Browse Source

新开的窗在最上层,增加预览视频,开窗以大屏为基点

liuwei 4 years ago
parent
commit
48b3431d14
100 changed files with 6 additions and 14 deletions
  1. 6 10
      src/renderer/components/BigShow.vue
  2. 0 4
      src/renderer/components/SignalList.vue
  3. 0 0
      static/Data/1.png
  4. 0 0
      static/Data/10.png
  5. 0 0
      static/Data/100.png
  6. 0 0
      static/Data/101.png
  7. 0 0
      static/Data/102.png
  8. 0 0
      static/Data/103.png
  9. 0 0
      static/Data/104.png
  10. 0 0
      static/Data/105.png
  11. 0 0
      static/Data/106.png
  12. 0 0
      static/Data/107.png
  13. 0 0
      static/Data/108.png
  14. 0 0
      static/Data/109.png
  15. 0 0
      static/Data/11.png
  16. 0 0
      static/Data/110.png
  17. 0 0
      static/Data/111.png
  18. 0 0
      static/Data/112.png
  19. 0 0
      static/Data/113.png
  20. 0 0
      static/Data/114.png
  21. 0 0
      static/Data/115.png
  22. 0 0
      static/Data/116.png
  23. 0 0
      static/Data/117.png
  24. 0 0
      static/Data/118.png
  25. 0 0
      static/Data/119.png
  26. 0 0
      static/Data/12.png
  27. 0 0
      static/Data/120.png
  28. 0 0
      static/Data/121.png
  29. 0 0
      static/Data/122.png
  30. 0 0
      static/Data/123.png
  31. 0 0
      static/Data/124.png
  32. 0 0
      static/Data/125.png
  33. 0 0
      static/Data/126.png
  34. 0 0
      static/Data/127.png
  35. 0 0
      static/Data/128.png
  36. 0 0
      static/Data/129.png
  37. 0 0
      static/Data/13.png
  38. 0 0
      static/Data/130.png
  39. 0 0
      static/Data/131.png
  40. 0 0
      static/Data/132.png
  41. 0 0
      static/Data/133.png
  42. 0 0
      static/Data/134.png
  43. 0 0
      static/Data/135.png
  44. 0 0
      static/Data/136.png
  45. 0 0
      static/Data/137.png
  46. 0 0
      static/Data/138.png
  47. 0 0
      static/Data/139.png
  48. 0 0
      static/Data/14.png
  49. 0 0
      static/Data/140.png
  50. 0 0
      static/Data/141.png
  51. 0 0
      static/Data/142.png
  52. 0 0
      static/Data/143.png
  53. 0 0
      static/Data/144.png
  54. 0 0
      static/Data/145.png
  55. 0 0
      static/Data/146.png
  56. 0 0
      static/Data/147.png
  57. 0 0
      static/Data/148.png
  58. 0 0
      static/Data/149.png
  59. 0 0
      static/Data/15.png
  60. 0 0
      static/Data/150.png
  61. 0 0
      static/Data/151.png
  62. 0 0
      static/Data/152.png
  63. 0 0
      static/Data/153.png
  64. 0 0
      static/Data/154.png
  65. 0 0
      static/Data/155.png
  66. 0 0
      static/Data/156.png
  67. 0 0
      static/Data/157.png
  68. 0 0
      static/Data/158.png
  69. 0 0
      static/Data/159.png
  70. 0 0
      static/Data/16.png
  71. 0 0
      static/Data/160.png
  72. 0 0
      static/Data/161.png
  73. 0 0
      static/Data/162.png
  74. 0 0
      static/Data/163.png
  75. 0 0
      static/Data/164.png
  76. 0 0
      static/Data/165.png
  77. 0 0
      static/Data/166.png
  78. 0 0
      static/Data/167.png
  79. 0 0
      static/Data/168.png
  80. 0 0
      static/Data/169.png
  81. 0 0
      static/Data/17.png
  82. 0 0
      static/Data/170.png
  83. 0 0
      static/Data/171.png
  84. 0 0
      static/Data/172.png
  85. 0 0
      static/Data/173.png
  86. 0 0
      static/Data/174.png
  87. 0 0
      static/Data/175.png
  88. 0 0
      static/Data/176.png
  89. 0 0
      static/Data/177.png
  90. 0 0
      static/Data/178.png
  91. 0 0
      static/Data/179.png
  92. 0 0
      static/Data/18.png
  93. 0 0
      static/Data/180.png
  94. 0 0
      static/Data/181.png
  95. 0 0
      static/Data/182.png
  96. 0 0
      static/Data/183.png
  97. 0 0
      static/Data/184.png
  98. 0 0
      static/Data/185.png
  99. 0 0
      static/Data/186.png
  100. 0 0
      static/Data1/187.png

