From 60824990249e0e7f819d5ffcc5dd70acadb1525a Mon Sep 17 00:00:00 2001 From: Vce Date: Mon, 25 Mar 2024 18:19:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9fyyk=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .env.production | 4 ++-- .../asphaltMixer/bottomCenter.vue | 20 ++++++++++++------- .../largeMachinery/asphaltMixer/topLeft.vue | 2 +- .../concreteMixingPlant/bottomCenter.vue | 19 +++++++++++------- .../waterStabilizedMixer/bottomCenter.vue | 19 +++++++++++------- .../concreteMonitor/leftTop.vue | 11 +++++++--- 7 files changed, 50 insertions(+), 29 deletions(-) diff --git a/.env.development b/.env.development index 1cb52ab..4367518 100644 --- a/.env.development +++ b/.env.development @@ -13,9 +13,9 @@ NODE_ENV = 'development' # 沈阳合盈线上 # VITE_API_URL = "http://101.43.164.214:45022" # 演示平台 -# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' +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_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/.env.production b/.env.production index 5ffbb72..2cd57f1 100644 --- a/.env.production +++ b/.env.production @@ -11,10 +11,10 @@ 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' +VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 七参数标准版(测试平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:15551' diff --git a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomCenter.vue b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomCenter.vue index 9cd5e2f..96063e1 100644 --- a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomCenter.vue +++ b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/bottomCenter.vue @@ -104,6 +104,7 @@ import { GlobalStore } from "@/stores"; const store = GlobalStore(); import { concreteMixStationPage2, concreteMaterialDataList2 } from "@/api/modules/largeMachinery"; let dialogShowTime = ref(false as any); + // 1正常2初级超标3中级超标4高级超标5异常 let stateOptions = ref([ { @@ -499,18 +500,23 @@ onMounted(() => { } } .not-data { - top: 73%; - width: 12%; - left: 44%; - position: absolute; + top: 25%; + width: 100%; + left: 35%; + // position: absolute; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; img { - width: 40%; - margin: 5% 30%; + width: 10%; + margin: 10% 0 5% 0; } p { + text-align: center; color: #fff; font-size: calc(100vw * 14 / 1920); - margin: -6% 37%; + margin: -3% 30%; } } .political-outlook { diff --git a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topLeft.vue b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topLeft.vue index b913e0a..870eb54 100644 --- a/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topLeft.vue +++ b/src/views/sevenLargeScreen/largeMachinery/asphaltMixer/topLeft.vue @@ -312,7 +312,7 @@ const getMeterTotal = async () => { chartDom.removeAttribute("_echarts_instance_"); } let echartsTest = echarts.init(document.getElementById("loadLineTopLeft")); - echartsTest.clear(); + // echartsTest.clear(); } }; diff --git a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomCenter.vue b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomCenter.vue index e22fc06..c5a3666 100644 --- a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomCenter.vue +++ b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/bottomCenter.vue @@ -494,18 +494,23 @@ onMounted(() => { } } .not-data { - top: 73%; - width: 12%; - left: 44%; - position: absolute; + top: 25%; + width: 100%; + left: 35%; + // position: absolute; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; img { - width: 40%; - margin: 5% 30%; + width: 10%; + margin: 10% 0 5% 0; } p { + text-align: center; color: #fff; font-size: calc(100vw * 14 / 1920); - margin: -6% 37%; + margin: -3% 30%; } } .political-outlook { diff --git a/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/bottomCenter.vue b/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/bottomCenter.vue index 3f56d67..12f8042 100644 --- a/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/bottomCenter.vue +++ b/src/views/sevenLargeScreen/largeMachinery/waterStabilizedMixer/bottomCenter.vue @@ -505,18 +505,23 @@ onMounted(() => { } } .not-data { - top: 73%; - width: 12%; - left: 44%; - position: absolute; + top: 25%; + width: 100%; + left: 35%; + // position: absolute; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; img { - width: 40%; - margin: 5% 30%; + width: 8%; + margin: 6% 0 4% 0; } p { + text-align: center; color: #fff; font-size: calc(100vw * 14 / 1920); - margin: -6% 37%; + margin: -3% 30%; } } .political-outlook { diff --git a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue index 33c8cf2..576c251 100644 --- a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue +++ b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/leftTop.vue @@ -374,13 +374,18 @@ const list = ref([] as any); } } .notoDta { - top: 35%; + // background-color: #fff; + top: 20%; width: 50%; - left: 30%; + left: 25%; position: absolute; text-align: center; + // display: flex; + // flex-direction: column; + // justify-content: center; + // align-items: center; img { - width: 40%; + width: 20%; margin: 5% 30%; } p {