fix: 调整detection菜单和一些文字描述

This commit is contained in:
chenjinsong
2023-10-23 18:04:29 +08:00
parent 5b7dd6da90
commit d0aa64fb9c
6 changed files with 15 additions and 35 deletions

View File

@@ -99,7 +99,7 @@
</div> </div>
</template> </template>
<template v-else-if="index===2"> <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> <span v-else class="route-menu" @click="jump(route,item.value,'',3)">{{ $t(item.value) }}</span>
</template> </template>
<!-- index=0和index=1的点击跳转由breadcrumb里的数据控制 --> <!-- index=0和index=1的点击跳转由breadcrumb里的数据控制 -->
@@ -455,22 +455,6 @@ export default {
type: entityGraphMenu.type type: entityGraphMenu.type
}) })
return true 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) const menu = menus.find(m => m.route === this.route)
if (menu) { if (menu) {

View File

@@ -70,7 +70,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--theme--> <!--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" <el-select id="account-input-roleIds"
v-model="editObject.theme" v-model="editObject.theme"
class="right-box__select" class="right-box__select"
@@ -83,7 +83,7 @@
<el-option :label="theme.label" :value="theme.value"></el-option> <el-option :label="theme.label" :value="theme.value"></el-option>
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<!--enable--> <!--enable-->
<el-form-item :label="$t('config.user.enable')"> <el-form-item :label="$t('config.user.enable')">
<el-switch <el-switch

View File

@@ -93,19 +93,15 @@ const routes = [
component: () => import('@/views/administration/I18n') component: () => import('@/views/administration/I18n')
}, },
{ {
path: '/detectionsNew', path: '/detectionPolicy',
component: () => import('@/views/detectionsNew/Index') component: () => import('@/views/detectionsNew/Index')
}, },
{ {
path: '/detection/policies', path: '/detectionPolicy/create',
component: () => import('@/views/detectionsNew/Index')
},
{
path: '/detection/policies/create',
component: () => import('@/views/detectionsNew/DetectionForm') component: () => import('@/views/detectionsNew/DetectionForm')
}, },
{ {
path: '/detection/policies/edit', path: '/detectionPolicy/edit',
component: () => import('@/views/detectionsNew/DetectionForm') component: () => import('@/views/detectionsNew/DetectionForm')
} }
] ]

View File

@@ -791,7 +791,7 @@ export default {
}, },
jumpNewDetetion () { jumpNewDetetion () {
this.$router.push({ this.$router.push({
path: '/detectionsNew', path: '/detectionPolicy',
query: { query: {
t: +new Date() t: +new Date()
} }

View File

@@ -3,7 +3,7 @@
<loading :loading="myLoading"></loading> <loading :loading="myLoading"></loading>
<div class="detection-form-header"> <div class="detection-form-header">
{{ $t('detection.createEventPolicies') }} {{ ruleId ? $t('detection.editEventPolicies') : $t('detection.createEventPolicies') }}
</div> </div>
<!--第一步General Settings--> <!--第一步General Settings-->
@@ -88,9 +88,9 @@
<div class="form-setting__btn1"> <div class="form-setting__btn1">
<div class="btn1"> <div class="btn1">
<el-button @click="createPolicy('')">{{ $t('overall.create') }}</el-button> <el-button @click="createPolicy('')">{{ $t('overall.save') }}</el-button>
</div> </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>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -212,7 +212,7 @@ export default {
console.error(e) console.error(e)
this.$message.error(this.errorMsgHandler(e)) this.$message.error(this.errorMsgHandler(e))
this.$router.push({ this.$router.push({
path: '/detection/policies', path: '/detectionPolicy',
query: { query: {
pageNo: this.pageNoForTable ? Number(this.pageNoForTable) : 1, pageNo: this.pageNoForTable ? Number(this.pageNoForTable) : 1,
t: +new Date() t: +new Date()
@@ -276,7 +276,7 @@ export default {
}) })
this.$router.push({ this.$router.push({
path: '/detectionsNew', path: '/detectionPolicy',
query: { query: {
t: +new Date() t: +new Date()
} }
@@ -301,7 +301,7 @@ export default {
}) })
this.$router.push({ this.$router.push({
path: '/detectionsNew', path: '/detectionPolicy',
query: { query: {
pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1, pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
t: +new Date() t: +new Date()

View File

@@ -140,7 +140,7 @@ export default {
}, },
onCreate () { onCreate () {
this.$router.push({ this.$router.push({
path: '/detection/policies/create', path: '/detectionPolicy/create',
query: { query: {
t: +new Date() t: +new Date()
} }
@@ -149,7 +149,7 @@ export default {
onEdit () { onEdit () {
const pageNo = this.$router.currentRoute.value.query.pageNo const pageNo = this.$router.currentRoute.value.query.pageNo
this.$router.push({ this.$router.push({
path: '/detection/policies/edit', path: '/detectionPolicy/edit',
query: { query: {
t: +new Date(), t: +new Date(),
pageNoForTable: pageNo || 1, pageNoForTable: pageNo || 1,