Преглед изворни кода

feat:色诱1.0修改控制

yf_elsa.cui пре 1 месец
родитељ
комит
de129a3169
98 измењених фајлова са 2331 додато и 1820 уклоњено
  1. 2 2
      components/equip-item/equip-item.vue
  2. 2 2
      components/linzq-citySelect/linzq-citySelect.vue
  3. 3 3
      main.js
  4. 1218 1264
      pages.json
  5. 4 4
      pages/afterSale/addafter.vue
  6. 3 3
      pages/afterSale/index.vue
  7. 1 1
      pages/afterSale/search.vue
  8. 63 38
      pages/cb/bzy/equip-set/bzyhistoryile.vue
  9. 1 1
      pages/cb/cbd/equip-set/analyse.vue
  10. 77 15
      pages/cb/cbd/equip-set/equip-set-new.vue
  11. 617 0
      pages/cb/cbd/equip-set/equip-set-sy2.vue
  12. 3 3
      pages/cb/cbd/equip-set/imgpage.vue
  13. 1 1
      pages/cb/cbd/equip-set/new-analyse.vue
  14. 1 1
      pages/cb/cbd/equip-set/photo.vue
  15. 1 1
      pages/cb/cbd/equip-set/results.vue
  16. 5 5
      pages/cb/equip-detail/equip-detail-new.vue
  17. 7 7
      pages/cb/equip-detail/equip-detail.vue
  18. 1 1
      pages/cb/index/index.vue
  19. 2 2
      pages/cb/index/search.vue
  20. 10 10
      pages/cb/nlNewXy/nlNewXy.vue
  21. 2 2
      pages/cb/shuifeiL/shuifeiL.vue
  22. 2 2
      pages/cb/sim/sim.vue
  23. 1 1
      pages/cb/smallPest/analyse.vue
  24. 3 3
      pages/cb/smallPest/photolist.vue
  25. 7 7
      pages/cb/smallPest/smallPest.vue
  26. 10 10
      pages/cb/sy/detail.vue
  27. 3 3
      pages/cb/sy/imgList.vue
  28. 3 3
      pages/cb/thxydetail/photolist.vue
  29. 13 13
      pages/cb/thxydetail/thxydetail.vue
  30. 1 1
      pages/cb/xctdetail/analyse.vue
  31. 3 3
      pages/cb/xctdetail/photolist.vue
  32. 7 7
      pages/cb/xctdetail/xctdetail.vue
  33. 2 2
      pages/cb/xy/equip-set/xyhistoryile.vue
  34. 11 11
      pages/cb/xy2.0/particulars.vue
  35. 3 3
      pages/cb/xylps/detail/detail.vue
  36. 3 3
      pages/cb/zjxydetail/photolist.vue
  37. 13 13
      pages/cb/zjxydetail/thxydetail.vue
  38. 1 1
      pages/cbqxyj/cbwarn.vue
  39. 3 3
      pages/disandpests/index.vue
  40. 3 3
      pages/discernRecord/discernRecord.vue
  41. 4 4
      pages/disease/cmb.vue
  42. 3 3
      pages/disease/forecastResult.vue
  43. 1 1
      pages/disease/mls/forecastResult.vue
  44. 4 5
      pages/disease/mls/mls.vue
  45. 7 7
      pages/environment/equipment.vue
  46. 5 5
      pages/environment/gsequipment.vue
  47. 1 1
      pages/environment/gshistory.vue
  48. 1 1
      pages/environment/history.vue
  49. 5 5
      pages/environment/index.vue
  50. 3 3
      pages/environment/search.vue
  51. 1 1
      pages/environment/sim.vue
  52. 2 2
      pages/equipList/index.vue
  53. 1 1
      pages/equipList/seabox/search.vue
  54. 2 2
      pages/equipMange/index/assignment.vue
  55. 2 2
      pages/equipMange/index/index.vue
  56. 4 4
      pages/expertDiagnosis/exchangeShare.vue
  57. 4 4
      pages/expertDiagnosis/index.vue
  58. 1 1
      pages/expertDiagnosis/introduce.vue
  59. 3 7
      pages/expertDiagnosis/particulars.vue
  60. 1 1
      pages/expertDiagnosis/postmessage.vue
  61. 2 2
      pages/expertDiagnosis/wormcase.vue
  62. 2 2
      pages/fourBase/allocation.vue
  63. 2 2
      pages/fourBase/basefacility.vue
  64. 4 4
      pages/fourBase/index.vue
  65. 3 3
      pages/identifyPest/cerealPlant/cerealPlant.vue
  66. 5 5
      pages/identifyPest/collect/collect.vue
  67. 3 4
      pages/identifyPest/economicsPlant/economicsPlant.vue
  68. 3 3
      pages/identifyPest/fruitsPlant/fruitsPlant.vue
  69. 17 17
      pages/identifyPest/guidance/guidance.vue
  70. 5 5
      pages/identifyPest/identifyPest.vue
  71. 3 4
      pages/identifyPest/identifyPestIndex/identifyPestIndex.vue
  72. 1 1
      pages/identifyPest/recognizeFail/recognizeFail.vue
  73. 3 3
      pages/identifyPest/repository/repository.vue
  74. 3 3
      pages/identifyPest/vegetablesPlant/vegetablesPlant.vue
  75. 19 169
      pages/index/index.vue
  76. 4 4
      pages/irrigate/index.vue
  77. 3 3
      pages/irrigate/search.vue
  78. 1 1
      pages/login/login.vue
  79. 3 3
      pages/monitor/imagelist.vue
  80. 2 2
      pages/monitor/index.vue
  81. 1 1
      pages/monitor/sim.vue
  82. 1 1
      pages/my/about/about.vue
  83. 7 7
      pages/prevention/equipmentdetails.vue
  84. 2 2
      pages/prevention/index.vue
  85. 1 1
      pages/prevention/search.vue
  86. 2 2
      pages/prevention/sim.vue
  87. 1 1
      pages/prevention/ucharts.vue
  88. 1 1
      pages/qxzyj/cbwarn.vue
  89. 1 1
      pages/waterandfer/basestate.vue
  90. 7 7
      pages/waterandfer/datails.vue
  91. 1 1
      pages/waterandfer/elementdata.vue
  92. 3 3
      pages/waterandfer/index.vue
  93. 1 1
      pages/waterandfer/waterhis.vue
  94. 26 26
      pages/waterandfernew/details.vue
  95. 1 1
      pages/webview/webview.vue
  96. 4 4
      style/html/h52.html
  97. 2 2
      util/api.js
  98. 10 0
      util/neutral.js

+ 2 - 2
components/equip-item/equip-item.vue

