Merge branch 'feature/v2.4.0-liugh-logManage' into 'develop_2.4.0_LogManage'

异常鉴权预警管理对接完成

See merge request dcuc-tjdsj/auth-web!5

src/api/log-manage.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Liugh
  * @Date: 2021-05-27 11:28:29
- * @LastEditTime: 2021-05-27 14:56:51
+ * @LastEditTime: 2021-05-28 09:57:24
  * @LastEditors: Do not edit
  * @FilePath: \auth-web\src\api\log-manage.js
  * @Description:日志管理接口
@@ -13,6 +13,9 @@ export const base = `/auditsvr/v2`;
 // 鉴权预警列表
 export const warningProgrammeTableUrl = `${base}/warningProgramme/_search`;
 
+// 鉴权统计列表
+export const authenticationLogTableUrl = `${base}/authenticationLog/statistics`;
+
 // 鉴权预警详情
 export function warningProgrammeInfo(id) {
     return axios.get(`${base}/warningProgramme/${id}`);
@@ -20,20 +23,6 @@ export function warningProgrammeInfo(id) {
 
 // 鉴权预警编辑
 export function riskProgramme(data) {
-    return axios.put(`${base}/riskProgramme/${data.id}`, data);
-}
-
-// 角色授权情况列表
-export function getRoleRptList(data) {
-    return axios.post(`${base}/roleRptList/_search`, data, { loading: true });
+    return axios.put(`${base}/warningProgramme/${data.id}`, data);
 }
 
-// 应用拥有的角色数量，配额数量
-export function getRoleQuotasInfo(appId) {
-    return axios.get(`${base}/getRoleQuotasInfo/${appId}`);
-}
-
-// 分局应用授权情况
-export function roleQuotasTable(data) {
-    return axios.post(`${base}/orgRptList/_search`, data);
-}

src/pages/log-manage/DataConfig.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Liugh
  * @Date: 2021-05-25 14:09:24
- * @LastEditTime: 2021-05-27 17:14:10
+ * @LastEditTime: 2021-05-28 10:14:53
  * @LastEditors: Do not edit
  * @FilePath: \auth-web\src\pages\log-manage\DataConfig.js
  * @Description:
@@ -41,22 +41,4 @@ const earlyWarningPlanTableInfo = [
     { label: "规则说明", value: "ruleExplain", span: 24 },
     { label: "预警信息", value: "warningMsg", span: 24 }
 ];
-const authActionCountTable = [
-    {
-        label: "鉴权类型",
-        prop: "name"
-    },
-    {
-        label: "鉴权成功次数",
-        prop: "createTime"
-    },
-    {
-        label: "鉴权失败次数",
-        prop: "updateTime"
-    },
-    {
-        label: "鉴权总次数",
-        prop: "number"
-    }
-];
-export { earlyWarningPlanTable, earlyWarningPlanTableInfo, authActionCountTable };
+export { earlyWarningPlanTable, earlyWarningPlanTableInfo };

src/pages/log-manage/auth-action-count.vue

@@ -1,75 +0,0 @@
-<!--
- * @Author: Liugh
- * @Date: 2021-05-27 16:04:48
- * @LastEditTime: 2021-05-27 16:26:45
- * @LastEditors: Do not edit
- * @FilePath: \auth-web\src\pages\log-manage\auth-action-count.vue
- * @Description: 
--->
-<template>
-    <main class="auth-earlywarning-plan">
-        <el-form ref="ruleForm" inline :rules="rules" :model="form">
-            <el-form-item label="鉴权时间" prop="time.value">
-                <el-input v-model="form.time.value" placeholder="请输入鉴权预警方案名称" clearable></el-input>
-            </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>
-            </el-form-item>
-        </el-form>
-        <Table ref="myTable" :url="tableUrl" :headerData="authActionCountTable" :condition="form"> </Table>
-    </main>
-</template>
-
-<script>
-import Table from "@/pages/common/table";
-import { authActionCountTable } from "../DataConfig";
-import { warningProgrammeTableUrl } from "@/api/log-manage";
-export default {
-    name: "auth-earlywarning-plan", // 组件名称
-    props: {
-        // 接收父组件的数据
-    },
-    data() {
-        // 组件内部参数
-        return {
-            // 参数名称及默认值
-            authActionCountTable,
-            form: {
-                time: {
-                    value: "",
-                    op: "like"
-                }
-            },
-            rules: {},
-            tableUrl: warningProgrammeTableUrl
-        };
-    },
-    computed: {}, // 计算属性
-    watch: {}, // 侦听器（扩展的计算属性）
-    components: { Table }, // 注册局部组件
-    methods: {
-        /**
-         * @description:表单查询
-         */
-        handleSearch() {
-            this.$refs.myTable.handleSearchClick();
-        },
-        /**
-         * @description:表单重置
-         */
-        handleReset() {
-            this.$refs.ruleForm.resetFields();
-        }
-    }, // 内部方法
-    beforeCreate() {}, // 组件创建前
-    created() {}, // 组件创建完成后
-    beforeMount() {}, // 组件挂载前
-    mounted() {}, // 组件挂载完成后
-    beforeUpdate() {}, // 组件更新前
-    updated() {}, // 组件挂载完成后
-    beforeDestroy() {}, // 组件销毁前
-    destroyed() {} // 组件销毁完成后
-};
-</script>
-<style lang="scss" scoped></style>

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

@@ -1,14 +1,14 @@
 <!--
  * @Author: Liugh
  * @Date: 2021-05-26 15:09:38
- * @LastEditTime: 2021-05-27 17:18:45
+ * @LastEditTime: 2021-05-27 17:28:32
  * @LastEditors: Do not edit
  * @FilePath: \auth-web\src\pages\log-manage\err-auth-earlywarning-manage\detail.vue
  * @Description: 
 -->
 <template>
     <main class="auth-earlywarning-plan-detail">
-        <el-form ref="ruleForm" :model="detailInfo" label-width="100px" label-suffix="：">
+        <el-form v-if="detailInfo.id" ref="ruleForm" :model="detailInfo" label-width="100px" label-suffix="：">
             <el-row>
                 <el-col :span="item.span" v-for="(item, index) in earlyWarningPlanTableInfo" :key="index">
                     <el-form-item :label="item.label">

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: Liugh
  * @Date: 2021-05-26 15:09:38
- * @LastEditTime: 2021-05-27 17:16:18
+ * @LastEditTime: 2021-05-28 09:55:10
  * @LastEditors: Do not edit
  * @FilePath: \auth-web\src\pages\log-manage\err-auth-earlywarning-manage\edit.vue
  * @Description: 
@@ -71,9 +71,9 @@
                 <!-- <el-form-item :label="item.label">{{ detailInfo[item.value] }} </el-form-item> -->
                 <!-- </el-col> -->
             </el-row>
-            <el-form-item>
-                <el-button type="primary" @click="onSubmit">立即创建</el-button>
-                <el-button>取消</el-button>
+            <el-form-item align="right">
+                <el-button type="primary" @click="onSubmit">保存</el-button>
+                <el-button @click="close">取消</el-button>
             </el-form-item>
         </el-form>
     </main>
@@ -112,13 +112,24 @@ export default {
     components: {}, // 注册局部组件
     computed: {},
     methods: {
+        /**
+         * @description: 关闭
+         */
+        close() {
+            this.$emit("success");
+        },
+        /**
+         * @description: 提交
+         */
         onSubmit() {
-            this.form.ruleContent.forEach(item => {
+            let obj = JSON.parse(JSON.stringify(this.form));
+            obj.ruleContent.forEach(item => {
                 item.start = parseInt(item.time[0]);
                 item.end = parseInt(item.time[1]);
+                delete item.time;
             });
-            this.form.ruleContent = JSON.stringify(this.form.ruleContent);
-            riskProgramme(this.form).then(res => {
+            obj.ruleContent = JSON.stringify(obj.ruleContent);
+            riskProgramme(obj).then(res => {
                 this.$message.success("操作成功");
                 this.$emit("success");
             });

src/router/modules/log-manage.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Liugh
  * @Date: 2021-05-25 11:19:26
- * @LastEditTime: 2021-05-27 11:11:50
+ * @LastEditTime: 2021-05-28 10:15:02
  * @LastEditors: Do not edit
  * @FilePath: \auth-web\src\router\modules\log-manage.js
  * @Description: 日志管理模块