8/3 数据备份

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.0.5",
-    "versionCode" : 105,
+    "versionName" : "1.0.6",
+    "versionCode" : 106,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -47,6 +47,9 @@
                     "<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\"/>",
@@ -152,7 +155,8 @@
                     }
                 }
             }
-        }
+        },
+        "template" : "static/tempalate.html"
     }
 }
 // "sdkConfigs" : {

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

@@ -224,13 +224,13 @@
 			}
 		},
 		onLoad(option) {
+			this.timeend = +new Date() / 1000
+			this.timestate = this.timeend - 60 * 60 * 24
 			console.log(option)
 			this.device_id = option.device_id
 			this.d_id = option.d_id
 		},
 		onShow(){
-			this.timeend = +new Date() / 1000
-			this.timestate = this.timeend - 60 * 60 * 24
 			this.imglists=[]
 			console.log(this.timestate)
 			this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))

pages/cb/equip-detail/equip-detail.vue

@@ -15,7 +15,7 @@
 				最新上报时间：{{equipInfo.addtime||equipInfo.uptime | timeFormat}}
 			</view>
 			<view class="">
-				设备地址：{{equipInfo.address?equipInfo.address:"--"}}
+				设备地址：{{equipInfo.address||city}}
 			</view>
 			<view v-if="type==7" @click="setTime(equipInfo.d_id)">
 				<text space="emsp">载玻片、培养液更换时间</text>
@@ -659,7 +659,12 @@
 					dataType: "json",
 					complete: ress => {
 						console.log(ress)
-						this.city = ress.data.regeocode.formatted_address
+						// this.city = ress.data.regeocode.formatted_address
+						if(ress.data.regeocode.formatted_address.length==0){
+							this.city="--"
+						}else{
+							this.city = ress.data.regeocode.formatted_address
+						}
 					}
 				});
 			},

pages/cb/xy2.0/historydatas.vue

@@ -79,12 +79,12 @@
 				pixelRatio: 1,
 				canvastishiTF: false,
 				pagesum: null,
