Parcourir la source

去除清单功能 + 接口联调 + 调整文件结构

林倩 il y a 4 ans
Parent
commit
aeb909ce53
26 fichiers modifiés avec 344 ajouts et 262 suppressions
  1. 10 0
      src/api/data-auth.js
  2. 1 0
      src/components/data-auth/business-tag-tree.vue
  3. 7 19
      src/components/data-auth/check-list.vue
  4. 24 0
      src/components/data-auth/column-check-layer.vue
  5. 0 0
      src/components/data-auth/list-table-header.js
  6. 57 0
      src/components/data-auth/person-view-tree.vue
  7. 55 15
      src/components/data-auth/set-auth-tree.vue
  8. 0 0
      src/components/data-auth/set-auth.vue
  9. 95 0
      src/components/data-auth/table-check-layer.vue
  10. 9 5
      src/components/data-auth/table-column-auth.vue
  11. 0 0
      src/pages/data-auth-module/auth-object-manage/sort-code-manage/data-level.vue
  12. 2 2
      src/pages/data-auth-module/auth-object-manage/sort-code-manage/field-sort-code.vue
  13. 0 0
      src/pages/data-auth-module/auth-object-manage/sort-code-manage/index.scss
  14. 0 0
      src/pages/data-auth-module/auth-object-manage/sort-code-manage/index.vue
  15. 0 0
      src/pages/data-auth-module/auth-object-manage/sort-code-manage/safe-level-code.vue
  16. 0 0
      src/pages/data-auth-module/auth-object-manage/sort-code-manage/source-sort-code.vue
  17. 10 4
      src/pages/data-auth-module/data-permission-manage/data-auth-manage/business-tag-auth.vue
  18. 1 1
      src/pages/data-auth-module/data-permission-manage/data-auth-manage/org-auth.vue
  19. 5 3
      src/pages/data-auth-module/data-permission-manage/data-auth-manage/person-auth.vue
  20. 38 0
      src/pages/data-auth-module/data-permission-manage/data-auth-search/data-view.vue
  21. 0 33
      src/pages/data-auth-module/data-permission-manage/data-auth-search/detail-layer.vue
  22. 23 92
      src/pages/data-auth-module/data-permission-manage/data-auth-search/person-view.vue
  23. 0 24
      src/pages/data-auth-module/set-auth-tree.js
  24. 0 57
      src/pages/data-auth-module/tree.js
  25. 4 4
      src/router/modules/data-auth-module.js
  26. 3 3
      src/router/modules/empower-manage.js

+ 10 - 0
src/api/data-auth.js

@@ -131,5 +131,15 @@ export function getSelectList(params) {
     })
     })
 }
 }
 
 
+// 人员视角 - 授权列表
+export function userDataTreeByIdcard(authType, idcard) {
+    return request({
+        url: `${baseUrl}/userDataTreeByIdcard`,
+        params: {
+            authType,
+            idcard
+        }
+    })
+}
 
 
 
 

+ 1 - 0
src/pages/data-auth-module/data-permission-manage/data-auth-manage/business-tag-tree.vue → src/components/data-auth/business-tag-tree.vue

