更新

src/views/vent/monitorManager/alarmMonitor/fire/common/echartLine.vue

@@ -14,6 +14,9 @@
     },
     maxY:{
       type:Number
+    },
+    echartDw:{
+      type:String
     }
   });
   //获取dom元素节点
@@ -32,7 +35,7 @@
       const myChart = echarts.init(line.value);
       let option = {
         grid: {
-          top: '6%',
+          top: '18%',
           left: '2%',
           bottom: '6%',
           right: '2%',
@@ -81,10 +84,11 @@
                 color: '#b3b8cc',
               },
             },
+            name:props.echartDw,
             nameTextStyle: {
               color: '#fff',
               fontSize: 12,
-              lineHeight: 40,
+              lineHeight: 15,
             },
             splitLine: {
               lineStyle: {

src/views/vent/monitorManager/alarmMonitor/fire/dustPage.vue

@@ -76,10 +76,10 @@ function topAreaClick(index) {
     echartDataFc.aveValue.data.length = 0
     echartDataFc.xData.length = 0
     centerAreaListB.push(
-        { content: choiceData[index].readData.dustval },
-        { content: choiceData[index].readData.totalDust },
-        { content: choiceData[index].readData.breathWeighted },
-        { content: choiceData[index].readData.atomizingState },
+        { content: choiceData[index].readData.dustval || '/' },
+        { content: choiceData[index].readData.totalDust || '/' },
+        { content: choiceData[index].readData.breathWeighted || '/' },
+        { content: choiceData[index].readData.atomizingState || '/' },
     )
     choiceData[index].history.forEach(el => {
         echartDataFc.maxData.data.push(el.dustval)
@@ -98,10 +98,10 @@ watch(() => props.listData, (val) => {
             topAreaList.push({
                 title: el.strinstallpos,
                 content: [
-                    { ids: 0, label: '温度(°C)', value: el.readData.temperature, },
-                    { ids: 1, label: '粉尘浓度(%)', value: el.readData.dustval, },
-                    { ids: 2, label: '喷雾水压', value: el.readData.waterPressure, },
-                    { ids: 3, label: '喷雾状态', value: el.readData.atomizingState, },
+                    { ids: 0, label: '温度(°C)', value: el.readData.temperature || '/', },
+                    { ids: 1, label: '粉尘浓度(%)', value: el.readData.dustval || '/', },
+                    { ids: 2, label: '喷雾水压', value: el.readData.waterPressure || '/', },
+                    { ids: 3, label: '喷雾状态', value: el.readData.atomizingState || '/', },
                 ],
             },)
         })
@@ -113,10 +113,10 @@ watch(() => props.listData, (val) => {
         echartDataFc.xData.length = 0
         if (choiceData[activeIndex.value]) {
             centerAreaListB.push(
-                { content: choiceData[activeIndex.value].readData.dustval },
-                { content: choiceData[activeIndex.value].readData.totalDust },
-                { content: choiceData[activeIndex.value].readData.breathWeighted },
-                { content: choiceData[activeIndex.value].readData.atomizingState },
+                { content: choiceData[activeIndex.value].readData.dustval || '/' },
+                { content: choiceData[activeIndex.value].readData.totalDust || '/' },
+                { content: choiceData[activeIndex.value].readData.breathWeighted || '/'},
+                { content: choiceData[activeIndex.value].readData.atomizingState || '/' },
             )
 
             choiceData[activeIndex.value].history.forEach(el => {
@@ -130,10 +130,10 @@ watch(() => props.listData, (val) => {
         } else {
             activeIndex.value = 0
             centerAreaListB.push(
-                { content: choiceData[activeIndex.value].readData.dustval },
-                { content: choiceData[activeIndex.value].readData.totalDust },
-                { content: choiceData[activeIndex.value].readData.breathWeighted },
-                { content: choiceData[activeIndex.value].readData.atomizingState },
+                { content: choiceData[activeIndex.value].readData.dustval || '/' },
+                { content: choiceData[activeIndex.value].readData.totalDust || '/' },
+                { content: choiceData[activeIndex.value].readData.breathWeighted || '/' },
+                { content: choiceData[activeIndex.value].readData.atomizingState || '/' },
             )
             choiceData[activeIndex.value].history.forEach(el => {
                 echartDataFc.maxData.data.push(el.dustval)
@@ -172,6 +172,8 @@ watch(() => props.listData, (val) => {
             margin: 0px 20px;
 
             .top-title {
+                width: 80%;
+                text-align: center;
                 position: absolute;
                 left: 50%;
                 top: 6px;
@@ -225,6 +227,8 @@ watch(() => props.listData, (val) => {
             margin: 0px 20px;
 
             .top-title {
+                width: 80%;
+                text-align: center;
                 position: absolute;
                 left: 50%;
                 top: 6px;

src/views/vent/monitorManager/alarmMonitor/fire/fireWork.vue

@@ -34,7 +34,7 @@
                 </a-select> -->
             </div>
             <div class="echart-box">
-                <echartLine :echartDataGq="echartDataGq" :maxY="maxY"></echartLine>
+                <echartLine :echartDataGq="echartDataGq" :maxY="maxY" :echartDw="echartDw"></echartLine>
             </div>
         </div>
         <!-- 底部区域 -->
@@ -87,6 +87,7 @@ let props = defineProps({
 });
 
 let maxY=ref(2000)
+let echartDw=ref('(­°C)')
 //光钎测温-图表数据
 let echartDataGq=reactive({
     maxData: {

src/views/vent/monitorManager/alarmMonitor/fire/gasPage.vue

@@ -27,7 +27,7 @@
 
         <div  :class="topAreaListWs.length!=0 ? 'bot-area' : 'bot-area1' ">
             <div class="title-b">
-                <div class="text-b">瓦斯巡检系统监测点</div>
+                <div class="text-b">安全监控测点信息</div>
             </div>
             <div class="content-b">
                 <div class="card-b" v-for="(item, index) in cardListWs" :key="index">
@@ -77,7 +77,7 @@ watch(() => props.listData, (val) => {
                 label: v.strinstallpos,
                 list: [
                     { name: '抽采泵流量', val: v.readData.FlowSensor_InputFlux || 0 },
-                    { name: '报警状态', val: v.warnLevel },
+                    { name: '报警状态', val: v.warnLevel || 0 },
                 ]
             })
         })
@@ -120,7 +120,7 @@ watch(() => props.listData, (val) => {
 
         .top-box {
             position: relative;
-            width: 300px;
+            width: 330px;
             height: 128px;
             background: url('../../../../../assets/images/fire/top-area.png') no-repeat;
             background-size: 100% 100%;
@@ -150,7 +150,7 @@ watch(() => props.listData, (val) => {
                 flex-wrap: wrap;
 
                 .value-b {
-                    width: calc(50% - 15px);
+                    width: calc(50% - 10px);
                     height: 100%;
                     display: flex;
                     justify-content: space-between;

src/views/vent/monitorManager/alarmMonitor/fire/ventilate.vue

@@ -35,7 +35,7 @@
       </div>
     </div>
     <div class="bot-area">
-      <echartLine :echartDataGq="echartDataFc1" :maxY="maxY" />
+      <echartLine :echartDataGq="echartDataFc1" :maxY="maxY" :echartDw="echartDw" />
     </div>
   </div>
 </template>
@@ -50,6 +50,7 @@ let props = defineProps({
 });
 
 let maxY = ref(2000)
+let echartDw=ref('(m³/min)')
 
 //报警区域数据
 let topAreaList = reactive<any[]>([]);

src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -274,7 +274,7 @@
             <div class="gas-item">
               <div class="top">
                 <div class="value">{{ gasData.sums1 }}</div>
-                <div class="title">瓦斯巡检系统监测点</div>
+                <div class="title">瓦斯抽采系统监测点</div>
               </div>
               <div class="detail-box">
                 <div class="detail-item" v-for="(item, index) in gasMonitor" :key="index">