From ba188b9128978f9d4073b806ff5a95e33e33c45c Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 19 Nov 2020 18:20:31 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Asystem=20basic=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=99=90=E5=88=B6query=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=95=B0=E9=87=8F=20=E4=BB=A5=E5=8F=8A=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E6=A0=87=E7=AD=BE=E9=A1=B5Notticati?= =?UTF-8?q?on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/language/cn.js | 15 +- .../src/components/common/language/en.js | 17 +- .../src/components/page/config/system.vue | 207 +++++++++++++++++- 3 files changed, 234 insertions(+), 5 deletions(-) diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 7861abe6c..8d5e0585d 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -702,7 +702,8 @@ const cn = { timezone: "时区", defaultCabinetUsize: "机柜默认U位", second:'秒', - day:'天' + day:'天', + maxSeries:'Query max series', }, email: { email: "邮件", @@ -747,6 +748,18 @@ const cn = { nameMaxLength:"长度应小于64", uriRequired:'请填写正确的网址' }, + notification: { + notification:'Notification', + name: "名称", + filePath: "文件路径", + operation: "操作", + add: "添加", + update: "更新", + del: "删除", + nameMaxLength:"长度应小于64", + uriRequired:'必填项', + filePathReg:'请输入正确的文件路径' + }, reset: { reset: "重置", type: "类型", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 904098b66..d6e261116 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -707,7 +707,8 @@ const en = { timezone:'Timezone', defaultCabinetUsize:'Cabinet U Size', second:'second', - day:'day' + day:'day', + maxSeries:'Query max series', }, email:{ email:'Email', @@ -744,7 +745,7 @@ const en = { link: { link:'Link', name: "Name", - url: "URL", + filePath: "FilePath", operation: "Operation", add: "Add", update: "Update", @@ -752,6 +753,18 @@ const en = { nameMaxLength:'The length should be less than 64', uriRequired:'Please fill in the correct url' }, + notification: { + notification:'Notification', + name: "Name", + filePath: "filePath", + operation: "Operation", + add: "Add", + update: "Update", + del: "Delete", + nameMaxLength:'The length should be less than 64', + uriRequired:'Required', + filePathReg:'Please enter the correct file path' + }, reset:{ reset:'Reset', type:'Type', diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue index feed6e3bb..f4039b1ec 100644 --- a/nezha-fronted/src/components/page/config/system.vue +++ b/nezha-fronted/src/components/page/config/system.vue @@ -2,7 +2,7 @@
-
+
@@ -29,8 +29,11 @@ {{$t('config.system.basic.day')}} + + + - + @@ -133,6 +136,74 @@
+ +
+
+ +
{{$t('config.system.notification.name')}}
+
{{$t('config.system.notification.filePath')}}
+
{{$t('config.system.notification.operation')}}
+
+ +
+ + + + + + + + + + + + +
+ +
+ +
+ + + + + + + + + + + + + + +
+
{{item.name}}
+
+ + + {{item.filePath}} + + +
+
+ + +
+
+
+ +
+
+
@@ -256,6 +327,7 @@ current_site_url:'', timezone:'', default_cabinet_usize:'', + query_max_series:'' }, basicCopy:null, basicRules:{ @@ -267,6 +339,7 @@ storage_local_retention:[{required:true,message:this.$t('validate.required'),trigger:'blur'},{validator:positiveInteger,trigger:'blur'}], timezone:[{required:true,message:this.$t('validate.required'),trigger:'blur'}], default_cabinet_usize:[{required:true,message:this.$t('validate.required'),trigger:'blur'},{validator:positiveInteger,trigger:'blur'},{validator:uSize,trigger:'blur'}], + query_max_series:[{required:true,message:this.$t('validate.required'),trigger:'blur'},], }, basicRules2:{ system_name:[{required:true,message:this.$t('validate.required'),trigger:'blur'},], @@ -276,6 +349,7 @@ storage_local_retention:[{required:true,message:this.$t('validate.required'),trigger:'blur'},{validator:positiveInteger,trigger:'blur'}], timezone:[{required:true,message:this.$t('validate.required'),trigger:'blur'}], default_cabinet_usize:[{validator:positiveInteger,trigger:'blur'},{validator:uSize,trigger:'blur'}], + query_max_series:[{required:true,message:this.$t('validate.required'),trigger:'blur'},], }, timezoneOption:[ {label:'UTC-12:00',value:'-12'}, @@ -376,6 +450,22 @@ // { 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' }, + { max: 64, message: this.$t('config.system.link.nameMaxLength'), trigger: 'blur' } + ], + filePath:[ + { required: true, message: this.$t('validate.required'), trigger: 'blur' }, + { pattern: /^\/(\w+\/?)+$/, message: this.$t('config.system.notification.filePathReg') } + // { type: 'url', message: this.$t('config.system.link.uriRequired'), trigger: 'blur' } /*检验网址是否正确*/ + ] + }, resetRules:{ type:[{required:true,message:this.$t('validate.required'),trigger:'blur'},], password:[{required:true,message:this.$t('validate.required'),trigger:'blur'},], @@ -413,6 +503,10 @@ this.getLinkData(); return } + if(type == 'notification'){ + this.getNotificationData(); + return + } this.$get('sysConfig?type='+type).then(response=>{ if(response.code == 200){ let sets=response.data[type]; @@ -537,6 +631,28 @@ start: function (evt) { // console.log(evt) }, + notificationEnd: function (evt) { + let length=this.notification.length; + if(evt.newIndex==evt.oldIndex){ // 如果没有移动返回 + return + } + let parmas={ + id:this.notification[evt.newIndex].id, + prev:0, + next:-1 + } + if(evt.newIndex==length-1){ + parmas.prev=this.notification[evt.newIndex-1].id; + }else if(evt.newIndex==0){ + parmas.next=this.notification[evt.newIndex+1].id; + }else{ + parmas.prev=this.notification[evt.newIndex-1].id; + parmas.next=this.notification[evt.newIndex+1].id; + } + this.$put('/alert/script/modify',parmas).then((response)=>{ + // this.$store.commit('setLinkData',this.link); + }) + }, end: function (evt) { let length=this.link.length; if(evt.newIndex==evt.oldIndex){ // 如果没有移动返回 @@ -645,6 +761,90 @@ } }); }, + + getNotificationData(){ + this.notificationTemp={name:'',filePath:''}; + this.$refs['notificationTempForm'].clearValidate(); + this.$get('/alert/script').then(response=>{ + this.notification=response.data.list; + console.log(this.notification); + this.notificationReserved=[...this.notification]; + }); + }, + // link add + notificationAdd(){ + this.$refs['notificationTempForm'].validate((valid) => { + if (valid) { + this.$post('/alert/script',this.notificationTemp).then(response=>{//新增link + if(response.code == 200){ + this.notificationTemp={name:'',filePath:''}; + this.notificationAddCallBack(); + this.$message({duration: 2000, type: 'success', message: this.$t("tip.addSuccess")}); + }else{ + this.$message.error(response.msg); + } + }) + } else { + return false; + } + }); + }, + notificationAddCallBack(){ + this.$get('/link').then(response=>{ + this.notification.push(response.data[response.data.length-1]); + this.notificationReserved.push(response.data[response.data.length-1]); + // this.$store.commit('setLinkData',this.link); + }); + }, + // link edit + notificationEdit(item){ + let index=this.notification.findIndex((item1)=>item.id==item1.id); + this.$set(this.notification,index,{...this.notification[index],isEdit:true}); + }, + // link update + notificationUpdate(item){ + this.$refs['notificationForm'+item.id][0].validate((valid) => { + if (valid) { + let params={ + id:item.id, + name:item.name, + filePath:item.filePath, + }; + this.$put('/alert/script',params).then(response=>{ + if(response.code == 200){ + let index=this.notification.findIndex((item1)=>item.id==item1.id); + this.$set(this.notification,index,{...this.notification[index],isEdit:false}); + this.notificationReserved=[...this.notification]; + // this.$store.commit('setLinkData',this.notification); + this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")}); + }else{ + this.$message.error(response.msg); + } + }) + } else { + return false; + } + }); + }, + // link cancel + notificationCancel(item){ + let index=this.notification.findIndex((item1)=>item.id==item1.id); + let indexReserved=this.notificationReserved.findIndex((item1)=>item.id==item1.id); + this.$set(this.notification,index,{...this.notificationReserved[indexReserved],isEdit:false}); + }, + // link del + notificationDel(item){ + this.$delete('/alert/script?ids='+item.id).then((response)=>{ + if(response.code == 200){ + this.notification=this.notification.filter((item1)=>item.id!==item1.id); + this.notificationReserved=this.notificationReserved.filter((item1)=>item.id!==item1.id); + // this.$store.commit('setLinkData',this.link); + this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")}); + }else{ + this.$message.error(response.msg); + } + }); + }, //openUrl 跳转页面 openUrl(item){ // window.open(item.url) @@ -765,6 +965,9 @@ .system-config-form.terminal /deep/ .el-input-number--small{ width: 512px; } + .system-config-form.basicForm /deep/ .el-input-number--small{ + width: 512px; + } .system-config-form /deep/ .el-input input{ text-align: left; }