@@ -67,6 +67,7 @@ export default {
     methods: {
     methods: {
         handleSearch() {
         handleSearch() {
             this.$refs.tree.filter(this.keyword);
             this.$refs.tree.filter(this.keyword);
+            this.$emit("submitSearchTree");
         },
         },
         /**
         /**
          * @description: 点击节点
          * @description: 点击节点

+ 7 - 19
src/pages/data-auth-module/data-permission-manage/data-auth-manage/check-list.vue → src/components/data-auth/check-list.vue

@@ -1,6 +1,6 @@
 
 
 <!--
 <!--
-列清单
+列清单 - 通过页面配置
 @Author: linqian
 @Author: linqian
 @Date: 2021-04-08 14:25
 @Date: 2021-04-08 14:25
 -->
 -->
@@ -129,18 +129,6 @@ export default {
     },
     },
     data() {
     data() {
         return {
         return {
-            options: [
-                {
-                    value: "zhinan",
-                    label: "一级分类",
-                    children: [
-                        {
-                            value: "shejiyuanze",
-                            label: "二级分类"
-                        }
-                    ]
-                }
-            ],
             // 列授权 - tab, table配置
             // 列授权 - tab, table配置
             columnAuthTabList: [
             columnAuthTabList: [
                 {
                 {
@@ -285,15 +273,15 @@ export default {
         }
         }
     },
     },
     created() {
     created() {
-        if (this.type == "TABLE") {
+        // if (this.type == "TABLE") {
             this.tabList = this.tableAuthTabList;
             this.tabList = this.tableAuthTabList;
             this.activeTab = "sjfj";
             this.activeTab = "sjfj";
             this.initTableSelectList();
             this.initTableSelectList();
-        } else {
-            this.tabList = this.columnAuthTabList;
-            this.activeTab = "sjaqjb";
-        }
-        this.initTable();
+        // } else {
+        //     this.tabList = this.columnAuthTabList;
+        //     this.activeTab = "sjaqjb";
+        //     this.initColumnSelectList();
+        // }
     },
     },
     mounted() {}
     mounted() {}
 };
 };

+ 24 - 0
src/components/data-auth/column-check-layer.vue

@@ -0,0 +1,24 @@
+<!--
+列授权清单
+@Author: linqian
+@Date: 2021-04-21
+-->
+<template>
+    <div>
+        <!-- 表格 -->
+        <dg-table :data="tableList" paging-type="client" border row-key="id">
+                <dg-table-column prop="columnName" label="字段中文名称"></dg-table-column>
+                <dg-table-column prop="dataItemCode" label="数据项标识符"></dg-table-column>
+                <dg-table-column prop="columnClassifyName" label="字段分类名称"></dg-table-column>
+                <dg-table-column prop="dataSecurityLevelName" label="数据安全级别名称"></dg-table-column>
+        </dg-table>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        tableList: Array
+    }
+};
+</script>

+ 0 - 0
src/pages/data-auth-module/data-permission-manage/data-auth-manage/list-table-header.js → src/components/data-auth/list-table-header.js


+ 57 - 0
src/components/data-auth/person-view-tree.vue

@@ -0,0 +1,57 @@
+<!--
+人员视角 - 权限设置展示
+@Author: linqian
+@Date: 2021-04-21
+-->
+<template>
+    <div>
+        <dg-scrollbar>
+            <div class="auth-group" style="height: calc(100vh - 19rem)">
+                <template v-if="authData.length > 0">
+                    <set-auth-tree
+                        :showCheckbox="false"
+                        v-for="(item, index) in authData"
+                        :key="index"
+                        :treeData="item"
+                        :tab="tab"
+                    ></set-auth-tree>
+                </template>
+                <p v-else-if="authData.length == 0 && idcard">没有设置相关的数据权限。</p>
+                <p v-else>请选择人员。</p>
+            </div>
+        </dg-scrollbar>
+    </div>
+</template>
+
+<script>
+import setAuthTree from "@/components/data-auth/set-auth-tree";
+import { userDataTreeByIdcard } from "@/api/data-auth.js";
+
+export default {
+    components: {
+        setAuthTree
+    },
+    props: {
+        tab: String,
+        idcard: String
+    },
+    data() {
+        return {
+            authData: []
+        };
+    },
+    computed: {},
+    methods: {},
+    created() {
+        if (this.idcard) {
+            userDataTreeByIdcard(this.tab, this.idcard).then((res) => {
+                this.authData = res.data.content;
+            });
+        }
+    },
+    mounted() {}
+};
+</script>
+
+<style lang='scss'>
+</style>

+ 55 - 15
src/pages/data-auth-module/data-permission-manage/data-auth-manage/set-auth-tree.vue → src/components/data-auth/set-auth-tree.vue

@@ -7,8 +7,11 @@
     <div>
     <div>
         <div class="tree">
         <div class="tree">
             <p class="tree__title">
             <p class="tree__title">
-                {{ treeData.label }}(<span style="color: red">{{ selectNodesNum }}</span
-                >/{{ treeData.total }})
+                {{ treeData.label
+                }}<span v-if="showCheckbox"
+                    >(<span style="color: red">{{ selectNodesNum }}</span
+                    >/{{ treeData.total }})</span
+                >
             </p>
             </p>
             <div class="tree__content">
             <div class="tree__content">
                 <dg-tree
                 <dg-tree
@@ -16,9 +19,10 @@
                     node-key="id"
                     node-key="id"
                     :props="props"
                     :props="props"
                     :expand-on-click-node="false"
                     :expand-on-click-node="false"
-                    show-checkbox
+                    :show-checkbox="showCheckbox"
                     v-model="selectNodes"
                     v-model="selectNodes"
                     :data="treeData.nodes"
                     :data="treeData.nodes"
+                    :highlight-current="false"
                     @node-click="handleNodeClick"
                     @node-click="handleNodeClick"
                     @check="handleCheckTree"
                     @check="handleCheckTree"
                 >
                 >
@@ -27,7 +31,8 @@
                             <i class="el-icon-folder-opened" v-if="data.treeNode"></i>
                             <i class="el-icon-folder-opened" v-if="data.treeNode"></i>
                             <i class="el-icon-document" v-else></i>
                             <i class="el-icon-document" v-else></i>
                             <span>
                             <span>
-                                <span class="tree-node__name">{{ data.label }}</span>
+                                <span class="tree-node__name">{{ data.label }}</span> 
+                                 <span class="tree-node__operate" v-if="!data.treeNode && tab== 'TABLE'" @click="handleViewCheckList($event,data)">查看数据资源</span>
                                 <el-popover placement="top-start" width="400" trigger="hover" :open-delay="1000">
                                 <el-popover placement="top-start" width="400" trigger="hover" :open-delay="1000">
                                     <div class="tip-box">
                                     <div class="tip-box">
                                         <h3>{{ data.label }}</h3>
                                         <h3>{{ data.label }}</h3>
@@ -45,11 +50,21 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import tableCheckLayer from "./table-check-layer";
+
 export default {
 export default {
     props: {
     props: {
         treeData: {
         treeData: {
             type: Object
             type: Object
-        }
+        },
+        // true = 可勾选,数据授权使用
+        // false = 只读。 授权查询使用
+        showCheckbox: {
+            type: Boolean,
+            default: true
+        },
+        // 列授权 || 表授权
+        tab: String
     },
     },
     activated() {},
     activated() {},
     components: {},
     components: {},
@@ -102,7 +117,6 @@ export default {
         getSelectKeys() {
         getSelectKeys() {
             this.selectNodes = this.$refs.authTree.getCheckedKeys(true);
             this.selectNodes = this.$refs.authTree.getCheckedKeys(true);
             const selectNodes = this.$refs.authTree.getCheckedNodes(true);
             const selectNodes = this.$refs.authTree.getCheckedNodes(true);
-            console.log("选中的节点", selectNodes);
             this.selectNodesNum = this.selectNodes.length;
             this.selectNodesNum = this.selectNodes.length;
             const nodes = selectNodes.map((item) => {
             const nodes = selectNodes.map((item) => {
                 return {
                 return {
@@ -116,16 +130,37 @@ export default {
             });
             });
         },
         },
 
 
-        // 获取单个主体授权
-        getSubDataAuth() {}
+        // 查看清单
+        handleViewCheckList(e,data) {
+            
+            e.stopPropagation();
+            const vm = this;
+            const layer = this.$dgLayer({
+                title: "数据资源列表",
+                content: tableCheckLayer,
+                props: {
+                    tab: vm.tab,
+                    codeDataTypeStr: data.codeDataTypeStr
+                },
+                on: {
+                    success(params) {
+                        layer.close(layer.dialogIndex);
+                    }
+                },
+                cancel: function (index, layero) {
+                    // 关闭对应弹窗的ID
+                    layer.close(index);
+                    return false;
+                },
+                area: ["900px", "760px"]
+            });
+        }
     },
     },
     created() {
     created() {
-        this.selectNodes = this.treeData.selectNodes ? this.treeData.selectNodes.map(item => item.dataId) : [];
+        this.selectNodes = this.treeData.selectNodes ? this.treeData.selectNodes.map((item) => item.dataId) : [];
         this.selectNodesNum = this.selectNodes.length;
         this.selectNodesNum = this.selectNodes.length;
     },
     },
     mounted() {
     mounted() {
-        // this.$refs.authTree.setCheckedKeys(this.selectNodes, false);
-
     }
     }
 };
 };
 </script>
 </script>
@@ -154,14 +189,19 @@ export default {
         &__name {
         &__name {
             font-weight: bold;
             font-weight: bold;
         }
         }
+        &__operate {
+            color: #1890ff;
+            cursor: pointer;
+            margin-left: 50px;
+        }
     }
     }
 }
 }
 // /deep/.dg-tree .dg-tree-node.is-current > .el-tree-node__content {
 // /deep/.dg-tree .dg-tree-node.is-current > .el-tree-node__content {
 //     background: #fff;
 //     background: #fff;
 //     color: #1890ff;
 //     color: #1890ff;
 // }
 // }
-/deep/ .dg-tree-node .el-tree-node__content:hover {
-    background: #fff;
-    color: #1890ff;
-}
+// /deep/ .dg-tree-node .el-tree-node__content:hover {
+//     background: #fff;
+//     color: #1890ff;
+// }
 </style>
 </style>

+ 0 - 0
src/pages/data-auth-module/data-permission-manage/data-auth-manage/set-auth.vue → src/components/data-auth/set-auth.vue


+ 95 - 0
src/components/data-auth/table-check-layer.vue

@@ -0,0 +1,95 @@
+<!--
+表码详情
+@Author: linqian
+@Date: 2021-04-01 15:38
+-->
+<template>
+    <div>
+        <!-- 查询项 -->
+        <el-form :inline="true" class="search-form">
+            <el-form-item label="数据资源名称">
+                <el-input v-model="condition.resourceName.value"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <dg-button type="primary" icon="el-icon-search" @click="handleSearch">查询</dg-button>
+            </el-form-item>
+        </el-form>
+        <!-- 表格 -->
+        <dg-table ref="checkTable" url="/authsvr/v2/dataauth/dataDetailList" :condition="condition" border row-key="id">
+            <dg-table-column type="index" width="70" label="序号"></dg-table-column>
+            <dg-table-column prop="resourceName" label="数据资源名称"></dg-table-column>
+            <dg-table-column prop="tableCode" label="数据资源英文名称"></dg-table-column>
+            <dg-table-column prop="resourceCode" label="数据资源标识符"></dg-table-column>
+            <dg-table-column prop="resourceCode" label="数据资源标识符"></dg-table-column>
+            <dg-table-column label="操作" align="center" width="120">
+                <template slot-scope="{ row }">
+                    <div class="u-table__operation">
+                        <el-tooltip content="查看列授权清单" effect="dark" placement="top-end">
+                            <i class="el-icon-document" @click="handleViewColumnCheckList(row)"></i>
+                        </el-tooltip>
+                    </div>
+                </template>
+            </dg-table-column>
+        </dg-table>
+    </div>
+</template>
+
+<script>
+// 列授权清单弹框
+import columnCheckLayer from "./column-check-layer";
+export default {
+    props: {
+        tab: String,
+        codeDataTypeStr: String
+    },
+    components: {},
+    data() {
+        return {
+            condition: {
+                codeDataTypeStr: {
+                    value: "",
+                    op: "="
+                },
+                resourceName: {
+                    value: "",
+                    op: "like"
+                }
+            }
+        };
+    },
+    computed: {},
+    methods: {
+        handleViewColumnCheckList(row) {
+            const layer = this.$dgLayer({
+                title: "列授权清单列表",
+                content: columnCheckLayer,
+                props: {
+                    tableList: row.dataItems
+                },
+                on: {
+                    success(params) {
+                        layer.close(layer.dialogIndex);
+                    }
+                },
+                cancel: function (index, layero) {
+                    // 关闭对应弹窗的ID
+                    layer.close(index);
+                    return false;
+                },
+                area: ["900px", "760px"]
+            });
+        },
+        
+        handleSearch() {
+            this.$refs.checkTable.searchForm();
+        }
+    },
+    created() {
+        this.condition.codeDataTypeStr.value = this.codeDataTypeStr;
+    },
+    mounted() {}
+};
+</script>
+
+<style lang='scss'>
+</style>

+ 9 - 5
src/pages/data-auth-module/data-permission-manage/data-auth-manage/table-column-auth.vue → src/components/data-auth/table-column-auth.vue

@@ -9,7 +9,7 @@
             <div style="height: calc(100vh - 22rem)">
             <div style="height: calc(100vh - 22rem)">
                 <dg-scrollbar>
                 <dg-scrollbar>
                     <set-auth-tree
                     <set-auth-tree
-                        :attrType="tab"
+                        :tab="tab"
                         v-for="(item, index) in authData"
                         v-for="(item, index) in authData"
                         :key="index"
                         :key="index"
                         :treeData="item"
                         :treeData="item"
@@ -18,19 +18,23 @@
                 </dg-scrollbar>
                 </dg-scrollbar>
             </div>
             </div>
             <el-row class="property-wapper__right-btn">
             <el-row class="property-wapper__right-btn">
-                <el-button @click="handleViewAuthList" v-if="!showCheckListBtn">清单</el-button>
+                <!-- <el-button @click="handleViewAuthList" v-if="showCheckListBtn">清单</el-button> -->
                 <el-button @click="handleReset">重置</el-button>
                 <el-button @click="handleReset">重置</el-button>
                 <el-button type="primary" @click="handleSave">保存</el-button>
                 <el-button type="primary" @click="handleSave">保存</el-button>
             </el-row>
             </el-row>
         </div>
         </div>
-        <div v-else>无数据,请选中被设置对象。</div>
+        <div v-else>
+            <p v-if="subType == 'BUSINESS'">请选择标签。</p>
+            <p v-else-if="subType == 'ORG'">请选择机构。</p>
+            <p v-else>请选择人员。</p>
+        </div>
     </div>
     </div>
 </template>
 </template>
 
 
 <script>
 <script>
 import * as api from "@/api/data-auth.js";
 import * as api from "@/api/data-auth.js";
 import setAuthTree from "./set-auth-tree";
 import setAuthTree from "./set-auth-tree";
-import columnCheckList from "./check-list";
+import checkList from "./check-list";
 
 
 export default {
 export default {
     props: {
     props: {
@@ -56,7 +60,7 @@ export default {
             const vm = this;
             const vm = this;
             const layer = this.$dgLayer({
             const layer = this.$dgLayer({
                 title: "授权清单",
                 title: "授权清单",
-                content: columnCheckList,
+                content: checkList,
                 props: {
                 props: {
                     type: vm.tab,
                     type: vm.tab,
                     authTree: vm.authTree
                     authTree: vm.authTree

+ 0 - 0
src/pages/data-auth-module/sort-code-manage/data-level.vue → src/pages/data-auth-module/auth-object-manage/sort-code-manage/data-level.vue


+ 2 - 2
src/pages/data-auth-module/sort-code-manage/field-sort-code.vue → src/pages/data-auth-module/auth-object-manage/sort-code-manage/field-sort-code.vue

@@ -24,9 +24,9 @@
         <!-- 列表 -->
         <!-- 列表 -->
         <dg-table ref="table" :data="tableList" border row-key="id" paging-type="client">
         <dg-table ref="table" :data="tableList" border row-key="id" paging-type="client">
             <dg-table-column type="index" width="75" label="序号"></dg-table-column>
             <dg-table-column type="index" width="75" label="序号"></dg-table-column>
-            <dg-table-column prop="firstLevelCode" label="代码"></dg-table-column>
+            <dg-table-column prop="firstLevelCode" label="字段一级代码"></dg-table-column>
             <dg-table-column prop="firstLevelName" label="字段一级分类"></dg-table-column>
             <dg-table-column prop="firstLevelName" label="字段一级分类"></dg-table-column>
-            <dg-table-column prop="secondLevelCode" label="代码"></dg-table-column>
+            <dg-table-column prop="secondLevelCode" label="字段二级代码"></dg-table-column>
             <dg-table-column prop="secondLevelName" label="字段二级分类"></dg-table-column>
             <dg-table-column prop="secondLevelName" label="字段二级分类"></dg-table-column>
         </dg-table>
         </dg-table>
     </div>
     </div>

+ 0 - 0
src/pages/data-auth-module/sort-code-manage/index.scss → src/pages/data-auth-module/auth-object-manage/sort-code-manage/index.scss


+ 0 - 0
src/pages/data-auth-module/sort-code-manage/index.vue → src/pages/data-auth-module/auth-object-manage/sort-code-manage/index.vue


+ 0 - 0
src/pages/data-auth-module/sort-code-manage/safe-level-code.vue → src/pages/data-auth-module/auth-object-manage/sort-code-manage/safe-level-code.vue


+ 0 - 0
src/pages/data-auth-module/sort-code-manage/source-sort-code.vue → src/pages/data-auth-module/auth-object-manage/sort-code-manage/source-sort-code.vue


+ 10 - 4
src/pages/data-auth-module/data-permission-manage/data-auth-manage/property-auth.vue → src/pages/data-auth-module/data-permission-manage/data-auth-manage/business-tag-auth.vue

@@ -9,7 +9,7 @@
             <!-- 属性列表 -->
             <!-- 属性列表 -->
             <dg-col :span="5" class="property-wapper__left">
             <dg-col :span="5" class="property-wapper__left">
                 <dg-card header="业务域标签列表" class="org-card box-card">
                 <dg-card header="业务域标签列表" class="org-card box-card">
-                    <business-tag-tree ref="tree" class="u-pm__left" @handleGetNode="handleGetNode"></business-tag-tree>
+                    <business-tag-tree ref="tree" class="u-pm__left" @handleGetNode="handleGetNode" @submitSearchTree="handleClearSubId"></business-tag-tree>
                 </dg-card>
                 </dg-card>
             </dg-col>
             </dg-col>
             <!-- 权限设置 -->
             <!-- 权限设置 -->
@@ -21,8 +21,8 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import businessTagTree from "./business-tag-tree";
-import setAuth from "./set-auth";
+import businessTagTree from "@/components/data-auth/business-tag-tree";
+import setAuth from "@/components/data-auth/set-auth";
 
 
 export default {
 export default {
     components: {
     components: {
@@ -47,7 +47,13 @@ export default {
             this.key++
             this.key++
 
 
         },
         },
-        submitRootNode() {},
+         /**
+         * @description: 搜索标签树,清除授权数据
+         */
+        handleClearSubId() {
+            this.subId = "";
+            this.key++;
+        }
     },
     },
     created() {},
     created() {},
     mounted() {}
     mounted() {}

+ 1 - 1
src/pages/data-auth-module/data-permission-manage/data-auth-manage/org-auth.vue

@@ -30,7 +30,7 @@
 
 
 <script>
 <script>
 import propetyTree from "@/pages/common/tree";
 import propetyTree from "@/pages/common/tree";
-import setAuth from "./set-auth";
+import setAuth from "@/components/data-auth/set-auth";
 export default {
 export default {
     components: {
     components: {
         propetyTree,
         propetyTree,

+ 5 - 3
src/pages/data-auth-module/data-permission-manage/data-auth-manage/person-auth.vue

@@ -62,7 +62,7 @@
                     <!-- <dg-table-column type="selection" reserve-selection width="55"></dg-table-column> -->
                     <!-- <dg-table-column type="selection" reserve-selection width="55"></dg-table-column> -->
                     <dg-table-column type="index" width="70" label="序号"></dg-table-column>
                     <dg-table-column type="index" width="70" label="序号"></dg-table-column>
                     <dg-table-column prop="name" label="姓名"></dg-table-column>
                     <dg-table-column prop="name" label="姓名"></dg-table-column>
-                    <dg-table-column prop="idcard" label="身份证"></dg-table-column>
+                    <dg-table-column prop="idcard" label="身份证号码"></dg-table-column>
                     <dg-table-column prop="userType" label="类型" code="DM_USER_TYPE"></dg-table-column>
                     <dg-table-column prop="userType" label="类型" code="DM_USER_TYPE"></dg-table-column>
                 </dg-table>
                 </dg-table>
             </dg-card>
             </dg-card>
@@ -76,7 +76,7 @@
 <script>
 <script>
 import orgTree from "@/pages/common/tree";
 import orgTree from "@/pages/common/tree";
 import { staffUserPage } from "@/api/role-auth-info";
 import { staffUserPage } from "@/api/role-auth-info";
-import setAuth from "./set-auth"
+import setAuth from "@/components/data-auth/set-auth"
 export default {
 export default {
     components: { orgTree, setAuth },
     components: { orgTree, setAuth },
     data() {
     data() {
@@ -107,6 +107,8 @@ export default {
             this.clearSelectedNode = true;
             this.clearSelectedNode = true;
             this.searchPersonCondition.orgId.value = "";
             this.searchPersonCondition.orgId.value = "";
             this.$refs.personTable.searchForm();
             this.$refs.personTable.searchForm();
+            this.subId = "";
+            this.key++
         },
         },
 
 
         /**
         /**
@@ -114,7 +116,7 @@ export default {
          * @param {*} row
          * @param {*} row
          */
          */
         handleTableRowClick(row) {
         handleTableRowClick(row) {
-            this.subId = row.id;
+            this.subId = row.idcard;
             this.key++
             this.key++
         },
         },
         /**
         /**

+ 38 - 0
src/pages/data-auth-module/data-permission-manage/data-auth-search/data-view.vue

@@ -0,0 +1,38 @@
+<!--
+人员视角
+@Author: linqian
+@Date: 2021-04-22
+-->
+<template>
+    <div>
+        人员视角
+    </div>
+</template>
+
+<script>
+    export default {
+        components: {
+
+        },
+        data () {
+            return {
+
+            };
+        },
+        computed: {
+
+        },
+        methods: {
+
+        },
+        created() {
+
+        },
+        mounted() {
+
+        }
+}
+</script>
+
+<style lang='scss'>
+</style>

+ 0 - 33
src/pages/data-auth-module/data-permission-manage/data-auth-search/detail-layer.vue

@@ -1,33 +0,0 @@
-<!--
-表码详情
-@Author: linqian
-@Date: 2021-04-01 15:38
--->
-<template>
-    <div>
-        <dg-table :data="tableList" border row-key="id">
-            <dg-table-column type="index" width="70" label="序号"></dg-table-column>
-            <dg-table-column prop="name" label="数据资源名称"></dg-table-column>
-            <dg-table-column prop="name" label="数据资源英文名称"></dg-table-column>
-            <dg-table-column prop="name" label="数据资源标识符"></dg-table-column>
-        </dg-table>
-    </div>
-</template>
-
-<script>
-export default {
-    components: {},
-    data() {
-        return {
-            tableList: []
-        };
-    },
-    computed: {},
-    methods: {},
-    created() {},
-    mounted() {}
-};
-</script>
-
-<style lang='scss'>
-</style>

+ 23 - 92
src/pages/data-auth-module/data-permission-manage/data-auth-search/person-view.vue

@@ -23,7 +23,7 @@
             </dg-card>
             </dg-card>
         </dg-col>
         </dg-col>
         <!-- 人员列表区域 -->
         <!-- 人员列表区域 -->
-        <dg-col :span="7" class="property-wapper__center">
+        <dg-col :span="9" class="property-wapper__center">
             <dg-card class="box-card" header="人员列表">
             <dg-card class="box-card" header="人员列表">
                 <!-- 搜索栏 -->
                 <!-- 搜索栏 -->
                 <el-form :inline="true" class="search-form">
                 <el-form :inline="true" class="search-form">
@@ -52,44 +52,32 @@
                 >
                 >
                     <dg-table-column type="index" width="70" label="序号"></dg-table-column>
                     <dg-table-column type="index" width="70" label="序号"></dg-table-column>
                     <dg-table-column prop="name" label="姓名"></dg-table-column>
                     <dg-table-column prop="name" label="姓名"></dg-table-column>
-                    <dg-table-column prop="idcard" label="身份证"></dg-table-column>
+                    <dg-table-column prop="idcard" label="身份证号码"></dg-table-column>
                     <dg-table-column prop="orgName" label="单位名称"></dg-table-column>
                     <dg-table-column prop="orgName" label="单位名称"></dg-table-column>
                 </dg-table>
                 </dg-table>
             </dg-card>
             </dg-card>
         </dg-col>
         </dg-col>
         <!-- 权限设置 -->
         <!-- 权限设置 -->
-        <dg-col :span="12" class="property-wapper__right">
+        <dg-col :span="10" class="property-wapper__right">
             <dg-card class="box-card" header="权限设置">
             <dg-card class="box-card" header="权限设置">
-                <el-tabs v-model="activeName" @tab-click="handleClick">
-                    <el-tab-pane label="表授权" name="TABLE"></el-tab-pane>
-                    <el-tab-pane label="列授权" name="COLUMN"></el-tab-pane>
-                    <dg-scrollbar>
-                        <div class="auth-group" style="height: calc(100vh - 19rem)">
-                            <div v-for="(item, index) in sortCodeList" :key="index" class="auth-group__item">
-                                <p class="auth-group__item-subTitle">{{ item.title }}</p>
-                                <div v-for="(cItem, cIndex) in item.list" :key="cIndex" class="auth-group__item-list">
-                                    <i class="el-icon-document"></i><span class="list-title">{{ cItem.title }}</span
-                                    ><span class="list-content"
-                                        >(福建省厦门市数据资源表,福建省厦门市数据资源表,福建省厦门市数据资源表,福建省厦门市数据资源表,福建省厦门市数据资源表)</span
-                                    >
-                                    <span class="list-detail" @click="handleViewDetail(cItem)">详情</span>
-                                </div>
-                            </div>
-                        </div>
-                    </dg-scrollbar>
+                <el-tabs v-model="activeName">
+                    <el-tab-pane label="表授权" name="TABLE">
+                        <person-view-tree tab="TABLE" :idcard="idcard" :key="key"></person-view-tree>
+                    </el-tab-pane>
+                    <el-tab-pane label="列授权" name="COLUMN">
+                        <person-view-tree tab="COLUMN" :idcard="idcard" :key="key"></person-view-tree>
+                    </el-tab-pane>
                 </el-tabs>
                 </el-tabs>
             </dg-card>
             </dg-card>
         </dg-col>
         </dg-col>
     </dg-row>
     </dg-row>
 </template>
 </template>
 <script>
 <script>
-import codeTree from "../../tree.js";
-import detailLayer from "./detail-layer";
 import orgTree from "@/pages/common/tree";
 import orgTree from "@/pages/common/tree";
 import { staffUserPage } from "@/api/role-auth-info";
 import { staffUserPage } from "@/api/role-auth-info";
-import { dataAuthInfoByUserId } from "@/api/data-auth.js"
+import personViewTree from "@/components/data-auth/person-view-tree";
 export default {
 export default {
-    components: { orgTree },
+    components: { orgTree, personViewTree },
     data() {
     data() {
         return {
         return {
             // 激活的tab
             // 激活的tab
@@ -97,23 +85,19 @@ export default {
             rowStyle: {
             rowStyle: {
                 cursor: "pointer"
                 cursor: "pointer"
             },
             },
-            sortCodeList: codeTree,
             // 查询人员姓名
             // 查询人员姓名
             personUrl: staffUserPage,
             personUrl: staffUserPage,
             searchPersonCondition: {
             searchPersonCondition: {
                 orgId: { value: "", op: "" },
                 orgId: { value: "", op: "" },
                 name: { value: "", op: "like" }
                 name: { value: "", op: "like" }
             },
             },
-            clearSelectedNode: false
+            clearSelectedNode: false,
+            idcard: "",
+            key: 0
         };
         };
     },
     },
     computed: {},
     computed: {},
     methods: {
     methods: {
-        /**
-         * @description: 切换tab
-         * @param {*} tab
-         */
-        handleClick(tab) {},
         /**
         /**
          * @description: 搜索人员列表
          * @description: 搜索人员列表
          */
          */
@@ -121,6 +105,8 @@ export default {
             this.clearSelectedNode = true;
             this.clearSelectedNode = true;
             this.searchPersonCondition.orgId.value = "";
             this.searchPersonCondition.orgId.value = "";
             this.$refs.personTable.searchForm();
             this.$refs.personTable.searchForm();
+            this.idcard = "";
+            this.key++;
         },
         },
 
 
         /**
         /**
@@ -128,29 +114,9 @@ export default {
          * @param {*} row
          * @param {*} row
          */
          */
         handleTableRowClick(row) {
         handleTableRowClick(row) {
-           this.getAuthData(row.id);
-        },
-        /**
-         * @description: 点击码表详情,弹框
-         * @param {*} item
-         */
-        handleViewDetail(item) {
-            const layer = this.$dgLayer({
-                title: "详情",
-                content: detailLayer,
-                props: {},
-                on: {
-                    success(params) {
-                        layer.close(layer.dialogIndex);
-                    }
-                },
-                cancel: function (index, layero) {
-                    // 关闭对应弹窗的ID
-                    layer.close(index);
-                    return false;
-                },
-                area: ["880px", "720px"]
-            });
+            if (row.idcard == this.idcard) return;
+            this.idcard = row.idcard;
+            this.key++;
         },
         },
         /**
         /**
          * @description: 获取机构节点
          * @description: 获取机构节点
@@ -161,6 +127,8 @@ export default {
             if (oldValue !== id) {
             if (oldValue !== id) {
                 this.searchPersonCondition.orgId.value = id;
                 this.searchPersonCondition.orgId.value = id;
                 this.$refs.personTable.searchForm();
                 this.$refs.personTable.searchForm();
+                this.idcard = "";
+                this.key++;
             }
             }
         },
         },
         // 默认获取根节点
         // 默认获取根节点
@@ -169,21 +137,12 @@ export default {
                 this.handleGetNode({ id });
                 this.handleGetNode({ id });
             });
             });
         },
         },
-          /**
+        /**
          * @description: 设置清除选中节点标志
          * @description: 设置清除选中节点标志
          * @param {*} val
          * @param {*} val
          */
          */
         getClearNodesFlag(val) {
         getClearNodesFlag(val) {
             this.clearSelectedNode = val;
             this.clearSelectedNode = val;
-        },
-        getAuthData(userId) {
-            const params =  {
-                authType: "TABLE",
-                userId
-            }
-            dataAuthInfoByUserId(params).then(res => {
-                
-            })
         }
         }
     },
     },
     created() {},
     created() {},
@@ -237,32 +196,4 @@ export default {
         }
         }
     }
     }
 }
 }
