NEZ-2198 feat:model 批量导入页面开发

This commit is contained in:
zyh
2022-09-16 15:26:50 +08:00
parent 8a3914a48d
commit 8ca1ad8184
8 changed files with 32 additions and 42 deletions

View File

@@ -240,26 +240,26 @@ export default {
language () { return this.$store.getters.getLanguage },
// 显示新版导入
importType () {
// asset module endpoint dc cabinet
const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import']
// asset module endpoint dc cabinet model
const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import']
return arr.some(item => item === this.importUrl)
},
// 已存在的内容处理方式
showEexisted () {
// asset module endpoint dc cabinet
const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import']
// asset module endpoint dc cabinet model
const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import']
return arr.some(item => item === this.importUrl)
},
// 遇到错误是否继续导入
showIgnoreError () {
// asset module endpoint dc cabinet
const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import']
// asset module endpoint dc cabinet model
const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import']
return arr.some(item => item === this.importUrl)
},
// 是否同步更新关联的dashboard
showSyncDashboard () {
// asset endpoint
const arr = ['/asset/asset/import', '/monitor/endpoint/import']
// asset endpoint model
const arr = ['/asset/asset/import', '/monitor/endpoint/import', '/asset/model/import']
return arr.some(item => item === this.importUrl)
},
// 是否同步更新关联的endpoint

View File

@@ -78,7 +78,3 @@ export default {
}
}
</script>
<style scoped>
</style>

View File

@@ -10,8 +10,7 @@
@search="search"
>
<template v-slot:top-tool-right>
<button id="account-add" v-has="'model_add'" :title="$t('overall.createModel')" class="top-tool-btn margin-r-10"
type="button" @click="add">
<button id="account-add" v-has="'model_add'" :title="$t('overall.createModel')" class="top-tool-btn margin-r-10" type="button" @click="add">
<i class="nz-icon-create-square nz-icon"></i>
</button>
<top-tool-more-options
@@ -20,9 +19,9 @@
id="model"
:params="searchLabel"
:permissions="{
import: 'model_add',
export: 'model_edit'
}"
import: 'model_add',
export: 'model_edit'
}"
class="top-tool-export margin-r-10"
export-file-name="asset-model"
export-url="/asset/model/export"

View File

@@ -106,9 +106,7 @@
</button>
</div>
</el-dialog>
<el-dialog :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
:show-close="true" width="620px" class="nz-dialog" @closed="fileClosed">
<el-dialog :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false' :show-close="true" width="620px" class="nz-dialog" @closed="fileClosed">
<div>
<div class="login-dialog-title">
Should you ever lose your phone or access to your one time password secret, each of these recovery codes can be used one time each to regain access to your account.

View File

@@ -6,11 +6,12 @@
<el-form :model="basic" label-width="180px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false">
<div class="system-title">{{$t('overall.basicInfo')}}</div>
<el-form-item :label="$t('config.system.basic.language')" prop="language">
<el-select id="account-input-language"
class="right-box__select"
v-model="basic.language"
popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
size="small">
<el-select
id="account-input-language"
class="right-box__select"
v-model="basic.language"
popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
size="small">
<template v-for="item in languageList">f
<el-option :key="item.value" :label="item.label" :value="item.value"></el-option>
</template>
@@ -28,21 +29,22 @@
</el-form-item>
<el-form-item :label="$t('config.system.basic.defTheme')" prop="defTheme">
<el-select id="account-input-language"
class="right-box__select"
v-model="basic.theme"
popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
size="small">
class="right-box__select"
v-model="basic.theme"
popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
size="small">
<template v-for="item in themeList">
<el-option :key="item.value" :label="item.label" :value="item.value"></el-option>
</template>
</el-select>
</el-form-item>
<el-form-item :label="$t('config.system.basic.dataFormat')" prop="dataFormat">
<el-select id="account-input-language"
class="right-box__select"
v-model="basic.date_format"
popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
size="small">
<el-select
id="account-input-language"
class="right-box__select"
v-model="basic.date_format"
popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
size="small">
<template v-for="item in dateFormatList">
<el-option :key="item.value" :label="item.label" :value="item.value">
<div style="display: flex;justify-content: space-between;">

View File

@@ -56,7 +56,3 @@ export default {
}
}
</script>
<style scoped>
</style>

View File

@@ -46,7 +46,7 @@
>
<template>
<el-input-number ref="jumpInput" v-model="pageObj.pageNo" :controls="false" :min="1" :max="pageObj.pages" class="jump-input" @change="getTableData" @keyup.enter.native="getTableData" size="mini"/>
<span class="jump-pages">/&nbsp{{pageObj.pages}}</span>
<span class="jump-pages">/&nbsp;{{pageObj.pages}}</span>
</template>
</el-pagination>
</template>

View File

@@ -45,7 +45,7 @@
>
<template>
<el-input-number ref="jumpInput" v-model="pageObj.pageNo" :controls="false" :min="1" :max="pageObj.pages" class="jump-input" @change="getTableData" @keyup.enter.native="getTableData" size="mini"/>
<span class="jump-pages">/&nbsp{{pageObj.pages}}</span>
<span class="jump-pages">/&nbsp;{{pageObj.pages}}</span>
</template>
</el-pagination>
</template>
@@ -64,8 +64,7 @@
@getTableData="getTableData"
>
<template v-slot:top-tool-right>
<button id="account-add" v-has="'user_add'" :title="$t('overall.createUser')" class="top-tool-btn margin-r-10"
type="button" @click="add">
<button id="account-add" v-has="'user_add'" :title="$t('overall.createUser')" class="top-tool-btn margin-r-10" type="button" @click="add">
<i class="nz-icon-create-square nz-icon"></i>
</button>
<delete-button