Merge branch 'develop' of http://code.nyzhwlw.com:10202/yf_zhb/bigdata_WX into develop

pages/bzy/detail.vue

@@ -70,7 +70,7 @@
           </view>
         </view>
       </view>
-      <view v-if="activeTab === 'viewImage'">
+      <view v-show="activeTab === 'viewImage'">
         <photoImage
           :images="imageList"
           :pestList="pestList"
@@ -80,7 +80,7 @@
           :deviceInfo="deviceInfo"
         />
       </view>
-      <view v-if="activeTab === 'deviceData'">
+      <view v-show="activeTab === 'deviceData'">
         <DeviceData
           :deviceStatic="deviceStatic"
           :deviceInfo="deviceInfo"
@@ -318,6 +318,7 @@ export default {
     handleChange(e){
       this.startDate = e.startDate;
       this.endDate = e.endDate;
+      this.page = 1;
       this.initAction();
     },
     showCalendar(){
@@ -392,8 +393,8 @@ export default {
         data: {
           device_type_id: this.deviceInfo.type_id,
           d_id: this.deviceInfo.d_id,
-          start_time: new Date(this.startDate).getTime()/1000,// 转成毫秒
-          end_time: new Date(this.endDate).getTime()/1000,// 转成毫秒
+          start_time: new Date(this.startDate + ' 00:00:00').getTime()/1000,// 转成毫秒
+          end_time: new Date(this.endDate + ' 23:59:59').getTime()/1000,// 转成毫秒
         },
       });
       const data = res || [];
@@ -406,8 +407,8 @@ export default {
         data: {
           device_type_id: this.deviceInfo.type_id,
           device_id: this.deviceInfo.id,
-          start_time: new Date(this.startDate).getTime()/1000,
-          end_time: new Date(this.endDate).getTime()/1000,
+          start_time: new Date(this.startDate + ' 00:00:00').getTime()/1000,
+          end_time: new Date(this.endDate + ' 23:59:59').getTime()/1000,
           page: this.page,
           page_size: this.page_size,
         },

pages/cb/bzy/equip-set/equip-set.vue

@@ -23,7 +23,7 @@
 		<view class="tit" v-if="device_model == 0">
 			载玻片滴液时间
 		</view>
-		<view class="uni-list-cell" @click="selectFun('drop_time')">
+		<view class="uni-list-cell" @click="selectFun('drop_time')" v-if="device_model == 0">
 			<text class="uni-input">{{setFrom.drop_time}}</text>
 			<view class="arrow"></view>
 			<u-select v-model="drop_time_show" mode="single-column" :list="drop_time_List" @confirm="confirm($event,'drop')"></u-select>
@@ -34,29 +34,29 @@
 		<view class="" v-if="device_model == 0">
 			<slider :value="setFrom.cul_time" show-value="true" :min="1" :max="24" @change="sliderChange($event,'cul_time')"  block-color="#57C878" activeColor="#57C878" step="1" />
 		</view>
-		<view class="tit">
+		<view class="tit" v-if="device_model == 0">
 			保温仓设定温度(℃)
 		</view>
-		<view class="">
+		<view class="" v-if="device_model == 0">
 			<slider :value="setFrom.set_temp" show-value="true" :min="10" :max="40" @change="sliderChange($event,'set_temp')"  block-color="#57C878" activeColor="#57C878" step="1" />
 		</view>
 		<view class="tit">
-			高温保护阈值(℃)
+			数据上传时间间隔(min)
 		</view>
 		<view class="">
-			<slider :value="setFrom.tph" show-value="true" :min="50" :max="70" @change="sliderChange($event,'tph')"  block-color="#57C878" activeColor="#57C878" step="1" />
+			<slider :value="setFrom.datt" show-value="true" :min="10" :max="60" @change="sliderChange($event,'datt')"  block-color="#57C878" activeColor="#57C878" step="1" />
 		</view>
 		<view class="tit">
-			低温保护阈值(℃)
+			高温保护阈值(℃)
 		</view>
 		<view class="">
-			<slider :value="setFrom.tpl" show-value="true" :min="-30" :max="20" @change="sliderChange($event,'tpl')"  block-color="#57C878" activeColor="#57C878" step="1" />
+			<slider :value="setFrom.tph" show-value="true" :min="50" :max="70" @change="sliderChange($event,'tph')"  block-color="#57C878" activeColor="#57C878" step="1" />
 		</view>
 		<view class="tit">
-			数据上传时间间隔(min)
+			低温保护阈值(℃)
 		</view>
 		<view class="">
-			<slider :value="setFrom.datt" show-value="true" :min="10" :max="60" @change="sliderChange($event,'datt')"  block-color="#57C878" activeColor="#57C878" step="1" />
+			<slider :value="setFrom.tpl" show-value="true" :min="-30" :max="20" @change="sliderChange($event,'tpl')"  block-color="#57C878" activeColor="#57C878" step="1" />
 		</view>
 		<view class="tit">
 			采集开启和关闭时间

pages/cb/cbd/equip-set/imgpage.vue

@@ -123,7 +123,7 @@
 				// console.log(e)
 			},
 			//forecast.forecast_system.equip_photofo
-			async imglistdata(time_begin, time_end) { //获取图片列表
+			async imglistdata(time_begin, time_end,isInit) { //获取图片列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.forecast_system.device_photo_list',
 					data: {
@@ -136,7 +136,11 @@
 						time_end: time_end, //结束时间
 					}
 				})
-				this.imglists = this.imglists.concat(res.data)
+				if(isInit){
+					this.imglists = res.data
+				}else{
+					this.imglists = this.imglists.concat(res.data)
+				}
 				console.log(this.imglists)
 				if (this.imglists.length == 0) {
 					this.tishi = true
@@ -145,7 +149,7 @@
 				}
 			},
 			// 孢子仪的图片列表
