Browse Source

作业指导书模块

章政 7 years ago
parent
commit
1963c35dfb

+ 117 - 0
UAS-MES/CustomControl/HeadBar/PDFOperater.Designer.cs

@@ -0,0 +1,117 @@
+namespace UAS_MES.CustomControl
+{
+    partial class PDFOperater
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源,为 true;否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            this.ZoomComBox_label = new System.Windows.Forms.ToolStripLabel();
+            this.ZoomComBox = new System.Windows.Forms.ToolStripComboBox();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.ScrollSpan_label = new System.Windows.Forms.ToolStripLabel();
+            this.ScrollSpan = new System.Windows.Forms.ToolStripTextBox();
+            this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+            this.toolStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // toolStrip1
+            // 
+            this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ZoomComBox_label,
+            this.ZoomComBox,
+            this.toolStripLabel1,
+            this.toolStripSeparator1,
+            this.ScrollSpan_label,
+            this.ScrollSpan});
+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(598, 30);
+            this.toolStrip1.TabIndex = 0;
+            this.toolStrip1.Text = "toolStrip1";
+            // 
+            // ZoomComBox_label
+            // 
+            this.ZoomComBox_label.Name = "ZoomComBox_label";
+            this.ZoomComBox_label.Size = new System.Drawing.Size(56, 27);
+            this.ZoomComBox_label.Text = "缩放比例";
+            // 
+            // ZoomComBox
+            // 
+            this.ZoomComBox.Name = "ZoomComBox";
+            this.ZoomComBox.Size = new System.Drawing.Size(75, 30);
+            this.ZoomComBox.SelectedIndexChanged += new System.EventHandler(this.ZoomComBox_SelectedIndexChanged);
+            this.ZoomComBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ZoomComBox_KeyDown);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 30);
+            // 
+            // ScrollSpan_label
+            // 
+            this.ScrollSpan_label.Name = "ScrollSpan_label";
+            this.ScrollSpan_label.Size = new System.Drawing.Size(56, 27);
+            this.ScrollSpan_label.Text = "滚动间隔";
+            // 
+            // ScrollSpan
+            // 
+            this.ScrollSpan.Name = "ScrollSpan";
+            this.ScrollSpan.Size = new System.Drawing.Size(30, 30);
+            // 
+            // toolStripLabel1
+            // 
+            this.toolStripLabel1.Name = "toolStripLabel1";
+            this.toolStripLabel1.Size = new System.Drawing.Size(19, 27);
+            this.toolStripLabel1.Text = "%";
+            // 
+            // PDFOperater
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.Controls.Add(this.toolStrip1);
+            this.Name = "PDFOperater";
+            this.Size = new System.Drawing.Size(598, 30);
+            this.toolStrip1.ResumeLayout(false);
+            this.toolStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ToolStrip toolStrip1;
+        private System.Windows.Forms.ToolStripComboBox ZoomComBox;
+        private System.Windows.Forms.ToolStripLabel ZoomComBox_label;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripLabel ScrollSpan_label;
+        private System.Windows.Forms.ToolStripTextBox ScrollSpan;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+    }
+}

+ 52 - 0
UAS-MES/CustomControl/HeadBar/PDFOperater.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using O2S.Components.PDFView4NET;
+
+namespace UAS_MES.CustomControl
+{
+    public partial class PDFOperater : UserControl
+    {
+        private PDFPageView PageView1;
+
+        public PDFPageView PageView
+        {
+            get
+            {
+                return PageView1;
+            }
+
+            set
+            {
+                PageView1 = value;
+            }
+        }
+
+        public PDFOperater()
+        {
+            InitializeComponent();
+            for (int i = 1; i <= 20; i++)
+            {
+                ZoomComBox.Items.Add(i * 10);
+            }
+        }
+
+        private void ZoomComBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            PageView1.Zoom = double.Parse(ZoomComBox.Text);
+        }
+
+        private void ZoomComBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                PageView1.Zoom = double.Parse(ZoomComBox.Text);
+            }
+        }
+    }
+}

+ 123 - 0
UAS-MES/CustomControl/HeadBar/PDFOperater.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

+ 1 - 1
UAS-MES/FunctionCode/Query/Query_OperationInstruction.Designer.cs

@@ -92,7 +92,7 @@
             this.FileList.Items.AddRange(new object[] {
             "1.mp4",
             "C:\\Users\\callm\\Desktop\\工作文档\\考勤机数据对接\\1.pdf",
-            "3.jpg",
+            "H:\\UAS_WinForm\\UAS_MES_NEW\\Resources\\LoginBG.jpg",
             "4.jpeg"});
             this.FileList.Location = new System.Drawing.Point(325, 18);
             this.FileList.Name = "FileList";

