Merge branch 'hebei-cangzhouyancao' of https://gitlab.hzleaper.com:81/duoji/duoji-frontend into hebei-cangzhouyancao

# Conflicts:
#	src/views/roadwayManage/model.vue
#	src/views/videoWall/index.vue

src/views/roadwayManage/index.vue

@@ -98,6 +98,10 @@ const columns = [
         title: '巷道标识',
         dataIndex: 'plcId',
     },
+    {
+        title: '库区',
+        dataIndex: 'area',
+    },
     {
         title: '光源IP',
         scopedSlots: { customRender: 'lightSourceIp' }

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">

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)