@@ -119,6 +119,7 @@ export default {
selectArr: [], // 已被选择的条件
key: '', // 当前被选中的 key
symbol: false, // 当前被选中的 symbol
+ selectSymbolValue: '', // 当前被选中的 symbol 的值
value: '', // 当前被选中的 value
keyShow: false, // key 的下拉
symbolShow: false, // symbol 的下拉 显示根据key的类型 自定义的不包含 大于小于
@@ -209,6 +210,8 @@ export default {
// console.log(e, 'keydown')
if (e.keyCode == 8 && !this.searchStr && this.selectArr.length) {
this.selectArr.pop()
+ } else if (e.keyCode == 8) {
+ // console.log(this.oldSearchStr, this.searchStr)
}
// 5
if (e.keyCode == 38) { // 向上
@@ -247,18 +250,6 @@ export default {
this.$refs.searchStr.focus()
return
}
- // 2 3
- const index = this.searchStr.indexOf(':')
- if (index === -1) {
- this.symbol = false
- this.inputReadonly = false
- this.contentShow('key')
- } else if (index === this.searchStr.length - 1 && !this.symbol) {
- this.contentShow('symbol')
- } else {
- this.symbol = true
- this.contentShow('value')
- }
// 4
if (e.keyCode == 13 && index !== -1 && this.symbol) {
this.addSelectArr(this.searchStr)
@@ -280,7 +271,7 @@ export default {
if (index === -1) {
this.symbol = false
this.contentShow('key')
- } else if (index === this.searchStr.length - 1 && !this.symbol) {
+ } else if ((index == this.searchStr.length - 1) && !this.symbol) {
this.contentShow('symbol')
} else {
this.symbol = true
@@ -289,6 +280,7 @@ export default {
},
selectSymbol (item) {
this.symbol = true
+ this.selectSymbolValue = item.value
switch (item.value) {
case '=' :
this.$refs.searchStr.focus()
@@ -334,6 +326,53 @@ export default {
this.setValueList('')
this.contentShow('value')
},
+ delSymbol () {
+ const length = this.searchStr.length
+ switch (this.selectSymbolValue) {
+ case '=' :
+ this.$refs.searchStr.focus()
+ break
+ case '≠' :
+ this.searchStr = this.searchStr.substring(1)
+ this.$refs.searchStr.focus()
+ break
+ case '>=' :
+ // this.searchStr = this.searchStr + '>='
+ // this.$refs.searchStr.focus()
+ break
+ case '<=' :
+ // this.searchStr = this.searchStr + '<='
+ // this.$refs.searchStr.focus()
+ break
+ case '>' :
+ // this.searchStr = this.searchStr + '>'
+ // this.$refs.searchStr.focus()
+ break
+ case '<' :
+ // this.searchStr = this.searchStr + '<'
+ // this.$refs.searchStr.focus()
+ break
+ case 'wildcard' :
+ this.searchStr = this.searchStr.substring(1)
+ this.$refs.searchStr.focus()
+ break
+ case 'not wildcard' :
+ this.searchStr = this.searchStr.substring(2)
+ this.$refs.searchStr.focus()
+ break
+ case 'exist' :
+ // this.selectValue('*')
+ // this.$refs.searchStr.focus()
+ break
+ case 'not exist' :
+ this.searchStr = this.searchStr.substring(2)
+ // this.searchStr = '-' + this.searchStr + '*'
+ // this.selectValue('*')
+ this.$refs.searchStr.focus()
+ break
+ }
+ this.selectSymbolValue = ''
+ },
selectValue (value) {
this.searchStr = this.searchStr + value
this.addSelectArr(this.searchStr)
@@ -348,8 +387,16 @@ export default {
this.keyShow = false // key 的下拉
this.symbolShow = false // symbol 的下拉
this.valueShow = false // value 的下拉
- if (key) {
- this[key + 'Show'] = true
+ console.log(key)
+ if (key === 'symbol') {
+ this.setSymBolList()
+ this.symbolShow = true
+ }
+ if (key === 'key') {
+ this.keyShow = true
+ }
+ if (key === 'value') {
+ this.valueShow = true
}
const keyStr = this.searchStr.split(':')[0]
// console.log(keyStr, this.searchStr.split(':'))
@@ -412,6 +459,7 @@ export default {
key,
value: [value]
})
+ this.setSearchList()
}
},
removeSelectArr (index) {
@@ -511,6 +559,28 @@ export default {
this.searchList = n.searchLabelList || []
this.oldSearchList = n.searchLabelList || []
}
+ },
+ searchStr: {
+ handler (n, o) {
+ console.log(n, o)
+ // 2 3
+ const index = this.searchStr.indexOf(':')
+ if (index === -1) {
+ this.symbol = false
+ this.inputReadonly = false
+ this.contentShow('key')
+ } else if (index === this.searchStr.length - 1 && !this.symbol) {
+ this.contentShow('symbol')
+ } else {
+ this.symbol = true
+ this.contentShow('value')
+ }
+ if (n.indexOf(':') === -1 && o.indexOf(':') !== -1) {
+ this.symbol = false
+ this.delSymbol()
+ }
+ // if (n.indexOf(':'))
+ }
}
}
}
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 96ddd070b..7086e8f9d 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -249,7 +249,8 @@ export default {
tableDataInitNum: 0,
alertRuleShow: false,
alertRuleId: '',
- alertRuleObj: ''
+ alertRuleObj: '',
+ timeRule: ''
}
},
computed: {
@@ -518,7 +519,7 @@ export default {
},
// alertName鼠标划入
alertMessageHover (item, loading, e) {
- clearTimeout(this.timer)
+ clearTimeout(this.timeRule)
if (e) {
const dom = e.currentTarget
const position = dom.getBoundingClientRect()
@@ -527,13 +528,13 @@ export default {
this.alertRuleObj = item
}
this.$set(item.alertRule, 'loading', loading)
- this.timer = setTimeout(() => {
+ this.timeRule = setTimeout(() => {
this.alertRuleShow = loading
}, 500)
this.flag = loading
},
tipHoverRule (tipLoading) {
- clearTimeout(this.timer)
+ clearTimeout(this.timeRule)
if (this.flag === false) {
this.alertRuleShow = tipLoading
}
diff --git a/nezha-fronted/src/components/common/table/tool/pingTable.vue b/nezha-fronted/src/components/common/table/tool/pingTable.vue
index 8ddc2f007..a54756b73 100644
--- a/nezha-fronted/src/components/common/table/tool/pingTable.vue
+++ b/nezha-fronted/src/components/common/table/tool/pingTable.vue
@@ -2,7 +2,7 @@
-
-
-
+
@@ -91,7 +91,7 @@
-
+
diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue
index 1922ef5a5..7517fc6c8 100644
--- a/nezha-fronted/src/components/page/monitor/project/projectList.vue
+++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue
@@ -134,6 +134,7 @@ export default {
},
methods: {
getTableData (params) {
+ console.log('213123123')
if (params && Object.keys(params).length > 0) {
for (const key in params) {
this.$set(this.searchLabel, key, params[key])
@@ -194,6 +195,17 @@ export default {
}
}
})
+ },
+ delCallBack (id) {
+ console.log(id, 'id')
+ if (id.indexOf(this.$store.state.currentProject.id) !== -1) {
+ console.log(123, id)
+ this.$store.commit('currentProjectChange', {
+ id: '',
+ name: '',
+ remark: ''
+ })
+ }
}
},
computed: {
diff --git a/nezha-fronted/src/entrance/app/main.js b/nezha-fronted/src/entrance/app/main.js
index 990e89908..2af113d73 100644
--- a/nezha-fronted/src/entrance/app/main.js
+++ b/nezha-fronted/src/entrance/app/main.js
@@ -61,11 +61,11 @@ import hljs from 'highlight.js'
VMdPreview.use(githubTheme, {
Hljs: hljs
})
-Pace.options = {
- minTime: 0.1,
- ghostTime: 0.1,
- restartOnRequestAfter: 0.1
-}
+// Pace.options = {
+// minTime: 0.1,
+// ghostTime: 0.1,
+// restartOnRequestAfter: 0.1
+// }
window.Meta2d = Meta2d
Vue.use(VMdPreview)
Vue.use(Pace)
diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index 4d20b545f..ae322e130 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -139,6 +139,9 @@ export function get (url, params, responseType) {
headers: response.headers
})
}
+ if (url.indexOf('/stat/alertMessage/trend') !== -1) {
+ response.data.responseURL = response.request.responseURL
+ }
resolve(response.data)
}).catch(err => {
if (err.response) {
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 9f67a7941..88ae3cfd8 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -33,7 +33,7 @@ router.beforeEach((to, from, next) => {
localStorage.setItem('nz-sys-timezone', res.data.timezone || '')
localStorage.setItem('nz-sys-bgImg', res.data.system_bgImg || '')
localStorage.setItem('nz-default-theme', res.data.theme || '')
- localStorage.setItem('nz-default-dateFormat', res.data.dateFormat || '')
+ localStorage.setItem('nz-default-dateFormat', res.data.dateFormat || 'YYYY-MM-DD HH:mm:ss')
changeFavicon(res.data.system_favicon)
}
resolve()