将应用系统名称搜素项改为下拉搜索+改造页面

src/api/list-manage.js

@@ -49,7 +49,7 @@ export function getRedAppFuncList({ page, size, searchCondition }) {
   return request({
     url: `${baseUrl}/redlist/funRedListPage`,
     method: 'POST',
-    data: handleSearchCondition(page, size, searchCondition)
+    data: handleSearchCondition( {page, size, searchCondition })
   });
 }
 

src/app.vue

@@ -26,6 +26,9 @@ export default {
                 this.isRouterAlive = true;
             });
         }
+    },
+    created() {
+        console.log("test");
     }
 };
 </script>

src/assets/style/project.scss

@@ -70,7 +70,8 @@
     padding: 12px 0;
   }
 }
-// 下拉最大高度
+
 .el-select-dropdown__wrap {
   max-height: 550px;
-}
+}
+

src/components/search-bar/index.vue

@@ -9,7 +9,10 @@
       <el-form-item v-for="(item, index) in form" :key="index" :label="item.label">
         <template
           v-if="
-            item.component !== 'SelectOrgTree' && item.component !== 'DgDatePicker' && item.component !== 'SelectApp'
+            item.component &&
+            item.component !== 'SelectOrgTree' &&
+            item.component !== 'DgDatePicker' &&
+            item.component !== 'SelectApp'
           "
         >
           <component
@@ -38,6 +41,7 @@
             :tableSearchName="item.name"
             :valueName="item.valueName"
             :labelName="item.labelName"
+            :placeholder="item.placeholder"
             @submitAppValue="getAppValue"
             @submitCurrentApp="getCurrentApp"
           ></select-app>
