修改文字

config/dev.env.js

@@ -43,14 +43,6 @@ module.exports = merge(prodEnv, {
             // target: "http://10.11.0.48:8861",// 邱宇
             target: "http://10.254.11.203:8861"
 
-        },
-        "/dcuc": {
-            // target: "http://10.11.0.205:8888", // 易长安
-            // target: "http://10.11.1.155:8860" // 傅志强
-                // target: "http://dcucwebapp:8888", // 傅志强
-                target: "http://10.254.10.15:8860" // 傅志强
-            // target: "http://10.11.1.164:8860"
-
         }
     })
 });

src/components/data-auth/business-tag-tree.vue

@@ -20,6 +20,7 @@
                     node-key="code"
                     :props="props"
                     :data="treeData"
+                    default-expand-all
                     :expand-on-click-node="true"
                     :filter-node-method="filterNode"
                     style="padding-right: 15px"
@@ -87,7 +88,7 @@ export default {
         // 获取树
         getTree() {
             getBusinessTagTree().then((res) => {
-                this.treeData = res.data.content;
+                this.treeData = res.data.content.filter(item => item.child);
             });
         }
     },

src/components/data-auth/check-list.vue

@@ -9,7 +9,7 @@
         <el-tabs v-model="activeTab" type="card">
             <el-tab-pane :label="item.tabLabel" :name="item.tabName" v-for="(item, index) in tabList" :key="index">
                 <el-form :inline="true" class="search-form" :model="item.searchCondition">
-                    <!-- 列授权-数据安全级别搜索 -->
+                    <!-- 列权限-数据安全级别搜索 -->
                     <template v-if="activeTab == 'sjaqjb'">
                         <el-form-item label="数据安全等级">
                             <dg-select
@@ -56,7 +56,7 @@
                             <el-input v-model="item.searchCondition.resourceName.value"></el-input>
                         </el-form-item>
                     </template>
-                    <!-- 表授权-数据安全级别搜索 -->
+                    <!-- 表权限-数据安全级别搜索 -->
                     <!-- <template v-if="activeTab == 'sjaqjb2'">
                         <el-form-item label="数据安全级别">
                             <el-input v-model="item.searchCondition.level.value"></el-input>