-@media screen and (max-width: 1365px) {
-    .auth-group__item-list {
-        .list-content {
-            width: 400px;
-        }
-    }
-}
-@media screen and(max-width: 1560px) and (min-width: 1366px) {
-    .auth-group__item-list {
-        .list-content {
-            width: 450px;
-        }
-    }
-}
-@media screen and(max-width: 1670px) and (min-width: 1560px) {
-    .auth-group__item-list {
-        .list-content {
-            width: 500px;
-        }
-    }
-}
-@media screen and (max-width: 1800px) and (min-width: 1671px) {
-    .auth-group__item-list {
-        .list-content {
-            width: 580px;
-        }
-    }
-}
 </style>
 </style>

+ 0 - 24
src/pages/data-auth-module/set-auth-tree.js

@@ -1,24 +0,0 @@
-const tree = [
-    {
-        code: "DATA_CLASSIFY",
-        id: "DATA_CLASSIFY",
-        treeNode: true,
-        label: "全部",
-        path: "",
-        pid: null,
-        child: [
-            {
-                child: null,
-                code: "01",
-                id: "DATA_CLASSIFY|01",
-                isParent: false,
-                label: "公开",
-                path: "7F08CCC3C4984A2586C9D3F0A6B804E5",
-                pid: "DATA_CLASSIFY"
-            },
-         
-        ]
-    }
-];
-
-export default tree

