提交新版本

src/api/sys/monitor.ts

@@ -87,8 +87,8 @@ export function getMonitorSite(params: MonitorSiteParams, mode: ErrorMessageMode
 }
 
 /** 测点操作内嵌的iframe地址 */
-export const monitorSiteOperationUrl = 'http://172.16.253.23:91/valkyrja/?type=tf';
-// export const monitorSiteOperationUrl = 'http://82.157.13.146:18224/valkyrja/';
+// export const monitorSiteOperationUrl = 'http://172.16.253.23:91/valkyrja/?type=tf';
+export const monitorSiteOperationUrl = 'http://82.157.13.146:18224/valkyrja/';
 
 /** 发送测点操作指令 */
 export function postMonitorOperation(el: Window, params: MonitorSiteOperationParams) {

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

@@ -6,7 +6,7 @@
                 }}</div>
         </div>
         <div class="safety-content">
-            <vue3-seamless-scroll hover-stop="true" :list="dustZbList" :hover="true" :step="0.15" class="seamless-warp">
+            <vue3-seamless-scroll hover-stop="true" :list="dustZbList" :hover="true" :step="0.15" :copy-num="3" class="seamless-warp">
                 <div class="safety-content-box" v-for="(ite, ind) in dustZbList" :key="ind">
                     <span>{{ ite.label || '--' }}</span>
                     <span>{{ ite.temperature || '--' }}</span>

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

@@ -6,7 +6,7 @@
       }}</div>
     </div>
     <div class="safety-content">
-      <vue3-seamless-scroll hover-stop="true" :list="dustZbList" :hover="true" :step="0.15" class="seamless-warp">
+      <vue3-seamless-scroll hover-stop="true" :list="dustZbList" :hover="true" :step="0.15" :copy-num="3" class="seamless-warp">
         <div class="safety-content-box" v-for="(ite, ind) in dustZbList" :key="ind">
           <span>{{ ite.label || '--' }}</span>
           <!-- <span>{{ ite.temperature }}</span>

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

@@ -14,13 +14,13 @@
       <vue3-seamless-scroll hover-stop="true" :list="cardList" :hover="true" :step="0.15" :copy-num="3"
         class="seamless-warp">
         <div class="card-box" v-for="(ite, ind) in cardList" :key="ind">
-          <div class="card-l-label">{{ ite.title }}</div>
-          <div class="card-l-val">{{ ite.val || '0' }}</div>
-          <div class="card-r-label">{{ ite.label }}</div>
-         
+          <div class="card-l-label">风险</div>
+          <div class="card-l-val">{{  ite.warningLevel == 1 ? '低': ite.warningLevel == 2 ? '中' :  ite.warningLevel == 3 ? '较大' :  ite.warningLevel == 4 ? '重大' : '--' }}</div>
+          <div class="card-r-label">{{ ite.name }}</div>
+
           <div class="card-r-des">
-            <span>最大值：</span>
-            <span style="color:#089dff">{{ ite.val1 || '0' }}</span>
+            <span>粉尘浓度：</span>
+            <span style="color:#089dff">{{ ite.dust || '0' }} mg/m³</span>
           </div>
         </div>
       </vue3-seamless-scroll>
@@ -69,13 +69,13 @@ watch(() => props.cardData, (newC, oldC) => {
 
 watch(() => props.echartData, (newV, oldV) => {
   console.log(newV, '图表数据------')
+  fxLenged.length = 0
   if (newV.length != 0) {
-    fxLenged.length = 0
     newV.forEach(el => {
       fxLenged.push({ name: el.label, value: el.value })
     })
     let maxValue = fxLenged.sort((a, b) => b.value - a.value)
-    echartDatas.value=maxValue[0].value
+    echartDatas.value = maxValue[0].value
   }
 }, { immediate: true, deep: true })
 

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

@@ -19,17 +19,17 @@
           </div>
           <!-- 左中区域 -->
           <div class="left-c">
-            <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '526px' }" :bgSize="'large'">
-              <workJc :heightT="'25%'" :heightB="'75%'" :cardData="cardData" :echartData="echartDataWork" />
+            <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '808px' }" :bgSize="'large'">
+              <workJc :heightT="'18%'" :heightB="'82%'" :cardData="selectListBd" :echartData="echartDataWork" />
             </DanelBd>
           </div>
           <!-- 左底部区域 -->