-			async imglistdataBzy(time_begin, time_end) { //获取图片列表
+			async imglistdataBzy(time_begin, time_end,isInit) { //获取图片列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo',
 					data: {
@@ -158,7 +162,11 @@
 						time_end: time_end, //结束时间
 					}
 				})
-				this.imglists = this.imglists.concat(res.data)
+				if(isInit){
+					this.imglists = res.data
+				}else{
+					this.imglists = this.imglists.concat(res.data)
+				}
 				console.log(this.imglists)
 				if (this.imglists.length == 0) {
 					this.tishi = true
@@ -201,7 +209,7 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.send_control.admin_device_control',
 					data: {
-						device_type_id: 3,
+						device_type_id: this.device_type,
 						d_id: this.d_id,
 						cmd: "takephoto"
 					}
@@ -215,9 +223,9 @@
 					var that = this
 					setTimeout(() => {
 						if(that.device_type == 7) {
-							that.imglistdataBzy(parseInt(that.timestate), parseInt(that.timeend))
+							that.imglistdataBzy(parseInt(that.timestate), parseInt(that.timeend),true)
 						} else {
-							that.imglistdata(parseInt(that.timestate), parseInt(that.timeend))
+							that.imglistdata(parseInt(that.timestate), parseInt(that.timeend),true)
 						}
 					}, 1000)
 				} else {

pages/cbd/detail.vue

@@ -335,8 +335,10 @@ export default {
       return `${year}-${month}-${day}`;
     },
     handleChange(e){
+      console.log(e,'eeeeeeee');
       this.startDate = e.startDate;
       this.endDate = e.endDate;
+      this.page = 1;
       this.initAction();
     },
     showCalendar(){
@@ -415,8 +417,8 @@ export default {
         data: {
           device_type_id: this.deviceInfo.type_id,
           d_id: this.deviceInfo.d_id,
-          start_time: new Date(this.startDate).getTime()/1000,// 转成毫秒
-          end_time: new Date(this.endDate).getTime()/1000,// 转成毫秒
+          start_time: new Date(this.startDate + ' 00:00:00').getTime()/1000,// 转成毫秒
+          end_time: new Date(this.endDate + ' 23:59:59').getTime()/1000,
         },
       });
       const data = res || [];
@@ -429,8 +431,8 @@ export default {
         data: {
           device_type_id: this.deviceInfo.type_id,
           device_id: this.deviceInfo.id,
-          start_time: new Date(this.startDate).getTime()/1000,
-          end_time: new Date(this.endDate).getTime()/1000,
+          start_time: new Date(this.startDate + ' 00:00:00').getTime()/1000,
+          end_time: new Date(this.endDate + ' 23:59:59').getTime()/1000,
           page: this.page,
           page_size: this.page_size,
         },

pages/cbd/devicePhoto.vue

@@ -95,7 +95,7 @@
     <view class="recognition-result" v-if="pestList.length">
       <view class="result-title">当前图片识别结果</view>
       <!-- 一类害虫 -->
-      <view v-if="is_mark == 0">
+      <view>
         <view class="pest-category" v-for="(pest,index) in pestList" :key="index">
           <view class="category-header">
             <text class="category-title">{{ pest[0] }}</text>
@@ -110,7 +110,7 @@
           </view>
         </view>
       </view>
-      <view v-else>
+      <!-- <view v-else>
         <view class="pest-category" v-for="(pest,index) in pestList" :key="index">
           <view class="pest-item">
             <view class="pest-info">
@@ -120,7 +120,7 @@
             <text class="pest-count">{{ pest[1].value }}</text>
           </view>
         </view>
-      </view>
+      </view> -->
     </view>
     <u-empty v-else text="暂无数据"></u-empty>
 		<u-calendar 
@@ -471,17 +471,16 @@ export default {
               });
             }
           });
