改一些提示

pages/cb/smallPest/analyse.vue

@@ -56,12 +56,12 @@
 				<u-button type="primary" text="归档时间" size="mini" @click="timeshow = true">归档时间</u-button>
 				<u-select v-model="timeshow" mode="mutil-column" :list="list" @confirm="Hourchange" :default-value="defaultValue"></u-select>
 			</view>
-			<view class="tendency">
+			<view class="tendency" v-if="!tiemshow && !timeshow">
 				<canvas canvas-id="canvasColumnA" id="canvasColumnA" class="charts" @touchstart="touchLineA($event)"
 					@touchmove="moveLineA($event)" @touchend="touchEndLineA($event)" disable-scroll=true
 					:style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
 			</view>
-			<view class="tendency">
+			<view class="tendency" v-if="!tiemshow && !timeshow">
 				<canvas canvas-id="canvasRing" id="canvasRing" class="charts" @touchstart="touchRing"
 					:style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
 			</view>

pages/cb/smallPest/photolist.vue

@@ -111,7 +111,7 @@
 				this.imglists = []
 				this.page = 1
 				console.log(e)
-				this.timestate = +new Date(e.startDate) / 1000 - 8 * 60 * 60
+				this.timestate = +new Date(e.startDate) / 1000 - 24 * 60 * 60
 				this.timeend = +new Date(e.endDate) / 1000 + 16 * 60 * 60
 				this.getimglist()
 			},
@@ -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() {

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"
 					}

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,
 				},
@@ -242,6 +246,13 @@
 			},
 			async submit() {
 				console.log(this.equipContrlForm)
+				if(this.equipContrlForm.fan_speed < 10) {
+					uni.showToast({
+						title:'风量值不能小于10',
+						icon:'none'
+					})
+					return
+				}
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.haomi.haomi_config',
 					data: {

util/api.js

@@ -1,9 +1,9 @@
-// let BASE_URL = 'http://114.115.147.140:8002'
+// let BASE_URL = 'http://114.55.0.7:8002'
 // const BASE_URL='http://8.136.98.49:8002'
 // let BASE_URL = 'http://192.168.2.183:8006'
 // let BASE_URL = 'https://wx.hnyfwlw.com'
-// let BASE_URL = 'https://wx.hnyfwlw.com'
-let BASE_URL = 'http://192.168.2.163:8003'
+let BASE_URL = 'https://wx.hnyfwlw.com'
+// let BASE_URL = 'http://192.168.2.163:8003'
 export const myRequest=(options)=>{
 	// BASE_URL=uni.getStorageSync('http')
 	// if(BASE_URL==''){