소스 검색

调整分辨率前的一次修改

liuwei 4 년 전
부모
커밋
ce55b0e397
66개의 변경된 파일23개의 추가작업 그리고 19987개의 파일을 삭제
  1. 6 6
      src/renderer/App.vue
  2. 2 2
      src/renderer/components/BigShow.vue
  3. BIN
      static/Data/1.png
  4. BIN
      static/Data/10.png
  5. BIN
      static/Data/11.png
  6. BIN
      static/Data/12.png
  7. BIN
      static/Data/13.png
  8. BIN
      static/Data/14.png
  9. BIN
      static/Data/15.png
  10. BIN
      static/Data/16.png
  11. BIN
      static/Data/17.png
  12. BIN
      static/Data/18.png
  13. BIN
      static/Data/19.png
  14. BIN
      static/Data/2.png
  15. BIN
      static/Data/20.png
  16. BIN
      static/Data/21.png
  17. BIN
      static/Data/22.png
  18. BIN
      static/Data/23.png
  19. BIN
      static/Data/24.png
  20. BIN
      static/Data/25.png
  21. BIN
      static/Data/26.png
  22. BIN
      static/Data/27.png
  23. BIN
      static/Data/28.png
  24. BIN
      static/Data/29.png
  25. BIN
      static/Data/3.png
  26. BIN
      static/Data/30.png
  27. BIN
      static/Data/31.png
  28. BIN
      static/Data/32.png
  29. BIN
      static/Data/33.png
  30. BIN
      static/Data/34.png
  31. BIN
      static/Data/35.png
  32. BIN
      static/Data/36.png
  33. BIN
      static/Data/37.png
  34. BIN
      static/Data/38.png
  35. BIN
      static/Data/39.png
  36. BIN
      static/Data/40.png
  37. BIN
      static/Data/41.png
  38. BIN
      static/Data/42.png
  39. BIN
      static/Data/43.png
  40. BIN
      static/Data/44.png
  41. BIN
      static/Data/45.png
  42. BIN
      static/Data/46.png
  43. BIN
      static/Data/47.png
  44. BIN
      static/Data/48.png
  45. BIN
      static/Data/49.png
  46. BIN
      static/Data/5.png
  47. BIN
      static/Data/50.png
  48. BIN
      static/Data/6.png
  49. BIN
      static/Data/7.png
  50. BIN
      static/Data/8.png
  51. BIN
      static/Data/9.png
  52. 1 230
      static/Data/EnityBigScreen.Data
  53. 1 4911
      static/Data/EnityButton.Data
  54. 1 8608
      static/Data/EnityDevice.Data
  55. 1 4182
      static/Data/EnityIcon.Data
  56. 1 170
      static/Data/EnityImage.Data
  57. 1 427
      static/Data/EnityLable.Data
  58. 1 35
      static/Data/EnityLogin.Data
  59. 1 24
      static/Data/EnityMemory.Data
  60. 1 1
      static/Data/EnitySignalPreviewList.Data
  61. 1 230
      static/Data/EnitySlider.Data
  62. 1 16
      static/Data/EnityTimer.Data
  63. 1 346
      static/Data/EnityTopology.Data
  64. 1 422
      static/Data/EnityTopologyConnection.Data
  65. 1 1
      static/Data/EnityView.Data
  66. 1 376
      static/Data/EnityWindow.Data

+ 6 - 6
src/renderer/App.vue

@@ -53,12 +53,12 @@
       })
 
       // 更新vuex中的缩放比例
-      axios.get('static/Data/EnityWindow.Data').then(async res => {
-        if (res.status === 200) {
-              const bigScale = window.screen.height/res.data[0].Height
-              this.$store.dispatch('updateScale',bigScale)
-          }
-      })
+      // axios.get('static/Data/EnityWindow.Data').then(async res => {
+      //   if (res.status === 200) {
+      //         const bigScale = window.screen.height/res.data[0].Height
+      //         this.$store.dispatch('updateScale',bigScale)
+      //     }
+      // })
     }
   }
 </script>

+ 2 - 2
src/renderer/components/BigShow.vue

