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