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

+ 1 - 1
src/renderer/components/Admin.vue

@@ -11,7 +11,7 @@
                 height:windowJson[0] ? windowJson[0].Height*scale + 'px' : '',
                 zIndex:windowJson[0] ? windowJson[0].ZIndex : '',
                 display:windowJson[0] ? (windowJson[0].IsVisibility ? 'block' : 'none') : '',
-                backgroundImage:windowJson[0] ? (windowJson[0].BackIcon ? 'url('+require(`../../../static/images/${windowJson[0].BackIcon}`)+')' : null) : '',
+                backgroundImage:windowJson[0] ? (windowJson[0].BackIcon ? 'url('+require(`../../../static/${windowJson[0].BackIcon}`)+')' : null) : '',
                 backgroundRepeat:'no-repeat',
                 backgroundSize:'100% 100%',
                 backgroundColor:`#${windowJson[0] ? (windowJson[0].BrackgroupStr ? windowJson[0].BrackgroupStr.slice(3) : null) : ''}`,

+ 26 - 26
src/renderer/components/Button.vue

@@ -12,7 +12,7 @@
                     zIndex:item.ZIndex,
                     display:item.IsVisibility ? 'block' : 'none',
                     fontSize:item.FontSize*scale + 'px',
-                    backgroundImage:'url('+require(`../../../static/images/${item.BackIcon}`)+')',
+                    backgroundImage:'url('+require(`../../../static/${item.BackIcon}`)+')',
                     backgroundSize:'100% 100%',
                     backgroundRepeat:'no-repeat',
                     color:`#${item.ForegroundStr.slice(3)}`,
@@ -64,7 +64,7 @@
 
 
             this.slideJson = await getStaticFile('EnitySlider.Data')
