修改图标的y坐标轴标签，修改运行监控页面的设置下发按钮和操作

web/public/config/columnList.js

@@ -250,14 +250,10 @@ export const columnList = [
         ellipsis: true,
         fixed: 'left'
       },
-      {
-        title: '设备编号',
-        dataIndex: 'code'
-      },
       {
         title: '所属场站',
-        dataIndex: 'station_id',
+        dataIndex: 'station_name',
-        key: 'station_id'
+        key: 'station_name'
         // filterable: true
       },
       {
@@ -271,7 +267,10 @@ export const columnList = [
         title: '设备名称',
         dataIndex: 'name'
       },
-
+      {
+        title: '设备编号',
+        dataIndex: 'code'
+      },
       {
         title: '厂家信息',
         dataIndex: 'factory'

web/src/components/Home/Alarm.vue

@@ -170,6 +170,8 @@ export default {
           }
         },
         yAxis: {
+          name: '次数',
+          nameTextStyle: { color: '#fff' },
           type: 'value',
           splitLine: {
             lineStyle: { type: 'dashed', color: '#435463' }

web/src/components/Home/Energy.vue

@@ -161,6 +161,8 @@ export default {
           }
         },
         yAxis: {
+          name: '电量(kW·h)',
+          nameTextStyle: { color: '#fff' },
           type: 'value',
           splitLine: {
             lineStyle: { type: 'dashed', color: '#435463' }

web/src/components/Home/Pv.vue

@@ -161,6 +161,8 @@ export default {
           }
         },
         yAxis: {
+          name: '电量(kW·h)',
+          nameTextStyle: { color: '#fff' },
           type: 'value',
           splitLine: {
             lineStyle: { type: 'dashed', color: '#435463' }

web/src/views/monitor.vue

@@ -9,12 +9,12 @@
               >{{ station.name }}
             </a-select-option>
           </a-select>
-          <a-button type="primary" @click="handleMessage" style="margin-left: 20px"
+          <a-button type="primary" @click="handleMessage" style="margin-left: 20px">查看预制舱参数</a-button>
-            >查看预制舱参数</a-button
+          <a-button type="primary" @click="openDispatchModeModal" style="margin-left: 20px">模式设置</a-button>
-          >
+           <a-button type="primary" @click="openDispatchParamModal" style="margin-left: 20px">参数设置</a-button>
         </div>
       </div>
-      <div class="right">
+      <!-- <div class="right">
         <div class="search-item">
           <span>运行模式</span>
           <a-select v-model:value="workMode" style="width: 220px">
@@ -24,9 +24,12 @@
           </a-select>
         </div>
         <div class="search-item">
-          <a-button type="primary" @click="openDispatchModal">下发</a-button>
+          <a-button type="primary" @click="openDispatchModeModal">模式设置</a-button>
         </div>
+        <div class="search-item">
+          <a-button type="primary" @click="openDispatchParamModal">参数设置</a-button>
         </div>
+      </div> -->
     </div>
     <div class="content">
       <div class="stations">
@@ -66,6 +69,24 @@
     >
       <div style="color: #fff; padding: 20px" v-html="message"></div>
     </a-modal>
+    <a-modal
+      v-model:open="dispatchModeModal"
+      width="900px"
+      style="top: 80px"
+      :footer="null"
+      :destroy-on-close="true"
+    >
+      <DetailInfo
+        :items="detailInfoMode"
+        :rule-form="ruleForm"
+        ref="detailInfo"
+      >
+      </DetailInfo>
+      <div style="display: flex; justify-content: center; gap: 20px">
+        <a-button @click="handlebackMode">取消</a-button>
+        <a-button @click="handleConfirmMode" type="primary" >确认下发</a-button>
+      </div>
+    </a-modal>
     <a-modal
       v-model:open="dispatchModal"
       width="900px"
@@ -103,6 +124,7 @@ export default {
     return {
       // currentKey: '储能系统',
       dispatchModal: false,
+      dispatchModeModal: false,
       systemType: 1,
       value: [],
       stations: [],
@@ -185,6 +207,30 @@ export default {
         }
       ],
       deviceGroup: [],
+      detailInfoMode: {
+        title: '预制舱模式设置',
+        icon: 'icon-xinxi',
+        list: [
+          {
+            label: '预制舱运行模式',
+            value: '0',
+            key: 'work_mode',
+            type: 'select',
+            // addonAfter: '%',
+            // inputType:'number'
+            list: [ 
+              { value: '0', label: '手动' },
+              { value: '1', label: '峰谷套利' },
+              { value: '2', label: '增网配容' },
+              { value: '3', label: '应急供电' },
+              { value: '4', label: '并网保电' },
+              { value: '5', label: '自定时段' }
+            ],
+            options: { label: 'label', value: 'value' }
+          }
+        ],
+        ruleForm: {}
+      },
       detailInfo: {
         title: '预制舱参数设置',
         icon: 'icon-xinxi',
@@ -271,7 +317,7 @@ export default {
             required: true,
             message: '请输入储能充电上限值'
           },
-          { pattern: /^(100|[1-9][0-9]?)$/, message: '请输入1-100的整数', trigger: 'blur' }
+          { pattern: /^(100|[1-9][0-9]?)$/, message: '请输入1-100的整数' }
         ],
         capacity: [
           {
@@ -279,11 +325,7 @@ export default {
             required: true,
             message: '请输入台区变压器容量'
           },
-          {
+          { pattern: /^(1600|1[6-9][0-9]|[2-9][0-9]{2}|1[0-5][0-9]{2})$/, message: '请输入160-1600的整数' }
-            pattern: /^(1600|1[6-9][0-9]|[2-9][0-9]{2}|1[0-5][0-9]{2})$/,
-            message: '请输入160-1600的整数',
-            trigger: 'blur'
-          }
         ],
         power_safe: [
           {
@@ -292,9 +334,7 @@ export default {
             message: '请输入安全输入功率'
           },
           {
-            pattern: /^(400|[1-3][0-9]{2}|[1-9][0-9]?)$/,
+            pattern: /^(400|[1-3][0-9]{2}|[1-9][0-9]|[0-9])$/, message: '请输入0-400的整数',
-            message: '请输入0-400的整数',
-            trigger: 'blur'
           }
         ],
         power_discharge: [
@@ -303,7 +343,7 @@ export default {
             required: true,
             message: '请输入储能最大放电功率'
           },
-          { pattern: /^(150|[1-1][0-9]?|[1-9])$/, message: '请输入0-150的整数', trigger: 'blur' }
+          { pattern: /^(150|1[0-4][0-9]|[1-9][0-9]|[0-9])$/, message: '请输入0-150的整数' }
         ],
         power_charge: [
           {
@@ -311,7 +351,7 @@ export default {
             required: true,
             message: '请输入储能最大充电功率'
           },
-          { pattern: /^(150|[1-1][0-9]?|[1-9])$/, message: '请输入0-150的整数', trigger: 'blur' }
+          { pattern: /^(150|1[0-4][0-9]|[1-9][0-9]|[0-9])$/, message: '请输入0-150的整数' }
         ],
         backflow: [
           {
@@ -320,10 +360,7 @@ export default {
             message: '请输入防逆流回差'
           },
           {
-            pattern: /^(300|[1-2][0-9]{2}|[1-9][0-9])$/,
+            pattern: /^(300|[1-2][0-9]{2}|[1-9][0-9])$/, message: '请输入10-300的整数' }
-            message: '请输入10-300的整数',
-            trigger: 'blur'
-          }
         ],
         overload: [
           {
@@ -331,11 +368,7 @@ export default {
             required: true,
             message: '请输入防过载回差'
           },
-          {
+          { pattern: /^(300|[1-2][0-9]{2}|[1-9][0-9])$/, message: '请输入10-300的整数' }
-            pattern: /^(300|[1-2][0-9]{2}|[1-9][0-9])$/,
-            message: '请输入10-300的整数',
-            trigger: 'blur'
-          }
         ]
       },
       ruleForm:{},
@@ -346,13 +379,38 @@ export default {
     this.getStations()
   },
   methods: {
+    handlebackMode() {
+      this.dispatchModeModal = false
+    },
+    async handleConfirmMode() {
+      const res = await this.$refs.detailInfo.confirm()
+      if (!res) return
+      if (this.ruleForm.work_mode) {
+        this.handleSubmitMode()
+      }
+    },
+    async handleSubmitMode() {
+      try {
+        const res = await postReq('/updateStation', {
+          station_id: this.selectStationId,
+          work_mode: this.ruleForm.work_mode,
+          ...this.ruleForm
+        })
+        if (res.errcode == 0) {
+          this.$message.success('下发成功')
+          this.dispatchModeModal=false
+        }
+      } catch (error) {
+        this.$message.error('下发失败')
+        this.dispatchModeModal=false
+      }
+    },
     handleback() {
       this.dispatchModal = false
     },
     async handleConfirm() {
       const res = await this.$refs.detailInfo.confirm()
       if (!res) return
-
       this.handleSubmit()
     },
     async handleSubmit() {
@@ -384,7 +442,10 @@ export default {
     },
     //下发
     // handleDispatch
-    async openDispatchModal() {
+    async openDispatchModeModal() {
+      this.dispatchModeModal = true;
+    },
+    async openDispatchParamModal() {
       
       try {
         const res = await getReq('/queryDevicByCategory', {
@@ -402,7 +463,6 @@ export default {
       
       } catch (error) {
         this.ruleForm = {}
-
       }
       
     },

web/src/views/predict.vue

@@ -30,6 +30,15 @@ export default {
           type: 'line',
           smooth:false,
           dataKey: 'chargeDischarge',
+          yAxisOption:[ 
+            {
+              name: '电量(kW·h)',
+              type: 'value',
+              nameTextStyle: { color: '#fff' },
+              splitLine: { lineStyle: { type: 'dashed', color: '#435463' } },
+              axisLabel: { interval: 4, color: '#fff', fontSize:12 },
+            }
+          ],
           infoKeys: [
      
             {
@@ -69,8 +78,16 @@ export default {
           type: 'line',
           smooth:false,
           dataKey: 'chargeDischarge',
+          yAxisOption:[ 
+            {
+              name: '电量(kW·h)',
+              type: 'value',
+              nameTextStyle: { color: '#fff' },
+              splitLine: { lineStyle: { type: 'dashed', color: '#435463' } },
+              axisLabel: { interval: 4, color: '#fff', fontSize:12 },
+            }
+          ],
           infoKeys: [
-     
             {
               key: 'W_charge',
               label: '充电电量',

web/src/views/statisticalAnalysis.vue

@@ -106,7 +106,17 @@ export default {
               infoKeys: [
                 { key: 'storage_elect_in', label: '日充电电量', lineColor: '#2A82E4' },
                 { key: 'storage_elect_out', label: '日放电电量', lineColor: '#5AABF2' }
+              ],
+              yAxisOption:[ 
+                {
+                  name: '电量(kW·h)',
+                  type: 'value',
+                  nameTextStyle: { color: '#fff' },
+                  splitLine: { lineStyle: { type: 'dashed', color: '#435463' } },
+                  axisLabel: { interval: 4, color: '#fff', fontSize:12 },
+                }
               ]
+                        
             },
             {
               title: '运行状态分析',