+ 22 - 2
UAS-MES/FunctionCode/Query/Query_OperationInstruction.cs

@@ -46,8 +46,28 @@ namespace UAS_MES.Query
 
         private void OpenFile_Click(object sender, EventArgs e)
         {
-            Query.Query_ShowInstruction showin = new Query_ShowInstruction(FileList.Text);
-            showin.Show();
+
+            switch (BaseUtil.GetFileSuffix(FileList.Text))
+            {
+                case "MP4":
+                    Query.Query_ShowVideo ShowVideo = new Query_ShowVideo(FileList.Text);
+                    ShowVideo.Show();
+                    break;
+                case "PDF":
+                    Query.Query_ShowPDF ShowPdf = new Query_ShowPDF(FileList.Text);
+                    ShowPdf.Show();
+                    break;
+                case "JPEG":
+                    Query.Query_ShowPicture ShowPic = new Query_ShowPicture(FileList.Text);
+                    ShowPic.Show();
+                    break;
+                case "JPG":
+                    Query.Query_ShowPicture ShowPic1 = new Query_ShowPicture(FileList.Text);
+                    ShowPic1.Show();
+                    break;
+                default:
+                    break;
+            }
         }
     }
 }

+ 0 - 67
UAS-MES/FunctionCode/Query/Query_ShowInstruction.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using UAS_MES.PublicMethod;
-
-namespace UAS_MES.Query
-{
-    public partial class Query_ShowInstruction : Form
-    {
-        //文件具体地址
-        string type = "";
-
-        public Query_ShowInstruction(string FileType)
-        {
-            InitializeComponent();
-            MediaPlayer.PlayStateChange += MediaPlayer_PlayStateChange;
-            type = FileType;
-            StartPosition = FormStartPosition.CenterScreen;
-        }
-
-        private void MediaPlayer_PlayStateChange(object sender, AxWMPLib._WMPOCXEvents_PlayStateChangeEvent e)
-        {
-            if ((int)MediaPlayer.playState == 1)
-            {
-                System.Threading.Thread.Sleep(1000);
-                MediaPlayer.Ctlcontrols.play();
-            }
-        }
-
-        private void Quert_ShowInstruction_Load(object sender, EventArgs e)
-        {
-            switch (BaseUtil.GetFileSuffix(type))
-            {
-                case "MP4":
-                    MediaPlayer.Visible = true;
-                    PageView.Visible = false;
-                    PicBox.Visible = false;
-                    MediaPlayer.URL = type;
-                    MediaPlayer.Ctlcontrols.play();
-                    break;
-                case "PDF":
-                    MediaPlayer.Visible = false;
-                    PageView.Visible = true;
-                    PDFDocument.FilePath = type;
-                    PicBox.Visible = false;
-                    break;
-                case "JPEG":
-                    MediaPlayer.Visible = false;
-                    PageView.Visible = false;
-                    PicBox.Visible = true;
-                    break;
-                case "JPG":
-                    MediaPlayer.Visible = false;
-                    PageView.Visible = false;
-                    PicBox.Visible = true;
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-}

+ 16 - 38
UAS-MES/FunctionCode/Query/Query_ShowInstruction.Designer.cs → UAS-MES/FunctionCode/Query/Query_ShowPDF.Designer.cs

@@ -1,6 +1,6 @@
 namespace UAS_MES.Query
 {
-    partial class Query_ShowInstruction
+    partial class Query_ShowPDF
     {
         /// <summary>
         /// Required designer variable.
@@ -29,27 +29,11 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Query_ShowInstruction));
-            this.PicBox = new System.Windows.Forms.PictureBox();
             this.PageView = new O2S.Components.PDFView4NET.PDFPageView();
             this.PDFDocument = new O2S.Components.PDFView4NET.PDFDocument(this.components);
-            this.MediaPlayer = new AxWMPLib.AxWindowsMediaPlayer();
-            ((System.ComponentModel.ISupportInitialize)(this.PicBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.MediaPlayer)).BeginInit();
+            this.PDFOperater = new UAS_MES.CustomControl.PDFOperater();
             this.SuspendLayout();
             // 
-            // PicBox
-            // 
-            this.PicBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.PicBox.Image = global::UAS_MES.Properties.Resources.LoginBG;
-            this.PicBox.Location = new System.Drawing.Point(0, 0);
-            this.PicBox.Name = "PicBox";
-            this.PicBox.Size = new System.Drawing.Size(1006, 600);
-            this.PicBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.PicBox.TabIndex = 203;
-            this.PicBox.TabStop = false;
-            this.PicBox.Visible = false;
-            // 
             // PageView
             // 
             this.PageView.AutoScroll = true;
@@ -72,7 +56,6 @@
             this.PageView.SubstituteFonts = null;
             this.PageView.TabIndex = 204;
             this.PageView.VerticalPageSpacing = 5;
-            this.PageView.Visible = false;
             this.PageView.WorkMode = O2S.Components.PDFView4NET.UserInteractiveWorkMode.PanAndScan;
             // 
             // PDFDocument
@@ -81,42 +64,37 @@
             this.PDFDocument.PageLayout = O2S.Components.PDFView4NET.PDFPageLayout.SinglePage;
             this.PDFDocument.PageMode = O2S.Components.PDFView4NET.PDFPageMode.UseNone;
             // 
-            // MediaPlayer
+            // PDFOperater
             // 
-            this.MediaPlayer.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.MediaPlayer.Enabled = true;
-            this.MediaPlayer.Location = new System.Drawing.Point(0, 0);
-            this.MediaPlayer.Name = "MediaPlayer";
-            this.MediaPlayer.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("MediaPlayer.OcxState")));
-            this.MediaPlayer.Size = new System.Drawing.Size(1006, 600);
-            this.MediaPlayer.TabIndex = 205;
-            this.MediaPlayer.Visible = false;
+            this.PDFOperater.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.PDFOperater.Dock = System.Windows.Forms.DockStyle.Top;
+            this.PDFOperater.Location = new System.Drawing.Point(0, 0);
+            this.PDFOperater.Name = "PDFOperater";
+            this.PDFOperater.PageView = this.PageView;
+            this.PDFOperater.Size = new System.Drawing.Size(1006, 30);
+            this.PDFOperater.TabIndex = 203;
+            this.PDFOperater.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PDFOperater_KeyDown);
             // 
