浏览代码

解决显示多个大屏彼此独立前的一次提交

liuwei 4 年之前
父节点
当前提交
c4ecc90af2
共有 100 个文件被更改,包括 17 次插入20086 次删除
  1. 2 2
      src/renderer/components/BigShow.vue
  2. 1 230
      static/Data/EnityBigScreen.Data
  3. 1 4911
      static/Data/EnityButton.Data
  4. 1 8608
      static/Data/EnityDevice.Data
  5. 1 4182
      static/Data/EnityIcon.Data
  6. 1 170
      static/Data/EnityImage.Data
  7. 1 427
      static/Data/EnityLable.Data
  8. 1 35
      static/Data/EnityLogin.Data
  9. 1 24
      static/Data/EnityMemory.Data
  10. 1 106
      static/Data/EnitySignalPreviewList.Data
  11. 1 230
      static/Data/EnitySlider.Data
  12. 1 16
      static/Data/EnityTimer.Data
  13. 1 346
      static/Data/EnityTopology.Data
  14. 1 422
      static/Data/EnityTopologyConnection.Data
  15. 1 1
      static/Data/EnityView.Data
  16. 1 376
      static/Data/EnityWindow.Data
  17. 0 0
      static/Data1/1.png
  18. 0 0
      static/Data1/10.png
  19. 0 0
      static/Data1/100.png
  20. 0 0
      static/Data1/101.png
  21. 0 0
      static/Data1/102.png
  22. 0 0
      static/Data1/103.png
  23. 0 0
      static/Data1/104.png
  24. 0 0
      static/Data1/105.png
  25. 0 0
      static/Data1/106.png
  26. 0 0
      static/Data1/107.png
  27. 0 0
      static/Data1/108.png
  28. 0 0
      static/Data1/109.png
  29. 0 0
      static/Data1/11.png
  30. 0 0
      static/Data1/110.png
  31. 0 0
      static/Data1/111.png
  32. 0 0
      static/Data1/112.png
  33. 0 0
      static/Data1/113.png
  34. 0 0
      static/Data1/114.png
  35. 0 0
      static/Data1/115.png
  36. 0 0
      static/Data1/116.png
  37. 0 0
      static/Data1/117.png
  38. 0 0
      static/Data1/118.png
  39. 0 0
      static/Data1/119.png
  40. 0 0
      static/Data1/12.png
  41. 0 0
      static/Data1/120.png
  42. 0 0
      static/Data1/121.png
  43. 0 0
      static/Data1/122.png
  44. 0 0
      static/Data1/123.png
  45. 0 0
      static/Data1/124.png
  46. 0 0
      static/Data1/125.png
  47. 0 0
      static/Data1/126.png
  48. 0 0
      static/Data1/127.png
  49. 0 0
      static/Data1/128.png
  50. 0 0
      static/Data1/129.png
  51. 0 0
      static/Data1/13.png
  52. 0 0
      static/Data1/130.png
  53. 0 0
      static/Data1/131.png
  54. 0 0
      static/Data1/132.png
  55. 0 0
      static/Data1/133.png
  56. 0 0
      static/Data1/134.png
  57. 0 0
      static/Data1/135.png
  58. 0 0
      static/Data1/136.png
  59. 0 0
      static/Data1/137.png
  60. 0 0
      static/Data1/138.png
  61. 0 0
      static/Data1/139.png
  62. 0 0
      static/Data1/14.png
  63. 0 0
      static/Data1/140.png
  64. 0 0
      static/Data1/141.png
  65. 0 0
      static/Data1/142.png
  66. 0 0
      static/Data1/143.png
  67. 0 0
      static/Data1/144.png
  68. 0 0
      static/Data1/145.png
  69. 0 0
      static/Data1/146.png
  70. 0 0
      static/Data1/147.png
  71. 0 0
      static/Data1/148.png
  72. 0 0
      static/Data1/149.png
  73. 0 0
      static/Data1/15.png
  74. 0 0
      static/Data1/150.png
  75. 0 0
      static/Data1/151.png
  76. 0 0
      static/Data1/152.png
  77. 0 0
      static/Data1/153.png
  78. 0 0
      static/Data1/154.png
  79. 0 0
      static/Data1/155.png
  80. 0 0
      static/Data1/156.png
  81. 0 0
      static/Data1/157.png
  82. 0 0
      static/Data1/158.png
  83. 0 0
      static/Data1/159.png
  84. 0 0
      static/Data1/16.png
  85. 0 0
      static/Data1/160.png
  86. 0 0
      static/Data1/161.png
  87. 0 0
      static/Data1/162.png
  88. 0 0
      static/Data1/163.png
  89. 0 0
      static/Data1/164.png
  90. 0 0
      static/Data1/165.png
  91. 0 0
      static/Data1/166.png
  92. 0 0
      static/Data1/167.png
  93. 0 0
      static/Data1/168.png
  94. 0 0
      static/Data1/169.png
  95. 0 0
      static/Data1/17.png
  96. 0 0
      static/Data1/170.png
  97. 0 0
      static/Data1/171.png
  98. 0 0
      static/Data1/172.png
  99. 0 0
      static/Data1/173.png
  100. 0 0
      static/Data/174.png

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

