From a3f8d9c45ab55fe213edbcb57aab77e2d21b9b9c Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 26 Nov 2024 13:51:28 +0800
Subject: [PATCH] =?UTF-8?q?style):(layout=20=E4=BC=98=E5=8C=96=E5=A4=9A?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=B8=83=E5=B1=80=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整了多个视图中计量设备树状结构的 el-col 组件的 span 属性，将侧边栏宽度从 5 格减至 4 格，以增加主内容区域的宽度
- currentSteamCurve和pointSteamCurve坐标点不显示（symbolSize: 0, //标记的大小）
- 移除了部分冗余的空行，提高了代码的可读性
---
 .../ems/base/baseMonitorThreshold/index.vue   |  2 +-
 .../ems/base/baseMonitorWorkUnit/index.vue    |  2 +-
 .../ems/record/recordDnbInstant/index.vue     |  2 +-
 .../ems/record/recordIOTInstant/index.vue     | 20 +++++++++----------
 .../record/recordLatestSteamInstant/index.vue |  2 +-
 .../ems/record/recordSteamInstant/index.vue   |  2 +-
 .../ems/record/recordWaterInstant/index.vue   |  2 +-
 .../TemperatureHumidityMonitoring/index.vue   |  2 +-
 .../TemperatureHumidityMonitoring2/index.vue  |  2 +-
 .../TemperatureHumidityMonitoring3/index.vue  |  2 +-
 .../TemperatureHumidityMonitoring4/index.vue  |  2 +-
 .../ems/report/currentIOTCurve/index.vue      |  2 +-
 .../ems/report/currentSteamCurve/index.vue    | 15 +++++++-------
 .../report/currentVibrationCurve/index.vue    |  2 +-
 .../ems/report/currentVoltageCurve/index.vue  |  2 +-
 src/views/ems/report/energyPreview/index.vue  |  2 +-
 .../report/energyStatisticalReport/index.vue  |  2 +-
 .../peaksValleysConsumptionReport/index.vue   |  2 +-
 .../ems/report/pointSteamCurve/index.vue      | 10 +++++-----
 src/views/ems/report/reportPointDnb/index.vue |  2 +-
 .../ems/report/reportPointSteam/index.vue     |  2 +-
 .../ems/report/reportPointWater/index.vue     |  2 +-
 22 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/views/ems/base/baseMonitorThreshold/index.vue b/src/views/ems/base/baseMonitorThreshold/index.vue
index ec8a53d..8240685 100644
--- a/src/views/ems/base/baseMonitorThreshold/index.vue
+++ b/src/views/ems/base/baseMonitorThreshold/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="filterBoxName"
diff --git a/src/views/ems/base/baseMonitorWorkUnit/index.vue b/src/views/ems/base/baseMonitorWorkUnit/index.vue
index a7cfb8f..82cd7f1 100644
--- a/src/views/ems/base/baseMonitorWorkUnit/index.vue
+++ b/src/views/ems/base/baseMonitorWorkUnit/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/record/recordDnbInstant/index.vue b/src/views/ems/record/recordDnbInstant/index.vue
index 620dfa2..dd212d5 100644
--- a/src/views/ems/record/recordDnbInstant/index.vue
+++ b/src/views/ems/record/recordDnbInstant/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/record/recordIOTInstant/index.vue b/src/views/ems/record/recordIOTInstant/index.vue
index dc02abe..bd6e17b 100644
--- a/src/views/ems/record/recordIOTInstant/index.vue
+++ b/src/views/ems/record/recordIOTInstant/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
         <el-row :gutter="28">
-            <el-col :span="5" :xs="24">
+            <el-col :span="4" :xs="24">
                 <div class="head-container">
                 <el-input
                     v-model="workUnitName"
@@ -220,9 +220,9 @@
                         </template>
                     </el-table-column>
                 </el-table>
-            </el-col> 
+            </el-col>
         </el-row>
-        
+
 
         <pagination
                 v-show="total>0"
@@ -301,12 +301,12 @@
 </template>
 
 <script>
-    import { 
-        listRecordIOTInstant, 
-        getRecordIOTInstant, 
-        delRecordIOTInstant, 
-        addRecordIOTInstant, 
-        updateRecordIOTInstant } 
+    import {
+        listRecordIOTInstant,
+        getRecordIOTInstant,
+        delRecordIOTInstant,
+        addRecordIOTInstant,
+        updateRecordIOTInstant }
         from "@/api/ems/record/recordIOTInstant";
     import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
     import Treeselect from '@riophae/vue-treeselect'
@@ -397,7 +397,7 @@
             // const nowDate = this.parseTime(new Date(), '{y}-{m}-{d}')
             // this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
             // this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
-            
+
             // this.daterangeRecordTime[0] = nowDate + ' 00:00:00'
             // this.daterangeRecordTime[1] = nowDate + ' 23:59:59'
             this.getList();
diff --git a/src/views/ems/record/recordLatestSteamInstant/index.vue b/src/views/ems/record/recordLatestSteamInstant/index.vue
index 4a107f7..05b6917 100644
--- a/src/views/ems/record/recordLatestSteamInstant/index.vue
+++ b/src/views/ems/record/recordLatestSteamInstant/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/record/recordSteamInstant/index.vue b/src/views/ems/record/recordSteamInstant/index.vue
index 9572ecf..747a686 100644
--- a/src/views/ems/record/recordSteamInstant/index.vue
+++ b/src/views/ems/record/recordSteamInstant/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/record/recordWaterInstant/index.vue b/src/views/ems/record/recordWaterInstant/index.vue
index 51ae741..d50677c 100644
--- a/src/views/ems/record/recordWaterInstant/index.vue
+++ b/src/views/ems/record/recordWaterInstant/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/TemperatureHumidityMonitoring/index.vue b/src/views/ems/report/TemperatureHumidityMonitoring/index.vue
index df362fe..653e874 100644
--- a/src/views/ems/report/TemperatureHumidityMonitoring/index.vue
+++ b/src/views/ems/report/TemperatureHumidityMonitoring/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue b/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
index 7a227ab..f5e6e7c 100644
--- a/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
+++ b/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue b/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue
index 5dab568..6db9edc 100644
--- a/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue
+++ b/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/TemperatureHumidityMonitoring4/index.vue b/src/views/ems/report/TemperatureHumidityMonitoring4/index.vue
index 6941b3a..23dab48 100644
--- a/src/views/ems/report/TemperatureHumidityMonitoring4/index.vue
+++ b/src/views/ems/report/TemperatureHumidityMonitoring4/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/currentIOTCurve/index.vue b/src/views/ems/report/currentIOTCurve/index.vue
index 9354a88..c8b13bc 100644
--- a/src/views/ems/report/currentIOTCurve/index.vue
+++ b/src/views/ems/report/currentIOTCurve/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/currentSteamCurve/index.vue b/src/views/ems/report/currentSteamCurve/index.vue
index 99aeb20..3908809 100644
--- a/src/views/ems/report/currentSteamCurve/index.vue
+++ b/src/views/ems/report/currentSteamCurve/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
@@ -26,6 +26,7 @@
           />
         </div>
       </el-col>
+
       <el-col :span="19" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="100px"
@@ -265,7 +266,7 @@ export default {
 
       let option1 = {
         title: {
-          text: this.selectMonitorName + ' 瞬时流量曲线' + ' (平均值:'+
+          text: this.selectMonitorName + ' 瞬时流量' + ' (平均值:'+
             ((data.map(e=>parseFloat(e.fluxFlow)).reduce((a,b)=>a+b,0))/data.length).toFixed(2)+")",
           x: 'center'
         },
@@ -342,7 +343,7 @@ export default {
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 10, //标记的大小
+            symbolSize: 0, //标记的大小
             data: data.map(e => e.fluxFlow)
           },
         ]
@@ -360,7 +361,7 @@ export default {
 
 
          title: {
-           text: this.selectMonitorName + ' 温度曲线' + ' (平均值:'+
+           text: this.selectMonitorName + ' 温度' + ' (平均值:'+
              ((data.map(e=>parseFloat(e.temperature)).reduce((a,b)=>a+b,0))/data.length).toFixed(2)+")",
            x: 'center'
          },
@@ -438,14 +439,14 @@ export default {
              smooth: true, //平滑曲线显示
              showAllSymbol: true, //显示所有图形。
              symbol: 'circle', //标记的图形为实心圆
-             symbolSize: 10, //标记的大小
+             symbolSize: 0, //标记的大小
              data: data.map(e => e.temperature)
            },
          ]
        }
        let option3 = {
          title: {
-           text: this.selectMonitorName + ' 压力曲线' + ' (平均值:'+
+           text: this.selectMonitorName + ' 压力' + ' (平均值:'+
              ((data.map(e=>parseFloat(e.press)).reduce((a,b)=>a+b,0))/data.length).toFixed(2)+")",
            x: 'center'
          },
@@ -522,7 +523,7 @@ export default {
              smooth: true, //平滑曲线显示
              showAllSymbol: true, //显示所有图形。
              symbol: 'circle', //标记的图形为实心圆
-             symbolSize: 10, //标记的大小
+             symbolSize: 0, //标记的大小
              data: data.map(e => e.press)
            },
          ]
diff --git a/src/views/ems/report/currentVibrationCurve/index.vue b/src/views/ems/report/currentVibrationCurve/index.vue
index 75c1c3d..f5cf24b 100644
--- a/src/views/ems/report/currentVibrationCurve/index.vue
+++ b/src/views/ems/report/currentVibrationCurve/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/currentVoltageCurve/index.vue b/src/views/ems/report/currentVoltageCurve/index.vue
index 2a4baa8..0e672b0 100644
--- a/src/views/ems/report/currentVoltageCurve/index.vue
+++ b/src/views/ems/report/currentVoltageCurve/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/energyPreview/index.vue b/src/views/ems/report/energyPreview/index.vue
index 5f6aa0a..c353c12 100644
--- a/src/views/ems/report/energyPreview/index.vue
+++ b/src/views/ems/report/energyPreview/index.vue
@@ -69,7 +69,7 @@
     </el-card>
 
     <el-row :gutter="20">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <el-card class="box-card" style="height: 350px; position: relative">
           <img
             class="centered-image"
diff --git a/src/views/ems/report/energyStatisticalReport/index.vue b/src/views/ems/report/energyStatisticalReport/index.vue
index 59db612..8b3db49 100644
--- a/src/views/ems/report/energyStatisticalReport/index.vue
+++ b/src/views/ems/report/energyStatisticalReport/index.vue
@@ -2,7 +2,7 @@
 
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/peaksValleysConsumptionReport/index.vue b/src/views/ems/report/peaksValleysConsumptionReport/index.vue
index 7f01560..68993c5 100644
--- a/src/views/ems/report/peaksValleysConsumptionReport/index.vue
+++ b/src/views/ems/report/peaksValleysConsumptionReport/index.vue
@@ -2,7 +2,7 @@
 
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
diff --git a/src/views/ems/report/pointSteamCurve/index.vue b/src/views/ems/report/pointSteamCurve/index.vue
index 8f6054b..2aa5c48 100644
--- a/src/views/ems/report/pointSteamCurve/index.vue
+++ b/src/views/ems/report/pointSteamCurve/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="workUnitName"
@@ -336,7 +336,7 @@ export default {
             smooth: true, //平滑曲线显示
             showAllSymbol: true, //显示所有图形。
             symbol: 'circle', //标记的图形为实心圆
-            symbolSize: 10, //标记的大小
+            symbolSize: 0, //标记的大小
             data: data.map(e => e.expend)
           },
         ]
