Merge branch 'master' of ssh://gitlab.91isoft.com:10022/hikvision/web-project

src/views/SchedulingPage/AnnualParamPage.vue

@@ -65,6 +65,11 @@ function handleDelete(val) {
           message: '删除成功.',
           type: 'success',
         })
+      }else {
+        ElMessage({
+          message: '删除失败.',
+          type: 'error',
+        })
       }
     }).catch(err => {
       ElMessage({
@@ -95,6 +100,11 @@ function onSubmit() {
         message: '修改成功.',
         type: 'success',
       })
+    }else {
+      ElMessage({
+        message: '修改失败.',
+        type: 'error',
+      })
     }
   }).catch(err=>{
     ElMessage({
@@ -111,12 +121,19 @@ function onAddSubmit() { // 提交新增
     }
   })
   addAnnualParam(addForm.value).then(res => {
-    getData()
-    handleClose()
-    ElMessage({
-      message: '新增成功.',
-      type: 'success',
-    })
+    if(res.success){
+      getData()
+      handleClose()
+      ElMessage({
+        message: '新增成功.',
+        type: 'success',
+      })
+    }else {
+      ElMessage({
+        message: '新增失败.',
+        type: 'error',
+      })
+    }
   }).catch(err=>{
     ElMessage({
       message: '新增失败.',

src/views/SchedulingPage/PhenomenonPage.vue

@@ -46,11 +46,18 @@ function omit(val){
       }
   ).then(()=>{
     deletePhenomenon(param).then(res=>{
-      getData()
-      ElMessage({
-        message: '删除成功.',
-        type: 'success',
-      })
+      if(res.success){
+        getData()
+        ElMessage({
+          message: '删除成功.',
+          type: 'success',
+        })
+      }else {
+        ElMessage({
+          message: '删除失败.',
+          type: 'error',
+        })
+      }
     }).catch(err=>{
       ElMessage({
         message: '删除失败.',
@@ -66,12 +73,20 @@ function handleClose(){
 } // 关闭弹窗
 function onReviseSubmit(){
   alterPhenomenon(reviseForm.value).then(res=>{
-    getData()
-    reviseWindowOpen.value = false
-    ElMessage({
-      message: '修改成功.',
-      type: 'success',
-    })
+    if(res.success){
+      getData()
+      reviseWindowOpen.value = false
+      ElMessage({
+        message: '修改成功.',
+        type: 'success',
+      })
+    }else {
+      ElMessage({
+        message: '修改失败.',
+        type: 'error',
+      })
+    }
+
   }).catch(err=>{
     ElMessage({
       message: '修改失败.',
@@ -81,12 +96,19 @@ function onReviseSubmit(){
 } // 修改表单提交
 function onAddSubmit(){
   addPhenomenon(addForm.value).then(res=>{
-    handleClose()
-    getData()
-    ElMessage({
-      message: '新增成功.',
-      type: 'success',
-    })
+    if(res.success){
+      handleClose()
+      getData()
+      ElMessage({
+        message: '新增成功.',
+        type: 'success',
+      })
+    }else {
+      ElMessage({
+        message: '新增失败.',
+        type: 'error',
+      })
+    }
   }).catch(err=>{
     ElMessage({
       message: '新增失败.',

src/views/SchedulingPage/WeatherManagePage.vue

@@ -39,12 +39,19 @@ const confirmRevise = val => { // 修改弹窗确认按钮事件
     // 该属性要么有一个正确的值，要么移除，否则报错
   }
   alterWeatherMagData(params).then(res=>{
-    getData()
-    reviseWindowOpen.value = false
-    ElMessage({
-      message: '修改成功.',
-      type: 'success',
-    })
+    if(res.success){
+      getData()
+      reviseWindowOpen.value = false
+      ElMessage({
+        message: '修改成功.',
+        type: 'success',
+      })
+    }else {
+      ElMessage({
+        message: '修改失败.',
+        type: 'error',
+      })
+    }
   }).catch(err=>{
     ElMessage({
       message: '修改失败.',
@@ -58,16 +65,21 @@ const confirmBind = val => {
   params.isAuto = params.isAuto === '自动模式' ? true : false
   params.isFixed = params.isFixed === '固定模式' ? true : false
   params.operateTime = getCurrentDateTime()
-  console.log(params)
   // 绑定，新增，和修改用的是同一个接口
   alterWeatherMagData(params).then(res=>{
-    console.log(res)
-    ElMessage({
-      message: '绑定成功.',
-      type: 'success',
-    })
-    getData()
-    bindWindowOpen.value = false
+    if(res.success){
+      ElMessage({
+        message: '绑定成功.',
+        type: 'success',
+      })
+      getData()
+      bindWindowOpen.value = false
+    }else {
+      ElMessage({
+        message: '绑定失败.',
+        type: 'error',
+      })
+    }
   }).catch(err=>{
     console.log(err)
     ElMessage({
@@ -96,12 +108,19 @@ function handleAddWinOpenClose(){
 function handleAdd(val){
   console.log("新增数据",val)
   alterWeatherMagData(val).then(res=>{
-    getData()
-    addWindowOpen.value = false
-    ElMessage({
-      message: '新增成功.',
-      type: 'success',
-    })
+    if(res.success){
+      getData()
+      addWindowOpen.value = false
+      ElMessage({
+        message: '新增成功.',
+        type: 'success',
+      })
+    }else {
+      ElMessage({
+        message: '新增失败.',
+        type: 'error',
+      })
+    }
   }).catch(err=>{
     ElMessage({
       message: '新增失败.',

src/views/SchedulingPage/WindManagePage.vue

@@ -40,11 +40,18 @@ function omit(val) {
   })
     .then(() => {
       deleteWind(param).then((res) => {
-        getData();
-        ElMessage({
-          message: "删除成功.",
-          type: "success",
-        });
+        if(res.success){
+          getData();
+          ElMessage({
+            message: "删除成功.",
+            type: "success",
+          });
+        }else {
+          ElMessage({
+            message: "删除失败.",
+            type: "error",
+          });
+        }
       }).catch((err) => {
             ElMessage({
               message: "删除失败.",
@@ -71,12 +78,20 @@ function handleClose() {
 function onReviseSubmit() {
   alterWind(reviseForm.value)
     .then((res) => {
-      getData();
-      handleClose();
-      ElMessage({
-        message: "修改成功.",
-        type: "success",
-      });
+      if(res.success){
+        getData();
+        handleClose();
+        ElMessage({
+          message: "修改成功.",
+          type: "success",
+        });
+      }else {
+        ElMessage({
+          message: "修改失败.",
+          type: "error",
+        });
+      }
+
     })
     .catch((err) => {
       ElMessage({
@@ -88,12 +103,20 @@ function onReviseSubmit() {
 function onAddSubmit() {
   addWind(addForm.value)
     .then((res) => {
-      getData();
-      handleClose();
-      ElMessage({
-        message: "新增成功.",
-        type: "success",
-      });
+      if(res.success){
+        getData();
+        handleClose();
+        ElMessage({
+          message: "新增成功.",
+          type: "success",
+        });
+      }else {
+        ElMessage({
+          message: "新增失败.",
+          type: "error",
+        });
+      }
+
     })
     .catch((err) => [
       ElMessage({