From 6322e1f476aa089cdbb55fca09dea036257d1517 Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Wed, 21 Aug 2024 15:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/WisdomDeviceList.vue          | 24 -------------------
 src/views/admin/modules/WisdomDeviceModal.vue | 16 ++++++++-----
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/views/admin/WisdomDeviceList.vue b/src/views/admin/WisdomDeviceList.vue
index 9b0cd09..06cc4d3 100644
--- a/src/views/admin/WisdomDeviceList.vue
+++ b/src/views/admin/WisdomDeviceList.vue
@@ -72,38 +72,14 @@ export default {
       queryParam: {},
       // 表头
       columns: [
-        {
-          title: '设备分类',
-          dataIndex: 'type'
-        },
         {
           title: '设备名称',
           dataIndex: 'equipmentName'
         },
-        {
-          title: '设备状态',
-          dataIndex: 'status'
-        },
         {
           title: '设备编号',
           dataIndex: 'equipmentNum'
         },
-        {
-          title: '设备图片',
-          dataIndex: 'pic'
-        },
-        {
-          title: '更新时间',
-          dataIndex: 'ip'
-        },
-        {
-          title: '园区ID',
-          dataIndex: 'parkId'
-        },
-        {
-          title: '会议室id',
-          dataIndex: 'contentId'
-        },
         {
           title: '会议室名称',
           dataIndex: 'contentName'
diff --git a/src/views/admin/modules/WisdomDeviceModal.vue b/src/views/admin/modules/WisdomDeviceModal.vue
index 12ccf8a..440c1cd 100644
--- a/src/views/admin/modules/WisdomDeviceModal.vue
+++ b/src/views/admin/modules/WisdomDeviceModal.vue
@@ -20,14 +20,16 @@
         </a-select>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="设备名称">
-        <a-input placeholder="设备名称" v-decorator="['equipmentName']" />
+        <a-input placeholder="设备名称" v-decorator="['equipmentName' , {rules: [{ required: true, message: '请输入设备名称' }]}]" />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="设备编号">
-        <a-input placeholder="设备编号" v-decorator="['equipmentNum']" />
+        <a-input placeholder="设备编号" v-decorator="['equipmentNum' , {rules: [{ required: true, message: '请输入设备编号' }]}]"  />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议室id">
-        <a-select v-decorator="['contentId', {rules: [{ required: true, message: '请选择会议室' }]}]">
-          <a-select-option v-for="item in roomList" :key="item.id">{{ item.meetingName }}</a-select-option>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议室">
+        <a-select :label-in-value="true"
+                  v-decorator="['contentId', {rules: [{ required: true, message: '请选择会议室' }]}]"
+                  @change="selectRoom">
+          <a-select-option v-for="item in roomList" :key="item.id" :value="item.id">{{ item.meetingName }}</a-select-option>
         </a-select>
       </a-form-item>
 
@@ -95,7 +97,9 @@ export default {
         this.roomList = res.rows
       })
     },
-
+    selectRoom (item) {
+      console.log(item)
+    },
     add () {
       this.form.resetFields()
       this.edit({ id: 0 })