更新

src/views/houseSelfCollect/weighingManagement.vue

@@ -159,6 +159,8 @@ export default {
       warehouseList: [],
       warehouseId: '',
       cangid: '',
+      monitorUrl1: '',
+      monitorUrl2: '',
       isShowPrint:false,//打印弹出
       dialogData:{
         qualityInspectionManagement:{},
@@ -201,7 +203,9 @@ export default {
           this.purchasePriceList = this.warehouseList[i].warehouseList
           this.allowEdit = this.warehouseList[i].allowEdit
           this.WAREHOUSE[2].payname = this.warehouseList[i].value
-          this.common.name  =  this.warehouseList[0].value
+          this.common.name  =  this.warehouseList[i].value
+          this.monitorUrl1 =  this.warehouseList[i].monitorUrl1
+          this.monitorUrl2 =  this.warehouseList[i].monitorUrl2
           sessionStorage.setItem('ck',e)
         }
       }
@@ -225,6 +229,8 @@ export default {
           netWeight: row.netWeight,
           relationId: row.relationId,
           warehouseId: this.warehouseId,
+          monitorUrl1: this.monitorUrl1,
+          monitorUrl2: this.monitorUrl2,
           purchasePriceList: this.purchasePriceList,
           allowEdit:this.allowEdit
         },
@@ -255,7 +261,9 @@ export default {
               value: response[i].warehouseName,
               warehouseId: response[i].id,
               warehouseList:response[i].purchasePriceList,
-              allowEdit:response[i].allowEdit
+              allowEdit:response[i].allowEdit,
+              monitorUrl1:response[i].monitorUrl1,
+              monitorUrl2:response[i].monitorUrl2
             })
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
@@ -263,6 +271,8 @@ export default {
               this.common.name = response[i].warehouseName
               this.warehouseId =  response[i].id
               this.warehouseNo =  response[i].commonWarehouseNo
+              this.monitorUrl1 =  response[i].monitorUrl1
+              this.monitorUrl2 =  response[i].monitorUrl2
               this.purchasePriceList =  response[i].purchasePriceList
             }
           }
@@ -273,6 +283,8 @@ export default {
             this.purchasePriceList =  this.warehouseList[0].purchasePriceList
             this.WAREHOUSE[1].payname = this.warehouseList[0].value
             this.common.name  =  this.warehouseList[0].value
+            this.monitorUrl1 =  this.warehouseList[0].monitorUrl1
+            this.monitorUrl2 =  this.warehouseList[0].monitorUrl2
           }
            sessionStorage.setItem('ck',this.common.name)
          this.getList()

src/views/houseSelfCollect/weightCheck.vue

@@ -20,19 +20,27 @@
         </div>
         <h2 class="bg-left titleup">实时监控</h2>
         <div class="bottom">
-          <div class="video1">
-            <!-- <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" v-if="!video1Src">
-            <div v-if="!video1Src">监控视频未连接</div>
-            <video v-if="video1Src" controls="controls" :src="video1Src"  autoplay="autoplay" class="video-content"
-              mediatype="video"></video> -->
-              <iframe src="http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000001&aspect=fullscreen" width="440" height="360" allowfullscreen allow="autoplay; fullscreen; microphone;"></iframe>
+          <div v-if="!monitorUrl1" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" >
+            <div >监控视频未连接</div>
+              
           </div>
-          <div class="vide2">
-            <!-- <img src="../../../public/img/quesheng@2x.png" alt="" class="img2" v-if="!video2Src">
-            <div v-if="!video2Src">监控视频未连接</div>
-            <video src="" v-if="video2Src" class="video-content"></video> -->
-            <iframe src="http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000002&aspect=fullscreen" width="440" height="360" allowfullscreen allow="autoplay; fullscreen; microphone;"></iframe>
-          
+          <div v-else class="video1">
+           <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen ="true"
+           webkitallowfullscreen="true"
+           mozallowfullscreen="true"
+           allow="autoplay; fullscreen; microphone;"></iframe>
+          </div>
+          <div v-if="!monitorUrl2" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" >
+            <div >监控视频未连接</div>
+              
+          </div>
+          <div v-else class="video2">
+           <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true"
+           webkitallowfullscreen="true"
+           mozallowfullscreen="true"
+            allow="autoplay; fullscreen; microphone;"></iframe>
           </div>
         </div>
       </div>
@@ -168,8 +176,6 @@
         pList: [],
         mList: [],
         index: 0,
-        video1Src: 'http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000001',
-        video2Src: 'http://live.eliangeyun.com/play.html?serial=34020000001110000001&code=34020000001310000002',
         currentPage: 1,
         pageSize: 10,
         carList: [],
@@ -195,7 +201,9 @@
         isShowPrint: false,
         tableData: {},
         reader: null,
-        param: 9600
+        param: 9600,
+        monitorUrl1: '',
+        monitorUrl2: '',
       }
     },
     activated() {
@@ -210,6 +218,8 @@
       this.weighingList.goodsName = this.$route.query.goodsName
       this.weighingList.id = this.$route.query.id
       this.relationId = this.$route.query.relationId
+      this.monitorUrl1 = this.$route.query.monitorUrl1
+      this.monitorUrl2 = this.$route.query.monitorUrl2
       this.warehouseId = this.$route.query.warehouseId
       if (!this.$route.query.grossWeight) {
         this.$route.query.grossWeight = 0

src/views/warehouse/warehouseManagementEdit.vue

@@ -321,7 +321,7 @@ export default {
   },
   activated() {
     this.loaddata()
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.baseId })
+    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:'' })
       .toPromise()
       .then((response) => {
         this.options = response