From 0397588c96dcdcc42903f482f58e9da245b8a39b Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Wed, 3 Sep 2025 17:21:21 +0800 Subject: [PATCH] =?UTF-8?q?flx:=E6=8B=89=E5=8F=96=E6=97=A7=E7=89=88?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=20=E6=8F=90=E4=BA=A4=E6=B2=B3=E5=8D=97?= =?UTF-8?q?=E4=BF=A1=E9=98=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +++- src/config/config.ts | 5 +++-- src/routers/modules/staticRouter.ts | 4 ++-- src/views/commandScreen/indexCommand.vue | 4 ++-- src/views/sevenLargeScreen/indexL.vue | 4 ++-- .../toxicGasMonitor/bottomLeft.vue | 15 ++++++++++----- .../toxicGasMonitor/index.vue | 19 ++++++++++++------- 7 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.env.development b/.env.development index 9e2ebd0..bdecc63 100644 --- a/.env.development +++ b/.env.development @@ -44,13 +44,15 @@ VITE_API_URL = 'http://101.43.164.214:11111' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' # VITE_API_URL = 'http://jxj.zhgdyun.com:34568' # 新能源智慧基建管理平台|中新建电力集团(外网) -VITE_API_URL = 'http://117.146.73.156:9820' +# VITE_API_URL = 'http://117.146.73.156:9820' # 九柱集团 # VITE_API_URL = 'http://218.95.151.122:31004' # 包头化工 # VITE_API_URL = 'http://jxj.zhgdyun.com:18000' # 大连金笔 # VITE_API_URL = 'http://101.43.164.214:11126' +VITE_API_URL = 'http://121.37.106.37:9809' + # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/config/config.ts b/src/config/config.ts index 3770105..94b9f2c 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -25,7 +25,7 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 项目环境标识配置 部署时需更改对应的项目 // export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "zhzrf"; //中海·臻如府 -export const COMPANY: string = "zsbf"; //中水北方 +// export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "tj"; // 同济项目 @@ -53,7 +53,8 @@ export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "jzjt"; //九柱集团 // export const COMPANY: string = "whzt"; //武汉中铁 // export const COMPANY: string = "ztsyj"; // 中铁十一局 -export const COMPANY: string = "xnyzhjj"; // 新能源智慧基建管理平台|中新建 +// export const COMPANY: string = "xnyzhjj"; // 新能源智慧基建管理平台|中新建 +export const COMPANY: string = "hnxy"; // 信阳项目 河南省 出山店水库 // export const COMPANY: string = "gwkj"; // 国维科技 // export const COMPANY: string = "allxm"; // 安立路项目 // export const COMPANY: string = "hbla"; // 湖北龙澳 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index fa1e3a3..63d732f 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/large", name: "大屏", - // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - component: () => import("@/views/commandScreen/indexCommand.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/locationLive/locationL.vue"), //人员定位大屏 diff --git a/src/views/commandScreen/indexCommand.vue b/src/views/commandScreen/indexCommand.vue index f1f08f8..dc15f4d 100644 --- a/src/views/commandScreen/indexCommand.vue +++ b/src/views/commandScreen/indexCommand.vue @@ -25,7 +25,7 @@
{{ adminName }}
-
+
项目后台
@@ -209,7 +209,7 @@ function jumpBgd() { if (COMPANY === "as") { window.location.replace("http://182.90.224.237:15551/#/projectIndex"); // 鞍山项目 } - if (COMPANY === "xnyzhjj") { + if (COMPANY === "xnyzhjj" || COMPANY === "hnxy") { window.location.replace("http://117.146.73.156:9809/#/login?token=" + store.token); } if(COMPANY === "agjtCommand"){ diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 3116930..8416bf4 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -781,7 +781,7 @@ function jumpBgd() { window.location.replace("http://117.146.73.156:9809/#/login?token=" + store.token); } else if (COMPANY === "gwkj") { window.location.replace("http://10.216.103.99:9809/#/login?token=" + store.token); - } else if (COMPANY === "xnyzhjj") { + } else if (COMPANY === "xnyzhjj" || COMPANY === "hnxy") { window.location.replace("http://121.37.106.37:9809/#/login?token=" + store.token); } else if (envList.includes(COMPANY)) { window.location.replace(BASEURL + "/#/login?token=" + store.token); @@ -814,7 +814,7 @@ function jumpBgd() { } .largeScreen { - background: url("@/assets/images/bigImg.png") no-repeat; + background: url("@/assets/images/bigImg3.gif") no-repeat; background-size: 100% 100%; position: relative; diff --git a/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/bottomLeft.vue b/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/bottomLeft.vue index 5b5f419..cd2fec0 100644 --- a/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/bottomLeft.vue +++ b/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/bottomLeft.vue @@ -21,7 +21,7 @@ import Card from "@/components/card.vue"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); import { countPoisonousGasAlarmType } from "@/api/modules/toxicGasMonitor"; - +import { COMPANY } from "@/config/config"; // const airType = ref(1); // let gasName = ref(1 as any); let selectDayType = ref(1 as any); @@ -116,7 +116,7 @@ let dataList = ref([ }, { value: 0, - show: true, + show: COMPANY === 'hnxy' ? false : true, name: "一氧化碳", itemStyle: { normal: { @@ -126,7 +126,7 @@ let dataList = ref([ }, { value: 0, - show: true, + show: COMPANY === 'hnxy' ? false : true, name: "二氧化碳", itemStyle: { normal: { @@ -146,7 +146,7 @@ let dataList = ref([ }, { value: 0, - show: true, + show: COMPANY === 'hnxy' ? false : true, name: "二氧化硫", itemStyle: { normal: { @@ -192,6 +192,10 @@ const getToxicGasList = async () => { const res: any = await countPoisonousGasAlarmType({ projectSn: store.sn, type: selectDayType.value }); console.log("气体含量报警统计", res); dataList.value = res.result.data.map((item: any) => { + if(COMPANY === 'hnxy') { + const includesList = ['一氧化碳', '二氧化碳', '二氧化硫'] + if(includesList.includes(item.name)) return undefined; + } return { value: Number(item.count), show: true, @@ -202,7 +206,8 @@ const getToxicGasList = async () => { } } }; - }); + }).filter((item: any) => item !== undefined); + // let gaxList = res.result; // list.value = gaxList.concat(res.result); drawEchart(); diff --git a/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/index.vue b/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/index.vue index 3079f85..bdaf225 100644 --- a/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/index.vue +++ b/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/index.vue @@ -12,29 +12,28 @@
-
+
-
+
-
+
-