Showing
43 changed files
with
10 additions
and
8 deletions
| ... | ... | @@ -6,7 +6,7 @@ import { |
| 6 | 6 | EXCEPTION_COMPONENT, |
| 7 | 7 | PAGE_NOT_FOUND_NAME, |
| 8 | 8 | } from '/@/router/constant'; |
| 9 | -import { DATA_BOARD_SHARE_URL } from '/@/views/data/board/config/config'; | |
| 9 | +import { DATA_BOARD_SHARE_URL } from '../../views/visual/board/config/config'; | |
| 10 | 10 | |
| 11 | 11 | // 404 on a page |
| 12 | 12 | export const PAGE_NOT_FOUND_ROUTE: AppRouteRecordRaw = { |
| ... | ... | @@ -81,7 +81,7 @@ export const ERROR_LOG_ROUTE: AppRouteRecordRaw = { |
| 81 | 81 | export const DATA_BOARD_SHARE: AppRouteRecordRaw = { |
| 82 | 82 | path: DATA_BOARD_SHARE_URL(), |
| 83 | 83 | name: 'dataBoardSharePage', |
| 84 | - component: () => import('/@/views/data/board/detail/index.vue'), | |
| 84 | + component: () => import('/@/views/visual/board/detail/index.vue'), | |
| 85 | 85 | meta: { |
| 86 | 86 | ignoreAuth: true, |
| 87 | 87 | title: '分享看板', | ... | ... |
src/views/visual/board/components/InstrumentComponent/DashBoardComponent.vue
renamed from
src/views/data/board/components/InstrumentComponent/DashBoardComponent.vue
src/views/visual/board/components/InstrumentComponent/DigitalDashBoard.vue
renamed from
src/views/data/board/components/InstrumentComponent/DigitalDashBoard.vue
src/views/visual/board/components/InstrumentComponent/dashBoardComponent.config.ts
renamed from
src/views/data/board/components/InstrumentComponent/dashBoardComponent.config.ts
| ... | ... | @@ -241,7 +241,7 @@ export const getGradient = (key: Gradient, record: GradientInfo[] = []) => { |
| 241 | 241 | }; |
| 242 | 242 | |
| 243 | 243 | export const update_instrument_1_font = (radio: number) => { |
| 244 | - const basicFontSize = fontSize({ radio, basic: 20, max: 20, min: 12 }); | |
| 244 | + const basicFontSize = fontSize({ radio, basic: 16, max: 16, min: 12 }); | |
| 245 | 245 | return { |
| 246 | 246 | series: [ |
| 247 | 247 | { |
| ... | ... | @@ -258,7 +258,7 @@ export const update_instrument_1_font = (radio: number) => { |
| 258 | 258 | |
| 259 | 259 | export const update_instrument_2_font = (radio: number) => { |
| 260 | 260 | const axisLabelFontSize = fontSize({ radio, basic: 10, max: 16 }); |
| 261 | - const detailFontSize = fontSize({ radio, basic: 18, max: 18, min: 10 }); | |
| 261 | + const detailFontSize = fontSize({ radio, basic: 16, max: 16, min: 10 }); | |
| 262 | 262 | return { |
| 263 | 263 | series: [ |
| 264 | 264 | { | ... | ... |
src/views/visual/board/components/InstrumentComponent/digitalDashBoard.config.ts
renamed from
src/views/data/board/components/InstrumentComponent/digitalDashBoard.config.ts
src/views/visual/board/components/InstrumentComponent/index.ts
renamed from
src/views/data/board/components/InstrumentComponent/index.ts
src/views/visual/board/components/Other/CommandSendButton.vue
renamed from
src/views/data/board/components/Other/CommandSendButton.vue
src/views/visual/board/components/Other/IndicatorLight.vue
renamed from
src/views/data/board/components/Other/IndicatorLight.vue
src/views/visual/board/components/Other/InformationPanel.vue
renamed from
src/views/data/board/components/Other/InformationPanel.vue
src/views/visual/board/components/Other/LightBulbSwitch.vue
renamed from
src/views/data/board/components/Other/LightBulbSwitch.vue
src/views/visual/board/components/Other/RockerSwitch.vue
renamed from
src/views/data/board/components/Other/RockerSwitch.vue
src/views/visual/board/components/Other/SlidingSwitch.vue
renamed from
src/views/data/board/components/Other/SlidingSwitch.vue
src/views/visual/board/components/Other/ToggleSwitch.vue
renamed from
src/views/data/board/components/Other/ToggleSwitch.vue
src/views/visual/board/components/PanelDetailModal.vue
renamed from
src/views/data/board/components/PanelDetailModal.vue
src/views/visual/board/components/PictureComponent/PictureComponent.vue
renamed from
src/views/data/board/components/PictureComponent/PictureComponent.vue
src/views/visual/board/components/PictureComponent/index.ts
renamed from
src/views/data/board/components/PictureComponent/index.ts
src/views/visual/board/components/PictureComponent/pictureComponent.config.ts
renamed from
src/views/data/board/components/PictureComponent/pictureComponent.config.ts
src/views/visual/board/components/TextComponent/TextComponent.vue
renamed from
src/views/data/board/components/TextComponent/TextComponent.vue
src/views/visual/board/components/TextComponent/config.ts
renamed from
src/views/data/board/components/TextComponent/config.ts
src/views/visual/board/components/WidgetHeader/BaseWidgetHeader.vue
renamed from
src/views/data/board/components/WidgetHeader/BaseWidgetHeader.vue
src/views/visual/board/components/WidgetWrapper/WidgetWrapper.vue
renamed from
src/views/data/board/components/WidgetWrapper/WidgetWrapper.vue
src/views/visual/board/components/WidgetWrapper/type.ts
renamed from
src/views/data/board/components/WidgetWrapper/type.ts
src/views/visual/board/config/componentMap.ts
renamed from
src/views/data/board/config/componentMap.ts
src/views/visual/board/config/config.ts
renamed from
src/views/data/board/config/config.ts
src/views/visual/board/config/panelDetail.ts
renamed from
src/views/data/board/config/panelDetail.ts
src/views/visual/board/detail/components/BasicConfiguration.vue
renamed from
src/views/data/board/detail/components/BasicConfiguration.vue
src/views/visual/board/detail/components/DataBindModal.vue
renamed from
src/views/data/board/detail/components/DataBindModal.vue
src/views/visual/board/detail/components/HistoryTrendModal.vue
renamed from
src/views/data/board/detail/components/HistoryTrendModal.vue
src/views/visual/board/detail/components/VisualConfiguration.vue
renamed from
src/views/data/board/detail/components/VisualConfiguration.vue
src/views/visual/board/detail/components/VisualOptionsModal.vue
renamed from
src/views/data/board/detail/components/VisualOptionsModal.vue
src/views/visual/board/detail/components/VisualWidgetSelect.vue
renamed from
src/views/data/board/detail/components/VisualWidgetSelect.vue
src/views/visual/board/detail/config/basicConfiguration.ts
renamed from
src/views/data/board/detail/config/basicConfiguration.ts
src/views/visual/board/detail/config/help.ts
renamed from
src/views/data/board/detail/config/help.ts
src/views/visual/board/detail/config/historyTrend.config.ts
renamed from
src/views/data/board/detail/config/historyTrend.config.ts
src/views/visual/board/detail/config/util.ts
renamed from
src/views/data/board/detail/config/util.ts
src/views/visual/board/detail/config/visualOptions.ts
renamed from
src/views/data/board/detail/config/visualOptions.ts
src/views/visual/board/detail/index.vue
renamed from
src/views/data/board/detail/index.vue
src/views/visual/board/hook/useCalcGridLayout.ts
renamed from
src/views/data/board/hook/useCalcGridLayout.ts
src/views/visual/board/hook/useSocketConnect.ts
renamed from
src/views/data/board/hook/useSocketConnect.ts
src/views/visual/board/hook/useUpdateCenter.ts
renamed from
src/views/data/board/hook/useUpdateCenter.ts
src/views/visual/board/index.vue
renamed from
src/views/data/board/index.vue
| ... | ... | @@ -136,15 +136,17 @@ |
| 136 | 136 | |
| 137 | 137 | const handleViewBoard = (record: DataBoardRecord) => { |
| 138 | 138 | const hasDetailPermission = hasPermission('api:yt:data_component:list'); |
| 139 | - if (hasDetailPermission) | |
| 139 | + if (hasDetailPermission) { | |
| 140 | + const boardId = encode(record.id); | |
| 141 | + const boardName = encode(record.name); | |
| 140 | 142 | router.push({ |
| 141 | - name: 'dataBoardDetail', | |
| 143 | + path: `/visual/board/detail/${boardId}/${boardName}`, | |
| 142 | 144 | params: { |
| 143 | 145 | boardId: encode(record.id), |
| 144 | 146 | boardName: encode(record.name), |
| 145 | 147 | }, |
| 146 | 148 | }); |
| 147 | - else createMessage.warning('没有权限'); | |
| 149 | + } else createMessage.warning('没有权限'); | |
| 148 | 150 | }; |
| 149 | 151 | |
| 150 | 152 | const handlePagenationPosition = () => { | ... | ... |
src/views/visual/board/types/type.ts
renamed from
src/views/data/board/types/type.ts