添加按钮图标配置文件，将一些通用组件从page挪到components下

config/btn-icon-config.js

@@ -0,0 +1,24 @@
+/** 页面按钮图标配置 */
+const btnAttr = [
+    ['修改', 'el-icon-edit'],
+    ['详情', 'el-icon-document'],
+    ['删除', 'el-icon-delete'],
+    ['移除', 'el-icon-remove-outline'],
+    ['功能配置', 'el-icon-menu'],
+    ['导入', 'el-icon-upload2'],
+    ['新增', 'el-icon-circle-plus-outline'],
+    ['同步', 'el-icon-refresh'],
+    ['权限变更申请', 'el-icon-circle-plus-outline'],
+    ['批量添加', 'el-icon-circle-plus-outline'],
+    ['批量移除', 'el-icon-remove-outline'],
+    ['批量设置名单级别', 'el-icon-setting'],
+    ['查询', 'el-icon-search'],
+    ['重置', 'el-icon-refresh-right'],
+    ['撤销', 'el-icon-refresh-right'],
+    ['撤回', 'el-icon-back']
+]
+let iconMap = new Map(btnAttr);
+export default iconMap
+
+
+

src/components/operate-bar/index.vue

@@ -4,7 +4,7 @@
 @Date: 2021-07-28 14:23
 -->
 <template>
-  <dg-row zebra="10px" class="opt-bar">
+  <dg-row zebra="20px" class="opt-bar">
     <dg-button
       v-for="(item, index) in pageOptList"
       :key="index"
