From 7c6666428ece98a6ca184f89ed38aadbafb73447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Wed, 23 Dec 2020 12:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E8=A7=86=E9=A2=91=E6=B5=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E6=97=B6=E5=99=A8=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=93=8D=E4=BD=9C=EF=BC=8C=E7=90=83=E6=9C=BA?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=B8=B2=E6=9F=93=E5=AD=97=E6=AE=B5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/realTimeMonitoring/index.vue | 43 +++++++++----
 src/views/roadwayManage/model.vue      | 83 ++++++++++++++++++--------
 2 files changed, 87 insertions(+), 39 deletions(-)

diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue
index 5f61227..5127c1b 100644
--- a/src/views/realTimeMonitoring/index.vue
+++ b/src/views/realTimeMonitoring/index.vue
@@ -42,6 +42,7 @@
                 </div>
             </div>
         </div>
+<!--        <h1 style="color: #40a9ff">{{num}}</h1>-->
 <!--        <canvas class="video-cav" width="480" height="270"></canvas>-->
         <Model
             :visible.sync="visible"
@@ -66,16 +67,20 @@ export default {
             path:[],
             player:'',
             visible:false,
-            modelData:[]
+            modelData:[],
+            timer:'',
+            num:240
         };
     },
     mounted() {
         this.getRealTimeList()
-        this.getVideos()
+        // this.getVideos()
+        this.timerFn()
     },
     destroyed(){
         console.log('2222222')
-        this.player.destroy()
+        // this.player.destroy()
+        clearInterval(this.timer)
     },
     methods: {
         // 展开收起
@@ -124,20 +129,32 @@ export default {
 
             });
         },
-        getVideos(){
-            // var canvas = document.querySelector('.video-cav')
-            // var url = 'ws://192.168.66.56:9007/api/lychee/stream/live/'+this.url
-            // var player = new JSMpeg.Player(url, {
-            //     canvas: canvas,
-            //     audio: false,
-            //     pauseWhenHidden: false,
-            //     videoBufferSize: 8 * 1024 * 1024,
-            //     loop:false
-            // })
+        timerFn(){
+            const that=this
+            this.timer = setInterval(function () {
+                that.num = that.num-1;
+                console.log(that.num)
+                if(that.num == -1){
+                    location.reload();
+                    that.num = 240
+                }
+            },1000)
         },
+        // getVideos(){
+        //     var canvas = document.querySelector('.video-cav')
+        //     var url = 'ws://192.168.66.56:9007/api/lychee/stream/live/'+this.url
+        //     var player = new JSMpeg.Player(url, {
+        //         canvas: canvas,
+        //         audio: false,
+        //         pauseWhenHidden: false,
+        //         videoBufferSize: 8 * 1024 * 1024,
+        //         loop:false
+        //     })
+        // },
         showModel(item){
             console.log(11111)
             this.player.destroy()
+            clearInterval(this.timer)
             console.log(item)
             this.visible = true
             this.modelData=item
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index 6716a8c..76f82c2 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -137,32 +137,61 @@
                     </div>
                     <a-divider></a-divider>
                 </div>
-
-                <a-form-item label="球机1" :label-col="formItemVerticalLayout.labelCol">
-                    <a-select
-                        v-decorator="[
+                <div  v-if="cameraList.length>0">
+                    <a-form-item label="球机1" :label-col="formItemVerticalLayout.labelCol">
+                        <a-select
+                            v-decorator="[
                                'camera1Id',
                             ]"
-                        placeholder="选择球机"
-                        @dropdownVisibleChange="handleSelectCamera"
-                    >
-                        <a-select-option v-for="item in camera1Id" :key="item.id" :value="item.id">
-                            {{item.name}}
-                        </a-select-option>
-                    </a-select>
-                </a-form-item>
-                <a-form-item label="球机2" :label-col="formItemVerticalLayout.labelCol">
-                    <a-select
-                        v-decorator="[
+                            placeholder="选择球机"
+                            @dropdownVisibleChange="handleSelectCamera"
+                        >
+                            <a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
+                                {{item.name}}
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                    <a-form-item label="球机2" :label-col="formItemVerticalLayout.labelCol">
+                        <a-select
+                            v-decorator="[
                                'camera2Id',
                             ]"
-                        placeholder="选择球机"
-                    >
-                        <a-select-option v-for="item in camera1Id" :key="item.id" :value="item.id">
-                            {{item.name}}
-                        </a-select-option>
-                    </a-select>
-                </a-form-item>
+                            placeholder="选择球机"
+                        >
+                            <a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
+                                {{item.name}}
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </div>
+                <div v-else>
+                    <a-form-item label="球机1" :label-col="formItemVerticalLayout.labelCol">
+                        <a-select
+                            v-decorator="[
+                               'camera1Name',
+                            ]"
+                            placeholder="选择球机"
+                            @dropdownVisibleChange="handleSelectCamera"
+                        >
+                            <a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
+                                {{item.name}}
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                    <a-form-item label="球机2" :label-col="formItemVerticalLayout.labelCol">
+                        <a-select
+                            v-decorator="[
+                               'camera2Name',
+                            ]"
+                            placeholder="选择球机"
+                        >
+                            <a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
+                                {{item.name}}
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </div>
+
             </a-form>
         </a-modal>
     </div>
@@ -188,7 +217,7 @@ export default {
             this.title = newVal;
         },
         modelData: function(newVal){
-            // console.log(newVal)
+            console.log(newVal)
             if(newVal.id){
                 this.mdata=newVal
                 this.leftType=newVal.leftType
@@ -212,7 +241,9 @@ export default {
                         rightInsideShelveId:newVal.rightInsideShelveId,
                         rightOutsideShelveId:newVal.rightOutsideShelveId,
                         camera1Id:newVal.camera1Id,
-                        camera2Id:newVal.camera2Id
+                        camera2Id:newVal.camera2Id,
+                        camera1Name:newVal.camera1Name,
+                        camera2Name:newVal.camera2Name
                     })
                 })
             }
@@ -231,7 +262,7 @@ export default {
             leftType:'',
             rightType:'',
             id:'',
-            camera1Id:[],
+            cameraList:[],
             mdata:[]
         };
     },
@@ -321,7 +352,7 @@ export default {
                     pageSize:0,
                 }
             }).then(res => {
-                this.camera1Id = res.data.list;
+                this.cameraList = res.data.list;
             }).catch(err => {
 
             });