浏览代码

改一些显示

zhangsijie 1 年之前
父节点
当前提交
ef39c0618e

+ 3 - 3
manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "云飞智控",
+    "name" : "智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.10.0",
-    "versionCode" : 1100,
+    "versionName" : "1.11.0",
+    "versionCode" : 1110,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
pages/cb/smallPest/photolist.vue

@@ -119,7 +119,7 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.send_control.admin_device_control',
 					data: {
-						device_type_id: 12,
+						device_type_id: 28,
 						d_id: this.d_id,
 						cmd: "takephoto"
 					}
@@ -148,7 +148,7 @@
 			this.d_id =  option.d_id
 			this.device_id = option.device_id
 			this.timeend = +new Date() / 1000
-			this.timestate = this.timeend - 60 * 60 * 24
+			this.timestate = this.timeend - 60 * 60 * 24 * 7
 			this.getimglist()
 		},
 		onReachBottom() {

+ 2 - 2
pages/cb/smallPest/smallPest.vue

@@ -339,8 +339,8 @@
 					url: '/api/api_gateway?method=forecast.haomi.haomi_data',
 					data: {
 						d_id: this.equipInfo.d_id,
-						start_time: Math.floor(+new Date(this.start_time) / 1000),
-						end_time: Math.floor(+new Date(this.end_time) / 1000),
+						start: Math.floor(+new Date(this.start_time) / 1000),
+						end: Math.floor(+new Date(this.end_time) / 1000),
 						page: this.page,
 						page_size: "10"
 					}

+ 11 - 0
pages/cb/smallPest/xctset.vue

@@ -80,6 +80,9 @@
 			<u-form-item label="数据上传间隔(min)" :label-width="260">
 				<u-input v-model="equipContrlForm.dat_f" type="number" />
 			</u-form-item>
+			<u-form-item label="风量" :label-width="260">
+				<u-input v-model="equipContrlForm.fan_speed" type="number" />
+			</u-form-item>
 		</u-form>
 		<view class="submit-box">
 			<u-button @click="submit" type="success">确定</u-button>
@@ -104,6 +107,7 @@
 					"ts": "",
 					"collstart": "",
 					"collend": "",
+					fan_speed:'',
 					show_st: false,
 					show_et: false,
 				},
@@ -241,6 +245,13 @@
 				console.log(this.equipContrlForm);
 			},
 			async submit() {
+				if(this.equipContrlForm.fan_speed < 10) {
+					uni.showToast({
+						title:'风量值不能小于10',
+						icon:'none'
+					})
+					return
+				}
 				console.log(this.equipContrlForm)
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.haomi.haomi_config',

二进制
unpackage/cache/apk/__UNI__DBA6730_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/b4f94200-a7eb-11ef-a0b1-eb1caac3906c
+https://app.liuyingyong.cn/build/download/6e842a70-c380-11ef-bce0-5521a25b66bd

文件差异内容过多而无法显示
+ 1 - 1
unpackage/cache/apk/cmManifestCache.json


文件差异内容过多而无法显示
+ 2 - 2
unpackage/cache/wgt/__UNI__DBA6730/app-config-service.js


文件差异内容过多而无法显示
+ 5 - 5
unpackage/cache/wgt/__UNI__DBA6730/app-service.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/app-view.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/manifest.json


文件差异内容过多而无法显示
+ 2 - 2
unpackage/dist/build/app-plus/app-config-service.js


文件差异内容过多而无法显示
+ 5 - 5
unpackage/dist/build/app-plus/app-service.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js


文件差异内容过多而无法显示
+ 1 - 1
unpackage/dist/build/app-plus/manifest.json


+ 2 - 2
util/neutral.js

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