-          console.log(markers,'markersmarkers')
           this.bugMarkers = markers;
         } catch (error) {
           console.error('处理label参数失败:', error);
           this.bugMarkers = [];
         }
       } else {
-        this.pestList = [];
+        // this.pestList = [];
         const markers = [];
         // 根据原图宽度计算缩放比例
-        let scaleRatio = 4;
+        let scaleRatio = 3.1;
         // if (this.imageWidth >= 5000) {
         //   scaleRatio = 4;
         // } else if (this.imageWidth >= 4000) {
@@ -489,31 +488,31 @@ export default {
         // } else {
         //   scaleRatio = 2.5;
         // }
-        const pestArr = new Map()
+        // const pestArr = new Map()
         this.currentImg.mark.map((item, index) => {
-          if(pestArr.has(item.text)){
-            pestArr.set(item.text,{
-              value: pestArr.get(item.text).value+=1,
-              text: item.text
-            })
-          }else{
-            pestArr.set(item.text, {
-              value: 1,
-              text: item.text
-            })
-          }
-          const pestList = []
-          for(let key of pestArr){
-            pestList.push(key)
-          }
-          this.pestList = pestList
+          // if(pestArr.has(item.text)){
+          //   pestArr.set(item.text,{
+          //     value: pestArr.get(item.text).value+=1,
+          //     text: item.text
+          //   })
+          // }else{
+          //   pestArr.set(item.text, {
+          //     value: 1,
+          //     text: item.text
+          //   })
+          // }
+          // const pestList = []
+          // for(let key of pestArr){
+          //   pestList.push(key)
+          // }
+          // this.pestList = pestList
           this.is_mark = 1
           const { startX, startY,text } = item;
           // 使用缩放比例计算标记位置和尺寸
-          const x = (startX * scaleRatio / this.imageWidth) * 100;
-          const y = (startY * scaleRatio / this.imageHeight) * 100;
-          const width = (item.width * scaleRatio / this.imageWidth) * 100;
-          const height = (item.height * scaleRatio / this.imageHeight) * 100;
+          const x = item.width > 0 ? (startX * scaleRatio / this.imageWidth) * 105 : ((startX + item.width) * scaleRatio / this.imageWidth) * 105;
+          const y = item.height > 0 ? (startY * scaleRatio / this.imageHeight) * 105 : ((startY + item.height) * scaleRatio / this.imageHeight) * 105;
+          const width = (item.width > 0 ? item.width : -item.width) * scaleRatio / this.imageWidth * 100;
+          const height = (item.height > 0 ? item.height : -item.height) * scaleRatio / this.imageHeight * 100;
 
           // 从字典中获取虫子名字（尝试字符串和数字两种类型）
           const pestName = text;

pages/equipList2/index.vue

@@ -132,6 +132,7 @@
         counts:0,
         online_counts:0,
         offline_counts:0,
+				accessToken: '',
 				current: 0,
 				currents: 0,
 				total: 0,
@@ -208,7 +209,13 @@
 						})
 					}
 				}
