From 71e5fa676127cf0800a787b1f836572822abef2f Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Fri, 13 Mar 2026 10:52:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=8F=8A=E9=9A=90=E8=97=8F=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Equipment/Equipment/WuRenJi/config.ts | 1 - .../components/Equipment/Equipment/WuRenJi/index.vue | 5 ++--- .../Zhigan/Zhigan/ZhiGan_DroneList/config.ts | 12 ------------ .../Zhigan/Zhigan/ZhiGan_DroneList/index.vue | 7 +++---- src/router/routes/modules/bigscreen.ts | 2 +- src/router/routes/modules/dashboard.ts | 3 ++- 6 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/packages/components/Equipment/Equipment/WuRenJi/config.ts b/src/packages/components/Equipment/Equipment/WuRenJi/config.ts index 450c3f2..4f76da6 100644 --- a/src/packages/components/Equipment/Equipment/WuRenJi/config.ts +++ b/src/packages/components/Equipment/Equipment/WuRenJi/config.ts @@ -19,6 +19,5 @@ export default class Config extends PublicConfigClass implements CreateComponent public attr = { ...chartInitConfig, w: 117, h: 168, zIndex: 1 } public chartConfig = cloneDeep(WuRenJiConfig) public option = cloneDeep(option) - public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from ' }, } public filter = "return res.result;" } diff --git a/src/packages/components/Equipment/Equipment/WuRenJi/index.vue b/src/packages/components/Equipment/Equipment/WuRenJi/index.vue index d26ef2d..e482684 100644 --- a/src/packages/components/Equipment/Equipment/WuRenJi/index.vue +++ b/src/packages/components/Equipment/Equipment/WuRenJi/index.vue @@ -38,9 +38,8 @@ onMounted(() => { }) }) // 数据callback处理（预览时触发） - useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { -// props.chartConfig.option.dataset = resData; -}); + // useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { + // }); const chartEditStore = useChartEditStore(); diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/config.ts b/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/config.ts index 28006b8..603ecf8 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/config.ts +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/config.ts @@ -24,18 +24,6 @@ export const option = { export default class Config extends PublicConfigClass implements CreateComponentType { public key = ZhiGan_DroneListConfig.key public attr = { ...chartInitConfig, w: 506, h: 378, zIndex: -1 } - public request = { - ...requestSqlConfig, - requestHttpType: "get", - requestContentType: 0, - requestUrl: VITE_GLOB_API_URL_SITUATION+"/api/Manage/GetUavPageList", - requestParams: { - Params: { - page: "1", - limit: "999" - } - } - } public filter = "return res.result.items;" public chartConfig = cloneDeep(ZhiGan_DroneListConfig) public option = cloneDeep(option) diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/index.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/index.vue index 8af452c..65d5c94 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneList/index.vue @@ -67,7 +67,6 @@ if (!getClient() || !getClient().connected) { // createConnection(); } - // 获取eventBus传过来的值 GetUavPageList().then(resData => { option.dataset = resData.items; resData.items.forEach(item => { @@ -99,9 +98,9 @@ }, 1000); }); - // 数据callback处理（预览时触发） - useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { - }); + // // 数据callback处理（预览时触发） + // useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { + // }); const flyControl = (item) => { activeDrone.value = item.id airPortStoreVal.setAirPort('sn', item.psn); diff --git a/src/router/routes/modules/bigscreen.ts b/src/router/routes/modules/bigscreen.ts index ff946bd..0bd584a 100644 --- a/src/router/routes/modules/bigscreen.ts +++ b/src/router/routes/modules/bigscreen.ts @@ -26,4 +26,4 @@ const bigscreen: AppRouteModule = { ], }; -export default bigscreen; +// export default bigscreen; diff --git a/src/router/routes/modules/dashboard.ts b/src/router/routes/modules/dashboard.ts index e28e9b3..de9e6e2 100644 --- a/src/router/routes/modules/dashboard.ts +++ b/src/router/routes/modules/dashboard.ts @@ -11,13 +11,14 @@ const dashboard: AppRouteModule = { meta: { orderNo: 10, icon: 'ion:grid-outline', - title: t('routes.dashboard.dashboard'), + title: '首页', }, children: [ { path: '/dashboard/analysis', name: 'Analysis', meta: { + icon: 'material-symbols:house-outline-rounded', title: t('routes.dashboard.analysis'), }, component: () => import('@/views/home/index.vue'), From 6991c104f228dffb26d6322b47ac222985c884c6 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Fri, 13 Mar 2026 10:52:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A3=8E=E9=80=9F=E9=A3=8E=E5=90=91=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=8F=8F=E8=BF=B0=E6=80=A7?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Decorates/Titles/Weather/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/packages/components/Decorates/Titles/Weather/index.vue b/src/packages/components/Decorates/Titles/Weather/index.vue index c8e6e98..8393252 100644 --- a/src/packages/components/Decorates/Titles/Weather/index.vue +++ b/src/packages/components/Decorates/Titles/Weather/index.vue @@ -14,7 +14,10 @@
- {{`风速：${windPower}m/s`}}{{`风向： ${winddirection}`}}
+   + {{`${windPower}m/s`}} +   + {{`${winddirection}`}} @@ -24,6 +27,7 @@ import dayjs from 'dayjs'; import { CreateComponentType } from '@/packages/index.d'; import { GoIconify } from '@/components/GoIconify'; + import Icon from '@/components/Icon/Icon.vue'; const props = defineProps({ chartConfig: { type: Object as PropType, From 1defb26689b98bfb3ae0324bb44e97e5d83cb960 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Fri, 13 Mar 2026 13:51:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=81=AB=E6=83=85=E7=BA=BF=E7=B4=A2?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Equipment/Equipment/HuoQingXianSuo/index.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue b/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue index 556db8d..81577a9 100644 --- a/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue +++ b/src/packages/components/Equipment/Equipment/HuoQingXianSuo/index.vue @@ -17,7 +17,7 @@ v-for="(item, index) in sectionDatas" @click="handlerFireDetail(item)" > -
+
{{ item.describe }}
{{ item.degreeType }}
@@ -392,6 +392,7 @@ const getFileImage = (type) => { height: calc(100% - 40px); margin-left: 4%; overflow: auto; + padding-right: 5px; img { width: 21px; height: 21px; @@ -400,6 +401,7 @@ const getFileImage = (type) => { width: 15px; height: 15px; margin-left: 3px; + margin-right: 10px; } } .sectionLi { @@ -413,7 +415,9 @@ const getFileImage = (type) => { text-overflow: ellipsis; white-space: nowrap; color: v-bind('titleColor'); - font-size: v-bind('titleSize+"px"'); + // font-size: v-bind('titleSize+"px"'); + font-size: 14px; + font-weight: 600; } .dataStyle { font-size: 14px; @@ -437,6 +441,9 @@ const getFileImage = (type) => { .desStyle { color: v-bind('desColor'); font-size: v-bind('desSize+"px"'); + display: flex; + align-items: center; + height: 100%; } .desImg { margin-right: 10px; @@ -448,7 +455,7 @@ const getFileImage = (type) => { margin-right: 6px; } .mt-1 { - margin-top: 8px; + // margin-top: 8px; } From 13bf37ae8c0e8fab5e6cc82b95f208f4aee49aaf Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Fri, 13 Mar 2026 14:03:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Tasks/Tasks/TaskBanner/index.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/packages/components/Tasks/Tasks/TaskBanner/index.vue b/src/packages/components/Tasks/Tasks/TaskBanner/index.vue index d65548f..43037ac 100644 --- a/src/packages/components/Tasks/Tasks/TaskBanner/index.vue +++ b/src/packages/components/Tasks/Tasks/TaskBanner/index.vue @@ -12,7 +12,7 @@
-
+
{{ item.title }}
{{ item.desc }}
@@ -162,7 +162,7 @@ const handlerShowColumns = ()=> { margin: 0 auto; } .tasktitlesbox{ - width: 120px; + width: 90px; height: 30px; } .dots{ @@ -175,6 +175,11 @@ const handlerShowColumns = ()=> { .titleText{ color: v-bind('titleColor'); font-size: v-bind('titleSize+"px"'); + width: 72px; + text-align: right; + margin-right: 10px; + color: #9aa4af; + flex-shrink: 0; } .desStyle{ width: calc(100% - 120px); From cc7e9267e7d8c57021829af4f95009827a2c5995 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Fri, 13 Mar 2026 15:00:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=BC=A9=E5=87=8F=E5=B0=8F=E6=95=B0=E7=82=B9?= =?UTF-8?q?=E5=90=8E=E4=BD=8D=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue b/src/packages/components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue index 234ba03..76c822c 100644 --- a/src/packages/components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue +++ b/src/packages/components/Zhichu/Zhichu/ResourceAnalysisReport/index.vue @@ -1,6 +1,6 @@