修复遗留的问题

manifest.json

@@ -67,7 +67,9 @@
                 "abiFilters" : [ "armeabi-v7a", "x86" ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "geolocation" : {

package-lock.json

@@ -2,32 +2,10 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
-    "echarts": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.0.2.tgz",
-      "integrity": "sha512-En0VYpc96nw2/2AZoBWPHsGi471zMublttj50kfFpYAeR4geup0Tj9iVgEXh7QYZFPnRiruDJEjcB5PXZ+BYzQ==",
-      "requires": {
-        "tslib": "2.0.3",
-        "zrender": "5.0.4"
-      }
-    },
-    "highcharts": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-9.0.1.tgz",
-      "integrity": "sha512-0UmcCz2RmFuqfT/Igu3h5sGnkeSqqZwfuYrTzJ/htptmJAo5SSxH62NFcTjVRk+3WstoBJmoXR0v5FVGQUzK5A=="
-    },
-    "tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
-    },
-    "zrender": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.0.4.tgz",
-      "integrity": "sha512-DJpy0yrHYY5CuH6vhb9IINWbjvBUe/56J8aH86Jb7O8rRPAYZ3M2E469Qf5B3EOIfM3o3aUrO5edRQfLJ+l1Qw==",
-      "requires": {
-        "tslib": "2.0.3"
-      }
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     }
   }
 }

package.json

@@ -1,18 +1,19 @@
 {
-  "dependencies": {
-	    "name": "gulp",
-	    "version": "1.0.0",
-	    "description": "",
-	    "main": "index.js",
-	    "dependencies": {
-	      "gulp": "^4.0.2",
-	      "gulp-uglify": "^3.0.2"
-	    },
-	    "devDependencies": {},
-	    "scripts": {
-	      "test": "echo \"Error: no test specified\" && exit 1"
-	    },
-	    "author": "",
-	    "license": "ISC"
-  }
+		"dependencies": {
+				"author": "",
+				"dependencies": {
+						"gulp": "^4.0.2",
+						"gulp-uglify": "^3.0.2"
+				},
+				"description": "",
+				"devDependencies": {},
+				"license": "ISC",
+				"lodash-es": "^4.17.21",
+				"main": "index.js",
+				"name": "gulp",
+				"scripts": {
+						"test": "echo \"Error: no test specified\" && exit 1"
+				},
+				"version": "1.0.0"
+		}
 }

pages.json

@@ -220,7 +220,7 @@
 			"path": "pages/fourBase/allocation",
 			"style": {
 				"navigationBarTitleText": "设备分配",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 

pages/cbqxyj/cbwarn.vue

@@ -147,7 +147,7 @@
 				</view>
 			</u-swipe-action>
 		</view>
-		<view class="addwarnlist" v-show="active == 2" @click="addshow = true">
+		<view class="addwarnlist" v-show="active == 2" @click="event=>toset()">
 			添 加
 		</view>
 		<view class="">
@@ -265,7 +265,7 @@
 						backgroundColor: '#dd524d'
 					}
 				}],
-				confpage:1
+				confpage: 1
 			}
 		},
 		methods: {
@@ -309,14 +309,14 @@
 			async getwranlistdata() {
 				var end_time = ""
 				var start_time = ""
-				if(this.end_time!=""){
-					end_time = Math.floor(+new Date(this.end_time)/1000)
-				}else{
+				if (this.end_time != "") {
+					end_time = Math.floor(+new Date(this.end_time) / 1000)
+				} else {
 					end_time = ""
 				}
-				if(this.start_time!=""){
-					start_time = Math.floor(+new Date(this.start_time)/1000)
-				}else{
+				if (this.start_time != "") {
+					start_time = Math.floor(+new Date(this.start_time) / 1000)
+				} else {
 					start_time = ""
 				}
 				const res = await this.$myRequest({
@@ -498,7 +498,7 @@
 			toset(id) {
 				console.log(id)
 				uni.navigateTo({
-					url: "./warnset?id=" + id
+					url: "./warnset?id=" + (id || '')
 				})
 			},
 			async addwarning_config() {
@@ -508,7 +508,7 @@
 						title: "请填写预警名称",
 						icon: "none"
 					})
-				}else{
+				} else {
 					const res = await this.$myRequest({
 						url: '/api/api_gateway?method=device.device_sms_alert.create_user_warning_config',
 						data: {
@@ -516,8 +516,8 @@
 							device_type_id: 3
 						}
 					})
-					console.log(res,'add warning config')
-					if(res){
+					console.log(res, 'add warning config')
+					if (res) {
 						this.addshow = false
 						this.configlist = []
 						this.confpage = 1
@@ -525,11 +525,11 @@
 					}
 				}
 			},
-			async delconfig(id){
+			async delconfig(id) {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=device.device_sms_alert.del_user_warning_config_status',
 					data: {
-						id:id
+						id: id
 					}
 				})
 				console.log(res)
@@ -541,11 +541,21 @@
 			}
 		},
 		onLoad() {
-			this.getwranlistdata()
+			// this.getwranlistdata()
 			// this.getmessagescounts()
 			// this.getconfiglist()
 		},
 		onShow() {
+			if (this.active == 0) {
+				this.listpage = 1;
+				this.wranlistdata = [];
+				this.getwranlistdata();
+			} else if (this.active == 2) {
+				this.confpage = 1;
+				this.configlist = [];
+				this.getconfiglist();
+			}
+
 			this.getuseriphonelist()
 		},
 		onReachBottom() {
@@ -850,4 +860,4 @@
 			color: #fff;
 		}
 	}
-</style>
+</style>

pages/cbqxyj/warnset.vue

@@ -1,6 +1,14 @@
 <template>
 	<view style="padding-bottom: 30rpx;">
 		<view class="basesel">
+			<view class="">
+				<view class="">
+					预警名称
+				</view>
+				<view class="">
+					<u-input v-model="warning_name" placeholder="请输入预警名称" maxlength="24" />
+				</view>
+			</view>
 			<view class="basesel_list">
 				<view class="basesel_list_tilte">
 					预警设备选择：
@@ -174,7 +182,8 @@
 		},
 		data() {
 			return {
-				warning_id:"",
+				warning_name:'',
+				warning_id: "",
 				selbaselist: [],
 				warnjihe: "0",
 				accServiceShow: false,
@@ -196,7 +205,7 @@
 				confnum: [{
 					appointPestName: "",
 					appointPestNum: "",
-					appointPestNameid:""
+					appointPestNameid: ""
 				}],
 				device_ids: [],
 				send_user: [],
@@ -231,6 +240,7 @@
 					}
 				})
 				console.log(res)
+				this.warning_name = res.warning_name;
 				this.confnum = []
 				this.conf.pestCategory = res.conf.pestCategory == "on" ? true : false
 				this.conf.appointPest = res.conf.appointPest == "on" ? true : false
@@ -263,13 +273,13 @@
 						var obj = {
 							appointPestName: dict[Number(res.conf["appointPestName"])],
 							appointPestNum: res.conf["appointPestNum"],
-							appointPestNameid:res.conf["appointPestName"]
+							appointPestNameid: res.conf["appointPestName"]
 						};
 					} else {
 						var obj = {
 							appointPestName: dict[Number(res.conf["appointPestName" + i])],
 							appointPestNum: res.conf["appointPestNum" + i],
-							appointPestNameid:res.conf["appointPestName"+ i]
+							appointPestNameid: res.conf["appointPestName" + i]
 						};
 					}
 					this.confnum.push(obj);