-        this.type_id = this.list[0].device_type_id;
+				const firstChild = this.list[0];
+        this.type_id = firstChild.device_type_id;
+				if(firstChild.device_type_id !== ''){
+					this.device_model = firstChild?.device_model || '';
+				}else{
+					this.device_model = '';
+				}
         this.initPage();
       },
 			async eqlist(tf) {
@@ -249,18 +256,18 @@
 						list.push(item)
 					}
 				})
-				if(list.length > 1){
-					if(this.list[0].purview_name != '全部'){
-						this.list.unshift({
-							device_type_id: '',
-							purview_name: '全部'
-						})
-					}
-				}
+				// if(list.length > 1){
+				// 	if(this.list[0].purview_name != '全部'){
+				// 		this.list.unshift({
+				// 			device_type_id: '',
+				// 			purview_name: '全部'
+				// 		})
+				// 	}
+				// }
         this.current = index;
         const item = this.list[0];
         this.pur_id = itemData.pur_id || '';
-        this.changeDevice(item,0);
+        // this.changeDevice(item,0);
 			},
       changeDevice(item,index){
 				this.currents = index;
@@ -280,7 +287,7 @@
 					this.device_model = 15;
 				} else if(name === 'zhiCbd'){
 					this.device_model = 16;
-				}else {
+				} else {
 					this.device_model = item.device_model || '';
 				}
 				this.page = 1;
@@ -307,6 +314,7 @@
       },
 			historys(item) {
 				const type_id = item.type_id;
+				this.accessToken = uni.getStorageSync('session_key')
 				item.pur_id = this.pur_id;
 				switch (type_id) {
 					// 水肥新设备
@@ -332,12 +340,15 @@
 						break;
 					case 2:
 						item.addtime = item.uptime;
-						uni.navigateTo({
-							url: '../prevention/equipmentdetails?shebei=' + JSON.stringify(item),
-						});
-						// uni.navigateTo({
-						// 	url: '../scd/detail?info=' + JSON.stringify(item),
-						// });
+						if(item.device_model == 102){
+							uni.navigateTo({
+								url: '../scd/detail?info=' + JSON.stringify(item),
+							});
+						}else{
+							uni.navigateTo({
+								url: '../prevention/equipmentdetails?shebei=' + JSON.stringify(item),
+							});
+						}
 						break;
 					case 38:
 						var obj = {};

pages/index/developing.vue

@@ -1,9 +1,9 @@
 <template>
   <view class="developing-page">
-    <view class="back-btn" @click="goBack">
+    <!-- <view class="back-btn" @click="goBack">
       <text class="back-icon">←</text>
       <text class="back-text">返回</text>
-    </view>
+    </view> -->
     <view class="content-wrapper" v-if="!webUrl">
       <view class="icon-wrapper">
         <text class="icon">🚧</text>

pages/index/index.vue

@@ -299,7 +299,7 @@
 						url: '/pages/equipList2/index',
 						success: () => {
 							setTimeout(() => {
-								uni.$emit('purId',item.pur_id);
+								uni.$emit('purId',{purId,menu:item.children[0]?.menu || '',device_model:item.children[0]?.device_model || ''});
 							}, 50);
 						}
 					});

pages/scd/components/deviceData.vue

@@ -86,7 +86,6 @@
                 v-for="(item, index) in historyData"
                 :key="index"
                 class="fixed-row"
-                :class="{ even: index % 2 === 0 }"
               >
                 <text class="body-cell fixed">{{ formatTime(item.addtime) }}</text>
               </view>
@@ -107,7 +106,6 @@
                 v-for="(item, index) in historyData"
                 :key="index"
                 class="scrollable-row"
-                :class="{ even: index % 2 === 0 }"
               >
                 <text class="body-cell">{{ item.ds == 1? '打开' : '关闭' }}</text>
                 <text class="body-cell">{{ item.at }}</text>
