From 673fb4132c9285242a03938feb8c46c3eca11dea Mon Sep 17 00:00:00 2001 From: leomon Date: Wed, 16 Aug 2023 00:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS.UI/DocManager/frmDocument.cs | 4 + AIMS.UI/DocManager/frmDocument3.cs | 5 + AIMS.UI/DocManager/frmDocument3.designer.cs | 1 + .../frmAanesthesiaRecord.Designer.cs | 258 +++++++++--------- .../frmAanesthesiaRecord.cs | 8 + .../frmAanesthesiaRecover.Designer.cs | 26 +- .../frmAanesthesiaRecover.cs | 8 + .../frmInstrumentRecord2.Designer.cs | 2 + .../frmInstrumentRecord2.cs | 8 + .../frmOperationApply.Designer.cs | 4 +- AIMS.UI/OperationFront/frmOperationApply.cs | 8 + AIMS.UI/OperationFront/frmOperationApply.resx | 84 ------ .../frmOperationSchedulePlan.cs | 9 + .../frmOperationSchedulePlan.resx | 2 +- AIMS/AIMS.csproj | 1 - AIMS/AIMS.xml | 6 +- AIMS/app.config | 3 - 17 files changed, 205 insertions(+), 232 deletions(-) delete mode 100644 AIMS/app.config diff --git a/AIMS.UI/DocManager/frmDocument.cs b/AIMS.UI/DocManager/frmDocument.cs index 5ec4fb1..ce57f3c 100644 --- a/AIMS.UI/DocManager/frmDocument.cs +++ b/AIMS.UI/DocManager/frmDocument.cs @@ -190,6 +190,10 @@ namespace AIMS.DocManager private void frmDocument2_Load(object sender, EventArgs e) { + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("数据中心")) + { + buttonX1.Visible = true; + } //ucClassify初始化 ucClassify = new DocumentManagement.ucClassify(); this.expandablePanel1.Controls.Add(ucClassify); diff --git a/AIMS.UI/DocManager/frmDocument3.cs b/AIMS.UI/DocManager/frmDocument3.cs index 83ae383..28952a8 100644 --- a/AIMS.UI/DocManager/frmDocument3.cs +++ b/AIMS.UI/DocManager/frmDocument3.cs @@ -65,6 +65,11 @@ namespace AIMS.OperationAfter.UI { ControlExtension.GetOperationSiteRoom(labelSite, CboOperationSite, null); + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("数据中心")) + { + buttonX1.Visible = true; + } + System.Drawing.Size mSize = SystemInformation.WorkingArea.Size; txtnameOrHnum.Text = "姓名或住院号关键字"; txtnameOrHnum.ForeColor = Color.FromArgb(164, 164, 164); diff --git a/AIMS.UI/DocManager/frmDocument3.designer.cs b/AIMS.UI/DocManager/frmDocument3.designer.cs index 6a65dd4..5ce6ee6 100644 --- a/AIMS.UI/DocManager/frmDocument3.designer.cs +++ b/AIMS.UI/DocManager/frmDocument3.designer.cs @@ -343,6 +343,7 @@ this.buttonX1.Size = new System.Drawing.Size(76, 23); this.buttonX1.TabIndex = 6; this.buttonX1.Text = "数据中心"; + this.buttonX1.Visible = false; this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click); // // btnSel diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs index a957fe3..f53ba05 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs @@ -74,9 +74,16 @@ this.superTabMain = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.panelExZKZB = new DevComponents.DotNetBar.PanelEx(); + this.panel8 = new AIMS.PublicUI.UI.DrawPanel(); + this.paneltop = new System.Windows.Forms.Panel(); + this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress(); + this.zgcAnaesRecord = new DrawGraph.ZedGraphControl(); this.spTabQXQDD = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.panelExBLSJ = new DevComponents.DotNetBar.PanelEx(); + this.panel82 = new AIMS.PublicUI.UI.DrawPanel(); + this.circularProgress2 = new DevComponents.DotNetBar.Controls.CircularProgress(); + this.zgcAnaesRecord2 = new DrawGraph.ZedGraphControl(); this.spTabBM = new DevComponents.DotNetBar.SuperTabItem(); this.panel7 = new System.Windows.Forms.Panel(); this.panel21 = new System.Windows.Forms.Panel(); @@ -128,13 +135,6 @@ this.txtInRoom1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.panel8 = new AIMS.PublicUI.UI.DrawPanel(); - this.paneltop = new System.Windows.Forms.Panel(); - this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress(); - this.zgcAnaesRecord = new DrawGraph.ZedGraphControl(); - this.panel82 = new AIMS.PublicUI.UI.DrawPanel(); - this.circularProgress2 = new DevComponents.DotNetBar.Controls.CircularProgress(); - this.zgcAnaesRecord2 = new DrawGraph.ZedGraphControl(); this.panel3.SuspendLayout(); this.panel14.SuspendLayout(); this.panel4.SuspendLayout(); @@ -144,8 +144,10 @@ this.superTabMain.SuspendLayout(); this.superTabControlPanel1.SuspendLayout(); this.panelExZKZB.SuspendLayout(); + this.panel8.SuspendLayout(); this.superTabControlPanel2.SuspendLayout(); this.panelExBLSJ.SuspendLayout(); + this.panel82.SuspendLayout(); this.panel7.SuspendLayout(); this.panel21.SuspendLayout(); this.plTitleEventTime.SuspendLayout(); @@ -173,8 +175,6 @@ this.panel6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).BeginInit(); - this.panel8.SuspendLayout(); - this.panel82.SuspendLayout(); this.SuspendLayout(); // // panel2 @@ -552,6 +552,7 @@ this.btnsjzx.TabIndex = 30; this.btnsjzx.Text = " 数据中心"; this.btnsjzx.UseVisualStyleBackColor = false; + this.btnsjzx.Visible = false; this.btnsjzx.Click += new System.EventHandler(this.btnsjzx_Click); // // btnyldj @@ -613,6 +614,7 @@ this.btndptz.TabIndex = 27; this.btndptz.Text = " 大屏通知"; this.btndptz.UseVisualStyleBackColor = false; + this.btndptz.Visible = false; this.btndptz.Click += new System.EventHandler(this.btndptz_Click); // // btnxldlx @@ -919,6 +921,69 @@ this.panelExZKZB.Style.GradientAngle = 90; this.panelExZKZB.TabIndex = 0; // + // panel8 + // + this.panel8.AutoScroll = true; + this.panel8.BackColor = System.Drawing.Color.White; + this.panel8.Controls.Add(this.paneltop); + this.panel8.Controls.Add(this.circularProgress1); + this.panel8.Controls.Add(this.zgcAnaesRecord); + this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel8.Location = new System.Drawing.Point(0, 0); + this.panel8.Name = "panel8"; + this.panel8.Size = new System.Drawing.Size(1389, 803); + this.panel8.TabIndex = 2; + this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); + // + // paneltop + // + this.paneltop.Location = new System.Drawing.Point(9, 137); + this.paneltop.Name = "paneltop"; + this.paneltop.Size = new System.Drawing.Size(690, 30); + this.paneltop.TabIndex = 7; + this.paneltop.Visible = false; + // + // circularProgress1 + // + this.circularProgress1.AnimationSpeed = 50; + // + // + // + this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); + this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; + this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.circularProgress1.FocusCuesEnabled = false; + this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F); + this.circularProgress1.Location = new System.Drawing.Point(602, 274); + this.circularProgress1.Margin = new System.Windows.Forms.Padding(4); + this.circularProgress1.Name = "circularProgress1"; + this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; + this.circularProgress1.Size = new System.Drawing.Size(389, 239); + this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress1.TabIndex = 6; + this.circularProgress1.Value = 100; + // + // zgcAnaesRecord + // + this.zgcAnaesRecord.Location = new System.Drawing.Point(416, 41); + this.zgcAnaesRecord.Name = "zgcAnaesRecord"; + this.zgcAnaesRecord.ScrollGrace = 0D; + this.zgcAnaesRecord.ScrollMaxX = 0D; + this.zgcAnaesRecord.ScrollMaxY = 0D; + this.zgcAnaesRecord.ScrollMaxY2 = 0D; + this.zgcAnaesRecord.ScrollMinX = 0D; + this.zgcAnaesRecord.ScrollMinY = 0D; + this.zgcAnaesRecord.ScrollMinY2 = 0D; + this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000); + this.zgcAnaesRecord.TabIndex = 0; + this.zgcAnaesRecord.Visible = false; + this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder); + this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent); + this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent); + this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent); + this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp); + this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick); + // // spTabQXQDD // this.spTabQXQDD.AttachedControl = this.superTabControlPanel1; @@ -955,6 +1020,60 @@ this.panelExBLSJ.Style.GradientAngle = 90; this.panelExBLSJ.TabIndex = 0; // + // panel82 + // + this.panel82.AutoScroll = true; + this.panel82.BackColor = System.Drawing.Color.White; + this.panel82.Controls.Add(this.circularProgress2); + this.panel82.Controls.Add(this.zgcAnaesRecord2); + this.panel82.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel82.Location = new System.Drawing.Point(0, 0); + this.panel82.Name = "panel82"; + this.panel82.Size = new System.Drawing.Size(1389, 803); + this.panel82.TabIndex = 3; + this.panel82.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel82_Scroll); + // + // circularProgress2 + // + this.circularProgress2.AnimationSpeed = 50; + // + // + // + this.circularProgress2.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); + this.circularProgress2.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; + this.circularProgress2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.circularProgress2.FocusCuesEnabled = false; + this.circularProgress2.Font = new System.Drawing.Font("微软雅黑", 9F); + this.circularProgress2.Location = new System.Drawing.Point(678, 354); + this.circularProgress2.Margin = new System.Windows.Forms.Padding(4); + this.circularProgress2.Name = "circularProgress2"; + this.circularProgress2.ProgressColor = System.Drawing.Color.DodgerBlue; + this.circularProgress2.Size = new System.Drawing.Size(389, 239); + this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress2.TabIndex = 6; + this.circularProgress2.Value = 100; + // + // zgcAnaesRecord2 + // + this.zgcAnaesRecord2.Location = new System.Drawing.Point(416, 41); + this.zgcAnaesRecord2.Name = "zgcAnaesRecord2"; + this.zgcAnaesRecord2.ScrollGrace = 0D; + this.zgcAnaesRecord2.ScrollMaxX = 0D; + this.zgcAnaesRecord2.ScrollMaxY = 0D; + this.zgcAnaesRecord2.ScrollMaxY2 = 0D; + this.zgcAnaesRecord2.ScrollMinX = 0D; + this.zgcAnaesRecord2.ScrollMinY = 0D; + this.zgcAnaesRecord2.ScrollMinY2 = 0D; + this.zgcAnaesRecord2.Size = new System.Drawing.Size(800, 1000); + this.zgcAnaesRecord2.TabIndex = 0; + this.zgcAnaesRecord2.Visible = false; + this.zgcAnaesRecord2.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord2_ContextMenuBuilder); + this.zgcAnaesRecord2.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseDownEvent); + this.zgcAnaesRecord2.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseUpEvent); + this.zgcAnaesRecord2.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseMoveEvent); + this.zgcAnaesRecord2.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord2_KeyUp); + this.zgcAnaesRecord2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord2_MouseDoubleClick); + // // spTabBM // this.spTabBM.AttachedControl = this.superTabControlPanel2; @@ -1906,123 +2025,6 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // - // panel8 - // - this.panel8.AutoScroll = true; - this.panel8.BackColor = System.Drawing.Color.White; - this.panel8.Controls.Add(this.paneltop); - this.panel8.Controls.Add(this.circularProgress1); - this.panel8.Controls.Add(this.zgcAnaesRecord); - this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel8.Location = new System.Drawing.Point(0, 0); - this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(1389, 803); - this.panel8.TabIndex = 2; - this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); - // - // paneltop - // - this.paneltop.Location = new System.Drawing.Point(9, 137); - this.paneltop.Name = "paneltop"; - this.paneltop.Size = new System.Drawing.Size(690, 30); - this.paneltop.TabIndex = 7; - this.paneltop.Visible = false; - // - // circularProgress1 - // - this.circularProgress1.AnimationSpeed = 50; - // - // - // - this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); - this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; - this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.circularProgress1.FocusCuesEnabled = false; - this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.circularProgress1.Location = new System.Drawing.Point(602, 274); - this.circularProgress1.Margin = new System.Windows.Forms.Padding(4); - this.circularProgress1.Name = "circularProgress1"; - this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; - this.circularProgress1.Size = new System.Drawing.Size(389, 239); - this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; - this.circularProgress1.TabIndex = 6; - this.circularProgress1.Value = 100; - // - // zgcAnaesRecord - // - this.zgcAnaesRecord.Location = new System.Drawing.Point(416, 41); - this.zgcAnaesRecord.Name = "zgcAnaesRecord"; - this.zgcAnaesRecord.ScrollGrace = 0D; - this.zgcAnaesRecord.ScrollMaxX = 0D; - this.zgcAnaesRecord.ScrollMaxY = 0D; - this.zgcAnaesRecord.ScrollMaxY2 = 0D; - this.zgcAnaesRecord.ScrollMinX = 0D; - this.zgcAnaesRecord.ScrollMinY = 0D; - this.zgcAnaesRecord.ScrollMinY2 = 0D; - this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000); - this.zgcAnaesRecord.TabIndex = 0; - this.zgcAnaesRecord.Visible = false; - this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder); - this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent); - this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent); - this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent); - this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp); - this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick); - // - // panel82 - // - this.panel82.AutoScroll = true; - this.panel82.BackColor = System.Drawing.Color.White; - this.panel82.Controls.Add(this.circularProgress2); - this.panel82.Controls.Add(this.zgcAnaesRecord2); - this.panel82.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel82.Location = new System.Drawing.Point(0, 0); - this.panel82.Name = "panel82"; - this.panel82.Size = new System.Drawing.Size(1389, 803); - this.panel82.TabIndex = 3; - this.panel82.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel82_Scroll); - // - // circularProgress2 - // - this.circularProgress2.AnimationSpeed = 50; - // - // - // - this.circularProgress2.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); - this.circularProgress2.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; - this.circularProgress2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.circularProgress2.FocusCuesEnabled = false; - this.circularProgress2.Font = new System.Drawing.Font("微软雅黑", 9F); - this.circularProgress2.Location = new System.Drawing.Point(678, 354); - this.circularProgress2.Margin = new System.Windows.Forms.Padding(4); - this.circularProgress2.Name = "circularProgress2"; - this.circularProgress2.ProgressColor = System.Drawing.Color.DodgerBlue; - this.circularProgress2.Size = new System.Drawing.Size(389, 239); - this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; - this.circularProgress2.TabIndex = 6; - this.circularProgress2.Value = 100; - // - // zgcAnaesRecord2 - // - this.zgcAnaesRecord2.Location = new System.Drawing.Point(416, 41); - this.zgcAnaesRecord2.Name = "zgcAnaesRecord2"; - this.zgcAnaesRecord2.ScrollGrace = 0D; - this.zgcAnaesRecord2.ScrollMaxX = 0D; - this.zgcAnaesRecord2.ScrollMaxY = 0D; - this.zgcAnaesRecord2.ScrollMaxY2 = 0D; - this.zgcAnaesRecord2.ScrollMinX = 0D; - this.zgcAnaesRecord2.ScrollMinY = 0D; - this.zgcAnaesRecord2.ScrollMinY2 = 0D; - this.zgcAnaesRecord2.Size = new System.Drawing.Size(800, 1000); - this.zgcAnaesRecord2.TabIndex = 0; - this.zgcAnaesRecord2.Visible = false; - this.zgcAnaesRecord2.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord2_ContextMenuBuilder); - this.zgcAnaesRecord2.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseDownEvent); - this.zgcAnaesRecord2.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseUpEvent); - this.zgcAnaesRecord2.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseMoveEvent); - this.zgcAnaesRecord2.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord2_KeyUp); - this.zgcAnaesRecord2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord2_MouseDoubleClick); - // // frmAanesthesiaRecord // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2045,8 +2047,10 @@ this.superTabMain.ResumeLayout(false); this.superTabControlPanel1.ResumeLayout(false); this.panelExZKZB.ResumeLayout(false); + this.panel8.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false); this.panelExBLSJ.ResumeLayout(false); + this.panel82.ResumeLayout(false); this.panel7.ResumeLayout(false); this.panel7.PerformLayout(); this.panel21.ResumeLayout(false); @@ -2075,8 +2079,6 @@ this.panel6.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).EndInit(); - this.panel8.ResumeLayout(false); - this.panel82.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.cs index 623bbc0..b250996 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -88,6 +88,14 @@ namespace AIMS.OperationAanesthesia { btnChage.Visible = true; } + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("数据中心")) + { + btnsjzx.Visible = true; + } + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("大屏通知")) + { + btndptz.Visible = true; + } //this.MaximizeBox = false; //this.MinimizeBox = false; LoadAnesRescue(); diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs index c59e9ea..0b34a5a 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs @@ -72,6 +72,7 @@ this.zgcAnaesRecord = new DrawGraph.ZedGraphControl(); this.panel7 = new System.Windows.Forms.Panel(); this.panel21 = new System.Windows.Forms.Panel(); + this.PanelSave = new System.Windows.Forms.Panel(); this.panel17 = new System.Windows.Forms.Panel(); this.btnNextPage = new System.Windows.Forms.Panel(); this.plPrintBrowse = new System.Windows.Forms.Panel(); @@ -101,7 +102,6 @@ this.picInRoom = new System.Windows.Forms.PictureBox(); this.txtInRoom1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.PanelSave = new System.Windows.Forms.Panel(); this.panel3.SuspendLayout(); this.panel14.SuspendLayout(); this.panel4.SuspendLayout(); @@ -630,6 +630,7 @@ this.btnsjzx.TabIndex = 22; this.btnsjzx.Text = " 数据中心"; this.btnsjzx.UseVisualStyleBackColor = false; + this.btnsjzx.Visible = false; this.btnsjzx.Click += new System.EventHandler(this.btnsjzx_Click); // // btnzsk @@ -670,6 +671,7 @@ this.btndptz.TabIndex = 19; this.btndptz.Text = " 大屏通知"; this.btndptz.UseVisualStyleBackColor = false; + this.btndptz.Visible = false; this.btndptz.Click += new System.EventHandler(this.btndptz_Click); // // btnsbwh @@ -801,6 +803,17 @@ this.panel21.Size = new System.Drawing.Size(400, 40); this.panel21.TabIndex = 10; // + // PanelSave + // + this.PanelSave.BackgroundImage = global::AIMSControls.Properties.Resources.图标_保存; + this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; + this.PanelSave.Location = new System.Drawing.Point(174, 4); + this.PanelSave.Name = "PanelSave"; + this.PanelSave.Size = new System.Drawing.Size(28, 28); + this.PanelSave.TabIndex = 10; + this.PanelSave.Paint += new System.Windows.Forms.PaintEventHandler(this.PanelSave_Paint); + // // panel17 // this.panel17.BackgroundImage = global::AIMSControls.Properties.Resources.图标_末尾页; @@ -1312,17 +1325,6 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // - // PanelSave - // - this.PanelSave.BackgroundImage = global::AIMSControls.Properties.Resources.图标_保存; - this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; - this.PanelSave.Location = new System.Drawing.Point(174, 4); - this.PanelSave.Name = "PanelSave"; - this.PanelSave.Size = new System.Drawing.Size(28, 28); - this.PanelSave.TabIndex = 10; - this.PanelSave.Paint += new System.Windows.Forms.PaintEventHandler(this.PanelSave_Paint); - // // frmAanesthesiaRecover // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.cs index f92d267..7937327 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.cs @@ -65,6 +65,14 @@ namespace AIMS.OperationAanesthesia { btnChage.Visible = true; } + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("数据中心")) + { + btnsjzx.Visible = true; + } + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("大屏通知")) + { + btndptz.Visible = true; + } if (PublicMethod.HospitalName.Contains("天福")) { btnOperationInfo.Text = " 恢复信息"; diff --git a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.Designer.cs b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.Designer.cs index 90d9e7c..6e4e5b5 100644 --- a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.Designer.cs @@ -735,6 +735,7 @@ this.btnsjzx.TabIndex = 22; this.btnsjzx.Text = " 数据中心"; this.btnsjzx.UseVisualStyleBackColor = false; + this.btnsjzx.Visible = false; this.btnsjzx.Click += new System.EventHandler(this.btnsjzx_Click); // // btndptz @@ -755,6 +756,7 @@ this.btndptz.TabIndex = 19; this.btndptz.Text = " 大屏通知"; this.btndptz.UseVisualStyleBackColor = false; + this.btndptz.Visible = false; this.btndptz.Click += new System.EventHandler(this.btndptz_Click); // // btnsbwh diff --git a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.cs b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.cs index d393056..1c1a95a 100644 --- a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.cs +++ b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.cs @@ -79,6 +79,14 @@ namespace AIMS.OperationAanesthesia { btnChage.Visible = true; } + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("数据中心")) + { + btnsjzx.Visible = true; + } + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("大屏通知")) + { + btndptz.Visible = true; + } if (PublicMethod.HospitalName.Contains("漳浦天福")) { QXList = new List() { diff --git a/AIMS.UI/OperationFront/frmOperationApply.Designer.cs b/AIMS.UI/OperationFront/frmOperationApply.Designer.cs index bf940b1..e024f62 100644 --- a/AIMS.UI/OperationFront/frmOperationApply.Designer.cs +++ b/AIMS.UI/OperationFront/frmOperationApply.Designer.cs @@ -141,7 +141,7 @@ this.CboOperationSite.Name = "CboOperationSite"; this.CboOperationSite.Size = new System.Drawing.Size(115, 25); this.CboOperationSite.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.CboOperationSite.TabIndex = 502; + this.CboOperationSite.TabIndex = 502; // // labelSite // @@ -252,12 +252,14 @@ this.toolStripButton1.Size = new System.Drawing.Size(60, 46); this.toolStripButton1.Text = "数据中心"; this.toolStripButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.toolStripButton1.Visible = false; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(6, 49); + this.toolStripSeparator3.Visible = false; // // tsbExit // diff --git a/AIMS.UI/OperationFront/frmOperationApply.cs b/AIMS.UI/OperationFront/frmOperationApply.cs index f1aa145..eb09209 100644 --- a/AIMS.UI/OperationFront/frmOperationApply.cs +++ b/AIMS.UI/OperationFront/frmOperationApply.cs @@ -32,6 +32,14 @@ namespace AIMS.OperationFront.UI { toolStripSeparator4.Visible = true; tsbAuditing.Visible = true; } else { toolStripSeparator4.Visible = false; tsbAuditing.Visible = false; } + + + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("数据中心")) + { + toolStripButton1.Visible = true; + toolStripSeparator3.Visible = true; + } + dtpBegInDate.Value = DateTime.Parse(dtpBegInDate.Value.ToString("yyyy-MM-dd")); dtpEndDate.Value = DateTime.Parse(dtpEndDate.Value.ToString("yyyy-MM-dd")).AddDays(4); diff --git a/AIMS.UI/OperationFront/frmOperationApply.resx b/AIMS.UI/OperationFront/frmOperationApply.resx index 8669e4d..675aa57 100644 --- a/AIMS.UI/OperationFront/frmOperationApply.resx +++ b/AIMS.UI/OperationFront/frmOperationApply.resx @@ -204,88 +204,4 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/AIMS.UI/OperationFront/frmOperationSchedulePlan.cs b/AIMS.UI/OperationFront/frmOperationSchedulePlan.cs index 0485f79..b0d0472 100644 --- a/AIMS.UI/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMS.UI/OperationFront/frmOperationSchedulePlan.cs @@ -2583,12 +2583,14 @@ namespace AIMS.OperationFront.UI this.btnDataCente.Size = new System.Drawing.Size(68, 46); this.btnDataCente.Text = " "; this.btnDataCente.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.btnDataCente.Visible = false; this.btnDataCente.Click += new System.EventHandler(this.btnDataCente_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(6, 49); + this.toolStripSeparator1.Visible = false; // // tspSetting // @@ -3567,6 +3569,13 @@ namespace AIMS.OperationFront.UI RoomCardManage.IsAllowNur = RoomCardManage.GetRolePermission("ų̻ʿ"); RoomCardManage.IsAllowStopOpe = RoomCardManage.GetRolePermission("ֹͣ"); RoomCardManage.IsAllowPassOpe = RoomCardManage.GetRolePermission("ųͨ"); + + if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("")) + { + btnDataCente.Visible = true; + toolStripSeparator1.Visible = true; + } + tsbCancelOperationApply.Visible = RoomCardManage.IsAllowStopOpe; if (RoomCardManage.IsAllowAns == false) { diff --git a/AIMS.UI/OperationFront/frmOperationSchedulePlan.resx b/AIMS.UI/OperationFront/frmOperationSchedulePlan.resx index d108dc6..5928bac 100644 --- a/AIMS.UI/OperationFront/frmOperationSchedulePlan.resx +++ b/AIMS.UI/OperationFront/frmOperationSchedulePlan.resx @@ -251,7 +251,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+ - CAAAAk1TRnQBSQFMAgEBAgEAATQBFAE0ARQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAATwBFAE8ARQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj index c6eb356..86bd875 100644 --- a/AIMS/AIMS.csproj +++ b/AIMS/AIMS.csproj @@ -92,7 +92,6 @@ Resources.resx True - Always diff --git a/AIMS/AIMS.xml b/AIMS/AIMS.xml index 8fe8536..b82cd83 100644 --- a/AIMS/AIMS.xml +++ b/AIMS/AIMS.xml @@ -1,7 +1,9 @@  - Data Source=.;Initial Catalog=AIMSDB_FJZPTFYY;User ID=sa;Password=Test2020; - Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020; + Data Source=100.101.220.106;Initial Catalog=AIMSDB_ETKQQMYYY;User ID=sa;Password=Sm@123456; + Data Source=100.101.220.106;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Sm@123456; + Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39; diff --git a/AIMS/app.config b/AIMS/app.config deleted file mode 100644 index 3e0e37c..0000000 --- a/AIMS/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - -