注氮注浆界面添加-提交

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

@@ -1,6 +1,7 @@
 <template>
   <div class="outFireJc">
-    <vue3-seamless-scroll hover-stop="true" :list="outFireList" :hover="true" :step="0.15" :direction="'left'" limitMoveNum="3" :copy-num="1" :single-line="true" class="seamless-warp1">
+    <vue3-seamless-scroll hover-stop="true" :list="outFireList" :hover="true" :step="0.15" :direction="'left'"
+      limitMoveNum="3" :copy-num="1" :single-line="true" class="seamless-warp1">
       <div class="outFire-box" v-for="(item, index) in outFireList" :key="index">
         <div class="outFire-icon"></div>
         <div class="outFire-title">{{ item.title }}</div>
@@ -118,6 +119,26 @@ watch(() => props.outFireData, (newO, oldO) => {
         background: url('../../../../../assets/images/fire/firehome/smoke.png') no-repeat center;
         background-size: 100% 100%;
       }
+
+      &:nth-child(4) .outFire-icon {
+        position: absolute;
+        top: 65px;
+        left: 13px;
+        width: 80px;
+        height: 58px;
+        background: url('../../../../../assets/images/fire/firehome/co1.png') no-repeat center;
+        background-size: 100% 100%;
+      }
+
+      &:nth-child(5) .outFire-icon {
+        position: absolute;
+        top: 61px;
+        left: 16px;
+        width: 74px;
+        height: 74px;
+        background: url('../../../../../assets/images/fire/firehome/smoke.png') no-repeat center;
+        background-size: 100% 100%;
+      }
     }
   }
 

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

@@ -15,15 +15,16 @@ let router = useRouter(); //路由
 let systemJcList = reactive([{ label: '智能灌浆系统' }, { label: '智能注氮系统' }]);
 
 function getDetail(index) {
-  console.log(index, 'index--------')
   switch (index) {
     case 0:
     router.push({
-      path: '/fire/fire-composite-warn',
-      // query: { sysOrgCode: homeParam.sysOrgCode, bpmStatus: homeParam.bpmStatus, flag: homeParam.flag },
+      path: '/fire/fire-zhuj',
     });
       break;
     case 1:
+    router.push({
+      path: '/fire/fire-zhud',
+    });
       break;
   }
 }

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

@@ -293,21 +293,17 @@ async function getFireAreaInfoListDs() {
     dataDs.forEach(el => {
       selectListDs.push({ label: el.areaName, value: el.areaName })
     })
-    if (dsCode.value) {
-      let dataName = dataDs.filter(v => v.areaName == dsCode.value)[0]
-      console.log(dataName, '0000000=======')
-      outFireData.push(
+
+    dsCode.value=dsCode.value ? dsCode.value : selectListDs[0].value
+    let dataName = dataDs.filter(v => v.areaName == dsCode.value)[0]
+    outFireData.push(
         { title: '光钎预警', val: dataName.infoTypeTwo.maxTemperature, dw: '℃', label: '最高温度' },
         { title: '一氧化碳预警', val: dataName.infoTypeTwo.returnAirCornerCO, dw: 'ppm', label: '最高浓度' },
         { title: '烟雾预警', val: dataName.infoTypeTwo.hazard, dw: '', label: '状态' },
+        { title: '火焰预警', val: '--', dw: '', label: '状态' },
+        { title: '喷粉阀门', val: '--', dw: '', label: '开关量' },
       )
-    } else {
-      outFireData.push(
-        { title: '光钎预警', val: dataDs[0].infoTypeTwo.maxTemperature, dw: '℃', label: '最高温度' },
-        { title: '一氧化碳预警', val: dataDs[0].infoTypeTwo.returnAirCornerCO, dw: 'ppm', label: '最高浓度' },
-        { title: '烟雾预警', val: dataDs[0].infoTypeTwo.hazard, dw: '', label: '状态' },
-      )
-    }
+   
   }
 }
 

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

@@ -3,32 +3,32 @@
     <div class="zhud-content">
       <div class="content-item" v-for="(item, index) in contentList" :key="index">
         <div class="card-item">
-          <span>设备名称 : </span>
-          <span>{{ item.deviceName || '--' }}</span>
+          <span class="card-label">设备名称 : </span>
+          <span class="card-text">{{ item.deviceName || '--' }}</span>
         </div>
         <div class="card-item">
-          <span>额定注氮压力(Mpa) : </span>
-          <span>{{ item.injectionPressure || '--' }}</span>
+          <span class="card-label">额定注氮压力(Mpa) : </span>
+          <span class="card-text">{{ item.injectionPressure || '--' }}</span>
         </div>
         <div class="card-item">
-          <span>额定注氮流量(m3/h) : </span>
-          <span>{{ item.injectionFlow || '--' }}</span>
+          <span class="card-label">额定注氮流量(m3/h) : </span>
+          <span class="card-text">{{ item.injectionFlow || '--' }}</span>
         </div>
         <div class="card-item">
-          <span>额定氮气浓度(%) : </span>
-          <span>{{ item.injectionConsistence || '--' }}</span>
+          <span class="card-label">额定氮气浓度(%) : </span>
+          <span class="card-text">{{ item.injectionConsistence || '--' }}</span>
         </div>
         <div class="card-item">
-          <span>设备型号 : </span>
-          <span>{{ item.modelCode || '--' }}</span>
+          <span class="card-label">设备型号 : </span>
+          <span class="card-text">{{ item.modelCode || '--' }}</span>
         </div>
         <div class="card-item">
-          <span>额定电流 : </span>
-          <span>{{ item.current || '--' }}</span>
+          <span class="card-label">额定电流 : </span>
+          <span class="card-text">{{ item.current || '--' }}</span>
         </div>
         <div class="card-item">
-          <span>额定电压 : </span>
-          <span>{{ item.voltage || '--' }}</span>
+          <span class="card-label">额定电压 : </span>
+          <span class="card-text">{{ item.voltage || '--' }}</span>
         </div>
       </div>
     </div>
@@ -100,18 +100,44 @@ onUnmounted(() => {
     background: url('../../../../assets/images/fire/zhud-t.png') no-repeat center;
     background-size: 100% 100%;
 
-    .content-item{
-      &:nth-child(1){
+    .content-item {
+      box-sizing: border-box;
+      padding: 10px;
+
+      &:nth-child(1) {
         position: absolute;
-        top: 20px;
-        right: 20px;
+        top: 0;
+        right: 280px;
       }
 
-      &:nth-child(2){
+      &:nth-child(2) {
         position: absolute;
-        top: 40px;
-        right: 40px;
+        top: 35px;
+        right: 530px;
+      }
+
+      .card-item {
+        display: flex;
+        box-sizing: border-box;
+        align-items: center;
+        justify-content: space-between;
+        width: 209px;
+        height: 37px;
+        padding: 0 10px;
+        background: url('../../../../assets/images/fire/zhud-card.png') no-repeat center;
+        background-size: 100% 100%;
+
+        .card-label {
+          color: #fff;
+          font-size: 14px;
+        }
+
+        .card-text {
+          color: #dbca20;
+          font-size: 14px;
+        }
       }
+
     }
   }