fix:NEZ-621 以及 修改endpoint 导出导入相关
This commit is contained in:
@@ -194,7 +194,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="assetShow" @close="closeAssetCustom" class="nz-dialog" width="620px" >
|
||||
<el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="assetShow" @close="closeAssetCustom" class="nz-dialog" width="620px" destroy-on-close>
|
||||
<div slot="title">Connect</div>
|
||||
<div >
|
||||
<el-form label-width="120px" size="small" :model="assetContent" label-position = "top" :rules="rules" ref="assetConnect" v-loading="assetLoading" >
|
||||
@@ -217,7 +217,7 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="customShow" @close="closeAssetCustom" class="nz-dialog" width="620px" >
|
||||
<el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="customShow" @close="closeAssetCustom" class="nz-dialog" width="620px"destroy-on-close >
|
||||
<div slot="title">Connect</div>
|
||||
<div >
|
||||
<el-form label-width="120px" size="small" :model="customConnect" label-position = "top" :rules="rulesCustom" ref="customConnect" v-loading="assetLoading" class="custom">
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<!--password-->
|
||||
<el-form-item :label="$t('config.user.pin')" prop="pin">
|
||||
<el-input id="account-input-password" v-model="editUser.pin" maxlength="16" placeholder=""
|
||||
show-word-limit size="small" type="password" @blur="pinBlur"></el-input>
|
||||
show-word-limit size="small" type="password" @blur="pinBlur" autocomplete="new-password"></el-input>
|
||||
</el-form-item>
|
||||
<!--pinChange-->
|
||||
<el-form-item :label="$t('config.user.confirmPin')" label-width="200px" prop="pinChange">
|
||||
@@ -41,7 +41,8 @@
|
||||
<el-form-item :label="$t('config.user.roles')" prop="roleIds">
|
||||
<el-select id="account-input-roleIds" v-model="editUser.roleIds" :disabled="(editUser.username==='admin') && editUser.id==1" clearable collapse-tags placeholder="" popper-class="right-box-select-dropdown prevent-clickoutside" size="small" @change="()=>{this.$forceUpdate()}">
|
||||
<template v-for="role in roles">
|
||||
<el-option :key="role.id" :label="role.i18n?$t(role.i18n):role.name" :value="role.id"></el-option>
|
||||
<!-- <el-option :key="role.id" :label="role.i18n?$t(role.i18n+''):role.name" :value="role.id"></el-option>-->
|
||||
<el-option :key="role.id" :label="role.name" :value="role.id"></el-option>
|
||||
</template>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -147,9 +148,9 @@ export default {
|
||||
immediate: true,
|
||||
handler (n) {
|
||||
this.editUser = JSON.parse(JSON.stringify(n))
|
||||
if (this.editUser.roles && this.editUser.roles.length > 0) {
|
||||
this.editUser.roleIds = this.editUser.roles.map(t => t.id)
|
||||
}
|
||||
// if (this.editUser.roles && this.editUser.roles.length > 0) {
|
||||
// this.editUser.roleIds = this.editUser.roles.map(t => t.id)
|
||||
// }
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -187,7 +187,7 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
<el-form-item :label="$t('asset.pin')" prop="authPin">
|
||||
<el-input v-model="editAsset.authPin" size="small"/>
|
||||
<el-input v-model="editAsset.authPin" size="small" type="password"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('asset.port')" prop="authProtocolPort">
|
||||
<el-input v-model="editAsset.authProtocolPort" size="small"/>
|
||||
@@ -200,13 +200,13 @@
|
||||
<el-input v-model="editAsset.authUsername" size="small"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('asset.pin')" prop="authPin">
|
||||
<el-input v-model="editAsset.authPin" size="small"/>
|
||||
<el-input v-model="editAsset.authPin" size="small" type="password"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('asset.usernamePrompt')" prop="authUserTip">
|
||||
<el-input v-model="editAsset.authUserTip" size="small"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('asset.pinPrompt')" prop="authPinTip">
|
||||
<el-input v-model="editAsset.authPinTip" size="small"/>
|
||||
<el-input v-model="editAsset.authPinTip" size="small" type="password"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('asset.port')" prop="authProtocolPort">
|
||||
<el-input v-model="editAsset.authProtocolPort" size="small"/>
|
||||
|
||||
@@ -64,10 +64,12 @@ export default {
|
||||
name: '',
|
||||
username: '',
|
||||
email: '',
|
||||
pin: '',
|
||||
pinChange: '',
|
||||
status: '1',
|
||||
createTime: '',
|
||||
receiver: [],
|
||||
roleIds: 0,
|
||||
roleIds: '',
|
||||
roles: [],
|
||||
lang: '',
|
||||
notifications: []
|
||||
@@ -99,7 +101,32 @@ export default {
|
||||
}
|
||||
this.getTableData()
|
||||
})
|
||||
},
|
||||
edit (u) {
|
||||
this.$get(`${this.url}/${u.id}`).then(response => {
|
||||
console.log(response)
|
||||
const user = response.user
|
||||
if (response.code === 200) {
|
||||
this.object = {
|
||||
id: user.id,
|
||||
name: user.name,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
status: user.status + '',
|
||||
createAt: this.utcTimeToTimezoneStr(user.createAt),
|
||||
receiver: user.receiver,
|
||||
roleIds: Number(user.roles.map(item => item.id).join(',')),
|
||||
roles: user.roles,
|
||||
lang: user.lang,
|
||||
notifications: user.notifications,
|
||||
pin: '',
|
||||
pinChange: ''
|
||||
}
|
||||
console.log(this.object);
|
||||
this.rightBox.show = true
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
isCurrentUser () {
|
||||
|
||||
@@ -41,8 +41,8 @@
|
||||
id="panel"
|
||||
:params="filter"
|
||||
:permissions="{
|
||||
import: 'panel_chart_import',
|
||||
export: 'panel_chart_export'
|
||||
import: 'panel_chart_add',
|
||||
export: 'panel_view'
|
||||
}"
|
||||
class="top-tool-export"
|
||||
export-file-name="chart"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
import-url="monitor/endpoint/import"
|
||||
export-file-name="expression-template"
|
||||
:params="searchLabel"
|
||||
:permissions="{import: 'endpoint_import', export: 'endpoint_import'}"
|
||||
:permissions="{import: 'monitor_endpoint_add', export: 'monitor_module_view'}"
|
||||
@afterImport="getTableData"
|
||||
class="top-tool-export margin-r-10"
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user