+ 0 - 57
src/pages/data-auth-module/tree.js

@@ -1,57 +0,0 @@
-let codeTree = [];
-for (let i = 0; i < 2; i++) {
-    const obj = {
-        title: "数据分级代码表",
-        list: [
-            {
-                title: "公开",
-                list: [
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表"
-                ]
-            },
-            {
-                title: "公开",
-                list: [
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表"
-                ]
-            },
-            {
-                title: "公开",
-                list: [
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表"
-                ]
-            },
-            {
-                title: "公开",
-                list: [
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表",
-                    "福建省厦门市数据资源表"
-                ]
-            }
-        ]
-    };
-    codeTree.push(obj)
-}
-
-export default codeTree
-
-

+ 4 - 4
src/router/modules/data-auth-module.js

@@ -15,10 +15,10 @@ const componentsRouter = [
         meta: { title: "授权客体管理", icon: "el-icon-goods", noCache: true, permission: ["YHGLPT_YYGL"] },
         meta: { title: "授权客体管理", icon: "el-icon-goods", noCache: true, permission: ["YHGLPT_YYGL"] },
         children: [
         children: [
             {
             {
-                path: "code-manage",
-                component: () => import("@/pages/data-auth-module/sort-code-manage"),
-                name: "code-manage",
-                meta: { title: "数据分级分类表码管理", noCache: false, permission: ["YHGLPT_YYGL_CSGL"]}
+                path: "sort-code-manage",
+                component: () => import("@/pages/data-auth-module/auth-object-manage/sort-code-manage"),
+                name: "sort-code-manage",
+                meta: { title: "数据分级分类表码", noCache: false, permission: ["YHGLPT_YYGL_CSGL"]}
             }
             }
         ]
         ]
     },
     },

+ 3 - 3
src/router/modules/empower-manage.js

@@ -34,10 +34,10 @@ const componentRouter = {
             meta: { title: "数据授权管理", noCache: false, permission: ["YHGLPT_YYGL_CSGL"] },
             meta: { title: "数据授权管理", noCache: false, permission: ["YHGLPT_YYGL_CSGL"] },
             children: [
             children: [
                 {
                 {
-                    path: "property-auth",
+                    path: "business-tag-auth",
                     component: () =>
                     component: () =>
-                        import("@/pages/data-auth-module/data-permission-manage/data-auth-manage/property-auth.vue"),
-                    name: "property-auth",
+                        import("@/pages/data-auth-module/data-permission-manage/data-auth-manage/business-tag-auth.vue"),
+                    name: "business-tag-auth",
                     meta: { title: "标签授权", noCache: false, permission: ["YHGLPT_YYGL_CSGL"], layout: "page" }
                     meta: { title: "标签授权", noCache: false, permission: ["YHGLPT_YYGL_CSGL"], layout: "page" }
                 },
                 },
                 {
                 {