@@ -403,36 +413,62 @@
 						if (key == "pestCategory" ||
 							key == "appointPest" ||
 							key == "pestTotal" ||
-							key == "pestWarn" ) {
+							key == "pestWarn") {
 							obj[key] = this.conf[key] ? "on" : "off"
-						}else{
+						} else {
 							obj[key] = this.conf[key]
 						}
 					}
 					console.log(obj)
-					const res = await this.$myRequest({
-						url: '/api/api_gateway?method=device.device_sms_alert.create_user_pest_warning',
-						data: {
-							conf: JSON.stringify(obj),
-							device_ids: this.device_ids.join(","),
-							send_user: this.send_user.join(","),
-							warning_id: this.warning_id,
-							warning_type: this.warnjihe
-						}
-					})
+					
+					let res = Promise.resolve();
+					
+					if(this.warning_id){
+						res = await this.$myRequest({
+							url: '/api/api_gateway?method=device.device_sms_alert.create_user_pest_warning',
+							data: {
+								conf: JSON.stringify(obj),
+								device_ids: this.device_ids.join(","),
+								send_user: this.send_user.join(","),
+								warning_id: this.warning_id,
+								warning_type: this.warnjihe
+							}
+						})
+					}else{
+						res = await this.$myRequest({
+							url: '/api/api_gateway?method=device.device_sms_alert.create_user_warning_config',
+							data: {
+								title: this.warning_name,
+								device_type_id: 3,
+								conf: JSON.stringify(obj),
+								device_ids: this.device_ids.join(","),
+								send_user: this.send_user.join(","),
+								warning_type: this.warnjihe
+							}
+						})
+					}
+					
 					console.log(res)
-					uni.showToast({
-						title: "预警配置成功",
-						icon: "none"
-					})
-					uni.navigateBack({
-						delta:1
-					})
+					if(res){
+						uni.showToast({
+							title: "预警配置成功",
+							icon: "none"
+						})
+						uni.navigateBack({
+							delta: 1
+						})
+					}else{
+						uni.showToast({
+							title: "预警配置失败，请稍后再试",
+							icon: "none"
+						})
+					}
 				}
 			}
 		},
 		onLoad(option) {
 			// console.log(dict)
+			console.warn(option.id, 'onload warn set ', option)
 			this.wormlist = []
 			for (var key in dict) {
 				var obj = {
@@ -443,8 +479,10 @@
 			}
 			this.getbaselist()
 			this.getuseriphonelist()
-			this.getpeizhi(option.id)
-			this.warning_id = option.id
+			if (option.id) {
+				this.getpeizhi(option.id)
+				this.warning_id = option.id
+			}
 		}
 	}
 </script>
@@ -615,4 +653,4 @@
 		text-align: center;
 		color: #fff;
 	}
-</style>
+</style>

pages/fourBase/allocation.vue

@@ -5,16 +5,16 @@
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备分配"></uni-nav-bar>
 			</view>
-			<view class="utabs">
+			<view class="utabs" v-if="typeList.length">
 				<view style="width: 95%;margin: 0 auto;">
-					<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" item-width="140" font-size="24" gutter="20"
-					 bar-width="60" active-color="#42b983"></u-tabs>
+					<u-tabs :list="typeList" keyName="type_name" :is-scroll="true" :current="current" @change="change"
+						item-width="140" font-size="24" gutter="20" bar-width="60" active-color="#42b983"></u-tabs>
 				</view>
 			</view>
 			<view class="bases_search">
 				<view class="bases_search_text">
 					<u-icon name="search" class="search" @click="searchs"></u-icon>
-					<input type="text" v-model="inputdata" placeholder="请输入设备ID"/>
+					<input type="text" v-model="inputdata" placeholder="请输入设备编号" @change="handleSearch" @confirm="handleSearch" />
 				</view>
 			</view>
 			<view class="loading" v-if="loadingtf">
@@ -25,16 +25,19 @@
 			</view>
 			<view class="ass_list">
 				<checkbox-group class="che_group" @change="checkboxchange">
-					<label  v-for="(items,indexs) in assignments.children" :key="items.id" >
-						<view class="" v-if="items.type_name.search(inputdata)+1" class="equipment">
+					<label v-for="(items,indexs) in equipmentList" :key="items.id">
+						<view class="" class="equipment">
 							<view class="equipment_top">
-								<image :src="'http://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/'+assignments.id+'.png'" mode="" class="equipment_top_img"></image>
-								<span class="equipment_top_name">{{assignments.type_name}}</span>
-								<checkbox :value="String(items.type_name)" :checked="items.check" class="ucheckbox" color="#42b983" />
+								<image
+									:src="'http://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/'+currentType.type_id+'.png'"
+									mode="" class="equipment_top_img"></image>
+								<span class="equipment_top_name">{{currentType.type_name}}</span>
+								<checkbox :value="String(items.type_name)" :checked="items.check" class="ucheckbox"
+									color="#42b983" />
 							</view>
 							<view class="equipment_bot">
 								<p class="equipment_bot_id">设备ID：{{items.id}}</p>
-								<p class="equipment_bot_name">设备名称：{{items.type_name}}</p>
+								<p class="equipment_bot_name">设备编号：{{items.type_name}}</p>
 								<view class="equipment_state">在线</view>
 							</view>
 						</view>
@@ -47,12 +50,24 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+				mode=""></image>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		map,
+		assign,
+		concat,
+		zipObject,
+		groupBy,
+		uniqBy,
+		values,
+		keys
+	} from 'lodash-es';
+
 	export default {
 		data() {
 			return {
@@ -68,9 +83,24 @@
 				isTop: false,
 				base_id: "",
 				baseidarr: "",
-				inputdata:"",
-				loadingtf:false,//loading
-				nonetf:false,//设备列表为空判断
+				inputdata: "",
+				loadingtf: false, //loading
+				nonetf: false, //设备列表为空判断
+				currentTypeID: 3,
+				pageSize: 10,
+				page: 1,
+				equipmentList: [],
+				typeList: [{
+					"type_name": "测报灯",
+					"type_id": 3
+				}],
+				selectedDataSource: {},
+				selectedGroupByNameIDs: {}
+			}
+		},
+		computed: {
+			currentType() {
+				return this.typeList[this.current]
 			}
 		},
 		methods: {
@@ -81,21 +111,26 @@
 						base_id: this.base_id
 					}
 				})
-				this.baseidarr = res
-				console.log(res)
+				this.baseidarr = res;
+				this.selectedDataSource = zipObject(map(res, 'device_id'), res);
+				this.selectedGroupByNameIDs = groupBy(res, item => item.type_name);
+
+
+
+				console.log(res, this.selectedDataSource)
 				var arr = []
