web添加页面

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx

@@ -95,6 +95,8 @@
                                         </f:Button>
                                         <f:Button ID="btnQR" ToolTip="批量生成二维码" Icon="TableRefresh" runat="server" OnClick="btnQR_Click">
                                         </f:Button>
+                                        <f:Button ID="btnUnitQR" ToolTip="生成单位二维码" Icon="TableRefresh" runat="server" OnClick="btnUnitQR_Click">
+                                        </f:Button>
                                     </Items>
                                 </f:Toolbar>
                             </Toolbars>

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs

@@ -1,10 +1,13 @@
 using BLL;
+using FineUIPro.Web.DataShow;
+using Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
+using System.Web.UI.DataVisualization.Charting;
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.SitePerson
@@ -721,5 +724,30 @@ namespace FineUIPro.Web.HSSE.SitePerson
 			}
 			ShowNotify("操作完成，新生成二维码" + num.ToString() + "条", MessageBoxIcon.Success);
 		}
+		protected void btnUnitQR_Click(object sender, EventArgs e)
+		{
+			if (this.tvProjectAndUnit.SelectedNodeID.Contains("|"))
+			{
+				string id = this.tvProjectAndUnit.SelectedNodeID;
+				string unitId = string.Empty;
+				string projectId = string.Empty;
+				var str = id.Split('|');
+				if (str.Count() > 1)
+				{
+					unitId = str[0];
+					projectId = str[1];
+				}
+				var unit = Funs.DB.Base_Unit.FirstOrDefault(x=>x.UnitId==unitId);
+				var pu = Funs.DB.Project_ProjectUnit.FirstOrDefault(x => x.UnitId == unitId && x.ProjectId == projectId);
+				PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/ShowQRImage.aspx?strValue={0}&urlName={1}&title={2}", System.Web.HttpUtility.UrlEncode("https://sgglapi.chengda.com/Home/PersonInfo#/pages/add_personnel/add_personnel?id=" + pu.ProjectUnitId), System.Web.HttpUtility.UrlEncode(unit.UnitName), System.Web.HttpUtility.UrlEncode(unit.UnitName), "查看 - "), "二维码查看", 360, 420));
+
+ 			}
+			else
+			{
+				ShowNotify("请点击选中单位", MessageBoxIcon.Warning);
+
+			}
+
+		}
 	}
 }

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs

@@ -248,6 +248,15 @@ namespace FineUIPro.Web.HSSE.SitePerson
 		/// </remarks>
 		protected global::FineUIPro.Button btnQR;
 
+		/// <summary>
+		/// btnUnitQR 控件。
+		/// </summary>
+		/// <remarks>
+		/// 自动生成的字段。
+		/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+		/// </remarks>
+		protected global::FineUIPro.Button btnUnitQR;
+
 		/// <summary>
 		/// lbI 控件。
 		/// </summary>

SGGL/WebAPI/Controllers/HomeController.cs

@@ -21,15 +21,15 @@ namespace WebAPI.Controllers
 		public ActionResult Index()
 		{
 
-            var welder = APIWelderService.GetWelderByIdCard("370322198609181310", "b54d4274-0bb6-4e04-b03a-9165b2a062fb");
+			//var welder = APIWelderService.GetWelderByIdCard("370322198609181310", "b54d4274-0bb6-4e04-b03a-9165b2a062fb");
-            if (welder != null)
+			//if (welder != null)
-            {
+			//{
-                var installtion1 = APIBaseInfoService.GetInstallationList("b54d4274-0bb6-4e04-b03a-9165b2a062fb", welder.WED_Unit);
+			//    var installtion1 = APIBaseInfoService.GetInstallationList("b54d4274-0bb6-4e04-b03a-9165b2a062fb", welder.WED_Unit);
-                var method = APIWelderService.GetWelderMethod(welder.WED_ID);
+			//    var method = APIWelderService.GetWelderMethod(welder.WED_ID);
-                var steel = APIWelderService.GetWelderBSSteel(welder.WED_ID);
+			//    var steel = APIWelderService.GetWelderBSSteel(welder.WED_ID);
-                var consumables = APIWelderService.GetConsumables();
+			//    var consumables = APIWelderService.GetConsumables();
 
-            }
+			//}
 
 			//APICommonService.getaccess_token();
 
@@ -161,5 +161,11 @@ namespace WebAPI.Controllers
 			//                  }).ToList();
 			return View();
 		}
