diff --git a/src/router/index.js b/src/router/index.js index eddc0b4b..58340847 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1361,109 +1361,104 @@ const routes2 = [{ { path: '/project/dataBoard/', name: '数据看板', - component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve), + component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve), + // component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve), + // children: [{ + // path: 'index', + // name: '数据看板-首页概览', + // component: () => import('@/views/projectAdmin/dataBoard/index.vue'), + // }, { + // path: 'digitalSite', + // name: '数据看板-数字工地', + // component: () => import('@/views/projectAdmin/dataBoard/digitalSite.vue'), + // }, { + // path: 'laborManage', + // name: '数据看板-劳务管理', + // component: () => import('@/views/projectAdmin/dataBoard/laborManage.vue'), + // }, { + // path: 'environment', + // name: '数据看板-环境监测', + // component: () => import('@/views/projectAdmin/dataBoard/environment.vue'), + // }, + // { + // path: 'material', + // name: '数据看板-材料管理', + // component: () => import('@/views/projectAdmin/dataBoard/material.vue'), + // }, + // { + // path: 'plan', + // name: '数据看板-进度计划', + // component: () => import('@/views/projectAdmin/dataBoard/plan.vue'), + // }, + // { + // path: 'secure', + // name: '数据看板-安全管理', + // component: () => import('@/views/projectAdmin/dataBoard/secure.vue'), + // }, + // { + // path: 'quality', + // name: '数据看板-质量管理', + // component: () => import('@/views/projectAdmin/dataBoard/quality.vue'), + // }, + // { + // path: 'SixHundred', + // name: '数据看板-六个百分百', + // component: () => import('@/views/projectAdmin/dataBoard/AiAnalysisCopy.vue'), + // }, + // { + // path: 'AiAnalysis', + // name: '数据看板-AI数据分析', + // component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'), + // } + // ] children: [{ - path: 'index', - name: '数据看板-首页概览', - component: () => import('@/views/projectAdmin/dataBoard/index.vue'), - }, { - path: 'digitalSite', - name: '数据看板-数字工地', - component: () => import('@/views/projectAdmin/dataBoard/digitalSite.vue'), - }, { - path: 'laborManage', - name: '数据看板-劳务管理', - component: () => import('@/views/projectAdmin/dataBoard/laborManage.vue'), - }, { - path: 'environment', - name: '数据看板-环境监测', - component: () => import('@/views/projectAdmin/dataBoard/environment.vue'), - }, - { - path: 'material', - name: '数据看板-材料管理', - component: () => import('@/views/projectAdmin/dataBoard/material.vue'), - }, - { - path: 'plan', - name: '数据看板-进度计划', - component: () => import('@/views/projectAdmin/dataBoard/plan.vue'), - }, - { - path: 'secure', - name: '数据看板-安全管理', - component: () => import('@/views/projectAdmin/dataBoard/secure.vue'), - }, - { - path: 'quality', - name: '数据看板-质量管理', - component: () => import('@/views/projectAdmin/dataBoard/quality.vue'), - }, - { - path: 'SixHundred', - name: '数据看板-六个百分百', - component: () => import('@/views/projectAdmin/dataBoard/AiAnalysisCopy.vue'), - }, - { - path: 'AiAnalysis', - name: '数据看板-AI数据分析', - component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'), - } - ] - }, - //数据看板2.0 - { - path: '/project/dataBoardTwo/', - name: '数据看板', - component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve), - children: [{ - path: 'index', - name: '数据看板-首页概览', - component: () => import('@/views/projectAdmin/dataBoard/index.vue'), - }, { - path: 'digitalSite', - name: '数据看板-数字工地', - component: () => import('@/views/projectAdmin/dataBoard/digitalSite.vue'), - }, { - path: 'laborManage', - name: '数据看板-劳务管理', - component: () => import('@/views/projectAdmin/dataBoard/laborManage.vue'), - }, { - path: 'environment', - name: '数据看板-环境监测', - component: () => import('@/views/projectAdmin/dataBoard/environment.vue'), - }, - { - path: 'material', - name: '数据看板-材料管理', - component: () => import('@/views/projectAdmin/dataBoard/material.vue'), - }, - { - path: 'plan', - name: '数据看板-进度计划', - component: () => import('@/views/projectAdmin/dataBoard/plan.vue'), - }, - { - path: 'secure', - name: '数据看板-安全管理', - component: () => import('@/views/projectAdmin/dataBoard/secure.vue'), - }, - { - path: 'quality', - name: '数据看板-质量管理', - component: () => import('@/views/projectAdmin/dataBoard/quality.vue'), - }, - { - path: 'SixHundred', - name: '数据看板-六个百分百', - component: () => import('@/views/projectAdmin/dataBoard/AiAnalysisCopy.vue'), - }, - { - path: 'AiAnalysis', - name: '数据看板-AI数据分析', - component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'), - } - ] + path: 'index', + name: '数据看板-首页概览', + component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'), + }, { + path: 'digitalSite', + name: '数据看板-数字工地', + component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite.vue'), + }, { + path: 'laborManage', + name: '数据看板-劳务管理', + component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'), + }, { + path: 'environment', + name: '数据看板-环境监测', + component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'), + }, + { + path: 'material', + name: '数据看板-材料管理', + component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'), + }, + { + path: 'plan', + name: '数据看板-进度计划', + component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'), + }, + { + path: 'secure', + name: '数据看板-安全管理', + component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'), + }, + { + path: 'quality', + name: '数据看板-质量管理', + component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'), + }, + { + path: 'SixHundred', + name: '数据看板-六个百分百', + component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'), + }, + { + path: 'AiAnalysis', + name: '数据看板-AI数据分析', + component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'), + } + ] }, { path: '/equipmentCenter/', diff --git a/src/views/projectAdmin/dataBoard/style.less b/src/views/projectAdmin/dataBoard/style.less index 31400adf..9234ca62 100644 --- a/src/views/projectAdmin/dataBoard/style.less +++ b/src/views/projectAdmin/dataBoard/style.less @@ -1,10 +1,5 @@ -// .dataBoardPage{ -// background-color: #040D15; -// position: relative; -// color: rgba(255, 255, 255, 0.8); -// } .dataBoardPage{ - background-image: url('../../../assets/images/dataBoard/bgc.png'); + background-color: #040D15; position: relative; color: rgba(255, 255, 255, 0.8); } diff --git a/src/views/projectAdmin/dataBoardTwo/dataBoard.vue b/src/views/projectAdmin/dataBoardTwo/dataBoard.vue index ac4a28dd..53b097a1 100644 --- a/src/views/projectAdmin/dataBoardTwo/dataBoard.vue +++ b/src/views/projectAdmin/dataBoardTwo/dataBoard.vue @@ -190,7 +190,7 @@ export default { font-size: 32px; } } - .dataBoardPage{ - background-color: blue; - } +// .dataBoardPage{ +// background-color: blue; +// } diff --git a/src/views/projectAdmin/dataBoardTwo/style.less b/src/views/projectAdmin/dataBoardTwo/style.less index 9234ca62..a244ca69 100644 --- a/src/views/projectAdmin/dataBoardTwo/style.less +++ b/src/views/projectAdmin/dataBoardTwo/style.less @@ -1,5 +1,5 @@ .dataBoardPage{ - background-color: #040D15; + background-image: url('../../../assets/images/dataBoard/bgc.png'); position: relative; color: rgba(255, 255, 255, 0.8); }