@@ -54,11 +54,11 @@
 		}
 
 		.tag-on {
-			 background-image:url('http://www.hnyfwlw.com:8006/bigdata_app/image/on.png');
+			 background-image:url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/on.png');
 		}
 
 		.tag-off {
-			  background-image:url('http://www.hnyfwlw.com:8006/bigdata_app/image/off.png');
+			  background-image:url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/off.png');
 		}
 
 		.info {

+ 2 - 2
components/linzq-citySelect/linzq-citySelect.vue

@@ -2,7 +2,7 @@
 	<div class="wrapper" :style="'top:'+statusBarHeight+'px'">
 		<div class="header">
 			<view class="back_div">
-				<image class="back_img" @click="back_city()" :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/back_img.png'" mode=""></image>
+				<image class="back_img" @click="back_city()" :src="$imageURL+'/bigdata_app'+'/back_img.png'" mode=""></image>
 			</view>
 			<input class="input" @input="onInput" placeholder="中文/拼音/首字母" v-model="searchValue" />
 		</div>
@@ -18,7 +18,7 @@
 							{{position}}
 						</view>
 						<view class="dingweis_div" @click="getWarpweft">
-							<image class="dingweis" :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/dingweis.png'" mode=""></image>
+							<image class="dingweis" :src="$imageURL+'/bigdata_app'+'/dingweis.png'" mode=""></image>
 							<text>{{po_tips}}</text>
 						</view>
 					</view>

+ 3 - 3
main.js

@@ -9,9 +9,9 @@ Vue.config.productionTip = false;
 
 App.mpType = 'app';
 
-Vue.prototype.$imghost = 'http://www.hnyfwlw.com:8006/projectimg'; // 线上图片服务器路径常量
-// http://www.hnyfwlw.com:8006/bigdata_app/image/10ca93e17420371a82826073c8425c0.png
-Vue.prototype.$appimghost = 'http://www.hnyfwlw.com:8006/bigdata_app';
+import config from './util/neutral.js';
+Vue.prototype.$imageURL_58003 = config.imageURL_58003;// 线上图片服务器路径常量 58003
+Vue.prototype.$imageURL = config.imageURL;//8006
 
 import { QueryPermission } from './util/QueryPermission.js';
 // Vue.use(QueryPermission)

Разлика између датотеке није приказан због своје велике величине
+ 1218 - 1264
pages.json


+ 4 - 4
pages/afterSale/addafter.vue

@@ -34,8 +34,8 @@
 					<u-action-sheet :list="actionSheetList" v-model="show" @click="actionSheetCallback"></u-action-sheet>
 				</view>
 				<view class="addafter_con_connect">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png'" mode=""></image>
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png'" mode=""></image>
 				</view>
 				<view class="addafter_con_bot">
 					<p class="addafter_con_bot_title">保修详情</p>
@@ -44,7 +44,7 @@
 					<view class="imgvideo">
 						<view class="imgvideo_img" v-for="(item,index) in 3">
 							<view @click="gainimg(index)">
-								<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png'" mode="" v-if="!uploadingTF[index]"></image>
+								<image :src="$imageURL+'/bigdata_app'+'/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png'" mode="" v-if="!uploadingTF[index]"></image>
 							</view>
 							<view class="sim_info_loding" v-if="loding">
 								<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
@@ -59,7 +59,7 @@
 						</view>
 						<view class="imgvideo_video" v-for="(item,index) in 1">
 							<view @click="gainvideo(index)">
-								<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/80314eaa07c32e9c76537a8a8224130.png'" mode="" v-if="!uploadingTF[index+3]"></image>
+								<image :src="$imageURL+'/bigdata_app'+'/image/afterSale/80314eaa07c32e9c76537a8a8224130.png'" mode="" v-if="!uploadingTF[index+3]"></image>
 							</view>
 							<view class="uploading" v-if="uploadingTF[index+3]">
 								<video :src="BASE_URL+selfList" :controls="false" class="uploading" ></video>

+ 3 - 3
pages/afterSale/index.vue

@@ -11,7 +11,7 @@
 				</view>
 			</uni-nav-bar>
 		</view>
-		<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/afterSale/dcd7147f4b15d00c5c90006738b8453.png" class="expertimages"></image>
+		<image :src="$imageURL+'/bigdata_app/image/afterSale/dcd7147f4b15d00c5c90006738b8453.png'" class="expertimages"></image>
 		<view class="aftersaleTF" v-if="aftersaleTF">
 			暂无数据
 		</view>
@@ -33,7 +33,7 @@
 					<button :class="item.errorvideo?'video':'none'" :disabled="!item.errorvideo" @click="faultVideo(item.errorvideo)">视频</button>
 				</view>
 				<view class="aftersale_item_icon">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app/image/afterSale/'+item.device_type+'.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/afterSale/'+item.device_type+'.png'" mode=""></image>
 				</view>
 			</view>
 		</view>
@@ -48,7 +48,7 @@
 			</view>
 		</u-modal>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

+ 1 - 1
pages/afterSale/search.vue

@@ -29,7 +29,7 @@
 					<button :class="item.errorvideo?'video':'none'" :disabled="!item.errorvideo" @click="faultVideo(item.errorvideo)">视频</button>
 				</view>
 				<view class="aftersale_item_icon">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+aftersale_icon[Number(item.device_type)-2].src" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+aftersale_icon[Number(item.device_type)-2].src" mode=""></image>
 				</view>
 			</view>
 		</view>

+ 63 - 38
pages/cb/bzy/equip-set/bzyhistoryile.vue

@@ -1,14 +1,14 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 40px;">
+		<view class="" style="position: relative;top: 44px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="历史数据"></uni-nav-bar>
 			</view>
 			<view class="shuju_one">
 				<view class="shuju_one_title">
-					<view :class="titleidnex==index?'title_text_color':'tltle_text'" v-for="(item,index) in titletext" :key="index"
-					 @click="changeindex(index)">
+					<view :class="titleidnex==index?'title_text_color':'tltle_text'" v-for="(item,index) in titletext"
+						:key="index" @click="changeindex(index)">
 						{{item}}
 					</view>
 				</view>
@@ -18,14 +18,16 @@
 				<view class="canvastishi" v-if="dataloadingtf">
 					<p class="dataloading">加载中</p>
 				</view>
-				<canvas v-if="canvastishiTF" 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>
+				<canvas v-if="canvastishiTF" 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="refresh" @click="refresh">
 				刷 新
 			</view>
 			<view class="condition">
-				<scroll-view  scroll-x="true" class="scroll-X" scroll-top="0">
+				<scroll-view scroll-x="true" class="scroll-X" scroll-top="0">
 					<table class="table" v-if="$QueryPermission(265) ||$QueryPermission(304) ||$QueryPermission(313)">
 						<tr class="tr">
 							<th class="th" v-for="(item,index) in thdata" :key="index" v-if="(!isShowBwc && item.indexOf('保温仓') < 0) || isShowBwc">{{item}}</th>
@@ -35,10 +37,10 @@
 							<td class="td">{{items.d_h_t.ds==0?"关":"开"}}</td>
 							<td class="td">{{items.d_h_t.at}}</td>
 							<td class="td">{{items.d_h_t.ah}}</td>
-							<td class="td"  v-if="isShowBwc">{{items.d_h_t.set_temp}}</td>
-							<td class="td"  v-if="isShowBwc">{{items.d_h_t.pre_temp}}</td>
+							<td class="td" v-if="isShowBwc">{{items.d_h_t.set_temp}}</td>
+							<td class="td" v-if="isShowBwc">{{items.d_h_t.pre_temp}}</td>
 							<td class="td">{{items.d_h_t.batStatus==0?"正常":"欠压"}}</td>
-							<td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td>
+							<!-- <td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td> -->
 							<td class="td">{{Circulation.work_sta.value[items.d_h_t.work_sta]}}</td>
 							<td class="td">{{items.d_h_t.csq}}</td>
 							<td class="td">{{items.d_h_t.current}}</td>
@@ -46,7 +48,8 @@
 							<td class="td">{{items.d_h_t.dver}}</td>
 						</tr>
 						<tr class="tr" v-if="forbidden">
-							<td class="td" v-for="item in 13" :key="item">暂无数据</td>
+							
+							<td class="td" v-for="(item,index) in thdata" :key="index" v-if="(!isShowBwc && item.indexOf('保温仓') < 0) || isShowBwc">暂无数据</td>
 						</tr>
 					</table>
 					<table class="table" v-else>
@@ -58,15 +61,16 @@
 							<td class="td">{{items.d_h_t.ds==0?"关":"开"}}</td>
 							<td class="td">{{items.d_h_t.at}}</td>
 							<td class="td">{{items.d_h_t.ah}}</td>
-							<td class="td"  v-if="isShowBwc">{{items.d_h_t.set_temp}}</td>
-							<td class="td"  v-if="isShowBwc">{{items.d_h_t.pre_temp}}</td>
+							<td class="td" v-if="isShowBwc">{{items.d_h_t.set_temp}}</td>
+							<td class="td" v-if="isShowBwc">{{items.d_h_t.pre_temp}}</td>
 							<td class="td">{{items.d_h_t.batStatus==0?"正常":"欠压"}}</td>
-							<td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td>
+							<!-- <td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td> -->
 							<td class="td">{{Circulation.work_sta.value[items.d_h_t.work_sta]}}</td>
 							<td class="td">{{items.d_h_t.dver}}</td>
 						</tr>
 						<tr class="tr" v-if="forbidden">
-							<td class="td" v-for="item in 10" :key="item">暂无数据</td>
+							
+							<td class="td" v-for="(item,index) in thdata2" :key="index" v-if="(!isShowBwc && item.indexOf('保温仓') < 0) || isShowBwc">暂无数据</td>
 						</tr>
 					</table>
 				</scroll-view>
@@ -107,15 +111,15 @@
 				page: 1,
 				pagesum: 1,
 				historylistdata: [],
-				thdata: ["上报时间", "设备开关", "环境温度(°C)", "环境湿度(%)", "保温仓设定温度(°C)", "保温仓当前温度(°C)", "电池状态", "雨控状态", "工作状态",
+				thdata: ["上报时间", "设备开关", "环境温度(°C)", "环境湿度(%)", "保温仓设定温度(°C)", "保温仓当前温度(°C)", "电池状态", "工作状态",
 					"信号强度", "电流(mA)", "电压(V)", "设备版本"
 				],
-				thdata2: ["上报时间", "设备开关", "环境温度(°C)", "环境湿度(%)", "保温仓设定温度(°C)", "保温仓当前温度(°C)", "电池状态", "雨控状态", "工作状态",
+				thdata2: ["上报时间", "设备开关", "环境温度(°C)", "环境湿度(%)", "保温仓设定温度(°C)", "保温仓当前温度(°C)", "电池状态", "工作状态",
 					"设备版本"
 				],
 				forbidden: false,
-				canvastishiTF: false,//暂无数据提示
-				dataloadingtf:true,//加载中提示
+				canvastishiTF: false, //暂无数据提示
+				dataloadingtf: true, //加载中提示
 				cWidth: '400',
 				cHeight: '400',
 				pixelRatio: 1,
@@ -154,7 +158,8 @@
 					var xtitle = []
 					for (var i = 0; i < res.length; i++) {
 						var times = new Date(res[i].addtime * 1000)
-						xtitle.push(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes())
+						xtitle.push(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" +
+							times.getMinutes())
 						arr1.push(res[i].temperature == "" ? "0" : res[i].temperature)
 						arr2.push(res[i].humidity == "" ? "0" : res[i].humidity)
 						if(res[i].others) {
@@ -208,8 +213,8 @@
 						this.isShowBwc = false;
 					}
 					this.forbidden = false
+					console.log(res.data.length)
 				}
-				// console.log(this.historylistdata)
 			},
 			changeindex(index) {
 				this.titleidnex = index
@@ -243,8 +248,10 @@
 				}
 			},
 			next() { //下一页
-				this.page++
-				this.historylist()
+				if (this.page < this.pagesum) {
+					this.page++
+					this.historylist()
+				}
 			},
 			clickLeft() {
 				uni.navigateBack({
@@ -252,7 +259,8 @@
 				})
 			},
 			showColumn(id, xtitle, xinfo) {
-				var _self = this
+				var _self = this;
+				console.log(_self.cWidth, '_self.cWidth');
 				const ctx = uni.createCanvasContext(id, this);
 				canvaColumnA = new uCharts({
 					context: ctx,
@@ -313,13 +321,13 @@
 						control_type: "data"
 					}
 				})
-				if(res){
+				if (res) {
 					uni.showToast({
 						title: '刷新成功',
 						duration: 2000,
 						icon: "none"
 					});
-				}else{
+				} else {
 					uni.showToast({
 						title: '刷新失败',
 						duration: 2000,
@@ -338,12 +346,22 @@
 			this.cHeight = uni.upx2px(500);
 		},
 		onShow() {
-			this.end_time = +new Date() 
+			this.end_time = +new Date()
 			this.start_time = this.end_time - 24 * 60 * 60 * 1000
-			setTimeout(()=>{
+			setTimeout(() => {
 				this.history()
 				this.historylist()
-			},1000)
+			}, 1000)
+		},
+		onPullDownRefresh() {
+			console.log('refresh');
+			this.this.historydatas = []
+			this.this.historylistdata = []
+			this.history()
+			this.historylist()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		}
 	}
 </script>
@@ -366,6 +384,7 @@
 			left: 50%;
 			margin-left: -64rpx;
 			margin-top: -21rpx;
+
 			.dataloading:after {
 				overflow: hidden;
 				display: inline-block;
@@ -373,12 +392,12 @@
 				animation: ellipsis 2s infinite;
 				content: "\2026";
 			}
-			
+
 			@keyframes ellipsis {
 				from {
 					width: 2px;
 				}
-			
+
 				to {
 					width: 15px;
 				}
@@ -393,7 +412,7 @@
 			.tltle_text {
 				width: 25%;
 				border: 2rpx solid #B2B2B2;
-				color: #B2B2B2;
+				color: #57c878;
 				text-align: center;
 				font-size: 24rpx;
 				height: 50rpx;
@@ -402,8 +421,9 @@
 
 			.title_text_color {
 				width: 25%;
-				border: 2rpx solid #28AE4F;
-				color: #28AE4F;
+				border: 2rpx solid #57c878;
+				background-color: #57c878;
+				color: #fff;
 				text-align: center;
 				font-size: 24rpx;
 				height: 50rpx;
@@ -418,7 +438,7 @@
 		left: 5%;
 		width: 160rpx;
 		height: 50rpx;
-		background-color: #28AE4F;
+		background-color: #57c878;
 		color: #FFFFFF;
 		line-height: 50rpx;
 		text-align: center;
@@ -437,12 +457,15 @@
 		.scroll-X {
 			width: 95%;
 			margin: 20rpx auto;
-			.table{
+
+			.table {
 				width: 1672px;
 			}
+
 			.tr {
 				display: flex;
 				overflow: hidden;
+
 				.th,
 				.td {
 					display: inline-block;
@@ -459,10 +482,12 @@
 					width: 350rpx;
 				}
 			}
-			.tr:nth-child(2n-1){
+
+			.tr:nth-child(2n-1) {
 				background-color: #f5fff8;
 			}
-			.tr:first-child{
+
+			.tr:first-child {
 				background-color: #57c878;
 				color: #fff;
 			}
@@ -478,7 +503,7 @@
 				line-height: 50rpx;
 				font-size: 26rpx;
 				text-align: center;
-				background-color: #17BB89;
+				background-color: #57c878;
 				color: #FFFFFF;
 				margin: 0 10rpx;
 			}

+ 1 - 1
pages/cb/cbd/equip-set/analyse.vue

@@ -54,7 +54,7 @@
 				</view>
 				<view class="timesbox">
 					<!-- <image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image> -->
 					<p>{{oldtime}}</p>
 					<p class="or">至</p>

+ 77 - 15
pages/cb/cbd/equip-set/equip-set-new.vue

@@ -25,7 +25,17 @@
 		<view style="margin:40rpx 0 20rpx 0;">
 			<u-line color="#E5EBE9" />
 		</view>
-
+<!-- 		<view class="">
+			<view class="tit">
+				IMEI:{{equipContrlForm.imei}}
+			</view>
+			<view class="tit">
+				设备ID:{{device_id}}
+			</view>
+			<view class="tit">
+				设备版本:{{equipContrlForm.version}}
+			</view>
+		</view> -->
 		<view class="uni-list-cell" v-if="device_type==32" @click="modeShow = true">
 			<span class="tit">定时模式</span>
 			<view class="right-data" style="float: right;">
@@ -33,14 +43,14 @@
 				<u-icon class="arrow" name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<view class="uni-list-cell" v-if="device_type==33||device_type==34" @click="syModeShow = true">
+<!-- 		<view class="uni-list-cell" v-if="device_type==33||device_type==34" @click="syModeShow = true">
 			<span class="tit">控制模式</span>
 			<view class="right-data" style="float: right;">
 				<span>{{tsArrLabel}}</span>
 				<u-icon class="arrow" name="arrow-right"></u-icon>
 			</view>
-		</view>
-		<view class="uni-list-cell" @click="shikongshow = true" v-if="equipContrlForm.CONTROL==0">
+		</view> -->
+<!-- 		<view class="uni-list-cell" @click="shikongshow = true" v-if="equipContrlForm.CONTROL==0">
 			<span class="tit">
 				时控时长
 			</span>
@@ -49,8 +59,8 @@
 				<u-icon class="arrow" name="arrow-right"></u-icon>
 			</view>
 			
-		</view>
-		<view class="uni-list-cell" @click="gkongShow = true" v-if="equipContrlForm.CONTROL==1">
+		</view> -->
+<!-- 		<view class="uni-list-cell" @click="gkongShow = true" v-if="equipContrlForm.CONTROL==1">
 			<span class="tit">
 				光控时长
 			</span>
@@ -59,24 +69,24 @@
 				<u-icon class="arrow" name="arrow-right"></u-icon>
 			</view>
 			
-		</view>
+		</view> -->
 		
-		<view class="uni-list-cell" @click="photoShow = true" v-if="device_type==33||device_type==34">
+		<view class="uni-list-cell" @click="shikongshow = true" v-if="device_type==33||device_type==34">
 			<span class="tit">
 				拍照时间
 			</span>
 			<view class="right-data" style="float: right;">
-				<span>{{photoLabel}}</span>
+				<span>{{shikongLabel}}</span>
 				<u-icon class="arrow" name="arrow-right"></u-icon>
 			</view>
 			
 		</view>
-		<view class="uni-list-cell" v-if="device_type==33||device_type==34"  @click="selectOperate(5,1440,'P_DATT')">
+		<view class="uni-list-cell" v-if="device_type==33||device_type==34"  @click="selectOperate(5,1440,'PHO_T')">
 			<span class="tit">
 				拍照频率(min)
 			</span>
 			<view class="right-data" style="float: right;">
-				<span>{{equipContrlForm.P_DATT}}</span>
+				<span>{{equipContrlForm.PHO_T}}</span>
 				<u-icon class="arrow" name="arrow-right"></u-icon>
 			</view>
 			
@@ -101,6 +111,38 @@
 			</view>
 			
 		</view>
+		<view class="uni-list-cell" v-if="device_type==34"  >
+			<span class="tit">
+				是否温控
+			</span>
+			<view class="right-data" style="width:50px;height: 100%; float: right;display: flex;align-items: center;">
+				<u-switch style="margin-top: 5px;" color="#57C878" v-model="equipContrlForm.TEMP_LIMIT" size="40"></u-switch>
+				<!-- <u-icon class="arrow" name="arrow-right"></u-icon> -->
+			</view>
+			
+		</view>
+		<view class="uni-list-cell" v-if="device_type==34 && equipContrlForm.TEMP_LIMIT" >
+			<span class="tit">
+				低温设置
+			</span>
+			<view class="right-data" style="float: right;width: 70%;">
+				<slider style="margin: 0;" :block-size='20' :value="equipContrlForm.TEMP_DOWN" show-value="true" :min="0" :max="20" @change="sliderChange($event,'down')"  block-color="#57C878" activeColor="#57C878" step="1" />
+		
+				
+			</view>
+			
+		</view>
+		<view class="uni-list-cell" v-if="device_type==34 && equipContrlForm.TEMP_LIMIT"  >
+			<span class="tit">
+				高温设置
+			</span>
+			<view class="right-data" style="float: right;width: 70%;">
+				<slider style="margin: 0;" :block-size='20' :value="equipContrlForm.TEMP_UP" show-value="true" :min="50" :max="80" @change="sliderChange($event,'up')"  block-color="#57C878" activeColor="#57C878" step="1" />
+				
+				<!-- <u-icon class="arrow" name="arrow-right"></u-icon> -->
+			</view>
+			
+		</view>
 		<view >
 			<u-select v-model="modeShow" :list="tsArr" @confirm="tsArrConfirm"></u-select>
 			<u-select v-model="syModeShow" :list="syArr" @confirm="tsArrConfirm"></u-select>
@@ -168,14 +210,17 @@
 				wsModelShow: false,
 				equipContrlForm: {
 					END_TIME: '',
-					CONTROL: 0,
+					// CONTROL: 0,
 					DATT: 5,
 					START_TIME: '',
 					PHO_T: 5,
 					P_DATT:1,
 					TT: '',
 					P_START:'',
-					P_END:''
+					P_END:'',
+					TEMP_LIMIT:false,
+					TEMP_UP: 50,
+					TEMP_DOWN: 0
 				},
 
 				shikongLabel:'00:00-00:00',
@@ -402,6 +447,18 @@
 			})
 		},
 		methods: {
+			sliderChange(e,a){
+				let val=e.detail.value
+				switch(a){
+					case 'up':
+						this.equipContrlForm.TEMP_UP=val;
+						break;
+					case 'down':
+						this.equipContrlForm.TEMP_DOWN=val;
+						break;
+
+				}
+			},
 			selectOperate(min,max,formKey){
 				this.dataSelectShow = true
 		
@@ -417,7 +474,7 @@
 			},
 			tsArrConfirm(e){
 				this.tsArrLabel = e[0].label
-				this.equipContrlForm.CONTROL = e[0].value
+				// this.equipContrlForm.CONTROL = e[0].value
 			},
 			gkArrConfirm(e){
 				this.gkongLabel = e[0].label
@@ -459,12 +516,17 @@
 					return 
 				}
 				this.equipContrlForm = res
+		
+				this.equipContrlForm.TEMP_LIMIT = res.TEMP_LIMIT=='1'
+				this.equipContrlForm.TEMP_UP = (res.TEMP_UP||50)-0
+				this.equipContrlForm.TEMP_DOWN = (res.TEMP_DOWN||0)-0
 				this.photoLabel = (res.P_START||'00:00')+' - '+ (res.P_END||'00:00')
 				this.shikongLabel = res.START_TIME + ':00' +  ' - '+res.END_TIME + ':00' 
-				console.log(this.equipContrlForm)
+				console.log(this.equipContrlForm,'0000')
 			},
 			async submit() {
 				console.log(this.equipContrlForm)
+				this.equipContrlForm.TEMP_LIMIT = this.equipContrlForm.TEMP_LIMIT ? '1':'0'
 				let res = await this.$myRequest({
 					url: '/api/api_gateway?method=new_gateway.device_info.update_device_config',
 					data: {

+ 617 - 0
pages/cb/cbd/equip-set/equip-set-sy2.vue

@@ -0,0 +1,617 @@
+<template>
+	<view style="padding: 0 24rpx;">
+		<view class="" v-if="myuser_type">
+			<view class="tit adminTit">
+				联网模块
+			</view>
+			<view class="btns">
+				<button v-for="(item,index) in controlInfo.netControl" type="warn" @click="equipBtnControl(item.cmd)" size="mini">{{item.name}}</button>
+			</view>
+			<view class="tit adminTit" v-if="controlInfo.forceControl.length>0">
+				强制操作
+			</view>
+			<view class="btns">
+				<button v-for="(item,index) in controlInfo.forceControl" type="warn" @click="equipBtnControl(item.cmd)" size="mini">{{item.name}}</button>
+		
+			</view>
+			<view class="tit adminTit">
+				设备操作
+			</view>
+			<view class="btns">
+				<button v-for="(item,index) in controlInfo.equipControl" type="warn" @click="equipBtnControl(item.cmd)" size="mini">{{item.name}}</button>
+
+			</view>
+		</view>
+		<view style="margin:40rpx 0 20rpx 0;">
+			<u-line color="#E5EBE9" />
+		</view>
+		<view class="">
+			<view class="tit">
+				IMEI:{{equipContrlForm.imei}}
+			</view>
+			<view class="tit">
+				设备ID:{{device_id}}
+			</view>
+			<view class="tit">
+				设备版本:{{equipContrlForm.version}}
+			</view>
+		</view>
+		<view class="uni-list-cell" v-if="device_type==32" @click="modeShow = true">
+			<span class="tit">定时模式</span>
+			<view class="right-data" style="float: right;">
+				<span>{{tsArrLabel}}</span>
+				<u-icon class="arrow" name="arrow-right"></u-icon>
+			</view>
+		</view>
+		<view class="uni-list-cell" v-if="device_type==33||device_type==34" @click="syModeShow = true">
+			<span class="tit">控制模式</span>
+			<view class="right-data" style="float: right;">
+				<span>{{tsArrLabel}}</span>
+				<u-icon class="arrow" name="arrow-right"></u-icon>
+			</view>
+		</view>
+		<view class="uni-list-cell" @click="shikongshow = true" v-if="equipContrlForm.ctrlMode=='0'">
+			<span class="tit">
+				时控时长
+			</span>
+			<view class="right-data" style="float: right;">
+				<span>{{shikongLabel}}</span>
+				<u-icon class="arrow" name="arrow-right"></u-icon>
+			</view>
+			
+		</view>
+		<view class="uni-list-cell" @click="gkongShow = true" v-if="equipContrlForm.ctrlMode=='1'">
+			<span class="tit">
+				光控时长
+			</span>
+			<view class="right-data" style="float: right;">
+				<span>{{gkongLabel}}</span>
+				<u-icon class="arrow" name="arrow-right"></u-icon>
+			</view>
+			
+		</view>
+
+
+
+		<view  class="uni-list-cell" @click="selectOperate(5,180,'takePhotoIntervalMinutes')">
+			<span class="tit">
+				拍照频率(min)
+			</span>
+			<view class="right-data" style="float: right;">
+				<span>{{equipContrlForm.takePhotoIntervalMinutes}}</span>
+				<u-icon class="arrow" name="arrow-right"></u-icon>
+			</view>
+			
+		</view>
+		<view >
+			<u-select v-model="modeShow" :list="tsArr" @confirm="tsArrConfirm"></u-select>
+			<u-select v-model="syModeShow" :list="syArr" @confirm="tsArrConfirm"></u-select>
+			<u-select v-model="shikongshow" mode="mutil-column" :list="shikonglist" @confirm="shikongconfirm"></u-select>
+			<u-select v-model="photoShow" mode="mutil-column" :list="shikonglist" @confirm="photoConfirm"></u-select>
+			<u-select v-model="gkongShow" :list="gkongArr" @confirm="gkArrConfirm"></u-select>
+			<u-select v-model="dataSelectShow"  :list="singleSelectList" @confirm="dataconfirm"></u-select>
+		</view>
+		<view class="submit-box">
+			<u-button :custom-style="customStyle" @click="submit" :disabled="submitBtnDisabled" >确定</u-button>
+		</view>
+		<u-toast ref="toast" />
+		<u-popup v-model="mqttShow">
+			<view class="mqtt-popup">
+				<u-field required v-model="mqttConfig.muid" label="MQTT用户名" label-width="180">
+				</u-field>
+				<u-field required v-model="mqttConfig.mpwd" label="MQTT密码" label-width="180">
+				</u-field>
+				<u-field required v-model="mqttConfig.mpi" label="MQTT地址" label-width="180">
+				</u-field>
+				<u-field required v-model="mqttConfig.mport" label="MQTT端口" label-width="180">
+				</u-field>
+				<u-field required v-model="mqttConfig.mpub" label="上传地址" label-width="180">
+				</u-field>
+				<u-field required v-model="mqttConfig.msub" label="下发地址" label-width="180">
+				</u-field>
+				<u-field v-model="mqttConfig.fuid" label="FTP用户名" label-width="180">
+				</u-field>
+				<u-field v-model="mqttConfig.fpwd" label="FTP密码" label-width="180">
+				</u-field>
+				<u-field required v-model="mqttConfig.fip" label="图片上传地址" label-width="180">
+				</u-field>
+				<u-field required v-model="mqttConfig.fport" label="图片上传接口" label-width="180">
+				</u-field>
+			</view>
+			<view class="mqtt-btn-box">
+				<u-button @click="" size="medium" type="success">确定</u-button>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				d_id: '',
+				device_id:'',
+				device_type:'',
+				dsArr: ['关机', '开机'],
+				dsIndex: 0,
+				wsArr: ['待机', '工作'],
+				wsIndex: 0,
+				tsArr: [ 
+					{ value: 1, label: '时控触发' },
+					{ value: 0, label: '时控模式' },
+				],
+				syArr:[
+					{ value: 1, label: '光控模式' },
+					{ value: 0, label: '时控模式' }
+				  ],
+				tsIndex: 0,
+				imgresArr: ['高', '中', '低'],
+				imgresIndex: "",
+				wsModelShow: false,
+				equipContrlForm: {
+					endHour: '',
+					ctrlMode: '0',
+				
+					startHour: '',
+					takePhotoIntervalMinutes: 5,
+					lightDuration:''
+				},
+
+				shikongLabel:'00:00-00:00',
+				list: [{
+						value: '00:00',
+						label: '00:00'
+					},
+					{
+						value: '01:00',
+						label: '01:00'
+					},
+					{
+						value: '02:00',
+						label: '02:00'
+					},
+					{
+						value: '03:00',
+						label: '03:00'
+					},
+					{
+						value: '04:00',
+						label: '04:00'
+					},
+					{
+						value: '05:00',
+						label: '05:00'
+					},
+					{
+						value: '06:00',
+						label: '06:00'
+					},
+					{
+						value: '07:00',
+						label: '07:00'
+					}, {
+						value: '08:00',
+						label: '08:00'
+					},
+					{
+						value: '09:00',
+						label: '09:00'
+					},
+					{
+						value: '10:00',
+						label: '10:00'
+					},
+					{
+						value: '11:00',
+						label: '11:00'
+					},
+					{
+						value:'12:00',
+						label: '12:00'
+					},
+					{
+						value: '13:00',
+						label: '13:00'
+					},
+					{
+						value: '14:00',
+						label: '14:00'
+					}, {
+						value: '15:00',
+						label: '15:00'
+					},
+					{
+						value: '16:00',
+						label: '16:00'
+					},
+					{
+						value: '17:00',
+						label: '17:00'
+					},
+					{
+						value: '18:00',
+						label: '18:00'
+					},
+					{
+						value: '19:00',
+						label: '19:00'
+					},
+					{
+						value: '20:00',
+						label: '20:00'
+					},
+					{
+						value: '21:00',
+						label: '21:00'
+					}, {
+						value: '22:00',
+						label: '22:00'
+					},
+					{
+						value: '23:00',
+						label: '23:00'
+					},
+				],
+				mqttShow: false,
+				shikongshow:false,
+				gkongLabel:'0h',
+				gkongShow:false,
+				mqttConfig: {
+					muid: '',
+					mpwd: '',
+					mip: '',
+					mport: '',
+					mpub: '',
+					msub: '',
+					fuid: '',
+					fpwd: '',
+					fip: '',
+					fport: ''
+				},
+				myuser_type: false,
+				singleSelectList:[],
+				dataSelectShow:false,
+				currentFormKey:'',
+				tsArrLabel:'时控模式',
+			
+				modeShow:false,
+				syModeShow:false,
+				submitBtnDisabled:false,
+				photoShow:false,
+				photoLabel:'00:00-00:00'
+				
+			}
+		},
+		
+		computed:{
+			gkongArr(){
+				const list = []
+				      const count = 24
+				      for (let i = 0; i < count; i++) {
+				        list.push({
+				          value: i + 1 + '',
+				          label: i + 1 + 'h'
+				        })
+				      }
+				      return list
+			},
+			customStyle(){
+				return {
+					background: '#14A478',
+					borderRadius:'90rpx',
+					border:'none',
+					color:'#fff'
+				}
+			},
+			shikonglist(){
+				return[
+					[...this.list],
+					[...this.list]
+				] 
+			},
+
+			controlInfo(){
+				const netControl = [{
+          name: '数据单元重启',
+          cmd: 'reboot'
+        },
+        {
+          name: '数据单元升级',
+          cmd: 'upgradeApp'
+        }]
+				const forceControl = [
+				 //  {
+					// name: '控制单元重启',
+					// cmd: 'reboot'
+				 //  },
+				 //  {
+					// name: '控制单元升级',
+					// cmd: 'update'
+				 //  }
+				]
+				const equipControl = [
+				 {
+				           name: '测试拍照',
+				           cmd: 'takephoto'
+				         },
+				         {
+				           name: '获取定位',
+				           cmd: 'getLocation'
+				         }
+				]
+			
+				switch (this.device_type){
+					case 32://天牛
+						break;
+					case 33:
+						break;
+					case 34:
+						break;
+					case 35:
+					break;
+					default:
+						break;
+				}
+				return {
+					netControl,forceControl,equipControl
+					
+				}
+			}
+		},
+		onLoad(option) {
+			this.d_id = option.d_id
+			this.device_id = option.device_id
+			this.device_type = option.device_type
+			this.getInfo()
+			uni.getStorage({
+				key: "myuser_type",
+				success: (res) => {
+					if (Number(res.data) == 1) {
+						this.myuser_type = true
+					}
+				}
+			})
+		},
+		methods: {
+			selectOperate(min,max,formKey){
+				this.dataSelectShow = true
+		
+				this.singleSelectList = []
+				for (let i = min; i < max; i+=5) {
+					this.singleSelectList.push({
+						value:i,
+						label:i.toString()
+					})
+				}
+				console.log(this.singleSelectList,'--')
+				this.currentFormKey = formKey
+			},
+			tsArrConfirm(e){
+				this.tsArrLabel = e[0].label
+				this.equipContrlForm.ctrlMode = e[0].value
+			},
+			gkArrConfirm(e){
+				this.gkongLabel = e[0].label
+				this.equipContrlForm.lightDuration = e[0].value
+			},
+			dataconfirm(e){
+				this.equipContrlForm[this.currentFormKey] = e[0].value
+			},
+			shikongconfirm(e){
+				console.log(e)
+				this.shikongLabel = e[0].label+'-'+e[1].label
+				this.equipContrlForm.startHour = e[0].value
+				this.equipContrlForm.endHour = e[1].value
+			},
+			photoConfirm(e){
+				
+				this.photoLabel = e[0].label+'-'+e[1].label
+				this.equipContrlForm.P_START = e[0].value
+				this.equipContrlForm.P_END = e[1].value
+			},
+			turnChange(e, a) {
+				this.equipContrlForm.ts = e.target.value
+
+			},	
+			async getInfo() {
+				let res = await this.$myRequest({
+					url: '/api/api_gateway?method=new_gateway.device_info.get_device_config',
+					data: {
+						device_type_id:this.device_type,
+						id: this.d_id
+					}
+				})
+				if(res.code==4000){
+					this.submitBtnDisabled = true
+					this.$refs.toast.show({
+						title: res.msg,
+						type: 'warning'
+					})
+					return 
+				}
+				this.equipContrlForm = res
+				this.tsArrLabel = res.ctrlMode=='1' ? '光控模式':'时控模式'
+				this.gkongLabel = res.lightDuration + 'h'
+				this.shikongLabel = res.startHour + ':00' +  ' - '+res.endHour + ':00' 
+				console.log(this.equipContrlForm)
+			},
+			async submit() {
+				console.log(this.equipContrlForm)
+				let res = await this.$myRequest({
+					url: '/api/api_gateway?method=new_gateway.device_info.update_device_config',
+					data: {
+						device_type_id: this.device_type,
+						id: this.d_id,
+						...this.equipContrlForm
+					}
+				})
+				console.log('响应',res)
+				if(res){
+					this.$refs.toast.show({
+						title: '设备控制指令下发成功!',
+						type: 'success',
+					})
+				}
+				if(res.code==4000){
+					this.$refs.toast.show({
+						title: res.msg+'无法修改',
+						type: 'warning'
+					})
+					
+				}
+			},
+			async equipBtnControl(cmd) {
+				let res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.send_control.admin_device_control',
+					data: {
+						cmd,
+						device_type_id: this.device_type,
+						d_id: this.d_id
+					}
+				})
+				console.log(res,'响应----')
+				if (res) {
+					
+					this.$refs.toast.show({
+						title: '指令下发成功!',
+						type: 'success',
+					})
+				}
+			},
+			async mqttInfo() {
+				let res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.send_control.device_control_info',
+					data: {
+						cmd: 'netconf',
+						d_id: this.d_id
+					}
+				})
+				if (res) {
+					let {
+						ftp,
+						mqtt
+					} = res
+					this.mqttConfig = {
+						muid: mqtt.uid,
+						mpwd: mqtt.pwd,
+						mip: mqtt.ip,
+						mport: mqtt.port,
+						mpub: mqtt.pub,
+						msub: mqtt.sub,
+						fuid: ftp.uid,
+						fpwd: ftp.pwd,
+						fip: ftp.ip,
+						fport: ftp.port
+					}
+				}
+				this.mqttShow = true
+			},
+			async mqttSubm() {
+				let obj = {
+					mqtt: {
+						uid: this.mqttConfig.muid,
+						pwd: this.mqttConfig.mpwd,
+						ip: this.mqttConfig.mip,
+						port: this.mqttConfig.mport,
+						pub: this.mqttConfig.mpub,
+						sub: this.mqttConfig.msub,
+						keepalive: 60,
+						lastwill: '/yfkj/cbd/offline/'
+					},
+					ftp: {
+						uid: this.mqttConfig.fuid,
+						pwd: this.mqttConfig.fpwd,
+						ip: this.mqttConfig.fip,
+						port: this.mqttConfig.fport
+					}
+				}
+				let res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.send_control.device_control',
+					data: {
+						device_type_id: 3,
+						d_id: this.d_id,
+						cmd: 'setnet',
+						config: JSON.stringify(obj)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		.tit {
+			line-height: 30rpx;
+			font-size: 28rpx;
+			margin: 30rpx 0;
+			color: #666666;
+		}
+
+		.adminTit {
+			border-left-color: #e64340;
+		}
+
+		.btns {
+			display: flex;
+			justify-content: flex-start;
+			flex-wrap: wrap;
+			gap: 16rpx;
+			button {
+				margin: 0;
+				margin-right: 10rpx;
+				padding: 0 25rpx;
+			}
+		}
+
+		.uni-list-cell {
+			// background: #F7F8FA;
+			// padding: 10rpx 40rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			font-size: 28rpx;
+			box-sizing: border-box;
+			.arrow{
+				margin-left: 30rpx;
+			}
+			.right-data{
+				color: #CCCCCC;
+			}
+		}
+
+		.selectTime {
+			display: flex;
+			float: right;
+			width: 30%;
+			color: #CCCCCC;
+			justify-content: space-between;
+			.time {
+				// width: 350rpx;
+				// display: flex;
+				// justify-content: space-between;
+			}
+
+			.line {
+				width: 50rpx;
+				text-align: center;
+			}
+		}
+
+		.submit-box {
+			margin-top: 60rpx
+		}
+
+		.mqtt-popup {
+			width: 580rpx;
+
+		}
+
+		.mqtt-btn-box {
+			margin-top: 50rpx;
+			text-align: center;
+		}
+	}
+</style>

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

@@ -19,7 +19,7 @@
 				<view class="selecttimes" @click="tiemshow=!tiemshow">
 					<view class="timesbox">
 						<image
-							:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+							:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 							mode=""></image>
 						<p>{{timetab(timestate)}}</p>
 						<p class="or">~</p>
@@ -35,7 +35,7 @@
 			<view class="imglist">
 				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
 					<view class="imglist_left">
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="">
+						<image :src="$imageURL+'/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="">
 						</image>
 						<image :src="item.addr" mode="" @click="examine(index)"></image>
 					</view>
@@ -61,7 +61,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
 				mode=""></image>
 		</view>
 	</view>

+ 1 - 1
pages/cb/cbd/equip-set/new-analyse.vue

@@ -54,7 +54,7 @@
 				</view>
 				<view class="timesbox">
 					<!-- <image
-						:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image> -->
 					<p>{{oldtime}}</p>
 					<p class="or">至</p>

+ 1 - 1
pages/cb/cbd/equip-set/photo.vue

@@ -181,7 +181,7 @@
 					data: {
 						device_type_id: this.device_type,
 						id: this.device_id,
-						cmd: "0004"
+						COMMAND:this.device_type=='33'?'takephoto': '0004',
 					}
 				})
 				console.log(res)

+ 1 - 1
pages/cb/cbd/equip-set/results.vue

@@ -3,7 +3,7 @@
 		<view class="images_box">
 			<p class="title">图片标记</p>
 			<view class="images">
-				<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode=""
+				<image :src="$imageURL+'/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode=""
 					class="jiazai"></image>
 				<image :src="resuils.image" mode="" @click="examine(resuils)"></image>
 				<view class="imgbg" v-if="imgbg">

+ 5 - 5
pages/cb/equip-detail/equip-detail-new.vue

@@ -3,9 +3,9 @@
 		<view class="title">基本信息</view>
 		<view class="info">
 			<view class="device-id" @click="copy(equipInfo)">
-				<image class="logo" :src="`http://www.hnyfwlw.com:8006/bigdata_pc/equipdistribute/${equipInfo.type}.png`" mode=""></image>
+				<image class="logo" :src="`${$imageURL}/bigdata_pc/equipdistribute/${equipInfo.type}.png`" mode=""></image>
 				{{equipInfo.imei||equipInfo.device_id}}
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi">
+				<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode="" class="tishi">
 				</image>
 				<view :class="['float-right','yficonfont',equipInfo.is_online==1?'on icon-zaixian':'off icon-lixian']">
 					{{equipInfo.is_online==1?'在线':'离线'}}
@@ -65,7 +65,7 @@
 		<view class="newState" >
 			<view class="item" v-for="item in curEquip" @click="partClick(item.path)">
 				<view class="item_info_img">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
+					<image :src="$imageURL+'/bigdata_app'+item.icon" mode="widthFix"></image>
 				</view>
 				<view class="info-text">
 					{{item.tex}}
@@ -82,7 +82,7 @@
 		<view class="newState" v-else>
 			<view class="item" v-for="item in curState">
 				<view class="item_info_img">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
+					<image :src="$imageURL+'/bigdata_app'+item.icon" mode="widthFix"></image>
 				</view>
 				<view class="info-con">
 					<view class="active">
@@ -135,7 +135,7 @@
 				this.cbd = [{
 						icon: '/image/cb/4.png',
 						tex: '设备控制',
-						path: '/pages/cb/cbd/equip-set/equip-set-new',
+						path: this.type==33?'/pages/cb/cbd/equip-set/equip-set-sy2': '/pages/cb/cbd/equip-set/equip-set-new',
 						tf: true
 					}, {
 						icon: '/image/cb/6.png',

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

@@ -3,7 +3,7 @@
 		<view :class="['info',equipInfo.is_online==1?'on':'off']">
 			<view class="" @click="copy(equipInfo)">
 				设备ID:{{equipInfo.imei||equipInfo.device_id}}
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi">
+				<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode="" class="tishi">
 				</image>
 			</view>
 			<view class="">
@@ -71,7 +71,7 @@
 		<view class="equip_part">
 			<template v-if="equipInfo.type==7">
 				<view class="item1" v-for="item in bzy" v-if="item.tf" @click="partClick(item.path)">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
+					<image :src="$imageURL+'/bigdata_app'+item.icon" mode="widthFix"></image>
 					<view class="">
 						{{item.tex}}
 					</view>
@@ -79,7 +79,7 @@
 			</template>
 			<template v-else-if="equipInfo.type==3">
 				<view class="item2" v-for="item in curEquip" v-if="item.tf" @click="partClick(item.path)">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
+					<image :src="$imageURL+'/bigdata_app'+item.icon" mode="widthFix"></image>
 					<view class="">
 						{{item.tex}}
 					</view>
@@ -87,7 +87,7 @@
 			</template>
 			<template v-else>
 				<view class="item3" v-for="item in curEquip" v-if="item.tf" @click="partClick(item.path)">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
+					<image :src="$imageURL+'/bigdata_app'+item.icon" mode="widthFix"></image>
 					<view class="">
 						{{item.tex}}
 					</view>
@@ -110,7 +110,7 @@
 		<view class="newState" v-else>
 			<view class="item" v-for="item in curState">
 				<view class="item_info_img">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
+					<image :src="$imageURL+'/bigdata_app'+item.icon" mode="widthFix"></image>
 				</view>
 				<view class="info-con">
 					<view class="active">
@@ -736,11 +736,11 @@
 		}
 
 		.on {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/onBg.png')
 		}
 
 		.off {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
 		}
 
 		.equip_part {

+ 1 - 1
pages/cb/index/index.vue

@@ -12,7 +12,7 @@
 				 	</view>
 				 </view>
 				<view>
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/banner.jpg'" mode="widthFix"></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/cb/banner.jpg'" mode="widthFix"></image>
 				</view>
 				<view class="tab-box">
 					<view v-for="(item,index) in equipArr" :key="index" @click="tabClick(index,item)" :class="['tab-item',active==index?'active':'']">

+ 2 - 2
pages/cb/index/search.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="prevents" v-else>
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
-					<image :src="item.is_online==1?'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'" mode=""
+					<image :src="item.is_online==1? $imageURL+ '/bigdata_app/image/prevention/6.png':$imageURL+ '/bigdata_app/image/prevention/7.png'" mode=""
 					 class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备 ID:{{item.imei || item.device_id}}</p>
@@ -28,7 +28,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

+ 10 - 10
pages/cb/nlNewXy/nlNewXy.vue

@@ -3,7 +3,7 @@
 		<view :class="['info',equipInfo.is_online==1?'on':'off']">
 			<view class="" @click="copy(equipInfo)">
 				设备ID:{{showId}}
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi">
+				<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode="" class="tishi">
 				</image>
 			</view>
 			<view class="">
@@ -44,13 +44,13 @@
 		<u-calendar v-model="tiemshow" mode="date" :max-date="date" @change="tiemchange"></u-calendar>
 		<view class="caobox">
 			<view class="caobox_item" v-if="$QueryPermission(358)" @click="toset">
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/4.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/4.png'" mode="widthFix"></image>
 				<view class="">
 					设备控制
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(359)" @click="tohis">
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/2.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/2.png'" mode="widthFix"></image>
 				<view class="">
 					历史数据
 				</view>
@@ -62,35 +62,35 @@
 			</view>
 			<view class="realtime_text">
 				<view class="realtime_item">
-					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/wendu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/wendu.png'" mode=""></image>
 					<view class="text">
 						<p>环境温度</p>
 						<p>{{at}}℃</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/shidu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/shidu.png'" mode=""></image>
 					<view class="text">
 						<p>环境湿度</p>
 						<p>{{ah}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/tianqi.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/tianqi.png'" mode=""></image>
 					<view class="text">
 						<p>天气</p>
 						<p>{{wea}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/xiayu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/xiayu.png'" mode=""></image>
 					<view class="text">
 						<p>是否下雨</p>
 						<p>{{rain}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/yujing.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/yujing.png'" mode=""></image>
 					<view class="text">
 						<p>诱虫次数</p>
 						<p>{{wormnum}}</p>
@@ -282,11 +282,11 @@
 		}
 
 		.on {
-			background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/onBg.png')
 		}
 
 		.off {
-			background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
 		}
 
 		.caobox {

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

@@ -125,11 +125,11 @@ page {
   }
 
   .on {
-    background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+    background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/onBg.png')
   }
 
   .off {
-    background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+    background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
   }
 
   .caobox {

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

@@ -5,7 +5,7 @@
 				<image src="../../../static/images/cb/6286299.gif" mode="" class="img"></image>
 			</view>
 			<view class="tit">
-				<image mode="widthFix" src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/sim1.png"></image>
+				<image mode="widthFix" :src="$imageURL+'/bigdata_app/image/cb/sim1.png'"></image>
 				数据sim卡流量{{"("+sim.simnew+")"}}
 			</view>
 			<view class="item">
@@ -40,7 +40,7 @@
 					<image src="../../../static/images/cb/6286299.gif" mode="" class="img"></image>
 				</view>
 				<view class="tit">
-					<image mode="widthFix" src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/sim2.png"></image>
+					<image mode="widthFix" :src="$imageURL+'/bigdata_app/image/cb/sim2.png'"></image>
 					图片sim卡流量{{"("+hksim.simnew+")"}}
 				</view>
 				<view class="item">

+ 1 - 1
pages/cb/smallPest/analyse.vue

@@ -45,7 +45,7 @@
 				</view>
 				<view class="timesbox">
 					<!-- <image
-					:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+					:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 					mode=""></image> -->
 					<p>{{oldtime}}</p>
 					<p class="or">至</p>

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

@@ -10,7 +10,7 @@
 			<view class="selecttimes" @click="tiemshow=!tiemshow">
 				<view class="timesbox">
 					<image
-						:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(timestate)}}</p>
 					<p class="or">~</p>
@@ -22,7 +22,7 @@
 			<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 :src="$imageURL+'/bigdata_app/image/cb/jiazai.ui.gif'" mode="">
 						</image>
 						<image :src="item.addr" mode="" @click="examine(index)"></image>
 					</view>
@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
 				mode=""></image>
 		</view>
 	</view>

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

@@ -3,7 +3,7 @@
 		<view :class="['info',equipInfo.is_online==1?'on':'off']">
 			<view class="" @click="copy(equipInfo)">
 				设备ID:{{equipInfo.imei||equipInfo.device_id}}
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi">
+				<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode="" class="tishi">
 				</image>
 			</view>
 			<view class="">
@@ -21,25 +21,25 @@
 		</view>
 		<view class="caobox">
 			<view class="caobox_item" v-if="$QueryPermission(351)" @click="tophoto">
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/1.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/1.png'" mode="widthFix"></image>
 				<view class="">
 					查看图片
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(350)" @click="toset">
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/4.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/4.png'" mode="widthFix"></image>
 				<view class="">
 					设备控制
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(353)" @click="toanal">
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/3.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/3.png'" mode="widthFix"></image>
 				<view class="">
 					虫情分析
 				</view>
 			</view>
 			<view class="caobox_item" @click="simRouter">
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/6.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/6.png'" mode="widthFix"></image>
 				<view class="">
 					SIM卡
 				</view>
@@ -406,11 +406,11 @@
 		}
 
 		.on {
-			background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/onBg.png')
 		}
 
 		.off {
-			background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
 		}
 
 		.caobox {

+ 10 - 10
pages/cb/sy/detail.vue

@@ -3,7 +3,7 @@
 		<view :class="['info',equipInfo.is_online==1?'on':'off']">
 			<view class="" @click="copy(equipInfo)">
 				设备ID:{{equipInfo.imei||equipInfo.device_id}}
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi">
+				<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode="" class="tishi">
 				</image>
 			</view>
 			<view class="">
@@ -21,19 +21,19 @@
 		</view>
 		<view class="caobox">
 			<view class="caobox_item" v-if="$QueryPermission(187)" @click="tophoto">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/1.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/1.png'" mode="widthFix"></image>
 				<view class="">
 					查看图片
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(181)" @click="tohis">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/2.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/2.png'" mode="widthFix"></image>
 				<view class="">
 					历史数据
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(244)" @click="simRouter">
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/6.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/6.png'" mode="widthFix"></image>
 				<view class="">
 					SIM卡信息
 				</view>
@@ -45,28 +45,28 @@
 			</view>
 			<view class="realtime_text">
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/wendu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/wendu.png'" mode=""></image>
 					<view class="text">
 						<p>环境温度</p>
 						<p>{{at}}℃</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/shidu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/shidu.png'" mode=""></image>
 					<view class="text">
 						<p>环境湿度</p>
 						<p>{{ah}}%RH</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/icon02.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/icon02.png'" mode=""></image>
 					<view class="text">
 						<p>开机状态</p>
 						<p>{{status == 1 ? '开机' : '关机'}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/yujing.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/yujing.png'" mode=""></image>
 					<view class="text">
 						<p>版本号</p>
 						<p>{{version}}</p>
@@ -183,11 +183,11 @@
 		}
 
 		.on {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/onBg.png')
 		}
 
 		.off {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
 		}
 
 		.caobox {

+ 3 - 3
pages/cb/sy/imgList.vue

@@ -10,7 +10,7 @@
 			<view class="selecttimes" @click="tiemshow=!tiemshow">
 				<view class="timesbox">
 					<image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(timestate)}}</p>
 					<p class="or">~</p>
@@ -22,7 +22,7 @@
 			<view class="imglist">
 				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
 					<view class="imglist_left">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/jiazai.ui.gif" mode="">
+						<image :src="$imageURL+'/bigdata_app/image/cb/jiazai.ui.gif'" mode="">
 						</image>
 						<image :src="item.addr" mode="" @click="examine(index)"></image>
 					</view>
@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
 				mode=""></image>
 		</view>
 	</view>

+ 3 - 3
pages/cb/thxydetail/photolist.vue

@@ -10,7 +10,7 @@
 			<view class="selecttimes" @click="tiemshow=!tiemshow">
 				<view class="timesbox">
 					<image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(timestate)}}</p>
 					<p class="or">~</p>
@@ -22,7 +22,7 @@
 			<view class="imglist">
 				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
 					<view class="imglist_left">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/jiazai.ui.gif" mode="">
+						<image :src="$imageURL+'/bigdata_app/image/cb/jiazai.ui.gif'" mode="">
 						</image>
 						<image :src="item.addr" mode="" @click="examine(index)"></image>
 					</view>
@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
 				mode=""></image>
 		</view>
 	</view>

+ 13 - 13
pages/cb/thxydetail/thxydetail.vue

@@ -3,7 +3,7 @@
 		<view :class="['info',equipInfo.is_online==1?'on':'off']">
 			<view class="" @click="copy(equipInfo)">
 				设备ID:{{equipInfo.imei||equipInfo.device_id}}
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi">
+				<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode="" class="tishi">
 				</image>
 			</view>
 			<view class="">
@@ -44,25 +44,25 @@
 		<u-calendar v-model="tiemshow" mode="date" :max-date="date" @change="tiemchange"></u-calendar>
 		<view class="caobox">
 			<view class="caobox_item" v-if="$QueryPermission(200)" @click="tophoto">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/1.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/1.png'" mode="widthFix"></image>
 				<view class="">
 					查看图片
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(248)" @click="toset">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/4.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/4.png'" mode="widthFix"></image>
 				<view class="">
 					设备控制
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(247)" @click="tosim">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/6.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/6.png'" mode="widthFix"></image>
 				<view class="">
 					SIM卡
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(199)" @click="tohis">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/2.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/2.png'" mode="widthFix"></image>
 				<view class="">
 					历史数据
 				</view>
@@ -74,42 +74,42 @@
 			</view>
 			<view class="realtime_text">
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/wendu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/wendu.png'" mode=""></image>
 					<view class="text">
 						<p>环境温度</p>
 						<p>{{at}}℃</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/shidu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/shidu.png'" mode=""></image>
 					<view class="text">
 						<p>环境湿度</p>
 						<p>{{ah}}%</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/tianqi.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/tianqi.png'" mode=""></image>
 					<view class="text">
 						<p>天气</p>
 						<p>{{wea}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/xiayu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/xiayu.png'" mode=""></image>
 					<view class="text">
 						<p>是否下雨</p>
 						<p>{{rain}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/fengxiang.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/fengxiang.png'" mode=""></image>
 					<view class="text">
 						<p>风力风向</p>
 						<p>{{wind}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/yujing.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/yujing.png'" mode=""></image>
 					<view class="text">
 						<p>诱虫次数</p>
 						<p>{{wormnum}}</p>
@@ -381,11 +381,11 @@
 		}
 
 		.on {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/onBg.png')
 		}
 
 		.off {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
 		}
 
 		.caobox {

+ 1 - 1
pages/cb/xctdetail/analyse.vue

@@ -45,7 +45,7 @@
 					</view>
 					<view class="timesbox">
 						<!-- <image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image> -->
 						<p>{{oldtime}}</p>
 						<p class="or">至</p>

+ 3 - 3
pages/cb/xctdetail/photolist.vue

@@ -10,7 +10,7 @@
 			<view class="selecttimes" @click="tiemshow=!tiemshow">
 				<view class="timesbox">
 					<image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(timestate)}}</p>
 					<p class="or">~</p>
@@ -22,7 +22,7 @@
 			<view class="imglist">
 				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
 					<view class="imglist_left">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/jiazai.ui.gif" mode="">
+						<image :src="$imageURL+'/bigdata_app/image/cb/jiazai.ui.gif'" mode="">
 						</image>
 						<image :src="item.addr" mode="" @click="examine(index)"></image>
 					</view>
@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
 				mode=""></image>
 		</view>
 	</view>

+ 7 - 7
pages/cb/xctdetail/xctdetail.vue

@@ -3,7 +3,7 @@
 		<view :class="['info',equipInfo.is_online==1?'on':'off']">
 			<view class="" @click="copy(equipInfo)">
 				设备ID:{{equipInfo.imei||equipInfo.device_id}}
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi">
+				<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode="" class="tishi">
 				</image>
 			</view>
 			<view class="">
@@ -21,25 +21,25 @@
 		</view>
 		<view class="caobox">
 			<view class="caobox_item" v-if="$QueryPermission(182)" @click="tophoto">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/1.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/1.png'" mode="widthFix"></image>
 				<view class="">
 					查看图片
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(172)" @click="toset">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/4.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/4.png'" mode="widthFix"></image>
 				<view class="">
 					设备控制
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(238)" @click="toanal">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/3.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/3.png'" mode="widthFix"></image>
 				<view class="">
 					虫情分析
 				</view>
 			</view>
 			<view class="caobox_item" @click="simRouter">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/6.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/6.png'" mode="widthFix"></image>
 				<view class="">
 					SIM卡
 				</view>
@@ -399,11 +399,11 @@
 		}
 
 		.on {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/onBg.png')
 		}
 
 		.off {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
 		}
 
 		.caobox {

+ 2 - 2
pages/cb/xy/equip-set/xyhistoryile.vue

@@ -25,11 +25,11 @@
 				<p class="wind_titie">风速、风向</p>
 				<view class="wind_text">
 					<view class="wind_speed">
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/xy/1c24243bb184e84ffd13540367569ba.png'" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app'+'/image/cb/xy/1c24243bb184e84ffd13540367569ba.png'" mode=""></image>
 						<p>风速:{{wind_sped}}(m/s)</p>
 					</view>
 					<view class="wind_direction">
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/xy/c44ae038324e1040a1eaa702e6d71a5.png'" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app'+'/image/cb/xy/c44ae038324e1040a1eaa702e6d71a5.png'" mode=""></image>
 						<p>风向:{{wind_drec}}</p>
 					</view>
 				</view>

+ 11 - 11
pages/cb/xy2.0/particulars.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="">
 			<view :class="['info',equipInfo.is_online==1?'on':'off']">
-				<p @click="copy(newState.device_id)">设备ID:{{newState.device_id}}<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image></p>
+				<p @click="copy(newState.device_id)">设备ID:{{newState.device_id}}<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode="" class="tishi"></image></p>
 				<p>设备名称:{{newState.device_name==""?"无":newState.device_name}}</p>
 				<p>最新上报时间:{{newState.uptime | timeFormat}}</p>
 				<p>最新地址:{{newState.addr}}</p>
@@ -14,11 +14,11 @@
 			</view>
 			<view class="control">
 				<view class="control_item" @click="repairs">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/7.png'" mode=""></image>
 					<p>一键报修</p>
 				</view>
 				<view class="control_item" @click="toggle"  v-if="$QueryPermission(176)">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/2.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/cb/2.png'" mode=""></image>
 					<p>历史数据</p>
 				</view>
 			</view>
@@ -28,42 +28,42 @@
 				</view>
 				<view class="realtime_text">
 					<view class="realtime_item">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/wendu.png" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/wendu.png'" mode=""></image>
 						<view class="text">
 							<p>环境温度</p>
 							<p>{{newState.at}}℃</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/shidu.png" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/shidu.png'" mode=""></image>
 						<view class="text">
 							<p>环境湿度</p>
 							<p>{{newState.ah}}%</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/tianqi.png" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/tianqi.png'" mode=""></image>
 						<view class="text">
 							<p>天气</p>
 							<p>{{newState.type}}</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/xiayu.png" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/xiayu.png'" mode=""></image>
 						<view class="text">
 							<p>是否下雨</p>
 							<p>{{newState.rain}}</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/fengxiang.png" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/fengxiang.png'" mode=""></image>
 						<view class="text">
 							<p>风力风向</p>
 							<p>{{newState.wind}}</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/yujing.png" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/yujing.png'" mode=""></image>
 						<view class="text">
 							<p>诱虫次数</p>
 							<p>{{trapnum}}</p>
@@ -339,11 +339,11 @@
 	}
 
 	.on {
-		background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+		background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/onBg.png')
 	}
 
 	.off {
-		background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+		background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
 	}
 	.control {
 		width: 90%;

+ 3 - 3
pages/cb/xylps/detail/detail.vue

@@ -5,7 +5,7 @@
 			<view v-if="current == 0" class="infoBox">
 				<view :class="['info',equipInfo.is_online==1?'on':'off']">
 					<p @click="copy(equipInfo.imei)">设备ID:{{equipInfo.imei}}
-						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode=""
+						<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode=""
 							class="tishi">
 						</image>
 					</p>
@@ -1146,11 +1146,11 @@
 	}
 
 	.on {
-		background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+		background-image: url('https://s3.hnyfwlw.com/webstaticimgtaticimg/bigdata_app/image/cb/onBg.png')
 	}
 
 	.off {
-		background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+		background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
 	}
 
 	.infoBox {

+ 3 - 3
pages/cb/zjxydetail/photolist.vue

@@ -10,7 +10,7 @@
 			<view class="selecttimes" @click="tiemshow=!tiemshow">
 				<view class="timesbox">
 					<image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(timestate)}}</p>
 					<p class="or">~</p>
@@ -22,7 +22,7 @@
 			<view class="imglist">
 				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
 					<view class="imglist_left">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/jiazai.ui.gif" mode="">
+						<image :src="$imageURL+'/bigdata_app/image/cb/jiazai.ui.gif'" mode="">
 						</image>
 						<image :src="item.addr" mode="" @click="examine(index)"></image>
 					</view>
@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
 				mode=""></image>
 		</view>
 	</view>

+ 13 - 13
pages/cb/zjxydetail/thxydetail.vue

@@ -3,7 +3,7 @@
 		<view :class="['info',equipInfo.is_online==1?'on':'off']">
 			<view class="" @click="copy(equipInfo)">
 				设备ID:{{equipInfo.imei||equipInfo.device_id}}
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi">
+				<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode="" class="tishi">
 				</image>
 			</view>
 			<view class="">
@@ -44,25 +44,25 @@
 		<u-calendar v-model="tiemshow" mode="date" :max-date="date" @change="tiemchange"></u-calendar>
 		<view class="caobox">
 			<view class="caobox_item" v-if="$QueryPermission(336)" @click="tophoto">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/1.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/1.png'" mode="widthFix"></image>
 				<view class="">
 					查看图片
 				</view>
 			</view>
 			<!-- <view class="caobox_item" v-if="$QueryPermission(248)" @click="toset">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/4.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/4.png'" mode="widthFix"></image>
 				<view class="">
 					设备控制
 				</view>
 			</view>
 			<view class="caobox_item" v-if="$QueryPermission(247)" @click="tosim">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/6.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/6.png'" mode="widthFix"></image>
 				<view class="">
 					SIM卡
 				</view>
 			</view> -->
 			<view class="caobox_item" v-if="$QueryPermission(335)" @click="tohis">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/2.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/cb/2.png'" mode="widthFix"></image>
 				<view class="">
 					历史数据
 				</view>
@@ -74,42 +74,42 @@
 			</view>
 			<view class="realtime_text">
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/wendu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/wendu.png'" mode=""></image>
 					<view class="text">
 						<p>环境温度</p>
 						<p>{{at}}℃</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/shidu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/shidu.png'" mode=""></image>
 					<view class="text">
 						<p>环境湿度</p>
 						<p>{{ah}}%</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/tianqi.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/tianqi.png'" mode=""></image>
 					<view class="text">
 						<p>天气</p>
 						<p>{{wea}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/xiayu.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/xiayu.png'" mode=""></image>
 					<view class="text">
 						<p>是否下雨</p>
 						<p>{{rain}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/fengxiang.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/fengxiang.png'" mode=""></image>
 					<view class="text">
 						<p>风力风向</p>
 						<p>{{wind}}</p>
 					</view>
 				</view>
 				<view class="realtime_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/yujing.png" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/xy2.0/yujing.png'" mode=""></image>
 					<view class="text">
 						<p>诱虫次数</p>
 						<p>{{wormnum}}</p>
@@ -381,11 +381,11 @@
 		}
 
 		.on {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/onBg.png')
 		}
 
 		.off {
-			background-image: url('https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+			background-image: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/cb/offBg.png')
 		}
 
 		.caobox {

+ 1 - 1
pages/cbqxyj/cbwarn.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="cbwtop">
 			<image :src="
-			  'https://www.hnyfwlw.com:8006/bigdata_app/image/cbyj/banner.png'
+			  $imageURL+'/bigdata_app/image/cbyj/banner.png'
 			" mode="" class="image">
 			</image>
 			<view class="tab-box">

+ 3 - 3
pages/disandpests/index.vue

@@ -136,17 +136,17 @@
 				this.imgdata = ''
 			},
 			error() {
-				this.path2 = "https://www.hnyfwlw.com:8006/bigdata_app/image/e1cd85dc59139760f43ddbac15136f2.png"
+				this.path2 = this.$imageURL+"/bigdata_app/image/e1cd85dc59139760f43ddbac15136f2.png"
 			},
 			optionverify(data) {
 				console.log(data)
 				if (data == null) {
 					this.name = "识别失败,请换张图片"
 					this.tishi = false
-					this.path2 = "https://www.hnyfwlw.com:8006/bigdata_app/image/10ca93e17420371a82826073c8425c0.png"
+					this.path2 = this.$imageURL+"/bigdata_app/image/10ca93e17420371a82826073c8425c0.png"
 				} else {
 					if(data.img_urls==""){
-						this.path2 = "https://www.hnyfwlw.com:8006/bigdata_app/image/e1cd85dc59139760f43ddbac15136f2.png"
+						this.path2 = this.$imageURL+"/bigdata_app/image/e1cd85dc59139760f43ddbac15136f2.png"
 					}else{
 						console.log(data.img_urls)
 						this.path2 = data.img_urls

+ 3 - 3
pages/discernRecord/discernRecord.vue

@@ -10,7 +10,7 @@
 			<!-- 虫害 -->
 			<view class="plant_ul" v-show="Inv == 0">
 				<view class="plant_li" v-for="(item, index) in insectArr" :key="index">
-					<u-image width="320rpx" height="200rpx"  class="plant_li_img" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + item.img"></u-image>
+					<u-image width="320rpx" height="200rpx"  class="plant_li_img" :src="$imageURL_58003+'/bigservers/' + item.img"></u-image>
 
 					<view class="plant_liBox">
 						<view class="plant_liBox_top">{{ item.name == '' ? '识别失败' : item.name }}</view>
@@ -26,7 +26,7 @@
 			<!-- 病害 -->
 			<view class="plant_ul" v-show="Inv == 1">
 				<view class="plant_li" v-for="(item, index) in plantArr" :key="index">
-					<u-image width="320rpx" height="200rpx"  class="plant_li_img" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + item.img"></u-image>
+					<u-image width="320rpx" height="200rpx"  class="plant_li_img" :src="$imageURL_58003+'/bigservers/' + item.img"></u-image>
 
 					<view class="plant_liBox">
 						<view class="plant_liBox_top">{{ item.name == '' ? '识别失败' : item.name }}</view>
@@ -44,7 +44,7 @@
 
 		<!-- 暂无 -->
 		<view class="notDataBox" v-else>
-			<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
+			<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
 		</view>
 
 		<!-- 返回顶部 -->

+ 4 - 4
pages/disease/cmb.vue

@@ -7,10 +7,10 @@
 			</view>
 			<view class="info">
 				<view class="info_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png" mode="" class="bgi"></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/onBg.png'" mode="" class="bgi"></image>
 					<p style="font-size: 32rpx" @click="copy(eqinfo.device_id)">
 						设备 ID:{{ eqinfo.device_id }}
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode=""
+						<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode=""
 							class="tishi"></image>
 					</p>
 					<p>设备名称:{{ eqinfo.device_name || "无" }}</p>
@@ -24,7 +24,7 @@
 			<view class="control">
 				<view class="control_item" v-if="kongtf" @click="control">
 					<image :src="
-              'https://www.hnyfwlw.com:8006/bigdata_app' +
+              $imageURL+'/bigdata_app' +
               '/image/environment/forecastResult.png'
             " mode=""></image>
 					<p>预测结果</p>
@@ -34,7 +34,7 @@
 				<view class="selecttimes" @click="tiemshow = !tiemshow">
 					<view class="timesbox">
 						<image
-							:src="'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+							:src="$imageURL+'/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 							mode=""></image>
 						<p>{{ timetab(begintime) }}</p>
 						<p class="or">~</p>

+ 3 - 3
pages/disease/forecastResult.vue

@@ -13,14 +13,14 @@
       <view class="info">
         <view class="info_item">
           <image
-            src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png"
+            :src="$imageURL+'/bigdata_app/image/cb/onBg.png'"
             mode=""
             class="bgi"
           ></image>
           <p style="font-size: 32rpx" @click="copy(device_id)">
             设备 ID:{{ device_id }}
             <image
-              src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png"
+              :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'"
               mode=""
               class="tishi"
             ></image>
@@ -37,7 +37,7 @@
       </view>
       <!-- <view class="control">
 				<view class="control_item" v-if="kongtf" @click="control">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/8.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/8.png'" mode=""></image>
 					<p>预测结果</p>
 				</view>
 			</view> -->

+ 1 - 1
pages/disease/mls/forecastResult.vue

@@ -5,7 +5,7 @@
 				<view class="selecttimes" @click="tiemshow = !tiemshow">
 					<view class="timesbox">
 						<image
-							:src="'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+							:src="$imageURL+'/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 							mode=""></image>
 						<p>{{ initTime ? '出苗期' : begintime }}</p>
 						<p class="or">~</p>

+ 4 - 5
pages/disease/mls/mls.vue

@@ -3,10 +3,10 @@
 		<view class="" style="position: relative;">
 			<view class="info">
 				<view class="info_item">
-					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png" mode="" class="bgi"></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/onBg.png'" mode="" class="bgi"></image>
 					<p style="font-size: 32rpx" @click="copy(eqinfo.device_id)">
 						设备 ID:{{ eqinfo.device_id }}
-						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode=""
+						<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode=""
 							class="tishi"></image>
 					</p>
 					<p>设备名称:{{ eqinfo.device_name || "无" }}</p>
@@ -19,8 +19,7 @@
 			</view>
 			<view class="control">
 				<view class="control_item" v-if="kongtf" @click="control">
-					<image :src="
-              'http://www.hnyfwlw.com:8006/bigdata_app' +
+					<image :src="$imageURL+'/bigdata_app' +
               '/image/environment/forecastResult.png'
             " mode=""></image>
 					<p>防控决策</p>
@@ -30,7 +29,7 @@
 				<view class="selecttimes" @click="tiemshow = !tiemshow">
 					<view class="timesbox">
 						<image
-							:src="'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+							:src="$imageURL+'/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 							mode=""></image>
 						<p>{{ timetab(begintime) }}</p>
 						<p class="or">~</p>

+ 7 - 7
pages/environment/equipment.vue

@@ -8,11 +8,11 @@
 			<view class="info">
 				<view class="info_item">
 					<image
-						:src="eqinfo.item.is_online==1?'https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png':'https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png'"
+						:src="eqinfo.item.is_online==1?$imageURL+'/bigdata_app/image/cb/onBg.png':$imageURL+'/bigdata_app/image/cb/offBg.png'"
 						mode="" class="bgi"></image>
 					<p style="font-size: 32rpx;" @click="copy(eqinfo.item)">设备
 						ID:{{eqinfo.item.equip_id||eqinfo.item.device_id}}
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode=""
+						<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode=""
 							class="tishi"></image>
 					</p>
 					<p>设备名称:{{eqinfo.item.equip_name?eqinfo.item.equip_name:"无"}}</p>
@@ -23,19 +23,19 @@
 			</view>
 			<view class="control">
 				<view class="control_item" v-if="$QueryPermission(144)" @click="control">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/8.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/8.png'" mode=""></image>
 					<p>设备控制</p>
 				</view>
 				<view class="control_item" @click="repairs">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/7.png'" mode=""></image>
 					<p>一键报修</p>
 				</view>
 				<view class="control_item" v-if="$QueryPermission(147)" @click="charts">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/10.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/10.png'" mode=""></image>
 					<p>历史数据</p>
 				</view>
 				<view class="control_item" v-if="$QueryPermission(146)" @click="siminfo(eqinfo.item.d_id)">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/6.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/cb/6.png'" mode=""></image>
 					<p>SIM卡信息</p>
 				</view>
 			</view>
@@ -47,7 +47,7 @@
 							@click="oneday(index,item)">
 							<view class="item_info_img" :style="{'background-color':olddatas[1]}">
 								<image
-									:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/icon_'+item.value[1]+'.png'"
+									:src="$imageURL+'/bigdata_app'+'/image/environment/icon_'+item.value[1]+'.png'"
 									mode=""></image>
 							</view>
 							<view class="item_info_text">

+ 5 - 5
pages/environment/gsequipment.vue

@@ -7,9 +7,9 @@
 			</view>
 			<view class="info">
 				<view class="info_item">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png" mode="" class="bgi"></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/onBg.png'" mode="" class="bgi"></image>
 					<p style="font-size: 32rpx;" @click="copy(eqinfo.device_id)">设备 ID:{{eqinfo.device_id}}
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode=""
+						<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode=""
 							class="tishi"></image>
 					</p>
 					<p>设备名称:{{eqinfo.device_name||"无"}}</p>
@@ -40,7 +40,7 @@
 						<view class="newdatas_land_box">
 							<view class="imgbox">
 								<image
-									:src="'http://www.hnyfwlw.com:8006//bigdata_app/image/environment/tubular/trs'+(index+1)+'.png'"
+									:src="$imageURL+'//bigdata_app/image/environment/tubular/trs'+(index+1)+'.png'"
 									mode="" class="img"></image>
 							</view>
 							<view class="infobox">
@@ -51,7 +51,7 @@
 						<view class="newdatas_land_box">
 							<view class="imgbox">
 								<image
-									:src="'http://www.hnyfwlw.com:8006//bigdata_app/image/environment/tubular/trw'+(index+1)+'.png'"
+									:src="$imageURL+'//bigdata_app/image/environment/tubular/trw'+(index+1)+'.png'"
 									mode="" class="img"></image>
 							</view>
 							<view class="infobox">
@@ -62,7 +62,7 @@
 						<view class="newdatas_land_box" v-if="newdataobj.ecs[index]">
 							<view class="imgbox">
 								<image
-									:src="'http://www.hnyfwlw.com:8006//bigdata_app/image/environment/tubular/ddl'+(index+1)+'.png'"
+									:src="$imageURL+'//bigdata_app/image/environment/tubular/ddl'+(index+1)+'.png'"
 									mode="" class="img"></image>
 							</view>
 							<view class="infobox">

+ 1 - 1
pages/environment/gshistory.vue

@@ -10,7 +10,7 @@
 			<view class="selecttimes" @click="tiemshow=!tiemshow">
 				<view class="timesbox">
 					<image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(begintime)}}</p>
 					<p class="or">~</p>

+ 1 - 1
pages/environment/history.vue

@@ -31,7 +31,7 @@
 				<view class="selecttimes" @click="tiemshow=!tiemshow">
 					<view class="timesbox">
 						<image
-							:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+							:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 							mode=""></image>
 						<p>{{timetab(begintime)}}</p>
 						<p class="or">~</p>

+ 5 - 5
pages/environment/index.vue

@@ -22,7 +22,7 @@
 				</uni-nav-bar>
 			</view>
 			<image :src="
-          'https://www.hnyfwlw.com:8006/bigdata_app' + '/image/environment/1.png'
+          $imageURL+'/bigdata_app' + '/image/environment/1.png'
         " mode="" class="image">
 			</image>
 			<view class="loading" v-if="loadingtf">
@@ -40,8 +40,8 @@
 					<view class="" v-if="side_type == 5">
 						<image :src="
                 item.is_online == 1
-                  ? 'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png'
-                  : 'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'
+                  ? $imageURL+ '/bigdata_app/image/prevention/6.png'
+                  : $imageURL+ '/bigdata_app/image/prevention/7.png'
               " mode="" class="prevents_item_img"></image>
 						<view class="prevents_item_top">
 							<p>
@@ -67,7 +67,7 @@
 						</view>
 					</view>
 					<view class="" v-if="side_type == 15">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode=""
+						<image :src="$imageURL+ '/bigdata_app/image/prevention/6.png'" mode=""
 							class="prevents_item_img"></image>
 						<view class="prevents_item_top">
 							<p>
@@ -82,7 +82,7 @@
 						</view>
 					</view>
 					<view class="" v-if="side_type == 11 || side_type == 19 || side_type == 20">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode=""
+						<image :src="$imageURL+ '/bigdata_app/image/prevention/6.png'" mode=""
 							class="prevents_item_img"></image>
 						<view class="prevents_item_top">
 							<p>

+ 3 - 3
pages/environment/search.vue

@@ -13,7 +13,7 @@
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
 					<view class="" v-if="side_type == 5">
 						<image
-							:src="item.is_online==1?'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
+							:src="item.is_online==1?$imageURL+ '/bigdata_app/image/prevention/6.png':$imageURL+ '/bigdata_app/image/prevention/7.png'"
 							mode="" class="prevents_item_img"></image>
 						<view class="prevents_item_top">
 							<p>设备名称:{{item.equip_name==""?"无":item.equip_name}}</p>
@@ -25,7 +25,7 @@
 						</view>
 					</view>
 					<view class="" v-if="side_type == 15">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode=""
+						<image :src="$imageURL+ '/bigdata_app/image/prevention/6.png'" mode=""
 							class="prevents_item_img"></image>
 						<view class="prevents_item_top">
 							<p>设备名称:{{item.device_name==""?"无":item.device_name}}</p>
@@ -36,7 +36,7 @@
 						</view>
 					</view>
 					<view class="" v-if="side_type == 11 || side_type == 19 || side_type == 20">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode=""
+						<image :src="$imageURL+ '/bigdata_app/image/prevention/6.png'" mode=""
 							class="prevents_item_img"></image>
 						<view class="prevents_item_top">
 							<p>

+ 1 - 1
pages/environment/sim.vue

@@ -10,7 +10,7 @@
 					<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
 				</view>
 				<view class="sim_info_title">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/sim1.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/cb/sim1.png'" mode=""></image>
 					<p>sim卡查询{{"("+simnew+")"}}</p>
 				</view>
 				<view class="sim_info_text">

+ 2 - 2
pages/equipList/index.vue

@@ -55,7 +55,7 @@
               <p class="p1">
                 <image
                   :src="
-                    'http://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/' +
+                    $imageURL+'/bigdata_app/image/fourMoodBase/' +
                     type_id +
                     '.png'
                   "
@@ -124,7 +124,7 @@
     <view class="top" v-if="isTop" @click="top">
       <image
         :src="
-          'http://www.hnyfwlw.com:8006/bigdata_app' +
+          $imageURL+'/bigdata_app' +
           '/image/6209a98f0cb3b5086f2ca36152c9269.png'
         "
         mode=""

+ 1 - 1
pages/equipList/seabox/search.vue

@@ -12,7 +12,7 @@
 			<view class="list_item" v-for="(item,index) in eqlistdata" :key="index" @click="historys(item)">
 				<view class="list_item_top">
 					<p class="p1">
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+ imgpath[0].path" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app'+ imgpath[0].path" mode=""></image>
 						{{item.device_name==''?"--":item.device_name}}
 					</p>
 					<p :class="[item.is_online?'p2':'p_out']">{{item.is_online?"在线":"离线"}}</p>

+ 2 - 2
pages/equipMange/index/assignment.vue

@@ -21,7 +21,7 @@
 				<checkbox-group class="che_group" @change="checkboxchange">
 					<label class="equipment" v-for="(items,index) in assignment" :key="index">
 						<view class="equipment_top">
-							<image :src="'https://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/'+items.device_type_id+'.png'" mode="" class="equipment_top_img"></image>
+							<image :src="$imageURL+'/bigdata_app/image/fourMoodBase/'+items.device_type_id+'.png'" mode="" class="equipment_top_img"></image>
 							<span class="equipment_top_name">{{items.device_type_id_name}}</span>
 							<checkbox :value="String(items.d_id)" :checked="items.device_user==user_info.uid" class="ucheckbox" color="#42b983" />
 						</view>
@@ -39,7 +39,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

+ 2 - 2
pages/equipMange/index/index.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="userlists">
 				<view class="userlist-li" v-for="(item,index) in userlists" :kex="index">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/touxiang.png'" mode="">
+					<image :src="$imageURL+'/bigdata_app'+'/image/fourMoodBase/touxiang.png'" mode="">
 					</image>
 					<p class="userlist-li-city">{{item.username}}</p>
 					<p class="userlist-li-eamil">{{item.mobile}}</p>
@@ -29,7 +29,7 @@
 			新 增 用 户
 		</view> -->
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
 				mode=""></image>
 		</view>
 	</view>

+ 4 - 4
pages/expertDiagnosis/exchangeShare.vue

@@ -11,17 +11,17 @@
 				<view class="invitations_item" v-for="(items,index) in invitation" :key="index" @click="particulars(items)">
 					<view class="invitations_item_left">
 						<image :src="items.img_urls" mode="" v-if="items.img_urls!='' && items.img_urls!=null"></image>
-						<image :src="'http://www.hnyfwlw.com:8006/projectimg'+defaultimg" mode="" v-else></image>
+						<image :src="$imageURL+'/projectimg'+defaultimg" mode="" v-else></image>
 					</view>
 					<view class="invitations_item_right">
 						<view class="invitations_item_right_top">
-							<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'" mode="" v-if="Number(items.heat) == 1"></image>
+							<image :src="$imageURL+'/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'" mode="" v-if="Number(items.heat) == 1"></image>
 							<span>{{items.title}}</span>
 						</view>
 						<view class="invitations_item_right_contert" v-html="items.content">
 						</view>
 						<view class="invitations_item_right_bot">
-							<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/d2014837228702eeceb762bc5302b3f.png'" mode=""></image>
+							<image :src="$imageURL+'/bigdata_app'+'/image/expertDiagnosis/d2014837228702eeceb762bc5302b3f.png'" mode=""></image>
 							<span>{{items.username}}</span>
 							<p>查看详情</p>
 						</view>
@@ -36,7 +36,7 @@
 			发 帖
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

+ 4 - 4
pages/expertDiagnosis/index.vue

@@ -5,18 +5,18 @@
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="专家诊断"></uni-nav-bar>
 			</view>
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/05571341dbb0771b23d0b271764ac2e.png'" class="expertimages"></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/expertDiagnosis/05571341dbb0771b23d0b271764ac2e.png'" class="expertimages"></image>
 			<view class="expert_details">
 				<!-- <view class="details_item" @click="worm">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6612b1293fd1f45dd7ce6269a954999.png'"></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/expertDiagnosis/6612b1293fd1f45dd7ce6269a954999.png'"></image>
 					<p>虫情百科</p>
 				</view>
 				<view class="details_item" @click="virus">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/7f34f4eeba4d00819369cfa1b5ecce8.png'"></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/expertDiagnosis/7f34f4eeba4d00819369cfa1b5ecce8.png'"></image>
 					<p>病害百科</p>
 				</view> -->
 				<view class="details_item" @click="exchange">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/aa6a168b9fb72b62b687a2debc04a9f.png'"></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/expertDiagnosis/aa6a168b9fb72b62b687a2debc04a9f.png'"></image>
 					<p>交流圈</p>
 				</view>
 			</view>

+ 1 - 1
pages/expertDiagnosis/introduce.vue

@@ -6,7 +6,7 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
 			</view>
 			<view class="img_box">
-				<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/loading-2.gif'" mode="" class="imgbg"></image>
+				<image :src="$imageURL+'/bigdata_app'+'/image/loading-2.gif'" mode="" class="imgbg"></image>
 				<image :src="wormcasedata.img_urls" mode="" class="img" @click="examine(wormcasedata.img_urls)"></image>
 			</view>
 			<p class="name">{{wormcasedata.name}}</p>

+ 3 - 7
pages/expertDiagnosis/particulars.vue

@@ -12,13 +12,13 @@
 			<view class="quiz">
 				<view class="quiz_username">
 					<image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'"
 						mode="" v-if="Number(quizdata.heat)==1"></image>
 					<span>{{quizdata.title}}</span>
 				</view>
 				<view class="quiz_usertime">
 					<view style="display: flex;align-items: center;">
-						<image :src="quizdata.image?quizdata.image:'https://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/touxiang.png'"
+						<image :src="quizdata.image?quizdata.image:$imageURL+'/bigdata_app/image/fourMoodBase/touxiang.png'"
 							mode=""></image>
 						<span>{{quizdata.username}}</span>
 					</view>
@@ -158,11 +158,7 @@
 					}
 					this.list.push(obj)
 				}
-				// if (this.quizdata.image == '' || this.quizdata.image == null) {
-				// 	this.list = 'http://www.hnyfwlw.com:8006/projectimg' + this.defaultimg
-				// } else {
-				// 	this.list = this.quizdata.image
-				// }
+	
 				this.quizdata.content=this.quizdata.content.replace(/src/g,"none")
 				this.quizdata.content=this.quizdata.content.replace(/width/g,"none")
 				this.quizdata.content=this.quizdata.content.replace(/height/g,"none")

+ 1 - 1
pages/expertDiagnosis/postmessage.vue

@@ -12,7 +12,7 @@
 					<p class="imgvideo_img_title">添加图片</p>
 					<view class="imgvideo_img">
 						<view @click="gainimg" class="imgbg">
-							<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png'" mode="" v-if="!uploadingTF"></image>
+							<image :src="$imageURL+'/bigdata_app'+'/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png'" mode="" v-if="!uploadingTF"></image>
 						</view>
 						<view class="uploading" v-if="uploadingTF">
 							<u-icon name="close" class="delete" @click="deletes"></u-icon>

+ 2 - 2
pages/expertDiagnosis/wormcase.vue

@@ -14,7 +14,7 @@
 			<view class="particulars">
 				<view class="particulars_item" v-for="(item,index) in content" :key="index" @click="introduce(item.id)">
 					<view class="imgs">
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="" class="imgbg"></image>
+						<image :src="$imageURL+'/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="" class="imgbg"></image>
 						<image :src="item.img_urls" mode="" class="imgs_img"></image>
 					</view>
 					<p class="info">{{item.name}}</p>
@@ -22,7 +22,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

+ 2 - 2
pages/fourBase/allocation.vue

@@ -26,7 +26,7 @@
 						<view class="" v-if="items.type_name.search(inputdata)+1" class="equipment">
 							<view class="equipment_top">
 								<image
-									:src="'https://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/'+assignments.id+'.png'"
+									:src="$imageURL+'/bigdata_app/image/fourMoodBase/'+assignments.id+'.png'"
 									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"
@@ -47,7 +47,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
 				mode=""></image>
 		</view>
 	</view>

+ 2 - 2
pages/fourBase/basefacility.vue

@@ -8,7 +8,7 @@
 			<view class="ass_list">
 				<view class="equipment" v-for="(items,indexs) in assignments" :key="items.id" v-if="tishiTF" @click="skip(JSON.stringify(items))">
 					<view class="equipment_top">
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+items.src" mode="" class="equipment_top_img"></image>
+						<image :src="$imageURL+'/bigdata_app'+items.src" mode="" class="equipment_top_img"></image>
 						<span class="equipment_top_name">{{items.type_name}}</span>
 					</view>
 					<view class="equipment_bot">
@@ -23,7 +23,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

+ 4 - 4
pages/fourBase/index.vue

@@ -34,9 +34,9 @@
 						<u-icon name="more-dot-fill" class="" @click.native.stop="XQclick(items)"></u-icon>
 					</view>
 					<view class="photoshow">
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/1.png'" mode=""></image>
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/3.png'" mode=""></image>
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/5.png'" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app'+'/image/fourMoodBase/1.png'" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app'+'/image/fourMoodBase/3.png'" mode=""></image>
+						<image :src="$imageURL+'/bigdata_app'+'/image/fourMoodBase/5.png'" mode=""></image>
 						<view class="photoshow_num">
 							{{items.num}}
 						</view>
@@ -49,7 +49,7 @@
 			新 增 基 地
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

+ 3 - 3
pages/identifyPest/cerealPlant/cerealPlant.vue

@@ -15,7 +15,7 @@
 
 				<view class="plantList_li_ul">
 					<view class="plantList_li_List" @click="recognizeData(allPlantData[lastTimeIndex].num, allPlantData[lastTimeIndex].name, lastTimeIndex)">
-						<image :lazy-load="true" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
+						<image :lazy-load="true" :src="$imageURL_58003+'/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
 						<view class="">
 							{{ allPlantData[lastTimeIndex].name }}
 						</view>
@@ -31,7 +31,7 @@
 
 				<view class="plantList_li_ul">
 					<view @click="recognizeData(item.num, item.name, index)" class="plantList_li_List" v-for="(item, index) in allPlantData" :key="index">
-						<image :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + item.img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + item.img" mode=""></image>
 						<view class="">
 							{{ item.name }}
 						</view>
@@ -48,7 +48,7 @@
 
 				<view class="plantList_li_ul">
 					<view class="plantList_li_List" @click="restsData()">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_9.png'" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_9.png'" mode=""></image>
 						<view class="">
 							其他
 						</view>

+ 5 - 5
pages/identifyPest/collect/collect.vue

@@ -21,11 +21,11 @@
 
 						<view class="plant_btmHandle">
 							<view class="plant_btmHandle_cancel" @click="noCollect(index, item.id)">
-								<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/starA.png'" mode="" class="plant_btmHandle_cancelImg"></image>
+								<image :src="$imageURL_58003+'/bigservers/' + 'images/starA.png'" mode="" class="plant_btmHandle_cancelImg"></image>
 								<text class="plant_btmHandle_cancelTxt">取消收藏</text>
 							</view>
 							<view class="plant_btmHandle_record" @click="defail(item.id)">
-								<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_8.png'" class="plant_btmHandle_recordImg" mode=""></image>
+								<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_8.png'" class="plant_btmHandle_recordImg" mode=""></image>
 								<text class="plant_btmHandle_recordTxt">查看详情</text>
 							</view>
 						</view>
@@ -48,11 +48,11 @@
 
 						<view class="plant_btmHandle">
 							<view class="plant_btmHandle_cancel"  @click="noCollect(index, item.id)">
-								<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/starA.png'" mode="" class="plant_btmHandle_cancelImg"></image>
+								<image :src="$imageURL_58003+'/bigservers/' + 'images/starA.png'" mode="" class="plant_btmHandle_cancelImg"></image>
 								<text class="plant_btmHandle_cancelTxt">取消收藏</text>
 							</view>
 							<view class="plant_btmHandle_record" @click="defail(item.id)">
-								<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_8.png'" class="plant_btmHandle_recordImg" mode=""></image>
+								<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_8.png'" class="plant_btmHandle_recordImg" mode=""></image>
 								<text class="plant_btmHandle_recordTxt">查看详情</text>
 							</view>
 						</view>
@@ -64,7 +64,7 @@
 
 		<!-- 暂无 -->
 		<view class="notDataBox" v-else>
-			<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
+			<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
 		</view>
 
 

+ 3 - 4
pages/identifyPest/economicsPlant/economicsPlant.vue

@@ -21,8 +21,7 @@
             "
           >
             <image
-              :src="
-                'http://web.hnyfwlw.com:58003/bigservers/' +
+              :src= "$imageURL_58003+'/bigservers/' +
                 allPlantData[lastTimeIndex].img
               "
               mode=""
@@ -46,7 +45,7 @@
             :key="index"
           >
             <image
-              :src="'http://web.hnyfwlw.com:58003/bigservers/' + item.img"
+              :src="$imageURL_58003+'/bigservers/' + item.img"
               mode=""
             ></image>
             <view class="">
@@ -65,7 +64,7 @@
 
 				<view class="plantList_li_ul">
 					<view class="plantList_li_List" @click="restsData()">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_9.png'" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_9.png'" mode=""></image>
 						<view class="">
 							其他
 						</view>

+ 3 - 3
pages/identifyPest/fruitsPlant/fruitsPlant.vue

@@ -14,7 +14,7 @@
 
 				<view class="plantList_li_ul">
 					<view class="plantList_li_List" @click="recognizeData(allPlantData[lastTimeIndex].num, allPlantData[lastTimeIndex].name, lastTimeIndex)">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
 						<view class="">
 							{{ allPlantData[lastTimeIndex].name }}
 						</view>
@@ -31,7 +31,7 @@
 				<view class="plantList_li_ul">
 					<view @click="recognizeData(item.num, item.name, index)" class="plantList_li_List" v-for="(item, index) in allPlantData"
 					 :key="index">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + item.img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + item.img" mode=""></image>
 						<view class="">
 							{{ item.name }}
 						</view>
@@ -48,7 +48,7 @@
 
 				<view class="plantList_li_ul">
 					<view class="plantList_li_List" @click="restsData()">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_9.png'" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_9.png'" mode=""></image>
 						<view class="">
 							其他
 						</view>

+ 17 - 17
pages/identifyPest/guidance/guidance.vue

@@ -5,7 +5,7 @@
 			<view class="fingerpost_li">
 				<!-- 标题 -->
 				<view class="fingerpost_tltBox">
-					<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_1.png'" mode=""></image>
+					<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_1.png'" mode=""></image>
 					<view class="fingerpost_tltBox_div">
 						<view class="fingerpost_tltBox_divtlt">
 							作物分类
@@ -24,9 +24,9 @@
 				<!-- 例图 -->
 				<view class="fingerpost_illustration">
 					<view class="illustration_true">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_4.png'" class="illustration_true_img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_4.png'" class="illustration_true_img" mode=""></image>
 						<view class="illustration_true_div">
-							<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_4.png'" class="illustration_true_divIcon" mode=""></image>
+							<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_4.png'" class="illustration_true_divIcon" mode=""></image>
 							<view class="illustration_true_divTxt">
 								正确
 							</view>
@@ -34,9 +34,9 @@
 					</view>
 					
 					<view class="illustration_true">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_5.png'" class="illustration_true_img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_5.png'" class="illustration_true_img" mode=""></image>
 						<view class="illustration_true_div">
-							<image style="width: 40rpx; height: 40rpx; margin: 10rpx 0 0 0;" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_3.png'" class="illustration_true_divIcon" mode=""></image>
+							<image style="width: 40rpx; height: 40rpx; margin: 10rpx 0 0 0;" :src="$imageURL_58003+'/bigservers/' + 'images/detail_3.png'" class="illustration_true_divIcon" mode=""></image>
 							<view class="illustration_true_divTxt">
 								错误
 							</view>
@@ -48,7 +48,7 @@
 			<view class="fingerpost_li">
 				<!-- 标题 -->
 				<view class="fingerpost_tltBox">
-					<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_2.png'" mode=""></image>
+					<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_2.png'" mode=""></image>
 					<view class="fingerpost_tltBox_div">
 						<view class="fingerpost_tltBox_divtlt">
 							拍摄清晰
@@ -67,9 +67,9 @@
 				<!-- 例图 -->
 				<view class="fingerpost_illustration">
 					<view class="illustration_true">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_4.png'" class="illustration_true_img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_4.png'" class="illustration_true_img" mode=""></image>
 						<view class="illustration_true_div">
-							<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_4.png'" class="illustration_true_divIcon" mode=""></image>
+							<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_4.png'" class="illustration_true_divIcon" mode=""></image>
 							<view class="illustration_true_divTxt">
 								正确
 							</view>
@@ -77,9 +77,9 @@
 					</view>
 					
 					<view class="illustration_true">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_6.png'" class="illustration_true_img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_6.png'" class="illustration_true_img" mode=""></image>
 						<view class="illustration_true_div">
-							<image style="width: 40rpx; height: 40rpx; margin: 10rpx 0 0 0;" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_3.png'" class="illustration_true_divIcon" mode=""></image>
+							<image style="width: 40rpx; height: 40rpx; margin: 10rpx 0 0 0;" :src="$imageURL_58003+'/bigservers/' + 'images/detail_3.png'" class="illustration_true_divIcon" mode=""></image>
 							<view class="illustration_true_divTxt">
 								错误
 							</view>
@@ -91,7 +91,7 @@
 			<view class="fingerpost_li">
 				<!-- 标题 -->
 				<view class="fingerpost_tltBox">
-					<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_3.png'" mode=""></image>
+					<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_3.png'" mode=""></image>
 					<view class="fingerpost_tltBox_div">
 						<view class="fingerpost_tltBox_divtlt">
 							适当距离
@@ -110,9 +110,9 @@
 				<!-- 例图 -->
 				<view class="fingerpost_illustration">
 					<view class="illustration_true">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_4.png'" class="illustration_true_img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_4.png'" class="illustration_true_img" mode=""></image>
 						<view class="illustration_true_div">
-							<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_4.png'" class="illustration_true_divIcon" mode=""></image>
+							<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_4.png'" class="illustration_true_divIcon" mode=""></image>
 							<view class="illustration_true_divTxt">
 								正确
 							</view>
@@ -120,9 +120,9 @@
 					</view>
 					
 					<view class="illustration_true">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_7.png'" class="illustration_true_img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_7.png'" class="illustration_true_img" mode=""></image>
 						<view class="illustration_true_div">
-							<image style="width: 40rpx; height: 40rpx; margin: 10rpx 0 0 0;" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_3.png'" class="illustration_true_divIcon" mode=""></image>
+							<image style="width: 40rpx; height: 40rpx; margin: 10rpx 0 0 0;" :src="$imageURL_58003+'/bigservers/' + 'images/detail_3.png'" class="illustration_true_divIcon" mode=""></image>
 							<view class="illustration_true_divTxt">
 								错误
 							</view>
@@ -137,8 +137,8 @@
 			<view class="referenceBtn">
 				参考图片
 			</view>
-			<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_8.png'" class="referenceIcon" mode=""></image>
-			<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_9.png'" class="referenceIcon" mode=""></image>
+			<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_8.png'" class="referenceIcon" mode=""></image>
+			<image :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_9.png'" class="referenceIcon" mode=""></image>
 		</view>
 	</view>
 </template>

+ 5 - 5
pages/identifyPest/identifyPest.vue

@@ -17,7 +17,7 @@
           :key="index"
         >
           <image
-            :src="'http://web.hnyfwlw.com:58003/bigservers/' + item.url"
+            :src="$imageURL_58003+'/bigservers/' + item.url"
             mode=""
             class="photograph_list_img"
           ></image>
@@ -26,7 +26,7 @@
     </view>
 
     <!-- 拍照指南 -->
-    <image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/home_5.png'" @click="photoGuide('/pages/identifyPest/guidance/guidance')"
+    <image :src="$imageURL_58003+'/bigservers/' + 'images/home_5.png'" @click="photoGuide('/pages/identifyPest/guidance/guidance')"
 		 class="photo_img" mode=""></image>
 
     <!-- 更多操作 -->
@@ -36,12 +36,12 @@
 				<text class="operation_txt">更多操作</text>
 			</view>
 			<view class="operation_ul">
-				<image @click="photoGuide('/pages/repository/repository')" :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/home_6.png'"
+				<image @click="photoGuide('/pages/repository/repository')" :src="$imageURL_58003+'/bigservers/' + 'images/home_6.png'"
 				 class="operation_left" mode=""></image>
 				<view class="operation_list">
-					<image @click="photoGuide('/pages/discernRecord/discernRecord')" :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/home_7.png'"
+					<image @click="photoGuide('/pages/discernRecord/discernRecord')" :src="$imageURL_58003+'/bigservers/' + 'images/home_7.png'"
 					 class="operation_rightTop" mode=""></image>
-					<image @click="photoGuide('/pages/collect/collect')" :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/home_8.png'"
+					<image @click="photoGuide('/pages/collect/collect')" :src="$imageURL_58003+'/bigservers/' + 'images/home_8.png'"
 					 class="operation_rightBottom" mode=""></image>
 				</view>
 			</view>

+ 3 - 4
pages/identifyPest/identifyPestIndex/identifyPestIndex.vue

@@ -13,8 +13,7 @@
 		            lastTimeIndex
 		          )
 		        ">
-						<image :src="
-		            'http://web.hnyfwlw.com:58003/bigservers/' +
+						<image :src="$imageURL_58003+'/bigservers/' +
 		            (identifyPestObj[type].data)[lastTimeIndex].img
 		          " mode=""></image>
 						<view class="">
@@ -31,7 +30,7 @@
 				<view class="plantList_li_ul">
 					<view @click="recognizeData(item.num, item.name, index)" class="plantList_li_List"
 						v-for="(item, index) in (identifyPestObj[type].data)" :key="index">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + item.img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + item.img" mode=""></image>
 						<view class="">
 							{{ item.name }}
 						</view>
@@ -48,7 +47,7 @@
 		
 					<view class="plantList_li_ul">
 						<view class="plantList_li_List" @click="restsData()">
-							<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_9.png'" mode=""></image>
+							<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_9.png'" mode=""></image>
 							<view class="">
 								其他
 							</view>

+ 1 - 1
pages/identifyPest/recognizeFail/recognizeFail.vue

@@ -30,7 +30,7 @@
 				<view class="failTxt_listTop">
 					示例照片
 				</view>
-				<image class="failTxt_listImg" :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + 'images/Photoguide_4.png'" mode=""></image>
+				<image class="failTxt_listImg" :src="$imageURL_58003+'/bigservers/' + 'images/Photoguide_4.png'" mode=""></image>
 				<view class="failTxt_listBtnBox">
 					<u-button @click="returnInterface" class="failTxt_listBtn" type="success" shape="circle" size="medium">再拍一张</u-button>
 				</view>

+ 3 - 3
pages/identifyPest/repository/repository.vue

@@ -40,7 +40,7 @@
 			</view>
 			<!-- 暂无 -->
 			<view class="notDataBox" v-else>
-				<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
+				<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
 			</view>
 
 			<!--  -->
@@ -51,7 +51,7 @@
 
 		<!-- 搜索 -->
 		<view class="searchBox" v-else>
-			<!-- <image class="searchBox_img" :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/search.gif'" mode=""></image> -->
+			<!-- <image class="searchBox_img" :src="$imageURL_58003+'/bigservers/' + 'images/search.gif'" mode=""></image> -->
 			<view v-if="isShow">
 				<!-- 虫害 -->
 				<view class="" v-show="Inv == 0">
@@ -80,7 +80,7 @@
 			</view>
 			<!-- 暂无 -->
 			<view class="notDataBox" v-else>
-				<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
+				<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_11.png'" class="notDataBox_img" mode=""></image>
 			</view>
 
 			<!--  -->

+ 3 - 3
pages/identifyPest/vegetablesPlant/vegetablesPlant.vue

@@ -15,7 +15,7 @@
 
 				<view class="plantList_li_ul">
 					<view class="plantList_li_List" @click="recognizeData(allPlantData[lastTimeIndex].num, allPlantData[lastTimeIndex].name, lastTimeIndex)">
-						<image :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + allPlantData[lastTimeIndex].img" mode=""></image>
 						<view class="">
 							{{ allPlantData[lastTimeIndex].name }}
 						</view>
@@ -31,7 +31,7 @@
 
 				<view class="plantList_li_ul">
 					<view @click="recognizeData(item.num, item.name, index)" class="plantList_li_List" v-for="(item, index) in allPlantData" :key="index">
-						<image :src=" 'http://web.hnyfwlw.com:58003/bigservers/' + item.img" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + item.img" mode=""></image>
 						<view class="">
 							{{ item.name }}
 						</view>
@@ -48,7 +48,7 @@
 
 				<view class="plantList_li_ul">
 					<view class="plantList_li_List" @click="restsData()">
-						<image :src="'http://web.hnyfwlw.com:58003/bigservers/' + 'images/detail_9.png'" mode=""></image>
+						<image :src="$imageURL_58003+'/bigservers/' + 'images/detail_9.png'" mode=""></image>
 						<view class="">
 							其他
 						</view>

+ 19 - 169
pages/index/index.vue

@@ -15,18 +15,18 @@
 		</view>
 		<view class="weatherinfo">
 			<view class="weatherinfo_item">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/weizhi.png" mode="" class="weaimg">
+				<image :src="$imageURL+'/bigdata_app/newindex/weizhi.png'" mode="" class="weaimg">
 				</image>
 				<view class="textbox">
 					{{ weatherinfo.district || '-' }}
 				</view>
 			</view>
 			<view class="weatherinfo_item">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/wendu.png" mode="" class="weaimg"></image>
+				<image :src="$imageURL+'/bigdata_app/newindex/wendu.png'" mode="" class="weaimg"></image>
 				<view class="textbox"> {{ weatherinfo.at || '-' }}℃ </view>
 			</view>
 			<view class="weatherinfo_item">
-				<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/shidu.png" mode="" class="weaimg"></image>
+				<image :src="$imageURL+'/bigdata_app/newindex/shidu.png'" mode="" class="weaimg"></image>
 				<view class="textbox"> {{ weatherinfo.ah || '-' }} </view>
 			</view>
 			<view class="weatherinfo_item">
@@ -40,22 +40,22 @@
 			<view class="functionbox_title"> 功能应用 </view>
 			<view class="functionbox_text">
 				<view class="functionbox_text_item" v-if="jurisdiction.sqtf" @click="tabfunction(0)">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/base.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/base.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 四情基地 </view>
 				</view>
 				<view class="functionbox_text_item" @click="tabfunction(1)">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/worm.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/worm.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 田间随识 </view>
 				</view>
 				<view class="functionbox_text_item" v-if="jurisdiction.zjtf" @click="tabfunction(2)">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/knowledge.png" mode=""
+					<image :src="$imageURL+'/bigdata_app/newindex/knowledge.png'" mode=""
 						class="itemimg"></image>
 					<view class=""> 知识百科 </view>
 				</view>
 				<view class="functionbox_text_item" @click="tabfunction(3)">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/aftersale.png" mode=""
+					<image :src="$imageURL+'/bigdata_app/newindex/aftersale.png'" mode=""
 						class="itemimg"></image>
 					<view class=""> 售后服务 </view>
 				</view>
@@ -65,48 +65,48 @@
 			<view class="facilitybox_title"> 系统设备 </view>
 			<view class="facilitybox_itembox">
 				<view class="facilitybox_item" v-if="jurisdiction.cbtf" @click="tabequipment('../cb/index/index')">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/cb.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/cb.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 测报系统 </view>
 				</view>
 				<view class="facilitybox_item" v-if="jurisdiction.cbyj" @click="tabequipment('../cbqxyj/cbwarn')">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/cbyj.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/cbyj.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 测报预警 </view>
 				</view>
 				<view class="facilitybox_item" v-if="jurisdiction.fztf" @click="tabequipment('../prevention/index')">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/fz.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/fz.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 防治系统 </view>
 				</view>
 				<view class="facilitybox_item" v-if="jurisdiction.jktf" @click="tabequipment('../monitor/index')">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/jk.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/jk.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 监控系统 </view>
 				</view>
 				<view class="facilitybox_item" v-if="jurisdiction.hjtf" @click="tabequipment('../environment/index')">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/hj.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/hj.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 环境监测 </view>
 				</view>
 				<view class="facilitybox_item" v-if="jurisdiction.qxz" @click="tabequipment('../qxzyj/cbwarn', 5)">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/qxyj.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/qxyj.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 气象预警 </view>
 				</view>
 				<view class="facilitybox_item" v-if="jurisdiction.sq" @click="tabequipment('../qxzyj/cbwarn', '15')">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/sqyj.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/sqyj.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 墒情预警 </view>
 				</view>
 				<view class="facilitybox_item" v-if="jurisdiction.ggtf" @click="tabequipment('../irrigate/index')">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/guangai.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/guangai.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 智能灌溉 </view>
 				</view>
 				<view class="facilitybox_item" v-if="jurisdiction.sbtf"
 					@click="tabequipment('../equipMange/index/index')">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/user.png" mode="" class="itemimg">
+					<image :src="$imageURL+'/bigdata_app/newindex/user.png'" mode="" class="itemimg">
 					</image>
 					<view class=""> 用户管理 </view>
 				</view>
@@ -119,82 +119,7 @@
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 			</view>
-			<!-- <view class="insectattack_listbox">
-				<view class="insectattack_list">
-					<view class="list_box list_box1" @click="introduce(79,'虫情百科')">
-						<view class="list_boxbg">
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/cao.png" mode="" class="list_boxbg_img"></image>
-						</view>
-						<view class="list_box_xiang">
-							<view class="list_box_xiang_click">
-								详情
-							</view>
-						</view>
-						<view class="list_box_info">
-							<view class="list_box_info_name">
-								小地老虎
-							</view>
-							<view class="list_box_info_text">
-								该虫能危害百余种植物,是对农、林木幼苗危害很大的地下害虫, 在东北主要危害落叶松、红松、水曲柳、核桃楸等苗木
-							</view>
-						</view>
-					</view>
-					<view class="list_box list_box2" @click="introduce(369,'虫情百科')">
-						<view class="list_boxbg">
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/yee.jpg" mode="" class="list_boxbg_img"></image>
-						</view>
-						<view class="list_box_xiang">
-							<view class="list_box_xiang_click">
-								详情
-							</view>
-						</view>
-						<view class="list_box_info">
-							<view class="list_box_info_name">
-								草地贪夜蛾
-							</view>
-							<view class="list_box_info_text">
-								草地贪夜蛾被认为是世界上最具破坏性的害虫之一,其巨大的破坏性主要源于其“贪”的本性——贪吃、贪育、贪婪、广适、耐药。
-							</view>
-						</view>
-					</view>
-					<view class="list_box list_box3" @click="introduce(6,'虫情百科')">
-						<view class="list_boxbg">
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/lingc.jpg" mode="" class="list_boxbg_img"></image>
-						</view>
-						<view class="list_box_xiang">
-							<view class="list_box_xiang_click">
-								详情
-							</view>
-						</view>
-						<view class="list_box_info">
-							<view class="list_box_info_name">
-								棉铃虫
-							</view>
-							<view class="list_box_info_text">
-								棉铃虫具有高度多食性,可以为害20余科200多种植物,但比较喜食禾本科、锦葵科、茄科和豆科植物的花蕾和果实等繁殖器官。
-							</view>
-						</view>
-					</view>
-					<view class="list_box list_box4" @click="introduce(67,'虫情百科')">
-						<view class="list_boxbg">
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/ming.png" mode="" class="list_boxbg_img"></image>
-						</view>
-						<view class="list_box_xiang">
-							<view class="list_box_xiang_click">
-								详情
-							</view>
-						</view>
-						<view class="list_box_info">
-							<view class="list_box_info_name">
-								稻纵卷叶螟
-							</view>
-							<view class="list_box_info_text">
-								生命潜能强,寿命长,产卵期长,产卵量也多。各代雌、雄蛾比例几乎各占半数。蛾子有强烈的趋荫蔽栖息习性
-							</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
+			
 		</view>
 		<view class="insectattack">
 			<view class="insectattack_title" @click="virus">
@@ -203,82 +128,7 @@
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 			</view>
-			<!-- <view class="insectattack_listbox">
-				<view class="insectattack_list">
-					<view class="list_box list_box5" @click="introduce(267,'病害百科')">
-						<view class="list_boxbg">
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/mai.png" mode="" class="list_boxbg_img"></image>
-						</view>
-						<view class="list_box_xiang">
-							<view class="list_box_xiang_click">
-								详情
-							</view>
-						</view>
-						<view class="list_box_info">
-							<view class="list_box_info_name">
-								小麦赤霉病
-							</view>
-							<view class="list_box_info_text">
-								小麦赤霉病从苗期到穗期均可发生,引起苗腐、茎基腐、秆腐和穗腐,以穗腐危害最大。湿度大时,病部均可见粉红色霉层。
-							</view>
-						</view>
-					</view>
-					<view class="list_box list_box6" @click="introduce(320,'病害百科')">
-						<view class="list_boxbg">
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/dadou.jpg" mode="" class="list_boxbg_img"></image>
-						</view>
-						<view class="list_box_xiang">
-							<view class="list_box_xiang_click">
-								详情
-							</view>
-						</view>
-						<view class="list_box_info">
-							<view class="list_box_info_name">
-								大豆根腐病
-							</view>
-							<view class="list_box_info_text">
-								初期茎基部或胚根表皮出现淡红褐色不规则的小斑,后变红褐色凹陷坏死斑,绕根茎扩展致根皮枯死
-							</view>
-						</view>
-					</view>
-					<view class="list_box list_box7" @click="introduce(292,'病害百科')">
-						<view class="list_boxbg">
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/yumi.png" mode="" class="list_boxbg_img"></image>
-						</view>
-						<view class="list_box_xiang">
-							<view class="list_box_xiang_click">
-								详情
-							</view>
-						</view>
-						<view class="list_box_info">
-							<view class="list_box_info_name">
-								玉米大斑病
-							</view>
-							<view class="list_box_info_text">
-								玉米大斑病主要为害叶片,严重时也为害叶鞘和苞叶。植株下部叶片先发病,然后向上扩展。
-							</view>
-						</view>
-					</view>
-					<view class="list_box list_box8" @click="introduce(278,'病害百科')">
-						<view class="list_boxbg">
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/newindex/dao.png" mode="" class="list_boxbg_img"></image>
-						</view>
-						<view class="list_box_xiang">
-							<view class="list_box_xiang_click">
-								详情
-							</view>
-						</view>
-						<view class="list_box_info">
-							<view class="list_box_info_name">
-								水稻稻瘟病
-							</view>
-							<view class="list_box_info_text">
-								发生于三叶前,由种子带菌所致。病苗基部灰黑,上部变褐,卷缩而死,湿度较大时病部产生大量灰黑色霉层。
-							</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
+			
 		</view>
 	</view>
 </template>
@@ -680,7 +530,7 @@
 
 <style lang="less">
 	page {
-		background-image: url(https://www.hnyfwlw.com:8006/bigdata_app/newindex/bg.png);
+		background-image: url(https://s3.hnyfwlw.com/webstaticimg/bigdata_app/newindex/bg.png);
 		background-size: 100%;
 		background-repeat: no-repeat;
 		background-color: #f9f9f9;

+ 4 - 4
pages/irrigate/index.vue

@@ -22,7 +22,7 @@
 				 </view>
 				 </uni-nav-bar>
 			</view>
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app/image/irrigate/1.png'" mode="" class="image">
+			<image :src="$imageURL+'/bigdata_app/image/irrigate/1.png'" mode="" class="image">
 			</image>
 			<view class="loading" v-if="loadingtf">
 				<image src="../../static/images/ajax-loader.gif" mode="" class="img"></image>
@@ -38,7 +38,7 @@
 				<view class="prevents_item" v-for="(item,index) in eqlistdata" :key="item.d_id" @click="eqdetails(item, index)">
 					<view class="" v-if="side_type == 18">
 						<image
-							:src="item.device_status==1?'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
+							:src="item.device_status==1?$imageURL+ '/bigdata_app/image/prevention/6.png':$imageURL+ '/bigdata_app/image/prevention/7.png'"
 							mode="" class="prevents_item_img"></image>
 						<view class="prevents_item_top">
 							<p>设备名称:{{item.device_name}}</p>
@@ -72,7 +72,7 @@
 						</view>
 					</view>
 					<view class="" v-if="side_type == 17">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode=""
+						<image :src="$imageURL+ '/bigdata_app/image/prevention/6.png'" mode=""
 							class="prevents_item_img"></image>
 						<view class="prevents_item_top">
 							<p>设备名称:{{item.device_name}}</p>
@@ -107,7 +107,7 @@
 						</view>
 					</view>
 					<view class="" v-if="side_type == 13 || side_type=='xph'">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode=""
+						<image :src="$imageURL+ '/bigdata_app/image/prevention/6.png'" mode=""
 							class="prevents_item_img"></image>
 						<view class="prevents_item_top">
 							<p>设备名称:{{item.device_name}}</p>

+ 3 - 3
pages/irrigate/search.vue

@@ -10,7 +10,7 @@
 			<view class="prevents_item" v-for="item,index in eqlistdata" :key="item.d_id" @click="eqdetails(item)">
 				<view class="" v-if="side_type == 18">
 					<image
-						:src="item.device_status==1?'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
+						:src="item.device_status==1?$imageURL+ '/bigdata_app/image/prevention/6.png':$imageURL+ '/bigdata_app/image/prevention/7.png'"
 						mode="" class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称:{{item.device_name}}</p>
@@ -40,7 +40,7 @@
 					</view>
 				</view>
 				<view class="" v-if="side_type == 17">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode=""
+					<image :src="$imageURL+ '/bigdata_app/image/prevention/6.png'" mode=""
 						class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称:{{item.device_name}}</p>
@@ -71,7 +71,7 @@
 					</view>
 				</view>
 				<view class="" v-if="side_type == 13">
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode=""
+					<image :src="$imageURL+ '/bigdata_app/image/prevention/6.png'" mode=""
 						class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称:{{item.device_name}}</p>

+ 1 - 1
pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="bg">
-			<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/bg.png" mode="" class="bgimg"></image>
+			<image :src="$imageURL+'/bigdata_app/log/bg.png'" mode="" class="bgimg"></image>
 		</view>
 		<!-- <view class="status_bar"></view> -->
 		<view class="apptitle">

+ 3 - 3
pages/monitor/imagelist.vue

@@ -9,7 +9,7 @@
 			<view class="selecttimes" @click="tiemshow=!tiemshow">
 				<view class="timesbox">
 					<image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(timestate)}}</p>
 					<p class="or">~</p>
@@ -21,7 +21,7 @@
 			<view class="imglist">
 				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
 					<view class="imglist_left">
-						<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="">
+						<image :src="$imageURL+'/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="">
 						</image>
 						<image :src="item.addr" mode="" @click="examine(index)"></image>
 					</view>
@@ -35,7 +35,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
 				mode=""></image>
 		</view>
 	</view>

+ 2 - 2
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="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/monitor/banner.png'" mode="widthFix"></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/monitor/banner.png'" mode="widthFix"></image>
 				</view>
 			</view>
 			<view class="contenttf" v-if="contenttf">
@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

+ 1 - 1
pages/monitor/sim.vue

@@ -10,7 +10,7 @@
 					<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
 				</view>
 				<view class="sim_info_title">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/sim1.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/cb/sim1.png'" mode=""></image>
 					<p>sim卡查询{{"("+simnew+")"}}</p>
 				</view>
 				<view class="sim_info_text">

+ 1 - 1
pages/my/about/about.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="line"></view>
 		<view class="logo-box">
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image>
+			<image :src="$imageURL+'/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image>
 			<view class="version">
 				<view>
 					云飞物联网

+ 7 - 7
pages/prevention/equipmentdetails.vue

@@ -8,11 +8,11 @@
 			<view class="info">
 				<view class="info_item">
 					<image
-						:src="eqinfo.item.is_online==1?'https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png':'https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png'"
+						:src="eqinfo.item.is_online==1?$imageURL+'/bigdata_app/image/cb/onBg.png':$imageURL+'/bigdata_app/image/cb/offBg.png'"
 						mode="" class="bgi"></image>
 					<p style="font-size: 32rpx;" @click="copy(eqinfo.item.imei || eqinfo.item.device_id)">设备
 						ID:{{eqinfo.item.imei || eqinfo.item.device_id}}
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode=""
+						<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode=""
 							class="tishi"></image>
 					</p>
 					<p>设备名称:{{eqinfo.item.device_name?eqinfo.item.device_name:"无"}}</p>
@@ -23,19 +23,19 @@
 			</view>
 			<view class="control">
 				<view class="control_item" v-if="$QueryPermission(316) || $QueryPermission(75)" @click="control">
-					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/8.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/8.png'" mode=""></image>
 					<p>设备控制</p>
 				</view>
 				<view class="control_item" v-if="$QueryPermission(318)|| $QueryPermission(77)" @click="charts">
-					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/10.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/10.png'" mode=""></image>
 					<p>历史数据</p>
 				</view>
 				<view class="control_item" v-if="$QueryPermission(317)|| $QueryPermission(76)" @click="sim">
-					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/9.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/9.png'" mode=""></image>
 					<p>SIM卡详情</p>
 				</view>
 				<view class="control_item" @click="repairs">
-					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/7.png'" mode=""></image>
 					<p>一键报修</p>
 				</view>
 			</view>
@@ -45,7 +45,7 @@
 					<view class="realtime_text_item">
 						<view class="realtime_text_item_info" v-for="item,index in olddatas" :key="index">
 							<view class="item_info_img">
-								<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode=""></image>
+								<image :src="$imageURL+'/bigdata_app'+item.icon" mode=""></image>
 							</view>
 							<view class="item_info_text">
 								<p>{{item.txt}}</p>

+ 2 - 2
pages/prevention/index.vue

@@ -11,7 +11,7 @@
 					<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
 				</view>
 			</view>
-			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1.png'" mode="" class="image">
+			<image :src="$imageURL+'/bigdata_app'+'/image/prevention/1.png'" mode="" class="image">
 			</image>
 			<view class="loading" v-if="loadingtf">
 				<image src="../../static/images/ajax-loader.gif" mode="" class="img"></image>
@@ -26,7 +26,7 @@
 			<view class="prevents">
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
 					<image
-						:src="item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
+						:src="item.is_online==1?$imageURL+'/bigdata_app/image/prevention/6.png':$imageURL+'/bigdata_app/image/prevention/7.png'"
 						mode="" class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称:{{item.device_name==""?"无":item.device_name}}</p>

+ 1 - 1
pages/prevention/search.vue

@@ -11,7 +11,7 @@
 			</view>
 			<view class="prevents">
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
-					<image :src="item.is_online==1?'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
+					<image :src="item.is_online==1?$imageURL+ '/bigdata_app/image/prevention/6.png':$imageURL+ '/bigdata_app/image/prevention/7.png'"
 					 mode="" class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称:{{item.device_name==""?"无":item.device_name}}</p>

+ 2 - 2
pages/prevention/sim.vue

@@ -8,7 +8,7 @@
 					<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
 				</view>
 				<view class="sim_info_title">
-					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/sim1.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/cb/sim1.png'" mode=""></image>
 					<p>数据SIM卡流量</p>
 				</view>
 				<view class="sim_info_text">
@@ -36,7 +36,7 @@
 						<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
 					</view>
 					<view class="sim_info_title">
-						<image mode="widthFix" src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/sim2.png"></image>
+						<image mode="widthFix" :src="$imageURL+'/bigdata_app/image/cb/sim2.png'"></image>
 						图片sim卡流量
 					</view>
 					<view class="sim_info_text">

+ 1 - 1
pages/prevention/ucharts.vue

@@ -8,7 +8,7 @@
 			<view class="selecttimes" @click="pickshow = !pickshow">
 				<view class="timesbox">
 					<image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(oldtime)}}</p>
 					<p class="or">~</p>

+ 1 - 1
pages/qxzyj/cbwarn.vue

@@ -189,7 +189,7 @@
 		},
 		data() {
 			return {
-				bannersrc:'https://www.hnyfwlw.com:8006/bigdata_app/image/cbyj/banner2.png',
+				bannersrc:this.$imageURL+'/bigdata_app/image/cbyj/banner2.png',
 				device_type:'',
 				date: "",
 				active: 0,

+ 1 - 1
pages/waterandfer/basestate.vue

@@ -2,7 +2,7 @@
 	<view class="statebox">
 		<view class="stateitem" v-for="item,index in olddatas" :key="index">
 			<view class="stateitem_img">
-				<image :src="'http://www.hnyfwlw.com:8006/bigdata_pc/sf/tubiao/'+typename[item.icon]+item.value+'.png'" mode="" class="img"></image>
+				<image :src="$imageURL+'/bigdata_pc/sf/tubiao/'+typename[item.icon]+item.value+'.png'" mode="" class="img"></image>
 			</view>
 			<view class="stateitem_txt">
 				{{item.txt}}

+ 7 - 7
pages/waterandfer/datails.vue

@@ -8,12 +8,12 @@
 			<view class="info">
 				<view class="info_item">
 					<!-- <image
-						:src="eqinfo.item.is_online==1?'https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png':'https://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png'"
+						:src="eqinfo.item.is_online==1?$imageURL+'/bigdata_app/image/cb/onBg.png':$imageURL+'/bigdata_app/image/cb/offBg.png'"
 						mode="" class="bgi"></image> -->
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png" mode="" class="bgi"></image>
+					<image :src="$imageURL+'/bigdata_app/image/cb/onBg.png'" mode="" class="bgi"></image>
 					<p style="font-size: 32rpx;" @click="copy(eqinfo.item.imei || eqinfo.item.device_id)">设备
 						ID:{{eqinfo.item.imei || eqinfo.item.device_id}}
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode=""
+						<image :src="$imageURL+'/bigdata_app/image/environment/fuzhi.png'" mode=""
 							class="tishi"></image>
 					</p>
 					<p>设备名称:{{eqinfo.item.device_name}}</p>
@@ -24,15 +24,15 @@
 			</view>
 			<view class="control">
 				<view class="control_item" v-if="$QueryPermission(196)" @click="control">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/8.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/8.png'" mode=""></image>
 					<p>设备状态</p>
 				</view>
 				<view class="control_item" v-if="$QueryPermission(197)" @click="charts">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/10.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/10.png'" mode=""></image>
 					<p>要素数据</p>
 				</view>
 				<view class="control_item" @click="repairs">
-					<image :src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<image :src="$imageURL+'/bigdata_app'+'/image/environment/7.png'" mode=""></image>
 					<p>一键报修</p>
 				</view>
 			</view>
@@ -45,7 +45,7 @@
 					<view class="realtime_text_item">
 						<view class="realtime_text_item_info" v-for="item,index in olddatas" :key="index">
 							<view class="item_info_img">
-								<image :src="'http://www.hnyfwlw.com:8006/bigdata_pc/sf/dev/icon_'+item.icon+'.png'"
+								<image :src="$imageURL+'/bigdata_pc/sf/dev/icon_'+item.icon+'.png'"
 									mode=""></image>
 							</view>
 							<view class="item_info_text">

+ 1 - 1
pages/waterandfer/elementdata.vue

@@ -4,7 +4,7 @@
 			<view class="selecttimes" @click="tiemshow=!tiemshow">
 				<view class="timesbox">
 					<image
-						:src="'https://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						:src="$imageURL+'/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(oldtime)}}</p>
 					<p class="or">~</p>

+ 3 - 3
pages/waterandfer/index.vue

@@ -11,7 +11,7 @@
 					<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
 				</view>
 			</view>
-			<image :src="'https://www.hnyfwlw.com:8006/bigdata_app/image/waterandfer/1.png'" mode="" class="image">
+			<image :src="$imageURL+'/bigdata_app/image/waterandfer/1.png'" mode="" class="image">
 			</image>
 			<view class="loading" v-if="loadingtf">
 				<image src="../../static/images/ajax-loader.gif" mode="" class="img"></image>
@@ -19,9 +19,9 @@
 			<view class="prevents">
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
 					<!-- <image
-						:src="item.is_online==1?'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
+						:src="item.is_online==1?$imageURL+ '/bigdata_app/image/prevention/6.png':$imageURL+ '/bigdata_app/image/prevention/7.png'"
 						mode="" class="prevents_item_img"></image> 在线离线区分-->
-					<image src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode="" class="prevents_item_img"></image>
+					<image :src="$imageURL+ '/bigdata_app/image/prevention/6.png'" mode="" class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称:{{item.device_name==""?"无":item.device_name}}</p>
 						<!-- <p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p> -->

+ 1 - 1
pages/waterandfer/waterhis.vue

@@ -4,7 +4,7 @@
 			<view class="selecttimes" @click="tiemshow=!tiemshow">
 				<view class="timesbox">
 					<image
-						src="https://www.hnyfwlw.com:8006/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png"
+						:src="$imageURL+'/bigdata_app/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
 						mode=""></image>
 					<p>{{timetab(oldtime)}}</p>
 					<p class="or">~</p>

+ 26 - 26
pages/waterandfernew/details.vue

@@ -133,7 +133,7 @@
 					</u-popup> -->
 				</view>
 				<view class="main">
-					<image class="mainContent" src="https://www.hnyfwlw.com:8006/bigdata_app/log/mainNew.png"></image>
+					<image class="mainContent" :src="$imageURL+'/bigdata_app/log/mainNew.png'"></image>
 					<!-- <view class="sourceBox">
 						<view class="smallBox">
 							水源
@@ -145,13 +145,13 @@
 							<view class="btnName">
 								{{resultBan[index].e_name}}
 							</view>
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/colNew.png" v-if="pickBtnList.length == 1">
+							<image :src="$imageURL+'/bigdata_app/log/colNew.png'" v-if="pickBtnList.length == 1">
 							</image>
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/colLeft.png"
+							<image :src="$imageURL+'/bigdata_app/log/colLeft.png'"
 								v-else-if="pickBtnList.length > 1 && index == 0"></image>
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/colRight.png"
+							<image :src="$imageURL+'/bigdata_app/log/colRight.png'"
 								v-else-if="pickBtnList.length > 1 && index == pickBtnList.length - 1"></image>
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/colCenter.png" v-else></image>
+							<image :src="$imageURL+'/bigdata_app/log/colCenter.png'" v-else></image>
 							<view class="jiaoBtn" v-if="resultBan.length > 0">
 								<u-switch v-model="resultBan[index]['off']" active-color="#14A478"
 									inactive-color="#AEB4C2" :loading="resultBan[index]['disabled']"
@@ -159,73 +159,73 @@
 							</view>
 							<view class="shanBox" v-if="resultBan.length > 0">
 								<image v-if="!resultBan[index]['off']"
-									src="https://www.hnyfwlw.com:8006/bigdata_app/log/shan.png"></image>
+									:src="$imageURL+'/bigdata_app/log/shan.png'"></image>
 								<image v-else class="circleAnm"
-									src="https://www.hnyfwlw.com:8006/bigdata_app/log/shanannimate.png"></image>
+									:src="$imageURL+'/bigdata_app/log/shanannimate.png'"></image>
 							</view>
 							<view class="btnBox" @click="switchchange($event, item.number, item, index, true)">
-								<image v-if="item.off" src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiopen.png"></image>
-								<image v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiclose.png"></image>
+								<image v-if="item.off" :src="$imageURL+'/bigdata_app/log/feiopen.png'"></image>
+								<image v-else :src="$imageURL+'/bigdata_app/log/feiclose.png'"></image>
 							</view>
 						</view>
 					</view>
 					<!-- 废料管口 -->
 					<view class="exit">
-						<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/exit.png"></image>
+						<image :src="$imageURL+'/bigdata_app/log/exit.png'"></image>
 					</view>
 					<!-- 注肥泵 -->
 					<view class="feiLight"
 						@click="switchchange(!feiBengItem.e_status, feiBengItem.number, feiBengItem, feiBengIndex)">
-						<image v-if="feiBengItem.e_status" src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiAllopen.png"></image>
-						<image v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiAllclose.png"></image>
+						<image v-if="feiBengItem.e_status" :src="$imageURL+'/bigdata_app/log/feiAllopen.png'"></image>
+						<image v-else :src="$imageURL+'/bigdata_app/log/feiAllclose.png'"></image>
 					</view>
 					<!-- 控制柜 -->
 					<view class="kongBox">
-						<image v-if="feiBengItem.e_status" src="https://www.hnyfwlw.com:8006/bigdata_app/log/kongclose.png"></image>
-						<image v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/kongopen.png"></image>
+						<image v-if="feiBengItem.e_status" :src="$imageURL+'/bigdata_app/log/kongclose.png'"></image>
+						<image v-else :src="$imageURL+'/bigdata_app/log/kongopen.png'"></image>
 					</view>
 					<!-- 进水泵 -->
 					<view class="warterIn"
 						@click="switchchange(!mainBengItem.e_status, mainBengItem.number, mainBengItem, mainBengIndex)">
-						<image v-if="mainBengItem.e_status" src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiopen.png"></image>
-						<image v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiclose.png"></image>
+						<image v-if="mainBengItem.e_status" :src="$imageURL+'/bigdata_app/log/feiopen.png'"></image>
+						<image v-else :src="$imageURL+'/bigdata_app/log/feiclose.png'"></image>
 					</view>
 					<!-- 进水指示 -->
 					<view class="warterLight">
-						<image v-if="mainBengItem.e_status" src="https://www.hnyfwlw.com:8006/bigdata_app/log/bengopen.png"></image>
-						<image v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/bengclose.png"></image>
+						<image v-if="mainBengItem.e_status" :src="$imageURL+'/bigdata_app/log/bengopen.png'"></image>
+						<image v-else :src="$imageURL+'/bigdata_app/log/bengclose.png'"></image>
 					</view>
 					<!-- 电风扇 -->
 					<!-- <view class="fengBox">
 						<view class="relativeBox">
-							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/fengmain.png"></image>
+							<image :src="$imageURL+'/bigdata_app/log/fengmain.png'"></image>
 							<image :class="feiBeng ? 'circleAnm' : ''"
-								src="https://www.hnyfwlw.com:8006/bigdata_app/log/fengleafs.png"></image>
+								:src="$imageURL+'/bigdata_app/log/fengleafs.png'"></image>
 						</view>
 					</view> -->
 					<!-- 水管控制阀 -->
 					<view class="benList">
 						<!-- <view class="preBen" v-for="item, index in buttonList" v-if="(index + 1) % 2 == 1"
 							@click="switchchange(!item.off, item.number, item, index, true)">
-							<image class="daoguan" src="https://www.hnyfwlw.com:8006/bigdata_app/log/bottomNew.png"
+							<image class="daoguan" :src="$imageURL+'/bigdata_app/log/bottomNew.png'"
 								v-if="(index + 1) % 2 < 4"></image>
 							<view class="info">
 								肥料{{ (index + 1) / 2 > 1 ? (index + 2) / 2 : 1 }}开关
 							</view>
-							<image class="status" v-if="item.off" src="https://www.hnyfwlw.com:8006/bigdata_app/log/open.png">
+							<image class="status" v-if="item.off" :src="$imageURL+'/bigdata_app/log/open.png'">
 							</image>
-							<image class="status" v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/close.png"></image>
+							<image class="status" v-else :src="$imageURL+'/bigdata_app/log/close.png'"></image>
 						</view> -->
 						<view class="preBen" v-for="item, index in faList"
 							@click="switchchange(!item.e_status, item.number, item, index)">
-							<image class="daoguan" src="https://www.hnyfwlw.com:8006/bigdata_app/log/bottomNew.png"
+							<image class="daoguan" :src="$imageURL+'/bigdata_app/log/bottomNew.png'"
 								v-if="index < 5"></image>
 							<view class="info">
 								{{item.e_name}}
 							</view>
-							<image class="status" v-if="item.e_status" src="https://www.hnyfwlw.com:8006/bigdata_app/log/open.png">
+							<image class="status" v-if="item.e_status" :src="$imageURL+'/bigdata_app/log/open.png'">
 							</image>
-							<image class="status" v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/close.png"></image>
+							<image class="status" v-else :src="$imageURL+'/bigdata_app/log/close.png'"></image>
 						</view>
 					</view>
 				</view>

+ 1 - 1
pages/webview/webview.vue

@@ -16,7 +16,7 @@
 		},
 		onLoad(options) {
 			this.device_id = options.device_id
-			this.accessToken = options.accessToken
+			this.accessToken = uni.getStorageSync('session_key')
 			
 			this.url = "https://wx.hnyfwlw.com/wexin/index.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken
 			// this.url = "http://192.168.2.167:5500/index.html?device_id=" + this.device_id + "&accessToken=" + this.accessToken

+ 4 - 4
style/html/h52.html

@@ -38,7 +38,7 @@
 			.direc {
 				width: 150px;
 				height: 150px;
-				background: url('http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/1.png');
+				background: url('https://s3.hnyfwlw.com/webstaticimg/bigdata_app/image/monitor/1.png');
 				background-size: 100% auto;
 				background-repeat: no-repeat;
 				position: relative;
@@ -100,7 +100,7 @@
 		</div>
 		<div class="btn-box">
 			<div class="more" ontouchstart="configCamera('move', 8)" ontouchend="stopConfigCamera()">
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/3.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/monitor/3.png'" mode="widthFix"></image>
 			</div>
 			<div class="direc">
 				<div class="top" ontouchstart="configCamera('move', 0)" ontouchend="stopConfigCamera()">
@@ -120,7 +120,7 @@
 				</div>
 			</div>
 			<div class="less" ontouchstart="configCamera('move', 9)" ontouchend="stopConfigCamera()">
-				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/2.png" mode="widthFix"></image>
+				<image :src="$imageURL+'/bigdata_app/image/monitor/2.png'" mode="widthFix"></image>
 			</div>
 		</div>
 	</body>
@@ -129,7 +129,7 @@
 	<!-- <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.4.0.js"></script> -->
 	<!-- uni 的 SDK -->
 	<script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
-	<script type="text/javascript" src="http://www.hnyfwlw.com:8006/bigdata_app/js/ezuikit.js"></script>
+	<script type="text/javascript" src="https://s3.hnyfwlw.com/webstaticimg/bigdata_app/js/ezuikit.js"></script>
 	<script type="text/javascript">
 		function configCamera(ctrl, movenum) {
 			if (ctrl == "takephoto") {

+ 2 - 2
util/api.js

@@ -2,8 +2,8 @@
 // const BASE_URL='http://8.136.98.49:8002'
 // let BASE_URL = 'http://218.28.198.186:10505'
 // let BASE_URL = 'https://wx.hnyfwlw.com'
-// let BASE_URL = 'https://wx.hnyfwlw.com';
-let BASE_URL = 'http://218.28.198.186:10508';
+let BASE_URL = 'https://wx.hnyfwlw.com';
+// let BASE_URL = 'http://218.28.198.186:10508';
 export const myRequest = (options) => {
   // BASE_URL=uni.getStorageSync('http')
   // if(BASE_URL==''){

+ 10 - 0
util/neutral.js

@@ -0,0 +1,10 @@
+export default {
+  // isneutral:true//云飞智控
+  isneutral: false, //智控
+  developAPI:'http://218.28.198.186:10508',//测试环境访问地址
+  // productAPI:'http://8.136.98.49:8002',//生产环境
+  productAPI:'https://api.hnyfwlw.com',//生产环境
+  // imageURL:'http://www.hnyfwlw.com:8006',//图片访问路径
+  imageURL:'https://s3.hnyfwlw.com/webstaticimg',//图片访问路径原8006端口
+  imageURL_58003:'https://s3.hnyfwlw.com/bigdata-image'//原58003端口
+};