Merge branch 'dev-xiaomi' into 'master'

Dev xiaomi

See merge request !8

src/assets/js/http.js

@@ -41,6 +41,7 @@ if (process.env.NODE_ENV == 'development') {
     // 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://120.196.217.6:7000/'; // 鹤洲
     // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
 

src/router/index.js

@@ -1386,7 +1386,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',
@@ -1436,74 +1435,56 @@ const routes2 = [
         //         component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'),
         //     }
         // ]
+
+        component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve),
         children: [{
-            path: 'index',
+                path: 'index',
-            name: '数据看板-首页概览',
+                name: '数据看板-首页概览',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'),
-        }, {
+            }, {
-            path: 'digitalSite',
+                path: 'digitalSite',
-            name: '数据看板-数字工地',
+                name: '数据看板-数字工地',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'),
-        }, {
+            }, {
-            path: 'laborManage',
+                path: 'laborManage',
-            name: '数据看板-劳务管理',
+                name: '数据看板-劳务管理',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'),
-        }, {
+            }, {
-            path: 'environment',
+                path: 'environment',
-            name: '数据看板-环境监测',
+                name: '数据看板-环境监测',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'),
-        },
+            },
-        {
+            {
-            path: 'material',
+                path: 'material',
-            name: '数据看板-材料管理',
+                name: '数据看板-材料管理',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'),
-        },
+            },
-        {
+            {
-            path: 'plan',
+                path: 'plan',
-            name: '数据看板-进度计划',
+                name: '数据看板-进度计划',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'),
-        },
+            },
-        {
+            {
-            path: 'secure',
+                path: 'secure',
-            name: '数据看板-安全管理',
+                name: '数据看板-安全管理',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'),
-        },
+            },
-        {
+            {
-            path: 'quality',
+                path: 'quality',
-            name: '数据看板-质量管理',
+                name: '数据看板-质量管理',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'),
-        },
+            },
-        {
+            {
-            path: 'SixHundred',
+                path: 'SixHundred',
-            name: '数据看板-六个百分百',
+                name: '数据看板-六个百分百',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'),
-        },
+            },
-        {
+            {
-            path: 'AiAnalysis',
+                path: 'AiAnalysis',
-            name: '数据看板-AI数据分析',
+                name: '数据看板-AI数据分析',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'),
+                component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'),
-        },
+            }
-        {
+        ]
-            path: 'contractManage',
-            name: '数据看板-合约管理',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'),
-        },
-        {
-            path: 'doublecManage',
-            name: '数据看板-双碳管理',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'),
-        },
-        {
-            path: 'bigScreen',
-            name: '数据看板-监控大屏',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'),
-        },
-        {
-            path: 'cimManage',
-            name: '数据看板-CIM+',
-            component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'),
-        }
-    ]
     },
     {
         path: '/equipmentCenter/',