From 7bf085ec89d503143c58203dd29f1d1d742f27ef Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 19 Sep 2024 16:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E4=BB=A5=E5=8F=8A=E8=BE=B9=E4=BB=A3?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |  3 ++
 .../base/device/components/form-device.vue    | 43 ++++++++++++++++---
 src/views/base/edgeDeviceManage/config.js     |  8 ++--
 src/views/base/edgeDeviceManage/index.vue     |  4 +-
 4 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/main.js b/src/main.js
index d75b67b..143c294 100644
--- a/src/main.js
+++ b/src/main.js
@@ -39,6 +39,8 @@ import VueMeta from 'vue-meta'
 import DictData from '@/components/DictData'
 // 表格组件
 import TableModel from '@/components/TableModel'
+
+import TableModelTwo from '@/components/TableModelTwo'
 // 弹框组件
 import DialogModel from '@/components/DialogModel'
 
@@ -64,6 +66,7 @@ Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('TableModel', TableModel)
+Vue.component('TableModelTwo', TableModelTwo)
 Vue.component('DialogModel', DialogModel)
 
 Vue.use(directive)
diff --git a/src/views/base/device/components/form-device.vue b/src/views/base/device/components/form-device.vue
index 8527126..fddf816 100644
--- a/src/views/base/device/components/form-device.vue
+++ b/src/views/base/device/components/form-device.vue
@@ -66,6 +66,23 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="设备状态" prop="devStatus">
+            <el-select
+              v-model="deviceParams.devStatus"
+              allow-create
+              clearable
+              filterable
+              placeholder="请选择设备状态"
+            >
+              <el-option
+                v-for="item in this.deviceStatusRange"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item>
               <el-button type="success" @click="onSubmit">确认</el-button>
               <el-button
@@ -102,10 +119,9 @@ export default {
       
     },
    async mounted() {
-    this.open = true
+        this.open = true
        await this.getRanges()
-       
-        console.log(this.editParams)
+       console.log(this.editParams)
         if (this.editParams) {
           await  Object.assign(this.deviceParams, this.editParams)
             console.log(this.deviceParams)
@@ -126,6 +142,7 @@ export default {
               devCode: undefined, // 设备编码
               bdId: undefined, // 所属边带
               configId: undefined, //预警配置
+              devStatus: undefined, //设备状态
             },
             deviceTypeRange: [], // 设备类型下拉选
             bdIdRange: [], // 所属边带下拉选
@@ -167,7 +184,24 @@ export default {
                   trigger: 'change',
                 },
               ],
+              devStatus: [
+                {
+                  required: true,
+                  message: '请选择设备状态',
+                  trigger: 'change',
+                },
+              ],
             },
+            deviceStatusRange:[
+              {
+                label: '在线',
+                value: 1
+              },
+              {
+                label: '离线',
+                value: 0
+              }
+            ],
             // 各类下拉
 
         }
@@ -196,14 +230,12 @@ export default {
           })
           // 获取预警配置下拉选
           let configRes = await queryConfigApi(paramsTwo)
-          console.log(configRes)
           this.configRange = configRes.data.map(item => {
             return {
               label: item.configName+" "+item.typeName,
               value: item.id,
             }
           })
-          console.log(this.configRange)
         },
         /** 改变树结构 */
         changeTree(leaf) {
@@ -233,6 +265,7 @@ export default {
         },
         /** 确认按钮 */
         onSubmit() {
+          console.log(this.deviceParams)
             this.$refs.deviceParamsRef.validate(valid => {
                 if (valid) {
                     // 1. 表单校验通过后调后台 Api
diff --git a/src/views/base/edgeDeviceManage/config.js b/src/views/base/edgeDeviceManage/config.js
index fdb0c81..cfcd06a 100644
--- a/src/views/base/edgeDeviceManage/config.js
+++ b/src/views/base/edgeDeviceManage/config.js
@@ -1,16 +1,16 @@
 export const formLabel = [
     { f_label: '工程名称', f_model: 'proName', f_type: 'ipt' },
     { f_label: '项目部名称', f_model: 'departName', f_type: 'ipt' },
-    { f_label: '边带名称', f_model: 'devName', f_type: 'ipt' },
-    { f_label: '边带编码', f_model: 'devCode', f_type: 'ipt' },
+    { f_label: '边代名称', f_model: 'devName', f_type: 'ipt' },
+    { f_label: '边代编码', f_model: 'devCode', f_type: 'ipt' },
 ]
 
 export const columnsList = [
     { t_props: 'departName', t_label: '项目部名称' },
     { t_props: 'proName', t_label: '在用工程', },
     { t_props: 'areaName', t_label: '所用区域', },
-    { t_props: 'devName', t_label: '边带名称',  },
-    { t_props: 'devCode', t_label: '边带编码', },
+    { t_props: 'devName', t_label: '边代名称',  },
+    { t_props: 'devCode', t_label: '边代编码', },
     { t_props: 'devUser', t_label: '负责人', },
     { t_props: 'devUserPhone', t_label: '负责人电话'},
 ]
diff --git a/src/views/base/edgeDeviceManage/index.vue b/src/views/base/edgeDeviceManage/index.vue
index ec0b227..a3d7a20 100644
--- a/src/views/base/edgeDeviceManage/index.vue
+++ b/src/views/base/edgeDeviceManage/index.vue
@@ -2,13 +2,13 @@
   <!-- 工程管理页面 -->
   <div class="app-container">
     <!-- 表格 -->
-    <TableModel
+    <TableModelTwo
       :formLabel="formLabel"
       :columnsList="columnsList"
       :request-api="queryEdgeDeviceListApiTwo"
       ref="tableRef"
     >
-    </TableModel>
+    </TableModelTwo>
 
   </div>
 </template>