Browse Source

功率分析、缺口分析界面展示

wrinkle17 4 months ago
parent
commit
221c125c9d
3 changed files with 954 additions and 343 deletions
  1. 734 188
      DPTools/DevFrmMain.Designer.cs
  2. 67 1
      DPTools/DevFrmMain.cs
  3. 153 154
      DPTools/DevFrmMain.resx

File diff suppressed because it is too large
+ 734 - 188
DPTools/DevFrmMain.Designer.cs


+ 67 - 1
DPTools/DevFrmMain.cs

@@ -394,7 +394,7 @@ namespace Uninpho.Tools
             List<int> indexid = new List<int>();
             List<string> indexzt = new List<string>();
             DACommon.getSFZT(gridView3, ref indexid, ref indexzt);
-            DACommon.OpenFile("bny", LGLcheckEdit.Checked,gridView2);
+            DACommon.OpenFile("bny", LGLcheckEdit.Checked,gridView3);
             List<T_file_account> daochaLists = DataAnalysisToPG.getfile("bny", indexid, indexzt) as List<T_file_account>;
             this.gridControl3.DataSource = daochaLists;
             DACommon.repushSFZT(gridView3, indexid);
@@ -724,5 +724,71 @@ namespace Uninpho.Tools
         {
 
         }
+        /// <summary>
+        /// 功率分析按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void GLBtn_ItemClick_1(object sender, ItemClickEventArgs e)
+        {
+
+            //确定tab页名称
+            string strDXtabname = "xtraTabPageGL";
+            //判断tab页是否已经创建,如果已创建直接显示
+            tabtools.addTabmenu(xtraTabControl1, strDXtabname);
+        }
+        //导入文件
+        private void DWGLopenfileBtn_Click(object sender, EventArgs e)
+        {//解析方式要重新写
+            List<int> indexid = new List<int>();
+            List<string> indexzt = new List<string>();
+            DACommon.getSFZT(gridView4, ref indexid, ref indexzt);
+            DACommon.OpenFile("txt", JHFXcheckEdit.Checked, gridView4);
+            List<T_file_account> daochaLists = DataAnalysisToPG.getfile("geo", indexid, indexzt) as List<T_file_account>;
+            this.gridControl2.DataSource = daochaLists;
+            DACommon.repushSFZT(gridView4, indexid);
+        }
+
+        private void DWGLdelBtn_Click(object sender, EventArgs e)
+        {
+
+        }
+        /// <summary>
+        /// 缺口分析按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void QKBtn_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            //确定tab页名称
+            string strDXtabname = "xtraTabPageQK";
+            //判断tab页是否已经创建,如果已创建直接显示
+            tabtools.addTabmenu(xtraTabControl1, strDXtabname);
+        }
+        //导入文件
+        private void DWQKopenfileBtn_Click(object sender, EventArgs e)
+        {
+            //解析方式要重新写
+            List<int> indexid = new List<int>();
+            List<string> indexzt = new List<string>();
+            DACommon.getSFZT(gridView4, ref indexid, ref indexzt);
+            DACommon.OpenFile("txt", JHFXcheckEdit.Checked, gridView4);
+            List<T_file_account> daochaLists = DataAnalysisToPG.getfile("geo", indexid, indexzt) as List<T_file_account>;
+            this.gridControl2.DataSource = daochaLists;
+            DACommon.repushSFZT(gridView4, indexid);
+        }
+        /// <summary>
+        /// 缺口分析按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DWSJBtn_ItemClick(object sender, ItemClickEventArgs e)
+        {
+
+            //确定tab页名称
+            string strDXtabname = "xtraTabPageDWZS";
+            //判断tab页是否已经创建,如果已创建直接显示
+            tabtools.addTabmenu(xtraTabControl1, strDXtabname);
+        }
     }
 }

+ 153 - 154
DPTools/DevFrmMain.resx

@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="xrDesignRibbonController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>832, 17</value>
+    <value>693, 17</value>
   </metadata>
   <metadata name="applicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 59</value>
