瀏覽代碼

测报灯 害虫分析 图片列表增加模型切换

zhangsijie 1 年之前
父節點
當前提交
d62c25ba13
共有 100 個文件被更改,包括 250 次插入155 次删除
  1. 36 8
      pages/cb/cbd/equip-set/analyse.vue
  2. 117 50
      pages/cb/cbd/equip-set/imgpage.vue
  3. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  4. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/bazaar-city_list/index.js.map
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/equip-item/equip-item.js.map
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ksp-image-cutter/ksp-image-cutter.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/multiple-select.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-icons/uni-icons.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-nav-bar/uni-nav-bar.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-status-bar/uni-status-bar.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/addafter.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/index.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/search.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/bzyhistoryile.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/equip-set.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/addimg.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/analyse.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/equip-set.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/historyfile.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/imgpage.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/manualinput.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/note.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/results.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/statistics.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/equip-detail/equip-detail.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/index.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/search.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/sim/sim.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/photolist.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxydetail.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyhisdata.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyset.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/analyse.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/photolist.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctdetail.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctset.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/equip-set.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/xyhistoryile.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/historydatas.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/particulars.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/addressbook.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/basemap.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/cbwarn.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/warnset.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disandpests/index.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/cmb.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/forecastResult.js.map
  48. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/distribution/index.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/contros.js.map
  50. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/equipment.js.map
  51. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gsequipment.js.map
  52. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gshistory.js.map
  53. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/history.js.map
  54. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/index.js.map
  55. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/onedaythedata.js.map
  56. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/search.js.map
  57. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/sim.js.map
  58. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/index.js.map
  59. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/modification.js.map
  60. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/search.js.map
  61. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/addusers.js.map
  62. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/assignment.js.map
  63. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/changepasswold.js.map
  64. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/index.js.map
  65. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/useroperation.js.map
  66. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/exchangeShare.js.map
  67. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/index.js.map
  68. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/introduce.js.map
  69. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/particulars.js.map
  70. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/postmessage.js.map
  71. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/wormcase.js.map
  72. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/addbase.js.map
  73. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/allocation.js.map
  74. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/basefacility.js.map
  75. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/index.js.map
  76. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/modification.js.map
  77. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  78. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/index.js.map
  79. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/irrmap.js.map
  80. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/realtimedata.js.map
  81. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/search.js.map
  82. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/weathdata.js.map
  83. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  84. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/monitor/index.js.map
  85. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/monitor/sim.js.map
  86. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/about/about.js.map
  87. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index/index.js.map
  88. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/record/record.js.map
  89. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/user-info/user-info.js.map
  90. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/control.js.map
  91. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/equipmentdetails.js.map
  92. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/index.js.map
  93. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/search.js.map
  94. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/sim.js.map
  95. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/ucharts.js.map
  96. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/qxzyj/cbwarn.js.map
  97. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/qxzyj/warnset.js.map
  98. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/waterandfer/basestate.js.map
  99. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/waterandfer/datails.js.map
  100. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/waterandfer/elementdata.js.map

+ 36 - 8
pages/cb/cbd/equip-set/analyse.vue

@@ -2,6 +2,15 @@
 	<view class="anabox">
 		<view class="timebox">
 			<view class="schedulebox">
+				<view class="schedule" @click="modelPicker=!modelPicker">
+					<p class="schedule_value">{{modelList[identify_model].label}}</p>
+					<!-- {{titletext[indexone]}} -->
+					<p class="schedule_icon">
+						<u-icon name="arrow-down"></u-icon>
+					</p>
+				</view>
+				<u-select v-model="modelPicker" mode="single-column" @confirm="confirmModel"
+					:default-value="[identify_model]" :list="modelList"></u-select>
 				<view class="schedule" @click="pickertfone=!pickertfone">
 					<p class="schedule_value">{{yservalue}}</p>
 					<!-- {{titletext[indexone]}} -->
@@ -59,16 +68,16 @@
 				<u-select v-model="timeshow" mode="mutil-column" :list="list" @confirm="Hourchange"
 					:default-value="defaultValue"></u-select>
 			</view>
-			<view class="tendency" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
+			<view class="tendency" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm && !modelPicker">
 				<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" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
+			<view class="tendency" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm && !modelPicker">
 				<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>
-			<view class="tendency_pro" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
+			<view class="tendency_pro" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm && !modelPicker">
 				<view class="" v-for="(item,index) in progresslist">
 					<span>{{index+1}}、{{item.name}}</span>
 					<u-line-progress :active-color="colorlist[index%6]"
