修改1.预测页面放电曲线不显示。2.修改查看日志信息表格显示字段。3.修改地图场站异常状态判断条件

web/public/config/columnList.js

@@ -202,11 +202,11 @@ export const columnList = [
         ellipsis: true
         // filterable: true
       },
-      {
-        title: '储能容量',
-        dataIndex: 'capacity',
-        key: 'capacity'
-      },
+      // {
+      //   title: '储能容量',
+      //   dataIndex: 'capacity',
+      //   key: 'capacity'
+      // },
       {
         title: '场站状态',
         dataIndex: 'status',
@@ -316,17 +316,27 @@ export const columnList = [
         width: 120,
         scopedSlots: { customRender: 'type' }
       },
-      {
-        title: '操作用户',
-        dataIndex: 'user_id',
-        key: 'user_id',
-        width: 120
-      },
+      // {
+      //   title: '操作用户',
+      //   dataIndex: 'user_id',
+      //   key: 'user_id',
+      //   width: 120
+      // },
       {
         title: '设备ID',
         dataIndex: 'device_id',
         key: 'device_id'
       },
+      {
+        title: '设备名称D',
+        dataIndex: 'device_name',
+        key: 'device_name'
+      },
+      {
+        title: '所属场站',
+        dataIndex: 'station_name',
+        key: 'station_name'
+      },
       {
         title: '日志内容',
         dataIndex: 'content',
@@ -834,6 +844,13 @@ export const alarmlogOptions = [
         type: 'input',
         disabled: true
       },
+      {
+        label: '所属场站',
+        value: '',
+        key: 'station_name',
+        type: 'input',
+        disabled: true
+      },
       {
         label: '日志内容',
         value: '',

web/src/components/Home/Map.vue

@@ -97,7 +97,7 @@ export default {
           this.markers = res.data.map((item) => {
             return {
               ...item,
-              iconMap: (item.status === 1)
+              iconMap: (item.err === "1")
                 ? require('../../assets/home/homeIcon.png')
                 : require('../../assets/home/homeIcon1.png')
             }

web/src/views/predict.vue

@@ -57,7 +57,7 @@ export default {
             
             },
             {
-              key: 'W_store_ou',
+              key: 'W_store_out',
               label: '放电电量',
               seriesOptions:{
                 symbol: 'circle',

web/src/views/statisticalAnalysis.vue

@@ -432,6 +432,13 @@ export default {
       tableList: {
         1: {
           columns: [
+            {
+              title: '日期',
+              dataIndex: 'dt',
+              key: 'dt',
+              width: 120,
+              ellipsis: true
+            },
             {
               title: '充电电量',
               dataIndex: 'storage_elect_in',
@@ -488,13 +495,6 @@ export default {
               key: 'storage_num_err',
               width: 120,
               ellipsis: true
-            },
-            {
-              title: '日期',
-              dataIndex: 'dt',
-              key: 'dt',
-              width: 120,
-              ellipsis: true
             }
           ],
           geturl: '',
@@ -507,6 +507,13 @@ export default {
         },
         2: {
           columns: [
+            {
+              title: '日期',
+              dataIndex: 'dt',
+              key: 'dt',
+              width: 120,
+              ellipsis: true
+            },
             {
               title: '充电电量',
               dataIndex: 'charge_elect',
@@ -541,14 +548,6 @@ export default {
               key: 'charge_num_err',
               width: 120,
               ellipsis: true
-            },
-
-            {
-              title: '日期',
-              dataIndex: 'dt',
-              key: 'dt',
-              width: 120,
-              ellipsis: true
             }
           ],
           geturl: '',
@@ -561,6 +560,13 @@ export default {
         },
         3: {
           columns: [
+            {
+              title: '日期',
+              dataIndex: 'dt',
+              key: 'dt',
+              width: 120,
+              ellipsis: true
+            },
             {
               title: '发电电量',
               dataIndex: 'solar_elect_gen',
@@ -595,14 +601,6 @@ export default {
               key: 'solar_num_err',
               width: 120,
               ellipsis: true
-            },
-
-            {
-              title: '日期',
-              dataIndex: 'dt',
-              key: 'dt',
-              width: 120,
-              ellipsis: true
             }
           ],
 
@@ -642,7 +640,7 @@ export default {
   mounted() {
     console.log('mounted')
     // 优先加载第一个页面(activeKey=1)所需的数据
-    this.btnOptionList = this.$getBtns(['导出'])
+    // this.btnOptionList = this.$getBtns(['导出'])
     Promise.all([
       this.getStationList()