fix:修改asset connect点击报错 ,panel-addByTemplate穿梭框,varIds传参不正确,以及assetmodel编辑框中chart-template回显问题

This commit is contained in:
zhangyu
2021-05-25 14:21:14 +08:00
parent 03f3c69142
commit 6ec63ff6f3
6 changed files with 18 additions and 18 deletions

View File

@@ -515,7 +515,7 @@ export default {
// this.$store.commit('addConsole'); // this.$store.commit('addConsole');
}, },
show (id, host, accountId, port) { show (id, host, accountId, port) {
this.addConsole(id, host, accountId, port) this.addConsole(id, host, accountId, port,'asset')
this.consoleShow = true this.consoleShow = true
}, },
initDialog () { initDialog () {

View File

@@ -22,7 +22,7 @@
<!-- ChartTemplate --> <!-- ChartTemplate -->
<el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate"> <el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">
<v-selectpage <v-selectpage
:data="'visual/panel/chart'" :data="chartlList"
:tb-columns="ChartSearchShowFields" :tb-columns="ChartSearchShowFields"
:params="{ :params="{
varType: 1, panelId: 0, varType: 1, panelId: 0,
@@ -115,7 +115,7 @@ export default {
}, },
created () { created () {
this.getBrandList() this.getBrandList()
// this.ChartTemplateList() this.ChartTemplateList()
}, },
methods: { methods: {
clickOutside () { clickOutside () {
@@ -198,13 +198,13 @@ export default {
assetData.totalRow = resp.data.total assetData.totalRow = resp.data.total
return assetData return assetData
} }
} },
/* 获取chart列表数据 */ /* 获取chart列表数据 */
// ChartTemplateList () { ChartTemplateList () {
// this.$get('visual/panel/chart', { pageSize: -1, varType: 1, panelId: 0 }).then(res => { this.$get('visual/panel/chart', { pageSize: -1, varType: 1, panelId: 0, groupId: 0 }).then(res => {
// this.chartlList = res.data.list this.chartlList = res.data.list
// }) })
// } }
} }
} }
</script> </script>

View File

@@ -228,7 +228,7 @@ export default {
} else if (this.from === fromRoute.endpoint) { // 来自endpoint时取endpointId } else if (this.from === fromRoute.endpoint) { // 来自endpoint时取endpointId
this.editChartTemp.varIds = this.obj.varIds this.editChartTemp.varIds = this.obj.varIds
} else { } else {
this.editChartTemp.varIds = this.transfer.selectedData.map(item => item.id) this.editChartTemp.varIds = this.$refs.transfer.selectedData.map(item => item.id)
} }
this.$refs.userForm.validate((valid) => { this.$refs.userForm.validate((valid) => {
if (valid) { if (valid) {

View File

@@ -88,7 +88,7 @@
<el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate"> <el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">
<v-selectpage <v-selectpage
v-model="editModule.chartIds" v-model="editModule.chartIds"
:data="'visual/panel/chart'" :data="chartlList"
:language="language" :language="language"
:multiple="true" :multiple="true"
:params="{ :params="{
@@ -648,14 +648,14 @@ export default {
}, },
/* 获取chart列表数据 */ /* 获取chart列表数据 */
ChartTemplateList () { ChartTemplateList () {
this.$get('visual/panel/chart', { pageSize: -1, varType: 2, panelId: 0 }).then(res => { this.$get('visual/panel/chart', { pageSize: -1, varType: 2, panelId: 0, returnChildren: 0, groupId: 0 }).then(res => {
this.chartlList = res.data.list this.chartlList = res.data.list
}) })
} }
}, },
mounted () { mounted () {
this.getWalkData() this.getWalkData()
// this.ChartTemplateList() this.ChartTemplateList()
}, },
created () { created () {
this.getProjectList() this.getProjectList()

View File

@@ -609,6 +609,7 @@ export default {
} }
} }
}, },
deleteMessage () {}
} }
} }
</script> </script>

View File

@@ -251,12 +251,11 @@ export default {
} }
}, },
methods: { methods: {
cli ([id, host, account]) { cli (row) {
const consoleParam = { const consoleParam = {
id: id, id: row.id,
host: host, host: row.manageIp,
accountId: account.id, port: row.authProtocolPort
port: account.port
} }
this.$store.commit('addConsole', consoleParam) this.$store.commit('addConsole', consoleParam)
}, },