-          <div class="left-f">
+          <!-- <div class="left-f">
             <DanelBd :moduleName="'粉尘实时浓度监测'" :contentStyle="{ contentH: '224px' }" 
               :bgSize="'middle'">
               <dustTimeNow :timeNowData="selectListBd"></dustTimeNow>
             </DanelBd>
-          </div>
+          </div> -->
         </div>
       </transition>
 
@@ -46,12 +46,12 @@
               <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> -->
+          <!-- <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 name="fade" mode="out-in">
           <div class="center-b" v-if="isShow">
-            <DanelBd :moduleName="'工作面粉尘浓度'" :contentStyle="{ contentH: '222px' }" :commonTitle="'selected'"
+            <DanelBd :moduleName="'工作面粉尘浓度 (mg/m³)'" :contentStyle="{ contentH: '222px' }" :commonTitle="'selected'"
               :selectList="selectListBd" :selectValue="sensorCode" @change-select="changeSelect" :bgSize="''">
               <multipleDust :echartData="echartData" />
             </DanelBd>
@@ -113,7 +113,7 @@ let toggleOpen = ref(false)
 let isShow = ref(true);
 
 //工作面风险监测数据
-let cardData = reactive<any[]>([]);
+// let cardData = reactive<any[]>([]);
 let echartDataWork = ref<any[]>([]);
 let areaType = ref('');
 
@@ -145,9 +145,9 @@ let pwData = reactive<any[]>([]);
 
 //粉尘静态指标数据
 let selectListJt = reactive<any[]>([
-  // { label: '8#煤层', value: '0' },
+  { label: '8#煤层', value: '0' },
   // { label: '9#煤层', value: '1' },
-  { label: '10#煤层', value: '0' },
+  // { label: '10#煤层', value: '0' },
 ]);
 let jtzbCode = ref('0');
 
