From 42881e7101f92eacafe4880444f56ee8052cdb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Thu, 17 Dec 2020 22:11:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=B7=E9=81=93model?=
 =?UTF-8?q?=E7=9A=84selete=E6=A1=86=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=90=83=E6=9C=BA=E8=AF=B7=E6=B1=82=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cameraManage/index.vue  | 21 ++++++++++++++++-----
 src/views/cameraManage/model.vue  |  1 -
 src/views/roadwayManage/index.vue |  2 +-
 src/views/roadwayManage/model.vue | 26 ++++++++++++++++----------
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/views/cameraManage/index.vue b/src/views/cameraManage/index.vue
index 48045c7..2a949bf 100644
--- a/src/views/cameraManage/index.vue
+++ b/src/views/cameraManage/index.vue
@@ -1,8 +1,13 @@
 <template>
     <div>
-        <a-button type="primary" class="add" @click="showModel('add','')">
-            新增球机
-        </a-button>
+        <div class="button-box">
+            <a-button type="primary" class="add" @click="showModel('add','')">
+                新增球机
+            </a-button>
+            <a-button type="primary" class="plc">
+                PLC IO表配置
+            </a-button>
+        </div>
         <a-table
             :columns="columns"
             :row-key="record => record.id"
@@ -147,10 +152,16 @@ export default {
     }
 };
 </script>
-<style lang="scss">
-    .add{
+<style lang="scss" scoped>
+    .button-box{
         position: absolute;
         top:0;
         right: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .add{
+            margin-right: 20px;
+        }
     }
 </style>
diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue
index 71f4d7a..e2a74f3 100644
--- a/src/views/cameraManage/model.vue
+++ b/src/views/cameraManage/model.vue
@@ -26,7 +26,6 @@
                            { rules: [{ required: true, message: '请选择球机IP!' }] },
                         ]"
                         placeholder="选择球机IP"
-                        @change="handleSelectChangeLeft"
                     >
                         <a-select-option value="192.168.11.6">
                             192.168.11.6
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index c621b5a..1c3c3c0 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -166,7 +166,7 @@ export default {
     }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
     .add{
         position: absolute;
         top:0;
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index 10c62bb..db5a45b 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -144,12 +144,10 @@
                                'camera1Id',
                             ]"
                         placeholder="选择球机"
+                        @dropdownVisibleChange="handleSelectCamera"
                     >
-                        <a-select-option value="0">
-                            球机1
-                        </a-select-option>
-                        <a-select-option value="1">
-                            球机2
+                        <a-select-option v-for="item in camera1Id" :key="item.id" :value="item.id">
+                            {{item.name}}
                         </a-select-option>
                     </a-select>
                 </a-form-item>
@@ -160,11 +158,8 @@
                             ]"
                         placeholder="选择球机"
                     >
-                        <a-select-option value="0">
-                            球机3
-                        </a-select-option>
-                        <a-select-option value="1">
-                            球机4
+                        <a-select-option v-for="item in camera1Id" :key="item.id" :value="item.id">
+                            {{item.name}}
                         </a-select-option>
                     </a-select>
                 </a-form-item>
@@ -236,6 +231,7 @@ export default {
             leftType:'',
             rightType:'',
             id:'',
+            camera1Id:[],
             mdata:[]
         };
     },
@@ -314,6 +310,16 @@ export default {
             })
             this.rightType = value  //判断渲染右货架单伸或者双伸的时会用到，在这里赋值给data实例
         },
+        handleSelectCamera(){
+            this.$api.httpApi.getCameraList({
+                data: {
+                    pageNum:0,
+                    pageSize:0,
+                }
+            }).then(res => {
+                this.camera1Id = res.data.list;
+            });
+        }
     },
 };
 </script>