bugxiufu

common/common.js

@@ -3,12 +3,14 @@ function noMultipleClicks(methods) {
     let that = this;
     
     if (that.noClick) {
+		console.log(1)
         that.noClick= false;
-        // methods();
+        methods();
         setTimeout(function () {
             that.noClick= true;
         }, 2000)
     } else {
+		console.log(2)
         uni.showToast({
             title: '请勿重复点击',
             duration: 2000,

pages/accountManage/perAdd/perAdd.vue

@@ -47,7 +47,7 @@
 			</view>
 
 			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(submit())">提 交 </button>
+				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(submit)">提 交 </button>
 			</view>
 		</form>
 

pages/inspectList/unprocessDetail/unprocessDetail.vue

@@ -47,7 +47,7 @@
 							:name="reason"></textarea>
 						</view>
 						<view class="btn-area">
-							<button class="bg-blue round  margin-top" @click="$noMultipleClicks(powerSubmit())">提 交 </button>
+							<button class="bg-blue round  margin-top" @click="$noMultipleClicks(powerSubmit)">提 交 </button>
 						</view>
 					</form>
 				</view>

pages/setting/messagePush/messagePush.vue

@@ -16,7 +16,7 @@
 			</checkbox-group>
 
 			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(btnSubmit())">提 交 </button>
+				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(btnSubmit)">提 交 </button>
 			</view>
 
 		</form>
@@ -198,8 +198,10 @@
 							url: '/pages/setting/setting',
 						});
 					}, 1000);
+					
 				}
 				
+				
 
 			},
 			PushSettings(params = {}) {

pages/setting/setting.vue

@@ -70,7 +70,7 @@
 			}
 		},
 		onLoad() {
-			this.getAuthorization()
+			// this.getAuthorization()
 		},
 		methods: {
 			

pages/unprocessDetail/unprocessDetail.vue

@@ -51,9 +51,9 @@
 
 						</view>
 						<view class="btn-area">
-							<button class="bg-orange round missReport margin-top" @click="$noMultipleClicks(alarmSubmit(1))">误 报
+							<button class="bg-orange round missReport margin-top" @click="$noMultipleClicks(alarmSubmit1)">误 报
 							</button>
-							<button class="bg-blue round  missReport margin-top " @click="$noMultipleClicks(alarmSubmit(0))">非 误 报
+							<button class="bg-blue round  missReport margin-top " @click="$noMultipleClicks(alarmSubmit0)">非 误 报
 							</button>
 						</view>
 					</form>
@@ -158,7 +158,58 @@
 				}
 			},
 
-			alarmSubmit(query) {
+
+			//误报
+			alarmSubmit1() {
+				if (!this.textareaMsg.replace(/^\s*/g,'')) {
+					uni.showToast({
+						title: "请输入处理内容",
+						icon: "none"
+					});
+				} else {
+					
+					let queryParam = {};
+					queryParam.id = this.getData.id;
+					queryParam.type = this.getData.dwtype;
+					queryParam.device_code = this.getData.device_code;
+					queryParam.if_batch = this.radioOne;
+					queryParam.clwb = 1;
+					queryParam.ncmd = this.getData.ncmd;
+					queryParam.clnr = this.textareaMsg;
+					
+					if (this.getData.dwtype == 1) {
+						queryParam.data3 = this.getData.data3;
+						queryParam.data5 = this.getData.data5;
+						this.powerSubmitRes(queryParam);
+						return;
+					}
+					if (this.getData.dwtype == 2) {
+						queryParam.data1 = this.getData.data1;
+						this.powerSubmitRes(queryParam);
+						return;
+					}
+					if (this.getData.dwtype == 7) {
+						queryParam.data1 = this.getData.data1;
+						this.powerSubmitRes(queryParam);
+						return;
+					}
+					if (this.getData.dwtype == 3) {
+						queryParam.data2=this.getData.data2;
+						this.powerSubmitRes(queryParam);
+						return;
+					}
+					if (this.getData.dwtype == 6) {
+						queryParam.data2=this.getData.data2;
+						queryParam.data4=this.getData.data4;
+						this.powerSubmitRes(queryParam);
+						return;
+					}
+					this.powerSubmitRes(queryParam)
+				}
+			},
+			//非误报
+			//误报
+			alarmSubmit0() {
 				if (!this.textareaMsg.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入处理内容",
@@ -171,7 +222,7 @@
 					queryParam.type = this.getData.dwtype;
 					queryParam.device_code = this.getData.device_code;
 					queryParam.if_batch = this.radioOne;
-					queryParam.clwb = query;
+					queryParam.clwb = 0;
 					queryParam.ncmd = this.getData.ncmd;
 					queryParam.clnr = this.textareaMsg;
 					

pages/weiBao/planDetail/planDetail.vue

@@ -48,7 +48,7 @@
 			</view>
 
 			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(addSubmit())">提 交 </button>
+				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(addSubmit)">提 交 </button>
 			</view>
 		</form>
 	</view>

pages/xunJian/planDetail/planDetail.vue

@@ -48,7 +48,7 @@
 			</view>
 
 			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(addSubmit())">提 交 </button>
+				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(addSubmit)">提 交 </button>
 			</view>
 		</form>
 	</view>
@@ -101,7 +101,7 @@
 					success: (uploadFileRes) => {
 						var data = JSON.parse(uploadFileRes.data)
 						this.img = data.img_url;
-						console.log(this.img)
+						alert(this.img)
 					},
 					fail: (err) => {
 						console.log(err)
@@ -110,27 +110,31 @@
 			},
 
 			addSubmit() {
-				if (!this.reportName.replace(/^\s*/g,'')) {
+				
+				if (!this.img) {
 					uni.showToast({
-						title: "请输入上报名称",
+						title: "请上传图片",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.msg.replace(/^\s*/g,'')) {
+				
+				if (!this.reportName.replace(/^\s*/g,'')) {
 					uni.showToast({
-						title: "请输入巡检描述",
+						title: "请输入上报名称",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.img) {
+				
+				if (!this.msg.replace(/^\s*/g,'')) {
 					uni.showToast({
-						title: "请上传图片",
+						title: "请输入巡检描述",
 						icon: "none"
 					});
 					return
 				}
+				
 				this.powerSubmitRes({
 					"zb_id": this.zb_id,
 					"spot_id": this.id,