@@ -420,7 +420,7 @@ export default {
              smooth: true, //平滑曲线显示
              showAllSymbol: true, //显示所有图形。
              symbol: 'circle', //标记的图形为实心圆
-             symbolSize: 10, //标记的大小
+             symbolSize: 0, //标记的大小
              data: data.map(e => e.steamFlow)
            },
          ]
@@ -503,7 +503,7 @@ export default {
              smooth: true, //平滑曲线显示
              showAllSymbol: true, //显示所有图形。
              symbol: 'circle', //标记的图形为实心圆
-             symbolSize: 10, //标记的大小
+             symbolSize: 0, //标记的大小
              data: data.map(e => e.heatInstantValue)
            },
          ]
@@ -586,7 +586,7 @@ export default {
              smooth: true, //平滑曲线显示
              showAllSymbol: true, //显示所有图形。
              symbol: 'circle', //标记的图形为实心圆
-             symbolSize: 10, //标记的大小
+             symbolSize: 0, //标记的大小
              data: data.map(e => e.heatTotalValue)
            },
          ]
diff --git a/src/views/ems/report/reportPointDnb/index.vue b/src/views/ems/report/reportPointDnb/index.vue
index 30d3776..be77dfe 100644
--- a/src/views/ems/report/reportPointDnb/index.vue
+++ b/src/views/ems/report/reportPointDnb/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="filterBoxName"
diff --git a/src/views/ems/report/reportPointSteam/index.vue b/src/views/ems/report/reportPointSteam/index.vue
index bc86214..e2d12f7 100644
--- a/src/views/ems/report/reportPointSteam/index.vue
+++ b/src/views/ems/report/reportPointSteam/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="filterBoxName"
diff --git a/src/views/ems/report/reportPointWater/index.vue b/src/views/ems/report/reportPointWater/index.vue
index 6852778..f9ffee5 100644
--- a/src/views/ems/report/reportPointWater/index.vue
+++ b/src/views/ems/report/reportPointWater/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
+      <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="filterBoxName"