8/3 数据备份

pages/cb/xy2.0/historydatas.vue

@@ -78,13 +78,13 @@
 				cHeight: '400',
 				pixelRatio: 1,
 				canvastishiTF: false,
-				pagesum: 1,
-				worms:[]
+				pagesum: null,
+				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,13 +135,40 @@
 					}
 				})
 				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_type_id: 3,
 						device_id: this.device_id,
 						strat_time: parseInt(this.start_time / 1000),
 						end_time: parseInt(this.end_time / 1000),
@@ -174,7 +193,7 @@
 						d_id: this.d_id
 					}
 				})
-				if(res){
+				if (res) {
 					uni.showToast({
 						title: '刷新成功',
 						duration: 2000,
@@ -183,7 +202,7 @@
 					uni.navigateBack({
 						delta: 1
 					})
-				}else{
+				} else {
 					uni.showToast({
 						title: '刷新失败',
 						duration: 2000,
@@ -200,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()
 				}
 			},
@@ -260,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: {
@@ -294,13 +325,13 @@
 			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
-			setTimeout(()=>{
-				this.history()
-				this.historylist()
-			},1000)
+			console.log(new Date(this.end_time), new Date(this.start_time))
+			// this.history()
+			this.Chistory()
+			this.historylist()
 		}
 	}
 </script>
@@ -315,7 +346,6 @@
 		box-shadow: 0 0 10rpx #bcb9ca;
 		padding-top: 20rpx;
 		height: 550rpx;
-
 		.canvastishi {
 			font-size: 32rpx;
 			position: absolute;
@@ -377,9 +407,11 @@
 		.scroll-X {
 			width: 95%;
 			margin: 20rpx auto;
-			.table{
+
+			.table {
 				width: 1042px;
 			}
+
 			.tr {
 				display: flex;
 				overflow: hidden;
@@ -426,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">

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/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,16 +40,20 @@
 					code: null,
 					page: null
 				},
-				isTop:false
+				isTop:false,
+				inputdata:"",
+				placeholder:""
 			}
 		},
 		methods: {
+			// http://8.136.98.49:8002/api/api_gateway?method=pest.pests.pests_search
 			async getCooperation(data) {
 				const res = await this.$myRequest({
 					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 +74,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 +127,7 @@
 	.particulars {
 		width: 100%;
 		position: relative;
-		top: 88rpx;
+		top: 140rpx;
 		display: flex;
 		flex-wrap: wrap;
 
@@ -121,12 +158,41 @@
 				}
 			}
 
-			p {
-				font-size: 24rpx;
+			.info {
+				font-size: 28rpx;
+				text-align: center;
+				margin-top: 20rpx;
+			}
+		}
+	}
+	.bases_search {
+		width: 100%;
+		position: fixed;
+		top: 80px;
+		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;
 			}
 		}
 	}
-
 	.top {
 		position: fixed;
 		right: 30px;

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,11 +188,18 @@
 					scrollTop: 0,
 					duration: 500
 				})
-			}
+			},
+			searchs(){
+				console.log(this.inputdata.search("好"))
+			},
 		},
 		onLoad(option) {
 			this.base_id = option.base_id
-			this.ybase()
+			if(this.base_id){
+				this.ybase()
+			}else{
+				this.getFourbase()
+			}
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听，可用bindingx代替
 			if (e.scrollTop > 200) { //距离大于200时显示
@@ -180,19 +215,17 @@
 	.utabs {
 		width: 100%;
 		position: fixed;
-		top: 88px;
+		top: 80px;
 		z-index: 100;
 	}
 
 	.bases_search {
 		width: 100%;
 		position: fixed;
-		top: 84px;
+		top: 120px;
 		z-index: 100;
 		background-color: #FFFFFF;
-		height: 80rpx;
-		padding-top: 20rpx;
-
+	
 		.bases_search_text {
 			width: 90%;
 			margin: 0 auto;
@@ -201,12 +234,12 @@
 			border-radius: 30rpx;
 			display: flex;
 			line-height: 60rpx;
-
+	
 			.search {
 				padding: 0 20rpx;
 				font-size: 34rpx;
 			}
-
+	
 			input {
 				width: 80%;
 				margin-top: 10rpx;
@@ -217,7 +250,7 @@
 
 	.ass_list {
 		position: absolute;
-		top: 84px;
+		top: 115px;
 		width: 100%;
 		margin-bottom: 40px;
 

pages/index/index.vue

@@ -245,16 +245,6 @@
 					    duration: 2000,
 						icon:"none"
 					});
-					// if(this.jurisdiction.cbtf){
-					// 	uni.navigateTo({
-					// 		url: "../cb/index/index"
-					// 	})
-					// }else{
-					// 	uni.showToast({
-					// 		title: "此账号未开启此模块，如有需要，请联系管理员",
-					// 		icon: "none"
-					// 	})
-					// }
 				}
 			},
 			onok(ev) {

unpackage/dist/dev/mp-weixin/components/bazaar-city_list/index.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

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: 140rpx;
   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: 80px;
+  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

@@ -27,17 +27,15 @@
 .utabs {
   width: 100%;
   position: fixed;
-  top: 88px;
+  top: 80px;
   z-index: 100;
 }
 .bases_search {
   width: 100%;
   position: fixed;
-  top: 84px;
+  top: 120px;
   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

@@ -4,40 +4,10 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": true,
-    "es6": true,
-    "enhance": false,
-    "postcss": false,
-    "preloadBackgroundData": false,
+    "urlCheck": false,
     "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": false,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true
+    "postcss": false,
+    "es6": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
@@ -45,15 +15,19 @@
   "projectname": "云飞智控",
   "condition": {
     "search": {
+      "current": -1,
       "list": []
     },
     "conversation": {
+      "current": -1,
       "list": []
     },
     "game": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": 3,
       "list": [
         {
           "name": "about",