From eb5e088a20a3a467e6b707daab8d5b1e3592c3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com> Date: Wed, 12 Feb 2025 10:31:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?ctrl+s=E4=BF=9D=E5=AD=98=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/chart/hooks/useKeyboard.hook.ts | 254 ++++++++++++++++------ src/views/chart/hooks/useSync.hook.ts | 2 +- 2 files changed, 189 insertions(+), 67 deletions(-) diff --git a/src/views/chart/hooks/useKeyboard.hook.ts b/src/views/chart/hooks/useKeyboard.hook.ts index c8a7968..f42e792 100644 --- a/src/views/chart/hooks/useKeyboard.hook.ts +++ b/src/views/chart/hooks/useKeyboard.hook.ts @@ -1,16 +1,18 @@ -import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' -import { WinKeyboard, MacKeyboard, MenuEnum } from '@/enums/editPageEnum' -import throttle from 'lodash/throttle' -import debounce from 'lodash/debounce' -import keymaster from 'keymaster' -import { setKeyboardDressShow } from '@/utils' +import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'; +import { WinKeyboard, MacKeyboard, MenuEnum } from '@/enums/editPageEnum'; +import throttle from 'lodash/throttle'; +import debounce from 'lodash/debounce'; +import keymaster from 'keymaster'; +import { setKeyboardDressShow } from '@/utils'; +import { useSync } from './useSync.hook'; +const { dataSyncUpdate } = useSync(); // Keymaster可以支持识别以下组合键: ⇧,shift,option,⌥,alt,ctrl,control,command,和⌘ -const chartEditStore = useChartEditStore() +const chartEditStore = useChartEditStore(); -const winCtrlMerge = (e: string) => `${WinKeyboard.CTRL}+${e}` -const winShiftMerge = (e: string) => `${WinKeyboard.SHIFT}+${e}` -const winAltMerge = (e: string) => `${WinKeyboard.ALT}+${e}` +const winCtrlMerge = (e: string) => `${WinKeyboard.CTRL}+${e}`; +const winShiftMerge = (e: string) => `${WinKeyboard.SHIFT}+${e}`; +const winAltMerge = (e: string) => `${WinKeyboard.ALT}+${e}`; export const winKeyboardValue = { [MenuEnum.ARROW_UP]: winCtrlMerge('up'), @@ -28,13 +30,14 @@ export const winKeyboardValue = { [MenuEnum.LOCK]: winCtrlMerge('l'), [MenuEnum.UNLOCK]: winCtrlMerge(winShiftMerge('l')), [MenuEnum.HIDE]: winCtrlMerge('h'), - [MenuEnum.SHOW]: winCtrlMerge(winShiftMerge('h')) -} + [MenuEnum.SHOW]: winCtrlMerge(winShiftMerge('h')), + [MenuEnum.SAVE]: winCtrlMerge('s'), +}; // 这个 Ctrl 后面还是换成了 ⌘ -const macCtrlMerge = (e: string) => `${MacKeyboard.CTRL}+${e}` -const macShiftMerge = (e: string) => `${MacKeyboard.SHIFT}+${e}` -const macAltMerge = (e: string) => `${MacKeyboard.ALT}+${e}` +const macCtrlMerge = (e: string) => `${MacKeyboard.CTRL}+${e}`; +const macShiftMerge = (e: string) => `${MacKeyboard.SHIFT}+${e}`; +const macAltMerge = (e: string) => `${MacKeyboard.ALT}+${e}`; // 没有测试 macOS 系统,因为我没有😤👻 export const macKeyboardValue = { @@ -53,8 +56,9 @@ export const macKeyboardValue = { [MenuEnum.LOCK]: macCtrlMerge('l'), [MenuEnum.UNLOCK]: macCtrlMerge(macShiftMerge('l')), [MenuEnum.HIDE]: macCtrlMerge('h'), - [MenuEnum.SHOW]: macCtrlMerge(macShiftMerge('h')) -} + [MenuEnum.SHOW]: macCtrlMerge(macShiftMerge('h')), + [MenuEnum.SAVE]: macCtrlMerge('s'), +}; // Win 快捷键列表 const winKeyList: Array = [ @@ -78,8 +82,10 @@ const winKeyList: Array = [ winKeyboardValue.unLock, winKeyboardValue.hide, - winKeyboardValue.show -] + winKeyboardValue.show, + + winKeyboardValue.save, +]; // Mac 快捷键列表 const macKeyList: Array = [ @@ -103,129 +109,245 @@ const macKeyList: Array = [ macKeyboardValue.unLock, macKeyboardValue.hide, - macKeyboardValue.show -] + macKeyboardValue.show, + + macKeyboardValue.save, +]; // 处理键盘记录 const keyRecordHandle = () => { // 默认赋值 window.$KeyboardActive = { ctrl: false, - space: false - } + space: false, + }; document.onkeydown = (e: KeyboardEvent) => { - const { keyCode } = e - if (keyCode == 32 && e.target == document.body) e.preventDefault() + const { keyCode } = e; + if (keyCode == 32 && e.target == document.body) e.preventDefault(); if ([17, 32].includes(keyCode) && window.$KeyboardActive) { - setKeyboardDressShow(e.keyCode) + setKeyboardDressShow(e.keyCode); switch (keyCode) { - case 17: window.$KeyboardActive.ctrl = true; break - case 32: window.$KeyboardActive.space = true; break + case 17: + window.$KeyboardActive.ctrl = true; + break; + case 32: + window.$KeyboardActive.space = true; + break; } } - } + }; document.onkeyup = (e: KeyboardEvent) => { - const { keyCode } = e - if (keyCode == 32 && e.target == document.body) e.preventDefault() + const { keyCode } = e; + if (keyCode == 32 && e.target == document.body) e.preventDefault(); if ([17, 32].includes(keyCode) && window.$KeyboardActive) { - setKeyboardDressShow() + setKeyboardDressShow(); switch (keyCode) { - case 17: window.$KeyboardActive.ctrl = false; break - case 32: window.$KeyboardActive.space = false; break + case 17: + window.$KeyboardActive.ctrl = false; + break; + case 32: + window.$KeyboardActive.space = false; + break; } } - } -} + }; +}; // 初始化监听事件 export const useAddKeyboard = () => { - const throttleTime = 50 + const throttleTime = 50; const switchHandle = (keyboardValue: typeof winKeyboardValue, e: string) => { switch (e) { // ct+↑ case keyboardValue.up: - keymaster(e, throttle(() => { chartEditStore.setMove(MenuEnum.ARROW_UP); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setMove(MenuEnum.ARROW_UP); + return false; + }, throttleTime), + ); break; // ct+→ case keyboardValue.right: - keymaster(e, throttle(() => { chartEditStore.setMove(MenuEnum.ARROW_RIGHT); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setMove(MenuEnum.ARROW_RIGHT); + return false; + }, throttleTime), + ); break; // ct+↓ case keyboardValue.down: - keymaster(e, throttle(() => { chartEditStore.setMove(MenuEnum.ARROW_DOWN); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setMove(MenuEnum.ARROW_DOWN); + return false; + }, throttleTime), + ); break; // ct+← case keyboardValue.left: - keymaster(e, throttle(() => { chartEditStore.setMove(MenuEnum.ARROW_LEFT); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setMove(MenuEnum.ARROW_LEFT); + return false; + }, throttleTime), + ); break; // 删除 delete case keyboardValue.delete: - keymaster(e, debounce(() => { chartEditStore.removeComponentList(); return false }, throttleTime)) + keymaster( + e, + debounce(() => { + chartEditStore.removeComponentList(); + return false; + }, throttleTime), + ); break; // 复制 ct+v case keyboardValue.copy: - keymaster(e, debounce(() => { chartEditStore.setCopy(); return false }, throttleTime)) + keymaster( + e, + debounce(() => { + chartEditStore.setCopy(); + return false; + }, throttleTime), + ); break; // 剪切 ct+x case keyboardValue.cut: - keymaster(e, debounce(() => { chartEditStore.setCut(); return false }, throttleTime)) + keymaster( + e, + debounce(() => { + chartEditStore.setCut(); + return false; + }, throttleTime), + ); break; // 粘贴 ct+v case keyboardValue.parse: - keymaster(e, throttle(() => { chartEditStore.setParse(); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setParse(); + return false; + }, throttleTime), + ); break; // 撤回 ct+z case keyboardValue.back: - keymaster(e, throttle(() => { chartEditStore.setBack(); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setBack(); + return false; + }, throttleTime), + ); break; // 前进 ct+sh+z case keyboardValue.forward: - keymaster(e, throttle(() => { chartEditStore.setForward(); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setForward(); + return false; + }, throttleTime), + ); break; - + // 创建分组 ct+g case keyboardValue.group: - keymaster(e, throttle(() => { chartEditStore.setGroup(); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setGroup(); + return false; + }, throttleTime), + ); break; // 解除分组 ct+sh+g case keyboardValue.unGroup: - keymaster(e, throttle(() => { chartEditStore.setUnGroup(); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setUnGroup(); + return false; + }, throttleTime), + ); break; // 锁定 ct+l case keyboardValue.lock: - keymaster(e, throttle(() => { chartEditStore.setLock(); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setLock(); + return false; + }, throttleTime), + ); break; // 解除锁定 ct+sh+l case keyboardValue.unLock: - keymaster(e, throttle(() => { chartEditStore.setUnLock(); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setUnLock(); + return false; + }, throttleTime), + ); break; // 隐藏 ct+h case keyboardValue.hide: - keymaster(e, throttle(() => { chartEditStore.setHide(); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setHide(); + return false; + }, throttleTime), + ); break; // 解除隐藏 ct+sh+h case keyboardValue.show: - keymaster(e, throttle(() => { chartEditStore.setShow(); return false }, throttleTime)) + keymaster( + e, + throttle(() => { + chartEditStore.setShow(); + return false; + }, throttleTime), + ); + break; + // 复制 ct+s + case keyboardValue.save: + keymaster( + e, + throttle(() => { + dataSyncUpdate(); + return false; + }, throttleTime), + ); break; } - } + }; winKeyList.forEach((key: string) => { - switchHandle(winKeyboardValue, key) - }) + switchHandle(winKeyboardValue, key); + }); macKeyList.forEach((key: string) => { - switchHandle(macKeyboardValue, key) - }) + switchHandle(macKeyboardValue, key); + }); - keyRecordHandle() -} + keyRecordHandle(); +}; // 卸载监听事件 export const useRemoveKeyboard = () => { @@ -233,9 +355,9 @@ export const useRemoveKeyboard = () => { document.onkeyup = () => {}; winKeyList.forEach((key: string) => { - keymaster.unbind(key) - }) + keymaster.unbind(key); + }); macKeyList.forEach((key: string) => { - keymaster.unbind(key) - }) -} \ No newline at end of file + keymaster.unbind(key); + }); +}; diff --git a/src/views/chart/hooks/useSync.hook.ts b/src/views/chart/hooks/useSync.hook.ts index 9ca6c8b..dc9cecb 100644 --- a/src/views/chart/hooks/useSync.hook.ts +++ b/src/views/chart/hooks/useSync.hook.ts @@ -303,6 +303,7 @@ export const useSync = () => { // * 数据保存 const dataSyncUpdate = throttle(async (updateImg = true) => { + window['$message'].success('正在保存,请稍后...'); if (!fetchRouteParamsLocation()) return; let projectId = chartEditStore.getProjectInfo[ProjectInfoEnum.PROJECT_ID]; if (projectId === null || projectId === '') { @@ -369,7 +370,6 @@ export const useSync = () => { // 失败状态 chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.FAILURE); window['$message'].error('保存失败!'); - }, 3000); // * 定时处理 From ab84d7d215cfb3d92fa90dda015aa802b6f5cdc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com> Date: Wed, 12 Feb 2025 11:35:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=99=BA=E6=84=9F=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E5=87=BA=E6=9D=A5=E6=88=90=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Tables/Tables/index.ts | 22 ---------------- .../Zhigan}/GeneralHead/config.ts | 0 .../Zhigan}/GeneralHead/config.vue | 0 .../Zhigan}/GeneralHead/index.ts | 6 ++--- .../Zhigan}/GeneralHead/index.vue | 0 .../Zhigan}/GeneralHead/svg/title.vue | 0 .../Zhigan}/MeiRiShangBao/config.ts | 0 .../Zhigan}/MeiRiShangBao/config.vue | 0 .../Zhigan}/MeiRiShangBao/data.json | 0 .../Zhigan}/MeiRiShangBao/index.ts | 6 ++--- .../Zhigan}/MeiRiShangBao/index.vue | 0 .../Zhigan}/MeiRiShangBao/svg/xinxi.vue | 0 .../Zhigan}/ModalButton/config.ts | 0 .../Zhigan}/ModalButton/config.vue | 0 .../Zhigan}/ModalButton/index.ts | 6 ++--- .../Zhigan}/ModalButton/index.vue | 0 .../Zhigan}/ModalButton/svg/button.vue | 0 .../Zhigan}/ModalFrame/config.ts | 0 .../Zhigan}/ModalFrame/config.vue | 0 .../Zhigan}/ModalFrame/index.ts | 6 ++--- .../Zhigan}/ModalFrame/index.vue | 7 +++--- .../Zhigan}/ModalFrame/svg/frame.vue | 0 .../Zhigan}/ModalFrameClose/config.ts | 0 .../Zhigan}/ModalFrameClose/config.vue | 0 .../Zhigan}/ModalFrameClose/index.ts | 6 ++--- .../Zhigan}/ModalFrameClose/index.vue | 0 .../Zhigan}/ModalFrameClose/svg/button.vue | 0 .../Zhigan}/ModalHead/config.ts | 0 .../Zhigan}/ModalHead/config.vue | 0 .../Zhigan}/ModalHead/index.ts | 6 ++--- .../Zhigan}/ModalHead/index.vue | 0 .../Zhigan}/ModalHead/svg/title.vue | 0 .../Zhigan}/ModalTimeLine/config.ts | 0 .../Zhigan}/ModalTimeLine/config.vue | 0 .../Zhigan}/ModalTimeLine/data.json | 0 .../Zhigan}/ModalTimeLine/index.ts | 6 ++--- .../Zhigan}/ModalTimeLine/index.vue | 0 .../Zhigan}/MoreButton/config.ts | 0 .../Zhigan}/MoreButton/config.vue | 0 .../Zhigan}/MoreButton/index.ts | 6 ++--- .../Zhigan}/MoreButton/index.vue | 0 .../Zhigan}/WeiXingYaoGan/config.ts | 0 .../Zhigan}/WeiXingYaoGan/config.vue | 0 .../Zhigan}/WeiXingYaoGan/data.json | 0 .../Zhigan}/WeiXingYaoGan/index.ts | 6 ++--- .../Zhigan}/WeiXingYaoGan/index.vue | 0 .../Zhigan}/WeiXingYaoGan/svg/xinxi.vue | 0 .../Zhigan}/XianSuoShangBao/config.ts | 0 .../Zhigan}/XianSuoShangBao/config.vue | 0 .../Zhigan}/XianSuoShangBao/data.json | 0 .../Zhigan}/XianSuoShangBao/index.ts | 6 ++--- .../Zhigan}/XianSuoShangBao/index.vue | 0 .../Zhigan}/XianSuoShangBao/svg/listMark.vue | 0 .../Zhigan}/XianSuoShangBao/svg/listTitle.vue | 0 .../Zhigan}/XianSuoShangBao/svg/listType.vue | 0 .../Zhigan}/XianSuoShangBao/svg/mark.vue | 0 .../Zhigan}/XianSuoShangBao/svg/progress.vue | 0 .../Zhigan}/XianSuoShangBao/svg/title.vue | 0 .../components/Zhigan/Zhigan/index.ts | 25 +++++++++++++++++++ src/packages/components/Zhigan/index.d.ts | 7 ++++++ src/packages/components/Zhigan/index.ts | 3 +++ src/packages/index.d.ts | 3 +++ src/packages/index.ts | 4 ++- .../ContentCharts/hooks/useAside.hook.ts | 4 +++ 64 files changed, 79 insertions(+), 56 deletions(-) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/GeneralHead/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/GeneralHead/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/GeneralHead/index.ts (75%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/GeneralHead/index.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/GeneralHead/svg/title.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MeiRiShangBao/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MeiRiShangBao/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MeiRiShangBao/data.json (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MeiRiShangBao/index.ts (76%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MeiRiShangBao/index.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MeiRiShangBao/svg/xinxi.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalButton/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalButton/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalButton/index.ts (75%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalButton/index.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalButton/svg/button.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrame/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrame/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrame/index.ts (75%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrame/index.vue (90%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrame/svg/frame.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrameClose/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrameClose/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrameClose/index.ts (77%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrameClose/index.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalFrameClose/svg/button.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalHead/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalHead/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalHead/index.ts (76%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalHead/index.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalHead/svg/title.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalTimeLine/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalTimeLine/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalTimeLine/data.json (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalTimeLine/index.ts (76%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/ModalTimeLine/index.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MoreButton/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MoreButton/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MoreButton/index.ts (75%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/MoreButton/index.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/WeiXingYaoGan/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/WeiXingYaoGan/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/WeiXingYaoGan/data.json (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/WeiXingYaoGan/index.ts (76%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/WeiXingYaoGan/index.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/WeiXingYaoGan/svg/xinxi.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/config.ts (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/config.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/data.json (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/index.ts (76%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/index.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/svg/listMark.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/svg/listTitle.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/svg/listType.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/svg/mark.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/svg/progress.vue (100%) rename src/packages/components/{Tables/Tables => Zhigan/Zhigan}/XianSuoShangBao/svg/title.vue (100%) create mode 100644 src/packages/components/Zhigan/Zhigan/index.ts create mode 100644 src/packages/components/Zhigan/index.d.ts create mode 100644 src/packages/components/Zhigan/index.ts diff --git a/src/packages/components/Tables/Tables/index.ts b/src/packages/components/Tables/Tables/index.ts index dd4e874..458fc9d 100644 --- a/src/packages/components/Tables/Tables/index.ts +++ b/src/packages/components/Tables/Tables/index.ts @@ -1,31 +1,9 @@ import { TableListConfig } from './TableList' import { TableScrollBoardConfig } from './TableScrollBoard' import { TablesBasicConfig } from "./TablesBasic/index"; -import { GeneralHeadConfig } from "./GeneralHead/index"; -import { ModalHeadConfig } from "./ModalHead/index"; -import { MoreButtonConfig } from "./MoreButton/index"; -import { WeiXingYaoGanConfig } from "./WeiXingYaoGan/index"; -import { XianSuoShangBaoConfig } from "./XianSuoShangBao/index"; -import { MeiRiShangBaoConfig } from "./MeiRiShangBao/index"; - -import { ModalFrameConfig } from "./ModalFrame/index"; -import { ModalFrameCloseConfig } from "./ModalFrameClose/index"; -import { ModalButtonConfig } from "./ModalButton/index"; -import { ModalTimeLineConfig } from "./ModalTimeLine/index"; - export default [ TableListConfig, TableScrollBoardConfig, TablesBasicConfig, - GeneralHeadConfig, - ModalHeadConfig, - MoreButtonConfig, - WeiXingYaoGanConfig, - XianSuoShangBaoConfig, - MeiRiShangBaoConfig, - // ModalFrameConfig, - ModalFrameCloseConfig, - ModalButtonConfig, - ModalTimeLineConfig ]; diff --git a/src/packages/components/Tables/Tables/GeneralHead/config.ts b/src/packages/components/Zhigan/Zhigan/GeneralHead/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/GeneralHead/config.ts rename to src/packages/components/Zhigan/Zhigan/GeneralHead/config.ts diff --git a/src/packages/components/Tables/Tables/GeneralHead/config.vue b/src/packages/components/Zhigan/Zhigan/GeneralHead/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/GeneralHead/config.vue rename to src/packages/components/Zhigan/Zhigan/GeneralHead/config.vue diff --git a/src/packages/components/Tables/Tables/GeneralHead/index.ts b/src/packages/components/Zhigan/Zhigan/GeneralHead/index.ts similarity index 75% rename from src/packages/components/Tables/Tables/GeneralHead/index.ts rename to src/packages/components/Zhigan/Zhigan/GeneralHead/index.ts index cc17bdf..c6bc8db 100644 --- a/src/packages/components/Tables/Tables/GeneralHead/index.ts +++ b/src/packages/components/Zhigan/Zhigan/GeneralHead/index.ts @@ -6,9 +6,9 @@ export const GeneralHeadConfig: ConfigType = { chartKey: 'VGeneralHead', conKey: 'VCGeneralHead', title: '组件标题栏', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'GeneralHead.png' } diff --git a/src/packages/components/Tables/Tables/GeneralHead/index.vue b/src/packages/components/Zhigan/Zhigan/GeneralHead/index.vue similarity index 100% rename from src/packages/components/Tables/Tables/GeneralHead/index.vue rename to src/packages/components/Zhigan/Zhigan/GeneralHead/index.vue diff --git a/src/packages/components/Tables/Tables/GeneralHead/svg/title.vue b/src/packages/components/Zhigan/Zhigan/GeneralHead/svg/title.vue similarity index 100% rename from src/packages/components/Tables/Tables/GeneralHead/svg/title.vue rename to src/packages/components/Zhigan/Zhigan/GeneralHead/svg/title.vue diff --git a/src/packages/components/Tables/Tables/MeiRiShangBao/config.ts b/src/packages/components/Zhigan/Zhigan/MeiRiShangBao/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/MeiRiShangBao/config.ts rename to src/packages/components/Zhigan/Zhigan/MeiRiShangBao/config.ts diff --git a/src/packages/components/Tables/Tables/MeiRiShangBao/config.vue b/src/packages/components/Zhigan/Zhigan/MeiRiShangBao/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/MeiRiShangBao/config.vue rename to src/packages/components/Zhigan/Zhigan/MeiRiShangBao/config.vue diff --git a/src/packages/components/Tables/Tables/MeiRiShangBao/data.json b/src/packages/components/Zhigan/Zhigan/MeiRiShangBao/data.json similarity index 100% rename from src/packages/components/Tables/Tables/MeiRiShangBao/data.json rename to src/packages/components/Zhigan/Zhigan/MeiRiShangBao/data.json diff --git a/src/packages/components/Tables/Tables/MeiRiShangBao/index.ts b/src/packages/components/Zhigan/Zhigan/MeiRiShangBao/index.ts similarity index 76% rename from src/packages/components/Tables/Tables/MeiRiShangBao/index.ts rename to src/packages/components/Zhigan/Zhigan/MeiRiShangBao/index.ts index 5da6669..d20eb79 100644 --- a/src/packages/components/Tables/Tables/MeiRiShangBao/index.ts +++ b/src/packages/components/Zhigan/Zhigan/MeiRiShangBao/index.ts @@ -6,9 +6,9 @@ export const MeiRiShangBaoConfig: ConfigType = { chartKey: 'VMeiRiShangBao', conKey: 'VCMeiRiShangBao', title: '每日上报数量统计', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'MeiRiShangBao.png' } diff --git a/src/packages/components/Tables/Tables/MeiRiShangBao/index.vue b/src/packages/components/Zhigan/Zhigan/MeiRiShangBao/index.vue similarity index 100% rename from src/packages/components/Tables/Tables/MeiRiShangBao/index.vue rename to src/packages/components/Zhigan/Zhigan/MeiRiShangBao/index.vue diff --git a/src/packages/components/Tables/Tables/MeiRiShangBao/svg/xinxi.vue b/src/packages/components/Zhigan/Zhigan/MeiRiShangBao/svg/xinxi.vue similarity index 100% rename from src/packages/components/Tables/Tables/MeiRiShangBao/svg/xinxi.vue rename to src/packages/components/Zhigan/Zhigan/MeiRiShangBao/svg/xinxi.vue diff --git a/src/packages/components/Tables/Tables/ModalButton/config.ts b/src/packages/components/Zhigan/Zhigan/ModalButton/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/ModalButton/config.ts rename to src/packages/components/Zhigan/Zhigan/ModalButton/config.ts diff --git a/src/packages/components/Tables/Tables/ModalButton/config.vue b/src/packages/components/Zhigan/Zhigan/ModalButton/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalButton/config.vue rename to src/packages/components/Zhigan/Zhigan/ModalButton/config.vue diff --git a/src/packages/components/Tables/Tables/ModalButton/index.ts b/src/packages/components/Zhigan/Zhigan/ModalButton/index.ts similarity index 75% rename from src/packages/components/Tables/Tables/ModalButton/index.ts rename to src/packages/components/Zhigan/Zhigan/ModalButton/index.ts index b6f24b4..23f6950 100644 --- a/src/packages/components/Tables/Tables/ModalButton/index.ts +++ b/src/packages/components/Zhigan/Zhigan/ModalButton/index.ts @@ -6,9 +6,9 @@ export const ModalButtonConfig: ConfigType = { chartKey: 'VModalButton', conKey: 'VCModalButton', title: '重复报警弹窗按钮', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'ModalButton.png' } diff --git a/src/packages/components/Tables/Tables/ModalButton/index.vue b/src/packages/components/Zhigan/Zhigan/ModalButton/index.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalButton/index.vue rename to src/packages/components/Zhigan/Zhigan/ModalButton/index.vue diff --git a/src/packages/components/Tables/Tables/ModalButton/svg/button.vue b/src/packages/components/Zhigan/Zhigan/ModalButton/svg/button.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalButton/svg/button.vue rename to src/packages/components/Zhigan/Zhigan/ModalButton/svg/button.vue diff --git a/src/packages/components/Tables/Tables/ModalFrame/config.ts b/src/packages/components/Zhigan/Zhigan/ModalFrame/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/ModalFrame/config.ts rename to src/packages/components/Zhigan/Zhigan/ModalFrame/config.ts diff --git a/src/packages/components/Tables/Tables/ModalFrame/config.vue b/src/packages/components/Zhigan/Zhigan/ModalFrame/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalFrame/config.vue rename to src/packages/components/Zhigan/Zhigan/ModalFrame/config.vue diff --git a/src/packages/components/Tables/Tables/ModalFrame/index.ts b/src/packages/components/Zhigan/Zhigan/ModalFrame/index.ts similarity index 75% rename from src/packages/components/Tables/Tables/ModalFrame/index.ts rename to src/packages/components/Zhigan/Zhigan/ModalFrame/index.ts index 7453169..dec1a4c 100644 --- a/src/packages/components/Tables/Tables/ModalFrame/index.ts +++ b/src/packages/components/Zhigan/Zhigan/ModalFrame/index.ts @@ -6,9 +6,9 @@ export const ModalFrameConfig: ConfigType = { chartKey: 'VModalFrame', conKey: 'VCModalFrame', title: '重复报警弹窗框架', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'ModalFrame.png' } diff --git a/src/packages/components/Tables/Tables/ModalFrame/index.vue b/src/packages/components/Zhigan/Zhigan/ModalFrame/index.vue similarity index 90% rename from src/packages/components/Tables/Tables/ModalFrame/index.vue rename to src/packages/components/Zhigan/Zhigan/ModalFrame/index.vue index a1ae058..50a5f79 100644 --- a/src/packages/components/Tables/Tables/ModalFrame/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ModalFrame/index.vue @@ -1,8 +1,9 @@ diff --git a/src/packages/components/Tables/Tables/ModalFrame/svg/frame.vue b/src/packages/components/Zhigan/Zhigan/ModalFrame/svg/frame.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalFrame/svg/frame.vue rename to src/packages/components/Zhigan/Zhigan/ModalFrame/svg/frame.vue diff --git a/src/packages/components/Tables/Tables/ModalFrameClose/config.ts b/src/packages/components/Zhigan/Zhigan/ModalFrameClose/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/ModalFrameClose/config.ts rename to src/packages/components/Zhigan/Zhigan/ModalFrameClose/config.ts diff --git a/src/packages/components/Tables/Tables/ModalFrameClose/config.vue b/src/packages/components/Zhigan/Zhigan/ModalFrameClose/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalFrameClose/config.vue rename to src/packages/components/Zhigan/Zhigan/ModalFrameClose/config.vue diff --git a/src/packages/components/Tables/Tables/ModalFrameClose/index.ts b/src/packages/components/Zhigan/Zhigan/ModalFrameClose/index.ts similarity index 77% rename from src/packages/components/Tables/Tables/ModalFrameClose/index.ts rename to src/packages/components/Zhigan/Zhigan/ModalFrameClose/index.ts index eb2657b..e1632ed 100644 --- a/src/packages/components/Tables/Tables/ModalFrameClose/index.ts +++ b/src/packages/components/Zhigan/Zhigan/ModalFrameClose/index.ts @@ -6,9 +6,9 @@ export const ModalFrameCloseConfig: ConfigType = { chartKey: 'VModalFrameClose', conKey: 'VCModalFrameClose', title: '重复报警弹窗关闭按钮', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'ModalFrameClose.png' } diff --git a/src/packages/components/Tables/Tables/ModalFrameClose/index.vue b/src/packages/components/Zhigan/Zhigan/ModalFrameClose/index.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalFrameClose/index.vue rename to src/packages/components/Zhigan/Zhigan/ModalFrameClose/index.vue diff --git a/src/packages/components/Tables/Tables/ModalFrameClose/svg/button.vue b/src/packages/components/Zhigan/Zhigan/ModalFrameClose/svg/button.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalFrameClose/svg/button.vue rename to src/packages/components/Zhigan/Zhigan/ModalFrameClose/svg/button.vue diff --git a/src/packages/components/Tables/Tables/ModalHead/config.ts b/src/packages/components/Zhigan/Zhigan/ModalHead/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/ModalHead/config.ts rename to src/packages/components/Zhigan/Zhigan/ModalHead/config.ts diff --git a/src/packages/components/Tables/Tables/ModalHead/config.vue b/src/packages/components/Zhigan/Zhigan/ModalHead/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalHead/config.vue rename to src/packages/components/Zhigan/Zhigan/ModalHead/config.vue diff --git a/src/packages/components/Tables/Tables/ModalHead/index.ts b/src/packages/components/Zhigan/Zhigan/ModalHead/index.ts similarity index 76% rename from src/packages/components/Tables/Tables/ModalHead/index.ts rename to src/packages/components/Zhigan/Zhigan/ModalHead/index.ts index beb2fdf..db14143 100644 --- a/src/packages/components/Tables/Tables/ModalHead/index.ts +++ b/src/packages/components/Zhigan/Zhigan/ModalHead/index.ts @@ -6,9 +6,9 @@ export const ModalHeadConfig: ConfigType = { chartKey: 'VModalHead', conKey: 'VCModalHead', title: '重复报警弹窗内部组件标题栏', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'ModalHead.png' } diff --git a/src/packages/components/Tables/Tables/ModalHead/index.vue b/src/packages/components/Zhigan/Zhigan/ModalHead/index.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalHead/index.vue rename to src/packages/components/Zhigan/Zhigan/ModalHead/index.vue diff --git a/src/packages/components/Tables/Tables/ModalHead/svg/title.vue b/src/packages/components/Zhigan/Zhigan/ModalHead/svg/title.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalHead/svg/title.vue rename to src/packages/components/Zhigan/Zhigan/ModalHead/svg/title.vue diff --git a/src/packages/components/Tables/Tables/ModalTimeLine/config.ts b/src/packages/components/Zhigan/Zhigan/ModalTimeLine/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/ModalTimeLine/config.ts rename to src/packages/components/Zhigan/Zhigan/ModalTimeLine/config.ts diff --git a/src/packages/components/Tables/Tables/ModalTimeLine/config.vue b/src/packages/components/Zhigan/Zhigan/ModalTimeLine/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalTimeLine/config.vue rename to src/packages/components/Zhigan/Zhigan/ModalTimeLine/config.vue diff --git a/src/packages/components/Tables/Tables/ModalTimeLine/data.json b/src/packages/components/Zhigan/Zhigan/ModalTimeLine/data.json similarity index 100% rename from src/packages/components/Tables/Tables/ModalTimeLine/data.json rename to src/packages/components/Zhigan/Zhigan/ModalTimeLine/data.json diff --git a/src/packages/components/Tables/Tables/ModalTimeLine/index.ts b/src/packages/components/Zhigan/Zhigan/ModalTimeLine/index.ts similarity index 76% rename from src/packages/components/Tables/Tables/ModalTimeLine/index.ts rename to src/packages/components/Zhigan/Zhigan/ModalTimeLine/index.ts index 44db4ee..524a2d2 100644 --- a/src/packages/components/Tables/Tables/ModalTimeLine/index.ts +++ b/src/packages/components/Zhigan/Zhigan/ModalTimeLine/index.ts @@ -6,9 +6,9 @@ export const ModalTimeLineConfig: ConfigType = { chartKey: 'VModalTimeLine', conKey: 'VCModalTimeLine', title: '重复报警弹窗时间线', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'ModalTimeLine.png' } diff --git a/src/packages/components/Tables/Tables/ModalTimeLine/index.vue b/src/packages/components/Zhigan/Zhigan/ModalTimeLine/index.vue similarity index 100% rename from src/packages/components/Tables/Tables/ModalTimeLine/index.vue rename to src/packages/components/Zhigan/Zhigan/ModalTimeLine/index.vue diff --git a/src/packages/components/Tables/Tables/MoreButton/config.ts b/src/packages/components/Zhigan/Zhigan/MoreButton/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/MoreButton/config.ts rename to src/packages/components/Zhigan/Zhigan/MoreButton/config.ts diff --git a/src/packages/components/Tables/Tables/MoreButton/config.vue b/src/packages/components/Zhigan/Zhigan/MoreButton/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/MoreButton/config.vue rename to src/packages/components/Zhigan/Zhigan/MoreButton/config.vue diff --git a/src/packages/components/Tables/Tables/MoreButton/index.ts b/src/packages/components/Zhigan/Zhigan/MoreButton/index.ts similarity index 75% rename from src/packages/components/Tables/Tables/MoreButton/index.ts rename to src/packages/components/Zhigan/Zhigan/MoreButton/index.ts index f1ebda5..918f6a2 100644 --- a/src/packages/components/Tables/Tables/MoreButton/index.ts +++ b/src/packages/components/Zhigan/Zhigan/MoreButton/index.ts @@ -6,9 +6,9 @@ export const MoreButtonConfig: ConfigType = { chartKey: 'VMoreButton', conKey: 'VCMoreButton', title: '更多按钮', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'MoreButton.png' } diff --git a/src/packages/components/Tables/Tables/MoreButton/index.vue b/src/packages/components/Zhigan/Zhigan/MoreButton/index.vue similarity index 100% rename from src/packages/components/Tables/Tables/MoreButton/index.vue rename to src/packages/components/Zhigan/Zhigan/MoreButton/index.vue diff --git a/src/packages/components/Tables/Tables/WeiXingYaoGan/config.ts b/src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/WeiXingYaoGan/config.ts rename to src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/config.ts diff --git a/src/packages/components/Tables/Tables/WeiXingYaoGan/config.vue b/src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/WeiXingYaoGan/config.vue rename to src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/config.vue diff --git a/src/packages/components/Tables/Tables/WeiXingYaoGan/data.json b/src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/data.json similarity index 100% rename from src/packages/components/Tables/Tables/WeiXingYaoGan/data.json rename to src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/data.json diff --git a/src/packages/components/Tables/Tables/WeiXingYaoGan/index.ts b/src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/index.ts similarity index 76% rename from src/packages/components/Tables/Tables/WeiXingYaoGan/index.ts rename to src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/index.ts index bc70d74..ed847a7 100644 --- a/src/packages/components/Tables/Tables/WeiXingYaoGan/index.ts +++ b/src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/index.ts @@ -6,9 +6,9 @@ export const WeiXingYaoGanConfig: ConfigType = { chartKey: 'VWeiXingYaoGan', conKey: 'VCWeiXingYaoGan', title: '卫星遥感信息', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'WeiXingYaoGan.png' } diff --git a/src/packages/components/Tables/Tables/WeiXingYaoGan/index.vue b/src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/index.vue similarity index 100% rename from src/packages/components/Tables/Tables/WeiXingYaoGan/index.vue rename to src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/index.vue diff --git a/src/packages/components/Tables/Tables/WeiXingYaoGan/svg/xinxi.vue b/src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/svg/xinxi.vue similarity index 100% rename from src/packages/components/Tables/Tables/WeiXingYaoGan/svg/xinxi.vue rename to src/packages/components/Zhigan/Zhigan/WeiXingYaoGan/svg/xinxi.vue diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/config.ts b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/config.ts similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/config.ts rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/config.ts diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/config.vue b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/config.vue similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/config.vue rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/config.vue diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/data.json b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/data.json similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/data.json rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/data.json diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/index.ts b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/index.ts similarity index 76% rename from src/packages/components/Tables/Tables/XianSuoShangBao/index.ts rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/index.ts index 4b4cb29..49c9391 100644 --- a/src/packages/components/Tables/Tables/XianSuoShangBao/index.ts +++ b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/index.ts @@ -6,9 +6,9 @@ export const XianSuoShangBaoConfig: ConfigType = { chartKey: 'VXianSuoShangBao', conKey: 'VCXianSuoShangBao', title: '线索上报渠道', - category: ChatCategoryEnum.TABLE, - categoryName: ChatCategoryEnumName.TABLE, - package: PackagesCategoryEnum.TABLES, + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, chartFrame: ChartFrameEnum.COMMON, image: 'XianSuoShangBao.png' } diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/index.vue b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/index.vue similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/index.vue rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/index.vue diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/svg/listMark.vue b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/listMark.vue similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/svg/listMark.vue rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/listMark.vue diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/svg/listTitle.vue b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/listTitle.vue similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/svg/listTitle.vue rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/listTitle.vue diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/svg/listType.vue b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/listType.vue similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/svg/listType.vue rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/listType.vue diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/svg/mark.vue b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/mark.vue similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/svg/mark.vue rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/mark.vue diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/svg/progress.vue b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/progress.vue similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/svg/progress.vue rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/progress.vue diff --git a/src/packages/components/Tables/Tables/XianSuoShangBao/svg/title.vue b/src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/title.vue similarity index 100% rename from src/packages/components/Tables/Tables/XianSuoShangBao/svg/title.vue rename to src/packages/components/Zhigan/Zhigan/XianSuoShangBao/svg/title.vue diff --git a/src/packages/components/Zhigan/Zhigan/index.ts b/src/packages/components/Zhigan/Zhigan/index.ts new file mode 100644 index 0000000..4263042 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/index.ts @@ -0,0 +1,25 @@ +import { GeneralHeadConfig } from "./GeneralHead/index"; +import { ModalHeadConfig } from "./ModalHead/index"; +import { MoreButtonConfig } from "./MoreButton/index"; +import { WeiXingYaoGanConfig } from "./WeiXingYaoGan/index"; +import { XianSuoShangBaoConfig } from "./XianSuoShangBao/index"; +import { MeiRiShangBaoConfig } from "./MeiRiShangBao/index"; + +import { ModalFrameConfig } from "./ModalFrame/index"; +import { ModalFrameCloseConfig } from "./ModalFrameClose/index"; +import { ModalButtonConfig } from "./ModalButton/index"; +import { ModalTimeLineConfig } from "./ModalTimeLine/index"; + + +export default [ + GeneralHeadConfig, + ModalHeadConfig, + MoreButtonConfig, + WeiXingYaoGanConfig, + XianSuoShangBaoConfig, + MeiRiShangBaoConfig, + ModalFrameConfig, + ModalFrameCloseConfig, + ModalButtonConfig, + ModalTimeLineConfig +]; diff --git a/src/packages/components/Zhigan/index.d.ts b/src/packages/components/Zhigan/index.d.ts new file mode 100644 index 0000000..898268a --- /dev/null +++ b/src/packages/components/Zhigan/index.d.ts @@ -0,0 +1,7 @@ +export enum ChatCategoryEnum { + ZHIGAN = 'Zhigan', +} + +export enum ChatCategoryEnumName { + ZHIGAN = '智感', +} \ No newline at end of file diff --git a/src/packages/components/Zhigan/index.ts b/src/packages/components/Zhigan/index.ts new file mode 100644 index 0000000..9cc8d0f --- /dev/null +++ b/src/packages/components/Zhigan/index.ts @@ -0,0 +1,3 @@ +import Zhigan from './Zhigan' + +export const ZhiganList = [...Zhigan] diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts index 9605463..d3d7051 100644 --- a/src/packages/index.d.ts +++ b/src/packages/index.d.ts @@ -201,6 +201,7 @@ export enum PackagesCategoryEnum { DECORATES = 'Decorates', CUSTOM = 'Custom', DIY = 'Diy', + ZHIGAN = 'Zhigan', } // 包分类名称 @@ -214,6 +215,7 @@ export enum PackagesCategoryName { DECORATES = '小组件', CUSTOM = '预警信息', DIY = 'DIY', + ZHIGAN = '智感', } // 获取组件 @@ -233,4 +235,5 @@ export type PackagesType = { [PackagesCategoryEnum.DECORATES]: ConfigType[]; [PackagesCategoryEnum.CUSTOM]: ConfigType[]; [PackagesCategoryEnum.DIY]: ConfigType[]; + [PackagesCategoryEnum.ZHIGAN]: ConfigType[]; }; diff --git a/src/packages/index.ts b/src/packages/index.ts index 18b706e..6b583a2 100644 --- a/src/packages/index.ts +++ b/src/packages/index.ts @@ -5,6 +5,7 @@ import { TableList } from '@/packages/components/Tables/index' import { PhotoList } from '@/packages/components/Photos/index' import { IconList } from '@/packages/components/Icons/index' import { DiyList } from '@/packages/components/Diy/index' +import { ZhiganList } from '@/packages/components/Zhigan/index' import { PackagesCategoryEnum, PackagesType, ConfigType, FetchComFlagType } from '@/packages/index.d' const configModules: Record = import.meta.glob('./components/**/config.vue', { @@ -25,7 +26,8 @@ export let packagesList: PackagesType = { [PackagesCategoryEnum.DECORATES]: DecorateList, [PackagesCategoryEnum.PHOTOS]: PhotoList, [PackagesCategoryEnum.ICONS]: IconList, - [PackagesCategoryEnum.DIY]: DiyList + [PackagesCategoryEnum.DIY]: DiyList, + [PackagesCategoryEnum.ZHIGAN]: ZhiganList } // 组件缓存, 可以大幅度提升组件加载速度 diff --git a/src/views/chart/ContentCharts/hooks/useAside.hook.ts b/src/views/chart/ContentCharts/hooks/useAside.hook.ts index 97f72ca..6890846 100644 --- a/src/views/chart/ContentCharts/hooks/useAside.hook.ts +++ b/src/views/chart/ContentCharts/hooks/useAside.hook.ts @@ -53,6 +53,10 @@ const packagesListObj = { [PackagesCategoryEnum.DIY]: { icon: renderIcon(AirPlaneOutlineIcon), label: PackagesCategoryName.DIY + }, + [PackagesCategoryEnum.ZHIGAN]: { + icon: renderIcon(AirPlaneOutlineIcon), + label: PackagesCategoryName.ZHIGAN } } From 55860ac28ec56be7516b0d94adf82ee6474adaff Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Wed, 12 Feb 2025 15:17:12 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9A=97=E4=B8=BB=E9=A2=98=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 15 ++++++++++++--- src/hooks/useTheme.hook.ts | 5 +++-- src/styles/common/_dark.scss | 2 ++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/App.vue b/src/App.vue index 18bcdbd..7dbfc2c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,8 +1,12 @@ @@ -15,6 +19,11 @@ import { useDarkModeTheme } from '@/hooks/setting/useDarkModeTheme'; import 'dayjs/locale/zh-cn'; import { computed } from 'vue'; + import { NConfigProvider } from 'naive-ui' + import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks' + + // 暗黑主题 + const darkNTheme = useDarkThemeHook() // support Multi-language const { getAntdLocale } = useLocale(); diff --git a/src/hooks/useTheme.hook.ts b/src/hooks/useTheme.hook.ts index 94d809d..17a1df6 100644 --- a/src/hooks/useTheme.hook.ts +++ b/src/hooks/useTheme.hook.ts @@ -3,6 +3,7 @@ import { darkTheme, GlobalThemeOverrides } from 'naive-ui' import { useDesignStore } from '@/store/modules/designStore/designStore' import { borderRadius } from '@/settings/designSetting' import { alpha, lighten } from '@/utils' +import { useAppStore } from '@/store/modules/app' /** * * 设置全局主题 @@ -45,6 +46,6 @@ export const useThemeOverridesHook = () => { // 返回暗黑主题 export const useDarkThemeHook = () => { - const designStore = useDesignStore() - return computed(() => (designStore.getDarkTheme ? darkTheme : undefined)) + const appStore = useAppStore() + return computed(() => (appStore.getDarkMode == 'dark' ? darkTheme : undefined)) } diff --git a/src/styles/common/_dark.scss b/src/styles/common/_dark.scss index 1c9ee92..edbfe2b 100644 --- a/src/styles/common/_dark.scss +++ b/src/styles/common/_dark.scss @@ -3,6 +3,8 @@ $dark: ( // 文字颜色 color: $--color-text-4, + // aside 背景 + aside-background-color: $--color-dark-bg-1, //背景 background-color: $--color-dark-bg-1, background-color1: $--color-dark-bg-1, From a4e22f421c97e753bc258dca09e8febb460fb040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com> Date: Wed, 12 Feb 2025 16:33:08 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8A=A8=E4=BD=9C=E5=85=B3=E8=81=94?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EventItem.vue | 6 +++--- .../ContentConfigurations/components/ChartEvent/index.vue | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteractionConfiguration/components/EventItem.vue b/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteractionConfiguration/components/EventItem.vue index b10eab3..987a62a 100644 --- a/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteractionConfiguration/components/EventItem.vue +++ b/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteractionConfiguration/components/EventItem.vue @@ -54,7 +54,7 @@
-
+
关联组件(可多选)
-
+
组件交互方法
-
+
跳转新地址
diff --git a/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue b/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue index ffff705..881db6d 100644 --- a/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartEvent/index.vue @@ -21,6 +21,5 @@ import { useTargetData } from '../hooks/useTargetData.hook'; const { targetData } = useTargetData(); - console.log(targetData); const showModal = ref(false); From 8442d96e1c614b2552369498a22640730ec9da10 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Thu, 13 Feb 2025 09:13:35 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sys/login/Login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/sys/login/Login.vue b/src/views/sys/login/Login.vue index 4e2e2da..8bb060b 100644 --- a/src/views/sys/login/Login.vue +++ b/src/views/sys/login/Login.vue @@ -1,5 +1,5 @@ diff --git a/src/packages/components/Zhigan/Zhigan/ModalTimeLine/index.vue b/src/packages/components/Zhigan/Zhigan/ModalTimeLine/index.vue index 4e19d1b..787bd7e 100644 --- a/src/packages/components/Zhigan/Zhigan/ModalTimeLine/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ModalTimeLine/index.vue @@ -82,8 +82,8 @@ > diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/config.ts b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/config.ts new file mode 100644 index 0000000..d38ea03 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/config.ts @@ -0,0 +1,43 @@ +import cloneDeep from 'lodash/cloneDeep' +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig } from '@/settings/designSetting' +import { WuRenJiFeiXingShuJuConfig } from './index' +import dataJson from './data.json' + +const { source } = dataJson; + +export const option = { + dataset: source, + dataStyle: { + backgroud: '#FFFFFF00', + margintop: 15, + marginleft: 20, + gap: 16, + + topMarginTop: 5, + iconSize: 45, + iconX: 12, + iconY: 12, + topWidth: 80, + topHeight: 80, + + bottomFontColor1: '#A4F9AB', + bottomFontSize1: 20, + bottomFontColor2: '#FFFFFF', + bottomFontSize2: 12, + bottomFontColor3: '#FFFFFF', + bottomFontSize3: 12, + lineColor: '#A4F9AB', + bottomMarginTop: 0, + bottomWidth: 80, + bottomHeight: 120, + } +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = WuRenJiFeiXingShuJuConfig.key + public attr = { ...chartInitConfig, w: 400, h: 225, zIndex: -1 } + public chartConfig = cloneDeep(WuRenJiFeiXingShuJuConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/config.vue b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/config.vue new file mode 100644 index 0000000..3eee02b --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/config.vue @@ -0,0 +1,198 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/data.json b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/data.json new file mode 100644 index 0000000..a41142c --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/data.json @@ -0,0 +1,28 @@ +{ + "source": [ + { + "icon": "01", + "num": "5463", + "unit": "个", + "title": "飞行总次数" + }, + { + "icon": "02", + "num": "7267", + "unit": "h", + "title": "飞行总时长" + }, + { + "icon": "03", + "num": "2463", + "unit": "万km", + "title": "飞行总里程" + }, + { + "icon": "04", + "num": "1307", + "unit": "个", + "title": "无人机总数" + } + ] +} diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/index.ts b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/index.ts new file mode 100644 index 0000000..3f87296 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const WuRenJiFeiXingShuJuConfig: ConfigType = { + key: 'WuRenJiFeiXingShuJu', + chartKey: 'VWuRenJiFeiXingShuJu', + conKey: 'VCWuRenJiFeiXingShuJu', + title: '无人机飞行数据', + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, + chartFrame: ChartFrameEnum.COMMON, + image: 'WuRenJiFeiXingShuJu.png' +} diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/index.vue b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/index.vue new file mode 100644 index 0000000..ed87937 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/index.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/01.svg b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/01.svg new file mode 100644 index 0000000..514421e --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/01.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/02.svg b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/02.svg new file mode 100644 index 0000000..8f3b4d7 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/02.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/03.svg b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/03.svg new file mode 100644 index 0000000..ea45bab --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/03.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/04.svg b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/04.svg new file mode 100644 index 0000000..ba00245 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/04.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/bottom.vue b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/bottom.vue new file mode 100644 index 0000000..c65a756 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/bottom.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/top.vue b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/top.vue new file mode 100644 index 0000000..f4fa551 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiFeiXingShuJu/svg/top.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiImage/config.ts b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/config.ts new file mode 100644 index 0000000..da45ac4 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/config.ts @@ -0,0 +1,15 @@ +import cloneDeep from 'lodash/cloneDeep' +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig } from '@/settings/designSetting' +import { WuRenJiImageConfig } from './index' + +export const option = { +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = WuRenJiImageConfig.key + public attr = { ...chartInitConfig, w: 401, h: 273, zIndex: -1 } + public chartConfig = cloneDeep(WuRenJiImageConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiImage/config.vue b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/config.vue new file mode 100644 index 0000000..15e0a42 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/config.vue @@ -0,0 +1,15 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiImage/index.ts b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/index.ts new file mode 100644 index 0000000..655562a --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const WuRenJiImageConfig: ConfigType = { + key: 'WuRenJiImage', + chartKey: 'VWuRenJiImage', + conKey: 'VCWuRenJiImage', + title: '无人机图片', + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, + chartFrame: ChartFrameEnum.COMMON, + image: 'WuRenJiImage.png' +} diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiImage/index.vue b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/index.vue new file mode 100644 index 0000000..a22e4fa --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/index.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiImage/svg/tupian.vue b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/svg/tupian.vue new file mode 100644 index 0000000..35391ac --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiImage/svg/tupian.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/config.ts b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/config.ts new file mode 100644 index 0000000..47468d5 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/config.ts @@ -0,0 +1,37 @@ +import cloneDeep from 'lodash/cloneDeep' +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig } from '@/settings/designSetting' +import { WuRenJiShiShiHuaMianConfig } from './index' +import dataJson from './data.json' + +const { source } = dataJson; + +export const option = { + dataset: source, + dataStyle: { + backgroud: '#FFFFFF00', + margintop: 15, + marginleft: 15, + + titleColor: '#FFFFFF', + titleFontSize: 16, + titleMarginTop: 5, + titleWidth: 181, + titleHeight: 30, + + videoloop: true, // 视频-循环播放 + videomuted: true, // 视频-静音 + videofit: 'fill', // 视频-适应方式 + videowidth: 181, + videoheight: 115, + videoMarginTop: 10, + } +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = WuRenJiShiShiHuaMianConfig.key + public attr = { ...chartInitConfig, w: 400, h: 343, zIndex: -1 } + public chartConfig = cloneDeep(WuRenJiShiShiHuaMianConfig) + public option = cloneDeep(option) +} diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/config.vue b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/config.vue new file mode 100644 index 0000000..160fde2 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/config.vue @@ -0,0 +1,142 @@ + + + diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/data.json b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/data.json new file mode 100644 index 0000000..e02ba44 --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/data.json @@ -0,0 +1,28 @@ +{ + "source": [ + { + "title":"DJA-72无人机监控画面", + "videoUrl": "/src/assets/videos/earth.mp4" + }, + { + "title":"DJ-057无人机监控画面", + "videoUrl": "/src/assets/videos/earth.mp4" + }, + { + "title":"DJA-20无人机监控画面", + "videoUrl": "/src/assets/videos/earth.mp4" + }, + { + "title":"DJA-035无人机监控画面", + "videoUrl": "/src/assets/videos/earth.mp4" + }, + { + "title":"DJA-11无人机监控画面", + "videoUrl": "/src/assets/videos/earth.mp4" + }, + { + "title":"DJ-021无人机监控画面", + "videoUrl": "/src/assets/videos/earth.mp4" + } + ] +} diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/index.ts b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/index.ts new file mode 100644 index 0000000..733135a --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const WuRenJiShiShiHuaMianConfig: ConfigType = { + key: 'WuRenJiShiShiHuaMian', + chartKey: 'VWuRenJiShiShiHuaMian', + conKey: 'VCWuRenJiShiShiHuaMian', + title: '无人机实时画面', + category: ChatCategoryEnum.ZHIGAN, + categoryName: ChatCategoryEnumName.ZHIGAN, + package: PackagesCategoryEnum.ZHIGAN, + chartFrame: ChartFrameEnum.COMMON, + image: 'WuRenJiShiShiHuaMian.png' +} diff --git a/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/index.vue b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/index.vue new file mode 100644 index 0000000..710b2fb --- /dev/null +++ b/src/packages/components/Zhigan/Zhigan/WuRenJiShiShiHuaMian/index.vue @@ -0,0 +1,88 @@ +