Signed-off-by: zhaobao <528046418@qq.com>

admin/README.md

@@ -13,4 +13,7 @@
 手机端-》设置=》隐私设置=》加密（关闭）
 
 18591509399
-Abc123456
+Abc123456
+
+
+https://open.ys7.com/cn/s/index

admin/src/assets/js/cameras.js

@@ -1,4 +1,9 @@
 let cameras=[
+    
+    {"deviceSerial": "D21357992","deviceName": "尧柏水泥厂（室内）"}, 
+    {"deviceSerial": "D17867806","deviceName": "尧柏水泥厂（室外）" },  
+    
+    
     {"deviceSerial": "BA7452836","deviceName": "安康睿峰玩具礼品有限公司(室内）","deviceType": "CS-C8c-V100-1J5WKFL"}, 
     {"deviceSerial": "BA7719038","deviceName": "安康睿峰玩具礼品有限公司（室外）","deviceType": "CS-C8c-V100-1J5WKFL" },  
 
@@ -29,8 +34,7 @@ let cameras=[
     {"deviceSerial": "BA7718547", "deviceName": "旬阳市宝利机械有限责任公司(室内）","deviceType": "CS-C8c-V100-1J5WKFL"},
     {"deviceSerial": "BA7718796","deviceName": "旬阳市宝利机械有限责任公司（室外）", "deviceType": "CS-C8c-V100-1J5WKFL"}, 
 
-    {"deviceSerial": "BA7718740","deviceName": "陕西尚虹丰纺织科技有限公司(室内）","deviceType": "CS-C8c-V100-1J5WKFL"},
-    {"deviceSerial": "BA7718645","deviceName": "陕西尚虹丰纺织科技有限公司(室外）","deviceType": "CS-C8c-V100-1J5WKFL"},   
+ 
 
 
     {"deviceSerial": "BA6528026","deviceName": "陕西广誉远药业有限公司（室外）","deviceType": "CS-C8c-V100-1J5WKFL"},      
@@ -40,15 +44,21 @@ let cameras=[
     {"deviceSerial": "BA7718822","deviceName": "陕西华禾柏生物科技有限公司（室内）","deviceType": "CS-C8c-V100-1J5WKFL"},
 
     // 不在线    
-    {"deviceSerial": "BA7718316","deviceName": "旬阳吕河园区十字路口", "deviceType": "CS-C8c-V100-1J5WKFL"}, 
-    {"deviceSerial": "BA7718343","deviceName": "陕西森鑫汇木业有限公司(室外）","deviceType": "CS-C8c-V100-1J5WKFL"},
-    {"deviceSerial": "BA7718437","deviceName": "陕西森鑫汇木业有限公司（室内）","deviceType": "CS-C8c-V100-1J5WKFL"},  
+    {"deviceSerial": "BA7718316","deviceName": "旬阳吕河园区十字路口", "deviceType": "CS-C8c-V100-1J5WKFL"},  
     {"deviceSerial": "BA7718347","deviceName": "安康巴山雪饮食有限责任公司(室外）", "deviceType": "CS-C8c-V100-1J5WKFL" }, 
-    {"deviceSerial": "BA7718831","deviceName": "旬阳市欣福长商砼有限公司(室外）","deviceType": "CS-C8c-V100-1J5WKFL"},
+
     {"deviceSerial": "BA7718366","deviceName": "旬阳盛鑫轻工科技有限公司(室外）","deviceType": "CS-C8c-V100-1J5WKFL" },
-    {"deviceSerial": "BA7718323","deviceName": "陕西中科纳米材料股份有限公司（室内）", "deviceType": "CS-C8c-V100-1J5WKFL"},
-    {"deviceSerial": "BA7718227","deviceName": "恒源生化（室内）","deviceType": "CS-C8c-V100-1J5WKFL"},
+    {"deviceSerial": "BA7718831","deviceName": "旬阳市欣福长商砼有限公司(室外）","deviceType": "CS-C8c-V100-1J5WKFL"},
     {"deviceSerial": "BA7718576","deviceName": "旬阳市欣福长商砼有限公司（室内）","deviceType": "CS-C8c-V100-1J5WKFL"},
-    {"deviceSerial": "BA7718493","deviceName": "陕西同春电力科技发展有限公司(室外）","deviceType": "CS-C8c-V100-1J5WKFL"},  
+
+    {"deviceSerial": "BA7718323","deviceName": "陕西中科纳米材料股份有限公司（室内）", "deviceType": "CS-C8c-V100-1J5WKFL"},
+    // {"deviceSerial": "BA7718493","deviceName": "陕西同春电力科技发展有限公司(室外）","deviceType": "CS-C8c-V100-1J5WKFL"}, 
+    // {"deviceSerial": "BA7718227","deviceName": "恒源生化（室内）","deviceType": "CS-C8c-V100-1J5WKFL"}, 
+
+    {"deviceSerial": "BA7718740","deviceName": "陕西尚虹丰纺织科技有限公司(室内）","deviceType": "CS-C8c-V100-1J5WKFL"},
+    {"deviceSerial": "BA7718645","deviceName": "陕西尚虹丰纺织科技有限公司(室外）","deviceType": "CS-C8c-V100-1J5WKFL"},  
+
+    {"deviceSerial": "BA7718343","deviceName": "陕西森鑫汇木业有限公司(室外）","deviceType": "CS-C8c-V100-1J5WKFL"},
+    {"deviceSerial": "BA7718437","deviceName": "陕西森鑫汇木业有限公司（室内）","deviceType": "CS-C8c-V100-1J5WKFL"}, 
 ]
 export default cameras

admin/src/components/cameras/index.vue

@@ -3,7 +3,7 @@
         <div class="nav">双预防视频监控平台</div>    
         <div class="camera-container">
             <!-- flv-video -->
-            <div  class="flv video-container" v-for="(item,key) in flvsItem" :key="'flv-'+key"  @click.stop="showflvModel(item)" :class="flv.id===item.id?'fixed':'121'">
+            <!-- <div  class="flv video-container" v-for="(item,key) in flvsItem" :key="'flv-'+key"  @click.stop="showflvModel(item)" :class="flv.id===item.id?'fixed':'121'">
                 <div class="flv-camera-box">
                     <div class="title">
                         <div class="name">{{ item.name }}</div>                                                                 
@@ -11,7 +11,7 @@
                     </div>               
                     <video class="flv-video" :id="item.id"  style="width:100%;height:100%;" controls autoplay muted></video>             
                 </div>
-            </div>        
+            </div>         -->
             <div class="video-container" v-for="(item,key) in items" :key="key" >
                 <div class="name">{{ item.deviceName }}</div>   
                 <div :id="`video-`+item.deviceSerial"  style="width:100%;height:100%;" v-if="key<18"></div>  
@@ -74,7 +74,7 @@
                     this.getData()
                     // this.getDevicelist()
                 })
-                this.renderflvitems()
+                // this.renderflvitems()
             },
             showModel(item,type){
                 if(type!==2){