From c38a3bb6a9cb89297356a1c97ffe87f5ed165c89 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 25 十月 2023 09:51:09 +0800
Subject: [PATCH] 编码规则删除码段提示修改,前端按钮缓存结构修改上传

---
 Source/UBCS-WEB/src/page/login/userlogin.vue |  215 +++++++++++++++++++++++++++--------------------------
 Source/UBCS-WEB/src/views/code/code.vue      |    4 +
 Source/UBCS-WEB/src/views/wel/Statistic.vue  |    2 
 Source/UBCS-WEB/src/store/modules/user.js    |   18 ++++
 4 files changed, 130 insertions(+), 109 deletions(-)

diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 441ce6d..2bb86b9 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -157,113 +157,114 @@
   created() {
     this.getTenant();
     //杩欓噷鏄祻瑙堝櫒鐨勪竴涓猙ug锛岀獊鐒跺嚭鐜扮殑鐩墠鎵句笉鍒板師鍥狅紝鏂扮殑娴忚鍣ㄦ墦寮�姝ら」鐩�俵ocalStorage浼氬皯瀛樺偍涓�涓悕涓簊aber-permission鐨勬暟鎹紝灏戜簡杩欐潯鏁版嵁绉熸埛绠$悊鐣岄潰浼氱己灏戝嚑涓寜閽拰鏍峰紡
-    localStorage.setItem("saber-permission", JSON.stringify({
-      "dataType": "object", "content": {
-        "flow_model_create": true,
-        "flow_model_update": true,
-        "flow_model_deploy": true,
-        "flow_model_download": true,
-        "flow_model_delete": true,
-        "work_start_flow": true,
-        "work_start_image": true,
-        "oss_add": true,
-        "oss_edit": true,
-        "oss_delete": true,
-        "oss_view": true,
-        "oss_enable": true,
-        "role_add": true,
-        "role_edit": true,
-        "role_delete": true,
-        "role_view": true,
-        "notice_add": true,
-        "notice_edit": true,
-        "notice_delete": true,
-        "notice_view": true,
-        "user_add": true,
-        "user_edit": true,
-        "user_delete": true,
-        "user_role": true,
-        "user_reset": true,
-        "user_view": true,
-        "log_usual_view": true,
-        "code_add": true,
-        "code_edit": true,
-        "code_delete": true,
-        "code_view": true,
-        "region_add": true,
-        "region_delete": true,
-        "region_import": true,
-        "region_export": true,
-        "region_debug": true,
-        "work_claim_sign": true,
-        "work_claim_detail": true,
-        "work_claim_follow": true,
-        "work_todo_handle": true,
-        "work_todo_detail": true,
-        "work_todo_follow": true,
-        "data_scope_setting": true,
-        "datasource_add": true,
-        "datasource_edit": true,
-        "datasource_delete": true,
-        "datasource_view": true,
-        "attach_upload": true,
-        "attach_download": true,
-        "attach_delete": true,
-        "dept_add": true,
-        "dept_edit": true,
-        "dept_delete": true,
-        "dept_view": true,
-        "log_api_view": true,
-        "flow_manager_state": true,
-        "flow_manager_image": true,
-        "flow_manager_remove": true,
-        "work_send_detail": true,
-        "work_send_follow": true,
-        "sms_add": true,
-        "sms_edit": true,
-        "sms_delete": true,
-        "sms_view": true,
-        "sms_enable": true,
-        "api_scope_setting": true,
-        "log_error_view": true,
-        "post_add": true,
-        "post_edit": true,
-        "post_delete": true,
-        "post_view": true,
-        "flow_follow_delete": true,
-        "work_done_detail": true,
-        "work_done_follow": true,
-        "dict_add": true,
-        "dict_edit": true,
-        "dict_delete": true,
-        "dict_view": true,
-        "dictbiz_add": true,
-        "dictbiz_edit": true,
-        "dictbiz_delete": true,
-        "dictbiz_view": true,
-        "menu_add": true,
-        "menu_edit": true,
-        "menu_delete": true,
-        "menu_view": true,
-        "topmenu_add": true,
-        "topmenu_edit": true,
-        "topmenu_delete": true,
-        "topmenu_view": true,
-        "topmenu_setting": true,
-        "param_add": true,
-        "param_edit": true,
-        "param_delete": true,
-        "param_view": true,
-        "tenant_add": true,
-        "tenant_edit": true,
-        "tenant_delete": true,
-        "tenant_view": true,
-        "client_add": true,
-        "client_edit": true,
-        "client_delete": true,
-        "client_view": true
-      }, "datetime": 1678352291697
-    }))
+    // localStorage.setItem("saber-permission", JSON.stringify({
+    //   "dataType": "object", "content": {
+    //     "flow_model_create": true,
+    //     "flow_model_update": true,
+    //     "flow_model_deploy": true,
+    //     "flow_model_download": true,
+    //     "flow_model_delete": true,
+    //     "work_start_flow": true,
+    //     "work_start_image": true,
+    //     "oss_add": true,
+    //     "oss_edit": true,
+    //     "oss_delete": true,
+    //     "oss_view": true,
+    //     "oss_enable": true,
+    //     "role_add": true,
+    //     "role_edit": true,
+    //     "role_delete": true,
+    //     "role_view": true,
+    //     "notice_add": true,
+    //     "notice_edit": true,
+    //     "notice_delete": true,
+    //     "notice_view": true,
+    //     "user_add": true,
+    //     "user_edit": true,
+    //     "user_delete": true,
+    //     "user_role": true,
+    //     "user_reset": true,
+    //     "user_view": true,
+    //     "log_usual_view": true,
+    //     "code_add": true,
+    //     "code_edit": true,
+    //     "code_delete": true,
+    //     "code_view": true,
+    //     "region_add": true,
+    //     "region_delete": true,
+    //     "region_import": true,
+    //     "region_export": true,
+    //     "region_debug": true,
+    //     "work_claim_sign": true,
+    //     "work_claim_detail": true,
+    //     "work_claim_follow": true,
+    //     "work_todo_handle": true,
+    //     "work_todo_detail": true,
+    //     "work_todo_follow": true,
+    //     "data_scope_setting": true,
+    //     "datasource_add": true,
+    //     "datasource_edit": true,
+    //     "datasource_delete": true,
+    //     "datasource_view": true,
+    //     "attach_upload": true,
+    //     "attach_download": true,
+    //     "attach_delete": true,
+    //     "dept_add": true,
+    //     "dept_edit": true,
+    //     "dept_delete": true,
+    //     "dept_view": true,
+    //     "log_api_view": true,
+    //     "flow_manager_state": true,
+    //     "flow_manager_image": true,
+    //     "flow_manager_remove": true,
+    //     "work_send_detail": true,
+    //     "work_send_follow": true,
+    //     "sms_add": true,
+    //     "sms_edit": true,
+    //     "sms_delete": true,
+    //     "sms_view": true,
+    //     "sms_enable": true,
+    //     "api_scope_setting": true,
+    //     "log_error_view": true,
+    //     "post_add": true,
+    //     "post_edit": true,
+    //     "post_delete": true,
+    //     "post_view": true,
+    //     "flow_follow_delete": true,
+    //     "work_done_detail": true,
+    //     "work_done_follow": true,
+    //     "dict_add": true,
+    //     "dict_edit": true,
+    //     "dict_delete": true,
+    //     "dict_view": true,
+    //     "dictbiz_add": true,
+    //     "dictbiz_edit": true,
+    //     "dictbiz_delete": true,
+    //     "dictbiz_view": true,
+    //     "menu_add": true,
+    //     "menu_edit": true,
+    //     "menu_delete": true,
+    //     "menu_view": true,
+    //     "topmenu_add": true,
+    //     "topmenu_edit": true,
+    //     "topmenu_delete": true,
+    //     "topmenu_view": true,
+    //     "topmenu_setting": true,
+    //     "param_add": true,
+    //     "param_edit": true,
+    //     "param_delete": true,
+    //     "param_view": true,
+    //     "tenant_add": true,
+    //     "tenant_edit": true,
+    //     "tenant_delete": true,
+    //     "tenant_view": true,
+    //     "client_add": true,
+    //     "client_edit": true,
+    //     "client_delete": true,
+    //     "client_view": true
+    //   }, "datetime": 1678352291697
+    // }))
+  
   },
   mounted() {
     this.$axios.get('/api/ubcs-system/tenant/tenant-map').then(res => {
diff --git a/Source/UBCS-WEB/src/store/modules/user.js b/Source/UBCS-WEB/src/store/modules/user.js
index ac03016..5eb70d5 100644
--- a/Source/UBCS-WEB/src/store/modules/user.js
+++ b/Source/UBCS-WEB/src/store/modules/user.js
@@ -227,7 +227,7 @@
           const data = res.data.data;
           // console.log(data);
           commit('SET_PERMISSION', data);
-          resolve();
+          resolve()
         })
       })
     },