@@ -76,7 +85,7 @@
 					<span>{{Number((item.data/pestsum*100).toFixed(2))}}%</span>
 				</view>
 			</view>
-			<view class="tablebox" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
+			<view class="tablebox" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm && !modelPicker">
 				<view class="top_text">
 					<view :class="topindex==index?'title_text_color':'tltle_text'" v-for="(item,index) in toptext"
 						:key="index" @click="changeindex(index)">
@@ -143,6 +152,15 @@
 	export default {
 		data() {
 			return {
+				modelPicker: false,
+				identify_model: 1,
+				modelList: [{
+					value: 'A',
+					label: '模型A'
+				}, {
+					value: 'B',
+					label: '模型B'
+				}],
 				d_id: "",
 				oldtime: "",
 				newtime: "",
@@ -391,6 +409,16 @@
 			}
 		},
 		methods: {
+			// 切换模型
+			confirmModel(e) {
+				this.modelList.forEach((item, index) => {
+					if (e[0].value == item.value) {
+						this.identify_model = index;
+					}
+				})
+				this.getyear()
+				// console.log(e)
+			},
 			getyear() {
 				var Year = new Date().getFullYear();
 				var num = Year - 2019;
@@ -406,7 +434,7 @@
 					url: '/api/api_gateway?method=forecast.worm_lamp.pest_raise_info',
 					data: {
 						d_ids: this.d_id,
-						identify_model: 'A',
+						identify_model:this.modelList[this.identify_model].value,
 						year: this.yservalue,
 					}
 				})
@@ -447,7 +475,7 @@
 					url: '/api/api_gateway?method=forecast.worm_lamp.pest_statistics_char_new',
 					data: {
 						d_ids: this.d_id,
-						identify_model: 'A',
+						identify_model:this.modelList[this.identify_model].value,
 						start_time: this.oldtime,
 						end_time: this.newtime,
 						sp_hour_st: this.sp_hour_st,
@@ -708,7 +736,7 @@
 					url: '/api/api_gateway?method=forecast.worm_lamp.pest_image_source',
 					data: {
 						d_ids: this.d_id,
-						identify_model: 'A',
+						identify_model:this.modelList[this.identify_model].value,
 						start_time: this.oldtime,
 						end_time: this.newtime,
 						sp_hour_st: this.sp_hour_st,
@@ -730,7 +758,7 @@
 					url: '/api/api_gateway?method=forecast.worm_lamp.pest_base_data',
 					data: {
 						d_ids: this.d_id,
-						identify_model: 'A',
+						identify_model:this.modelList[this.identify_model].value,
 						start_time: this.oldtime,
 						end_time: this.newtime,
 						page: this.page

+ 117 - 50
pages/cb/cbd/equip-set/imgpage.vue

@@ -6,6 +6,15 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="查看图片"></uni-nav-bar>
 			</view>
 			<p class="tishi" v-if="tishi">暂无图片</p>
+			<u-select v-model="modelPicker" mode="single-column" @confirm="confirmModel"
+				:default-value="[identify_model]" :list="modelList"></u-select>
+			<view class="schedule" @click="modelPicker=!modelPicker">
+				<p class="schedule_value">{{modelList[identify_model].label}}</p>
+				<!-- {{titletext[indexone]}} -->
+				<p class="schedule_icon">
+					<u-icon name="arrow-down"></u-icon>
+				</p>
+			</view>
 			<view class="timeshow">
 				<view class="selecttimes" @click="tiemshow=!tiemshow">
 					<view class="timesbox">
@@ -26,7 +35,8 @@
 			<view class="imglist">
 				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
 					<view class="imglist_left">
-						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode=""></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="">
+						</image>
 						<image :src="item.addr" mode="" @click="examine(index)"></image>
 					</view>
 					<view class="imglist_right">
@@ -51,7 +61,8 @@
 			</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>
@@ -60,6 +71,15 @@
 	export default {
 		data() {
 			return {
+				modelPicker: false,
+				identify_model: 1,
+				modelList: [{
+					value: 'A',
+					label: '模型A'
+				}, {
+					value: 'B',
+					label: '模型B'
+				}],
 				page: 1,
 				imglists: [],
 				tishi: true,
@@ -75,28 +95,41 @@
 					minute: true,
 					second: false
 				},
-				flag:1,
-				self:true,
-				isTop:false,
-				resultdata:{},
-				titleidnex:0,
-				tiemshow:false,
-				disable:"",
-				device_type:"",
-				myuid:""
+				flag: 1,
+				self: true,
+				isTop: false,
+				resultdata: {},
+				titleidnex: 0,
+				tiemshow: false,
+				disable: "",
+				device_type: "",
+				myuid: ""
 			}
 		},
 		methods: {
+			// 切换模型
+			confirmModel(e) {
+				this.modelList.forEach((item, index) => {
+					if (e[0].value == item.value) {
+						this.identify_model = index;
+					}
+				})
+				this.imglists=[];
+				this.imglistdata(parseInt(this.timestate), parseInt(this.timeend))
+				// console.log(e)
+			},
 			//forecast.forecast_system.equip_photofo
-			async imglistdata(time_begin,time_end) { //获取图片列表
+			async imglistdata(time_begin, time_end) { //获取图片列表
 				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo',
+					url: '/api/api_gateway?method=forecast.forecast_system.device_photo_list',
 					data: {
 						device_id: this.device_id,
 						page: this.page,
-						ret: "list",
-						time_begin:time_begin,//开始时间
-						time_end:time_end,//结束时间
+						status: "no",
+						page_number: 12,
+						identify_model: this.modelList[this.identify_model].value,
+						time_begin: time_begin, //开始时间
+						time_end: time_end, //结束时间
 					}
 				})
 				this.imglists = this.imglists.concat(res.data)
@@ -124,12 +157,12 @@
 					});
 					this.page = 1
 					this.imglists = []
-					this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
-				}else{
+					this.imglistdata(parseInt(this.timestate), parseInt(this.timeend))
+				} else {
 					uni.showToast({
 						title: '指令下发失败!',
 						duration: 2000,
-						icon:"none"
+						icon: "none"
 					});
 				}
 			},
@@ -150,17 +183,17 @@
 						duration: 2000
 					});
 					var that = this
