From 997336627f1de1f338f305873c7d61170a2c4026 Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Thu, 11 Dec 2025 18:01:40 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/projectOverview.ts | 4 ++ .../integratedView/bottomDwon.vue | 43 ++++++++++++++++--- .../components/seamlessScroll.vue | 3 +- .../integratedView/projectInfoDialog.vue | 13 +++--- 4 files changed, 50 insertions(+), 13 deletions(-) diff --git a/src/api/modules/projectOverview.ts b/src/api/modules/projectOverview.ts index d21ccfd..34542af 100644 --- a/src/api/modules/projectOverview.ts +++ b/src/api/modules/projectOverview.ts @@ -166,6 +166,10 @@ export const getBigScreenCountJdpzPageApi = (params: {}) => { export const getWeldingRecordPageApi = (params: {}) => { return http.get(BASEURL + `/xmgl/gsWeldingRecord/page`, params, { headers: { noLoading: true } }); }; +// 查询焊接项目配置 +export const getProjectConfigListApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/projectConfig/getProjectConfigList`, params, { headers: { noLoading: true } }); +}; // 桥位环缝列表 export const getBridgeSitePageApi = (params: {}) => { return http.get(BASEURL + `/xmgl/gsBridgeSite/page`, params, { headers: { noLoading: true } }); diff --git a/src/views/sevenLargeScreen/comprehensiveManage/integratedView/bottomDwon.vue b/src/views/sevenLargeScreen/comprehensiveManage/integratedView/bottomDwon.vue index 137fba9..3bd5cb6 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/integratedView/bottomDwon.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/integratedView/bottomDwon.vue @@ -38,7 +38,11 @@
小节段号
重量(吨)
- +
{{ item.weldBead }}
{{ item.startWeldingTime }}
{{ item.endWeldingTime }}
-
{{ item.duration }}
+
+ {{ item.duration }} +
@@ -124,7 +130,11 @@ >
{{ index + 1 }}
{{ item.bridgeSiteNumber }}
-
{{ item.status == 2 ? '已完成' : item.status == 1 ? '未完成' : '--' }}
+
+ {{ + item.status == 2 ? "已完成" : item.status == 1 ? "未完成" : "--" + }} +
{{ item.date }}
@@ -149,6 +159,7 @@ import { getBigScreenCountJdpzPageApi, getWeldingRecordPageApi, getBridgeSitePageApi, + getProjectConfigListApi, } from "@/api/modules/projectOverview"; import SeamlessScroll from "./components/seamlessScroll.vue"; import projectInfoDialog from "./projectInfoDialog.vue"; @@ -172,6 +183,7 @@ const pageInfo = reactive({ const bridgeSiteList = ref([]); const bigScreenCountJdpzList = ref([]); const weldingList = ref([]); +const showBigScreenType = ref(0); // 桥位环缝列表 function getBridgeSitePage() { let data = { @@ -205,12 +217,31 @@ function getWeldingRecordPage() { pageSize: 100, projectSn: store.sn, }; + if(showBigScreenType.value == 0) { + data.showBigScreenType = 1; + } getWeldingRecordPageApi(data).then((res) => { if (res.code == 200) { weldingList.value = res.result.records; } }); } +// 焊接项目配置 +function getProjectConfigList() { + const data = { + projectSn: store.sn, + }; + getProjectConfigListApi(data).then((res) => { + if (res.code == 200) { + if (!res.result || res.result.length == 0) { + showBigScreenType.value = 0; + } else { + showBigScreenType.value = res.result[0].showBigScreenType; + } + getWeldingRecordPage(); + } + }); +} const onWeldClick = (item) => { console.log(7744, item); projectInfoDialogRef.value.openDialog(item); @@ -220,16 +251,16 @@ defineExpose({ // projectTypeEnum }); onMounted(() => { + getProjectConfigList(); getBigScreenCountJdpzPage(); - getWeldingRecordPage(); getBridgeSitePage(); });