diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8233158..8689543 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -42,7 +42,7 @@ this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - winGridViewPager1.dataGridView1.MultiSelect = false; + winGridViewPager1.dataGridView1.MultiSelect = false; } static FormDocumentManager frm; @@ -53,7 +53,7 @@ frm = new FormDocumentManager(); frm.waitpicBox.Show(); frm.Show(); - + } else { @@ -105,7 +105,7 @@ winGridViewPager1.PagerInfo.PageSize = maxPageIndex; winGridViewPager1.dataGridView1.Refresh(); //winGridViewPager1.Controls.RemoveAt(1); - }); + }); } /// /// 页面刷新 @@ -228,7 +228,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; @@ -289,7 +289,7 @@ static readonly object lockHelp = new object(); - + /// /// 下载远程文件，并显示进度条 /// 如果本地存在相同文件，且文件未在使用，则删除后进行下载 @@ -298,81 +298,81 @@ /// public int DownloadFile(string URL, string filename, ProgressBar prog) { - // lock (lockHelp) - // { - string vFileName = @filename; - if (File.Exists(vFileName)) - {//文件存在 - IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); - if (vHandle == HFILE_ERROR) - {//文件被占用，说明已经有点击，返回即可 - CloseHandle(vHandle); - return 1; - } - else + // lock (lockHelp) + // { + string vFileName = @filename; + if (File.Exists(vFileName)) + {//文件存在 + IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); + if (vHandle == HFILE_ERROR) + {//文件被占用，说明已经有点击，返回即可 + CloseHandle(vHandle); + return 1; + } + else + { + //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 + CloseHandle(vHandle); + File.Delete(vFileName); + } + + } + float percent = 0; + try + { + System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); + //Myrq.Timeout = 10000; + System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + long totalBytes = myrp.ContentLength; + + if (prog != null) + { + this.Invoke((EventHandler)delegate { - //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 - CloseHandle(vHandle); - File.Delete(vFileName); - } + prog.Maximum = (int)totalBytes; + }); } - float percent = 0; - try - { - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); - //Myrq.Timeout = 10000; - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; + System.IO.Stream st = myrp.GetResponseStream(); + System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); + long totalDownloadedByte = 0; + byte[] by = new byte[1024]; + int osize = st.Read(by, 0, (int)by.Length); + while (osize > 0) + { + totalDownloadedByte = osize + totalDownloadedByte; + System.Windows.Forms.Application.DoEvents(); + so.Write(by, 0, osize); if (prog != null) { this.Invoke((EventHandler)delegate { - prog.Maximum = (int)totalBytes; + prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; }); } + osize = st.Read(by, 0, (int)by.Length); - System.IO.Stream st = myrp.GetResponseStream(); - System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); - long totalDownloadedByte = 0; - byte[] by = new byte[1024]; - int osize = st.Read(by, 0, (int)by.Length); - while (osize > 0) - { - totalDownloadedByte = osize + totalDownloadedByte; - System.Windows.Forms.Application.DoEvents(); - so.Write(by, 0, osize); - if (prog != null) - { - this.Invoke((EventHandler)delegate - { - prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; - }); - - } - osize = st.Read(by, 0, (int)by.Length); - - percent = (float)totalDownloadedByte / (float)totalBytes * 100; - System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 - } - so.Close(); - st.Close(); + percent = (float)totalDownloadedByte / (float)totalBytes * 100; + System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 } - catch (System.Net.WebException e) - { + so.Close(); + st.Close(); + } + catch (System.Net.WebException e) + { - return 3; - } - catch (System.Exception e) - { - return 2; - } - return 0; - - // } - + return 3; + } + catch (System.Exception e) + { + return 2; + } + return 0; + + // } + } private void FormDocumentManager_Load(object sender, EventArgs e) @@ -383,8 +383,8 @@ dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); loadThread.IsBackground = true; - loadThread.Start(); - + loadThread.Start(); + } private void doFormLoad() @@ -395,9 +395,10 @@ { using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - this.Invoke((EventHandler)delegate { + this.Invoke((EventHandler)delegate + { combo_writer.Items.Add(""); - }); + }); while (reader.Read()) { this.Invoke((EventHandler)delegate @@ -409,7 +410,7 @@ } catch (Exception) { - MessageBox.Show("数据库访问异常","错误"); + MessageBox.Show("数据库访问异常", "错误"); } this.Invoke((EventHandler)delegate @@ -461,7 +462,7 @@ //Myrq.Timeout = 10000; System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); long totalBytes = myrp.ContentLength; - if (totalBytes>50*1024*1024) + if (totalBytes > 50 * 1024 * 1024) { MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); return; @@ -476,7 +477,7 @@ MessageBox.Show(filename + "预览操作失败", "通知"); return; } - + this.Invoke((EventHandler)delegate { //progressBar1.Visible = false; @@ -488,7 +489,7 @@ excelDocumentControl.Visible = false; pdfDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".xls": @@ -504,7 +505,7 @@ wordDocumentControl.Visible = false; excelDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".jpg": @@ -523,7 +524,7 @@ } }); - + } } @@ -596,4 +597,4 @@ } } -} +} \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8233158..8689543 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -42,7 +42,7 @@ this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - winGridViewPager1.dataGridView1.MultiSelect = false; + winGridViewPager1.dataGridView1.MultiSelect = false; } static FormDocumentManager frm; @@ -53,7 +53,7 @@ frm = new FormDocumentManager(); frm.waitpicBox.Show(); frm.Show(); - + } else { @@ -105,7 +105,7 @@ winGridViewPager1.PagerInfo.PageSize = maxPageIndex; winGridViewPager1.dataGridView1.Refresh(); //winGridViewPager1.Controls.RemoveAt(1); - }); + }); } /// /// 页面刷新 @@ -228,7 +228,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; @@ -289,7 +289,7 @@ static readonly object lockHelp = new object(); - + /// /// 下载远程文件，并显示进度条 /// 如果本地存在相同文件，且文件未在使用，则删除后进行下载 @@ -298,81 +298,81 @@ /// public int DownloadFile(string URL, string filename, ProgressBar prog) { - // lock (lockHelp) - // { - string vFileName = @filename; - if (File.Exists(vFileName)) - {//文件存在 - IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); - if (vHandle == HFILE_ERROR) - {//文件被占用，说明已经有点击，返回即可 - CloseHandle(vHandle); - return 1; - } - else + // lock (lockHelp) + // { + string vFileName = @filename; + if (File.Exists(vFileName)) + {//文件存在 + IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); + if (vHandle == HFILE_ERROR) + {//文件被占用，说明已经有点击，返回即可 + CloseHandle(vHandle); + return 1; + } + else + { + //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 + CloseHandle(vHandle); + File.Delete(vFileName); + } + + } + float percent = 0; + try + { + System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); + //Myrq.Timeout = 10000; + System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + long totalBytes = myrp.ContentLength; + + if (prog != null) + { + this.Invoke((EventHandler)delegate { - //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 - CloseHandle(vHandle); - File.Delete(vFileName); - } + prog.Maximum = (int)totalBytes; + }); } - float percent = 0; - try - { - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); - //Myrq.Timeout = 10000; - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; + System.IO.Stream st = myrp.GetResponseStream(); + System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); + long totalDownloadedByte = 0; + byte[] by = new byte[1024]; + int osize = st.Read(by, 0, (int)by.Length); + while (osize > 0) + { + totalDownloadedByte = osize + totalDownloadedByte; + System.Windows.Forms.Application.DoEvents(); + so.Write(by, 0, osize); if (prog != null) { this.Invoke((EventHandler)delegate { - prog.Maximum = (int)totalBytes; + prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; }); } + osize = st.Read(by, 0, (int)by.Length); - System.IO.Stream st = myrp.GetResponseStream(); - System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); - long totalDownloadedByte = 0; - byte[] by = new byte[1024]; - int osize = st.Read(by, 0, (int)by.Length); - while (osize > 0) - { - totalDownloadedByte = osize + totalDownloadedByte; - System.Windows.Forms.Application.DoEvents(); - so.Write(by, 0, osize); - if (prog != null) - { - this.Invoke((EventHandler)delegate - { - prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; - }); - - } - osize = st.Read(by, 0, (int)by.Length); - - percent = (float)totalDownloadedByte / (float)totalBytes * 100; - System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 - } - so.Close(); - st.Close(); + percent = (float)totalDownloadedByte / (float)totalBytes * 100; + System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 } - catch (System.Net.WebException e) - { + so.Close(); + st.Close(); + } + catch (System.Net.WebException e) + { - return 3; - } - catch (System.Exception e) - { - return 2; - } - return 0; - - // } - + return 3; + } + catch (System.Exception e) + { + return 2; + } + return 0; + + // } + } private void FormDocumentManager_Load(object sender, EventArgs e) @@ -383,8 +383,8 @@ dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); loadThread.IsBackground = true; - loadThread.Start(); - + loadThread.Start(); + } private void doFormLoad() @@ -395,9 +395,10 @@ { using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - this.Invoke((EventHandler)delegate { + this.Invoke((EventHandler)delegate + { combo_writer.Items.Add(""); - }); + }); while (reader.Read()) { this.Invoke((EventHandler)delegate @@ -409,7 +410,7 @@ } catch (Exception) { - MessageBox.Show("数据库访问异常","错误"); + MessageBox.Show("数据库访问异常", "错误"); } this.Invoke((EventHandler)delegate @@ -461,7 +462,7 @@ //Myrq.Timeout = 10000; System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); long totalBytes = myrp.ContentLength; - if (totalBytes>50*1024*1024) + if (totalBytes > 50 * 1024 * 1024) { MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); return; @@ -476,7 +477,7 @@ MessageBox.Show(filename + "预览操作失败", "通知"); return; } - + this.Invoke((EventHandler)delegate { //progressBar1.Visible = false; @@ -488,7 +489,7 @@ excelDocumentControl.Visible = false; pdfDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".xls": @@ -504,7 +505,7 @@ wordDocumentControl.Visible = false; excelDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".jpg": @@ -523,7 +524,7 @@ } }); - + } } @@ -596,4 +597,4 @@ } } -} +} \ No newline at end of file diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index a3cf55c..2225d01 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -149,7 +149,8 @@ long dbid = long.Parse(row.Cells["编号"].Value.ToString()); String macId = row.Cells["MAC地址"].Value.ToString(); String username = row.Cells["设备所有人"].Value.ToString(); - String descn = row.Cells["设备状态"].Value.ToString(); + // String descn = row.Cells["设备状态"].Value.ToString(); + String descn = row.Cells["设备描述"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8233158..8689543 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -42,7 +42,7 @@ this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - winGridViewPager1.dataGridView1.MultiSelect = false; + winGridViewPager1.dataGridView1.MultiSelect = false; } static FormDocumentManager frm; @@ -53,7 +53,7 @@ frm = new FormDocumentManager(); frm.waitpicBox.Show(); frm.Show(); - + } else { @@ -105,7 +105,7 @@ winGridViewPager1.PagerInfo.PageSize = maxPageIndex; winGridViewPager1.dataGridView1.Refresh(); //winGridViewPager1.Controls.RemoveAt(1); - }); + }); } /// /// 页面刷新 @@ -228,7 +228,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; @@ -289,7 +289,7 @@ static readonly object lockHelp = new object(); - + /// /// 下载远程文件，并显示进度条 /// 如果本地存在相同文件，且文件未在使用，则删除后进行下载 @@ -298,81 +298,81 @@ /// public int DownloadFile(string URL, string filename, ProgressBar prog) { - // lock (lockHelp) - // { - string vFileName = @filename; - if (File.Exists(vFileName)) - {//文件存在 - IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); - if (vHandle == HFILE_ERROR) - {//文件被占用，说明已经有点击，返回即可 - CloseHandle(vHandle); - return 1; - } - else + // lock (lockHelp) + // { + string vFileName = @filename; + if (File.Exists(vFileName)) + {//文件存在 + IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); + if (vHandle == HFILE_ERROR) + {//文件被占用，说明已经有点击，返回即可 + CloseHandle(vHandle); + return 1; + } + else + { + //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 + CloseHandle(vHandle); + File.Delete(vFileName); + } + + } + float percent = 0; + try + { + System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); + //Myrq.Timeout = 10000; + System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + long totalBytes = myrp.ContentLength; + + if (prog != null) + { + this.Invoke((EventHandler)delegate { - //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 - CloseHandle(vHandle); - File.Delete(vFileName); - } + prog.Maximum = (int)totalBytes; + }); } - float percent = 0; - try - { - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); - //Myrq.Timeout = 10000; - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; + System.IO.Stream st = myrp.GetResponseStream(); + System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); + long totalDownloadedByte = 0; + byte[] by = new byte[1024]; + int osize = st.Read(by, 0, (int)by.Length); + while (osize > 0) + { + totalDownloadedByte = osize + totalDownloadedByte; + System.Windows.Forms.Application.DoEvents(); + so.Write(by, 0, osize); if (prog != null) { this.Invoke((EventHandler)delegate { - prog.Maximum = (int)totalBytes; + prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; }); } + osize = st.Read(by, 0, (int)by.Length); - System.IO.Stream st = myrp.GetResponseStream(); - System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); - long totalDownloadedByte = 0; - byte[] by = new byte[1024]; - int osize = st.Read(by, 0, (int)by.Length); - while (osize > 0) - { - totalDownloadedByte = osize + totalDownloadedByte; - System.Windows.Forms.Application.DoEvents(); - so.Write(by, 0, osize); - if (prog != null) - { - this.Invoke((EventHandler)delegate - { - prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; - }); - - } - osize = st.Read(by, 0, (int)by.Length); - - percent = (float)totalDownloadedByte / (float)totalBytes * 100; - System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 - } - so.Close(); - st.Close(); + percent = (float)totalDownloadedByte / (float)totalBytes * 100; + System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 } - catch (System.Net.WebException e) - { + so.Close(); + st.Close(); + } + catch (System.Net.WebException e) + { - return 3; - } - catch (System.Exception e) - { - return 2; - } - return 0; - - // } - + return 3; + } + catch (System.Exception e) + { + return 2; + } + return 0; + + // } + } private void FormDocumentManager_Load(object sender, EventArgs e) @@ -383,8 +383,8 @@ dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); loadThread.IsBackground = true; - loadThread.Start(); - + loadThread.Start(); + } private void doFormLoad() @@ -395,9 +395,10 @@ { using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - this.Invoke((EventHandler)delegate { + this.Invoke((EventHandler)delegate + { combo_writer.Items.Add(""); - }); + }); while (reader.Read()) { this.Invoke((EventHandler)delegate @@ -409,7 +410,7 @@ } catch (Exception) { - MessageBox.Show("数据库访问异常","错误"); + MessageBox.Show("数据库访问异常", "错误"); } this.Invoke((EventHandler)delegate @@ -461,7 +462,7 @@ //Myrq.Timeout = 10000; System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); long totalBytes = myrp.ContentLength; - if (totalBytes>50*1024*1024) + if (totalBytes > 50 * 1024 * 1024) { MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); return; @@ -476,7 +477,7 @@ MessageBox.Show(filename + "预览操作失败", "通知"); return; } - + this.Invoke((EventHandler)delegate { //progressBar1.Visible = false; @@ -488,7 +489,7 @@ excelDocumentControl.Visible = false; pdfDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".xls": @@ -504,7 +505,7 @@ wordDocumentControl.Visible = false; excelDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".jpg": @@ -523,7 +524,7 @@ } }); - + } } @@ -596,4 +597,4 @@ } } -} +} \ No newline at end of file diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index a3cf55c..2225d01 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -149,7 +149,8 @@ long dbid = long.Parse(row.Cells["编号"].Value.ToString()); String macId = row.Cells["MAC地址"].Value.ToString(); String username = row.Cells["设备所有人"].Value.ToString(); - String descn = row.Cells["设备状态"].Value.ToString(); + // String descn = row.Cells["设备状态"].Value.ToString(); + String descn = row.Cells["设备描述"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 6f11a43..f83fb7a 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -366,6 +365,17 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); @@ -379,17 +389,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -611,6 +610,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,10 +647,10 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -1047,16 +1047,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4124,10 +4114,10 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4170,6 +4160,198 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_device + // + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); + // + // btn_Person + // + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); + // + // btn_constructMap + // + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); + // + // buttonItem9 + // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4195,6 +4377,7 @@ this.ribbonPanel7.StyleMouseOver.Class = ""; this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // // ribbonBar5 // @@ -4377,199 +4560,6 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6093,6 +6083,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6103,7 +6094,6 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover1; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_041; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -6425,6 +6415,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6498,10 +6498,10 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8233158..8689543 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -42,7 +42,7 @@ this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - winGridViewPager1.dataGridView1.MultiSelect = false; + winGridViewPager1.dataGridView1.MultiSelect = false; } static FormDocumentManager frm; @@ -53,7 +53,7 @@ frm = new FormDocumentManager(); frm.waitpicBox.Show(); frm.Show(); - + } else { @@ -105,7 +105,7 @@ winGridViewPager1.PagerInfo.PageSize = maxPageIndex; winGridViewPager1.dataGridView1.Refresh(); //winGridViewPager1.Controls.RemoveAt(1); - }); + }); } /// /// 页面刷新 @@ -228,7 +228,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; @@ -289,7 +289,7 @@ static readonly object lockHelp = new object(); - + /// /// 下载远程文件，并显示进度条 /// 如果本地存在相同文件，且文件未在使用，则删除后进行下载 @@ -298,81 +298,81 @@ /// public int DownloadFile(string URL, string filename, ProgressBar prog) { - // lock (lockHelp) - // { - string vFileName = @filename; - if (File.Exists(vFileName)) - {//文件存在 - IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); - if (vHandle == HFILE_ERROR) - {//文件被占用，说明已经有点击，返回即可 - CloseHandle(vHandle); - return 1; - } - else + // lock (lockHelp) + // { + string vFileName = @filename; + if (File.Exists(vFileName)) + {//文件存在 + IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); + if (vHandle == HFILE_ERROR) + {//文件被占用，说明已经有点击，返回即可 + CloseHandle(vHandle); + return 1; + } + else + { + //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 + CloseHandle(vHandle); + File.Delete(vFileName); + } + + } + float percent = 0; + try + { + System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); + //Myrq.Timeout = 10000; + System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + long totalBytes = myrp.ContentLength; + + if (prog != null) + { + this.Invoke((EventHandler)delegate { - //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 - CloseHandle(vHandle); - File.Delete(vFileName); - } + prog.Maximum = (int)totalBytes; + }); } - float percent = 0; - try - { - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); - //Myrq.Timeout = 10000; - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; + System.IO.Stream st = myrp.GetResponseStream(); + System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); + long totalDownloadedByte = 0; + byte[] by = new byte[1024]; + int osize = st.Read(by, 0, (int)by.Length); + while (osize > 0) + { + totalDownloadedByte = osize + totalDownloadedByte; + System.Windows.Forms.Application.DoEvents(); + so.Write(by, 0, osize); if (prog != null) { this.Invoke((EventHandler)delegate { - prog.Maximum = (int)totalBytes; + prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; }); } + osize = st.Read(by, 0, (int)by.Length); - System.IO.Stream st = myrp.GetResponseStream(); - System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); - long totalDownloadedByte = 0; - byte[] by = new byte[1024]; - int osize = st.Read(by, 0, (int)by.Length); - while (osize > 0) - { - totalDownloadedByte = osize + totalDownloadedByte; - System.Windows.Forms.Application.DoEvents(); - so.Write(by, 0, osize); - if (prog != null) - { - this.Invoke((EventHandler)delegate - { - prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; - }); - - } - osize = st.Read(by, 0, (int)by.Length); - - percent = (float)totalDownloadedByte / (float)totalBytes * 100; - System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 - } - so.Close(); - st.Close(); + percent = (float)totalDownloadedByte / (float)totalBytes * 100; + System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 } - catch (System.Net.WebException e) - { + so.Close(); + st.Close(); + } + catch (System.Net.WebException e) + { - return 3; - } - catch (System.Exception e) - { - return 2; - } - return 0; - - // } - + return 3; + } + catch (System.Exception e) + { + return 2; + } + return 0; + + // } + } private void FormDocumentManager_Load(object sender, EventArgs e) @@ -383,8 +383,8 @@ dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); loadThread.IsBackground = true; - loadThread.Start(); - + loadThread.Start(); + } private void doFormLoad() @@ -395,9 +395,10 @@ { using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - this.Invoke((EventHandler)delegate { + this.Invoke((EventHandler)delegate + { combo_writer.Items.Add(""); - }); + }); while (reader.Read()) { this.Invoke((EventHandler)delegate @@ -409,7 +410,7 @@ } catch (Exception) { - MessageBox.Show("数据库访问异常","错误"); + MessageBox.Show("数据库访问异常", "错误"); } this.Invoke((EventHandler)delegate @@ -461,7 +462,7 @@ //Myrq.Timeout = 10000; System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); long totalBytes = myrp.ContentLength; - if (totalBytes>50*1024*1024) + if (totalBytes > 50 * 1024 * 1024) { MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); return; @@ -476,7 +477,7 @@ MessageBox.Show(filename + "预览操作失败", "通知"); return; } - + this.Invoke((EventHandler)delegate { //progressBar1.Visible = false; @@ -488,7 +489,7 @@ excelDocumentControl.Visible = false; pdfDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".xls": @@ -504,7 +505,7 @@ wordDocumentControl.Visible = false; excelDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".jpg": @@ -523,7 +524,7 @@ } }); - + } } @@ -596,4 +597,4 @@ } } -} +} \ No newline at end of file diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index a3cf55c..2225d01 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -149,7 +149,8 @@ long dbid = long.Parse(row.Cells["编号"].Value.ToString()); String macId = row.Cells["MAC地址"].Value.ToString(); String username = row.Cells["设备所有人"].Value.ToString(); - String descn = row.Cells["设备状态"].Value.ToString(); + // String descn = row.Cells["设备状态"].Value.ToString(); + String descn = row.Cells["设备描述"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 6f11a43..f83fb7a 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -366,6 +365,17 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); @@ -379,17 +389,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -611,6 +610,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,10 +647,10 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -1047,16 +1047,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4124,10 +4114,10 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4170,6 +4160,198 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_device + // + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); + // + // btn_Person + // + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); + // + // btn_constructMap + // + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); + // + // buttonItem9 + // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4195,6 +4377,7 @@ this.ribbonPanel7.StyleMouseOver.Class = ""; this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // // ribbonBar5 // @@ -4377,199 +4560,6 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6093,6 +6083,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6103,7 +6094,6 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover1; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_041; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -6425,6 +6415,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6498,10 +6498,10 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/MainFrm.resx b/MainFrm.resx index 1a0c130..3734419 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 142 + 50 diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8233158..8689543 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -42,7 +42,7 @@ this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - winGridViewPager1.dataGridView1.MultiSelect = false; + winGridViewPager1.dataGridView1.MultiSelect = false; } static FormDocumentManager frm; @@ -53,7 +53,7 @@ frm = new FormDocumentManager(); frm.waitpicBox.Show(); frm.Show(); - + } else { @@ -105,7 +105,7 @@ winGridViewPager1.PagerInfo.PageSize = maxPageIndex; winGridViewPager1.dataGridView1.Refresh(); //winGridViewPager1.Controls.RemoveAt(1); - }); + }); } /// /// 页面刷新 @@ -228,7 +228,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; @@ -289,7 +289,7 @@ static readonly object lockHelp = new object(); - + /// /// 下载远程文件，并显示进度条 /// 如果本地存在相同文件，且文件未在使用，则删除后进行下载 @@ -298,81 +298,81 @@ /// public int DownloadFile(string URL, string filename, ProgressBar prog) { - // lock (lockHelp) - // { - string vFileName = @filename; - if (File.Exists(vFileName)) - {//文件存在 - IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); - if (vHandle == HFILE_ERROR) - {//文件被占用，说明已经有点击，返回即可 - CloseHandle(vHandle); - return 1; - } - else + // lock (lockHelp) + // { + string vFileName = @filename; + if (File.Exists(vFileName)) + {//文件存在 + IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); + if (vHandle == HFILE_ERROR) + {//文件被占用，说明已经有点击，返回即可 + CloseHandle(vHandle); + return 1; + } + else + { + //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 + CloseHandle(vHandle); + File.Delete(vFileName); + } + + } + float percent = 0; + try + { + System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); + //Myrq.Timeout = 10000; + System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + long totalBytes = myrp.ContentLength; + + if (prog != null) + { + this.Invoke((EventHandler)delegate { - //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 - CloseHandle(vHandle); - File.Delete(vFileName); - } + prog.Maximum = (int)totalBytes; + }); } - float percent = 0; - try - { - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); - //Myrq.Timeout = 10000; - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; + System.IO.Stream st = myrp.GetResponseStream(); + System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); + long totalDownloadedByte = 0; + byte[] by = new byte[1024]; + int osize = st.Read(by, 0, (int)by.Length); + while (osize > 0) + { + totalDownloadedByte = osize + totalDownloadedByte; + System.Windows.Forms.Application.DoEvents(); + so.Write(by, 0, osize); if (prog != null) { this.Invoke((EventHandler)delegate { - prog.Maximum = (int)totalBytes; + prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; }); } + osize = st.Read(by, 0, (int)by.Length); - System.IO.Stream st = myrp.GetResponseStream(); - System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); - long totalDownloadedByte = 0; - byte[] by = new byte[1024]; - int osize = st.Read(by, 0, (int)by.Length); - while (osize > 0) - { - totalDownloadedByte = osize + totalDownloadedByte; - System.Windows.Forms.Application.DoEvents(); - so.Write(by, 0, osize); - if (prog != null) - { - this.Invoke((EventHandler)delegate - { - prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; - }); - - } - osize = st.Read(by, 0, (int)by.Length); - - percent = (float)totalDownloadedByte / (float)totalBytes * 100; - System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 - } - so.Close(); - st.Close(); + percent = (float)totalDownloadedByte / (float)totalBytes * 100; + System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 } - catch (System.Net.WebException e) - { + so.Close(); + st.Close(); + } + catch (System.Net.WebException e) + { - return 3; - } - catch (System.Exception e) - { - return 2; - } - return 0; - - // } - + return 3; + } + catch (System.Exception e) + { + return 2; + } + return 0; + + // } + } private void FormDocumentManager_Load(object sender, EventArgs e) @@ -383,8 +383,8 @@ dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); loadThread.IsBackground = true; - loadThread.Start(); - + loadThread.Start(); + } private void doFormLoad() @@ -395,9 +395,10 @@ { using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - this.Invoke((EventHandler)delegate { + this.Invoke((EventHandler)delegate + { combo_writer.Items.Add(""); - }); + }); while (reader.Read()) { this.Invoke((EventHandler)delegate @@ -409,7 +410,7 @@ } catch (Exception) { - MessageBox.Show("数据库访问异常","错误"); + MessageBox.Show("数据库访问异常", "错误"); } this.Invoke((EventHandler)delegate @@ -461,7 +462,7 @@ //Myrq.Timeout = 10000; System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); long totalBytes = myrp.ContentLength; - if (totalBytes>50*1024*1024) + if (totalBytes > 50 * 1024 * 1024) { MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); return; @@ -476,7 +477,7 @@ MessageBox.Show(filename + "预览操作失败", "通知"); return; } - + this.Invoke((EventHandler)delegate { //progressBar1.Visible = false; @@ -488,7 +489,7 @@ excelDocumentControl.Visible = false; pdfDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".xls": @@ -504,7 +505,7 @@ wordDocumentControl.Visible = false; excelDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".jpg": @@ -523,7 +524,7 @@ } }); - + } } @@ -596,4 +597,4 @@ } } -} +} \ No newline at end of file diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index a3cf55c..2225d01 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -149,7 +149,8 @@ long dbid = long.Parse(row.Cells["编号"].Value.ToString()); String macId = row.Cells["MAC地址"].Value.ToString(); String username = row.Cells["设备所有人"].Value.ToString(); - String descn = row.Cells["设备状态"].Value.ToString(); + // String descn = row.Cells["设备状态"].Value.ToString(); + String descn = row.Cells["设备描述"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 6f11a43..f83fb7a 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -366,6 +365,17 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); @@ -379,17 +389,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -611,6 +610,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,10 +647,10 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -1047,16 +1047,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4124,10 +4114,10 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4170,6 +4160,198 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_device + // + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); + // + // btn_Person + // + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); + // + // btn_constructMap + // + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); + // + // buttonItem9 + // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4195,6 +4377,7 @@ this.ribbonPanel7.StyleMouseOver.Class = ""; this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // // ribbonBar5 // @@ -4377,199 +4560,6 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6093,6 +6083,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6103,7 +6094,6 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover1; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_041; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -6425,6 +6415,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6498,10 +6498,10 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/MainFrm.resx b/MainFrm.resx index 1a0c130..3734419 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 142 + 50 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index bca70bc..cb84f22 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8233158..8689543 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -42,7 +42,7 @@ this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - winGridViewPager1.dataGridView1.MultiSelect = false; + winGridViewPager1.dataGridView1.MultiSelect = false; } static FormDocumentManager frm; @@ -53,7 +53,7 @@ frm = new FormDocumentManager(); frm.waitpicBox.Show(); frm.Show(); - + } else { @@ -105,7 +105,7 @@ winGridViewPager1.PagerInfo.PageSize = maxPageIndex; winGridViewPager1.dataGridView1.Refresh(); //winGridViewPager1.Controls.RemoveAt(1); - }); + }); } /// /// 页面刷新 @@ -228,7 +228,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; @@ -289,7 +289,7 @@ static readonly object lockHelp = new object(); - + /// /// 下载远程文件，并显示进度条 /// 如果本地存在相同文件，且文件未在使用，则删除后进行下载 @@ -298,81 +298,81 @@ /// public int DownloadFile(string URL, string filename, ProgressBar prog) { - // lock (lockHelp) - // { - string vFileName = @filename; - if (File.Exists(vFileName)) - {//文件存在 - IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); - if (vHandle == HFILE_ERROR) - {//文件被占用，说明已经有点击，返回即可 - CloseHandle(vHandle); - return 1; - } - else + // lock (lockHelp) + // { + string vFileName = @filename; + if (File.Exists(vFileName)) + {//文件存在 + IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); + if (vHandle == HFILE_ERROR) + {//文件被占用，说明已经有点击，返回即可 + CloseHandle(vHandle); + return 1; + } + else + { + //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 + CloseHandle(vHandle); + File.Delete(vFileName); + } + + } + float percent = 0; + try + { + System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); + //Myrq.Timeout = 10000; + System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + long totalBytes = myrp.ContentLength; + + if (prog != null) + { + this.Invoke((EventHandler)delegate { - //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 - CloseHandle(vHandle); - File.Delete(vFileName); - } + prog.Maximum = (int)totalBytes; + }); } - float percent = 0; - try - { - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); - //Myrq.Timeout = 10000; - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; + System.IO.Stream st = myrp.GetResponseStream(); + System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); + long totalDownloadedByte = 0; + byte[] by = new byte[1024]; + int osize = st.Read(by, 0, (int)by.Length); + while (osize > 0) + { + totalDownloadedByte = osize + totalDownloadedByte; + System.Windows.Forms.Application.DoEvents(); + so.Write(by, 0, osize); if (prog != null) { this.Invoke((EventHandler)delegate { - prog.Maximum = (int)totalBytes; + prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; }); } + osize = st.Read(by, 0, (int)by.Length); - System.IO.Stream st = myrp.GetResponseStream(); - System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); - long totalDownloadedByte = 0; - byte[] by = new byte[1024]; - int osize = st.Read(by, 0, (int)by.Length); - while (osize > 0) - { - totalDownloadedByte = osize + totalDownloadedByte; - System.Windows.Forms.Application.DoEvents(); - so.Write(by, 0, osize); - if (prog != null) - { - this.Invoke((EventHandler)delegate - { - prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; - }); - - } - osize = st.Read(by, 0, (int)by.Length); - - percent = (float)totalDownloadedByte / (float)totalBytes * 100; - System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 - } - so.Close(); - st.Close(); + percent = (float)totalDownloadedByte / (float)totalBytes * 100; + System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 } - catch (System.Net.WebException e) - { + so.Close(); + st.Close(); + } + catch (System.Net.WebException e) + { - return 3; - } - catch (System.Exception e) - { - return 2; - } - return 0; - - // } - + return 3; + } + catch (System.Exception e) + { + return 2; + } + return 0; + + // } + } private void FormDocumentManager_Load(object sender, EventArgs e) @@ -383,8 +383,8 @@ dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); loadThread.IsBackground = true; - loadThread.Start(); - + loadThread.Start(); + } private void doFormLoad() @@ -395,9 +395,10 @@ { using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - this.Invoke((EventHandler)delegate { + this.Invoke((EventHandler)delegate + { combo_writer.Items.Add(""); - }); + }); while (reader.Read()) { this.Invoke((EventHandler)delegate @@ -409,7 +410,7 @@ } catch (Exception) { - MessageBox.Show("数据库访问异常","错误"); + MessageBox.Show("数据库访问异常", "错误"); } this.Invoke((EventHandler)delegate @@ -461,7 +462,7 @@ //Myrq.Timeout = 10000; System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); long totalBytes = myrp.ContentLength; - if (totalBytes>50*1024*1024) + if (totalBytes > 50 * 1024 * 1024) { MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); return; @@ -476,7 +477,7 @@ MessageBox.Show(filename + "预览操作失败", "通知"); return; } - + this.Invoke((EventHandler)delegate { //progressBar1.Visible = false; @@ -488,7 +489,7 @@ excelDocumentControl.Visible = false; pdfDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".xls": @@ -504,7 +505,7 @@ wordDocumentControl.Visible = false; excelDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".jpg": @@ -523,7 +524,7 @@ } }); - + } } @@ -596,4 +597,4 @@ } } -} +} \ No newline at end of file diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index a3cf55c..2225d01 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -149,7 +149,8 @@ long dbid = long.Parse(row.Cells["编号"].Value.ToString()); String macId = row.Cells["MAC地址"].Value.ToString(); String username = row.Cells["设备所有人"].Value.ToString(); - String descn = row.Cells["设备状态"].Value.ToString(); + // String descn = row.Cells["设备状态"].Value.ToString(); + String descn = row.Cells["设备描述"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 6f11a43..f83fb7a 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -366,6 +365,17 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); @@ -379,17 +389,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -611,6 +610,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,10 +647,10 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -1047,16 +1047,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4124,10 +4114,10 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4170,6 +4160,198 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_device + // + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); + // + // btn_Person + // + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); + // + // btn_constructMap + // + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); + // + // buttonItem9 + // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4195,6 +4377,7 @@ this.ribbonPanel7.StyleMouseOver.Class = ""; this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // // ribbonBar5 // @@ -4377,199 +4560,6 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6093,6 +6083,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6103,7 +6094,6 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover1; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_041; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -6425,6 +6415,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6498,10 +6498,10 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/MainFrm.resx b/MainFrm.resx index 1a0c130..3734419 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 142 + 50 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index bca70bc..cb84f22 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index fcabf8e..70e2faa 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8233158..8689543 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -42,7 +42,7 @@ this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - winGridViewPager1.dataGridView1.MultiSelect = false; + winGridViewPager1.dataGridView1.MultiSelect = false; } static FormDocumentManager frm; @@ -53,7 +53,7 @@ frm = new FormDocumentManager(); frm.waitpicBox.Show(); frm.Show(); - + } else { @@ -105,7 +105,7 @@ winGridViewPager1.PagerInfo.PageSize = maxPageIndex; winGridViewPager1.dataGridView1.Refresh(); //winGridViewPager1.Controls.RemoveAt(1); - }); + }); } /// /// 页面刷新 @@ -228,7 +228,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; @@ -289,7 +289,7 @@ static readonly object lockHelp = new object(); - + /// /// 下载远程文件，并显示进度条 /// 如果本地存在相同文件，且文件未在使用，则删除后进行下载 @@ -298,81 +298,81 @@ /// public int DownloadFile(string URL, string filename, ProgressBar prog) { - // lock (lockHelp) - // { - string vFileName = @filename; - if (File.Exists(vFileName)) - {//文件存在 - IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); - if (vHandle == HFILE_ERROR) - {//文件被占用，说明已经有点击，返回即可 - CloseHandle(vHandle); - return 1; - } - else + // lock (lockHelp) + // { + string vFileName = @filename; + if (File.Exists(vFileName)) + {//文件存在 + IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); + if (vHandle == HFILE_ERROR) + {//文件被占用，说明已经有点击，返回即可 + CloseHandle(vHandle); + return 1; + } + else + { + //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 + CloseHandle(vHandle); + File.Delete(vFileName); + } + + } + float percent = 0; + try + { + System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); + //Myrq.Timeout = 10000; + System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + long totalBytes = myrp.ContentLength; + + if (prog != null) + { + this.Invoke((EventHandler)delegate { - //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 - CloseHandle(vHandle); - File.Delete(vFileName); - } + prog.Maximum = (int)totalBytes; + }); } - float percent = 0; - try - { - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); - //Myrq.Timeout = 10000; - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; + System.IO.Stream st = myrp.GetResponseStream(); + System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); + long totalDownloadedByte = 0; + byte[] by = new byte[1024]; + int osize = st.Read(by, 0, (int)by.Length); + while (osize > 0) + { + totalDownloadedByte = osize + totalDownloadedByte; + System.Windows.Forms.Application.DoEvents(); + so.Write(by, 0, osize); if (prog != null) { this.Invoke((EventHandler)delegate { - prog.Maximum = (int)totalBytes; + prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; }); } + osize = st.Read(by, 0, (int)by.Length); - System.IO.Stream st = myrp.GetResponseStream(); - System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); - long totalDownloadedByte = 0; - byte[] by = new byte[1024]; - int osize = st.Read(by, 0, (int)by.Length); - while (osize > 0) - { - totalDownloadedByte = osize + totalDownloadedByte; - System.Windows.Forms.Application.DoEvents(); - so.Write(by, 0, osize); - if (prog != null) - { - this.Invoke((EventHandler)delegate - { - prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; - }); - - } - osize = st.Read(by, 0, (int)by.Length); - - percent = (float)totalDownloadedByte / (float)totalBytes * 100; - System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 - } - so.Close(); - st.Close(); + percent = (float)totalDownloadedByte / (float)totalBytes * 100; + System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 } - catch (System.Net.WebException e) - { + so.Close(); + st.Close(); + } + catch (System.Net.WebException e) + { - return 3; - } - catch (System.Exception e) - { - return 2; - } - return 0; - - // } - + return 3; + } + catch (System.Exception e) + { + return 2; + } + return 0; + + // } + } private void FormDocumentManager_Load(object sender, EventArgs e) @@ -383,8 +383,8 @@ dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); loadThread.IsBackground = true; - loadThread.Start(); - + loadThread.Start(); + } private void doFormLoad() @@ -395,9 +395,10 @@ { using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - this.Invoke((EventHandler)delegate { + this.Invoke((EventHandler)delegate + { combo_writer.Items.Add(""); - }); + }); while (reader.Read()) { this.Invoke((EventHandler)delegate @@ -409,7 +410,7 @@ } catch (Exception) { - MessageBox.Show("数据库访问异常","错误"); + MessageBox.Show("数据库访问异常", "错误"); } this.Invoke((EventHandler)delegate @@ -461,7 +462,7 @@ //Myrq.Timeout = 10000; System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); long totalBytes = myrp.ContentLength; - if (totalBytes>50*1024*1024) + if (totalBytes > 50 * 1024 * 1024) { MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); return; @@ -476,7 +477,7 @@ MessageBox.Show(filename + "预览操作失败", "通知"); return; } - + this.Invoke((EventHandler)delegate { //progressBar1.Visible = false; @@ -488,7 +489,7 @@ excelDocumentControl.Visible = false; pdfDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".xls": @@ -504,7 +505,7 @@ wordDocumentControl.Visible = false; excelDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".jpg": @@ -523,7 +524,7 @@ } }); - + } } @@ -596,4 +597,4 @@ } } -} +} \ No newline at end of file diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index a3cf55c..2225d01 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -149,7 +149,8 @@ long dbid = long.Parse(row.Cells["编号"].Value.ToString()); String macId = row.Cells["MAC地址"].Value.ToString(); String username = row.Cells["设备所有人"].Value.ToString(); - String descn = row.Cells["设备状态"].Value.ToString(); + // String descn = row.Cells["设备状态"].Value.ToString(); + String descn = row.Cells["设备描述"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 6f11a43..f83fb7a 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -366,6 +365,17 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); @@ -379,17 +389,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -611,6 +610,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,10 +647,10 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -1047,16 +1047,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4124,10 +4114,10 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4170,6 +4160,198 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_device + // + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); + // + // btn_Person + // + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); + // + // btn_constructMap + // + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); + // + // buttonItem9 + // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4195,6 +4377,7 @@ this.ribbonPanel7.StyleMouseOver.Class = ""; this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // // ribbonBar5 // @@ -4377,199 +4560,6 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6093,6 +6083,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6103,7 +6094,6 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover1; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_041; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -6425,6 +6415,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6498,10 +6498,10 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/MainFrm.resx b/MainFrm.resx index 1a0c130..3734419 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 142 + 50 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index bca70bc..cb84f22 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index fcabf8e..70e2faa 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index bca70bc..cb84f22 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8233158..8689543 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -42,7 +42,7 @@ this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - winGridViewPager1.dataGridView1.MultiSelect = false; + winGridViewPager1.dataGridView1.MultiSelect = false; } static FormDocumentManager frm; @@ -53,7 +53,7 @@ frm = new FormDocumentManager(); frm.waitpicBox.Show(); frm.Show(); - + } else { @@ -105,7 +105,7 @@ winGridViewPager1.PagerInfo.PageSize = maxPageIndex; winGridViewPager1.dataGridView1.Refresh(); //winGridViewPager1.Controls.RemoveAt(1); - }); + }); } /// /// 页面刷新 @@ -228,7 +228,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; @@ -289,7 +289,7 @@ static readonly object lockHelp = new object(); - + /// /// 下载远程文件，并显示进度条 /// 如果本地存在相同文件，且文件未在使用，则删除后进行下载 @@ -298,81 +298,81 @@ /// public int DownloadFile(string URL, string filename, ProgressBar prog) { - // lock (lockHelp) - // { - string vFileName = @filename; - if (File.Exists(vFileName)) - {//文件存在 - IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); - if (vHandle == HFILE_ERROR) - {//文件被占用，说明已经有点击，返回即可 - CloseHandle(vHandle); - return 1; - } - else + // lock (lockHelp) + // { + string vFileName = @filename; + if (File.Exists(vFileName)) + {//文件存在 + IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); + if (vHandle == HFILE_ERROR) + {//文件被占用，说明已经有点击，返回即可 + CloseHandle(vHandle); + return 1; + } + else + { + //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 + CloseHandle(vHandle); + File.Delete(vFileName); + } + + } + float percent = 0; + try + { + System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); + //Myrq.Timeout = 10000; + System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + long totalBytes = myrp.ContentLength; + + if (prog != null) + { + this.Invoke((EventHandler)delegate { - //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 - CloseHandle(vHandle); - File.Delete(vFileName); - } + prog.Maximum = (int)totalBytes; + }); } - float percent = 0; - try - { - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); - //Myrq.Timeout = 10000; - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; + System.IO.Stream st = myrp.GetResponseStream(); + System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); + long totalDownloadedByte = 0; + byte[] by = new byte[1024]; + int osize = st.Read(by, 0, (int)by.Length); + while (osize > 0) + { + totalDownloadedByte = osize + totalDownloadedByte; + System.Windows.Forms.Application.DoEvents(); + so.Write(by, 0, osize); if (prog != null) { this.Invoke((EventHandler)delegate { - prog.Maximum = (int)totalBytes; + prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; }); } + osize = st.Read(by, 0, (int)by.Length); - System.IO.Stream st = myrp.GetResponseStream(); - System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); - long totalDownloadedByte = 0; - byte[] by = new byte[1024]; - int osize = st.Read(by, 0, (int)by.Length); - while (osize > 0) - { - totalDownloadedByte = osize + totalDownloadedByte; - System.Windows.Forms.Application.DoEvents(); - so.Write(by, 0, osize); - if (prog != null) - { - this.Invoke((EventHandler)delegate - { - prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; - }); - - } - osize = st.Read(by, 0, (int)by.Length); - - percent = (float)totalDownloadedByte / (float)totalBytes * 100; - System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 - } - so.Close(); - st.Close(); + percent = (float)totalDownloadedByte / (float)totalBytes * 100; + System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 } - catch (System.Net.WebException e) - { + so.Close(); + st.Close(); + } + catch (System.Net.WebException e) + { - return 3; - } - catch (System.Exception e) - { - return 2; - } - return 0; - - // } - + return 3; + } + catch (System.Exception e) + { + return 2; + } + return 0; + + // } + } private void FormDocumentManager_Load(object sender, EventArgs e) @@ -383,8 +383,8 @@ dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); loadThread.IsBackground = true; - loadThread.Start(); - + loadThread.Start(); + } private void doFormLoad() @@ -395,9 +395,10 @@ { using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - this.Invoke((EventHandler)delegate { + this.Invoke((EventHandler)delegate + { combo_writer.Items.Add(""); - }); + }); while (reader.Read()) { this.Invoke((EventHandler)delegate @@ -409,7 +410,7 @@ } catch (Exception) { - MessageBox.Show("数据库访问异常","错误"); + MessageBox.Show("数据库访问异常", "错误"); } this.Invoke((EventHandler)delegate @@ -461,7 +462,7 @@ //Myrq.Timeout = 10000; System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); long totalBytes = myrp.ContentLength; - if (totalBytes>50*1024*1024) + if (totalBytes > 50 * 1024 * 1024) { MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); return; @@ -476,7 +477,7 @@ MessageBox.Show(filename + "预览操作失败", "通知"); return; } - + this.Invoke((EventHandler)delegate { //progressBar1.Visible = false; @@ -488,7 +489,7 @@ excelDocumentControl.Visible = false; pdfDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".xls": @@ -504,7 +505,7 @@ wordDocumentControl.Visible = false; excelDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".jpg": @@ -523,7 +524,7 @@ } }); - + } } @@ -596,4 +597,4 @@ } } -} +} \ No newline at end of file diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index a3cf55c..2225d01 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -149,7 +149,8 @@ long dbid = long.Parse(row.Cells["编号"].Value.ToString()); String macId = row.Cells["MAC地址"].Value.ToString(); String username = row.Cells["设备所有人"].Value.ToString(); - String descn = row.Cells["设备状态"].Value.ToString(); + // String descn = row.Cells["设备状态"].Value.ToString(); + String descn = row.Cells["设备描述"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 6f11a43..f83fb7a 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -366,6 +365,17 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); @@ -379,17 +389,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -611,6 +610,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,10 +647,10 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -1047,16 +1047,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4124,10 +4114,10 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4170,6 +4160,198 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_device + // + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); + // + // btn_Person + // + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); + // + // btn_constructMap + // + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); + // + // buttonItem9 + // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4195,6 +4377,7 @@ this.ribbonPanel7.StyleMouseOver.Class = ""; this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // // ribbonBar5 // @@ -4377,199 +4560,6 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6093,6 +6083,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6103,7 +6094,6 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover1; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_041; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -6425,6 +6415,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6498,10 +6498,10 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/MainFrm.resx b/MainFrm.resx index 1a0c130..3734419 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 142 + 50 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index bca70bc..cb84f22 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index fcabf8e..70e2faa 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index bca70bc..cb84f22 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index fcabf8e..70e2faa 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8233158..8689543 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -42,7 +42,7 @@ this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); this.winGridViewPager1.OnEndExport += new EventHandler(pager1_OnEndExport); - winGridViewPager1.dataGridView1.MultiSelect = false; + winGridViewPager1.dataGridView1.MultiSelect = false; } static FormDocumentManager frm; @@ -53,7 +53,7 @@ frm = new FormDocumentManager(); frm.waitpicBox.Show(); frm.Show(); - + } else { @@ -105,7 +105,7 @@ winGridViewPager1.PagerInfo.PageSize = maxPageIndex; winGridViewPager1.dataGridView1.Refresh(); //winGridViewPager1.Controls.RemoveAt(1); - }); + }); } /// /// 页面刷新 @@ -228,7 +228,7 @@ int minPage = (pageIndex - 1) * maxPageIndex + 1; int maxPage = pageIndex * maxPageIndex; string sqlCount = "select count(*) from casic_userdocument where sysname = 'EMS'"; - string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题,"+ + string sqlData = "select filename as 文档名称,dbid as 编号,title as 文档标题," + "filetype as 文档类型,upday as 上传日期,writer as 上传人 " + "from (select t.*,rownum row_num from casic_userdocument t where sysname = 'EMS'"; @@ -289,7 +289,7 @@ static readonly object lockHelp = new object(); - + /// /// 下载远程文件，并显示进度条 /// 如果本地存在相同文件，且文件未在使用，则删除后进行下载 @@ -298,81 +298,81 @@ /// public int DownloadFile(string URL, string filename, ProgressBar prog) { - // lock (lockHelp) - // { - string vFileName = @filename; - if (File.Exists(vFileName)) - {//文件存在 - IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); - if (vHandle == HFILE_ERROR) - {//文件被占用，说明已经有点击，返回即可 - CloseHandle(vHandle); - return 1; - } - else + // lock (lockHelp) + // { + string vFileName = @filename; + if (File.Exists(vFileName)) + {//文件存在 + IntPtr vHandle = _lopen(vFileName, OF_READWRITE | OF_SHARE_DENY_NONE); + if (vHandle == HFILE_ERROR) + {//文件被占用，说明已经有点击，返回即可 + CloseHandle(vHandle); + return 1; + } + else + { + //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 + CloseHandle(vHandle); + File.Delete(vFileName); + } + + } + float percent = 0; + try + { + System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); + //Myrq.Timeout = 10000; + System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + long totalBytes = myrp.ContentLength; + + if (prog != null) + { + this.Invoke((EventHandler)delegate { - //文件没有被占用，直接删除，以后优化可以判断如果文件和要下载的一直，则直接忽略下面步骤，如果不一致再删除。 - CloseHandle(vHandle); - File.Delete(vFileName); - } + prog.Maximum = (int)totalBytes; + }); } - float percent = 0; - try - { - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(URL); - //Myrq.Timeout = 10000; - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; + System.IO.Stream st = myrp.GetResponseStream(); + System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); + long totalDownloadedByte = 0; + byte[] by = new byte[1024]; + int osize = st.Read(by, 0, (int)by.Length); + while (osize > 0) + { + totalDownloadedByte = osize + totalDownloadedByte; + System.Windows.Forms.Application.DoEvents(); + so.Write(by, 0, osize); if (prog != null) { this.Invoke((EventHandler)delegate { - prog.Maximum = (int)totalBytes; + prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; }); } + osize = st.Read(by, 0, (int)by.Length); - System.IO.Stream st = myrp.GetResponseStream(); - System.IO.Stream so = new System.IO.FileStream(filename, System.IO.FileMode.Create); - long totalDownloadedByte = 0; - byte[] by = new byte[1024]; - int osize = st.Read(by, 0, (int)by.Length); - while (osize > 0) - { - totalDownloadedByte = osize + totalDownloadedByte; - System.Windows.Forms.Application.DoEvents(); - so.Write(by, 0, osize); - if (prog != null) - { - this.Invoke((EventHandler)delegate - { - prog.Value = (int)totalDownloadedByte < prog.Maximum ? (int)totalDownloadedByte : prog.Maximum; - }); - - } - osize = st.Read(by, 0, (int)by.Length); - - percent = (float)totalDownloadedByte / (float)totalBytes * 100; - System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 - } - so.Close(); - st.Close(); + percent = (float)totalDownloadedByte / (float)totalBytes * 100; + System.Windows.Forms.Application.DoEvents(); //必须加注这句代码，否则label1将因为循环执行太快而来不及显示信息 } - catch (System.Net.WebException e) - { + so.Close(); + st.Close(); + } + catch (System.Net.WebException e) + { - return 3; - } - catch (System.Exception e) - { - return 2; - } - return 0; - - // } - + return 3; + } + catch (System.Exception e) + { + return 2; + } + return 0; + + // } + } private void FormDocumentManager_Load(object sender, EventArgs e) @@ -383,8 +383,8 @@ dateTime_begin.Value = DateTime.Now.AddDays(-6); Thread loadThread = new Thread(new ThreadStart(doFormLoad)); loadThread.IsBackground = true; - loadThread.Start(); - + loadThread.Start(); + } private void doFormLoad() @@ -395,9 +395,10 @@ { using (OracleDataReader reader = OracleUtils.ExecuteReader(OracleUtils.ConnectionString, CommandType.Text, sql)) { - this.Invoke((EventHandler)delegate { + this.Invoke((EventHandler)delegate + { combo_writer.Items.Add(""); - }); + }); while (reader.Read()) { this.Invoke((EventHandler)delegate @@ -409,7 +410,7 @@ } catch (Exception) { - MessageBox.Show("数据库访问异常","错误"); + MessageBox.Show("数据库访问异常", "错误"); } this.Invoke((EventHandler)delegate @@ -461,7 +462,7 @@ //Myrq.Timeout = 10000; System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); long totalBytes = myrp.ContentLength; - if (totalBytes>50*1024*1024) + if (totalBytes > 50 * 1024 * 1024) { MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); return; @@ -476,7 +477,7 @@ MessageBox.Show(filename + "预览操作失败", "通知"); return; } - + this.Invoke((EventHandler)delegate { //progressBar1.Visible = false; @@ -488,7 +489,7 @@ excelDocumentControl.Visible = false; pdfDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".xls": @@ -504,7 +505,7 @@ wordDocumentControl.Visible = false; excelDocumentControl.Visible = false; pictureDocumentControl.Visible = false; - + pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); break; case ".jpg": @@ -523,7 +524,7 @@ } }); - + } } @@ -596,4 +597,4 @@ } } -} +} \ No newline at end of file diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index a3cf55c..2225d01 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -149,7 +149,8 @@ long dbid = long.Parse(row.Cells["编号"].Value.ToString()); String macId = row.Cells["MAC地址"].Value.ToString(); String username = row.Cells["设备所有人"].Value.ToString(); - String descn = row.Cells["设备状态"].Value.ToString(); + // String descn = row.Cells["设备状态"].Value.ToString(); + String descn = row.Cells["设备描述"].Value.ToString(); FrmEquipmentEdit frm = new FrmEquipmentEdit(dbid.ToString(), macId, username, descn); frm.reloadGrid += new ReloadEquipmentGrid(LoadData); frm.ShowDialog(); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 6f11a43..f83fb7a 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -366,6 +365,17 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); @@ -379,17 +389,6 @@ this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -611,6 +610,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,10 +647,10 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel8.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -1047,16 +1047,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4124,10 +4114,10 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -4170,6 +4160,198 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_device + // + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); + // + // btn_Person + // + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); + // + // btn_constructMap + // + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); + // + // buttonItem9 + // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4195,6 +4377,7 @@ this.ribbonPanel7.StyleMouseOver.Class = ""; this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; // // ribbonBar5 // @@ -4377,199 +4560,6 @@ this.btn_reset_password.Text = "重置密码"; this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6093,6 +6083,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6103,7 +6094,6 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover1; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_041; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -6425,6 +6415,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6498,10 +6498,10 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/MainFrm.resx b/MainFrm.resx index 1a0c130..3734419 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -2094,7 +2094,7 @@ - 142 + 50 diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index bca70bc..cb84f22 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index fcabf8e..70e2faa 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index bca70bc..cb84f22 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index fcabf8e..70e2faa 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index ef16893..39e5fbb 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