From 4d6a042a6eb86b426f9371b0d6d74cda2bc605e3 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Mon, 30 Sep 2024 11:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=99=BB=E8=AE=B0=E9=80=9A?=
 =?UTF-8?q?=E8=AE=AF=E5=8D=8F=E8=AE=AE=E6=94=B9=E4=B8=BA=E5=A4=A7=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/manage/factory.vue | 43 ++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index a9880a0..0c6524c 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -19,7 +19,12 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="设备型号">
-                    <el-select v-model="tableStore.table.params.devModel" filterable clearable placeholder="请选择设备型号">
+                    <el-select
+                        v-model="tableStore.table.params.devModel"
+                        filterable
+                        clearable
+                        placeholder="请选择设备型号"
+                    >
                         <el-option
                             v-for="item in devModelOptionsFilter"
                             :key="item.value"
@@ -30,8 +35,8 @@
                 </el-form-item>
                 <el-form-item label="通讯协议">
                     <el-select v-model="tableStore.table.params.devAccessMethod" clearable placeholder="请选择通讯协议">
-                        <el-option label="MQTT" value="mqtt"></el-option>
-                        <el-option label="CLD" value="cloud"></el-option>
+                        <el-option label="MQTT" value="MQTT"></el-option>
+                        <el-option label="CLD" value="CLD"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="状态">
@@ -71,7 +76,7 @@
             width="40%"
         >
             <el-form :model="form" label-width="120px" :rules="rules" ref="ruleFormRef" class="form-two">
-                <el-form-item label="设备名称:" prop="name" >
+                <el-form-item label="设备名称:" prop="name">
                     <el-input
                         v-model="form.name"
                         autocomplete="off"
@@ -104,8 +109,8 @@
                 </el-form-item>
                 <el-form-item label="通讯协议:" prop="devAccessMethod" class="top">
                     <el-select v-model="form.devAccessMethod" placeholder="请选择" clearable>
-                        <el-option label="MQTT" value="mqtt"></el-option>
-                        <el-option label="CLD" value="cloud"></el-option>
+                        <el-option label="MQTT" value="MQTT"></el-option>
+                        <el-option label="CLD" value="CLD"></el-option>
                     </el-select>
                 </el-form-item>
 
@@ -154,7 +159,7 @@ const deivce: any = ref({})
 const ruleFormRef = ref()
 const form = reactive({
     cntractNo: '',
-    devAccessMethod: 'mqtt',
+    devAccessMethod: 'MQTT',
     devModel: '',
     devType: '',
     name: '',
@@ -173,7 +178,8 @@ const dialogTitle = ref('新增设备')
 const loading = ref<boolean>(false)
 const devModelOptions: any = ref([])
 queryByCode('Device_Type').then(res => {
-    queryCsDictTree(res.data.id).then(res => {
+    const id = res.data.id
+    queryCsDictTree(id).then(res => {
         devTypeOptions.value = res.data.map((item: any) => {
             return {
                 value: item.id,
@@ -182,8 +188,13 @@ queryByCode('Device_Type').then(res => {
             }
         })
     })
-    queryByid(res.data.id).then(res => {
-        devModelOptions.value = res.data.map((item: any) => {
+    queryByid(id).then(res => {
+        res.data.map((item: any, index: any) => {
+            if (item.pid == id) {
+                res.data.splice(index, 1)
+            }
+        }) 
+        devModelOptions.value = res.data.map((item: any, index: any) => {
             return {
                 value: item.id,
                 label: item.name,
@@ -234,7 +245,7 @@ const tableStore = new TableStore({
             title: '通讯协议',
             field: 'devAccessMethod',
             formatter: row => {
-                return row.cellValue === 'MQTT' ? 'MQTT' : row.cellValue === 'cloud' ? 'CLD' : row.cellValue
+                return row.cellValue === 'MQTT' ? 'MQTT' : row.cellValue === 'CLD' ? 'CLD' : row.cellValue
             }
         },
         { title: '录入时间', field: 'createTime' },
@@ -512,10 +523,10 @@ const tableStore = new TableStore({
     }
 })
 tableStore.table.params.orderBy = 'desc'
-tableStore.table.params.devType=''
-tableStore.table.params.devModel=''
-tableStore.table.params.devAccessMethod=''
-tableStore.table.params.status=''
+tableStore.table.params.devType = ''
+tableStore.table.params.devModel = ''
+tableStore.table.params.devAccessMethod = ''
+tableStore.table.params.status = ''
 
 // 设备类型
 const devTypeChange = (e: any) => {
@@ -591,7 +602,7 @@ const resetForm = () => {
         // 模拟待编辑数据
         let user = {
             cntractNo: '',
-            devAccessMethod: 'mqtt',
+            devAccessMethod: 'MQTT',
             devModel: '',
             devType: '',
             name: '',