|
@@ -151,15 +151,18 @@
|
|
start_time:function(){
|
|
start_time:function(){
|
|
// alert(this.start_time)
|
|
// alert(this.start_time)
|
|
},
|
|
},
|
|
|
|
+ report_type:function(newVal){
|
|
|
|
+ if(newVal){
|
|
|
|
+ var array123=['','1','2','3','4','5','6','7','16','128','131','130','129','17']
|
|
|
|
+ if(array123.indexOf(this.device_type)==-1){
|
|
|
|
+ this.device_type=''
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ },
|
|
device_type:function(newVal){
|
|
device_type:function(newVal){
|
|
-
|
|
|
|
if(newVal){
|
|
if(newVal){
|
|
-
|
|
|
|
this.deviceList({'company_code':uni.getStorageSync('selectedCode'),'device_type' :this.device_type });
|
|
this.deviceList({'company_code':uni.getStorageSync('selectedCode'),'device_type' :this.device_type });
|
|
-
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
},
|
|
},
|
|
@@ -315,16 +318,23 @@
|
|
url: this.id?'AlarmReport/edit':'AlarmReport/add',
|
|
url: this.id?'AlarmReport/edit':'AlarmReport/add',
|
|
data: params
|
|
data: params
|
|
})
|
|
})
|
|
- if (res.data.flag) {
|
|
|
|
|
|
+
|
|
|
|
+ if (!res.data.flag) {
|
|
|
|
+ uni.showToast({
|
|
|
|
+ title: "提交失败",
|
|
|
|
+ icon: "none"
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
uni.showToast({
|
|
uni.showToast({
|
|
title: "提交成功",
|
|
title: "提交成功",
|
|
});
|
|
});
|
|
- setTimeout(() => {
|
|
|
|
- uni.navigateTo({
|
|
|
|
- url: '/pages/accountManage/success/success',
|
|
|
|
- });
|
|
|
|
- }, 1000);
|
|
|
|
}
|
|
}
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ uni.redirectTo({
|
|
|
|
+ url: '/pages/setting/funReport/funReport',
|
|
|
|
+ });
|
|
|
|
+ }, 1000);
|
|
|
|
+
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|