From a3bf4db6e35a0f027960595450151eef14e6c9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com> Date: Thu, 20 Mar 2025 09:55:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=99=BA=E5=A4=84-=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Zhichu/Zhichu/ZhiChu_ModalTable/config.ts | 30 +- .../Zhichu/ZhiChu_ModalTable/config.vue | 604 +++++++++++++--- .../Zhichu/Zhichu/ZhiChu_ModalTable/data.json | 93 ++- .../Zhichu/Zhichu/ZhiChu_ModalTable/index.vue | 665 ++++++++++++++---- 4 files changed, 1150 insertions(+), 242 deletions(-) diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/config.ts b/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/config.ts index 754ff1d..6959140 100644 --- a/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/config.ts +++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/config.ts @@ -5,34 +5,28 @@ import { chartInitConfig } from '@/settings/designSetting' import { ZhiChu_ModalTableConfig } from './index' import dataJson from './data.json' -const {header, source} = dataJson; +const {header, source, filterset} = dataJson; export const option = { header: header, dataset: source, + filterset: filterset, dataStyle: { - mapshow: ['水源', '物资', '营房', '防火通道', '', ], - distance: '1', + colLeft: 4, - // filterSet: [ - // { label: '地图显示', field:'circle', showType: '', value: ''}, - // { label: '资源列表', field:'', showType: '', value: ''}, - // { label: '重点资源', field:'', showType: '', value: ''}, - // { label: '距离', field:'', showType: '', value: ''}, - // ], - - filterHeight: 200, - filterMarginTop: 40, + filterMarginTop: 20, filterMarginLeft: 50, + filterItemHeight: 45, + + filterTitleAlign: 'left', filterTitleFontSize: 24, filterTitleFontColor: '#ADFFC0', - filterTitleWidth: 100, - filterTitleMarginRight: 20, + filterContentAlign: 'left', filterChooseFontSize: 18, filterChooseFontColor: '#FFFFFF', - tableMarginTop: 10, + tableMarginTop: 20, tableMarginLeft: 20, tableBordered: false, tableSigleColumn: true, @@ -41,9 +35,9 @@ export const option = { tableSize: 'small', tableAlign: 'center', // 表头 - tableHeaderShow: true, + tableHeaderShow: false, // 序号 - orderBumberShow: true, + orderBumberShow: false, // 操作 buttonDivShow: true, buttonDivShow1: true, @@ -64,7 +58,7 @@ export const option = { export default class Config extends PublicConfigClass implements CreateComponentType { public key = ZhiChu_ModalTableConfig.key - public attr = { ...chartInitConfig, w: 995, h: 544, zIndex: -1 } + public attr = { ...chartInitConfig, w: 1060, h: 485, zIndex: -1 } public chartConfig = cloneDeep(ZhiChu_ModalTableConfig) public option = cloneDeep(option) } diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/config.vue b/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/config.vue index 3ea7e7d..4041d99 100644 --- a/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/config.vue +++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/config.vue @@ -1,9 +1,189 @@ diff --git a/src/views/chart/ContentCharts/components/PhotoModal/index.vue b/src/views/chart/ContentCharts/components/PhotoModal/index.vue index 27bf309..8367d13 100644 --- a/src/views/chart/ContentCharts/components/PhotoModal/index.vue +++ b/src/views/chart/ContentCharts/components/PhotoModal/index.vue @@ -1,5 +1,5 @@ diff --git a/src/packages/components/Zhilan/Zhilan/index.ts b/src/packages/components/Zhilan/Zhilan/index.ts index e8035d8..c5d91c5 100644 --- a/src/packages/components/Zhilan/Zhilan/index.ts +++ b/src/packages/components/Zhilan/Zhilan/index.ts @@ -18,7 +18,7 @@ import { ZhiLanRenYuanLeiXingConfig } from './ZhiLanRenYuanLeiXing/index'; import { ZhiLanGongNengLeiXingConfig } from './ZhiLanGongNengLeiXing/index'; import { WeiXingGuoLvConfig } from './WeiXingGuoLv/index'; import { WeiXingImgConfig } from './WeiXingImg/index'; - +import { ZhiLan_ZhongZhiShuLiangMianJiConfig } from './ZhiLan_ZhongZhiShuLiangMianJi/index'; export default [ ZhiLanTitlesConfig, @@ -27,6 +27,7 @@ export default [ ZhiLanGongNengLeiXingConfig, WeiXingGuoLvConfig, WeiXingImgConfig, + ZhiLan_ZhongZhiShuLiangMianJiConfig, ZhiLanIcons01Config, ZhiLanIcons02Config, ZhiLanIcons03Config,