From dc78bf39c0a7aa4aad2d50ff7fec3b164c38c50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Mon, 17 Jul 2023 15:32:26 +0800
Subject: [PATCH] Revert "Revert "Merge branch 'hebei-cangzhouyancao' of
 https://gitlab.hzleaper.com:81/duoji/duoji-frontend into
 hebei-cangzhouyancao""

This reverts commit 0cc18e5701762de95be4e223f1687cd0863f4ea9.
---
 src/views/roadwayManage/index.vue |  4 ++++
 src/views/roadwayManage/model.vue | 11 +++++++++++
 src/views/videoWall/index.vue     | 11 +++++++++++
 3 files changed, 26 insertions(+)

diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index 19b085c..c18c13c 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -98,6 +98,10 @@ const columns = [
         title: '巷道标识',
         dataIndex: 'plcId',
     },
+    {
+        title: '库区',
+        dataIndex: 'area',
+    },
     {
         title: '光源IP',
         scopedSlots: { customRender: 'lightSourceIp' }
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index fdf9806..15d3e5f 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -26,6 +26,17 @@
                         />
                     </a-form-item>
                     
+<<<<<<< HEAD
+=======
+                </div>
+                <div class="across-layout">
+                    
+                    <a-form-item label="库区" :label-col="formItemAcrossLayout.labelCol">
+                        <a-input
+                            v-decorator="['area']"
+                        />
+                    </a-form-item>
+>>>>>>> 7c8cb048022f8fbc9d7b274bbde1e5502cefbe4d
                 </div>
                 <div class="across-layout">
                     <a-form-item label="PLC IP" :label-col="formItemAcrossLayout.labelCol">
diff --git a/src/views/videoWall/index.vue b/src/views/videoWall/index.vue
index 05b0a52..afb70aa 100644
--- a/src/views/videoWall/index.vue
+++ b/src/views/videoWall/index.vue
@@ -138,7 +138,18 @@ export default {
                 data: {}
             }).then(res => {
                 if(res.code == 200) {
+<<<<<<< HEAD
                     this.getAllCameras()
+=======
+                    this.areas = res.data;
+                    
+                    if(this.areas.length == 0){
+                        this.getAllCameras()
+                    }else{
+                        this.activeKey = this.areas[0]
+                        this.tabChange();
+                    }
+>>>>>>> 7c8cb048022f8fbc9d7b274bbde1e5502cefbe4d
                 }
             }).catch(err => {
                 console.log(err)