From b11f4839f45ad3782797df9a8c06b91ad31c9a0c Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Tue, 11 Feb 2025 10:59:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/home/components/table.vue         |  5 ++---
 .../machine/devType/components/devTypePopup.vue      | 12 +++++++++---
 frontend/src/views/machine/device/index.vue          |  6 +++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 3a49786..1040590 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -635,10 +635,9 @@ const handleSelectionChange = (selection: any[]) => {
   channelsSelection.value = selection
   devNum = selection.length
   devChannelsNum = 0
-
+ 
   for (let i = 0; i < selection.length; i++) {
-    devChannelsNum += selection[i].dev_Chns
-   
+    devChannelsNum += selection[i].devChns
   }
 
   devTestedNum = selection.filter((item) => item.checkState === 2).length
diff --git a/frontend/src/views/machine/devType/components/devTypePopup.vue b/frontend/src/views/machine/devType/components/devTypePopup.vue
index cb1e28a..ff1f00f 100644
--- a/frontend/src/views/machine/devType/components/devTypePopup.vue
+++ b/frontend/src/views/machine/devType/components/devTypePopup.vue
@@ -1,8 +1,8 @@
 <template>
     <!-- 基础信息弹出框 -->
-  <el-dialog :model-value="dialogVisible" :title="dialogTitle" v-bind="dialogSmall" @close="close" >
+  <el-dialog :model-value="dialogVisible" :title="dialogTitle" v-bind="dialogMiddle" @close="close" >
     <div>
-        <el-form :model="formContent"  ref='dialogFormRef' :rules='rules' >
+        <el-form :model="formContent"  ref='dialogFormRef' :rules='rules' class="form-two">
             <el-form-item label="名称" prop="name" >
                 <el-input v-model='formContent.name' placeholder="请输入设备类型名称"/>
             </el-form-item>
@@ -86,7 +86,7 @@
   import { ref,computed, Ref  } from 'vue'
   import { type DevType } from '@/api/device/interface/devType'
    import { type ICD } from '@/api/device/interface/icd'
-  import {dialogSmall} from '@/utils/elementBind'
+  import {dialogMiddle} from '@/utils/elementBind'
   import { useDictStore } from '@/stores/modules/dict'
   import {addDevType,updateDevType} from '@/api/device/devType'
   import {getICDAllList} from '@/api/device/icd'
@@ -153,6 +153,12 @@ const resetFormContent = () => {
   devCurr: [
     { required: true, message: '额定电流必选！', trigger: 'change' }
   ],
+  reportName: [
+    { required: true, message: '报告模版名称必选！', trigger: 'change' }
+  ],
+  icd: [
+    { required: true, message: '设备关联ICD必选！', trigger: 'change' }
+  ],
   })
 
   
diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue
index 1023158..715b353 100644
--- a/frontend/src/views/machine/device/index.vue
+++ b/frontend/src/views/machine/device/index.vue
@@ -59,9 +59,9 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { onBeforeMount, reactive, ref } from 'vue'
 import { useModeStore, useAppSceneStore } from '@/stores/modules/mode'
 
-defineOptions({
-  name: 'device',
-})
+// defineOptions({
+//   name: 'device',
+// })
 const modeStore = useModeStore()
 const dictStore = useDictStore()
 const appSceneStore = useAppSceneStore()