+
@@ -628,36 +617,28 @@
@@ -674,22 +655,16 @@
@@ -714,7 +689,7 @@
-
{{$t('overall.cancel')}}
{{currentModule.id == '' ? $t('overall.create') : $t('overall.save')}}
+
{{$t('overall.cancel')}}
{{currentModule.id == '' && moduleRightBox.isCreate ? $t('overall.create') : $t('overall.save')}}
@@ -731,9 +706,12 @@ export default {
tableShow: 1, // 1.endpoint; 2.metrics
projectRightBox: {
show: false,
- title: ''
+ title: '',
+ isCreate: false
},
project: {id: '', name: '', remark: ''},
+ newProject: {id: '', name: '', remark: ''},
+ newModule: {id: '', name: '', project: {}, port: '', path: '', param: '', paramObj: []},
rightBox: { //弹出框相关
show: false,
isEdit: false, //false查看，true编辑
@@ -779,19 +757,20 @@ export default {
},
moduleRightBox: {
show: false,
- title: ''
+ title: '',
+ isCreate: false
},
currentModule: { //左侧列表当前选中的module
id: '',
name: '',
projectId: ''
},
- selectedModule: { //侧滑框中选中的module
+ selectedModule: { //endpoint侧滑框中选中的module
id: '',
name: '',
projectId: ''
},
- selectedAsset: { //侧滑框中选中的asset
+ selectedAsset: { //endpoint侧滑框中选中的asset
id: '',
host: '',
sn: ''
@@ -890,13 +869,21 @@ export default {
});
},
// 获取module、endpoint弹框中project下拉框数据
- getProjectData: function() {
+ getProjectData: function(name) {
this.$get('project').then(response => {
if (response.code === 200) {
this.projectData = response.data.list;
- console.info(this.project);
- this.project = this.projectData[0];
- console.info(this.project);
+ if (name) {
+ for (let i = 0; i < this.projectData.length; i++) {
+ if (this.projectData[i].name == name) {
+ this.project = this.projectData[i];
+ this.$store.commit('setProject', this.project);
+ break;
+ }
+ }
+ } else {
+ this.project = this.projectData[0];
+ }
}
});
},
@@ -937,7 +924,7 @@ export default {
this.$get('module', {projectId: this.$store.state.projectData.id}).then(response => {
if (response.code === 200) {
this.moduleData = response.data.list;
- for (var i = 0; i < response.data.list.length; i++) {
+ for (let i = 0; i < response.data.list.length; i++) {
try {
var tempObj = JSON.parse(response.data.list[i].param);
} catch (err) {
@@ -956,7 +943,6 @@ export default {
this.endPointTableData = [];
this.pageObj.total = 0;
}
-
}
});
},
@@ -1082,7 +1068,10 @@ export default {
this.$message({duration: 3000, type: 'success', message: this.$t("tip.deleteSuccess")});
this.$store.commit('projectRightBoxShow', false);
this.getProjectData();
- this.getModuleData();
+ setTimeout(() => {
+ this.getModuleData();
+ }, 50);
+
if (this.projectData.length > 0) {
this.$store.commit('setProject', this.projectData[0]);
}
@@ -1105,6 +1094,9 @@ export default {
this.rightBox.isEdit = true;
this.rightBox.title = this.$t("project.endpoint.createEndpoint");
this.rightBox.show = true;
+ },
+ toAddProject: function() {
+
},
// 打开endpoint详情页
detail: function(u) {
@@ -1127,24 +1119,48 @@ export default {
},
// 保存project
projectSave: function() {
- this.$put('project', this.project).then(response => {
- if (response.code === 200) {
- this.$store.commit('setProject', this.project);
- this.$store.commit('projectListReloadChange', true);
- this.$store.commit('projectRightBoxShow', false);
- }
- });
+ if (!this.projectRightBox.isCreate) {
+ this.$put('project', this.project).then(response => {
+ if (response.code === 200) {
+ this.$store.commit('setProject', this.project);
+ this.$store.commit('projectListReloadChange', true);
+ this.$store.commit('projectRightBoxShow', false);
+ }
+ });
+ } else {
+ this.$post('project', this.newProject).then(response => {
+ if (response.code === 200) {
+ this.projectRightBox.isCreate = false;
+ this.getProjectData(this.newProject.name);
+ this.$store.commit('projectListReloadChange', true);
+ this.$store.commit('projectRightBoxShow', false);
+ this.getModuleData();
+ this.newProject = {id:'', name:'', remark:''};
+ }
+ });
+ }
},
// 保存module
moduleSave: function() {
- this.currentModule.param = this.paramToJson();
- this.currentModule.projectId = this.currentModule.project.id;
- this.$put('module', this.currentModule).then(response => {
- if (response.code === 200) {
- this.esc(3);
- this.getModuleData();
- }
- });
+ if (!this.moduleRightBox.isCreate) {
+ this.currentModule.param = this.paramToJson();
+ this.currentModule.projectId = this.currentModule.project.id;
+ this.$put('module', this.currentModule).then(response => {
+ if (response.code === 200) {
+ this.esc(3);
+ this.getModuleData();
+ }
+ });
+ } else {
+ this.newModule.param = this.paramToJson();
+ this.$post('module', this.newModule).then(response => {
+ if (response.code === 200) {
+ this.esc(3);
+ this.getModuleData();
+ this.moduleRightBox.isCreate = false;
+ }
+ });
+ }
},
// 保存endpoint
save: function() {
@@ -1246,7 +1262,16 @@ export default {
},
projectBoxShow() {
return this.$store.state.projectBoxShow;
- }
+ },
+ toCreateProject() {
+ return this.$store.state.createProject;
+ },
+ toCreateModule() {
+ return this.$store.state.createModule;
+ },
+ toCreateEndpoint() {
+ return this.$store.state.createEndpoint;
+ },
},
watch: {
sProject(n, o) {
@@ -1258,6 +1283,32 @@ export default {
},
projectBoxShow(n, o) {
this.projectRightBox.show = n;
+ },
+ toCreateProject(n ,o) {
+ if (n) {
+ this.$store.commit('toCreateProject', false);
+ this.projectRightBox.isCreate = true;
+ this.projectRightBox.title = this.$t('project.project.createProject');
+ }
+ },
+ toCreateModule(n ,o) {
+ if (n) {
+ this.$store.commit('toCreateModule', false);
+ this.moduleRightBox.show = true;
+ this.moduleRightBox.isCreate = true;
+ this.moduleRightBox.title = this.$t('project.module.createModule');
+ this.newModule = {id: '', name: '', projectId: this.project.id, project: this.project, port: '', path: '', param: '', paramObj: []};
+ this.paramObj = [];
+ }
+ },
+ toCreateEndpoint(n, o) {
+ if (n) {
+ this.$store.commit('toCreateEndpoint', false);
+ this.cleanEndpoint();
+ this.rightBox.show = true;
+ this.rightBox.isEdit = true;
+ this.rightBox.title = this.$t('project.endpoint.createEndpoint');
+ }
}
}
}
diff --git a/nezha-fronted/src/store/index.js b/nezha-fronted/src/store/index.js
index 4f4e9d26b..58c1d73ef 100644
--- a/nezha-fronted/src/store/index.js
+++ b/nezha-fronted/src/store/index.js
@@ -13,7 +13,11 @@ const store = new Vuex.Store({
name: ''
},
projectBoxShow: false,
- projectListReload: false
+ projectListReload: false,
+ createProject: false,
+ createModule: false,
+ createEndpoint: false,
+ createAlertConfig: false,
},
getters: {
},
@@ -27,7 +31,19 @@ const store = new Vuex.Store({
},
projectListReloadChange(state, reload) {
state.projectListReload = reload;
- }
+ },
+ toCreateProject(state, status) {
+ state.createProject = status;
+ },
+ toCreateModule(state, status) {
+ state.createModule = status;
+ },
+ toCreateEndpoint(state, status) {
+ state.createEndpoint = status;
+ },
+ toCreateAlertConfig(state, status) {
+ state.createAlertConfig = status;
+ },
},
actions: {
}