4877小优化一下

pages/4877/BJQ4877.vue

@@ -610,23 +610,23 @@
 
 
 			showUnWarn(val) {
-				this.showPop({
-					message: '确定解除声光报警模式?',
-					iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
-					borderColor: "#e034344d",
-					buttonBgColor: "#E03434",
-					okCallback: () => {
+				// this.showPop({
+				// 	message: '确定解除声光报警模式?',
+				// 	iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+				// 	borderColor: "#e034344d",
+				// 	buttonBgColor: "#E03434",
+				// 	okCallback: () => {
 						clearInterval(interval);
 
 						this.sosSetting({
 							val: val
 						});
-					},
-					buttonText: "解除",
-					showCancel: true,
-					buttonCancelText: '取消'
+				// 	},
+				// 	buttonText: "解除",
+				// 	showCancel: true,
+				// 	buttonCancelText: '取消'
 
-				});
+				// });
 			},
 			groupSetting(item, index) {
 				if (this.formData.sta_SOSType === 'sos') {
@@ -694,7 +694,9 @@
 
 						});
 				}
-				if (item.val === 'sos') {
+				
+				
+				let confirmTask=()=>{
 					this.showPop({
 						message: '确定' + (this.formData.sta_SOSType === 'sos' ? '关闭' : '开启') + '声光报警模式?',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -705,9 +707,19 @@
 						showCancel: true,
 						buttonCancelText: '取消'
 					});
+				}
+				if (item.val === 'sos') {
+					confirmTask();
 
 				} else if (item.val === 'sos_off') {
-					task();
+					
+					if(this.formData.sta_SOSType === 'sos'){
+						confirmTask();
+					}else{
+						task();
+					}
+					
+					
 				} else {
 
 					if (this.formData.sta_SOSType === 'sos') {