From f1449f587d8384d0dbbe7e34e5c31e52e814dbc5 Mon Sep 17 00:00:00 2001 From: jiayu Date: Tue, 10 Sep 2024 16:17:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E8=AF=9A=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- src/api/modules/labor.ts | 2 +- .../projectOverview/index.vue | 26 +++++++++---------- .../projectOverview/leftTop.vue | 6 +++-- .../qualityControl/schedulePlan/leftTop.vue | 2 +- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.env.development b/.env.development index f59fd22..2e1cf5f 100644 --- a/.env.development +++ b/.env.development @@ -47,7 +47,7 @@ VITE_API_URL = 'http://192.168.34.155:19111' # 包头化工 # VITE_API_URL = 'http://jxj.zhgdyun.com:18000' # 大连金笔 -VITE_API_URL = 'http://101.43.164.214:11126' +# VITE_API_URL = 'http://101.43.164.214:11126' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/.env.production b/.env.production index 0d1a721..6967c64 100644 --- a/.env.production +++ b/.env.production @@ -42,7 +42,7 @@ VITE_API_URL = 'http://192.168.9.249:9820' # 包头化工 # VITE_API_URL = 'http://jxj.zhgdyun.com:18000' # 大连金笔 -VITE_API_URL = 'http://101.43.164.214:11126' +# VITE_API_URL = 'http://101.43.164.214:11126' # 打包 VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' diff --git a/src/api/modules/labor.ts b/src/api/modules/labor.ts index 604eb33..d0ed54a 100644 --- a/src/api/modules/labor.ts +++ b/src/api/modules/labor.ts @@ -35,7 +35,7 @@ export const getCountEntryAndExitNum = (params: {}) => { }; //查询今日作业人员趋势 export const getQueryTodayAttendanceTrendApi = (params: {}) => { - return http.get(BASEURL + `/xmgl/workerAttendance/queryTodayAttendanceTrend`, params, { headers: { noLoading: true } }); + return http.get(BASEURL + `/xmgl/workerAttendance/queryYearAttendanceTrend`, params, { headers: { noLoading: true } }); }; //查询出勤分析 diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue index 774bd75..d4a53bb 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue @@ -29,7 +29,7 @@ import rightBottom from "@/views/sevenLargeScreen/comprehensiveManage/projectOve import { GlobalStore } from "@/stores"; const store = GlobalStore(); import { getWorkerStatisticsCountApi, getProjectDetail } from "@/api/modules/projectOverview"; -import { ref, onMounted, onBeforeUnmount,nextTick } from "vue"; +import { ref, onMounted, onBeforeUnmount, nextTick } from "vue"; const statisticsCount = ref(null as any); const projectData = ref(null as any); @@ -59,34 +59,34 @@ const callChildFn = async () => { centerTopRef.value.getDataList(true); centerBottomRef.value.getProgressOption(true); rightTopRef.value.getSafeInfo(true); - rightCenterRef.value.qualityInfo() - rightBottomRef.value.getList() - }) -} + rightCenterRef.value.qualityInfo(); + rightBottomRef.value.getList(); + }); +}; //定时器 const interval = ref(null as any); //定时调用 const startInterval = async () => { - interval.value= setInterval(() => { + interval.value = setInterval(() => { getPersonDetail(); getProjectInfo(true); callChildFn(); }, 30 * 1000); -} +}; // 在组件销毁时清除 interval const destroyInterval = () => { if (interval.value) { clearInterval(interval.value); - } -} + } +}; // 在组件销毁时调用 destroyInterval 方法清除 interval onBeforeUnmount(() => { destroyInterval(); -}) -window.onbeforeunload = (e) => { +}); +window.onbeforeunload = () => { destroyInterval(); -} -onMounted( async () => { +}; +onMounted(async () => { getPersonDetail(); getProjectInfo(); startInterval(); diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue index 025801a..56f8e23 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue @@ -4,8 +4,10 @@
项目名称： {{ projectData.projectName || "" }}
项目地址： {{ projectLocal }}
-
项目经理： {{ projectData.projectManage || "" }}
-
联系电话： {{ projectData.projectTel || "" }}
+ +
承建单位： {{ projectData.constructionUnit || "" }}
+
监理单位： {{ projectData.supervisorUnit || "" }}
建筑面积： {{ projectData.projectAcreage || "" }} ㎡
开工日期： {{ projectData.startWorkDate || "" }}
项目编号： {{ projectData.projectNumber || "" }}
diff --git a/src/views/sevenLargeScreen/qualityControl/schedulePlan/leftTop.vue b/src/views/sevenLargeScreen/qualityControl/schedulePlan/leftTop.vue index 0be0e36..f834486 100644 --- a/src/views/sevenLargeScreen/qualityControl/schedulePlan/leftTop.vue +++ b/src/views/sevenLargeScreen/qualityControl/schedulePlan/leftTop.vue @@ -42,7 +42,7 @@ const getProjectInfo = async () => { const res: any = await getTaskTimeDetail({ projectSn: store.sn }); console.log("获取项目信息", res); projectTimeInfo.value = res.result; - countdown.value = projectTimeInfo.value.projectOverallCountdown.toString().padStart(6, "0"); + countdown.value = projectTimeInfo.value.surplusDay.toString().padStart(6, "0"); }; onMounted(async () => {