-				for(var i=0;i<res.length;i++){
+				for (var i = 0; i < res.length; i++) {
 					if (arr.indexOf(res[i].type_name) === -1) {
-					     arr.push(res[i].type_name)
+						arr.push(res[i].type_name)
 					}
 				}
 				var obj = {}
-				for(var i=0;i<arr.length;i++){
-					obj[arr[i]]=[]
+				for (var i = 0; i < arr.length; i++) {
+					obj[arr[i]] = []
 				}
-				for(var i=0;i<res.length;i++){
-					for(var key in obj){
-						if(res[i].type_name==key){
+				for (var i = 0; i < res.length; i++) {
+					for (var key in obj) {
+						if (res[i].type_name == key) {
 							obj[key].push(res[i].device_id)
 						}
 					}
@@ -105,13 +140,25 @@
 				this.getFourbase()
 			},
 			async getFourbase() { //全部设备列表
-				this.loadingtf =true
+				this.loadingtf = true
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=base.bases.base_equip',
-					data:{
-						base_id: this.base_id
+					data: {
+						base_id: this.base_id,
+						type_id: this.currentTypeID,
+						device_id: this.inputdata,
+						page_size: this.pageSize,
+						page: this.page
 					}
 				})
+				this.typeList = res.type_info_list.map(item => {
+					return {
+						name: item.type_name,
+						type_name: item.type_name,
+						type_id: item.type_id
+					}
+				});
+				console.log(res, 'get four base', this.typeList)
 				this.loadingtf = false
 				this.assignment = res.data
 				for (var i = 0; i < this.assignment.length; i++) {
@@ -119,30 +166,41 @@
 					obj.name = this.assignment[i].type_name
 					this.list.push(obj)
 				}
-				if(this.list.length==0){
+				if (this.list.length == 0) {
 					let obj = {}
 					obj.name = "全部"
 					this.list.push(obj)
 					this.nonetf = true
 				}
-				this.assignments = this.assignment[this.current]
-				for (let i = 0; i < this.assignments.children.length; i++) {
-					this.assignments.children[i].check = false
-					for (let j = 0; j < this.baseidarr.length; j++) {
-						if (this.assignments.children[i].type_name == this.baseidarr[j].device_id) {
-							this.assignments.children[i].check = true
-							console.log(this.assignments.children[i].check)
-						}
-					}
-				}
+				console.warn(this.assignment, '--------------- equipment list', this.page)
+				this.assignments = this.assignment[0]
+				const dataList = res.data[0] && map(res.data[0].children, item => {
+					return assign({}, item, {
+						check: !!this.selectedDataSource[item.type_name]
+					})
+				});
+				this.equipmentList = this.page === 1 ? dataList : concat(this.equipmentList, dataList);
+
+				console.warn(this.equipmentList, 'get equip list ', this.equipmentList.length)
+
+
+				// for (let i = 0; i < this.assignments.children.length; i++) {
+				// 	this.assignments.children[i].check = false
+				// 	for (let j = 0; j < this.baseidarr.length; j++) {
+				// 		if (this.assignments.children[i].type_name == this.baseidarr[j].device_id) {
+				// 			this.assignments.children[i].check = true
+				// 			console.log(this.assignments.children[i].check)
+				// 		}
+				// 	}
+				// }
 			},
 			forchange(obj) {
 				for (let i = 0; i < this.assignments.children.length; i++) {
 					this.assignments.children[i].check = false
 					for (let key in obj) {
-						if(key==this.list[this.current].name){
-							for(let j = 0; j < obj[key].length; j++){
-								if(this.assignments.children[i].type_name == obj[key][j]){
+						if (key == this.list[this.current].name) {
+							for (let j = 0; j < obj[key].length; j++) {
+								if (this.assignments.children[i].type_name == obj[key][j]) {
 									this.assignments.children[i].check = true
 								}
 							}
@@ -150,15 +208,32 @@
 					}
 				}
 			},
-			change(index) {
+			change(index, item) {
 				this.current = index
-				this.assignments = this.assignment[index]
+				this.page = 1;
+				this.equipmentList = []
+				this.currentTypeID = this.typeList[index] && this.typeList[index].type_id || ''
+				this.getFourbase();
 				console.log(this.obj)
-				this.forchange(this.obj)
+				// this.forchange(this.obj)
 			},
 			checkboxchange(e, items) {
+				console.log(e.detail, 'checkbox ', typeof e.detail.value)
 				this.obj[this.assignments.type_name] = JSON.parse(JSON.stringify(e.detail.value))
-				console.log(this.obj)
+				const originCurrentTypeIDList = this.selectedGroupByNameIDs[this.currentType.type_name] || []
+				this.selectedGroupByNameIDs[this.currentType.type_name] = uniqBy(concat(originCurrentTypeIDList, map(e
+					.detail.value, id => ({
+						device_id: id
+					}), 'device_id')))
+
+				if (!this.selectedDataSource[e.detail.value]) {
+					this.selectedDataSource[e.detail.value] = {
+						"type_name": this.currentType.type_name,
+						"device_id": e.detail.value
+					}
+				}
+
+
 			},
 			clickLeft() {
 				uni.navigateBack({
@@ -169,12 +244,16 @@
 				this.clickLeft()
 			},
 			canfirm() {
+				const data = zipObject(keys(this.selectedGroupByNameIDs), map(values(this.selectedGroupByNameIDs),
+					items => map(items, 'device_id')))
+
+				console.log(data, 'confrim ')
 				uni.setStorage({
-					key:"typeid",
-					data:JSON.stringify(this.obj),
-					success:()=>{
+					key: "typeid",
+					data: JSON.stringify(data),
+					success: () => {
 						uni.navigateBack({
-							delta:1
+							delta: 1
 						})
 					}
 				})
@@ -185,16 +264,22 @@
 					duration: 500
 				})
 			},
-			searchs(){
+			searchs() {
 				console.log(this.inputdata.search("好"))
 			},
+			handleSearch() {
+				console.log('handle search 00000000000000')
+				this.page = 1;
+				this.equipmentList = [];
+				this.getFourbase();
+			}
 		},
 		onLoad(option) {
 			this.base_id = option.base_id
 			console.log(this.base_id)
-			if(this.base_id){
+			if (this.base_id) {
 				this.ybase()
-			}else{
+			} else {
 				this.getFourbase()
 			}
 		},
@@ -205,6 +290,10 @@
 				this.isTop = false
 			}
 		},
+		onReachBottom() {
+			this.page++;
+			this.getFourbase();
+		}
 	}
 </script>
 
@@ -222,7 +311,7 @@
 		top: 128px;
 		z-index: 100;
 		background-color: #FFFFFF;
-	
+
 		.bases_search_text {
 			width: 90%;
 			margin: 0 auto;
@@ -231,12 +320,12 @@
 			border-radius: 30rpx;
 			display: flex;
 			line-height: 60rpx;
-	
+
 			.search {
 				padding: 0 20rpx;
 				font-size: 34rpx;
 			}
-	
+
 			input {
 				width: 80%;
 				margin-top: 10rpx;
@@ -244,18 +333,20 @@
 			}
 		}
 	}
+
 	.loading {
 		position: fixed;
 		top: 440px;
 		width: 95%;
 		left: 2.5%;
 		text-align: center;
-	
+
 		.img {
 			width: 300rpx;
 			height: 40rpx;
 		}
 	}
+
 	.ass_list {
 		position: absolute;
 		top: 115px;
@@ -365,4 +456,4 @@
 			height: 100rpx;
 		}
 	}
-</style>
+</style>

pages/monitor/index.vue

@@ -6,7 +6,7 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="监控系统" right-icon="search"
 					@clickRight="clickRight" size="16"></uni-nav-bar>
 				<view class="inputs" :style="{'width':width+'rpx'}">
-					<input type="text" value="" placeholder="请输入设备ID或设备名称" v-model="imports" @input="searchinp"
+					<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinp"
 						class="inputbox" :clearable="false" />
 					<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
 				</view>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/a7f56010-172c-11ed-af7a-dfbd9fdca133
+https://ide.dcloud.net.cn/build/download/335fa160-cdf4-11ed-9918-c5e9f008053c

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=E:/大数据平台app安装包/签名证书/yfzhikong.keystore
+andrCertfile=E:/群晖/SynologyDrive/研发二部（软件）/app证书/智控app签名证书/yfzhikong.keystore
 andrCertAlias=testalias
 andrCertPass=uecGPNMV8s+KLcdEgW/MRg==

unpackage/cache/wgt/__UNI__DBA6730/static/h52.html

@@ -115,7 +115,7 @@
 				<div class="left" ontouchstart="configCamera('move', 2)" ontouchend="stopConfigCamera()">
 
 				</div>
-				<div class="right" ontouchstart="configCamera('move', 6)" ontouchend="stopConfigCamera()">
+				<div class="right" ontouchstart="configCamera('move', 3)" ontouchend="stopConfigCamera()">
 
 				</div>
 			</div>
@@ -190,7 +190,7 @@
 		}).then((res) => {
 			console.log(res.data)
 			var data = eval("(" + res.data + ")");
-			var hlsHdSrc = data.hls;
+			var hlsHdSrc = data.hlsHd;
 			console.log(hlsHdSrc)
 			var rtmpHdSrc = data.rtmpHd;
 			var playHtml =

unpackage/cache/wgt/__UNI__DBA6730/static/js/equipState_dict.json

@@ -1,3 +1,4 @@
+
 {   
     "imei":{
         "name":"设备ID",
@@ -35,7 +36,7 @@
         "value":{
             "0":"待机",
             "1":"工作",
-            "2":"工作"
+            "2":"充电"
         },
         "desc":"工作状态、0 待机， 1 工作"
     },
@@ -362,6 +363,17 @@
         },
         "desc":"摄像头状态 0 正常, 1 异常"
     },
+    "work_sta":{
+        "name":"摄像头状态",
+        "unit":"",
+        "value":{
+            "0":"待机",
+            "1":"收集",
+            "2": "培养",
+            "3": "拍照"
+        },
+        "desc":"摄像头状态 0 待机, 1 收集, 2 培养, 3 拍照"
+    },
     "imgres":{
         "name":"图片分辨率",
         "unit":"",
@@ -520,4 +532,5 @@
         ],
         "desc":"sim卡状态"
     }
+    
 }

unpackage/dist/dev/app-plus/app-view.js

@@ -23142,31 +23142,33 @@ var render = function () {
             ],
             1
           ),
-          _c(
-            "uni-view",
-            { staticClass: _vm._$g(5, "sc"), attrs: { _i: 5 } },
-            [
-              _c(
+          _vm._$g(5, "i")
+            ? _c(
                 "uni-view",
-                {
-                  staticStyle: { width: "95%", margin: "0 auto" },
-                  attrs: { _i: 6 },
-                },
+                { staticClass: _vm._$g(5, "sc"), attrs: { _i: 5 } },
                 [
-                  _c("u-tabs", {
-                    attrs: { _i: 7 },
-                    on: {
-                      change: function ($event) {
-                        return _vm.$handleViewEvent($event)
-                      },
+                  _c(
+                    "uni-view",
+                    {
+                      staticStyle: { width: "95%", margin: "0 auto" },
+                      attrs: { _i: 6 },
                     },
-                  }),
+                    [
+                      _c("u-tabs", {
+                        attrs: { _i: 7 },
+                        on: {
+                          change: function ($event) {
+                            return _vm.$handleViewEvent($event)
+                          },
+                        },
+                      }),
+                    ],
+                    1
+                  ),
                 ],
                 1
-              ),
-            ],
-            1
-          ),
+              )
+            : _vm._e(),
           _c(
             "uni-view",
             { staticClass: _vm._$g(8, "sc"), attrs: { _i: 8 } },
@@ -23187,9 +23189,17 @@ var render = function () {
                   _c("v-uni-input", {
                     attrs: {
                       type: "text",
-                      placeholder: "请输入设备ID",
+                      placeholder: "请输入设备编号",
                       _i: 11,
                     },
+                    on: {
+                      change: function ($event) {
+                        return _vm.$handleViewEvent($event)
+                      },
+                      confirm: function ($event) {
+                        return _vm.$handleViewEvent($event)
+                      },
+                    },
                     model: {
                       value: _vm._$g(11, "v-model"),
                       callback: function ($$v) {
@@ -23244,100 +23254,93 @@ var render = function () {
                     "v-uni-label",
                     { key: items, attrs: { _i: "17-" + $30 } },
                     [
-                      _vm._$g("18-" + $30, "i")
-                        ? _c(
+                      _c(
+                        "uni-view",
+                        {
+                          staticClass: _vm._$g("18-" + $30, "sc"),
+                          attrs: { class: "equipment", _i: "18-" + $30 },
+                        },
+                        [
+                          _c(
                             "uni-view",
                             {
-                              staticClass: _vm._$g("18-" + $30, "sc"),
-                              attrs: { class: "equipment", _i: "18-" + $30 },
+                              staticClass: _vm._$g("19-" + $30, "sc"),
+                              attrs: { _i: "19-" + $30 },
                             },
                             [
+                              _c("v-uni-image", {
+                                staticClass: _vm._$g("20-" + $30, "sc"),
+                                attrs: {
+                                  src: _vm._$g("20-" + $30, "a-src"),
+                                  mode: "",
+                                  _i: "20-" + $30,
+                                },
+                              }),
                               _c(
-                                "uni-view",
+                                "span",
+                                {
+                                  staticClass: _vm._$g("21-" + $30, "sc"),
+                                  attrs: { _i: "21-" + $30 },
+                                },
+                                [_vm._v(_vm._$g("21-" + $30, "t0-0"))]
+                              ),
+                              _c("v-uni-checkbox", {
+                                staticClass: _vm._$g("22-" + $30, "sc"),
+                                attrs: {
+                                  value: _vm._$g("22-" + $30, "a-value"),
+                                  checked: _vm._$g("22-" + $30, "a-checked"),
+                                  color: "#42b983",
+                                  _i: "22-" + $30,
+                                },
+                              }),
+                            ],
+                            1
+                          ),
+                          _c(
+                            "uni-view",
+                            {
+                              staticClass: _vm._$g("23-" + $30, "sc"),
+                              attrs: { _i: "23-" + $30 },
+                            },
+                            [
+                              _c(
+                                "p",
                                 {
-                                  staticClass: _vm._$g("19-" + $30, "sc"),
-                                  attrs: { _i: "19-" + $30 },
+                                  staticClass: _vm._$g("24-" + $30, "sc"),
+                                  attrs: { _i: "24-" + $30 },
                                 },
                                 [
-                                  _c("v-uni-image", {
-                                    staticClass: _vm._$g("20-" + $30, "sc"),
-                                    attrs: {
-                                      src: _vm._$g("20-" + $30, "a-src"),
-                                      mode: "",
-                                      _i: "20-" + $30,
-                                    },
-                                  }),
-                                  _c(
-                                    "span",
-                                    {
-                                      staticClass: _vm._$g("21-" + $30, "sc"),
-                                      attrs: { _i: "21-" + $30 },
-                                    },
-                                    [_vm._v(_vm._$g("21-" + $30, "t0-0"))]
+                                  _vm._v(
+                                    "设备ID：" + _vm._$g("24-" + $30, "t0-0")
                                   ),
-                                  _c("v-uni-checkbox", {
-                                    staticClass: _vm._$g("22-" + $30, "sc"),
-                                    attrs: {
-                                      value: _vm._$g("22-" + $30, "a-value"),
-                                      checked: _vm._$g(
-                                        "22-" + $30,
-                                        "a-checked"
-                                      ),
-                                      color: "#42b983",
-                                      _i: "22-" + $30,
-                                    },
-                                  }),
-                                ],
-                                1
+                                ]
                               ),
                               _c(
-                                "uni-view",
+                                "p",
                                 {
-                                  staticClass: _vm._$g("23-" + $30, "sc"),
-                                  attrs: { _i: "23-" + $30 },
+                                  staticClass: _vm._$g("25-" + $30, "sc"),
+                                  attrs: { _i: "25-" + $30 },
                                 },
                                 [
-                                  _c(
-                                    "p",
-                                    {
-                                      staticClass: _vm._$g("24-" + $30, "sc"),
-                                      attrs: { _i: "24-" + $30 },
-                                    },
-                                    [
-                                      _vm._v(
-                                        "设备ID：" +
-                                          _vm._$g("24-" + $30, "t0-0")
-                                      ),
-                                    ]
-                                  ),
-                                  _c(
-                                    "p",
-                                    {
-                                      staticClass: _vm._$g("25-" + $30, "sc"),
-                                      attrs: { _i: "25-" + $30 },
-                                    },
-                                    [
-                                      _vm._v(
-                                        "设备名称：" +
-                                          _vm._$g("25-" + $30, "t0-0")
-                                      ),
-                                    ]
-                                  ),
-                                  _c(
-                                    "uni-view",
-                                    {
-                                      staticClass: _vm._$g("26-" + $30, "sc"),
-                                      attrs: { _i: "26-" + $30 },
-                                    },
-                                    [_vm._v("在线")]
+                                  _vm._v(
+                                    "设备编号：" + _vm._$g("25-" + $30, "t0-0")
                                   ),
-                                ],
-                                1
+                                ]
+                              ),
+                              _c(
+                                "uni-view",
+                                {
+                                  staticClass: _vm._$g("26-" + $30, "sc"),
+                                  attrs: { _i: "26-" + $30 },
+                                },
+                                [_vm._v("在线")]
                               ),
                             ],
                             1
-                          )
-                        : _vm._e(),
+                          ),
+                        ],
+                        1
+                      ),
                     ],
                     1
                   )
@@ -35739,7 +35742,7 @@ var render = function () {
                     attrs: {
                       type: "text",
                       value: "",
-                      placeholder: "请输入设备ID或设备名称",
+                      placeholder: "请输入设备ID",
                       clearable: false,
                       _i: 6,
                     },
@@ -50931,12 +50934,12 @@ __webpack_require__.r(__webpack_exports__);
 var components
 try {
   components = {
+    uInput: __webpack_require__(/*! @/uview-ui/components/u-input/u-input.vue */ 17).default,
     uIcon: __webpack_require__(/*! @/uview-ui/components/u-icon/u-icon.vue */ 5).default,
     uRadioGroup:
       __webpack_require__(/*! @/uview-ui/components/u-radio-group/u-radio-group.vue */ 907).default,
     uRadio: __webpack_require__(/*! @/uview-ui/components/u-radio/u-radio.vue */ 915).default,
     uSwitch: __webpack_require__(/*! @/uview-ui/components/u-switch/u-switch.vue */ 483).default,
-    uInput: __webpack_require__(/*! @/uview-ui/components/u-input/u-input.vue */ 17).default,
     uMask: __webpack_require__(/*! @/uview-ui/components/u-mask/u-mask.vue */ 47).default,
     uSelect: __webpack_require__(/*! @/uview-ui/components/u-select/u-select.vue */ 205).default,
   }
@@ -50971,18 +50974,41 @@ var render = function () {
         [
           _c(
             "uni-view",
-            { staticClass: _vm._$g(2, "sc"), attrs: { _i: 2 } },
+            { attrs: { _i: 2 } },
             [
+              _c("uni-view", { attrs: { _i: 3 } }, [_vm._v("预警名称")]),
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(3, "sc"), attrs: { _i: 3 } },
+                { attrs: { _i: 4 } },
+                [
+                  _c("u-input", {
+                    attrs: { _i: 5 },
+                    model: {
+                      value: _vm._$g(5, "v-model"),
+                      callback: function () {},
+                      expression: "warning_name",
+                    },
+                  }),
+                ],
+                1
+              ),
+            ],
+            1
+          ),
+          _c(
+            "uni-view",
+            { staticClass: _vm._$g(6, "sc"), attrs: { _i: 6 } },
+            [
+              _c(
+                "uni-view",
+                { staticClass: _vm._$g(7, "sc"), attrs: { _i: 7 } },
                 [_vm._v("预警设备选择：")]
               ),
               _c(
                 "uni-view",
                 {
-                  staticClass: _vm._$g(4, "sc"),
-                  attrs: { _i: 4 },
+                  staticClass: _vm._$g(8, "sc"),
+                  attrs: { _i: 8 },
                   on: {
                     click: function ($event) {
                       return _vm.$handleViewEvent($event)
@@ -50997,12 +51023,12 @@ var render = function () {
                         {
                           name: "show",
                           rawName: "v-show",
-                          value: _vm._$g(5, "v-show"),
-                          expression: "_$g(5,'v-show')",
+                          value: _vm._$g(9, "v-show"),
+                          expression: "_$g(9,'v-show')",
                         },
                       ],
-                      staticClass: _vm._$g(5, "sc"),
-                      attrs: { _i: 5 },
+                      staticClass: _vm._$g(9, "sc"),
+                      attrs: { _i: 9 },
                     },
                     [_vm._v("请选择预警")]
                   ),
@@ -51013,29 +51039,29 @@ var render = function () {
                         {
                           name: "show",
                           rawName: "v-show",
-                          value: _vm._$g(6, "v-show"),
-                          expression: "_$g(6,'v-show')",
+                          value: _vm._$g(10, "v-show"),
+                          expression: "_$g(10,'v-show')",
                         },
                       ],
-                      staticClass: _vm._$g(6, "sc"),
-                      attrs: { _i: 6 },
+                      staticClass: _vm._$g(10, "sc"),
+                      attrs: { _i: 10 },
                     },
-                    _vm._l(_vm._$g(7, "f"), function (item, $10, $20, $30) {
+                    _vm._l(_vm._$g(11, "f"), function (item, $10, $20, $30) {
                       return _c(
                         "uni-view",
                         {
                           key: item,
                           staticStyle: { "margin-right": "20rpx" },
-                          attrs: { _i: "7-" + $30 },
+                          attrs: { _i: "11-" + $30 },
                         },
-                        [_vm._v(_vm._$g("7-" + $30, "t0-0"))]
+                        [_vm._v(_vm._$g("11-" + $30, "t0-0"))]
                       )
                     }),
                     1
                   ),
                   _c("u-icon", {
-                    staticClass: _vm._$g(8, "sc"),
-                    attrs: { _i: 8 },
+                    staticClass: _vm._$g(12, "sc"),
+                    attrs: { _i: 12 },
                   }),
                 ],
                 1
@@ -51045,26 +51071,26 @@ var render = function () {
           ),
           _c(
             "uni-view",
-            { staticClass: _vm._$g(9, "sc"), attrs: { _i: 9 } },
+            { staticClass: _vm._$g(13, "sc"), attrs: { _i: 13 } },
             [
               _c(
                 "uni-view",
-                { staticStyle: { "line-height": "27px" }, attrs: { _i: 10 } },
+                { staticStyle: { "line-height": "27px" }, attrs: { _i: 14 } },
                 [_vm._v("预警计算：")]
               ),
               _c(
                 "u-radio-group",
                 {
-                  attrs: { _i: 11 },
+                  attrs: { _i: 15 },
                   model: {
-                    value: _vm._$g(11, "v-model"),
+                    value: _vm._$g(15, "v-model"),
                     callback: function () {},
                     expression: "warnjihe",
                   },
                 },
                 [
-                  _c("u-radio", { attrs: { _i: 12 } }, [_vm._v("逐台预警")]),
-                  _c("u-radio", { attrs: { _i: 13 } }, [_vm._v("合并预警")]),
+                  _c("u-radio", { attrs: { _i: 16 } }, [_vm._v("逐台预警")]),
+                  _c("u-radio", { attrs: { _i: 17 } }, [_vm._v("合并预警")]),
                 ],
                 1
               ),
@@ -51076,22 +51102,22 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(14, "sc"), attrs: { _i: 14 } },
+        { staticClass: _vm._$g(18, "sc"), attrs: { _i: 18 } },
         [
           _c(
             "uni-view",
-            { staticClass: _vm._$g(15, "sc"), attrs: { _i: 15 } },
+            { staticClass: _vm._$g(19, "sc"), attrs: { _i: 19 } },
             [
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(16, "sc"), attrs: { _i: 16 } },
+                { staticClass: _vm._$g(20, "sc"), attrs: { _i: 20 } },
                 [
                   _c(
                     "uni-view",
-                    { staticClass: _vm._$g(17, "sc"), attrs: { _i: 17 } },
+                    { staticClass: _vm._$g(21, "sc"), attrs: { _i: 21 } },
                     [_vm._v("目标种类预警")]
                   ),
-                  _c("uni-view", { attrs: { _i: 18 } }, [
+                  _c("uni-view", { attrs: { _i: 22 } }, [
                     _vm._v("每天害虫 种类数量达到此值时，短信预警"),
                   ]),
                 ],
@@ -51099,12 +51125,12 @@ var render = function () {
               ),
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(19, "sc"), attrs: { _i: 19 } },
+                { staticClass: _vm._$g(23, "sc"), attrs: { _i: 23 } },
                 [
                   _c("u-switch", {
-                    attrs: { _i: 20 },
+                    attrs: { _i: 24 },
                     model: {
-                      value: _vm._$g(20, "v-model"),
+                      value: _vm._$g(24, "v-model"),
                       callback: function () {},
                       expression: "conf.pestCategory",
                     },
@@ -51117,17 +51143,17 @@ var render = function () {
           ),
           _c(
             "uni-view",
-            { attrs: { _i: 21 } },
+            { attrs: { _i: 25 } },
             [
-              _c("uni-view", { attrs: { _i: 22 } }, [_vm._v("害虫种类预警")]),
+              _c("uni-view", { attrs: { _i: 26 } }, [_vm._v("害虫种类预警")]),
               _c(
                 "uni-view",
-                { attrs: { _i: 23 } },
+                { attrs: { _i: 27 } },
                 [
                   _c("u-input", {
-                    attrs: { _i: 24 },
+                    attrs: { _i: 28 },
                     model: {
-                      value: _vm._$g(24, "v-model"),
+                      value: _vm._$g(28, "v-model"),
                       callback: function () {},
                       expression: "conf.pestCategoryNum",
                     },
@@ -51143,22 +51169,22 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(25, "sc"), attrs: { _i: 25 } },
+        { staticClass: _vm._$g(29, "sc"), attrs: { _i: 29 } },
         [
           _c(
             "uni-view",
-            { staticClass: _vm._$g(26, "sc"), attrs: { _i: 26 } },
+            { staticClass: _vm._$g(30, "sc"), attrs: { _i: 30 } },
             [
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(27, "sc"), attrs: { _i: 27 } },
+                { staticClass: _vm._$g(31, "sc"), attrs: { _i: 31 } },
                 [
                   _c(
                     "uni-view",
-                    { staticClass: _vm._$g(28, "sc"), attrs: { _i: 28 } },
+                    { staticClass: _vm._$g(32, "sc"), attrs: { _i: 32 } },
                     [_vm._v("数量预警")]
                   ),
-                  _c("uni-view", { attrs: { _i: 29 } }, [
+                  _c("uni-view", { attrs: { _i: 33 } }, [
                     _vm._v("每天害虫 指定害虫数达到此值时，短信预警"),
                   ]),
                 ],
@@ -51166,12 +51192,12 @@ var render = function () {
               ),
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(30, "sc"), attrs: { _i: 30 } },
+                { staticClass: _vm._$g(34, "sc"), attrs: { _i: 34 } },
                 [
                   _c("u-switch", {
-                    attrs: { _i: 31 },
+                    attrs: { _i: 35 },
                     model: {
-                      value: _vm._$g(31, "v-model"),
+                      value: _vm._$g(35, "v-model"),
                       callback: function () {},
                       expression: "conf.appointPest",
                     },
@@ -51184,25 +51210,25 @@ var render = function () {
           ),
           _c(
             "uni-view",
-            { staticClass: _vm._$g(32, "sc"), attrs: { _i: 32 } },
+            { staticClass: _vm._$g(36, "sc"), attrs: { _i: 36 } },
             [
-              _c("uni-view", { attrs: { _i: 33 } }, [
+              _c("uni-view", { attrs: { _i: 37 } }, [
                 _vm._v("指定害虫数量预警"),
               ]),
-              _vm._l(_vm._$g(34, "f"), function (item, index, $21, $31) {
+              _vm._l(_vm._$g(38, "f"), function (item, index, $21, $31) {
                 return _c(
                   "uni-view",
                   {
                     key: item,
-                    staticClass: _vm._$g("34-" + $31, "sc"),
-                    attrs: { _i: "34-" + $31 },
+                    staticClass: _vm._$g("38-" + $31, "sc"),
+                    attrs: { _i: "38-" + $31 },
                   },
                   [
                     _c(
                       "uni-view",
                       {
-                        staticClass: _vm._$g("35-" + $31, "sc"),
-                        attrs: { _i: "35-" + $31 },
+                        staticClass: _vm._$g("39-" + $31, "sc"),
+                        attrs: { _i: "39-" + $31 },
                         on: {
                           click: function ($event) {
                             return _vm.$handleViewEvent($event)
@@ -51217,12 +51243,12 @@ var render = function () {
                               {
                                 name: "show",
                                 rawName: "v-show",
-                                value: _vm._$g("36-" + $31, "v-show"),
-                                expression: "_$g((\"36-\"+$31),'v-show')",
+                                value: _vm._$g("40-" + $31, "v-show"),
+                                expression: "_$g((\"40-\"+$31),'v-show')",
                               },
                             ],
-                            staticClass: _vm._$g("36-" + $31, "sc"),
-                            attrs: { _i: "36-" + $31 },
+                            staticClass: _vm._$g("40-" + $31, "sc"),
+                            attrs: { _i: "40-" + $31 },
                           },
                           [_vm._v("请选择害虫")]
                         ),
@@ -51233,18 +51259,18 @@ var render = function () {
                               {
                                 name: "show",
                                 rawName: "v-show",
-                                value: _vm._$g("37-" + $31, "v-show"),
-                                expression: "_$g((\"37-\"+$31),'v-show')",
+                                value: _vm._$g("41-" + $31, "v-show"),
+                                expression: "_$g((\"41-\"+$31),'v-show')",
                               },
                             ],
-                            staticClass: _vm._$g("37-" + $31, "sc"),
-                            attrs: { _i: "37-" + $31 },
+                            staticClass: _vm._$g("41-" + $31, "sc"),
+                            attrs: { _i: "41-" + $31 },
                           },
-                          [_vm._v(_vm._$g("37-" + $31, "t0-0"))]
+                          [_vm._v(_vm._$g("41-" + $31, "t0-0"))]
                         ),
                         _c("u-icon", {
-                          staticClass: _vm._$g("38-" + $31, "sc"),
-                          attrs: { _i: "38-" + $31 },
+                          staticClass: _vm._$g("42-" + $31, "sc"),
+                          attrs: { _i: "42-" + $31 },
                         }),
                       ],
                       1
@@ -51252,14 +51278,14 @@ var render = function () {
                     _c(
                       "uni-view",
                       {
-                        staticClass: _vm._$g("39-" + $31, "sc"),
-                        attrs: { _i: "39-" + $31 },
+                        staticClass: _vm._$g("43-" + $31, "sc"),
+                        attrs: { _i: "43-" + $31 },
                       },
                       [
                         _c("u-input", {
-                          attrs: { _i: "40-" + $31 },
+                          attrs: { _i: "44-" + $31 },
                           model: {
-                            value: _vm._$g("40-" + $31, "v-model"),
+                            value: _vm._$g("44-" + $31, "v-model"),
                             callback: function () {},
                             expression: "item.appointPestNum",
                           },
@@ -51272,12 +51298,12 @@ var render = function () {
                         {
                           name: "show",
                           rawName: "v-show",
-                          value: _vm._$g("41-" + $31, "v-show"),
-                          expression: "_$g((\"41-\"+$31),'v-show')",
+                          value: _vm._$g("45-" + $31, "v-show"),
+                          expression: "_$g((\"45-\"+$31),'v-show')",
                         },
                       ],
-                      staticClass: _vm._$g("41-" + $31, "sc"),
-                      attrs: { _i: "41-" + $31 },
+                      staticClass: _vm._$g("45-" + $31, "sc"),
+                      attrs: { _i: "45-" + $31 },
                       on: {
                         click: function ($event) {
                           return _vm.$handleViewEvent($event)
@@ -51289,12 +51315,12 @@ var render = function () {
                         {
                           name: "show",
                           rawName: "v-show",
-                          value: _vm._$g("42-" + $31, "v-show"),
-                          expression: "_$g((\"42-\"+$31),'v-show')",
+                          value: _vm._$g("46-" + $31, "v-show"),
+                          expression: "_$g((\"46-\"+$31),'v-show')",
                         },
                       ],
-                      staticClass: _vm._$g("42-" + $31, "sc"),
-                      attrs: { _i: "42-" + $31 },
+                      staticClass: _vm._$g("46-" + $31, "sc"),
+                      attrs: { _i: "46-" + $31 },
                       on: {
                         click: function ($event) {
                           return _vm.$handleViewEvent($event)
@@ -51313,22 +51339,22 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(43, "sc"), attrs: { _i: 43 } },
+        { staticClass: _vm._$g(47, "sc"), attrs: { _i: 47 } },
         [
           _c(
             "uni-view",
-            { staticClass: _vm._$g(44, "sc"), attrs: { _i: 44 } },
+            { staticClass: _vm._$g(48, "sc"), attrs: { _i: 48 } },
             [
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(45, "sc"), attrs: { _i: 45 } },
+                { staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } },
                 [
                   _c(
                     "uni-view",
-                    { staticClass: _vm._$g(46, "sc"), attrs: { _i: 46 } },
+                    { staticClass: _vm._$g(50, "sc"), attrs: { _i: 50 } },
                     [_vm._v("总数预警")]
                   ),
-                  _c("uni-view", { attrs: { _i: 47 } }, [
+                  _c("uni-view", { attrs: { _i: 51 } }, [
                     _vm._v("每天害虫总数数量达到此值时，短信预警"),
                   ]),
                 ],
@@ -51336,12 +51362,12 @@ var render = function () {
               ),
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(48, "sc"), attrs: { _i: 48 } },
+                { staticClass: _vm._$g(52, "sc"), attrs: { _i: 52 } },
                 [
                   _c("u-switch", {
-                    attrs: { _i: 49 },
+                    attrs: { _i: 53 },
                     model: {
-                      value: _vm._$g(49, "v-model"),
+                      value: _vm._$g(53, "v-model"),
                       callback: function () {},
                       expression: "conf.pestTotal",
                     },
@@ -51354,17 +51380,17 @@ var render = function () {
           ),
           _c(
             "uni-view",
-            { attrs: { _i: 50 } },
+            { attrs: { _i: 54 } },
             [
-              _c("uni-view", { attrs: { _i: 51 } }, [_vm._v("害虫种类预警")]),
+              _c("uni-view", { attrs: { _i: 55 } }, [_vm._v("害虫种类预警")]),
               _c(
                 "uni-view",
-                { attrs: { _i: 52 } },
+                { attrs: { _i: 56 } },
                 [
                   _c("u-input", {
-                    attrs: { _i: 53 },
+                    attrs: { _i: 57 },
                     model: {
-                      value: _vm._$g(53, "v-model"),
+                      value: _vm._$g(57, "v-model"),
                       callback: function () {},
                       expression: "conf.pestTotalNum",
                     },
@@ -51380,22 +51406,22 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(54, "sc"), attrs: { _i: 54 } },
+        { staticClass: _vm._$g(58, "sc"), attrs: { _i: 58 } },
         [
           _c(
             "uni-view",
-            { staticClass: _vm._$g(55, "sc"), attrs: { _i: 55 } },
+            { staticClass: _vm._$g(59, "sc"), attrs: { _i: 59 } },
             [
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(56, "sc"), attrs: { _i: 56 } },
+                { staticClass: _vm._$g(60, "sc"), attrs: { _i: 60 } },
                 [
                   _c(
                     "uni-view",
-                    { staticClass: _vm._$g(57, "sc"), attrs: { _i: 57 } },
+                    { staticClass: _vm._$g(61, "sc"), attrs: { _i: 61 } },
                     [_vm._v("综合预警")]
                   ),
-                  _c("uni-view", { attrs: { _i: 58 } }, [
+                  _c("uni-view", { attrs: { _i: 62 } }, [
                     _vm._v("监测每天出现的害虫种类及数量，短信预警"),
                   ]),
                 ],
@@ -51403,12 +51429,12 @@ var render = function () {
               ),
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(59, "sc"), attrs: { _i: 59 } },
+                { staticClass: _vm._$g(63, "sc"), attrs: { _i: 63 } },
                 [
                   _c("u-switch", {
-                    attrs: { _i: 60 },
+                    attrs: { _i: 64 },
                     model: {
-                      value: _vm._$g(60, "v-model"),
+                      value: _vm._$g(64, "v-model"),
                       callback: function () {},
                       expression: "conf.pestWarn",
                     },
@@ -51424,22 +51450,22 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(61, "sc"), attrs: { _i: 61 } },
+        { staticClass: _vm._$g(65, "sc"), attrs: { _i: 65 } },
         [
           _c(
             "uni-view",
-            { staticClass: _vm._$g(62, "sc"), attrs: { _i: 62 } },
+            { staticClass: _vm._$g(66, "sc"), attrs: { _i: 66 } },
             [
               _c(
                 "uni-view",
-                { staticClass: _vm._$g(63, "sc"), attrs: { _i: 63 } },
+                { staticClass: _vm._$g(67, "sc"), attrs: { _i: 67 } },
                 [_vm._v("短信接受人：")]
               ),
               _c(
                 "uni-view",
                 {
                   staticStyle: { color: "#14A478" },
-                  attrs: { _i: 64 },
+                  attrs: { _i: 68 },
                   on: {
                     click: function ($event) {
                       return _vm.$handleViewEvent($event)
@@ -51454,8 +51480,8 @@ var render = function () {
           _c(
             "uni-view",
             {
-              staticClass: _vm._$g(65, "sc"),
-              attrs: { _i: 65 },
+              staticClass: _vm._$g(69, "sc"),
+              attrs: { _i: 69 },
               on: {
                 click: function ($event) {
                   return _vm.$handleViewEvent($event)
@@ -51470,12 +51496,12 @@ var render = function () {
                     {
                       name: "show",
                       rawName: "v-show",
-                      value: _vm._$g(66, "v-show"),
-                      expression: "_$g(66,'v-show')",
+                      value: _vm._$g(70, "v-show"),
+                      expression: "_$g(70,'v-show')",
                     },
                   ],
-                  staticClass: _vm._$g(66, "sc"),
-                  attrs: { _i: 66 },
+                  staticClass: _vm._$g(70, "sc"),
+                  attrs: { _i: 70 },
                 },
                 [_vm._v("请选择短信接收人")]
               ),
@@ -51486,29 +51512,29 @@ var render = function () {
                     {
                       name: "show",
                       rawName: "v-show",
-                      value: _vm._$g(67, "v-show"),
-                      expression: "_$g(67,'v-show')",
+                      value: _vm._$g(71, "v-show"),
+                      expression: "_$g(71,'v-show')",
                     },
                   ],
-                  staticClass: _vm._$g(67, "sc"),
-                  attrs: { _i: 67 },
+                  staticClass: _vm._$g(71, "sc"),
+                  attrs: { _i: 71 },
                 },
-                _vm._l(_vm._$g(68, "f"), function (item, $12, $22, $32) {
+                _vm._l(_vm._$g(72, "f"), function (item, $12, $22, $32) {
                   return _c(
                     "uni-view",
                     {
                       key: item,
                       staticStyle: { "margin-right": "20rpx" },
-                      attrs: { _i: "68-" + $32 },
+                      attrs: { _i: "72-" + $32 },
                     },
-                    [_vm._v(_vm._$g("68-" + $32, "t0-0"))]
+                    [_vm._v(_vm._$g("72-" + $32, "t0-0"))]
                   )
                 }),
                 1
               ),
               _c("u-icon", {
-                staticClass: _vm._$g(69, "sc"),
-                attrs: { _i: 69 },
+                staticClass: _vm._$g(73, "sc"),
+                attrs: { _i: 73 },
               }),
             ],
             1
@@ -51519,8 +51545,8 @@ var render = function () {
       _c(
         "uni-view",
         {
-          staticClass: _vm._$g(70, "sc"),
-          attrs: { _i: 70 },
+          staticClass: _vm._$g(74, "sc"),
+          attrs: { _i: 74 },
           on: {
             click: function ($event) {
               return _vm.$handleViewEvent($event)
@@ -51531,44 +51557,44 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { attrs: { _i: 71 } },
+        { attrs: { _i: 75 } },
         [
-          _c("u-mask", { attrs: { _i: 72 } }),
+          _c("u-mask", { attrs: { _i: 76 } }),
           _c("u-select", {
-            attrs: { _i: 73 },
+            attrs: { _i: 77 },
             on: {
               confirm: function ($event) {
                 return _vm.$handleViewEvent($event)
               },
             },
             model: {
-              value: _vm._$g(73, "v-model"),
+              value: _vm._$g(77, "v-model"),
               callback: function () {},
               expression: "wormshow",
             },
           }),
           _c("multiple-select", {
-            attrs: { _i: 74 },
+            attrs: { _i: 78 },
             on: {
               confirm: function ($event) {
                 return _vm.$handleViewEvent($event)
               },
             },
             model: {
-              value: _vm._$g(74, "v-model"),
+              value: _vm._$g(78, "v-model"),
               callback: function () {},
               expression: "accServiceShow",
             },
           }),
           _c("multiple-select", {
-            attrs: { _i: 75 },
+            attrs: { _i: 79 },
             on: {
               confirm: function ($event) {
                 return _vm.$handleViewEvent($event)
               },
             },
             model: {
-              value: _vm._$g(75, "v-model"),
+              value: _vm._$g(79, "v-model"),
               callback: function () {},
               expression: "accServiceShowphone",
             },

util/api.js

@@ -8,7 +8,7 @@ export const myRequest = (options) => {
 		BASE_URL = process.env.NODE_ENV === 'development' ? "http://114.115.147.140:8002" : "http://8.136.98.49:8002"
 		// BASE_URL = 'http://192.168.1.77:8002'
 	}
-	// BASE_URL = 'http://192.168.1.52:8002'
+	BASE_URL = 'http://192.168.1.52:8002'
 	console.log(BASE_URL,'my request',process.env.NODE_ENV)
 	// console.log(BASE_URL)
 	var session_key = ""