Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev
This commit is contained in:
@@ -17,11 +17,7 @@ axios.interceptors.request.use(config => {
|
|||||||
if (config.params && config.params.q && config.params.q.length > 0) {
|
if (config.params && config.params.q && config.params.q.length > 0) {
|
||||||
let q = config.params.q
|
let q = config.params.q
|
||||||
if (q.indexOf('+') > -1) {
|
if (q.indexOf('+') > -1) {
|
||||||
for (let i = 0; i < q.length; i++) {
|
q = q.replace(/\+/g, ' ')
|
||||||
if (q[i] === '+') {
|
|
||||||
q = q.replace('+', ' ')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
config.params.q = q
|
config.params.q = q
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,7 +101,6 @@ import GeneralSettings from '@/components/table/detection/GeneralSettings'
|
|||||||
import RuleDefinition from '@/components/table/detection/RuleDefinition'
|
import RuleDefinition from '@/components/table/detection/RuleDefinition'
|
||||||
import { get } from '@/utils/http'
|
import { get } from '@/utils/http'
|
||||||
import { api } from '@/utils/api'
|
import { api } from '@/utils/api'
|
||||||
import axios from 'axios'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DetectionForm',
|
name: 'DetectionForm',
|
||||||
@@ -191,7 +190,6 @@ export default {
|
|||||||
},
|
},
|
||||||
/** 创建policy */
|
/** 创建policy */
|
||||||
createPolicy () {
|
createPolicy () {
|
||||||
const self = this
|
|
||||||
const settingLen = Object.keys(this.settingObj).length
|
const settingLen = Object.keys(this.settingObj).length
|
||||||
const ruleLen = Object.keys(this.ruleObj).length
|
const ruleLen = Object.keys(this.ruleObj).length
|
||||||
|
|
||||||
|
|||||||
@@ -89,7 +89,6 @@ import DetectionTable from '@/views/detectionsNew/DetectionTable'
|
|||||||
import { api } from '@/utils/api'
|
import { api } from '@/utils/api'
|
||||||
import dataListMixin from '@/mixins/data-list'
|
import dataListMixin from '@/mixins/data-list'
|
||||||
import DetectionDrawer from '@/views/detectionsNew/DetectionDrawer'
|
import DetectionDrawer from '@/views/detectionsNew/DetectionDrawer'
|
||||||
import axios from 'axios'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Index',
|
name: 'Index',
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ import Chart from '@/views/charts/Chart'
|
|||||||
import _ from 'lodash'
|
import _ from 'lodash'
|
||||||
import { get } from '@/utils/http'
|
import { get } from '@/utils/http'
|
||||||
import relatedServer from '@/mixins/relatedServer'
|
import relatedServer from '@/mixins/relatedServer'
|
||||||
import { dateFormatByAppearance, getMillisecond, getSecond } from '@/utils/date-util'
|
import { dateFormatByAppearance, getMillisecond } from '@/utils/date-util'
|
||||||
import Loading from '@/components/common/Loading'
|
import Loading from '@/components/common/Loading'
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
|
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ import Chart from '@/views/charts/Chart'
|
|||||||
import _ from 'lodash'
|
import _ from 'lodash'
|
||||||
import { get } from '@/utils/http'
|
import { get } from '@/utils/http'
|
||||||
import relatedServer from '@/mixins/relatedServer'
|
import relatedServer from '@/mixins/relatedServer'
|
||||||
import { dateFormatByAppearance, getMillisecond, getSecond } from '@/utils/date-util'
|
import { dateFormatByAppearance, getMillisecond } from '@/utils/date-util'
|
||||||
import Loading from '@/components/common/Loading'
|
import Loading from '@/components/common/Loading'
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
|
|
||||||
|
|||||||
@@ -248,7 +248,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import entityDetailMixin from './entityDetailMixin'
|
import entityDetailMixin from './entityDetailMixin'
|
||||||
import { api } from '@/utils/api'
|
import { api } from '@/utils/api'
|
||||||
import { unitTypes } from '@/utils/constants'
|
import { unitTypes, countryNameIdMapping } from '@/utils/constants'
|
||||||
import { valueToRangeValue } from '@/utils/unit-convert'
|
import { valueToRangeValue } from '@/utils/unit-convert'
|
||||||
import Chart from '@/views/charts/Chart'
|
import Chart from '@/views/charts/Chart'
|
||||||
import _ from 'lodash'
|
import _ from 'lodash'
|
||||||
@@ -257,7 +257,6 @@ import relatedServer from '@/mixins/relatedServer'
|
|||||||
import { dateFormatByAppearance, getMillisecond, getSecond } from '@/utils/date-util'
|
import { dateFormatByAppearance, getMillisecond, getSecond } from '@/utils/date-util'
|
||||||
import Loading from '@/components/common/Loading'
|
import Loading from '@/components/common/Loading'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import { countryNameIdMapping } from '@/utils/constants'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Ip',
|
name: 'Ip',
|
||||||
|
|||||||
Reference in New Issue
Block a user