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

# Conflicts:
#	src/pages/log-manage/DataConfig.js

src/pages/log-manage/DataConfig.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Liugh
  * @Date: 2021-05-25 14:09:24
- * @LastEditTime: 2021-05-28 10:14:53
+ * @LastEditTime: 2021-05-28 16:37:12
  * @LastEditors: Do not edit
  * @FilePath: \auth-web\src\pages\log-manage\DataConfig.js
  * @Description:

src/pages/log-manage/auth-behavior-statistic/index.vue

@@ -16,6 +16,7 @@
                     end-placeholder="结束日期"
                     clearable
                     value-format="yyyyMMddHHmmss"
+                    :unlink-panels="true"
                 >
                 </dg-date-picker>
             </el-form-item>

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-28 15:31:18
+ * @LastEditTime: 2021-05-28 16:36:56
  * @LastEditors: Do not edit
  * @FilePath: \auth-web\src\pages\log-manage\err-auth-earlywarning-manage\edit.vue
  * @Description: 
@@ -11,8 +11,8 @@
         <el-form ref="ruleForm" :model="form" label-width="100px" label-suffix="：">
             <el-row>
                 <el-col :span="24">
-                    <el-form-item label="方案名称">
-                        <el-input clearable placeholder="请输入方案名称" v-model="form.name"></el-input>
+                    <el-form-item label="方案名称" >
+                        <el-input clearable placeholder="请输入方案名称" v-model="form.name" disabled></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -56,14 +56,14 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                    <el-form-item label="规则说明">
-                        <el-input type="textarea" :rows="2" placeholder="请输入规则说明" v-model="form.ruleExplain">
+                    <el-form-item label="规则说明" >
+                        <el-input type="textarea" :rows="2" placeholder="请输入规则说明" v-model="form.ruleExplain" disabled>
                         </el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
                     <el-form-item label="预警信息">
-                        <el-input type="textarea" :rows="2" placeholder="请输入预警信息" v-model="form.warningMsg">
+                        <el-input type="textarea" :rows="2" placeholder="请输入预警信息" v-model="form.contentFormat" disabled>
                         </el-input>
                     </el-form-item>
                 </el-col>

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

@@ -72,7 +72,7 @@ export const authServiceLogTableHeader = [
     {
         label: "鉴权类型",
         prop: "authenticationType",
-        enum: "AuthenticationTypeEnum"
+        enum: "AuthenticationNecessaryParamEnum"
     },
     {
         label: "鉴权结果",
@@ -107,8 +107,8 @@ export const authRiskLogTableHeader = [
         prop: "requesterName"
     },
     {
-        label: "命中规则",
-        prop: "targetRule"
+        label: "风险内容",
+        prop: "riskContent"
     }
 ];
 
@@ -116,7 +116,8 @@ export const authRiskLogTableHeader = [
 export const authBehaviorStatisticTableHeader = [
     {
         label: "鉴权类型",
-        prop: "type"
+        prop: "type",
+        enum: "AuthenticationNecessaryParamEnum"
     },
     {
         label: "鉴权成功次数",
@@ -163,11 +164,6 @@ export const authRiskLogDetail = [
         label: "鉴权请求者标识",
         value: "requesterId"
     },
-    {
-        label: "命中规则",
-        value: "targetRule",
-        span: 24
-    },
     {
         label: "风险内容",
         value: "riskContent",
@@ -216,7 +212,7 @@ export const authServiceLogDetail = [
     {
         label: "鉴权类型",
         value: "authenticationType",
-        enum: "AuthenticationTypeEnum"
+        enum: "AuthenticationNecessaryParamEnum"
     },
     {
         label: "鉴权结果",

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

@@ -20,6 +20,7 @@
                     end-placeholder="结束日期"
                     clearable
                     value-format="yyyyMMddHHmmss"
+                    :unlink-panels="true"
                 >
                 </dg-date-picker>
             </el-form-item>

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

@@ -19,6 +19,7 @@
                     end-placeholder="结束日期"
                     clearable
                     value-format="yyyyMMddHHmmss"
+                    :unlink-panels="true"
                 >
                 </dg-date-picker>
             </el-form-item>

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

@@ -18,7 +18,7 @@
                 <dg-select
                     v-model="form.authenticationType.value"
                     placeholder="请选择鉴权类型"
-                    enum="AuthenticationTypeEnum"
+                    enum="AuthenticationNecessaryParamEnum"
                     clearable
                     style="width: 9rem"
                 >
@@ -34,6 +34,7 @@
                     clearable
                     value-format="yyyyMMddHHmmss"
                     style="width: 16rem"
+                    :unlink-panels="true"
                 >
                 </dg-date-picker>
             </el-form-item>