feat:一些问题

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.14.10",
-    "versionCode" : 11410,
+    "versionName" : "1.15.1",
+    "versionCode" : 11501,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */
@@ -175,7 +175,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/ksy" : {
-                    "target" : "http://114.115.147.140:8002",
+                    "target" : "http://dev.hnyfwlw.com",
                     "changeOrigin" : true,
                     "ws" : true,
                     "pathRewrite" : {

pages/cb/cbd/equip-set/equip-set-new.vue

@@ -463,7 +463,7 @@
 				this.dataSelectShow = true
 		
 				this.singleSelectList = []
-				for (let i = min; i < max; i+=5) {
+				for (let i = min; i < max; i+=1) {
 					this.singleSelectList.push({
 						value:i,
 						label:i.toString()

pages/cb/cbd/equip-set/equip-set-sy2.vue

@@ -141,8 +141,8 @@
 					{ value: 0, label: '时控模式' },
 				],
 				syArr:[
-					{ value: 1, label: '光控模式' },
-					{ value: 0, label: '时控模式' }
+					{ value: "0", label: '光控模式' },
+					{ value: "1", label: '时控模式' }
 				  ],
 				tsIndex: 0,
 				imgresArr: ['高', '中', '低'],

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

@@ -164,7 +164,7 @@ export default {
           id: this.d_id,
           device_type_id: this.device_type,
           page: this.page,
-          page_number: 12,
+          page_size: 20,
           start: +new Date(this.start_time + ' 00:00:00') / 1000,
           end: +new Date(this.end_time + ' 23:59:59') / 1000,
           ...this.searchObj,

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

@@ -5,7 +5,7 @@
       <view class="device-id" @click="copy(equipInfo)">
         <image
           class="logo"
-          :src="`${$imageURL}/bigdata_pc/equipdistribute/${equipInfo.type}.png`"
+          :src="`${$imageURL}/bigdata_app/image/fourMoodBase/${equipInfo.type}.png`"
           mode=""
         ></image>
         {{ equipInfo.imei || equipInfo.device_id }}
@@ -219,7 +219,7 @@ export default {
         getUserPermission(),
         this.equipInfo.pur_id
       );
-      permission.forEach((item) => {
+      permission&&permission.forEach((item) => {
         if (item.purview_name == '查看图片') {
           this.cbd.unshift({
             icon: '/image/cb/1.png',
@@ -461,7 +461,9 @@ export default {
     },
   },
   onLoad(option) {
+	  
     this.equipInfo = JSON.parse(option.info);
+	
     this.getDeviceStatus();
     this.type =
       Number(this.equipInfo.type) ||

pages/disandpests/index.vue

@@ -99,8 +99,8 @@
 				if (this.flag == 2) {
 					// pest.pests.insect_discern 虫害
 					uni.uploadFile({
-						// url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
-						url: 'http://114.115.147.140:8002/api/api_gateway?method=pest.pests.insect_discern', //仅为示例，非真实的接口地址
+						// url: 'http://dev.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+						url: 'http://dev.hnyfwlw.com/api/api_gateway?method=pest.pests.insect_discern', //仅为示例，非真实的接口地址
 						filePath: ev.path,
 						name: 'img_file',
 						formData: {
@@ -115,8 +115,8 @@
 				} else if (this.flag == 1) {
 					//pest.pests.insect_discern病害识别
 					uni.uploadFile({
-						// url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
-						url: 'http://114.115.147.140:8002/api/api_gateway?method=pest.pests.plant_discern', //仅为示例，非真实的接口地址
+						// url: 'http://dev.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+						url: 'http://dev.hnyfwlw.com/api/api_gateway?method=pest.pests.plant_discern', //仅为示例，非真实的接口地址
 						filePath: ev.path,
 						name: 'img_file',
 						formData: {

pages/distribution/index.vue

@@ -117,9 +117,10 @@
 						obj.longitude = Number(res[i].lng)
 						obj.id = parseInt(i)
 						obj.title = res[i].device_name || res[i].device_id
-						// obj.width = 30
-						// obj.height = 30
-						obj.iconPath = "https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/image/distribution/"+res[i].device_type_id+".png"
+						obj.width = 30
+						obj.height = 30
+						obj.iconPath = '/static/images/distribution/' + res[i].device_type_id + ".png"
+						// obj.iconPath = "https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/image/distribution/"+res[i].device_type_id+".png"
 						arr.push(obj)
 					}
 

pages/expertDiagnosis/postmessage.vue

@@ -109,7 +109,7 @@
 				console.log(ev)
 				this.toloadTF = true
 				uni.uploadFile({
-				    url: 'http://114.115.147.140:8002/api/api_gateway?method=pest.pests.pests_img', //仅为示例，非真实的接口地址
+				    url: 'http://dev.hnyfwlw.com/api/api_gateway?method=pest.pests.pests_img', //仅为示例，非真实的接口地址
 					filePath: ev.path,
 				    name: 'img_file',
 				    formData: {

pages/fourBase/addbase.vue

@@ -243,7 +243,7 @@
 			},
 			onok(ev){
 				uni.uploadFile({
-					url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+					url: 'http://dev.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
 					filePath: ev.path,
 					name: 'img_file',
 					formData: {

pages/fourBase/modification.vue

@@ -251,7 +251,7 @@
 			},
 			onok(ev) {
 				uni.uploadFile({
-					url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+					url: 'http://dev.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
 					filePath: ev.path,
 					name: 'img_file',
 					formData: {

pages/index/index.vue

@@ -498,7 +498,7 @@
 					console.log('111')
 					// pest.pests.insect_discern 虫害
 					uni.uploadFile({
-						// url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+						// url: 'http://dev.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
 						url: 'http://8.136.98.49:8002/api/api_gateway?method=pest.pests.insect_discern', //仅为示例，非真实的接口地址
 						filePath: ev.path,
 						name: 'img_file',
@@ -521,7 +521,7 @@
 						title: '加载中'
 					});
 					uni.uploadFile({
-						// url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+						// url: 'http://dev.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
 						url: 'http://8.136.98.49:8002/api/api_gateway?method=pest.pests.plant_discern', //仅为示例，非真实的接口地址
 						filePath: ev.path,
 						name: 'img_file',
@@ -587,6 +587,7 @@
 		},
 		onLoad() {
 			// console.log(this.$QueryPermission(242))
+			
 			var time = new Date()
 			var hours = time.getHours()
 			if (hours < 12) {

pages/index/indexcopy.vue

@@ -270,8 +270,8 @@
 					console.log('111')
 					// pest.pests.insect_discern 虫害
 					uni.uploadFile({
-						// url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
-						url: 'http://114.115.147.140:8002/api/api_gateway?method=pest.pests.insect_discern', //仅为示例，非真实的接口地址
+						// url: 'http://dev.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+						url: 'http://dev.hnyfwlw.com/api/api_gateway?method=pest.pests.insect_discern', //仅为示例，非真实的接口地址
 						filePath: ev.path,
 						name: 'img_file',
 						formData: {
@@ -291,8 +291,8 @@
 						title: '加载中'
 					});
 					uni.uploadFile({
-						// url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
-						url: 'http://114.115.147.140:8002/api/api_gateway?method=pest.pests.plant_discern', //仅为示例，非真实的接口地址
+						// url: 'http://dev.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+						url: 'http://dev.hnyfwlw.com/api/api_gateway?method=pest.pests.plant_discern', //仅为示例，非真实的接口地址
 						filePath: ev.path,
 						name: 'img_file',
 						formData: {

pages/my/user-info/user-info.vue

@@ -69,7 +69,7 @@
 						success: (res) => {
 							this.loding=true
 							uni.uploadFile({
-								url: 'http://114.115.147.140:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+								url: 'http://dev.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
 								filePath: res.tempFilePaths[0],
 								name: 'img_file',
 								formData: {

pages/prevention/index.vue

@@ -222,7 +222,7 @@ export default {
           page_size: '10',
           device_status: this.device_status,
           device_id: this.imports,
-          device_model: this.equipArr[this.active].device_model,
+          device_model:this.equipArr[this.active].device_model>0?this.equipArr[this.active].device_model: ""
         },
       });
       this.loadingtf = false;

static/h52.html

@@ -219,8 +219,8 @@
 	<!-- <script src="./js/flv.min.js"></script> -->
 	<script >
 		// import Player from './videoPlayer/videoPlay-js.js'
-		// const domin = 'https://wx.hnyfwlw.com'
-		const domin = 'http://218.28.198.186:10508'
+		const domin = 'https://wx.hnyfwlw.com'
+		// const domin = 'http://218.28.198.186:10508'
 		
 		let player = null
 		let stopTimer = 0

util/api.js

@@ -10,8 +10,7 @@ export const myRequest = (options) => {
         : config.productAPI;
   }
   BASE_URL = config.productAPI;
-  BASE_URL = config.developAPI;
-  // console.log(BASE_URL)
+  // BASE_URL = config.developAPI;
   var session_key = '';
   session_key = uni.getStorageSync('session_key');
   let url = '';

util/neutral.js

@@ -1,5 +1,5 @@
 export default {
-  // isneutral:true//云飞智控
+  // isneutral:true,//云飞智控
   isneutral: false, //智控
   developAPI:'http://218.28.198.186:10508',//测试环境访问地址
   // productAPI:'http://8.136.98.49:8002',//生产环境