微调

frontend/src/views/machine/device/components/devicePopup.vue

@@ -206,7 +206,7 @@
                     <ProTable
                         ref='proTable'
                         :columns='columns'
-                        :request-api='getPqMonList'
+                       
                     >
                     <!-- 表格 header 按钮 -->
                     <template #tableHeader='scope'>
@@ -253,6 +253,7 @@ const MonIsShow = ref(false)
 const DevIsShow = ref(false)
 const IsPasswordShow = ref(false)
 const dictStore = useDictStore()
+const mode = ref()
 // 定义弹出组件元信息
 const dialogFormRef = ref()
 const disabledDate = (time: Date) => {
@@ -265,7 +266,7 @@ const disabledDate = (time: Date) => {
     const formContent = ref<Device.ResPqDev>({
       id: '',
       name: '',
-      pattern:'模拟式',
+      pattern:mode.value,
       devType:'',
       devChns:1,
       devVolt:57.74,
@@ -291,7 +292,7 @@ const disabledDate = (time: Date) => {
     formContent.value = {
         id: '',
         name: '',
-        pattern:'模拟式',
+        pattern:mode.value,
         devType:'',
         devChns:1,
         devVolt:57.74,
@@ -390,18 +391,15 @@ const disabledDate = (time: Date) => {
 }
 
 
-
-
-
 // 打开弹窗，可能是新增，也可能是编辑
-const open = (sign: string, data: Device.ResPqDev) => {
-  // 重置表单
-  dialogFormRef.value?.resetFields()
-  titleType.value = sign
-  dialogVisible.value = true
+const open = (sign: string, data: Device.ResPqDev,currentMode: string) => {
+    mode.value = currentMode
+    // 重置表单
+    dialogFormRef.value?.resetFields()
+    titleType.value = sign
+    dialogVisible.value = true
 
-  const patternItem = dictStore.getDictData('Pattern').find(item => item.id === data.pattern)
-    if( patternItem && patternItem.name ==='比对式'){
+    if( currentMode ==='比对式'){
         DevIsShow.value = false
         MonIsShow.value = true
     }else{

frontend/src/views/machine/device/index.vue

@@ -42,7 +42,9 @@ import { useDictStore } from '@/stores/modules/dict'
 import { getPqDevList, deletePqDev, exportPqDev, downloadTemplate, importPqDev } from '@/api/device/device/index.ts'
 import { ElMessageBox } from 'element-plus'
 import { computed, reactive, ref } from 'vue'
+import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store
 
+const modeStore = useModeStore();
 const dictStore = useDictStore()
 // ProTable 实例
 const proTable = ref<ProTableInstance>()
@@ -53,6 +55,8 @@ const getTableList = (params: any) => {
   let newParams = JSON.parse(JSON.stringify(params))
   newParams.searchEndTime = endDate.value
   newParams.searchBeginTime = startDate.value
+  const patternId  = dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.id//获取数据字典中对应的id
+  newParams.pattern = patternId
   return getPqDevList(newParams)
 }
 
@@ -131,7 +135,7 @@ const handleDateChange = (startDateTemp: string, endDateTemp: string) => {
 }
 // 打开 drawer(新增、编辑)
 const openDialog = (titleType: string, row: Partial<Device.ResPqDev> = {}) => {
-  devicePopup.value?.open(titleType, row)
+  devicePopup.value?.open(titleType, row,modeStore.currentMode)
 }