@@ -1086,11 +1084,6 @@ export default {
             height: 80rpx;
             display: flex;
             align-items: center;
-
-            &.even {
-              background: #FAFAFA;
-            }
-
             .body-cell.fixed {
               font-size: 24rpx;
               font-family: 'Source Han Sans CN VF', sans-serif;
@@ -1143,10 +1136,6 @@ export default {
             height: 80rpx;
             align-items: center;
 
-            &.even {
-              background: #FAFAFA;
-            }
-
             .body-cell {
               min-width: 140rpx;
               font-size: 24rpx;

pages/scd/detail.vue

@@ -161,11 +161,15 @@ export default {
       polylineList: [],
       isShowPhoto: false,
       deviceHistoryList: [],
-      deviceStatic: {}
+      deviceStatic: {},
+      accessToken: '',
+      camera_id: ''
     }
   },
   onLoad(options){
     this.deviceInfo = JSON.parse(options.info);
+		this.accessToken = uni.getStorageSync('session_key')
+    this.getDeviceCameraData()
     const newVal = this.deviceInfo;
     if (newVal.device_model == '11'){
       this.isShowPhoto = true
@@ -342,14 +346,30 @@ export default {
     },
     handleTabClick(tab) {
       if(tab === 'videoMonitor'){
+        // uni.navigateTo({
+        //   url:
+        //     '/pages/scd/videoMonitor?videoUrl=' + this.videoUrl
+        // });
         uni.navigateTo({
-          url:
-            '/pages/scd/videoMonitor?videoUrl=' + this.videoUrl
-        }); 
+          url: '/pages/webview/webview?device_id=' +
+            this.camera_id +
+            '&accessToken=' +
+            this.accessToken,
+        });
       }else{
         this.initAction();
       }
     },
+    async getDeviceCameraData(){
+      const res = await this.$myRequest({
+        url: '/api/api_gateway?method=forecast.send_control.get_binding_camera_info',
+        method: 'POST',
+        data: {
+          device_id: this.deviceInfo.id,
+        },
+      });
+      this.camera_id = res?.camera_id || ''
+    },
     async getDeviceData(){
       const res = await this.$myRequest({
         url: '/api/api_gateway?method=forecast.worm_lamp.device_status_data',

pages/scd/videoMonitor.vue

@@ -1,26 +1,42 @@
 <template>
-   <view>
-		<web-view :src="videoUrl" id="webcon" cache-control="no-cache" class="video-monitor" :fullscreen="false">
+	<view class="webview">
+		<web-view :src="url" id="webcon"  cache-control="no-cache">
 		</web-view>
-    </view>
+	</view>
 </template>
+
 <script>
-export default {
-  data() {
-    return {
-     videoUrl:''
-    }
-  },
-  onLoad() {
-    const route = this.$route;
-    const videoUrl = route.query.videoUrl;
-    this.videoUrl = videoUrl;
-  },
-}
+	export default {
+		data() {
+			return {
+				url: '',
+				device_id: '',
+				accessToken: ''
+			}
+		},
+		onLoad(options) {
+			this.device_id = options.device_id
+			this.accessToken = uni.getStorageSync('session_key')
+			
+			this.url = "https://wx.hnyfwlw.com/wexin/h52.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken
+			// this.url = "http://192.168.2.167:5500/index.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken
+			// this.url = "https://demo.nyzhwlw.com/wechat?device_id=" + this.device_id + "&accessToken=" + this.accessToken
+			//设置 webview 界面的状态栏的 title
+			uni.setNavigationBarTitle({
+				title: '监控详情'
+			});
+		},
+		methods: {
+
+
+
+		}
+	}
 </script>
-<style scoped>
-.video-monitor {
-  width: 100%;
-  height: 100%;
-}
-</style>
+
+<style>
+	.webview {
+		width: 100vw;
+		height: 100vh;
+	}
+</style>

pages/webview/webview.vue

@@ -17,6 +17,7 @@
 		onLoad(options) {
 			this.device_id = options.device_id
 			this.accessToken = uni.getStorageSync('session_key')
+			console.log(this.accessToken,'thisaccessToken')
 			
 			this.url = "https://wx.hnyfwlw.com/wexin/h52.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken
 			// this.url = "http://192.168.2.167:5500/index.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken