Przeglądaj źródła

2020年7月8日22:47:49

linan-0110 5 lat temu
rodzic
commit
2ff2d992d4

+ 0 - 46
src/views/deviceManagement/DeviceType.vue

@@ -43,52 +43,6 @@
                 <el-button type="primary" @click="handleSave">保 存</el-button>
             </div>
         </el-dialog>
-        <div>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>1</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>d</p>
-            <p>22</p>
-        </div>
     </div>
 </template>
 <script>

+ 92 - 48
src/views/deviceManagement/SubDeviceAdmin.vue

@@ -2,16 +2,29 @@
 <template>
     <!-- 子设备管理页 -->
     <div class="SubDeviceAdmin">
-        <header id="header">
-            <el-page-header @back="goBack" :content="mainDeviceInfo.name" />
-            <el-button @click="showAddSubDevice=true" type="primary" icon="el-icon-document-add">添加</el-button>
-        </header>
+        <el-row type="flex">
+            <el-col :span="20">
+                <el-page-header @back="goBack" :content="mainDeviceInfo.name" />
+            </el-col>
+            <el-col :span="4">
+                <el-button
+                    @click="showAddSubDevice=true"
+                    type="primary"
+                    icon="el-icon-document-add"
+                >添加</el-button>
+            </el-col>
+        </el-row>
 
         <el-table :data="subDeviceList" style="width: 100%">
             <el-table-column prop="id" label="序号"></el-table-column>
             <el-table-column prop="communicationId" label="通讯ID"></el-table-column>
-            <el-table-column prop="deviceNo" label="型号"></el-table-column>
+            <el-table-column prop="deviceNo" label="MAC/SN"></el-table-column>
             <el-table-column prop="channelNo" label="通道"></el-table-column>
+            <el-table-column label="是否可用(0-不可用 1-可用)">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.enable==1?"可用":scope.row.enable==0?"不可用":scope.row.enable }}</span>
+                </template>
+            </el-table-column>
             <el-table-column label="最后一次">
                 <template slot-scope="scope">
                     <span>{{ new Date(scope.row.updated).toLocaleDateString() }}</span>
@@ -20,7 +33,6 @@
             <el-table-column fixed="right" label="操作" width="200">
                 <template slot-scope="scope">
                     <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
-                    <!-- <el-button @click="del(scope.row)">删除</el-button> -->
                     <el-popconfirm title="是否删除此设备的信息?" @onConfirm="del(scope.row)">
                         <el-button slot="reference" type="text" size="small">删除</el-button>
                     </el-popconfirm>
@@ -30,35 +42,36 @@
 
         <!-- 添加子设备信息 -->
         <el-dialog title="添加/编辑子设备信息" :visible.sync="showAddSubDevice">
-            <el-form ref="form" :model="form" label-width="100px">
-                <el-form-item label="设备型号:">
-                    <el-input v-model="form.deviceNo"></el-input>
-                </el-form-item>
-                <el-form-item label="通讯ID:">
-                    <el-input v-model="form.communicationId"></el-input>
-                </el-form-item>
-                <el-form-item label="通道:">
-                    <el-input v-model="form.channelNo"></el-input>
-                </el-form-item>
-                <!-- <el-form-item label="硬件型号">
-                    <el-input v-model="form.hardTypeId"></el-input>
-                </el-form-item>-->
-                <el-form-item label="硬件型号:">
-					<el-input v-model="form.hardTypeId"></el-input>
-                </el-form-item>
+            <el-row type="flex">
+                <el-col :span="14">
+                    <el-form ref="form" :model="form" label-width="100px">
+                        <!-- <el-form-item label="MAC/SN:">
+                            <el-input v-model="form.deviceNo"></el-input>
+                        </el-form-item>-->
+                        <el-form-item label="通讯ID:">
+                            <el-input v-model="form.communicationId"></el-input>
+                        </el-form-item>
+                        <el-form-item label="通道:">
+                            <el-input v-model="form.channelNo"></el-input>
+                        </el-form-item>
+                        <!-- <el-form-item label="硬件型号:">
+                            <el-input v-model="form.hardTypeId"></el-input>
+                        </el-form-item>-->
 
-                <el-form-item label="设备是否可用:">
-                    <el-radio-group v-model="form.enable">
-                        <el-radio :label="1">可用</el-radio>
-                        <el-radio :label="0">不可用</el-radio>
-                    </el-radio-group>
-                </el-form-item>
+                        <el-form-item label="设备是否可用:">
+                            <el-radio-group v-model="form.enable">
+                                <el-radio :label="1">可用</el-radio>
+                                <el-radio :label="0">不可用</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
 
-                <el-form-item>
-                    <el-button type="primary" @click="addSubDevice">立即创建</el-button>
-                    <el-button @click="onCancel">取消</el-button>
-                </el-form-item>
-            </el-form>
+                        <el-form-item>
+                            <el-button @click="onCancel">取消</el-button>
+                            <el-button type="primary" @click="addSubDevice">立即创建</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-col>
+            </el-row>
         </el-dialog>
     </div>
 </template>
@@ -73,10 +86,10 @@ export default {
             subDeviceList: [], // 子设备信息列表
             showAddSubDevice: false,
             form: {
-                deviceNo: "",
+                // deviceNo: "",
                 communicationId: null,
                 channelNo: "",
-                hardTypeId: null,
+                // hardTypeId: null,
                 enable: 1
             }
         };
@@ -101,6 +114,11 @@ export default {
                 },
                 success: res => {
                     this.subDeviceList = res;
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
                 }
             });
         },
@@ -109,24 +127,54 @@ export default {
             console.log("编辑", row);
             this.showAddSubDevice = true;
         },
-        // 删除
+        // 删除  (接口有问题)
         del(row) {
             console.log("删除 未完成", row);
+            this.fetch({
+                api: "/device/device-slave/delete",
+                method: "POST",
+                data: {
+                    communicationId: row.communicationId
+                },
+                success: res => {
+                    this.subDeviceList = res;
+                    // 获取子设备信息列表
+                    this.doSubDeviceList();
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
+                }
+            });
         },
-        // 保存 添加子设备信息
+        // 保存 添加子设备信息 (接口有问题)
         addSubDevice() {
             console.log("保存 添加子设备信息", this.form);
-            console.log(this.form);
+            let data = Object.assign(this.form, {
+                deviceNo: this.mainDeviceInfo.deviceNo,
+                hardTypeId: this.mainDeviceInfo.hardTypeId
+            });
             this.fetch({
                 api: "/device/device-slave/add",
-                method: "Post",
-                data: this.form,
+                method: "POST",
+                data,
                 success: res => {
                     console.log(res);
-                    this.$message({
-                        message: "添加子设备信息成功",
-                        type: "success"
-                    });
+                    // 获取子设备信息列表
+                    this.doSubDeviceList();
+                    this.showAddSubDevice = false;
+                    this.form = {
+                        communicationId: null,
+                        channelNo: "",
+                        enable: 1
+                    };
+                    this.$message.success("添加子设备信息成功");
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
                 }
             });
         },
@@ -143,9 +191,5 @@ export default {
 
 <style lang="scss" scoped>
 .SubDeviceAdmin {
-    #header {
-        display: flex;
-        justify-content: space-between;
-    }
 }
 </style>

BIN
~$I接口设计稿.docx