提交新版本

src/views/vent/common/basicEchartLine.vue

@@ -84,7 +84,7 @@ function getOption() {
       legend: {
         align: 'left',
         right: 'center',
-        top: '0%',
+        top: '1%',
         type: 'plain',
         textStyle: {
           color: '#7ec7ff',

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

@@ -41,13 +41,15 @@
       <div :class="isShow ? 'center-area' : 'center-area1'">
         <div :class="isShow ? 'center-t' : 'center-t1'">
           <div class="center-scalc" @click="getScalc">
-            <img src="../../../../assets/images/scalc.png" alt="" />
+            <div class="scalc-line"></div>
+            <div class="scalc-line"></div>
+            <div class="scalc-line"></div>
           </div>
           <iframe src="http://172.16.253.23:91/valkyrja/?type=tf" 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: '309px' }" :commonTitle="'selected'"
+            <DanelBd :moduleName="'综放工作面粉尘浓度'" :contentStyle="{ contentH: '245px' }" :commonTitle="'selected'"
               :selectList="selectListBd" :selectValue="sensorCode" @change-select="changeSelect">
               <multipleDust :echartData="echartData" />
             </DanelBd>
@@ -66,8 +68,7 @@
           </div>
           <!-- 右中区域 -->
           <div class="right-c">
-            <DanelBd :moduleName="'粉尘关联指标'" :contentStyle="{ contentH: '280px' }"
-             >
+            <DanelBd :moduleName="'粉尘关联指标'" :contentStyle="{ contentH: '280px' }">
               <dustGlzb :dustGlzbData="dustGlzbData" />
             </DanelBd>
           </div>
@@ -127,7 +128,13 @@ let unInterTotal = ref(0);
 let pwData = reactive<any[]>([]);
 
 //粉尘关联指标数据
-let dustGlzbData = reactive<any[]>([]);
+let dustGlzbData = reactive<any[]>([
+  {label:'最高温度(°C)',val:''},
+  {label:'环境湿度(%)',val:''},
+  {label:'风速(m/s)',val:''},
+  {label:'水压(Mpa)',val:'10'},
+  {label:'水阀',val:'-'},
+]);
 
 //粉尘静态指标数据
 let selectListJt = reactive<any[]>([
@@ -233,23 +240,22 @@ async function historyAndForecastList(params) {
     echartData.yData1.length = 0
     let nowData = []
     let ycDate = []
-    res.lineData.forEach((el, index) => {
-      if (new Date(el.time).getTime() <= new Date(res.splitTime).getTime()) {
-        nowData = res.lineData.slice(0, index)
-      }else {
-        ycDate = res.lineData.slice(index)
-      }
-      console.log(nowData, 'nowData---------------------------')
-      console.log(ycDate, 'ycDate============')
-      echartData.xData.push(el.time);
-    });
+    let counts = -1
+    nowData = res.lineData.filter(n => new Date(n.time).getTime() <= new Date(res.splitTime).getTime())
+    ycDate = res.lineData.filter(y => new Date(y.time).getTime() > new Date(res.splitTime).getTime())
+    console.log(nowData, 'nowData---------------------------')
+    console.log(ycDate, 'ycDate============')
+    res.lineData.forEach(el => {
+      echartData.xData.push(el.time)
+    })
     echartData.xData.forEach((el, index) => {
       if (nowData[index]) {
         echartData.yData.push(nowData[index]['value']);
         echartData.yData1.push('')
       } else {
+        counts += 1
         echartData.yData.push('');
-        echartData.yData1.push(ycDate[index]['valuePredict'])
+        echartData.yData1.push(ycDate[counts]['valuePredict'])
       }
     })
   }
@@ -274,13 +280,12 @@ async function getRealDataList() {
 }
 
 //粉尘关联指标数据
-async function getGzmMaxBySensorTypeList(){
-  let res=await getGzmMaxBySensorType()
-  if(res.length!=0){
-    dustGlzbData.length=0
-    res.forEach(el=>{
-      dustGlzbData.push({label:`${el.sensorName}${el.unit}`,val:el.value})
-    })
+async function getGzmMaxBySensorTypeList() {
+  let res = await getGzmMaxBySensorType()
+  if (res.length != 0) {
+    dustGlzbData[0]['val']=res.filter(v=>v.sensorType=='M0201')[0]['value'] || '-'
+    dustGlzbData[1]['val']=res.filter(v=>v.sensorType=='M0202')[0]['value'] || '-'
+    dustGlzbData[2]['val']=res.filter(v=>v.sensorType=='M0302')[0]['value'] || '-'
   }
 }
 
@@ -413,39 +418,48 @@ onUnmounted(() => {
       .center-t {
         position: relative;
         width: 100%;
-        height: 60%;
+        height: calc(100% - 295px);
         margin-bottom: 15px;
         overflow: hidden;
 
         .center-scalc {
           position: absolute;
-          top: 10px;
-          left: 10px;
-          width: 50px;
-          height: 50px;
-          background-color: rgb(30 58 117 / 41.8%);
-
-          img {
+          top: 0;
+          left: 0;
+          width: 44px;
+          height: 44px;
+          border-radius: 50%;
+          background-color: #000;
+          box-shadow: 0 0 15px 1px rgb(31 179 247 / 70%) inset;
+          cursor: pointer;
+
+          .scalc-line {
             position: absolute;
-            top: 50%;
             left: 50%;
-            width: 37px;
-            height: 41px;
-            transform: translate(-50%, -50%);
-            cursor: pointer;
-
-            &:hover {
-              width: 43px;
-              height: 47px;
-              background-color: rgb(100 228 185 / 6.27%);
+            width: 22px;
+            height: 3px;
+            transform: translate(-50%, 0);
+            background-color: #fff;
+
+            &:nth-child(1) {
+              top: 14px;
+            }
+
+            &:nth-child(2) {
+              top: 21px;
             }
+
+            &:nth-child(3) {
+              bottom: 13px;
+            }
+
           }
         }
       }
 
       .center-b {
         width: 100%;
-        height: calc(40% - 15px);
+        height: 280px;
       }
     }
 
@@ -465,26 +479,35 @@ onUnmounted(() => {
 
         .center-scalc {
           position: absolute;
-          top: 10px;
-          left: 10px;
-          width: 50px;
-          height: 50px;
-          background-color: rgb(30 58 117 / 41.8%);
-
-          img {
+          top: 0;
+          left: 0;
+          width: 44px;
+          height: 44px;
+          border-radius: 50%;
+          background-color: #000;
+          box-shadow: 0 0 15px 1px rgb(31 179 247 / 70%) inset;
+          cursor: pointer;
+
+          .scalc-line {
             position: absolute;
-            top: 50%;
             left: 50%;
-            width: 37px;
-            height: 41px;
-            transform: translate(-50%, -50%);
-            cursor: pointer;
-
-            &:hover {
-              width: 43px;
-              height: 47px;
-              background-color: rgb(100 228 185 / 6.27%);
+            width: 22px;
+            height: 3px;
+            transform: translate(-50%, 0);
+            background-color: #fff;
+
+            &:nth-child(1) {
+              top: 14px;
             }
+
+            &:nth-child(2) {
+              top: 21px;
+            }
+
+            &:nth-child(3) {
+              bottom: 13px;
+            }
+
           }
         }
       }

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

@@ -155,23 +155,22 @@ async function historyAndForecastList(params) {
     echartData.yData1.length = 0
     let nowData = []
     let ycDate = []
-    res.lineData.forEach((el, index) => {
-      if (new Date(el.time).getTime() <= new Date(res.splitTime).getTime()) {
-        nowData = res.lineData.slice(0, index)
-      } else {
-        ycDate = res.lineData.slice(index)
-      }
-      console.log(nowData, 'nowData---------------------------')
-      console.log(ycDate, 'ycDate============')
-      echartData.xData.push(el.time);
-    });
+    let counts = -1
+    nowData = res.lineData.filter(n => new Date(n.time).getTime() <= new Date(res.splitTime).getTime())
+    ycDate = res.lineData.filter(y => new Date(y.time).getTime() > new Date(res.splitTime).getTime())
+    console.log(nowData, 'nowData---------------------------')
+    console.log(ycDate, 'ycDate============')
+    res.lineData.forEach(el => {
+      echartData.xData.push(el.time)
+    })
     echartData.xData.forEach((el, index) => {
       if (nowData[index]) {
         echartData.yData.push(nowData[index]['value']);
         echartData.yData1.push('')
       } else {
+        counts += 1
         echartData.yData.push('');
-        echartData.yData1.push(ycDate[index]['valuePredict'])
+        echartData.yData1.push(ycDate[counts]['valuePredict'])
       }
     })
   }

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

@@ -102,13 +102,13 @@ async function getDustWarnHistoryList() {
   let ttime_end = `${dayjs(TimeRange.value[1]).format('YYYY-MM-DD')} 00:00:00`
   let res = await getDustWarnHistory({ pageNo: pagination.current, pageSize: pagination.pageSize, ttime_begin: ttime_begin, ttime_end: ttime_end })
   console.log(res, '预警记录------------')
-  if (res.result.records.length != 0) {
-    res.result.records.forEach(el => {
+  if (res.records.length != 0) {
+    res.records.forEach(el => {
       el.zhType = '粉尘'
       el.isLk = '未联控'
     })
-    dataSource.value = res.result.records
-    pagination.total = res.result.total
+    dataSource.value = res.records
+    pagination.total = res.total
   }
 }
 //分页切换

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

@@ -75,7 +75,7 @@ let props = defineProps({
 let ring = ref();
 
 let fxLenged = reactive<any[]>([]);//图表数据
-let echartDatas=ref<any[]>([])
+let echartDatas=reactive<any[]>([])
 
 let cardList = ref<any[]>([]);
 
@@ -159,14 +159,14 @@ watch(() => props.cardData, (newC, oldC) => {
 
 watch(() => props.echartData, (newV, oldV) => {
   console.log(newV, '图表数据------')
-  fxLenged.length = 0
   if(newV.length!=0){
     fxLenged.length=0
+    echartDatas.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]
+    echartDatas.push(maxValue[0])
   }
 }, { immediate: true, deep: true })
 

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

@@ -15,7 +15,9 @@
                 <div>监测区域</div>
               </div>
               <div class="tcontent-c">
-                <div style="margin-bottom: 15px;color: #1fb3f7; font-size: 24px;font-weight:bolder;letter-spacing:10px;">低风险</div>
+                <div
+                  style="margin-bottom: 15px;color: #1fb3f7; font-size: 24px;font-weight:bolder;letter-spacing:10px;">
+                  低风险</div>
                 <div style="color: #fff; font-size: 12px">自燃倾向性等级 : 容易自燃</div>
               </div>
               <div class="tcontent-r">火灾风险</div>
@@ -24,7 +26,7 @@
           <!-- 左中区域 -->
           <div class="left-c">
             <DanelBd :moduleName="'工作面风险监测'" :contentStyle="{ contentH: '450px' }">
-              <workJc :heightT="'30%'" :heightB="'70%'"  :echartData="echartDataWork" :cardData="cardData" />
+              <workJc :heightT="'30%'" :heightB="'70%'" :echartData="echartDataWork" :cardData="cardData" />
             </DanelBd>
           </div>
           <!-- 左下区域 -->
@@ -35,7 +37,7 @@
             </DanelBd>
           </div>
           <!-- 左底部区域 -->
-         <!-- <div class="left-f">
+          <!-- <div class="left-f">
             <DanelBd :moduleName="'GIS重点区域风险监测'" :contentStyle="{ contentH: '0px' }" commonTitle="switchs" />
           </div> -->
         </div>
@@ -44,14 +46,16 @@
       <div :class="isShow ? 'center-area' : 'center-area1'">
         <div :class="isShow ? 'center-t' : 'center-t1'">
           <div class="center-scalc" @click="getScalc">
-            <img src="../../../../assets/images/scalc.png" alt="" />
+            <div class="scalc-line"></div>
+            <div class="scalc-line"></div>
+            <div class="scalc-line"></div>
           </div>
           <iframe src="http://172.16.253.23:91/valkyrja/?type=tf" width="100%" height="100%" frameborder="0"></iframe>
         </div>
         <transition name="fade" mode="out-in">
           <div class="center-b" v-if="isShow">
             <DanelBd :moduleName="'工作面束管监测'" :selectValue="pointCode" :moduleSelect="moduleSelect"
-              :contentStyle="{ contentH: '309px' }" commonTitle="selected" :selectList="selectList"
+              :contentStyle="{ contentH: '245px' }" commonTitle="selected" :selectList="selectList"
               @change-select="changeSelect">
               <fiberBunbleJc :bunbleData="bunbleData" />
             </DanelBd>
@@ -219,9 +223,9 @@ function changeSelect(data) {
   }
 }
 //获取工作面风险监测图表数据
-async function getFireWarningCntByTypeList(){
-  let res=await getFireWarningCntByType({areaType:2})
-  if(res.length!=0){
+async function getFireWarningCntByTypeList() {
+  let res = await getFireWarningCntByType({ areaType: 2 })
+  if (res.length != 0) {
     echartDataWork.value = res
   }
 }
@@ -581,17 +585,17 @@ onUnmounted(() => {
           transform: translate(0, -50%);
 
           .tcontent-l {
-              display: flex;
-              flex: 1;
-              flex-direction: column;
-              align-items: center;
-              justify-content: center;
-              height: 100%;
-              color: #9da5aa;
-              font-size: 14px;
-              font-weight: bold;
-              letter-spacing: 2px;
-            }
+            display: flex;
+            flex: 1;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            height: 100%;
+            color: #9da5aa;
+            font-size: 14px;
+            font-weight: bold;
+            letter-spacing: 2px;
+          }
 
           .tcontent-c {
             display: flex;
@@ -603,17 +607,17 @@ onUnmounted(() => {
           }
 
           .tcontent-r {
-              display: flex;
-              flex: 1;
-              flex-direction: column;
-              align-items: center;
-              justify-content: center;
-              height: 100%;
-              color: #9da5aa;
-              font-size: 14px;
-              font-weight: bold;
-              letter-spacing: 2px;
-            }
+            display: flex;
+            flex: 1;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            height: 100%;
+            color: #9da5aa;
+            font-size: 14px;
+            font-weight: bold;
+            letter-spacing: 2px;
+          }
         }
       }
 
@@ -640,39 +644,48 @@ onUnmounted(() => {
       .center-t {
         position: relative;
         width: 100%;
-        height: 60%;
+        height: calc(100% - 295px);
         margin-bottom: 15px;
         overflow: hidden;
 
         .center-scalc {
           position: absolute;
-          top: 10px;
-          left: 10px;
-          width: 50px;
-          height: 50px;
-          background-color: rgb(30 58 117 / 41.8%);
-
-          img {
+          top: 0;
+          left: 0;
+          width: 44px;
+          height: 44px;
+          border-radius: 50%;
+          background-color: #000;
+          box-shadow: 0 0 15px 1px rgb(31 179 247 / 70%) inset;
+          cursor: pointer;
+
+          .scalc-line {
             position: absolute;
-            top: 50%;
             left: 50%;
-            width: 37px;
-            height: 41px;
-            transform: translate(-50%, -50%);
-            cursor: pointer;
-
-            &:hover {
-              width: 43px;
-              height: 47px;
-              background-color: rgb(100 228 185 / 6.27%);
+            width: 22px;
+            height: 3px;
+            transform: translate(-50%, 0);
+            background-color: #fff;
+
+            &:nth-child(1) {
+              top: 14px;
+            }
+
+            &:nth-child(2) {
+              top: 21px;
             }
+
+            &:nth-child(3) {
+              bottom: 13px;
+            }
+
           }
         }
       }
 
       .center-b {
         width: 100%;
-        height: calc(40% - 15px);
+        height: 280px;
       }
     }
 
@@ -692,26 +705,35 @@ onUnmounted(() => {
 
         .center-scalc {
           position: absolute;
-          top: 10px;
-          left: 10px;
-          width: 50px;
-          height: 50px;
-          background-color: rgb(30 58 117 / 41.8%);
-
-          img {
+          top: 0;
+          left: 0;
+          width: 44px;
+          height: 44px;
+          border-radius: 50%;
+          background-color: #000;
+          box-shadow: 0 0 15px 1px rgb(31 179 247 / 70%) inset;
+          cursor: pointer;
+
+          .scalc-line {
             position: absolute;
-            top: 50%;
             left: 50%;
-            width: 37px;
-            height: 41px;
-            transform: translate(-50%, -50%);
-            cursor: pointer;
-
-            &:hover {
-              width: 43px;
-              height: 47px;
-              background-color: rgb(100 228 185 / 6.27%);
+            width: 22px;
+            height: 3px;
+            transform: translate(-50%, 0);
+            background-color: #fff;
+
+            &:nth-child(1) {
+              top: 14px;
+            }
+
+            &:nth-child(2) {
+              top: 21px;
             }
+
+            &:nth-child(3) {
+              bottom: 13px;
+            }
+
           }
         }
       }

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

@@ -101,13 +101,13 @@ async function getFireWarnHistoryList() {
   let ttime_end = `${dayjs(TimeRange.value[1]).format('YYYY-MM-DD')} 00:00:00`
   let res = await getFireWarnHistory({ pageNo: pagination.current, pageSize: pagination.pageSize, ttime_begin: ttime_begin, ttime_end: ttime_end })
   console.log(res, '预警记录------------')
-  if (res.result.records.length != 0) {
-    res.result.records.forEach(el => {
+  if (res.records.length != 0) {
+    res.records.forEach(el => {
       el.zhType = '火灾'
       el.isLk = '未联控'
     })
-    dataSource.value = res.result.records
-    pagination.total = res.result.total
+    dataSource.value = res.records
+    pagination.total = res.total
   }
 }
 //分页切换