Browse Source

解决切换按钮图片错乱的问题

liuwei 4 years ago
parent
commit
e7bf57bd86
75 changed files with 50 additions and 159 deletions
  1. 9 7
      src/renderer/components/Button.vue
  2. 29 71
      src/renderer/store/actions.js
  3. BIN
      static/Data2/1.jpg
  4. 1 1
      static/Data2/EnityBigScreen.Data
  5. 1 1
      static/Data2/EnityButton.Data
  6. 1 1
      static/Data2/EnityDevice.Data
  7. 1 1
      static/Data2/EnityIcon.Data
  8. 1 1
      static/Data2/EnityImage.Data
  9. 1 1
      static/Data2/EnityLable.Data
  10. 1 1
      static/Data2/EnityMemory.Data
  11. 1 1
      static/Data2/EnitySignalPreviewList.Data
  12. 1 1
      static/Data2/EnityTimer.Data
  13. 1 1
      static/Data2/EnityTopology.Data
  14. 1 1
      static/Data2/EnityTopologyConnection.Data
  15. 1 1
      static/Data2/EnityWindow.Data
  16. 0 1
      static/Data2/测试.prj
  17. BIN
      static/Data3/1.png
  18. 0 1
      static/Data3/EnityBigScreen.Data
  19. 0 1
      static/Data3/EnityButton.Data
  20. 0 1
      static/Data3/EnityDevice.Data
  21. 0 1
      static/Data3/EnityIcon.Data
  22. 0 1
      static/Data3/EnityImage.Data
  23. 0 1
      static/Data3/EnityLable.Data
  24. 0 1
      static/Data3/EnityLogin.Data
  25. 0 1
      static/Data3/EnityMemory.Data
  26. 0 1
      static/Data3/EnitySignalPreviewList.Data
  27. 0 1
      static/Data3/EnitySlider.Data
  28. 0 7
      static/Data3/EnitySystem.data
  29. 0 1
      static/Data3/EnityTimer.Data
  30. 0 1
      static/Data3/EnityTopology.Data
  31. 0 1
      static/Data3/EnityTopologyConnection.Data
  32. 0 1
      static/Data3/EnityView.Data
  33. 0 1
      static/Data3/EnityWindow.Data
  34. BIN
      static/Data4/1.jpg
  35. BIN
      static/Data4/2.jpg
  36. BIN
      static/Data4/3.jpg
  37. BIN
      static/Data4/4.png
  38. 0 1
      static/Data4/EnityBigScreen.Data
  39. 0 1
      static/Data4/EnityButton.Data
  40. 0 1
      static/Data4/EnityDevice.Data
  41. 0 1
      static/Data4/EnityIcon.Data
  42. 0 1
      static/Data4/EnityImage.Data
  43. 0 1
      static/Data4/EnityLable.Data
  44. 0 1
      static/Data4/EnityLogin.Data
  45. 0 1
      static/Data4/EnityMemory.Data
  46. 0 1
      static/Data4/EnitySignalPreviewList.Data
  47. 0 1
      static/Data4/EnitySlider.Data
  48. 0 7
      static/Data4/EnitySystem.data
  49. 0 1
      static/Data4/EnityTimer.Data
  50. 0 1
      static/Data4/EnityTopology.Data
  51. 0 1
      static/Data4/EnityTopologyConnection.Data
  52. 0 1
      static/Data4/EnityView.Data
  53. 0 1
      static/Data4/EnityWindow.Data
  54. 0 1
      static/Data4/新测试项目.prj
  55. BIN
      static/Data5/1.jpg
  56. BIN
      static/Data5/2.jpg
  57. BIN
      static/Data5/3.jpg
  58. BIN
      static/Data5/4.png
  59. 0 1
      static/Data5/EnityBigScreen.Data
  60. 0 1
      static/Data5/EnityButton.Data
  61. 0 1
      static/Data5/EnityDevice.Data
  62. 0 1
      static/Data5/EnityIcon.Data
  63. 0 1
      static/Data5/EnityImage.Data
  64. 0 1
      static/Data5/EnityLable.Data
  65. 0 1
      static/Data5/EnityLogin.Data
  66. 0 1
      static/Data5/EnityMemory.Data
  67. 0 1
      static/Data5/EnitySignalPreviewList.Data
  68. 0 1
      static/Data5/EnitySlider.Data
  69. 0 7
      static/Data5/EnitySystem.data
  70. 0 1
      static/Data5/EnityTimer.Data
  71. 0 1
      static/Data5/EnityTopology.Data
  72. 0 1
      static/Data5/EnityTopologyConnection.Data
  73. 0 1
      static/Data5/EnityView.Data
  74. 0 1
      static/Data5/EnityWindow.Data
  75. 0 1
      static/Data5/新测试项目.prj

