东泰鑫源bug修改-提交

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

@@ -150,9 +150,9 @@ let dustGlzbData = reactive<any[]>([
 
 //粉尘静态指标数据
 let selectListJt = reactive<any[]>([
-  { label: '8#煤层', value: '0' },
-  { label: '9#煤层', value: '1' },
-  { label: '10#煤层', value: '2' },
+  // { label: '8#煤层', value: '0' },
+  // { label: '9#煤层', value: '1' },
+  { label: '10#煤层', value: '0' },
 ]);
 let jtzbCode = ref('0');
 

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

@@ -11,7 +11,7 @@
         </div>
         <div class="composite-bot-box">
           <div class="search-area">
-            <div class="area-title">束管系统监测</div>
+            <div class="area-title">密闭系统监测</div>
             <a-range-picker v-model:value="TimeRange" :format="dateFormat" @change="onDataChange" />
           </div>
 
@@ -112,7 +112,7 @@ async function getMbRealDataList() {
   if (res.length != 0) {
     card3List.length = 0
     res.forEach(el => {
-      card3List.push({ title: el.type, ndLabel: '浓度 : ', ndVal: el.currentValue, tLabel: '时间 : ', tVal: el.time, aLabel: '位置 : ', aVal: el.position })
+      card3List.push({ title: el.type, ndLabel: '浓度 : ', unit:el.unit, ndVal: el.currentValue, tLabel: '时间 : ', tVal: el.time, aLabel: '位置 : ', aVal: el.position })
     })
     type.value = type.value ? type.value : card3List[0]['title']
     //获取密闭图表数据

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

@@ -90,12 +90,9 @@ watch(() => props.bunbleData, (newB, oldB) => {
       left: 112px;
     }
 
-
-
-
-
-
-
+    &:nth-child(7) .jc-title {
+      left: 112px;
+    }
 
     .jc-item {
       position: absolute;

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

@@ -57,7 +57,7 @@
             </div>
           </div>
 
-          <iframe src="http://172.16.253.23:91/valkyrja/?type=tf" width="100%" height="100%" frameborder="0"></iframe>
+          <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>
         <transition>
@@ -176,7 +176,7 @@ let substationData=reactive<any[]>([])
 
 //安全监控
 let selectListAq = reactive<any[]>([
-  { label: '综采工作面传感器监测', value: 'one' },
+  { label: '综放工作面传感器监测', value: 'one' },
   { label: '掘进工作面传感器监测', value: 'two' },
   { label: '主运输系统传感器监测', value: 'three' },
   { label: '机电硐室及配电点传感器监测', value: 'four' },
@@ -497,15 +497,16 @@ async function getMainTrafficYwList() {
   safetyList.length = 0;
   safetyHead.push(
     { label: '测点位置' },
-    { label: '温度(°C)' },
+    { label: '测点值' },
     { label: '预警级别' },
     // { label: '时间' },
   );
   if (res.length != 0) {
     res.forEach((el) => {
+     el.detectValue= el.sensorType=='M0104' ? '0ppm' : el.sensorType=='K0007' ? el.detectValue=='0' ? '无烟雾' : el.detectValue=='1' ? '有烟雾' : '-' : '-'
       safetyList.push({
         address: el.nodePlacement,
-        temp: el.detectValue || '-',
+        temp: el.detectValue,
         grade: el.warningMsg,
         // time: el.dateTime,
       });