bugfix

config/dev.env.js

@@ -42,8 +42,8 @@ module.exports = merge(prodEnv, {
             // target: "http://10.11.1.164:8861"
             // target: "http://10.11.0.48:8861",// 邱宇
             // target: "http://10.254.11.203:8861"
-            target: "http://10.11.1.237:8861"
-            // target: "http://10.254.11.203:8861"
+            // target: "http://10.11.1.237:8861"
+            target: "http://10.254.11.203:8861"
 
         }
     })

src/api/common.js

@@ -93,8 +93,8 @@ export function downTemplate(params) {
 export function importFile(url, data) {
    return request({
        url,
-       method: "POST",
-       data
+       method: "GET",
+       params: data
    })
 }
 

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

@@ -127,7 +127,8 @@ export default {
             const nodes = selectNodes.map((item) => {
                 return {
                     dataType: item.dataType,
-                    dataId: item.id
+                    dataId: item.id,
+                    innerId: item.innerId
                 };
             });
             this.$emit("getSelectNodes", {

src/directive/code/index.js

@@ -11,7 +11,7 @@ export default function (el, binding) {
     let elInnerText = el.textContent.replace(/[ ]|[\r\n]/g, "");
     ["enum", "code", "url"].some((item) => {
         if (binding.value[item]) {
-            params[item] = binding.value[item];
+            params = binding.value;
             return true;
         }
     });

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

@@ -33,9 +33,9 @@
                     <el-input v-model="form.applyCode" placeholder="" v-if="!isDetail"></el-input>
                     <span v-else>{{ form.applyCode }}</span>
                 </el-form-item>
-                <el-form-item label="系统在用标识：" prop="applyStatus">
+                <el-form-item label="应用系统在用标识：" prop="applyStatus">
                     <dg-select v-model="form.applyStatus" v-if="!isDetail" code="DM_APPLY_STATUS"></dg-select>
-                    <span v-else>{{ form.applyStatus == "0" ? "禁用" : "启用"}}</span>
+                    <span v-else>{{ form.applyStatus == "1" ? "禁用" : "启用"}}</span>
                 </el-form-item>
                 <el-form-item label="应用系统事权单位代码：" prop="managerOrgCode">
                     <el-input v-model="form.managerOrgCode" placeholder="" v-if="!isDetail"></el-input>
@@ -64,7 +64,7 @@
 
 <script>
 import { appRestApi } from "@/api/application";
-import moment from "moment"
+import moment from "moment";
 export default {
     props: {
         id: String,
@@ -102,7 +102,7 @@ export default {
          * 保存
          */
         saveForm() {
-           return new Promise((resolve) => {
+            return new Promise((resolve) => {
                 this.$refs.form.validate((valid) => {
                     if (valid) {
                         const api = this.id ? "update" : "save";

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

@@ -11,8 +11,8 @@
             <el-form-item label="应用系统名称">
                 <el-input v-model="form.applyName.value" placeholder="请输入应用名称" clearable></el-input>
             </el-form-item>
-            <el-form-item label="应用在用标识">
-                <dg-select code="DM_APPLY_STATUS" v-model="form.applyStatus.value"  placeholder="请选择应用在用标识"  clearable></dg-select>
+            <el-form-item label="应用系统在用标识">
+                <dg-select code="DM_APPLY_STATUS" v-model="form.applyStatus.value"  placeholder="请选择应用系统在用标识"  clearable></dg-select>
             </el-form-item>
             <el-form-item>
                 <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
@@ -38,7 +38,7 @@
             <dg-table-column prop="applyCode" label="应用系统编码" align="center"></dg-table-column>
             <dg-table-column prop="applyName" label="应用系统名称" align="center"></dg-table-column>
             <dg-table-column prop="appEnglishName" label="应用英文名称" align="center"></dg-table-column>
-            <dg-table-column prop="applyStatus" label="应用在用标识" align="center" code="DM_APPLY_STATUS">
+            <dg-table-column prop="applyStatus" label="应用系统在用标识" align="center" code="DM_APPLY_STATUS">
                 <!-- <template slot-scope="scope">
                     {{ scope.row.applyStatus == "0" ? "禁用" : "启用" }}
                 </template> -->
@@ -206,7 +206,7 @@ export default {
          */
         handleSync() {
               appSync().then(res => {
-                this.$message.success("同步成功");
+                this.$message.success("同步中，若数据量大，可能会存在延迟，请稍后自行刷新！");
                 // this.handleSearch();
             })
         },

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

@@ -18,11 +18,11 @@
                         style="width: 180px"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="系统在用标识">
+                <el-form-item label="应用系统在用标识">
                     <dg-select
                         code="DM_APPLY_STATUS"
                         v-model="form.status.value"
-                        placeholder="请选择应用在用标识"
+                        placeholder="请选择应用系统在用标识"
                         clearable
                         style="width: 180px"
                     >
@@ -89,7 +89,7 @@ export default {
          * @description: 查询
          */
         handleSearch() {
-            this.$refs.table.searchForm();
+            this.$refs.table.handleSearchClick();
         },
         /**
          * @description: 单击表格行

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

@@ -45,7 +45,7 @@
                 </el-form-item>
             </dg-col>
             <dg-col :span="24">
-                <el-form-item label="服务提供应用系统名称：" prop="appName">
+                <el-form-item label="服务提供应用系统名称：" prop="appCode">
                     <dg-select
                         :data="apps"
                         v-model="form.appCode"
@@ -107,7 +107,7 @@ export default {
                 serviceProvideWay: [{ required: true, message: "请选择服务提供方式", trigger: "change" }],
                 serviceUrl: [{ required: true, message: "请输入服务访问地址", trigger: "change" }],
                 appCode: [{ required: true, message: "请输入服务提供应用系统名称", trigger: "change" }],
-                mustSelf: [{ required: true, message: "请选择是否自动服务", trigger: "change" }]
+                mustSelf: [{ required: true, message: "请选择是否自动服务", trigger: "change" }],
             },
             apps: []
         };

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

@@ -7,19 +7,19 @@
     <div>
         <!-- 搜索项 -->
         <el-form :inline="true" class="search-form">
-            <el-form-item label="数据资源名称">
-                <el-input v-model="form.serviceName.value" placeholder="请输入数据资源名称" clearable></el-input>
+            <el-form-item label="服务资源名称">
+                <el-input v-model="form.serviceName.value" placeholder="请输入服务资源名称" clearable></el-input>
             </el-form-item>
-            <el-form-item label="数据提供方式">
+            <el-form-item label="服务提供方式">
                 <dg-select
                     v-model="form.serviceProvideWay.value"
                     enum="ServiceProvideWayEnum"
-                    placeholder="请选择数据提供方式"
+                    placeholder="请选择服务提供方式"
                     clearable
                 ></dg-select>
             </el-form-item>
-            <el-form-item label="数据提供应用系统名称">
-                <el-input v-model="form.appName.value" placeholder="请输入数据提供应用系统名称" clearable></el-input>
+            <el-form-item label="服务提供应用系统名称">
+                <el-input v-model="form.appName.value" placeholder="请输入服务提供应用系统名称" clearable></el-input>
             </el-form-item>
             <el-form-item>
                 <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
@@ -204,7 +204,7 @@ export default {
          */
         handleSynchro() {
             authSerSync().then((res) => {
-                this.$message.success("同步成功");
+                this.$message.success("同步中，若数据量大，可能会存在延迟，请稍后自行刷新！");
                 this.handleSearch();
             });
         }

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

@@ -19,7 +19,7 @@
         <dg-row zebra="10px">
             <dg-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</dg-button>
             <dg-button type="primary" icon="el-icon-refresh" @click="handleSynchro">同步</dg-button>
-            <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button>
+            <!-- <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button> -->
         </dg-row>
         <!-- 列表 -->
         <dg-table ref="table" :url="dataLevelTableUrl" :condition="form" border row-key="id">
@@ -160,7 +160,7 @@ export default {
          */
         handleSynchro() {
             dataLevelSync().then(res => {
-                this.$message.success("同步成功");
+                this.$message.success("同步中，若数据量大，可能会存在延迟，请稍后自行刷新！");
                 this.handleSearch();
             })
         },

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

@@ -177,7 +177,7 @@ export default {
          */
         handleSynchro() {
             fieldSortSync().then((res) => {
-                this.$message.success("同步成功");
+                this.$message.success("同步中，若数据量大，可能会存在延迟，请稍后自行刷新！");
                 this.handleSearch();
             });
         }

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

@@ -18,7 +18,7 @@
         <dg-row zebra="10px">
             <dg-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd">新增</dg-button>
             <dg-button type="primary" icon="el-icon-refresh" @click="handleSynchro">同步</dg-button>
-            <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button>
+            <!-- <dg-button type="primary" @click="handleImport" icon="el-icon-upload">导入</dg-button> -->
         </dg-row>
         <!-- 列表 -->
         <Table ref="myTable" :url="dataSecLevTableUrl" :headerData="safeLevelForm" :condition="form">
@@ -166,7 +166,7 @@ export default {
          */
         handleSynchro() {
             dataSafeLevelSync().then((res) => {
-                this.$message.success("同步成功");
+                this.$message.success("同步中，若数据量大，可能会存在延迟，请稍后自行刷新！");
                 this.handleSearch();
             });
         }

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

@@ -186,7 +186,7 @@ export default {
          */
         handleSynchro() {
             dataSourceSync().then((res) => {
-                this.$message.success("同步成功");
+                this.$message.success("同步中，若数据量大，可能会存在延迟，请稍后自行刷新！");
                 this.handleSearch();
             });
         }

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

@@ -54,7 +54,7 @@ const ApplicationTableData = [
         prop: "appEnglishName"
     },
     {
-        label: "应用在用标识",
+        label: "应用系统在用标识",
         prop: "applyStatus",
         code: "DM_APPLY_STATUS"
     },
@@ -118,7 +118,7 @@ const cardAgencylist = [
         prop: "applyCode"
     },
     {
-        label: "系统在用标识",
+        label: "应用系统在用标识",
         prop: "applyStatus",
         code: "DM_APPLY_STATUS"
     }
@@ -184,20 +184,21 @@ const typeData = {
 };
 const institutionField = [
     { label: "上级行政机构", value: "upGovName" },
-    { label: "机构类型", value: "orgType", enum: "OrgKindEnum" },
+    { label: "机构类型", value: "orgKind", enum: "OrgKindEnum" },
     { label: "机构名称", value: "fullName" },
-    { label: "行政区划", value: "areaCode" },
+    { label: "行政区划", value: "areaCode", code: "T_MD_AREA_CODE" },
     { label: "机构代码", value: "code" },
-    { label: "机构类别", value: "unitClass", code: "T_MD_ORGTYPE" },
+    { label: "机构类别", value: "orgType", code: "T_MD_ORGTYPE" },
     { label: "单位层级", value: "orgLevel", code: "T_MD_ORG_LEVEL" },
     { label: "单位级别", value: "orgRank", code: "T_MD_ORG_RANK" },
-    { label: "单位类别", value: "orgKind", code: "T_MD_UNIT_CLASS" }
+    { label: "单位类别", value: "unitClass", url: "/duacm/codeSon/v2/data/T_MD_UNIT_CLASS" }
+
 ];
 const applicationField = [
     { label: "应用系统名称", value: "applyName" },
     { label: "应用系统编号", value: "applyCode" },
     { label: "应用英文名称", value: "appEnglishName" },
-    { label: "应用在用标识", value: "applyStatus", code: "DM_APPLY_STATUS" },
+    { label: "应用系统在用标识", value: "applyStatus", code: "DM_APPLY_STATUS" },
     { label: "上线日期", value: "lineTime" },
     { label: "应用系统事权单位代码", value: "managerOrgCode" },
     { label: "应用负责人", value: "fzr" },

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

@@ -12,26 +12,39 @@
             <el-form-item label="应用系统名称">
                 <el-input v-model="form.applyName.value" placeholder="请输入应用系统名称" clearable></el-input>
             </el-form-item>
-            <el-form-item label="应用在用标识">
+            <el-form-item label="应用系统在用标识">
                 <dg-select
                     v-model="form.applyStatus.value"
-                    placeholder="请选择应用在用标识"
+                    placeholder="请选择应用系统在用标识"
                     code="DM_APPLY_STATUS"
                     style="width: 13rem"
                     clearable
                 >
                 </dg-select>
             </el-form-item>
-            <el-form-item label="应用系统事权单位代码">
+            <!-- <el-form-item label="应用系统事权单位代码">
                 <el-input
                     v-model="form.managerOrgCode.value"
                     placeholder="请输入应用系统事权单位代码"
                     clearable
                 ></el-input>
+            </el-form-item> -->
+            <el-form-item label="上线日期">
+                <dg-date-picker
+                    v-model="form.lineTime.value"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    clearable
+                    value-format="yyyyMMddHHmmss"
+                    :unlink-panels="true"
+                >
+                </dg-date-picker>
             </el-form-item>
             <el-form-item>
                 <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
-                  <dg-button type="primary" @click="handleReset" icon="el-icon-refresh-right">重置</dg-button>
+                <dg-button type="primary" @click="handleReset" icon="el-icon-refresh-right">重置</dg-button>
             </el-form-item>
             <!-- <el-form-item label="最近同步时间：" style="float: right">
                 <span>2021-04-08 12:00:00</span>
@@ -63,8 +76,8 @@ import { ApplicationTableData } from "../DataConfig";
 import detail from "../../auth-object-manage/appfun-resource-manage/add-app-form";
 import importFile from "@/pages/common/import";
 import { appRestApi } from "@/api/application";
-import { appSync } from "@/api/sync"
-import { appImportUrl } from "@/api/import"
+import { appSync } from "@/api/sync";
+import { appImportUrl } from "@/api/import";
 export default {
     name: "application-properties", // 组件名称
     props: {
@@ -86,6 +99,12 @@ export default {
                 managerOrgCode: {
                     value: "",
                     op: "like"
+                },
+                lineTime: {
+                    value: "",
+                    op: "between",
+                    type: "DATE",
+                    format: "yyyyMMddHHmmss"
                 }
             },
             ApplicationTableData,
@@ -107,7 +126,7 @@ export default {
          */
         handleReset() {
             for (const key in this.form) {
-              this.form[key].value = "";
+                this.form[key].value = "";
             }
         },
         /**
@@ -139,14 +158,14 @@ export default {
                 area: ["550px", "500px"]
             });
         },
-       /**
+        /**
          * @description:同步方法，假同步
          */
         handleSynchro() {
-            appSync().then(res => {
-                this.$message.success("同步成功");
+            appSync().then((res) => {
+                this.$message.success("同步中，若数据量大，可能会存在延迟，请稍后自行刷新！");
                 this.handleSearch();
-            })
+            });
         },
         /**
          * @description:详情

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

@@ -41,6 +41,9 @@
                                 <div v-if="item.code" v-translate="{ code: item.code }">{{ formInfo[item.value] }}</div>
                                 <div v-else-if="item.enum" v-translate="{ enum: item.enum }">
                                     {{ formInfo[item.value] }}
+                                </div>
+                                  <div v-else-if="item.url" v-translate="{ url: item.url, valueName: 'CODE', labelName: 'VALUE' }">
+                                    {{ formInfo[item.value] }}
                                 </div>
                                 <span v-else>{{ formInfo[item.value] }}</span>
                             </el-form-item>
@@ -107,7 +110,7 @@ export default {
          */
         handleSynchro() {
             authOrgSync().then((res) => {
-                this.$message.success("同步成功");
+                this.$message.success("同步中，若数据量大，可能会存在延迟，请稍后自行刷新！");
                 this.handleSearch();
             });
         },
@@ -116,6 +119,7 @@ export default {
          */
         handleGetNode({ id }) {
             if (this.currentId != id) {
+                this.formInfo = {};
                 this.currentId = id;
                 this.getDetail();
             }

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

@@ -12,11 +12,11 @@
             <el-form-item label="应用系统名称">
                 <el-input clearable placeholder="请输入应用系统名称" v-model="form.applyName.value"></el-input>
             </el-form-item>
-            <el-form-item label="系统在用标识">
+            <el-form-item label="应用系统在用标识">
                 <dg-select
                     code="DM_APPLY_STATUS"
                     v-model="form.applyStatus.value"
-                    placeholder="请选择应用在用标识"
+                    placeholder="请选择应用系统在用标识"
                     style="width: 13rem"
                     clearable
                 >

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

@@ -6,59 +6,67 @@
 <template>
     <div>
         <dg-card class="box-card" header="属性详情">
-            <el-form
-                ref="ruleForm"
-                :rules="rules"
-                :model="form"
-                label-width="80px"
-                :style="{ width: type == 'SUB' ? '50%' : '100%' }"
-            >
-                <el-form-item label="属性类别">
-                    <el-input v-model="rootName" placeholder="请输入属性类别" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="属性名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入属性名称" :disabled="readOnly"></el-input>
-                </el-form-item>
-                <el-form-item
-                    v-for="(item, index) in form.child"
-                    :key="index"
-                    :label="index == 0 ? '属性值' : ''"
-                    :prop="'child.' + index + '.name'"
-                    class="prop-value-item"
-                    :rules="{
-                        required: true,
-                        message: '属性值不能为空',
-                        trigger: 'blur'
-                    }"
-                >
-                    <div class="subject-property__form-item">
-                        <el-input v-model="item.name" placeholder="请输入属性值" :disabled="readOnly"></el-input>
-                        <i
-                            class="el-icon-remove-outline icon"
-                            @click="handleDeletePropValue(index)"
-                            v-if="form.child.length > 1 && !readOnly"
-                        ></i>
-                        <!-- <dg-button class="delete-btn" size="mini" icon="el-icon-minus" plain></dg-button> -->
-                    </div>
-                </el-form-item>
-                <el-form-item label="">
-                    <dg-button
-                        v-if="!readOnly"
-                        icon="el-icon-circle-plus-outline"
-                        size="mini"
-                        type="primary"
-                        plain
-                        @click="handleAddPropValue"
-                        >添加属性值</dg-button
+            <div style="height: calc(100vh - 19rem)">
+                <dg-scrollbar>
+                    <el-form
+                        ref="ruleForm"
+                        :rules="rules"
+                        :model="form"
+                        label-width="80px"
+                        :style="{ width: type == 'SUB' ? '40%' : '90%' }"
                     >
-                </el-form-item>
-                <el-form-item label="说明" v-if="!readOnly">
-                    <el-input v-model="form.remark" type="textarea" row="3" placeholder="请输入说明"></el-input>
-                </el-form-item>
-                <el-form-item v-if="!readOnly" label="" style="text-align: center"
-                    ><dg-button type="primary" @click="handleSaveProp">保存</dg-button></el-form-item
-                >
-            </el-form>
+                        <el-form-item label="属性类别">
+                            <el-input v-model="rootName" placeholder="请输入属性类别" disabled></el-input>
+                        </el-form-item>
+                        <el-form-item label="属性名称" prop="name">
+                            <el-input v-model="form.name" placeholder="请输入属性名称" :disabled="readOnly"></el-input>
+                        </el-form-item>
+                        <el-form-item
+                            v-for="(item, index) in form.child"
+                            :key="index"
+                            :label="index == 0 ? '属性值' : ''"
+                            :prop="'child.' + index + '.name'"
+                            class="prop-value-item"
+                            :rules="{
+                                required: true,
+                                message: '属性值不能为空',
+                                trigger: 'blur'
+                            }"
+                        >
+                            <div class="subject-property__form-item">
+                                <el-input
+                                    v-model="item.name"
+                                    placeholder="请输入属性值"
+                                    :disabled="readOnly"
+                                ></el-input>
+                                <i
+                                    class="el-icon-remove-outline icon"
+                                    @click="handleDeletePropValue(index)"
+                                    v-if="form.child.length > 1 && !readOnly"
+                                ></i>
+                                <!-- <dg-button class="delete-btn" size="mini" icon="el-icon-minus" plain></dg-button> -->
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="">
+                            <dg-button
+                                v-if="!readOnly"
+                                icon="el-icon-circle-plus-outline"
+                                size="mini"
+                                type="primary"
+                                plain
+                                @click="handleAddPropValue"
+                                >添加属性值</dg-button
+                            >
+                        </el-form-item>
+                        <el-form-item label="说明" v-if="!readOnly">
+                            <el-input v-model="form.remark" type="textarea" row="3" placeholder="请输入说明"></el-input>
+                        </el-form-item>
+                        <el-form-item v-if="!readOnly" label="" style="text-align: center"
+                            ><dg-button type="primary" @click="handleSaveProp">保存</dg-button></el-form-item
+                        >
+                    </el-form>
+                </dg-scrollbar>
+            </div>
         </dg-card>
     </div>
 </template>

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

@@ -8,15 +8,15 @@
 <template>
     <main class="user-attributes">
         <el-form ref="ruleForm" inline :rules="rules" :model="form">
-            <el-form-item label="用户类别">
+            <el-form-item label="用户类型">
                 <dg-select v-model="form.userType.value" placeholder="请选择用户类别" enum="UserTypeEnum" clearable>
                 </dg-select>
             </el-form-item>
             <el-form-item label="姓名">
                 <el-input v-model="form.name.value" placeholder="请输入姓名" clearable></el-input>
             </el-form-item>
-            <el-form-item label="身份证号">
-                <el-input v-model="form.idcard.value" placeholder="请输入身份证号" clearable></el-input>
+            <el-form-item label="身份证号码">
+                <el-input v-model="form.idcard.value" placeholder="请输入身份证号码" clearable></el-input>
             </el-form-item>
 
             <el-form-item label="所属机构">
@@ -109,12 +109,12 @@ export default {
          * 重置
          */
         handleReset() {
+             if (this.form.orgCode.value) {
+                this.key++;
+            }
             for (const key in this.form) {
                 this.form[key].value = "";
             }
-            if (this.form.orgCode.value) {
-                this.key++;
-            }
         },
         /**
          * @description:导入方法
@@ -147,7 +147,7 @@ export default {
          */
         handleSynchro() {
             authUserSync().then(res => {
-                this.$message.success("同步成功");
+                this.$message.success("同步中，若数据量大，可能会存在延迟，请稍后自行刷新！");
                 this.handleSearch();
             })
         },

src/pages/log-manage/DataConfig.js

@@ -13,12 +13,14 @@ const earlyWarningPlanTable = [{
   {
     label: "创建时间",
     prop: "createTime",
-    timestamp: "YYYY-MM-DD"
+    timestamp: true,
+    format: "YYYY-MM-DD HH:mm:ss"
   },
   {
     label: "修改时间",
     prop: "updateTime",
-    timestamp: "YYYY-MM-DD"
+    timestamp: true,
+    format: "YYYY-MM-DD HH:mm:ss"
   },
   {
     label: "预警数量",
@@ -95,7 +97,7 @@ const RiskDetectionPlan = [{
     label: "方案状态",
     // custom: true, // 如果需要自定义请加上这个属性，插槽名称为prop
     prop: "state",
-    code: "DM_APPLY_STATUS"
+    enum: "ProgrammeStateEnum"
   }
 ];
 // 鉴权预警信息

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

@@ -11,7 +11,7 @@
             <dg-row :gutter="20">
                 <dg-col :span="12">
                     <el-form-item label="方案状态">
-                        <div class="u-detail__text" v-translate="{ code: 'DM_APPLY_STATUS' }">{{ sizeForm.state }}</div>
+                        <div class="u-detail__text" v-translate="{ enum: 'ProgrammeStateEnum' }">{{ sizeForm.state }}</div>
                     </el-form-item>
                 </dg-col>
             </dg-row>

src/pages/log-manage/auth-risk-detection/edit.vue

@@ -29,7 +29,7 @@
                             style="width: 100%;"
                             v-model="sizeForm.state"
                             placeholder="请选择方案状态"
-                            code="DM_APPLY_STATUS"
+                            enum="ProgrammeStateEnum"
                         >
                         </dg-select>
                     </el-form-item>

src/pages/log-manage/auth-risk-detection/index.vue

@@ -16,7 +16,7 @@
                 <dg-select
                     v-model="form.state.value"
                     placeholder="请选择方案状态"
-                    code="DM_APPLY_STATUS"
+                    enum="ProgrammeStateEnum"
                     style="width: 13rem"
                     clearable
                 >
@@ -28,7 +28,7 @@
             </el-form-item>
         </el-form>
         <Table ref="myTable" :url="tableUrl" :headerData="RiskDetectionPlan" :condition="form">
-            <dg-table-column fixed="right" label="操作" width="120" align="center">
+            <dg-table-column label="操作" width="120" align="center">
                 <template slot-scope="scope">
                     <div class="u-table__operation">
                         <el-tooltip

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

@@ -94,6 +94,7 @@ export default {
          * @description: 编辑
          */
         handleViewEdit(row) {
+            const vm = this;
             const layer = this.$dgLayer({
                 title: `异常鉴权预警方案修改`,
                 shade: [0.4, "#FFF"],
@@ -105,6 +106,7 @@ export default {
                 },
                 on: {
                     success() {
+                        vm.handleSearch();
                         layer.close(layer.dialogIndex);
                     }
                 },

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

@@ -29,7 +29,7 @@
                         </template>
                         <template v-else-if="item.isTime">
                             <div class="u-detail__text">
-                                {{ detailInfo[item.value] | dateFormatter("YYYY-MM-DD") }}
+                                {{ detailInfo[item.value] | dateFormatter("YYYY-MM-DD HH:mm:ss") }}
                             </div>
                         </template>
                         <template v-else>

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

@@ -222,7 +222,7 @@ export const authServiceLogDetail = [
     {
         label: "鉴权结果",
         value: "state",
-        enum: "AuthenticationResultEnum"
+        enum: "AuthResultEnum"
     },
     {
         label: "鉴权内容",

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

@@ -24,8 +24,8 @@
                 >
                 </dg-date-picker>
             </el-form-item>
-            <el-form-item label="授权处理者">
-                <el-input v-model="form.authorizeHandlerNames.value" placeholder="请输入授权处理者" clearable></el-input>
+            <el-form-item label="权限处理者">
+                <el-input v-model="form.authorizeHandlerNames.value" placeholder="请输入权限处理者" clearable></el-input>
             </el-form-item>
             <el-form-item>
                 <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>

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

@@ -23,7 +23,7 @@
             <el-form-item label="操作内容"> -- </el-form-item>
             <dg-row zebra="16px">
                 <dg-table :data="detailInfo.handlers" paging-type="client" :pagination-props="paginationProps">
-                    <dg-table-column prop="handlerName" label="授权处理者"></dg-table-column>
+                    <dg-table-column prop="handlerName" label="权限处理者"></dg-table-column>
                     <dg-table-column prop="handlerIdcard" label="权限处理者身份证号码"></dg-table-column>
                 </dg-table>
             </dg-row>

src/router/index.js

@@ -115,7 +115,7 @@ export const asyncRouterMap = [{
     //     }]
     // },
     ...dataAuthModuleRouter,
-    logManage
+    ...logManage
 ];
 
 export default new Router({

src/router/modules/log-manage.js

@@ -10,111 +10,114 @@ import Layout from "@/pages/layout/layout";
 import common from "@/pages/common";
 // const Layout = () => import("@/pages/" + process.env.LAYOUT + "/layout");
 
-const componentsRouter = {
-    path: "/log-manage",
-    component: Layout,
-    redirect: "/log-manage",
-    alwaysShow: true,
-    meta: { title: "日志管理", icon: "el-icon-document-checked", noCache: true, permission: ["QXGL_RZGL"] },
-    children: [
-        {
-            path: "/err-auth-earlywarning-manage",
-            component: common,
-            name: "common",
-            redirect: "/err-auth-earlywarning-manage",
-            alwaysShow: true,
-            meta: { title: "异常鉴权预警管理", icon: "el-icon-goods", noCache: true, permission: ["QXGL_RZGL_YCJQYJGL"] },
-            children: [
-                {
-                    path: "auth-earlywarning-plan",
-                    component: () => import("@/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-plan"),
-                    name: "auth-earlywarning-plan",
-                    meta: {
-                        title: "鉴权预警方案",
-                        noCache: false,
-                        permission: ["QXGL_RZGL_YCJQYJGL_JQYJFA"]
-                        // layout: "page"
-                    }
-                },
-                {
-                    path: "auth-earlywarning-info",
-                    component: () => import("@/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-info"),
-                    name: "auth-earlywarning-info",
-                    meta: {
-                        title: "鉴权预警信息",
-                        noCache: false,
-                        permission: ["QXGL_RZGL_YCJQYJGL_JQYJXX"]
-                        // layout: "page"
-                    }
+const componentsRouter = [
+    {
+        path: "/err-auth-earlywarning-manage",
+        component: Layout,
+        redirect: "/err-auth-earlywarning-manage",
+        alwaysShow: true,
+        meta: { title: "异常鉴权预警管理", icon: "el-icon-goods", noCache: true, permission: ["QXGL_RZGL_YCJQYJGL"] },
+        children: [
+            {
+                path: "auth-earlywarning-plan",
+                component: () => import("@/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-plan"),
+                name: "auth-earlywarning-plan",
+                meta: {
+                    title: "鉴权预警方案",
+                    noCache: false,
+                    permission: ["QXGL_RZGL_YCJQYJGL_JQYJFA"]
+                    // layout: "page"
                 }
-            ]
-        },
-        {
-          path: "auth-risk-detection",
-          component: () => import("@/pages/log-manage/auth-risk-detection/index"),
-          name: "auth-risk-detection",
-          meta: {
+            },
+            {
+                path: "auth-earlywarning-info",
+                component: () => import("@/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-info"),
+                name: "auth-earlywarning-info",
+                meta: {
+                    title: "鉴权预警信息",
+                    noCache: false,
+                    permission: ["QXGL_RZGL_YCJQYJGL_JQYJXX"]
+                    // layout: "page"
+                }
+            }
+        ]
+    },
+    {
+        path: "/auth-risk-detection",
+        component: Layout,
+        redirect: "/index",
+        meta: {
             title: "鉴权风险检测",
-            noCache: false,
-            permission: ['QXGL_RZGL_JQFXJC']
-          }
+            icon: "el-icon-goods",
+            noCache: true,
+            permission: ["QXGL_RZGL_JQFXJC"]
         },
-        {
-            path: "/permiss-log-manage",
-            component: common,
-            name: "common",
-            redirect: "/permiss-log-manage",
-            alwaysShow: true,
-            meta: { title: "权限日志管理", icon: "el-icon-goods", noCache: true, permission: ["QXGL_RZGL_QXRZGL"] },
-            children: [
-                {
-                    path: "auth-manage-log",
-                    component: () => import("@/pages/log-manage/permiss-log-manage/auth-manage-log"),
-                    name: "auth-manage-log",
-                    meta: {
-                        title: "授权管理日志",
-                        noCache: false,
-                        permission: ["QXGL_RZGL_QXRZGL_SQGLRZ"]
-                    }
-                },
-                {
-                    path: "auth-service-log",
-                    component: () => import("@/pages/log-manage/permiss-log-manage/auth-service-log"),
-                    name: "auth-service-log",
-                    meta: {
-                        title: "鉴权服务日志",
-                        noCache: false,
-                        permission: ["QXGL_RZGL_QXRZGL_JQFWRZ"]
-                    }
-                },
-                {
-                    path: "auth-risk-log",
-                    component: () => import("@/pages/log-manage/permiss-log-manage/auth-risk-log"),
-                    name: "auth-risk-log",
-                    meta: {
-                        title: "鉴权风险日志",
-                        noCache: false,
-                        permission: ["QXGL_RZGL_QXRZGL_JQFXRZ"]
-                    }
+        children: [
+            {
+                path: "index",
+                component: () => import("@/pages/log-manage/auth-risk-detection/index"),
+                name: "auth-risk-detection",
+                meta: {
+                    title: "鉴权风险检测",
+                    noCache: true,
+                    permission: ["QXGL_RZGL_JQFXJC"]
                 }
-            ]
-        },
-        {
-            path: "/auth-behavior-statistic",
-            component: common,
-            name: "common",
-            redirect: "/index",
-            meta: { title: "鉴权行为分析", icon: "el-icon-goods", noCache: true, permission: ["QXGL_RZGL_JQXWTJ"] },
-            children: [
-                {
-                    path: "index",
-                    component: () => import("@/pages/log-manage/auth-behavior-statistic"),
-                    name: "auth-behavior-statistic",
-                    meta: { title: "鉴权行为分析", icon: "el-icon-goods", noCache: true, permission: ["QXGL_RZGL_JQXWTJ"] }
+            }
+        ]
+    },
+    {
+        path: "/auth-behavior-statistic",
+        component: Layout,
+        redirect: "/index",
+        meta: { title: "鉴权行为统计", icon: "el-icon-goods", noCache: true, permission: ["QXGL_RZGL_JQXWTJ"] },
+        children: [
+            {
+                path: "index",
+                component: () => import("@/pages/log-manage/auth-behavior-statistic"),
+                name: "auth-behavior-statistic",
+                meta: { title: "鉴权行为统计", icon: "el-icon-goods", noCache: true, permission: ["QXGL_RZGL_JQXWTJ"] }
+            }
+        ]
+    },
+    {
+        path: "/log-manage",
+        component: Layout,
+        redirect: "/log-manage",
+        alwaysShow: true,
+        meta: { title: "日志管理", icon: "el-icon-document-checked", noCache: true, permission: ["QXGL_RZGL"] },
+        children: [
+            {
+                path: "auth-manage-log",
+                component: () => import("@/pages/log-manage/permiss-log-manage/auth-manage-log"),
+                name: "auth-manage-log",
+                meta: {
+                    title: "授权管理日志",
+                    noCache: false,
+                    permission: ["QXGL_RZGL_QXRZGL_SQGLRZ"]
+                }
+            },
+            {
+                path: "auth-service-log",
+                component: () => import("@/pages/log-manage/permiss-log-manage/auth-service-log"),
+                name: "auth-service-log",
+                meta: {
+                    title: "鉴权服务日志",
+                    noCache: false,
+                    permission: ["QXGL_RZGL_QXRZGL_JQFWRZ"]
+                }
+            },
+            {
+                path: "auth-risk-log",
+                component: () => import("@/pages/log-manage/permiss-log-manage/auth-risk-log"),
+                name: "auth-risk-log",
+                meta: {
+                    title: "鉴权风险日志",
+                    noCache: false,
+                    permission: ["QXGL_RZGL_QXRZGL_JQFXRZ"]
                 }
-            ]
-        }
-    ]
-};
+            }
+        ]
+    }
+];
 
 export default componentsRouter;