监控新增查看图片功能

manifest.json

@@ -1,175 +1,175 @@
 {
-  "name": "云飞智控",
-  "appid": "__UNI__DBA6730",
-  "description": "",
-  "versionName": "1.6.0",
-  "versionCode": 160,
-  "transformPx": false,
-  /* 5+App特有相关 */
-  "app-plus": {
-    "softinput": {
-      "mode": "adjustPan",
-      "softinputMode": "adjustResize"
-    },
-    "usingComponents": true,
-    "nvueCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
-    },
-    "compatible": {
-      "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
-    },
-    /* 模块配置 */
-    "modules": {
-      "Webview-x5": {},
-      "Maps": {},
-      "VideoPlayer": {},
-      "LivePusher": {},
-      "Geolocation": {},
-      "Camera": {}
-    },
-    /* 应用发布信息 */
-    "distribute": {
-      /* android打包配置 */
-      "android": {
-        "permissions": [
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_COMPONENT_ENABLED_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.DISABLE_KEYGUARD\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-permission android:name=\"android.permission.INSTALL_LOCATION_PROVIDER\"/>",
-          "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-          "<uses-permission android:name=\"android.permission.INSTALL_SHORTCUT\"/>",
-          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-          "<uses-permission android:name=\"android.permission.UPDATE_DEVICE_STATS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ],
-        "abiFilters": ["armeabi-v7a", "x86"]
-      },
-      /* ios打包配置 */
-      "ios": {
-        "dSYMs": false
-      },
-      /* SDK配置 */
-      "sdkConfigs": {
-        "geolocation": {
-          "amap": {
-            "__platform__": ["ios", "android"],
-            "appkey_ios": "25716a10d462140d75820fd9f5b342a5",
-            "appkey_android": "25716a10d462140d75820fd9f5b342a5"
-          }
+    "name" : "智控",
+    "appid" : "__UNI__DBA6730",
+    "description" : "",
+    "versionName" : "1.6.1",
+    "versionCode" : 161,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "softinput" : {
+            "mode" : "adjustPan",
+            "softinputMode" : "adjustResize"
         },
-        "maps": {
-          "amap": {
-            "appkey_ios": "25716a10d462140d75820fd9f5b342a5",
-            "appkey_android": "25716a10d462140d75820fd9f5b342a5"
-          }
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
-        "ad": {}
-      },
-      "icons": {
-        "android": {
-          "hdpi": "unpackage/res/icons/72x72.png",
-          "xhdpi": "unpackage/res/icons/96x96.png",
-          "xxhdpi": "unpackage/res/icons/144x144.png",
-          "xxxhdpi": "unpackage/res/icons/192x192.png"
+        "compatible" : {
+            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
         },
-        "ios": {
-          "appstore": "unpackage/res/icons/1024x1024.png",
-          "ipad": {
-            "app": "unpackage/res/icons/76x76.png",
-            "app@2x": "unpackage/res/icons/152x152.png",
-            "notification": "unpackage/res/icons/20x20.png",
-            "notification@2x": "unpackage/res/icons/40x40.png",
-            "proapp@2x": "unpackage/res/icons/167x167.png",
-            "settings": "unpackage/res/icons/29x29.png",
-            "settings@2x": "unpackage/res/icons/58x58.png",
-            "spotlight": "unpackage/res/icons/40x40.png",
-            "spotlight@2x": "unpackage/res/icons/80x80.png"
-          },
-          "iphone": {
-            "app@2x": "unpackage/res/icons/120x120.png",
-            "app@3x": "unpackage/res/icons/180x180.png",
-            "notification@2x": "unpackage/res/icons/40x40.png",
-            "notification@3x": "unpackage/res/icons/60x60.png",
-            "settings@2x": "unpackage/res/icons/58x58.png",
-            "settings@3x": "unpackage/res/icons/87x87.png",
-            "spotlight@2x": "unpackage/res/icons/80x80.png",
-            "spotlight@3x": "unpackage/res/icons/120x120.png"
-          }
+        /* 模块配置 */
+        "modules" : {
+            "Webview-x5" : {},
+            "Maps" : {},
+            "VideoPlayer" : {},
+            "LivePusher" : {},
+            "Geolocation" : {},
+            "Camera" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_COMPONENT_ENABLED_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.DISABLE_KEYGUARD\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_LOCATION_PROVIDER\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_SHORTCUT\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.UPDATE_DEVICE_STATS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "x86" ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "25716a10d462140d75820fd9f5b342a5",
+                        "appkey_android" : "25716a10d462140d75820fd9f5b342a5"
+                    }
+                },
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "25716a10d462140d75820fd9f5b342a5",
+                        "appkey_android" : "25716a10d462140d75820fd9f5b342a5"
+                    }
+                },
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
         }
-      }
-    }
-  },
-  /* 快应用特有相关 */
-  "quickapp": {},
-  /* 小程序特有相关 */
-  "mp-weixin": {
-    "appid": "wx1cabf67f460e3a14",
-    "setting": {
-      "urlCheck": false,
-      "minified": true,
-      "postcss": false,
-      "es6": true
     },
-    "usingComponents": true
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "h5": {
-    "devServer": {
-      "port": 8000,
-      "disableHostCheck": true,
-      "proxy": {
-        "/ksy": {
-          "target": "http://114.115.147.140:8002",
-          "changeOrigin": true,
-          "ws": true,
-          "pathRewrite": {
-            "^/ksy": "ksy"
-          }
-        }
-      }
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx1cabf67f460e3a14",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "postcss" : false,
+            "es6" : true
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "template": "static/tempalate.html",
-    "sdkConfigs": {
-      "maps": {
-        "qqmap": {
-          "key": "XGQBZ-MSGW6-KNDSO-MVOIJ-OM6LO-JXBKB"
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "h5" : {
+        "devServer" : {
+            "port" : 8000,
+            "disableHostCheck" : true,
+            "proxy" : {
+                "/ksy" : {
+                    "target" : "http://114.115.147.140:8002",
+                    "changeOrigin" : true,
+                    "ws" : true,
+                    "pathRewrite" : {
+                        "^/ksy" : "ksy"
+                    }
+                }
+            }
+        },
+        "template" : "static/tempalate.html",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "XGQBZ-MSGW6-KNDSO-MVOIJ-OM6LO-JXBKB"
+                }
+            }
         }
-      }
     }
-  }
 }
 // "sdkConfigs" : {
 //     "maps" : {
@@ -178,3 +178,4 @@
 //         }
 //     }
 // }
+

pages.json

@@ -728,6 +728,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/monitor/imagelist",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "图片列表",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"condition": { //模式配置，仅开发期间生效
 		"current": 3, //当前激活的模式（list 的索引项）

pages/monitor/imagelist.vue

@@ -0,0 +1,369 @@
+<template>
+	<view>
+		<!-- <view class="status_bar"></view> -->
+		<view class="" style="position: relative;top: 44px;">
+			<!-- <view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="查看图片"></uni-nav-bar>
+			</view> -->
+			<p class="tishi" v-if="tishi">暂无数据</p>
+			<view class="selecttimes" @click="tiemshow=!tiemshow">
+				<view class="timesbox">
+					<image
+						:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						mode=""></image>
+					<p>{{timetab(timestate)}}</p>
+					<p class="or">~</p>
+					<p>{{timetab(timeend)}}</p>
+					<u-icon name="rili" custom-prefix="custom-icon" class="icon"></u-icon>
+				</view>
+				<u-calendar v-model="tiemshow" mode="range" @change="tiemchange"></u-calendar>
+			</view>
+			<view class="imglist">
+				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
+					<view class="imglist_left">
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="">
+						</image>
+						<image :src="item.addr" mode="" @click="examine(index)"></image>
+					</view>
+					<view class="imglist_right">
+						<view class="icon_box" @click="delimg(item.photo_id)">
+							<p class="iconfont icon-shanchu">删除</p>
+						</view>
+						<p style="color: #06B535;">{{item.addtime|timeFormat()}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="top" v-if="isTop" @click="top">
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+				mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				page: 1,
+				imglists: [],
+				tishi: true,
+				d_id: '',
+				timeend: '', //当前时间 也是搜索的结束时间
+				timestate: '',
+				timeshow: false,
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: false
+				},
+				flag: 1,
+				self: true,
+				isTop: false,
+				resultdata: {},
+				titletext: ["24小时", "近一个月", "近半年", "近一年"],
+				titleidnex: 0,
+				tiemshow: false, //时间选择器
+				disable: "",
+				device_type: "",
+				myuid:""
+			}
+		},
+		methods: {
+			//forecast.forecast_system.equip_photofo
+			async imglistdata(time_begin, time_end) { //获取图片列表
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=camera.camera_manage.camera_photo',
+					data: {
+						device_id: this.device_id,
+						page: this.page,
+						page_size: 8,
+						start_time: time_begin, //开始时间
+						end_time: time_end, //结束时间
+					}
+				})
+				this.imglists = this.imglists.concat(res.data)
+				console.log(this.imglists)
+				if (this.imglists.length == 0) {
+					this.tishi = true
+				} else {
+					this.tishi = false
+				}
+			},
+			//forecast.forecast_system.equip_photo_del
+			async del(id) { //删除图片
+				var arr = id;
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=camera.camera_manage.del_camera_photo',
+					data: {
+						// device_id: this.device_id,
+						photo_id_list: JSON.stringify(arr)
+					}
+				})
+				if (res) {
+					uni.showToast({
+						title: '删除成功！',
+						duration: 2000
+					});
+					this.page = 1
+					this.imglists = []
+					this.imglistdata(parseInt(this.timestate), parseInt(this.timeend))
+				} else {
+					uni.showToast({
+						title: '删除失败！',
+						duration: 2000,
+						icon: "none"
+					});
+				}
+			},
+			//forecast.forecast_system.equip_photo_species  pest_list
+			//forecast.forecast_system.equip_photo_species统计
+
+			//forecast.send_control.admin_device_control 拍照 
+			clickLeft() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			delimg(id) { //删除图片
+				uni.showModal({
+					title: '提示',
+					content: '是否删除此图片？',
+					success: (res) => {
+						if (res.confirm) {
+							this.del(id)
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			top() {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 500
+				})
+			},
+			tiemchange(e) {
+				this.imglists = []
+				this.page = 1
+				console.log(e)
+				this.timestate = +new Date(e.startDate) / 1000 - 8 * 60 * 60
+				this.timeend = +new Date(e.endDate) / 1000 + 16 * 60 * 60
+				this.imglistdata(parseInt(this.timestate), parseInt(this.timeend))
+			},
+			timetab(e) {
+				if(!e) return '请选择'
+				e = new Date(e * 1000)
+				var year = e.getFullYear()
+				var month = e.getMonth() + 1 < 10 ? "0" + (e.getMonth() + 1) : e.getMonth() + 1
+				var day = e.getDate() < 10 ? "0" + e.getDate() : e.getDate()
+				var time = year + "/" + month + "/" + day
+				return time
+			},
+		},
+		onLoad(option) {
+			uni.getStorage({
+				key:"myuid",
+				success:(res)=> {
+					this.myuid = res.data
+					console.log(this.myuid)
+				}
+			})
+			// this.timeend = +new Date() / 1000
+			// this.timestate = this.timeend - 60 * 60 * 24
+			console.log(option)
+			this.device_id = option.id
+			console.log(this.timestate)
+			this.imglistdata('', '')
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+			this.page++
+			console.log(this.timestate)
+			if(this.timestate != '') {
+				this.timestate = parseInt(this.timestate)
+			}
+			if(this.timeend != '') {
+				this.timeend = parseInt(this.timeend)
+			}
+			this.imglistdata(this.timestate, this.timeend)
+		},
+		onPageScroll(e) { //nvue暂不支持滚动监听，可用bindingx代替
+			if (e.scrollTop > 200) { //距离大于200时显示
+				this.isTop = true
+			} else { //距离小于200时隐藏
+				this.isTop = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tishi {
+		position: absolute;
+		top: 40px;
+		width: 95%;
+		left: 2.5%;
+		text-align: center;
+		font-size: 40rpx;
+	}
+
+	.selecttimes {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+		background-color: #fff;
+		padding-top: 30rpx;
+
+		.timesbox {
+			display: flex;
+			width: 95%;
+			margin: 0 auto;
+			justify-content: space-around;
+			box-shadow: 0 0 10rpx #bcb9ca;
+			padding: 10rpx 20rpx;
+			box-sizing: border-box;
+
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin-top: 6rpx;
+			}
+
+			.icon {
+				color: #949494;
+				text-align: right;
+				margin-left: 30rpx;
+
+			}
+		}
+
+		/deep/.u-calendar__action {
+			display: flex;
+			justify-content: space-around;
+
+			.u-calendar__action__text {
+				line-height: 25px;
+			}
+		}
+	}
+
+	.timeshow {
+		width: 96%;
+		height: 50rpx;
+		background-color: #FFFFFF;
+		position: fixed;
+		top: 10px;
+		left: 2.5%;
+		display: flex;
+		z-index: 100;
+		padding-top: 10px;
+
+		.shuju_one_title {
+			width: 70%;
+			margin: 0 auto;
+			display: flex;
+
+			.tltle_text {
+				width: 25%;
+				border: 2rpx solid #B2B2B2;
+				color: #B2B2B2;
+				text-align: center;
+				font-size: 24rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+
+			.title_text_color {
+				width: 25%;
+				border: 2rpx solid #28AE4F;
+				color: #28AE4F;
+				text-align: center;
+				font-size: 24rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+		}
+
+		.timeshow_tate,
+		.timeshow_end {
+			height: 50rpx;
+			width: 45%;
+			line-height: 50rpx;
+			text-align: center;
+			margin-right: 10rpx;
+			background-color: #56C877;
+			color: #FFFFFF;
+		}
+	}
+
+	.imglist {
+		position: absolute;
+		top: 0;
+		width: 95%;
+		left: 2.5%;
+
+		.imglist_box {
+			display: flex;
+			box-shadow: 0 0 10rpx #bcb9ca;
+			padding: 20rpx;
+			margin-bottom: 20rpx;
+			height: 140px;
+		}
+
+		.imglist_left {
+			width: 50%;
+			position: relative;
+
+			image {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 280rpx;
+			}
+		}
+
+		.imglist_right {
+			margin-left: 40rpx;
+			padding: 10rpx 0;
+
+			.icon_box {
+				margin-bottom: 12rpx;
+				font-size: 24rpx;
+
+				.iconfont {
+					margin-right: 20rpx;
+					color: #56C877;
+					font-size: 32rpx;
+				}
+			}
+
+			p:last-child {
+				margin-bottom: 0;
+			}
+
+		}
+	}
+
+	.top {
+		position: fixed;
+		right: 30px;
+		bottom: 100px;
+		z-index: 100;
+
+		image {
+			width: 100rpx;
+			height: 100rpx;
+		}
+	}
+</style>

pages/webview.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="webview">
 		<web-view :src="url" id="webcon" @message="handleMessage">
-
 		</web-view>
 	</view>
 </template>

static/h52.html

@@ -91,6 +91,26 @@
 				top: 50%;
 				margin-top: -40px;
 			}
+
+			.imgBtn {
+				position: absolute;
+				width: 100%;
+				padding: 10px;
+				bottom: 0;
+				left: 0;
+				text-align: center;
+				color: #338cd9;
+				font-size: 16px;
+				box-sizing: border-box;
+			}
+			.imgBtn img{
+				display: inline-block;
+				width: 20px;
+				height: 20px;
+				vertical-align: middle;
+				margin-right: 2px;
+				margin-bottom: 3px;
+			}
 		</style>
 	</head>
 	<body>
@@ -123,6 +143,9 @@
 				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/2.png" mode="widthFix"></image>
 			</div>
 		</div>
+		<div class="imgBtn">
+			<img src="images/image.png" />查看图片
+		</div>
 	</body>
 	<script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
 	<!-- 微信 JS-SDK 如果不需要兼容小程序，则无需引用此 JS 文件。 -->
@@ -202,5 +225,10 @@
 			}, 150);
 
 		})