+ 6 - 10
src/renderer/components/BigShow.vue

@@ -26,12 +26,12 @@
                     @resizestop="(size) => resizeSignal(size,itemV,bigScreenObj,curOpeBigscreenId)"
             >
                 <div ref="signal" :id="itemV.ID">
-                    {{itemV.deviceID}}
-                    <!--<VideoPlayer
+                    <!--{{itemV.deviceID}}-->
+                    <VideoPlayer
                             ref="videoPlayer"
                             :options="playerOptions"
                             :playsinline="true"
-                    />-->
+                    />
                     <div class="closeBtn" @click.stop="closeSignal(itemV)">×</div>
                 </div>
             </VueDragResize>
@@ -127,8 +127,8 @@
                 if(Id){
                     const signals = obj[Id].signalArr
                     const streamWindows = signals.map((item,index) => ({
-                        left:item.left + this.screenPosition[Id].left,
-                        top:item.top + this.screenPosition[Id].top,
+                        left:item.left,
+                        top:item.top,
                         width:item.width,
                         height:item.height,
                         id:index,
@@ -137,10 +137,6 @@
                         heightScale:item.heightScale,
                         orginRect:{}
                     }))
-                    console.log({
-                        bigScreenId:Id,
-                        streamWindows
-                    })
                     await reqRefreshView({
                         bigScreenId:Id,
                         streamWindows
@@ -220,7 +216,7 @@
                         const positionInfo = elePosition(newObj[0].width,newObj[0].height,positionNum,this.screenPosition[bigscreenId].top,this.screenPosition[bigscreenId].left,bigScreenObj[bigscreenId].splitStatus+1)
                         newObj[0].top = positionInfo.top - this.screenPosition[bigscreenId].top
                         newObj[0].left = positionInfo.left - this.screenPosition[bigscreenId].left
-                        bigScreenObj[bigscreenId].signalArr = [...newObj,...otherSignals]
+                        bigScreenObj[bigscreenId].signalArr = [...otherSignals,...newObj]
                         this.refreshBigScreen(bigScreenObj,bigscreenId)
                     })
                 }

+ 0 - 4
src/renderer/components/SignalList.vue

@@ -60,10 +60,6 @@
         async beforeCreate() {
             this.signalBorder = await getStaticFile('EnitySignalPreviewList.Data')
         },
