HRI.git - Gitblit

parent: b96ee299 | 补丁 | 提交 | ignore whitespace

abc

7 天以前 6cde8426a8e0e9f2ecc3d205dd9d3f9154be3697

4个文件已添加

3 文件已重命名

10个文件已修改

	PPMX.Web/Areas/Master/Controllers/GroupController.cs	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/Areas/Master/MasterAreaRegistration.cs	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/Areas/Master/Views/Group/Index.cshtml	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/Areas/Master/Views/Shared/_Layout.cshtml	48 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/Areas/Master/Views/_ViewStart.cshtml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/Areas/Master/Views/web.config	59 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/Areas/Ppm/PpmAreaRegistration.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/Areas/System/Views/Shared/_Layout.cshtml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/PPMX.Web.csproj	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/Scripts/Master/Group/Index.js	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/Views/Shared/_Layout.cshtml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/bin/PPMX.Web.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/bin/PPMX.Web.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/obj/Debug/PPMX.Web.csproj.CoreCompileInputs.cache	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/obj/Debug/PPMX.Web.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PPMX.Web/obj/Debug/PPMX.Web.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 PPMX.Web/Areas/Master/Controllers/GroupController.cs

File was renamed from PPMX.Web/Areas/Ppm/Controllers/MasterController.cs
@@ -1,28 +1,24 @@
using PPMX.Entity;
using PPMX.Logic.Master;
using PPMX.Web.Controllers;
using System;
using System.Collections.Generic;
using System.Drawing.Drawing2D;
using System.Linq;
using System.Web;
using System.Web.Mvc;

namespace PPMX.Web.Areas.Ppm.Controllers
namespace PPMX.Web.Areas.Master.Controllers
{
    public class MasterController : Controller
    public class GroupController : BaseController
    {
        private GroupLogic groupLogic;

        public MasterController() {
            groupLogic = new GroupLogic();
        }

        public ActionResult Group()
        // GET: Master/Group
        public ActionResult Index()
        {
            return View();
        }

        public ActionResult GroupData(int page, int limit, string keyWord,int Status)
        public ActionResult GetList(int page, int limit, string keyWord, int Status)
        {
            Receive receive = groupLogic.GetList(page, limit, keyWord, Status);
            return Json(new
@@ -33,8 +29,5 @@
                count = receive.total
            });
        }



    }
}

 PPMX.Web/Areas/Master/MasterAreaRegistration.cs

New file
@@ -0,0 +1,24 @@
using System.Web.Mvc;

namespace PPMX.Web.Areas.Master
{
    public class MasterAreaRegistration : AreaRegistration 
    {
        public override string AreaName 
        {
            get 
            {
                return "Master";
            }
        }

        public override void RegisterArea(AreaRegistrationContext context) 
        {
            context.MapRoute(
                "Master_default",
                "Master/{controller}/{action}/{id}",
                new { action = "Index", id = UrlParameter.Optional }
            );
        }
    }
}

 PPMX.Web/Areas/Master/Views/Group/Index.cshtml

File was renamed from PPMX.Web/Areas/Ppm/Views/Master/Group.cshtml
@@ -1,10 +1,11 @@

@{
    ViewBag.Title = "Group";
    Layout = "~/Views/Shared/_Layout.cshtml";
    ViewBag.Title = "Index";
    Layout = "~/Areas/Master/Views/Shared/_Layout.cshtml";
}

<script src="~/Scripts/JQueryTool/Method.js"></script>
<script src="~/Scripts/Master/Group.js"></script>
<script src="~/Scripts/Master/Group/Index.js"></script>

<div class="panel animated fadeIn">
    <div class="panel-body">
@@ -19,10 +20,9 @@
            </div><div class="layui-btn-group"></div>
        </div>

        <table id="tabGroup" lay-filter="test"></table>
        <table id="tabGroupIndex" lay-filter="test"></table>

        <div id="paged"></div>
    </div>
</div>



 PPMX.Web/Areas/Master/Views/Shared/_Layout.cshtml

