From ebbf47896366fe2b3d3e554a88a7640bc17739d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=9A=E7=A5=96=E6=9C=9B?= <573413756@qq.com>
Date: Mon, 4 Sep 2023 17:08:20 +0800
Subject: [PATCH] modify terminalAdd page

---
 .../src/views/terminal/add/index.vue          | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/xiuosiot-frontend/src/views/terminal/add/index.vue b/xiuosiot-frontend/src/views/terminal/add/index.vue
index fad2520..f74bf40 100644
--- a/xiuosiot-frontend/src/views/terminal/add/index.vue
+++ b/xiuosiot-frontend/src/views/terminal/add/index.vue
@@ -67,32 +67,32 @@
     <!-- 新增弹窗 -->
     <el-dialog title="新增设备" :visible="visible" width="500px" @close="closeDialog">
       <el-form ref="form" :rules="rules" label-width="130px" :model="form" size="medium">
-        <el-tabs v-model="activeName">
+        <el-row>
+          <el-col :span="18" :offset="3">
+            <el-form-item label="产品分类：" prop="product">
+              <el-select v-model="form.product" value-key="name" @change="handleChange">
+                <el-option v-for="(item,index) in productList" :key="index" :label="item.name" :value="item" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设备类型：" prop="type">
+              <el-select v-model="form.type">
+                <el-option v-for="(item,index) in deviceList" :key="index" :label="item.name" :value="item.name" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设备序列号：" prop="no">
+              <el-input v-model="form.no" />
+            </el-form-item>
+            <el-form-item label="设备描述：" prop="devicedesc">
+              <el-input v-model="form.devicedesc" />
+            </el-form-item>
+            <el-form-item label="设备状态：" prop="activestatus">
+              <el-radio v-model="form.activestatus" :label="1">已激活</el-radio>
+              <el-radio v-model="form.activestatus" :label="0">未激活</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-tabs v-model="activeName">
           <el-tab-pane label="基本信息" name="first">
-            <el-row>
-              <el-col :span="18" :offset="3">
-                <el-form-item label="产品分类：" prop="product">
-                  <el-select v-model="form.product" value-key="name" @change="handleChange">
-                    <el-option v-for="(item,index) in productList" :key="index" :label="item.name" :value="item" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="设备类型：" prop="type">
-                  <el-select v-model="form.type">
-                    <el-option v-for="(item,index) in deviceList" :key="index" :label="item.name" :value="item.name" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="设备序列号：" prop="no">
-                  <el-input v-model="form.no" />
-                </el-form-item>
-                <el-form-item label="设备描述：" prop="devicedesc">
-                  <el-input v-model="form.devicedesc" />
-                </el-form-item>
-                <el-form-item label="设备状态：" prop="activestatus">
-                  <el-radio v-model="form.activestatus" :label="1">已激活</el-radio>
-                  <el-radio v-model="form.activestatus" :label="0">未激活</el-radio>
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-tab-pane>
           <el-tab-pane label="TCP/IP" name="second">
             <el-row>
@@ -157,7 +157,7 @@
               </el-col>
             </el-row>
           </el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="medium" @click="visible=false">取 消</el-button>
@@ -448,8 +448,10 @@ export default {
           const temp = {
             src, productname, type, no, devicedesc, color
           }
-          const runstatus = Math.round(Math.random() * 10) % 3
-          const statusdesc = runstatus === 0 ? '待机' : runstatus === 1 ? '运行' : '警告'
+          // const runstatus = Math.round(Math.random() * 10) % 3
+          // const statusdesc = runstatus === 0 ? '待机' : runstatus === 1 ? '运行' : '警告'
+          const runstatus = 1
+          const statusdesc = '运行'
           const dataTemplate = {
             runstatus,
             statusdesc,