字段统一

src/api/admin-manage.js

@@ -36,12 +36,12 @@ export function saveMenuRange(data) {
 // 非管理员警员列表
 export const tableUnAdminPolices = "/usersvr/v2/admin/unAdminPolices";
 
-//管理员管理范围--树形
+// 管理员管理范围--树形
 export function orgRange(data) {
     // return axios.post(`/usersvr/admin/right/range`, data);
     return axios.post(`/orgsvr/v2/org/tree/admin`, data);
 }
-//管理员菜单权限-树形
+// 管理员菜单权限-树形
 export function menuRange(data) {
     return axios.post(`/usersvr/v2/admin/meun/range`, data);
 }
@@ -54,8 +54,3 @@ export function getAllMenu(id) {
     return axios.get(`/usersvr/v2/admin/allMenu/${id}`);
 }
 
-
-// 授权管理员
-// const baseAuth = `/usersvr/auth/admin`
-
-export const authTable = `/usersvr/auth/admins`

src/pages/admin-manage/DataConfig.js

@@ -39,7 +39,6 @@ const conditionForm = [
     type: 'APP',
     component: 'SelectOrgTree',
     placeholder: '请选择单位名称',
-    filterable: false
   }
 ];
 const tableHeader = [

src/pages/application-manage/app-manage/detail.vue

@@ -82,7 +82,7 @@
                     <el-form-item label="建设单位负责人姓名" prop="jgFzr">
                         <div class="u-detail__text">{{ sizeForm.jgFzr }}</div>
                     </el-form-item>
-                    <el-form-item label="应用负责人" prop="fzr">
+                    <el-form-item label="应用负责人姓名" prop="fzr">
                         <div class="u-detail__text">{{ sizeForm.fzr }}</div>
                     </el-form-item>
                     <el-form-item label="应用管理员" prop="managerName">

src/pages/application-manage/app-manage/editor.vue

@@ -166,8 +166,8 @@
                             maxlength="5"
                         />
                     </el-form-item>
-                    <el-form-item label="应用负责人" prop="fzr">
-                        <el-input v-model.trim="sizeForm.fzr" placeholder="请输入应用负责人" clearable maxlength="25" />
+                    <el-form-item label="应用负责人姓名" prop="fzr">
+                        <el-input v-model.trim="sizeForm.fzr" placeholder="请输入应用负责人姓名" clearable maxlength="25" />
                     </el-form-item>
                     <el-form-item label="应用管理员" prop="managerName">
                         <el-input
@@ -297,7 +297,7 @@ export default {
                 managerDescribe: "", // 应用描述
                 jgFzr: "", // *建设单位负责人姓名
                 jgFzrPhone: "", // *建设单位负责人联系电话
-                fzr: "", // *应用负责人
+                fzr: "", // *应用负责人姓名
                 fzrPhone: "", // *负责人联系电话
                 managerName: "", // 应用管理员
                 managerPhone: "", // 管理员联系电话
@@ -318,7 +318,7 @@ export default {
                 manufacturerId: [{ required: true, message: "请选择承建厂商", trigger: "change" }],
                 jgFzr: [{ required: true, message: "请输入建设单位负责人姓名", trigger: "blur" }],
                 jgFzrPhone: [{ required: true, validator: checkPhone, trigger: "blur" }],
-                fzr: [{ required: true, message: "请输入应用负责人", trigger: "blur" }],
+                fzr: [{ required: true, message: "请输入应用负责人姓名", trigger: "blur" }],
                 fzrPhone: [{ required: true, validator: checkPhone, trigger: "blur" }]
                 // managerName: [{ required: true, message: "请输入应用管理员", trigger: "blur" }],
                 // managerPhone: [{ required: true, validator: checkPhone, trigger: "blur" }],

src/pages/application-manage/app-manage/index.vue

@@ -154,7 +154,7 @@ export default {
       titleData: [
         { label: '应用名称', prop: 'applyName', width: 120 },
         { label: '应用代码', prop: 'applyCode', width: 120 },
-        { label: '应用负责人', prop: 'fzr', width: 120 },
+        { label: '应用负责人姓名', prop: 'fzr', width: 120 },
         { label: '应用负责人电话', prop: 'fzrPhone', width: 140 },
         { label: '建设单位负责人', prop: 'jgFzr', width: 140 },
         { label: '建设单位负责人电话', prop: 'jgFzrPhone', width: 180 },

src/pages/application-manage/vendor-manage/index.vue

@@ -60,7 +60,7 @@ export default {
         { label: '承建单位', prop: 'manufacturerName' },
         { label: '承建单位负责人', prop: 'name' },
         { label: '负责人联系电话', prop: 'phone' },
-        { label: '负责人身份证', prop: 'idcard' },
+        { label: '负责人身份证号码', prop: 'idcard' },
         { label: '承建单位地址', prop: 'address' }
       ],
       pageOptList: ['新增'],

src/pages/authorization-manage/author-role-manage.vue

@@ -112,7 +112,7 @@ export default {
             titleData: [
                 { label: "角色名称", prop: "name" },
                 { label: "角色层级", code: "DM_ROLE_LEVEL", prop: "rolelevelCode" },
-                { label: "角色警种", prop: "policeCategory", code: "T_MD_POLICE_TYPE" }
+                { label: "警种", prop: "policeCategory", code: "T_MD_POLICE_TYPE" }
             ],
             treeProps: {
                 label: "label",

src/pages/common/time-line/index.vue

@@ -27,7 +27,7 @@
                         &nbsp;&nbsp;&nbsp;机构配额：<span class="color-blue">{{ childItem.number }}</span>
                     </p>
                     <p class="line-sub-title">
-                        操作人：
+                        操作人姓名：
                         <span class="line-sub-text">{{ childItem.operateUserName }}</span>
                         &nbsp;&nbsp;&nbsp; 单位名称：
                         <span class="line-sub-text">{{ childItem.operateOrgName }}</span>

src/pages/data-auth-module/auth-object-manage/appfun-resource-manage/DataConfig.js

@@ -79,7 +79,7 @@ const appForm = [
     dateFormat: 'YYYY-MM-DD'
   },
   {
-    label: '应用负责人',
+    label: '应用负责人姓名',
     prop: 'fzr',
     component: 'ElInput',
     value: ''

src/pages/data-auth-module/auth-object-manage/object-prop-manage/service-list.vue

@@ -10,8 +10,8 @@
     <dg-card class="box-card" header="服务资源列表">
         暂无
         <!-- <el-form ref="form" :model="cardForm" label-suffix=":" inline>
-            <el-form-item label="机构名称">
-                <el-input clearable placeholder="请输入机构名称" v-model="cardForm.name"></el-input>
+            <el-form-item label="单位名称">
+                <el-input clearable placeholder="请输入单位名称" v-model="cardForm.name"></el-input>
             </el-form-item>
             <el-form-item label="机构代码">
                 <dg-tree-select

src/pages/data-auth-module/auth-subject-manage/DataConfig.js

@@ -34,14 +34,13 @@ const userPropConditionForm =  [
   },
   {
     label: '单位名称',
-    name: 'orgCode',
+    name: 'orgId',
     op: '=',
     value: '',
     apiName: 'getOrgTree',
-    nodeKey: 'code',
+    nodeKey: 'id',
     type: 'APP',
     component: 'SelectOrgTree',
-    placeholder: '请选择单位名称'
   }
 ]
 
@@ -59,10 +58,10 @@ const UserTableData = [
     label: '身份证号码',
     prop: 'idcard'
   },
-  {
-    label: '编号',
-    prop: 'policeNumber'
-  },
+  // {
+  //   label: '编号',
+  //   prop: 'policeNumber'
+  // },
   {
     label: '单位名称',
     custom: true,
@@ -167,7 +166,7 @@ const cardAddPersonnelList = [
 ];
 const cardApplicationList = [
   {
-    label: '机构名称',
+    label: '单位名称',
     prop: ''
   },
   {
@@ -227,7 +226,7 @@ const typeData = {
     { label: '性别', value: 'sex', code: 'DM_SEX' },
     { label: '身份证号码', value: 'idcard' },
     { label: '省份', value: 'area', code: 'DM_AREA_CODE' },
-    { label: '编号', value: 'policeNumber' },
+    { label: '警号', value: 'policeNumber' },
     { label: '人员类型', value: 'userType', code: 'DM_MAN_TYPE' },
     { label: '职级', value: 'title', code: 'DM_CERT_DUTY_LEVEL' },
     // { label: "用户类别", value: "userType", enum: "UserTypeEnum" },
@@ -240,7 +239,7 @@ const typeData = {
     { label: '姓名', value: 'name' },
     { label: '性别', value: 'sex', code: 'DM_SEX' },
     { label: '身份证号码', value: 'idcard' },
-    { label: '编号', value: 'policeNumber' },
+    { label: '警号', value: 'policeNumber' },
     { label: '单位名称', value: 'orgName' },
     { label: '人员类型', value: 'auxiliaryType', code: 'DM_AUXILIARY_TYPE' },
     // { label: "用户类别", value: "userType", enum: "UserTypeEnum" },
@@ -260,7 +259,7 @@ const typeData = {
 const institutionField = [
   { label: '上级行政机构', value: 'upGovName' },
   { label: '机构类型', value: 'orgKind', enum: 'OrgKindEnum' },
-  { label: '机构名称', value: 'fullName' },
+  { label: '单位名称', value: 'fullName' },
   { label: '行政区划', value: 'areaCode', code: 'T_MD_AREA_CODE' },
   { label: '机构代码', value: 'code' },
   { label: '机构类别', value: 'orgType', code: 'T_MD_ORGTYPE' },
@@ -275,7 +274,7 @@ const applicationField = [
   { label: '应用系统在用标识', value: 'applyStatus', code: 'DM_APPLY_STATUS' },
   { label: '上线日期', value: 'lineTime' },
   { label: '应用系统事权单位代码', value: 'managerOrgCode' },
-  { label: '应用负责人', value: 'fzr' },
+  { label: '应用负责人姓名', value: 'fzr' },
   { label: '应用系统运维单位名称', value: 'appOpsDepName' },
   { label: '应用系统管理单位名称', value: 'managerOrgName' },
   { label: '应用系统说明', value: 'managerDescribe' }

src/pages/data-auth-module/auth-subject-manage/subject-prop-manage/agency-list.vue

@@ -9,8 +9,8 @@
 <template>
     <dg-card class="box-card" header="机构列表">
         <el-form ref="form" :model="cardForm" label-suffix=":" inline>
-            <el-form-item label="机构名称">
-                <el-input clearable placeholder="请输入机构名称" v-model="cardForm.name"></el-input>
+            <el-form-item label="单位名称">
+                <el-input clearable placeholder="请输入单位名称" v-model="cardForm.name"></el-input>
             </el-form-item>
             <el-form-item label="机构代码">
                 <dg-tree-select

src/pages/empower-manage/institutional-quotas-manage/edit.vue

@@ -81,7 +81,7 @@
                         highlight-current-row
                         @row-click="handleOrgTreeRow"
                     >
-                        <dg-table-column prop="name" label="机构名称" width="180"></dg-table-column>
+                        <dg-table-column prop="name" label="单位名称" width="180"></dg-table-column>
                         <dg-table-column label="配额分配" align="right">
                             <template slot-scope="{ row, $index }">
                                 <div class="pe_div">
@@ -147,7 +147,7 @@ export default {
             r_title_data: [
                 { label: "角色名称", prop: "name" },
                 { label: "角色层级", prop: "roleLevel", code: "DM_ROLE_LEVEL" },
-                { label: "角色警种", prop: "policeCategory", code: "T_MD_POLICE_TYPE" },
+                { label: "警种", prop: "policeCategory", code: "T_MD_POLICE_TYPE" },
                 { label: "总配额", prop: "totalQuotas" }
             ],
             roleForm: {
@@ -177,7 +177,7 @@ export default {
             self_click_map: {
                 roleName: "", //角色名称
                 roleId: "", //角色id
-                orgName: "", // 机构名称
+                orgName: "", // 单位名称
                 orgId: "", // 机构id
                 freeNumber: "" //空闲配额
             },

src/pages/empower-manage/persional-empower-manage/DataConfig.js

@@ -27,6 +27,7 @@ export const userTableHeader = [
   { label: '姓名', prop: 'name' },
   { label: '身份证号码', prop: 'idcard' },
   { label: '用户类型', width: '100px', prop: 'userType', enum: 'UserTypeEnum' },
+  { label: '单位名称', prop: 'orgName' },
   { label: '警种', prop: 'policeCategory', code: 'T_MD_POLICE_TYPE' },
   { label: '业务域标签', prop: 'policeBusiness', custom: true }
 ];

src/pages/empower-manage/persional-empower-manage/persionView.vue

@@ -18,7 +18,7 @@
           @handleRowClick="handleRowClick"
         >
           <template #policeBusiness="{ row }">
-            <div>{{ transferBusinessTag(row.policeBusiness) }}</div>
+           {{ transferBusinessTag(row.policeBusiness) }}
           </template>
         </new-table>
       </dg-card>

src/pages/empower-manage/persional-empower-manage/roleView.vue

@@ -42,6 +42,7 @@
           <dg-table-column type="selection" width="50"></dg-table-column>
           <dg-table-column prop="name" align="center" width="120" label="姓名"></dg-table-column>
           <dg-table-column prop="idcard" align="center" label="身份证号码"></dg-table-column>
+           <dg-table-column prop="orgName" align="center" label="单位名称"></dg-table-column>
           <dg-table-column prop="policeCategory" align="center" code="T_MD_POLICE_TYPE" label="警种"></dg-table-column>
           <dg-table-column prop="policeBusiness" align="center" label="业务域标签"></dg-table-column>
           <dg-table-column label="权限有效期" width="120" align="center">
@@ -102,6 +103,7 @@ export default {
       roleTableHeader: [
         { label: '角色名称', prop: 'name' },
         { label: '角色层级', prop: 'roleLevel', code: 'DM_ROLE_LEVEL' },
+         { label: '应用系统名称', prop: '' },
         { label: '警种', prop: 'policeCategory', code: 'T_MD_POLICE_TYPE' },
         { label: '业务域标签', prop: 'roleBusiness', code: 'DM_POLICE_BUSINESS' }
       ],

src/pages/log-manage/DataConfig.js

@@ -102,12 +102,12 @@ const RiskDetectionPlan = [{
 ];
 // 鉴权预警信息
 const EarlyWarningInfo = [{
-    label: "预警对象",
+    label: "姓名",
     prop: "creater",
     width: "250"
   },
   {
-    label: "预警对象唯一标识",
+    label: "身份证号码",
     prop: "createrId",
     width: "250"
   },

src/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-info-detail.vue

@@ -3,12 +3,12 @@
         <el-form ref="ruleForm" label-width="130px" label-suffix=":">
             <dg-row :gutter="20">
                 <dg-col :span="12">
-                    <el-form-item label="预警对象">
+                    <el-form-item label="姓名">
                         <div class="u-detail__text">{{ sizeForm.creater }}</div>
                     </el-form-item>
                 </dg-col>
                 <dg-col :span="12">
-                    <el-form-item label="预警对象唯一标识">
+                    <el-form-item label="身份证号码">
                         <div class="u-detail__text">{{ sizeForm.createrId }}</div>
                     </el-form-item>
                 </dg-col>

src/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-info.vue

@@ -35,13 +35,13 @@ export default {
       EarlyWarningInfo,
       conditionForm: [
         {
-          label: '预警对象',
+          label: '姓名',
           name: 'creater',
           op: 'like',
           component: 'ElInput'
         },
         {
-          label: '预警对象唯一标识',
+          label: '身份证号码',
           name: 'createrId',
           op: 'like',
           component: 'ElInput'

src/pages/log-manage/permiss-log-manage/DataConfig.js

@@ -49,7 +49,7 @@ export const authServiceLogTableHeader = [
         prop: "userName"
     },
     {
-        label: "用户身份证号码",
+        label: "身份证号码",
         prop: "userIdcard"
     },
     {
@@ -184,7 +184,7 @@ export const authServiceLogDetail = [
         prop: "userName"
     },
     {
-        label: "用户身份证号码",
+        label: "身份证号码",
         prop: "userIdcard"
     },
     {

src/pages/log-manage/permiss-log-manage/auth-service-log.vue

@@ -48,7 +48,7 @@ export default {
           component: 'ElInput'
         },
         {
-          label: '用户身份证号码',
+          label: '身份证号码',
           name: 'userIdcard',
           op: 'like',
           component: 'ElInput'

src/pages/log-report/persionnel-author-audit/index.vue

@@ -99,7 +99,7 @@ export default {
           placeholder: '请选择单位名称'
         },
         {
-          label: '人员姓名',
+          label: '姓名',
           name: 'name',
           op: 'like',
           value: '',
@@ -115,7 +115,7 @@ export default {
       ],
       userTableHeader: [
         {
-          label: '人员姓名',
+          label: '姓名',
           prop: 'name'
         },
         {

src/pages/log-report/persionnel-author-audit/timeLine.vue

@@ -23,7 +23,7 @@
           <div v-show="childItem.auditType == 'role'">
             <h4 class="line-title">角色创建</h4>
             <p class="line-sub-title">
-              操作人：
+              操作人姓名：
               <span class="line-sub-text">{{
                 timeData.roleCreatorName == null || timeData.roleInfoVo.creator == '' ? '无' : timeData.roleCreatorName
               }}</span>
@@ -38,13 +38,13 @@
           <div v-show="childItem.auditType == 'orgQutoLogMaps'">
             <h4 class="line-title">机构配额设置</h4>
             <p class="line-sub-title">
-              机构名称：<span class="line-sub-text">{{ childItem.targetOrgName }}</span> &nbsp;&nbsp;机构配额：<span
+              单位名称：<span class="line-sub-text">{{ childItem.targetOrgName }}</span> &nbsp;&nbsp;机构配额：<span
                 class="line-sub-text"
                 >{{ childItem.number }}</span
               >
             </p>
             <p class="line-sub-title">
-              操作人：
+              操作人姓名：
               <span class="line-sub-text">{{
                 childItem.managerName == null || childItem.managerName == '' ? '无' : childItem.managerName
               }}</span>
@@ -60,7 +60,7 @@
               权限信息：<span class="color-blue">{{ childItem.name }}</span>
             </p>
             <p class="line-sub-title">
-              操作人：
+              操作人姓名：
               <span class="line-sub-text">{{
                 childItem.createUserName == null || childItem.createUserName == '' ? '无' : childItem.createUserName
               }}</span>
@@ -85,7 +85,7 @@
               <span class="color-blue" v-show="childItem.status == 30">取消授权</span>
             </p>
             <p class="line-sub-title">
-              操作人：
+              操作人姓名：
               <span class="line-sub-text">{{
                 childItem.managerName == null || childItem.managerName == '' ? '无' : childItem.managerName
               }}</span>

src/pages/log-report/scope-author-audit/index.vue

@@ -45,7 +45,7 @@ export default {
         { label: '用户类型', prop: 'userType', enum: 'UserTypeEnum' },
         { label: '人员类型', prop: 'manType', code: 'DM_MAN_TYPE' },
         { label: '职级', prop: 'title', code: 'DM_CERT_DUTY_LEVEL' },
-        { label: '创建人', prop: 'createUser' },
+        { label: '创建人姓名', prop: 'createUser' },
         // { label: "创建时间", prop: "createTime", format: "YYYY-MM-DD", dataType: "date" }
         { label: '创建时间', prop: 'createTimeString' }
       ],

src/pages/log-report/scope-author-audit/timeLine.vue

@@ -28,7 +28,7 @@
               <!--&nbsp;&nbsp;&nbsp;机构配额：<span class="color-blue">{{ childItem.number }}</span>-->
             </p>
             <p class="line-sub-title">
-              操作人：
+              操作人姓名：
               <span class="line-sub-text">{{ childItem.operateUserName }}</span>
               &nbsp;&nbsp;&nbsp; 单位名称：
               <span class="line-sub-text">{{ childItem.operateOrgName }}</span>

src/pages/permission-selfhelp-manage/component/basic-form.vue

@@ -157,7 +157,7 @@
             </el-form-item>
           </dg-col>
           <dg-col :span="13">
-            <el-form-item label="案件/事件/线索/被查询人员姓名：" prop="userName" label-width="250px">
+            <el-form-item label="案件/事件/线索/被查询姓名：" prop="userName" label-width="250px">
               <div v-if="isDetail">{{ sizeForm.userName }}</div>
               <div v-else>
                 <el-input v-model="sizeForm.userName"></el-input>
@@ -330,7 +330,7 @@ export default {
         ],
         permissionValidType: { required: true, validator: checkPermissionValid, trigger: 'change' },
         applyId: [{ required: true, message: '请选择应用方', trigger: 'change' }], // 应用方
-        userName: [{ required: true, message: '请输入人员名称', trigger: 'change' }],
+        userName: [{ required: true, message: '请输入姓名', trigger: 'change' }],
         userType: [{ required: true, message: '请选择人员类型', trigger: 'change' }],
         userCode: [{ required: true, message: '请输入人员编号', trigger: 'change' }]
       },

src/pages/permission-selfhelp-manage/component/process-status/index.vue

@@ -13,7 +13,7 @@
                 <template slot-scope="props">
                     <dg-table :data="props.row.taskVos" :pagination="false" class="expand-table" stripe>
                         <dg-table-column width="90"></dg-table-column>
-                        <dg-table-column label="操作人" prop="assigneeName" width="300"></dg-table-column>
+                        <dg-table-column label="操作人姓名" prop="assigneeName" width="300"></dg-table-column>
                         <dg-table-column label="操作状态" prop="operateState" width="180">
                             <template slot-scope="{row}">
                                 <span v-if="row.operateState"><i class="el-icon-success" style="color:#67c23a"></i> 已办</span>

src/pages/service-delegate/editor.vue

@@ -5,20 +5,19 @@
       :rules="rules"
       label-position="right"
       label-suffix=":"
-      label-width="100px"
+      label-width="150px"
       ref="ruleForm"
-      style="margin-top: 12px; padding-right: 24px"
     >
       <dg-row>
         <dg-col>
-          <el-form-item label="应用名称" prop="appName">
+          <el-form-item label="应用系统名称" prop="appName">
             <dg-select
               :data="appNameList"
               @change="changeAppName"
               clearable
               filterable
               label-name="value"
-              placeholder="请选择应用名称"
+              placeholder="请选择应用系统名称"
               v-model="sizeForm.appName"
               value-name="code"
             />
@@ -34,7 +33,7 @@
                           value-name="code"
                       />
                     </el-form-item>-->
-          <el-form-item label="服务名称" prop="serviceName">
+          <el-form-item label="服务资源名称" prop="serviceName">
             <dg-select
               :data="serviceData"
               :loading="loading"
@@ -43,18 +42,18 @@
               clearable
               filterable
               label-name="serviceName"
-              placeholder="请输入服务名称或关键字"
+              placeholder="请输入服务资源名称或关键字"
               remote
               v-model.trim="sizeForm.serviceName"
               value-name="serviceCode"
             />
           </el-form-item>
-          <el-form-item label="服务代码" prop="serviceCode">
+          <el-form-item label="服务资源标识符" prop="serviceCode">
             <el-input
               :data="serviceData"
               label-name="serviceCode"
               maxlength="50"
-              placeholder="在此显示服务代码，不可修改"
+              placeholder="在此显示服务资源标识符，不可修改"
               readonly
               v-model.trim="sizeForm.serviceCode"
               value-name="serviceCode"
@@ -65,7 +64,7 @@
     </el-form>
     <div class="dg-layer-demo" v-footer>
       <dg-button @click="handleClose">取消</dg-button>
-      <dg-button @click="handleSave" type="primary">确定</dg-button>
+      <dg-button @click="handleSave" type="primary">保存</dg-button>
     </div>
   </div>
 </template>
@@ -111,18 +110,15 @@ export default {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           let api;
-          let message;
           if (this.id) {
-            message = '修改成功！';
             api = 'patch';
           } else {
-            message = '保存成功！';
             api = 'save';
           }
           Api[api](this.sizeForm)
             .then(() => {
               this.$emit('success');
-              this.$message.success(message);
+              this.$message.success('保存成功！');
             })
             .catch((error) => this.$message.error({ message: error }));
         }

src/pages/service-delegate/index.vue

@@ -1,5 +1,4 @@
 <!--
-
     @Author: xiongkai
     @project:
     @Date: 2021-03-09
@@ -48,28 +47,28 @@ export default {
       tableUrl: api.tableUrl,
       conditionForm: [
         {
-          label: '应用名称',
+          label: '应用系统名称',
           name: 'appName',
           op: 'like',
           value: '',
           component: 'ElInput'
         },
         {
-          label: '应用代码',
+          label: '应用系统编号',
           name: 'appCode',
           op: 'like',
           value: '',
           component: 'ElInput'
         },
         {
-          label: '服务名称',
+          label: '服务资源名称',
           name: 'serviceName',
           op: 'like',
           value: '',
           component: 'ElInput'
         },
         {
-          label: '服务代码',
+          label: '服务资源标识符',
           name: 'serviceCode',
           op: 'like',
           value: '',
@@ -77,10 +76,10 @@ export default {
         }
       ],
       tableHeader: [
-        { label: '应用名称', prop: 'appName' },
-        { label: '应用代码', prop: 'appCode' },
-        { label: '服务名称', prop: 'serviceName' },
-        { label: '服务代码', prop: 'serviceCode' },
+        { label: '应用系统名称', prop: 'appName' },
+        { label: '应用系统编号', prop: 'appCode' },
+        { label: '服务资源名称', prop: 'serviceName' },
+        { label: '服务资源标识符', prop: 'serviceCode' },
         { label: '创建时间', prop: 'createTime' }
       ],
       pageOptList: ['新增'],
@@ -107,7 +106,7 @@ export default {
     handleAddDialog() {
       const that = this;
       const layer = that.$dgLayer({
-        title: '添加',
+        title: '新增',
         shade: [0.4, '#FFF'],
         content: Editor,
         props: {},
@@ -164,7 +163,7 @@ export default {
     },
     handleDelete({ id }) {
       const that = this;
-      that.$confirm(`是否确定删除该条服务授权`, '确认', {}).then(() => {
+      that.$confirm(`是否确定删除这条数据`, '确认', {}).then(() => {
         api.del(id).then(() => {
           that.handleSearch();
           that.$message.success('删除成功!');

src/pages/statistics-manage/role-authorization/detail.vue

@@ -46,7 +46,7 @@ export default {
     return {
       tableData: [],
       tableHeader: [
-        { label: '机构名称', prop: 'name' },
+        { label: '单位名称', prop: 'name' },
         { label: '机构代码', prop: 'code' },
         { label: '应分配名额', prop: 'mustQuotas' },
         { label: '实际分配名额', prop: 'quotaed' },

src/pages/statistics-manage/role-authorization/index.vue

@@ -52,7 +52,7 @@ export default {
         }
       ],
       tableHeader: [
-        { label: '机构名称', prop: 'name' },
+        { label: '单位名称', prop: 'name' },
         { label: '机构代码', prop: 'code' },
         { label: '应分配名额', prop: 'mustQuotas' },
         { label: '实际分配名额', prop: 'quotaed' },

src/pages/user-manage/police-manage/detail.vue

@@ -1,162 +1,155 @@
 <template>
-    <div class="u-detail">
-        <el-form v-if="detailInfo.id" ref="ruleForm" label-width="120px" label-suffix=":">
-            <dg-row :gutter="20">
-                <dg-col :span="12">
-                    <el-form-item label="姓名" prop="name">
-                        <div class="u-detail__text">{{ detailInfo.name }}</div>
-                    </el-form-item>
-                    <el-form-item label="身份证" prop="idcard">
-                        <div class="u-detail__text">{{ detailInfo.idcard }}</div>
-                    </el-form-item>
-                    <el-form-item label="省份" prop="area" class="form-area">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_AREA_CODE' }">{{ detailInfo.area }}</div>
-                    </el-form-item>
-                    <el-form-item label="警号" prop="policeNumber">
-                        <div class="u-detail__text">{{ detailInfo.policeNumber }}</div>
-                    </el-form-item>
-                    <el-form-item label="性别" prop="sex">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_SEX' }">{{ detailInfo.sex }}</div>
-                    </el-form-item>
-                    <el-form-item label="出生日期" prop="birth">
-                        <div class="u-detail__text">{{ detailInfo.birth }}</div>
-                    </el-form-item>
-                    <el-form-item label="警种" prop="policeCategory">
-                        <div class="u-detail__text" v-translate="{ code: 'T_MD_POLICE_TYPE' }">
-                            {{ detailInfo.policeCategory }}
-                        </div>
-                    </el-form-item>
+  <div class="u-detail">
+    <el-form v-if="detailInfo.id" ref="ruleForm" label-width="120px" label-suffix=":">
+      <dg-row :gutter="20">
+        <dg-col :span="12">
+          <el-form-item label="姓名" prop="name">
+            <div class="u-detail__text">{{ detailInfo.name }}</div>
+          </el-form-item>
+          <el-form-item label="身份证" prop="idcard">
+            <div class="u-detail__text">{{ detailInfo.idcard }}</div>
+          </el-form-item>
+          <el-form-item label="省份" prop="area" class="form-area">
+            <div class="u-detail__text" v-translate="{ code: 'DM_AREA_CODE' }">{{ detailInfo.area }}</div>
+          </el-form-item>
+          <el-form-item label="警号" prop="policeNumber">
+            <div class="u-detail__text">{{ detailInfo.policeNumber }}</div>
+          </el-form-item>
+          <el-form-item label="性别" prop="sex">
+            <div class="u-detail__text" v-translate="{ code: 'DM_SEX' }">{{ detailInfo.sex }}</div>
+          </el-form-item>
+          <el-form-item label="出生日期" prop="birth">
+            <div class="u-detail__text">{{ detailInfo.birth }}</div>
+          </el-form-item>
+          <el-form-item label="警种" prop="policeCategory">
+            <div class="u-detail__text" v-translate="{ code: 'T_MD_POLICE_TYPE' }">
+              {{ detailInfo.policeCategory }}
+            </div>
+          </el-form-item>
 
-                    <el-form-item label="人员类型" prop="manType">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_MAN_TYPE' }">{{ detailInfo.manType }}</div>
-                    </el-form-item>
-                    <el-form-item label="警衔" prop="rank">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_POLICE_RANK' }">{{ detailInfo.rank }}</div>
-                    </el-form-item>
-                    <el-form-item label="手机号码(1)" prop="mobileWork">
-                        <div class="u-detail__text">{{ detailInfo.mobileWork }}</div>
-                    </el-form-item>
-                    <el-form-item label="QQ号">
-                        <div class="u-detail__text">{{ detailInfo.qqAccount }}</div>
-                    </el-form-item>
-                    <el-form-item label="微信号" prop="wxAccount">
-                        <div class="u-detail__text">{{ detailInfo.wxAccount }}</div>
-                    </el-form-item>
-                </dg-col>
-                <dg-col :span="12">
-                    <el-form-item label="" prop="file">
-                        <dg-upload
-                            v-model="detailInfo.file"
-                            disabled
-                            icon-zoom
-                            leaflet
-                            accept="image/*"
-                            server-url="/dcucauth"
-                            list-type="pictureList"
-                        ></dg-upload>
-                    </el-form-item>
-                    <el-form-item label="民族" prop="nation">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_NATION_CODE' }">
-                            {{ detailInfo.nation }}
-                        </div>
-                    </el-form-item>
-                    <el-form-item label="业务域标签">
-                        <div class="u-detail__text">{{ transferBusinessTag(detailInfo.policeBusiness) }}</div>
-                        <!--<dg-select-->
-                        <!--v-model="detailInfo.policeBusinessLabel"-->
-                        <!--:url="`/duacm/codeSon/v2/searchColumn?codeDicId=DM_POLICE_BUSINESS&columnName=police_type_id&columnValue=${-->
-                        <!--detailInfo.policeCategory || '01'-->
-                        <!--}`"-->
-                        <!--placeholder="请选择业务域"-->
-                        <!--multiple-->
-                        <!--disabled-->
-                        <!--&gt;</dg-select>-->
-                    </el-form-item>
-                    <el-form-item label="职级" prop="title">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_CERT_DUTY_LEVEL' }">
-                            {{ detailInfo.title }}
-                        </div>
-                    </el-form-item>
-                    <el-form-item label="座机" prop="phone">
-                        <div class="u-detail__text">{{ detailInfo.phone }}</div>
-                    </el-form-item>
-                    <el-form-item label="手机号码(2)" prop="mobilePrivate">
-                        <div class="u-detail__text">{{ detailInfo.mobilePrivate }}</div>
-                    </el-form-item>
-                    <el-form-item label="e-mail" prop="email">
-                        <div class="u-detail__text">{{ detailInfo.email }}</div>
-                    </el-form-item>
-                    <el-form-item label="联系地址" prop="address">
-                        <div class="u-detail__text">{{ detailInfo.address }}</div>
-                    </el-form-item>
-                </dg-col>
-            </dg-row>
-            <dg-row>
-                <dg-col :span="24">
-                    <dg-table :data="detailInfo.postInfos" :pagination="false" stripe border style="width: 100%">
-                        <dg-table-column prop="orgName" label="单位名称" align="center">
-                            <template slot-scope="scope">
-                                <span v-show="scope.row.type == '1'">
-                                    <label for="">编制单位：{{ scope.row.orgName }}</label>
-                                </span>
-                                <span v-show="scope.row.type == '0' || scope.row.type == null || scope.row.type == ''">
-                                    <label for="">工作单位：{{ scope.row.orgName }}</label>
-                                </span>
-                            </template>
-                        </dg-table-column>
-                        <dg-table-column prop="postType" label="职务" align="center"> </dg-table-column>
-                        <dg-table-column prop="jobType" label="在职类型" align="center">
-                            <template slot-scope="{ row }">
-                                <div class="u-detail__text" v-translate="{ code: 'DM_JOB_TYPE' }">
-                                    {{ row.jobType }}
-                                </div>
-                            </template>
-                        </dg-table-column>
-                    </dg-table>
-                </dg-col>
-            </dg-row>
-        </el-form>
-        <div class="dg-layer-demo" v-footer>
-            <dg-button @click="handleClose">取消</dg-button>
-        </div>
+          <el-form-item label="人员类型" prop="manType">
+            <div class="u-detail__text" v-translate="{ code: 'DM_MAN_TYPE' }">{{ detailInfo.manType }}</div>
+          </el-form-item>
+          <el-form-item label="警衔" prop="rank">
+            <div class="u-detail__text" v-translate="{ code: 'DM_POLICE_RANK' }">{{ detailInfo.rank }}</div>
+          </el-form-item>
+          <el-form-item label="手机号码(1)" prop="mobileWork">
+            <div class="u-detail__text">{{ detailInfo.mobileWork }}</div>
+          </el-form-item>
+          <el-form-item label="QQ号">
+            <div class="u-detail__text">{{ detailInfo.qqAccount }}</div>
+          </el-form-item>
+          <el-form-item label="微信号" prop="wxAccount">
+            <div class="u-detail__text">{{ detailInfo.wxAccount }}</div>
+          </el-form-item>
+        </dg-col>
+        <dg-col :span="12">
+          <el-form-item label="" prop="file">
+            <dg-upload
+              v-model="detailInfo.file"
+              disabled
+              icon-zoom
+              leaflet
+              accept="image/*"
+              server-url="/dcucauth"
+              list-type="pictureList"
+            ></dg-upload>
+          </el-form-item>
+          <el-form-item label="民族" prop="nation">
+            <div class="u-detail__text" v-translate="{ code: 'DM_NATION_CODE' }">
+              {{ detailInfo.nation }}
+            </div>
+          </el-form-item>
+          <el-form-item label="职级" prop="title">
+            <div class="u-detail__text" v-translate="{ code: 'DM_CERT_DUTY_LEVEL' }">
+              {{ detailInfo.title }}
+            </div>
+          </el-form-item>
+          <el-form-item label="座机" prop="phone">
+            <div class="u-detail__text">{{ detailInfo.phone }}</div>
+          </el-form-item>
+          <el-form-item label="手机号码(2)" prop="mobilePrivate">
+            <div class="u-detail__text">{{ detailInfo.mobilePrivate }}</div>
+          </el-form-item>
+          <el-form-item label="e-mail" prop="email">
+            <div class="u-detail__text">{{ detailInfo.email }}</div>
+          </el-form-item>
+          <el-form-item label="联系地址" prop="address">
+            <div class="u-detail__text">{{ detailInfo.address }}</div>
+          </el-form-item>
+        </dg-col>
+      </dg-row>
+      <dg-row>
+        <el-form-item label="业务域标签">
+          <div class="u-detail__text">{{ transferBusinessTag(detailInfo.policeBusiness) }}</div>
+        </el-form-item>
+      </dg-row>
+      <dg-row>
+        <dg-col :span="24">
+          <dg-table :data="detailInfo.postInfos" :pagination="false" stripe border style="width: 100%">
+            <dg-table-column prop="orgName" label="单位名称" align="center">
+              <template slot-scope="scope">
+                <span v-show="scope.row.type == '1'">
+                  <label for="">编制单位：{{ scope.row.orgName }}</label>
+                </span>
+                <span v-show="scope.row.type == '0' || scope.row.type == null || scope.row.type == ''">
+                  <label for="">工作单位：{{ scope.row.orgName }}</label>
+                </span>
+              </template>
+            </dg-table-column>
+            <dg-table-column prop="postType" label="职务" align="center"> </dg-table-column>
+            <dg-table-column prop="jobType" label="在职类型" align="center">
+              <template slot-scope="{ row }">
+                <div class="u-detail__text" v-translate="{ code: 'DM_JOB_TYPE' }">
+                  {{ row.jobType }}
+                </div>
+              </template>
+            </dg-table-column>
+          </dg-table>
+        </dg-col>
+      </dg-row>
+    </el-form>
+    <div class="dg-layer-demo" v-footer>
+      <dg-button @click="handleClose">关闭</dg-button>
     </div>
+  </div>
 </template>
 
 <script>
-import { detail } from "@/api/police-manage";
-import transferBusinessTag from "@/mixins/transfer-business-tag";
+import { detail } from '@/api/police-manage';
+import transferBusinessTag from '@/mixins/transfer-business-tag';
 
 export default {
-    name: "policeDetail",
-    props: {
-        sizeForm: {
-            type: Object,
-            required: true
-        }
-    },
-    mixins: [transferBusinessTag],
-    data() {
-        return {
-            detailInfo: {}
-        };
-    },
-    methods: {
-        handleClose() {
-            this.$emit("close");
-        }
-    },
-    created() {
-        detail(this.sizeForm.id).then((res) => {
-            this.detailInfo = res;
-        });
+  name: 'policeDetail',
+  props: {
+    sizeForm: {
+      type: Object,
+      required: true
     }
+  },
+  mixins: [transferBusinessTag],
+  data() {
+    return {
+      detailInfo: {}
+    };
+  },
+  methods: {
+    handleClose() {
+      this.$emit('close');
+    }
+  },
+  created() {
+    detail(this.sizeForm.id).then((res) => {
+      this.detailInfo = res;
+    });
+  }
 };
 </script>
 
 <style lang="scss">
 .u-detail {
-    .el-form-item {
-        margin-bottom: 10px;
-    }
+  .el-form-item {
+    margin-bottom: 10px;
+  }
 }
 </style>