灾害预警基金-更新提交

src/views/vent/dust/dustHome/components/multipleDust.vue

@@ -21,7 +21,7 @@ let gridV = reactive({
     top: '12%',
     left: '6%',
     right: '4%',
-    bottom: '15%',
+    bottom: '17%',
 })
 
 let markLine1=reactive({})

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

@@ -27,7 +27,7 @@
           <div class="left-f">
             <DanelBd :moduleName="'粉尘实时浓度监测'" :contentStyle="{ contentH: '224px' }" 
               :bgSize="'middle'">
-              <dustTimeNow :timeNowData="selectListBd1"></dustTimeNow>
+              <dustTimeNow :timeNowData="selectListBd"></dustTimeNow>
             </DanelBd>
           </div>
         </div>
@@ -46,8 +46,6 @@
               <InfoCircleOutlined class="scalc-icon" />
             </div>
           </div>
-
-
           <iframe src="http://172.16.253.23:91/valkyrja/?type=tf" width="100%" height="100%" frameborder="0"></iframe>
           <!-- <iframe src="http://82.157.13.146:18224/valkyrja/" width="100%" height="100%" frameborder="0"></iframe> -->
         </div>
@@ -74,7 +72,7 @@
           <div class="right-c">
             <DanelBd :moduleName="'粉尘关联指标'" :contentStyle="{ contentH: '328px' }" :bgSize="'middle'">
               <!-- <dustGlzb :dustGlzbData="dustGlzbData" />selectListBd1 -->
-              <dustGlzb :dustGlzbData="selectListBd1" />
+              <dustGlzb :dustGlzbData="selectListBd" />
             </DanelBd>
           </div>
           <!-- 右下区域 -->
@@ -121,7 +119,6 @@ let areaType = ref('');
 
 //综采工作面粉尘浓度数据
 let selectListBd = reactive<any[]>([]);
-let selectListBd1 = reactive<any[]>([]);
 let sensorCode = ref('');
 let echartData = reactive({
   xData: [],
@@ -225,18 +222,17 @@ async function getRealSensorDataByTypeList() {
   let res = await getRealSensorDataByType({ areaType: 2 });
   if (res.length != 0) {
     selectListBd.length = 0;
-    selectListBd1.length = 0;
     res.forEach((el) => {
-      selectListBd.push({
-        label: el.name,
-        value: el.code,
-        temperature: el.temperature,
-        humidity: el.humidity,
-        windSpeed: el.windSpeed,
-        waterPressure: el.waterPressure,
-      });
+      // selectListBd.push({
+      //   label: el.name,
+      //   value: el.code,
+      //   temperature: el.temperature,
+      //   humidity: el.humidity,
+      //   windSpeed: el.windSpeed,
+      //   waterPressure: el.waterPressure,
+      // });
       if (el.displayStatus) {
-        selectListBd1.push({
+        selectListBd.push({
           label: el.name,
           value: el.code,
           temperature: el.temperature,

src/views/vent/fire/fireHome/components/workJc.vue

@@ -18,12 +18,12 @@
           <div class="card-r-label">{{ ite.label }}</div>
           <div class="card-r-content">
             <div class="content-r-item">
-              <div class="item-label">{{ ite.temp || '--' }}</div>
-              <div class="item-val">{{ `${ite.tempVal}℃` || '0' }}</div>
+              <div class="item-label">{{ ite.title1 || '--' }}</div>
+              <div class="item-val">{{ `${ite.val1}℃` || '0' }}</div>
             </div>
             <div class="content-r-item">
-              <div class="item-label">{{ ite.zb || '--' }}</div>
-              <div class="item-val">{{ ite.zbVal || '0' }}</div>
+              <div class="item-label">指标气体异常值</div>
+              <div class="item-val">0</div>
             </div>
           </div>
           <div class="card-r-des">

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

@@ -53,7 +53,6 @@
               <InfoCircleOutlined class="scalc-icon" />
             </div>
           </div>
-
           <iframe src="http://172.16.253.23:91/valkyrja/?type=tf" width="100%" height="100%" frameborder="0"></iframe>
           <!-- <iframe src="http://82.157.13.146:18224/valkyrja/" width="100%" height="100%" frameborder="0"></iframe> -->
         </div>
@@ -247,7 +246,6 @@ async function getFireWarningCntByTypeList() {
 //获取工作面风险监测数据
 async function getFireAreaInfoList() {
   let res = await getFireAreaInfo({ fireCauseType: 2 });
-
   if (res.length != 0) {
     cardData.length = 0;
     let data = res.filter((v) => v.areaType == 2);
@@ -269,7 +267,8 @@ async function getFireAreaInfoList() {
         val1: el.infoTypeTwo.maxTemperature,
       });
     });
-    areaCode.value = data[0].areaCode;
+    // areaCode.value = data[0].areaCode;
+    areaCode.value = data.filter(m=>m.displayStatus==1)[0].areaCode;
     //工作面束管监测
     getSgjcPointInfoList();
   }
@@ -285,7 +284,6 @@ async function getFireAreaInfoListMb() {
       dataMb.forEach((m) => {
         selectListMb.push({ label: m.areaName, value: m.areaCode });
       });
-
       areaCodeMb.value = areaCodeMb.value ? areaCodeMb.value : selectListMb[0]['value'];
       //获取密闭监测实时信息
       getMbRealDataList();