+    <value>906, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="barButtonImageTile.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1393,173 +1393,172 @@
         5I/Gb45XG/jzgOx/2ZzKgxEwf90AAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="barButtonItem29.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="GLBtn.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
 </value>
   </data>
-  <data name="barButtonItem29.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="GLBtn.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
-        YII=
+        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
 </value>
   </data>
-  <data name="barButtonItem30.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="QKBtn.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
 </value>
   </data>
-  <data name="barButtonItem30.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="QKBtn.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
-        WpjJnUIAAAAASUVORK5CYII=
+        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
+        rkJggg==
 </value>
   </data>
-  <data name="barButtonItem31.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="DWSJBtn.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAF3RFWHRUaXRsZQBNZXJnZTtN
-        ZXJnZUNlbGxzO9/OO0QAAAJMSURBVDhPpdPtS1NRHAfwA1kUVP/HSmysfyXnfEii1BetWq0JszRtD2ma
-        biuCIoJYPtxN8anhZkw3CUsSclMiwY3eZ3PPbrsG337n3LvyRUTQ4MP3PPzOuedyzxj9jpAacvQfHVPx
-        dg1zuINRp+ctqhxunouUv9mFEOwuSlcQtpEQCaJ36M0Kc9JksXxAZBQoC/sHePfxK4qUhZKK2itrSUoZ
-        RerzOZ59jxbAbK4QFclI58vYy5WRLVSwGN1GjorzRRk5VSj6RYxV+/vlH3g58QHsPh0l8j4J7+Q6vFPr
-        orDjqQ4dT86j/bGOaNFG2ebR4YpHi8vuc8IlF1cH1ju8gDztnMpVhGxBpgVaRJOdh1gUCQsiHLV5tg7T
-        BvcGA+KoKTp+KstfQRZP4EW+zRb44s3wE56cJLIJy4nbaBmkDboHAnTsbXqfNSEQ/ozWkTpRIMUbIcUa
-        MVHNmIEouZQwo2mgFqyrfx7ZYgXfM2Xsqie4OFQnCnjheEyPsQ3FqGpsox5LO7dg6D8LZnXOIUOLdvkG
-        mRIy+QqaH9aKgqrwoQzv3Pyl3qEB67TPYDa0heevV/HMu4q5xS2xs/DgDBqIwUFJ9LSgwa7BBZsGesKT
-        WWzT4qnf0iWB34WZ4CbS9EUEmuOmg3FxV8R9oT6/C54Xy2DmvilaVBGDe1mFNL+htpXLxb/O+OwnSuVT
-        8+Tz1+5IYEbraMTUMwlTjx+mbj9ukOvcXZ9KokKfokuCkRYZuyZw1Sqh3fwqSn8odpycJKf+4vQf8PET
-        DMB/APsJckKsQ7QhL6EAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAXdEVYdFRpdGxlAE1lcmdlO01lcmdlQ2VsbHM73847
+        RAAAAkxJREFUOE+l0+1LU1EcB/ADWRRU/8dKbKx/Jed8SKLUF61arQmzNG0PaZpuK4Iiglg+3E3xqeFm
+        TDcJSxJyUyLBjd5nc89uuwbffufcu/JFRNDgw/c8/M6553LPGP2OkBpy9B8dU/F2DXO4g1Gn5y2qHG6e
+        i5S/2YUQ7C5KVxC2kRAJonfozQpz0mSxfEBkFCgL+wd49/EripSFkoraK2tJShlF6vM5nn2PFsBsrhAV
+        yUjny9jLlZEtVLAY3UaOivNFGTlVKPpFjFX7++UfeDnxAew+HSXyPgnv5Dq8U+uisOOpDh1PzqP9sY5o
+        0UbZ5tHhikeLy+5zwiUXVwfWO7yAPO2cylWEbEGmBVpEk52HWBQJCyIctXm2DtMG9wYD4qgpOn4qy19B
+        Fk/gRb7NFvjizfATnpwksgnLidtoGaQNugcCdOxtep81IRD+jNaROlEgxRshxRoxUc2YgSi5lDCjaaAW
+        rKt/HtliBd8zZeyqJ7g4VCcKeOF4TI+xDcWoamyjHks7t2DoPwtmdc4hQ4t2+QaZEjL5Cpof1oqCqvCh
+        DO/c/KXeoQHrtM9gNrSF569X8cy7irnFLbGz8OAMGojBQUn0tKDBrsEFmwZ6wpNZbNPiqd/SJYHfhZng
+        JtL0RQSa46aDcXFXxH2hPr8LnhfLYOa+KVpUEYN7WYU0v6G2lcvFv8747CdK5VPz5PPX7khgRutoxNQz
+        CVOPH6ZuP26Q69xdn0qiQp+iS4KRFhm7JnDVKqHd/CpKfyh2nJwkp/7i9B/w8RMMwH8A+wlyQqxDtCEv
+        oQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="barButtonItem31.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="DWSJBtn.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAF3RFWHRUaXRsZQBNZXJnZTtN
-        ZXJnZUNlbGxzO9/OO0QAAAZeSURBVFhHxZdpUxRXFIZJTIy4a5IfEbcYtZKYReMHK99ScUF2RUZQRMqF
-        iAEUAUGNC1EECbvsIMgiq9FgGTbREdmUGPcsFUQcARWGGeXknHPv7Z7R5FNKM1WPb3dPc5/33p7paR3k
-        6zXJ668A5dJetDMKeRN5y4YxL4nRyBsIleHXqENJNYtTchuNaQXNkJbfDKmKvGZIyTvPJOdiIsm5TZBE
-        5DQiTZCY3cj8kIVkNkACcjSzHo5m1EP8sTqkHuLS6+AIkfYzHEo5a4zYX/gleqkEr8TofQm13Xf+MMHI
-        yMgLnL/82wvHnslsarnL2/9Eg/G2vv9M5+bdXgiPqbmHXlplXoUxWIAHfPjIggxDH/JwAMHMK23hZAbw
-        fTouySm5JI8PgwnTRCm3s4qN2nnacYRKRMRUA3odVQHH7+J/kgX0wZVMk9gI1Dk5JUKijqn3iawTF8HU
-        b7Y7RlCB8ANVVGAsQp89B8e9WICWSg1sOxgXsNm3PSdbzlIdN/VLBsyQaVuAjwmsT0cgbD8XGKcKjN0T
-        dwYaLt1hGc1KJQlCcxYJshdBSPYXGsFZSOZCjW8zFyALYVsGsQCCiGOfQ1C6YCvyDZH2GWNXYPeR07w0
-        elt96YKzFkLznZ02hGmcJ27vwNwBTZiC7UwjcSsUE6G8FcI0IJtTPqUC41WBcdGxqoAZHvAyYnIJMwTh
-        zEj241VfONWFUCI1XT6YPlBDXFkD1VcVBqjG/aorBhu8obKTWA31t4JhU9In9gWiDp+Cp7KAkOslaOlo
-        RiwiAQ7OKbeFUEhshVUslHSsxvTC9IK6m9sgIGE+FZigCoyP/P4Ufzho9jq0GmYIxOtFS8ciKWNhp4EH
-        F2IxO6ICZRUoq0AZUc65irMc89yNreAf/5F9gYiYGqhtvA7Hii4ICpsRkXS96m8GQyVJFFLGQikrV0my
-        dhKu5O2TmERZu+Ds9UDwi/2QCkxUBSaE443BasUV6BMz7+0jhjk3Js7nZaMlVLPSIZESShmLPDE9oayN
-        8OAsxSxtc4faa5th7eF5qgDdjh0m7DxYBRYsIMS6nNiQ8DEvG4tIggKaHaWAJEKqhKXtJENa3Vlagilw
-        gzPXNoJPzFwqMEkrQDcGi/UZ3NcKIA/NvE/X6+yNQCFQPC+Ssyth3KCYQJnAlTlx2QVxhdNdAWA4MMeu
-        wMTt+yq4AIlViftUAFmH16v21y1ycCGwhWQ0s2IcnEWaUEkJZyjCLGxxxm+QP3jt+4AKTNYKhO6tgMra
-        LvzZbdJIJvBn1/fQPF42NRNGyXBQGriIBTqFlCgrbHFCVnAevySovuIHq/a8b1dgUsjecjBbnvKMe3jm
-        Q5hDnD4H58LpXwKgqFXMxk5A2yxYAccZJyggWctyKECZgLaXMflIZacveOyeRQWmaAWCd5/kAj0mlCNK
-        ToW898/BO956lAmRkJFEzKiAZAqUkSSf0rgM8oxLNXI5l+DX1QCuUTPsCkzeFl0G5mFRQINWwzSE12s2
-        3oD8hNBIUiEqMAqJji7Lu4jCi0sQkTnEha+ZsrbV4BzBBaZqBYKiS2HQTAVw6W3BVVi5Zzbe9Xx56So7
-        fPHG44Pff0F5xxrmZDvSYcD0Rgz4TfFmUVmbF347vKCsVWRp6yr8wHqB085pqgA9hzpMCYoqhRNVbfhc
-        V4/PdAil3PaIngXuRNRMxg2Xz3XXTMkMcCEipoNzJEKJOIVPhxXh01gkeA+Wh02D5TswkWUIet/WCmzd
-        VcIrcI9m/WCIk8Ht+Iw6fd80yMdU0kMnbXfTMQlv47lH0s7JbXyfxxLnDTyxgn9ogV2BqYGRxfBkyCoG
-        liL6o27MOCqAfywEIrt5MHwvnSSqlHpf7MfKAuJc/W8GHmOBEC7wjiowZUtEMTwetPIJaiCS034czZIE
-        NoOJbZTIAnb0ivNiU1UBXd7dOwj9jy2wPjjfbgUmbQor/Oty559c4tGgBdMCj3CpCHosG3hikVhxBjKR
-        DPzl1N+zQL8Cz0k/3sxJ9BH4xE15oe13WBeU041e7Ubk+JVbpItnQGrPyoB08CQ2pDEehH8quCvWp4Cb
-        wi8FXJlkxmWdIolxXvs8ieDsmwhOPgk9i5eGupIX4cdy+k2mHfpxoGWha/NvvPsfoTHoBkSP5DR7/p8R
-        /UNN6ABdk5cNechHXi5AL7XzKhEvAPgfAYe/AYb+p/Yf5htdAAAAAElFTkSuQmCC
+        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
 </value>
   </data>
   <metadata name="ribbonMiniToolbar1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 101</value>