+ 9 - 7
src/renderer/components/Button.vue

@@ -32,7 +32,7 @@
     import {mapState} from 'vuex'
     import PubSub from 'pubsub-js'
     import {getStaticFile} from "../../utils/tools"
-    import {CLEAR_SCREEN, OPEN_WINDOWS} from "../../utils/constant"
+    import {OPEN_WINDOWS} from "../../utils/constant"
     import {reqRefreshView} from "../api"
 
     export default {
@@ -70,12 +70,14 @@
                 const controlBtns = this.buttonJson.filter(item => item.ButtonType === 1 && item.GroupNumber === e.GroupNumber)
                 if(controlBtns.some(item => item === e)){
                     // 1.当前按下的按钮处于激活状态
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${e.ActionIcon}`) + ')'
+                    // this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${e.ActionIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url('+`${this.staticUrl}/Data/${e.ActionIcon}`+')'
 
                     // 2.同一组的其他按钮处于未激活状态
                     const otherBtns = controlBtns.filter(item => item !== e)
                     otherBtns.forEach(item => {
-                        this.$refs[item.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${item.BackIcon}`) + ')'
+                        // this.$refs[item.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${item.BackIcon}`) + ')'
+                        this.$refs[item.ID][0].style.backgroundImage = 'url('+`${this.staticUrl}/Data/${item.BackIcon}`+')'
                     })
 
                     // 3.切换界面
