监察上报图片上传超限提示，分页测试，图表legend配置修改等

pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -140,18 +140,29 @@
 
 
 			  success: (uploadFileRes) => {
-
 			   var data=JSON.parse(uploadFileRes.data)
+				if(data.flag){
+					 this.img=data.img_url
+				}else{
+					uni.showToast({
+						title: data.msg,
+						icon: "none"
+					});					
+				}
 			    // alert('上传成功')
 				// alert(data.img_url)
 			   // console.log('data')
 			   // console.log(data.img_url)
 			   // console.log('uploadFileRes')
-			   this.img=data.img_url
+			  
 			  },
 			  fail: (err) => {
 				  // alert('上传失败')
+				  
+			   // alert(err)
 			   console.log(err)
+			   //  console.log('err'+err)
+			   // console.log('err.errMsg'+errMsg)
 			  }
 			 });
 			},

pages/index/components/chart/chart.vue

@@ -63,6 +63,7 @@
 						itemWidth: 12,
 						itemHeight: 12,
 						itemGap: 60,
+						selectedMode: false, 
 						// top: -10,
 						textStyle: {
 

pages/index/components/chart2/chart2.vue

@@ -68,6 +68,7 @@
 						}
 					}],
 					legend: { //aa图例
+						selectedMode: false, 
 						orient: 'horizontal',
 						icon: 'circle',
 						itemWidth: 12,

pages/index/index.vue

@@ -193,15 +193,15 @@
 
 		onLoad: function(option) {
 		
-		// 	if (option.op) {
-		// 		this.getData();
+			if (option.op) {
+				this.getData();
 			
-		// 	} else {
-		// 		this.init()
-		// 	}
+			} else {
+				this.init()
+			}
 			
 			
-			this.getData();
+			// this.getData();
 
 			this.hackReset = false;
 			this.$nextTick(() => {

pages/login/login.vue

@@ -45,11 +45,11 @@
 		onLoad(option) {
 			// alert(option.flag)
 			
-			// if(option.flag){	
-			// }else{
-			// this.init()
+			if(option.flag){	
+			}else{
+			this.init()
 				
-			// }
+			}
 
 			uni.setNavigationBarColor({
 				frontColor: "#ffffff", //文字颜色