-				worms:[]
+				worms: []
 			}
 		},
 		methods: {
 			async history() { //历史数据列表折线图
-				this.Chistory()
+				// this.Chistory()
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=sex_lure_nl.sex_lure.nl_device_line_chart',
 					data: {
@@ -100,30 +100,22 @@
 					this.canvastishiTF = false
 				} else {
 					this.canvastishiTF = true
-					var arr1 = []
-					var arr2 = []
+					// var arr1 = []
+					// var arr2 = []
 					var arr3 = []
 					var xtitle = []
 					for (var i = 0; i < res.length; i++) {
 						var times = new Date(res[i].xy_addtime)
 						xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes())
-						arr1.unshift(res[i].ah == "" ? "0" : res[i].ah)
-						arr2.unshift(res[i].at == "" ? "0" : res[i].at)
+						// arr1.unshift(res[i].ah == "" ? "0" : res[i].ah)
+						// arr2.unshift(res[i].at == "" ? "0" : res[i].at)
 					}
-					for(var j = 0; j < this.worms.length; j++){
+					for (var j = 0; j < this.worms.length; j++) {
 						var times = new Date(res[i].xy_addtime)
 						arr3.unshift(res[i].pest_num == "" ? "0" : res[i].pest_num)
 					}
-					this.$nextTick(()=>{
+					this.$nextTick(() => {
 						var obj = [{
-							name: '温度',
-							data: arr1,
-							color: '#00E29D'
-						}, {
-							name: '湿度',
-							data: arr2,
-							color: '#6CBBFF'
-						},{
 							name: '诱虫次数',
 							data: arr3,
 							color: '#ff0000'
@@ -143,15 +135,43 @@
 					}
 				})
 				this.worms = res
+				console.log(this.worms)
+				if (this.worms.data.length == 0) {
+					this.canvastishiTF = false
+				} else {
+					this.canvastishiTF = true
+					var arr3 = []
+					var xtitle = []
+					for (var i = 0; i < res.data.length; i++) {
+						// var times = new Date(res[i].xy_addtime)
+						// xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes())
+						xtitle.unshift(res.data[i].xy_addtime)
+						// arr1.unshift(res[i].ah == "" ? "0" : res[i].ah)
+						// arr2.unshift(res[i].at == "" ? "0" : res[i].at)
+					}
+					for (var j = 0; j < this.worms.data.length; j++) {
+						// var times = new Date(res[i].xy_addtime)
+						arr3.unshift(this.worms.data[j].pest_num == "" ? "0" : this.worms.data[j].pest_num)
+					}
+					console.log(arr3)
+					this.$nextTick(() => {
+						var obj = [{
+							name: '诱虫次数',
+							data: arr3,
+							color: '#ff0000'
+						}]
+						this.showColumn("canvasColumnA", xtitle, obj)
+					})
+				}
 			},
 			//forecast.worm_lamp.device_history_data历史数据列表
 			async historylist() { //历史数据列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=sex_lure_nl.sex_lure.nl_device_history',
 					data: {
-						device_id:this.device_id,
-						strat_time:parseInt(this.start_time / 1000),
-						end_time:parseInt(this.end_time / 1000),
+						device_id: this.device_id,
+						strat_time: parseInt(this.start_time / 1000),
+						end_time: parseInt(this.end_time / 1000),
 						page: this.page
 					}
 				})
@@ -173,7 +193,7 @@
 						d_id: this.d_id
 					}
 				})
-				if(res){
+				if (res) {
 					uni.showToast({
 						title: '刷新成功',
 						duration: 2000,
@@ -182,7 +202,7 @@
 					uni.navigateBack({
 						delta: 1
 					})
-				}else{
+				} else {
 					uni.showToast({
 						title: '刷新失败',
 						duration: 2000,
@@ -199,22 +219,26 @@
 				this.$forceUpdate()
 				if (index == 0) {
 					this.start_time = this.end_time - 24 * 60 * 60 * 1000
-					this.history()
+					// this.history()
+					this.Chistory()
 					this.historylist()
 				} else if (index == 1) {
 					var oldtime = now.setMonth(now.getMonth() - 1)
 					this.start_time = parseInt(oldtime)
-					this.history()
+					// this.history()
+					this.Chistory()
 					this.historylist()
 				} else if (index == 2) {
 					var oldtime = now.setMonth(now.getMonth() - 6)
 					this.start_time = parseInt(oldtime)
-					this.history()
+					// this.history()
+					this.Chistory()
 					this.historylist()
 				} else if (index == 3) {
 					var oldtime = now.setFullYear(now.getFullYear() - 1)
 					this.start_time = parseInt(oldtime)
-					this.history()
+					// this.history()
+					this.Chistory()
 					this.historylist()
 				}
 			},
@@ -259,7 +283,15 @@
 						scrollBackgroundColor: '#F7F7FF', //默认为 #EFEBEF
 						scrollColor: '#DEE7F7', //默认为 #A6A6A6
 					},
-					yAxis: {},
+					yAxis: {
+						gridType: 'dash',
+						gridColor: '#CCCCCC',
+						dashLength: 8,
+						splitNumber: 5,
+						format: (val) => {
+							return val.toFixed(1)
+						}
+					},
 					width: _self.cWidth * 1,
 					height: _self.cHeight * 1,
 					extra: {
@@ -293,11 +325,12 @@
 			this.cWidth = uni.upx2px(650);
 			this.cHeight = uni.upx2px(500);
 		},
-		onShow(){
-			this.end_time = +new  Date() + 1000
+		onShow() {
+			this.end_time = +new Date() + 1000
 			this.start_time = this.end_time - 24 * 60 * 60 * 1000
-			console.log(new Date(this.end_time),new Date(this.start_time))
-			this.history()
+			console.log(new Date(this.end_time), new Date(this.start_time))
+			// this.history()
+			this.Chistory()
 			this.historylist()
 		}
 	}
@@ -313,7 +346,6 @@
 		box-shadow: 0 0 10rpx #bcb9ca;
 		padding-top: 20rpx;
 		height: 550rpx;
-
 		.canvastishi {
 			font-size: 32rpx;
 			position: absolute;
@@ -375,9 +407,11 @@
 		.scroll-X {
 			width: 95%;
 			margin: 20rpx auto;
-			.table{
+
+			.table {
 				width: 1042px;
 			}
+
 			.tr {
 				display: flex;
 				overflow: hidden;
@@ -424,4 +458,3 @@
 		}
 	}
 </style>
-

pages/cb/xy2.0/particulars.vue

@@ -62,13 +62,13 @@
 							<p>{{newState.wind}}</p>
 						</view>
 					</view>
-					<view class="realtime_item">
+					<!-- <view class="realtime_item">
 						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/yujing.png" mode=""></image>
 						<view class="text">
 							<p>虫害情报</p>
 							<p>{{newState.warn==""?"暂无":newState.warn}}</p>
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<view class="sim" v-if="simTF">
@@ -352,9 +352,10 @@
 		width: 95%;
 		margin: 0rpx auto;
 		.realtime_title{
-			font-size: 36rpx;
+			font-size: 32rpx;
 			display: flex;
 			justify-content: space-between;
+			font-weight: 700;
 			.span{
 				color: #6e6c76;
 				font-size: 24rpx;
@@ -390,7 +391,8 @@
 		width: 95%;
 		margin: 40rpx auto;
 		.sim_title{
-			font-size: 36rpx;
+			font-size: 32rpx;
+			font-weight: 700;
 		}
 		.sim_text{
 			box-shadow: 0 0 10rpx #bcb9ca;

pages/disandpests/index.vue

@@ -11,7 +11,7 @@
 			<view class="recognition" v-if="datasTF">
 				<p class="recognition_title">{{name}}</p>
 				<view :class="tishi?'recognition_img':'recognition_img_two'">
-					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+path2" mode="" @error="error" @click="examine(path2)"></image>
+					<image :src="path2" mode="" @error="error" @click="examine(path2)"></image>
 				</view>
 				<button class="recognition_details" v-if="tishi" @click="examines">查看详情</button>
 				<button class="recognition_details" v-if="!tishi" @click="show=!show">再拍一张</button>
@@ -136,18 +136,19 @@
 				this.imgdata = ''
 			},
 			error() {
-				this.path2 = "/image/e1cd85dc59139760f43ddbac15136f2.png"
+				this.path2 = "http://www.hnyfwlw.com:8006/bigdata_app/image/e1cd85dc59139760f43ddbac15136f2.png"
 			},
 			optionverify(data) {
 				console.log(data)
 				if (data == null) {
 					this.name = "识别失败，请换张图片"
 					this.tishi = false
-					this.path2 = "/image/10ca93e17420371a82826073c8425c0.png"
+					this.path2 = "http://www.hnyfwlw.com:8006/bigdata_app/image/10ca93e17420371a82826073c8425c0.png"
 				} else {
 					if(data.img_urls==""){
-						this.path2 = "/image/e1cd85dc59139760f43ddbac15136f2.png"
+						this.path2 = "http://www.hnyfwlw.com:8006/bigdata_app/image/e1cd85dc59139760f43ddbac15136f2.png"
 					}else{
+						console.log(data.img_urls)
 						this.path2 = data.img_urls
 					}
 					this.name = data.name

pages/environment/equipment.vue

@@ -14,7 +14,7 @@
 					</p>
 					<p>设备名称：{{eqinfo.item.equip_name?eqinfo.item.equip_name:"无"}}</p>
 					<p>最近上报时间：<span v-if="eqinfo.item.uptime">{{eqinfo.item.uptime|timeFormat()}}</span><span v-else>{{eqinfo.item.addtime|timeFormat()}}</span></p>
-					<p>地址：{{city==""?"--":city}}</p>
+					<p>地址：{{city}}</p>
 				</view>
 			</view>
 			<view class="control">
@@ -36,7 +36,7 @@
 				<view class="realtime_text">
 					<view class="realtime_text_item">
 						<view class="realtime_text_item_info" v-for="(item,index) in olddata.conf" :key="index" v-if="olddata.dat[index][1]" @click="oneday(item,index)">
-							<view class="item_info_img" :style="{'background-color':olddatas[Math.floor(Math.random()*(5-0+1))]}">
+							<view class="item_info_img" :style="{'background-color':olddatas[Number(index.substr(1))%6]}">
 								<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/icon_'+olddata.dat[index][1]+'.png'"
 								 mode=""></image>
 							</view>
@@ -159,7 +159,12 @@
 					dataType: "json",
 					complete: ress => {
 						console.log(ress)
-						this.city = ress.data.regeocode.formatted_address
+						// this.city = ress.data.regeocode.formatted_address
+						if(ress.data.regeocode.formatted_address.length==0){
+							this.city="--"
+						}else{
+							this.city = ress.data.regeocode.formatted_address
+						}
 					}
 				});
 			},

pages/environment/history.vue

@@ -122,7 +122,7 @@
 			}
 		},
 		methods: { //weather.weather.qxz_detail
-			async listhistorydata(datas) { //上传时间 
+			async listhistorydata(datas) { //历史记录表格信息
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=weather.weather.qxz_detail',
 					data: {

pages/expertDiagnosis/index.vue

@@ -91,7 +91,7 @@
 			},
 			virus() {
 				uni.navigateTo({
-					url: "./wormcase?name=" + '病毒百科',
+					url: "./wormcase?name=" + '病害百科',
 				});
 			},
 			exchange() {

pages/expertDiagnosis/wormcase.vue

@@ -5,13 +5,19 @@
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" :title="title"></uni-nav-bar>
 			</view>
+			<view class="bases_search">
+				<view class="bases_search_text">
+					<u-icon name="search" class="search" @click="search"></u-icon>
+					<input type="text" v-model="inputdata" :placeholder="placeholder" @input="searchinput" />
+				</view>
+			</view>
 			<view class="particulars">
 				<view class="particulars_item" v-for="(item,index) in content" :key="index" @click="introduce(item.id)">
 					<view class="imgs">
 						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="" class="imgbg"></image>
 						<image :src="item.img_urls" mode="" class="imgs_img"></image>
 					</view>
-					<p>{{item.name}}</p>
+					<p class="info">{{item.name}}</p>
 				</view>
 			</view>
 		</view>
@@ -21,6 +27,10 @@
 	</view>
 </template>
 <script>
+	import {
+		Debounce,
+		Throttle
+	} from "../../util/anitthro.js"
 	export default {
 		data() {
 			return {
@@ -30,7 +40,8 @@
 					code: null,
 					page: null
 				},
-				isTop:false
+				isTop: false,
+				inputdata: ""
 			}
 		},
 		methods: {
@@ -39,7 +50,8 @@
 					url: '/api/api_gateway?method=pest.pests.pests_search',
 					data: {
 						code: data.code,
-						page: data.page
+						page: data.page,
+						name: data.name
 					}
 				})
 				this.content = this.content.concat(res.data)
@@ -60,17 +72,40 @@
 					duration: 500
 				})
 			},
+			searchinput() { //搜索
+				Debounce(() => {
+					this.search()
+				}, 1000)()
+			},
+			search() { //搜索按钮
+				this.content = []
+				if (this.title == "虫情百科") {
+					this.data.code = 2
+					this.data.page = 1
+					this.data.name = this.inputdata
+					this.getCooperation(this.data)
+				} else {
+					this.data.code = 1
+					this.data.page = 1
+					this.data.name = this.inputdata
+					this.getCooperation(this.data)
+				}
+			},
 		},
 		onLoad(option) {
 			this.title = option.name
 			if (option.name == "虫情百科") {
 				this.data.code = 2
 				this.data.page = 1
+				this.data.name = this.inputdata
 				this.getCooperation(this.data)
+				this.placeholder = "请输入害虫名称"
 			} else {
 				this.data.code = 1
 				this.data.page = 1
+				this.data.name = this.inputdata
 				this.getCooperation(this.data)
+				this.placeholder = "请输入病害名称"
 			}
 		},
 		onReachBottom() {
@@ -90,7 +125,7 @@
 	.particulars {
 		width: 100%;
 		position: relative;
-		top: 88rpx;
+		top: 148rpx;
 		display: flex;
 		flex-wrap: wrap;
 
@@ -121,8 +156,39 @@
 				}
 			}
 
-			p {
-				font-size: 24rpx;
+			.info {
+				font-size: 28rpx;
+				text-align: center;
+				margin-top: 20rpx;
+			}
+		}
+	}
+
+	.bases_search {
+		width: 100%;
+		position: fixed;
+		top: 88px;
+		z-index: 100;
+		background-color: #FFFFFF;
+
+		.bases_search_text {
+			width: 90%;
+			margin: 0 auto;
+			background-color: #F8F8F8;
+			height: 60rpx;
+			border-radius: 30rpx;
+			display: flex;
+			line-height: 60rpx;
+
+			.search {
+				padding: 0 20rpx;
+				font-size: 34rpx;
+			}
+
+			input {
+				width: 80%;
+				margin-top: 10rpx;
+				font-size: 28rpx;
 			}
 		}
 	}

pages/fourBase/allocation.vue

@@ -11,18 +11,26 @@
 					 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"/>
+				</view>
+			</view>
 			<view class="ass_list">
 				<checkbox-group class="che_group" @change="checkboxchange">
-					<label class="equipment" v-for="(items,indexs) in assignments.children" :key="items.id">
-						<view class="equipment_top">
-							<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+assignments.src" 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" />
-						</view>
-						<view class="equipment_bot">
-							<p class="equipment_bot_id">设备ID：{{items.id}}</p>
-							<p class="equipment_bot_name">设备名称：{{items.type_name}}</p>
-							<view class="equipment_state">在线</view>
+					<label  v-for="(items,indexs) in assignments.children" :key="items.id" >
+						<view class="" v-if="items.type_name.search(inputdata)+1" class="equipment">
+							<view class="equipment_top">
+								<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+assignments.src" 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" />
+							</view>
+							<view class="equipment_bot">
+								<p class="equipment_bot_id">设备ID：{{items.id}}</p>
+								<p class="equipment_bot_name">设备名称：{{items.type_name}}</p>
+								<view class="equipment_state">在线</view>
+							</view>
 						</view>
 					</label>
 				</checkbox-group>
@@ -71,11 +79,12 @@
 				obj: {},
 				isTop: false,
 				base_id: "",
-				baseidarr: ""
+				baseidarr: "",
+				inputdata:""
 			}
 		},
 		methods: {
-			async ybase() { //获取基地设备
+			async ybase() { //获取基地已绑定设备
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=base.bases.base_map_list',
 					data: {
@@ -84,9 +93,28 @@
 				})
 				this.baseidarr = res
 				console.log(res)
+				var arr = []
+				for(var i=0;i<res.length;i++){
+					if (arr.indexOf(res[i].type_name) === -1) {
+					     arr.push(res[i].type_name)
+					}
+				}
+				var obj = {}
+				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){
+							obj[key].push(res[i].device_id)
+						}
+					}
+				}
+				console.log(obj)
+				this.obj = obj
 				this.getFourbase()
 			},
