Ver código fonte

电气火灾三个tab渲染,可燃气体值判断显示

Ming 4 anos atrás
pai
commit
2d28fcceca

+ 4 - 4
src/pages/eleFireCard/eleFireCard.vue

@@ -222,10 +222,10 @@ export default {
 
           this.global.sendWs(json);
 
-          // setInterval(() => {
-          //   console.log("每隔30秒请求一次getDeviceDetail");
-          //   this.global.sendWs(json);
-          // }, 30000);
+          setInterval(() => {
+            // console.log("每隔30秒请求一次getDeviceDetail");
+            this.global.sendWs(json);
+          }, 30000);
         }
 
         if (redata.CMD == "getDeviceDetail") {

+ 1 - 1
src/pages/eleFireData/components/cableTemChart.vue

@@ -81,7 +81,7 @@ export default {
       this.myChart.setOption({
         // 通过这个color修改两条线的颜色
         title: {
-          text: "ABC三相电流",
+          text: "ABC三相线缆温度",
           textStyle: {
             align: "center",
             color: "#fff",

+ 1 - 1
src/pages/eleFireData/components/eleCurrentChart.vue

@@ -81,7 +81,7 @@ export default {
       this.myChart.setOption({
         // 通过这个color修改两条线的颜色
         title: {
-          text: "ABC三相电",
+          text: "ABC三相电",
           textStyle: {
             align: "center",
             color: "#fff",

+ 1 - 1
src/pages/eleFireData/components/voltageChart.vue

@@ -78,7 +78,7 @@ export default {
       this.myChart.setOption({
         // 通过这个color修改两条线的颜色
         title: {
-          text: "ABC三相电",
+          text: "ABC三相电",
           textStyle: {
             align: "center",
             color: "#fff",

+ 2 - 2
src/pages/eleFireData/eleFireData.vue

@@ -232,8 +232,8 @@ export default {
           this.global.sendWs(json);
 
           setInterval(() => {
-            console.log("每隔30秒请求一次getDeviceDetail");
-            this.global.sendWs(json);
+            // console.log("每隔30秒请求一次getDeviceDetail");
+            // this.global.sendWs(json);
           }, 30000);
         }
 

+ 4 - 4
src/pages/gasCard/gasCard.vue

@@ -97,10 +97,10 @@ export default {
 
           this.global.sendWs(json);
 
-          // setInterval(() => {
-          //   console.log("每隔30秒请求一次getDeviceDetail");
-          //   this.global.sendWs(json);
-          // }, 30000);
+          setInterval(() => {
+            // console.log("每隔30秒请求一次getDeviceDetail");
+            this.global.sendWs(json);
+          }, 30000);
 
         }
 

+ 4 - 4
src/pages/index/index.vue

@@ -111,10 +111,10 @@ export default {
 
           this.global.sendWs(json);
 
-          // setInterval(() => {
-          //   console.log("每隔30秒请求一次getStationDetail");
-          //   this.global.sendWs(json);
-          // }, 30000);
+          setInterval(() => {
+            // console.log("每隔30秒请求一次getStationDetail");
+            this.global.sendWs(json);
+          }, 30000);
         }
 
         if (redata.CMD == "getStationDetail") {

+ 212 - 27
src/pages/inspectRecord/inspectRecord.vue

@@ -6,40 +6,187 @@
         <return-back></return-back>
         <h3>电气火灾监控信息</h3>
         <p>更新时间:{{ Time }}</p>
-        <ul class="cardTabs"  >
-          <li v-for="(item, index) in eleData"
-            :key="index"  @click="Inv = index" :class="{ active: Inv === index }">{{item.DeviceName}}</li>
+        <ul class="cardTabs">
+          <li
+            v-for="(item, index) in eleData"
+            :key="index"
+            @click="Inv = index"
+            :class="{ active: Inv === index }"
+          >
+            {{ item.DeviceName }}
+          </li>
           <!-- <li @click="Inv = 1" :class="{ active: Inv === 1 }">电气火灾2</li> -->
         </ul>
-        <div class="tabBox fireTabs" style="margin-bottom:3%">
-          <table v-show="Inv == index" v-for="(item, index) in eleData"
-            :key="index" >
+        <div class="tabBox fireTabs" style="margin-bottom: 3%">
+          <table
+            v-show="Inv == index"
+            v-for="(item, index) in eleData"
+            :key="index"
+          >
             <tr>
-              <th>1供电过压告警:<span class="normal">正常</span></th>
-              <th>供电低压告警:<span class="normal">正常</span></th>
-              <th>供电过流告警:<span class="normal">正常</span></th>
-              <th>漏电告警:<span class="normal">正常</span></th>
+              <th>
+                {{ item.Points[0].PointName }}:<span
+                  :class="[item.Points[0].Value == 0 ? 'normal' : 'error']"
+                  >{{
+                    item.Points[0].Value == 0
+                      ? "正常"
+                      : item.Points[0].Value == 1
+                      ? "告警"
+                      : "故障"
+                  }}</span
+                >
+              </th>
+
+              <th>
+                {{ item.Points[1].PointName }}:<span
+                  :class="[item.Points[1].Value == 0 ? 'normal' : 'error']"
+                  >{{
+                    item.Points[1].Value == 0
+                      ? "正常"
+                      : item.Points[1].Value == 1
+                      ? "告警"
+                      : "故障"
+                  }}</span
+                >
+              </th>
+              <th>
+                {{ item.Points[2].PointName }}:<span
+                  :class="[item.Points[2].Value == 0 ? 'normal' : 'error']"
+                  >{{
+                    item.Points[2].Value == 0
+                      ? "正常"
+                      : item.Points[2].Value == 1
+                      ? "告警"
+                      : "故障"
+                  }}</span
+                >
+              </th>
+              <th>
+                {{ item.Points[3].PointName }}:<span
+                  :class="[item.Points[3].Value == 0 ? 'normal' : 'error']"
+                  >{{
+                    item.Points[3].Value == 0
+                      ? "正常"
+                      : item.Points[3].Value == 1
+                      ? "告警"
+                      : "故障"
+                  }}</span
+                >
+              </th>
             </tr>
             <tr>
               <td>
-                <P>A相线缆温度超高:<span class="normal">正常</span></P>
-                <P>B相线缆温度超高:<span class="normal">正常</span></P>
-                <P>C相线缆温度超高:<span class="normal">正常</span></P>
+                <P>
+                  {{ item.Points[4].PointName }}:<span
+                    :class="[item.Points[4].Value == 0 ? 'normal' : 'error']"
+                    >{{
+                      item.Points[4].Value == 0
+                        ? "正常"
+                        : item.Points[4].Value == 1
+                        ? "告警"
+                        : "故障"
+                    }}</span
+                  ></P
+                >
+                <P>
+                  {{ item.Points[5].PointName }}:<span
+                    :class="[item.Points[5].Value == 0 ? 'normal' : 'error']"
+                    >{{
+                      item.Points[5].Value == 0
+                        ? "正常"
+                        : item.Points[5].Value == 1
+                        ? "告警"
+                        : "故障"
+                    }}</span
+                  ></P
+                >
+                <P>
+                  {{ item.Points[6].PointName }}:<span
+                    :class="[item.Points[6].Value == 0 ? 'normal' : 'error']"
+                    >{{
+                      item.Points[6].Value == 0
+                        ? "正常"
+                        : item.Points[6].Value == 1
+                        ? "告警"
+                        : "故障"
+                    }}</span
+                  ></P
+                >
               </td>
               <td>
-                <P>A相电压:<span class="normal">219.00</span></P>
-                <P>B相电压:<span class="normal">219.00</span></P>
-                <P>C相电压:<span class="normal">219.00</span></P>
+                <P
+                  >A相电压:
+                  <span :class="[item.Points[7].Value == 0 ? 'normal' : 'error']" v-if="getData.length > 0">
+                    {{ item.Points[7].Value }}
+                  </span>
+                  <span v-else> 219.00 </span>
+                </P>
+                <P
+                  >B相电压:
+                  <span class="normal" v-if="getData.length > 0">
+                    {{ item.Points[8].Value }}
+                  </span>
+                  <span v-else> 219.00 </span>
+                </P>
+                <P
+                  >C相电压:
+                  <span class="normal" v-if="getData.length > 0">
+                    {{ item.Points[9].Value }}
+                  </span>
+                  <span v-else> 219.00 </span>
+                </P>
               </td>
               <td>
-                <P>A相电流:<span class="normal">9.00</span></P>
-                <P>B相电流:<span class="error">3.00</span></P>
-                <P>C相电流:<span class="normal">9.00</span></P>
+                <P
+                  >A相电流:
+                  <span class="normal" v-if="getData.length > 0">
+                    {{ item.Points[10].Value }}
+                  </span>
+                  <span v-else> 9.00 </span>
+                </P>
+                <P
+                  >B相电流:
+                  <!-- <span class="error">3.00</span> -->
+                  <span class="normal" v-if="getData.length > 0">
+                    {{ item.Points[11].Value }}
+                  </span>
+                  <span v-else> 9.00 </span>
+                </P>
+                <P
+                  >C相电流:
+                  <span class="normal" v-if="getData.length > 0">
+                    {{ item.Points[12].Value}}
+                  </span>
+                  <span v-else> 9.00 </span>
+                  <!-- <span class="normal">9.00</span> -->
+                </P>
               </td>
               <td>
-                <P>A相线缆温度:<span class="normal">29.00</span></P>
-                <P>B相线缆温度:<span class="error">56.00</span></P>
-                <P>C相线缆温度:<span class="normal">29.00</span></P>
+                <P
+                  >A相线缆温度:
+                  <span class="normal" v-if="getData.length > 0">
+                    {{ item.Points[13].Value }}
+                  </span>
+                  <span v-else> 29.00 </span>
+                  <!-- <span class="normal">29.00</span> -->
+                </P>
+                <P
+                  >B相线缆温度:
+                  <span class="normal" v-if="getData.length > 0">
+                    {{ item.Points[14].Value }}
+                  </span>
+                  <span v-else> 29.00 </span>
+
+                  <!-- <span class="error">56.00</span> -->
+                </P>
+                <P
+                  >C相线缆温度:
+                  <span class="normal" v-if="getData.length > 0">
+                    {{ item.Points[15].Value }}
+                  </span>
+                  <span v-else> 29.00 </span>
+                  <!-- <span class="normal">29.00</span> -->
+                </P>
               </td>
             </tr>
           </table>
@@ -117,13 +264,27 @@
             <h3>{{ item.DeviceName }}</h3>
             <div>
               <ul>
+                <!-- <li>告警状态</li>
+                <li>浓度值</li> -->
                 <li v-for="(innerItem, index) in item.Points" :key="index">
-                  {{ innerItem.PointName}}
+                  {{ innerItem.PointName }}
                 </li>
               </ul>
               <ul>
                 <li v-for="(innerItem, index) in item.Points" :key="index">
-                  {{ 'Value' in innerItem ? innerItem.Value : '-'}}
+                  <span
+                    v-if="'Value' in innerItem"
+                    :class="[innerItem.Value == 0 ? 'normal' : 'error']"
+                  >
+                    {{
+                      index == 0
+                        ? innerItem.Value == 0
+                          ? "正常"
+                          : "异常"
+                        : innerItem.Value
+                    }}
+                  </span>
+                  <span v-else>-</span>
                 </li>
               </ul>
             </div>
@@ -146,7 +307,7 @@ export default {
   data() {
     return {
       getData: [],
-      eleData:[],
+      eleData: [],
       Inv: 0,
       Time: "",
     };
@@ -182,8 +343,32 @@ export default {
           this.recordData = redata.RESULT.LIST;
           // console.log(this.recordData);
           this.getData = this.recordData;
-          this.eleData=this.recordData.slice(3,6);
-          console.log(this.eleData)
+          this.eleData = this.recordData.slice(3, 6);
+
+          console.log("排序前");
+          console.log(this.eleData);
+
+          let sortPointer = [
+            1, 2, 3, 4, 5, 6, 7, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+          ];
+
+          // console.log(sortPointer);
+
+          // console.log(element1)
+
+          this.eleData.forEach((element2, index) => {
+            let sortPointerArr = [];
+            element2.Points.forEach((element3) => {
+              sortPointer.forEach((index) => {
+                if (element3.BusAddr == index) {
+                  sortPointerArr.push(element3);
+                }
+              });
+            });
+            this.eleData[index].Points = sortPointerArr;
+          });
+          console.log("排序后");
+          console.log(this.eleData);
         }
       }
     },

+ 4 - 4
src/pages/recordTime/recordTime.vue

@@ -95,10 +95,10 @@ export default {
 
           this.global.sendWs(json);
 
-          // setInterval(() => {
-          //   console.log("每隔30秒请求一次getPatrolRecord");
-          //   this.global.sendWs(json);
-          // }, 30000);
+          setInterval(() => {
+            // console.log("每隔30秒请求一次getPatrolRecord");
+            this.global.sendWs(json);
+          }, 30000);
         }
 
         if (redata.CMD == "getPatrolRecord") {