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

<feat>完成鉴权预警信息

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

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

@@ -145,7 +145,7 @@ export default {
 .form-inline {
     display: flex;
     label {
-        min-width: 75px;
+        min-width: 5.4em;
     }
 }
 </style>

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

@@ -209,7 +209,7 @@ export default {
 .form-inline {
     display: flex;
     label {
-        min-width: 75px;
+        min-width: 5.4em;
     }
 }
 </style>

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

@@ -91,7 +91,7 @@ export default {
                 .then(res => {
                     const formData = res;
                     const layer = that.$dgLayer({
-                        title: "修改",
+                        title: "修改风险检测方案",
                         shade: [0.4, "#FFF"],
                         area: ["830px", "660px"],
                         content: Editor,
@@ -117,7 +117,7 @@ export default {
             getAuthRiskDetail(id)
                 .then(res => {
                     const layer = that.$dgLayer({
-                        title: "详情",
+                        title: "风险检测方案详情",
                         shade: [0.4, "#FFF"],
                         content: Detail,
                         area: ["830px", "660px"],

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

@@ -14,18 +14,18 @@
                 </dg-col>
             </dg-row>
             <dg-row :gutter="20">
-                <dg-col :span="12">
+                <!-- <dg-col :span="12">
                     <el-form-item label="所属单位">
                         <div class="u-detail__text" v-translate="{ code: 'DM_APPLY_STATUS' }">{{ sizeForm.state }}</div>
                     </el-form-item>
-                </dg-col>
+                </dg-col> -->
                 <dg-col :span="12">
                     <el-form-item label="预警类型">
-                        <div class="u-detail__text" v-translate="{ code: 'WarningProgrammeTypeEnum' }">{{ sizeForm.programmeType }}</div>
+                        <div class="u-detail__text" v-translate="{ enum: 'WarningProgrammeTypeEnum' }">
+                            {{ sizeForm.programmeType }}
+                        </div>
                     </el-form-item>
                 </dg-col>
-            </dg-row>
-            <dg-row :gutter="20">
                 <dg-col :span="12">
                     <el-form-item label="预警时间">
                         <div class="u-detail__text">
@@ -38,7 +38,9 @@
                 <dg-col :span="12">
                     <el-form-item label="预警来源">
                         <div class="u-detail__text">
-                            {{ sizeForm.createTime | dateFormatter("YYYY-MM-DD HH:mm:ss") }}
+                            <span class="u-detail__text" v-translate="{ enum: 'WarningProgrammeTypeEnum' }">
+                                {{ sizeForm.programmeType }}
+                            </span>方案
                         </div>
                     </el-form-item>
                 </dg-col>
@@ -59,7 +61,7 @@
 
 <script>
 export default {
-    name: "auth-earlywarning-detail",
+    name: "auth-earlywarning-info-detail",
     props: {
         sizeForm: {
             type: Object,

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

@@ -17,6 +17,19 @@
                 >
                 </dg-select>
             </el-form-item>
+            <el-form-item label="预警时间" prop="createTime.value">
+                <dg-date-picker
+                    v-model="form.createTime.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>
@@ -59,6 +72,12 @@ export default {
                 programmeType: {
                     value: "",
                     op: "="
+                },
+                createTime: {
+                    value: "",
+                    op: "between",
+                    type: "DATE",
+                    format: "yyyyMMddHHmmss"
                 }
             },
             rules: {},

src/router/modules/log-manage.js

@@ -39,7 +39,7 @@ const componentsRouter = {
                 {
                     path: "auth-earlywarning-info",
                     component: () => import("@/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-info"),
-                    name: "auth-earlywarning-plan",
+                    name: "auth-earlywarning-info",
                     meta: {
                         title: "鉴权预警信息",
                         noCache: false,