From 04f22c0acad8e2ea6740b272baffef208ae96c60 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 23 May 2024 13:54:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +-- src/config/config.ts | 4 +-- .../highFormwork/alarm-list.vue | 7 ++--- .../highFormwork/bottomRight.vue | 16 +++++++++--- .../highFormwork/history-list.vue | 7 ++--- .../highFormwork/real-time-list.vue | 8 +++--- .../highFormwork/topRight.vue | 26 +++++++++++++------ 7 files changed, 48 insertions(+), 24 deletions(-) diff --git a/.env.development b/.env.development index 4ee55a5..ecef57f 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.221:19111' -VITE_API_URL = 'http://192.168.34.221:9111' -# VITE_API_URL = 'http://192.168.34.221:28888' +# VITE_API_URL = 'http://192.168.34.221:9111' +VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' # VITE_API_URL = 'http://192.168.34.221:12360' diff --git a/src/config/config.ts b/src/config/config.ts index 1653e5f..fa382ac 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -27,10 +27,10 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "zhzrf"; //中海·臻如府 // export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "as"; //鞍山项目 -export const COMPANY: string = "agjt"; //鞍钢集团 +// export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "slx"; //苏立信项目 -// export const COMPANY: string = "hfqc"; //合肥启程项目 +export const COMPANY: string = "hfqc"; //合肥启程项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目 // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页) diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/alarm-list.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/alarm-list.vue index fe69478..f3bf433 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/alarm-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/alarm-list.vue @@ -58,7 +58,7 @@ import { watch, ref, onMounted } from "vue"; import { alarmRecordList } from "@/api/modules/highFormwork"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); -const props = defineProps(["selectPoint"]); +const props = defineProps(["selectObj"]); const pageNo = ref(1 as any); const pageSize = ref(15 as any); const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 @@ -152,7 +152,8 @@ const timeChange = () => { const getAlarmRecord = async (type: any) => { let requestData: any = { projectSn: store.sn, - measurePointNumber: props.selectPoint, + measurePointNumber: props.selectObj.measurePointNumber, + acquisitionInstrumentNumber: props.selectObj.acquisitionInstrumentNumber, pageNo: pageNo.value, pageSize: pageSize.value }; @@ -174,7 +175,7 @@ const getAlarmRecord = async (type: any) => { } }; watch( - () => props.selectPoint, + () => props.selectObj, newVal => { // console.log(newVal, "newVal"); if (newVal) { diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomRight.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomRight.vue index 93a7093..5509958 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomRight.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/bottomRight.vue @@ -8,7 +8,7 @@ v-for="(item, index) in pointList" :key="index" :label="item.measurePointName" - :value="item.measurePointNumber" + :value="item.id" /> @@ -324,7 +324,17 @@ function drawChart() { } // 获取累计变形量 const getCountTransform = async () => { - const res: any = await countTransform({ projectSn: store.sn, measurePointNumber: selectPoint.value }); + let requestData:any = { + projectSn: store.sn + } + let findItem = pointList.value.find((item:any) => { + return item.id == selectPoint.value + }) + if(findItem){ + requestData.measurePointNumber = findItem.measurePointNumber + requestData.acquisitionInstrumentNumber = findItem.acquisitionInstrumentNumber + } + const res: any = await countTransform(requestData); console.log("获取高支模累计变形量", res); option.value.series = []; // 每次渲染先置空 for (let i = 0; i < typeList.value.length; i++) { @@ -353,7 +363,7 @@ const getMonitorViewPoint = async () => { console.log("获取测点数据", res); pointList.value = res.result.records; if (res.result.records && res.result.records.length > 0) { - selectPoint.value = res.result.records[0].measurePointNumber; + selectPoint.value = res.result.records[0].id; } }; onMounted(async () => { diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/history-list.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/history-list.vue index 4e57856..98ef85d 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/history-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/history-list.vue @@ -70,7 +70,7 @@ import { ref, onMounted, watch } from "vue"; import { realMonitorList } from "@/api/modules/highFormwork"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); -const props = defineProps(["selectPoint"]); +const props = defineProps(["selectObj"]); const pageNo = ref(1 as any); const pageSize = ref(15 as any); const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 @@ -163,7 +163,8 @@ const timeChange = () => { const getMonitorViewPoint = async (type: any) => { let requestData: any = { projectSn: store.sn, - measurePointNumber: props.selectPoint, + measurePointNumber: props.selectObj.measurePointNumber, + acquisitionInstrumentNumber: props.selectObj.acquisitionInstrumentNumber, pageNo: pageNo.value, pageSize: pageSize.value }; @@ -185,7 +186,7 @@ const getMonitorViewPoint = async (type: any) => { } }; watch( - () => props.selectPoint, + () => props.selectObj, newVal => { // console.log(newVal, "newVal"); if (newVal) { diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue index 768b44e..9a462b3 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/real-time-list.vue @@ -67,7 +67,7 @@ import { watch, ref, onMounted } from "vue"; import { realMonitorList } from "@/api/modules/highFormwork"; import { GlobalStore } from "@/stores"; const store = GlobalStore(); -const props = defineProps(["selectPoint"]); +const props = defineProps(["selectObj"]); const pageNo = ref(1 as any); const pageSize = ref(15 as any); const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 @@ -155,9 +155,11 @@ let formworkOption = ref([ const list = ref([] as any); // 获取监测数据（实时值、历史数据） const getMonitorViewPoint = async (type: any) => { + console.log(props.selectObj,777888) const res: any = await realMonitorList({ projectSn: store.sn, - measurePointNumber: props.selectPoint, + measurePointNumber: props.selectObj.measurePointNumber, + acquisitionInstrumentNumber: props.selectObj.acquisitionInstrumentNumber, pageNo: pageNo.value, pageSize: pageSize.value }); @@ -174,7 +176,7 @@ const getMonitorViewPoint = async (type: any) => { } }; watch( - () => props.selectPoint, + () => props.selectObj, newVal => { // console.log(newVal, "newVal"); if (newVal) { diff --git a/src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue b/src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue index 92b7787..8e3cad7 100644 --- a/src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue +++ b/src/views/sevenLargeScreen/safetyManagement/highFormwork/topRight.vue @@ -64,19 +64,19 @@
- - + +
- +
- +
- +
@@ -97,7 +97,8 @@ const selectView = ref(""); const viewList = ref([] as any); const monitorTimeText = ref(""); const planViewData = ref(); -const selectPoint = ref("" as any); +const selectPoint = ref({} as any); +const selectObj = ref({} as any); const pointList = ref([] as any); let tabIndex = ref(1 as any); let topText = ref([ @@ -105,7 +106,15 @@ let topText = ref([ { id: 2, title: "历史数据", isActive: false }, { id: 3, title: "报警记录", isActive: false } ]); - +const selectPointChange = () => { + let findItem = pointList.value.find((item:any) => { + return item.id == selectPoint.value + }) + console.log(findItem,888999) + if(findItem){ + selectObj.value = findItem; + } +} function getStyle(item: any) { if (item.isActive) { let choiseStyle = { @@ -170,7 +179,8 @@ const getMonitorViewPoint = async () => { list.value = res.result pointList.value = res.result if(res.result && res.result.length > 0){ - selectPoint.value = res.result[0].measurePointNumber + selectPoint.value = res.result[0].id + selectObj.value = res.result[0] } }; onMounted(async () => {