New file
@@ -0,0 +1,48 @@
@{
    Layout = null;
}

<!DOCTYPE html>

<html>
<head>
    <meta name="viewport" content="width=device-width" />
    <title>@ViewBag.title</title>
    <link href="~/Content/layui/css/layui.css" rel="stylesheet" />
    <link href="~/Content/framework/css/console.css" rel="stylesheet" />
    <link href="~/Content/framework/css/animate.css" rel="stylesheet" />
    <link href="~/Content/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
    <script src="~/Content/jquery/jquery.min.js"></script>
    <script src="~/Content/layui/layui.js"></script>
    <script src="~/Content/framework/js/global.js"></script>

    <script src="~/Content/vue.js"></script>
    <style>
        html {
            height: 100%;
        }

        body {
            height: 100%;
        }

        #app {
            min-height: 100%;
            display: flex;
            flex-flow: column nowrap;
            justify-content: space-between;
        }

        #vue-footer {
            background-color: #ffffff;
            margin-top: 45px;
            text-align: center;
        }
    </style>
</head>
<body>
    <div id="app">
        @RenderBody()
    </div>
</body>
</html>

 PPMX.Web/Areas/Master/Views/_ViewStart.cshtml

New file
@@ -0,0 +1,3 @@
@{
    Layout = "~/Views/Shared/_Layout.cshtml";
}

 PPMX.Web/Areas/Master/Views/web.config

New file
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>

<configuration>
    <configSections>
        <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
            <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
            <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
        </sectionGroup>
    </configSections>

    <system.web.webPages.razor>
        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
        <pages pageBaseType="System.Web.Mvc.WebViewPage">
            <namespaces>
                <add namespace="System.Web.Mvc" />
                <add namespace="System.Web.Mvc.Ajax" />
                <add namespace="System.Web.Mvc.Html" />
                <add namespace="System.Web.Optimization"/>
                <add namespace="System.Web.Routing" />
            </namespaces>
        </pages>
    </system.web.webPages.razor>

    <appSettings>
        <add key="webpages:Enabled" value="false" />
    </appSettings>

    <system.web>
        <httpHandlers>
            <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
        </httpHandlers>

        <!--
        在视图页面中启用请求验证将导致验证在
        控制器已对输入进行处理后发生。默认情况下，
        MVC 在控制器处理输入前执行请求验证。
        若要更改此行为，请对控制器或操作
        应用 ValidateInputAttribute。
    -->
        <pages
            validateRequest="false"
            pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
            pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
            userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
            <controls>
                <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
            </controls>
        </pages>
    </system.web>

    <system.webServer>
        <validation validateIntegratedModeConfiguration="false" />

        <handlers>
            <remove name="BlockViewHandler"/>
            <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
        </handlers>
    </system.webServer>
</configuration>

 PPMX.Web/Areas/Ppm/PpmAreaRegistration.cs

@@ -2,7 +2,7 @@

namespace PPMX.Web.Areas.Ppm
{
    public class PpmAreaRegistration : AreaRegistration 
    public class MasterAreaRegistration : AreaRegistration 
    {
        public override string AreaName 
        {

 PPMX.Web/Areas/System/Views/Shared/_Layout.cshtml

@@ -34,7 +34,7 @@
        #vue-footer {
            background-color: #ffffff;
            margin-top: 45px;
            text-align:center;
            text-align: center;
        }
    </style>
</head>

