lxh 1 yıl önce
ebeveyn
işleme
3f9e35c547

+ 9 - 12
src/views/vent/home/dustHome/components/multipleDust.vue

@@ -55,7 +55,7 @@ function getOption() {
                     boundaryGap: false,
                     axisLine: {
                         lineStyle: {
-                            color: '#244a94',
+                            color: 'rgba(100, 99, 99,.5)',
                             type: 'dashed'
                         },
                     },
@@ -93,7 +93,7 @@ function getOption() {
                 splitLine: {
                     show: true,
                     lineStyle: {
-                        color: '#244a94',
+                        color: 'rgba(100, 99, 99,.5)',
                             type: 'dashed'
                     }
                 },
@@ -120,7 +120,7 @@ function getOption() {
                     showAllSymbol: true,
                     // symbol: 'image://./static/images/guang-circle.png',
                     symbol: 'circle',
-                    symbolSize: 8,
+                    symbolSize: 10,
                     lineStyle: {
                         normal: {
                             color: "#1fb3f7",
@@ -134,11 +134,11 @@ function getOption() {
                         show: true,
                         position: 'top',
                         textStyle: {
-                            color: '#6c50f3',
+                            color: '#1fb3f7',
                         }
                     },
                     itemStyle: {
-                        color: "#6c50f3",
+                        color: "#1fb3f7",
                         borderColor: "#fff",
                         borderWidth: 3,
                         shadowColor: 'rgba(0, 0, 0, .3)',
@@ -153,14 +153,14 @@ function getOption() {
                         normal: {
                             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                                 offset: 0,
-                                color: 'rgba(108,80,243,0.3)'
+                                color: 'rgba(31, 179, 247,0.3)'
                             },
                             {
                                 offset: 1,
-                                color: 'rgba(108,80,243,0)'
+                                color: 'rgba(31, 179, 247,0)'
                             }
                             ], false),
-                            shadowColor: 'rgba(108,80,243, 0.9)',
+                            shadowColor: 'rgba(31, 179, 247, 0.9)',
                             shadowBlur: 20
                         }
                     },
@@ -186,12 +186,9 @@ onMounted(() => {
     position: relative;
     width: 100%;
     height: 100%;
-
     .multiple-box {
         width: 100%;
         height: 100%;
-
-
-    }
+       }
 }
 </style>

+ 37 - 18
src/views/vent/monitorManager/compressor/components/nitrogenHome2.vue

@@ -11,26 +11,26 @@
 
 
                     <div class="monitor-item">
-                        <span class="monitor-title">流量:</span>
+                        <span class="monitor-title">实时流量:</span>
                         <span class="monitor-val" v-if="!refresh"><span class="val">{{
                             monitorData[0]['flow'] ? monitorData[0]['flow'] : '-' }}</span>
                             <span class="unit">m³/min</span></span>
                     </div>
 
                     <div class="monitor-item">
-                        <span class="monitor-title">流量:</span>
+                        <span class="monitor-title">单次流量:</span>
                         <span class="monitor-val" v-if="!refresh"><span class="val">{{
-                            monitorData[0]['total_flow'] ? monitorData[0]['total_flow'] : '-'
+                            monitorData[0]['single_flow'] ? monitorData[0]['single_flow'] : '-'
                         }}</span>
                             <span class="unit">m³</span></span>
                     </div>
 
                     <div class="monitor-item">
-                        <span class="monitor-title">单次流量:</span>
+                        <span class="monitor-title">流量:</span>
                         <span class="monitor-val" v-if="!refresh"><span class="val">{{
-                            monitorData[0]['single_flow'] ? monitorData[0]['single_flow'] : '-'
+                            monitorData[0]['total_flow'] ? monitorData[0]['total_flow'] : '-'
                         }}</span>
-                            <span class="unit">m³/min</span></span>
+                            <span class="unit">m³</span></span>
                     </div>
 
                     <div class="monitor-item">
@@ -51,12 +51,16 @@
             <div class="top-box">
                 <!-- 中间区域控制按钮 -->
                 <div class="center-item-box">
-                    <div class="top-center">
+                    <div class="top-left">
                         <div class="button-box" @click="handlerDevice(airCompressorState[0], '主机启动')">主机启动</div>
                         <div class="button-box" @click="handlerDevice(airCompressorState[0], '主机停止')">主机停止</div>
                         <div class="button-box" @click="handlerDevice(airCompressorState[0], '备机启动')">备机启动</div>
                         <div class="button-box" @click="handlerDevice(airCompressorState[0], '备机停止')">备机停止</div>
                     </div>
+                    <div class="top-center">
+                        <div class="top-c-label">通信状态:</div>
+                        <div class="top-c-val">{{ monitorData[0]['netStatus']==1 ? '连接' : monitorData[0]['netStatus']==0 ? '断开' : '未知'  }}</div>
+                    </div>
                     <div class="top-right">
                         <div class="control-type">
                             <div class="control-title">运行状态:</div>
@@ -720,23 +724,23 @@ watch(monitorDataGroupNum, () => {
 
     const arr = <any[]>[]
     const item = {
-        legend: '单次流量',
+        legend: '实时流量',
         seriesName: '(m³/min)',
-        ymax: 100,
+        ymax: 500,
         yname: 'm³/min',
         linetype: 'line',
         yaxispos: 'left',
         color: '#FDB146',
         sort: 1,
         xRotate: 0,
-        dataIndex: 'single_flow',
+        dataIndex: 'flow',
     }
     const propTypeList = []
     let echartLend=1
     for (let i = 1; i <= echartLend; i++) {
         const lineType = lodash.cloneDeep(item)
-        lineType.legend = '制氮机单次流量';
-        lineType.dataIndex = 'single_flow'
+        lineType.legend = '制氮机实时流量';
+        lineType.dataIndex = 'flow'
         lineType.color = colors[i - 1]
         arr.push(lineType)
     }
@@ -1027,9 +1031,9 @@ onUnmounted(() => {
                 align-items: center;
                 pointer-events: auto;
 
-                .top-center {
+                .top-left {
                     display: flex;
-                    flex: 1.5;
+                    flex: 2;
                     color: #fff;
 
                     .button-box {
@@ -1048,11 +1052,23 @@ onUnmounted(() => {
                         background: linear-gradient(#1fa6cb, #127cb5);
                     }
                 }
+                .top-center{
+                    display: flex;
+                    flex: 1;
+                    justify-content: center;
+                    align-items: center;
+                    font-size: 20px;
+                    color: #fff;
+                    .top-c-label{
+                        color: yellow;
+                    }
+                }
 
                 .top-right {
                     display: flex;
-                    flex: 1;
+                    flex: 2;
                     justify-content: right;
+                    align-items: center;
                     color: #fff;
 
                     .control-type {
@@ -1426,12 +1442,14 @@ onUnmounted(() => {
 
             .val {
                 width: 80px;
-                font-size: 14px;
+                // font-size: 14px;
+                font-size: 16px;
             }
 
             .unit {
                 color: #ffffffbb;
-                font-size: 14px;
+                // font-size: 14px;
+                font-size: 16px;
             }
         }
     }
@@ -1440,7 +1458,8 @@ onUnmounted(() => {
         width: 100px;
         color: #7af5ff;
         font-weight: 400;
-        font-size: 14px;
+        // font-size: 14px;
+        font-size: 16px;
     }