modify:修改页面布局

lqnet/Api/MyConstants.cs

@@ -33,7 +33,7 @@ namespace lqnet.Api
     }
     public class VariablesGlobal
     {
-        public static string IP_PORT = "http://192.168.1.4:8190/";
+        public static string IP_PORT = "http://10.60.102.253:8088/";
         public static string USER_TOKEN = "";
     }
 }

lqnet/Forms/DevicePopupForm.cs

@@ -293,6 +293,7 @@ namespace lqnet.Forms
             // 
             // prodeFactory
             // 
+            this.prodeFactory.DataPropertyName = "prodeFactory";
             this.prodeFactory.HeaderText = "生产厂家";
             this.prodeFactory.MinimumWidth = 8;
             this.prodeFactory.Name = "prodeFactory";
@@ -300,7 +301,7 @@ namespace lqnet.Forms
             // 
             // equitParameterDataGridViewTextBoxColumn
             // 
-            this.equitParameterDataGridViewTextBoxColumn.DataPropertyName = "prodeFactory";
+            this.equitParameterDataGridViewTextBoxColumn.DataPropertyName = "equitParameter";
             this.equitParameterDataGridViewTextBoxColumn.HeaderText = "设备参数";
             this.equitParameterDataGridViewTextBoxColumn.MinimumWidth = 8;
             this.equitParameterDataGridViewTextBoxColumn.Name = "equitParameterDataGridViewTextBoxColumn";

lqnet/Forms/DevicePopupForm.resx

@@ -123,15 +123,9 @@
   <metadata name="deviceListBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="deviceListBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>294, 17</value>
   </metadata>
-  <metadata name="prodeFactory.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

lqnet/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.6")]
-[assembly: AssemblyFileVersion("1.0.0.6")]
+[assembly: AssemblyVersion("1.0.0.9")]
+[assembly: AssemblyFileVersion("1.0.0.9")]

lqnet/bin/Debug/lqnet.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>57wBHPtFRMdctmJdHnzNkW6wnVKm2pewj9pwti9Lef4=</dsig:DigestValue>
+        <dsig:DigestValue>MGm3p8eZrmKaTRlFmlmPPqB24cqHoHzTMgWx0QkfskY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/bin/Debug/lqnet.exe.manifest

@@ -4,7 +4,7 @@
   <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="lqnet" version="1.0.0.6" language="neutral" processorArchitecture="x86" />
+    <assemblyIdentity name="lqnet" version="1.0.0.9" language="neutral" processorArchitecture="x86" />
     <commandLine file="lqnet.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -79,13 +79,13 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="lqnet.exe" size="688128">
-      <assemblyIdentity name="lqnet" version="1.0.0.6" language="neutral" processorArchitecture="x86" />
+      <assemblyIdentity name="lqnet" version="1.0.0.9" language="neutral" processorArchitecture="x86" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>gCgk+mslVwTTVt/QWsdOJ7OxHd2ixgOobtydj+6AtPg=</dsig:DigestValue>
+        <dsig:DigestValue>WqYeJ1DszGcvpS4iePUsCco0wrP72lshN0k033DMBfM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/obj/Debug/lqnet.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>57wBHPtFRMdctmJdHnzNkW6wnVKm2pewj9pwti9Lef4=</dsig:DigestValue>
+        <dsig:DigestValue>MGm3p8eZrmKaTRlFmlmPPqB24cqHoHzTMgWx0QkfskY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/obj/Debug/lqnet.exe.manifest

@@ -4,7 +4,7 @@
   <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="lqnet" version="1.0.0.6" language="neutral" processorArchitecture="x86" />
+    <assemblyIdentity name="lqnet" version="1.0.0.9" language="neutral" processorArchitecture="x86" />
     <commandLine file="lqnet.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -79,13 +79,13 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="lqnet.exe" size="688128">
-      <assemblyIdentity name="lqnet" version="1.0.0.6" language="neutral" processorArchitecture="x86" />
+      <assemblyIdentity name="lqnet" version="1.0.0.9" language="neutral" processorArchitecture="x86" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>gCgk+mslVwTTVt/QWsdOJ7OxHd2ixgOobtydj+6AtPg=</dsig:DigestValue>
+        <dsig:DigestValue>WqYeJ1DszGcvpS4iePUsCco0wrP72lshN0k033DMBfM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>