火灾监测预警模块修改 登录页修改

pages/device/index.vue

@@ -64,7 +64,7 @@ export default {
       backPic: "url(../../static/topnavbar.png)",
       PageCur: "0",
       showColum: {},
-      menushow: false,
+      menushow: true,
       deviceType: "",
       tabList: [
         {

pages/filecenter/filecenter.vue

@@ -284,6 +284,7 @@ export default {
       ],
       fileTypeList: [
         [
+          { label: "全部类型", value: "" },
           { label: ".txt", value: "txt" },
           { label: ".doc", value: "doc" },
           { label: ".docx", value: "docx" },
@@ -334,7 +335,11 @@ export default {
     //选择文件类型
     selectFileType(e) {
       this.pickershow = false;
-      this.fileType = e.value[0].label;
+      if (e.value[0].label === "全部类型") {
+        this.fileType = "";
+      } else {
+        this.fileType = e.value[0].label;
+      }
     },
     //根据条件查询相关文件
     searchFile() {

pages/gasreport/components/gasImgIdentify.vue

@@ -276,7 +276,7 @@
 import api from "@/api/api";
 import moment from "moment";
 import configService from "@/common/service/config.service.js";
-import { RHFselcet } from "@/uni_modules/fz-media-selcet";
+// import { RHFselcet } from "@/uni_modules/fz-media-selcet";
 export default {
   name: "gasFill",
   props: {

pages/history/history.vue

@@ -184,7 +184,9 @@
                       }}
                     </view>
                     <view
-                      v-else-if="showitem.datatype == 2"
+                      v-else-if="
+                        showitem.datatype == 2 && stationType != 'redis'
+                      "
                       class="demo-layout bg-purple-light"
                       style="
                         color: #3787fe;
@@ -200,6 +202,24 @@
                       }}
                     </view>
                     <view
+                      v-else-if="
+                        showitem.datatype == 2 && stationType == 'redis'
+                      "
+                      class="demo-layout bg-purple-light"
+                      style="
+                        color: #3787fe;
+                        font-size: 30rpx;
+                        margin-top: 20rpx;
+                      "
+                    >
+                      {{
+                        item[showitem.monitorcode] == null ||
+                        item[showitem.monitorcode] == ""
+                          ? "-"
+                          : item[showitem.monitorcode]
+                      }}
+                    </view>
+                    <view
                       class="demo-layout bg-purple-light"
                       style="
                         margin-top: 20rpx;
@@ -459,23 +479,25 @@ export default {
             if (response.data.code == 200) {
               const infolist = response.data.result;
               this.historyData = infolist.datalist.records;
-              this.historyData.forEach((item) => {
-                if (item.readData.frontGateOpen == 1) {
-                  item.readData.frontGateOpen = "打开";
-                } else {
-                  item.readData.frontGateOpen = "关闭";
-                }
-                if (item.readData.rearGateOpen == 1) {
-                  item.readData.rearGateOpen = "打开";
-                } else {
-                  item.readData.rearGateOpen = "关闭";
-                }
-                if (item.readData.midGateOpen == 1) {
-                  item.readData.midGateOpen = "打开";
-                } else {
-                  item.readData.midGateOpen = "关闭";
-                }
-              });
+              // console.log(this.historyData, "111111111111111111");
+              // this.historyData.forEach((item) => {
+              //   if (item.readData.frontGateOpen == 1) {
+              //     item.readData.frontGateOpen = "打开";
+              //   } else {
+              //     item.readData.frontGateOpen = "关闭";
+              //   }
+              //   if (item.readData.rearGateOpen == 1) {
+              //     item.readData.rearGateOpen = "打开";
+              //     1;
+              //   } else {
+              //     item.readData.rearGateOpen = "关闭";
+              //   }
+              //   if (item.readData.midGateOpen == 1) {
+              //     item.readData.midGateOpen = "打开";
+              //   } else {
+              //     item.readData.midGateOpen = "关闭";
+              //   }
+              // });
               this.pageNo = response.data.result.datalist.current;
             } else {
               resolve(response);
@@ -505,23 +527,23 @@ export default {
             if (response.data.code == 200) {
               const infolist = response.data.result;
               this.historyData = infolist.records;
-              this.historyData.forEach((item) => {
-                if (item.readData.frontGateOpen == 1) {
-                  item.readData.frontGateOpen = "打开";
-                } else {
-                  item.readData.frontGateOpen = "关闭";
-                }
-                if (item.readData.rearGateOpen == 1) {
-                  item.readData.rearGateOpen = "打开";
-                } else {
-                  item.readData.rearGateOpen = "关闭";
-                }
-                if (item.readData.midGateOpen == 1) {
-                  item.readData.midGateOpen = "打开";
-                } else {
-                  item.readData.midGateOpen = "关闭";
-                }
-              });
+              // this.historyData.forEach((item) => {
+              //   if (item.readData.frontGateOpen == 1) {
+              //     item.readData.frontGateOpen = "打开";
+              //   } else {
+              //     item.readData.frontGateOpen = "关闭";
+              //   }
+              //   if (item.readData.rearGateOpen == 1) {
+              //     item.readData.rearGateOpen = "打开";
+              //   } else {
+              //     item.readData.rearGateOpen = "关闭";
+              //   }
+              //   if (item.readData.midGateOpen == 1) {
+              //     item.readData.midGateOpen = "打开";
+              //   } else {
+              //     item.readData.midGateOpen = "关闭";
+              //   }
+              // });
               this.pageNo = response.data.result.datalist.current;
             } else {
               resolve(response);

pages/home/detail/autodoor/autodoor.vue

@@ -822,9 +822,12 @@ export default {
               this.doorNetStatus = result.netStatus;
               this.warnFlag = result.warnLevel_str;
               this.readTime = result.readTime;
-              this.qidongfengji = result.readData.Fan1StartStatus
-                ? result.readData.Fan1StartStatus
-                : result.readData.Fan2StartStatus;
+
+              this.qidongfengji =
+                result.readData.Fan1MOT2_RunningStatus1_str === "停止" &&
+                result.readData.Fan1StartStatus_str === "停止"
+                  ? 1
+                  : 2;
               var maxarea = result.maxarea;
               this.windowAngle =
                 (this.tableData.forntArea / maxarea) * 100 * 0.9;

pages/home/detail/fanmainAnimate/fanmainAnimate.vue

@@ -407,11 +407,11 @@
       >
         <span>2号电机</span>
       </div>
-      <div style="position: absolute; color: #fff; top: 63%; left: 28.4%">
+      <div style="position: absolute; color: #fff; top: 45%; left: 28.4%">
         <span v-if="topindex == 2">1#风机</span>
         <span v-if="topindex == 1">2#风机</span>
       </div>
-      <div style="position: absolute; color: #fff; bottom: 63%; left: 31.4%">
+      <div style="position: absolute; color: #fff; bottom: 19%; left: 31.4%">
         <span v-if="topindex == 2">2#风机</span>
         <span v-if="topindex == 1">1#风机</span>
       </div>
@@ -492,14 +492,6 @@ export default {
         document.getElementById("box2").style.WebkitAnimationPlayState =
           "paused";
       } else if (this.nowfengji == "1") {
-        if (configUrl.group != "lh") {
-          document.getElementById("box2").style.animationPlayState = "running";
-          document.getElementById("box2").style.WebkitAnimationPlayState =
-            "running";
-          document.getElementById("box1").style.animationPlayState = "paused";
-          document.getElementById("box1").style.WebkitAnimationPlayState =
-            "paused";
-        }
         document.getElementById("box2-s").style.animationPlayState = "running";
         document.getElementById("box2-s").style.WebkitAnimationPlayState =
           "running";

pages/home/home.vue

@@ -9,7 +9,7 @@
               v-for="(item, index) in curlist"
               :key="index"
             >
-              <div @tap="openNewPage(item)">
+              <div>
                 <u-row gutter="5" customStyle="margin-bottom: 10px">
                   <u-col span="24">
                     <image
@@ -49,15 +49,18 @@
                       />
                       <span style="float: right">正常</span>
                     </div>
-                    <div v-else class="error-tag">
+                    <div v-else class="error-tag" @click="toggleWarn()">
                       <image
+                        v-show="!isWarnVisible"
                         src="/static/model/alarmFalse.svg"
                         alt=""
                         class="icon-style"
                       />
-                      <span style="float: right; text-overflow: ellipsis">{{
-                        item.warnDes
-                      }}</span>
+                      <span
+                        v-show="isWarnVisible"
+                        style="text-overflow: ellipsis; text-algin: center"
+                        >{{ item.warnDes }}</span
+                      >
                     </div>
                   </u-col>
                   <u-col span="3">
@@ -65,99 +68,101 @@
                   </u-col>
                 </u-row>
                 <view v-if="TabCur != 'fanmain' && TabCur != 'fanlocal'">
-                  <view
-                    class="datacard"
-                    v-for="(showitem, index) in deviceShowList"
-                    :key="index"
-                    v-show="
-                      showitem.appShow == 1 &&
-                      showitem.monitorcode != 'strinstallpos' &&
-                      showitem.monitorcode != 'netStatus' &&
-                      showitem.monitorcode != 'warnFlag' &&
-                      showitem.monitorcode != 'readTime'
-                    "
-                  >
+                  <div @tap="openNewPage(item)">
                     <view
-                      :class="TabCur"
-                      style="
-                        padding-top: 10rpx;
-                        padding-bottom: 10rpx;
-                        display: flex;
-                        flex-direction: column;
-                        align-items: center;
-                        height: 100%;
+                      class="datacard"
+                      v-for="(showitem, index) in deviceShowList"
+                      :key="index"
+                      v-show="
+                        showitem.appShow == 1 &&
+                        showitem.monitorcode != 'strinstallpos' &&
+                        showitem.monitorcode != 'netStatus' &&
+                        showitem.monitorcode != 'warnFlag' &&
+                        showitem.monitorcode != 'readTime'
                       "
                     >
                       <view
-                        v-if="
-                          showitem.datatype == 1 &&
-                          showitem.monitorcode == 'doorUse'
-                        "
-                        class="demo-layout bg-purple-light"
-                        style="
-                          margin-top: 10rpx;
-                          color: #3787fe;
-                          font-size: 30rpx;
-                          margin-top: 20rpx;
-                        "
-                      >
-                        {{
-                          item[showitem.monitorcode] == "2"
-                            ? "行人"
-                            : item[showitem.monitorcode] == "1"
-                            ? "行车"
-                            : "-"
-                        }}
-                      </view>
-                      <view
-                        v-else-if="showitem.datatype == 1"
-                        class="demo-layout bg-purple-light"
-                        style="
-                          margin-top: 10rpx;
-                          color: #3787fe;
-                          font-size: 30rpx;
-                          margin-top: 20rpx;
-                        "
-                      >
-                        {{
-                          item[showitem.monitorcode] == null ||
-                          item[showitem.monitorcode] == ""
-                            ? "-"
-                            : item[showitem.monitorcode]
-                        }}
-                      </view>
-                      <view
-                        v-else-if="showitem.datatype == 2"
-                        class="demo-layout bg-purple-light"
+                        :class="TabCur"
                         style="
-                          color: #3787fe;
-                          font-size: 30rpx;
-                          margin-top: 20rpx;
+                          padding-top: 10rpx;
+                          padding-bottom: 10rpx;
+                          display: flex;
+                          flex-direction: column;
+                          align-items: center;
+                          height: 100%;
                         "
                       >
-                        {{
-                          item.readData[showitem.monitorcode] == null ||
-                          item.readData[showitem.monitorcode] == ""
-                            ? "-"
-                            : item.readData[showitem.monitorcode]
-                        }}
-                      </view>
+                        <view
+                          v-if="
+                            showitem.datatype == 1 &&
+                            showitem.monitorcode == 'doorUse'
+                          "
+                          class="demo-layout bg-purple-light"
+                          style="
+                            margin-top: 10rpx;
+                            color: #3787fe;
+                            font-size: 30rpx;
+                            margin-top: 20rpx;
+                          "
+                        >
+                          {{
+                            item[showitem.monitorcode] == "2"
+                              ? "行人"
+                              : item[showitem.monitorcode] == "1"
+                              ? "行车"
+                              : "-"
+                          }}
+                        </view>
+                        <view
+                          v-else-if="showitem.datatype == 1"
+                          class="demo-layout bg-purple-light"
+                          style="
+                            margin-top: 10rpx;
+                            color: #3787fe;
+                            font-size: 30rpx;
+                            margin-top: 20rpx;
+                          "
+                        >
+                          {{
+                            item[showitem.monitorcode] == null ||
+                            item[showitem.monitorcode] == ""
+                              ? "-"
+                              : item[showitem.monitorcode]
+                          }}
+                        </view>
+                        <view
+                          v-else-if="showitem.datatype == 2"
+                          class="demo-layout bg-purple-light"
+                          style="
+                            color: #3787fe;
+                            font-size: 30rpx;
+                            margin-top: 20rpx;
+                          "
+                        >
+                          {{
+                            item.readData[showitem.monitorcode] == null ||
+                            item.readData[showitem.monitorcode] == ""
+                              ? "-"
+                              : item.readData[showitem.monitorcode]
+                          }}
+                        </view>
 
-                      <view
-                        class="demo-layout bg-purple-light"
-                        style="
-                          margin-top: 20rpx;
-                          color: #677799;
-                          margin-top: 20rpx;
-                        "
-                      >
-                        {{ showitem.des }}
+                        <view
+                          class="demo-layout bg-purple-light"
+                          style="
+                            margin-top: 20rpx;
+                            color: #677799;
+                            margin-top: 20rpx;
+                          "
+                        >
+                          {{ showitem.des }}
+                        </view>
                       </view>
                     </view>
-                  </view>
+                  </div>
                 </view>
 
-                <div class="fanContent" v-else>
+                <div class="fanContent" @tap="openNewPage(item)" v-else>
                   <div class="top">
                     <view>主机</view>
                     <view
@@ -432,6 +437,7 @@ export default {
       colums: {},
       typeList: [], //详情页展示数据
       deviceShowList: [], //设备展示字段
+      isWarnVisible: false,
     };
   },
   props: ["showColum", "deviceType"],
@@ -468,6 +474,10 @@ export default {
     this.startTimer();
   },
   methods: {
+    toggleWarn() {
+      console.log("测试");
+      this.isWarnVisible = !this.isWarnVisible;
+    },
     startTimer() {
       // 每隔一段时间执行某个操作
       this.timer = setInterval(async () => {

pages/login/login.vue

@@ -51,7 +51,7 @@
 import { ACCESS_TOKEN, USER_NAME, USER_INFO } from "@/common/util/constants";
 import { mapActions } from "vuex";
 import configService from "@/common/service/config.service.js";
-import {AesEncryption, getLoginCipher} from "@/common/util/cipher.js";
+import { AesEncryption, getLoginCipher } from "@/common/util/cipher.js";
 //import FlvJs from "flv.js";
 import api from "@/api/api";
 export default {
@@ -77,8 +77,8 @@ export default {
     };
   },
   onLoad: function (option) {
-        console.log("=======option.ticket======"+JSON.stringify(option.ticket));
-		this.loginCas(option.ticket)
+    console.log("=======option.ticket======" + JSON.stringify(option.ticket));
+    this.loginCas(option.ticket);
     // #ifdef APP-PLUS
     var that = this;
     plus.runtime.getProperty(plus.runtime.appid, function (wgtinfo) {
@@ -125,10 +125,13 @@ export default {
         username: this.userName,
         password: this.password,
       };
-			// 加密
-			const loginCipher = getLoginCipher()
-			const encryption = new AesEncryption({ key: loginCipher.key, iv: loginCipher.iv });
-			loginParams.password = encryption.encryptByAES(loginParams.password)
+      // 加密
+      const loginCipher = getLoginCipher();
+      const encryption = new AesEncryption({
+        key: loginCipher.key,
+        iv: loginCipher.iv,
+      });
+      loginParams.password = encryption.encryptByAES(loginParams.password);
       this.loading = true;
       this.mLogin(loginParams)
         .then((res) => {
@@ -158,51 +161,54 @@ export default {
           this.loading = false;
         });
     },
-	
-	loginCas(value) {
-	  var than = this;
-	  
-	  // this.$tip.success(configService.apiUrl);
-	  var ser = configService.apiUrl;
-	  ser = ser.replace(9999, 8092);
-	          // this.$tip.success(ser);
-	  new Promise((resolve, reject) => {
-	    api
-	      .validateCasLogin("", "?ticket=" + value + "&service=" + encodeURIComponent(ser))
-	      .then((response) => {
-	          // than.$tip.success("登录成功1");
-			  
-	        // if (response.data.code == 200) {
-	        // 	uni.setStorageSync(ACCESS_TOKEN, response.data.result.token);
-	        // } else {
-	        // }
-	        const result = response.data.result;
-	        const userInfo = result.userInfo;
-	        uni.setStorageSync(ACCESS_TOKEN, result.token);
-	        uni.setStorageSync(USER_INFO, userInfo);
-	        console.log("userInfo=" + userInfo);
-	        than.$store.commit("SET_TOKEN", result.token);
-	        console.log("result.token=" + result.token);
-	        than.$store.commit("SET_DICT", result.sysAllDictItems);
-	        than.$store.commit("SET_AVATAR", userInfo.avatar);
-	        than.$store.commit("SET_NAME", {
-	          username: userInfo.username,
-	          realname: userInfo.realname,
-	        });
-	
-	          // than.$tip.success("loginCas=");
-	        than.getPermissionList();
-	      })
-	      .catch((error) => {
-	        debugger;
-	        console.log("catch===>response", error);
-	        // uni.navigateTo({
-	        //   url: "/pages/home/home",
-	        // });
-	      });
-	  });
-	},
-	
+
+    loginCas(value) {
+      var than = this;
+
+      // this.$tip.success(configService.apiUrl);
+      var ser = configService.apiUrl;
+      ser = ser.replace(9999, 8092);
+      // this.$tip.success(ser);
+      new Promise((resolve, reject) => {
+        api
+          .validateCasLogin(
+            "",
+            "?ticket=" + value + "&service=" + encodeURIComponent(ser)
+          )
+          .then((response) => {
+            // than.$tip.success("登录成功1");
+
+            // if (response.data.code == 200) {
+            // 	uni.setStorageSync(ACCESS_TOKEN, response.data.result.token);
+            // } else {
+            // }
+            const result = response.data.result;
+            const userInfo = result.userInfo;
+            uni.setStorageSync(ACCESS_TOKEN, result.token);
+            uni.setStorageSync(USER_INFO, userInfo);
+            console.log("userInfo=" + userInfo);
+            than.$store.commit("SET_TOKEN", result.token);
+            console.log("result.token=" + result.token);
+            than.$store.commit("SET_DICT", result.sysAllDictItems);
+            than.$store.commit("SET_AVATAR", userInfo.avatar);
+            than.$store.commit("SET_NAME", {
+              username: userInfo.username,
+              realname: userInfo.realname,
+            });
+
+            // than.$tip.success("loginCas=");
+            than.getPermissionList();
+          })
+          .catch((error) => {
+            debugger;
+            console.log("catch===>response", error);
+            // uni.navigateTo({
+            //   url: "/pages/home/home",
+            // });
+          });
+      });
+    },
+
     //获取权限菜单
     getPermissionList() {
       new Promise((resolve, reject) => {
@@ -299,7 +305,7 @@ export default {
           if (res.data.success) {
             this.$tip.success("登录成功!");
             uni.navigateTo({
-              url: "/pages/index/index",
+              url: "/pages/inedx/inedx",
             });
           } else {
             this.$tip.error(res.data.message);
@@ -324,11 +330,10 @@ export default {
       console.log("changeloginType====");
       var tourl = configService.apiUrl;
       tourl = tourl.replace(9999, 8092);
-              // this.$tip.success("tourl="+tourl);
+      // this.$tip.success("tourl="+tourl);
       var rastourl =
-        "https://id.shendong.com.cn/default" +
-        "/login?service=" + tourl;
-		// rastourl ="http://182.92.126.35:8092/?ticket=234";
+        "https://id.shendong.com.cn/default" + "/login?service=" + tourl;
+      // rastourl ="http://182.92.126.35:8092/?ticket=234";
       console.log("===========" + rastourl);
       this.openBrowser(rastourl);
       // window.location.href='/pages/index/index?ticket=123'
@@ -337,7 +342,7 @@ export default {
     openBrowser(url) {
       // 使用uni.navigateTo打开内置浏览器
       console.log("----url---------------" + url);
-              // this.$tip.success("url="+url);
+      // this.$tip.success("url="+url);
       uni.navigateTo({
         url: "/pages/webview/webview?url=" + encodeURIComponent(url),
       });
@@ -376,17 +381,11 @@ export default {
   text-align: center;
 }
 
-
-
-
-
 .input-placeholder,
 .zai-input {
   color: #94afce;
 }
 
-
-
 .zai-btn {
   background: #ff65a3;
   color: #fff;

pages/warndata/components/device-detail.vue

@@ -7,7 +7,7 @@
       @click="NavChange"
     ></u-tabs>
     <view class="device-content">
-      <view class="top-area">
+      <view class="top-area" v-if="PageCur != 0">
         <view class="date-box" style="margin-bottom: 10px">
           <view class="date-text">开始时间:</view>
           <uni-datetime-picker

pages/warndata/components/dust-detail.vue

@@ -12,30 +12,30 @@
           <view style="font-weight: bold">{{ item.label }}</view>
         </view>
         <view class="top-card">
-          <view class="card-item card-item1">
+          <!-- <view class="card-item card-item1">
             <view class="item-box item-box1">
               <view class="box-val">{{ item.temperature || "--" }}</view>
               <view class="box-name">温度(℃)</view>
             </view>
-          </view>
+          </view> -->
           <view class="card-item card-item1">
             <view class="item-box item-box2">
               <view class="box-val">{{ item.dustval || "--" }}</view>
               <view class="box-name">粉尘浓度(mg/m³)</view>
             </view>
           </view>
-          <view class="card-item">
+          <!-- <view class="card-item">
             <view class="item-box item-box3">
               <view class="box-val">{{ item.waterPressure || "--" }}</view>
               <view class="box-name">喷雾水压(MPa)</view>
             </view>
-          </view>
-          <view class="card-item">
+          </view> -->
+          <!-- <view class="card-item">
             <view class="item-box item-box4">
               <view class="box-val">{{ item.atomizingState || "--" }}</view>
               <view class="box-name">喷雾状态</view>
             </view>
-          </view>
+          </view> -->
         </view>
         <view class="top-echart">
           <LineChart

pages/warndata/components/fire-detail-ckq.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="fire-detail-ckq">
-    <view class="top-area">
+    <!-- <view class="top-area">
       <view class="top-card">
         <view class="card-box" v-for="(item, index) in cardList" :key="index">
           <view class="box-item">
@@ -9,15 +9,15 @@
           </view>
         </view>
       </view>
-    </view>
-    <view class="center-area">
+    </view> -->
+    <!-- <view class="center-area">
       <view class="bot-title">
         <view style="font-weight: bold">光钎测温系统温度实时监测</view>
       </view>
       <view class="echartBox">
         <LineChart :chartData="option" :style="{ width: '100%' }"></LineChart>
       </view>
-    </view>
+    </view> -->
     <view class="bot-area">
       <view class="bot-title">
         <view style="font-weight: bold">束管系统监测</view>

pages/warndata/components/fire-detail-out.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 外因火灾 -->
   <view class="fire-detail-out">
-    <view class="top-area">
+    <!-- <view class="top-area">
       <view class="top-card">
         <view class="card-box" v-for="(item, index) in cardList" :key="index">
           <view class="box-item">
@@ -10,15 +10,15 @@
           </view>
         </view>
       </view>
-    </view>
-    <view class="center-area">
+    </view> -->
+    <!-- <view class="center-area">
       <view class="bot-title">
         <view style="font-weight: bold">光钎测温系统温度实时监测</view>
       </view>
       <view class="echartBox">
         <LineChart :chartData="option" :style="{ width: '100%' }"></LineChart>
       </view>
-    </view>
+    </view> -->
     <view class="bot-area" v-for="(item, index) in botList" :key="index">
       <view class="bot-title">
         <view style="font-weight: bold">{{ item.title }}</view>
@@ -33,6 +33,14 @@
               >{{ items.title }}</view
             >
           </view>
+          <view class="table-head" v-else-if="item.title == '温度传感器监测'">
+            <view
+              class="head-item1"
+              v-for="(items, index) in headList2"
+              :key="index"
+              >{{ items.title }}
+            </view>
+          </view>
           <view class="table-head" v-else>
             <view
               class="head-item1"
@@ -44,6 +52,16 @@
           <view class="table-content">
             <view
               class="content-tr"
+              v-if="item.title == '温度传感器监测'"
+              v-for="(ite, ind) in tableDataWd"
+              :key="ind"
+            >
+              <view class="content-td td1">{{ ite.val }}</view>
+              <view class="content-td td2">{{ ite.warnLevel_str }}</view>
+              <view class="content-td td3">{{ ite.readTime }}</view>
+            </view>
+            <view
+              class="content-tr"
               v-if="item.title == '烟雾传感器监测'"
               v-for="(ite, ind) in tableDataYw"
               :key="ind"
@@ -59,9 +77,9 @@
               v-for="(ite, ind) in tableDataCo"
               :key="ind"
             >
-              <view class="content-td td">{{ ite.strinstallpos }}</view>
-              <view class="content-td td1">{{ ite.warnLevel_str }}</view>
-              <view class="content-td td2">{{ ite.readTime }}</view>
+              <view class="content-td td1">{{ ite.strinstallpos }}</view>
+              <view class="content-td td2">{{ ite.warnLevel_str }}</view>
+              <view class="content-td td3">{{ ite.readTime }}</view>
             </view>
             <view
               class="content-tr"
@@ -105,6 +123,7 @@ export default {
         { name: "状态", value: "正常" },
       ],
       botList: [
+        { title: "温度传感器监测" },
         { title: "烟雾传感器监测" },
         { title: "一氧化碳传感器监测" },
         { title: "自动喷淋灭火装置监测" },
@@ -116,9 +135,11 @@ export default {
         { title: "时间" },
       ],
       headList1: [{ title: "设备名称" }, { title: "状态" }, { title: "时间" }],
+      headList2: [{ title: "值" }, { title: "状态" }, { title: "时间" }],
       tableDataYw: [],
       tableDataCo: [],
       tableDataPl: [],
+      tableDataWd: [],
     };
   },
   watch: {
@@ -163,7 +184,18 @@ export default {
           } else {
             that.tableDataYw = [];
           }
-
+          if (newW.temperature.length != 0) {
+            that.tableDataWd = newW.temperature.map((el) => {
+              return {
+                val: el.readData.fireval,
+                warnLevel_str:
+                  el.warnLevel_str == "正常" ? "低风险" : el.warnLevel_str,
+                readTime: el.readTime,
+              };
+            });
+          } else {
+            that.tableDataWd = [];
+          }
           if (newW.co.length != 0) {
             that.tableDataCo = newW.co;
           } else {

pages/warndata/components/gas-detail.vue

@@ -34,7 +34,7 @@
           <text class="icon-text">低风险</text>
         </view>
       </view>
-      <view class="top-area">
+      <view class="top-area" v-if="topContentList.length > 0">
         <view class="top-title">
           <view style="font-weight: bold">瓦斯抽采泵信息</view>
         </view>
@@ -135,11 +135,6 @@
             </view>
             <view class="content-item">
               <view class="item-l">
-                <view class="item-value">{{ item.warnFlag || "--" }}</view>
-                <view class="item-label">测点状态</view>
-              </view>
-              <view class="item-c"></view>
-              <view class="item-r">
                 <view class="item-value">{{ item.readTime || "--" }}</view>
                 <view class="item-label">数据时间</view>
               </view>
@@ -163,7 +158,7 @@ export default {
       timeRan: Number(new Date()),
       timer: "",
       PageCur: "0",
-      tabList: [{ name: "预警监测" }, { name: "预警指标" }],
+      tabList: [{ name: "预警监测" }],
       // isShowSelect: true,
       showJcd: false,
       searchText: "",

pages/warndata/warndata.vue

@@ -149,19 +149,17 @@
           </view>
         </view>
         <view class="flcard" v-show="isShow3" @click="getDetail('dust')">
-          <view class="firecard fire-style">
-            <view v-for="(value, key) in dustData" :key="key" class="fire-item">
-              <view style="margin-top: 20rpx">
-                <image
-                  src="/static/warndata/alarm.svg"
-                  class="icon-style"
-                  :style="{ backgroundColor: key === 'alarm' ? 'red' : key }"
-                ></image>
-                <span style="margin-top: 10rpx">
-                  {{ dustMap[key] }} :{{ value }}</span
-                >
-              </view>
+          <view class="datacard demo-layout bg-purple-light">
+            <view style="margin-top: 10rpx">
+              <text class="text-style1">{{ dustTotalcount }}</text>
+            </view>
+            <view style="margin-top: 10rpx">测点数量:</view>
+          </view>
+          <view class="datacard demo-layout bg-purple-light">
+            <view style="margin-top: 10rpx">
+              <text class="text-style1">{{ dustLevelstatus }}</text>
             </view>
+            <view style="margin-top: 10rpx">当前状态:</view>
           </view>
         </view>
 
@@ -285,6 +283,8 @@ export default {
       fireData: [],
       gasData: [],
       dustData: [],
+      dustTotalcount: 0,
+      dustLevelstatus: "",
       gasDevice: [],
       externalInfo: [],
       internalInfo: [],
@@ -415,7 +415,10 @@ export default {
               this.gasData = response.data.result.info.sysInfo.gasS;
               this.gasDevice = this.gasData.devices;
               this.xufengliang = this.windData.sysdata.xufengliang;
-              this.dustData = response.data.result.info.sysInfo.dustS.levels;
+              this.dustTotalcount =
+                response.data.result.info.devicekindInfo.dusting.totalcount;
+              this.dustLevelstatus =
+                response.data.result.info.devicekindInfo.dusting.levelstatus;
             } else {
               reject(response);
             }