-
{{scope.row[item.prop]}}
-
+
@@ -198,6 +326,7 @@ export default {
name: "prom",
data() {
return {
+ visible:false,
rightBox: { //弹出框相关
show: false,
isEdit: false, //false查看，true编辑
@@ -283,6 +412,28 @@ export default {
}],
},
searchLabel: {}, //搜索参数
+ idcSelectedData: {
+ id: '',
+ name: '',
+ location: '',
+ principal: '',
+ tel: ''
+ },
+ addIdcData: {
+ id: '',
+ name: '',
+ location: '',
+ principal: '',
+ tel: ''
+ },
+ popIdcData: {
+ id: '',
+ name: '',
+ location: '',
+ principal: '',
+ tel: ''
+ },
+ idcUserData: '',
}
},
methods: {
@@ -382,6 +533,7 @@ export default {
if (this.idcData[i].isEdit) {
this.idcData[i].name = this.idcData[i].oldName;
this.idcData[i].isEdit = false;
+
this.idcData[i].errorMessage = '';
break;
}
@@ -412,6 +564,7 @@ export default {
for (var i = 0; i < this.idcData.length; i++) {
this.$set(this.idcData[i], 'oldName', this.idcData[i].name);
this.$set(this.idcData[i], 'isEdit', false);
+ this.$set(this.idcData[i], this.idcData[i].name, false)
}
this.getTableData();
}
@@ -466,7 +619,6 @@ export default {
this.getTableData();
},
search: function(searchObj) {
- console.info(searchObj);
this.searchLabel = {};
for (let item in searchObj) {
if (searchObj[item]) {
@@ -474,10 +626,77 @@ export default {
}
}
this.getTableData();
- }
+ },
+ addNewData(type) {
+ if (type === 'IDC') {
+ this.$post('idc', this.addIdcData).then(res => {
+ if (res.code === 200) {
+ const h = this.$createElement;
+ this.$notify({
+ message: h('i', {style: 'color: teal'}, '添加成功'),
+ duration: 2000
+ });
+ this.getIdcData()
+ }else{
+ const h = this.$createElement;
+ this.$notify({
+ message: h('i', {style: 'color: teal'}, res.msg),
+ duration: 2000
+ });
+ }
+ })
+ }
+ },
+ getSingleIDCData(data, item) {
+ if (item !== 'edit') {
+ this.idcSelectedData = '';
+ this.idcData.forEach(item => {
+ if (item.id === data) {
+ this.idcSelectedData = item
+ }
+ });
+ } else {
+ this.idcData.forEach(item => {
+ if (item.id === data) {
+ console.log(item)
+ this.popIdcData.name = item.name
+ this.popIdcData.location = item.location
+ this.popIdcData.principal = item.principal
+ this.popIdcData.tel = item.tel
+ }
+ });
+ }
+ },
+ getUserData() {
+ this.$get('sys/user/list').then(response => {
+
+ if (response.code === 200) {
+ this.idcUserData = response.data.list
+ }
+ })
+ },
+ editData(data, id, item) {
+ item.id = id;
+ this.$put(data, item).then(res => {
+ if (res.code === 200) {
+ const h = this.$createElement;
+ this.$notify({
+ message: h('i', {style: 'color: teal'}, '修改成功'),
+ duration: 2000
+ })
+ }else{
+ const h = this.$createElement;
+ this.$notify({
+ message: h('i', {style: 'color: teal'}, res.msg),
+ duration: 2000
+ })
+ }
+ })
+ },
},
mounted: function() {
this.getIdcData();
+ this.getUserData();
},
watch: {
'promServer.idc': function(n, o) {
diff --git a/nezha-fronted/src/components/page/dashboard/metricPreview.vue b/nezha-fronted/src/components/page/dashboard/metricPreview.vue
new file mode 100644
index 000000000..9f1ac12fa
--- /dev/null
+++ b/nezha-fronted/src/components/page/dashboard/metricPreview.vue
@@ -0,0 +1,49 @@
+
+
+
-
-
+
diff --git a/nezha-fronted/src/components/common/home.vue b/nezha-fronted/src/components/common/home.vue
index 102d8a6c8..3ea4c1021 100644
--- a/nezha-fronted/src/components/common/home.vue
+++ b/nezha-fronted/src/components/common/home.vue
@@ -17,7 +17,7 @@ export default {
diff --git a/nezha-fronted/src/components/common/i18n.js b/nezha-fronted/src/components/common/i18n.js
index 3c4055a1a..ad425df51 100644
--- a/nezha-fronted/src/components/common/i18n.js
+++ b/nezha-fronted/src/components/common/i18n.js
@@ -5,9 +5,9 @@ import messages from './language'
Vue.use(VueI18n)
//从localStorage获取语言选择。
const i18n = new VueI18n({
- locale: localStorage.language || 'en', //初始未选择默认 en 英文
+ locale: localStorage.getItem('nz-language') || 'en', //初始未选择默认 en 英文
messages,
})
locale.i18n((key, value) => i18n.t(key, value)) //兼容element
-export default i18n
\ No newline at end of file
+export default i18n
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 8396fba6c..92533f849 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -16,6 +16,23 @@ const cn = {
add: '新增',
option: "操作"
},
+ dashboard:{
+ title:'仪表盘',
+ panel:{
+ title:'看板',
+ //侧滑框
+ createPanelTitle: "创建面板",
+ createPanelTitleSec:"创建新面板",
+ editPanelTitle: "编辑面板",
+ panelForm:{
+ panelName:"面板名称" ,
+ panelId:"ID"
+ }
+ },
+ metricPreview:{
+ title:'指标预览',
+ }
+ },
asset: {
tableTitle: {
id: 'ID',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 866d5fc47..3bc8a70e7 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -18,17 +18,39 @@ const en = {
clearAll: "Clear All",
clear: "Clear",
name: 'Name',
- cover: 'Cover'
+ cover: 'Cover',
+ signOut: 'Sign Out'
},
+ dashboard:{
+ title:'Dashboard',
+ panel:{
+ title:'Panel',
+ //侧滑框
+ createPanelTitle: "Create Panel",
+ createPanelTitleSec:"Create New Panel",
+ editPanelTitle: "Panel",
+ panelForm:{
+ panelName:"Panel Name",
+ panelId:"ID"
+ }
+ },
+ metricPreview:{
+ title:'MetricPreview',
+ }
+ },
+
search: {
- searchTip: 'Press Enter or click to search'
+ searchTip: 'Press Enter or click to search',
+ recentSearch: 'Recent Searches',
+ noRecentSearch: 'No Recent Searches'
},
tip: {
confirmDelete: "Confirm Delete?",
yes: "Yes",
no: "No",
deleteSuccess: "Successfully Deleted",
- saveSuccess: "Successfully Saved"
+ saveSuccess: "Successfully Saved",
+ coverSuccess: 'Successfully Covered'
},
asset:{
createAsset: "Create Asset",
@@ -141,7 +163,8 @@ const en = {
accountId: "Accound ID",
createAccount: "Create Account",
editAccount: "Edit Account",
- notCurrentlySupport: 'Not currently supported'
+ notCurrentlySupport: 'Not currently supported',
+ password: 'Password'
},
promServer: {
promServerList: "Prometheus Server",
diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue
index f92796203..bb231f3e4 100644
--- a/nezha-fronted/src/components/common/login.vue
+++ b/nezha-fronted/src/components/common/login.vue
@@ -1,27 +1,45 @@
-
-
-
-
-
-
- English
-
-
- 简体
-
-
- русский
-
- 退出登录
-
-
- 用户名
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.label}}
+
+ {{$t('overall.dashboard')}}
+
+ {{$t('dashboard.panel.title')}}
+ {{$t('dashboard.metricPreview.title')}}
+ {{$t('overall.project')}}
+
+
+
+ {{item.name}}
+
+
+ {{$t('overall.asset')}}
+
+
+ {{item.name}}
+ {{$t('overall.alert')}}
+
+ {{$t('alert.alertList')}}
+ {{$t('alert.alertConfig')}}
+ {{$t('overall.config')}}
+
+ {{$t('config.account.account')}}
+ {{$t('config.promServer.promServerList')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{username}}
+
+ English
+ 中文
+ {{$t('overall.signOut')}}
+
-
-
-
-
@@ -119,7 +128,7 @@
} else {
this.$message.error(response.msg);
}
- })
+ });
});
}
},
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 3f722d61e..49e2fb548 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -6,7 +6,7 @@
@@ -37,7 +37,7 @@
-
- NeZha
- -
-
-
-
-
-
-
-
+
+
\ No newline at end of file
+
diff --git a/nezha-fronted/src/components/common/pagination.vue b/nezha-fronted/src/components/common/pagination.vue
index 95dbc8e87..364ee181b 100644
--- a/nezha-fronted/src/components/common/pagination.vue
+++ b/nezha-fronted/src/components/common/pagination.vue
@@ -2,7 +2,6 @@
+
+
+
+
+ NEZHA
+ User Name
+
+
+
+ Password
+
+
+
+
+
+
+
+
+
+ 
+ 
+ EN
+
+
+
+
+ EN
+
+
+
+
+ 中
+
+
+
+ 中
+
+
+
+
+
@@ -177,15 +216,16 @@
export default {
name: "endpointBox",
props: {
- endpoint: Object,
currentProject: Object,
currentModule: Object
},
data() {
return {
+ currentModuleCopy: {},
+ tempParamObj: [],
+ tempEndpoint: {},
rightBox: {show: false, title: this.$t('project.endpoint.createEndpoint'),isEdit: false},
- editParamBox: {show: false}, //param编辑弹框
- viewParamBox: {show: false}, //param查看弹框
+ editParamBox: {show: false, top: 0, left: 0, type: 0}, //param编辑弹框
moduleParamShow: false, //module默认参数param悬浮窗
assetSearch: {host: '', sn: '', text: '', label: 'IP', dropdownShow: false}, //侧滑框中asset的搜索相关
assetPageObj: {pageNo: 1, pageSize: 9999},
@@ -227,47 +267,85 @@
methods: {
show(show) {
this.rightBox.show = show;
+ this.currentModuleCopy = JSON.parse(JSON.stringify(this.currentModule)); //打开弹框时将currentModule还原
},
- //子弹框控制
- showEditParamBox(show) {
+ //子弹框控制 obj: module或endpoint对象 type:1module2endpoint
+ showEditParamBox(show, obj, type, e) {
+ if (show) {
+ let position = e.target.getBoundingClientRect();
+ this.editParamBox.type = type;
+ if (this.editParamBox.type == 2) {
+ this.tempEndpoint = obj;
+ }
+ this.editParamBox.top = position.top - 234;
+ this.editParamBox.left = position.left - 48;
+ if (!obj.param) {
+ this.$set(obj, 'paramObj', []);
+ this.tempParamObj = [];
+ } else {
+ this.tempParamObj = JSON.parse(JSON.stringify(obj.paramObj));
+ }
+ } else {
+ if (this.endpointList.length > 0) {
+ for (let i = 0; i < this.endpointList.length; i++) {
+ this.endpointList[i].isEdit = false;
+ }
+ }
+ if (!this.editParamBox.show) {
+ return;
+ }
+ if (this.editParamBox.type == 1) {
+ this.currentModuleCopy.paramObj = this.tempParamObj;
+ this.currentModuleCopy.param = this.paramToJson(this.tempParamObj);
+ } else if (this.editParamBox.type == 2) {
+ for (let i = 0; i < this.endpointList.length; i++) {
+ if (this.endpointList[i].asset.id == this.tempEndpoint.asset.id) {
+ this.endpointList[i].param = this.paramToJson(this.tempParamObj);
+ this.endpointList[i].paramObj = this.tempParamObj;
+ break;
+ }
+ }
+ }
+ this.tempParamObj = [];
+ }
this.editParamBox.show = show;
},
- showViewParamBox(show) {
- this.viewParamBox.show = show;
- },
/*关闭弹框*/
esc() {
this.rightBox.show = false;
this.editParamBox.show = false;
- this.viewParamBox.show = false;
},
// 新增param
addParam() {
- this.endpoint.paramObj.push({key: '', value: ''});
+ this.tempParamObj.push({key: '', value: ''});
},
// 移除单个param
removeParam(index) {
- this.endpoint.paramObj.splice(index, 1);
+ this.tempParamObj.splice(index, 1);
},
- //将param转为json字符串格式
- paramToJson(param) {
- let tempParam = {};
- if (!param) {
- param = [];
- }
- for (let i = 0; i < param.length; i++) {
- eval('tempParam.' + param[i].key + '="' + param[i].value + '"');
- }
- let jsonString = JSON.stringify(tempParam);
- if (jsonString == '{}') {
- return "";
- } else {
- return jsonString;
+ //编辑endpoint
+ toEditEndpoint(endpoint) {
+ endpoint.isEdit = true;
+ },
+ editEndpoint(endpoint) {
+ endpoint.isEdit = false;
+ },
+
+ //移除endpoint
+ removeEndpoint(endpoint) {
+ endpoint.isEdit = false;
+ for (let i = 0; i < this.endpointList.length; i++) {
+ if (this.endpointList[i].assetId == endpoint.assetId) {
+ this.endpointList.splice(i, 1);
+ this.assetList.unshift(endpoint.asset);
+ i--;
+ break;
+ }
}
},
@@ -276,7 +354,11 @@
this.$get('project', {pageSize: 999, pageNo: 1}).then(response => {
if (response.code === 200) {
this.projectList = response.data.list;
+ if (this.moduleList.length == 0) {
+ this.getModuleList(this.currentProject.id);
+ }
}
+
});
},
@@ -284,6 +366,16 @@
getAssetList() {
this.$get('asset', this.assetPageObj).then(response => {
if (response.code === 200) {
+ let respData = response.data.list;
+ for (let i = 0; i < respData.length; i++) {
+ for (let j = 0; j < this.endpointList.length; j++) {
+ if (respData[i].id == this.endpointList[j].assetId) {
+ respData.splice(i, 1);
+ i--;
+ break;
+ }
+ }
+ }
this.assetList = response.data.list;
}
});
@@ -302,17 +394,41 @@
this.getAssetList();
},
+ changeProject(project) {
+ this.currentModuleCopy = {};
+ this.editParamBox.show = false;
+ this.tempParamObj = [];
+ this.endpointList = [];
+ this.getAssetList();
+ },
+
+ changeModule(module) {
+ this.editParamBox.show = false;
+ this.tempParamObj = [];
+ },
+
+ //清空勾选的endpoint
+ clearSelection() {
+ let selections = this.$refs.endpointTable.selection;
+ if (selections && selections.length > 0) {
+ for (let i = 0; i < selections.length; i++) {
+ this.removeEndpoint(selections[i])
+ }
+ }
+ },
+
// endpoint弹框中的asset子弹框里asset选择事件
selectAsset(obj, index) {
this.endpointList.push({
+ isEdit: false,
assetId: obj.id,
asset: obj,
host: obj.host,
- param: this.currentModule.param,
- paramObj: this.currentModule.paramObj,
- port: this.currentModule.port,
- path: this.currentModule.path,
- moduleId: this.currentModule.id
+ param: this.currentModuleCopy.param,
+ paramObj: this.currentModuleCopy.paramObj,
+ port: this.currentModuleCopy.port,
+ path: this.currentModuleCopy.path,
+ moduleId: this.currentModuleCopy.id
});
this.assetList.splice(index, 1);
},
@@ -321,7 +437,7 @@
paramToJson(param) {
let tempParam = {};
for (let i = 0; i < param.length; i++) {
- eval('tempParam.' + param[i].key + '="' + param[i].value + '"');
+ eval('tempParam["' + param[i].key + '"]="' + param[i].value + '"');
}
let jsonString = JSON.stringify(tempParam);
if (jsonString == '{}') {
@@ -353,10 +469,7 @@
//保存endpoint
save() {
- this.endpoint.moduleId = this.currentModule.id;
- this.endpoint.projectId = this.currentProject.id;
- this.endpoint.param = this.paramToJson(this.endpoint.paramObj);
- this.$put('endpoint', this.endpoint).then(response => {
+ this.$post('endpoint', this.endpointList).then(response => {
if (response.code === 200) {
this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
this.esc();
@@ -367,8 +480,17 @@
});
},
- //param展示悬浮框
- viewParam(item, flag, event) {
+ //覆盖endpoint的port/path/param
+ coverEndpoint() {
+ if (this.endpointList.length > 0) {
+ for (let i = 0; i < this.endpointList.length; i++) {
+ this.endpointList[i].port = this.currentModuleCopy.port;
+ this.endpointList[i].param = this.currentModuleCopy.param;
+ this.endpointList[i].paramObj = this.currentModuleCopy.paramObj;
+ this.endpointList[i].path = this.currentModuleCopy.path;
+ }
+ this.$message({duration: 1000, type: 'success', message: this.$t("tip.coverSuccess")});
+ }
},
//删除endpoint
@@ -394,21 +516,22 @@
this.assetSearch.label = label;
this.assetSearch.dropdownShow = false;
},
+
+ clearEndpoints() {
+ this.getAssetList();
+ this.endpointList = [];
+ }
},
created() {
this.getProjectList();
this.getAssetList();
},
- mounted() {
- this.getModuleList(this.currentProject.id);
- },
watch: {
- endpoint(n, o) {
- if (n && n.id) {
- this.rightBox.title = this.$t("project.endpoint.editEndpoint") + " ID：" + n.id;
- } else {
- this.rightBox.title = this.$t("project.endpoint.createEndpoint");
- }
+ currentProject(n, o) {
+ this.getModuleList(n.id);
+ },
+ currentModule(n, o) {
+ this.currentModuleCopy = JSON.parse(JSON.stringify(n));
}
}
}
@@ -441,15 +564,8 @@
}
.param-box {
- border: 1px solid #DCDFE6;
- border-radius: 4px;
- padding: 0 10px;
- }
- .param-box-endpoint {
- height: 325px;
- }
- .param-box-module {
- height: 227px;
+ height: 200px;
+ overflow: auto;
}
.param-box-row {
padding: 7px 0 0 0;
@@ -460,14 +576,14 @@
}
.param-box-row-key, .param-box-row-value {
display: inline-block;
- width: 41.5%;
+ width: 50px;
}
.param-box-row-eq {
display: inline-block;
- width: 22px;
+ width: 18px;
text-align: center;
- height: 32px;
- line-height: 32px;
+ height: 22px;
+ line-height: 22px;
color: #c4c7cF;
}
.param-box-row-symbol:first-of-type {
@@ -476,7 +592,7 @@
text-align: center;
display: inline-block;
position: absolute;
- top: 6px;
+ top: 7px;
right: 34px;
cursor: pointer;
}
@@ -489,8 +605,8 @@
width: 14px;
display: inline-block;
position: absolute;
- top: 9px;
- right: 14px;
+ top: 12px;
+ left: 135px;
cursor: pointer;
}
.param-box-row-symbol>i {
@@ -536,10 +652,10 @@
.right-child-box .module-info {
display: inline-block;
- height: 33px;
+ height: 24px;
vertical-align: middle;
position: absolute;
- top: 2px;
+ top: 5px;
}
.right-child-box-title {
padding: 9px 0 0 4px;
@@ -569,9 +685,12 @@
width: 60px;
right: 52px;
}
+ .endpoint-info-param {
+ width: 80px;
+ }
.right-child-box .module-info-cover {
right: 4px;
- height: 28px;
+ height: 24px;
padding: 5px 5px;
background: #656565;
color: white;
@@ -591,17 +710,11 @@
/* begin--子弹框*/
.right-sub-box {
- width: 380px;
- height: 520px;
- position: absolute;
- right: 80px;
+ width: 170px;
+ height: 225px;
+ position: fixed;
z-index: 2;
- padding: 0 10px;
- }
- .right-sub-box .el-input-group {
- width: 227px;
- float: right;
- margin: 7px 0 0 0;
+ padding: 0 0 0 10px;
}
/* begin--搜索框*/
.endpoint-asset-prepend {
@@ -652,7 +765,7 @@
line-height: 28px;
height: 30px;
}
- .endpoint-sub-table-row {
+ .endpoint-sub-table-row, .endpoint-sub-table-row-disabled {
line-height: 28px;
height: 30px;
color: #656565;
@@ -681,9 +794,17 @@
}
.endpoint-sub-table-body {
font-size: 15px;
+ position: relative;
overflow: auto;
height: calc(100% - 95px);
}
+ .endpoint-sub-table-body-dialog {
+ width: 100%;
+ height: 100%;
+ background-color: #e9ebec;
+ position: absolute;
+ opacity: 0.2;
+ }
.endpoints-clear-btn {
margin: 6px 0 0 10px;
}
@@ -692,8 +813,12 @@
/* end--子弹框*/
diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
new file mode 100644
index 000000000..6505d3358
--- /dev/null
+++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
@@ -0,0 +1,436 @@
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
index 0a7446b1e..294ef73f0 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
@@ -264,7 +264,7 @@
paramToJson(param) {
let tempParam = {};
for (let i = 0; i < param.length; i++) {
- eval('tempParam.' + param[i].key + '="' + param[i].value + '"');
+ eval('tempParam["' + param[i].key + '"]="' + param[i].value + '"');
}
let jsonString = JSON.stringify(tempParam);
if (jsonString == '{}') {
@@ -360,7 +360,9 @@
this.endpoint.moduleId = this.currentModule.id;
this.endpoint.projectId = this.currentProject.id;
this.endpoint.param = this.paramToJson(this.endpoint.paramObj);
- this.$put('endpoint', this.endpoint).then(response => {
+ let requestData = [];
+ requestData.push(this.endpoint);
+ this.$put('endpoint', requestData).then(response => {
if (response.code === 200) {
this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
this.esc();
diff --git a/nezha-fronted/src/components/common/rightBox/paramEditBox.vue b/nezha-fronted/src/components/common/rightBox/paramEditBox.vue
new file mode 100644
index 000000000..763d24ab4
--- /dev/null
+++ b/nezha-fronted/src/components/common/rightBox/paramEditBox.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/common/rightBox/projectBox.vue b/nezha-fronted/src/components/common/rightBox/projectBox.vue
index 7e05a2523..13f31bb9d 100644
--- a/nezha-fronted/src/components/common/rightBox/projectBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/projectBox.vue
@@ -28,28 +28,37 @@
+
+
+
+
+
+
+
+ <!–name–>
-->
-
@@ -28,7 +28,7 @@
@@ -169,6 +191,23 @@
+
+ {{$t("project.project.project")}}
-
+
@@ -37,7 +37,7 @@
{{$t("project.module.module")}}
-
+
@@ -76,6 +76,7 @@
+
+
{{item.host}}
{{item.sn}}
@@ -84,26 +85,30 @@
+
- {{$t('overall.cover')}}
+ {{$t('overall.cover')}}
+
@@ -114,49 +119,66 @@
-
- {{scope.row[item.prop].host}}
-
+
+ {{scope.row[title.prop].host}}
+
- {{scope.row.param.length > 8 ? scope.row.param.substring(0, 8) + '...' : scope.row.param}}
+
+ {{scope.row.param.length > 8 ? scope.row.param.substring(0, 8) + '...' : scope.row.param}}
+
-
+
- {{scope.row.path.length > 5 ? scope.row.path.substring(0, 5) + '...' : scope.row.path}}
+
+ {{scope.row.path.length > 5 ? scope.row.path.substring(0, 5) + '...' : scope.row.path}}
+
- {{scope.row[item.prop]}}
+
+ {{scope.row.port}}
+
-
+
- {{$t('overall.clear')}}
+
{{$t('project.endpoint.moduleParameter')}}:
-
-
- {{item.key}}={{item.value}}
+ {{item.key}}={{item.value}}
{{p.key}}={{p.value}}
-
-
+
+
+
+ {{$t('overall.clear')}}
+ All: {{this.endpointList.length}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('overall.esc')}}
+
+
+
+ {{$t('overall.save')}}
+ {{$t('overall.edit')}}
+
+
+
+ {{$t('overall.delete')}}
+
+ {{rightBox.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('alert.config.name')}}
+
+
+ {{alertRule.alertName}}
+
+
+
+ {{$t('alert.list.type')}}
+
+
+
+
+
+
+ {{item.value}}
+
+
+
+ {{$t('alert.config.link')}}
+
+
+
+
+
+
+ {{alertRule.linkObject ? alertRule.linkObject.name : ''}}
+
+
+
+ {{$t('alert.config.expr')}}
+
+
+ {{alertRule.expr}}
+
+
+
+ {{$t('alert.config.for')}}
+
+
+ second
+
+
+ {{alertRule.last}}s
+
+
+
+ {{$t('alert.severity')}}
+
+
+
+ {{item.value}}
+
+
+
+
+ {{alertRule.severity}}
+
+
+
+ {{$t('alert.summary')}}
+
+
+ {{alertRule.summary}}
+
+
+
+
+ {{$t('alert.description')}}
+
+
+ {{alertRule.description}}
+
+
+
+
+ {{$t('overall.cancel')}}
{{alertRule.id == '' ? $t('overall.create') : $t('overall.save')}}
+
+
+
+
+
+
+
+
+ {{rightBox.title}}
-
+ {{$t("project.project.projectName")}}
{{$t("project.project.description")}}
+
- {{other.recentSearch}}
+ {{$t('search.recentSearch')}}
@@ -21,7 +21,7 @@
{{other.clearReSearch}}
- {{other.noRecentSearch}}
+ {{$t('search.noRecentSearch')}}
-
+
{{type.value}}
- {{scope.row[item.prop].name}}
+ {{scope.row.type != 3 && scope.row.linkObject ? scope.row[item.prop].name : scope.row[item.prop].host}}
{{scope.row[item.prop]}}
-
+
@@ -346,11 +128,7 @@ export default {
searchLabel: { //搜索参数
},
- rightBox: { //弹出框相关
- show: false,
- isEdit: false, //false查看，true编辑
- title: ''
- },
+
alertRule: {
id: '',
alertName: '',
@@ -441,40 +219,13 @@ export default {
show: true,
}
],
- receiverData: [{
- id: '1',
- name: 'group1',
- description: '小组1desc'
- }, {
- id: '2',
- name: 'group2',
- description: '小组2desc'
- }, {
- id: '3',
- name: '小组3',
- description: '小组3desc'
- }, {
- id: '4',
- name: '小组4',
- description: '小组4desc'
- }, {
- id: '5',
- name: '小组啊小组5',
- description: '小组5desc'
- }, {
- id: '6',
- name: '小组6',
- description: '小组6desc'
- }],
tableData: []
}
},
methods: {
toEdit: function(u) {
this.alertRule = Object.assign({}, u);
- this.rightBox.isEdit = true;
- this.rightBox.title = this.$t("alert.config.editAlertConfig") + " ID：" + u.id;
- this.rightBox.show = true;
+ this.$refs.alertConfigBox.show(true, true);
},
del: function(u) {
this.$confirm(this.$t("tip.confirmDelete"), {
@@ -494,84 +245,13 @@ export default {
},
toAdd: function() {
this.cleanAlertRule();
- this.rightBox.isEdit = true;
- this.rightBox.title = this.$t("alert.config.createAlertConfig");
- this.rightBox.show = true;
+ this.$refs.alertConfigBox.show(true, true);
},
detail: function(u) {
this.alertRule = Object.assign({}, u);
- this.rightBox.isEdit = false;
- this.rightBox.title = this.$t("alert.config.alertConfig") + " ID：" + u.id;
- this.rightBox.show = true;
- },
- save: function() {
- if (this.alertRule.id) {
- this.$put('alert/rule', this.alertRule).then(response => {
- if (response.code === 200) {
- this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
- this.getTableData();
- this.rightBox.show = false;
- } else {
- this.$message.error(response.msg);
- }
- });
- } else {
- this.$post('alert/rule', this.alertRule).then(response => {
- if (response.code === 200) {
- this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
- this.getTableData();
- this.rightBox.show = false;
- } else {
- this.$message.error(response.msg);
- }
- });
- }
- },
- saveOrToEdit: function() {
- if (!this.rightBox.isEdit) {
- this.rightBox.isEdit = true;
- this.rightBox.title = this.$t("alert.config.editAlertConfig") + " ID：" + this.alertRule.id;
- } else {
- this.save();
- }
- },
- toEditReceiver: function(item) {
- if (!item.isEdit) {
- //如果不在编辑状态，那么其他项如果有改动，则还原改动，最后开始编辑
- this.blurEditReceiver();
- item.isEdit = true;
- } else {
- //如果已在编辑状态，判断name是否有变更，有变更则发请求
- if (item.name != item.oldName) {
- if (this.updateReceiverName(item) == 200) {
- item.isEdit = false;
- }
- } else {
- item.errorMessage = '';
- item.isEdit = false;
- }
- }
- },
- blurEditReceiver: function() {
- for (var i = 0; i < this.receiverData.length; i++) {
- if (this.receiverData[i].isEdit) {
- this.receiverData[i].name = this.receiverData[i].oldName;
- this.receiverData[i].isEdit = false;
- this.receiverData[i].errorMessage = '';
- break;
- }
- }
- },
- toDelReceiver: function(item) {
- this.blurEditReceiver();
- //TODO 请求后台，删除组
- },
- initReceiverData: function() {
- for (var i = 0; i < this.receiverData.length; i++) {
- this.$set(this.receiverData[i], 'oldName', this.receiverData[i].name);
- this.$set(this.receiverData[i], 'isEdit', false);
- }
+ this.$refs.alertConfigBox.show(true, false);
},
+
getTableData: function() {
this.$set(this.searchLabel, "pageNo", this.pageObj.pageNo);
this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize);
@@ -582,9 +262,6 @@ export default {
}
})
},
- esc: function() {
- this.rightBox.show = false;
- },
updateReceiverName: function(item) {
//TODO 请求接口改名
var code = 200;
@@ -609,8 +286,6 @@ export default {
}
},
jumpTo(data,id) {
- this.$store.state.assetData.moduleData = data;
- this.$store.state.assetData.selectedData = id;
this.$router.push({
path: "/" + data,
query: {
@@ -638,18 +313,6 @@ export default {
},
mounted() {
this.getTableData();
- this.initReceiverData();
- },
- computed: {
- sProject() {
- return this.$store.state.createAlertConfig;
- }
- },
- watch: {
- sProject(n, o) {
- this.$store.commit('toCreateAlertConfig', false);
- this.toAdd();
- }
}
}
diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue
index 1403e8ef6..8b1b45cfb 100644
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -169,7 +169,7 @@
- {{item.label}} @@ -626,8 +626,17 @@ } }, // input框监听是按删除还是回车 - enter(e) { + enter(val, e) { var keyCode = window.event ? e.keyCode : e.which; + if(val == 'ID'&&keyCode == 13){ + let id = /^[0-9]*$/ + if (!id.test(this.input_sreach) || this.input_sreach > 2147483647) { + //如果有不正确的值 进行删除 + this.input_sreach = '' + this.$message.error(this.other.delErrorId) + return false; + } + } if(keyCode!==8){ this.delBool = false this.delcriteriaBool = false diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index c8f4df8cf..b6a85a849 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -48,11 +48,10 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
- {{$t('overall.esc')}}
-
-
-
- {{$t('overall.save')}}
- {{$t('overall.edit')}}
-
-
-
- {{$t('overall.delete')}}
-
- {{rightBox.title}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('alert.config.name')}}
-
-
- {{alertRule.alertName}}
-
-
-
- {{$t('alert.list.type')}}
-
-
-
-
-
-
- {{item.value}}
-
-
-
- {{$t('alert.config.link')}}
-
-
- {{alertRule.linkObject.name}}
-
-
-
-
- {{$t('alert.config.expr')}}
-
-
- {{alertRule.expr}}
-
-
-
- {{$t('alert.config.for')}}
-
-
- second
-
-
- {{alertRule.last}}s
-
-
-
- {{$t('alert.severity')}}
-
-
-
- {{item.value}}
-
-
-
-
- {{alertRule.severity}}
-
-
-
- {{$t('alert.summary')}}
-
-
- {{alertRule.summary}}
-
-
-
- {{$t('alert.description')}}
-
-
- {{alertRule.description}}
-
-
- {{$t('config.account.receiver')}}
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
- {{alertRule.receiver}}
-
-
-
-
- {{$t('overall.cancel')}}
{{alertRule.id == '' ? $t('overall.create') : $t('overall.save')}}
-
-
@@ -35,11 +71,10 @@
-
-
+
-
+
+
+
+
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
new file mode 100644
index 000000000..75f773b59
--- /dev/null
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -0,0 +1,318 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index f54a5fa0d..efef9c44e 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -1,188 +1,655 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('dashboard.panel.createPanelTitleSec')}}
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('overall.esc')}}
+
+
+
+ {{$t('overall.save')}}
+
+
+
+ {{$t('overall.delete')}}
+
+ {{rightBox.title}}
+
+
+
+
+
+
+
+
+
+
+ {{$t('dashboard.panel.panelForm.panelName')}}
+
+
+
+
+
+
+ {{$t('overall.cancel')}}
{{panel.id == '' ? $t('overall.create') : $t('overall.save')}}
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+ {{scope.row[item.prop]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[item.prop].host}}
+
+ {{p.key}}={{p.value}}，
+
+ {{dateFormat(scope.row.lastUpdate)}}
+ {{scope.row.state == 1 ? 'up' : ''}}{{scope.row.state == 0 ? 'down' : ''}}
+ {{scope.row[item.prop]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/nezha-fronted/src/components/page/project/project2.vue b/nezha-fronted/src/components/page/project/project2.vue
deleted file mode 100644
index 6df2a8be7..000000000
--- a/nezha-fronted/src/components/page/project/project2.vue
+++ /dev/null
@@ -1,671 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row[item.prop]}}
-
-
-
-
-
-
-
-
-
- {{$t('project.endpoint.endpoint')}}
-
-
- {{$t('project.metrics.metrics')}}
-
-
-
-
-
-
-
- {{scope.row[item.prop].host}}
- {{scope.row[item.prop]}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('project.endpoint.endpoint')}}
-
-
- {{$t('project.metrics.metrics')}}
-
-
-
-
- {{$t('overall.add')}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('overall.esc')}}
-
-
-
- {{$t('overall.save')}}
- {{$t('overall.edit')}}
-
-
-
- {{$t('overall.delete')}}
-
- {{rightBox.title}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t("project.project.project")}}
-
-
-
-
- {{endpoint.project.name}}
-
-
-
- {{$t("project.module.module")}}
-
-
-
-
- {{endpoint.module.name}}
-
-
-
- {{$t("project.endpoint.host")}}
-
-
-
-
-
- {{endpoint.host}}
-
-
-
- {{$t("project.endpoint.port")}}
-
-
- {{endpoint.port}}
-
-
-
- {{$t("project.endpoint.path")}}
-
-
- {{endpoint.path}}
-
-
-
- {{$t("project.endpoint.param")}}
- {{$t('overall.add')}}
- {{$t('overall.clearAll')}}
-
-
-
-
-
-
-
-
-
-
- {{$t('overall.cancel')}}
{{endpoint.id == '' ? $t('overall.create') : $t('overall.save')}}
-
-
-
-
-
-
-
-
-
- {{rightSubBox.title}}
-
-
-
-
-
-
-
-
- {{assetSearch.label}}
-
-
-
-
-
-
-
- IP
- SN
-
-
-
-
-
-
- IP
- SN
-
-
-
-
- {{selectedAsset.host}}
- {{selectedAsset.sn}}
-
-
- {{item.host}}
- {{item.sn}}
-
-
-
-
- All: {{assetPageObj.total}}
-
-
-
-
-
-
-
-
-
-
- {{$t('overall.esc')}}
-
-
-
- {{$t('overall.save')}}
-
-
-
- {{$t('overall.delete')}}
-
- {{projectRightBox.title}}
-
-
-
-
-
-
-
-
-
-
-
- {{$t("project.project.projectName")}}
-
-
-
-
- {{$t("project.project.description")}}
-
-
-
-
-
- {{$t('overall.cancel')}}
{{project.id == '' ? $t('overall.create') : $t('overall.save')}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('overall.esc')}}
-
-
-
- {{$t('overall.save')}}
-
-
-
- {{$t('overall.delete')}}
-
- {{moduleRightBox.title}}
-
-
-
-
-
-
-
-
-
-
-
- {{$t("project.project.project")}}
-
-
-
-
-
-
-
-
-
- {{$t("project.module.moduleName")}}
-
-
-
-
-
- {{$t("project.module.description")}}
-
-
-
-
-
-
-
-
- {{$t('project.module.tip.defaultEndpointSet')}}
-
- {{$t('project.module.tip.relation')}}
-
-
-
-
- {{$t("project.endpoint.port")}}
-
-
-
-
-
- {{$t("project.endpoint.path")}}
-
-
-
-
-
- {{$t("project.endpoint.param")}}
- {{$t('overall.add')}}
- {{$t('overall.clearAll')}}
-
-
-
-
-
-
-
-
-
-
- {{$t('overall.cancel')}}
{{currentModule.id == '' && moduleRightBox.isCreate ? $t('overall.create') : $t('overall.save')}}
-
-
-
-
-
-
-
-
diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index 418d84857..d378816c8 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -11,7 +11,7 @@ axios.interceptors.request.use(config => {
// "Content-Type": 'application/x-www-form-urlencoded',
// }
// config.data = qs.stringify(config.data);
- let token = sessionStorage.getItem('token')
+ let token = sessionStorage.getItem('nz-token')
if (token) {
config.headers['Authorization'] = token //请求头token
}
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index aaada3c83..e2952bd85 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -22,6 +22,7 @@ import editEndpointBox from './components/common/rightBox/editEndpointBox'; //en
import addEndpointBox from './components/common/rightBox/addEndpointBox'; //endpoint弹框组件
import assetAddUnit from "./components/page/asset/assetAddUnit"; //资产添加组件
import assetEditUnit from "./components/page/asset/assetEditUnit"; //资产添加组件
+import alertConfigBox from "./components/common/rightBox/alertConfigBox"; //告警规则弹框组件
Vue.component("Pagination", Pagination);
Vue.component("searchInput", searchInput);
@@ -31,6 +32,7 @@ Vue.component("edit-endpoint-box", editEndpointBox);
Vue.component("add-endpoint-box", addEndpointBox);
Vue.component("assetAddUnit", assetAddUnit);
Vue.component("assetEditUnit", assetEditUnit);
+Vue.component("alert-config-box", alertConfigBox);
Vue.prototype.$axios = axios;
Vue.prototype.$post = post;
diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js
index ef0f3b493..569fbee18 100644
--- a/nezha-fronted/src/router/index.js
+++ b/nezha-fronted/src/router/index.js
@@ -36,9 +36,17 @@ export default new Router({
path: '/dashboard',
component: resolve => require(['../components/page/dashboard.vue'], resolve),
},
+ {
+ path: '/panel',
+ component: resolve => require(['../components/page/dashboard/panel.vue'], resolve),
+ },
+ {
+ path: '/metricPreview',
+ component: resolve => require(['../components/page/dashboard/metricPreview.vue'], resolve),
+ },
{
path: '/project',
- component: resolve => require(['../components/page/project/project2.vue'], resolve),
+ component: resolve => require(['../components/page/project/project.vue'], resolve),
},
{
path: '/asset',
-
-
-
-
-
-
-
-
-
- {{scope.row[item.prop]}}
-
-
-
-
-
-
-
-
-
- {{$t('project.endpoint.endpoint')}}
-
-
- {{$t('project.metrics.metrics')}}
-
-
-
-
-
-
-
- {{scope.row[item.prop].host}}
-
- {{p.key}}={{p.value}}，
-
- {{scope.row[item.prop]}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('project.endpoint.endpoint')}}
-
-
- {{$t('project.metrics.metrics')}}
-
-
-
-
- {{$t('overall.add')}}
-
-
-