diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" "b/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" deleted file mode 100644 index 4682023..0000000 --- "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" "b/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" deleted file mode 100644 index 4682023..0000000 --- "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" "b/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" deleted file mode 100644 index 699bebe..0000000 --- "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" "b/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" deleted file mode 100644 index 4682023..0000000 --- "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" "b/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" deleted file mode 100644 index 699bebe..0000000 --- "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" +++ /dev/null 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" deleted file mode 100644 index c30c9ee..0000000 --- "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" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" "b/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" deleted file mode 100644 index 4682023..0000000 --- "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" "b/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" deleted file mode 100644 index 699bebe..0000000 --- "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" +++ /dev/null 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" deleted file mode 100644 index c30c9ee..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" "b/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" deleted file mode 100644 index 830e5f7..0000000 --- "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" "b/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" deleted file mode 100644 index 4682023..0000000 --- "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" "b/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" deleted file mode 100644 index 699bebe..0000000 --- "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" +++ /dev/null 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" deleted file mode 100644 index c30c9ee..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" "b/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" deleted file mode 100644 index 830e5f7..0000000 --- "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index 16d2d0f..0000000 --- "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" "b/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" deleted file mode 100644 index 4682023..0000000 --- "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" "b/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" deleted file mode 100644 index 699bebe..0000000 --- "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" +++ /dev/null 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" deleted file mode 100644 index c30c9ee..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" "b/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" deleted file mode 100644 index 830e5f7..0000000 --- "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index 16d2d0f..0000000 --- "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" "b/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" deleted file mode 100644 index 0806c0f..0000000 --- "a/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" "b/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" deleted file mode 100644 index 4682023..0000000 --- "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" "b/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" deleted file mode 100644 index 699bebe..0000000 --- "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" +++ /dev/null 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" deleted file mode 100644 index c30c9ee..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" "b/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" deleted file mode 100644 index 830e5f7..0000000 --- "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index 16d2d0f..0000000 --- "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" "b/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" deleted file mode 100644 index 0806c0f..0000000 --- "a/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\347\256\241\347\275\221\347\224\265\345\255\220\346\240\207\350\257\206\347\263\273\347\273\237\347\274\272\351\231\267\350\267\237\350\270\252\350\241\25020160517.xlsx" "b/bin/x86/Debug/download/\347\256\241\347\275\221\347\224\265\345\255\220\346\240\207\350\257\206\347\263\273\347\273\237\347\274\272\351\231\267\350\267\237\350\270\252\350\241\25020160517.xlsx" deleted file mode 100644 index c0441c1..0000000 --- "a/bin/x86/Debug/download/\347\256\241\347\275\221\347\224\265\345\255\220\346\240\207\350\257\206\347\263\273\347\273\237\347\274\272\351\231\267\350\267\237\350\270\252\350\241\25020160517.xlsx" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" "b/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" deleted file mode 100644 index 4682023..0000000 --- "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" "b/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" deleted file mode 100644 index 699bebe..0000000 --- "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" +++ /dev/null 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" deleted file mode 100644 index c30c9ee..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" "b/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" deleted file mode 100644 index 830e5f7..0000000 --- "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index 16d2d0f..0000000 --- "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" "b/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" deleted file mode 100644 index 0806c0f..0000000 --- "a/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\347\256\241\347\275\221\347\224\265\345\255\220\346\240\207\350\257\206\347\263\273\347\273\237\347\274\272\351\231\267\350\267\237\350\270\252\350\241\25020160517.xlsx" "b/bin/x86/Debug/download/\347\256\241\347\275\221\347\224\265\345\255\220\346\240\207\350\257\206\347\263\273\347\273\237\347\274\272\351\231\267\350\267\237\350\270\252\350\241\25020160517.xlsx" deleted file mode 100644 index c0441c1..0000000 --- "a/bin/x86/Debug/download/\347\256\241\347\275\221\347\224\265\345\255\220\346\240\207\350\257\206\347\263\273\347\273\237\347\274\272\351\231\267\350\267\237\350\270\252\350\241\25020160517.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\351\233\250\346\261\241\346\260\264.zip" "b/bin/x86/Debug/download/\351\233\250\346\261\241\346\260\264.zip" deleted file mode 100644 index df73bad..0000000 --- "a/bin/x86/Debug/download/\351\233\250\346\261\241\346\260\264.zip" +++ /dev/null Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 818e401..9abb1ee 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index a7d021a..69c4e7e 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -443,16 +443,9 @@ DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; try { - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - }); + string filename = row.Cells["文档名称"].Value.ToString(); 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 9ab0f58..ddf2a51 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = false; + nodelayerchild.Checked = true; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = false; + nodelayerchild1.Checked = true; 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 bf50024..7bf2a72 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 1ef9c69..487c4e9 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 daffa46..2fd9bd9 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 3557a6a..ad32862 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 0c03c0c..5112bdf 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 9bbe64b..2dc55d1 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 8946534..b1550fa 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 cb87ae9..f0dfcfe 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 dae4fed..3166fe2 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 5aa1fd6..e838f61 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 (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '男', '李四', null); +values (10080, 'OFFLINE', '20', '96e79218965eb72c92a549dd5a330112', '18510774864', '��', '�', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '13465457682', '男', '杨孟', null); +values (161, 'OFFLINE', '33', '2be9bd7a3434f7038ca27d1918de58bd', '13465457682', '��', '����', null); insert into patroler (DBID, ACCOUNTSTATE, AGE, PASSWORD, PHONENUM, SEX, USERNAME, REGION_ID) -values (141, 'ONLINE', '23', '96e79218965eb72c92a549dd5a330112', '13465457682', '男', '张帆', null); +values (201, 'OFFLINE', '32', '202cb962ac59075b964b07152d234b70', '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 (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 diff --git a/SQL/V0_0_113__EQUIPMENT_SEQ.sql b/SQL/V0_0_113__EQUIPMENT_SEQ.sql index e0566f8..a70e3bd 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 6dd8b3f..25ed14d 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 fc6e407..e297c1d 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 10f1d0f..59815d7 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 dda50d2..38f0cd3 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 0630014..05518f4 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 09bc04e..8eaa51c 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 db5851d..32e6767 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 a120273..ec3bf1e 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 64101f5..5204822 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 1869b38..1839279 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 3aef10e..e03614e 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 873fb16..c72c00a 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 43bc94e..b217e67 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 c6a9282..e7f385b 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 6daa6fe..b84649d 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 2fbb79d..84ee20a 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 26fa8be..69e3bb8 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 bf32df7..3112a86 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/download/11.xls b/bin/x86/Debug/download/11.xls deleted file mode 100644 index 8b933a0..0000000 --- a/bin/x86/Debug/download/11.xls +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index a7f23e9..0000000 --- "a/bin/x86/Debug/download/2016.5.5\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160113122316.xlsx b/bin/x86/Debug/download/20160113122316.xlsx deleted file mode 100644 index 099fa16..0000000 --- a/bin/x86/Debug/download/20160113122316.xlsx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160114093211.dwg b/bin/x86/Debug/download/20160114093211.dwg deleted file mode 100644 index 55c0330..0000000 --- a/bin/x86/Debug/download/20160114093211.dwg +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160120142014.docx b/bin/x86/Debug/download/20160120142014.docx deleted file mode 100644 index c2e5bbe..0000000 --- a/bin/x86/Debug/download/20160120142014.docx +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160307112156.doc b/bin/x86/Debug/download/20160307112156.doc deleted file mode 100644 index c7587b1..0000000 --- a/bin/x86/Debug/download/20160307112156.doc +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/download/20160309114124.txt b/bin/x86/Debug/download/20160309114124.txt deleted file mode 100644 index 3e3d93e..0000000 --- a/bin/x86/Debug/download/20160309114124.txt +++ /dev/null @@ -1,20 +0,0 @@ - -JS_S3_001 :GX_JSL_3000_EY_572 :GX_JSL_3000_EY_431 - -JS_S3_002 :GX_JSL_3000_EY_576 :GX_JSL_3000_EY_433 :GX_JSL_3000_EY_578 - -JS_S3_003 :GX_JSL_3000_EY_459 :GX_JSL_3000_EY_619 :GX_JSL_3000_EY_620 - -JS_S3_004 :GX_JSL_3000_EY_599 :GX_JSL_3000_EY_452 - -JS_S3_005 :GX_JSL_3000_EY_454,GX_JSL_3000_EY_453,GX_JSL_3000_EY_602 :GX_JSL_3000_EY_605 - -JS_S3_006 :GX_JSL_3000_EY_639 :GX_JSL_3000_EY_465 :GX_JSL_3000_EY_638,GX_JSL_3000_EY_640 - -JS_S3_007 :GX_JSL_3000_EY_471,GX_JSL_3000_EY_472 :GX_JSL_3000_EY_654 - -JS_S3_008 :GX_JSL_3000_EY_450 :GX_JSL_3000_EY_632 :GX_JSL_3000_EY_598 - -JS_S3_009 :GX_JSL_3000_EY_647,GX_JSL_3000_EY_1333 :GX_JSL_3000_EY_1332 :GX_JSL_3000_EY_1326,GX_JSL_3000_EY_1327 - -JS_S3_010 :GX_JSL_3000_EY_1314 :GX_JSL_3000_EY_1271 :GX_JSL_3000_EY_1315,GX_JSL_3000_EY_1269 \ No newline at end of file diff --git a/bin/x86/Debug/download/20160425144007.docx b/bin/x86/Debug/download/20160425144007.docx deleted file mode 100644 index 1280557..0000000 --- a/bin/x86/Debug/download/20160425144007.docx +++ /dev/null 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" deleted file mode 100644 index 79f9d60..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" "b/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" deleted file mode 100644 index 0195a95..0000000 --- "a/bin/x86/Debug/download/JSP\346\225\231\347\250\213.pdf" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" "b/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" deleted file mode 100644 index 4682023..0000000 --- "a/bin/x86/Debug/download/\344\272\214\351\231\242\346\225\264\344\275\223GEO\344\277\241\346\201\257\350\241\250pad\347\211\210.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" "b/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" deleted file mode 100644 index 699bebe..0000000 --- "a/bin/x86/Debug/download/\345\233\233\345\267\235\347\234\201\345\234\260\344\270\213\347\256\241\347\272\277\347\233\221\347\235\243\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237\350\256\276\350\256\241.docx" +++ /dev/null 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" deleted file mode 100644 index c30c9ee..0000000 --- "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" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" "b/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" deleted file mode 100644 index 830e5f7..0000000 --- "a/bin/x86/Debug/download/\345\267\245\345\215\225\347\232\204\345\207\240\347\247\215\347\212\266\346\200\201\345\217\212\350\257\264\346\230\216.doc" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" "b/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" deleted file mode 100644 index 16d2d0f..0000000 --- "a/bin/x86/Debug/download/\345\276\267\345\267\236\350\275\257\344\273\266\351\234\200\346\261\202\350\256\276\350\256\241\350\257\204\345\256\241\344\274\232\350\256\256\347\272\252\350\246\201.docx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" "b/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" deleted file mode 100644 index 0806c0f..0000000 --- "a/bin/x86/Debug/download/\347\224\265\345\255\220\346\240\207\350\257\206\350\256\276\350\256\241\346\226\275\345\267\245\345\217\212\346\225\260\346\215\256\350\247\204\350\214\203V1.5.doc" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\347\256\241\347\275\221\347\224\265\345\255\220\346\240\207\350\257\206\347\263\273\347\273\237\347\274\272\351\231\267\350\267\237\350\270\252\350\241\25020160517.xlsx" "b/bin/x86/Debug/download/\347\256\241\347\275\221\347\224\265\345\255\220\346\240\207\350\257\206\347\263\273\347\273\237\347\274\272\351\231\267\350\267\237\350\270\252\350\241\25020160517.xlsx" deleted file mode 100644 index c0441c1..0000000 --- "a/bin/x86/Debug/download/\347\256\241\347\275\221\347\224\265\345\255\220\346\240\207\350\257\206\347\263\273\347\273\237\347\274\272\351\231\267\350\267\237\350\270\252\350\241\25020160517.xlsx" +++ /dev/null Binary files differ diff --git "a/bin/x86/Debug/download/\351\233\250\346\261\241\346\260\264.zip" "b/bin/x86/Debug/download/\351\233\250\346\261\241\346\260\264.zip" deleted file mode 100644 index df73bad..0000000 --- "a/bin/x86/Debug/download/\351\233\250\346\261\241\346\260\264.zip" +++ /dev/null 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" deleted file mode 100644 index a75b25d..0000000 --- "a/bin/x86/Debug/download/\351\234\200\350\246\201\347\232\204\346\225\260\346\215\256.docx" +++ /dev/null Binary files differ