Browse Source

首页bug修改

chenminghua 3 years ago
parent
commit
33868bf951

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

@@ -12,7 +12,7 @@
               <Row type="flex" class="plan">
                   <Col :span="24">
                   <com-panel title="预测电量" sub-title="(单位:万kWh)">
-                      <list-bar-chart-2 :list="ForecastPower" height="100%" />
+                      <list-bar-chart-2 :list="ForecastPower" height="15.7407vh" />
                   </com-panel>
                   </Col>
               </Row>

File diff suppressed because it is too large
+ 904 - 677
src/views/Home/components/map/svg-map-nx.vue


+ 5 - 13
src/views/Knowledge/Knowledge4.vue

@@ -93,19 +93,11 @@ export default {
         success(res) {
           if (res.code == 200) {
             that.tableData.data = [];
-          //   let data = res.data;
-          //   for (var i = 0; i < data.length; i++) {
-          //     let obj = {
-          //       id: i + 1,
-          //       safecontent: data[i].safecontent,
-          //       describe: data[i].describe,
-          //       principal: data[i].principal,
-          //       addtime: new Date(data[i].addtime).formatDate("yyyy-MM-dd"),
-          //       type: data[i].type,
-          //       other: data[i].other,
-          //     };
-              that.tableData.data = res.data;
-          //   }
+             res.data.forEach((item) => {
+              item.addtime = new Date(item.addtime).formatDate("yyyy-MM-dd hh:mm:ss")
+              that.tableData.data.push(item);
+            });
+            that.tableData.data = res.data;
           }
         },
       });

+ 1 - 1
src/views/Knowledge/Knowledge5.vue

@@ -136,7 +136,7 @@ export default {
           if (res.code == 200) {
             that.tableData.data = [];
             res.data.forEach((item) => {
-              item.enable = item.enable == 0 ? "启用" : "停止";
+              item.enable = "启用";
               that.tableData.data.push(item);
             });
           }