bug修复

src/components/highStand/sidebar.vue

@@ -3,7 +3,7 @@
     <div class="legend-menu" @click="toggleMenu" v-show="sidebarState"></div>
     <div class="legend-detail">
       <div class="content">
-        <el-tabs tab-position="left" v-model="slidactiveName" @tab-click="tabshandleClick">
+        <el-tabs tab-position="top" v-model="slidactiveName" @tab-click="tabshandleClick">
           <el-tab-pane
             v-for="(pages, index) in menu[equipType]"
             v-bind:key="index"
@@ -119,7 +119,7 @@ export default {
   align-items: flex-start;
   z-index: 9;
   .legend-menu {
-    width: 21px;
+    width: 18px;
     height: 103px;
     cursor: pointer;
     margin-top: calc(50vh - 100px);
@@ -141,6 +141,7 @@ export default {
     border-top-left-radius: 6px;
     border-bottom-left-radius: 6px;
     color: #212121;
+    background: rgba(12, 20, 44, 0.8);
     .content {
       padding: 20px;
       box-sizing: border-box;
@@ -157,35 +158,6 @@ export default {
     width: 400px;
   }
 }
-/deep/.el-tabs__item{
-  white-space: break-spaces;
-  height: inherit;
-  width: 42px;
-  line-height: 24px;
-  padding: 10px;
-  background: #dfdfdf;
-  color: #868686;
-  border-radius: 5px;
-  margin-bottom: 10px;
-}
-/deep/.el-tabs__nav-wrap::after,
-/deep/.el-tabs__active-bar{
-  background-color: #fff;
-}
-/deep/.el-tabs__item.is-active{
-  background: #0295ff;
-  color: #fff;
-}
-/deep/.el-tabs__content{
-  height: 100%;
-  overflow: auto;
-}
-/deep/.el-tabs--left .el-tabs__item.is-left{
-  text-align: center;
-}
-/deep/.el-tabs--left .el-tabs__active-bar.is-left{
-  right: -2px;
-}
 .el-tabs{
   height: 100%;
 }
@@ -196,6 +168,7 @@ export default {
 /deep/.el-form--label-top .el-form-item__label{
   padding: 0 0 0 13px;
   position: relative;
+  color: #92c2f3;
 }
 /deep/.el-form-item {
   margin-bottom: 5px;
@@ -227,4 +200,31 @@ export default {
 .el-select{
   width: 88%;
 }
+/deep/.legend-detail .content .el-tabs__item{
+  color: #e4e4e4;
+}
+/deep/.legend-detail .content .el-tabs__item.is-active,/deep/.legend-detail .content .el-tabs__item:hover{
+  color: #0295ff;
+}
+// input样式
+/deep/.el-form-item__content .el-input input{
+  background:transparent;
+  border: 1px solid #888888;
+  color: #dcdcdc;
+}
+/deep/.el-input-number__decrease{
+      border-right: 1px solid #828282;
+}
+/deep/.el-input-number__increase{
+      border-left: 1px solid #828282;
+}
+/deep/.el-input-number__increase, /deep/.el-input-number__decrease{
+  background: transparent;
+  line-height: 22px;
+  top: 4px;
+}
+/deep/.legend-detail .content .el-input--small .el-input__inner {
+    height: 24px;
+    line-height: 24px;
+}
 </style>

src/components/index.vue

@@ -191,7 +191,7 @@ export default {
         "102": 'icon-shuizhi',
         "11": 'icon-shuizhi',
         "12": 'icon-rizhi',
-        "13": 'icon-rizhi',
+        "13": 'icon-yujing',
         "14": 'icon-1',
         "15": 'icon-1',
         "16": 'icon-yen-2',

src/pages/plantGuard/disasterWarn/disasterWarn.vue

@@ -415,15 +415,16 @@ export default {
     equipWarnBoxShow(){
       this.equipWarnBox=true;
     },
-    editName(ctrl,item,index){
+    editName(ctrl,item,index2){
       if(ctrl == 'edit'){
-        this.equipData.forEach((item)=>{
-          item.key = 0
+        this.equipData.forEach((item,index)=>{
+          this.$set(this.equipData[index],'key',0);
         })
-        this.equipData[index].key = 1
-        this.editNameval = this.equipData[index].name;
+        this.$set(this.equipData[index2],'key',1);
+        this.editNameval = this.equipData[index2].name;
       }
       if(ctrl == 'cancel'){
+        
         this.equipData.forEach((item)=>{
           item.key = 0
         })
@@ -443,10 +444,11 @@ export default {
                   type: "success",
                   message: "修改成功",
                 });
-                this.equipData.forEach((item)=>{
-                  item.key = 0
+                this.equipData.forEach((item,index)=>{
+                  this.$set(this.equipData[index],'key',0);
                 })
-                this.equipData[index].name = this.editNameval
+                this.equipData[index2].name = this.editNameval
+                this.$forceUpdate();
               }else{
                 this.$message({
                   type: "error",
@@ -455,6 +457,7 @@ export default {
               }
         })
       }
+      this.$forceUpdate();
       
     },
     setQxzEleName(data){
@@ -690,8 +693,15 @@ export default {
       justify-content: space-around;
       line-height: 33px;
       color: #fff;
+      >div:nth-child(1){
+        width: 100px;
+        text-indent:14px;
+      }
       .wranmsg {
-        width: 157px;
+        width: 170px;
+      }
+      >div:nth-child(3){
+        width: 120px;
       }
     }
     .equipList {

src/pages/plantGuard/disasterWarn/sidebarWarn.vue

@@ -8,10 +8,10 @@
             <div class="top">
               <div class="titleTxt">
                 <span>基础信息</span>
-                <!-- <span>2021-1-03 12:12:00</span> -->
+                <span>{{uptime*1000 | formatTime}}</span>
               </div>
               <div class="titleCtrl">
-                <i @click="getQxzEle(1)" class="el-icon-refresh"></i>
+                <i @click="refreshDate()" class="el-icon-refresh"></i>
               </div>
             </div>
             <div class="inner">
@@ -151,6 +151,7 @@ export default {
       equipEleList: [],
       eleList:eleList,
       player:null,
+      uptime:'',
     };
   },
   methods: {
@@ -208,6 +209,7 @@ export default {
                 type: 'success'
               });
             }
+            this.uptime = res.data.data.dat.uptime
             this.renderEle()
         }
       });
@@ -358,11 +360,33 @@ export default {
         });
       }
     },
+    refreshDate(){
+      this.$axios({
+        method: "POST",
+        url: "/api/api_gateway?method=forecast.send_control.get_device_config",
+        data: this.qs.stringify({
+          device_type_id: 5,
+          d_id: this.qxzDid,
+          control_type: "data",
+        }),
+      }).then((res) => {
+        if (res.data.message == "") {
+          setTimeout(()=>{
+                this.getQxzEle(1);
+          },3000)
+        } else {
+          this.$message.err("刷新失败");
+        }
+      });
+    }
   },
   computed:{
     qxzId(){
       return this.$store.state.qxz_wran_id
     },
+    qxzDid(){
+      return this.$store.state.qxz_wran_did
+    },
     jkId(){
       return this.$store.state.jk_wran_id
     },

src/pages/plantGuard/disasterWarn/windowPopUp.vue

@@ -3,7 +3,7 @@
     <div class="infoWindowBox">
         <div class="topNav">
             <div class="title">最新预警消息</div>
-            <div class="record">
+            <div class="record" @click="goList()">
               <img src="../../../../static/images/disasterWarn/enterIcon.png" alt="">
             </div>
         </div>
@@ -96,6 +96,9 @@ export default {
       this.recognitionImage = [item.warning_pic]
       this.$viewer.view();
     },
+    goList(){
+      this.$router.push('/plantGuard/disasterWarnList')
+    }
   },
   mounted(){
   }

src/pages/plantGuard/irrigate/irrigate.vue

@@ -719,7 +719,7 @@ export default {
         })
       }).then(res => {
         this.$message({
-          message: '恭喜你，这是一条成功消息',
+          message: '下发成功',
           type: 'success'
         });
       })

src/pages/plantGuard/plantProtection/base.vue

@@ -97,7 +97,7 @@
       class="figEldialog"
       :visible.sync="scdDialogVisible"
       width="800px"
-      top="230px"
+      top="200px"
       :modal="false"
       :close-on-click-modal="true"
       :fullscreen="dialogFull"
@@ -134,7 +134,7 @@
       class="figEldialog"
       :visible.sync="cbdDialogVisible"
       width="800px"
-      top="230px"
+      top="200px"
       :modal="false"
       :close-on-click-modal="true"
       :fullscreen="dialogFull"
@@ -171,7 +171,7 @@
       class="figEldialog"
       :visible.sync="xycbDialogVisible"
       width="800px"
-      top="230px"
+      top="200px"
       :modal="false"
       :close-on-click-modal="true"
       :fullscreen="dialogFull"
@@ -208,7 +208,7 @@
       class="figEldialog"
       :visible.sync="qxzDialogVisible"
       width="800px"
-      top="230px"
+      top="200px"
       :modal="false"
       :close-on-click-modal="true"
       :fullscreen="dialogFull"
@@ -245,7 +245,7 @@
       class="figEldialog"
       :visible.sync="jkDialogVisible"
       width="800px"
-      top="230px"
+      top="200px"
       :modal="false"
       :close-on-click-modal="true"
       :fullscreen="dialogFull"
@@ -300,7 +300,7 @@
       class="figEldialog"
       :visible.sync="bzyDialogVisible"
       width="800px"
-      top="230px"
+      top="200px"
       :modal="false"
       :close-on-click-modal="true"
       :fullscreen="dialogFull"
@@ -343,7 +343,7 @@
       class="figEldialog"
       :visible.sync="setTimeDialogVisible"
       width="420px"
-      top="230px"
+      top="200px"
       :fullscreen="dialogFull"
       v-dialogDrag
     >
@@ -713,18 +713,12 @@ export default {
           name:"equipInfo",
           label:"设备信息",
         },{
-          name:"equipState",
-          label:"实时状态",
-        },{
           name:"equipHistoryDate",
           label:"历史数据",
         }],
         "3":[{
           name:"equipInfo",
           label:"设备信息",
-        },{
-          name:"equipState",
-          label:"实时状态",
         },
         {
           name:"cbdTabPhoto",
@@ -743,9 +737,6 @@ export default {
           name:"equipInfo",
           label:"设备信息",
         },{
-          name:"equipState",
-          label:"实时状态",
-        },{
           name:"equipHistoryDate",
           label:"历史数据",
         }],
@@ -753,9 +744,6 @@ export default {
           name:"equipInfo",
           label:"设备信息",
         },{
-          name:"qxzEquipState",
-          label:"实时状态",
-        },{
           name:"twentyFourHistoryDate",
           label:"24小时数据",
         },{
@@ -766,9 +754,6 @@ export default {
           name:"equipInfo",
           label:"设备信息",
         },{
-          name:"equipState",
-          label:"实时状态",
-        },{
           name:"bzyTabPhoto",
           label:"查看图片",
         },{
@@ -868,7 +853,8 @@ export default {
       })
       var polygon = new AMap.Polygon({
           path: polygonPath,  
-          fillOpacity: 0, // 多边形填充颜色
+          fillOpacity: 0.3, // 多边形填充颜色
+          fillColor: '#000', // 多边形填充颜色
           strokeWeight: 5, // 线条宽度，默认为 1
           strokeColor: 'yellow', // 线条颜色
           strokeOpacity:1
@@ -1007,7 +993,7 @@ export default {
         url: "/api/api_gateway?method=home.homes.equip_map_location",
         data: this.qs.stringify({
           equip_type: this.queryInfo.type,
-          device_id: this.searchEquipVal,
+          device_name: this.searchEquipVal,
           user_id:this.user_id
         }),
       }).then((res) => {

src/pages/plantGuard/plantProtection/baseAll.vue

@@ -456,43 +456,34 @@ methods: {
         
     },
     searchCity(){
-        var keyword = this.form.city; //关键字 
-        if(!keyword){
-            this.districtList = [];
-            this.form.district=''
-            return
-        }else{
-            this.distCluster.getClusterRecord(keyword,(error, result)=>{
-                // console.log(result);
-                //获取此区域下的数据点
-                this.mapData = [];
-                result.dataItems.forEach((item) => {
-                    this.mapData.push(item.dataItem)
-                });
-                this.$nextTick(()=>{
-                    this.pointSimplifierIns.setData(this.mapData)
-                })
+        var keyword = this.form.city || this.form.province; //关键字 
+        this.distCluster.getClusterRecord(keyword,(error, result)=>{
+            // console.log(result);
+            //获取此区域下的数据点
+            this.mapData = [];
+            result.dataItems.forEach((item) => {
+                this.mapData.push(item.dataItem)
+            });
+            this.$nextTick(()=>{
+                this.pointSimplifierIns.setData(this.mapData)
             })
-        }
+        })
         this.search('city',keyword)
     },
     searchDis(){
-        var keyword = this.form.district; //关键字 
-        if(!keyword){
-            return
-        }else{
-            this.distCluster.getClusterRecord(keyword,(error, result)=>{
-                // console.log(result);
-                //获取此区域下的数据点
-                this.mapData = [];
-                result.dataItems.forEach((item) => {
-                    this.mapData.push(item.dataItem)
-                });
-                this.$nextTick(()=>{
-                    this.pointSimplifierIns.setData(this.mapData)
-                })
+        var keyword = this.form.district ||this.form.city; //关键字 
+        this.distCluster.getClusterRecord(keyword,(error, result)=>{
+            // console.log(result);
+            //获取此区域下的数据点
+            this.mapData = [];
+            result.dataItems.forEach((item) => {
+                this.mapData.push(item.dataItem)
+            });
+            this.$nextTick(()=>{
+                this.pointSimplifierIns.setData(this.mapData)
             })
-        }
+        })
+        
         this.search('district',keyword)
     },
     search(levelSub,keyword) {

src/pages/plantGuard/plantProtection/baseComponents/equipHistoryDate.vue

@@ -16,6 +16,7 @@
           v-for="(item, index) in tableHeadTxt[equipType]"
           :key="index"
           :prop="item"
+          :fixed="item == 'addtime'?'left':false"
           :label="equipState_dict[item].name+equipState_dict[item].unit"
           :width="item=='addtime'?'170px':''"
         >
@@ -35,6 +36,7 @@
         </el-table-column>
       </el-table>
       <el-pagination
+        small
         background
         layout="prev, pager, next"
         :total="total"
@@ -77,11 +79,11 @@ export default {
       tableData:[],
       // 动态表头
       tableHeadTxt: {
-        "2":["ds", "ws", "tbs", "rps", "tps", "dps", "tt", "ct", "at", "ah", "cv", "bv","addtime"],
-        "3":["at","ah","hrt","rps","tps","lps","lamp","csq","current","vbat","addtime"],
-        "4":["proj","ds","ws","at","ah","cv","bv","cs","bs","infr_ct","csq","dver","addtime"],
-        "7":["ds","ws", "at", "ah", "set_temp", "pre_temp", "batStatus", "rps", "usb_sta", "csq", "dver", "addtime"],
-        // "7":["on_off", "at", "ah", "set_temp", "pre_temp", "batStatus", "rps", "usb_sta", "v_bat", "alti", "csq", "dver", "addtime"],
+        "2":["addtime","ds", "ws", "tbs", "rps", "tps", "dps", "tt", "ct", "at", "ah", "cv", "bv"],
+        "3":["addtime","at","ah","hrt","rps","tps","lps","lamp","csq","current","vbat"],
+        "4":["addtime","proj","ds","ws","at","ah","cv","bv","cs","bs","infr_ct","csq","dver"],
+        "7":["addtime","ds","ws", "at", "ah", "set_temp", "pre_temp", "batStatus", "rps", "usb_sta", "csq", "dver"],
+        // "7":["on_off", "at", "ah", "set_temp", "pre_temp", "batStatus", "rps", "usb_sta", "v_bat", "alti", "csq", "dver"],
       }
     };
   },
@@ -239,9 +241,7 @@ export default {
     },
     getChartLine(chart,table){
       switch(this.equipType){
-        case 2:
-          console.log(123213123);
-          
+        case 2: 
           if(chart){
             this.ChartData = [
               {
@@ -331,6 +331,8 @@ export default {
                   if(this.queryInfo.flag == 'auto'){
                     this.queryInfo.currNum++;
                     this.$refs.timeSearchRefs.timeBtnClick(this.queryInfo.currNum,this.queryInfo.flag);
+                  }else{
+                    this.tableData = [];
                   }
                 }
                 
@@ -402,9 +404,19 @@ export default {
             }).then((res) => {
               if (res.data.message == "") {
                 this.total = res.data.data.counts;
-                var data = res.data.data.data;
-                this.tableData = [];
-                this.tableData = data
+                if(this.total){
+                  var data = res.data.data.data;
+                  this.tableData = [];
+                  this.tableData = data
+                }else{
+                  if(this.queryInfo.flag == 'auto'){
+                    this.queryInfo.currNum++;
+                    this.$refs.timeSearchRefs.timeBtnClick(this.queryInfo.currNum,this.queryInfo.flag);
+                  }else{
+                    this.tableData = [];
+                  }
+                }
+                
               }
             });
           }
@@ -479,9 +491,19 @@ export default {
             }).then((res) => {
               if (res.data.message == "") {
                 this.total = res.data.data.counts;
-                var data = res.data.data.data;
-                this.tableData = [];
-                this.tableData = data
+                if(this.total){
+                  var data = res.data.data.data;
+                  this.tableData = [];
+                  this.tableData = data
+                }else{
+                  if(this.queryInfo.flag == 'auto'){
+                    this.queryInfo.currNum++;
+                    this.$refs.timeSearchRefs.timeBtnClick(this.queryInfo.currNum,this.queryInfo.flag);
+                  }else{
+                    this.tableData = [];
+                  }
+                }
+                
               }
             });
           }
@@ -548,9 +570,19 @@ export default {
             }).then((res) => {
               if (res.data.message == "") {
                 this.total = res.data.data.counts;
-                var data = res.data.data.data;
-                this.tableData = [];
-                this.tableData = data
+                if(this.total){
+                  var data = res.data.data.data;
+                  this.tableData = [];
+                  this.tableData = data
+                }else{
+                  if(this.queryInfo.flag == 'auto'){
+                    this.queryInfo.currNum++;
+                    this.$refs.timeSearchRefs.timeBtnClick(this.queryInfo.currNum,this.queryInfo.flag);
+                  }else{
+                    this.tableData = [];
+                  }
+                }
+                
               }
             });
           }
@@ -600,7 +632,7 @@ export default {
     border-bottom: 1px solid #434343;
     color: #eee;
 } 
-/deep/.customTable.el-table--enable-row-hover .el-table__body tr:hover > td{
+/deep/.customTable.el-table--enable-row-hover .el-table__body tr:hover > td,/deep/.el-table__body tr.hover-row > td{
   background-color:#042741
 }
 /deep/.customTable.el-table th.is-leaf,/deep/.customTable.el-table td{
@@ -621,4 +653,11 @@ export default {
 /deep/.el-pagination{
   margin-bottom: 0;
 }
+/deep/.el-pagination .el-pager li.active{
+  background-color: #0195ff!important;
+}
+/deep/.el-pagination.is-background .el-pager li:not(.disabled):hover{
+  color: #0195ff;
+}
+
 </style>

src/pages/plantGuard/plantProtection/baseComponents/equipHistoryDateQxz.vue

@@ -1,7 +1,7 @@
 <!-- 气象站设备历史数据 -->
 <template>
   <div class="equipInfo">
-    <DateSearch @dateChange="dateChange" @toggleSwitcState="toggleSwitcState"></DateSearch>
+    <DateSearch @dateChange="dateChange" ref="timeSearchRefs" @toggleSwitcState="toggleSwitcState"></DateSearch>
     <div v-if="switcState">
       <highcharts v-if="ChartData.length"
         :options="options"
@@ -15,6 +15,7 @@
 					:key="index"
 					:width="item.property == 'date' ? '160px' : ''"
 					:label="item.label"
+          :fixed="item.property == 'date'?'left':false"
 					:prop="item.property"
 				>
 					<template slot-scope="scope">{{
@@ -54,6 +55,8 @@ export default {
         begin:"",
         end:"",
         page:1,
+        currNum:'',
+        flag:'',
       },
       switcState:true,
       options:{},
@@ -85,6 +88,8 @@ export default {
       this.queryInfo.begin = data.begin;
       this.queryInfo.end = data.end;
       this.queryInfo.page = 1;
+      this.queryInfo.currNum = data.currNum;
+      this.queryInfo.flag = data.flag;
       this.getEchartsHisDataList();
       this.getHisDataList();
     },
@@ -284,6 +289,13 @@ export default {
 					}
 					this.hisData = arr2
 				} else {
+          if(this.queryInfo.flag == 'auto'){
+            this.queryInfo.currNum++;
+            this.$refs.timeSearchRefs.timeBtnClick(this.queryInfo.currNum,this.queryInfo.flag);
+          }else{
+            this.tableData = [];
+          }
+
 					this.hisData = []
 				}
 			})
@@ -329,7 +341,7 @@ export default {
     border-bottom: 1px solid #434343;
     color: #eee;
 } 
-/deep/.customTable.el-table--enable-row-hover .el-table__body tr:hover > td{
+/deep/.customTable.el-table--enable-row-hover .el-table__body tr:hover > td,/deep/.el-table__body tr.hover-row > td{
   background-color:#042741
 }
 /deep/.customTable.el-table th.is-leaf,/deep/.customTable.el-table td{
@@ -346,4 +358,11 @@ export default {
 /deep/.customTable.el-table::before{
 	background-color: #7d7d7d;
 }
+// 分页
+/deep/.el-pagination .el-pager li.active{
+  background-color: #0195ff!important;
+}
+/deep/.el-pagination.is-background .el-pager li:not(.disabled):hover{
+  color: #0195ff;
+}
 </style>

src/pages/plantGuard/plantProtection/baseComponents/equipInfo copy.vue

@@ -0,0 +1,308 @@
+<!-- 设备状态 -->
+<template>
+  <div class="equipInfo">
+    <div class="equipImg">
+      <img v-if="equipType==2" src="../../../../../static/images/equipImg2.png" alt="">
+      <img v-if="equipType==3" src="../../../../../static/images/equipImg3.png" alt="">
+      <img v-if="equipType==4" src="../../../../../static/images/equipImg4.jpg" alt="">
+      <img v-if="equipType==5" src="../../../../../static/images/equipImg5.png" alt="">
+      <img v-if="equipType==7" src="../../../../../static/images/equipImg7.png" alt="">
+      <img v-if="equipType==8" src="../../../../../static/images/equipImg8.jpg" alt="">
+      <p>设备类型：{{equipType|equipType}}</p>
+    </div>
+    <div class="equipMsg">
+      <div class="title">
+        <span></span>
+        <span>基础信息</span>
+      </div>
+      <div>设备ID：{{equipId}}</div>
+      <div>设备名称：{{info.device_name || '--'}}</div>
+      <div>在线状态：<span :class="[info.is_online?'online':'offline']">{{info.is_online?'在线':'离线'}}</span></div>
+      <template v-if="equipType==2">
+        <div>设备版本：{{info.dtype || '--'}}</div>
+      </template>
+      <template v-if="equipType==3">
+        <div>设备版本：{{info.dtype || '--'}}</div>
+      </template>
+      <template v-if="equipType==4">
+        <div>添加诱芯：
+          <span v-if="!lureShow">{{lure}}</span>
+          <span ref="upDateLure" v-if="lureShow">
+            <input type="text" v-model="editlure" placeholder="请输入监测害虫名称">
+            <i class="el-icon-check controlIcon" @click="submitYx()"></i>
+            <i class="el-icon-close controlIcon" @click="lureShow=false;editlure=lure"></i>
+          </span>
+          <i v-else class="el-icon-edit controlIcon" @click="changeLure()"></i>
+        </div>
+      </template>
+      <template v-if="equipType==5">
+        <div>电压：{{info.device_status || '--'}}</div>
+        <div>信号强度：{{info.device_status || '--'}}</div>
+      </template>
+      <template v-if="equipType==7">
+        <div>载玻片、培养液更换：
+          <span v-if="!lureShow">{{lure}}</span>
+          <span ref="upDateLure" v-if="lureShow">
+            <input type="text" v-model="editlure" placeholder="请输入监测害虫名称">
+            <i class="el-icon-edit controlIcon" @click="submitYx()"></i>
+            <i class="el-icon-edit controlIcon" @click="lureShow=false;editlure=lure"></i>
+          </span>
+          <i v-else class="el-icon-edit controlIcon" @click="setTime()"></i>
+        </div>
+      </template>
+      <div>最新上报时间：{{info.addtime*1000|formatTime}} 
+        <span><i class="el-icon-refresh controlIcon" @click="refreshDate()" v-if="info.d_id"></i></span>
+      </div>
+      <div v-if="equipType!=5">设备定位：{{info.address || '--'}}</div>
+    </div>
+    <div class="equipState">
+      <slot name="equipStateInner"></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
+//例如：import 《组件名称》 from '《组件路径》';
+export default {
+  //import引入的组件需要注入到对象中才能使用
+  components: {},
+  props: ["equipId", "equipType","d_id"],
+  data() {
+    //这里存放数据
+    return {
+      info:{},
+      editlure:"",
+      lure:"",
+      lureShow:false,
+      cultivate:"",
+      glass:""
+    };
+  },
+  //监听属性 类似于data概念
+  computed: {},
+  //监控data中的数据变化
+  watch: {},
+  //方法集合
+  methods: {
+    // 设备状态弹框
+    getEquipInfo(id, device_status) {
+      if(this.equipType==5){
+        this.$axios({
+          method: "POST",
+          url: "/api/api_gateway?method=weather.weather.qxz_page",
+          data: this.qs.stringify({
+            device_type_id: this.equipType,
+            device_id: id,
+            page: 1
+          })
+        }).then(res => {
+          if (res.data.message == "") {
+            if(res.data.data.counts == 0){
+              this.equipDataState=false;
+              this.info = {}
+            }else{
+              this.equipDataState = true;
+              var dat = res.data.data.ids[0]
+              dat.device_name = dat.equip_name;
+              dat.addtime = dat.uptime;
+              dat.imei = dat.equip_id;
+              this.info = dat
+            }
+          }
+        });
+      }else{
+        this.$axios({
+          method: "POST",
+          url: "/api/api_gateway?method=forecast.worm_lamp.lamp_list",
+          data: this.qs.stringify({
+            device_type_id: this.equipType,
+            page_size: 1,
+            device_id: id,
+            page: 1
+          })
+        }).then(res => {
+          if (res.data.message == "") {
+            if(res.data.data.counts>0){
+              this.info = res.data.data.data[0]
+            }else{
+              this.info = {
+                address: "",
+                dver_num: "--",
+                device_status:0,
+                status_time: 0
+              }
+            }
+          }
+        });
+      }
+    },
+    // 添加诱芯
+    changeLure(){
+      this.addYx()
+      this.lureShow = !this.lureShow;
+    },
+    addYx() {
+      this.$axios({
+        method: "POST",
+        url: "/api/api_gateway?method=device.device_manage.get_spore_time",
+        data: this.qs.stringify({
+          device_type_id: 4,
+          d_id:this.info.d_id,
+        }),
+      }).then((res) => {
+        if (res.data.message == "") {
+          let data = res.data.data;
+          this.lure = data.decoy;
+        }
+      });
+    },
+    submitYx() {
+      if (!this.editlure) {
+        this.$message.warning("请填写诱芯名称");
+        return false
+      }
+      this.$axios({
+        method: "POST",
+        url: "/api/api_gateway?method=device.device_manage.updata_spore_time",
+        data: this.qs.stringify({
+          device_type_id: 4,
+          d_id: this.info.d_id,
+          decoy: this.editlure,
+        }),
+      }).then((res) => {
+        if (res.data.message == "") {
+          this.$message.success("添加成功!");
+        } else {
+          this.$message.error(res.data.message);
+        }
+         this.changeLure();
+      });
+    },
+    // 载玻片、培养液
+    setTime(){
+      this.getSporeTime()
+    },
+    getSporeTime() {
+      this.$axios({
+        method: "POST",
+        url: "/api/api_gateway?method=device.device_manage.get_spore_time",
+        data: this.qs.stringify({
+          device_type_id: this.equipType,
+          d_id:this.info.d_id,
+        }),
+      }).then((res) => {
+        if (res.data.message == "") {
+          let data = res.data.data;
+          this.glass = data.glass_slide_time;
+          this.cultivate = data.cultivate_time;
+          var dat = {
+            glass:this.glass,
+            cultivate:this.cultivate,
+            d_id:this.info.d_id,
+          }
+          this.$emit('child-event',dat)
+        }
+      });
+    },
+    refreshDate(){
+      this.$axios({
+        method: "POST",
+        url: "/api/api_gateway?method=forecast.send_control.get_device_config",
+        data: this.qs.stringify({
+          device_type_id: this.equipType,
+          d_id: this.d_id,
+          control_type: "data",
+        }),
+      }).then((res) => {
+        if (res.data.message == "") {
+          setTimeout(()=>{
+            this.getEquipInfo(this.equipId,this.equipType);
+            var val = new Date().getTime();
+            this.$emit('getNowState');
+          },3000)
+        } else {
+          this.$message.err("刷新失败");
+        }
+      });
+    }
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    this.getEquipInfo(this.equipId,this.equipType)
+  },
+  beforeCreate() {}, //生命周期 - 创建之前
+  beforeMount() {}, //生命周期 - 挂载之前
+  beforeUpdate() {}, //生命周期 - 更新之前
+  updated() {}, //生命周期 - 更新之后
+  beforeDestroy() {}, //生命周期 - 销毁之前
+  destroyed() {}, //生命周期 - 销毁完成
+  activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
+};
+</script>
+<style scoped lang="less">
+// 设备信息样式
+.equipInfo{
+  display: flex;
+  justify-content: space-around;
+  align-content: center;
+  .equipImg{
+    position: relative;
+    flex: 1;
+    img{
+      width: 100%;
+      height: 100%;
+      border: 1px solid #9c9c9c;
+      border-radius: 5px;
+    }
+    p{
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      line-height: 33px;
+      background: rgba(0,0,0,.5);
+      color: #eee;
+      text-align: center;
+      font-size: 12px;
+    }
+  }
+  .equipMsg{
+    width: 300px;
+    padding-left: 25px;
+    line-height: 24px;
+    color: #92c2f3;
+    font-size: 13px;
+    .title{
+      font-size: 14px;
+      color: #fff;
+      span:nth-child(1){
+        // vertical-align: middle;
+        display: inline-block;
+        border: 4px solid #04d5e8;
+        margin-right: 2px;
+      }
+    }
+    >div{
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+  .equipState{
+    flex: 1;
+  }
+}
+.online{
+  color: #04d5e8;
+}
+.offline{
+  color: #ff0000;
+}
+.controlIcon{
+  color: #04d5e8;
+  cursor: pointer;
+}
+</style>

src/pages/plantGuard/plantProtection/baseComponents/equipInfo.vue

@@ -1,62 +1,121 @@
 <!-- 设备状态 -->
 <template>
-  <div class="equipInfo">
-    <div class="equipImg">
-      <img v-if="equipType==2" src="../../../../../static/images/equipImg2.png" alt="">
-      <img v-if="equipType==3" src="../../../../../static/images/equipImg3.png" alt="">
-      <img v-if="equipType==4" src="../../../../../static/images/equipImg4.jpg" alt="">
-      <img v-if="equipType==5" src="../../../../../static/images/equipImg5.png" alt="">
-      <img v-if="equipType==7" src="../../../../../static/images/equipImg7.png" alt="">
-      <img v-if="equipType==8" src="../../../../../static/images/equipImg8.jpg" alt="">
-      <p>设备类型：{{equipType|equipType}}</p>
-    </div>
-    <div class="equipMsg">
-      <div class="title">
-        <span></span>
-        <span>基础信息</span>
+  <div class="">
+    <div class="equipInfo">
+      <div class="equipImg">
+        <img v-if="equipType==2" src="../../../../../static/images/equipImg2.png" alt="">
+        <img v-if="equipType==3" src="../../../../../static/images/equipImg3.png" alt="">
+        <img v-if="equipType==4" src="../../../../../static/images/equipImg4.jpg" alt="">
+        <img v-if="equipType==5" src="../../../../../static/images/equipImg5.png" alt="">
+        <img v-if="equipType==7" src="../../../../../static/images/equipImg7.png" alt="">
+        <img v-if="equipType==8" src="../../../../../static/images/equipImg8.jpg" alt="">
+        <p>设备类型：{{equipType|equipType}}</p>
       </div>
-      <div>设备ID：{{equipId}}</div>
-      <div>设备名称：{{info.device_name || '--'}}</div>
-      <div>在线状态：<span :class="[info.is_online?'online':'offline']">{{info.is_online?'在线':'离线'}}</span></div>
-      <template v-if="equipType==2">
-        <div>设备版本：{{info.dtype || '--'}}</div>
-      </template>
-      <template v-if="equipType==3">
-        <div>设备版本：{{info.dtype || '--'}}</div>
-      </template>
-      <template v-if="equipType==4">
-        <div>添加诱芯：
-          <span v-if="!lureShow">{{lure}}</span>
-          <span ref="upDateLure" v-if="lureShow">
-            <input type="text" v-model="editlure" placeholder="请输入监测害虫名称">
-            <i class="el-icon-check controlIcon" @click="submitYx()"></i>
-            <i class="el-icon-close controlIcon" @click="lureShow=false;editlure=lure"></i>
-          </span>
-          <i v-else class="el-icon-edit controlIcon" @click="changeLure()"></i>
+      <div class="equipMsg">
+        <div class="title">
+          <span></span>
+          <span>基础信息</span>
         </div>
-      </template>
-      <template v-if="equipType==5">
-        <div>电压：{{info.device_status || '--'}}</div>
-        <div>信号强度：{{info.device_status || '--'}}</div>
-      </template>
-      <template v-if="equipType==7">
-        <div>载玻片、培养液更换：
-          <span v-if="!lureShow">{{lure}}</span>
-          <span ref="upDateLure" v-if="lureShow">
-            <input type="text" v-model="editlure" placeholder="请输入监测害虫名称">
-            <i class="el-icon-edit controlIcon" @click="submitYx()"></i>
-            <i class="el-icon-edit controlIcon" @click="lureShow=false;editlure=lure"></i>
-          </span>
-          <i v-else class="el-icon-edit controlIcon" @click="setTime()"></i>
+        <div>设备ID：{{equipId}}</div>
+        <div>设备名称：{{info.device_name || '--'}}</div>
+        <div>在线状态：<span :class="[info.is_online?'online':'offline']">{{info.is_online?'在线':'离线'}}</span></div>
+        <template v-if="equipType==2">
+          <div>设备版本：{{info.dtype || '--'}}</div>
+        </template>
+        <template v-if="equipType==3">
+          <div>设备版本：{{info.dtype || '--'}}</div>
+        </template>
+        <template v-if="equipType==4">
+          <div>添加诱芯：
+            <span v-if="!lureShow">{{lure}}</span>
+            <span ref="upDateLure" v-if="lureShow">
+              <input type="text" v-model="editlure" placeholder="请输入监测害虫名称">
+              <i class="el-icon-check controlIcon" @click="submitYx()"></i>
+              <i class="el-icon-close controlIcon" @click="lureShow=false;editlure=lure"></i>
+            </span>
+            <i v-else class="el-icon-edit controlIcon" @click="changeLure()"></i>
+          </div>
+        </template>
+        <template v-if="equipType==5">
+          <div>电压：{{info.device_status || '--'}}</div>
+          <div>信号强度：{{info.device_status || '--'}}</div>
+        </template>
+        <template v-if="equipType==7">
+          <div>载玻片、培养液更换：
+            <span v-if="!lureShow">{{lure}}</span>
+            <span ref="upDateLure" v-if="lureShow">
+              <input type="text" v-model="editlure" placeholder="请输入监测害虫名称">
+              <i class="el-icon-edit controlIcon" @click="submitYx()"></i>
+              <i class="el-icon-edit controlIcon" @click="lureShow=false;editlure=lure"></i>
+            </span>
+            <i v-else class="el-icon-edit controlIcon" @click="setTime()"></i>
+          </div>
+        </template>
+        <div>最新上报时间：{{info.addtime*1000|formatTime}} 
+          <span><i class="el-icon-refresh controlIcon" @click="refreshDate()" v-if="info.d_id"></i></span>
         </div>
-      </template>
-      <div>最新上报时间：{{info.addtime*1000|formatTime}} 
-        <span><i class="el-icon-refresh controlIcon" @click="refreshDate()" v-if="info.d_id"></i></span>
+        <div v-if="equipType!=5">设备定位：{{info.address || '--'}}</div>
+      </div>
+      <div class="equipState">
+        <slot name="equipStateInner"></slot>
       </div>
-      <div v-if="equipType!=5">设备定位：{{info.address || '--'}}</div>
     </div>
-    <div class="equipState">
-      <slot name="equipStateInner"></slot>
+    <div class="tab-pane" v-if="equipType !== 5">
+      <!-- {{equipId}}-
+      {{equipType}} -->
+      <div class="list" v-if="equipDataState">
+        <div class="elementItem" v-for="(item,index) in showState[equipType]" :key="index">
+          <!-- {{equipState_dict[item]}} -->
+          <div>{{equipState_dict[item].name}}</div>
+          <template v-if="item=='tt'">
+            <template v-if="equipData.ts == 1">
+              <div class="elementValue" >{{equipData['st']}}-{{equipData['et']}}{{equipState_dict['et'].unit}}</div>
+            </template>
+            <template v-else>
+              <div class="elementValue" v-if="equipState_dict[item].value">{{equipState_dict[item].value[equipData[item]]}}</div>
+              <div class="elementValue" v-else >{{equipData[item]}}{{equipState_dict[item].unit}}</div>
+            </template>
+          </template>
+          <template v-else>
+            <template v-if="item=='addtime'">
+              <div class="elementValue" >{{equipData[item]*1000|formatTime}}</div>
+            </template>
+            <template v-else-if="item=='at'">
+              <template v-if="equipData.new_tem">
+                <div class="elementValue" >{{equipData.new_tem}}{{equipState_dict[item].unit}}</div>
+              </template>
+              <template v-else>
+                <div class="elementValue" >{{equipData[item]}}{{equipState_dict[item].unit}}</div>
+              </template>
+            </template>
+            <template v-else-if="item=='ah'">
+              <template v-if="equipData.new_hum">
+                <div class="elementValue" >{{equipData.new_hum}}{{equipState_dict[item].unit}}</div>
+              </template>
+              <template v-else>
+                <div class="elementValue" >{{equipData[item]}}{{equipState_dict[item].unit}}</div>
+              </template>
+            </template>
+            <template v-else>
+              <div class="elementValue" v-if="equipState_dict[item].value">{{equipState_dict[item].value[equipData[item]]}}</div>
+              <div class="elementValue" v-else >{{equipData[item]}}{{equipState_dict[item].unit}}</div>
+            </template>
+          </template>
+            
+        </div>
+      </div>
+      <div v-else class="empty">
+          <div>暂无数据</div>
+      </div>
+    </div>
+    <div class="qxztab-pane" v-if="equipType == 5">
+      <div class="list">
+        <div class="elementItem" v-for="(item,index) in reaTimeStatusList" :key="index">
+          <div>{{item.e}}{{item.name}}</div>
+          <!-- <div>{{item.e}}{{item.name}}<i class="el-icon-refresh edit" @click="editName(item,index)"></i></div> -->
+          <div class="elementValue">{{item.num}}{{item.unit}}</div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -64,6 +123,7 @@
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
 //例如：import 《组件名称》 from '《组件路径》';
+import equipState_dict from './equipState_dict.json'
 export default {
   //import引入的组件需要注入到对象中才能使用
   components: {},
@@ -76,7 +136,19 @@ export default {
       lure:"",
       lureShow:false,
       cultivate:"",
-      glass:""
+      glass:"",
+      // 实施状态
+      equipState_dict,
+      showState: {
+          "2": ["ds","ws","rps","tps","dps","tt","ct","at","ah","cv","bv","csq","dver"],
+          "3": ["ds","ws","tt","hs","at","ah","upds","dnds","vbat","rps","tps","lps","csq","dver"],
+          "4": ["proj","ds","ws","at","ah","cv","bv","cs","bs","infr_ct","csq","dver"],
+          "7": ["at","ah","set_temp","pre_temp","bs","usb_sta","vbat","csq","dver"],
+      },
+      equipData:{},
+      equipDataState:true,
+      infos:'',
+      reaTimeStatusList:[],
     };
   },
   //监听属性 类似于data概念
@@ -217,14 +289,80 @@ export default {
       }).then((res) => {
         if (res.data.message == "") {
           setTimeout(()=>{
-            this.getEquipInfo(this.equipId,this.equipType);
-            var val = new Date().getTime();
-            this.$emit('getNowState');
+                this.equipStateSet(this.equipId, this.equipType);
           },3000)
         } else {
           this.$message.err("刷新失败");
         }
       });
+    },
+    // 设备状态弹框
+    equipStateSet(id, device_status) {
+      if(device_status == 5){
+        this.$axios({
+        method: "POST",
+        url: "/api/api_gateway?method=weather.weather.qxz_status",
+        data: this.qs.stringify({
+          device_type_id: this.equipType,
+          page_size: 1,
+          device_id: id,
+          page: 1
+        })
+      }).then(res => {
+        if (res.data.message == "") {
+          console.log(res.data.data.counts)
+            let arr = new Array();
+            let conf = res.data.data.conf;
+            let dat = res.data.data.dat;
+            for (let i1 in conf) {
+              if (conf[i1]) {
+                let arr2 = conf[i1].split("#");
+                let obj = {};
+                obj.e = "e" + i1.slice(1);
+                obj.name = arr2[0];
+                obj.unit = arr2[1];
+                for (let i2 in dat) {
+                  if (i1 == i2) {
+                    let arr3 = dat[i2].split("#");
+                    obj.num = arr3[0] == "-99.99" ? "N/A" : arr3[0];
+                    obj.icon = arr3[1];
+                    arr.push(obj);
+                  }
+                }
+              }
+            }
+            arr = arr.sort((a, b) => {
+              return a.e.slice(-1) - b.e.slice(-1);
+            });
+            this.reaTimeStatusList = arr;
+        }
+      });
+      }else{
+        this.$axios({
+          method: "POST",
+          url: "/api/api_gateway?method=forecast.worm_lamp.device_history_data",
+          data: this.qs.stringify({
+            device_type_id: this.equipType,
+            page_size: 1,
+            device_id: id,
+            page: 1
+          })
+        }).then(res => {
+          if (res.data.message == "") {
+            if(res.data.data.counts == 0){
+              this.equipDataState=false;
+              this.equipData = {}
+            }else{
+              this.equipDataState = true;
+              this.equipData = res.data.data.data[0].d_h_t
+              console.log(this.equipData);
+              console.log('this.equipData');
+              
+            }
+          }
+        });
+      }
+      
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -232,6 +370,7 @@ export default {
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
     this.getEquipInfo(this.equipId,this.equipType)
+    this.equipStateSet(this.equipId, this.equipType);
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
@@ -248,6 +387,7 @@ export default {
   display: flex;
   justify-content: space-around;
   align-content: center;
+  margin-bottom: 20px;
   .equipImg{
     position: relative;
     flex: 1;
@@ -305,4 +445,95 @@ export default {
   color: #04d5e8;
   cursor: pointer;
 }
+// 实时状态
+.tab-pane{
+    background: rgba(56,67,86,.7);
+    .list {
+      display: flex;
+      justify-content: left;
+      flex-direction: row;
+      flex-wrap: wrap;
+      padding: 10px 7px 5px 7px;
+      .elementItem{
+          width: 33.3333%;
+          box-sizing: border-box;
+          display: flex;
+          justify-content: space-between;
+          line-height: 36px;
+          border-left: 5px solid rgba(56,67,86,.7);
+          border-right: 5px solid rgba(56,67,86,.7);
+          margin-bottom: 10px;
+          padding: 0 9px;
+          font-size: .1625rem;
+          .elementValue{
+              color: #04d5e8;
+          }
+      }
+      
+      .elementItem:nth-child(6n+1),
+      .elementItem:nth-child(6n+2),
+      .elementItem:nth-child(6n+3){
+          background: #0c142c;
+      }
+
+      .elementItem:nth-child(6n+4),
+      .elementItem:nth-child(6n+5),
+      .elementItem:nth-child(6n+6){
+          background: #0c142c;
+      }
+  }
+  .empty{
+    line-height: 100px;
+    text-align: center;
+    font-size: 14px;
+    color: #0195ff;
+  }
+}
+// qxz实时状态
+.qxztab-pane{
+    background: rgba(56,67,86,.7);
+    .list {
+      display: flex;
+      justify-content: left;
+      flex-direction: row;
+      flex-wrap: wrap;
+      padding: 10px 7px 5px 7px;
+      .elementItem{
+          width: 33.3333%;
+          box-sizing: border-box;
+          display: flex;
+          justify-content: space-between;
+          line-height: 36px;
+          border-left: 5px solid rgba(56,67,86,.7);
+          border-right: 5px solid rgba(56,67,86,.7);
+          margin-bottom: 10px;
+          padding: 0 9px;
+          font-size: 13px;
+          .elementValue{
+              color: #04d5e8;
+          }
+          .edit{
+            cursor: pointer;
+          }
+      }
+      
+      .elementItem:nth-child(6n+1),
+      .elementItem:nth-child(6n+2),
+      .elementItem:nth-child(6n+3){
+          background: #0c142c;
+      }
+
+      .elementItem:nth-child(6n+4),
+      .elementItem:nth-child(6n+5),
+      .elementItem:nth-child(6n+6){
+          background: #0c142c;
+      }
+  }
+  .empty{
+    line-height: 100px;
+    text-align: center;
+    font-size: 14px;
+    color: #0195ff;
+  }
+}
 </style>

src/pages/plantGuard/plantProtection/cbdPestStats.vue

@@ -1142,7 +1142,7 @@ export default {
                 }
 
                 // 手动标记害虫数据处理 将自动以及手动标注数据融合到一起
-                if (time_d_sums[i].mark !== null) {
+                if (time_d_sums[i].mark) {
                   for (
                     var k = 0;
                     k < JSON.parse(time_d_sums[i].mark).length;
@@ -1733,7 +1733,9 @@ export default {
           this.imagepopShow = false;
           this.currentImage = row.img;
           this.$nextTick(() => {
-            this.renderData(JSON.parse(row.mark));
+            if(row.mark){
+              this.renderData(JSON.parse(row.mark));
+            }
           });
         } else {
           //自动统计

src/pages/plantGuard/plantProtection/equipCtrls/bzyctrl.vue

@@ -288,7 +288,8 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 .equipId{
   line-height: 33px;
   text-align: center;
-  background: #eee;
+  background: #0c142c;
+  color: #92c2f3;
 }
 .handAddFormBtn{
   margin-top: 20px;

src/pages/plantGuard/plantProtection/equipCtrls/cbdctrl.vue

@@ -287,7 +287,8 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 .equipId{
   line-height: 33px;
   text-align: center;
-  background: #eee;
+  background: #0c142c;
+  color: #92c2f3;
 }
 .handAddFormBtn{
   margin-top: 20px;

src/pages/plantGuard/plantProtection/equipCtrls/qxzctrl.vue

@@ -145,7 +145,8 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 .equipId{
   line-height: 33px;
   text-align: center;
-  background: #eee;
+  background: #0c142c;
+  color: #92c2f3;
 }
 .handAddFormBtn{
   margin-top: 20px;

src/pages/plantGuard/plantProtection/equipCtrls/scdctrl.vue

@@ -213,7 +213,8 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 .equipId{
   line-height: 33px;
   text-align: center;
-  background: #eee;
+  background: #0c142c;
+  color: #92c2f3;
 }
 .handAddFormBtn{
   margin-top: 20px;

src/pages/plantGuard/plantProtection/equipCtrls/simCode.vue

@@ -93,6 +93,7 @@ export default {
       (this.options2 = {
         chart: {
           type: "pie",
+          backgroundColor:'rgba(0,0,0,0)',
           options3d: {
             enabled: true,
             alpha: 60,
@@ -200,7 +201,8 @@ export default {
 .equipId {
   line-height: 33px;
   text-align: center;
-  background: #eee;
+  background: #0c142c;
+  color: #92c2f3;
 }
 .subTitle {
   margin: 15px 0;
@@ -208,6 +210,7 @@ export default {
   font-size: 14px;
   border-left: 4px solid #0295ff;
   padding-left: 10px;
+  color: #92c2f3;
 }
 .simCodeTitle {
   line-height: 40px;
@@ -215,6 +218,7 @@ export default {
   margin-left: 11px;
   position: relative;
   padding-left: 16px;
+  color: #92c2f3;
 }
 .simCodeTitle::before {
   position: absolute;

src/pages/plantGuard/plantProtection/equipCtrls/xycbctrl.vue

@@ -215,7 +215,8 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 .equipId{
   line-height: 33px;
   text-align: center;
-  background: #eee;
+  background: #0c142c;
+  color: #92c2f3;
 }
 .handAddFormBtn{
   margin-top: 20px;

src/pages/plantGuard/plantProtection/warn/cbdMsgWarn.vue

@@ -416,7 +416,8 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 .equipId{
   line-height: 33px;
   text-align: center;
-  background: #eee;
+  background: #0c142c;
+  color: #92c2f3;
 }
 .handAddFormBtn{
   margin-top: 20px;
@@ -435,6 +436,8 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 	h2{
 		padding-left: 10px;
 		border-left: 5px solid #0295ff;
+		color: #92c2f3;
+    	font-size: 15px;
 	}
 }
 
@@ -444,9 +447,9 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 	line-height: 40px;
 	font-size: 14px;
 	position: relative;
-	color: #606060;
+	color: #d2d2d2;
 	span {
-		color: #000;
+		color: #ff9494;
 		font-weight: bold;
 	}
 }
@@ -491,4 +494,10 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 	text-align: right;
 	margin-top: 20px;
 }
+// input样式
+/deep/.category .el-input input{
+  background: transparent;
+  border: 1px solid #888888;
+  color: #dcdcdc;
+}
 </style>

src/pages/plantGuard/plantProtection/warn/qxzMsgWarn.vue

@@ -1,8 +1,8 @@
 <!-- 气象站短信预警 -->
 <template>
-  <div class=''>
+  <div>
     <div class="equipId">设备ID：{{equipId}}</div>
-	<div>
+	<div class='category'>
 		<div>
 			<div class="title">预警手机号</div>
 			<div>
@@ -131,7 +131,8 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 .equipId{
   line-height: 33px;
   text-align: center;
-  background: #eee;
+  background: #0c142c;
+  color: #92c2f3;
 }
 .handAddFormBtn{
   margin-top: 20px;
@@ -147,6 +148,7 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 	position: relative;
 	color: #606060;
 	margin-top: 20px;
+	color: #92c2f3;
 	span {
 		color: #000;
 		font-weight: bold;
@@ -162,6 +164,7 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 	margin-left: 5px;
 	padding-left: 12px;
 	font-size: 14px;
+	color: #92c2f3;
 	line-height: 41px;
 }
 .title::before{
@@ -177,4 +180,10 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 	margin-top: 20px;
 	text-align: right;
 }
+// input样式
+/deep/.category .el-input input{
+  background: transparent;
+  border: 1px solid #888888;
+  color: #dcdcdc;
+}
 </style>