 PPMX.Web/PPMX.Web.csproj

@@ -160,8 +160,9 @@
    <Compile Include="App_Start\FilterConfig.cs" />
    <Compile Include="App_Start\RouteConfig.cs" />
    <Compile Include="App_Start\WebApiConfig.cs" />
    <Compile Include="Areas\Master\Controllers\GroupController.cs" />
    <Compile Include="Areas\Master\MasterAreaRegistration.cs" />
    <Compile Include="Areas\Ppm\Controllers\EmployeeDashboardController.cs" />
    <Compile Include="Areas\Ppm\Controllers\MasterController.cs" />
    <Compile Include="Areas\Ppm\PpmAreaRegistration.cs" />
    <Compile Include="Areas\System\Controllers\LogController.cs" />
    <Compile Include="Areas\System\Controllers\OrganizeController.cs" />
@@ -218,7 +219,10 @@
    <Content Include="Areas\Ppm\Views\EmployeeDashboard\GetEmployeeCNZJ.cshtml" />
    <Content Include="Areas\Ppm\Views\EmployeeDashboard\GetEmployeeCNZJPercent.cshtml" />
    <Content Include="Areas\Ppm\Views\EmployeeDashboard\GetEmployeeTotalCount.cshtml" />
    <Content Include="Areas\Ppm\Views\Master\Group.cshtml" />
    <Content Include="Areas\Master\Views\_ViewStart.cshtml" />
    <Content Include="Areas\Master\Views\web.config" />
    <Content Include="Areas\Master\Views\Group\Index.cshtml" />
    <Content Include="Areas\Master\Views\Shared\_Layout.cshtml" />
    <None Include="Connected Services\ServiceReference1\VerifyService.disco" />
    <None Include="Connected Services\ServiceReference1\configuration91.svcinfo" />
    <None Include="Connected Services\ServiceReference1\configuration.svcinfo" />
@@ -2118,7 +2122,7 @@
    <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
    <Content Include="Scripts\JQueryTool\CheckVal.js" />
    <Content Include="Scripts\JQueryTool\Method.js" />
    <Content Include="Scripts\Master\Group.js" />
    <Content Include="Scripts\Master\Group\Index.js" />
    <Content Include="Scripts\modernizr-2.8.3.js" />
    <Content Include="Web.config" />
    <Content Include="Web.Debug.config">
@@ -2148,6 +2152,7 @@
  </ItemGroup>
  <ItemGroup>
    <Folder Include="App_Data\" />
    <Folder Include="Areas\Master\Data\" />
    <Folder Include="Areas\Ppm\Data\" />
    <Folder Include="Areas\System\Models\" />
    <Folder Include="Upload\" />