+
+		public ActionResult PersonInfo(string id)
+		{
+			return View();
+		}
+
 	}
 }

SGGL/WebAPI/Home/static/js/pages-index-index.49fa6205.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-index"],{"6da9":function(t,n,e){"use strict";e("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a={data:function(){return{title:"Hello"}},onLoad:function(){},methods:{skip1:function(){uni.navigateTo({url:"/pages/add_personnel/add_personnel?id=abb8cb7d-6e4d-4167-8080-7caba46c9c8b"})}}};n.default=a},a113:function(t,n,e){"use strict";var a=e("aa65"),i=e.n(a);i.a},aa65:function(t,n,e){var a=e("cc71");a.__esModule&&(a=a.default),"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var i=e("4f06").default;i("edb87922",a,!0,{sourceMap:!1,shadowMode:!1})},bb44:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return a}));var a={uButton:e("eb0a").default},i=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("v-uni-view",{staticClass:"content"},[e("u-button",{on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.skip1.apply(void 0,arguments)}}},[t._v("人员信息")])],1)},o=[]},bff3:function(t,n,e){"use strict";e.r(n);var a=e("6da9"),i=e.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);n["default"]=i.a},cc71:function(t,n,e){var a=e("24fb");n=a(!1),n.push([t.i,".content[data-v-c43814d0]{display:flex;flex-direction:column;align-items:center;justify-content:center}.logo[data-v-c43814d0]{height:%?200?%;width:%?200?%;margin-top:%?200?%;margin-left:auto;margin-right:auto;margin-bottom:%?50?%}.text-area[data-v-c43814d0]{display:flex;justify-content:center}.title[data-v-c43814d0]{font-size:%?36?%;color:#8f8f94}",""]),t.exports=n},e696:function(t,n,e){"use strict";e.r(n);var a=e("bb44"),i=e("bff3");for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);e("a113");var c=e("f0c5"),u=Object(c["a"])(i["default"],a["b"],a["c"],!1,null,"c43814d0",null,!1,a["a"],void 0);n["default"]=u.exports}}]);

SGGL/WebAPI/Views/Home/PersonInfo.cshtml

@@ -0,0 +1,21 @@
+@{
+    Layout = null;
+}
+
+<!DOCTYPE html>
+<html lang=zh-CN>
+<head>
+    <meta charset=utf-8>
+    <meta http-equiv=X-UA-Compatible content="IE=edge">
+    <title>项目人员录入</title>
+    <script>
+    var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+        document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script>
+    <link rel=stylesheet href=./static/index.97465e7b.css>
+</head>
+<body>
+    <noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div>
+    <script src=./static/js/chunk-vendors.243f9a1a.js></script>
+    <script src=./static/js/index.588a1ec2.js></script>
+</body>
+</html>

SGGL/WebAPI/WebAPI.csproj

@@ -299,6 +299,10 @@
     <Content Include="favicon.ico" />
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
+    <Content Include="Home\static\js\index.03a2f39a.js" />
+    <Content Include="Home\static\js\index.588a1ec2.js" />
+    <Content Include="Home\static\js\pages-add_personnel-add_personnel.bad7c7eb.js" />
+    <Content Include="Home\static\js\pages-add_personnel-add_personnel.ff016799.js" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
     <Content Include="Areas\HelpPage\Views\Web.config" />
@@ -327,6 +331,12 @@
     <Content Include="Scripts\jquery-3.3.1.slim.js" />
     <Content Include="Scripts\jquery-3.3.1.slim.min.js" />
     <Content Include="Scripts\modernizr-2.8.3.js" />
+    <Content Include="Home\static\index.97465e7b.css" />
+    <Content Include="Home\static\js\chunk-vendors.243f9a1a.js" />
+    <Content Include="Home\static\js\index.5b55bafe.js" />
+    <Content Include="Home\static\js\pages-add_personnel-add_personnel.01ea8e3f.js" />
+    <Content Include="Home\static\js\pages-add_personnel-add_personnel~pages-index-index.a29b9044.js" />
+    <Content Include="Home\static\js\pages-index-index.49fa6205.js" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
@@ -343,6 +353,7 @@
     <Content Include="Views\Home\Index.cshtml" />
     <Content Include="Views\Shared\Error.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
+    <Content Include="Views\Home\PersonInfo.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />