@@ -359,10 +201,12 @@ import { positiveInteger, port, hostPlus, host, uSize } from '../../common/js/va
import latlngPicker from '../../common/latlngPicker'
import bus from '../../../libs/bus'
import draggable from 'vuedraggable'
-
+import notifyMethod from './system/notifyMethodTab'
+import linkTab from './system/linkTab'
+import apiKeyTab from './system/apiKeyTab'
export default {
name: 'system',
- components: { draggable, latlngPicker },
+ components: { draggable, latlngPicker, notifyMethod, linkTab, apiKeyTab },
data () {
return {
basic: {
@@ -501,11 +345,6 @@ export default {
// { type: 'url', message: this.$t('config.system.link.uriRequired'), trigger: 'blur' } /*检验网址是否正确*/
]
},
- notificationTemp: {
- name: '', filePath: ''
- },
- notification: [],
- notificationReserved: [],
notificationRules: {
name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' },
@@ -535,7 +374,7 @@ export default {
value: 'sysconfig'
}
],
- activeTab: 'basic'
+ activeTab: 'notification'
}
},
methods: {
@@ -547,15 +386,7 @@ export default {
console.error('type is required')
return
}
- if (type == 'reset') {
- return
- }
- if (type == 'link') {
- this.getLinkData()
- return
- }
- if (type == 'notification') {
- this.getNotificationData()
+ if (type == 'reset' || type == 'link' || type == 'notification' || type == 'apiKey') {
return
}
this.$get('sysConfig?type=' + type).then(response => {
@@ -727,12 +558,7 @@ export default {
// console.log(originalEvent) //鼠标位置
},
getLinkData () {
- this.linkTemp = { name: '', url: '' }
- this.$refs.linkTempForm.clearValidate()
- this.$get('/link').then(response => {
- this.link = response.data
- this.linkReserved = [...this.link]
- })
+
},
// link add
linkAdd () {
@@ -821,12 +647,7 @@ export default {
},
getNotificationData () {
- this.notificationTemp = { name: '', filePath: '' }
- this.$refs.notificationTempForm.clearValidate()
- this.$get('/alert/script').then(response => {
- this.notification = response.data.list
- this.notificationReserved = [...this.notification]
- })
+
},
// link add
notificationAdd () {
@@ -919,7 +740,7 @@ export default {
}
},
mounted () {
- this.querySetInfo('basic')
+ this.querySetInfo(this.activeTab)
}
}
@@ -1041,27 +862,16 @@ export default {
.system-config-form /deep/ .el-input input{
text-align: left;
}
- .notificationMessage{
- display: flex;
- width: 780px;
- background: #F6F6F6;
- color: #999999;
- margin-bottom: 10px;
- padding: 10px 10px 5px 10px;
- font-size: 14px;
- justify-content: left;
- justify-items: center;
- align-items: center;
- }
- .notificationMessage .more{
- font-size: 14px;
- cursor: pointer;
- }
diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTab.vue b/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
new file mode 100644
index 000000000..1e4615186
--- /dev/null
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
new file mode 100644
index 000000000..2ea9202be
--- /dev/null
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[item.prop]?scope.row[item.prop].name:'-'}}
+
+
+ {{scope.row[item.prop]?scope.row[item.prop].name:'-'}}
+
+ {{scope.row[item.prop]}}
+ -
+
+
+
+
+ {{$t('overall.option')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/config/system/linkTab.vue b/nezha-fronted/src/components/page/config/system/linkTab.vue
new file mode 100644
index 000000000..002961cf9
--- /dev/null
+++ b/nezha-fronted/src/components/page/config/system/linkTab.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/config/system/linkTable.vue b/nezha-fronted/src/components/page/config/system/linkTable.vue
new file mode 100644
index 000000000..c60c3ca32
--- /dev/null
+++ b/nezha-fronted/src/components/page/config/system/linkTable.vue
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[item.prop]?scope.row[item.prop].name:'-'}}
+
+ {{scope.row[item.prop]}}
+ -
+
+
+
+
+ {{$t('overall.option')}}
+
+
+
+
+
+
+
+
+
+ …
+
+
+ {{$t('overall.delete')}}
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue
new file mode 100644
index 000000000..214756cd9
--- /dev/null
+++ b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
. Please make sure the script file exists and has executable permissions
+
. The script file receives two parameters:
+
① Notification account
+
② Alert message(json)
+
+
+ {
+ "assetId": 1,
+ "dcId": 1,
+ "description": "The endpoint is down, the detailed information
+ Asset : 192.168.40.161, Project: system, Module: node_exporter,
+ Data center: center, EndpointId: 1",
+ "endAt": 1606240496000,
+ "endpointId": 1,
+ "hashKey": "34a17b57f289592a94ff65ee0864094b",
+ "id": 1,
+ "labels": "{\"severity\":\"P2\",\"endpoint\":\"1\",\"alertname\":\"1\",
+ \"module\":\"node_exporter\",\"project\":\"system\",\"datacenter\":
+ \"center\",\"asset\":\"192.168.40.161\"}",
+ "moduleId": 1,
+ "projectId": 1,
+ "ruleId": 1,
+ "severity": "P2",
+ "startAt": 1606009916000,
+ "state": 2,
+ "summary": "The endpoint is down, endpointId is 1"
+ }
+
+ ...
+
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
new file mode 100644
index 000000000..e2ba3ade8
--- /dev/null
+++ b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[item.prop] == '1'?$t(''):$t('')}}
+
+ {{scope.row[item.prop]}}
+ -
+
+
+
+
+ {{$t('overall.option')}}
+
+
+
+
+
+
+
+
+
+ …
+
+
+ {{$t('overall.delete')}}
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/config/system/systemCommon.js b/nezha-fronted/src/components/page/config/system/systemCommon.js
new file mode 100644
index 000000000..e034ff311
--- /dev/null
+++ b/nezha-fronted/src/components/page/config/system/systemCommon.js
@@ -0,0 +1,115 @@
+import { file } from '@topology/core/src/middles/nodes/file'
+
+export const tableCommon = {
+ data () {
+ return {
+ copy: null
+ }
+ },
+ methods: {
+ saveOrUpdate: function (obj) {
+ if (this.prevent_opt.save) {
+ return
+ }
+ if (!this.validateData(obj)) {
+ return
+ }
+ this.prevent_opt.save = true
+ const param = JSON.parse(JSON.stringify(obj))
+ if (param.id) {
+ this.$put(this.api, param).then(response => {
+ this.prevent_opt.save = false
+ if (response.code === 200) {
+ this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
+ this.$emit('reload')
+ } else {
+ this.$message.error(response.msg)
+ }
+ })
+ } else {
+ this.$post(this.api, param).then(response => {
+ this.prevent_opt.save = false
+ if (response.code === 200) {
+ this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
+ this.$emit('reload')
+ } else {
+ this.$message.error(response.msg)
+ }
+ })
+ }
+ },
+ toEdit: function (obj) {
+ if (this.tableData.every(t => !t.edit)) {
+ this.copy = JSON.parse(JSON.stringify(obj))
+ this.$set(obj, 'edit', true)
+ } else {
+ this.setWarning()
+ }
+ },
+ cancel: function (obj) {
+ if (obj.id) {
+ for (const key in obj) {
+ this.$set(obj, key, this.copy[key])
+ }
+ this.$set(obj, 'edit', false)
+ } else {
+ this.tableData.shift()
+ }
+ },
+ setWarning: function () {
+ const getArrayIndex = function (arr) {
+ let i = arr.length
+ while (i--) {
+ if (arr[i].edit) {
+ return i
+ }
+ }
+ return -1
+ }
+ const index = getArrayIndex(this.tableData)
+ const trs = document.querySelectorAll('#' + this.tableId + ' .el-table__body .el-table__row')
+ trs[index].style = 'animation-name: warnBackground;animation-duration: 1s;'
+ setTimeout(() => {
+ trs[index].style = ''
+ }, 1000)
+ },
+ validateData: function (data) {
+ let result = true
+ for (const field in this.rules) {
+ const rule = this.rules[field]
+ console.log(field, !data[field])
+ if (rule.required && !data[field]) {
+ rule.switch = true
+ result = false
+ }
+ }
+ return result
+ },
+ popShow: function (rule) {
+ const timeout = setTimeout(() => {
+ rule.switch = false
+ clearTimeout(timeout)
+ }, 1000)
+ }
+ }
+}
+export const parentTableCommon = {
+ methods: {
+ getTableData: function () {
+ this.searchLabel.pageSize = -1
+ this.$get(this.url, this.searchLabel).then(response => {
+ this.tools.loading = false
+ if (response.code === 200) {
+ this.tableData = []
+ this.tableData = response.data.list
+ if (!this.scrollbarWrap) {
+ this.$nextTick(() => {
+ this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
+ this.toTopBtnHandler(this.scrollbarWrap)
+ })
+ }
+ }
+ })
+ }
+ }
+}
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index 419acd5f2..d898e6fcb 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -167,7 +167,7 @@ Vue.mixin({
getButtonList () {
return this.$store.state.buttonList
},
- route: function () {
+ $routePath: function () {
return this.$route.path
}
}
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 31dd0572f..187e021b5 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -8,7 +8,7 @@ import VueResource from 'vue-resource'
Vue.use(VueResource)
-const loginWhiteList = ['/login', '/setup'] // 免登陆白名单
+const loginWhiteList = ['/login', '/setup', '/sys/license/upload', '/sys/license/state'] // 免登陆白名单
const permissionWhiteList = ['/menu', ...loginWhiteList] // 权限白名单
router.beforeEach((to, from, next) => {