@@ -41,6 +41,6 @@ export default {
 
 <style lang='scss' scoped>
 .opt-bar {
-    // border-top: 1px dashed rgba(0,0,0,.15);
+    border-top: 1px dashed rgba(0,0,0,.15);
 }
 </style>

src/components/search-bar/index.vue

@@ -10,8 +10,8 @@
         <component :is="item.component" v-model="item.value" v-bind="item.attr" clearable />
       </el-form-item>
       <el-form-item>
-        <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
-        <dg-button v-if="resetable" type="primary" @click="handleReset" icon="el-icon-refresh-right">重置</dg-button>
+        <dg-button type="primary" @click="handleSearch" :icon="'查询' | optIcon">查询</dg-button>
+        <dg-button v-if="resetable" @click="handleReset" :icon="'重置' | optIcon">重置</dg-button>
       </el-form-item>
     </el-form>
   </div>

src/components/select-org-tree/index.vue

@@ -24,11 +24,6 @@
     <template slot="prefix">
       <slot name="prefix"></slot>
     </template>
-    <!-- <template slot="empty">
-      <slot name="empty">
-        <span v-if="!loading && treeData.length == 0">空数据 </span>
-      </slot>
-    </template> -->
     <dg-scrollbar
       ref="scrollbar"
       wrap-class="el-select-dropdown__wrap"
@@ -168,7 +163,7 @@ export default {
       this.selectedNodeLabel = '';
       this.$refs.tree.setCurrentKey(null);
       this.$refs.tree.setRadioKeys([]);
-      this.$emit("orgTreeValue", "");
+      this.$emit('orgTreeValue', '');
     },
     handleScrollToBottom() {
       if (!this.lazy && !this.isLast) {

src/components/select-tree-table/index.vue

@@ -1,88 +0,0 @@
-/**
-* 组件名称；可动态配置是否带复选框
-* @author:laiyh
-* @Date:2020-07-27
-*/
-
-<template>
-	<dg-table
-			ref="selectTreeTable"
-			:data="tableData"
-			:pagination="false"
-			style="width: 100%;margin-bottom: 20px;"
-			row-key="id"
-			border
-			default-expand-all
-			v-bind="$attrs"
-			v-on="$listeners"
-			@selection-change="selectChange"
-	>		
-			<dg-table-column type="selection" v-if="selectShow"></dg-table-column>
-			<template v-for="(item, indexs) in headerData">
-					<dg-table-column :key="indexs" v-bind="item">
-							<template v-if="item.state" slot-scope="scope">
-									<span>{{converterText(scope.row, item)}}</span>
-							</template>
-					</dg-table-column>
-			</template>
-			<slot />
-	</dg-table>
-</template>
-
-<script>
-
-export default {
-  name: "",
-  // 接收父节点的参数
-  props: {
-    url: {
-      tpye: String,
-      require: true
-    },
-    treeProp: {
-      type: Object,
-      default: () => ({
-        hasChildren: 'isParent',
-        children: 'children',
-        isLeaf(data) {
-          return data.isParent !== 'true';
-        },
-      })
-    },
-    headerData: {
-      type: Array,
-      default: () => []
-    },
-    selectShow: {
-      type: Boolean,
-      default: true
-    },
-    roleId:,
-  },
-  watch: {
-    // 监听父组件传过来的值，刷新表格
-    roleId(val) {
-      console.log(roleId);
-    }
-  },
-  data() {
-    return {
-      tableData: [],
-    }
-  },
-  // 方法
-  methods: {
-    // 选择框状态改变时
-    selectChange(selection) {
-      this.$emit("selectChange", {selectSource: selection});
-    }
-  },
-  // 页面创建完成$data可访问 $el不可以访问
-  created() {
-
-  },
-
-}
-</script>
-
-<style lang="scss" scoped></style>

src/filters/index.js

@@ -1,5 +1,6 @@
 import utils from '@/common/utils';
 const { ztMoment } = utils;
+import iconMap from "../../config/btn-icon-config"
 
 function pluralize(time, label) {
   if (time === 1) {
@@ -54,25 +55,6 @@ export function optIcon(type, defaultIcon) {
   if (defaultIcon) {
     return defaultIcon;
   }
-  let iconMap = new Map();
-  iconMap
-    .set('修改', 'el-icon-edit')
-    .set('详情', 'el-icon-document')
-    .set('删除', 'el-icon-delete')
-    .set('移除', 'el-icon-remove-outline')
-    .set('功能配置', 'el-icon-menu')
-    .set('导入', 'el-icon-upload2')
-    .set('导入', 'el-icon-upload2')
-    .set('新增', 'el-icon-circle-plus-outline')
-    .set('同步', 'el-icon-refresh')
-    .set('权限申请', 'el-icon-circle-plus-outline')
-    .set('批量添加', 'el-icon-circle-plus-outline')
-    .set('批量移除', 'el-icon-remove-outline')
-    .set('批量设置名单级别', 'el-icon-setting')
-    .set('查询', 'el-icon-search')
-    .set('重置', 'el-icon-refresh-right')
-    .set('撤销', 'el-icon-refresh-right')
-    .set('撤回', 'el-icon-back')
   const icon = iconMap.get(type);
   return icon ? icon : 'el-icon-edit';
 }

src/pages/admin-manage/tab-first.vue

@@ -72,7 +72,7 @@
 <script>
 import Tree from "@/pages/common/tree";
 import Table from "@/pages/common/table";
-// import Import from "@/pages/common/import";
+// import Import from "@/components/import";
 import Add from "./add";
 import Editor from "./noBindEditor";
 import PoliceDetail from "@/pages/user-manage/police-manage/detail";

src/pages/admin-manage/tab-second.vue

@@ -43,7 +43,7 @@
 <script>
 import Tree from "@/pages/common/tree";
 import Table from "@/pages/common/table";
-// import Import from "@/pages/common/import";
+// import Import from "@/components/import";
 import Editor from "./noBindEditor";
 import PoliceDetail from "@/pages/user-manage/police-manage/detail";
 import AuxiliaryDetail from "@/pages/user-manage/auxiliary-police-manage/detail";

src/pages/data-auth-module/auth-object-manage/appfun-resource-manage/app-list.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import importFile from '@/pages/common/import';
+import importFile from '@/components/import';
 import { appRestApi } from '@/api/application';
 import { appSync } from '@/api/sync';
 import addFuncForm from './add-func-form';
@@ -32,8 +32,8 @@ import operateBar from '@/components/operate-bar';
 import basicTable from '@/pages/common/new-table';
 import searchBar from '@/components/search-bar';
 import { conditionForm, pageOptList, tableOptList, appForm } from './DataConfig';
-import Form from '@/pages/common/form';
-import FormDetail from '@/pages/common/form-detail';
+import Form from '@/components/form';
+import FormDetail from '@/components/form-detail';
 
 export default {
   components: { operateBar, basicTable, searchBar },

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

@@ -71,7 +71,7 @@
 </template>
 
 <script>
-import importFile from "@/pages/common/import";
+import importFile from "@/components/import";
 import addForm from "./add-form";
 import * as Api from "@/api/ser-resource-manage";
 import { serviceImportUrl } from "@/api/import";

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

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import importFile from "@/pages/common/import";
+import importFile from "@/components/import";
 import { dataLevelTableUrl, delDataLevel } from "@/api/data-auth";
 import addForm from "./forms/data-level-form";
 import { dataLevelSync } from "@/api/sync"

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

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import importFile from "@/pages/common/import";
+import importFile from "@/components/import";
 import fieldSortForm from "./forms/field-sort-form";
 import { fieldClassifyTableUrl, delFieldClassify } from "@/api/data-auth";
 import { fieldSortSync } from "@/api/sync";

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

@@ -42,11 +42,11 @@
 </template>
 
 <script>
-import importFile from "@/pages/common/import";
+import importFile from "@/components/import";
 import { dataSecLevTableUrl, getDataSecLevDetail, saveDataSecLev, delDataSecLev } from "@/api/data-auth";
 import { dataSafeLevelSync } from "@/api/sync";
 import { safeLevelForm } from "./DataConfig";
-import Form from "@/pages/common/form";
+import Form from "@/components/form";
 import Table from "@/pages/common/table";
 import { dataSafeLevelImportUrl } from "@/api/import";
 export default {

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

@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import importFile from "@/pages/common/import";
+import importFile from "@/components/import";
 import sourceSortForm from "./forms/source-sort-form";
 import { dataSourceClaTableUrl, delDataSourceCla } from "@/api/data-auth";
 import { dataSourceSync } from "@/api/sync";

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

@@ -74,7 +74,7 @@ import Table from "@/pages/common/table";
 import { ApplicationTableData } from "../DataConfig";
 // import detail from "./detail";
 import detail from "../../auth-object-manage/appfun-resource-manage/add-app-form";
-import importFile from "@/pages/common/import";
+import importFile from "@/components/import";
 import { appRestApi } from "@/api/application";
 import { appSync } from "@/api/sync";
 import { appImportUrl } from "@/api/import";

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

@@ -60,7 +60,7 @@ import Tree from "@/pages/common/tree";
 import { institutionField } from "../DataConfig";
 import { orgInfoDetail } from "@/api/data-auth";
 import { authOrgSync } from "@/api/sync";
-import importFile from "@/pages/common/import";
+import importFile from "@/components/import";
 import { orgImportUrl } from "@/api/import";
 export default {
     name: "institutional-attributes", // 组件名称

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

@@ -88,7 +88,7 @@ import { authUserTableUrl } from '@/api/data-auth';
 import { authUserSync } from '@/api/sync';
 import baseApi from '@/api/jz-base';
 import detail from './detail';
-import importFile from '@/pages/common/import';
+import importFile from '@/components/import';
 import selectTree from '@/pages/common/select-tree';
 import { userImportUrl } from '@/api/import';
 export default {

src/pages/log-manage/permiss-log-manage/log-detail/auth-risk.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import formDetail from "@/pages/common/form-detail";
+import formDetail from "@/components/form-detail";
 import { authRiskLogDetail } from "../DataConfig";
 import { getAuthRiskLogDetail } from "@/api/permiss-log-manage";
 export default {

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

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import formDetail from "@/pages/common/form-detail";
+import formDetail from "@/components/form-detail";
 import { authServiceLogDetail } from "../DataConfig";
 import { getAuthServiceLogDetail } from "@/api/permiss-log-manage";
 export default {

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

@@ -153,7 +153,7 @@
 <script>
 import Tree from "@/pages/common/tree";
 import Table from "@/pages/common/table";
-import Import from "@/pages/common/import";
+import Import from "@/components/import";
 import CheckTree from "@/pages/common/check-tree";
 import Editor from "./editor";
 import Detail from "./detail";