From d0aa64fb9c74fb404fbc1abdbf95018c0ca30c3a Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 23 Oct 2023 18:04:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4detection=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=92=8C=E4=B8=80=E4=BA=9B=E6=96=87=E5=AD=97=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/Header.vue             | 18 +-----------------
 src/components/rightBox/settings/UserBox.vue |  4 ++--
 src/router/index.js                          | 10 +++-------
 src/views/detections/Index.vue               |  2 +-
 src/views/detectionsNew/DetectionForm.vue    | 12 ++++++------
 src/views/detectionsNew/Index.vue            |  4 ++--
 6 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index 028d4265..bcaf7268 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -99,7 +99,7 @@
             </div>
           </template>
           <template v-else-if="index===2">
-            <span v-if="route===wholeScreenRouterMapping.dns">{{ $t(item.value) }}</span>
+            <span v-if="route===wholeScreenRouterMapping.dns || !route.startsWith('/panel')">{{ $t(item.value) }}</span>
             <span v-else class="route-menu" @click="jump(route,item.value,'',3)">{{ $t(item.value) }}</span>
           </template>
           <!-- index=0和index=1的点击跳转由breadcrumb里的数据控制 -->
@@ -455,22 +455,6 @@ export default {
           type: entityGraphMenu.type
         })
         return true
-      } else if (this.route === '/detectionsNew') {
-        const detectionMenu = menus.find(m => m.route === '/detection')
-        const policyMenu = menus.find(m => m.route === '/detectionsNew')
-        breadcrumb.push({
-          code: detectionMenu.code,
-          value: detectionMenu.i18n ? this.$t(detectionMenu.i18n) : detectionMenu.name,
-          route: detectionMenu.route,
-          type: detectionMenu.type
-        })
-        breadcrumb.push({
-          code: policyMenu.code,
-          value: policyMenu.i18n ? this.$t(policyMenu.i18n) : policyMenu.name,
-          route: policyMenu.route,
-          type: policyMenu.type
-        })
-        return true
       }
       const menu = menus.find(m => m.route === this.route)
       if (menu) {
diff --git a/src/components/rightBox/settings/UserBox.vue b/src/components/rightBox/settings/UserBox.vue
index 51461cac..6df0d8b7 100644
--- a/src/components/rightBox/settings/UserBox.vue
+++ b/src/components/rightBox/settings/UserBox.vue
@@ -70,7 +70,7 @@
             </el-select>
           </el-form-item>
           <!--theme-->
-          <el-form-item :label="$t('config.user.theme')" prop="i18n">
+<!--          <el-form-item :label="$t('config.user.theme')" prop="i18n">
             <el-select id="account-input-roleIds"
                        v-model="editObject.theme"
                        class="right-box__select"
@@ -83,7 +83,7 @@
                 <el-option :label="theme.label" :value="theme.value"></el-option>
               </template>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <!--enable-->
           <el-form-item :label="$t('config.user.enable')">
             <el-switch
diff --git a/src/router/index.js b/src/router/index.js
index 6a8fab72..7d829fc5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -93,19 +93,15 @@ const routes = [
         component: () => import('@/views/administration/I18n')
       },
       {
-        path: '/detectionsNew',
+        path: '/detectionPolicy',
         component: () => import('@/views/detectionsNew/Index')
       },
       {
-        path: '/detection/policies',
-        component: () => import('@/views/detectionsNew/Index')
-      },
-      {
-        path: '/detection/policies/create',
+        path: '/detectionPolicy/create',
         component: () => import('@/views/detectionsNew/DetectionForm')
       },
       {
-        path: '/detection/policies/edit',
+        path: '/detectionPolicy/edit',
         component: () => import('@/views/detectionsNew/DetectionForm')
       }
     ]
diff --git a/src/views/detections/Index.vue b/src/views/detections/Index.vue
index 54abd608..3931a241 100644
--- a/src/views/detections/Index.vue
+++ b/src/views/detections/Index.vue
@@ -791,7 +791,7 @@ export default {
     },
     jumpNewDetetion () {
       this.$router.push({
-        path: '/detectionsNew',
+        path: '/detectionPolicy',
         query: {
           t: +new Date()
         }
diff --git a/src/views/detectionsNew/DetectionForm.vue b/src/views/detectionsNew/DetectionForm.vue
index 320a7e37..05a47183 100644
--- a/src/views/detectionsNew/DetectionForm.vue
+++ b/src/views/detectionsNew/DetectionForm.vue
@@ -3,7 +3,7 @@
     <loading :loading="myLoading"></loading>
 
     <div class="detection-form-header">
-      {{ $t('detection.createEventPolicies') }}
+      {{ ruleId ? $t('detection.editEventPolicies') : $t('detection.createEventPolicies') }}
     </div>
 
     <!--第一步：General Settings-->
@@ -88,9 +88,9 @@
 
               <div class="form-setting__btn1">
                 <div class="btn1">
-                  <el-button @click="createPolicy('')">{{ $t('overall.create') }}</el-button>
+                  <el-button @click="createPolicy('')">{{ $t('overall.save') }}</el-button>
                 </div>
-                <el-button @click="createPolicy('enabled')">{{ $t('overall.create') }} & {{ $t('detection.create.enablePolicy') }}</el-button>
+                <el-button @click="createPolicy('enabled')">{{ $t('overall.save') }} & {{ $t('detection.create.enablePolicy') }}</el-button>
               </div>
             </div>
           </el-collapse-item>
@@ -212,7 +212,7 @@ export default {
           console.error(e)
           this.$message.error(this.errorMsgHandler(e))
           this.$router.push({
-            path: '/detection/policies',
+            path: '/detectionPolicy',
             query: {
               pageNo: this.pageNoForTable ? Number(this.pageNoForTable) : 1,
               t: +new Date()
@@ -276,7 +276,7 @@ export default {
                   })
 
                   this.$router.push({
-                    path: '/detectionsNew',
+                    path: '/detectionPolicy',
                     query: {
                       t: +new Date()
                     }
@@ -301,7 +301,7 @@ export default {
                   })
 
                   this.$router.push({
-                    path: '/detectionsNew',
+                    path: '/detectionPolicy',
                     query: {
                       pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
                       t: +new Date()
diff --git a/src/views/detectionsNew/Index.vue b/src/views/detectionsNew/Index.vue
index 4febd749..8d93f8eb 100644
--- a/src/views/detectionsNew/Index.vue
+++ b/src/views/detectionsNew/Index.vue
@@ -140,7 +140,7 @@ export default {
     },
     onCreate () {
       this.$router.push({
-        path: '/detection/policies/create',
+        path: '/detectionPolicy/create',
         query: {
           t: +new Date()
         }
@@ -149,7 +149,7 @@ export default {
     onEdit () {
       const pageNo = this.$router.currentRoute.value.query.pageNo
       this.$router.push({
-        path: '/detection/policies/edit',
+        path: '/detectionPolicy/edit',
         query: {
           t: +new Date(),
           pageNoForTable: pageNo || 1,