From 68e9856641712703e0636d3b22fcd7a8e89a465b Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Tue, 6 May 2025 11:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E7=BA=A7=E5=B9=B3=E5=8F=B0=E4=B8=8D?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=B3=BB=E6=95=B0=E6=A0=A1=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/views/home/components/table.vue | 8 +++++---
.../src/views/machine/device/components/devicePopup.vue | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 906c601..a1079cc 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -100,7 +100,7 @@
>设备新增 -->
系数校准
@@ -271,7 +271,8 @@ import {generateDevReport, getBoundPqDevList} from '@/api/plan/plan.ts'
import {onBeforeMount, onMounted, reactive, ref, watch} from 'vue'
import {useDictStore} from '@/stores/modules/dict'
import ChannelsTest from './channelsTest.vue'
-import {useModeStore} from '@/stores/modules/mode' // 引入模式 store
+import {useModeStore,useAppSceneStore} from '@/stores/modules/mode' // 引入模式 store
+
import {useCheckStore} from '@/stores/modules/check'
import {CheckData} from '@/api/check/interface'
import socketClient from '@/utils/webSocketClient'
@@ -355,6 +356,7 @@ const props = defineProps({
default: null,
},
})
+const appSceneStore = useAppSceneStore()
const emit = defineEmits<{
(e: 'batchGenerateClicked'): void;
@@ -586,7 +588,7 @@ const columns = reactive[]>([
label: '系数校准结果',
minWidth: 100,
sortable: true,
- isShow: factorCheckShow,
+ isShow: factorCheckShow && appSceneStore.currentScene === "1" ,
render: scope => {
if (scope.row.factorCheckResult === 0) {
return '不合格'
diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index a2fa33c..182d6a7 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -122,7 +122,7 @@
-
+
是
否