NEZ-2373 fix:快照模板支持 增加 表头修改按钮

This commit is contained in:
18317449825
2022-11-11 11:07:17 +08:00
parent 263d17f50e
commit 0ac533e7b0
6 changed files with 28 additions and 21 deletions

View File

@@ -565,7 +565,7 @@ textarea {
.el-dialog__header{ .el-dialog__header{
color: $--color-text-primary; color: $--color-text-primary;
} }
#entranceHtml { #entranceHtml,#entrance {
.el-icon-arrow-right { .el-icon-arrow-right {
font-family: "nz-icon" !important; font-family: "nz-icon" !important;
font-size: 16px; font-size: 16px;
@@ -576,6 +576,12 @@ textarea {
.el-icon-arrow-right:before { .el-icon-arrow-right:before {
content: "\e6ad"; content: "\e6ad";
} }
.el-icon-arrow-up{
font-family: nz-icon!important;
}
.el-icon-arrow-up:before{
content: "\e6af";
}
.el-icon-arrow-down{ .el-icon-arrow-down{
font-family: nz-icon!important; font-family: nz-icon!important;
} }

View File

@@ -74,7 +74,7 @@
.el-icon { .el-icon {
display: block; display: block;
font-size: 12px; font-size: 12px !important;
font-weight: bold; font-weight: bold;
} }
} }

View File

@@ -1,5 +1,4 @@
import bus from '@/libs/bus' import bus from '@/libs/bus'
import { Loading } from 'element-ui'
export default { export default {
data () { data () {
return { return {

View File

@@ -4287,7 +4287,6 @@ export default {
document.body.removeChild(link) // 下载完成移除元素 document.body.removeChild(link) // 下载完成移除元素
window.URL.revokeObjectURL(href) // 释放blob对象 window.URL.revokeObjectURL(href) // 释放blob对象
} }
this.$refs.topTool.closeDialog()
}, () => { }, () => {
this.$message.error('123') this.$message.error('123')
}) })

View File

@@ -28,12 +28,13 @@
<el-collapse-item class="el-collapse-item__height" name="2" title="Table"> <el-collapse-item class="el-collapse-item__height" name="2" title="Table">
<div slot="title" class="explore-table-title"> <div slot="title" class="explore-table-title">
{{$t('dashboard.panel.chartForm.typeVal.table.label')}} {{$t('dashboard.panel.chartForm.typeVal.table.label')}}
<!-- <i--> <i
<!-- class="nz-icon-gear nz-icon"--> class="nz-icon-gear nz-icon"
<!-- style="position: absolute;right: 10px;top: 8px"--> style="position: absolute;right: 10px;top: 8px"
<!-- @click.stop="tools.showCustomTableTitle = true"--> @click.stop="tools.showCustomTableTitle = true"
<!-- :title="$t('overall.selectColumns')"--> :title="$t('overall.selectColumns')"
<!-- ></i>--> >
</i>
<!-- 自定义table列 --> <!-- 自定义table列 -->
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
<element-set <element-set
@@ -51,7 +52,8 @@
</div> </div>
<!-- 自定义table列 --> <!-- 自定义table列 -->
<div class="nz-table-list explore-table"> <div class="nz-table-list explore-table">
<el-table ref="exploreTable" <el-table
ref="exploreTable"
v-my-loading="tools.loading" v-my-loading="tools.loading"
class="metric-table" class="metric-table"
:data="tableData" :data="tableData"
@@ -85,8 +87,7 @@
</template> </template>
</el-table> </el-table>
</div> </div>
<pagination ref="Pagination" :page-obj="pageObj" @pageNo='pageNo' <pagination ref="Pagination" :page-obj="pageObj" @pageNo='pageNo' @pageSize='pageSize'></pagination>
@pageSize='pageSize'></pagination>
</el-collapse-item> </el-collapse-item>
</template> </template>
<!--log--> <!--log-->

View File

@@ -2,7 +2,7 @@
// import 'element-ui/lib/theme-chalk/index.css' // import 'element-ui/lib/theme-chalk/index.css'
// import 'xterm/dist/xterm.css' // import 'xterm/dist/xterm.css'
import '@/assets/css/main.scss' import '@/assets/css/main.scss'
// import '@/assets/css/font/iconfont.js' import '@/assets/css/font/iconfont.js'
import ElementUI from 'element-ui' import ElementUI from 'element-ui'
import i18n from '@/components/common/i18n' import i18n from '@/components/common/i18n'
@@ -21,12 +21,14 @@ import { clickoutside, bottomBoxWindow, stringTimeParseToUnix, unixTimeParseToSt
import * as tools from '@/components/common/js/tools.js' import * as tools from '@/components/common/js/tools.js'
import * as constants from '@/components/common/js/constants.js' import * as constants from '@/components/common/js/constants.js'
import elementSet from '@/components/common/elementSet' // 自定义表头组件
import chartList from '@/components/chart/chartList.vue' // 全局引入 chartList 组件 防止 chart-group爆粗 import chartList from '@/components/chart/chartList.vue' // 全局引入 chartList 组件 防止 chart-group爆粗
import pickTime from '@/components/common/pickTime' import pickTime from '@/components/common/pickTime'
import nzDataList from '@/components/common/table/nzDataList' import nzDataList from '@/components/common/table/nzDataList'
import mainMixin from '@/components/common/mixin/mainMixinFun' import mainMixin from '@/components/common/mixin/mainMixinFun'
import Pagination from '@/components/common/pagination' import Pagination from '@/components/common/pagination'
Vue.component('element-set', elementSet) // 公用设置表头
Vue.component('pick-time', pickTime) Vue.component('pick-time', pickTime)
Vue.component('nzDataList', nzDataList) Vue.component('nzDataList', nzDataList)
Vue.component('chartList', chartList) Vue.component('chartList', chartList)