diff --git a/nezha-fronted/src/components/common/dcConfig.vue b/nezha-fronted/src/components/common/dcConfig.vue index c2a14ac3a..15310edf0 100644 --- a/nezha-fronted/src/components/common/dcConfig.vue +++ b/nezha-fronted/src/components/common/dcConfig.vue @@ -26,7 +26,7 @@ - + @@ -108,7 +108,6 @@ } }, openBox:function(){ - console.log("show") this.popBox.show=true; }, getUserData() { @@ -125,7 +124,6 @@ if(valide){ const h = temp.$createElement; if(!temp.idc.id){ - console.log("save") temp.$post('idc', temp.idc).then(response => { if (response.code === 200) { temp.$message({duration: 1000, type: 'success', message: temp.$t("tip.deleteSuccess")}); @@ -136,7 +134,6 @@ } }) }else{ - console.log("edit") this.$put('idc', temp.idc).then(response => { if (response.code === 200) { temp.$message({duration: 1000, type: 'success', message: temp.$t("tip.deleteSuccess")}); @@ -201,7 +198,6 @@ this.title = this.$t('asset.createAssetTab.AddIdcTab.title'); this.popBox.isEdit=false; this.resetData(); - console.log("reset") } } }, diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index b8998afcd..ef2f42d63 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -57,7 +57,12 @@
{{item.name}} - + + +
@@ -334,8 +339,11 @@ } }, jumpToAsset(data, id) { - this.$store.state.assetData.moduleData = data; - this.$store.state.assetData.selectedData = id; + if (id != this.$store.state.assetData.selectedData) { + this.$store.state.assetData = {selectedData: id, step: this.$store.state.assetData.step+1}; + } else { + this.$store.state.assetData.step = this.$store.state.assetData.step+1; + } this.jumpTo(data); }, jumpToProject(p) { @@ -723,3 +731,9 @@ border-bottom-right-radius: 8px; } + diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 95bf63b9f..28f4f1a59 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -111,6 +111,7 @@ const en = { }, tip: { confirmDelete: "Confirm Delete?", + assetConfirmDelete: 'Its associated Endpoints and Alert Rules will also be deleted, confirm delete?', yes: "Yes", no: "No", deleteSuccess: "Successfully Deleted", diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 6fcbe918f..079d7dc35 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -4,7 +4,7 @@
Asset
- + {{item.name}} @@ -205,7 +205,8 @@ { label: this.$t("asset.tableTitle.id"), prop: 'ID', - show: false, + show: true, + width: 60 }, { label: this.$t("asset.tableTitle.assetType"), prop: '资产类型', @@ -328,10 +329,14 @@ }, watch: { getData: { - handler(oldVal, newVal) { - this.checkList.splice(0, 1, newVal.selectedData); - this.pageObj.idcIds = newVal.selectedData; - this.getAssetData() + handler(newVal) { + if (this.checkList.indexOf(newVal.selectedData) >= 0) { + this.checkList.splice(this.checkList.indexOf(newVal.selectedData), 1); + } else { + this.checkList.push(newVal.selectedData); + } + this.getSingleAsset(); + this.getAssetData(); }, deep: true, }, @@ -346,7 +351,7 @@ }, created() { this.checkList.push(this.$store.state.assetData.selectedData) - this.getSingleAsset(this.checkList) + this.getSingleAsset() }, methods: { @@ -361,7 +366,8 @@ window.open(routeData.href); }, getAssetData(data) { - this.$get('asset', this.pageObj).then(response => { + this.searchLabel = Object.assign(this.pageObj, this.searchLabel); + this.$get('asset', this.searchLabel).then(response => { if (response.code === 200) { this.tableData = response.data.list; this.pageObj.total = response.data.total @@ -388,59 +394,44 @@ item.name = this.addIdcData.popName } this.$put(data, item).then(res => { - const h = this.$createElement; if (res.code === 200) { - this.$notify({ - message: h('i', {style: 'color: teal'}, '修改成功'), - duration: 2000 - }); + this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")}); this.getAssetData(); } else { - this.$notify({ - message: h('i', {style: 'color: teal'}, res.msg), - duration: 2000 - }) + this.$message.error(res.msg); } }) }, addNewData(type) { if (type === 'IDC') { this.$post('idc', this.addIdcData).then(res => { - const h = this.$createElement; if (res.code === 200) { const h = this.$createElement; - this.$notify({ - message: h('i', {style: 'color: teal'}, '添加成功'), - duration: 2000 - }); + this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")}); this.getIDCOptionData() this.getAssetData() } else { - this.$notify({ - message: h('i', {style: 'color: teal'}, '添加成功'), - duration: 2000 - }); + this.$message.error(res.msg); } }) } }, deleteData(data, item) { - this.$delete(data + "?ids=" + item).then(response => { - const h = this.$createElement; - if (response.code === 200) { - this.$notify({ - message: h('i', {style: 'color: teal'}, '删除成功'), - duration: 2000 - }); - this.getAssetData() - this.getIDCOptionData() - } else { - this.$notify({ - message: h('i', {style: 'color: teal'}, response.msg), - duration: 2000 - }); - } - }) + this.$confirm(this.$t("tip.assetConfirmDelete"), { + confirmButtonText: this.$t("tip.yes"), + cancelButtonText: this.$t("tip.no"), + type: 'warning' + }).then(() => { + this.$delete(data + "?ids=" + item).then(response => { + if (response.code === 200) { + this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")}); + this.getAssetData(); + this.getIDCOptionData(); + } else { + this.$message.error(response.msg); + } + }) + }); }, markOptionData(data) { data.forEach(item => { @@ -511,15 +502,16 @@ } } , - getSingleAsset(data) { - let result = [] - if (data[0] === '') { - result = data.slice(1); - this.pageObj.idcIds = result.join(',') - } else { - this.pageObj.idcIds = data.join(',') + getSingleAsset() { + if (this.checkList.length > 0 ) { + if (this.checkList[0] === '') { + this.checkList.splice(0, 1); + this.getSingleAsset(); + } else { + this.pageObj.idcIds = this.checkList.join(','); + } + this.getAssetData(); } - this.getAssetData() }, pageNo(val) { this.pageObj.pageNo = val; @@ -547,11 +539,18 @@ } }, flushData() { + this.getSingleAsset(); this.getAssetData(); this.getIDCOptionData(); }, - search() { - + search(searchObj) { + this.searchLabel = {}; + for (let item in searchObj) { + if (searchObj[item]) { + this.$set(this.searchLabel, item, searchObj[item]); + } + } + this.getAssetData(); } }, mounted() { diff --git a/nezha-fronted/src/components/page/asset/assetAddUnit.vue b/nezha-fronted/src/components/page/asset/assetAddUnit.vue index f923e556b..21af03e9f 100644 --- a/nezha-fronted/src/components/page/asset/assetAddUnit.vue +++ b/nezha-fronted/src/components/page/asset/assetAddUnit.vue @@ -822,11 +822,11 @@ } } }, - computed: { + /*computed: { getData() { return this.$store.state.assetData } - }, + },*/ watch: { allModelUlData(newVal) { if (newVal) { @@ -887,7 +887,7 @@ if (response.code === 200) { this.IDCOptionData = response.data.list; this.markOptionData(this.IDCOptionData) - this.$store.state.assetData.idcData = this.IDCOptionData; + //this.$store.state.assetData.idcData = this.IDCOptionData; this.$emit('refreshData'); } }) @@ -1263,7 +1263,7 @@ this.cabinetSelectedData.remark = '' }, editing(item) { - console.log(item) + //console.log(item) }, getSingleIDCData(data, item, itemData) { if (item !== 'edit') { diff --git a/nezha-fronted/src/components/page/asset/assetEditUnit.vue b/nezha-fronted/src/components/page/asset/assetEditUnit.vue index 3aa0ebd98..cc7562fe5 100644 --- a/nezha-fronted/src/components/page/asset/assetEditUnit.vue +++ b/nezha-fronted/src/components/page/asset/assetEditUnit.vue @@ -63,16 +63,16 @@ > {{ item.value }} - - + + - - - + + + - - + +
@@ -861,11 +861,11 @@ } } }, - computed: { + /*computed: { getData() { return this.$store.state.assetData } - }, + },*/ watch: { allModelUlData(newVal) { if (newVal) { @@ -961,7 +961,7 @@ if (response.code === 200) { this.IDCOptionData = response.data.list; this.markOptionData(this.IDCOptionData) - this.$store.state.assetData.idcData = this.IDCOptionData + //this.$store.state.assetData.idcData = this.IDCOptionData this.$emit('refreshData'); } }) @@ -1205,7 +1205,6 @@ type: 'warning' }).then(() => { this.$delete(data + "?ids=" + item).then(response => { - const h = this.$createElement; if (response.code === 200) { this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")}); this.getAssetData(); @@ -1326,6 +1325,24 @@ } }, delOptionData(data) { + this.$confirm(this.$t("tip.confirmDelete"), { + confirmButtonText: this.$t("tip.yes"), + cancelButtonText: this.$t("tip.no"), + type: 'warning' + }).then(() => { + this.$delete("/sys/dict/delete?ids=" + data.id).then(response => { + if (response.code === 200) { + this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")}); + this.getAssetData(); + this.getAssetTypeOptionData(); + this.getVendorOptionData(); + this.getAllModelOptionData(this.assetType); + this.getModelOptionData(this.assetType, this.vendorCode); + } else { + this.$message.error(response.msg); + } + }) + }); }, tabControl(data) { if (data === 'close') { diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index 2e3733c7b..80443488c 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -84,7 +84,7 @@ {{p.key}}={{p.value}}， {{dateFormat(scope.row.lastUpdate)}} - {{scope.row.state == 1 ? 'up' : ''}}{{scope.row.state == 0 ? 'down' : ''}} + {{scope.row.state == 1 ? 'up' : ''}}{{scope.row.state == 0 ? 'down' : ''}} {{scope.row[item.prop]}} diff --git a/nezha-fronted/src/store/index.js b/nezha-fronted/src/store/index.js index af18b08cc..4a228e8ef 100644 --- a/nezha-fronted/src/store/index.js +++ b/nezha-fronted/src/store/index.js @@ -6,8 +6,7 @@ const store = new Vuex.Store({ state: { assetData:{ selectedData:'', - moduleData:'', - idcData:'' + step: 0 }, currentProject: { id: '',