微调

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

@@ -5,8 +5,8 @@
                 <div >
                     <el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false" label-width="auto" class="form-three">
                         <el-divider >设备信息</el-divider>
-                                <el-form-item label="设备序列号" prop="createId" >
-                                    <el-input v-model="formContent.createId" placeholder="请输入设备序列号" @input="handleInput" />
+                                <el-form-item label="装置编号" prop="createId" >
+                                    <el-input v-model="formContent.createId" placeholder="请输入装置编号" @input="handleInput" />
                                 </el-form-item>   
                                 <el-form-item label="设备名称" prop="name" >
                                     <el-input v-model='formContent.name' placeholder="请输入设备名称" :disabled="scene === '1'"/>
@@ -274,7 +274,7 @@ const baseRules: Record<string, Array<FormItemRule>> = {
     { required: true, message: '额定电流必填！', trigger: 'blur' },
     { pattern: /^\d+(\.\d+)?$/, message: '额定电流格式错误', trigger: 'blur' }
   ],
-  createId: [{ required: true, message: '设备序列号必填！', trigger: 'blur' }],
+  createId: [{ required: true, message: '装置编号必填！', trigger: 'blur' }],
   ip: [
     { required: true, message: 'IP地址必填！', trigger: 'blur' },
     { pattern: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, message: 'IP地址格式错误', trigger: 'blur' }

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

@@ -10,7 +10,8 @@
       <template #tableHeader='scope'>
         <el-button v-auth.device="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
         <el-button v-auth.device="'export'" type='primary' :icon='Upload' plain @click='downloadFile()'>导出</el-button>
-        <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()' v-if='modeStore.currentMode === "比对式"'>导入</el-button>
+        <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click="importFile('')" v-if='modeStore.currentMode != "比对式"'>导入</el-button>
+        <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click="importFile('比对式')" v-if='modeStore.currentMode === "比对式"'>导入</el-button>
         <el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           删除
@@ -52,8 +53,6 @@ const appSceneStore = useAppSceneStore()
 // ProTable 实例
 const proTable = ref<ProTableInstance>()
 const devicePopup = ref()
-
-
 const boundPqDevList=ref<Device.ReqPqDevParams[]>([])//根据检测计划id查询出所有已绑定的设备 
 // 存储设备类型选项
 const devTypeOptions = ref<Device.ResDev[]>([])
@@ -205,15 +204,28 @@ const downloadFile = async () => {
 //导入设备
 const deviceImportExcel = ref<InstanceType<typeof ImportExcel> | null>(null)
 
-const importFile = async () => {
-  const params = {
-    title: '被检设备',
-    showCover: false,
-    tempApi: downloadTemplate,
-    importApi: importPqDev,
-    getTableList: proTable.value?.getTableList,
+const importFile = async (pattern:string) => {
+
+  if(pattern === '比对式'){
+    const params = {
+        title: '被检设备',
+        showCover: false,
+        tempApi: downloadTemplate,
+        importApi: importPqDev,
+        getTableList: proTable.value?.getTableList,
+    }
+    deviceImportExcel.value?.acceptParams(params)
+  }else{
+    const params = {
+        title: '被检设备',
+        showCover: false,
+        tempApi: downloadTemplate,
+        
+        getTableList: proTable.value?.getTableList,
+    }
+    deviceImportExcel.value?.acceptParams(params)
   }
-  deviceImportExcel.value?.acceptParams(params)
+
 }
 
 onBeforeMount(async () => {