Merge branch 'master' into dev_fbl

src/page/accounts/statisticalDialog/edit.vue

 <template>
   <el-dialog
     custom-class="party-dialog"
-    title="新建统计账号"
+    title="编辑统计账号"
     :visible.sync="dialogVisible"
     width="468px"
     :before-close="handleClose"

src/page/system/log/platformlog.vue

@@ -79,7 +79,7 @@ export default {
         { prop: "operator", label: "操作者" },
         { prop: "operationType", label: "操作类型" },
         { prop: "operationObject", label: "操作对象" },
-        { prop: "operationIp", label: "设备Ip" },
+        { prop: "operationIp", label: "设备IP" },
       ],
       list: [],
       page: {

src/page/system/log/userlog.vue

@@ -84,7 +84,7 @@ export default {
         { prop: "operator", label: "操作者" },
         { prop: "operationType", label: "操作类型" },
         { prop: "operationObject", label: "操作对象" },
-        { prop: "operationIp", label: "设备Ip" },
+        { prop: "operationIp", label: "设备IP" },
       ],
       list: [],
       page: {

src/page/system/organ.vue

@@ -270,17 +270,21 @@ export default {
           let resData = res.data;
           if (res.status == 200) {
             if (resData.resultCode == 200) {
+              _this.$message({
+                type: "success",
+                message: resData.message,
+              });
               _this.getOrgTree();
             } else {
-              _this.$message.error(resData.msg || resData.message);
+              _this.$message.error(resData.msg || resData.message || "");
             }
           } else {
-            _this.$message.error(resData.msg || resData.message);
+            _this.$message.error(resData.msg || resData.message || "");
           }
         })
         .catch((err) => {
           console.log(err);
-          _this.$message.error(err.msg || err.message);
+          _this.$message.error(err.msg || err.message || "");
         });
     },
   },