@@ -3,11 +3,11 @@
 <template>
     <div>
         <draggable
+                v-for="(item,index) in currentBigshow"
                 element="div"
                 v-model="signalPreList"
                 :options="dragOptions2"
                 @change="log"
-                v-for="item in currentBigshow"
                 :class="['split_screen', splitScreenStatus === 0 ? 'split_screen_one' : splitScreenStatus === 1 ? 'split_screen_four' : splitScreenStatus === 2 ? 'split_screen_nine' : 'split_screen_sixteen']"
                 :style="{
                     float:'left',
@@ -52,7 +52,7 @@
     import VueDragResize from 'vue-drag-resize'
 
     import '../assets/less/splitscreen.less'
-    import {elePosition, getElementLeft, getElementTop, getStaticFile, guId, throttleFunc} from "../../utils/tools"
+    import {elePosition, getElementLeft, getElementTop, getStaticFile, guId} from "../../utils/tools"
     import {reqRefreshView} from "../api"
     import VideoPlayer from "./player.vue"
 

文件差异内容过多而无法显示
+ 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,170 +1 @@
-[
-  {
-    "BackIcon":"161.png",
-    "ResourceID":"161",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"9feccc76-380b-499f-966f-199a6a361c1c",
-    "Name":"V0--Img0",
-    "Left":1,
-    "Top":2,
-    "Width":111,
-    "Height":40,
-    "ZIndex":200,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"804.png",
-    "ResourceID":"804",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"ef00b427-9ecc-45b2-83d6-be39cf583923",
-    "Name":"V0--Img4",
-    "Left":0,
-    "Top":42,
-    "Width":121,
-    "Height":680,
-    "ZIndex":300,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"155.png",
-    "ResourceID":"155",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"76172538-43a9-4561-ad13-ce1940f96c7f",
-    "Name":"V3--Img12",
-    "Left":472,
-    "Top":446,
-    "Width":346,
-    "Height":277,
-    "ZIndex":30500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"155.png",
-    "ResourceID":"155",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"b03303eb-d41c-4284-b008-19e3eb9b87cf",
-    "Name":"V3--Img13",
-    "Left":131,
-    "Top":446,
-    "Width":343,
-    "Height":278,
-    "ZIndex":30100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"172.png",
-    "ResourceID":"172",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"37d1fd12-210c-4827-aa6e-36abe4b7b226",
-    "Name":"V10--Img8",
-    "Left":130,
-    "Top":41,
-    "Width":692,
-    "Height":400,
-    "ZIndex":80100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"08208721-41cc-4f1e-937b-3a1627389049",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"172.png",
-    "ResourceID":"172",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"59c0ee30-837b-420a-95ae-eb0baec075d9",
-    "Name":"V5--Img6",
-    "Left":130,
-    "Top":40,
-    "Width":700,
-    "Height":407,
-    "ZIndex":40100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"9a0dff23-8633-4e7f-89bf-cc4f68ec88e1",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"172.png",
-    "ResourceID":"172",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"061d15ce-a49a-402e-904b-5945862359b6",
-    "Name":"V9--Img6",
-    "Left":132,
-    "Top":42,
-    "Width":695,
-    "Height":399,
-    "ZIndex":90100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"ab842585-0c91-4e65-bfed-a219bcaaeb43",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "BackIcon":"182.png",
-    "ResourceID":"182",
-    "IsPanel":false,
-    "EnityName":"Image",
-    "ID":"d561b791-f8ef-413e-9a9b-aaa62c18e080",
-    "Name":"V0--Img7",
-    "Left":822,
-    "Top":44,
-    "Width":202,
-    "Height":683,
-    "ZIndex":100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  }
-]
+[{"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}]

+ 1 - 427
static/Data/EnityLable.Data

@@ -1,427 +1 @@
-[
-  {
-    "Code":"9f2f47a0-6c7c-428f-ae6f-1a4d2101520b",
-    "ActionType":5,
-    "Text":"预 案 管 理",
-    "ForegroundStr":"#FFF0F8FF",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"9f2f47a0-6c7c-428f-ae6f-1a4d2101520b",
-    "Name":"Lable2",
-    "Left":18,
-    "Top":56,
-    "Width":90,
-    "Height":35,
-    "ZIndex":1800,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"a9342554-eb77-47e9-b5fc-6eee45497c27",
-    "ActionType":5,
-    "Text":"摄 像 机 1",
-    "ForegroundStr":"#FF00FFFF",
-    "FontSize":18,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"a9342554-eb77-47e9-b5fc-6eee45497c27",
-    "Name":"Lable3",
-    "Left":244,
-    "Top":681,
-    "Width":100,
-    "Height":35,
-    "ZIndex":32500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"c5f81595-180b-4f0b-b936-da08632ae681",
-    "ActionType":5,
-    "Text":"摄 像 机 2",
-    "ForegroundStr":"#FF00FFFF",
-    "FontSize":18,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"c5f81595-180b-4f0b-b936-da08632ae681",
-    "Name":"Lable4",
-    "Left":618,
-    "Top":681,
-    "Width":100,
-    "Height":35,
-    "ZIndex":32600,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"027ab76d-6b9c-46ac-abe6-75b8059f786b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"29e9f186-26a8-4eb4-b7de-3702ec28529d",
-    "ActionType":5,
-    "Text":"请 确 认 是 否 关 闭 系 统!!",
-    "ForegroundStr":"#FFDC143C",
-    "FontSize":25,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"29e9f186-26a8-4eb4-b7de-3702ec28529d",
-    "Name":"Lable4",
-    "Left":307,
-    "Top":156,
-    "Width":349,
-    "Height":96,
-    "ZIndex":100100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"6bee9008-ccd6-49e1-864d-3b9b73d3a61b",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"3a5c7661-4dc5-4981-abc6-97772eb3c325",
-    "ActionType":5,
-    "Text":"系统开关",
-    "ForegroundStr":"#FF00FA9A",
-    "FontSize":16,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"3a5c7661-4dc5-4981-abc6-97772eb3c325",
-    "Name":"Lable6",
-    "Left":440,
-    "Top":676,
-    "Width":84,
-    "Height":35,
-    "ZIndex":50800,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"d80a8b6e-9f88-41ff-b3a7-1ff8d6ee37a5",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"54b3c91b-bed5-41ce-99e6-6dd8abcf528a",
-    "ActionType":5,
-    "Text":"窗帘控制",
-    "ForegroundStr":"#FF00FA9A",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"54b3c91b-bed5-41ce-99e6-6dd8abcf528a",
-    "Name":"Lable7",
-    "Left":620,
-    "Top":574,
-    "Width":72,
-    "Height":35,
-    "ZIndex":60300,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"a12b287f-f68c-4efa-b652-d6e5b0a09d0d",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"3386dd2b-caaf-4182-84fe-d75630cc38bf",
-    "ActionType":5,
-    "Text":"空调",
-    "ForegroundStr":"#FF00FA9A",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"3386dd2b-caaf-4182-84fe-d75630cc38bf",
-    "Name":"Lable8",
-    "Left":280,
-    "Top":552,
-    "Width":100,
-    "Height":35,
-    "ZIndex":60500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"a12b287f-f68c-4efa-b652-d6e5b0a09d0d",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"9701509d-c4e7-47a2-ac03-15d41fe282bc",
-    "ActionType":5,
-    "Text":"环 境 控 制",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":18,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"9701509d-c4e7-47a2-ac03-15d41fe282bc",
-    "Name":"Lable9",
-    "Left":412,
-    "Top":455,
-    "Width":100,
-    "Height":35,
-    "ZIndex":60900,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"a12b287f-f68c-4efa-b652-d6e5b0a09d0d",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"a26b9d94-f037-4514-969c-580c687e694e",
-    "ActionType":5,
-    "Text":"HYHT",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"a26b9d94-f037-4514-969c-580c687e694e",
-    "Name":"Lable9",
-    "Left":247,
-    "Top":694,
-    "Width":57,
-    "Height":28,
-    "ZIndex":10700,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"026033d2-d123-437d-b2f7-7d7305a31a50",
-    "ActionType":5,
-    "Text":"WXHT",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"026033d2-d123-437d-b2f7-7d7305a31a50",
-    "Name":"Lable9副本",
-    "Left":302,
-    "Top":696,
-    "Width":57,
-    "Height":28,
-    "ZIndex":10800,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"5b47ed61-5114-47dd-85da-84a236b75fab",
-    "ActionType":5,
-    "Text":"PC1",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"5b47ed61-5114-47dd-85da-84a236b75fab",
-    "Name":"Lable11",
-    "Left":383,
-    "Top":697,
-    "Width":42,
-    "Height":28,
-    "ZIndex":11100,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"4e8c9597-c184-4134-b87a-f96a5a6b26dd",
-    "ActionType":5,
-    "Text":"PC2",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"4e8c9597-c184-4134-b87a-f96a5a6b26dd",
-    "Name":"Lable12",
-    "Left":459,
-    "Top":692,
-    "Width":49,
-    "Height":35,
-    "ZIndex":11300,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"ba490dfc-8e93-4b61-b024-aeaf57378ba8",
-    "ActionType":5,
-    "Text":"PC3",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"ba490dfc-8e93-4b61-b024-aeaf57378ba8",
-    "Name":"Lable12副本",
-    "Left":528,
-    "Top":697,
-    "Width":46,
-    "Height":24,
-    "ZIndex":11400,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"fefe3dbd-a142-4ec4-9adb-15484907b659",
-    "ActionType":5,
-    "Text":"PC4",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"fefe3dbd-a142-4ec4-9adb-15484907b659",
-    "Name":"Lable12副本副本",
-    "Left":597,
-    "Top":696,
-    "Width":46,
-    "Height":25,
-    "ZIndex":11500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"79f3ccd4-4f58-4fb2-893d-415dcee5edbb",
-    "ActionType":5,
-    "Text":"深圳大因展厅",
-    "ForegroundStr":"#FF00FFFF",
-    "FontSize":14,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"79f3ccd4-4f58-4fb2-893d-415dcee5edbb",
-    "Name":"Lable15",
-    "Left":466,
-    "Top":0,
-    "Width":100,
-    "Height":35,
-    "ZIndex":2200,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":false,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"3e4a6286-a668-4fd6-9fc6-8e3f41e1d67d",
-    "ActionType":5,
-    "Text":"信号源列表",
-    "ForegroundStr":"#FFD6D6D6",
-    "FontSize":18,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"3e4a6286-a668-4fd6-9fc6-8e3f41e1d67d",
-    "Name":"Lable16",
-    "Left":878,
-    "Top":71,
-    "Width":100,
-    "Height":35,
-    "ZIndex":2300,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":true,
-    "isSyn":true,
-    "WindowID":"64a2f252-370a-4bc6-a817-3397f8abb4dc",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  },
-  {
-    "Code":"74fff89a-711e-4e26-9015-234fd9390706",
-    "ActionType":5,
-    "Text":"电脑控制",
-    "ForegroundStr":"#FF00FFFF",
-    "FontSize":16,
-    "IsShow":false,
-    "IsPanel":false,
-    "EnityName":"Lable",
-    "ID":"74fff89a-711e-4e26-9015-234fd9390706",
-    "Name":"Lable16",
-    "Left":428,
-    "Top":446,
-    "Width":100,
-    "Height":35,
-    "ZIndex":70500,
-    "GroupNumber":"",
-    "IsRunVisiable":true,
-    "IsVisibility":false,
-    "isSyn":false,
-    "WindowID":"d9868551-b579-4258-9bc7-7c1f733773f5",
-    "PanelID":null,
-    "IsLock":false,
-    "IsWindow":false
-  }
-]
+[{"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}]

+ 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 - 106
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


static/Data3/1.png → static/Data1/1.png


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 0 - 0
static/Data/174.png


部分文件因为文件数量过多而无法显示