-            // Query_ShowInstruction
+            // Query_ShowPDF
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1006, 600);
-            this.Controls.Add(this.MediaPlayer);
+            this.Controls.Add(this.PDFOperater);
             this.Controls.Add(this.PageView);
-            this.Controls.Add(this.PicBox);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
-            this.Name = "Query_ShowInstruction";
+            this.Name = "Query_ShowPDF";
             this.Tag = "Query!ShowInstruction";
             this.Text = "作业指导书";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
-            this.Load += new System.EventHandler(this.Quert_ShowInstruction_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.PicBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.MediaPlayer)).EndInit();
+            this.Load += new System.EventHandler(this.Query_ShowPDF_Load);
             this.ResumeLayout(false);
 
         }
 
         #endregion
-
-        private System.Windows.Forms.PictureBox PicBox;
         private O2S.Components.PDFView4NET.PDFPageView PageView;
         private O2S.Components.PDFView4NET.PDFDocument PDFDocument;
-        private AxWMPLib.AxWindowsMediaPlayer MediaPlayer;
+        private CustomControl.PDFOperater PDFOperater;
     }
 }

+ 45 - 0
UAS-MES/FunctionCode/Query/Query_ShowPDF.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES.CustomControl;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.Query
+{
+    public partial class Query_ShowPDF : Form
+    {
+        //文件具体地址
+        string type = "";
+
+        public Query_ShowPDF(string FileType)
+        {
+            InitializeComponent();
+            type = FileType;
+            StartPosition = FormStartPosition.CenterScreen;
+        }
+
+        //private void MediaPlayer_PlayStateChange(object sender, AxWMPLib._WMPOCXEvents_PlayStateChangeEvent e)
+        //{
+        //    //if ((int)MediaPlayer.playState == 1)
+        //    //{
+        //    //    System.Threading.Thread.Sleep(1000);
+        //    //    MediaPlayer.Ctlcontrols.play();
+        //    //}
+        //}
+
+        private void Query_ShowPDF_Load(object sender, EventArgs e)
+        {
+            PDFDocument.FilePath = type;
+        }
+
+        private void PDFOperater_KeyDown(object sender, KeyEventArgs e)
+        {
+
+        }
+    }
+}

+ 123 - 0
UAS-MES/FunctionCode/Query/Query_ShowPDF.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="PDFDocument.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

+ 64 - 0
UAS-MES/FunctionCode/Query/Query_ShowPicture.Designer.cs

