From c8fb3787df627970248fe4e1cf0a551453635535 Mon Sep 17 00:00:00 2001 From: zhangyh Date: Tue, 16 Sep 2025 13:50:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/historyDetail/index.vue | 134 ++ src/component/LibraryPage/searchLabel.vue | 50 +- src/lang/cn.ts | 4 +- src/lang/en.ts | 2 +- src/tool/listData.js | 6 + src/views/HomeMain.vue | 46 +- src/views/HomeView/history111.vue | 1392 ++++++++++-------- 7 files changed, 991 insertions(+), 643 deletions(-) create mode 100644 src/component/Detail/historyDetail/index.vue diff --git a/src/component/Detail/historyDetail/index.vue b/src/component/Detail/historyDetail/index.vue new file mode 100644 index 00000000..21650cee --- /dev/null +++ b/src/component/Detail/historyDetail/index.vue @@ -0,0 +1,134 @@ + + + diff --git a/src/component/LibraryPage/searchLabel.vue b/src/component/LibraryPage/searchLabel.vue index f5a13542..10db0354 100644 --- a/src/component/LibraryPage/searchLabel.vue +++ b/src/component/LibraryPage/searchLabel.vue @@ -14,27 +14,29 @@
-
{{$t('LibraryPage.Tag')}}
- - - +
{{$t('LibraryPage.Category')}}
@@ -90,6 +92,12 @@ import { Modal,message,Upload,CascaderProps } from 'ant-design-vue'; import { ElCascader } from 'element-plus' export default defineComponent({ + props:{ + isHistory:{ + type:Boolean, + default:false + }, + }, components:{ VueCropper, ElCascader, diff --git a/src/lang/cn.ts b/src/lang/cn.ts index d093f37d..3f672fad 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -350,8 +350,8 @@ export default { CollectionsName: "名字", source: "来源", UptateTime: "修改时间", - SketchCounts: "项目名字", - Operations: "Operations", + SketchCounts: "草图数量", + Operations: "操作", jsContent1: "删除成功", jsContent2: "您确定要删除这个收藏吗？", jsContent3: "修改成功", diff --git a/src/lang/en.ts b/src/lang/en.ts index 88e55012..aee9a5cd 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -352,7 +352,7 @@ export default { CollectionsName: "Collections Name", source: "Source", UptateTime: "Uptate Time", - SketchCounts: "Project Name", + SketchCounts: "SketchCounts", Operations: "Operations", jsContent1: "Deleted successfully", jsContent2: "Do you really want to delete this collection? ", diff --git a/src/tool/listData.js b/src/tool/listData.js index 258bcc6a..cb647e5f 100644 --- a/src/tool/listData.js +++ b/src/tool/listData.js @@ -360,6 +360,12 @@ const openTypeList = (t)=>{ Earlierlist:[ ], }, + history111:{ + icon:'fi-br-time-past', + label:t('HistoryPage.History'), + value:'history111', + router:'/home/history111' + }, gallery:{ icon:'fi-rr-gallery', label:t('works.WORKS'), diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index d5c3aa97..f42166c7 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -18,17 +18,17 @@

{{$t('Header.NewProject')}}

-
+
{{item.label}}
-
+
-
+
@@ -339,7 +339,8 @@ export default defineComponent({ isWithinAWeek:false, isEarlier:false, }, - bathGenerationList:["poseTransfer","SERIES_DESIGN","toProduct","relight"] + bathGenerationList: ["poseTransfer", "SERIES_DESIGN", "toProduct", "relight"], + showHistory:false }) watch(()=>homeMainData.userDetailLanguage,(newVal)=>{ if(locale.value == newVal || !newVal)return @@ -355,6 +356,8 @@ export default defineComponent({ } } }) + + // watch(()=>locale.value,(newVal,oldVal)=>{ // if(newVal == oldVal)return // console.log(newVal , oldVal) @@ -409,6 +412,20 @@ export default defineComponent({ }, { immediate: true } // 立即触发一次以处理初始参数 ); + + // 监听路由,当路由地址为/home/history111时homeMainData.showHistory为true,改变左侧菜单颜色 + watch(() => route.path, () => { + if(route.path == '/home/history111'){ + homeMainData.showHistory = true + }else{ + homeMainData.showHistory = false + } + }, + { immediate: true } + ) + + + // watch(()=>homeMainData.openTypeList,()=>{ // homeMainData.historyData.page = 1 // }) @@ -539,16 +556,15 @@ export default defineComponent({ let imgParent = document.querySelector('.homeMain_max .detail .material_content_list_loding .historyPage_loading') if(Observer?.unobserve)Observer.unobserve(imgParent); }) - const setOpenType = (type,list)=>{ + const setOpenType = (type, list) => { + if(homeMainData.openType == type){ homeMainData.openType = '' }else { homeMainData.openType = type - // if(type == 'history'){ - // if(list.length == 0){ - - // } - // } + if (type === 'history111') { + router.push('/home/history111') + } } } let Observer = null @@ -1120,6 +1136,10 @@ export default defineComponent({ // padding: 1.2rem; max-height: 5rem; border-radius: 2rem; + &.show-history{ + background: #fff; + border-radius: 0.8rem; + } &.active{ > .detailBox{ flex: 1; @@ -1368,6 +1388,11 @@ export default defineComponent({ overflow: hidden; max-height: 100%; background: #00000008; + &.isHistory{ + background: #fff; + border-radius: 0.8rem; + max-height: 5rem; + } > .titleBox{ padding: 0; margin-bottom: 1.6rem; @@ -1379,6 +1404,7 @@ export default defineComponent({ } } } + &.language{ > .titleBox{ padding: .8rem; diff --git a/src/views/HomeView/history111.vue b/src/views/HomeView/history111.vue index 148a3309..2dadba90 100644 --- a/src/views/HomeView/history111.vue +++ b/src/views/HomeView/history111.vue @@ -1,642 +1,816 @@ -徽标 -工单管理 -合并请求 -里程碑 -探索 -aidlab -/ -aida_front -代码 -工单 -合并请求 -Actions -软件包 -项目 -版本发布 -百科 -动态 -您已经于43分钟前推送了分支 dev_vite -您已经于43分钟前推送了分支 StableVersion -文件 -Events.vue -HomeView.vue -Works.vue -history.vue -library.vue -404.vue -Administrator.vue -Demo.vue -HomeMain.vue -HomeRecommend.vue -LoginPage.vue -Register.vue -Upgrade.vue -emailVerify.vue -feedbackSurvey.vue -feedbackSurveyCN.vue -paySucceed.vue -setIdentification.vue -test.vue -trialApproval.vue -versions1Guide.vue -App.vue -main.ts -shims-vue.d.ts -.env -.env.dev -.env.dev_build -.env.production -.env.test -.env.test_build -.eslintrc.js -.gitignore -README.md -babel.config.js -dist.7z -package-lock.json -package.json -tsconfig.json -vue.config.js -aida_front -/ -src -/ -views -/ -HomeView -/ -history.vue - -X1627315083 -b6e5f05f06 -fix -6个月前 -559 行 -18 KiB -Vue - -Powered by Gitea -当前版本: 1.24.5 页面: -155ms -模板: -20ms -许可证 -API \ No newline at end of file From c39a50066a2161639b11aebdd248b666bb9aded6 Mon Sep 17 00:00:00 2001 From: zhangyh Date: Tue, 16 Sep 2025 15:25:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E5=B0=86=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8A=BD=E7=A6=BB=E4=B8=BA=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/common/TableSearchBar.vue | 112 ++++++++++++++++++++++++ src/views/HomeView/history111.vue | 91 ++++--------------- 2 files changed, 129 insertions(+), 74 deletions(-) create mode 100644 src/component/common/TableSearchBar.vue diff --git a/src/component/common/TableSearchBar.vue b/src/component/common/TableSearchBar.vue new file mode 100644 index 00000000..00fc3884 --- /dev/null +++ b/src/component/common/TableSearchBar.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/views/HomeView/history111.vue b/src/views/HomeView/history111.vue index 2dadba90..6104ef18 100644 --- a/src/views/HomeView/history111.vue +++ b/src/views/HomeView/history111.vue @@ -72,29 +72,11 @@
--> -
-
-
- {{ t(item.label) }} -
-
-
- - -
-
+
{ const language = store.state.UserHabit?.userDetail?.language @@ -192,7 +176,7 @@ export default defineComponent({ return [ { title: useI18n().t('HistoryPage.CollectionsName'), - align: 'center', + align: 'left', ellipsis: true, width: 150, dataIndex: 'name', @@ -293,13 +277,12 @@ export default defineComponent({ pageSize: 10, total: 0, presetList: [ - { label: 'Header.All', value: 'all' }, - { label: 'newProjectg.series', value: 'series' }, - { label: 'newProjectg.single', value: 'single' }, - { label: 'Header.Product', value: 'product' }, - { label: 'Header.POSE_TRANSFER', value: 'video' } + { label: this.t('Header.All'), value: 'all' }, + { label: this.t('newProjectg.series'), value: 'series' }, + { label: this.t('newProjectg.single'), value: 'single' }, + { label: this.t('Header.Product'), value: 'product' }, + { label: this.t('Header.POSE_TRANSFER'), value: 'video' } ], - currentPreset: 'all', searchParam: { text: '', type: '', @@ -386,16 +369,12 @@ export default defineComponent({ }, //查询列表 - searchHistoryList() { + searchHistoryList(value:any) { + console.log('value',value) this.currentPage = 1 this.getHistoryList() }, - // 点击预设 - handleChangePreset(value) { - this.currentPreset = value - }, - getHistoryList() { this.isShowMark = true let startDate: any = this.rangePickerValue @@ -659,42 +638,6 @@ export default defineComponent({ // } // } // } - .history_table_search { - .search_preset { - column-gap: 2rem; - .preset_item { - // cursor: pointer; - // box-sizing: border-box; - // height: 6rem; - // line-height: 6rem; - // padding: 0 5rem; - border: 0.1rem solid #000; - // border-radius: 5rem; - color: #000; - background-color: #fff; - &.active { - color: #fff; - background-color: #000; - } - } - } - .search_input { - background-color: #fff; - border: 0.1rem solid #000; - border-radius: 3rem; - // column-gap: 3rem; - padding-right: 1rem; - .search_input_inner { - border: none; - height: 100%; - padding-left: 3rem; - border-radius: 3rem; - } - :deep(.ant-input) { - border: none; - } - } - } .history_table_content { margin-top: 2.6rem; From 744197310332343bc7be5e6944f4c3a4fac07a3c Mon Sep 17 00:00:00 2001 From: zhangyh Date: Tue, 16 Sep 2025 15:38:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E9=9A=90=E8=97=8F=E6=97=A7?= =?UTF-8?q?=E7=9A=84=E5=8E=86=E5=8F=B2=E8=8F=9C=E5=8D=95=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tool/listData.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/tool/listData.js b/src/tool/listData.js index 7baae450..ca1fe496 100644 --- a/src/tool/listData.js +++ b/src/tool/listData.js @@ -348,19 +348,19 @@ const openTypeList = (t)=>{ }, ] }, - history:{ - icon:'fi-br-time-past', - label:t('HistoryPage.History'), - value:'history', - Todaylist:[ - ], - Yesterdaylist:[ - ], - WithinAWeeklist:[ - ], - Earlierlist:[ - ], - }, + // history:{ + // icon:'fi-br-time-past', + // label:t('HistoryPage.History'), + // value:'history', + // Todaylist:[ + // ], + // Yesterdaylist:[ + // ], + // WithinAWeeklist:[ + // ], + // Earlierlist:[ + // ], + // }, history111:{ icon:'fi-br-time-past', label:t('HistoryPage.History'), From 5fed96a1e1323a76a911d79738aa55ac4ebcc4fd Mon Sep 17 00:00:00 2001 From: zhangyh Date: Tue, 16 Sep 2025 16:58:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20canvas=E7=BC=96=E8=BE=91=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=9A=84title=E9=9A=8F=E9=80=89=E6=8B=A9=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Canvas/ExistsImageList/index.vue | 2 +- src/component/home/design/tools.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/component/Canvas/ExistsImageList/index.vue b/src/component/Canvas/ExistsImageList/index.vue index 5730cbfe..06ca2bbd 100644 --- a/src/component/Canvas/ExistsImageList/index.vue +++ b/src/component/Canvas/ExistsImageList/index.vue @@ -4,7 +4,7 @@
diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue index 331926b1..b88053bc 100644 --- a/src/component/home/design/tools.vue +++ b/src/component/home/design/tools.vue @@ -295,7 +295,8 @@ export default defineComponent({ }) let obj = { value:'mannquin', - type:'Mannquin', + // type:'Mannquin', + type:data.locale == "ENGLISH"?'Mannquin':'模特', imgList:list } if(list.length > 0){ From 873b02b343934e3d45577a565b3b7dfb1b075993 Mon Sep 17 00:00:00 2001 From: zhangyh Date: Wed, 17 Sep 2025 11:19:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/HomeView/history111.vue | 60 ++++++++++++++++++------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/src/views/HomeView/history111.vue b/src/views/HomeView/history111.vue index 6104ef18..87f4f599 100644 --- a/src/views/HomeView/history111.vue +++ b/src/views/HomeView/history111.vue @@ -121,9 +121,10 @@ :groupDetails="groupDetails" :collectionName="collectionName" > - + - + +
@@ -144,8 +145,9 @@ import enUS from 'ant-design-vue/es/locale/en_US' import zhCN from 'ant-design-vue/es/locale/zh_CN' import { ConfigProvider } from 'ant-design-vue' import TableSearchBar from '@/component/common/TableSearchBar.vue' -import setLabel from '@/component/LibraryPage/setLabel.vue' -import searchLabel from '@/component/LibraryPage/searchLabel.vue' +// import setLabel from '@/component/LibraryPage/setLabel.vue' +// import searchLabel from '@/component/LibraryPage/searchLabel.vue' +import projectSetting from '@/component/home/newProject/setting.vue' import { useStore } from 'vuex' export default defineComponent({ @@ -153,17 +155,18 @@ export default defineComponent({ // HeaderComponent, HistoryDetail, // RobotAssist, - setLabel, + // setLabel, ElCascader, - searchLabel, + // searchLabel, SearchOutlined, ConfigProvider, - TableSearchBar + TableSearchBar, + projectSetting }, setup() { const store = useStore() let rangePickerValue: any = ref([]) - + const projectSetting: any = ref(null) let renameData: any = ref({}) //修改名字选中的数据 let isShowMark: any = ref(false) @@ -268,7 +271,8 @@ export default defineComponent({ isShowMark, enUS, zhCN, - tableLocale + tableLocale, + projectSetting } }, data() { @@ -369,8 +373,8 @@ export default defineComponent({ }, //查询列表 - searchHistoryList(value:any) { - console.log('value',value) + searchHistoryList(value: any) { + console.log('value', value) this.currentPage = 1 this.getHistoryList() }, @@ -429,23 +433,28 @@ export default defineComponent({ console.log('record', record) let deleteGroupFun = (id: any, index: number) => { - let data = { - userGroupId: id - } - Https.axiosPost(Https.httpUrls.deleteUserGroup, data).then((rv: any) => { + // let data = { + // userGroupId: id + // } + Https.axiosPost( + Https.httpUrls.projectDetail, + {}, + { params: { projectId: id } } + ).then((rv: any) => { message.success(this.t('HistoryPage.jsContent1')) this.collectionList.splice(index, 1) + this.getHistoryList() // let userGroupId: any = computed(() => { // return // }); - if (record.id == this.store.state.HomeStoreModule.userGroupId) { - this.store.commit('deleteUserGroupId') - this.store.commit('setLikeDesignCollectionList', []) - this.store.commit('clearAllData') - this.store.commit('clearAllCollection') - this.store.commit('setAllBoardDataChoose', {}) - this.store.commit('clearShowSketchboard', {}) - } + // if (record.id == this.store.state.HomeStoreModule.userGroupId) { + // this.store.commit('deleteUserGroupId') + // this.store.commit('setLikeDesignCollectionList', []) + // this.store.commit('clearAllData') + // this.store.commit('clearAllCollection') + // this.store.commit('setAllBoardDataChoose', {}) + // this.store.commit('clearShowSketchboard', {}) + // } }) } Modal.confirm({ @@ -463,8 +472,9 @@ export default defineComponent({ //修改名字 renameCollection(record: any, index: number) { - let searchLabel: any = this.$refs.searchLabel - searchLabel.init(record, index) + // let searchLabel: any = this.$refs.searchLabel + // searchLabel.init(record, index) + this.$refs.projectSetting.init(record) }, retrieveHome(record: any) {