浏览代码

进行大屏调整前的一次修改

liuwei 4 年之前
父节点
当前提交
66207160d8

文件差异内容过多而无法显示
+ 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
-  }
-]
+[{"Name":"dog-gif","BackIcon":"33.png","ResourceID":"33","IsPanel":false,"EnityName":"Image","ID":"5487fd23-5266-4804-9da8-c78dfe6a7dd9","Left":478,"Top":29,"Width":100,"Height":100,"ZIndex":100,"GroupNumber":"","IsRunVisiable":true,"IsVisibility":true,"isSyn":false,"WindowID":"2c621760-ee96-490a-a2de-f60f9163f756","PanelID":null,"IsLock":false,"IsWindow":false}]

文件差异内容过多而无法显示
+ 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 @@
-[]
+[{"ID":"ed4418af-2107-4413-b445-ae8f23211c43","IsVisibility":true,"IsLock":false,"Name":"P0","BackIconObjID":"12","BackIcon":"12.jpg","BrackgroupStr":"#00FFFFFF","IsShow":false,"Code":"ed4418af-2107-4413-b445-ae8f23211c43","IsPanel":true,"EnityName":"View","ActionType":14,"Left":1419,"Top":141,"Width":200,"Height":200,"ZIndex":500,"GroupNumber":"221","IsRunVisiable":true,"isSyn":false,"WindowID":"2c621760-ee96-490a-a2de-f60f9163f756","PanelID":null,"IsWindow":false}]

文件差异内容过多而无法显示
+ 1 - 376
static/Data/EnityWindow.Data