bug修复

manifest.json

@@ -142,8 +142,7 @@
                         "^/web" : "/"
                     }
                 }
-            },
-            "https" : false
+            }
         },
         "domain" : "https://qhome.usky.cn/",
         "sdkConfigs" : {
@@ -151,7 +150,7 @@
         },
         "optimization" : {
             "treeShaking" : {
-                "enable" : false
+                "enable" : true
             }
         }
     }

pages/device-Manage/export/export.vue

@@ -96,9 +96,13 @@
 				// alert(this.dwtype)
 
 				//#ifdef H5
+				var start_time =this.datetimerange[0]?`start_time/${this.datetimerange[0]}/`:'';
+				var end_time =this.datetimerange[1]?`end_time/${this.datetimerange[1]}/`:'';
 				let exportUrl = this.$BASE_URL+
-					`ExportModule/getDeviceListExpor/start_time/${this.datetimerange[0]}/end_time/${this.datetimerange[1]}/dwtype/${this.dwtype}/company_code/${uni.getStorageSync('selectedCode')}/`
+					`ExportModule/getDeviceListExpor/${start_time}${end_time}dwtype/${this.dwtype}/company_code/${uni.getStorageSync('selectedCode')}/`
+				// alert(exportUrl)
 				var ua = window.navigator.userAgent.toLowerCase();
+				
 				if (ua.match(/MicroMessenger/i) == 'micromessenger') {
 					uni.showModal({
 						showCancel: false,

pages/deviceDetail/components/chart.vue

@@ -71,7 +71,8 @@
 						itemWidth: 12,
 						itemHeight: 12,
 						itemGap: 50,
-						 bottom: -6,
+						bottom: -6,
+						selectedMode: false, 
 						textStyle: {
 
 							fontSize: 14,

pages/deviceDetail/components/waterChart.vue

@@ -54,7 +54,7 @@
 					grid: {
 						left: '7%',
 						right: '4%',
-						bottom: '3%',
+						bottom: '15%',
 						containLabel: true
 					},
 					toolbox: {
@@ -64,14 +64,16 @@
 					},
 					legend: {
 						data: ['水压/水位(兆帕/米)', '电量/信号(%)'],
-						left: 10
+						// left: 10
 					},
 					xAxis: {
 						type: 'category',
 						axisTick: {
 							alignWithLabel: true
 						},
-						data: this.bindData.stiem
+						data:this.bindData.stiem.map( function(value,index){
+							return `${value.substring(0,10)}\n${value.substring(11,20)}`
+						})
 					},
 					yAxis: [{
 						name: '水压/水位',
@@ -79,24 +81,24 @@
 						max: 1
 					}, {
 						name: '电量/信号',
-						nameLocation: 'start',
+						// nameLocation: 'start',
 						max: 100,
 						type: 'value',
 						// inverse: true
 					}],
-					dataZoom: [{
-						type: 'slider',
-						xAxisIndex: 0,
-						filterMode: 'empty',
-						start: 0,
-						end: 100
-					}, {
-						type: 'inside',
-						xAxisIndex: 0,
-						filterMode: 'empty',
-						start: 0,
-						end: 100
-					}],
+					// dataZoom: [{
+					// 	type: 'slider',
+					// 	xAxisIndex: 0,
+					// 	filterMode: 'empty',
+					// 	start: 0,
+					// 	end: 100
+					// }, {
+					// 	type: 'inside',
+					// 	xAxisIndex: 0,
+					// 	filterMode: 'empty',
+					// 	start: 0,
+					// 	end: 100
+					// }],
 
 					series: [{
 						name: tes2,
@@ -127,6 +129,7 @@
 			}
 		},
 		onLoad() {
+			
 
 		},
 		methods: {
@@ -148,6 +151,11 @@
 	let myChart
 	export default {
 		mounted() {
+			
+			console.log('this.bindData')
+			console.log(this.bindData)
+			
+			
 			if (typeof window.echarts === 'function') {
 				this.initEcharts()
 			} else {

pages/deviceManage/deviceManage.vue

@@ -305,10 +305,13 @@
 					bb = this.checkedArr.join(",")
 					// alert(bb)
 				}
-
+				var transmission_mode=this.transmission_mode1?`transmission_mode/${this.transmission_mode1}/`:'';
+				var dwtype=this.dwtype1?`dwtype/${this.dwtype1}/`:'';
+				
 				let exportUrl = this.$BASE_URL +
-					`ExportModule/getDeviceConfigListExpor/transmission_mode/${this.transmission_mode1}/${aa}/${bb}/dwtype/${this.dwtype1}/company_code/${uni.getStorageSync('selectedCode')}/`
+					`ExportModule/getDeviceConfigListExpor/${transmission_mode}${aa}/${bb}/${dwtype}company_code/${uni.getStorageSync('selectedCode')}/`
 				// alert(exportUrl)
+				// return
 
 				var ua = window.navigator.userAgent.toLowerCase();
 				if (ua.match(/MicroMessenger/i) == 'micromessenger') {

pages/export/export.vue

@@ -104,9 +104,11 @@
 				}
 				
 				
-				//#ifdef H5				
+				//#ifdef H5		
+				var start_time =this.datetimerange[0]?`start_time/${this.datetimerange[0]}/`:'';
+				var end_time =this.datetimerange[1]?`end_time/${this.datetimerange[1]}/`:'';
 				let exportUrl = this.$BASE_URL +url2+
-					`/start_time/${this.datetimerange[0]}/end_time/${this.datetimerange[1]}/company_code/${uni.getStorageSync('selectedCode')}/`
+					`/${start_time}${end_time}company_code/${uni.getStorageSync('selectedCode')}/`
 				var ua = window.navigator.userAgent.toLowerCase();
 				// alert(exportUrl)
 				if (ua.match(/MicroMessenger/i) == 'micromessenger') {

pages/processList/export/export.vue

@@ -145,10 +145,16 @@
 			},
 			exportButton() {
 				//#ifdef H5
+				
+				var start_time =this.datetimerange[0]?`start_time/${this.datetimerange[0]}/`:'';
+				var end_time =this.datetimerange[1]?`end_time/${this.datetimerange[1]}/`:'';
 				let exportUrl = this.$BASE_URL+
-					`ExportModule/getIntegratedAlarmListExpor/start_time/${this.datetimerange[0]}/end_time/${this.datetimerange[1]}/type/${this.type}/company_code/${uni.getStorageSync('selectedCode')}/`
-				var ua = window.navigator.userAgent.toLowerCase();
+					`ExportModule/getIntegratedAlarmListExpor/${start_time}${end_time}type/${this.type}/company_code/${uni.getStorageSync('selectedCode')}/`	
 				// alert(exportUrl)
+	
+				
+				var ua = window.navigator.userAgent.toLowerCase();
+				
 				if (ua.match(/MicroMessenger/i) == 'micromessenger') {
 					uni.showModal({
 						showCancel: false,

pages/processList/processList.vue

@@ -8,8 +8,8 @@
 					<!-- <view v-if="TabCur==index" class="cu-tag badge">
 						<block class="cu-tag badge">{{TabCur? porcessedList.length:alarm_count}} </block>
 					</view> -->
-					<view v-if="TabCur==index&&!TabCur" class="cu-tag badge">
-						<block class="cu-tag badge">{{alarm_count}} </block>
+					<view v-if="TabCur==index&&!TabCur&&alarm_count" class="cu-tag badge">
+						<block class="">{{alarm_count}} </block>
 					</view>
 					{{item}}
 				</view>