-			async getFourbase() { //基地列表
+			async getFourbase() { //全部设备列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=base.bases.base_equip',
 				})
@@ -160,7 +188,10 @@
 					scrollTop: 0,
 					duration: 500
 				})
-			}
+			},
+			searchs(){
+				console.log(this.inputdata.search("好"))
+			},
 		},
 		onLoad(option) {
 			this.base_id = option.base_id
@@ -191,12 +222,10 @@
 	.bases_search {
 		width: 100%;
 		position: fixed;
-		top: 84px;
+		top: 128px;
 		z-index: 100;
 		background-color: #FFFFFF;
-		height: 80rpx;
-		padding-top: 20rpx;
-
+	
 		.bases_search_text {
 			width: 90%;
 			margin: 0 auto;
@@ -205,12 +234,12 @@
 			border-radius: 30rpx;
 			display: flex;
 			line-height: 60rpx;
-
+	
 			.search {
 				padding: 0 20rpx;
 				font-size: 34rpx;
 			}
-
+	
 			input {
 				width: 80%;
 				margin-top: 10rpx;
@@ -221,7 +250,7 @@
 
 	.ass_list {
 		position: absolute;
-		top: 84px;
+		top: 115px;
 		width: 100%;
 		margin-bottom: 40px;
 

pages/login/login.vue

@@ -79,7 +79,7 @@
 				isShow: false, //进度条
 				percentNum: 0, //在线下载进度
 				passvalue: false,
-				turnover: false
+				turnover: true
 			}
 		},
 		onLoad() {
@@ -130,10 +130,11 @@
 				this.appName = res[0].app_name
 				this.versions = Number(res[0].app_num.match(/\d+/g).join(""))
 				var id = Number(plus.runtime.version.match(/\d+/g).join(""))
-				console.log(this.versions, id)
+				console.log(this.versions, plus.runtime.version)
 				if (this.percentNum > 0) {
 					console.log("更新中")
 				} else {
+					console.log(this.turnover)
 					if (this.turnover) {
 						if (this.versions > id) {
 							uni.showModal({
@@ -173,6 +174,18 @@
 									}
 								}
 							})
+						}else{
+							uni.getStorage({
+								key: 'session_key',
+								success: (res) => {
+									console.log(res)
+									if (res.data != "") {
+										uni.switchTab({
+											url: "../index/index"
+										})
+									}
+								},
+							})
 						}
 					} else {
 						uni.getStorage({
@@ -192,7 +205,9 @@
 			upgrade() {
 				console.log(this.appName)
 				// var url = this.value + "/app_file/" + this.appName
-				var url = "http://hnyfwlw.com/app/big_data.apk"
+				var appName = "big_data2"//中性
+				// var appName = "big_data"//云飞
+				var url = "http://hnyfwlw.com/app/"+appName+".apk"
 				const downloadTask = uni.downloadFile({
 					url: url, //仅为示例，并非真实的资源
 					success: (res) => {

pages/monitor/index.vue

@@ -5,7 +5,7 @@
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="监控系统"></uni-nav-bar>
 				<view class="" style="margin-top: -10rpx;">
-					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/monitor/banner.png'" mode="widthFix"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/banner.png'" mode="widthFix"></image>
 				</view>
 			</view>
 			<view class="contenttf" v-if="contenttf">
@@ -14,6 +14,9 @@
 			<view class="content" v-else>
 				<template v-for="(item,index) in listArr">
 					<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">
+						<view class="" style="font-size:28rpx;color: #999;">
+							设备ID：{{item.device_id}}
+						</view>
 						<view class="type-name">
 							<view class="iconfont icon-jiankong"></view>
 							<text>
@@ -25,7 +28,7 @@
 			</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>

pages/my/about/about.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="line"></view>
+		<!-- <view class="line"></view>
 		<view class="logo-box">
 			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image>
 			<view class="version">
@@ -40,7 +40,7 @@
 				<text class="tit">公司邮箱</text>
 				<text class="val">hnyf826@163.com</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="line"></view>
 		<view class="part">
 			<view class="info-item" @click="renewal">
@@ -55,9 +55,9 @@
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<view class="bottom">
+		<!-- <view class="bottom">
 			©河南云飞科技发展有限公司
-		</view>
+		</view> -->
 		<u-modal title="升级中请勿随意操作" :show-confirm-button="false" v-model="showA" :content="contentA">
 			<view class="upgradeBox">
 				<u-line-progress v-show="isShow" active-color="#19be6b" :striped="true" :percent="percentNum" :striped-active="true"></u-line-progress>
@@ -76,11 +76,11 @@
 				contentA: '',
 				isShow: false, //进度条
 				percentNum: 0, //在线下载进度，
-				value: ""
+				value: "",
 			}
 		},
 		methods: {
-			async getEquipList(TF) {
+			async getEquipList() {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=home.homes.app_version_record',
 					data: {
@@ -89,42 +89,39 @@
 				})
 				console.log(res)
 				this.appName = res[0].app_name
-				this.id = res[0].app_num
 				this.versions = Number(res[0].app_num.match(/\d+/g).join(""))
-				var ids = Number(this.id.match(/\d+/g).join(""))
+				var ids = Number(plus.runtime.version.match(/\d+/g).join(""))
 				if (this.percentNum > 0) {
 					console.log("更新中")
 				} else {
-					if (TF) {
-						if (this.versions > ids) {
-							uni.showModal({
-								title: '检测到有新版本，是否更新？',
-								content: '建议更新,不更新可能会出现部分数据无法获取！',
-								confirmText: "更新",
-								cancelText: "不更新",
-								success: (res) => {
-									if (res.confirm) {
-										console.log('用户点击确定');
-										this.showA = true
-										this.isShow = true
-										this.upgrade()
-									} else if (res.cancel) {
-										// plus.runtime.quit();
-										console.log('用户点击取消');
-									}
+					if (this.versions > ids) {
+						uni.showModal({
+							title: '检测到有新版本，是否更新？',
+							content: '建议更新,不更新可能会出现部分数据无法获取！',
+							confirmText: "更新",
+							cancelText: "不更新",
+							success: (res) => {
+								if (res.confirm) {
+									console.log('用户点击确定');
+									this.showA = true
+									this.isShow = true
+									this.upgrade()
+								} else if (res.cancel) {
+									// plus.runtime.quit();
+									console.log('用户点击取消');
 								}
-							})
-						} else {
-							uni.showToast({
-								title: "当前版本已是最新版本",
-								icon: "none"
-							})
-						}
+							}
+						})
+					} else {
+						uni.showToast({
+							title: "当前版本已是最新版本",
+							icon: "none"
+						})
 					}
 				}
 			},
 			renewal() {
-				this.getEquipList(true)
+				this.getEquipList()
 			},
 			upgrade() {
 				uni.getStorage({
@@ -134,7 +131,10 @@
 					}
 				})
 				console.log(this.appName)
-				var url = "http://hnyfwlw.com/app/big_data.apk"
+				// ---------------------------------------------------------------------------------------------------------------------------
+				//中性版
+				this.appName = "big_data2"
+				var url = "http://hnyfwlw.com/app/" + this.appName + ".apk"
 				console.log(url)
 				const downloadTask = uni.downloadFile({
 					url: url, //仅为示例，并非真实的资源
@@ -170,8 +170,7 @@
 			}
 		},
 		onShow() {
-			// this.id = plus.runtime.version
-			this.getEquipList(false)
+			this.id = plus.runtime.version
 		},
 		onBackPress(option) {
 			uni.redirectTo({

pages/my/index/index.vue

@@ -19,8 +19,8 @@
 			<view style="background-color: #FFFFFF;margin: 20rpx auto 0;">
 				<view class="AboutUs" @click="about">
 					<u-icon name="moban" custom-prefix="custom-icon" class="icon_left"></u-icon>
-					关于我们
-					<!-- 关于更新 -->
+					<!-- 关于我们 -->
+					关于更新
 					<uni-icons type="arrowright" class="icon_right"></uni-icons>
 				</view>
 			</view>

pages/prevention/equipmentdetails.vue

@@ -15,7 +15,7 @@
 					<p>设备名称：{{eqinfo.item.device_name}}</p>
 					<p>设备型号：{{eqinfo.item.dtype}}</p>
 					<p>最近上报时间：{{eqinfo.item.addtime|timeFormat()}}</p>
-					<p>设备地址：{{city||eqinfo.item.address}}</p>
+					<p>设备地址：{{eqinfo.item.address||city}}</p>
 				</view>
 			</view>
 			<view class="control">
@@ -210,7 +210,11 @@
 					dataType: "json",
 					complete: ress => {
 						console.log(ress.data.regeocode.formatted_address)
-						this.city = ress.data.regeocode.formatted_address
+						if(ress.data.regeocode.formatted_address.length==0){
+							this.city="--"
+						}else{
+							this.city = ress.data.regeocode.formatted_address
+						}
 					}
 				});
 			},

static/tempalate.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <meta name="referrer"  content="never"> 
+        <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+
+        <title>
+            <%= htmlWebpackPlugin.options.title %>
+        </title>
+        <script>
+              document.addEventListener('DOMContentLoaded', function() {
+                document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+            })
+        </script>
+        <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+    </head>
+    <body>
+        <noscript>
+            <strong>Please enable JavaScript to continue.</strong>
+        </noscript>
+        <div id="app"></div>
+        <!-- built files will be auto injected -->
+    </body>
+</html>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/5844f9b0-db14-11eb-94ec-41a48c948e2d
+https://service.dcloud.net.cn/build/download/ef5e5b10-e836-11eb-9c4c-977be9854736

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

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <meta name="referrer"  content="never"> 
+        <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+
+        <title>
+            <%= htmlWebpackPlugin.options.title %>
+        </title>
+        <script>
+              document.addEventListener('DOMContentLoaded', function() {
+                document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+            })
+        </script>
+        <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+    </head>
+    <body>
+        <noscript>
+            <strong>Please enable JavaScript to continue.</strong>
+        </noscript>
+        <div id="app"></div>
+        <!-- built files will be auto injected -->
+    </body>
+</html>

unpackage/dist/build/app-plus/static/tempalate.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <meta name="referrer"  content="never"> 
+        <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+
+        <title>
+            <%= htmlWebpackPlugin.options.title %>
+        </title>
+        <script>
+              document.addEventListener('DOMContentLoaded', function() {
+                document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+            })
+        </script>
+        <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+    </head>
+    <body>
+        <noscript>
+            <strong>Please enable JavaScript to continue.</strong>
+        </noscript>
+        <div id="app"></div>
+        <!-- built files will be auto injected -->
+    </body>
+</html>

unpackage/dist/dev/app-plus/static/tempalate.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <meta name="referrer"  content="never"> 
+        <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+
+        <title>
+            <%= htmlWebpackPlugin.options.title %>
+        </title>
+        <script>
+              document.addEventListener('DOMContentLoaded', function() {
+                document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+            })
+        </script>
+        <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+    </head>
+    <body>
+        <noscript>
+            <strong>Please enable JavaScript to continue.</strong>
+        </noscript>
+        <div id="app"></div>
+        <!-- built files will be auto injected -->
+    </body>
+</html>

unpackage/dist/dev/mp-weixin/app.json

@@ -102,6 +102,5 @@
       }
     ]
   },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/cb/xy2.0/particulars.wxss

@@ -174,16 +174,6 @@
   background-color: #0dc6b6;
   border-radius: 8rpx;
 }
-.field .fild-body {
-  margin-left: -30px;
-}
-.field .uni-input-input {
-  border: 2rpx solid #FF0000;
-  border-radius: 24rpx;
-  width: 140px;
-  padding-left: 20rpx;
-  box-sizing: border-box;
-}
 .btn-box {
   text-align: center;
   padding: 20rpx 30rpx;

unpackage/dist/dev/mp-weixin/pages/expertDiagnosis/wormcase.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "navigationStyle": "custom",
   "usingComponents": {
-    "uni-nav-bar": "/components/uni-nav-bar/uni-nav-bar"
+    "uni-nav-bar": "/components/uni-nav-bar/uni-nav-bar",
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
   }
 }

unpackage/dist/dev/mp-weixin/pages/expertDiagnosis/wormcase.wxss

@@ -27,7 +27,7 @@
 .particulars {
   width: 100%;
   position: relative;
-  top: 88rpx;
+  top: 148rpx;
   display: -webkit-box;
   display: -webkit-flex;
   display: flex;
@@ -58,8 +58,37 @@
   top: 0;
   left: 0;
 }
-.particulars .particulars_item ._p {
-  font-size: 24rpx;
+.particulars .particulars_item .info {
+  font-size: 28rpx;
+  text-align: center;
+  margin-top: 20rpx;
+}
+.bases_search {
+  width: 100%;
+  position: fixed;
+  top: 88px;
+  z-index: 100;
+  background-color: #FFFFFF;
+}
+.bases_search .bases_search_text {
+  width: 90%;
+  margin: 0 auto;
+  background-color: #F8F8F8;
+  height: 60rpx;
+  border-radius: 30rpx;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  line-height: 60rpx;
+}
+.bases_search .bases_search_text .search {
+  padding: 0 20rpx;
+  font-size: 34rpx;
+}
+.bases_search .bases_search_text input {
+  width: 80%;
+  margin-top: 10rpx;
+  font-size: 28rpx;
 }
 .top {
   position: fixed;

unpackage/dist/dev/mp-weixin/pages/fourBase/allocation.json

@@ -4,6 +4,7 @@
   "navigationStyle": "custom",
   "usingComponents": {
     "uni-nav-bar": "/components/uni-nav-bar/uni-nav-bar",
-    "u-tabs": "/uview-ui/components/u-tabs/u-tabs"
+    "u-tabs": "/uview-ui/components/u-tabs/u-tabs",
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
   }
 }

unpackage/dist/dev/mp-weixin/pages/fourBase/allocation.wxss

@@ -33,11 +33,9 @@
 .bases_search {
   width: 100%;
   position: fixed;
-  top: 84px;
+  top: 128px;
   z-index: 100;
   background-color: #FFFFFF;
-  height: 80rpx;
-  padding-top: 20rpx;
 }
 .bases_search .bases_search_text {
   width: 90%;
@@ -61,7 +59,7 @@
 }
 .ass_list {
   position: absolute;
-  top: 84px;
+  top: 115px;
   width: 100%;
   margin-bottom: 40px;
 }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -12,7 +12,7 @@
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wx1cabf67f460e3a14",
-  "projectname": "智控",
+  "projectname": "云飞智控",
   "condition": {
     "search": {
       "current": -1,