Merge branch 'master' of http://39.104.94.153:3000/yf_zd/cropland

config/index.js

@@ -21,7 +21,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.1.3', // can be overwritten by process.env.HOST
+    host: '192.168.1.10', // can be overwritten by process.env.HOST
     port: 8000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

package-lock.json

@@ -8720,8 +8720,7 @@
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "optional": true
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
     },
     "pify": {
       "version": "3.0.0",
@@ -13648,6 +13647,11 @@
       "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="
     },
+    "vuex": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
+      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
+    },
     "watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
@@ -13737,7 +13741,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -13794,7 +13797,6 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "optional": true,
           "requires": {
             "kind-of": "^3.0.2"
           }

src/pages/bigdata/bcbd/Bcbd.vue

@@ -46,20 +46,25 @@
               <el-col :span="12">
                 <el-dropdown trigger="click" @command="handleCommand">
                   <span class="el-dropdown-link mainLi_value">
-                    {{
+                    <!-- {{
                       this.basemessage.valNum == ""
                         ? this.basemessage.redata.device_id
                         : this.basemessage.valNum
+                    }} -->
+                    {{
+                      this.basemessage.valNum == ""
+                        ? this.basemessage.redata.imei
+                        : this.basemessage.valNum
                     }}
                     <!-- {{this.basemessage.valNum}} -->
                     <i class="el-icon-arrow-down el-icon--right"></i>
                   </span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item
-                      :command="item.device_id"
+                      :command="item.imei"
                       v-for="(item, index) in this.basemessage.reDataList"
                       :key="index"
-                      >{{ item.device_id }}</el-dropdown-item
+                      >{{ item.imei }}</el-dropdown-item
                     >
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -89,6 +94,7 @@
               <div class="mainLi_name">最新上报时间:</div>
               <div class="mainLi_value">
                 {{ this.basemessage.redata.status_time }}
+                <!-- {{ this.basemessage.redata.addtime }} -->
               </div>
             </li>
           </ul>
@@ -362,10 +368,15 @@
             <li class="main_li">
               <div class="mainLi_circle">
                 <div class="mainLi_val">
-                  {{
+                  <!-- {{
                     this.facilitystate.redata.device_status == "0"
                       ? "离线"
                       : "在线"
+                  }} -->
+                   {{
+                    this.facilitystate.redata.is_online == "0"
+                      ? "离线"
+                      : "在线"
                   }}
                 </div>
               </div>
@@ -1000,6 +1011,7 @@ export default {
       // console.log(this.equips)
     },
     equipMarkerClick(item) {
+      console.log(item)
       this.equipShow = true;
       this.currEquip.name = item.name;
       this.currEquip.time = item.time;
@@ -1049,40 +1061,52 @@ export default {
           var onOffLine = []; //全部
           var equips = that.equips; //地图数据
           for (let i = 0; i < data.length; i++) {
-            DataId.push(data[i].device_id);
-            var time = data[i].status_time;
+            // DataId.push(data[i].device_id);
+            DataId.push(data[i].imei);
+            // var time = data[i].status_time;
+            var time = data[i].addtime;
             var date = new Date(parseInt(time) * 1000)
               .toLocaleString()
               .replace(/:\d{1,2}$/, " ");
             var dataA = data[i];
             dataA["status_time"] = date;
             reDataList.push(dataA);
-            onOffLine.push(data[i].device_status); //在线离线设备
+            // onOffLine.push(data[i].device_status); //在线离线设备
+            onOffLine.push(data[i].is_online); //在线离线设备
             var mapObj = {};
-            if (data[i].device_status == 0) {
+            // if (data[i].device_status == 0) {
+            if (data[i].is_online == 0) {
               //离线
-              offLine.push(data[i].device_status);
+              // offLine.push(data[i].device_status);
+              offLine.push(data[i].is_online);
               mapObj["equipName"] = "离线";
               mapObj["type"] = 3;
               mapObj["lat"] = data[i].lat;
               mapObj["lng"] = data[i].lng;
               mapObj["addr"] = data[i].address;
               mapObj["name"] = data[i].device_name;
-              mapObj["time"] = reDataList[i].status_time;
-              mapObj["id"] = reDataList[i].device_id;
-            } else if (data[i].device_status == 1) {
+              // mapObj["time"] = reDataList[i].status_time;
+              mapObj["time"] = this.formatTime(reDataList[i].addtime * 1000);
+              // mapObj["id"] = reDataList[i].device_id;
+              mapObj["id"] = reDataList[i].imei;
+            // } else if (data[i].device_status == 1) {
+            } else if (data[i].is_online == 1) {
               //在线
-              onLine.push(data[i].device_status);
+              // onLine.push(data[i].device_status);
+              onLine.push(data[i].is_online);
               mapObj["equipName"] = "在线";
               mapObj["type"] = 2;
               mapObj["lat"] = data[i].lat;
               mapObj["lng"] = data[i].lng;
               mapObj["addr"] = data[i].address;
               mapObj["name"] = data[i].device_name;
-              mapObj["time"] = reDataList[i].status_time;
-              mapObj["id"] = reDataList[i].device_id;
+              // mapObj["time"] = reDataList[i].status_time;
+              mapObj["time"] = this.formatTime(reDataList[i].addtime * 1000);
+              // mapObj["id"] = reDataList[i].device_id;
+              mapObj["id"] = reDataList[i].imei;
             }
             equips.push(mapObj);
+            console.log(mapObj)
           }
           that.facilitySurvey.onLine = onLine.length; //在线
           that.facilitySurvey.offLine = offLine.length; //离线
@@ -1093,13 +1117,17 @@ export default {
           that.basemessage.redata = reDataList[0]; //第一条数据为默认数据
           that.basemessage.reDataList = reDataList; //全部测报灯设备数据
           that.facilityState(
-            reDataList[0].device_id,
-            reDataList[0].device_status
+            // reDataList[0].device_id,
+            reDataList[0].imei,
+            // reDataList[0].device_status
+            reDataList[0].is_online
           );
           // that.renderGraph(reDataList[0].device_id) //环境温湿度、加热仓温度渲染
-          that.renderGraph(reDataList[0].d_id, reDataList[0].device_id); //环境温湿度、加热仓温度渲染
+          // that.renderGraph(reDataList[0].d_id, reDataList[0].device_id); //环境温湿度、加热仓温度渲染
+          that.renderGraph(reDataList[0].d_id, reDataList[0].imei); //环境温湿度、加热仓温度渲染
 
-          that.imgListData(reDataList[0].device_id); //设备图片接口
+          // that.imgListData(reDataList[0].device_id); //设备图片接口
+          that.imgListData(reDataList[0].imei); //设备图片接口
         })
         .catch((err) => {
           console.log(err);
@@ -1136,8 +1164,10 @@ export default {
           var DataId = []; //设备ID
           var reDataList = []; //测报灯全部设备数据
           for (let i = 0; i < data.length; i++) {
-            DataId.push(data[i].device_id);
-            var time = data[i].status_time;
+            // DataId.push(data[i].device_id);
+            DataId.push(data[i].imei);
+            // var time = data[i].status_time;
+            var time = data[i].addtime;
             var date = new Date(parseInt(time) * 1000)
               .toLocaleString()
               .replace(/:\d{1,2}$/, " ");
@@ -1147,12 +1177,15 @@ export default {
           }
           that.basemessage.redata = reDataList[0]; //第一条数据为默认数据
           that.facilityState(
-            reDataList[0].device_id,
-            reDataList[0].device_status
+            // reDataList[0].device_id,
+            reDataList[0].imie,
+            // reDataList[0].device_status
+            reDataList[0].is_online
           );
           // that.rendergraph.device_id = reDataList[0].device_id //传递给data
           // that.renderGraph(reDataList[0].device_id) //环境温湿度、加热仓温度渲染
-          that.renderGraph(reDataList[0].d_id, reDataList[0].device_id); //环境温湿度、加热仓温度渲染
+          // that.renderGraph(reDataList[0].d_id, reDataList[0].device_id); //环境温湿度、加热仓温度渲染
+          that.renderGraph(reDataList[0].d_id, reDataList[0].imei); //环境温湿度、加热仓温度渲染
         })
         .catch((err) => {
           console.log(err);
@@ -1246,6 +1279,9 @@ export default {
             let s = date.getSeconds();
             timeData.push(M + D);
           }
+          // console.log(timeData)
+          // console.log(temperature)
+          // console.log(humidity)
           that.rendergraph.timeData = timeData;
           that.rendergraph.temperature = temperature;
           that.rendergraph.humidity = humidity;

src/pages/bigdata/bqxz/Bqxz.vue

@@ -393,7 +393,8 @@ export default {
 							}
 						})
 						this.mapChart()
-						this.e_id = this.ids[0] //页面初始化的设备id
+						// this.e_id = this.ids[0] //页面初始化的设备id
+						this.e_id = this.ids[7] //页面初始化的设备id
 						this.getEquipInfo(this.e_id) //获取气象站信息
 						this.data24(this.e_id) //获取24小时数据
 					}

src/pages/bigdata/bzy/Bzy.vue

@@ -222,10 +222,12 @@ export default {
 				})
 			})
 				.then((res) => {
+					// console.log(res.data.data.data)
 					if (res.data) {
 						let data = res.data.data.data
 						data.forEach((item) => {
-							this.ids.push(item.device_id)
+							// this.ids.push(item.device_id)
+							this.ids.push(item.imei)
 							this.d_ids.push(item.d_id)
 							if (item.is_online == 1) {
 								this.bzy_on.push({ value: [item.lng, item.lat] })
@@ -239,8 +241,10 @@ export default {
 						this.chartsInit()
 						//地图
 						this.mapChart()
-						this.e_id = this.ids[0] //页面初始化的设备id
-						this.d_id = this.d_ids[0] //页面初始化的设备id
+						// this.e_id = this.ids[0] //页面初始化的设备id
+						this.e_id = this.ids[29] //页面初始化的设备id
+						// this.d_id = this.d_ids[0] //页面初始化的设备id
+						this.d_id = this.d_ids[29] //页面初始化的设备id
 						this.getEquipInfo(this.e_id)
 						// this.getChartData(this.d_id)
 						this.getDetailData(this.e_id)
@@ -263,7 +267,8 @@ export default {
 				let data = res.data.data.data[0]
 				this.equipInfo['设备名称'] = data.device_name
 				this.equipInfo['设备定位'] = data.address
-				this.equipInfo['最新上报时间'] = this.formatTime(data.status_time)
+				// this.equipInfo['最新上报时间'] = this.formatTime(data.status_time)
+				this.equipInfo['最新上报时间'] = this.formatTime(data.addtime * 1000)
 				this.isOnline = data.device_status
 			})
 		},
@@ -346,6 +351,8 @@ export default {
 					page_size: 1
 				})
 			}).then((res) => {
+				console.log(res.data)
+				console.log(res.data.data.data[0].d_h_t)
 				let data = res.data.data.data[0].d_h_t
 				this.bzyStatusFormat = []
 				this.bzyState = []

src/pages/bigdata/fourSituations/FourSituations.vue

@@ -146,7 +146,8 @@
       </div>
       <div class="center">
         <div class="cTop">
-          <div class="videobox" v-html="html"></div>
+          <!-- <div class="videobox" v-html="html"></div> -->
+          <div class="videobox" id="videoCon"></div>
           <div class="jkctrlBox" style="cursor: pointer">
             <img
               src="@/assets/images/bigdata/fourSituations/jkctrlBox1.png"
@@ -301,7 +302,7 @@ export default {
       bzy_d_id: "",
       bzy_status_list: [], //孢子仪在线状态集合
       bzy_status: "", //孢子仪在线状态
-      html: "",
+      // html: "",
       mySwiper: "",
     };
   },
@@ -338,7 +339,7 @@ export default {
         this.jk_id = this.jk_list[0];
         this.qxz_id = this.qxz_list[0];
         this.cbd_id = this.cbd_list[0];
-        this.bzy_id = this.bzy_list[0];
+        this.bzy_id = this.bzy_list[29];
         this.bzy_d_id = this.bzy_d_id_list[0];
         this.jk(this.jk_id);
         // this.bzyLine(this.bzy_d_id)
@@ -579,18 +580,34 @@ export default {
         data: this.qs.stringify({ device_id: id }),
       }).then((res) => {
         if (res.data.message == "") {
-          let data = eval("(" + res.data.data + ")");
-          let rtmpHdSrc = data.rtmp;
-          console.log(rtmpHdSrc);
-          //插件
-          this.html =
-            '<video id="myPlayer" autoplay  controls playsInline webkit-playsinline [autoplay] style="width:100%; height:100%;"><source src="' +
-            rtmpHdSrc +
-            '" type="application/x-mpegURL"></video>';
-          setTimeout(() => {
-            let player = new EZUIKit.EZUIPlayer(myPlayer);
-            player.play();
-          }, 1000);
+          // let data = eval("(" + res.data.data + ")");
+          // let rtmpHdSrc = data.rtmp;
+          // console.log(rtmpHdSrc);
+          // //插件
+          // this.html =
+          //   '<video id="myPlayer" autoplay  controls playsInline webkit-playsinline [autoplay] style="width:100%; height:100%;"><source src="' +
+          //   rtmpHdSrc +
+          //   '" type="application/x-mpegURL"></video>';
+          // setTimeout(() => {
+          //   let player = new EZUIKit.EZUIPlayer(myPlayer);
+          //   player.play();
+          // }, 1000);
+           let data = eval("(" + res.data.data + ")");
+            let hlsHd = data.hlsHd;
+            // this.jkSrc = hlsHd
+            // console.log(this.jkSrc)
+            let playHtml = `<video id="myPlayer"  muted autoplay  poster='' controls playsInline  webkit-playsinline src="${hlsHd}"  style="width:100%; height:100%;"></video>`;
+            console.log(hlsHd);
+            document.getElementById("videoCon").innerHTML = playHtml;
+            setTimeout(() => {
+              console.log(document.getElementById("myPlayer"));
+              this.player = new EZUIPlayer("myPlayer");
+              console.log(player);
+              this.player.play();
+              // let player = videojs('myPlayer')
+              // player.src({ src: hlsHd, type: 'application/x-mpegURL' })
+              // player.play()
+            }, 1000);
         }
       });
     },

src/pages/plantGuard/page1.vue

@@ -774,7 +774,7 @@ export default {
               this.$nextTick(()=>{
                 document.getElementById("equipListBox").scrollTop = 87*e.data.index;
                 
-                this.equipMarkerClick(e.data)
+                this.equipMarkerClick(e.data)  
               })
             })
           })