diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" new file mode 100644 index 0000000..a75b25d --- /dev/null +++ "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" new file mode 100644 index 0000000..a75b25d --- /dev/null +++ "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 257dbae..39e3019 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -410,3 +410,209 @@ D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe.config +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.dll +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.xml +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\ResolveAssemblyReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EditTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_OnlineTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaksManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FormDocumentManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmMnModify.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShRK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccess.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesgather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddFlagBatch.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddSinMark.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddValve.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddWellShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPP.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPAuditor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASKReason.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPregion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSER.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSERRESET.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBACKORACLE.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmChangePassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCodingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareFeature.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateUser.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCustomLabel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDataBaseOpt.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDbManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDocumentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDownloadProgress.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentManage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportCADS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDatabase.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlySetDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBasicQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBoosterValvers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DigFillAnalysisDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenTopo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCloseValves.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDigPitSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFittingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlow.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlyToPosition.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFolderSelecter.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFTAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmKeywordQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLayerControl.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.FrmLog.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogDescription.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogin.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMDDictory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadata.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataOutput.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOperMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPerm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPermMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDeepstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDiametergather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frmpipediameterstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeMaterialGather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmProject.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddPipeFitting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllPipelineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDiameterQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRedlineResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleRescManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmShResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoManger.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserInfoRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValveStatistics.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMaterialSel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.frmPipeSetEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmProfileAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPropertiesMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryHistory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionTypeMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESC.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESCMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoadHDM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetGoalLayer.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmTackPolygonDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHDMAnalysis3.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySQL.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserAdd.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepoMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiData.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frm_password_reset.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT1.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.Log.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.MainFrm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateTunnel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCitySevenLineType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportVector.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFloodAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPipelineIndented.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Properties.Resources.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetLatLonPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSceneLightSet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetFlytoPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesSensor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddInstrument.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SysRescInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SystemFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" new file mode 100644 index 0000000..a75b25d --- /dev/null +++ "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 257dbae..39e3019 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -410,3 +410,209 @@ D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe.config +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.dll +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.xml +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\ResolveAssemblyReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EditTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_OnlineTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaksManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FormDocumentManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmMnModify.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShRK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccess.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesgather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddFlagBatch.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddSinMark.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddValve.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddWellShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPP.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPAuditor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASKReason.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPregion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSER.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSERRESET.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBACKORACLE.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmChangePassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCodingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareFeature.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateUser.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCustomLabel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDataBaseOpt.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDbManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDocumentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDownloadProgress.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentManage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportCADS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDatabase.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlySetDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBasicQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBoosterValvers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DigFillAnalysisDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenTopo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCloseValves.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDigPitSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFittingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlow.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlyToPosition.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFolderSelecter.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFTAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmKeywordQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLayerControl.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.FrmLog.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogDescription.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogin.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMDDictory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadata.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataOutput.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOperMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPerm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPermMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDeepstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDiametergather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frmpipediameterstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeMaterialGather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmProject.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddPipeFitting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllPipelineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDiameterQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRedlineResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleRescManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmShResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoManger.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserInfoRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValveStatistics.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMaterialSel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.frmPipeSetEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmProfileAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPropertiesMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryHistory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionTypeMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESC.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESCMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoadHDM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetGoalLayer.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmTackPolygonDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHDMAnalysis3.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySQL.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserAdd.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepoMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiData.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frm_password_reset.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT1.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.Log.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.MainFrm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateTunnel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCitySevenLineType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportVector.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFloodAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPipelineIndented.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Properties.Resources.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetLatLonPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSceneLightSet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetFlytoPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesSensor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddInstrument.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SysRescInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SystemFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index accd5cd..7bb4bd0 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" new file mode 100644 index 0000000..a75b25d --- /dev/null +++ "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 257dbae..39e3019 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -410,3 +410,209 @@ D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe.config +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.dll +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.xml +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\ResolveAssemblyReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EditTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_OnlineTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaksManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FormDocumentManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmMnModify.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShRK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccess.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesgather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddFlagBatch.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddSinMark.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddValve.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddWellShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPP.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPAuditor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASKReason.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPregion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSER.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSERRESET.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBACKORACLE.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmChangePassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCodingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareFeature.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateUser.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCustomLabel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDataBaseOpt.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDbManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDocumentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDownloadProgress.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentManage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportCADS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDatabase.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlySetDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBasicQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBoosterValvers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DigFillAnalysisDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenTopo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCloseValves.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDigPitSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFittingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlow.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlyToPosition.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFolderSelecter.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFTAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmKeywordQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLayerControl.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.FrmLog.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogDescription.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogin.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMDDictory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadata.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataOutput.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOperMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPerm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPermMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDeepstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDiametergather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frmpipediameterstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeMaterialGather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmProject.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddPipeFitting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllPipelineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDiameterQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRedlineResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleRescManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmShResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoManger.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserInfoRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValveStatistics.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMaterialSel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.frmPipeSetEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmProfileAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPropertiesMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryHistory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionTypeMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESC.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESCMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoadHDM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetGoalLayer.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmTackPolygonDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHDMAnalysis3.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySQL.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserAdd.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepoMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiData.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frm_password_reset.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT1.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.Log.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.MainFrm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateTunnel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCitySevenLineType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportVector.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFloodAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPipelineIndented.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Properties.Resources.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetLatLonPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSceneLightSet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetFlytoPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesSensor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddInstrument.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SysRescInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SystemFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index accd5cd..7bb4bd0 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f19ebf3..a452283 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" new file mode 100644 index 0000000..a75b25d --- /dev/null +++ "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 257dbae..39e3019 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -410,3 +410,209 @@ D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe.config +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.dll +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.xml +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\ResolveAssemblyReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EditTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_OnlineTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaksManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FormDocumentManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmMnModify.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShRK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccess.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesgather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddFlagBatch.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddSinMark.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddValve.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddWellShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPP.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPAuditor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASKReason.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPregion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSER.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSERRESET.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBACKORACLE.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmChangePassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCodingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareFeature.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateUser.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCustomLabel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDataBaseOpt.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDbManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDocumentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDownloadProgress.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentManage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportCADS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDatabase.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlySetDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBasicQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBoosterValvers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DigFillAnalysisDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenTopo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCloseValves.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDigPitSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFittingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlow.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlyToPosition.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFolderSelecter.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFTAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmKeywordQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLayerControl.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.FrmLog.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogDescription.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogin.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMDDictory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadata.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataOutput.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOperMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPerm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPermMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDeepstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDiametergather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frmpipediameterstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeMaterialGather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmProject.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddPipeFitting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllPipelineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDiameterQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRedlineResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleRescManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmShResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoManger.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserInfoRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValveStatistics.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMaterialSel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.frmPipeSetEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmProfileAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPropertiesMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryHistory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionTypeMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESC.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESCMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoadHDM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetGoalLayer.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmTackPolygonDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHDMAnalysis3.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySQL.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserAdd.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepoMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiData.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frm_password_reset.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT1.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.Log.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.MainFrm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateTunnel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCitySevenLineType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportVector.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFloodAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPipelineIndented.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Properties.Resources.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetLatLonPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSceneLightSet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetFlytoPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesSensor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddInstrument.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SysRescInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SystemFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index accd5cd..7bb4bd0 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f19ebf3..a452283 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" new file mode 100644 index 0000000..a75b25d --- /dev/null +++ "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 257dbae..39e3019 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -410,3 +410,209 @@ D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe.config +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.dll +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.xml +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\ResolveAssemblyReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EditTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_OnlineTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaksManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FormDocumentManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmMnModify.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShRK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccess.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesgather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddFlagBatch.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddSinMark.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddValve.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddWellShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPP.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPAuditor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASKReason.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPregion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSER.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSERRESET.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBACKORACLE.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmChangePassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCodingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareFeature.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateUser.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCustomLabel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDataBaseOpt.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDbManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDocumentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDownloadProgress.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentManage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportCADS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDatabase.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlySetDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBasicQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBoosterValvers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DigFillAnalysisDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenTopo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCloseValves.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDigPitSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFittingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlow.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlyToPosition.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFolderSelecter.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFTAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmKeywordQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLayerControl.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.FrmLog.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogDescription.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogin.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMDDictory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadata.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataOutput.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOperMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPerm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPermMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDeepstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDiametergather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frmpipediameterstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeMaterialGather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmProject.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddPipeFitting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllPipelineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDiameterQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRedlineResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleRescManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmShResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoManger.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserInfoRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValveStatistics.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMaterialSel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.frmPipeSetEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmProfileAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPropertiesMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryHistory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionTypeMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESC.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESCMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoadHDM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetGoalLayer.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmTackPolygonDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHDMAnalysis3.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySQL.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserAdd.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepoMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiData.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frm_password_reset.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT1.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.Log.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.MainFrm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateTunnel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCitySevenLineType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportVector.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFloodAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPipelineIndented.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Properties.Resources.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetLatLonPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSceneLightSet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetFlytoPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesSensor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddInstrument.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SysRescInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SystemFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index accd5cd..7bb4bd0 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f19ebf3..a452283 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" new file mode 100644 index 0000000..a75b25d --- /dev/null +++ "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 257dbae..39e3019 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -410,3 +410,209 @@ D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe.config +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.dll +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.xml +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\ResolveAssemblyReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EditTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_OnlineTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaksManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FormDocumentManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmMnModify.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShRK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccess.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesgather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddFlagBatch.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddSinMark.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddValve.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddWellShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPP.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPAuditor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASKReason.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPregion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSER.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSERRESET.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBACKORACLE.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmChangePassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCodingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareFeature.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateUser.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCustomLabel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDataBaseOpt.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDbManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDocumentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDownloadProgress.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentManage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportCADS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDatabase.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlySetDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBasicQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBoosterValvers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DigFillAnalysisDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenTopo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCloseValves.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDigPitSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFittingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlow.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlyToPosition.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFolderSelecter.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFTAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmKeywordQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLayerControl.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.FrmLog.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogDescription.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogin.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMDDictory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadata.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataOutput.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOperMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPerm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPermMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDeepstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDiametergather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frmpipediameterstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeMaterialGather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmProject.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddPipeFitting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllPipelineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDiameterQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRedlineResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleRescManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmShResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoManger.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserInfoRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValveStatistics.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMaterialSel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.frmPipeSetEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmProfileAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPropertiesMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryHistory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionTypeMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESC.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESCMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoadHDM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetGoalLayer.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmTackPolygonDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHDMAnalysis3.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySQL.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserAdd.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepoMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiData.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frm_password_reset.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT1.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.Log.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.MainFrm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateTunnel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCitySevenLineType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportVector.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFloodAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPipelineIndented.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Properties.Resources.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetLatLonPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSceneLightSet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetFlytoPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesSensor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddInstrument.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SysRescInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SystemFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index accd5cd..7bb4bd0 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f19ebf3..a452283 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index c981018..08618ec 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" new file mode 100644 index 0000000..a75b25d --- /dev/null +++ "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 257dbae..39e3019 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -410,3 +410,209 @@ D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe.config +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.dll +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.xml +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\ResolveAssemblyReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EditTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_OnlineTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaksManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FormDocumentManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmMnModify.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShRK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccess.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesgather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddFlagBatch.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddSinMark.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddValve.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddWellShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPP.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPAuditor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASKReason.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPregion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSER.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSERRESET.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBACKORACLE.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmChangePassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCodingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareFeature.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateUser.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCustomLabel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDataBaseOpt.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDbManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDocumentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDownloadProgress.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentManage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportCADS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDatabase.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlySetDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBasicQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBoosterValvers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DigFillAnalysisDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenTopo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCloseValves.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDigPitSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFittingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlow.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlyToPosition.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFolderSelecter.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFTAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmKeywordQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLayerControl.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.FrmLog.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogDescription.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogin.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMDDictory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadata.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataOutput.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOperMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPerm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPermMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDeepstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDiametergather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frmpipediameterstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeMaterialGather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmProject.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddPipeFitting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllPipelineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDiameterQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRedlineResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleRescManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmShResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoManger.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserInfoRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValveStatistics.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMaterialSel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.frmPipeSetEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmProfileAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPropertiesMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryHistory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionTypeMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESC.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESCMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoadHDM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetGoalLayer.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmTackPolygonDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHDMAnalysis3.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySQL.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserAdd.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepoMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiData.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frm_password_reset.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT1.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.Log.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.MainFrm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateTunnel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCitySevenLineType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportVector.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFloodAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPipelineIndented.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Properties.Resources.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetLatLonPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSceneLightSet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetFlytoPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesSensor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddInstrument.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SysRescInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SystemFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index accd5cd..7bb4bd0 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f19ebf3..a452283 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index c981018..08618ec 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/obj/x86/Debug/GenerateResource.write.1.tlog b/obj/x86/Debug/GenerateResource.write.1.tlog index 1db7541..64854f9 100644 --- a/obj/x86/Debug/GenerateResource.write.1.tlog +++ b/obj/x86/Debug/GenerateResource.write.1.tlog Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6797b66..818e401 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..a7d021a 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,9 +443,16 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { + string filename = row.Cells["文档名称"].Value.ToString(); string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; string file = System.Environment.CurrentDirectory + "\\download\\" + filename; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql index 7bf2a72..bf50024 100644 --- a/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql +++ b/SQL/V0_0_101__REGIONTYPEIS_SEQ.sql @@ -1,4 +1,4 @@ -CREATE sequence REGIONTYPEIS +CREATE sequence REGIONTYPEIS MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 diff --git a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql index 487c4e9..1ef9c69 100644 --- a/SQL/V0_0_102__REGIONTYPEIS_TBL.sql +++ b/SQL/V0_0_102__REGIONTYPEIS_TBL.sql @@ -1,4 +1,4 @@ -create table REGIONTYPE +create table REGIONTYPE ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql index 2fd9bd9..daffa46 100644 --- a/SQL/V0_0_103__REGIONTYPEIS_TRI.sql +++ b/SQL/V0_0_103__REGIONTYPEIS_TRI.sql @@ -1,4 +1,4 @@ ---Ѳ���������� +--巡检区域类型 create or replace TRIGGER regiontypeit BEFORE INSERT ON regiontype FOR EACH ROW diff --git a/SQL/V0_0_105__REGION_SEQ.sql b/SQL/V0_0_105__REGION_SEQ.sql index ad32862..3557a6a 100644 --- a/SQL/V0_0_105__REGION_SEQ.sql +++ b/SQL/V0_0_105__REGION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence REGIONIS +create sequence REGIONIS minvalue 1 maxvalue 999999999999999999999999999 start with 1 diff --git a/SQL/V0_0_106__REGION_TBL.sql b/SQL/V0_0_106__REGION_TBL.sql index 5112bdf..0c03c0c 100644 --- a/SQL/V0_0_106__REGION_TBL.sql +++ b/SQL/V0_0_106__REGION_TBL.sql @@ -1,4 +1,4 @@ -create table REGION +create table REGION ( DBID NUMBER(19) primary key not null, NAME VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_107__REGION_TRI.sql b/SQL/V0_0_107__REGION_TRI.sql index 2dc55d1..9bbe64b 100644 --- a/SQL/V0_0_107__REGION_TRI.sql +++ b/SQL/V0_0_107__REGION_TRI.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE TRIGGER regionit +CREATE OR REPLACE TRIGGER regionit BEFORE INSERT ON region FOR EACH ROW diff --git a/SQL/V0_0_109__PATROLER_SEQ.sql b/SQL/V0_0_109__PATROLER_SEQ.sql index b1550fa..8946534 100644 --- a/SQL/V0_0_109__PATROLER_SEQ.sql +++ b/SQL/V0_0_109__PATROLER_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_PATROLER_ID +create sequence SEQ_PATROLER_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10100 diff --git a/SQL/V0_0_110__PATROLER_TBL.sql b/SQL/V0_0_110__PATROLER_TBL.sql index f0dfcfe..cb87ae9 100644 --- a/SQL/V0_0_110__PATROLER_TBL.sql +++ b/SQL/V0_0_110__PATROLER_TBL.sql @@ -1,4 +1,4 @@ -create table PATROLER +create table PATROLER ( DBID NUMBER(19) primary key not null, ACCOUNTSTATE VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_111__PATROLER_TRI.sql b/SQL/V0_0_111__PATROLER_TRI.sql index 3166fe2..dae4fed 100644 --- a/SQL/V0_0_111__PATROLER_TRI.sql +++ b/SQL/V0_0_111__PATROLER_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER PATROLERIT +create or replace TRIGGER PATROLERIT BEFORE INSERT ON PATROLER FOR EACH ROW diff --git a/SQL/V0_0_112__PATROLER_DATA.sql b/SQL/V0_0_112__PATROLER_DATA.sql index e838f61..5aa1fd6 100644 --- a/SQL/V0_0_112__PATROLER_DATA.sql +++ b/SQL/V0_0_112__PATROLER_DATA.sql @@ -1,10 +1,10 @@ +insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '男', '杨帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '��', '����', null); +values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '��', '�ŷ�', null); -insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '��', '����', null); \ No newline at end of file +values (142, 'OFFLINE', '32', '25d55ad283aa400af464c76d713c07ad', '13877654398', '男', '张三', null); \ No newline at end of file diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index a70e3bd..e0566f8 100644 --- a/SQL/V0_0_113__EQUIPMENT_SEQ.sql +++ b/SQL/V0_0_113__EQUIPMENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_EQUIPMENT_ID +create sequence SEQ_EQUIPMENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10080 diff --git a/SQL/V0_0_114__EQUIPMENT_TBL.sql b/SQL/V0_0_114__EQUIPMENT_TBL.sql index 25ed14d..6dd8b3f 100644 --- a/SQL/V0_0_114__EQUIPMENT_TBL.sql +++ b/SQL/V0_0_114__EQUIPMENT_TBL.sql @@ -1,4 +1,4 @@ -create table EQUIPMENT +create table EQUIPMENT ( DBID NUMBER(19) primary key not null, DESCIRPTION VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_115__EQUIPMENT_TRI.sql b/SQL/V0_0_115__EQUIPMENT_TRI.sql index e297c1d..fc6e407 100644 --- a/SQL/V0_0_115__EQUIPMENT_TRI.sql +++ b/SQL/V0_0_115__EQUIPMENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER equipmentit +create or replace TRIGGER equipmentit BEFORE INSERT ON equipment FOR EACH ROW diff --git a/SQL/V0_0_117__TASKINFO_SEQ.sql b/SQL/V0_0_117__TASKINFO_SEQ.sql index 59815d7..10f1d0f 100644 --- a/SQL/V0_0_117__TASKINFO_SEQ.sql +++ b/SQL/V0_0_117__TASKINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence TASKINFOIS +create sequence TASKINFOIS minvalue 1 maxvalue 999999999999999999999999999 start with 21 diff --git a/SQL/V0_0_118__TASKINFO_TBL.sql b/SQL/V0_0_118__TASKINFO_TBL.sql index 38f0cd3..dda50d2 100644 --- a/SQL/V0_0_118__TASKINFO_TBL.sql +++ b/SQL/V0_0_118__TASKINFO_TBL.sql @@ -1,4 +1,4 @@ -create table TASKINFO +create table TASKINFO ( DBID NUMBER(19) primary key not null, DEPLOYTIME TIMESTAMP(6), diff --git a/SQL/V0_0_119__TASKINFO_TRI.sql b/SQL/V0_0_119__TASKINFO_TRI.sql index 05518f4..0630014 100644 --- a/SQL/V0_0_119__TASKINFO_TRI.sql +++ b/SQL/V0_0_119__TASKINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER taskinfoit +create or replace TRIGGER taskinfoit BEFORE INSERT ON taskinfo FOR EACH ROW diff --git a/SQL/V0_0_121__ACCIDENT_SEQ.sql b/SQL/V0_0_121__ACCIDENT_SEQ.sql index 8eaa51c..09bc04e 100644 --- a/SQL/V0_0_121__ACCIDENT_SEQ.sql +++ b/SQL/V0_0_121__ACCIDENT_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_ACCIDENT_ID +create sequence SEQ_ACCIDENT_ID minvalue 1 maxvalue 999999999999999999999999999 start with 8086 diff --git a/SQL/V0_0_122__ACCIDENT_TBL.sql b/SQL/V0_0_122__ACCIDENT_TBL.sql index 32e6767..db5851d 100644 --- a/SQL/V0_0_122__ACCIDENT_TBL.sql +++ b/SQL/V0_0_122__ACCIDENT_TBL.sql @@ -1,4 +1,4 @@ -create table ACCIDENT +create table ACCIDENT ( DBID NUMBER(19) primary key not null, ACCIDENTTIME TIMESTAMP(6), diff --git a/SQL/V0_0_123__ACCIDENT_TRI.sql b/SQL/V0_0_123__ACCIDENT_TRI.sql index ec3bf1e..a120273 100644 --- a/SQL/V0_0_123__ACCIDENT_TRI.sql +++ b/SQL/V0_0_123__ACCIDENT_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER accidentit +create or replace TRIGGER accidentit BEFORE INSERT ON accident FOR EACH ROW diff --git a/SQL/V0_0_125__LOGINFO_SEQ.sql b/SQL/V0_0_125__LOGINFO_SEQ.sql index 5204822..64101f5 100644 --- a/SQL/V0_0_125__LOGINFO_SEQ.sql +++ b/SQL/V0_0_125__LOGINFO_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_LOGINFO_ID +create sequence SEQ_LOGINFO_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_126__LOGINFO_TBL.sql b/SQL/V0_0_126__LOGINFO_TBL.sql index 1839279..1869b38 100644 --- a/SQL/V0_0_126__LOGINFO_TBL.sql +++ b/SQL/V0_0_126__LOGINFO_TBL.sql @@ -1,4 +1,4 @@ -create table LOGINFO +create table LOGINFO ( DBID NUMBER(19) primary key not null, EQUIPMENT VARCHAR2(255 CHAR), diff --git a/SQL/V0_0_127__LOGINFO_TRI.sql b/SQL/V0_0_127__LOGINFO_TRI.sql index e03614e..3aef10e 100644 --- a/SQL/V0_0_127__LOGINFO_TRI.sql +++ b/SQL/V0_0_127__LOGINFO_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER loginfoit +create or replace TRIGGER loginfoit BEFORE INSERT ON loginfo FOR EACH ROW diff --git a/SQL/V0_0_129__POSITION_SEQ.sql b/SQL/V0_0_129__POSITION_SEQ.sql index c72c00a..873fb16 100644 --- a/SQL/V0_0_129__POSITION_SEQ.sql +++ b/SQL/V0_0_129__POSITION_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_POSITION_ID +create sequence SEQ_POSITION_ID minvalue 1 maxvalue 999999999999999999999999999 start with 100 diff --git a/SQL/V0_0_130__POSITION_TBL.sql b/SQL/V0_0_130__POSITION_TBL.sql index b217e67..43bc94e 100644 --- a/SQL/V0_0_130__POSITION_TBL.sql +++ b/SQL/V0_0_130__POSITION_TBL.sql @@ -1,4 +1,4 @@ -create table POSITION +create table POSITION ( DBID NUMBER(19) primary key not null, LATITUDE FLOAT, diff --git a/SQL/V0_0_131__POSITION_TRI.sql b/SQL/V0_0_131__POSITION_TRI.sql index e7f385b..c6a9282 100644 --- a/SQL/V0_0_131__POSITION_TRI.sql +++ b/SQL/V0_0_131__POSITION_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER positionit +create or replace TRIGGER positionit BEFORE INSERT ON position FOR EACH ROW diff --git a/SQL/V0_0_132__POSITION_DATA.sql b/SQL/V0_0_132__POSITION_DATA.sql index b84649d..6daa6fe 100644 --- a/SQL/V0_0_132__POSITION_DATA.sql +++ b/SQL/V0_0_132__POSITION_DATA.sql @@ -1,2 +1,2 @@ -insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) -values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '�ŷ�', 141, 2015120500); \ No newline at end of file +insert into position (DBID, LATITUDE, LONGITUDE, RECEIVETIME, USERNAME, PATROLER_ID, TASK_ID) +values (1, 31.1875, 120.61, to_date('08-11-2014 12:00:25', 'dd-mm-yyyy hh24:mi:ss'), '张帆', 141, 2015120500); \ No newline at end of file diff --git a/SQL/V0_0_133__MARK_TASK_SEQ.sql b/SQL/V0_0_133__MARK_TASK_SEQ.sql index 84ee20a..2fbb79d 100644 --- a/SQL/V0_0_133__MARK_TASK_SEQ.sql +++ b/SQL/V0_0_133__MARK_TASK_SEQ.sql @@ -1,4 +1,4 @@ -create sequence SEQ_MARK_TASK_ID +create sequence SEQ_MARK_TASK_ID minvalue 1 maxvalue 999999999999999999999999999 start with 10709 diff --git a/SQL/V0_0_134__MARK_TASK_TBL.sql b/SQL/V0_0_134__MARK_TASK_TBL.sql index 69e3bb8..26fa8be 100644 --- a/SQL/V0_0_134__MARK_TASK_TBL.sql +++ b/SQL/V0_0_134__MARK_TASK_TBL.sql @@ -1,4 +1,4 @@ -create table MARK_TASK +create table MARK_TASK ( DBID NUMBER(19) primary key not null, CHECKTIME TIMESTAMP(6), diff --git a/SQL/V0_0_135__MARK_TASK_TRI.sql b/SQL/V0_0_135__MARK_TASK_TRI.sql index 3112a86..bf32df7 100644 --- a/SQL/V0_0_135__MARK_TASK_TRI.sql +++ b/SQL/V0_0_135__MARK_TASK_TRI.sql @@ -1,4 +1,4 @@ -create or replace TRIGGER mark_taskit +create or replace TRIGGER mark_taskit BEFORE INSERT ON mark_task FOR EACH ROW diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git "a/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" new file mode 100644 index 0000000..79f9d60 --- /dev/null +++ "b/bin/x86/Debug/download/3_JavaScript_\346\217\222\344\273\266_\302\267_Bootstrap_\344\270\255\346\226\207\346\226\207\346\241\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" new file mode 100644 index 0000000..c30c9ee --- /dev/null +++ "b/bin/x86/Debug/download/\345\237\272\344\272\216GIS\347\232\204\345\272\224\346\200\245\351\242\204\346\241\210\350\277\207\347\250\213\345\212\250\346\200\201\346\216\250\346\274\224\346\250\241\346\213\237\346\212\200\346\234\257\347\240\224\347\251\266_\345\274\240\346\254\243.pdf" Binary files differ diff --git "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" new file mode 100644 index 0000000..a75b25d --- /dev/null +++ "b/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt index 257dbae..39e3019 100644 --- a/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt +++ b/obj/x86/Debug/Cyberpipe.csproj.FileListAbsolute.txt @@ -410,3 +410,209 @@ D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog D:\ym\EMS+GHFX\tmp\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe.config +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.csproj.ResolveComReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.exe +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\EMSCyberpipe.pdb +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.dll +D:\ym\EMS+GHFX\EMS_SZ\bin\x86\Debug\Microsoft.Office.Tools.Excel.v4.0.Utilities.xml +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\ResolveAssemblyReference.cache +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DZ_Forms.F_GKT1添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EditTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_EventResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_OnlineTask.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.EMS_Forms.Form_TaksManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDetail.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FormDocumentManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\PipeLine.Forms.FrmAddPipelineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGongShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmMnModify.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDB.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPipelineModelDataOneStep.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmShRK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmTongXunAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccess.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesgather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoryAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddFlagBatch.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddSinMark.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddValve.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddWellShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddYuBiZiShp.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllWorkWellStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAnalysisGuiHuaResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPP.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPAuditor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASK.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPFORASKReason.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAPPregion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSER.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAppUSERRESET.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBACKORACLE.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQDuoBianXingStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBSQStreet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysisBSQ.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmChangePassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCodingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareFeature.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCompareLayers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateUser.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCustomLabel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDataBaseOpt.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting2.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDbManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDocumentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDownloadProgress.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEquipmentManage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportCADS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagDatabase.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagEdits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlagManagers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlySetDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBasicQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBoosterValvers.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBufferAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDatabaseParaSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.DigFillAnalysisDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmBaseLineProfillAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmGenTopo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCloseValves.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDigPitSetting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFittingQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlow.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFlyToPosition.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFolderSelecter.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFTAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmGenAndFaMenTopu.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHotFuncStatTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmKeywordQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLayerControl.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.FrmLog.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogDescription.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogin.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLogOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMDDictory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadata.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataOutput.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMetadataStat.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOperMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPatrolerManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPerm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPermMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDeepstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeDiametergather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frmpipediameterstatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmpipeMaterialGather.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmPaiShuiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmProject.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Forms.FrmRanQiAttribute.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddPipeFitting.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAllPipelineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmDiameterQuery.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFWPipeLineStatis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRedlineResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleRescManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmShResult.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoManger.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSysUserInfoPassword.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserInfoRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValveStatistics.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMaterialSel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.frmPipeSetEdit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmProfileAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPropertiesMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmOper.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryHistory.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQueryMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySensorAlarm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegion.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRegionTypeMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESC.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRESCMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoadHDM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRole.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetGoalLayer.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmTackPolygonDlg.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmHDMAnalysis3.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmLineCoordinate.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmQuerySQL.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserAdd.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRepoMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmUserRoleMgr.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiData.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Frm_password_reset.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT1.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.GKT_Forms.F_GKT添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSfiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSinout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.HFS_Forms.Frm_HFSProjedits.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.Log.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.MainFrm.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCreateTunnel.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCitySevenLineType.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_AddField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmEditShapeFile_DeleteField.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmExportVector.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmFloodAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmCityServerLineAnalysis.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmMarker.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmPipelineIndented.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PAS_Forms.F_PASProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMFiles.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMInout.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMTitle.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PATM_Forms.F_PATMProjedit.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.PED_Forms.F_添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.Properties.Resources.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetLatLonPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSceneLightSet.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmSetFlytoPos.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAccessoriesSensor.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmValiDataShowErrorMessage.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.FrmAddInstrument.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles数据输入输出.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加文件.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SFiles_Forms.F_SFiles添加项目.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SysRescInfoManager.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\Cyberpipe.SystemFile.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMS.TaskInfo.resources +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.read.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\GenerateResource.write.1.tlog +D:\ym\EMS+GHFX\EMS_SZ\obj\x86\Debug\EMSCyberpipe.exe.licenses diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index accd5cd..7bb4bd0 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f19ebf3..a452283 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index ddedd0a..8e4597e 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 3288859..38ccbb3 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index c981018..08618ec 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/obj/x86/Debug/GenerateResource.write.1.tlog b/obj/x86/Debug/GenerateResource.write.1.tlog index 1db7541..64854f9 100644 --- a/obj/x86/Debug/GenerateResource.write.1.tlog +++ b/obj/x86/Debug/GenerateResource.write.1.tlog Binary files differ diff --git a/obj/x86/Debug/ResolveAssemblyReference.cache b/obj/x86/Debug/ResolveAssemblyReference.cache index dbb9e10..11581c4 100644 --- a/obj/x86/Debug/ResolveAssemblyReference.cache +++ b/obj/x86/Debug/ResolveAssemblyReference.cache Binary files differ