From 2695f1efd089dd9ab73f7dc069e313097c6bf942 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Fri, 21 Jun 2024 18:47:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8C=87?= =?UTF-8?q?=E6=8C=A5=E9=83=A8=E5=A4=A7=E5=B1=8F=E6=A0=B7=E5=BC=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/config.ts | 4 ++-- src/routers/modules/staticRouter.ts | 4 ++-- .../commandCenter/centerBottom.vue | 2 ++ .../commandScreen/commandCenter/leftBottom.vue | 18 ++++++++++-------- .../commandScreen/commandCenter/rightAll.vue | 7 +++++-- .../components/radarMapOption.vue | 12 ++++++++---- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/config/config.ts b/src/config/config.ts index ff60707..ff2368c 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -29,8 +29,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 -// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 -export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 +export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 +// export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "zkjc"; //中科佳成项目 // export const COMPANY: string = "cqna"; //重庆南岸项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index fbcf688..550726a 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -25,10 +25,10 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/large", name: "大屏", // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 + component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 // component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 // component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏 - component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 + // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ { diff --git a/src/views/commandScreen/commandCenter/centerBottom.vue b/src/views/commandScreen/commandCenter/centerBottom.vue index 9b81dbd..32f0ba6 100644 --- a/src/views/commandScreen/commandCenter/centerBottom.vue +++ b/src/views/commandScreen/commandCenter/centerBottom.vue @@ -179,6 +179,7 @@ const activeIfo = reactive({ }); const randerInfo = reactive({ id: "radarMap2", + fontSize: 12, isLegend: "right", radarCenter: ["34%", "50%"], radius: "63%", @@ -231,6 +232,7 @@ const openDialogData = async () => { res.result.forEach((item: any, index: number) => { resultList.push({ id: `list${index}`, + fontSize: 12, radius: "70%", isLegend: "top", radarCenter: ["50%", "60%"], diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index 1f0924e..a34953f 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -164,6 +164,7 @@ const store = GlobalStore(); const randerInfo = reactive({ id: "radarMap1", + fontSize: 12, isLegend: "right", radarCenter: ["34%", "50%"], radius: "65%", @@ -208,12 +209,13 @@ const openDialogData = async () => { res.result.forEach((item: any, index: number) => { resultList.push({ id: `list${index}`, - radius: "70%", + fontSize: 12, + radius: "60%", isLegend: "top", - radarCenter: ["50%", "60%"], + radarCenter: ["50%", "56%"], dataList: [ { - value: [item.age, 1, item.safe, item.workerType, item.security, item.exam], + value: [item.age, 1, item.security, item.workerType, item.safe, item.exam], name: item.enterpriseName // areaStyle: {} } @@ -232,7 +234,7 @@ const openDialogData = async () => { percentage: item.area }, workerFlag: true, - workerList: [item.age, item.total, item.safe, item.workerType, item.security, item.exam] + workerList: [item.age, item.total, item.security, item.workerType, item.safe, item.exam] }); }); } @@ -507,17 +509,17 @@ const getWorkerRiskByProject = async (showLoading: boolean, val: number) => { randerInfo.dataList[0].value = [ res.result.age, 1, - res.result.safe, - res.result.workerType, res.result.security, + res.result.workerType, + res.result.safe, res.result.exam ]; randerInfo.workerList = [ res.result.age, res.result.total, - res.result.safe, - res.result.workerType, res.result.security, + res.result.workerType, + res.result.safe, res.result.exam ]; randerInfo.titleInfo.percentage = res.result.area; diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index f374e39..85bd139 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -223,6 +223,7 @@ const openDialogData = async () => { res.result.forEach((item: any, index: number) => { resultList.push({ id: `list${index}`, + fontSize: 12, radius: "60%", isLegend: "top", radarCenter: ["50%", "55%"], @@ -280,9 +281,10 @@ const activeInfo = reactive({ }); const randerInfo = reactive({ id: "radarMap3", + fontSize: 10, isLegend: "right", radarCenter: ["34%", "50%"], - radius: "55%", + radius: "68%", dataList: [ { value: [0, 0, 0, 0], @@ -306,9 +308,10 @@ const randerInfo = reactive({ }); const randerInfo2 = reactive({ id: "radarMap4", + fontSize: 10, isLegend: "right", radarCenter: ["34%", "50%"], - radius: "55%", + radius: "70%", dataList: [ { value: [0, 0, 0, 0, 0, 0, 0, 0], diff --git a/src/views/commandScreen/components/radarMapOption.vue b/src/views/commandScreen/components/radarMapOption.vue index f8717b1..9f80fa1 100644 --- a/src/views/commandScreen/components/radarMapOption.vue +++ b/src/views/commandScreen/components/radarMapOption.vue @@ -104,13 +104,13 @@ function radarMapEchart() { position: "inside" } : { top: "2%" }; - console.log(props.randerInfo.dataList); + console.log(props.randerInfo.dataList, props.randerInfo.fontSize); let option = { legend: { ...isLegend, textStyle: { color: "#AAAAAA", - fontSize: 10 + fontSize: props.randerInfo.fontSize > 10 ? props.randerInfo.fontSize : 10 }, itemWidth: 20, itemHeight: 10, @@ -134,8 +134,12 @@ function radarMapEchart() { }, axisName: { color: "#AAAAAA", - fontSize: 10 + fontSize: props.randerInfo.fontSize ? props.randerInfo.fontSize : 10 }, + name: { + fontSize: props.randerInfo.fontSize ? props.randerInfo.fontSize : 10 + }, + nameGap: 8, splitArea: { areaStyle: { color: ["#3F3C54", "#373551"], @@ -146,7 +150,7 @@ function radarMapEchart() { }, series: [ { - name: "Budget vs spending", + // name: "Budget vs spending", type: "radar", data: props.randerInfo.dataList } From ef179d8ae7b91869d886530eda85a3dd1a00a3e0 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Mon, 24 Jun 2024 14:27:58 +0800 Subject: [PATCH 2/9] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=80=BB?= =?UTF-8?q?=E8=A7=88=E5=A4=A7=E5=B1=8F=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E6=8C=87=E6=8C=A5=E9=83=A8=E5=A4=A7=E5=B1=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commandScreen/components/radarMapOption.vue | 10 +++++----- .../overviewScreen/commandCenter/rightAll.vue | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/views/commandScreen/components/radarMapOption.vue b/src/views/commandScreen/components/radarMapOption.vue index 9f80fa1..1cd40bd 100644 --- a/src/views/commandScreen/components/radarMapOption.vue +++ b/src/views/commandScreen/components/radarMapOption.vue @@ -58,15 +58,15 @@ function radarMapEchart() { '
' + props.randerInfo.indicator[index].name + "：" + - item * 100 + + (item * 100).toFixed(2) + "%
"; } else { - htmlobj = "
" + props.randerInfo.indicator[index].name + "：" + item * 100 + "%
"; + htmlobj = "
" + props.randerInfo.indicator[index].name + "：" + (item * 100).toFixed(2) + "%
"; } return htmlobj; }) .join(""); - console.log(11111111, textHTML); + // console.log(11111111, textHTML); return textHTML; } } @@ -85,12 +85,12 @@ function radarMapEchart() { const itemUp = props.randerInfo.workerList[index] > 1 ? props.randerInfo.workerList[index] - : props.randerInfo.workerList[index] * 100 + "%"; + : (props.randerInfo.workerList[index] * 100).toFixed(2) + "%"; htmlobj = "
" + props.randerInfo.indicator[index].name + "：" + itemUp + "
"; return htmlobj; }) .join(""); - console.log(11111111, textHTML); + // console.log(11111111, textHTML); return textHTML; } } diff --git a/src/views/overviewScreen/commandCenter/rightAll.vue b/src/views/overviewScreen/commandCenter/rightAll.vue index 01c5ee7..5ad520c 100644 --- a/src/views/overviewScreen/commandCenter/rightAll.vue +++ b/src/views/overviewScreen/commandCenter/rightAll.vue @@ -658,8 +658,10 @@ function getManAnalysisEchart() { }, legend: { trigger: "item", + type: "scroll", //legend要多，进行分页处理 position: "inside", top: "3%", + left: "1%", x: "center", textStyle: { color: "#fff" @@ -667,7 +669,19 @@ function getManAnalysisEchart() { itemWidth: 10, itemHeight: 10, icon: "roundRect", - data: workerRegionInfo.workerRegionList.map((item: any) => item.regionName) + data: workerRegionInfo.workerRegionList.map((item: any) => item.regionName), + formatter: function (data: any) { + if (workerRegionInfo.workerRegionList && workerRegionInfo.workerRegionList.length) { + for (let i = 0; i < workerRegionInfo.workerRegionList.length; i++) { + if (data === workerRegionInfo.workerRegionList[i].regionName) { + if (data == "无") return; + + const newData = data.length > 5 ? data.substr(0, 5) + "..." : data; + return newData; + } + } + } + } }, // color: ["#2BA5FF", "#F97766", "#1EF1FF", "#1EF1FF"], grid: { From 354b197ae5aa525bfe9b14068812ed82c93bcb99 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Mon, 24 Jun 2024 15:22:10 +0800 Subject: [PATCH 3/9] =?UTF-8?q?flx=EF=BC=9A=E8=B0=83=E6=95=B4=E6=80=BB?= =?UTF-8?q?=E8=A7=88=E5=A4=A7=E5=B1=8F=E6=A0=B7=E5=BC=8F=E9=81=AE=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/overviewScreen/commandCenter/rightAll.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/overviewScreen/commandCenter/rightAll.vue b/src/views/overviewScreen/commandCenter/rightAll.vue index 5ad520c..bd0f7b2 100644 --- a/src/views/overviewScreen/commandCenter/rightAll.vue +++ b/src/views/overviewScreen/commandCenter/rightAll.vue @@ -660,7 +660,7 @@ function getManAnalysisEchart() { trigger: "item", type: "scroll", //legend要多，进行分页处理 position: "inside", - top: "3%", + top: "2%", left: "1%", x: "center", textStyle: { From db07f825c3da4305cc62d8f5f760231e1a2bd8fb Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Mon, 24 Jun 2024 16:19:39 +0800 Subject: [PATCH 4/9] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E9=A3=8E=E9=99=A9=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/commandScreen/components/radarMapOption.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/commandScreen/components/radarMapOption.vue b/src/views/commandScreen/components/radarMapOption.vue index 1cd40bd..3ef0534 100644 --- a/src/views/commandScreen/components/radarMapOption.vue +++ b/src/views/commandScreen/components/radarMapOption.vue @@ -1,6 +1,6 @@