diff --git a/.env.development b/.env.development index 53e8c6e..99c6de3 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 太仓资产管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.108:9115' +VUE_APP_BASE_API = 'http://192.168.0.115:9115' # VUE_APP_BASE_API = 'http://39.101.188.84:9115' # 路由懒加载 diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 725530e..ce4228d 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -57,8 +57,11 @@ export default { this.levelList = [activeRoute[0].children[0],matched[0]] } else if(matched[0].path == "/myAssetsAuth") { // 单位端--我的资产--资产详情 - const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'myAssets') - this.levelList = [activeRoute[0].children[0],matched[0]] + // const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'myAssets') + // this.levelList = [activeRoute[0].children[0],matched[0]] + const activeRoute = sidebarRouters.filter(item => item.path == '/myAssets') + const childrenRoute = activeRoute[0].children; + this.levelList = [activeRoute[0],childrenRoute[Number(matched[0].meta.type)],matched[0]] } else if(matched[0].path == "/taskAuditInfo") { // 管理端--任务管理--任务审核--资产审核 const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'task') @@ -96,6 +99,10 @@ export default { this.$router.push("assetsManage/" + path) return; } + if(path == "myWebAssets" || path == "myProgram" || path == "myOfficialAccount" || path == "myEmail" || path == "myMobileApplication") { + this.$router.push("myAssets/" + path) + return; + } this.$router.push(path) } } diff --git a/src/router/index.js b/src/router/index.js index 5dba4e4..1f8c2a2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -113,7 +113,7 @@ export const constantRoutes = [ path: 'myAssetsAuth', component: () => import('@/views/unitPages/myAssets/assetsAuth'), name: 'myAssetsAuth', - meta: { title: '资产详情', icon: 'user', activeMenu: "/myAssets" } + meta: { title: '资产详情', icon: 'user', activeMenu: "/myAssetsAuth/myWebAssets" } },{ path: 'unitAuth', component: () => import('@/views/auditPages/unitManagement/index'), diff --git a/src/views/components/myAssetsType/index.vue b/src/views/components/myAssetsType/index.vue new file mode 100644 index 0000000..a185b1c --- /dev/null +++ b/src/views/components/myAssetsType/index.vue @@ -0,0 +1,3223 @@ + + diff --git a/src/views/components/myAssetsType/index_v1.vue b/src/views/components/myAssetsType/index_v1.vue new file mode 100644 index 0000000..2617fc4 --- /dev/null +++ b/src/views/components/myAssetsType/index_v1.vue @@ -0,0 +1,364 @@ + + + \ No newline at end of file diff --git a/src/views/components/myAssetsType/index_v2.vue b/src/views/components/myAssetsType/index_v2.vue new file mode 100644 index 0000000..3f94268 --- /dev/null +++ b/src/views/components/myAssetsType/index_v2.vue @@ -0,0 +1,332 @@ + + + \ No newline at end of file diff --git a/src/views/components/myAssetsType/index_v3.vue b/src/views/components/myAssetsType/index_v3.vue new file mode 100644 index 0000000..d993bb4 --- /dev/null +++ b/src/views/components/myAssetsType/index_v3.vue @@ -0,0 +1,299 @@ + + + \ No newline at end of file diff --git a/src/views/components/myAssetsType/index_v4.vue b/src/views/components/myAssetsType/index_v4.vue new file mode 100644 index 0000000..a67cd38 --- /dev/null +++ b/src/views/components/myAssetsType/index_v4.vue @@ -0,0 +1,261 @@ + + + \ No newline at end of file diff --git a/src/views/unitPages/myAssets/assetsAuth.vue b/src/views/unitPages/myAssets/assetsAuth.vue index cc8b6b8..97911b7 100644 --- a/src/views/unitPages/myAssets/assetsAuth.vue +++ b/src/views/unitPages/myAssets/assetsAuth.vue @@ -1,2779 +1,21 @@ diff --git a/src/views/unitPages/myAssets/email.vue b/src/views/unitPages/myAssets/email.vue new file mode 100644 index 0000000..4998871 --- /dev/null +++ b/src/views/unitPages/myAssets/email.vue @@ -0,0 +1,199 @@ + + + diff --git a/src/views/unitPages/myAssets/index.vue b/src/views/unitPages/myAssets/index.vue index 3e23325..e49ea91 100644 --- a/src/views/unitPages/myAssets/index.vue +++ b/src/views/unitPages/myAssets/index.vue @@ -183,6 +183,7 @@ export default { goInfo(row){ this.$router.push({name: 'myAssetsAuth',query: { pageType: "look", + type:0, id: row.id }}) }, diff --git a/src/views/unitPages/myAssets/mobileApplication.vue b/src/views/unitPages/myAssets/mobileApplication.vue new file mode 100644 index 0000000..0cdfa2c --- /dev/null +++ b/src/views/unitPages/myAssets/mobileApplication.vue @@ -0,0 +1,223 @@ + + + diff --git a/src/views/unitPages/myAssets/officialAccount.vue b/src/views/unitPages/myAssets/officialAccount.vue new file mode 100644 index 0000000..097d3b9 --- /dev/null +++ b/src/views/unitPages/myAssets/officialAccount.vue @@ -0,0 +1,224 @@ + + + diff --git a/src/views/unitPages/myAssets/program.vue b/src/views/unitPages/myAssets/program.vue new file mode 100644 index 0000000..07a4d1e --- /dev/null +++ b/src/views/unitPages/myAssets/program.vue @@ -0,0 +1,227 @@ + + +