@@ -112,11 +116,13 @@ export default {
     handleReset() {
       const vm = this;
       this.form.forEach((item) => {
-        item.value = '';
-        if (item.component == 'SelectOrgTree') {
-          vm.$refs.orgTree[0].handleClearSelect();
-        } else if (item.component == 'SelectApp') {
-          vm.$refs.app[0].handleClearSelect();
+        if (item.component) {
+          item.value = '';
+          if (item.component == 'SelectOrgTree') {
+            vm.$refs.orgTree[0].handleClearSelect();
+          } else if (item.component == 'SelectApp') {
+            vm.$refs.app[0].handleClearSelect();
+          }
         }
       });
     },
@@ -131,7 +137,7 @@ export default {
     },
     // 获取选中应用
     getCurrentApp(item) {
-      this.$emit("submitCurrentApp", item);
+      this.$emit('submitCurrentApp', item);
     },
     setPlaceHolder(item) {
       const { component, label } = item;

src/components/select-app/index.vue

@@ -12,12 +12,11 @@
     v-on="$listeners"
     @filter-change="handleFilter"
     @clearSelect="handleClearSelect"
-    placeholder="请选择应用系统名称"
+    :placeholder="placeholder"
     :filterable="true"
     :loadData="appList"
     :loading="loading"
     clearable
-    style="width: 200px"
     @scroll-bottom="handleScrollBottom"
     @change="handleChange"
   >
@@ -50,6 +49,10 @@ export default {
     tableSearchName: {
       type: String,
       default: 'appName'
+    },
+    placeholder: {
+      type: String,
+      default: "请选择应用系统名称"
     }
   },
   components: {

src/pages/authorization-manage/index.vue

@@ -23,6 +23,7 @@ import searchBar from '@/components/search-bar';
 import { searchOpt } from '@/mixins/page-opt';
 import Editor from './edit.vue';
 import * as AuthorzationManageApi from '@/api/empower-manage';
+import { appRestApi } from '@/api/application';
 const area = ['1280px', '880px'];
 export default {
   name: '',
@@ -45,9 +46,12 @@ export default {
         {
           label: '应用系统名称',
           name: 'applyName',
-          op: 'like',
+          op: '=',
           value: '',
-          component: 'ElInput'
+          component: 'SelectApp',
+          apiUrl: appRestApi.table,
+          valueName: 'applyName',
+          labelName: 'applyName'
         },
         {
           label: '单位名称',

src/pages/common/login/index.vue

@@ -18,7 +18,7 @@
 					:rules="loginRules"
 			>
 				<div class="v-login-box__content-name">
-					<span>用户姓名</span>
+					<span>姓名</span>
 					<el-input
 							class="border-input"
 							placeholder="请输入内容"

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

@@ -1,16 +1,17 @@
 /** 功能列表页数据项配置 */
+import { appRestApi } from '@/api/application';
 
 // 搜索栏配置
 const conditionForm = [
   {
     label: '应用系统名称',
     name: 'applyName',
-    op: 'like',
+    op: '=',
     value: '',
-    component: 'ElInput',
-    attr: {
-      placeholder: '请输入应用系统名称'
-    }
+    component: 'SelectApp',
+    apiUrl: appRestApi.table,
+    valueName: "applyName",
+    labelName: "applyName"
   },
   {
     label: '应用系统在用标识',
@@ -19,7 +20,6 @@ const conditionForm = [
     value: '',
     component: 'DgSelect',
     attr: {
-      placeholder: '请选择应用系统在用标识',
       code: 'DM_APPLY_STATUS'
     }
   }

src/pages/data-auth-module/auth-object-manage/object-prop-manage/add-dialog.vue

@@ -9,52 +9,19 @@
 
 <template>
   <main class="add-dialog">
-    <dg-row class="property-wapper" :gutter="10">
-      <!-- 机构列表 -->
-      <!-- <dg-col :span="8" class="property-wapper__left">
-                <dg-card class="box-card">
-                    <org-tree
-                        ref="tree"
-                        class="u-pm__left"
-                        treeHeight="470px"
-                        :search="true"
-                        paddingRight="15px"
-                        @handleGetNode="handleGetNode"
-                        @submitRootNode="handleGetNode"
-                    ></org-tree>
-                </dg-card>
-            </dg-col> -->
-      <!--  -->
-      <dg-col :span="24">
-        <el-form ref="form" label-suffix=":" inline>
-          <el-form-item label="功能名称" v-if="type == 'function'">
-            <el-input clearable placeholder="请输入功能名称" v-model="form.applyName.value"></el-input>
-          </el-form-item>
-          <el-form-item label="应用系统名称" v-if="type == 'application'">
-            <el-input clearable placeholder="请输入应用系统名称" v-model="form.applyName.value"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <dg-button type="primary" icon="el-icon-search" @click="handleSearch">查询</dg-button>
-            <dg-button :icon="'重置' | optIcon" @click="handleReset">重置</dg-button>
-          </el-form-item>
-        </el-form>
-        <dg-table
-          ref="table"
-          :url="tableUrl"
-          :condition="form"
-          border
-          row-key="id"
-          :before-quest="beforeQuest"
-          @select="handleSelect"
-          @select-all="handleCheckAll"
-          v-if="type !== 'service'"
-        >
-          <dg-table-column type="selection" reserve-selection width="55" />
-          <template v-for="(item, indexs) in cardAgencylist">
-            <dg-table-column :key="indexs" v-bind="item" align="center"> </dg-table-column>
-          </template>
-        </dg-table>
-      </dg-col>
+    <dg-row class="property-wapper">
+      <!-- 搜索栏 -->
+      <search-bar :conditionForm="appConditonForm2" @submitSearch="receiveSearch"></search-bar>
+      <!-- 表格 -->
+      <new-table
+        ref="table"
+        :selection="true"
+        :tableHeader="cardAgencylist"
+        :tableUrl="tableUrl"
+        :condition="condition"
+        v-if="type !== 'service'"
+      >
+      </new-table>
     </dg-row>
     <div v-footer>
       <dg-button @click="handleClose">取消</dg-button>
@@ -65,8 +32,11 @@
 
 <script>
 import { appRestApi } from '@/api/application';
-import { cardAgencylist, cardFunctionList } from '../../auth-subject-manage/DataConfig';
+import { cardAgencylist, cardFunctionList, appConditonForm2 } from '../../auth-subject-manage/DataConfig';
 import { addRelateApp, getRelateIds } from '@/api/data-auth';
+import searchBar from '@/components/search-bar';
+import { searchOpt } from '@/mixins/page-opt';
+import newTable from '@/pages/common/new-table';
 import _ from 'lodash';
 export default {
   name: 'add-dialog', // 组件名称
@@ -78,116 +48,26 @@ export default {
     },
     parentNode: Object
   },
+  components: { searchBar, newTable }, // 注册局部组件
+  mixins: [searchOpt],
   data() {
     // 组件内部参数
     return {
       // 参数名称及默认值
       cardFunctionList,
       cardAgencylist,
-      form: {
-        applyName: {
-          value: '',
-          op: 'like'
-        }
-      },
       tableUrl: appRestApi.table,
       otherParams: {
         attrBelongType: this.parentNode.attrBelongType,
         attrId: this.parentNode.id,
         attrType: 'OBJ'
-      }
+      },
+      appConditonForm2
     };
   },
   computed: {}, // 计算属性
   watch: {}, // 侦听器（扩展的计算属性）
-  components: {}, // 注册局部组件
   methods: {
-    /**
-     * @description: 获取机构节点
-     * @param {*} node
-     */
-    handleGetNode(node) {
-      this.subId = node.code;
-      this.key++;
-    },
-    /**
-     * @description:重置
-     */
-    handleReset() {
-      for (const key in this.form) {
-        this.form[key].value = '';
-      }
-    },
-    /**
-     * @description:查询
-     */
-    handleSearch() {
-      this.$refs.table.searchForm();
-    },
-    /**
-     * 进入页面默认选中设置
-     */
-    beforeQuest(res) {
-      const { content, totalElements } = res.data;
-      this.currentPageContent = content;
-      if (this.newChooseArr.length > 0) {
-        let rowKeys = [];
-        for (let j = 0; j < content.length; j++) {
-          const cItem = content[j];
-          const index = this.newChooseArr.findIndex((item) => (item.id || item) == cItem.id);
-          if (index > -1) {
-            rowKeys.push(this.newChooseArr[index].id || this.newChooseArr[index]);
-          }
-        }
-        setTimeout(() => {
-          this.$refs.table.setCheck(rowKeys);
-        }, 500);
-      }
-
-      const result = {
-        data: {
-          content,
-          totalElements
-        }
-      };
-      return result;
-    },
-    /**
-     * 选中某条数据
-     */
-    handleSelect(selection, row) {
-      let copyAttr = _.cloneDeep(this.newChooseArr);
-      const index = this.newChooseArr.findIndex((item) => (item.id || item) == row.id);
-      if (index > -1) {
-        copyAttr.splice(index, 1);
-      } else {
-        copyAttr.push(row);
-      }
-      this.newChooseArr = copyAttr;
-      console.log(this.newChooseArr);
-    },
-    /**
-     * 选中/取消选中
-     */
-    handleCheckAll(selection) {
-      const checked = selection.length == 0 ? false : true;
-      this.currentPageContent.forEach((row) => {
-        // this.handleSelect([], element);
-        let copyAttr = _.cloneDeep(this.newChooseArr);
-        const index = this.newChooseArr.findIndex((item) => (item.id || item) == row.id);
-        if (checked) {
-          if (index < 0) {
-            copyAttr.push(row);
-          }
-        } else {
-          if (index > -1) {
-            copyAttr.splice(index, 1);
-          }
-        }
-        this.newChooseArr = copyAttr;
-      });
-      console.log(this.newChooseArr);
-    },
     /**
      * 关闭
      */
@@ -200,7 +80,7 @@ export default {
     handleSave() {
       const params = {
         ...this.otherParams,
-        relIds: this.newChooseArr.map((item) => item.id || item)
+        relIds: this.$refs.table.newChooseArr.map((item) => item.id || item)
       };
       addRelateApp(params).then((res) => {
         this.$message.success('保存成功');
@@ -209,11 +89,15 @@ export default {
     }
   },
   created() {
-    getRelateIds(this.otherParams).then((res) => {
-      this.newChooseArr = res.data.content;
-    });
   },
-  mounted() {}
+  mounted() {
+     getRelateIds(this.otherParams).then((res) => {
+       this.$nextTick(() => {
+         this.$refs.table.newChooseArr = res.data.content;
+       })
+    });
+
+  }
 };
 </script>
 <style lang="scss" scoped></style>

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

@@ -9,72 +9,54 @@
 <template>
   <dg-card header="应用列表" shadow="never">
     <template v-if="operateType == 'detail'">
-      <el-form ref="form" :model="form" label-suffix="" inline>
-        <el-form-item label="应用系统名称">
-          <el-input
-            clearable
-            placeholder="请输入应用系统名称"
-            v-model="form.name.value"
-            style="width: 150px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="应用系统在用标识">
-          <dg-select
-            code="DM_APPLY_STATUS"
-            v-model="form.status.value"
-            placeholder="请选择应用系统在用标识"
-            clearable
-            style="width: 150px"
-          >
-          </dg-select>
-        </el-form-item>
-        <el-form-item>
-          <dg-button type="primary" :icon="'查询' | optIcon" @click="handleSearch">查询</dg-button>
-          <dg-button :icon="'重置' | optIcon" @click="handleReset">重置</dg-button>
-        </el-form-item>
-      </el-form>
+      <!-- 搜索栏 -->
+      <search-bar :conditionForm="conditionForm" @submitSearch="receiveSearch"></search-bar>
       <!-- 操作栏 -->
       <operate-bar :pageOptList="pageOptList" @submitPageOpt="receviceOpt"></operate-bar>
       <!-- 表格 -->
-      <Table ref="table" :url="ObjAppTableUrl" :headerData="cardAgencylist" :condition="form"> </Table>
+      <new-table ref="table" :tableUrl="ObjAppTableUrl" :tableHeader="cardAgencylist" :condition="condition"> </new-table>
     </template>
     <p v-else>请选择属性值</p>
   </dg-card>
 </template>
 
 <script>
-import Table from '@/pages/common/table';
+import newTable from '@/pages/common/new-table';
 import { ObjAppTableUrl } from '@/api/data-auth';
-import { cardAgencylist } from '../../auth-subject-manage/DataConfig';
+import { cardAgencylist, appConditionForm3 } from '../../auth-subject-manage/DataConfig';
 import addDialog from './add-dialog';
 import operateBar from '@/components/operate-bar';
+import searchBar from '@/components/search-bar';
+import { searchOpt} from '@/mixins/page-opt';
+
 export default {
   name: 'personnelList', // 组件名称
   props: {
     parentNode: Object,
     operateType: String
   },
-  components: { Table, operateBar }, // 注册局部组件
+  components: { newTable, operateBar, searchBar }, // 注册局部组件
+  mixins: [ searchOpt ],
   data() {
     // 组件内部参数
     return {
       // 参数名称及默认值
       cardAgencylist,
       ObjAppTableUrl,
-      form: {
-        status: {
-          op: '=',
-          value: ''
-        },
-        name: {
-          op: 'like',
-          value: ''
-        },
-        attrId: {
+      condition: {
+         attrId: {
+           op: "=",
+           value: this.parentNode.id
+         }
+      },
+      conditionForm: [
+        ...appConditionForm3,
+        {
+          name: 'attrId',
           op: '=',
           value: this.parentNode.id
         }
-      },
+      ],
       pageOptList: ['新增']
     };
   },
@@ -84,20 +66,6 @@ export default {
     receviceOpt(opt, row) {
       this.handleAdd();
     },
-    /**
-     * @description: 查询
-     */
-    handleSearch() {
-      this.$refs.table.handleSearchClick();
-    },
-    /**
-     * @description: 重置
-     */
-    handleReset() {
-      for (const key in this.form) {
-        this.form[key].value = '';
-      }
-    },
     /**
      * @description: 单击表格行
      */

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

@@ -14,7 +14,7 @@
                 <tree ref="tree" title="客体属性类" type="OBJ" @submitNodeOperate="getNodeOperate" />
             </dg-col>
             <!-- 属性详情 -->
-            <dg-col :span="7">
+            <dg-col :span="6">
                 <prop-detail
                     :parentNode="parentNode"
                     type="OBJ"
@@ -23,7 +23,7 @@
                     @savePropSuccess="refreshTree"
                 ></prop-detail>
             </dg-col>
-            <dg-col :span="12">
+            <dg-col :span="13">
                 <!-- TODO 根据点击属性类型判断显示什么表格 -->
                 <component
                     :is="componentValue"

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

@@ -1,4 +1,5 @@
 /** 服务资源列表页数据项配置 */
+import { appRestApi } from '@/api/application';
 
 // 搜索栏配置
 const conditionForm = [
@@ -28,10 +29,11 @@ const conditionForm = [
     name: 'appName',
     op: 'like',
     value: '',
-    component: 'ElInput',
-    attr: {
-      placeholder: '请输入服务提供应用系统名称'
-    }
+    component: 'SelectApp',
+    apiUrl: appRestApi.table,
+    valueName: "applyName",
+    labelName: "applyName",
+    placeholder: '请输入服务提供应用系统名称'
   }
 ];
 

src/pages/data-auth-module/auth-object-manage/service-resource-manage/add-form.vue

@@ -187,4 +187,5 @@ export default {
 </script>
 
 <style lang='scss'>
+
 </style>

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

@@ -6,9 +6,9 @@
  * @Description:
  */
 import { appRestApi } from '@/api/application';
-const pageOptList = ['导入', '同步']
+const pageOptList = ['导入', '同步'];
 
-const userPropConditionForm =  [
+const userPropConditionForm = [
   {
     label: '用户类型',
     name: 'userType',
@@ -41,9 +41,9 @@ const userPropConditionForm =  [
     apiName: 'getOrgTree',
     nodeKey: 'id',
     type: 'APP',
-    component: 'SelectOrgTree',
+    component: 'SelectOrgTree'
   }
-]
+];
 
 const UserTableData = [
   {
@@ -84,7 +84,7 @@ const UserTableData = [
 const appConditionForm = [
   {
     label: '应用系统名称',
-    name: 'appName',
+    name: 'applyName',
     op: '=',
     value: '',
     component: 'SelectApp',
@@ -109,11 +109,45 @@ const appConditionForm = [
     op: 'between',
     type: 'DATE',
     valueFormat: 'yyyyMMddHHmmss',
-    component: 'DgDatePicker',
+    component: 'DgDatePicker'
   }
+];
 
-]
+const appConditonForm2 = [
+  {
+    label: '应用系统名称',
+    name: 'applyName',
+    op: '=',
+    value: '',
+    component: 'SelectApp',
+    apiUrl: appRestApi.table,
+    valueName: 'applyName',
+    labelName: 'applyName'
+  }
+];
 
+const appConditionForm3 = [
+  {
+    label: '应用系统名称',
+    name: 'name',
+    op: 'like',
+    value: '',
+    component: 'SelectApp',
+    apiUrl: appRestApi.table,
+    valueName: 'applyName',
+    labelName: 'applyName'
+  },
+  {
+    label: '应用系统在用标识',
+    name: 'status',
+    op: '=',
+    value: '',
+    component: 'DgSelect',
+    attr: {
+      code: 'DM_APPLY_STATUS'
+    }
+  }
+];
 
 const appTableHeader = [
   {
@@ -237,7 +271,7 @@ const typeData = {
     { label: '单位名称', value: 'orgName' },
     { label: '警衔', value: 'rank', code: 'DM_POLICE_RANK' },
     { label: '警种', value: 'policeCategory', code: 'T_MD_POLICE_TYPE' },
-    { label: '业务域', value: 'policeBusiness',span: 24 }
+    { label: '业务域', value: 'policeBusiness', span: 24 }
   ],
   20: [
     { label: '姓名', value: 'name' },
@@ -248,8 +282,7 @@ const typeData = {
     { label: '人员类型', value: 'auxiliaryType', code: 'DM_AUXILIARY_TYPE' },
     // { label: "用户类别", value: "userType", enum: "UserTypeEnum" },
     { label: '警种', value: 'policeCategory', code: 'T_MD_POLICE_TYPE' },
-    { label: '业务域', value: 'policeBusiness',span: 24 },
-
+    { label: '业务域', value: 'policeBusiness', span: 24 }
   ],
   30: [
     { label: '姓名', value: 'name' },
@@ -293,9 +326,9 @@ const orgConditonForm = [
     nodeKey: 'id',
     type: 'APP',
     component: 'SelectOrgTree',
-    placeholder: '请选择单位名称',
+    placeholder: '请选择单位名称'
   }
-]
+];
 export {
   pageOptList,
   userPropConditionForm,
@@ -303,6 +336,8 @@ export {
   typeData,
   orgDetail,
   appConditionForm,
+  appConditonForm2,
+  appConditionForm3,
   appTableHeader,
   applicationField,
   cardPersonnelList,

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

@@ -26,6 +26,7 @@ import Editor from './edit';
 import { tableUrl } from '@/api/empower-manage';
 import searchBar from '@/components/search-bar';
 import { searchOpt } from '@/mixins/page-opt';
+import { appRestApi } from '@/api/application';
 export default {
   name: 'index',
   components: {
@@ -43,9 +44,12 @@ export default {
         {
           label: '应用系统名称',
           name: 'applyName',
-          op: 'like',
+          op: '=',
           value: '',
-          component: 'ElInput'
+          component: 'SelectApp',
+          apiUrl: appRestApi.table,
+          valueName: 'applyName',
+          labelName: 'applyName'
         },
         {
           label: '单位名称',

src/pages/list-manage/red-list-manage/component/app-func.vue

@@ -74,6 +74,8 @@ import jzApi from '@/api/jz-base';
 import operateBar from '@/components/operate-bar';
 import searchBar from '@/components/search-bar';
 import { searchOpt } from '@/mixins/page-opt';
+import { appRestApi } from '@/api/application';
+
 export default {
   components: { operateBar, searchBar },
   mixins: [searchOpt],
@@ -102,7 +104,10 @@ export default {
           name: 'appName',
           op: 'like',
           value: '',
-          component: 'ElInput'
+          component: 'SelectApp',
+          apiUrl: appRestApi.table,
+          valueName: 'applyName',
+          labelName: 'applyName'
         }
       ]
     };
@@ -162,7 +167,7 @@ export default {
           layer.close(index);
           return false;
         },
-        area: ['800px', '600px']
+        area: ['1000px', '800px']
       });
     },
     /**
@@ -233,7 +238,6 @@ export default {
         size: this.pageSize,
         searchCondition: this.condition
       };
-
       getRedAppFuncList(params).then((res) => {
         const { content, totalElements } = res.data;
         this.tableData = content;

src/pages/list-manage/red-list-manage/component/batch-add-appfunc.vue

@@ -5,15 +5,8 @@
 -->
 <template>
   <div>
-    <el-form inline>
-      <el-form-item label="应用系统名称">
-        <el-input v-model="appName" clearable></el-input>
-      </el-form-item>
-      <el-form-item>
-        <dg-button type="primary" @click="handleSearch" :icon="'查询' | optIcon">查询</dg-button>
-        <dg-button @click="handleReset" :icon="'重置' | optIcon">重置</dg-button>
-      </el-form-item>
-    </el-form>
+    <!-- 搜索栏 -->
+    <search-bar :conditionForm="conditionForm" @submitSearch="receiveSearch"></search-bar>
     <!-- 表格树 -->
     <vxe-table ref="vxeGrid" :data="sourceData" v-bind="gridOptions" highlight-hover-row>
       <vxe-table-column type="checkbox" width="60" align="center">
@@ -57,15 +50,28 @@
 import getTreeDataMixin from '@/pages/common/transfer-tree/mixin';
 import batchSetlevelAppFunc from './batch-setlevel-appfunc.vue';
 import { getFunIdsInRedList } from '@/api/list-manage';
+import searchBar from '@/components/search-bar';
+import { appRestApi } from '@/api/application';
 export default {
   props: {
     data: [Array]
   },
   mixins: [getTreeDataMixin],
-  components: {},
+  components: { searchBar },
   data() {
     return {
-      appName: '',
+      conditionForm: [
+        {
+          label: '应用系统名称',
+          name: 'applyName',
+          op: '=',
+          value: '',
+          component: 'SelectApp',
+          apiUrl: appRestApi.table,
+          valueName: 'applyName',
+          labelName: 'applyName'
+        }
+      ],
       value: [],
       valueName: 'id',
       childrenName: 'child',
@@ -90,11 +96,9 @@ export default {
     handleToggleAllCheck() {
       this.$refs.vxeGrid.toggleAllCheckboxRow();
     },
-    handleSearch() {
-      this.dataSource = this.data.filter((item) => item.label.indexOf(this.appName) > -1);
-    },
-    handleReset() {
-      this.appName = '';
+    receiveSearch(val) {
+      const appName = val.applyName.value;
+      this.dataSource = this.data.filter((item) => item.label.indexOf(appName) > -1);
     },
     handleCancel() {
       this.$emit('close');

src/pages/list-manage/red-list-manage/component/batch-setlevel-appfunc.vue

@@ -6,7 +6,7 @@
 <template>
   <div>
     <el-form inline>
-      <el-form-item label="红名单级别：">
+      <el-form-item label="红名单级别">
         <dg-select v-model="level" enum="ListLevelEnum" clearable></dg-select>
       </el-form-item>
     </el-form>

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

@@ -45,7 +45,7 @@ export const authManageLogTableHeader = [
 // 鉴权服务日志
 export const authServiceLogTableHeader = [
     {
-        label: "用户姓名",
+        label: "姓名",
         prop: "userName"
     },
     {
@@ -180,7 +180,7 @@ export const authRiskLogDetail = [
 // 鉴权服务日志详情
 export const authServiceLogDetail = [
     {
-        label: "用户姓名",
+        label: "姓名",
         prop: "userName"
     },
     {

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

@@ -42,7 +42,7 @@ export default {
       authServiceLogTableUrl,
       conditionForm: [
         {
-          label: '用户姓名',
+          label: '姓名',
           name: 'userName',
           op: 'like',
           component: 'ElInput'

src/pages/service-delegate/index.vue

@@ -30,6 +30,8 @@ import * as api from '@/api/service-delegate';
 import operateBar from '@/components/operate-bar';
 import searchBar from '@/components/search-bar';
 import { searchOpt } from '@/mixins/page-opt';
+import { appRestApi } from '@/api/application';
+
 const area = ['640px', '430px'];
 export default {
   name: 'index',
@@ -49,9 +51,12 @@ export default {
         {
           label: '应用系统名称',
           name: 'appName',
-          op: 'like',
+          op: '=',
           value: '',
-          component: 'ElInput'
+          component: 'SelectApp',
+          apiUrl: appRestApi.table,
+          valueName: 'applyName',
+          labelName: 'applyName'
         },
         {
           label: '应用系统编号',

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

@@ -6,8 +6,8 @@
     <search-bar :conditionForm="conditionForm" @submitSearch="receiveSearch"></search-bar>
     <!-- 统计条 -->
     <p class="statis-bar">
-      当前应用拥有角色【<span>{{ statisNums.roleNums }}</span
-      >】个，应用分配总名额 【<span>{{ statisNums.initNums }}</span
+      当前应用拥有角色【<span>{{ statisNums.roleNums}}</span
+      >】个，应用分配总名额 【<span>{{ statisNums.initNums}}</span
       >】名
     </p>
     <!-- 表格 -->

src/router/index.js

@@ -69,14 +69,14 @@ export const asyncRouterMap = [
     path: '/home',
     component: Layout,
     redirect: '/home/index',
-    meta: { title: '我的主页', icon: 'icon-home', noCache: false },
+    meta: { title: '我的主页', icon: 'icon-home', noCache: true },
     // hidden: true,
     children: [
       {
         path: 'index',
         component: () => import('@/pages/home'),
         name: 'index',
-        meta: { title: '我的主页', noCache: false }
+        meta: { title: '我的主页', noCache: true }
       }
     ]
   },
@@ -90,13 +90,13 @@ export const asyncRouterMap = [
   {
     path: '/service-delagate-manage',
     component: Layout,
-    meta: { title: '服务授权管理', icon: 'icon-fwsqgl', noCache: false, permission: ['QXGL_SQGL_SJSQGL_RYSQ'] },
+    meta: { title: '服务授权管理', icon: 'icon-fwsqgl', noCache: true, permission: ['QXGL_SQGL_SJSQGL_RYSQ'] },
     children: [
       {
         path: 'service-delagate',
         component: () => import('@/pages/service-delegate'),
         name: 'service-delagate',
-        meta: { title: '服务授权管理', noCache: false, permission: ['QXGL_SQGL_SJSQGL_RYSQ'] }
+        meta: { title: '服务授权管理', noCache: true, permission: ['QXGL_SQGL_SJSQGL_RYSQ'] }
       }
     ]
   },
@@ -104,26 +104,26 @@ export const asyncRouterMap = [
   {
     path: '/data-auth-manage',
     component: Layout,
-    meta: { title: '数据授权管理', icon: 'icon-permission', noCache: false, permission: ['QXGL_SQGL_SJSQGL'] },
+    meta: { title: '数据授权管理', icon: 'icon-permission', noCache: true, permission: ['QXGL_SQGL_SJSQGL'] },
     children: [
       {
         path: 'business-tag-auth',
         component: () =>
           import('@/pages/data-auth-module/data-permission-manage/data-auth-manage/business-tag-auth.vue'),
         name: 'business-tag-auth',
-        meta: { title: '属性授权', noCache: false, permission: ['QXGL_SQGL_SJSQGL_BQSQ'], layout: 'page' }
+        meta: { title: '属性授权', noCache: true, permission: ['QXGL_SQGL_SJSQGL_BQSQ'], layout: 'page' }
       },
       {
         path: 'person-auth',
         component: () => import('@/pages/data-auth-module/data-permission-manage/data-auth-manage/person-auth.vue'),
         name: 'person-auth',
-        meta: { title: '人员授权', noCache: false, permission: ['QXGL_SQGL_SJSQGL_RYSQ'], layout: 'page' }
+        meta: { title: '人员授权', noCache: true, permission: ['QXGL_SQGL_SJSQGL_RYSQ'], layout: 'page' }
       },
       {
         path: 'org-auth',
         component: () => import('@/pages/data-auth-module/data-permission-manage/data-auth-manage/org-auth.vue'),
         name: 'org-auth',
-        meta: { title: '机构授权', noCache: false, permission: ['QXGL_SQGL_SJSQGL_JGSQ'], layout: 'page' }
+        meta: { title: '机构授权', noCache: true, permission: ['QXGL_SQGL_SJSQGL_JGSQ'], layout: 'page' }
       }
     ]
   },

src/router/modules/admin-manage.js

@@ -18,7 +18,7 @@ const componentsRouter = {
         component: () =>
             import ("@/pages/admin-manage"),
         name: "admin-manage",
-        meta: { title: "管理员管理", noCache: false, permission: ['YHGLPT_YHGL_GLYGL'] }
+        meta: { title: "管理员管理", noCache: true, permission: ['YHGLPT_YHGL_GLYGL'] }
     }]
 };
 

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

@@ -16,25 +16,25 @@ const componentsRouter = [
         path: 'user-prop-manage',
         component: () => import('@/pages/data-auth-module/auth-subject-manage/user-prop-manage'),
         name: 'user-prop-manage',
-        meta: { title: '用户管理', noCache: false, permission: ['QXGL_SQGL_ZTGL_YHSXGL'] }
+        meta: { title: '用户管理', noCache: true, permission: ['QXGL_SQGL_ZTGL_YHSXGL'] }
       },
       {
         path: 'org-prop-manage',
         component: () => import('@/pages/data-auth-module/auth-subject-manage/org-prop-manage'),
         name: 'org-prop-manage',
-        meta: { title: '机构管理', noCache: false, permission: ['QXGL_SQGL_ZTGL_JGSXGL'], layout: "page" }
+        meta: { title: '机构管理', noCache: true, permission: ['QXGL_SQGL_ZTGL_JGSXGL'], layout: "page" }
       },
       {
         path: 'app-prop-manage',
         component: () => import('@/pages/data-auth-module/auth-subject-manage/app-prop-manage'),
         name: 'app-prop-manage',
-        meta: { title: '应用管理', noCache: false, permission: ['QXGL_SQGL_ZTGL_YYSXGL'] }
+        meta: { title: '应用管理', noCache: true, permission: ['QXGL_SQGL_ZTGL_YYSXGL'] }
       },
       {
         path: 'subject-prop-manage',
         component: () => import('@/pages/data-auth-module/auth-subject-manage/subject-prop-manage'),
         name: 'subject-prop-manage',
-        meta: { title: '主体属性管理', noCache: false, permission: ['QXGL_SQGL_ZTGL_ZTSXLGL'],layout: 'page' }
+        meta: { title: '主体属性管理', noCache: true, permission: ['QXGL_SQGL_ZTGL_ZTSXLGL'],layout: 'page' }
       }
     ]
   },
@@ -51,7 +51,7 @@ const componentsRouter = [
         name: 'appfun-resource-manage',
         meta: {
           title: '应用功能资源管理',
-          noCache: false,
+          noCache: true,
           permission: ['QXGL_SQGL_KTGL_YYGNGL']
         }
       },
@@ -59,19 +59,19 @@ const componentsRouter = [
         path: 'service-resource-manage',
         component: () => import('@/pages/data-auth-module/auth-object-manage/service-resource-manage'),
         name: 'service-resource-manage',
-        meta: { title: '服务资源管理', noCache: false, permission: ['QXGL_SQGL_KTGL_FWZYGL'] }
+        meta: { title: '服务资源管理', noCache: true, permission: ['QXGL_SQGL_KTGL_FWZYGL'] }
       },
       {
         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: ['QXGL_SQGL_KTGL_SJFJFLBM'] }
+        meta: { title: '数据分级分类管理', noCache: true, permission: ['QXGL_SQGL_KTGL_SJFJFLBM'] }
       },
       {
         path: 'object-prop-manage',
         component: () => import('@/pages/data-auth-module/auth-object-manage/object-prop-manage'),
         name: 'object-prop-manage',
-        meta: { title: '客体属性管理', noCache: false, permission: ['QXGL_SQGL_ZTGL_KTSXLGL'], layout: 'page' }
+        meta: { title: '客体属性管理', noCache: true, permission: ['QXGL_SQGL_ZTGL_KTSXLGL'], layout: 'page' }
       }
     ]
   }

src/router/modules/empower-manage.js

@@ -15,19 +15,19 @@ const componentRouter = {
       path: 'author-setting',
       component: () => import('@/pages/authorization-manage'),
       name: 'author-setting',
-      meta: { title: '应用角色管理', icon: '', noCache: false, permission: ['YHGLPT_QXGL_QXPZ'] }
+      meta: { title: '应用角色管理', icon: '', noCache: true, permission: ['YHGLPT_QXGL_QXPZ'] }
     },
     {
       path: 'institutional-quotas-manage',
       component: () => import('@/pages/empower-manage/institutional-quotas-manage'),
       name: 'institutional-quotas-manage',
-      meta: { title: '机构配额管理', noCache: false, permission: ['YHGLPT_SQGL_JGPEGL'] }
+      meta: { title: '机构配额管理', noCache: true, permission: ['YHGLPT_SQGL_JGPEGL'] }
     },
     {
       path: 'persional-empower-manage',
       component: () => import('@/pages/empower-manage/persional-empower-manage'),
       name: 'persional-empower-manage',
-      meta: { title: '角色授权管理', noCache: false, permission: ['YHGLPT_SQGL_RYSQGL'],layout: "page" }
+      meta: { title: '角色授权管理', noCache: true, permission: ['YHGLPT_SQGL_RYSQGL'],layout: "page" }
     }
   ]
 };

src/router/modules/statistics-manage.js

@@ -20,7 +20,7 @@ const componentsRouter = {
       path: 'role-authorization',
       component: () => import('@/pages/statistics-manage/role-authorization'),
       name: 'role-authorization',
-      meta: { title: '角色授权情况', noCache: false, permission: ['YHGLPT_TJBB_JSSQQK'] }
+      meta: { title: '角色授权情况', noCache: true, permission: ['YHGLPT_TJBB_JSSQQK'] }
     }
   ]
 };