@@ -192,25 +192,25 @@ async function getDustWarningCntByTypeList() {
 async function getFireAreaInfoList() {
   let res = await getAreaTypeList();
   if (res.length != 0) {
-    cardData.length = 0;
-    res.forEach((el) => {
-      cardData.push({
-        title: '风险',
-        val:
-          el.warningLevel == 1
-            ? '低'
-            : el.warningLevel == 2
-              ? '中'
-              : el.warningLevel == 3
-                ? '较大'
-                : el.warningLevel == 4
-                  ? '重大'
-                  : '--',
-        label: el.typeName,
-        title1: '最大值',
-        val1: el.maxValue,
-      });
-    });
+    // cardData.length = 0;
+    // res.forEach((el) => {
+    //   cardData.push({
+    //     title: '风险',
+    //     val:
+    //       el.warningLevel == 1
+    //         ? '低'
+    //         : el.warningLevel == 2
+    //           ? '中'
+    //           : el.warningLevel == 3
+    //             ? '较大'
+    //             : el.warningLevel == 4
+    //               ? '重大'
+    //               : '--',
+    //     label: el.typeName,
+    //     title1: '最大值',
+    //     val1: el.maxValue,
+    //   });
+    // });
     areaType.value = res[0]['areaType'];
     //获取粉尘选项数据
     getRealSensorDataByTypeList();
@@ -218,19 +218,14 @@ async function getFireAreaInfoList() {
 }
 //获取粉尘选项数据
 async function getRealSensorDataByTypeList() {
+  selectListBd.length = 0;
   // let res = await getRealSensorDataByType({ areaType: areaType.value });
   let res = await getRealSensorDataByType({ areaType: 2 });
-  if (res.length != 0) {
-    selectListBd.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,
-      // });
+  let res1 = await getRealSensorDataByType({ areaType: 6 });
+  let data=[...res,...res1]
+  if (data.length != 0) {
+   
+    data.forEach((el) => {
       if (el.displayStatus) {
         selectListBd.push({
           label: el.name,
@@ -243,7 +238,6 @@ async function getRealSensorDataByTypeList() {
           pwList:el.pwList.length
         });
       }
-
     });
     sensorCode.value = sensorCode.value ? sensorCode.value : selectListBd[0]['value'];
     //获取单项数据
@@ -420,12 +414,11 @@ onUnmounted(() => {
 
       .left-c {
         width: 100%;
-        margin-bottom: 25px;
       }
 
-      .left-f {
-        width: 100%;
-      }
+      // .left-f {
+      //   width: 100%;
+      // }
     }
 
     .center-area {

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

@@ -172,7 +172,7 @@ async function getFireAreaInfos() {
   const res = await getFireAreaInfo({ fireCauseType: 2 })
   if (res.length != 0) {
     res.forEach((el, ind) => {
-      if (el.areaType == 2) {
+      if (el.areaType == 2 && el.displayStatus==1) {
         treeData.push({ name: el.areaName, value: el.ind, id: el.ind, pid: null, areaCode: el.areaCode, gxcwCnt: el.gxcwCnt, sgjcCnt: el.sgjcCnt, infoTypeTwo: el.infoTypeTwo, warningLevel: el.warningLevel })
       }
     })

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

@@ -3,7 +3,7 @@
     <div class="empty-box" v-for="(item, index) in emptyList" :key="index">
       <div class="empty-label">{{ item.label }}</div>
       <div class="empty-val">
-        <span> {{ item.val || '--' }}</span>
+        <span> {{ item.val || '0' }}</span>
         <span>{{ item.unit }}</span>
       </div>
     </div>

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

@@ -71,7 +71,7 @@ watch(() => props.bunbleData, (newB, oldB) => {
     }
 
     &:nth-child(2) .jc-title {
-      left: 50px;
+      left: 38px;
     }
 
     &:nth-child(3) .jc-title {
@@ -79,19 +79,19 @@ watch(() => props.bunbleData, (newB, oldB) => {
     }
 
     &:nth-child(4) .jc-title {
-      left: 50px;
+      left: 54px;
     }
 
     &:nth-child(5) .jc-title {
-      left: 46px;
+      left: 38px;
     }
 
     &:nth-child(6) .jc-title {
-      left: 46px;
+      left: 54px;
     }
 
     &:nth-child(7) .jc-title {
-      left: 112px;
+      left: 54px;
     }
 
     .jc-item {

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

@@ -1,16 +1,18 @@
 <template>
   <div class="outFireJc">
-    <div class="outFire-box" v-for="(item, index) in outFireList" :key="index">
-      <div class="outFire-title">{{ item.title }}</div>
-      <div class="outFire-label">{{ item.label }}</div>
-      <div class="outFire-val">{{ `${item.val}${item.dw}` || '--' }}</div>
-    </div>
-
+    <vue3-seamless-scroll hover-stop="true" :list="outFireList" :hover="true" :step="0.1" :copy-num="3" class="seamless-warp">
+      <div class="outFire-box" v-for="(item, index) in outFireList" :key="index">
+        <div class="outFire-title">{{ item.title }}</div>
+        <div class="outFire-label">{{ item.label }}</div>
+        <div class="outFire-val">{{ `${item.val}${item.dw}` || '--' }}</div>
+      </div>
+    </vue3-seamless-scroll>
   </div>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive, defineProps, watch } from 'vue';
+import { Vue3SeamlessScroll } from 'vue3-seamless-scroll'
 
 let props = defineProps({
   outFireData: {
@@ -40,41 +42,48 @@ watch(() => props.outFireData, (newO, oldO) => {
   justify-content: center;
   width: 100%;
   height: 100%;
+  overflow: hidden;
 
-  .outFire-box {
-    display: flex;
-    box-sizing: border-box;
-    width: 90%;
-    height: 145px;
-    padding-top: 10px;
-    background: url('../../../../../assets/images/fire/firehome/list.png') no-repeat bottom;
-    background-size: 100% 100%;
-      color: #fff;
-    font-size: 14px;
+  .seamless-warp {
+    width: 100%;
 
-    .outFire-title{
+    .outFire-box {
       display: flex;
-      flex: 1;
-      justify-content: center;
-      height: 100%;
-      font-size: 12px;
-    }
+      box-sizing: border-box;
+      width: 90%;
+      height: 42px;
+      padding-top: 10px;
+      background: url('../../../../../assets/images/fire/firehome/list.png') no-repeat bottom;
+      background-size: 100% 100%;
+      color: #fff;
+      font-size: 14px;
 
-    .outFire-label{
-      display: flex;
-      flex: 1;
-      justify-content: center;
-      height: 100%;
-      font-size: 12px;
-    }
+      .outFire-title {
+        display: flex;
+        flex: 1;
+        justify-content: center;
+        height: 100%;
+        font-size: 12px;
+      }
 
-    .outFire-val{
-      display: flex;
-      flex: 1;
-      justify-content: center;
-      height: 100%;
-      color: #089dff;
+      .outFire-label {
+        display: flex;
+        flex: 1;
+        justify-content: center;
+        height: 100%;
+        font-size: 12px;
+      }
+
+      .outFire-val {
+        display: flex;
+        flex: 1;
+        justify-content: center;
+        height: 100%;
+        color: #089dff;
+      }
     }
   }
+
+
 }
 </style>

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

@@ -8,13 +8,13 @@
         }}</div>
     </div>
     <div class="safety-content">
-      <vue3-seamless-scroll hover-stop="true" :list="safetyList" :hover="true" :step="0.15" class="seamless-warp">
+      <vue3-seamless-scroll hover-stop="true" :list="safetyList" :hover="true" :step="0.15" :copy-num="3" class="seamless-warp">
         <div
           :class="safetyHeadList.length == 4 ? 'safety-content-box' : safetyHeadList.length == 3 ? 'safety-content-box0' : 'safety-content-box1'"
           v-for="(ite, ind) in safetyList" :key="ind">
           <span v-if="ite.address">{{ ite.address }}</span>
-          <span v-if="ite.nd">{{ ite.nd || '--' }}</span>
-          <span v-if="ite.temp">{{ ite.temp || '--' }}</span>
+          <span v-if="ite.nd">{{ ite.nd ? ite.nd : ite.nd!=null ? ite.nd : '--' }}</span>
+          <span v-if="ite.temp">{{ ite.temp ? ite.temp : ite.temp!=null ? ite.temp : '--'}}</span>
           <span v-if="ite.grade">{{ ite.grade || '--' }}</span>
           <span v-if="ite.time">{{ ite.time || '--' }}</span>
         </div>

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

@@ -1,10 +1,10 @@
 <template>
   <div class="substationJc">
-    <div class="substation-box" v-for="(item, index) in substationList" :key="index">
+    <!-- <div class="substation-box" v-for="(item, index) in substationList" :key="index">
       <div class="substation-title">{{ item.title }}</div>
       <div class="substation-label">{{ item.label }}</div>
       <div class="substation-val">{{ `${item.val}${item.dw}` || '--' }}</div>
-    </div>
+    </div> -->
 
   </div>
 </template>

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

@@ -28,7 +28,7 @@
           </div>
           <div class="card-r-des">
             <span>预测风险区域：</span>
-            <span>整个掘进面</span>
+            <span>工作面</span>
           </div>
         </div>
 

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

@@ -53,12 +53,12 @@
               <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> -->
+          <!-- <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>
           <div class="center-b" v-if="isShow">
-            <DanelBd :moduleName="'工作面束管监测'" :selectValue="pointCode" :moduleSelect="moduleSelect"
+            <DanelBd :moduleName="'工作面束管监测｜工作面光纤监测'" :selectValue="pointCode" :moduleSelect="moduleSelect"
               :contentStyle="{ contentH: '222px' }" commonTitle="selected" :selectList="selectList"
               @change-select="changeSelect" :bgSize="''">
               <fiberBunbleJc :bunbleData="bunbleData" />

src/views/vent/fire/fireZhud/fireZhud.api.ts

@@ -1,10 +1,11 @@
 import { defHttp } from '@/utils/http/axios';
 
 enum Api {
-  getRealData = '/fire/show/realData',
+  // getRealData = '/fire/show/realData',
+  getRealData='/fire/fireDisasterApi/getZhuDRealData'
 }
 /**
  * 智能注氮数据
  * @param params
  */
-export const getRealData = (params) => defHttp.post({ url: Api.getRealData, params });
+export const getRealData = (params) => defHttp.get({ url: Api.getRealData, params });

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

@@ -58,11 +58,12 @@ function getMonitor() {
 }
 
 async function getRealDataList() {
-  let res = await getRealData({ type: 'FireZhuD' })
+  // let res = await getRealData({ type: 'FireZhuD' })
+  let res = await getRealData({ areaCode: 81203 })
   console.log(res, '智能注氮数据----------')
-  if (res.length != 0) {
+  if (res.list.length != 0) {
     contentList.length = 0
-    res.forEach(el => {
+    res.list.forEach(el => {
       contentList.push(el)
     })
   }