Browse Source

页面跳转path补全,部分页面字段替换

yangxiao 3 years ago
parent
commit
fff553030e

+ 6 - 6
src/router/index.js

@@ -37,13 +37,13 @@ const routes = [
       path: 'draughtfanlist/:wpId', // 风机列表
       component: () => import(/* webpackChunkName: "windsitedraughtfanlist" */ '../views/WindSite/pages/DraughtFanList.vue'),
     }, {
-      path: 'matrix', // 风场矩阵
+      path: 'matrix/:wpId', // 风场矩阵
       component: () => import(/* webpackChunkName: "windsitematrix" */ '../views/WindSite/pages/Matrix.vue'),
     }, {
-      path: 'lightmatrix',
+      path: 'lightmatrix/:wpId',
       component: () => import(/* webpackChunkName: "windsitelightmatrix" */ '../views/WindSite/pages/LightMatrix.vue'),
     }, {
-      path: 'box',
+      path: 'box/:wpId',
       component: () => import(/* webpackChunkName: "windsitebox" */ '../views/WindSite/pages/Box.vue'),
     }, {
       path: 'info/:wpId/:wtId', // 单机状态监视
@@ -52,13 +52,13 @@ const routes = [
       path: 'tower/:wpId', // 测风塔
       component: () => import(/* webpackChunkName: "windsitetower" */ '../views/WindSite/pages/Tower.vue'),
     }, {
-      path: 'inverter-info',
+      path: 'inverter-info/:wpId',
       component: () => import(/* webpackChunkName: "windsitetower" */ '../views/WindSite/pages/Inverter-Info.vue'),
     }, {
-      path: 'map',
+      path: 'map/:wpId',
       component: () => import(/* webpackChunkName: "windsitemap" */ '../views/WindSite/pages/Map.vue'),
     }, {
-      path: 'map1',
+      path: 'map1/:wpId',
       component: () => import(/* webpackChunkName: "windsitemap1" */ '../views/WindSite/pages/Map1.vue'),
     }]
   },

+ 1 - 1
src/views/Home/Home.vue

@@ -578,7 +578,7 @@ export default {
           rdlKey.forEach((keyEle, keyIndex) => {
             res.data.rdlvos.forEach(cEle => {
               DayPower.value[keyIndex].value.push({
-                text: new Date(cEle.time).formatDate("yyyy-MM-dd"),
+                text: cEle.timestr,
                 value: cEle[keyEle]
               });
             });

+ 4 - 4
src/views/WindSite/WindSite.vue

@@ -45,7 +45,7 @@ export default {
         {
           icon: "svg-matrix",
           path: "/windsite/draughtfanlist",
-        } /*
+        },
         {
           icon: "svg-agc",
           path: "/windsite/matrix",
@@ -57,7 +57,7 @@ export default {
         {
           icon: "svg-intranet-involvement",
           path: "/windsite/box",
-        },*/,
+        },
         // {
         //   icon: "svg-matrix",
         //   path: "/windsite/info",
@@ -65,7 +65,7 @@ export default {
         {
           icon: "svg-easy-compass",
           path: "/windsite/tower",
-        } /*
+        },
         {
           icon: "svg-easy-compass",
           path: "/windsite/Inverter-Info",
@@ -77,7 +77,7 @@ export default {
         {
           icon: "svg-easy-compass",
           path: "/windsite/map1",
-        },*/,
+        },
       ],
     };
   },

+ 6 - 7
src/views/WindSite/pages/Home/Home.vue

@@ -467,7 +467,7 @@ export default {
             keys.forEach((key, keyIndex) => {
               res.data.glvos.forEach((ele) => {
                 Powertrend.value[keyIndex].value.push({
-                  text: new Date(ele.time).formatDate("yyyy-MM-dd"),
+                  text: new Date().formatDate("yyyy-MM-dd"),
                   value: ele[key],
                 });
               });
@@ -529,7 +529,7 @@ export default {
           let dayLost = [];
           res.data.forEach((ele) => {
             dayLost.push({
-              text: new Date(ele.time).formatDate("yyyy-MM-dd"),
+              text: ele.timestr,
               value: ele.value1,
             });
           });
@@ -564,11 +564,11 @@ export default {
 
           res.data.forEach((ele) => {
             data[0].value.push({
-              text: new Date(ele.time).formatDate("yyyy-MM-dd"),
+              text: ele.timestr,
               value: ele.value1 || 0,
             });
             data[1].value.push({
-              text: new Date(ele.time).formatDate("yyyy-MM-dd"),
+              text: ele.timestr,
               value: ele.value2 || 0,
             });
           });
@@ -604,11 +604,11 @@ export default {
 
           res.data.forEach((ele) => {
             data[0].value.push({
-              text: new Date(ele.time).formatDate("yyyy-MM-dd"),
+              text: ele.timestr,
               value: ele.value1,
             });
             data[1].value.push({
-              text: new Date(ele.time).formatDate("yyyy-MM-dd"),
+              text: ele.timestr,
               value: ele.value2,
             });
           });
@@ -622,7 +622,6 @@ export default {
   created() {
     let that = this;
     that.wpId = that.$route.params.wpId;
-    console.log(123123,that.$route.params)
     that.$nextTick(() => {
       that.requestData(false);
       that.timmer = setInterval(() => {

+ 16 - 16
src/views/layout/Menu.vue

@@ -146,23 +146,23 @@ export default {
             {
               text: "决策支持1",
               icon: "svg-matrix",
-              path: "decision/decision1",
+              path: "/decision/decision1",
+            },
+            {
+              text: "决策支持2",
+              icon: "svg-matrix",
+              path: "/decision/decision2",
+            },
+            {
+              text: "决策支持3",
+              icon: "svg-matrix",
+              path: "/decision/decision3",
+            },
+            {
+              text: "决策支持4",
+              icon: "svg-matrix",
+              path: "/decision/decision4",
             },
-            // {
-            //   text: "决策支持2",
-            //   icon: "svg-matrix",
-            //   path: "decision/decision2",
-            // },
-            // {
-            //   text: "决策支持3",
-            //   icon: "svg-matrix",
-            //   path: "decision/decision3",
-            // },
-            // {
-            //   text: "决策支持4",
-            //   icon: "svg-matrix",
-            //   path: "decision/decision4",
-            // },
           ],
         },
         {