Browse Source

修改几条建议

liuwei 4 years ago
parent
commit
f195cd3b01

+ 14 - 0
src/renderer/assets/less/splitscreen.less

@@ -11,6 +11,20 @@
   /*分屏项(信号源)*/
   /*分屏项(信号源)*/
   .sitem {
   .sitem {
 
 
+    // 信号源名称样式
+    .signalName {
+      width:100%;
+      height: 20px;
+      position: absolute;
+      bottom:4px;
+      color:#ffffff;
+      text-align: center;
+      font-size:16px;
+      z-index: 99999;
+      font-weight: 400;
+      font-family: SimSun-ExtB;
+    }
+
     // 关闭信号源开窗按钮
     // 关闭信号源开窗按钮
     .closeBtn {
     .closeBtn {
       position: absolute;
       position: absolute;

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

@@ -25,7 +25,7 @@
             <VueDragResize
             <VueDragResize
                     v-for="itemV in bigScreenObj[item.ID] ? bigScreenObj[item.ID].signalArr : []" :key="itemV.Id"
                     v-for="itemV in bigScreenObj[item.ID] ? bigScreenObj[item.ID].signalArr : []" :key="itemV.Id"
                     class="sitem"
                     class="sitem"
-                    :w="itemV.width" :h="itemV.height" :parentLimitation="false"
+                    :w="itemV.width" :h="itemV.height" :parentLimitation="true"
                     :x="itemV.left" :y="itemV.top"
                     :x="itemV.left" :y="itemV.top"
                     @dragstop="(position) => dragStop(position,itemV,bigScreenObj,curOpeBigscreenId)"
                     @dragstop="(position) => dragStop(position,itemV,bigScreenObj,curOpeBigscreenId)"
                     @resizestop="(size) => resizeSignal(size,itemV,bigScreenObj,curOpeBigscreenId)"
                     @resizestop="(size) => resizeSignal(size,itemV,bigScreenObj,curOpeBigscreenId)"
@@ -37,6 +37,7 @@
                             :playsinline="true"
                             :playsinline="true"
                             :style="scaleFun(itemV)"
                             :style="scaleFun(itemV)"
                     />
                     />
+                    <div class="signalName">{{itemV.deviceName}}</div>
                     <div class="closeBtn" @click.stop="closeSignal(itemV)">×</div>
                     <div class="closeBtn" @click.stop="closeSignal(itemV)">×</div>
                 </div>
                 </div>
             </VueDragResize>
             </VueDragResize>

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


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


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


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


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


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


+ 35 - 1
static/Data/EnityLogin.Data

@@ -1 +1,35 @@
-[]
+[
+    {
+        "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
+    }
+]

+ 24 - 1
static/Data/EnityMemory.Data

@@ -1 +1,24 @@
-[{"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}]
+[
+  {
+    "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
+  }
+]

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


+ 230 - 1
static/Data/EnitySlider.Data

@@ -1 +1,230 @@
-[]
+[
+  {
+    "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
+  }
+]

+ 16 - 1
static/Data/EnityTimer.Data

@@ -1 +1,16 @@
-[]
+[
+  {
+    "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
+  }
+]

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


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


+ 1 - 1
static/Data/EnityView.Data

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

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