diff --git a/.env.development b/.env.development index 5208615..8743206 100644 --- a/.env.development +++ b/.env.development @@ -19,7 +19,7 @@ NODE_ENV = 'development' # 演示平台 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 -VITE_API_URL = 'http://101.43.164.214:11111' +# VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(测试平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # 七参数标准版(测试平台) @@ -49,7 +49,7 @@ VITE_API_URL = 'http://101.43.164.214:11111' # 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_API_URL = 'http://121.37.106.37:9809' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/.env.production b/.env.production index 88194d3..31842bd 100644 --- a/.env.production +++ b/.env.production @@ -13,7 +13,7 @@ NODE_ENV = "production" # VITE_API_URL = "http://183.249.224.118:9003" # 百色 新项目通用地址 -VITE_API_URL = 'http://101.43.164.214:11111' +# VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(演示平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' @@ -53,7 +53,7 @@ VITE_API_URL = 'http://101.43.164.214:11111' # 新能源智慧基建管理平台 # VITE_API_URL = 'http://121.37.106.37:9820' # 121测试环境 -# VITE_API_URL = 'http://121.37.106.37:9809' +VITE_API_URL = 'http://121.37.106.37:9809' # 打包 VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' diff --git a/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/bottomLeft.vue b/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/bottomLeft.vue index 5b5f419..7c572ae 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 === 'zzsl' ? false : true, name: "一氧化碳", itemStyle: { normal: { @@ -126,7 +126,7 @@ let dataList = ref([ }, { value: 0, - show: true, + show: COMPANY === 'zzsl' ? false : true, name: "二氧化碳", itemStyle: { normal: { @@ -146,7 +146,7 @@ let dataList = ref([ }, { value: 0, - show: true, + show: COMPANY === 'zzsl' ? 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 === 'zzsl') { + 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..018603d 100644 --- a/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/index.vue +++ b/src/views/sevenLargeScreen/safetyManagement/toxicGasMonitor/index.vue @@ -12,29 +12,28 @@