@@ -87,10 +89,10 @@
                 // 音频菜单控制
                 if(e.ButtonType === 2){
                     if(!e.isOpen){
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${e.ActionIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+`${this.staticUrl}/Data/${e.ActionIcon}`+')'
                         e.isOpen = true
                     }else {
-                        this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${e.BackIcon}`) + ')'
+                        this.$refs[e.ID][0].style.backgroundImage = 'url('+`${this.staticUrl}/Data/${e.BackIcon}`+')'
                         e.isOpen = false
                     }
                 }
@@ -99,14 +101,14 @@
             // 鼠标按下事件
             mouseDown(e) {
                 if(e.ButtonType === 0){
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${e.ActionIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url('+`${this.staticUrl}/Data/${e.ActionIcon}`+')'
                 }
             },
 
             // 鼠标松开事件
             async mouseUp(e) {
                 if(e.ButtonType === 0){
-                    this.$refs[e.ID][0].style.backgroundImage = 'url(' + require(`../../../static/Data/${e.BackIcon}`) + ')'
+                    this.$refs[e.ID][0].style.backgroundImage = 'url('+`${this.staticUrl}/Data/${e.BackIcon}`+')'
 
                     // 分屏和清屏按钮控制
                     for(const item of e.MouseDownActionList){

+ 29 - 71
src/renderer/store/actions.js

@@ -1,103 +1,61 @@
 /*包含n个用于间接更新状态的方法的对象模块*/
 import {
     SAVE_USER,
-    CLEAR_SCREEN,
-    SPLIT_SCREEN,
-    UPDATE_SIGNALPRELIST,
     SAVE_BIGSCREEN,
     SAVE_SIGNALLIST,
     SAVE_DEVICE,
-    UPDATE_SCALE,
     UPDATE_POSITIONNUM,
     UPDATE_BIGSCREENOBJ,
     UPDATE_CURRENTSCREENID,
-    SECOND_UPDATE_BIGSCREEN,
     UPDATE_LABELJSON,
-    UPDATE_IMAGEJSON,
-    UPDATE_BIGSHOWJSON,
     UPDATE_HOMEJSON
 } from './mutation-types'
 
 export default {
 
-  // 保存用户
-  saveUser ({commit}, user) {
-    commit(SAVE_USER, {user})
-  },
-
-  // 清屏操作
-  clearScreen({commit}) {
-    commit(CLEAR_SCREEN)
-  },
-
-  // 分屏操作
-  splitScreen({commit},number) {
-    commit(SPLIT_SCREEN,{number})
-  },
-
-  // 更新大屏中的信号源列表
-  updateSignalPreList({commit},signalPreList) {
-    commit(UPDATE_SIGNALPRELIST,{signalPreList})
-  },
-
-  // 保存大屏数据
-  saveBigscreen({commit},bigScreenJson) {
-    commit(SAVE_BIGSCREEN,{bigScreenJson})
-  },
-
-  // 保存信号源数据
-  saveSignalList({commit},signalListJson) {
-    commit(SAVE_SIGNALLIST,{signalListJson})
-  },
-
-  // 保存设备数据
-  saveDevice({commit},deviceJson) {
-    commit(SAVE_DEVICE,{deviceJson})
-  },
-
-  // 更新元素缩放比例
-  updateScale({commit},bigScale) {
-    commit(UPDATE_SCALE,{bigScale})
-  },
+    // 保存用户
+    saveUser({commit}, user) {
+        commit(SAVE_USER, {user})
+    },
 
-  // 更新信号源在第几个栅格中
-  updatePositionNum({commit},positionNum) {
-    commit(UPDATE_POSITIONNUM,{positionNum})
-  },
+    // 保存大屏数据
+    saveBigscreen({commit}, bigScreenJson) {
+        commit(SAVE_BIGSCREEN, {bigScreenJson})
+    },
 
-  // 更新大屏对象
-  updateBigscreenObj({commit},obj) {
-    commit(UPDATE_BIGSCREENOBJ,{obj})
-  },
+    // 保存信号源数据
+    saveSignalList({commit}, signalListJson) {
+        commit(SAVE_SIGNALLIST, {signalListJson})
+    },
 
-    // 更新当前操作大屏id
-    updateCurBigscreenId({commit},Id) {
-        commit(UPDATE_CURRENTSCREENID,{Id})
+    // 保存设备数据
+    saveDevice({commit}, deviceJson) {
+        commit(SAVE_DEVICE, {deviceJson})
     },
 
-    // 间接更新大屏对象(更新对象中改动的信号源数组)
-    secondUpdateBigscreenObj({commit},signals) {
-        commit(SECOND_UPDATE_BIGSCREEN,{signals})
+    // 更新信号源在第几个栅格中
+    updatePositionNum({commit}, positionNum) {
+        commit(UPDATE_POSITIONNUM, {positionNum})
     },
 
-    // 更新labelJson
-    updateLabelJson({commit},labelJson) {
-        commit(UPDATE_LABELJSON,{labelJson})
+    // 更新大屏对象
+    updateBigscreenObj({commit}, obj) {
+        commit(UPDATE_BIGSCREENOBJ, {obj})
     },
 
-    // 更新imageJson
-    updateImageJson({commit},imageJson) {
-        commit(UPDATE_IMAGEJSON,{imageJson})
+    // 更新当前操作大屏id
+    updateCurBigscreenId({commit}, Id) {
+        commit(UPDATE_CURRENTSCREENID, {Id})
     },
 
-    // 更新bigshowJson
-    updateBigshowJson({commit},bigshowJson) {
-        commit(UPDATE_BIGSHOWJSON,{bigshowJson})
+    // 更新labelJson
+    updateLabelJson({commit}, labelJson) {
+        commit(UPDATE_LABELJSON, {labelJson})
     },
 
     // 更新homejson
-    updateHomeJson({commit},homeJson) {
-        commit(UPDATE_HOMEJSON,{homeJson})
+    updateHomeJson({commit}, homeJson) {
+        commit(UPDATE_HOMEJSON, {homeJson})
     },
 }
 

BIN
static/Data2/1.jpg


File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnityBigScreen.Data


File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnityButton.Data


File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnityDevice.Data


File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnityIcon.Data


File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnityImage.Data


File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnityLable.Data


+ 1 - 1
static/Data2/EnityMemory.Data

@@ -1 +1 @@
-[{"ID":"01","Code":"01","Name":"LoginUser","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4},{"ID":"02","Code":"02","Name":"LoginRole","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4}]
+[]

File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnitySignalPreviewList.Data


+ 1 - 1
static/Data2/EnityTimer.Data

@@ -1 +1 @@
-[]
+[{"ID":"d4469bbc-3ef3-4912-85a1-c43059b90b54","Code":"d4469bbc-3ef3-4912-85a1-c43059b90b54","Name":"延时1","ActionType":0,"Milliseconds":500},{"ID":"736ecb94-11a7-4315-9045-7f4f50fb2d89","Code":"736ecb94-11a7-4315-9045-7f4f50fb2d89","Name":"电源延时","ActionType":0,"Milliseconds":10000},{"ID":"bf9c0da6-85d0-4d9f-847c-130d34be7d12","Code":"bf9c0da6-85d0-4d9f-847c-130d34be7d12","Name":"会商延时","ActionType":0,"Milliseconds":1000}]

File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnityTopology.Data


File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnityTopologyConnection.Data


File diff suppressed because it is too large
+ 1 - 1
static/Data2/EnityWindow.Data


+ 0 - 1
static/Data2/测试.prj

@@ -1 +0,0 @@
-{"Name":"测试","DevWidth":1920,"DevHeight":1080,"UIAdaption":0}

BIN
static/Data3/1.png


File diff suppressed because it is too large
+ 0 - 1
static/Data3/EnityBigScreen.Data


File diff suppressed because it is too large
+ 0 - 1
static/Data3/EnityButton.Data


File diff suppressed because it is too large
+ 0 - 1
static/Data3/EnityDevice.Data


+ 0 - 1
static/Data3/EnityIcon.Data

@@ -1 +0,0 @@
-[{"ID":"1","Name":"1.png","Path":"1.png"}]

+ 0 - 1
static/Data3/EnityImage.Data

@@ -1 +0,0 @@
-[{"BackIcon":"1.png","ResourceID":"1","IsPanel":false,"EnityName":"Image","ID":"60017f5d-360d-4d16-95d0-bf8546d60e51","Name":"V0--Img0","Left":0,"Top":0,"Width":1075,"Height":664,"ZIndex":100,"GroupNumber":"","IsRunVisiable":true,"IsVisibility":true,"isSyn":false,"WindowID":"2410f9af-2303-485d-95dd-7b4a068a897f","PanelID":null,"IsLock":false,"IsWindow":false}]

+ 0 - 1
static/Data3/EnityLable.Data

@@ -1 +0,0 @@
-[{"Code":"37ac3dc5-1983-4666-a8fc-4f30499ba0ff","ActionType":5,"Text":"text","ForegroundStr":"#FFDC143C","FontSize":48,"IsShow":false,"IsPanel":false,"EnityName":"Lable","ID":"37ac3dc5-1983-4666-a8fc-4f30499ba0ff","Name":"Lable0","Left":431,"Top":10,"Width":244,"Height":70,"ZIndex":1000,"GroupNumber":"","IsRunVisiable":true,"IsVisibility":true,"isSyn":true,"WindowID":"2410f9af-2303-485d-95dd-7b4a068a897f","PanelID":null,"IsLock":false,"IsWindow":false}]

+ 0 - 1
static/Data3/EnityLogin.Data

@@ -1 +0,0 @@
-[]

+ 0 - 1
static/Data3/EnityMemory.Data

@@ -1 +0,0 @@
-[{"ID":"01","Code":"01","Name":"LoginUser","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4},{"ID":"02","Code":"02","Name":"LoginRole","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4}]

+ 0 - 1
static/Data3/EnitySignalPreviewList.Data

@@ -1 +0,0 @@
-[]

+ 0 - 1
static/Data3/EnitySlider.Data

@@ -1 +0,0 @@
-[]

+ 0 - 7
static/Data3/EnitySystem.data

@@ -1,7 +0,0 @@
-{
-  "ServerIP":"http://112.74.78.188",
-  "ServerPort":9000,
-  "Users":[
-
-  ]
-}

+ 0 - 1
static/Data3/EnityTimer.Data

@@ -1 +0,0 @@
-[]

File diff suppressed because it is too large
+ 0 - 1
static/Data3/EnityTopology.Data


File diff suppressed because it is too large
+ 0 - 1
static/Data3/EnityTopologyConnection.Data


+ 0 - 1
static/Data3/EnityView.Data

@@ -1 +0,0 @@
-[]

File diff suppressed because it is too large
+ 0 - 1
static/Data3/EnityWindow.Data


BIN
static/Data4/1.jpg


BIN
static/Data4/2.jpg


BIN
static/Data4/3.jpg


BIN
static/Data4/4.png


File diff suppressed because it is too large
+ 0 - 1
static/Data4/EnityBigScreen.Data


+ 0 - 1
static/Data4/EnityButton.Data

@@ -1 +0,0 @@
-[]

File diff suppressed because it is too large
+ 0 - 1
static/Data4/EnityDevice.Data


+ 0 - 1
static/Data4/EnityIcon.Data

@@ -1 +0,0 @@
-[{"ID":"1","Name":"Koala.jpg","Path":"1.jpg"},{"ID":"2","Name":"Lighthouse.jpg","Path":"2.jpg"},{"ID":"3","Name":"Penguins.jpg","Path":"3.jpg"},{"ID":"4","Name":"4.png","Path":"4.png"}]

File diff suppressed because it is too large
+ 0 - 1
static/Data4/EnityImage.Data


File diff suppressed because it is too large
+ 0 - 1
static/Data4/EnityLable.Data


+ 0 - 1
static/Data4/EnityLogin.Data

@@ -1 +0,0 @@
-[]

+ 0 - 1
static/Data4/EnityMemory.Data

@@ -1 +0,0 @@
-[{"ID":"01","Code":"01","Name":"LoginUser","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4},{"ID":"02","Code":"02","Name":"LoginRole","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4}]

File diff suppressed because it is too large
+ 0 - 1
static/Data4/EnitySignalPreviewList.Data


+ 0 - 1
static/Data4/EnitySlider.Data

@@ -1 +0,0 @@
-[]

+ 0 - 7
static/Data4/EnitySystem.data

@@ -1,7 +0,0 @@
-{
-  "ServerIP":"http://112.74.78.188",
-  "ServerPort":9000,
-  "Users":[
-
-  ]
-}

+ 0 - 1
static/Data4/EnityTimer.Data

@@ -1 +0,0 @@
-[]

File diff suppressed because it is too large
+ 0 - 1
static/Data4/EnityTopology.Data


File diff suppressed because it is too large
+ 0 - 1
static/Data4/EnityTopologyConnection.Data


+ 0 - 1
static/Data4/EnityView.Data

@@ -1 +0,0 @@
-[]

File diff suppressed because it is too large
+ 0 - 1
static/Data4/EnityWindow.Data


+ 0 - 1
static/Data4/新测试项目.prj

@@ -1 +0,0 @@
-{"Name":"新测试项目","DevWidth":1920,"DevHeight":1080,"UIAdaption":0}

BIN
static/Data5/1.jpg


BIN
static/Data5/2.jpg


BIN
static/Data5/3.jpg


BIN
static/Data5/4.png


File diff suppressed because it is too large
+ 0 - 1
static/Data5/EnityBigScreen.Data


+ 0 - 1
static/Data5/EnityButton.Data

@@ -1 +0,0 @@
-[]

File diff suppressed because it is too large
+ 0 - 1
static/Data5/EnityDevice.Data


+ 0 - 1
static/Data5/EnityIcon.Data

@@ -1 +0,0 @@
-[{"ID":"1","Name":"Koala.jpg","Path":"1.jpg"},{"ID":"2","Name":"Lighthouse.jpg","Path":"2.jpg"},{"ID":"3","Name":"Penguins.jpg","Path":"3.jpg"},{"ID":"4","Name":"4.png","Path":"4.png"}]

File diff suppressed because it is too large
+ 0 - 1
static/Data5/EnityImage.Data


File diff suppressed because it is too large
+ 0 - 1
static/Data5/EnityLable.Data


+ 0 - 1
static/Data5/EnityLogin.Data

@@ -1 +0,0 @@
-[]

+ 0 - 1
static/Data5/EnityMemory.Data

@@ -1 +0,0 @@
-[{"ID":"01","Code":"01","Name":"LoginUser","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4},{"ID":"02","Code":"02","Name":"LoginRole","isInt":false,"Value":null,"IsSyn":false,"IsSystem":true,"Mark":null,"ActionType":4}]

File diff suppressed because it is too large
+ 0 - 1
static/Data5/EnitySignalPreviewList.Data


+ 0 - 1
static/Data5/EnitySlider.Data

@@ -1 +0,0 @@
-[]

+ 0 - 7
static/Data5/EnitySystem.data

@@ -1,7 +0,0 @@
-{
-  "ServerIP":"http://112.74.78.188",
-  "ServerPort":9000,
-  "Users":[
-
-  ]
-}

+ 0 - 1
static/Data5/EnityTimer.Data

@@ -1 +0,0 @@
-[]

File diff suppressed because it is too large
+ 0 - 1
static/Data5/EnityTopology.Data


File diff suppressed because it is too large
+ 0 - 1
static/Data5/EnityTopologyConnection.Data


+ 0 - 1
static/Data5/EnityView.Data

@@ -1 +0,0 @@
-[]

File diff suppressed because it is too large
+ 0 - 1
static/Data5/EnityWindow.Data


+ 0 - 1
static/Data5/新测试项目.prj

@@ -1 +0,0 @@
-{"Name":"新测试项目","DevWidth":1920,"DevHeight":1080,"UIAdaption":0}