@@ -185,9 +185,9 @@
 
             // 大屏初始化
             async initBigScreen() {
+                VideoPlayer.methods.dispose()
+                // 先获取上次的视频对象信息
                 let bigscreenObj = this.$store.state.bigScreenObj
-                console.log(bigscreenObj)
-                
                 // 加载大屏json文件
                 const bigScreenJson = await getStaticFile('EnityBigScreen.Data')
                 // 过滤出显示的大屏

BIN
static/Data/1.png


BIN
static/Data/10.png


BIN
static/Data/11.png


BIN
static/Data/12.png


BIN
static/Data/13.png


BIN
static/Data/14.png


BIN
static/Data/15.png


BIN
static/Data/16.png


BIN
static/Data/17.png


BIN
static/Data/18.png


BIN
static/Data/19.png


BIN
static/Data/2.png


BIN
static/Data/20.png


BIN
static/Data/21.png


BIN
static/Data/22.png


BIN
static/Data/23.png


BIN
static/Data/24.png


BIN
static/Data/25.png


BIN
static/Data/26.png


BIN
static/Data/27.png


BIN
static/Data/28.png


BIN
static/Data/29.png


BIN
static/Data/3.png


BIN
static/Data/30.png


BIN
static/Data/31.png


BIN
static/Data/32.png


BIN
static/Data/33.png


BIN
static/Data/34.png


BIN
static/Data/35.png


BIN
static/Data/36.png


BIN
static/Data/37.png


BIN
static/Data/38.png


BIN
static/Data/39.png


BIN
static/Data/40.png


BIN
static/Data/41.png


BIN
static/Data/42.png


BIN
static/Data/43.png


BIN
static/Data/44.png


BIN
static/Data/45.png


BIN
static/Data/46.png


BIN
static/Data/47.png


BIN
static/Data/48.png


BIN
static/Data/49.png


BIN
static/Data/5.png


BIN
static/Data/50.png


BIN
static/Data/6.png


BIN
static/Data/7.png


BIN
static/Data/8.png


BIN
static/Data/9.png


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 230
static/Data/EnityBigScreen.Data


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 4911
static/Data/EnityButton.Data


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 8608
static/Data/EnityDevice.Data


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 4182
static/Data/EnityIcon.Data


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 170
static/Data/EnityImage.Data


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 427
static/Data/EnityLable.Data


+ 1 - 35
static/Data/EnityLogin.Data

@@ -1,35 +1 @@
-[
-    {
-        "IsBorder":true,
-        "BorderStr":"#FFFFFFFF",
-        "ForegroundStr":"#FFD6D6D6",
-        "BTNForegroundStr":"#FF000000",
-        "BrackgroupStr":"#FF03A9F4",
-        "BackIconObjID":"",
-        "BackIcon":null,
-        "ActionIconObjID":"",
-        "ActionIcon":null,
-        "FontSize":16,
-        "IsPanel":false,
-        "ValidatType":1,
-        "EnityName":"Login",
-        "VerifyPassActionList":[
-
-        ],
-        "ID":"cb3c80b1-f1e4-459d-88ae-e2979666b5e3",
-        "Name":"V1--Login0",
-        "Left":294,
-        "Top":194,
-        "Width":411,
-        "Height":266,
-        "ZIndex":20100,
-        "GroupNumber":"",
-        "IsRunVisiable":true,
-        "IsVisibility":false,
-        "isSyn":false,
-        "WindowID":"b7872c9a-45ec-46c6-a388-f8d364a9f2d7",
-        "PanelID":null,
-        "IsLock":false,
-        "IsWindow":false
-    }
-]
+[]

+ 1 - 24
static/Data/EnityMemory.Data

@@ -1,24 +1 @@
-[
-  {
-    "ID":"01",
-    "Code":"01",
-    "Name":"LoginUser",
-    "isInt":false,
-    "Value":null,
-    "IsSyn":false,
-    "IsSystem":false,
-    "Mark":null,
-    "ActionType":4
-  },
-  {
-    "ID":"02",
-    "Code":"02",
-    "Name":"LoginRole",
-    "isInt":false,
-    "Value":null,
-    "IsSyn":false,
-    "IsSystem":false,
-    "Mark":null,
-    "ActionType":4
-  }
-]
+[{"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}]

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
static/Data/EnitySignalPreviewList.Data


+ 1 - 230
static/Data/EnitySlider.Data

@@ -1,230 +1 @@
-[
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"5",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"b3539067-d6ea-4dbf-9e43-fd6d043f8684",
-    "Name":"Slider0",
-    "Left":244,
-    "Top":472,
-    "Width":54,
-    "Height":226,
-    "ZIndex":10600,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"228f105d-ebe4-45ba-a072-a1196bf6030e",
-    "Name":"Slider1",
-    "Left":307,
-    "Top":471,
-    "Width":56,
-    "Height":226,
-    "ZIndex":10900,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"a4ada37c-c564-45fe-a049-48650cf7d66e",
-    "Name":"Slider2",
-    "Left":374,
-    "Top":472,
-    "Width":61,
-    "Height":226,
-    "ZIndex":11000,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"42cf859e-bcd1-43b2-8eb0-63964eeab067",
-    "Name":"Slider3",
-    "Left":449,
-    "Top":472,
-    "Width":61,
-    "Height":227,
-    "ZIndex":11200,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"87f9e83f-38a5-4db6-82ca-76edc5a32e05",
-    "Name":"Slider4",
-    "Left":520,
-    "Top":472,
-    "Width":62,
-    "Height":230,
-    "ZIndex":11600,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"77.png",
-    "SliderIcon":"76.png",
-    "Orientation":0,
-    "InitValue":0,
-    "SliderFrequency":10,
-    "MinValue":1,
-    "MaxValue":100,
-    "DevCode":null,
-    "Channel":0,
-    "VolMargin":"6",
-    "SliderMargin":"0",
-    "ShowVol":true,
-    "imgBgWidth":67,
-    "imgBgHeight":215,
-    "imgSliderWidth":33,
-    "imgSliderHeight":54,
-    "Cmd":null,
-    "BindVar":null,
-    "DeviceID":null,
-    "IsPanel":false,
-    "EnityName":"Slider",
-    "ID":"96b74f03-87ce-48cf-80d8-718d21059530",
-    "Name":"Slider5",
-    "Left":593,
-    "Top":472,
-    "Width":59,
-    "Height":225,
-    "ZIndex":11700,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":true,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  }
-]
+[]

+ 1 - 16
static/Data/EnityTimer.Data

@@ -1,16 +1 @@
-[
-  {
-    "ID":"f5f1217e-f606-4372-8650-4363931fa8e1",
-    "Code":"f5f1217e-f606-4372-8650-4363931fa8e1",
-    "Name":"500ms",
-    "ActionType":0,
-    "Milliseconds":500
-  },
-  {
-    "ID":"08be426e-f9ae-469c-8ea3-ab41403c9f47",
-    "Code":"08be426e-f9ae-469c-8ea3-ab41403c9f47",
-    "Name":"1s",
-    "ActionType":0,
-    "Milliseconds":1000
-  }
-]
+[]

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 346
static/Data/EnityTopology.Data


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 422
static/Data/EnityTopologyConnection.Data


+ 1 - 1
static/Data/EnityView.Data

@@ -1 +1 @@
-[]
+[]

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 376
static/Data/EnityWindow.Data