+    <value>444, 55</value>
   </metadata>
   <metadata name="xrDesignDockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>207, 59</value>
+    <value>1065, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>171</value>
+    <value>113</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1724,7 +1723,7 @@
 </value>
   </data>
   <metadata name="galleryDropDown1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>636, 17</value>
+    <value>530, 17</value>
   </metadata>
   <data name="barButtonItem2.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1762,7 +1761,7 @@
 </value>
   </data>
   <metadata name="defaultLookAndFeel1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>422, 17</value>
+    <value>353, 17</value>
   </metadata>
   <data name="barButtonItem3.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1892,19 +1891,19 @@
 </value>
   </data>
   <metadata name="reportDesigner1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>245, 17</value>
+    <value>205, 17</value>
   </metadata>
   <metadata name="popupMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>441, 59</value>
+    <value>1259, 17</value>
   </metadata>
   <metadata name="galleryDropDown2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>598, 59</value>
+    <value>17, 55</value>
   </metadata>
   <metadata name="popupMenu2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>794, 59</value>
+    <value>180, 55</value>
   </metadata>
   <metadata name="popupMenu3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>951, 59</value>
+    <value>312, 55</value>
   </metadata>
   <data name="barButtonItem15.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1948,6 +1947,6 @@
 </value>
   </data>
   <metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>217, 101</value>
+    <value>614, 55</value>
   </metadata>
 </root>

Some files were not shown because too many files changed in this diff