 PPMX.Web/Scripts/Master/Group/Index.js

File was renamed from PPMX.Web/Scripts/Master/Group.js
@@ -4,12 +4,12 @@
}).use(['table', 'form'], function () {
    var form = layui.form;
    table = layui.table;

    alert('6');
    var toolWidth = $('#toolbar').width();
    var param = getGroupParam();
    var tabGroup = table.render({
        elem: '#tabGroup'
        , url: '/Ppm/Master/GroupData'
        , url: '/Master/Group/GetList'
        , where: param
        , method: 'POST'
        , width: toolWidth
@@ -59,7 +59,7 @@
function btn_add() {
    $.layerOpen({
        id: "add",
        title: "新增机构",
        title: "新增",
        width: "670px",
        height: "530px",
        content: "/Master/Group/Form",
@@ -78,7 +78,7 @@
    }
    $.layerOpen({
        id: "edit",
        title: "修改机构",
        title: "修改",
        width: "670px",
        height: "530px",
        content: "/Master/Group/Form?primaryKey=" + ids[0],
@@ -91,7 +91,7 @@
function edit(id) {
    $.layerOpen({
        id: "edit",
        title: "修改机构",
        title: "修改",
        width: "670px",
        height: "530px",
        content: "/Master/Group/Form?primaryKey=" + id,

 PPMX.Web/Views/Shared/_Layout.cshtml

@@ -9,16 +9,15 @@
    <title>@ViewBag.title</title>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width" />

    <link href="~/Content/layui/css/layui.css" rel="stylesheet" />
    <link href="~/Content/framework/css/console.css" rel="stylesheet" />
    <link href="~/Content/framework/css/animate.css" rel="stylesheet" />
    <link href="~/Content/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
    <link href="~/Content/framework/css/animate.css" rel="stylesheet" />


    <script src="~/Content/jquery/jquery.min.js"></script>
    <script src="~/Scripts/JQueryTool/Method.js"></script>
    <script src="~/Content/layui/layui.js"></script>
    <script src="~/Content/framework/js/global.js"></script>
    <script src="~/Content/vue.js"></script>

    @RenderSection("HeaderCSS", required: false)
</head>
<body>

 PPMX.Web/bin/PPMX.Web.dll

Binary files differ

 PPMX.Web/bin/PPMX.Web.pdb

Binary files differ

 PPMX.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 PPMX.Web/obj/Debug/PPMX.Web.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
0c2c9c923488f6dcc59cb9d4c020c072214c638cca1925e9c0db7172d7179670
ca52ac2918b0cfc42474c859db0ebab6434d4345c3ed017259889952883386cd

 PPMX.Web/obj/Debug/PPMX.Web.dll

Binary files differ

 PPMX.Web/obj/Debug/PPMX.Web.pdb

Binary files differ

File was renamed from PPMX.Web/Areas/Ppm/Controllers/MasterController.cs
			@@ -1,28 +1,24 @@
			using PPMX.Entity;
			using PPMX.Logic.Master;
			using PPMX.Web.Controllers;
			using System;
			using System.Collections.Generic;
			using System.Drawing.Drawing2D;
			using System.Linq;
			using System.Web;
			using System.Web.Mvc;

			namespace PPMX.Web.Areas.Ppm.Controllers
			namespace PPMX.Web.Areas.Master.Controllers
			{
			public class MasterController : Controller
			public class GroupController : BaseController
			{
			private GroupLogic groupLogic;

			public MasterController() {
			groupLogic = new GroupLogic();
			}

			public ActionResult Group()
			// GET: Master/Group
			public ActionResult Index()
			{
			return View();
			}

			public ActionResult GroupData(int page, int limit, string keyWord,int Status)
			public ActionResult GetList(int page, int limit, string keyWord, int Status)
			{
			Receive receive = groupLogic.GetList(page, limit, keyWord, Status);
			return Json(new
			@@ -33,8 +29,5 @@
			count = receive.total
			});
			}



			}
			}

New file
			@@ -0,0 +1,24 @@
			using System.Web.Mvc;

			namespace PPMX.Web.Areas.Master
			{
			public class MasterAreaRegistration : AreaRegistration
			{
			public override string AreaName
			{
			get
			{
			return "Master";
			}
			}

			public override void RegisterArea(AreaRegistrationContext context)
			{
			context.MapRoute(
			"Master_default",
			"Master/{controller}/{action}/{id}",
			new { action = "Index", id = UrlParameter.Optional }
			);
			}
			}
			}

File was renamed from PPMX.Web/Areas/Ppm/Views/Master/Group.cshtml
			@@ -1,10 +1,11 @@

			@{
			ViewBag.Title = "Group";
			Layout = "~/Views/Shared/_Layout.cshtml";
			ViewBag.Title = "Index";
			Layout = "~/Areas/Master/Views/Shared/_Layout.cshtml";
			}

			<script src="~/Scripts/JQueryTool/Method.js"></script>
			<script src="~/Scripts/Master/Group.js"></script>
			<script src="~/Scripts/Master/Group/Index.js"></script>

			<div class="panel animated fadeIn">
			<div class="panel-body">
			@@ -19,10 +20,9 @@
			</div><div class="layui-btn-group"></div>
			</div>

			<table id="tabGroup" lay-filter="test"></table>
			<table id="tabGroupIndex" lay-filter="test"></table>

			<div id="paged"></div>
			</div>
			</div>

New file
			@@ -0,0 +1,48 @@
			@{
			Layout = null;
			}

			<!DOCTYPE html>

			<html>
			<head>
			<meta name="viewport" content="width=device-width" />
			<title>@ViewBag.title</title>
			<link href="~/Content/layui/css/layui.css" rel="stylesheet" />
			<link href="~/Content/framework/css/console.css" rel="stylesheet" />
			<link href="~/Content/framework/css/animate.css" rel="stylesheet" />
			<link href="~/Content/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
			<script src="~/Content/jquery/jquery.min.js"></script>
			<script src="~/Content/layui/layui.js"></script>
			<script src="~/Content/framework/js/global.js"></script>

			<script src="~/Content/vue.js"></script>
			<style>
			html {
			height: 100%;
			}

			body {
			height: 100%;
			}

			#app {
			min-height: 100%;
			display: flex;
			flex-flow: column nowrap;
			justify-content: space-between;
			}

			#vue-footer {
			background-color: #ffffff;
			margin-top: 45px;
			text-align: center;
			}
			</style>
			</head>
			<body>
			<div id="app">
			@RenderBody()
			</div>
			</body>
			</html>

New file
			@@ -0,0 +1,3 @@
			@{
			Layout = "~/Views/Shared/_Layout.cshtml";
			}

New file
			@@ -0,0 +1,59 @@
			<?xml version="1.0" encoding="utf-8"?>

			<configuration>
			<configSections>
			<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
			<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
			<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
			</sectionGroup>
			</configSections>

			<system.web.webPages.razor>
			<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
			<pages pageBaseType="System.Web.Mvc.WebViewPage">
			<namespaces>
			<add namespace="System.Web.Mvc" />
			<add namespace="System.Web.Mvc.Ajax" />
			<add namespace="System.Web.Mvc.Html" />
			<add namespace="System.Web.Optimization"/>
			<add namespace="System.Web.Routing" />
			</namespaces>
			</pages>
			</system.web.webPages.razor>

			<appSettings>
			<add key="webpages:Enabled" value="false" />
			</appSettings>

			<system.web>
			<httpHandlers>
			<add path="" verb="" type="System.Web.HttpNotFoundHandler"/>
			</httpHandlers>

			<!--
			在视图页面中启用请求验证将导致验证在
			控制器已对输入进行处理后发生。默认情况下，
			MVC 在控制器处理输入前执行请求验证。
			若要更改此行为，请对控制器或操作
			应用 ValidateInputAttribute。
			-->
			<pages
			validateRequest="false"
			pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
			pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
			userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
			<controls>
			<add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
			</controls>
			</pages>
			</system.web>

			<system.webServer>
			<validation validateIntegratedModeConfiguration="false" />

			<handlers>
			<remove name="BlockViewHandler"/>
			<add name="BlockViewHandler" path="" verb="" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
			</handlers>
			</system.webServer>
			</configuration>

			@@ -2,7 +2,7 @@

			namespace PPMX.Web.Areas.Ppm
			{
			public class PpmAreaRegistration : AreaRegistration
			public class MasterAreaRegistration : AreaRegistration
			{
			public override string AreaName
			{

			@@ -34,7 +34,7 @@
			#vue-footer {
			background-color: #ffffff;
			margin-top: 45px;
			text-align:center;
			text-align: center;
			}
			</style>
			</head>

			@@ -160,8 +160,9 @@
			<Compile Include="App_Start\FilterConfig.cs" />
			<Compile Include="App_Start\RouteConfig.cs" />
			<Compile Include="App_Start\WebApiConfig.cs" />
			<Compile Include="Areas\Master\Controllers\GroupController.cs" />
			<Compile Include="Areas\Master\MasterAreaRegistration.cs" />
			<Compile Include="Areas\Ppm\Controllers\EmployeeDashboardController.cs" />
			<Compile Include="Areas\Ppm\Controllers\MasterController.cs" />
			<Compile Include="Areas\Ppm\PpmAreaRegistration.cs" />
			<Compile Include="Areas\System\Controllers\LogController.cs" />
			<Compile Include="Areas\System\Controllers\OrganizeController.cs" />
			@@ -218,7 +219,10 @@
			<Content Include="Areas\Ppm\Views\EmployeeDashboard\GetEmployeeCNZJ.cshtml" />
			<Content Include="Areas\Ppm\Views\EmployeeDashboard\GetEmployeeCNZJPercent.cshtml" />
			<Content Include="Areas\Ppm\Views\EmployeeDashboard\GetEmployeeTotalCount.cshtml" />
			<Content Include="Areas\Ppm\Views\Master\Group.cshtml" />
			<Content Include="Areas\Master\Views\_ViewStart.cshtml" />
			<Content Include="Areas\Master\Views\web.config" />
			<Content Include="Areas\Master\Views\Group\Index.cshtml" />
			<Content Include="Areas\Master\Views\Shared\_Layout.cshtml" />
			<None Include="Connected Services\ServiceReference1\VerifyService.disco" />
			<None Include="Connected Services\ServiceReference1\configuration91.svcinfo" />
			<None Include="Connected Services\ServiceReference1\configuration.svcinfo" />
			@@ -2118,7 +2122,7 @@
			<Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
			<Content Include="Scripts\JQueryTool\CheckVal.js" />
			<Content Include="Scripts\JQueryTool\Method.js" />
			<Content Include="Scripts\Master\Group.js" />
			<Content Include="Scripts\Master\Group\Index.js" />
			<Content Include="Scripts\modernizr-2.8.3.js" />
			<Content Include="Web.config" />
			<Content Include="Web.Debug.config">
			@@ -2148,6 +2152,7 @@
			</ItemGroup>
			<ItemGroup>
			<Folder Include="App_Data\" />
			<Folder Include="Areas\Master\Data\" />
			<Folder Include="Areas\Ppm\Data\" />
			<Folder Include="Areas\System\Models\" />
			<Folder Include="Upload\" />

File was renamed from PPMX.Web/Scripts/Master/Group.js
			@@ -4,12 +4,12 @@
			}).use(['table', 'form'], function () {
			var form = layui.form;
			table = layui.table;

			alert('6');
			var toolWidth = $('#toolbar').width();
			var param = getGroupParam();
			var tabGroup = table.render({
			elem: '#tabGroup'
			, url: '/Ppm/Master/GroupData'
			, url: '/Master/Group/GetList'
			, where: param
			, method: 'POST'
			, width: toolWidth
			@@ -59,7 +59,7 @@
			function btn_add() {
			$.layerOpen({
			id: "add",
			title: "新增机构",
			title: "新增",
			width: "670px",
			height: "530px",
			content: "/Master/Group/Form",
			@@ -78,7 +78,7 @@
			}
			$.layerOpen({
			id: "edit",
			title: "修改机构",
			title: "修改",
			width: "670px",
			height: "530px",
			content: "/Master/Group/Form?primaryKey=" + ids[0],
			@@ -91,7 +91,7 @@
			function edit(id) {
			$.layerOpen({
			id: "edit",
			title: "修改机构",
			title: "修改",
			width: "670px",
			height: "530px",
			content: "/Master/Group/Form?primaryKey=" + id,

			@@ -9,16 +9,15 @@
			<title>@ViewBag.title</title>
			<meta charset="utf-8">
			<meta name="viewport" content="width=device-width" />

			<link href="~/Content/layui/css/layui.css" rel="stylesheet" />
			<link href="~/Content/framework/css/console.css" rel="stylesheet" />
			<link href="~/Content/framework/css/animate.css" rel="stylesheet" />
			<link href="~/Content/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
			<link href="~/Content/framework/css/animate.css" rel="stylesheet" />


			<script src="~/Content/jquery/jquery.min.js"></script>
			<script src="~/Scripts/JQueryTool/Method.js"></script>
			<script src="~/Content/layui/layui.js"></script>
			<script src="~/Content/framework/js/global.js"></script>
			<script src="~/Content/vue.js"></script>

			@RenderSection("HeaderCSS", required: false)
			</head>
			<body>

			@@ -1 +1 @@
			0c2c9c923488f6dcc59cb9d4c020c072214c638cca1925e9c0db7172d7179670
			ca52ac2918b0cfc42474c859db0ebab6434d4345c3ed017259889952883386cd