灾害预警基金项目火灾粉尘最新提测bug-修改提交

src/views/vent/common/basicCard1.vue

@@ -58,23 +58,23 @@ watch(
     &:nth-child(1) .card-box-item {
       position: relative;
       // width: 261px;
-      width: 282px;
-      height: 102px;
+      width: 90%;
+      height: 120px;
       background: url('../../../assets/images/workPlaceWarn/dust-nd.png') no-repeat center;
       background-size: 100% 100%;
 
       .box-item-label {
         position: absolute;
-        top: 20px;
-        left: 115px;
+        top: 25px;
+        left: 170px;
         color: #fff;
         font-size: 14px;
       }
 
       .box-item-val {
         position: absolute;
-        top: 60px;
-        left: 155px;
+        top: 70px;
+        left: 200px;
         color: #1fb3f7;
         font-family: "Microsoft YaHei", sans-serif;
         font-size: 18px;
@@ -84,23 +84,23 @@ watch(
 
     &:nth-child(2) .card-box-item {
       position: relative;
-      width: 282px;
-      height: 102px;
+      width: 90%;
+      height: 120px;
       background: url('../../../assets/images/workPlaceWarn/zc-nd.png') no-repeat center;
       background-size: 100% 100%;
 
       .box-item-label {
         position: absolute;
-        top: 20px;
-        left: 115px;
+        top: 25px;
+        left: 170px;
         color: #fff;
         font-size: 14px;
       }
 
       .box-item-val {
         position: absolute;
-        top: 60px;
-        left: 155px;
+        top: 70px;
+        left: 200px;
         color: #1fb3f7;
         font-family: "Microsoft YaHei", sans-serif;
         font-size: 18px;
@@ -110,23 +110,23 @@ watch(
 
     &:nth-child(3) .card-box-item {
       position: relative;
-      width: 282px;
-      height: 102px;
+      width: 90%;
+      height: 120px;
       background: url('../../../assets/images/workPlaceWarn/hc-nd.png') no-repeat center;
       background-size: 100% 100%;
 
       .box-item-label {
         position: absolute;
-        top: 20px;
-        left: 115px;
+        top: 25px;
+        left: 170px;
         color: #fff;
         font-size: 14px;
       }
 
       .box-item-val {
         position: absolute;
-        top: 60px;
-        left: 185px;
+        top: 70px;
+        left: 230px;
         color: #1fb3f7;
         font-family: "Microsoft YaHei", sans-serif;
         font-size: 18px;
@@ -136,23 +136,23 @@ watch(
 
     &:nth-child(4) .card-box-item {
       position: relative;
-      width: 282px;
-      height: 102px;
+      width: 90%;
+      height: 120px;
       background: url('../../../assets/images/workPlaceWarn/bz-nd.png') no-repeat center;
       background-size: 100% 100%;
 
       .box-item-label {
         position: absolute;
-        top: 20px;
-        left: 115px;
+        top: 25px;
+        left: 170px;
         color: #fff;
         font-size: 14px;
       }
 
       .box-item-val {
         position: absolute;
-        top: 60px;
-        left: 155px;
+        top: 70px;
+        left: 200px;
         color: #1fb3f7;
         font-family: "Microsoft YaHei", sans-serif;
         font-size: 18px;

src/views/vent/dust/dustWarnAnalysis/index.vue

@@ -142,10 +142,10 @@ function toggleDustCards(data) {
 async function getDustInfosList() {
   let res = await getDustInfos({ sensorCode: sensorCode.value })
   console.log(res, '单项数据------')
-  cardData5[0].value = res.dustDensity
-  cardData5[1].value = res.dustDensityAverage
-  cardData5[2].value = res.dustDensityAverage40
-  cardData5[3].value = res.explodeDensity
+  cardData5[0].value = parseFloat(res.dustDensity).toFixed(2)
+  cardData5[1].value =parseFloat( res.dustDensityAverage).toFixed(2)
+  cardData5[2].value = parseFloat(res.dustDensityAverage40).toFixed(2)
+  cardData5[3].value = parseFloat(res.explodeDensity).toFixed(2)
 
   //获取粉尘图表数据
   historyAndForecastList(res.areaCode)
@@ -163,7 +163,7 @@ async function historyAndForecastList(params) {
     res.lineData.forEach(el => {
       echartData.xData.push(el.time)
       echartData.yData.push(el.value || 0)
-      // echartData.yData1.push(el.valuePredict)
+      echartData.yData1.push(el.valuePredict || 0)
     })
   }
 }

src/views/vent/fire/compositeWarn/index.vue

@@ -14,7 +14,6 @@
             <div class="item-left">光钎测温系统温度实时监测</div>
             <Select style="width: 180px" :options="gxSelectList" size="small" placeholder="请选择" v-model:value="gxSelect"
               allowClear @change="pointChange" />
-
           </div>
           <div class="gx-center-item-content">
             <basicEchartLine :gridV="gridV" :echartData="echartDataGx"></basicEchartLine>

src/views/vent/fire/fireGoaf/index.vue

@@ -10,7 +10,6 @@
           <basicCard3 :card3List="card3List" :warningLevel="warningLevel" @toggleChange="toggleChange"></basicCard3>
         </div>
         <div class="composite-bot-box">
-
           <div class="search-area">
             <div class="area-title">束管系统监测</div>
             <RangePicker v-model="TimeRange" size="small" style="width: 260px" :show-time="{ format: 'HH:mm:ss' }"
@@ -20,7 +19,6 @@
           <div class="content-area">
             <basicEchartLine :gridV="gridV" :echartData="echartData"></basicEchartLine>
           </div>
-
         </div>
       </div>
       <div style="display: flex;align-items: center;justify-content: center;width:100%;height:100%;" v-else>

src/views/vent/fire/wokeFace/index.vue

@@ -162,10 +162,10 @@ async function getFireAreaInfos() {
     areaCode.value = areaCode.value ? areaCode.value : treeData[0]['areaCode']
     warningLevel.value = treeData[0].warningLevel == 1 ? '低风险' : treeData[0].warningLevel == 2 ? '中风险' : treeData[0].warningLevel == 3 ? '较高风险' : treeData[0].warningLevel == 4 ? '重大风险' : '--'
     console.log(treeData, 'treeData-------')
-    cardContentList[0]['val'] = treeData[0].infoTypeTwo.maxTemperature
-    cardContentList[1]['val'] = treeData[0].infoTypeTwo.minTemperature
-    cardContentList[2]['val'] = treeData[0].infoTypeTwo.aveTemperature
-    cardContentList[3]['val'] = treeData[0].infoTypeTwo.returnAirCornerCO
+    cardContentList[0]['val'] = parseFloat(treeData[0].infoTypeTwo.maxTemperature).toFixed(2)
+    cardContentList[1]['val'] = parseFloat(treeData[0].infoTypeTwo.minTemperature).toFixed(2)
+    cardContentList[2]['val'] = parseFloat(treeData[0].infoTypeTwo.aveTemperature).toFixed(2)
+    cardContentList[3]['val'] = parseFloat(treeData[0].infoTypeTwo.returnAirCornerCO).toFixed(2)
     //获取烟雾传感器数据
     getYwRealDataList()
     //获取火焰传感器监测数据
@@ -197,10 +197,10 @@ function selectChange(treeNode) {
   let level = treeData.filter((m) => m.name == treeNode.node.dataRef.title)[0]['warningLevel']
   warningLevel.value = level == 1 ? '低风险' : level == 2 ? '中风险' : level == 3 ? '较高风险' : level == 4 ? '重大风险' : '--'
   let data = treeData.filter((a) => a.name == treeNode.node.dataRef.title)[0]
-  cardContentList[0]['val'] = data.infoTypeTwo.maxTemperature
-  cardContentList[1]['val'] = data.infoTypeTwo.minTemperature
-  cardContentList[2]['val'] = data.infoTypeTwo.aveTemperature
-  cardContentList[3]['val'] = data.infoTypeTwo.returnAirCornerCO
+  cardContentList[0]['val'] = parseFloat(data.infoTypeTwo.maxTemperature).toFixed(2)
+  cardContentList[1]['val'] = parseFloat(data.infoTypeTwo.minTemperature).toFixed(2)
+  cardContentList[2]['val'] = parseFloat(data.infoTypeTwo.aveTemperature).toFixed(2)
+  cardContentList[3]['val'] =parseFloat( data.infoTypeTwo.returnAirCornerCO).toFixed(2)
   //获取烟雾传感器数据
   getYwRealDataList()
   //获取火焰传感器监测数据
@@ -236,7 +236,8 @@ async function getInfosByAreaCodeList() {
     workBtnList.length = 0
     res.forEach(el => {
       workBtnList.push({
-        label: el.pointName,
+        // label: el.pointName,
+        label:el.pointPosition,
         value: el.pointCode,
       })
     })