@@ -129,7 +129,7 @@ export default {
     },
     data() {
         return {
-            // 列授权 - tab, table配置
+            // 列权限 - tab, table配置
             columnAuthTabList: [
                 {
                     tabName: "sjaqjb",
@@ -168,7 +168,7 @@ export default {
                     }
                 }
             ],
-            // 表授权 - tab、table配置
+            // 表权限 - tab、table配置
             tableAuthTabList: [
                 {
                     tabName: "sjfj",

src/components/data-auth/column-check-layer.vue

@@ -1,5 +1,5 @@
 <!--
-列授权清单
+列权限清单
 @Author: linqian
 @Date: 2021-04-21
 -->

src/components/data-auth/list-table-header.js

@@ -4,9 +4,9 @@
  @Date 2021-04-09 15:10
  */
 
-/******************************************** 列授权- 表头  ******************************/
+/******************************************** 列权限- 表头  ******************************/
 
-// 列授权- 数据安全等级和字段分类公用表头
+// 列权限- 数据安全等级和字段分类公用表头
 const columnPublicheader = [
     {
         label: "数据资源名称",
@@ -52,7 +52,7 @@ const zdflTableHeader = [
     ...columnPublicheader
 ];
 
-// 表授权- 公用表头
+// 表权限- 公用表头
 const tablePublicheader = [
     {
         label: "数据资源名称",
@@ -68,7 +68,7 @@ const tablePublicheader = [
     }
 ];
 
-/******************************************** 表授权- 表头  ******************************/
+/******************************************** 表权限- 表头  ******************************/
 
 // 数据分级-表头
 const sjfjTableHeader = [

src/components/data-auth/set-auth-tree.vue

@@ -20,19 +20,20 @@
                     :props="props"
                     :expand-on-click-node="false"
                     :show-checkbox="showCheckbox"
-                    v-model="selectNodes"
+                    v-model="selectkeys"
                     :data="treeData.nodes"
                     :highlight-current="false"
+                    :default-expanded-keys="defaultExpandKeys"
                     @node-click="handleNodeClick"
                     @check="handleCheckTree"
                 >
-                    <span slot-scope="{ node, data }" class="tree-node">
+                    <span slot-scope="{ data }" class="tree-node">
                         <span>
                             <i class="el-icon-folder-opened" v-if="data.treeNode"></i>
                             <i class="el-icon-document" v-else></i>
                             <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>
+                                 <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">
                                     <div class="tip-box">
                                         <h3>{{ data.label }}</h3>
@@ -51,7 +52,6 @@
 
 <script>
 import tableCheckLayer from "./table-check-layer";
-
 export default {
     props: {
         treeData: {
@@ -70,8 +70,6 @@ export default {
     components: {},
     data() {
         return {
-            // 节点总数
-
             props: {
                 value: "id",
                 label: "label",
@@ -80,15 +78,13 @@ export default {
                     return data.treeNode !== true;
                 }
             },
-            selectNodes: [],
-            selectNodesNum: 0
+            selectkeys: [],
+            selectNodesNum: 0,
+            // 默认展开的节点
+            defaultExpandKeys: []
         };
     },
-    computed: {
-        // selectNodesNum() {
-        //     return typeof this.selectNodes == "string" ? this.selectNodes.split(",").length : this.selectNodes.length;
-        // }
-    },
+    computed: {},
     methods: {
         /**
          * @description: 点击节点
@@ -96,7 +92,7 @@ export default {
          */
         handleNodeClick(node, a, b) {
             const { id, isParent, name } = node;
-            if (this.selectNodes.includes(id)) {
+            if (this.selectkeys.includes(id)) {
                 this.$refs.authTree.setChecked(id, false, true);
             } else {
                 this.$refs.authTree.setChecked(id, true, true);
@@ -115,9 +111,9 @@ export default {
          * @description: 获取选中的节点key
          */
         getSelectKeys() {
-            this.selectNodes = this.$refs.authTree.getCheckedKeys(true);
+            this.selectkeys = this.$refs.authTree.getCheckedKeys(true);
             const selectNodes = this.$refs.authTree.getCheckedNodes(true);
-            this.selectNodesNum = this.selectNodes.length;
+            this.selectNodesNum = this.selectkeys.length;
             const nodes = selectNodes.map((item) => {
                 return {
                     dataType: item.dataType,
@@ -152,13 +148,14 @@ export default {
                     layer.close(index);
                     return false;
                 },
-                area: ["900px", "760px"]
+                area: ["900px", "800px"]
             });
         }
     },
     created() {
-        this.selectNodes = this.treeData.selectNodes ? this.treeData.selectNodes.map((item) => item.dataId) : [];
-        this.selectNodesNum = this.selectNodes.length;
+        this.selectkeys = this.treeData.selectNodes ? this.treeData.selectNodes.map((item) => item.dataId) : [];
+        this.selectNodesNum = this.selectkeys.length;
+        this.defaultExpandKeys = [this.treeData.nodes[0].id];
     },
     mounted() {
     }

src/components/data-auth/table-check-layer.vue

@@ -20,11 +20,10 @@
             <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">
+                        <el-tooltip content="查看列权限清单" effect="dark" placement="top-end">
                             <i class="el-icon-document" @click="handleViewColumnCheckList(row)"></i>
                         </el-tooltip>
                     </div>
@@ -35,7 +34,7 @@
 </template>
 
 <script>
-// 列授权清单弹框
+// 列权限清单弹框
 import columnCheckLayer from "./column-check-layer";
 export default {
     props: {
@@ -61,7 +60,7 @@ export default {
     methods: {
         handleViewColumnCheckList(row) {
             const layer = this.$dgLayer({
-                title: "列授权清单列表",
+                title: "列权限清单列表",
                 content: columnCheckLayer,
                 props: {
                     tableList: row.dataItems

src/components/data-auth/table-column-auth.vue

@@ -1,5 +1,5 @@
 <!--
-表授权 - 标签授权、人员授权、机构授权 -公用
+表权限 - 标签授权、人员授权、机构授权 -公用
 @Author: linqian
 @Date: 2021-04-19 15:46 
 -->
@@ -144,7 +144,7 @@ export default {
             });
         },
         getAllDataTree() {
-            // 获取表授权
+            // 获取表权限
             return new Promise((resolve) => {
                 api.getAllDataTree({ attrType: this.tab }).then((res) => {
                     resolve(res.data.content);

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

@@ -7,7 +7,7 @@
     <div>
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
             <el-tab-pane label="数据分级表码" name="dataLevel"></el-tab-pane>
-            <el-tab-pane label="数据安全等级表码" name="safeLevelCode"></el-tab-pane>
+            <el-tab-pane label="数据安全级别表码" name="safeLevelCode"></el-tab-pane>
             <el-tab-pane label="数据资源分类表码" name="sourceSortCode"></el-tab-pane>
             <el-tab-pane label="字段分类表码" name="fieldSortCode"></el-tab-pane>
         </el-tabs>

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

@@ -1,5 +1,5 @@
 <!--
-数据安全等级表码列表
+数据安全级别表码列表
 @Author: linqian
 @Date: 2021-03-31 15:30:11
 -->
@@ -7,7 +7,7 @@
     <div>
         <!-- 搜索项 -->
         <el-form :inline="true" class="search-form">
-            <el-form-item label="数据安全等级">
+            <el-form-item label="数据安全级别">
                 <el-input v-model="keyword" clearable></el-input>
             </el-form-item>
             <el-form-item>
@@ -58,7 +58,7 @@ export default {
         handleImport() {
             const vm = this;
             const layer = this.$dgLayer({
-                title: "数据安全等级表码导入",
+                title: "数据安全级别表码导入",
                 content: importFile,
                 props: {
                     temp: "模板",

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

@@ -23,11 +23,11 @@
             </dg-card>
         </dg-col>
         <!-- 人员列表区域 -->
-        <dg-col :span="7" class="property-wapper__center">
+        <dg-col :span="8" class="property-wapper__center">
             <dg-card class="box-card" header="人员列表">
                 <!-- 搜索栏 -->
                 <el-form :inline="true" class="search-form">
-                    <el-form-item label="类型">
+                    <el-form-item label="用户类型">
                         <dg-select
                             style="width: 100px"
                             v-model="searchPersonCondition.userType.value"
@@ -63,12 +63,12 @@
                     <dg-table-column type="index" width="70" 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="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-card>
         </dg-col>
         <!-- 权限设置 -->
-        <dg-col :span="12" :key="key">
+        <dg-col :span="11" :key="key">
              <set-auth :subId="subId" subType="USER" saveApi="saveUserDataAuth"></set-auth>   
         </dg-col>
     </dg-row>

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

@@ -61,10 +61,10 @@
         <dg-col :span="10" class="property-wapper__right">
             <dg-card class="box-card" header="权限设置">
                 <el-tabs v-model="activeName">
-                    <el-tab-pane label="表授权" name="TABLE">
+                    <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">
+                    <el-tab-pane label="列权限" name="COLUMN">
                         <person-view-tree tab="COLUMN" :idcard="idcard" :key="key"></person-view-tree>
                     </el-tab-pane>
                 </el-tabs>