Merge branch 'master' of gitee.com:willamet/rn-bms-vue

src/views/firmware/firmwareUpdate/index.vue

@@ -105,7 +105,7 @@ export default {
       input: '',
       ids: [],
       // 表格数据
-      tableData: null,
+      tableData: [],
       // 总条数
       total: 0,
       // 查询参数

src/views/hardware/deviceList/index.vue

@@ -238,8 +238,8 @@ export default {
       form: {},
       nodeForm: {},
       // 表格数据
-      tableData: null,
-      nodeData: null,
+      tableData: [],
+      nodeData: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -409,7 +409,7 @@ export default {
       this.multiple = !selection.length;
     },
 
-    // nodeHandleSelectionChange(){},
+    // 节点多选框选中数据
     nodeHandleSelectionChange (selection) {
       this.nodeIds = selection.map((item) => item.id);
       this.nodeMultiple = !selection.length;
@@ -472,7 +472,7 @@ export default {
       })
       this.nodeOpen = true;
       this.title = "修改设备节点";
-      this.nodeForm = row;
+      this.nodeForm = Object.assign({}, row);
     },
     /** 提交按钮 */
     submitForm: function () {
@@ -486,7 +486,7 @@ export default {
                 this.open = false;
                 this.getList();
               } else {
-                this.msgSuccess(res.msg);
+                this.msgError(res.msg);
               }
 
             });
@@ -497,7 +497,7 @@ export default {
                 this.open = false;
                 this.getList();
               } else {
-                this.msgSuccess(res.msg);
+                this.msgError(res.msg);
               }
             });
           }
@@ -513,7 +513,7 @@ export default {
           this.nodeOpen = false;
           this.getList();
         } else {
-          this.msgSuccess(res.msg);
+          this.msgError(res.msg);
         }
       });
     },
@@ -532,7 +532,7 @@ export default {
           this.getList();
           this.msgSuccess("删除成功");
         } else {
-          this.msgSuccess(res.msg);
+          this.msgError(res.msg);
         }
       }).catch(res => { })
     },

src/views/hardware/productList/index.vue

@@ -144,7 +144,7 @@ export default {
   name: "ProductList",
   data () {
     return {
-      nodeData: null,
+      nodeData: [],
       nodeDialog: false,
       // 选中数组
       ids: [],
@@ -162,14 +162,6 @@ export default {
       open: false,
       nodeOpen: false,
       labelPosition: "right",
-      options: [
-        {
-          value: "选项1",
-        },
-        {
-          value: "选项2",
-        },
-      ],
       // 表单参数
       form: {},
       nodeForm: {},
@@ -177,7 +169,7 @@ export default {
       total: 0,
       value: "",
       // 表格数据
-      tableData: null,
+      tableData: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -299,7 +291,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate (row) {
       this.reset();
-      this.form = row;
+      this.form = Object.assign({}, row);
       this.open = true;
       this.title = "修改产品";
     },
@@ -308,7 +300,7 @@ export default {
     handleUpdatenode (row) {
       this.reset();
       this.nodeOpen = true;
-      this.nodeForm = row;
+      this.nodeForm = Object.assign({}, row);;
       this.title = "修改产品节点";
     },
     /** 提交按钮 */
@@ -322,7 +314,7 @@ export default {
                 this.open = false;
                 this.getList();
               } else {
-                this.msgSuccess(res.msg);
+                this.msgError(res.msg);
               }
             });
           } else {
@@ -332,7 +324,7 @@ export default {
                 this.open = false;
                 this.getList();
               } else {
-                this.msgSuccess(res.msg);
+                this.msgError(res.msg);
               }
             });
           }
@@ -347,7 +339,7 @@ export default {
           this.nodeOpen = false;
           this.getList();
         } else {
-          this.msgSuccess(res.msg);
+          this.msgError(res.msg);
         }
       });
     },
@@ -367,7 +359,7 @@ export default {
             this.getList();
             this.msgSuccess("删除成功");
           } else {
-            this.msgSuccess(res.msg);
+            this.msgError(res.msg);
           }
         })
         .catch((res) => { });
@@ -389,7 +381,7 @@ export default {
             this.getListnode(row);
             this.msgSuccess("删除成功");
           } else {
-            this.msgSuccess(res.msg);
+            this.msgError(res.msg);
           }
         })
         .catch((res) => { });
@@ -410,7 +402,7 @@ export default {
             this.getListnode(...this.nodeData);
             this.msgSuccess("删除成功");
           } else {
-            this.msgSuccess(res.msg);
+            this.msgError(res.msg);
           }
         })
         .catch((res) => { });

src/views/hardware/projectList/index.vue

@@ -98,7 +98,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 表格数据
-      tableData: null,
+      tableData: [],
       // 表单参数
       form: {},
       rules: {
@@ -200,7 +200,7 @@ export default {
             this.getList();
             this.msgSuccess("删除成功");
           } else {
-            this.msgSuccess(res.msg);
+            this.msgError(res.msg);
           }
         })
         .catch((res) => { });
@@ -218,7 +218,7 @@ export default {
                 this.open = false;
                 this.getList();
               } else {
-                this.msgSuccess(res.msg);
+                this.msgError(res.msg);
               }
             });
           } else {
@@ -228,7 +228,7 @@ export default {
                 this.open = false;
                 this.getList();
               } else {
-                this.msgSuccess(res.msg);
+                this.msgError(res.msg);
               }
             });
           }

src/views/system/area/index.vue

@@ -65,7 +65,7 @@ export default {
       open: false,
       areaOpen: false,
       // 表格数据
-      tableData: null,
+      tableData: [],
       areaData: [], // 大区省份
       provinceData: [], // 所有省份
       // 表单参数
@@ -135,7 +135,7 @@ export default {
     // 修改大区
     editArea (row) {
       this.areaOpen = true;
-      this.areaForm = row;
+      this.areaForm = Object.assign({}, row);
       this.title = "修改大区";
     },
 
@@ -190,8 +190,6 @@ export default {
         })
         .catch((res) => { });
     },
-
-
   }
 }
 </script>