-					setTimeout(()=>{
-						that.imglistdata(parseInt(that.timestate),parseInt(that.timeend))
-					},1000)
-				}else{
+					setTimeout(() => {
+						that.imglistdata(parseInt(that.timestate), parseInt(that.timeend))
+					}, 1000)
+				} else {
 					uni.showToast({
 						title: '指令下发失败!',
 						duration: 2000,
-						icon:"none"
+						icon: "none"
 					});
 				}
-				
+
 			},
 			clickLeft() {
 				uni.navigateBack({
@@ -171,7 +204,7 @@
 				uni.showModal({
 					title: '提示',
 					content: '是否删除此图片?',
-					success: (res)=> {
+					success: (res) => {
 						if (res.confirm) {
 							this.del(id)
 							console.log('用户点击确定');
@@ -181,31 +214,32 @@
 					}
 				});
 			},
-			shibie(id,addr) { //识别
+			shibie(id, addr) { //识别
 				// this.discern(id)
 				uni.navigateTo({
-					url: "./results?id="+id+"&addr="+addr
+					url: "./results?id=" + id + "&addr=" + addr
 				})
 			},
 			tongji(item) { //统计
 				uni.navigateTo({
-					url:"./manualinput?id="+item.id + "&device_id=" + item.device_id+"&addtime="+item.addtime
+					url: "./manualinput?id=" + item.id + "&device_id=" + item.device_id + "&addtime=" + item
+						.addtime
 				})
 			},
 			add(item) {
 				uni.navigateTo({
-					url: "./addimg?id=" + item.id + "&device_id=" + item.device_id+"&addtime="+item.addtime
+					url: "./addimg?id=" + item.id + "&device_id=" + item.device_id + "&addtime=" + item.addtime
 				})
 			},
 			examine(index) {
 				var imgarr = []
-				for(var i=0;i<this.imglists.length;i++){
+				for (var i = 0; i < this.imglists.length; i++) {
 					imgarr.push(this.imglists[i].addr)
 				}
 				console.log(imgarr)
 				uni.previewImage({
 					urls: imgarr,
-					current:index
+					current: index
 				});
 			},
 			clickRight() { //下发拍照指令
@@ -217,13 +251,13 @@
 					duration: 500
 				})
 			},
-			tiemchange(e){
-				this.imglists=[]
-				this.page =1
+			tiemchange(e) {
+				this.imglists = []
+				this.page = 1
 				console.log(e)
 				this.timestate = +new Date(e.startDate) / 1000 - 8 * 60 * 60
 				this.timeend = +new Date(e.endDate) / 1000 + 16 * 60 * 60
-				this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
+				this.imglistdata(parseInt(this.timestate), parseInt(this.timeend))
 			},
 			timetab(e) {
 				e = new Date(e * 1000)
@@ -236,8 +270,8 @@
 		},
 		onLoad(option) {
 			uni.getStorage({
-				key:"myuid",
-				success:(res)=> {
+				key: "myuid",
+				success: (res) => {
 					this.myuid = res.data
 					console.log(this.myuid)
 				}
@@ -248,16 +282,16 @@
 			this.disable = option.disable
 			this.timeend = +new Date() / 1000
 			this.timestate = this.timeend - 60 * 60 * 24
-			this.imglists=[]
+			this.imglists = []
 			this.device_type = option.device_type
-			this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
+			this.imglistdata(parseInt(this.timestate), parseInt(this.timeend))
 		},
-		onShow(){
-			
+		onShow() {
+
 		},
 		onReachBottom() {
 			this.page++
-			this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
+			this.imglistdata(parseInt(this.timestate), parseInt(this.timeend))
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听,可用bindingx代替
 			if (e.scrollTop > 200) { //距离大于200时显示
@@ -278,17 +312,50 @@
 		text-align: center;
 		font-size: 40rpx;
 	}
-
+	.schedule {
+		position: fixed;
+		top: 84px;
+		left: 10rpx;
+		padding: 5rpx 0;
+		// left: 50%;
+		// transform: translateX(-50%);
+		z-index: 100;
+		display: flex;
+		width: 180rpx;
+		margin: 0 auto;
+		height: 50rpx;
+		// border: 2rpx solid #F0F0F0;
+		background-color: #Fff;
+		// border-radius: 25px;
+		box-shadow: 0 0 10rpx #bcb9ca;
+	
+		.schedule_value {
+			width: 70%;
+			text-align: center;
+			line-height: 50rpx;
+			font-size: 24rpx;
+		}
+	
+		.schedule_icon {
+			width: 30%;
+			// background-color: #F2F2F2;
+			text-align: center;
+			line-height: 50rpx;
+	
+			/deep/.u-icon__icon {
+				color: rgba(0, 0, 0, 0.3);
+			}
+		}
+	}
 	.timeshow {
-		width: 100%;
+		width: 70%;
 		height: 80rpx;
 		background-color: #FFFFFF;
 		position: fixed;
 		top: 84px;
-		left: 0;
+		right: 10rpx;
 		display: flex;
 		z-index: 100;
-		padding-top: 10px;
 		.selecttimes {
 			width: 85%;
 			z-index: 100;
@@ -299,7 +366,7 @@
 				margin: 0 auto;
 				justify-content: space-around;
 				box-shadow: 0 0 10rpx #bcb9ca;
-				padding: 10rpx 20rpx;
+				padding: 13rpx 20rpx;
 				box-sizing: border-box;
 				image {
 					width: 30rpx;
@@ -325,8 +392,8 @@
 		}
 		.paizhao{
 			position: absolute;
-			top: 28rpx;
-			right: 40rpx;
+			top: 10rpx;
+			right: 10rpx;
 		}
 		.shuju_one_title {
 			width: 70%;

文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/bazaar-city_list/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/equip-item/equip-item.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/ksp-image-cutter/ksp-image-cutter.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/multiple-select.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-icons/uni-icons.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-nav-bar/uni-nav-bar.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-status-bar/uni-status-bar.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/addafter.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/afterSale/search.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/bzyhistoryile.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/equip-set.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/addimg.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/analyse.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/equip-set.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/historyfile.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/imgpage.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/manualinput.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/note.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/results.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/statistics.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/equip-detail/equip-detail.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/search.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/sim/sim.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/photolist.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxydetail.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyhisdata.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/thxydetail/thxyset.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/analyse.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/photolist.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctdetail.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xctdetail/xctset.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/equip-set.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/xyhistoryile.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/historydatas.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/particulars.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/addressbook.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/basemap.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/cbwarn.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cbqxyj/warnset.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disandpests/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/cmb.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disease/forecastResult.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/distribution/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/contros.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/equipment.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gsequipment.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/gshistory.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/history.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/onedaythedata.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/search.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/sim.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/modification.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/seabox/search.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/addusers.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/assignment.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/changepasswold.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/useroperation.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/exchangeShare.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/introduce.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/particulars.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/postmessage.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/expertDiagnosis/wormcase.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/addbase.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/allocation.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/basefacility.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/modification.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/irrmap.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/realtimedata.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/search.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/irrigate/weathdata.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/monitor/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/monitor/sim.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/about/about.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/record/record.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/user-info/user-info.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/control.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/equipmentdetails.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/search.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/sim.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/ucharts.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/qxzyj/cbwarn.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/qxzyj/warnset.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/waterandfer/basestate.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/waterandfer/datails.js.map


+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/waterandfer/elementdata.js.map


部分文件因文件數量過多而無法顯示