From 847619bb3e5d6c92a3184580838d26c6b29495bc Mon Sep 17 00:00:00 2001 From: Zhao Zhao Shen Date: Thu, 6 Mar 2025 14:21:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bug=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 4 +- src/views/Dashboard/index.vue | 82 +++++++++++++--------------------- src/views/Inspection/index.vue | 69 ++++++++++++++++------------ src/views/layout/vueLayout.vue | 28 ++++++------ 4 files changed, 87 insertions(+), 96 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 7e83ce2..dbb0743 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,8 +1,8 @@ import axios from 'axios'; const service = axios.create({ - baseURL: 'http://192.168.1.199:8080/api', // 办公室测试接口 - //baseURL: 'http://39.105.9.124:8090/api', // 家用测试接口 + // baseURL: 'http://192.168.1.199:8080/api', // 办公室测试接口 + baseURL: 'http://39.105.9.124:8090/api', // 家用测试接口 timeout: 5000, // 请求超时时间 headers: { "Access-Control-Allow-Origin": "*", diff --git a/src/views/Dashboard/index.vue b/src/views/Dashboard/index.vue index cacddd2..313ce22 100644 --- a/src/views/Dashboard/index.vue +++ b/src/views/Dashboard/index.vue @@ -10,7 +10,8 @@
+ :data-device-id="item?.deviceId" + @click="handleBlockClick(item?.deviceId, item.name, false)"> {{ item.name }}：
+ :data-device-id="item?.deviceId" + @click="handleBlockClick(item?.deviceId, item.name, false)"> {{ item.name }}：
- +   已碱洗 - +   已酸洗 - +  清洁状态 - +  无菌状态
@@ -106,7 +104,8 @@
+ @click="handleBlockClick(pulpUHTData?.deviceId, pulpUHTData.name, true)" + style="cursor: pointer;">

果肉 UHT

@@ -187,11 +186,8 @@
- - - - 果汁流量：{{ juiceTank.productFlowRate - }} + ▼果汁流量：{{ juiceTank.productFlowRate + }}
@@ -233,11 +229,8 @@
- - - - 果汁流量：{{ pulpTank.productFlowRate - }} + ▲果肉流量：{{ pulpTank.productFlowRate + }}

果肉无菌罐

@@ -286,8 +279,8 @@
- +
@@ -298,10 +291,11 @@ 流量：{{ productFlowRate }} 配方：{{ formula }} 持续时长：{{ duration }} - {{ selectedReason ? '停机原因：' + selectedReason : '请选择停机原因 ▲' }} + {{ selectedReason ? '停机原因：' + selectedReason : '请选择停机原因 ▲' }} - +
@@ -332,7 +326,7 @@ import ProcessGanttChart from '@/components/ProcessGanttChart.vue' const emit = defineEmits(['send-data']); const sendDataToParent = () => { - emit('send-data', 'SIEMENS MIS 1.0 前处理界面', 'mis-app'); + emit('send-data', 'SIEMENS MIS 1.0 前处理界面', 'mis-app'); }; // 设置为您期望的时区，比如 "Asia/Shanghai" @@ -371,7 +365,7 @@ const processData = ref([]) // 新增函数，转换时间格式 const formatTime = (timeString) => { const momentDate = moment(timeString); - return momentDate.tz(timezone).format('YYYY-MM-DD HH:mm'); + return momentDate.tz(timezone).format('YYYY-MM-DD HH:mm'); } // 新增函数，统一日期格式 @@ -420,7 +414,7 @@ const removeStatus = (id) => { statuses.value = statuses.value.filter(status => status.id !== id); }; -const updateCurrentInfo = (segment) => { +const updateCurrentInfo = (segment) => { id.value = segment.id; currentStatus.value = segment.deviceStatus; startTimeFormatted.value = formatTime(segment.beginTime); @@ -1114,22 +1108,6 @@ onUnmounted(() => { padding: 0; } -/* 箭头样式 */ -.arrow { - width: 0; - /* 调整高度 */ - padding: 0; -} - -/* 箭头样式 */ -.arrow { - width: 0; - height: 0; - border-left: 0.3125rem solid transparent; - border-right: 0.3125rem solid transparent; - border-top: 0.3125rem solid #00FFB9; -} - .lower-footer { display: flex; flex-wrap: wrap; diff --git a/src/views/Inspection/index.vue b/src/views/Inspection/index.vue index c4626d7..b172b48 100644 --- a/src/views/Inspection/index.vue +++ b/src/views/Inspection/index.vue @@ -3,33 +3,30 @@
- + - + - + - 查询 + 查询 - 导出全部 + 导出全部
- + {{ item.name }} @@ -61,14 +58,15 @@
- +
{{ item.label }} {{ item.unit || '--' }} {{ item.reference || '--' }} {{ item.current }} - + {{ item.data[hour] || '--' }}
@@ -375,24 +373,28 @@ onMounted(async () => { setupAutoUpdate(); // 监听 update-history 事件 - window.addEventListener('update-history', (event) => { - isAutoUpdate.value = false; - selectedDate.value = event.detail; - fetchCurrentValues(); - fetchInspectionData(); - setupAutoUpdate(); - }); + // window.addEventListener('update-history', (event) => { + // isAutoUpdate.value = false; + // selectedDate.value = event.detail; + // fetchCurrentValues(); + // fetchInspectionData(); + // setupAutoUpdate(); + // }); // 监听 reset 事件 - window.addEventListener('reset', (event) => { - isAutoUpdate.value = true; - selectedDate.value = moment().tz(timezone).format('YYYY-MM-DD HH:mm'); - fetchCurrentValues(); - fetchInspectionData(); - setupAutoUpdate(); - }); + // window.addEventListener('reset', (event) => { + // isAutoUpdate.value = true; + // selectedDate.value = moment().tz(timezone).format('YYYY-MM-DD HH:mm'); + // fetchCurrentValues(); + // fetchInspectionData(); + // setupAutoUpdate(); + // }); }); - +// 在 onUnmounted 中添加 +// onUnmounted(() => { +// window.removeEventListener('update-history', handleHistoryUpdate); +// window.removeEventListener('reset', handleReset); +// }); onUnmounted(() => { if (autoUpdateInterval) { clearInterval(autoUpdateInterval); @@ -476,10 +478,14 @@ onUnmounted(() => { .fixed-width { width: 6.5rem; /* 设置固定宽度 */ + height: 2.5rem; text-align: center; /* 居中对齐 */ font-size: 1rem; /* 调大固定宽度元素字体大小 */ + display: flex; + align-items: center; + justify-content: center; } .header-row { @@ -497,8 +503,8 @@ onUnmounted(() => { width: 15rem; } -ix-button { - margin: 0.25rem; +.btn-style { + margin: 1.8rem 0.5rem 0 0; } .testbg { @@ -546,4 +552,9 @@ ix-button { background-color: inherit; z-index: 1; } + +.highlight-cell { + background-color: orange; + cursor: pointer; +} diff --git a/src/views/layout/vueLayout.vue b/src/views/layout/vueLayout.vue index 851d3b6..43b3c61 100644 --- a/src/views/layout/vueLayout.vue +++ b/src/views/layout/vueLayout.vue @@ -2,12 +2,12 @@ -
{{ currentTime }}
+
{{ currentTime }}
- - - + + + @@ -42,12 +42,12 @@ import { useRoute } from 'vue-router'; let appSwitchConfig = { i18nAppSwitch: '切换应用', i18nLoadingApps: '加载应用中...', - currentAppId: '', + currentAppId: 'mis-app', apps: [ { id: 'mis-app', name: 'MIS 1.0', - iconSrc: '@/assets/genetic-data.svg', + iconSrc: require('@/assets/genetic-data.svg'), url: '/', description: '前处理系统', target: '_self', @@ -55,7 +55,7 @@ let appSwitchConfig = { { id: 'other-app', name: '点检系统', - iconSrc: '@/assets/genetic-data.svg', + iconSrc: require('@/assets/genetic-data.svg'), url: '/#/inspection', description: '其他系统描述', target: '_self', @@ -107,7 +107,6 @@ const handleDatePickerDone = (event) => { }; const updateHistoryWithTime = (datetime) => { - console.log("🚀 ~ updateHistoryWithTime ~ datetime:", datetime) // 将 datetime 转换为标准的 YYYY-MM-DD HH:mm:ss 格式 const parsedDate = new Date(datetime.replace(/-/g, '/')); if (isNaN(parsedDate.getTime())) { @@ -122,7 +121,6 @@ const updateHistoryWithTime = (datetime) => { const seconds = String(parsedDate.getSeconds()).padStart(2, '0'); const formattedDatetime = `${year}-${month}-${day} ${hours}:${minutes}`; // 触发主页中的 getHistory 方法 - console.log("🚀 ~ updateHistoryWithTime ~ formattedDatetime:", formattedDatetime) const event = new CustomEvent('update-history', { detail: formattedDatetime }); currentTime.value = formattedDatetime; @@ -131,7 +129,6 @@ const updateHistoryWithTime = (datetime) => { }; const updateHistoryWithDate = (date) => { - console.log("🚀 ~ updateHistoryWithDate ~ date:", date) // 将 date 转换为标准的 YYYY-MM-DD 格式 const { from } = date; const parsedDate = new Date(from); @@ -144,7 +141,6 @@ const updateHistoryWithDate = (date) => { const day = String(parsedDate.getDate()).padStart(2, '0'); const formattedDate = `${year}-${month}-${day}`; // 触发主页中的 getHistory 方法 - console.log("🚀 ~ updateHistoryWithDate ~ formattedDate:", formattedDate) const event = new CustomEvent('update-history', { detail: formattedDate }); currentTime.value = formattedDate; @@ -174,7 +170,7 @@ onMounted(() => { \ No newline at end of file