diff --git a/.env.development b/.env.development index ed07633..7edf2e8 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -VITE_API_URL = 'http://192.168.34.221:9111' +# VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue index faab353..eef64c2 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue @@ -68,7 +68,8 @@ import Card from "@/components/card.vue"; import { ref, watch, onMounted } from "vue"; import { getStageOption } from "@/api/modules/projectOverview"; - +import { GlobalStore } from "@/stores"; +const store = GlobalStore(); const progressList = ref([ // { // name: "施工证获取", @@ -127,7 +128,7 @@ watch( //获取里程碑option const getProgressOption = async () => { - const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage" }); + const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage", projectSn: store.sn }); if (res.result.length > 0) { let newArray = res.result.map((item: any) => { return { diff --git a/src/views/sevenLargeScreen/headNoise/centerTop.vue b/src/views/sevenLargeScreen/headNoise/centerTop.vue index cf39fc3..67b8c3e 100644 --- a/src/views/sevenLargeScreen/headNoise/centerTop.vue +++ b/src/views/sevenLargeScreen/headNoise/centerTop.vue @@ -16,13 +16,13 @@
- - - - - - - + + + + + + + diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue index efb912a..333ce54 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue @@ -201,7 +201,7 @@ function initOption() { params[0].seriesName + ":" + params[0].value[1] + - "mm" + "kN" ); } }, diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue index adae4e7..409dee7 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue @@ -199,7 +199,7 @@ function initOption() { params[0].seriesName + ":" + params[0].value[1] + - "mm" + "kN" ); } }, diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue index 8334b48..19fb51d 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/topLeft.vue @@ -83,8 +83,8 @@ const BASEURL = import.meta.env.VITE_API_URL; let currentIndex = ref(1 as any); // let showDialog = ref(false as any); function openDialog(item: any) { - currentIndex.value = item.id; - showDialog.value = true; + // currentIndex.value = item.id; + // showDialog.value = true; } function closeDialog() { showDialog.value = false;