+		document.addEventListener('UniAppJSBridgeReady', function() {
+			$('.imgBtn').click(function() {
+				uni.navigateTo({url:'/pages/monitor/imagelist?id=' + device_id})
+			})
+		});
 	</script>
 </html>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/78510550-382c-11ee-8a44-1f74891c0cd1
+https://ide.dcloud.net.cn/build/download/ae3cf5f0-3ce7-11ee-af8e-cbcc2a3fc232

util/api.js

@@ -5,7 +5,7 @@ export const myRequest = (options) => {
 	console.log(BASE_URL,'my request',process.env.NODE_ENV)
 	if (BASE_URL == '') {
 		// BASE_URL = 'http://8.136.98.49:8002'//线上
-		BASE_URL = process.env.NODE_ENV === 'development' ? "http://8.136.98.49:8002" : "http://8.136.98.49:8002"
+		BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.0.36:8003" : "http://8.136.98.49:8002"
 		// BASE_URL = 'http://192.168.1.77:8002'
 	}
 	// BASE_URL = 'http://192.168.1.52:8003'

util/neutral.js

@@ -1,4 +1,4 @@
 export default{
-	isneutral:true//云飞智控
-	// isneutral:false//云控
+	// isneutral:true//云飞智控
+	isneutral:false//智控
 }