-        
-        mounted() {
-          console.log(this.signalBorder)
-        },
 
         updated() {
             const flag = this.signalBorder[0] ? (this.signalBorder[0].Orientation === 0 ? 'column' : 'row') : ''

static/Data1/1.png → static/Data/1.png


static/Data1/10.png → static/Data/10.png


static/Data1/100.png → static/Data/100.png


static/Data1/101.png → static/Data/101.png


static/Data1/102.png → static/Data/102.png


static/Data1/103.png → static/Data/103.png


static/Data1/104.png → static/Data/104.png


static/Data1/105.png → static/Data/105.png


static/Data1/106.png → static/Data/106.png


static/Data1/107.png → static/Data/107.png


static/Data1/108.png → static/Data/108.png


static/Data1/109.png → static/Data/109.png


static/Data1/11.png → static/Data/11.png


static/Data1/110.png → static/Data/110.png


static/Data1/111.png → static/Data/111.png


static/Data1/112.png → static/Data/112.png


static/Data1/113.png → static/Data/113.png


static/Data1/114.png → static/Data/114.png


static/Data1/115.png → static/Data/115.png


static/Data1/116.png → static/Data/116.png


static/Data1/117.png → static/Data/117.png


static/Data1/118.png → static/Data/118.png


static/Data1/119.png → static/Data/119.png


static/Data1/12.png → static/Data/12.png


static/Data1/120.png → static/Data/120.png


static/Data1/121.png → static/Data/121.png


static/Data1/122.png → static/Data/122.png


static/Data1/123.png → static/Data/123.png


static/Data1/124.png → static/Data/124.png


static/Data1/125.png → static/Data/125.png


static/Data1/126.png → static/Data/126.png


static/Data1/127.png → static/Data/127.png


static/Data1/128.png → static/Data/128.png


static/Data1/129.png → static/Data/129.png


static/Data1/13.png → static/Data/13.png


static/Data1/130.png → static/Data/130.png


static/Data1/131.png → static/Data/131.png


static/Data1/132.png → static/Data/132.png


static/Data1/133.png → static/Data/133.png


static/Data1/134.png → static/Data/134.png


static/Data1/135.png → static/Data/135.png


static/Data1/136.png → static/Data/136.png


static/Data1/137.png → static/Data/137.png


static/Data1/138.png → static/Data/138.png


static/Data1/139.png → static/Data/139.png


static/Data1/14.png → static/Data/14.png


static/Data1/140.png → static/Data/140.png


static/Data1/141.png → static/Data/141.png


static/Data1/142.png → static/Data/142.png


static/Data1/143.png → static/Data/143.png


static/Data1/144.png → static/Data/144.png


static/Data1/145.png → static/Data/145.png


static/Data1/146.png → static/Data/146.png


static/Data1/147.png → static/Data/147.png


static/Data1/148.png → static/Data/148.png


static/Data1/149.png → static/Data/149.png


static/Data1/15.png → static/Data/15.png


static/Data1/150.png → static/Data/150.png


static/Data1/151.png → static/Data/151.png


static/Data1/152.png → static/Data/152.png


static/Data1/153.png → static/Data/153.png


static/Data1/154.png → static/Data/154.png


static/Data1/155.png → static/Data/155.png


static/Data1/156.png → static/Data/156.png


static/Data1/157.png → static/Data/157.png


static/Data1/158.png → static/Data/158.png


static/Data1/159.png → static/Data/159.png


static/Data1/16.png → static/Data/16.png


static/Data1/160.png → static/Data/160.png


static/Data1/161.png → static/Data/161.png


static/Data1/162.png → static/Data/162.png


static/Data1/163.png → static/Data/163.png


static/Data1/164.png → static/Data/164.png


static/Data1/165.png → static/Data/165.png


static/Data1/166.png → static/Data/166.png


static/Data1/167.png → static/Data/167.png


static/Data1/168.png → static/Data/168.png


static/Data1/169.png → static/Data/169.png


static/Data1/17.png → static/Data/17.png


static/Data1/170.png → static/Data/170.png


static/Data1/171.png → static/Data/171.png


static/Data1/172.png → static/Data/172.png


static/Data1/173.png → static/Data/173.png


static/Data1/174.png → static/Data/174.png


static/Data1/175.png → static/Data/175.png


static/Data1/176.png → static/Data/176.png


static/Data1/177.png → static/Data/177.png


static/Data1/178.png → static/Data/178.png


static/Data1/179.png → static/Data/179.png


static/Data1/18.png → static/Data/18.png


static/Data1/180.png → static/Data/180.png


static/Data1/181.png → static/Data/181.png


static/Data1/182.png → static/Data/182.png


static/Data1/183.png → static/Data/183.png


static/Data1/184.png → static/Data/184.png


static/Data1/185.png → static/Data/185.png


static/Data1/186.png → static/Data/186.png


+ 0 - 0
static/Data1/187.png


Some files were not shown because too many files changed in this diff