@@ -283,6 +283,22 @@
     SET_ROLES: (state, roles) => {
       state.roles = roles;
     },
+    SET_PERMISSION: (state, permission) => {
+      let permission_new = {};
+      permission.forEach(item => {
+        //console.log(item)
+        let children = {};
+        if (item.children && item.children.length > 0) {
+          item.children.forEach(child => {
+            Vue.set(children, child.code, true);
+          });
+        }
+        Vue.set(permission_new, item.code, children);
+      });
+      //console.log(permission_new)
+      state.permission = permission_new;
+      setStore({name: "saber-permission", content: permission_new});
+    },
 
   }
 
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 3286013..1c397cf 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -2934,6 +2934,10 @@
       if (!this.tipsMessage(this.selectionBasicList)) {
         return;
       }
+      if (this.selectionBasicList[0].lcStatus != "Editing") {
+        this.$message.warning('缂栫爜瑙勫垯鐘舵�佷笉鏄�"缂栬緫涓�"锛屼笉鍏佽鍒犻櫎鐮佹!');
+        return;
+      }
       let oid = this.selectionBasicList[0].oid;
       this.$confirm("鏄惁鍒犻櫎杩欐潯鏁版嵁锛熷鏋滆寮曠敤灏嗕笉鑳借鍒犻櫎锛�", {
         confirmButtonText: "纭畾",
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index 741d0bd..3a931d8 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -97,7 +97,7 @@
     FontInfo() {
       this.$nextTick(() => {
         const dataFatherBox = this.$refs.dataBox.$el;
-        console.log(dataFatherBox);
+        // console.log(dataFatherBox);
         this.$nextTick(() => {
           setTimeout(() => {
             //瀛椾綋

--
Gitblit v1.9.3