lxh пре 1 година
родитељ
комит
055ba112cd

+ 19 - 2
src/views/vent/monitorManager/comment/DeviceEcharts.vue

@@ -14,6 +14,7 @@
         height="100%"
         chartsType="listMonitor"
         :option="echartsOption"
+        :chartsColumns="chartsColumns"
       />
     </div>
     <div class="charts-box" v-else-if="chartsType === 'detail' && deviceListApi">
@@ -30,7 +31,9 @@
         :xAxisPropType="resultXAxisPropType"
         :dataSource="detailDataSource"
         height="100%"
+        :option="echartsOption2"
         chartsType="detail"
+        :chartsColumns="chartsColumns"
       />
     </div>
     <div class="charts-box" v-else-if="chartsType === 'history'">
@@ -80,6 +83,7 @@
         :option="echartsOption1"
         chartsType="history"
         style="margin-top: 20px;"
+        :chartsColumns="chartsColumns"
       />
     </div>
   </div>
@@ -156,10 +160,22 @@
       };
       const echartsOption1 = {
         grid: {
-          top: '60px',
+          top: '70px',
+          left: '10px',
+          right: '5px',
+          bottom: '5%',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {},
+        },
+      };
+      const echartsOption2 = {
+        grid: {
+          top: '70px',
           left: '10px',
           right: '5px',
-          bottom: '10%',
+          bottom: '2%',
           containLabel: true,
         },
         toolbox: {
@@ -247,6 +263,7 @@
         total,
         echartsOption,
         echartsOption1,
+        echartsOption2,
         onChange,
       };
     },

+ 12 - 12
src/views/vent/monitorManager/gateMonitor/gate.data.ts

@@ -289,16 +289,16 @@ export const chartsColumns = [
     xRotate: 0,
     dataIndex: 'frontRearDP',
   },
-  {
-    legend: '气源压力',
-    seriesName: '(MPa)',
-    ymax: 50,
-    yname: 'MPa',
-    linetype: 'line',
-    yaxispos: 'right',
-    color: '#FC4327',
-    sort: 2,
-    xRotate: 0,
-    dataIndex: 'sourcePressure',
-  },
+  // {
+  //   legend: '气源压力',
+  //   seriesName: '(MPa)',
+  //   ymax: 50,
+  //   yname: 'MPa',
+  //   linetype: 'line',
+  //   yaxispos: 'right',
+  //   color: '#FC4327',
+  //   sort: 2,
+  //   xRotate: 0,
+  //   dataIndex: 'sourcePressure',
+  // },
 ];

+ 1 - 1
src/views/vent/monitorManager/gateMonitor/index.vue

@@ -215,7 +215,7 @@ const initData = {
   deviceType: '',
   strname: '',
   frontRearDP: '-', //压差
-  sourcePressure: '-', //气源压力
+  // sourcePressure: '-', //气源压力
   runRoRecondition: null,
   autoRoManual: null,
   netStatus: '0', //通信状态

+ 2 - 2
src/views/vent/monitorManager/windrectMonitor/index.vue

@@ -46,7 +46,7 @@
           <a-button class="tabs-button" type="primary" @click="openModel">一键测风</a-button>
         </div>
         <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange">
-          <a-tab-pane key="1" tab="实时监测">
+          <a-tab-pane key="1" tab="实时监测111">
             <MonitorTable
               v-if="activeKey === '1'"
               ref="MonitorDataTable"
@@ -191,7 +191,7 @@
     strname: '',
     dataDh: '-', //压差
     dataDtestq: '-', //测试风量
-    sourcePressure: '-', //气源压力
+    // sourcePressure: '-', //气源压力
     dataDequivalarea: '-',
     netStatus: '0', //通信状态
     fault: '气源压力超限',

+ 12 - 12
src/views/vent/monitorManager/windrectMonitor/windrect.data.ts

@@ -446,16 +446,16 @@ export const chartsColumns = [
     xRotate: 0,
     dataIndex: 'incipientWindSpeed3',
   },
-  {
-    legend: '气源压力',
-    seriesName: '(MPa)',
-    ymax: 50,
-    yname: 'MPa',
-    linetype: 'line',
-    yaxispos: 'right',
-    color: '#fc8452',
-    sort: 2,
-    xRotate: 0,
-    dataIndex: 'sourcePressure',
-  },
+  // {
+  //   legend: '气源压力',
+  //   seriesName: '(MPa)',
+  //   ymax: 50,
+  //   yname: 'MPa',
+  //   linetype: 'line',
+  //   yaxispos: 'right',
+  //   color: '#fc8452',
+  //   sort: 2,
+  //   xRotate: 0,
+  //   dataIndex: 'sourcePressure',
+  // },
 ];