@@ -0,0 +1,64 @@
+namespace UAS_MES.Query
+{
+    partial class Query_ShowPicture
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.PicBox = new System.Windows.Forms.PictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.PicBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // PicBox
+            // 
+            this.PicBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.PicBox.Location = new System.Drawing.Point(0, 0);
+            this.PicBox.Name = "PicBox";
+            this.PicBox.Size = new System.Drawing.Size(1102, 686);
+            this.PicBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.PicBox.TabIndex = 0;
+            this.PicBox.TabStop = false;
+            // 
+            // Query_ShowPicture
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1102, 686);
+            this.Controls.Add(this.PicBox);
+            this.Name = "Query_ShowPicture";
+            this.Text = "作业指导书";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            this.Load += new System.EventHandler(this.Query_ShowPicture_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.PicBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.PictureBox PicBox;
+    }
+}

+ 29 - 0
UAS-MES/FunctionCode/Query/Query_ShowPicture.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.Query
+{
+    public partial class Query_ShowPicture : Form
+    {
+        string type = "";
+
+        public Query_ShowPicture(string FileType)
+        {
+            InitializeComponent();
+            StartPosition = FormStartPosition.CenterScreen;
+            type = FileType;
+        }
+
+        private void Query_ShowPicture_Load(object sender, EventArgs e)
+        {
+            PicBox.Image = Image.FromFile(type);
+        }
+    }
+}

+ 120 - 0
UAS-MES/FunctionCode/Query/Query_ShowPicture.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

+ 65 - 0
UAS-MES/FunctionCode/Query/Query_ShowVideo.Designer.cs

@@ -0,0 +1,65 @@
+namespace UAS_MES.Query
+{
+    partial class Query_ShowVideo
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Query_ShowVideo));
+            this.axWindowsMediaPlayer1 = new AxWMPLib.AxWindowsMediaPlayer();
+            ((System.ComponentModel.ISupportInitialize)(this.axWindowsMediaPlayer1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // axWindowsMediaPlayer1
+            // 
+            this.axWindowsMediaPlayer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.axWindowsMediaPlayer1.Enabled = true;
+            this.axWindowsMediaPlayer1.Location = new System.Drawing.Point(0, 0);
+            this.axWindowsMediaPlayer1.Name = "axWindowsMediaPlayer1";
+            this.axWindowsMediaPlayer1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axWindowsMediaPlayer1.OcxState")));
+            this.axWindowsMediaPlayer1.Size = new System.Drawing.Size(1124, 703);
+            this.axWindowsMediaPlayer1.TabIndex = 0;
+            // 
+            // Query_ShowVideo
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1124, 703);
+            this.Controls.Add(this.axWindowsMediaPlayer1);
+            this.Name = "Query_ShowVideo";
+            this.Text = "作业指导书";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            this.Load += new System.EventHandler(this.Query_ShowVideo_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.axWindowsMediaPlayer1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private AxWMPLib.AxWindowsMediaPlayer axWindowsMediaPlayer1;
+    }
+}

+ 29 - 0
UAS-MES/FunctionCode/Query/Query_ShowVideo.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace UAS_MES.Query
+{
+    public partial class Query_ShowVideo : Form
+    {
+
+        string type = "";
+
+        public Query_ShowVideo(string FileType)
+        {
+            InitializeComponent();
+            StartPosition = FormStartPosition.CenterScreen;
+            type = FileType;
+        }
+
+        private void Query_ShowVideo_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

+ 2 - 5
UAS-MES/FunctionCode/Query/Query_ShowInstruction.resx → UAS-MES/FunctionCode/Query/Query_ShowVideo.resx

@@ -117,17 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="PDFDocument.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="MediaPlayer.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="axWindowsMediaPlayer1.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAtwAAAAIB
         AAAAAQAAAAAAAAAAAAAAAKIAAAAAAwAACAAAAAAABQAAAAAAAADwPwMAAAAAAAUAAAAAAAAAAAAIAAIA
         AAAAAAMAAQAAAAsA//8DAAAAAAALAP//CAACAAAAAAADADIAAAALAAAACAAKAAAAZgB1AGwAbAAAAAsA
-        AAALAAAACwD//wsA//8LAAAACAACAAAAAAAIAAIAAAAAAAgAAgAAAAAACAACAAAAAAALAAAAmGgAAAQ7
+        AAALAAAACwD//wsA//8LAAAACAACAAAAAAAIAAIAAAAAAAgAAgAAAAAACAACAAAAAAALAAAAK3QAAKhI
         AAAL
 </value>
   </data>