diff --git a/src/config/config.ts b/src/config/config.ts index 9711206..dee2ee6 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -23,13 +23,13 @@ export const BAIDU_MAP_KEY: string = ""; export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 项目环境标识配置 部署时需更改对应的项目 -// export const COMPANY: string = ""; //标准版 +export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "zhzrf"; //中海·臻如府 // 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 = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "zkjc"; //中科佳成项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index c47a8a4..01e5f00 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -24,9 +24,9 @@ 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/sevenLargeScreen/indexL.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/sevenLargeScreen/rainfallMonitoring/rightCenter.vue b/src/views/sevenLargeScreen/rainfallMonitoring/rightCenter.vue index 5eb4eef..e0c83b8 100644 --- a/src/views/sevenLargeScreen/rainfallMonitoring/rightCenter.vue +++ b/src/views/sevenLargeScreen/rainfallMonitoring/rightCenter.vue @@ -56,6 +56,16 @@ let totalData = ref([ name: "风速报警", value: 0, radio: 0 + }, + { + name: "累计雨量报警", + value: 0, + radio: 0 + }, + { + name: "瞬时雨量报警", + value: 0, + radio: 0 } ]); //控制图形数据比例 @@ -87,6 +97,14 @@ let trafficWay = reactive([ { name: "风速报警", value: 10 + }, + { + name: "累计雨量报警", + value: 10 + }, + { + name: "瞬时雨量报警", + value: 10 } ]); let data = reactive([]); @@ -347,6 +365,7 @@ let option = ref({ show: false }, legend: { + type: "scroll", show: true, icon: "rect", itemGap: 20, @@ -373,7 +392,17 @@ let option = ref({ } return num; }, - data: ["大气压报警", "今日雨量报警", "昨日雨量报警", "风力报警", "温度报警", "湿度报警", "风速报警"], + data: [ + "大气压报警", + "今日雨量报警", + "昨日雨量报警", + "风力报警", + "温度报警", + "湿度报警", + "风速报警", + "累计雨量报警", + "瞬时雨量报警" + ], top: 20, right: 300, left: 280, @@ -460,6 +489,10 @@ const getList = async () => { totalData.value[i].value = res.result.airHumidityNum; } else if (totalData.value[i].name == "风速报警") { totalData.value[i].value = res.result.windSpeedNum; + } else if (totalData.value[i].name == "累计雨量报警") { + totalData.value[i].value = res.result.accumulatedRainfallNum; + } else if (totalData.value[i].name == "瞬时雨量报警") { + totalData.value[i].value = res.result.instantaneousRainfallNum; } } console.log("获取今日报警统计", totalData.value);