-            this.funSliderArr = res.data
+            this.funSliderArr = await getStaticFile('EnitySlider.Data')
         },
 
         computed: {
@@ -77,10 +77,10 @@
                 // 预案管理声音开关
                 if (e.ID === '355d3c32-1502-40b4-9ddd-663d5b8469e7') {
                     if (this.count % 2 === 0) {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                         ++this.count
                     } else {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.BackIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.BackIcon}`) + ')'
                         ++this.count
                     }
                     return
@@ -89,11 +89,11 @@
                 // 切换屏幕
                 if (e.Text === 'LCD屏' || e.Text === 'LED屏' || e.Text === '投影机') {
                     if (this.count4 === 0) {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                         ++this.count4
                     } else if(e !== this.lastData4) {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
-                        this.lastBtn4.style.backgroundImage = 'url(' + require(`../../../static/images/${this.lastData4.BackIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
+                        this.lastBtn4.style.backgroundImage = 'url(' + require(`../../../static/${this.lastData4.BackIcon}`) + ')'
                     }
                     // 保存点过的这个按钮和按钮数据
                     this.lastBtn4 = this.$refs[e.ID][0]
@@ -114,11 +114,11 @@
                 // 预案管理按钮处理
                 if (e.Name.includes('V0') && e.Name.slice(7) * 1 > 62 && e.Name.slice(7) * 1 < 72) {
                     if (this.count2 === 0) {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                         ++this.count2
                     } else if(e !== this.lastData) {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
-                        this.lastBtn.style.backgroundImage = 'url(' + require(`../../../static/images/${this.lastData.BackIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
+                        this.lastBtn.style.backgroundImage = 'url(' + require(`../../../static/${this.lastData.BackIcon}`) + ')'
                     }
                     // 保存点过的按钮和按钮数据
                     this.lastBtn = this.$refs[e.ID][0]
@@ -130,11 +130,11 @@
                 if (e.Name.includes('V0--Btn6') || e.Name.includes('V0--Btn61') || e.Name.includes('V0--Btn12') || e.Name.includes('V0--Btn58') || e.Name.includes('V0--Btn77')) {
                     // (1)背景切换
                     if (this.count3 === 0) {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                         ++this.count3
                     } else if(e !== this.lastData3) {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
-                        this.lastBtn3.style.backgroundImage = 'url(' + require(`../../../static/images/${this.lastData3.BackIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
+                        this.lastBtn3.style.backgroundImage = 'url(' + require(`../../../static/${this.lastData3.BackIcon}`) + ')'
                     }
                     // 保存点过的这个按钮和按钮数据
                     this.lastBtn3 = this.$refs[e.ID][0]
@@ -196,11 +196,11 @@
                 // 安卓和分布式按钮
                 if (e.Text === '安卓' || e.Text === '分布式') {
                     if (this.count5 === 0) {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                         ++this.count5
                     } else if(e !== this.lastData5){
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
-                        this.lastBtn5.style.backgroundImage = 'url(' + require(`../../../static/images/${this.lastData5.BackIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
+                        this.lastBtn5.style.backgroundImage = 'url(' + require(`../../../static/${this.lastData5.BackIcon}`) + ')'
                     }
                     // 保存点过的这个按钮和按钮数据
                     this.lastBtn5 = this.$refs[e.ID][0]
@@ -211,10 +211,10 @@
                 // 电源管理和电脑管理
                 if(this.powerAndCompBtns.some(item => item.ID === e.ID)){
                     if(e.ActionType === 2){
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                         e.ActionType = -2
                     }else {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.BackIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.BackIcon}`) + ')'
                         e.ActionType = 2
                     }
                 }
@@ -224,13 +224,13 @@
             // 鼠标按下事件
             mouseDown(e) {
                 if (this.arr.some(item => e === item) && e.Text !== '安卓' && e.Text !== '分布式') { // 分屏控制按钮
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                 }else if(e.WindowID === '027ab76d-6b9c-46ac-abe6-75b8059f786b') { // 视频控制按钮
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                 }else if(e.WindowID === 'a12b287f-f68c-4efa-b652-d6e5b0a09d0d') { // 环境控制按钮
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                 }else if(e.ID === '19554440-98bc-4644-83a0-d9cefd69153e'){ // 电脑控制All按钮
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.ActionIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.ActionIcon}`) + ')'
                 }
                 return
             },
@@ -238,13 +238,13 @@
             // 鼠标松开事件
             mouseUp(e) {
                 if (this.arr.some(item => e === item) && e.Text !== '安卓' && e.Text !== '分布式') { // 分屏控制按钮
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.BackIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.BackIcon}`) + ')'
                 }else if(e.WindowID === '027ab76d-6b9c-46ac-abe6-75b8059f786b') { // 视频控制按钮
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.BackIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.BackIcon}`) + ')'
                 }else if(e.WindowID === 'a12b287f-f68c-4efa-b652-d6e5b0a09d0d') { // 环境控制按钮
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.BackIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.BackIcon}`) + ')'
                 }if(e.ID === '19554440-98bc-4644-83a0-d9cefd69153e'){ // 电脑控制All按钮
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/images/${e.BackIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/${e.BackIcon}`) + ')'
                 }
                 return
             },

+ 2 - 1
src/renderer/components/Image.vue

@@ -11,7 +11,7 @@
                     height:item.Height*scale + 'px',
                     zIndex:item.ZIndex,
                     display:item.IsVisibility ? 'block' : 'none',
-                    backgroundImage:'url('+require(`../../../static/images/${item.BackIcon}`)+')',
+                    backgroundImage:'url('+require(`../../../static/${item.BackIcon}`)+')',
                     backgroundRepeat:'no-repeat',
                     backgroundSize:'100% 100%',
                 }"
@@ -22,6 +22,7 @@
 
 <script>
     import {mapState} from 'vuex'
+    import {getStaticFile} from "../../utils/tools"
 
     export default {
 

+ 1 - 0
src/renderer/components/Label.vue

@@ -23,6 +23,7 @@
 
 <script>
     import {mapState} from 'vuex'
+    import {getStaticFile} from "../../utils/tools"
 
     export default {
         data() {

+ 1 - 1
src/renderer/components/SignalList.vue

@@ -33,9 +33,9 @@
 </template>
 
 <script>
-    import axios from 'axios'
     import {mapState} from 'vuex'
     import draggable from 'vuedraggable'
+    import {getStaticFile} from "../../utils/tools"
 
     export default {
         data() {

+ 3 - 2
src/renderer/components/Slider.vue

@@ -11,7 +11,7 @@
                     height:item.Height*scale + 'px',
                     zIndex:item.ZIndex,
                     display:item.IsVisibility ? 'block' : 'none',
-                    backgroundImage:'url('+require(`../../../static/images/${item.BackIcon}`)+')',
+                    backgroundImage:'url('+require(`../../../static/${item.BackIcon}`)+')',
                     backgroundRepeat:'no-repeat',
                 }"
         >
@@ -25,7 +25,7 @@
                         :style="{
                             width:item.imgSliderWidth*scale + 'px',
                             height:item.imgSliderHeight*scale + 'px',
-                            backgroundImage:'url('+require(`../../../static/images/${item.SliderIcon}`)+')',
+                            backgroundImage:'url('+require(`../../../static/${item.SliderIcon}`)+')',
                             backgroundRepeat:'no-repeat',
                             marginLeft:'40%',
                         }"
@@ -40,6 +40,7 @@
 
 <script>
     import {mapState} from 'vuex'
+    import {getStaticFile} from "../../utils/tools"
 
     export default {
         data() {

static/images/1.png → static/1.png


static/images/10.png → static/10.png


static/images/100.png → static/100.png


static/images/101.png → static/101.png


static/images/102.png → static/102.png


static/images/103.png → static/103.png


static/images/104.png → static/104.png


static/images/105.png → static/105.png


static/images/106.png → static/106.png


static/images/107.png → static/107.png


static/images/108.png → static/108.png


static/images/109.png → static/109.png


static/images/11.png → static/11.png


static/images/110.png → static/110.png


static/images/111.png → static/111.png


static/images/112.png → static/112.png


static/images/113.png → static/113.png


static/images/114.png → static/114.png


static/images/115.png → static/115.png


static/images/116.png → static/116.png


static/images/117.png → static/117.png


static/images/118.png → static/118.png


static/images/119.png → static/119.png


static/images/12.png → static/12.png


static/images/120.png → static/120.png


static/images/121.png → static/121.png


static/images/122.png → static/122.png


static/images/123.png → static/123.png


static/images/124.png → static/124.png


static/images/125.png → static/125.png


static/images/126.png → static/126.png


static/images/127.png → static/127.png


static/images/128.png → static/128.png


static/images/129.png → static/129.png


static/images/13.png → static/13.png


static/images/130.png → static/130.png


static/images/131.png → static/131.png


static/images/132.png → static/132.png


static/images/133.png → static/133.png


static/images/134.png → static/134.png


static/images/135.png → static/135.png


static/images/136.png → static/136.png


static/images/137.png → static/137.png


static/images/138.png → static/138.png


static/images/139.png → static/139.png


static/images/14.png → static/14.png


static/images/140.png → static/140.png


static/images/141.png → static/141.png


static/images/142.png → static/142.png


static/images/143.png → static/143.png


static/images/144.png → static/144.png


static/images/145.png → static/145.png


static/images/146.png → static/146.png


static/images/147.png → static/147.png


static/images/148.png → static/148.png


static/images/149.png → static/149.png


static/images/15.png → static/15.png


static/images/150.png → static/150.png


static/images/151.png → static/151.png


static/images/152.png → static/152.png


static/images/153.png → static/153.png


static/images/154.png → static/154.png


static/images/155.png → static/155.png


static/images/156.png → static/156.png


static/images/157.png → static/157.png


static/images/158.png → static/158.png


static/images/159.png → static/159.png


static/images/16.png → static/16.png


static/images/160.png → static/160.png


static/images/161.png → static/161.png


static/images/162.png → static/162.png


static/images/163.png → static/163.png


static/images/164.png → static/164.png


static/images/165.png → static/165.png


static/images/166.png → static/166.png


static/images/167.png → static/167.png


static/images/168.png → static/168.png


static/images/169.png → static/169.png


static/images/17.png → static/17.png


static/images/170.png → static/170.png


static/images/171.png → static/171.png


static/images/172.png → static/172.png


static/images/173.png → static/173.png


static/images/174.png → static/174.png


static/images/175.png → static/175.png


static/images/176.png → static/176.png


static/images/177.png → static/177.png


static/images/178.png → static/178.png


static/images/179.png → static/179.png


static/images/18.png → static/18.png


static/images/180.png → static/180.png


static/images/181.png → static/181.png


static/images/182.png → static/182.png


+ 0 - 0
static/images/183.png


Деякі файли не було показано, через те що забагато файлів було змінено