Merge branch 'dev_1.0.0' of http://192.168.10.28:3000/Yaxin/know_sub_web into dev_1.0.0

src/views/knowledgeCentre/submission/MainTemplate.vue

@@ -6,7 +6,7 @@ import { Plus } from "@element-plus/icons-vue";
 import WangEditor from "@/components/WangEditor/index.vue";
 import { useKnowledgeCentreStoreHooks } from "@/store/modules/knowledgeCentre";
 import { message } from "@/utils/message";
-import { getUserInfo } from "@/utils/auth";
+import { getUserInfo, getToken } from "@/utils/auth";
 const ruleFormRef = ref();
 const formData = reactive({
   operate: "",
@@ -244,6 +244,9 @@ onMounted(() => {
                   :file-list="formData.fileList"
                   :limit="5"
                   multiple
+                  :headers="{
+                    token: getToken()
+                  }"
                   action="/know-sub/file/upload"
                   :on-success="handleSuccess"
                   :on-remove="handleRemove"

src/views/systemManagement/accountManagement/compontents/ruleSet.vue

@@ -6,8 +6,32 @@
       <div class="title_details">权限详情</div>
     </div>
     <div class="content">
-      <div class="content-item" v-for="(item, index) in dataList" :key="index">
-        1
+      <div class="content_item" v-for="(item, index) in dataList" :key="index">
+        <div class="content_item_type">{{ item.page }}</div>
+        <div class="content_item_page">
+          <el-checkbox
+            class="content_item_page_item"
+            v-for="(items, i) in item.list"
+            :label="items.page"
+            :key="i"
+            size="large"
+          />
+        </div>
+        <div class="content_item_btns">
+          <div
+            class="content_item_btns_item"
+            v-for="(items, i) in item.list"
+            :label="items.page"
+            :key="i"
+          >
+            <el-checkbox
+              v-for="(btns, j) in items.list"
+              :label="btns.btn"
+              :key="j"
+              size="large"
+            />
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -24,33 +48,159 @@ const dataList = ref([
         list: []
       }
     ]
+  },
+  {
+    page: "知识中心",
+    list: [
+      {
+        page: "知识报送",
+        list: [
+          {
+            btn: "详情"
+          },
+          {
+            btn: "编辑"
+          },
+          {
+            btn: "知识报送"
+          },
+          {
+            btn: "撤回"
+          },
+          {
+            btn: "删除"
+          },
+          {
+            btn: "流转记录"
+          }
+        ]
+      },
+      {
+        page: "知识审批",
+        list: [
+          {
+            btn: "详情"
+          },
+          {
+            btn: "审批通过"
+          },
+          {
+            btn: "审批驳回"
+          },
+          {
+            btn: "批量通过"
+          },
+          {
+            btn: "批量驳回"
+          },
+          {
+            btn: "流转记录"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    page: "业务管理",
+    list: [
+      {
+        page: "流程配置",
+        list: []
+      },
+      {
+        page: "统计分析",
+        list: []
+      }
+    ]
+  },
+  {
+    page: "系统管理",
+    list: [
+      {
+        page: "账号管理",
+        list: []
+      },
+      {
+        page: "子库管理",
+        list: []
+      },
+      {
+        page: "字典配置",
+        list: []
+      }
+    ]
   }
 ]);
 </script>
 <style lang="scss" scoped>
 .ruleSet {
-  padding: 16px 32px;
+  margin: 16px 32px;
+  border-top: 1px solid #dfe1e2;
+  border-left: 1px solid #dfe1e2;
+  border-right: 1px solid #dfe1e2;
   .title {
     display: flex;
-    height: 50px;
+
     background: #f2f6fa;
     align-items: center;
     font-size: 16px;
     color: #333333;
     .title_type {
       width: 160px;
+      height: 50px;
       text-align: center;
+      line-height: 50px;
       border-right: 1px solid #dfe1e2;
     }
     .titel_page {
       width: 168px;
+      height: 50px;
       text-align: center;
+      line-height: 50px;
       border-right: 1px solid #dfe1e2;
     }
     .title_details {
       flex: 1;
+      height: 50px;
+      line-height: 50px;
       text-align: center;
-      border-right: 1px solid #dfe1e2;
+    }
+  }
+  .content {
+    .content_item {
+      display: flex;
+      .content_item_type {
+        width: 160px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-right: 1px solid #dfe1e2;
+        border-bottom: 1px solid #dfe1e2;
+      }
+      .content_item_page {
+        display: flex;
+        width: 168px;
+        border-right: 1px solid #dfe1e2;
+        flex-direction: column;
+        .content_item_page_item {
+          padding: 16px 0 16px 40px;
+          border-bottom: 1px solid #dfe1e2;
+          width: 100%;
+        }
+      }
+      .content_item_btns {
+        display: flex;
+        flex-direction: column;
+        border-bottom: 1px solid #dfe1e2;
+        flex: 1;
+        .content_item_btns_item {
+          display: flex;
+          padding-left: 40px;
+          // border-bottom: 1px solid #dfe1e2;
+          // border-right: 1px solid #dfe1e2;
+          width: 100%;
+        }
+      }
     }
   }
 }

src/views/systemManagement/accountManagement/index.vue

@@ -298,7 +298,7 @@ const deleteName = (type: any) => {
 };
 //角色权限
 const handleRolePermission = row => {
-  console.log(row);
+  roleSetVisible.value = true;
 };
 //状态切换
 const changeUserStatus = async row => {