diff --git a/src/assets/images/dataBoard/wisdomBuild/map.jpg b/src/assets/images/dataBoard/wisdomBuild/map.jpg new file mode 100644 index 00000000..f0738a02 Binary files /dev/null and b/src/assets/images/dataBoard/wisdomBuild/map.jpg differ diff --git a/src/assets/images/dataBoard/wisdomBuild/menu-active.png b/src/assets/images/dataBoard/wisdomBuild/menu-active.png new file mode 100644 index 00000000..6158ae3d Binary files /dev/null and b/src/assets/images/dataBoard/wisdomBuild/menu-active.png differ diff --git a/src/assets/images/dataBoard/wisdomBuild/menu.png b/src/assets/images/dataBoard/wisdomBuild/menu.png new file mode 100644 index 00000000..2f86d027 Binary files /dev/null and b/src/assets/images/dataBoard/wisdomBuild/menu.png differ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 77c4d5a5..965c5d75 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -35,11 +35,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://14.29.220.211:6023/' // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光 // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' - axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789 + // axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789 // axios.defaults.baseURL = 'http://124.71.178.44:100/' // tag: 本地 - // axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 + axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 + // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 diff --git a/src/router/index.js b/src/router/index.js index 58340847..5e641a32 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1361,7 +1361,6 @@ const routes2 = [{ { path: '/project/dataBoard/', name: '数据看板', - component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve), // component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve), // children: [{ // path: 'index', @@ -1411,54 +1410,56 @@ const routes2 = [{ // component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'), // } // ] + + component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve), children: [{ - 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: 'index', + name: '数据看板-首页概览', + component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'), + }, { + path: 'digitalSite', + name: '数据看板-数字工地', + component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'), + }, { + 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/dataBoardTwo/digitalSite.vue b/src/views/projectAdmin/dataBoardTwo/digitalSite/index.vue similarity index 99% rename from src/views/projectAdmin/dataBoardTwo/digitalSite.vue rename to src/views/projectAdmin/dataBoardTwo/digitalSite/index.vue index f838ac0e..83643ed8 100644 --- a/src/views/projectAdmin/dataBoardTwo/digitalSite.vue +++ b/src/views/projectAdmin/dataBoardTwo/digitalSite/index.vue @@ -205,8 +205,12 @@