gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：添加module，endpoint的labels列 以及asset搜索条件添加

Browse Source
This commit is contained in:
zhangyu
2020-11-10 14:11:29 +08:00
parent bfd70c845f
commit 6e406374e8
13 changed files with 798 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
View File

@@ -81,6 +81,12 @@
</template>
<template v-else>-</template>
</span>
<span v-else-if="item.prop == 'labels'">
<template v-if="scope.row.labelModule">
<span v-for="(p,i) in scope.row.labelModule">{{p.key}}={{p.value}}<span v-if="i < scope.row.labelModule.length-1">，</span></span>
</template>
<template v-else>-</template>
</span>
<template v-else-if="item.prop == 'type'">{{scope.row.module.type}}</template>
<div v-else-if="item.prop == 'option'">&nbsp;
<span
@@ -204,6 +210,11 @@
prop: 'type',
show: false,
width:200,
},{
label: this.$t("project.endpoint.labels"),
prop: 'labels',
show: true,
width:200,
},{
label: this.$t("project.endpoint.param"),
prop: 'param',
@@ -278,9 +289,14 @@
try {
let tempObj = JSON.parse(response.data.list[i].param);
response.data.list[i].paramObj = [];
let tempObj1 = JSON.parse(response.data.list[i].labels);
response.data.list[i].labelModule = [];
for (let k in tempObj) {
response.data.list[i].paramObj.push({key: k, value: tempObj[k]})
}
for (let k in tempObj1) {
response.data.list[i].labelModule.push({key: k, value: tempObj1[k]})
}
} catch (err) {
//console.error(response.data.list[i], err);
}
@@ -334,6 +350,9 @@
if (!this.endpoint.paramObj) {
this.$set(this.endpoint, 'paramObj', []);
}
if (!this.endpoint.labelModule) {
this.$set(this.endpoint, 'labelModule', []);
}
},
closeEditEndpointRightBox(refresh) {
this.rightBox.editEndpoint.show = false;

11
nezha-fronted/src/components/common/header.vue
View File

@@ -222,8 +222,8 @@
projectData: [], //顶部菜单project列表中的数据
editProject: {id: '', name: '', remark: ''}, //新增/编辑的project
currentProject: {id: '', name: '', remark: ''}, //module/endpoint弹框用来回显project
editModule: { type: 'http', name: '', project: {}, port: 9100, path: '', param: '', paramObj: []}, //新增/编辑的module
currentModule: {id: '', name: '', project: {}, port: '', path: '', param: '', paramObj: []}, //endpoint弹框用来回显module，此处固定为空对象
editModule: { type: 'http', name: '', project: {}, port: 9100, path: '', param: '', paramObj: [], labelModule:[],labels:'',}, //新增/编辑的module
currentModule: {id: '', name: '', project: {}, port: '', path: '', param: '', paramObj: [],labels:'',labelModule:[],}, //endpoint弹框用来回显module，此处固定为空对象
editEndpoint: { //新增/编辑的endpoint
id: '',
host: '',
@@ -232,9 +232,10 @@
path: '',
asset: {id: '', name: '', host: ''},
project: {id: '', name: ''},
module: {id: '', name: '', param: '', paramObj: {}, projectId: ''},
module: {id: '', name: '', param: '', paramObj: {}, projectId: '',labelModule:[],labels:''},
moduleId: '',
assetId: ''
assetId: '',
labelModule:[]
},
editAsset: {
id: '',
@@ -332,9 +333,11 @@
port: 9100,
path: '',
param: '',
labels:'',
type: 'http',
paramObj: [],
snmpParam: '',
labelModule:[],
//snmp setting 下划线命名是因为业务需求
walk: [],
version: 2, //2/3

2
nezha-fronted/src/components/common/js/constants.js
View File

@@ -92,7 +92,7 @@ export const asset = {
stateData: [
{value: 1, label: i18n.t('asset.inStock')},
{value: 2, label: i18n.t('asset.notInStock')},
{value: 3, label: i18n.t('asset.offStreamUnit')},
{value: 3, label: i18n.t('asset.Suspended')},
],
};

4
nezha-fronted/src/components/common/language/cn.js
View File

@@ -535,7 +535,7 @@ const cn = {
uSize: "U位",
inStock: "在库",
notInStock: "出库",
offStreamUnit:'停用',
Suspended:'停用',
principal: "负责人",
tel: "电话",
featureTitle: "属性",
@@ -867,7 +867,7 @@ const cn = {
stateInfo_230010: "Prometheus服务可用",
stateInfo_230011: "Endpoint 连接错误",
alerts:"告警",
label:'标签',
labels:'标签',
},
metrics: {
metrics: "指标",

4
nezha-fronted/src/components/common/language/en.js
View File

@@ -441,7 +441,7 @@ const en = {
uSize: 'U size',
inStock: 'In stock',//'在库'
notInStock: 'Not in stock',//'出库'
offStreamUnit:'off stream unit',
Suspended:'Suspended',
assetType:'Asset type',//'资产类型'
principal:'Administrator',//'负责人'
tel:'Telephone', //'电话'
@@ -874,7 +874,7 @@ const en = {
stateInfo_230010:'Promserver can be used',
stateInfo_230011:'Endpoint connection refused',
alerts:'Alerts',
label:'Label'
labels:'Labels'
},
metrics: {
metrics: 'Metrics',//"指标"

12
nezha-fronted/src/components/common/leftMenu.vue
View File

@@ -156,8 +156,8 @@
currentProjectTitle: '',
currentProject: {id: '', name: '', remark: ''}, //endpoint弹框、module列表用来回显project
module: {}, //编辑的module
blankModule: {name: '', project: {}, port: 9100, path: '', param: '', type: 'http', paramObj: [], snmpParam: '', walk: [], version: 2, max_repetitions: 25, retries: 3, timeout: 10, community: 'public', username: '', security_level: 'noAuthNoPriv', password: '', auth_protocol: 'MD5', priv_protocol: 'DES', priv_password: '', context_name: ''}, //空白module
currentModule: {id: '', type: '', name: '', project: {}, port: '', path: '', param: '', paramObj: [], snmpParam: ''}, //用来回显的module
blankModule: {name: '', project: {}, port: 9100, path: '', param: '',labels:'', type: 'http', paramObj: [],labelModule:[], snmpParam: '', walk: [], version: 2, max_repetitions: 25, retries: 3, timeout: 10, community: 'public', username: '', security_level: 'noAuthNoPriv', password: '', auth_protocol: 'MD5', priv_protocol: 'DES', priv_password: '', context_name: ''}, //空白module
currentModule: {id: '', type: '', name: '', project: {}, port: '', path: '', param: '', paramObj: [], snmpParam: '',labels:'',labelModule:[]}, //用来回显的module
ready: false,
rightBox: {module: {show: false}},
@@ -304,10 +304,15 @@
for (let i = 0; i < this.moduleList.length; i++) {
try {
let tempObj = JSON.parse(this.moduleList[i].param);
let tempObj1 = JSON.parse(this.moduleList[i].labels);
this.$set(this.moduleList[i], 'paramObj', []);
this.$set(this.moduleList[i], 'labelModule', []);
for (let k in tempObj) {
this.moduleList[i].paramObj.push({key: k, value: tempObj[k]});
}
for (let k in tempObj1) {
this.moduleList[i].labelModule.push({key: k, value: tempObj1[k]});
}
} catch (err) {}
}
}
@@ -343,6 +348,9 @@
if (!this.module.paramObj) {
this.$set(this.module, 'paramObj', []);
}
if (!this.module.labelModule) {
this.$set(this.module, 'labelModule', []);
}
if (this.module.snmpParam) {
this.initSnmpParam(this.module);
}

144
nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="right-box right-box-add-endpoint" :class="{'right-box-add-endpoint-snmp': currentModuleCopy.type && currentModuleCopy.type.toLowerCase() == 'snmp'}" @mousedown="showEditParamBox(false)" v-clickoutside="clickOutside">
<div class="right-box right-box-add-endpoint" :class="{'right-box-add-endpoint-snmp': currentModuleCopy.type && currentModuleCopy.type.toLowerCase() == 'snmp'}" @mousedown="()=>{showEditParamBox(false);showEditLabelsBox(false)}" v-clickoutside="clickOutside">
<!-- begin--顶部按钮-->
<div class="right-box-top-btns"></div>
<!-- end--顶部按钮-->
@@ -94,7 +94,7 @@
<el-input class="module-info module-info-port input-x-mini-22" :class="{'module-info-port-snmp': currentModuleCopy.type && currentModuleCopy.type.toLowerCase() == 'snmp'}" v-model="currentModuleCopy.port"></el-input>
<el-popover
placement="bottom"
width="200"
width="100"
trigger="hover"
v-if="currentModuleCopy.type && currentModuleCopy.type.toLowerCase() == 'http'"
>
@@ -103,6 +103,18 @@
</div>
<el-input id="edit-param" @click.native.stop="showEditParamBox(true, currentModuleCopy, 1, $event)" slot="reference" disabled class="module-info module-info-param input-x-mini-22" v-model="currentModuleCopy.param"></el-input>
</el-popover>
<el-popover
placement="bottom"
width="100"
trigger="hover"
>
<div class="endpoint-param-pop">
<div v-for="item,index in currentModuleCopy.labelModule">{{item.key}}={{item.value}}</div>
</div>
<el-input id="edit-labels" @click.native.stop="showEditLabelsBox(true, currentModuleCopy, 1, $event)" slot="reference" disabled class="module-info module-info-param module-info-labels input-x-mini-22" :class="{'module-info-labels-snmp': currentModuleCopy.type && currentModuleCopy.type.toLowerCase() == 'snmp'}" v-model="currentModuleCopy.labels"></el-input>
</el-popover>
<el-input v-if="currentModuleCopy.type && currentModuleCopy.type.toLowerCase() == 'http'" class="module-info module-info-path input-x-mini-22" v-model="currentModuleCopy.path"></el-input>
<button type="button" id="cover-param" @click="coverEndpoint" class="nz-btn nz-btn-size-small nz-btn-style-light module-info module-info-cover"><i class="nz-icon nz-icon-override"></i></button>
</div>
@@ -151,6 +163,26 @@
</el-form-item>
</span>
</span>
<span v-else-if="title.prop == 'labels'">
<el-popover
v-if="!scope.row.isEdit"
placement="bottom"
width="200"
trigger="hover"
>
<div class="endpoint-param-pop">
<div v-for="p in scope.row.labelModule">{{p.key}}={{p.value}}</div>
</div>
<span slot="reference">
<span @mousedown.stop>{{scope.row.labels.length > 8 ? scope.row.labels.substring(0, 8) + '...' : scope.row.labels}}</span>
</span>
</el-popover>
<span @mousedown.stop v-else @click.stop="showEditLabelsBox(true, scope.row, 2, $event)">
<el-form-item :prop="'endpointList[' + scope.row.index + '].param'" :rules="{required: false, message: $t('validate.required'), trigger: 'blur'}">
<el-input readonly class="endpoint-info endpoint-info-param input-x-mini-22" v-model="scope.row.labels"></el-input>
</el-form-item>
</span>
</span>
<span v-else-if="title.prop == 'path'">
<el-popover
placement="bottom"
@@ -236,6 +268,23 @@
</div>
</transition>
<!--end--param编辑框-->
<!--start--labels编辑框-->
<transition name="right-sub-box">
<div @mousedown.stop class="right-sub-box" v-if="editLabelsBox.show" :style="'top: ' + editLabelsBox.top + 'px; left: ' + editLabelsBox.left + 'px;'">
<div class="param-box">
<div class="param-box-row" v-for="(item, index) in tempLabelModule">
<el-input placeholder="key" class="param-box-row-key input-x-mini-22" v-model="item.key"></el-input>
<span class="param-box-row-eq">=</span>
<el-input placeholder="value" class="param-box-row-value input-x-mini-22" v-model="item.value"></el-input>
<span class="param-box-row-symbol" :id="'remove-param-'+index" @click="removeLabels(index)"><i class="nz-icon nz-icon-shanchu1"></i></span>
</div>
</div>
<div style="width: 100%; text-align: center; height: 25px;">
<el-button @click="addLabels" id="add-labels" style="height: 18px; line-height: 18px; padding-top: 0; padding-bottom: 0;" size="mini"><i class="nz-icon nz-icon-plus"></i></el-button>
</div>
</div>
</transition>
<!--end--param编辑框-->
</div>
</template>
@@ -262,10 +311,12 @@
currentModuleCopy: {},
currentProjectCopy: {id: ''},
tempParamObj: [],
tempLabelModule: [],
tempEndpoint: {},
tempEndpoint2: {},
rightBox: {show: false, title: this.$t('project.endpoint.createEndpoint'),isEdit: false},
editParamBox: {show: false, top: 0, left: 0, type: 0}, //param编辑弹框
editLabelsBox: {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: -1},
@@ -278,18 +329,23 @@
{
label: this.$t("project.endpoint.asset"),
prop: 'asset',
width: 121,
width: 76,
show: true,
},{
label: this.$t("project.endpoint.host"),
prop: 'host',
width: 121,
width: 76,
show: true,
},{
label: this.$t("project.endpoint.port"),
prop: 'port',
width: 54,
show: true,
},{
label: this.$t("project.endpoint.labels"),
prop: 'labels',
width: 90,
show: true,
},{
label: this.$t("project.endpoint.param"),
prop: 'param',
@@ -350,6 +406,50 @@
this.editParamBox.show = show;
},
//子弹框控制 obj: module或endpoint对象 type:1module2endpoint
showEditLabelsBox(show, obj, type, e) {
//editLabelsBox tempLabelModule labelModule
console.log(123123123123,show, obj, type, e,this.tempLabelModule);
if (show) {
let position = e.target.getBoundingClientRect();
this.editLabelsBox.type = type;
if (this.editLabelsBox.type == 2) {
this.tempEndpoint = obj;
}
this.editLabelsBox.top = position.top - 227;
this.editLabelsBox.left = position.left - 48;
if (!obj.labels) {
this.$set(obj, 'labelModule', []);
this.tempLabelModule = [];
} else {
this.tempLabelModule = JSON.parse(JSON.stringify(obj.labelModule));
}
} else {
if (!this.editLabelsBox.show) {
return;
}
for (let i = 0; i < this.tempLabelModule.length; i++) {
if (!this.tempLabelModule[i].key || !this.tempLabelModule[i].value) {
this.tempLabelModule.splice(i, 1);
i--;
}
}
if (this.editLabelsBox.type == 1) {
this.currentModuleCopy.labelModule = this.tempLabelModule;
this.currentModuleCopy.labels = this.paramToJson(this.tempLabelModule);
} else if (this.editLabelsBox.type == 2) {
for (let i = 0; i < this.endpointList.length; i++) {
if (this.endpointList[i].asset.id == this.tempEndpoint.asset.id) {
this.endpointList[i].labels = this.paramToJson(this.tempLabelModule);
this.endpointList[i].labelModule = this.tempLabelModule;
break;
}
}
}
this.tempLabelModule = [];
}
this.editLabelsBox.show = show;
},
clickOutside() {
this.esc(false);
},
@@ -368,7 +468,15 @@
removeParam(index) {
this.tempParamObj.splice(index, 1);
},
// 新增labels
addLabels() {
this.tempLabelModule.push({key: '', value: ''});
},
// 移除单个param
removeLabels(index) {
this.tempLabelModule.splice(index, 1);
},
//编辑endpoint
toEditEndpoint(endpoint) {
for (let i = 0; i < this.endpointList.length; i++) {
@@ -462,6 +570,7 @@
this.endpoint.moduleId = '';
this.endpoint.projectId = project.id;
this.editParamBox.show = false;
this.editLabelsBox.show = false;
this.tempParamObj = [];
this.endpointList = [];
this.getAssetList();
@@ -471,6 +580,7 @@
changeModule(module) {
this.endpoint.moduleId = module.id;
this.editParamBox.show = false;
this.editLabelsBox.show = false;
this.tempParamObj = [];
},
@@ -525,6 +635,8 @@
host: item.host,
param: this.currentModuleCopy.param ? this.currentModuleCopy.param : "",
paramObj: this.currentModuleCopy.paramObj ? this.currentModuleCopy.paramObj : {},
labels: this.currentModuleCopy.labels ? this.currentModuleCopy.labels : "",
labelModule: this.currentModuleCopy.labelModule ? this.currentModuleCopy.labelModule : {},
port: this.currentModuleCopy.port,
path: this.currentModuleCopy.path,
moduleId: this.currentModuleCopy.id
@@ -576,10 +688,15 @@
for (let i = 0; i < response.data.list.length; i++) {
try {
let tempObj = JSON.parse(response.data.list[i].param);
let tempObj1 = JSON.parse(response.data.list[i].labels);
response.data.list[i].paramObj = [];
response.data.list[i].labelsModule = [];
for (let k in tempObj) {
response.data.list[i].paramObj.push({key: k, value: tempObj[k]})
}
for (let k in tempObj1) {
response.data.list[i].labelsModule.push({key: k, value: tempObj1[k]})
}
} catch(err) {
//console.info(response.data.list[i], err);
}
@@ -601,7 +718,7 @@
//对endpointList进行处理，避免携带过多无用数据
let endpointList = [];
this.endpointList.forEach((item, index) => {
let endpoint = {moduleId: item.moduleId, assetId: item.assetId, port: item.port, param: item.param, path: item.path, host: item.host};
let endpoint = {moduleId: item.moduleId, assetId: item.assetId, port: item.port, param: item.param, path: item.path, host: item.host,labels:item.labels};
endpointList.push(endpoint);
});
this.$refs.addEndpoint.validate((valid) => {
@@ -627,6 +744,8 @@
this.endpointList[i].port = this.currentModuleCopy.port;
this.endpointList[i].param = this.currentModuleCopy.param;
this.endpointList[i].paramObj = this.currentModuleCopy.paramObj;
this.endpointList[i].labels = this.currentModuleCopy.labels;
this.endpointList[i].labelModule = this.currentModuleCopy.labelModule;
this.endpointList[i].path = this.currentModuleCopy.path;
}
this.$message({duration: 1000, type: 'success', message: this.$t("tip.coverSuccess")});
@@ -702,11 +821,11 @@
immediate: true,
handler(n, o) {
if (n.type && n.type.toLowerCase() == 'snmp') {
this.endpointTableTitle[3].show = false;
this.endpointTableTitle[4].show = false;
this.endpointTableTitle[5].show = false;
} else {
this.endpointTableTitle[3].show = true;
this.endpointTableTitle[4].show = true;
this.endpointTableTitle[5].show = true;
}
}
},
@@ -831,15 +950,22 @@
}
.module-info-port {
width: 53px;
right: 209px;
right: 309px;
}
.module-info-port-snmp {
right: 50px;
right: 142px;
}
.module-info-param {
width: 89px;
right: 116px;
}
.module-info-labels {
width: 89px;
right: 216px;
}
.module-info-labels-snmp {
right: 50px;
}
.module-info-path {
width: 70px;
right: 42px;

59
nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
View File

@@ -84,6 +84,34 @@
</el-scrollbar>
</div>
</el-form-item>
<!--label-->
<el-form-item :label="$t('project.endpoint.labels')" class="right-box-form-param">
<div style="text-align: right;margin-bottom: 5px">
<button style="display: none;">第一个button会出现意料之外的hover样式，找不到原因，只好加个不可见的button规避问题</button>
<!--<button id="module-clear-all" type="button" @click="clearAllParam" class="nz-btn nz-btn-size-normal nz-btn-style-light">-->
<!--<span><i class="nz-icon nz-icon-delete"></i></span>-->
<!--</button>-->
<span id="module-add-label" type="button" @click="addLabel" class="right-box-form-add">
<span><i style="font-size: 16px;" class="nz-icon nz-icon-create-square"></i></span>
</span>
</div>
<div class="param-box param-box-module">
<el-scrollbar ref="labelBoxScrollbar" style="height: 100%">
<div class="param-box-row" v-for="(item, index) in endpoint.labelModule">
<el-form-item class="param-box-row-key" :rules="{required: true, message: $t('validate.required'), trigger: 'blur'}" :prop="'labelModule.' + index + '.key'">
<el-input placeholder="key" size="mini" v-model="item.key"></el-input>
</el-form-item>
<span class="param-box-row-eq">=</span>
<el-form-item class="param-box-row-value" :rules="{required: true, message: $t('validate.required'), trigger: 'blur'}" :prop="'labelModule.' + index + '.value'">
<el-input placeholder="value" size="mini" v-model="item.value"></el-input>
</el-form-item>
<span class="param-box-row-symbol" :id="'moduel-remove-label-'+index" @click="removeLabel(index)"><i class="nz-icon nz-icon-shanchu1" style="color:#666;"></i></span>
</div>
</el-scrollbar>
</div>
</el-form-item>
</el-form>
</el-scrollbar>
@@ -194,6 +222,35 @@
}
},
// 新增label
addLabel() {
console.log(123123);
this.endpoint.labelModule.push({key: '', value: ''});
this.$nextTick(() => {
this.$refs.labelBoxScrollbar.update();
});
},
// 移除单个Label
removeLabel(index) {
this.endpoint.labelModule.splice(index, 1);
this.$nextTick(() => {
this.$refs.labelBoxScrollbar.update();
});
},
//将labels转为json字符串格式
labelsToJson(param) {
let tempParam = {};
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;
}
},
/*获取project列表*/
getProjectList() {
return new Promise(resolve => {
@@ -296,12 +353,12 @@
}
});
},
//保存endpoint
save() {
this.$refs.endpointForm.validate((valide=>{
if(valide){
this.editEndpoint.param = this.paramToJson(this.editEndpoint.paramObj);
this.editEndpoint.labels = this.labelsToJson(this.editEndpoint.labelModule);
let requestData = [];
requestData.push(this.editEndpoint);
this.$put('endpoint', requestData).then(response => {

64
nezha-fronted/src/components/common/rightBox/moduleBox.vue
View File

@@ -268,6 +268,34 @@
</div>
</el-form-item>
<el-form-item :label="$t('project.endpoint.labels')" class="right-box-form-param">
<div style="text-align: right;margin-bottom: 5px">
<button style="display: none;">第一个button会出现意料之外的hover样式，找不到原因，只好加个不可见的button规避问题</button>
<!--<button id="module-clear-all" type="button" @click="clearAllParam" class="nz-btn nz-btn-size-normal nz-btn-style-light">-->
<!--<span><i class="nz-icon nz-icon-delete"></i></span>-->
<!--</button>-->
<span id="module-add-label" type="button" @click="addLabel" class="right-box-form-add">
<span><i style="font-size: 16px;" class="nz-icon nz-icon-create-square"></i></span>
</span>
</div>
<div class="param-box param-box-module">
<el-scrollbar ref="labelBoxScrollbar" style="height: 100%">
<div class="param-box-row" v-for="(item, index) in editModule.labelModule">
<el-form-item class="param-box-row-key" :rules="{required: true, message: $t('validate.required'), trigger: 'blur'}" :prop="'labelModule.' + index + '.key'">
<el-input placeholder="key" size="mini" v-model="item.key"></el-input>
</el-form-item>
<span class="param-box-row-eq">=</span>
<el-form-item class="param-box-row-value" :rules="{required: true, message: $t('validate.required'), trigger: 'blur'}" :prop="'labelModule.' + index + '.value'">
<el-input placeholder="value" size="mini" v-model="item.value"></el-input>
</el-form-item>
<span class="param-box-row-symbol" :id="'moduel-remove-label-'+index" @click="removeLabel(index)"><i class="nz-icon nz-icon-shanchu1" style="color:#666;"></i></span>
</div>
</el-scrollbar>
</div>
</el-form-item>
<el-form-item :label='$t("project.module.description")' prop="remark">
<el-input type="textarea" placeholder="" maxlength="1024" show-word-limit v-model="editModule.remark" size="small"></el-input>
</el-form-item>
@@ -446,7 +474,7 @@
this.$nextTick(()=>{
this.$refs.selectWalk.show();
})
this.editModule.port= 161
this.editModule.port= 161;
}
this.updateScrollbar();
},
@@ -505,7 +533,11 @@
},
/*保存*/
save() {
if(this.editModule.type.toLowerCase() == 'snmp'){
this.editModule.paramObj=[];//处理snmp可能会带有param的问题
}
this.editModule.param = this.paramToJson(this.editModule.paramObj);
this.editModule.labels = this.labelsToJson(this.editModule.labelModule);
this.$refs.moduleForm.validate((valid) => {
if (valid) {
if (this.editModule.type.toLowerCase() == 'snmp') {
@@ -585,7 +617,6 @@
this.$refs.paramBoxScrollbar.update();
});
},
// 移除单个param
removeParam(index) {
this.editModule.paramObj.splice(index, 1);
@@ -593,7 +624,21 @@
this.$refs.paramBoxScrollbar.update();
});
},
// 新增label
addLabel() {
console.log(123123);
this.editModule.labelModule.push({key: '', value: ''});
this.$nextTick(() => {
this.$refs.labelBoxScrollbar.update();
});
},
// 移除单个Label
removeLabel(index) {
this.editModule.labelModule.splice(index, 1);
this.$nextTick(() => {
this.$refs.labelBoxScrollbar.update();
});
},
//将param转为json字符串格式
paramToJson(param) {
let tempParam = {};
@@ -607,6 +652,19 @@
return jsonString;
}
},
//将labels转为json字符串格式
labelsToJson(param) {
let tempParam = {};
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;
}
},
updateScrollbar() {
this.$refs.scrollbar.update();
}

3
nezha-fronted/src/components/common/searchSelectInfo.vue
View File

@@ -46,6 +46,9 @@
}, {
value: 2,
label: i18n.t('asset.notInStock')
}, {
value: 3,
label: i18n.t('asset.Suspended')
}
],
pingStatus:[

2
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -87,7 +87,7 @@
<div v-if="item.prop=='state'">
<span v-if="scope.row.state==1">{{ $t('asset.inStock')}}</span>
<span v-if="scope.row.state==2">{{ $t('asset.notInStock')}}</span>
<span v-if="scope.row.state==3">{{ $t('asset.offStreamUnit')}}</span>
<span v-if="scope.row.state==3">{{ $t('asset.Suspended')}}</span>
</div>
<div v-if="item.prop == 'pingStatus'">
<el-popover

845
nezha-fronted/src/components/page/project/project.vue
View File

File diff suppressed because it is too large Load Diff

2
nezha-fronted/static/config.json
View File

@@ -1 +1 @@
{"baseUrl":"http://192.168.40.42:8080/nz-admin", "version": "1.2"}
{"baseUrl":"http://192.168.40.42:8080/nz-admin", "version": "1.2.2020.11.10.14.10"}