From d430f578c420117eb3b58b802aa7870cdedcfc6e Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Wed, 19 Jun 2024 19:36:55 +0800 Subject: [PATCH 1/6] =?UTF-8?q?flx=EF=BC=9A=E6=8F=90=E4=BA=A4=E6=8C=87?= =?UTF-8?q?=E6=8C=A5=E9=83=A8=E5=A4=A7=E5=B1=8F=E9=A3=8E=E9=99=A9=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/agjtCommandApi.ts | 30 +++ src/config/config.ts | 4 +- src/routers/modules/staticRouter.ts | 4 +- .../commandCenter/centerBottom.vue | 106 +++++++-- .../commandCenter/leftBottom.vue | 114 ++++++++-- .../commandScreen/commandCenter/rightAll.vue | 201 ++++++++++++++---- .../components/radarMapOption.vue | 25 +++ .../dialogCompnnents/radar-map-list.vue | 91 ++++---- 8 files changed, 459 insertions(+), 116 deletions(-) diff --git a/src/api/modules/agjtCommandApi.ts b/src/api/modules/agjtCommandApi.ts index fedb2862..00adc9f4 100644 --- a/src/api/modules/agjtCommandApi.ts +++ b/src/api/modules/agjtCommandApi.ts @@ -146,3 +146,33 @@ export const configWeekVideoSaveApi = (params: {}, showLoading: boolean) => { export const configWeekVideoListApi = (params: {}, showLoading: boolean) => { return http.get(BASEURL + `/xmgl/educationConfigWeekVideo/list`, params, { headers: { noLoading: showLoading } }); }; + +// 人员风险趋势 +export const getWorkerRiskByProjectApi = (params: {}, showLoading: boolean) => { + return http.get(BASEURL + `/xmgl/xzRiskPrediction/getWorkerRiskByProject`, params, { headers: { noLoading: showLoading } }); +}; +// 人员风险趋势(总包) +export const getWorkerRiskByEnterpriseApi = (params: {}, showLoading: boolean) => { + return http.get(BASEURL + `/xmgl/xzRiskPrediction/getWorkerRiskByEnterprise`, params, { headers: { noLoading: showLoading } }); +}; + +// 隐患风险预测趋势 +export const getSafetyRiskByProjectApi = (params: {}, showLoading: boolean) => { + return http.get(BASEURL + `/xmgl/xzRiskPrediction/getSafetyRiskByProject`, params, { headers: { noLoading: showLoading } }); +}; +// 隐患风险预测趋势(总包) +export const getSafetyRiskByEnterpriseApi = (params: {}, showLoading: boolean) => { + return http.get(BASEURL + `/xmgl/xzRiskPrediction/getSafetyRiskByEnterprise`, params, { headers: { noLoading: showLoading } }); +}; +// 特殊作业风险预测趋势 +export const getSpecialTrendApi = (params: {}, showLoading: boolean) => { + return http.post(BASEURL + `/xmgl/xzRiskPrediction/getSpecialTrend`, params, { headers: { noLoading: showLoading } }); +}; +// 事故风险预测趋势 +export const getRiskTrendByProjectApi = (params: {}, showLoading: boolean) => { + return http.post(BASEURL + `/xmgl/xzRiskPrediction/riskTrendByProject`, params, { headers: { noLoading: showLoading } }); +}; +// 事故风险预测趋势(总包) +export const getRiskTrendByMainEnterpriseApi = (params: {}, showLoading: boolean) => { + return http.post(BASEURL + `/xmgl/xzRiskPrediction/riskTrendByMainEnterprise`, params, { headers: { noLoading: showLoading } }); +}; diff --git a/src/config/config.ts b/src/config/config.ts index 93c500a1..8368c886 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -28,8 +28,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 -export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 -// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 +// export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 +export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "cqna"; //重庆市南岸区 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 1ac72047..550726a8 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -25,8 +25,8 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/large", name: "大屏", // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 - component: () => import("@/views/agjtLiveScreen/indexLive.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/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) diff --git a/src/views/commandScreen/commandCenter/centerBottom.vue b/src/views/commandScreen/commandCenter/centerBottom.vue index f04875b5..84c083af 100644 --- a/src/views/commandScreen/commandCenter/centerBottom.vue +++ b/src/views/commandScreen/commandCenter/centerBottom.vue @@ -160,6 +160,7 @@ import { getNoticeListApi } from "@/api/modules/projectOverview"; import { Vue3SeamlessScroll } from "vue3-seamless-scroll"; // import Card from "@/components/card.vue"; import { ref, onMounted, reactive } from "vue"; +import { getRiskTrendByProjectApi, getRiskTrendByMainEnterpriseApi } from "@/api/modules/agjtCommandApi"; import { getCountEmergencyTypedApi, getCountAlarmNumByEnterpriseApi } from "@/api/modules/projectOverview"; import * as echarts from "echarts"; import { GlobalStore } from "@/stores"; @@ -183,44 +184,123 @@ const randerInfo = reactive({ radius: "63%", dataList: [ { - value: [4200, 3000, 20000, 35000, 50000], + value: [0, 0, 0, 0, 0], name: "项目事故风险概率预测" // areaStyle: {} } ], indicator: [ - { name: "恶劣天气占比", max: 6500 }, - { name: "人员风险概率", max: 16000 }, - { name: "特殊作业风险概率", max: 30000 }, - { name: "月度安全评分", max: 38000 }, - { name: "隐患未整改占比", max: 52000 } + { name: "恶劣天气占比", max: 1 }, + { name: "人员风险概率", max: 1 }, + { name: "特殊作业风险概率", max: 1 }, + { name: "月度安全评分", max: 1 }, + { name: "隐患未整改占比", max: 1 } ], titleInfo: { titleLeft: "未来三天事故风险概率预测", titleRight: "查看各企业应急事故风险概率预测", percentage: 80 - } + }, + workerFlag: true, + workerList: [] as any[] }); //切换tab const handleTab = (val: number) => { - activeIfo.activeIndex = val; - if (activeIfo.activeIndex == 0) { + if (activeIfo.activeIndex == 1) { + activeIfo.activeIndex = val; getCountAlarmNumByEnterprise(false); + } else if (activeIfo.activeIndex == 0) { + getRiskTrendByProject(false, 1); } }; const emits = defineEmits(["openDialog"]); // 打开弹窗 -const openDialogData = () => { +const openDialogData = async () => { console.log("我打开了!!!!!!!!!!11"); + // 人员风险趋势 + const res: any = await getRiskTrendByMainEnterpriseApi( + { + projectSn: store.sn + }, + false + ); + const resultList = [] as any[]; + if (res.result) { + console.log("事故风险预测趋势", res.result); + res.result.forEach((item: any, index: number) => { + resultList.push({ + id: `list${index}`, + radius: "70%", + isLegend: "top", + radarCenter: ["50%", "60%"], + dataList: [ + { + value: [ + item.severeWeatherRate, + item.totalPersonnelRiskRate, + item.totalSpecialOperationsRiskRate, + item.monthlySafetyScoreRate, + item.unclosedHiddenDangersRate + ], + name: item.enterpriseName + // areaStyle: {} + } + ], + indicator: [ + { name: "恶劣天气占比", max: 1 }, + { name: "人员风险概率", max: 1 }, + { name: "特殊作业风险概率", max: 1 }, + { name: "月度安全评分", max: 1 }, + { name: "隐患未整改占比", max: 1 } + ], + titleInfo: { + titleLeft: "未来三天事故风险概率预测", + // titleRight: "查看各企业应急事故风险概率预测", + percentage: 80 + }, + workerFlag: true, + workerList: [ + item.severeWeatherRate, + item.totalPersonnelRiskRate, + item.totalSpecialOperationsRiskRate, + item.monthlySafetyScoreRate, + item.unclosedHiddenDangersRate + ] + }); + }); + } const resultInfo = { index: 11, title: "总包单位应急事故概率分析", - radarType: 2 + radarType: 2, + randerList: resultList }; emits("openDialog", resultInfo); }; +// 事故风险预测趋势 +const getRiskTrendByProject = async (showLoading: boolean, val: number) => { + const res: any = await getRiskTrendByProjectApi( + { + projectSn: store.sn + }, + showLoading + ); + if (res.result) { + console.log("事故风险预测趋势", res.result); + randerInfo.dataList[0].value = [ + res.result.severeWeatherRate, + res.result.totalPersonnelRiskRate, + res.result.totalSpecialOperationsRiskRate, + res.result.monthlySafetyScoreRate, + res.result.unclosedHiddenDangersRate + ]; + randerInfo.workerList = randerInfo.dataList[0].value; + } + activeIfo.activeIndex = val; +}; + const getNoticeList = async (showLoading: boolean) => { // const res: any = await getNoticeListApi({ projectSn: store.sn, type: 10, pageNo: 1, pageSize: 99999, }); // const res: any = await getNoticeListApi({ isBigScreen: 1, type: 32 }); // 公告 @@ -763,7 +843,9 @@ const getCountAlarmNumByEnterprise = async (showLoading: boolean) => { }; const setIntervalFn = (showLoading: boolean) => { getNoticeList(showLoading); - getCountAlarmNumByEnterprise(showLoading); + if (activeIfo.activeIndex == 1) { + getCountAlarmNumByEnterprise(showLoading); + } getMessCountEchartType(showLoading); }; onMounted(async () => { diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index 06bb5b4f..d1037213 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -151,7 +151,9 @@ import { getPersonTypeAndEduStatisticsApi, queryAttendanceOfEachCompanyApi, getCountTaskProgressApi, - queryCountEnterpriseApi + queryCountEnterpriseApi, + getWorkerRiskByProjectApi, + getWorkerRiskByEnterpriseApi } from "@/api/modules/agjtCommandApi"; import type { TabsPaneContext, ElMessageBox } from "element-plus"; import * as ElementPlusIconsVue from "@element-plus/icons-vue"; @@ -167,34 +169,78 @@ const randerInfo = reactive({ radius: "65%", dataList: [ { - value: [4200, 3000, 20000, 35000, 50000, 18000], + value: [0, 0, 0, 0, 0, 0], name: "项目人员风险" // areaStyle: {} } ], indicator: [ - { name: "高龄人员总数", max: 6500 }, - { name: "人员总数", max: 16000 }, - { name: "未闭合隐患", max: 30000 }, - { name: "特殊工种人员", max: 38000 }, - { name: "平均安全绩效评分", max: 52000 }, - { name: "平均培训通过率", max: 25000 } + { name: "高龄人员总数", max: 1 }, + { name: "人员总数", max: 1 }, + { name: "未闭合隐患", max: 1 }, + { name: "特殊工种人员", max: 1 }, + { name: "平均安全绩效评分", max: 1 }, + { name: "平均培训通过率", max: 1 } ], titleInfo: { titleLeft: "未来三天人员风险概率预测", titleRight: "查看各企业人员风险概率预测", percentage: 1 - } + }, + workerFlag: true, + workerList: [] as any[] }); const emits = defineEmits(["openDialog"]); // 打开弹窗 -const openDialogData = () => { +const openDialogData = async () => { console.log("我打开了!!!!!!!!!!11"); + // 人员风险趋势 + const res: any = await getWorkerRiskByEnterpriseApi( + { + projectSn: store.sn + }, + false + ); + const resultList = [] as any[]; + if (res.result) { + console.log("人员风险趋势", res.result); + res.result.forEach((item: any, index: number) => { + resultList.push({ + id: `list${index}`, + radius: "70%", + isLegend: "top", + radarCenter: ["50%", "60%"], + dataList: [ + { + value: [item.age, 1, item.safe, item.workerType, item.security, item.exam], + name: item.enterpriseName + // areaStyle: {} + } + ], + indicator: [ + { name: "高龄人员总数", max: 1 }, + { name: "人员总数", max: 1 }, + { name: "未闭合隐患", max: 1 }, + { name: "特殊工种人员", max: 1 }, + { name: "平均安全绩效评分", max: 1 }, + { name: "平均培训通过率", max: 1 } + ], + titleInfo: { + titleLeft: "未来三天人员风险概率预测", + // titleRight: "查看各企业应急事故风险概率预测", + percentage: 80 + }, + workerFlag: true, + workerList: [item.age, item.total, item.safe, item.workerType, item.security, item.exam] + }); + }); + } const resultInfo = { index: 11, title: "总包单位人员风险概率分析", - radarType: 1 + radarType: 1, + randerList: resultList }; emits("openDialog", resultInfo); }; @@ -253,18 +299,20 @@ const queryAttendanceOfEachCompany = async (showLoading: boolean) => { //切换tab const handleTab = (val: number) => { - activeIndex.value = val; - if (isFlag.value && activeIndex.value == 0) { + if (isFlag.value && activeIndex.value == 1) { + activeIndex.value = val; queryAttendanceOfEachCompany(false); + } else if (activeIndex.value == 0) { + getWorkerRiskByProject(false, 1); } }; //绘画柱状图 function drawBar() { type EChartsOption = echarts.EChartsOption; - var chartDom = document.getElementById("bar")!; - var myChart = echarts.init(chartDom); - var option: EChartsOption; + let chartDom = document.getElementById("bar")!; + let myChart = echarts.init(chartDom); + let option: EChartsOption; option = { xAxis: { @@ -446,10 +494,42 @@ const queryCountEnterprise = async (showLoading: boolean) => { processList.value = res.result; } }; +// 人员风险趋势 +const getWorkerRiskByProject = async (showLoading: boolean, val: number) => { + const res: any = await getWorkerRiskByProjectApi( + { + projectSn: store.sn + }, + showLoading + ); + if (res.result) { + console.log("人员风险趋势", res.result); + randerInfo.dataList[0].value = [ + res.result.age, + 1, + res.result.safe, + res.result.workerType, + res.result.security, + res.result.exam + ]; + randerInfo.workerList = [ + res.result.age, + res.result.total, + res.result.safe, + res.result.workerType, + res.result.security, + res.result.exam + ]; + } + activeIndex.value = val; +}; + const setIntervalFn = (showLoading: boolean) => { // drawBar() getPersonTypeAndEduStatistics(showLoading); - queryAttendanceOfEachCompany(showLoading); + if (activeIndex.value == 0) { + queryAttendanceOfEachCompany(showLoading); + } getCountTaskProgress(showLoading); queryCountEnterprise(showLoading); }; diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index 5f655c2e..2becefcf 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -54,7 +54,7 @@

暂无数据

- --> + -->
@@ -64,8 +64,8 @@
@@ -75,14 +75,14 @@
-
+

暂无数据

-
+
@@ -92,8 +92,8 @@
@@ -103,15 +103,17 @@
-
+

暂无数据

-
- +
+
+ +
+
-->
@@ -186,6 +188,7 @@ import radarMapOption from "@/views/commandScreen/components/radarMapOption.vue" import { onMounted, ref, watch, reactive } from "vue"; import { GlobalStore } from "@/stores"; import leftBottom from "@/views/commandScreen/components/leftBottom.vue"; +import { getSafetyRiskByProjectApi, getSafetyRiskByEnterpriseApi, getSpecialTrendApi } from "@/api/modules/agjtCommandApi"; import { // getProjectInspectRecordCountApi, // selectQualityStatisticsApi @@ -205,18 +208,58 @@ let questionTotal = ref(0 as any); const emits = defineEmits(["openDialog"]); // 打开弹窗 -const openDialogData = () => { +const openDialogData = async () => { console.log("我打开了!!!!!!!!!!11"); + // 人员风险趋势 + const res: any = await getSafetyRiskByEnterpriseApi( + { + projectSn: store.sn + }, + false + ); + const resultList = [] as any[]; + if (res.result) { + console.log("隐患风险预测趋势", res.result); + res.result.forEach((item: any, index: number) => { + resultList.push({ + id: `list${index}`, + radius: "70%", + isLegend: "top", + radarCenter: ["50%", "60%"], + dataList: [ + { + value: [item.security, item.safe, item.levelRisk, item.limitTime], + name: item.enterpriseName + // areaStyle: {} + } + ], + indicator: [ + { name: "隐患未闭合", max: 1 }, + { name: "平均安全绩效评分", max: 1 }, + { name: "重大、较大隐患", max: 1 }, + { name: "隐患超期整改", max: 1 } + ], + titleInfo: { + titleLeft: "未来三天安全隐患风险概率预测", + // titleRight: "查看各企业应急事故风险概率预测", + percentage: 80 + }, + workerFlag: true, + workerList: [item.security, item.safe, item.levelRisk, item.limitTime] + }); + }); + } const resultInfo = { index: 11, title: "总包单位安全隐患概率分析", - radarType: 3 + radarType: 3, + randerList: resultList }; emits("openDialog", resultInfo); }; -const activeIfo = reactive({ - activeIndex: 1, +const activeInfo = reactive({ + activeIndex: 0, activeTitleList: [ { id: 1, @@ -231,7 +274,9 @@ const activeIfo = reactive({ title: "特殊作业统计分析" }, { id: 2, title: "特殊作业风险预测趋势" } - ] + ], + rightFlag: true, + rightCount: 1 }); const randerInfo = reactive({ id: "radarMap3", @@ -240,22 +285,24 @@ const randerInfo = reactive({ radius: "55%", dataList: [ { - value: [4200, 3000, 20000, 35000], + value: [0, 0, 0, 0], name: "项目安全隐患风险概率预测" // areaStyle: {} } ], indicator: [ - { name: "隐患未闭合", max: 6500 }, - { name: "平均安全绩效评分", max: 16000 }, - { name: "重大、较大隐患", max: 30000 }, - { name: "隐患超期整改", max: 38000 } + { name: "隐患未闭合", max: 1 }, + { name: "平均安全绩效评分", max: 1 }, + { name: "重大、较大隐患", max: 1 }, + { name: "隐患超期整改", max: 1 } ], titleInfo: { titleLeft: "未来三天安全隐患风险概率预测", titleRight: "查看各企业安全隐患风险概率预测", percentage: 80 - } + }, + workerFlag: true, + workerList: [] as any[] }); const randerInfo2 = reactive({ id: "radarMap4", @@ -264,42 +311,103 @@ const randerInfo2 = reactive({ radius: "55%", dataList: [ { - value: [4200, 3000, 20000, 35000, 6500, 6500, 18000, 18000], + value: [0, 0, 0, 0, 0, 0, 0, 0], name: "恶劣天气影响风险概率预测" // areaStyle: {} } ], indicator: [ - { name: "动火作业", max: 6500 }, - { name: "高处作业", max: 16000 }, - { name: "盲板抽堵作业", max: 30000 }, - { name: "受限空间作业", max: 38000 }, - { name: "断路作业", max: 6500 }, - { name: "临时用电", max: 16000 }, - { name: "吊装安全作业", max: 30000 }, - { name: "动土作业", max: 38000 } + { name: "动火作业", max: 1 }, + { name: "高处作业", max: 1 }, + { name: "盲板抽堵作业", max: 1 }, + { name: "受限空间作业", max: 1 }, + { name: "断路作业", max: 1 }, + { name: "临时用电", max: 1 }, + { name: "吊装安全作业", max: 1 }, + { name: "动土作业", max: 1 } ], titleInfo: { titleLeft: "未来三天特殊作业风险概率预测", // titleRight: "查看各企业特殊作业风险概率预测", percentage: 80 - } + }, + workerFlag: true, + workerList: [] as any[] }); //切换tab const handleTab = (val: number, type: number) => { if (type == 1) { - activeIfo.activeIndex = val; - if (activeIfo.activeIndex == 0) { + if (activeInfo.activeIndex == 1) { + activeInfo.activeIndex = val; getInspectionRiskChart(false); + } else if (activeInfo.activeIndex == 0) { + getSafetyRiskByProject(false, 1); } } else if (type == 2) { - activeIfo.activeIndex2 = val; - if (activeIfo.activeIndex2 == 0) { + if (activeInfo.activeIndex2 == 1) { + activeInfo.activeIndex2 = val; getCountAllSpecial(false); + } else if (activeInfo.activeIndex2 == 0) { + getSpecialTrend(false, 1); } } }; +// 隐患风险预测趋势 +const getSafetyRiskByProject = async (showLoading: boolean, val: number) => { + const res: any = await getSafetyRiskByProjectApi( + { + projectSn: store.sn + }, + showLoading + ); + if (res.result) { + console.log("隐患风险预测趋势", res.result); + randerInfo.dataList[0].value = [res.result.security, res.result.safe, res.result.levelRisk, res.result.limitTime]; + randerInfo.workerList = [res.result.security, res.result.safe, res.result.levelRisk, res.result.limitTime]; + } + activeInfo.activeIndex = val; +}; + +const onRightDap = () => { + activeInfo.rightCount = activeInfo.rightCount == 1 ? 2 : 1; + getSpecialTrend(false, 1, true); +}; +// 特殊作业风险预测趋势 +const getSpecialTrend = async (showLoading: boolean, val: number, isRight?: boolean) => { + const res: any = await getSpecialTrendApi( + { + projectSn: store.sn, + type: activeInfo.rightCount + }, + showLoading + ); + if (res.result) { + console.log(activeInfo.rightCount); + console.log("特殊作业风险预测趋势", res.result); + randerInfo2.dataList = [ + { + name: activeInfo.rightCount == 1 ? "恶劣天气影响风险概率预测" : "隐患未消项影响风险概率预测", + value: [ + res.result.specialOperationFireSafety, + res.result.highJobSafe, + res.result.blindPlatePlugSafe, + res.result.limitSpaceSafe, + res.result.openCircuitSafe, + res.result.temporaryElectricitySafe, + res.result.hoistSafetyWork, + res.result.groundSafet + ] + } + ]; + randerInfo2.workerList = randerInfo2.dataList[0].value; + } + activeInfo.activeIndex2 = val; + if (isRight) { + activeInfo.rightFlag = !activeInfo.rightFlag; + } +}; + let dateRange = ref([] as any); let majorDangerCount = ref(0 as any); @@ -1680,8 +1788,13 @@ const getCountAllSpecial = async (showLoading: boolean) => { }; const setIntervalFn = (showLoading: boolean) => { - getInspectionRiskChart(showLoading); - getCountAllSpecial(showLoading); + if (activeInfo.activeIndex == 0) { + getInspectionRiskChart(showLoading); + } + if (activeInfo.activeIndex2 == 0) { + getCountAllSpecial(showLoading); + } + getSafeInfo(showLoading); qualityInfo(showLoading); getSelectQualityStatisticsNum(showLoading); @@ -1703,6 +1816,7 @@ onMounted(async () => { color: white; left: 42%; } + .safetext2 { position: absolute; top: 6%; @@ -2075,6 +2189,17 @@ onMounted(async () => { } } +.right-dap { + width: 30px; + height: 30px; + background-image: url(@/assets/images/right-dap.png); + background-repeat: no-repeat; + background-size: 100% 100%; + position: absolute; + top: 50px; + right: 25px; + cursor: pointer; +} ::v-deep .el-input__inner { color: #fff; } diff --git a/src/views/commandScreen/components/radarMapOption.vue b/src/views/commandScreen/components/radarMapOption.vue index a04bc808..5aec63e3 100644 --- a/src/views/commandScreen/components/radarMapOption.vue +++ b/src/views/commandScreen/components/radarMapOption.vue @@ -70,6 +70,30 @@ function radarMapEchart() { return textHTML; } } + : props.randerInfo.workerFlag + ? { + extraCssText: "white-space:pre-wrap;box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);", + formatter: function (params: any) { + // const obj = safeList[params.dataIndex]; + + const textHTML = params.value + .map((item: any, index: number) => { + let htmlobj = ""; + if (index == 0) { + htmlobj = "
" + params.name + "
"; + } + const itemUp = + props.randerInfo.workerList[index] > 1 + ? props.randerInfo.workerList[index] + : props.randerInfo.workerList[index] * 100 + "%"; + htmlobj = "
" + props.randerInfo.indicator[index].name + "：" + itemUp + "
"; + return htmlobj; + }) + .join(""); + console.log(11111111, textHTML); + return textHTML; + } + } : {}; let isLegend = props.randerInfo.isLegend == "right" @@ -80,6 +104,7 @@ function radarMapEchart() { position: "inside" } : { top: "2%" }; + console.log(props.randerInfo.dataList); let option = { legend: { ...isLegend, diff --git a/src/views/commandScreen/dialogCompnnents/radar-map-list.vue b/src/views/commandScreen/dialogCompnnents/radar-map-list.vue index f25c7785..49c80463 100644 --- a/src/views/commandScreen/dialogCompnnents/radar-map-list.vue +++ b/src/views/commandScreen/dialogCompnnents/radar-map-list.vue @@ -2,7 +2,7 @@
-
+
@@ -12,58 +12,59 @@ From 4f99277a9fcaab08fe3ebce953c0838efdef348d Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Wed, 19 Jun 2024 22:24:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?flx=EF=BC=9A=E6=8F=90=E4=BA=A4=E6=80=BB?= =?UTF-8?q?=E8=A7=88=E5=A4=A7=E5=B1=8F=E5=92=8C=E9=A1=B9=E7=9B=AE=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/config/config.ts | 4 ++-- src/routers/modules/staticRouter.ts | 4 ++-- .../projectOverview/leftCenter.vue | 2 +- .../projectOverview/rightCenter.vue | 13 ++++++++++++- .../overviewScreen/commandCenter/leftBottom.vue | 2 +- src/views/overviewScreen/commandCenter/rightAll.vue | 13 ++++++++++++- 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.env.development b/.env.development index 4a682ebb..14d9660a 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.155:19111' -VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 -# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 +# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' diff --git a/src/config/config.ts b/src/config/config.ts index 8368c886..6a513159 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -29,9 +29,9 @@ 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 = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 -// export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 +export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "cqna"; //重庆市南岸区 // export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 550726a8..644f1805 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -25,9 +25,9 @@ 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/overviewScreen/indexCommand.vue"), //总览大屏 // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue index 9edbacf7..046ccae6 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue @@ -123,7 +123,7 @@ const drawOneEchart = () => { }, series: [ { - name: "Access From", + // name: "Access From", type: "pie", top: "2%", radius: ["35%", "60%"], diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue index 7ad78068..518aab93 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue @@ -1,7 +1,7 @@