From 0e4321412e67b289ba4feee669533326c965b2fb Mon Sep 17 00:00:00 2001
From: skjia <106962133@qq.com>
Date: Tue, 20 Aug 2024 10:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BA=93=E5=8F=8A=E5=B7=A1?=
 =?UTF-8?q?=E6=9F=A5=E7=BB=93=E6=9E=9C=E4=B8=8A=E4=BC=A0-=E8=B4=BE?=
 =?UTF-8?q?=E8=83=9C=E5=87=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hxy-web/html/photoView.html                   |    4 +-
 hxy-web/html/wireManager/header.html          |    2 +
 hxy-web/html/wireManager/staff/staffAdd.html  |   52 +-
 hxy-web/html/wireManager/staff/staffList.html |   19 +-
 .../viewResult/specialPatrolAdd.html          |    4 +-
 .../wireManager/viewResult/uploadPhoto.html   |    5 +-
 .../wireManager/viewResult/viewResult.html    |   10 +-
 .../viewResult/viewResultUpdate.html          |    4 +-
 hxy-web/js/formSelects-v4.css                 |  174 ++
 hxy-web/js/formSelects-v4.js                  | 1791 +++++++++++++++++
 hxy-web/js/public/public.js                   |    2 +
 hxy-web/js/wireManager/header.js              |    4 +-
 hxy-web/js/wireManager/staff/staffAdd.js      |  584 +++---
 hxy-web/js/wireManager/staff/staffList.js     |  144 +-
 .../viewResult/specialPatrolAdd.js            |   63 +-
 .../js/wireManager/viewResult/uploadPhoto.js  |   69 +-
 .../js/wireManager/viewResult/viewResult.js   |  156 +-
 .../viewResult/viewResultUpdate.js            |  334 ++-
 18 files changed, 2847 insertions(+), 574 deletions(-)
 create mode 100644 hxy-web/js/formSelects-v4.css
 create mode 100644 hxy-web/js/formSelects-v4.js

diff --git a/hxy-web/html/photoView.html b/hxy-web/html/photoView.html
index 1d86c3f..8af33e9 100644
--- a/hxy-web/html/photoView.html
+++ b/hxy-web/html/photoView.html
@@ -43,10 +43,10 @@
 		}
 		
 		//测试用
-		path = 'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/08ffd23539df47ed873058a163249ffe005Qblgkgy1h3h38c7wwrj30q70q7gs5.jpg';
+		// path = 'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/08ffd23539df47ed873058a163249ffe005Qblgkgy1h3h38c7wwrj30q70q7gs5.jpg';
 		// path = fileUrl + "/" + filePath[i];
 		
-		var html = `<img src="${path}" style="height:100%"/>`
+		var html = `<img src="${filePath}" style="height:100%"/>`
 		$("#content").empty();
 		$("#content").append(html);
     });
diff --git a/hxy-web/html/wireManager/header.html b/hxy-web/html/wireManager/header.html
index 7c58845..302986f 100644
--- a/hxy-web/html/wireManager/header.html
+++ b/hxy-web/html/wireManager/header.html
@@ -10,7 +10,9 @@
 		<script src="../../js/public/public_utils.js"></script>
 		<script src="../../js/public/aescbc.js"></script>
 		<script src="../../plugs/layui-v2.9.2/layui/layui.js"></script>
+		<script type="text/javascript" src="../../js/formSelects-v4.js"></script>
 	    <link href="../../plugs/layui-v2.9.2/layui/css/layui.css" rel="stylesheet">
+		<link rel="stylesheet" href="../../js/formSelects-v4.css" type="text/css">
 		<!-- <script src="../../util/Interceptor.js"></script> -->
 		<!--业务js-->
 		<script src="../../js/wireManager/header.js"></script>
diff --git a/hxy-web/html/wireManager/staff/staffAdd.html b/hxy-web/html/wireManager/staff/staffAdd.html
index 2eceae1..f5c0b13 100644
--- a/hxy-web/html/wireManager/staff/staffAdd.html
+++ b/hxy-web/html/wireManager/staff/staffAdd.html
@@ -8,8 +8,10 @@
 		<script src="../../../js/public/aescbc.js"></script>
 		<script src="../../../plugs/jquery/jquery-3.6.0.min.js"></script>
 		<script src="../../../plugs/layui-v2.9.2/layui/layui.js"></script>
+		<script type="text/javascript" src="../../../js/formSelects-v4.js"></script>
 	    <link href="../../../plugs/layui-v2.9.2/layui/css/layui.css" rel="stylesheet">
-		<script src="../../../util/Interceptor.js"></script>
+		<link href="../../../js/formSelects-v4.css" rel="stylesheet">
+		<!-- <script src="../../../util/Interceptor.js"></script> -->
 		<!--业务js-->
 		<script src="../../../js/wireManager/staff/staffAdd.js"></script>
         <!-- css -->
@@ -113,6 +115,9 @@
         <div class="content">
 			<form class="form-inline layui-form" action="">
 				<input type="hidden" id="id" name="id">
+				<input type="hidden" id="gtId" name="gtId">
+				<input type="hidden" id="proId" name="proId">
+				<input type="hidden" id="userType" name="userType" value="0">
 				<div class="layui-form-item" style="margin-top: 1%;margin-left: 12%;">
 					<div class="layui-inline" style="width: 90%;" >
 						<span style="border: 3px solid #409EFF;width: 20px;height: 10px;margin-left: 5%"></span>人员基本信息
@@ -134,8 +139,8 @@
 						<label class="layui-form-label" style="width: 320px;">
 							<i class="tip-required" style="color: red;font-size: 20px">*</i>身份证号：</label>
 						<div class="layui-input-inline">
-							<input type="text" name="idCard" id="idCard" class="layui-input"
-								   lay-verify="idCard" maxlength="200" placeholder="请填写身份证号" style="width: 425px">
+							<input type="text" name="idNumber" id="idNumber" class="layui-input"
+								   lay-verify="idNumber" maxlength="200" placeholder="请填写身份证号" style="width: 425px">
 						</div>
 					</div>
 				</div>
@@ -154,7 +159,7 @@
 						<label class="layui-form-label" style="width: 320px;">
 							<i class="tip-required" style="color: red;font-size: 20px">*</i> 出生年月：</label>
 						<div class="layui-input-inline">
-							<input type="text" name="ages" id="ages" class="layui-input" readonly style="width: 425px" placeholder="根据身份证号码自动计算">
+							<input type="text" name="beBorn" id="beBorn" class="layui-input" readonly style="width: 425px" placeholder="根据身份证号码自动计算">
 						</div>
 					</div>
 				</div>
@@ -163,8 +168,8 @@
 						<label class="layui-form-label" style="width: 320px;">
 							<i class="tip-required" style="color: red;font-size: 20px">*</i>联系电话：</label>
 						<div class="layui-input-inline">
-							<input type="text" name="phone" id="phone" class="layui-input"
-								   lay-verify="phoneNum" maxlength="200" placeholder="请填写人员联系电话" style="width: 425px">
+							<input type="text" name="tel" id="tel" class="layui-input"
+								   lay-verify="tel" maxlength="200" placeholder="请填写人员联系电话" style="width: 425px">
 						</div>
 					</div>
 				</div>
@@ -183,8 +188,8 @@
 						<label class="layui-form-label" style="width: 320px;">
 							<i class="tip-required" style="color: red;font-size: 20px">*</i>健康状况：</label>
 						<div class="layui-input-inline">
-							<input type="text" name="health" id="health" class="layui-input"
-								 maxlength="200" placeholder="请填写人员健康状况" style="width: 425px">
+							<input type="text" name="healthStatus" id="healthStatus" class="layui-input"
+								lay-verify="required" maxlength="200" placeholder="请填写人员健康状况" style="width: 425px">
 						</div>
 					</div>
 				</div>
@@ -193,8 +198,8 @@
 						<label class="layui-form-label" style="width: 320px;">
 							<i class="tip-required" style="color: red;font-size: 20px">*</i>文化程度：</label>
 						<div class="layui-input-inline">
-							<input type="text" name="level" id="level" class="layui-input"
-								 maxlength="200" placeholder="请填写人员文化程度" style="width: 425px">
+							<input type="text" name="degree" id="degree" class="layui-input"
+								lay-verify="required" maxlength="200" placeholder="请填写人员文化程度" style="width: 425px">
 						</div>
 					</div>
 				</div>
@@ -203,8 +208,8 @@
 					<div class="layui-input-inline" style="width: 820px">
 						<label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 人员类型：</label>
 						<div class="layui-input-block btnOption1 bmscTrain">
-							<div data-value="1" class="pass">正式人员</div>
-							<div data-value="2">临时人员</div>
+							<div data-value="0" class="pass">正式人员</div>
+							<div data-value="1">临时人员</div>
 						</div>
 					</div>
 				</div>
@@ -222,13 +227,7 @@
 								<label class="layui-form-label" style="width: 120px;">
 									<i class="tip-required" style="color: red;font-size: 20px">*</i>管辖线路名称：</label>
 								<div class="layui-input-inline">
-									<select id="line" name="line" class="layui-select"  lay-verify="required" lay-search>
-										<option value="1">xxx工程</option>
-										<option value="2">xxx工程</option>
-										<option value="3">xxx工程</option>
-										<option value="4">xxx工程</option>
-										<option value="5">xxx工程</option>
-									</select>
+									<select id="proName" name="proName" xm-select="proName" xm-select-show-count="10" lay-filter="proName" lay-search="">
 								</div>
 							</div>
 						</div>
@@ -238,7 +237,7 @@
 									<i class="tip-required" style="color: red;font-size: 20px">*</i>范围、基数：
 								</label>
 								<div class="layui-input-inline">
-									<textarea id="area" name="area" class="layui-textarea layui-input-inline"
+									<textarea id="gtName" name="gtName" class="layui-textarea layui-input-inline"
 											  placeholder="请填写范围、基数" style="width: 425px;max-height: 200px;" lay-verify="required" maxlength="500"></textarea>
 								</div>
 							</div>
@@ -259,7 +258,7 @@
 																				 style="color: red;font-size: 20px">*</i>
 																				 工资核定标准（按量）：</label>
 						<div class="layui-input-inline">
-							<input type="text" lay-affix="number" min="0" oninput="this.value=this.value.replace(/[^0-9]\d*/g,'')" name="payAll" id="payAll"
+							<input type="text" lay-affix="number" min="0" oninput="this.value=this.value.replace(/[^0-9]\d*/g,'')" name="wagesMeasure" id="wagesMeasure"
 								   class="layui-input" lay-verify="required" placeholder="请填写" style="width: 425px">
 						</div>
 						<div class="layui-form-mid layui-word-aux">元/基</div>
@@ -271,7 +270,7 @@
 																				 style="color: red;font-size: 20px">*</i>
 																				 工资核定标准（按天）：</label>
 						<div class="layui-input-inline">
-							<input type="text" lay-affix="number" min="0" oninput="this.value=this.value.replace(/[^0-9]\d*/g,'')" name="payDay" id="payDay"
+							<input type="text" lay-affix="number" min="0" oninput="this.value=this.value.replace(/[^0-9]\d*/g,'')" name="wagesDay" id="wagesDay"
 								   class="layui-input" lay-verify="required" placeholder="请填写" style="width: 425px">
 						</div>
 						<div class="layui-form-mid layui-word-aux">元/天</div>
@@ -322,7 +321,7 @@
 						<label class="layui-form-label" style="width: 320px;">
 							<i class="tip-required" style="color: red;font-size: 20px">*</i>开户行：</label>
 						<div class="layui-input-inline">
-							<input type="text" name="ban1" id="ban1" class="layui-input"
+							<input type="text" name="bank" id="bank" class="layui-input"
 									lay-verify="required" maxlength="200" placeholder="请填写开户行" style="width: 425px">
 						</div>
 					</div>
@@ -332,7 +331,7 @@
 						<label class="layui-form-label" style="width: 320px;">
 							<i class="tip-required" style="color: red;font-size: 20px">*</i>银行卡号：</label>
 						<div class="layui-input-inline">
-							<input type="text" name="ban2" id="ban2" class="layui-input"
+							<input type="text" name="bankCard" id="bankCard" class="layui-input"
 									lay-verify="required" maxlength="200" placeholder="请填写银行卡号" style="width: 425px">
 						</div>
 					</div>
@@ -342,7 +341,7 @@
 						<label class="layui-form-label" style="width: 320px;">
 							<i class="tip-required" style="color: red;font-size: 20px">*</i>银联号：</label>
 						<div class="layui-input-inline">
-							<input type="text" name="ban3" id="ban3" class="layui-input"
+							<input type="text" name="unionpayNum" id="unionpayNum" class="layui-input"
 									lay-verify="required" maxlength="200" placeholder="请填写人银联号" style="width: 425px">
 						</div>
 					</div>
@@ -352,7 +351,7 @@
 						<label class="layui-form-label" style="width: 320px;">
 							银行支行：</label>
 						<div class="layui-input-inline">
-							<input type="text" name="ban4" id="ban4" class="layui-input"
+							<input type="text" name="bankBranch" id="bankBranch" class="layui-input"
 								 maxlength="200" placeholder="请填写银行支行" style="width: 425px">
 						</div>
 					</div>
@@ -362,6 +361,7 @@
 				<div class="footerBox">
 					<button id="closeBt" class="layui-btn layui-btn-primary layui-border-blue" style="margin-top: 1%;">取消</button>
 					<button id="submitBt" type="button" class="layui-btn layui-btn-normal" style="margin-top: 1%;" lay-submit lay-filter="formDemo">保存</button>
+					<button id="hideUpload1" type="button" style="display: none"></button>
 				</div>
 			</form>
         </div>
diff --git a/hxy-web/html/wireManager/staff/staffList.html b/hxy-web/html/wireManager/staff/staffList.html
index 2f90d79..bbda79a 100644
--- a/hxy-web/html/wireManager/staff/staffList.html
+++ b/hxy-web/html/wireManager/staff/staffList.html
@@ -9,7 +9,7 @@
 		<script src="../../../plugs/jquery/jquery-3.6.0.min.js"></script>
 		<script src="../../../plugs/layui-v2.9.2/layui/layui.js"></script>
 	    <link href="../../../plugs/layui-v2.9.2/layui/css/layui.css" rel="stylesheet">
-		<script src="../../../util/Interceptor.js"></script>
+		<!-- <script src="../../../util/Interceptor.js"></script> -->
 		<!--业务js-->
 		<script src="../../../js/wireManager/staff/staffList.js"></script>
 
@@ -34,34 +34,35 @@
         <div style="height: 96%;width: 98%;display: flex;flex-direction: column;margin: 0 auto;background-color: #FFFFFF;border-radius: 10px;padding: 10px;"> 
 			<header style="height: 10%">
 				<form class="layui-form" onsubmit="return false">
+					<input id="yjId" name="yjId" hidden >
 					<div class="form-group" style="margin-top: 0.5%">
 						<div class="layui-inline">
 							<div class="layui-input-inline">
-								<input id="search1" type="text" class="layui-input" placeholder="人员姓名" >
+								<input id="userName" type="text" class="layui-input" placeholder="人员姓名" >
 							</div>
 						</div>
 						<div class="layui-inline">
 							<div class="layui-input-inline">
-								<input id="search2" type="text" class="layui-input" placeholder="工程名称" >
+								<input id="proName" type="text" class="layui-input" placeholder="工程名称" >
 							</div>
 						</div>
 						<div class="layui-inline">
 							<div class="layui-input-inline">
-								<select id="search3" name="search3" class="layui-select" lay-verify="required">
+								<select id="contractState" name="contractState" class="layui-select" >
 									<option value="" selected>合同状态-全部</option>
 									<option value="1" >已签订</option>
-									<option value="2" >未签订</option>
-									<option value="4" >已过期</option>
-									<option value="5" >临期预警-1个月</option>
+									<option value="0" >未签订</option>
+									<option value="2" >已过期</option>
+									<option value="3" >临期预警-1个月</option>
 								</select>
 							</div>
 						</div>
 						<div class="layui-inline">
 							<div class="layui-input-inline">
-								<select id="search4" name="search4" class="layui-select" lay-verify="required">
+								<select id="userState" name="userState" class="layui-select" >
 									<option value="" selected>人员状态-全部</option>
 									<option value="1" >在职</option>
-									<option value="2" >离职</option>
+									<option value="0" >离职</option>
 								</select>
 							</div>
 						</div>
diff --git a/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html b/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html
index 4097c8b..017fcf6 100644
--- a/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html
+++ b/hxy-web/html/wireManager/viewResult/specialPatrolAdd.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!-- <!DOCTYPE html> -->
 <html>
 <head>
 	<meta charset="UTF-8">
@@ -9,7 +9,7 @@
 	<script src="../../../plugs/jquery/jquery-3.6.0.min.js"></script>
 	<script src="../../../plugs/layui-v2.9.2/layui/layui.js"></script>
 	<link href="../../../plugs/layui-v2.9.2/layui/css/layui.css" rel="stylesheet">
-	<script src="../../../util/Interceptor.js"></script>
+	<!-- <script src="../../../util/Interceptor.js"></script> -->
 	<script src="../../../js/wireManager/viewResult/specialPatrolAdd.js"></script>
     <style type="text/css">
         .layui-form-label {
diff --git a/hxy-web/html/wireManager/viewResult/uploadPhoto.html b/hxy-web/html/wireManager/viewResult/uploadPhoto.html
index 9f8eadd..219ee1b 100644
--- a/hxy-web/html/wireManager/viewResult/uploadPhoto.html
+++ b/hxy-web/html/wireManager/viewResult/uploadPhoto.html
@@ -9,7 +9,7 @@
 	<script src="../../../plugs/jquery/jquery-3.6.0.min.js"></script>
 	<script src="../../../plugs/layui-v2.9.2/layui/layui.js"></script>
 	<link href="../../../plugs/layui-v2.9.2/layui/css/layui.css" rel="stylesheet">
-	<script src="../../../util/Interceptor.js"></script>
+	<!-- <script src="../../../util/Interceptor.js"></script> -->
 	<script src="../../../js/wireManager/viewResult/uploadPhoto.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -26,6 +26,9 @@
     <form class="layui-form" action="">
 		<div class="layui-form-item" style="margin-top: 5%;">
 			<div class="layui-inline">
+				<input type="hidden" id="gtId" name="gtId">
+				<input type="hidden" id="month" name="month">
+				<input type="hidden" id="numTimes" name="numTimes">
 				<label class="layui-form-label" style="width:220px;">
 					<i class="tip-required" style="color: red;font-size: 20px">*</i>考勤照片(可多个):</label>
 				<div class="layui-input-inline" style="width: 610px;">
diff --git a/hxy-web/html/wireManager/viewResult/viewResult.html b/hxy-web/html/wireManager/viewResult/viewResult.html
index 2adfdc6..bf2fc35 100644
--- a/hxy-web/html/wireManager/viewResult/viewResult.html
+++ b/hxy-web/html/wireManager/viewResult/viewResult.html
@@ -9,7 +9,7 @@
 		<script src="../../../plugs/jquery/jquery-3.6.0.min.js"></script>
 		<script src="../../../plugs/layui-v2.9.2/layui/layui.js"></script>
 	    <link href="../../../plugs/layui-v2.9.2/layui/css/layui.css" rel="stylesheet">
-		<script src="../../../util/Interceptor.js"></script>
+		<!-- <script src="../../../util/Interceptor.js"></script> -->
 		<!--业务js-->
 		<script src="../../../js/wireManager/viewResult/viewResult.js"></script>
 
@@ -38,22 +38,22 @@
 					<div class="form-group" style="margin-top: 0.5%">
 						<div class="layui-inline">
 							<div class="layui-input-inline">
-								<input id="search1" type="text" class="layui-input" placeholder="输入姓名" >
+								<input id="userName" name="userName" type="text" class="layui-input" placeholder="输入姓名" >
 							</div>
 						</div>
 						<div class="layui-inline">
 							<div class="layui-input-inline">
-								<input id="search2" type="text" class="layui-input" placeholder="输入工作站" >
+								<input id="yjName" name="yjName" type="text" class="layui-input" placeholder="输入工作站" >
 							</div>
 						</div>
 						<div class="layui-inline">
 							<div class="layui-input-inline">
-								<input id="search3" type="text" class="layui-input" placeholder="输入工程名称" >
+								<input id="proName" name="proName" type="text" class="layui-input" placeholder="输入工程名称" >
 							</div>
 						</div>
 						<div class="layui-inline">
 							<div class="layui-input-inline">
-								<input id="dataTime" name="dataTime" type="text" class="layui-input" placeholder="请选择月份">
+								<input id="makeMonth" name="makeMonth" name="makeMonth" type="text" class="layui-input" placeholder="请选择月份">
 							</div>
 						</div>
 						<button class="layui-btn layui-btn-sm" lay-submit lay-filter="query">
diff --git a/hxy-web/html/wireManager/viewResult/viewResultUpdate.html b/hxy-web/html/wireManager/viewResult/viewResultUpdate.html
index c3fd6e1..13bbf50 100644
--- a/hxy-web/html/wireManager/viewResult/viewResultUpdate.html
+++ b/hxy-web/html/wireManager/viewResult/viewResultUpdate.html
@@ -9,7 +9,7 @@
 		<script src="../../../plugs/jquery/jquery-3.6.0.min.js"></script>
 		<script src="../../../plugs/layui-v2.9.2/layui/layui.js"></script>
 	    <link href="../../../plugs/layui-v2.9.2/layui/css/layui.css" rel="stylesheet">
-		<script src="../../../util/Interceptor.js"></script>
+		<!-- <script src="../../../util/Interceptor.js"></script> -->
 		<!--业务js-->
 		<script src="../../../js/wireManager/viewResult/viewResultUpdate.js"></script>
 
@@ -253,7 +253,7 @@
 		</div>
 		<div id="projects">
 			
-			
+		<input type="hidden" id="id" name="id">	
 		</div>
         <div class="detail-content">
             <div style="width: 100%;height: 88%;">
diff --git a/hxy-web/js/formSelects-v4.css b/hxy-web/js/formSelects-v4.css
new file mode 100644
index 0000000..d7d6981
--- /dev/null
+++ b/hxy-web/js/formSelects-v4.css
@@ -0,0 +1,174 @@
+/* formSelects多选css */
+select[xm-select]{display: none !important;}
+.xm-select-parent * {margin: 0;padding: 0;font-family: "Helvetica Neue", Helvetica, "PingFang SC", 微软雅黑, Tahoma, Arial, sans-serif; box-sizing: initial;}
+.xm-select-parent {text-align: left;}
+.xm-select-parent select {display: none;}
+.xm-select-parent .xm-select-title {position: relative;min-height: 36px;}
+.xm-select-parent .xm-input {cursor: pointer;border-radius: 2px;border-width: 1px;border-style: solid;border-color: #E6E6E6;display: block;width: 100%;box-sizing: border-box;background-color: #FFF;height: 36px;line-height: 1.3;padding-left: 10px;outline: 0}
+.xm-select-parent .xm-select-sj {display: inline-block;width: 0;height: 0;border-style: dashed;border-color: transparent;overflow: hidden;position: absolute;right: 10px;top: 50%;margin-top: -3px;cursor: pointer;border-width: 6px;border-top-color: #C2C2C2;border-top-style: solid;transition: all .3s;-webkit-transition: all .3s}
+.xm-select-parent .xm-form-selected .xm-select-sj {margin-top: -9px;transform: rotate(180deg)}
+.xm-select-parent .xm-form-select dl {display: none;position: absolute;left: 0;top: 42px;padding: 5px 0;z-index: 999;min-width: 100%;border: 1px solid #d2d2d2;max-height: 300px;overflow-y: auto;background-color: #fff;border-radius: 2px;box-shadow: 0 2px 4px rgba(0, 0, 0, .12);box-sizing: border-box;animation-fill-mode: both;-webkit-animation-name: layui-upbit;animation-name: layui-upbit;-webkit-animation-duration: .3s;animation-duration: .3s;-webkit-animation-fill-mode: both;animation-fill-mode: both}
+@-webkit-keyframes layui-upbit {
+	from {-webkit-transform: translate3d(0, 30px, 0);opacity: .3}
+	to {-webkit-transform: translate3d(0, 0, 0);opacity: 1}
+}
+@keyframes layui-upbit {
+	from {transform: translate3d(0, 30px, 0);opacity: .3}
+	to {transform: translate3d(0, 0, 0);opacity: 1}
+}
+.xm-select-parent .xm-form-selected dl {display: block}
+.xm-select-parent .xm-form-select dl dd,.xm-select-parent .xm-form-select dl dt {padding: 0 10px;line-height: 36px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis}
+.xm-select-parent .xm-form-select dl dd {cursor: pointer;height: 36px;}
+.xm-select-parent .xm-form-select dl dd:hover {background-color: #f2f2f2}
+.xm-select-parent .xm-form-select dl dt {font-size: 12px;color: #999}
+.layui-select-disabled .xm-dis-disabled {border-color: #eee!important}
+.xm-select-parent .xm-form-select dl .xm-select-tips {padding-left: 10px!important;color: #999;font-size: 14px}
+.xm-unselect {-moz-user-select: none;-webkit-user-select: none;-ms-user-select: none}
+
+.xm-form-checkbox {position: relative;display: block;vertical-align: middle;cursor: pointer;font-size: 0;-webkit-transition: .1s linear;transition: .1s linear;box-sizing: border-box;height: auto!important;line-height: normal!important;border: none!important;margin-right: 0;padding-right: 0;background: 0 0;}
+.xm-form-checkbox > i {color: #FFF; font-size: 16px; width: 16px; height: 16px; position: absolute; top: 9px; border: 1px solid #5FB878; border-radius: 3px; z-index: 2;}
+.xm-form-checkbox:hover > i {border-color: #5FB878;}
+.xm-form-checkbox > span{display: block;position: relative;padding: 0 15px 0 30px;height: 100%;font-size: 14px;border-radius: 2px 0 0 2px;background-color: #d2d2d2;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;background: 0 0;color: #666;line-height: 36px;}
+
+.xm-select-parent dl{width: 100%;}
+.xm-select-parent dl dd{position: relative;}
+.xm-select-parent dl dd > i:not(.icon-sousuo){position: absolute; right: 10px; top: 0; color: #AAAAAA;}
+.xm-select-parent dl dd.xm-select-this div i {border: none; color: #009688; font-size: 18px;}
+.xm-select-parent dl dd.xm-select-this div i:after{content: '\e613';}
+.xm-select-parent dl dd.xm-dis-disabled div i {border-color: #C2C2C2;}
+.xm-select-parent dl dd.xm-dis-disabled.xm-select-this div i {color: #C2C2C2;}
+.xm-select-radio div.xm-form-checkbox > i {border-radius: 20px;}
+.xm-select-parent dl.xm-select-radio dd.xm-select-this div i:after{content: '\e62b';}
+
+.xm-dis-disabled,.xm-dis-disabled:hover {cursor: not-allowed!important}
+.xm-form-select dl dd.xm-dis-disabled {background-color: #fff!important}
+.xm-form-select dl dd.xm-dis-disabled span {color: #C2C2C2}
+.xm-form-select dl dd.xm-dis-disabled .xm-icon-yes {border-color: #C2C2C2}
+.xm-select-parent {position: relative;-moz-user-select: none;-ms-user-select: none;-webkit-user-select: none}
+.xm-select-parent .xm-select {line-height: normal;height: auto;padding: 4px 10px 1px 10px;overflow: hidden;min-height: 36px;left: 0;z-index: 99;position: absolute;background: 0 0;padding-right: 20px}
+.xm-select-parent .xm-select:hover {border-color: #C0C4CC}
+.xm-select-parent .xm-select .xm-select-label {display: inline-block;margin: 0;vertical-align: middle}
+.xm-select-parent .xm-select-title div.xm-select-label>span {position: relative;padding: 2px 5px;background-color: #009688;border-radius: 2px;color: #FFF;display: inline-block;line-height: 18px;height: 18px;margin: 2px 5px 2px 0;cursor: initial;user-select: none;font-size: 14px;padding-right: 25px;-webkit-user-select: none;}
+.xm-select-parent .xm-select-title div.xm-select-label>span i {position: absolute; margin-left: 8px; font-size: 12px; cursor: pointer; line-height: 20px;}
+.xm-select-parent .xm-select .xm-select-input {border: none;height: 28px;background-color: transparent;padding: 0;vertical-align: middle;display: inline-block;width: 50px}
+.xm-select-parent .xm-select--suffix input {border: none}
+.xm-form-selected .xm-select,.xm-form-selected .xm-select:hover {border-color: #009688!important}
+.xm-select--suffix+div {position: absolute;top: 0;left: 0;bottom: 0;right: 0}
+.xm-select-dis .xm-select--suffix+div {z-index: 100;cursor: no-drop!important;opacity: .2;background-color: #FFF;}
+.xm-select-disabled,.xm-select-disabled:hover {color: #d2d2d2!important;cursor: not-allowed!important;background-color: #fff}
+.xm-select-none {display: none;margin: 5px 0;text-align: center;}
+.xm-select-none:hover {background-color: #FFF!important}
+.xm-select-empty {display: block}
+.xm-span-hide {display: none!important;}
+.layui-form-pane .xm-select,.layui-form-pane .xm-select:hover {border: none!important;top: 0px}
+.layui-form-pane .xm-select-title {border: 1px solid #e6e6e6!important}
+.xm-select-hide {display: none !important;}
+div[xm-hg] .xm-select-label{white-space: nowrap; overflow: hidden; position: absolute; right: 30px; left: 0; padding-left: 10px;}
+
+/* 颜色相关 */
+div[xm-select-skin] .xm-select-title div.xm-select-label>span {border: 1px solid #009688}
+div[xm-select-skin] .xm-select-title div.xm-select-label>span i:hover {opacity: .8;filter: alpha(opacity=80);cursor: pointer}
+div[xm-select-skin=default] .xm-select-title div.xm-select-label>span {background-color: #F0F2F5;color: #909399;border: 1px solid #F0F2F5}
+div[xm-select-skin=default] .xm-select-title div.xm-select-label>span i {color: #C0C4CC}
+div[xm-select-skin=default] .xm-select-title div.xm-select-label>span i:before {content: '\e60b'; font-size: 16px; margin-left: -3px;}
+div[xm-select-skin=default] dl dd:not(.xm-dis-disabled) i {border-color: #5FB878}
+div[xm-select-skin=default] dl dd.xm-select-this:not(.xm-dis-disabled) i {color: #5FB878}
+div[xm-select-skin=default].xm-form-selected .xm-select,div[xm-select-skin=default].xm-form-selected .xm-select:hover {border-color: #C0C4CC!important}
+div[xm-select-skin=primary] .xm-select-title div.xm-select-label>span {background-color: #009688;color: #FFF;border: 1px solid #009688}
+div[xm-select-skin=primary] .xm-select-title div.xm-select-label>span i {background-color: #009688; color: #FFF}
+div[xm-select-skin=primary] dl dd:not(.xm-dis-disabled) i {border-color: #009688}
+div[xm-select-skin=primary] dl dd.xm-select-this:not(.xm-dis-disabled) i {color: #009688}
+div[xm-select-skin=primary].xm-form-selected .xm-select,div[xm-select-skin=primary].xm-form-selected .xm-select:hover {border-color: #009688!important}
+div[xm-select-skin=normal] .xm-select-title div.xm-select-label>span {background-color: #1E9FFF;color: #FFF;border: 1px solid #1E9FFF}
+div[xm-select-skin=normal] .xm-select-title div.xm-select-label>span i {background-color: #1E9FFF;color: #FFF}
+div[xm-select-skin=normal] dl dd:not(.xm-dis-disabled) i {border-color: #1E9FFF}
+div[xm-select-skin=normal] dl dd.xm-select-this:not(.xm-dis-disabled) i {color: #1E9FFF}
+div[xm-select-skin=normal].xm-form-selected .xm-select,div[xm-select-skin=normal].xm-form-selected .xm-select:hover {border-color: #1E9FFF!important}
+div[xm-select-skin=warm] .xm-select-title div.xm-select-label>span {background-color: #FFB800;color: #FFF;border: 1px solid #FFB800}
+div[xm-select-skin=warm] .xm-select-title div.xm-select-label>span i {background-color: #FFB800;color: #FFF}
+div[xm-select-skin=warm] dl dd:not(.xm-dis-disabled) i {border-color: #FFB800}
+div[xm-select-skin=warm] dl dd.xm-select-this:not(.xm-dis-disabled) i {color: #FFB800}
+div[xm-select-skin=warm].xm-form-selected .xm-select,div[xm-select-skin=warm].xm-form-selected .xm-select:hover {border-color: #FFB800!important}
+div[xm-select-skin=danger] .xm-select-title div.xm-select-label>span {background-color: #FF5722;color: #FFF;border: 1px solid #FF5722}
+div[xm-select-skin=danger] .xm-select-title div.xm-select-label>span i {background-color: #FF5722;color: #FFF}
+div[xm-select-skin=danger] dl dd:not(.xm-dis-disabled) i {border-color: #FF5722}
+div[xm-select-skin=danger] dl dd.xm-select-this:not(.xm-dis-disabled) i {color: #FF5722}
+div[xm-select-skin=danger].xm-form-selected .xm-select,div[xm-select-skin=danger].xm-form-selected .xm-select:hover {border-color: #FF5722!important}
+
+
+/* 多选联动  */
+.xm-select-parent .layui-form-danger+.xm-select-title .xm-select {border-color: #FF5722 !important;}
+.xm-select-linkage li {padding: 10px 0px;cursor: pointer;}
+.xm-select-linkage li span {padding-left: 20px;padding-right: 30px;display: inline-block;height: 20px;overflow: hidden;text-overflow: ellipsis;}
+.xm-select-linkage li.xm-select-this span {border-left: 5px solid #009688;color: #009688;padding-left: 15px;}
+.xm-select-linkage-group {position: absolute;left: 0;top: 0;right: 0;bottom: 0;overflow-x: hidden;overflow-y: auto;}
+.xm-select-linkage-group li:hover {border-left: 1px solid #009688;}
+.xm-select-linkage-group li:hover span {padding-left: 19px;}
+.xm-select-linkage-group li.xm-select-this:hover span {padding-left: 15px;border-left-width: 4px;}
+.xm-select-linkage-group:nth-child(4n+1){background-color: #EFEFEF; left: 0;}
+.xm-select-linkage-group:nth-child(4n+1) li.xm-select-active{background-color: #F5F5F5;}
+.xm-select-linkage-group:nth-child(4n+2){background-color: #F5F5F5; left: 100px;}
+.xm-select-linkage-group:nth-child(4n+3) li.xm-select-active{background-color: #FAFAFA;}
+.xm-select-linkage-group:nth-child(4n+3){background-color: #FAFAFA; left: 200px;}
+.xm-select-linkage-group:nth-child(4n+3) li.xm-select-active{background-color: #FFFFFF;}
+.xm-select-linkage-group:nth-child(4n+4){background-color: #FFFFFF; left: 300px;}
+.xm-select-linkage-group:nth-child(4n+4) li.xm-select-active{background-color: #EFEFEF;}
+.xm-select-linkage li{list-style: none;}
+.xm-select-linkage-hide {display: none;}
+.xm-select-linkage-show {display: block;}
+
+div[xm-select-skin='default'] .xm-select-linkage li.xm-select-this span {border-left-color: #5FB878;color: #5FB878;}
+div[xm-select-skin='default'] .xm-select-linkage-group li:hover {border-left-color: #5FB878;}
+div[xm-select-skin='primary'] .xm-select-linkage li.xm-select-this span {border-left-color: #1E9FFF;color: #1E9FFF;}
+div[xm-select-skin='primary'] .xm-select-linkage-group li:hover {border-left-color: #1E9FFF;}
+div[xm-select-skin='normal'] .xm-select-linkage li.xm-select-this span {border-left-color: #1E9FFF;color: #1E9FFF;}
+div[xm-select-skin='normal'] .xm-select-linkage-group li:hover {border-left-color: #1E9FFF;}
+div[xm-select-skin='warm'] .xm-select-linkage li.xm-select-this span {border-left-color: #FFB800;color: #FFB800;}
+div[xm-select-skin='warm'] .xm-select-linkage-group li:hover {border-left-color: #FFB800;}
+div[xm-select-skin='danger'] .xm-select-linkage li.xm-select-this span {border-left-color: #FF5722;color: #FF5722;}
+div[xm-select-skin='danger'] .xm-select-linkage-group li:hover {border-left-color: #FF5722;}
+
+
+/* 快捷操作 */
+.xm-select-tips[style]:hover{background-color: #FFF!important;}
+.xm-select-parent dd > .xm-cz{position: absolute; top: 0px; right: 10px;}
+.xm-select-parent dd > .xm-cz-group{margin-right: 30px; border-right: 2px solid #ddd; height: 16px; margin-top: 10px; line-height: 16px; overflow: hidden;}
+.xm-select-parent dd > .xm-cz-group .xm-cz{display: inline-block; margin-right: 30px;}
+.xm-select-parent dd > .xm-cz-group .xm-cz i{margin-right: 10px;}
+.xm-select-parent dd > .xm-cz-group[show='name'] .xm-cz i{display: none;}
+.xm-select-parent dd > .xm-cz-group[show='icon'] .xm-cz span{display: none;}
+.xm-select-parent dd .xm-cz:hover{color: #009688;}
+div[xm-select-skin='default'] dd .xm-cz:hover{color: #C0C4CC;}
+div[xm-select-skin='primary'] dd .xm-cz:hover{color: #009688;}
+div[xm-select-skin='normal'] dd .xm-cz:hover{color: #1E9FFF;}
+div[xm-select-skin='warm'] dd .xm-cz:hover{color: #FFB800;}
+div[xm-select-skin='danger'] dd .xm-cz:hover{color: #FF5722;}
+
+
+/* 下拉里面的搜索 */
+.xm-select-tips .xm-input{border: none; border-bottom: 1px solid #E6E6E6; padding-left: 27px;}
+.xm-select-tips .icon-sousuo{position: absolute;}
+.xm-select-tips.xm-dl-input{display: none;}
+div[xm-select-search-type="1"] .xm-select-tips.xm-dl-input{display: block;}
+div[xm-select-search-type="1"] .xm-select .xm-select-input{display: none !important;}
+
+/* 阿里巴巴矢量图标库 */
+@font-face {font-family: "xm-iconfont";
+  src: url('//at.alicdn.com/t/font_792691_qxv28s6g1l9.eot?t=1534240067831'); /* IE9*/
+  src: url('//at.alicdn.com/t/font_792691_qxv28s6g1l9.eot?t=1534240067831#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAsYAAsAAAAAEQwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFY8ukovY21hcAAAAYAAAACrAAACPBtV6wxnbHlmAAACLAAABnEAAAmMovtEvWhlYWQAAAigAAAAMQAAADYSctBCaGhlYQAACNQAAAAgAAAAJAgBA69obXR4AAAI9AAAABsAAAAwMCX//WxvY2EAAAkQAAAAGgAAABoN8gwubWF4cAAACSwAAAAeAAAAIAEiAM9uYW1lAAAJTAAAAUUAAAJtPlT+fXBvc3QAAAqUAAAAhAAAALJ1LunfeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2BkYWacwMDKwMHUyXSGgYGhH0IzvmYwYuRgYGBiYGVmwAoC0lxTGByeMbwwZ27438AQw9zMcAQozAiSAwDk4AxmeJzlks0JwzAMhZ8bN/1xD4GU0h2Se26BbJMJOkkn6KmTPbJF8mT5UGg3qMRn0EPIRs8A9gAq0YsIhDcCLF5SQ9YrnLMe8VB9RSMlMjCxYcueIyfOy7CuAFHU7lP9iqApt5L3ksBJbzlgZ9PVkXDUvbWa6x8T/i0u+XyWKtmmHW0NDI55yeRok2DjaKdg65jX7Bzzm71jXnN08vzJkQvg7Ng/WAYH9Qb3wzM/AHicjVVvbFzFEd/Zfbv7/vn9uXf33vl8Pt/dO99BHOzEZ9/DKTImRS0KjUoLDUFCjtpCMGkT1D9qldQmhkiUSv2G1BBB1VYqilGREOIDViWEGzttqkpI/cAXqyL5gFRALVIF+VCJe9fZd+fEpR/o6d3s7G9mZ2dmZ3aJIKR3h0ZYmVgkIjGZJV8mDxECtenOTDOu1UU+hJoD+TCqzcNMk2V8O5OCbDVRPgZhEt4JCNTZ/4HA3+DfuWIxl8pcFFErG3K7oD7fvev8UaMUmEu259lrRjBsfs6cLhYbRfzSbSjGRVAkfQYihUXsyPkHTVyyZDNmXzSHg3Tl+aPKxpJFqbWGdtLl8w8iYDxuDTQIx7yc1YCdIx7Jk3HSwbwQwGBcyMKZVtG0ZCuJxjFJBb+foMSfhJaPOSr4FYgwSwqIx2MHJALtAdBi/7xcSMJL+fxmmBS2guD61tZm96X02mgcj0J1NAaIR9UMmhXIV24FuLUC71+r1AEmK1AYrQHUK/Tly/m8MrOZz2+FSf7jzc3NK9XR9F2lVq+gmRp0r+HK9B+VJmR263Rgd7ALwR/FOFfx/FeJS0YxQh9drakgMJhaBVizkwgqWxLD6eQ0Qo8f7p44fJziSH9x+PjLZUO+/jZ9+K35X37ljn/Rv+yW4Ziuf2nl4PfS5/LrP47OHTsFJULYjf369UZAEBmSqEOSJmG4Me6LeznA0BFkcDoJlGynVzmH2vY21DhPr25v9DjvbfTp2TXG1s5mlK0q4S7lT++6obbRox/s6CHF2LMEsHvoFfSFQIKnKQMZJVFCD6WH0p0PVvvcRx8uph8eUks0jOFNtskOkpDsJ18k9+NqVRg3qqMCSSerjyRuYUi1/vFH7YIqikGVcD+ehFl/pqPSPKZ6DG6mHisljFhBFvU/PoRkSNd/JHO6Ja5JOXcfwIGJbm/igBq/hn8Kfb57YbYUxyX4cwkLKH1u4gD9GVSL6USxCjjCO2p8VdcvH9XRYIQWqUblu3pR/v2BvXMAc3tTmJiDAQ895B9NL0C9BFdKqqRKczDX/Whg7O1irVbcqZ8/sbfYBOZwihC+6wSDzszUf+dF7rRO1O+fKaDO+nXOr6+vf8L5J44Qe4UvnlyRntwrxMoKzpFdeRJBNb9dGyiur1+nE59R+uwi9M1G395jb9KP0bcK2YM9nJB5cojcS75OFskxclzdc+pW699z8iYbtf14BGKf77ruZNyXKC0e50OEBI+V/Aug5Dex/9WjJfipuqnS00gfybjXbNe1f762tXmRPp3Bdl/l6g5JXyqXR0bK8J3PR+jvwYs8/GBnTM+kr8FX4ZknwC16XtG9iH9QfNn1vDHPe2GAj3ieV3XdF2+IPdeteh62Ra+HfQrsKWKSBtlHSOBgM7KkKQBLWnZoq1mVwotCLRGhOtSkMzMuqq2ml3SqUehdnZtynbtPLB88/Dy9dDrYVzoy/MTT6Svnlpd/AHueon5wpnGsEae/PZm+d3Jp6SSUTy7R3xw4f9/B5RN3O+5t3VNncjm6Cnt+uLx8DpedGj4yvD84HceNxTcG6ku4VPmZ9n6nNdj95BHyB3IJKxBPsKm6rpn4QopmqzlFm1MwqdxO5rPGnIc7aSfCGg1Vqyo6nUlQhnh7WiFhXzgGhVC4qjPRki9xdGCc4zXeSWb9BG1ktlqz2Q5Y7S2sIJfivkpVKCCDpyCWdbQzECj76qMVqvyJ/LxyI2rTv1bTC25lSM9xAUJ4Lc+U0wXTsKXDmaA8tHX+hvDt4Wa9IHLcMUBz9VwpL4xi2aGasAPPKNUbbmD/2jAtk0uXY4eJx8zRgj9iAnVNt5X+BL5vlHTOaiOmG7g6+7ZBNUOaefNXuJF3u25RjVvBLeW8E4wV7ZJBpbAXXGnqrwgupWVTAKqZjq5HbW44fMguNJhgwmw8oOk8GCqE8F3GhLB0uS/UDVt4lgjtqGxK/rpwuaDAqKHZNuWmJjVKuWUxbpg2B9DtoRdN3TKF9B0hw4p41C5i3CI9w4civP3aQLlmLMK3wpJpaI7BvmlhPtH3nPWCKQAdE2hK9zyuUeAm921qCA2kvqY8N1yDMq4beJlG+4XQqHDCQnqPlJIyyN579S4tIGcRv/82BbFfK9SgnVHkZzMeaSQjqR5/fP5XF2Chh+sW0g0gn27snqXv3/bsszsfJbCAIiTdjRTVCBL6jV0K5D8H/8xVAAAAeJxjYGRgYADi16c/vIvnt/nKwM3CAALXZxxzhtH///23YVFhbgZyORiYQKIAm34OJQAAAHicY2BkYGBu+N/AEMOi/P/f//8sKgxAERTAAwCmuAa3eJxjYWBgYAFhRiiNFf//z6L8/x+IDQAkCQRQAAAAAAAAjAEAATgBfgGaAiACbgMMA2AEhATGAAB4nGNgZGBg4GE4DMQgwATEXEDIwPAfzGcAAB2tAfIAAHicZY9NTsMwEIVf+gekEqqoYIfkBWIBKP0Rq25YVGr3XXTfpk6bKokjx63UA3AejsAJOALcgDvwSCebNpbH37x5Y08A3OAHHo7fLfeRPVwyO3INF7gXrlN/EG6QX4SbaONVuEX9TdjHM6bCbXRheYPXuGL2hHdhDx18CNdwjU/hOvUv4Qb5W7iJO/wKt9Dx6sI+5l5XuI1HL/bHVi+cXqnlQcWhySKTOb+CmV7vkoWt0uqca1vEJlODoF9JU51pW91T7NdD5yIVWZOqCas6SYzKrdnq0AUb5/JRrxeJHoQm5Vhj/rbGAo5xBYUlDowxQhhkiMro6DtVZvSvsUPCXntWPc3ndFsU1P9zhQEC9M9cU7qy0nk6T4E9XxtSdXQrbsuelDSRXs1JErJCXta2VELqATZlV44RelzRiT8oZ0j/AAlabsgAAAB4nG2L3QqCQBCFZ9RWU7sOfAeh8IFi3N10EHYUG1p8+gSjqz44F+cPEjgo4T81Jphihic0mGOBZyyxwhovUCxKIe4ylthRuDqV+I22UcLQ6+QH4ubWdZZkU3m4o/0tUqtSvT33TPLits12fzc+zhRcvoquo0o281OLhcMw7Q+AD8sULE0=') format('woff'),
+  url('//at.alicdn.com/t/font_792691_qxv28s6g1l9.ttf?t=1534240067831') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  url('//at.alicdn.com/t/font_792691_qxv28s6g1l9.svg?t=1534240067831#iconfont') format('svg'); /* iOS 4.1- */
+}
+.xm-iconfont {font-family:"xm-iconfont" !important; font-size:16px; font-style:normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;}
+.icon-quanxuan:before { content: "\e62c"; }
+.icon-caidan:before { content: "\e610"; }
+.icon-fanxuan:before { content: "\e837"; }
+.icon-pifu:before { content: "\e668"; }
+.icon-qingkong:before { content: "\e63e"; }
+.icon-sousuo:before { content: "\e600"; }
+.icon-danx:before { content: "\e62b"; }
+.icon-duox:before { content: "\e613"; }
+.icon-close:before { content: "\e601"; }
+.icon-expand:before { content: "\e641"; }
+
diff --git a/hxy-web/js/formSelects-v4.js b/hxy-web/js/formSelects-v4.js
new file mode 100644
index 0000000..8792ca9
--- /dev/null
+++ b/hxy-web/js/formSelects-v4.js
@@ -0,0 +1,1791 @@
+'use strict';
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+/**
+ * name: formSelects
+ * 基于Layui Select多选
+ * version: 4.0.0.0910
+ * http://sun.faysunshine.com/layui/formSelects-v4/dist/formSelects-v4.js
+ */
+(function (layui, window, factory) {
+	if ((typeof exports === 'undefined' ? 'undefined' : _typeof(exports)) === 'object') {
+		// 支持 CommonJS
+		module.exports = factory();
+	} else if (typeof define === 'function' && define.amd) {
+		// 支持 AMD
+		define(factory);
+	} else if (window.layui && layui.define) {
+		//layui加载
+		layui.define(['jquery'], function (exports) {
+			exports('formSelects', factory());
+		});
+	} else {
+		window.formSelects = factory();
+	}
+})(typeof layui == 'undefined' ? null : layui, window, function () {
+	var v = '4.0.0.0910',
+	    NAME = 'xm-select',
+	    PNAME = 'xm-select-parent',
+	    INPUT = 'xm-select-input',
+	    TDIV = 'xm-select--suffix',
+	    THIS = 'xm-select-this',
+	    LABEL = 'xm-select-label',
+	    SEARCH = 'xm-select-search',
+	    SEARCH_TYPE = 'xm-select-search-type',
+	    SHOW_COUNT = 'xm-select-show-count',
+	    CREATE = 'xm-select-create',
+	    CREATE_LONG = 'xm-select-create-long',
+	    MAX = 'xm-select-max',
+	    SKIN = 'xm-select-skin',
+	    DIRECTION = "xm-select-direction",
+	    HEIGHT = 'xm-select-height',
+	    DISABLED = 'xm-dis-disabled',
+	    DIS = 'xm-select-dis',
+	    TEMP = 'xm-select-temp',
+	    RADIO = 'xm-select-radio',
+	    LINKAGE = 'xm-select-linkage',
+	    DL = 'xm-select-dl',
+	    DD_HIDE = 'xm-select-hide',
+	    HIDE_INPUT = 'xm-hide-input',
+	    SANJIAO = 'xm-select-sj',
+	    ICON_CLOSE = 'xm-icon-close',
+	    FORM_TITLE = 'xm-select-title',
+	    FORM_SELECT = 'xm-form-select',
+	    FORM_SELECTED = 'xm-form-selected',
+	    FORM_NONE = 'xm-select-none',
+	    FORM_EMPTY = 'xm-select-empty',
+	    FORM_INPUT = 'xm-input',
+	    FORM_DL_INPUT = 'xm-dl-input',
+	    FORM_SELECT_TIPS = 'xm-select-tips',
+	    CHECKBOX_YES = 'xm-iconfont',
+	    FORM_TEAM_PID = 'XM_PID_VALUE',
+	    CZ = 'xm-cz',
+	    CZ_GROUP = 'xm-cz-group',
+	    TIPS = '请选择',
+	    data = {},
+	    events = {
+		on: {},
+		endOn: {},
+		filter: {},
+		maxTips: {},
+		opened: {},
+		closed: {}
+	},
+	    ajax = {
+		type: 'get',
+		header: {},
+		first: true,
+		data: {},
+		searchUrl: '',
+		searchName: 'keyword',
+		searchVal: null,
+		keyName: 'name',
+		keyVal: 'value',
+		keySel: 'selected',
+		keyDis: 'disabled',
+		keyChildren: 'children',
+		dataType: '',
+		delay: 500,
+		beforeSuccess: null,
+		success: null,
+		error: null,
+		beforeSearch: null,
+		response: {
+			statusCode: 0,
+			statusName: 'code',
+			msgName: 'msg',
+			dataName: 'data'
+		},
+		tree: {
+			nextClick: function nextClick(id, item, callback) {
+				callback([]);
+			},
+			folderChoose: true,
+			lazy: true
+		}
+	},
+	    quickBtns = [{ icon: 'xm-iconfont icon-quanxuan', name: '全选', click: function click(id, cm) {
+			cm.selectAll(id, true, true);
+		} }, { icon: 'xm-iconfont icon-qingkong', name: '清空', click: function click(id, cm) {
+			cm.removeAll(id, true, true);
+		} }, { icon: 'xm-iconfont icon-fanxuan', name: '反选', click: function click(id, cm) {
+			cm.reverse(id, true, true);
+		} }, { icon: 'xm-iconfont icon-pifu', name: '换肤', click: function click(id, cm) {
+			cm.skin(id);
+		} }],
+	    $ = window.$ || window.layui && window.layui.jquery,
+	    $win = $(window),
+	    ajaxs = {},
+	    fsConfig = {},
+	    fsConfigs = {},
+	    FormSelects = function FormSelects(options) {
+		var _this = this;
+
+		this.config = {
+			name: null, //xm-select="xxx"
+			max: null,
+			maxTips: function maxTips(id, vals, val, max) {
+				var ipt = $('[xid="' + _this.config.name + '"]').prev().find('.' + NAME);
+				if (ipt.parents('.layui-form-item[pane]').length) {
+					ipt = ipt.parents('.layui-form-item[pane]');
+				}
+				ipt.attr('style', 'border-color: red !important');
+				setTimeout(function () {
+					ipt.removeAttr('style');
+				}, 300);
+			},
+			init: null, //初始化的选择值,
+			on: null, //select值发生变化
+			opened: null,
+			closed: null,
+			filter: function filter(id, inputVal, val, isDisabled) {
+				return val.name.indexOf(inputVal) == -1;
+			},
+			clearid: -1,
+			direction: 'auto',
+			height: null,
+			isEmpty: false,
+			btns: [quickBtns[0], quickBtns[1], quickBtns[2]],
+			searchType: 0,
+			create: function create(id, name) {
+				return Date.now();
+			},
+			template: function template(id, item) {
+				return item.name;
+			},
+			showCount: 0,
+			isCreate: false,
+			placeholder: TIPS,
+			clearInput: false
+		};
+		this.select = null;
+		this.values = [];
+		$.extend(this.config, options, {
+			searchUrl: options.isSearch ? options.searchUrl : null,
+			placeholder: options.optionsFirst ? options.optionsFirst.value ? TIPS : options.optionsFirst.innerHTML || TIPS : TIPS,
+			btns: options.radio ? [quickBtns[1]] : [quickBtns[0], quickBtns[1], quickBtns[2]]
+		}, fsConfigs[options.name] || fsConfig);
+		if (isNaN(this.config.showCount) || this.config.showCount <= 0) {
+			this.config.showCount = 19921012;
+		}
+	};
+
+	//一些简单的处理方法
+	var Common = function Common() {
+		this.appender();
+		this.on();
+		this.onreset();
+	};
+
+	Common.prototype.appender = function () {
+		//针对IE做的一些拓展
+		//拓展Array map方法
+		if (!Array.prototype.map) {
+			Array.prototype.map = function (i, h) {
+				var b,
+				    a,
+				    c,
+				    e = Object(this),
+				    f = e.length >>> 0;if (h) {
+					b = h;
+				}a = new Array(f);c = 0;while (c < f) {
+					var d, g;if (c in e) {
+						d = e[c];g = i.call(b, d, c, e);a[c] = g;
+					}c++;
+				}return a;
+			};
+		};
+
+		//拓展Array foreach方法
+		if (!Array.prototype.forEach) {
+			Array.prototype.forEach = function forEach(g, b) {
+				var d, c;if (this == null) {
+					throw new TypeError("this is null or not defined");
+				}var f = Object(this);var a = f.length >>> 0;if (typeof g !== "function") {
+					throw new TypeError(g + " is not a function");
+				}if (arguments.length > 1) {
+					d = b;
+				}c = 0;while (c < a) {
+					var e;if (c in f) {
+						e = f[c];g.call(d, e, c, f);
+					}c++;
+				}
+			};
+		};
+
+		//拓展Array filter方法
+		if (!Array.prototype.filter) {
+			Array.prototype.filter = function (b) {
+				if (this === void 0 || this === null) {
+					throw new TypeError();
+				}var f = Object(this);var a = f.length >>> 0;if (typeof b !== "function") {
+					throw new TypeError();
+				}var e = [];var d = arguments[1];for (var c = 0; c < a; c++) {
+					if (c in f) {
+						var g = f[c];if (b.call(d, g, c, f)) {
+							e.push(g);
+						}
+					}
+				}return e;
+			};
+		};
+	};
+
+	Common.prototype.init = function (target) {
+		var _this2 = this;
+
+		//初始化页面上已有的select
+		$(target ? target : 'select[' + NAME + ']').each(function (index, select) {
+			var othis = $(select),
+			    id = othis.attr(NAME),
+			    hasLayuiRender = othis.next('.layui-form-select'),
+			    hasRender = othis.next('.' + PNAME),
+			    options = {
+				name: id,
+				disabled: select.disabled,
+				max: othis.attr(MAX) - 0,
+				isSearch: othis.attr(SEARCH) != undefined,
+				searchUrl: othis.attr(SEARCH),
+				isCreate: othis.attr(CREATE) != undefined,
+				radio: othis.attr(RADIO) != undefined,
+				skin: othis.attr(SKIN),
+				direction: othis.attr(DIRECTION),
+				optionsFirst: select.options[0],
+				height: othis.attr(HEIGHT),
+				formname: othis.attr('name') || othis.attr('_name'),
+				layverify: othis.attr('lay-verify') || othis.attr('_lay-verify'),
+				layverType: othis.attr('lay-verType'),
+				searchType: othis.attr(SEARCH_TYPE) == 'dl' ? 1 : 0,
+				showCount: othis.attr(SHOW_COUNT) - 0
+			},
+			    value = othis.find('option[selected]').toArray().map(function (option) {
+				//获取已选中的数据
+				return {
+					name: option.innerHTML,
+					value: option.value
+				};
+			}),
+			    fs = new FormSelects(options);
+
+			fs.values = value;
+
+			if (fs.config.init) {
+				fs.values = fs.config.init.map(function (item) {
+					if ((typeof item === 'undefined' ? 'undefined' : _typeof(item)) == 'object') {
+						return item;
+					}
+					return {
+						name: othis.find('option[value="' + item + '"]').text(),
+						value: item
+					};
+				}).filter(function (item) {
+					return item.name;
+				});
+				fs.config.init = fs.values.concat([]);
+			} else {
+				fs.config.init = value.concat([]);
+			}
+
+			!fs.values && (fs.values = []);
+
+			data[id] = fs;
+
+			//先取消layui对select的渲染
+			hasLayuiRender[0] && hasLayuiRender.remove();
+			hasRender[0] && hasRender.remove();
+
+			//构造渲染div
+			var dinfo = _this2.renderSelect(id, fs.config.placeholder, select);
+			var heightStyle = !fs.config.height || fs.config.height == 'auto' ? '' : 'xm-hg style="height: 34px;"';
+			var inputHtml = ['<div class="' + LABEL + '">', '<input type="text" fsw class="' + FORM_INPUT + ' ' + INPUT + '" ' + (fs.config.isSearch ? '' : 'style="display: none;"') + ' autocomplete="off" debounce="0" />', '</div>'];
+			var reElem = $('<div class="' + FORM_SELECT + '" ' + SKIN + '="' + fs.config.skin + '">\n\t\t\t\t\t<input class="' + HIDE_INPUT + '" value="" name="' + fs.config.formname + '" lay-verify="' + fs.config.layverify + '" lay-verType="' + fs.config.layverType + '" type="text" style="position: absolute;bottom: 0; z-index: -1;width: 100%; height: 100%; border: none; opacity: 0;"/>\n\t\t\t\t\t<div class="' + FORM_TITLE + ' ' + (fs.config.disabled ? DIS : '') + '">\n\t\t\t\t\t\t<div class="' + FORM_INPUT + ' ' + NAME + '" ' + heightStyle + '>\n\t\t\t\t\t\t\t' + inputHtml.join('') + '\n\t\t\t\t\t\t\t<i class="' + SANJIAO + '"></i>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t\t<div class="' + TDIV + '">\n\t\t\t\t\t\t\t<input type="text" autocomplete="off" placeholder="' + fs.config.placeholder + '" readonly="readonly" unselectable="on" class="' + FORM_INPUT + '">\n\t\t\t\t\t\t</div>\n\t\t\t\t\t\t<div></div>\n\t\t\t\t\t</div>\n\t\t\t\t\t<dl xid="' + id + '" class="' + DL + ' ' + (fs.config.radio ? RADIO : '') + '">' + dinfo + '</dl>\n\t\t\t\t</div>');
+
+			var $parent = $('<div class="' + PNAME + '" FS_ID="' + id + '"></div>');
+			$parent.append(reElem);
+			othis.after($parent);
+			othis.attr('lay-ignore', '');
+			othis.removeAttr('name') && othis.attr('_name', fs.config.formname);
+			othis.removeAttr('lay-verify') && othis.attr('_lay-verify', fs.config.layverify);
+
+			//如果可搜索, 加上事件
+			if (fs.config.isSearch) {
+				ajaxs[id] = $.extend({}, ajax, { searchUrl: fs.config.searchUrl }, ajaxs[id]);
+				$(document).on('input', 'div.' + PNAME + '[FS_ID="' + id + '"] .' + INPUT, function (e) {
+					_this2.search(id, e, fs.config.searchUrl);
+				});
+				if (fs.config.searchUrl) {
+					//触发第一次请求事件
+					_this2.triggerSearch(reElem, true);
+				}
+			} else {
+				//隐藏第二个dl
+				reElem.find('dl dd.' + FORM_DL_INPUT).css('display', 'none');
+			}
+		});
+	};
+
+	Common.prototype.search = function (id, e, searchUrl, call) {
+		var _this3 = this;
+
+		var input = void 0;
+		if (call) {
+			input = call;
+		} else {
+			input = e.target;
+			var keyCode = e.keyCode;
+			if (keyCode === 9 || keyCode === 13 || keyCode === 37 || keyCode === 38 || keyCode === 39 || keyCode === 40) {
+				return false;
+			}
+		}
+		var inputValue = $.trim(input.value);
+		//过滤一下tips
+		this.changePlaceHolder($(input));
+
+		var ajaxConfig = ajaxs[id] ? ajaxs[id] : ajax;
+		searchUrl = ajaxConfig.searchUrl || searchUrl;
+		var fs = data[id],
+		    isCreate = fs.config.isCreate,
+		    reElem = $('dl[xid="' + id + '"]').parents('.' + FORM_SELECT);
+		//如果开启了远程搜索
+		if (searchUrl) {
+			if (ajaxConfig.searchVal) {
+				inputValue = ajaxConfig.searchVal;
+				ajaxConfig.searchVal = '';
+			}
+			if (!ajaxConfig.beforeSearch || ajaxConfig.beforeSearch && ajaxConfig.beforeSearch instanceof Function && ajaxConfig.beforeSearch(id, searchUrl, inputValue)) {
+				var delay = ajaxConfig.delay;
+				if (ajaxConfig.first) {
+					ajaxConfig.first = false;
+					delay = 10;
+				}
+				clearTimeout(fs.clearid);
+				fs.clearid = setTimeout(function () {
+					reElem.find('dl > *:not(.' + FORM_SELECT_TIPS + ')').remove();
+					reElem.find('dd.' + FORM_NONE).addClass(FORM_EMPTY).text('请求中');
+					_this3.ajax(id, searchUrl, inputValue, false, null, true);
+				}, delay);
+			}
+		} else {
+			reElem.find('dl .' + DD_HIDE).removeClass(DD_HIDE);
+			//遍历选项, 选择可以显示的值
+			reElem.find('dl dd:not(.' + FORM_SELECT_TIPS + ')').each(function (idx, item) {
+				var _item = $(item);
+				var searchFun = events.filter[id] || data[id].config.filter;
+				if (searchFun && searchFun(id, inputValue, _this3.getItem(id, _item), _item.hasClass(DISABLED)) == true) {
+					_item.addClass(DD_HIDE);
+				}
+			});
+			//控制分组名称
+			reElem.find('dl dt').each(function (index, item) {
+				if (!$(item).nextUntil('dt', ':not(.' + DD_HIDE + ')').length) {
+					$(item).addClass(DD_HIDE);
+				}
+			});
+			//动态创建
+			this.create(id, isCreate, inputValue);
+			var shows = reElem.find('dl dd:not(.' + FORM_SELECT_TIPS + '):not(.' + DD_HIDE + ')');
+			if (!shows.length) {
+				reElem.find('dd.' + FORM_NONE).addClass(FORM_EMPTY).text('无匹配项');
+			} else {
+				reElem.find('dd.' + FORM_NONE).removeClass(FORM_EMPTY);
+			}
+		}
+	};
+
+	Common.prototype.isArray = function (obj) {
+		return Object.prototype.toString.call(obj) == "[object Array]";
+	};
+
+	Common.prototype.triggerSearch = function (div, isCall) {
+		var _this4 = this;
+
+		(div ? [div] : $('.' + FORM_SELECT).toArray()).forEach(function (reElem, index) {
+			reElem = $(reElem);
+			var id = reElem.find('dl').attr('xid');
+			if (id && data[id] && data[id].config.isEmpty || isCall) {
+				_this4.search(id, null, null, data[id].config.searchType == 0 ? reElem.find('.' + LABEL + ' .' + INPUT) : reElem.find('dl .' + FORM_DL_INPUT + ' .' + INPUT));
+			}
+		});
+	};
+
+	Common.prototype.clearInput = function (id) {
+		var div = $('.' + PNAME + '[fs_id="' + id + '"]');
+		var input = data[id].config.searchType == 0 ? div.find('.' + LABEL + ' .' + INPUT) : div.find('dl .' + FORM_DL_INPUT + ' .' + INPUT);
+		input.val('');
+	};
+
+	Common.prototype.ajax = function (id, searchUrl, inputValue, isLinkage, linkageWidth, isSearch, successCallback, isReplace) {
+		var _this5 = this;
+
+		var reElem = $('.' + PNAME + ' dl[xid="' + id + '"]').parents('.' + FORM_SELECT);
+		if (!reElem[0] || !searchUrl) {
+			return;
+		}
+		var ajaxConfig = ajaxs[id] ? ajaxs[id] : ajax;
+		var ajaxData = $.extend(true, {}, ajaxConfig.data);
+		ajaxData[ajaxConfig.searchName] = inputValue;
+		//是否需要对ajax添加随机时间
+		//ajaxData['_'] = Date.now();
+		$.ajax({
+			type: ajaxConfig.type,
+			headers: ajaxConfig.header,
+			url: searchUrl,
+			data: ajaxConfig.dataType == 'json' ? JSON.stringify(ajaxData) : ajaxData,
+			success: function success(res) {
+				if (typeof res == 'string') {
+					res = JSON.parse(res);
+				}
+				ajaxConfig.beforeSuccess && ajaxConfig.beforeSuccess instanceof Function && (res = ajaxConfig.beforeSuccess(id, searchUrl, inputValue, res));
+				if (_this5.isArray(res)) {
+					var newRes = {};
+					newRes[ajaxConfig.response.statusName] = ajaxConfig.response.statusCode;
+					newRes[ajaxConfig.response.msgName] = "";
+					newRes[ajaxConfig.response.dataName] = res;
+					res = newRes;
+				}
+				if (res[ajaxConfig.response.statusName] != ajaxConfig.response.statusCode) {
+					reElem.find('dd.' + FORM_NONE).addClass(FORM_EMPTY).text(res[ajaxConfig.response.msgName]);
+				} else {
+					reElem.find('dd.' + FORM_NONE).removeClass(FORM_EMPTY);
+					_this5.renderData(id, res[ajaxConfig.response.dataName], isLinkage, linkageWidth, isSearch, isReplace);
+					data[id].config.isEmpty = res[ajaxConfig.response.dataName].length == 0;
+				}
+				successCallback && successCallback(id);
+				ajaxConfig.success && ajaxConfig.success instanceof Function && ajaxConfig.success(id, searchUrl, inputValue, res);
+			},
+			error: function error(err) {
+				reElem.find('dd[lay-value]:not(.' + FORM_SELECT_TIPS + ')').remove();
+				reElem.find('dd.' + FORM_NONE).addClass(FORM_EMPTY).text('服务异常');
+				ajaxConfig.error && ajaxConfig.error instanceof Function && ajaxConfig.error(id, searchUrl, inputValue, err);
+			}
+		});
+	};
+
+	Common.prototype.renderData = function (id, dataArr, linkage, linkageWidth, isSearch, isReplace) {
+		var _this6 = this;
+
+		if (linkage) {
+			//渲染多级联动
+			this.renderLinkage(id, dataArr, linkageWidth);
+			return;
+		}
+		if (isReplace) {
+			this.renderReplace(id, dataArr);
+			return;
+		}
+
+		var reElem = $('.' + PNAME + ' dl[xid="' + id + '"]').parents('.' + FORM_SELECT);
+		var ajaxConfig = ajaxs[id] ? ajaxs[id] : ajax;
+		var pcInput = reElem.find('.' + TDIV + ' input');
+
+		dataArr = this.exchangeData(id, dataArr);
+		var values = [];
+		reElem.find('dl').html(this.renderSelect(id, pcInput.attr('placeholder') || pcInput.attr('back'), dataArr.map(function (item) {
+			var itemVal = $.extend({}, item, {
+				innerHTML: item[ajaxConfig.keyName],
+				value: item[ajaxConfig.keyVal],
+				sel: item[ajaxConfig.keySel],
+				disabled: item[ajaxConfig.keyDis],
+				type: item.type,
+				name: item[ajaxConfig.keyName]
+			});
+			if (itemVal.sel) {
+				values.push(itemVal);
+			}
+			return itemVal;
+		})));
+
+		var label = reElem.find('.' + LABEL);
+		var dl = reElem.find('dl[xid]');
+		if (isSearch) {
+			//如果是远程搜索, 这里需要判重
+			var oldVal = data[id].values;
+			oldVal.forEach(function (item, index) {
+				dl.find('dd[lay-value="' + item.value + '"]').addClass(THIS);
+			});
+			values.forEach(function (item, index) {
+				if (_this6.indexOf(oldVal, item) == -1) {
+					_this6.addLabel(id, label, item);
+					dl.find('dd[lay-value="' + item.value + '"]').addClass(THIS);
+					oldVal.push(item);
+				}
+			});
+		} else {
+			values.forEach(function (item, index) {
+				_this6.addLabel(id, label, item);
+				dl.find('dd[lay-value="' + item.value + '"]').addClass(THIS);
+			});
+			data[id].values = values;
+		}
+		this.commonHandler(id, label);
+	};
+
+	Common.prototype.renderLinkage = function (id, dataArr, linkageWidth) {
+		var result = [],
+		    index = 0,
+		    temp = { "0": dataArr },
+		    ajaxConfig = ajaxs[id] ? ajaxs[id] : ajax;
+		db[id] = {};
+
+		var _loop = function _loop() {
+			var group = result[index++] = [],
+			    _temp = temp;
+			temp = {};
+			$.each(_temp, function (pid, arr) {
+				$.each(arr, function (idx, item) {
+					var val = {
+						pid: pid,
+						name: item[ajaxConfig.keyName],
+						value: item[ajaxConfig.keyVal]
+					};
+					db[id][val.value] = $.extend(item, val);
+					group.push(val);
+					var children = item[ajaxConfig.keyChildren];
+					if (children && children.length) {
+						temp[val.value] = children;
+					}
+				});
+			});
+		};
+
+		do {
+			_loop();
+		} while (Object.getOwnPropertyNames(temp).length);
+
+		var reElem = $('.' + PNAME + ' dl[xid="' + id + '"]').parents('.' + FORM_SELECT);
+		var html = ['<div class="xm-select-linkage">'];
+
+		$.each(result, function (idx, arr) {
+			var groupDiv = ['<div style="left: ' + (linkageWidth - 0) * idx + 'px;" class="xm-select-linkage-group xm-select-linkage-group' + (idx + 1) + ' ' + (idx != 0 ? 'xm-select-linkage-hide' : '') + '">'];
+			$.each(arr, function (idx2, item) {
+				var span = '<li title="' + item.name + '" pid="' + item.pid + '" xm-value="' + item.value + '"><span>' + item.name + '</span></li>';
+				groupDiv.push(span);
+			});
+			groupDiv.push('</div>');
+			html = html.concat(groupDiv);
+		});
+		html.push('<div style="clear: both; height: 288px;"></div>');
+		html.push('</div>');
+		reElem.find('dl').html(html.join(''));
+		reElem.find('.' + INPUT).css('display', 'none'); //联动暂时不支持搜索
+	};
+
+	Common.prototype.renderReplace = function (id, dataArr) {
+		var _this7 = this;
+
+		var dl = $('.' + PNAME + ' dl[xid="' + id + '"]');
+		var ajaxConfig = ajaxs[id] ? ajaxs[id] : ajax;
+
+		dataArr = this.exchangeData(id, dataArr);
+		db[id] = dataArr;
+
+		var html = dataArr.map(function (item) {
+			var itemVal = $.extend({}, item, {
+				innerHTML: item[ajaxConfig.keyName],
+				value: item[ajaxConfig.keyVal],
+				sel: item[ajaxConfig.keySel],
+				disabled: item[ajaxConfig.keyDis],
+				type: item.type,
+				name: item[ajaxConfig.keyName]
+			});
+			return _this7.createDD(id, itemVal);
+		}).join('');
+
+		dl.find('dd:not(.' + FORM_SELECT_TIPS + '),dt:not([style])').remove();
+		dl.find('dt[style]').after($(html));
+	};
+
+	Common.prototype.exchangeData = function (id, arr) {
+		//这里处理树形结构
+		var ajaxConfig = ajaxs[id] ? ajaxs[id] : ajax;
+		var childrenName = ajaxConfig['keyChildren'];
+		var disabledName = ajaxConfig['keyDis'];
+		db[id] = {};
+		var result = this.getChildrenList(arr, childrenName, disabledName, [], false);
+		return result;
+	};
+
+	Common.prototype.getChildrenList = function (arr, childrenName, disabledName, pid, disabled) {
+		var result = [],
+		    offset = 0;
+		for (var a = 0; a < arr.length; a++) {
+			var item = arr[a];
+			if (item.type && item.type == 'optgroup') {
+				result.push(item);
+				continue;
+			} else {
+				offset++;
+			}
+			var parentIds = pid.concat([]);
+			parentIds.push(offset - 1 + '_E');
+			item[FORM_TEAM_PID] = JSON.stringify(parentIds);
+			item[disabledName] = item[disabledName] || disabled;
+			result.push(item);
+			var child = item[childrenName];
+			if (child && common.isArray(child) && child.length) {
+				item['XM_TREE_FOLDER'] = true;
+				var pidArr = parentIds.concat([]);
+				var childResult = this.getChildrenList(child, childrenName, disabledName, pidArr, item[disabledName]);
+				result = result.concat(childResult);
+			}
+		}
+		return result;
+	};
+
+	Common.prototype.create = function (id, isCreate, inputValue) {
+		if (isCreate && inputValue) {
+			var fs = data[id],
+			    dl = $('[xid="' + id + '"]'),
+			    tips = dl.find('dd.' + FORM_SELECT_TIPS + '.' + FORM_DL_INPUT),
+			    tdd = null,
+			    temp = dl.find('dd.' + TEMP);
+			dl.find('dd:not(.' + FORM_SELECT_TIPS + '):not(.' + TEMP + ')').each(function (index, item) {
+				if (inputValue == $(item).find('span').attr('name')) {
+					tdd = item;
+				}
+			});
+			if (!tdd) {
+				//如果不存在, 则创建
+				var val = fs.config.create(id, inputValue);
+				if (temp[0]) {
+					temp.attr('lay-value', val);
+					temp.find('span').text(inputValue);
+					temp.find('span').attr("name", inputValue);
+					temp.removeClass(DD_HIDE);
+				} else {
+					tips.after($(this.createDD(id, {
+						name: inputValue,
+						innerHTML: inputValue,
+						value: val
+					}, TEMP + ' ' + CREATE_LONG)));
+				}
+			}
+		} else {
+			$('[xid=' + id + '] dd.' + TEMP).remove();
+		}
+	};
+
+	Common.prototype.createDD = function (id, item, clz) {
+		var ajaxConfig = ajaxs[id] ? ajaxs[id] : ajax;
+		var name = $.trim(item.innerHTML);
+		db[id][item.value] = $(item).is('option') ? item = function () {
+			var resultItem = {};
+			resultItem[ajaxConfig.keyName] = name;
+			resultItem[ajaxConfig.keyVal] = item.value;
+			resultItem[ajaxConfig.keyDis] = item.disabled;
+			return resultItem;
+		}() : item;
+		var template = data[id].config.template(id, item);
+		var pid = item[FORM_TEAM_PID];
+		pid ? pid = JSON.parse(pid) : pid = [-1];
+		var attr = pid[0] == -1 ? '' : 'tree-id="' + pid.join('-') + '" tree-folder="' + !!item['XM_TREE_FOLDER'] + '"';
+		return '<dd lay-value="' + item.value + '" class="' + (item.disabled ? DISABLED : '') + ' ' + (clz ? clz : '') + '" ' + attr + '>\n\t\t\t\t\t<div class="xm-unselect xm-form-checkbox ' + (item.disabled ? DISABLED : '') + '"  style="margin-left: ' + (pid.length - 1) * 30 + 'px">\n\t\t\t\t\t\t<i class="' + CHECKBOX_YES + '"></i>\n\t\t\t\t\t\t<span name="' + name + '">' + template + '</span>\n\t\t\t\t\t</div>\n\t\t\t\t</dd>';
+	};
+
+	Common.prototype.createQuickBtn = function (obj, right) {
+		return '<div class="' + CZ + '" method="' + obj.name + '" title="' + obj.name + '" ' + (right ? 'style="margin-right: ' + right + '"' : '') + '><i class="' + obj.icon + '"></i><span>' + obj.name + '</span></div>';
+	};
+
+	Common.prototype.renderBtns = function (id, show, right) {
+		var _this8 = this;
+
+		var quickBtn = [];
+		var dl = $('dl[xid="' + id + '"]');
+		quickBtn.push('<div class="' + CZ_GROUP + '" show="' + show + '" style="max-width: ' + (dl.prev().width() - 54) + 'px;">');
+		$.each(data[id].config.btns, function (index, item) {
+			quickBtn.push(_this8.createQuickBtn(item, right));
+		});
+		quickBtn.push('</div>');
+		quickBtn.push(this.createQuickBtn({ icon: 'xm-iconfont icon-caidan', name: '' }));
+		return quickBtn.join('');
+	};
+
+	Common.prototype.renderSelect = function (id, tips, select) {
+		var _this9 = this;
+
+		db[id] = {};
+		var arr = [];
+		if (data[id].config.btns.length) {
+			setTimeout(function () {
+				var dl = $('dl[xid="' + id + '"]');
+				dl.parents('.' + FORM_SELECT).attr(SEARCH_TYPE, data[id].config.searchType);
+				dl.find('.' + CZ_GROUP).css('max-width', dl.prev().width() - 54 + 'px');
+			}, 10);
+			arr.push(['<dd lay-value="" class="' + FORM_SELECT_TIPS + '" style="background-color: #FFF!important;">', this.renderBtns(id, null, '30px'), '</dd>', '<dd lay-value="" class="' + FORM_SELECT_TIPS + ' ' + FORM_DL_INPUT + '" style="background-color: #FFF!important;">', '<i class="xm-iconfont icon-sousuo"></i>', '<input type="text" class="' + FORM_INPUT + ' ' + INPUT + '" placeholder="\u8BF7\u641C\u7D22"/>', '</dd>'].join(''));
+		} else {
+			arr.push('<dd lay-value="" class="' + FORM_SELECT_TIPS + '">' + tips + '</dd>');
+		}
+		if (this.isArray(select)) {
+			$(select).each(function (index, item) {
+				if (item) {
+					if (item.type && item.type === 'optgroup') {
+						arr.push('<dt>' + item.name + '</dt>');
+					} else {
+						arr.push(_this9.createDD(id, item));
+					}
+				}
+			});
+		} else {
+			$(select).find('*').each(function (index, item) {
+				if (item.tagName.toLowerCase() == 'option' && index == 0 && !item.value) {
+					return;
+				}
+				if (item.tagName.toLowerCase() === 'optgroup') {
+					arr.push('<dt>' + item.label + '</dt>');
+				} else {
+					arr.push(_this9.createDD(id, item));
+				}
+			});
+		}
+		arr.push('<dt style="display:none;"> </dt>');
+		arr.push('<dd class="' + FORM_SELECT_TIPS + ' ' + FORM_NONE + ' ' + (arr.length === 2 ? FORM_EMPTY : '') + '">\u6CA1\u6709\u9009\u9879</dd>');
+		return arr.join('');
+	};
+
+	Common.prototype.on = function () {
+		var _this10 = this;
+
+		//事件绑定
+		this.one();
+
+		$(document).on('click', function (e) {
+			if (!$(e.target).parents('.' + FORM_TITLE)[0]) {
+				//清空input中的值
+				$('.' + PNAME + ' dl .' + DD_HIDE).removeClass(DD_HIDE);
+				$('.' + PNAME + ' dl dd.' + FORM_EMPTY).removeClass(FORM_EMPTY);
+				$('.' + PNAME + ' dl dd.' + TEMP).remove();
+				$.each(data, function (key, fs) {
+					_this10.clearInput(key);
+					if (!fs.values.length) {
+						_this10.changePlaceHolder($('div[FS_ID="' + key + '"] .' + LABEL));
+					}
+				});
+			}
+			$('.' + PNAME + ' .' + FORM_SELECTED).each(function (index, item) {
+				_this10.changeShow($(item).find('.' + FORM_TITLE), false);
+			});
+		});
+	};
+
+	Common.prototype.calcLabelLeft = function (label, w, call) {
+		var pos = this.getPosition(label[0]);
+		pos.y = pos.x + label[0].clientWidth;
+		var left = label[0].offsetLeft;
+		if (!label.find('span').length) {
+			left = 0;
+		} else if (call) {
+			//校正归位
+			var span = label.find('span:last');
+			span.css('display') == 'none' ? span = span.prev()[0] : span = span[0];
+			var spos = this.getPosition(span);
+			spos.y = spos.x + span.clientWidth;
+
+			if (spos.y > pos.y) {
+				left = left - (spos.y - pos.y) - 5;
+			} else {
+				left = 0;
+			}
+		} else {
+			if (w < 0) {
+				var _span = label.find(':last');
+				_span.css('display') == 'none' ? _span = _span.prev()[0] : _span = _span[0];
+				var _spos = this.getPosition(_span);
+				_spos.y = _spos.x + _span.clientWidth;
+				if (_spos.y > pos.y) {
+					left -= 10;
+				}
+			} else {
+				if (left < 0) {
+					left += 10;
+				}
+				if (left > 0) {
+					left = 0;
+				}
+			}
+		}
+		label.css('left', left + 'px');
+	};
+
+	Common.prototype.one = function (target) {
+		var _this11 = this;
+
+		//一次性事件绑定
+		$(target ? target : document).off('click', '.' + FORM_TITLE).on('click', '.' + FORM_TITLE, function (e) {
+			var othis = $(e.target),
+			    title = othis.is(FORM_TITLE) ? othis : othis.parents('.' + FORM_TITLE),
+			    dl = title.next(),
+			    id = dl.attr('xid');
+
+			//清空非本select的input val
+			$('dl[xid]').not(dl).each(function (index, item) {
+				_this11.clearInput($(item).attr('xid'));
+			});
+			$('dl[xid]').not(dl).find('dd.' + DD_HIDE).removeClass(DD_HIDE);
+
+			//如果是disabled select
+			if (title.hasClass(DIS)) {
+				return false;
+			}
+			//如果点击的是右边的三角或者只读的input
+			if (othis.is('.' + SANJIAO) || othis.is('.' + INPUT + '[readonly]')) {
+				_this11.changeShow(title, !title.parents('.' + FORM_SELECT).hasClass(FORM_SELECTED));
+				return false;
+			}
+			//如果点击的是input的右边, focus一下
+			if (title.find('.' + INPUT + ':not(readonly)')[0]) {
+				var input = title.find('.' + INPUT),
+				    epos = { x: e.pageX, y: e.pageY },
+				    pos = _this11.getPosition(title[0]),
+				    width = title.width();
+				while (epos.x > pos.x) {
+					if ($(document.elementFromPoint(epos.x, epos.y)).is(input)) {
+						input.focus();
+						_this11.changeShow(title, true);
+						return false;
+					}
+					epos.x -= 50;
+				}
+			}
+
+			//如果点击的是可搜索的input
+			if (othis.is('.' + INPUT)) {
+				_this11.changeShow(title, true);
+				return false;
+			}
+			//如果点击的是x按钮
+			if (othis.is('i[fsw="' + NAME + '"]')) {
+				var val = _this11.getItem(id, othis),
+				    dd = dl.find('dd[lay-value=\'' + val.value + '\']');
+				if (dd.hasClass(DISABLED)) {
+					//如果是disabled状态, 不可选, 不可删
+					return false;
+				}
+				_this11.handlerLabel(id, dd, false, val);
+				return false;
+			}
+
+			_this11.changeShow(title, !title.parents('.' + FORM_SELECT).hasClass(FORM_SELECTED));
+			return false;
+		});
+		$(target ? target : document).off('click', 'dl.' + DL).on('click', 'dl.' + DL, function (e) {
+			var othis = $(e.target);
+			if (othis.is('.' + LINKAGE) || othis.parents('.' + LINKAGE)[0]) {
+				//linkage的处理
+				othis = othis.is('li') ? othis : othis.parents('li[xm-value]');
+				var _group = othis.parents('.xm-select-linkage-group'),
+				    _id = othis.parents('dl').attr('xid');
+				if (!_id) {
+					return false;
+				}
+				//激活li
+				_group.find('.xm-select-active').removeClass('xm-select-active');
+				othis.addClass('xm-select-active');
+				//激活下一个group, 激活前显示对应数据
+				_group.nextAll('.xm-select-linkage-group').addClass('xm-select-linkage-hide');
+				var nextGroup = _group.next('.xm-select-linkage-group');
+				nextGroup.find('li').addClass('xm-select-linkage-hide');
+				nextGroup.find('li[pid="' + othis.attr('xm-value') + '"]').removeClass('xm-select-linkage-hide');
+				//如果没有下一个group, 或没有对应的值
+				if (!nextGroup[0] || nextGroup.find('li:not(.xm-select-linkage-hide)').length == 0) {
+					var vals = [],
+					    index = 0,
+					    isAdd = !othis.hasClass('xm-select-this');
+					if (data[_id].config.radio) {
+						othis.parents('.xm-select-linkage').find('.xm-select-this').removeClass('xm-select-this');
+					}
+					do {
+						vals[index++] = {
+							name: othis.find('span').text(),
+							value: othis.attr('xm-value')
+						};
+						othis = othis.parents('.xm-select-linkage-group').prev().find('li[xm-value="' + othis.attr('pid') + '"]');
+					} while (othis.length);
+					vals.reverse();
+					var val = {
+						name: vals.map(function (item) {
+							return item.name;
+						}).join('/'),
+						value: vals.map(function (item) {
+							return item.value;
+						}).join('/')
+					};
+					_this11.handlerLabel(_id, null, isAdd, val);
+				} else {
+					nextGroup.removeClass('xm-select-linkage-hide');
+				}
+				return false;
+			}
+
+			if (othis.is('dl')) {
+				return false;
+			}
+
+			if (othis.is('dt')) {
+				othis.nextUntil('dt').each(function (index, item) {
+					item = $(item);
+					if (item.hasClass(DISABLED) || item.hasClass(THIS)) {} else {
+						item.find('i:not(.icon-expand)').click();
+					}
+				});
+				return false;
+			}
+			var dd = othis.is('dd') ? othis : othis.parents('dd');
+			var id = dd.parent('dl').attr('xid');
+
+			if (dd.hasClass(DISABLED)) {
+				//被禁用选项的处理
+				return false;
+			}
+
+			//菜单功效
+			if (othis.is('i.icon-caidan')) {
+				var opens = [],
+				    closes = [];
+				othis.parents('dl').find('dd[tree-folder="true"]').each(function (index, item) {
+					$(item).attr('xm-tree-hidn') == undefined ? opens.push(item) : closes.push(item);
+				});
+				var arr = closes.length ? closes : opens;
+				arr.forEach(function (item) {
+					return item.click();
+				});
+				return false;
+			}
+			//树状结构的选择
+			var treeId = dd.attr('tree-id');
+			if (treeId) {
+				//忽略右边的图标
+				if (othis.is('i:not(.icon-expand)')) {
+					_this11.handlerLabel(id, dd, !dd.hasClass(THIS));
+					return false;
+				}
+				var ajaxConfig = ajaxs[id] || ajax;
+				var treeConfig = ajaxConfig.tree;
+				var childrens = dd.nextAll('dd[tree-id^="' + treeId + '"]');
+				if (childrens && childrens.length) {
+					var len = childrens[0].clientHeight;
+					len ? (_this11.addTreeHeight(dd, len), len = 0) : (len = dd.attr('xm-tree-hidn') || 36, dd.removeAttr('xm-tree-hidn'), dd.find('>i').remove(), childrens = childrens.filter(function (index, item) {
+						return $(item).attr('tree-id').split('-').length - 1 == treeId.split('-').length;
+					}));
+					childrens.animate({
+						height: len
+					}, 150);
+					return false;
+				} else {
+					if (treeConfig.nextClick && treeConfig.nextClick instanceof Function) {
+						treeConfig.nextClick(id, _this11.getItem(id, dd), function (res) {
+							if (!res || !res.length) {
+								_this11.handlerLabel(id, dd, !dd.hasClass(THIS));
+							} else {
+								dd.attr('tree-folder', 'true');
+								var ddChilds = [];
+								res.forEach(function (item, idx) {
+									item.innerHTML = item[ajaxConfig.keyName];
+									item[FORM_TEAM_PID] = JSON.stringify(treeId.split('-').concat([idx]));
+									ddChilds.push(_this11.createDD(id, item));
+									db[id][item[ajaxConfig.keyVal]] = item;
+								});
+								dd.after(ddChilds.join(''));
+							}
+						});
+						return false;
+					}
+				}
+			}
+
+			if (dd.hasClass(FORM_SELECT_TIPS)) {
+				//tips的处理
+				var btn = othis.is('.' + CZ) ? othis : othis.parents('.' + CZ);
+				if (!btn[0]) {
+					return false;
+				}
+				var method = btn.attr('method');
+				var obj = data[id].config.btns.filter(function (bean) {
+					return bean.name == method;
+				})[0];
+				obj && obj.click && obj.click instanceof Function && obj.click(id, _this11);
+				return false;
+			}
+			_this11.handlerLabel(id, dd, !dd.hasClass(THIS));
+			return false;
+		});
+	};
+
+	Common.prototype.addTreeHeight = function (dd, len) {
+		var _this12 = this;
+
+		var treeId = dd.attr('tree-id');
+		var childrens = dd.nextAll('dd[tree-id^="' + treeId + '"]');
+		if (childrens.length) {
+			dd.append('<i class="xm-iconfont icon-expand"></i>');
+			dd.attr('xm-tree-hidn', len);
+			childrens.each(function (index, item) {
+				var that = $(item);
+				_this12.addTreeHeight(that, len);
+			});
+		}
+	};
+
+	var db = {};
+	Common.prototype.getItem = function (id, value) {
+		if (value instanceof $) {
+			if (value.is('i[fsw="' + NAME + '"]')) {
+				var span = value.parent();
+				return db[id][value] || {
+					name: span.find('font').text(),
+					value: span.attr('value')
+				};
+			}
+			var val = value.attr('lay-value');
+			return !db[id][val] ? db[id][val] = {
+				name: value.find('span[name]').attr('name'),
+				value: val
+			} : db[id][val];
+		} else if (typeof value == 'string' && value.indexOf('/') != -1) {
+			return db[id][value] || {
+				name: this.valToName(id, value),
+				value: value
+			};
+		}
+		return db[id][value];
+	};
+
+	Common.prototype.linkageAdd = function (id, val) {
+		var dl = $('dl[xid="' + id + '"]');
+		dl.find('.xm-select-active').removeClass('xm-select-active');
+		var vs = val.value.split('/');
+		var pid = void 0,
+		    li = void 0,
+		    index = 0;
+		var lis = [];
+		do {
+			pid = vs[index];
+			li = dl.find('.xm-select-linkage-group' + (index + 1) + ' li[xm-value="' + pid + '"]');
+			li[0] && lis.push(li);
+			index++;
+		} while (li.length && pid != undefined);
+		if (lis.length == vs.length) {
+			$.each(lis, function (idx, item) {
+				item.addClass('xm-select-this');
+			});
+		}
+	};
+
+	Common.prototype.linkageDel = function (id, val) {
+		var dl = $('dl[xid="' + id + '"]');
+		var vs = val.value.split('/');
+		var pid = void 0,
+		    li = void 0,
+		    index = vs.length - 1;
+		do {
+			pid = vs[index];
+			li = dl.find('.xm-select-linkage-group' + (index + 1) + ' li[xm-value="' + pid + '"]');
+			if (!li.parent().next().find('li[pid=' + pid + '].xm-select-this').length) {
+				li.removeClass('xm-select-this');
+			}
+			index--;
+		} while (li.length && pid != undefined);
+	};
+
+	Common.prototype.valToName = function (id, val) {
+		var dl = $('dl[xid="' + id + '"]');
+		var vs = (val + "").split('/');
+		if (!vs.length) {
+			return null;
+		}
+		var names = [];
+		$.each(vs, function (idx, item) {
+			var name = dl.find('.xm-select-linkage-group' + (idx + 1) + ' li[xm-value="' + item + '"] span').text();
+			names.push(name);
+		});
+		return names.length == vs.length ? names.join('/') : null;
+	};
+
+	Common.prototype.commonHandler = function (key, label) {
+		if (!label || !label[0]) {
+			return;
+		}
+		this.checkHideSpan(key, label);
+		//计算input的提示语
+		this.changePlaceHolder(label);
+		//计算高度
+		this.retop(label.parents('.' + FORM_SELECT));
+		this.calcLabelLeft(label, 0, true);
+		//表单默认值
+		this.setHidnVal(key, label);
+		//title值
+		label.parents('.' + FORM_TITLE + ' .' + NAME).attr('title', data[key].values.map(function (val) {
+			return val.name;
+		}).join(','));
+	};
+
+	Common.prototype.initVal = function (id) {
+		var _this13 = this;
+
+		var target = {};
+		if (id) {
+			target[id] = data[id];
+		} else {
+			target = data;
+		}
+		$.each(target, function (key, val) {
+			var values = val.values,
+			    div = $('dl[xid="' + key + '"]').parent(),
+			    label = div.find('.' + LABEL),
+			    dl = div.find('dl');
+			dl.find('dd.' + THIS).removeClass(THIS);
+
+			var _vals = values.concat([]);
+			_vals.concat([]).forEach(function (item, index) {
+				_this13.addLabel(key, label, item);
+				dl.find('dd[lay-value="' + item.value + '"]').addClass(THIS);
+			});
+			if (val.config.radio) {
+				_vals.length && values.push(_vals[_vals.length - 1]);
+			}
+			_this13.commonHandler(key, label);
+		});
+	};
+
+	Common.prototype.setHidnVal = function (key, label) {
+		if (!label || !label[0]) {
+			return;
+		}
+		label.parents('.' + PNAME).find('.' + HIDE_INPUT).val(data[key].values.map(function (val) {
+			return val.value;
+		}).join(','));
+	};
+
+	Common.prototype.handlerLabel = function (id, dd, isAdd, oval, notOn) {
+		var div = $('[xid="' + id + '"]').prev().find('.' + LABEL),
+		    val = dd && this.getItem(id, dd),
+		    vals = data[id].values,
+		    on = data[id].config.on || events.on[id],
+		    endOn = data[id].config.endOn || events.endOn[id];
+		if (oval) {
+			val = oval;
+		}
+		var fs = data[id];
+		if (isAdd && fs.config.max && fs.values.length >= fs.config.max) {
+			var maxTipsFun = events.maxTips[id] || data[id].config.maxTips;
+			maxTipsFun && maxTipsFun(id, vals.concat([]), val, fs.config.max);
+			return;
+		}
+		if (!notOn) {
+			if (on && on instanceof Function && on(id, vals.concat([]), val, isAdd, dd && dd.hasClass(DISABLED)) == false) {
+				return;
+			}
+		}
+		var dl = $('dl[xid="' + id + '"]');
+		isAdd ? (dd && dd[0] ? (dd.addClass(THIS), dd.removeClass(TEMP)) : dl.find('.xm-select-linkage')[0] && this.linkageAdd(id, val), this.addLabel(id, div, val), vals.push(val)) : (dd && dd[0] ? dd.removeClass(THIS) : dl.find('.xm-select-linkage')[0] && this.linkageDel(id, val), this.delLabel(id, div, val), this.remove(vals, val));
+		if (!div[0]) return;
+		//单选选完后直接关闭选择域
+		if (fs.config.radio) {
+			this.changeShow(div, false);
+		}
+		//移除表单验证的红色边框
+		div.parents('.' + FORM_TITLE).prev().removeClass('layui-form-danger');
+
+		//清空搜索值
+		fs.config.clearInput && this.clearInput(id);
+
+		this.commonHandler(id, div);
+
+		!notOn && endOn && endOn instanceof Function && endOn(id, vals.concat([]), val, isAdd, dd && dd.hasClass(DISABLED));
+	};
+
+	Common.prototype.addLabel = function (id, div, val) {
+		if (!val) return;
+		var tips = 'fsw="' + NAME + '"';
+		var _ref = [$('<span ' + tips + ' value="' + val.value + '"><font ' + tips + '>' + val.name + '</font></span>'), $('<i ' + tips + ' class="xm-iconfont icon-close"></i>')],
+		    $label = _ref[0],
+		    $close = _ref[1];
+
+		$label.append($close);
+		//如果是radio模式
+		var fs = data[id];
+		if (fs.config.radio) {
+			fs.values.length = 0;
+			$('dl[xid="' + id + '"]').find('dd.' + THIS + ':not([lay-value="' + val.value + '"])').removeClass(THIS);
+			div.find('span').remove();
+		}
+		//如果是固定高度
+		div.find('input').css('width', '50px');
+		div.find('input').before($label);
+	};
+
+	Common.prototype.delLabel = function (id, div, val) {
+		if (!val) return;
+		div.find('span[value="' + val.value + '"]:first').remove();
+	};
+
+	Common.prototype.checkHideSpan = function (id, div) {
+		var parentHeight = div.parents('.' + NAME)[0].offsetHeight + 5;
+		div.find('span.xm-span-hide').removeClass('xm-span-hide');
+		div.find('span[style]').remove();
+
+		var count = data[id].config.showCount;
+		div.find('span').each(function (index, item) {
+			if (index >= count) {
+				$(item).addClass('xm-span-hide');
+			}
+		});
+
+		var prefix = div.find('span:eq(' + count + ')');
+		prefix[0] && prefix.before($('<span style="padding-right: 6px;" fsw="' + NAME + '"> + ' + (div.find('span').length - count) + '</span>'));
+	};
+
+	Common.prototype.retop = function (div) {
+		//计算dl显示的位置
+		var dl = div.find('dl'),
+		    top = div.offset().top + div.outerHeight() + 5 - $win.scrollTop(),
+		    dlHeight = dl.outerHeight();
+		var up = div.hasClass('layui-form-selectup') || dl.css('top').indexOf('-') != -1 || top + dlHeight > $win.height() && top >= dlHeight;
+		div = div.find('.' + NAME);
+
+		var fs = data[dl.attr('xid')];
+		var base = dl.parents('.layui-form-pane')[0] && dl.prev()[0].clientHeight > 38 ? 14 : 10;
+		if (fs && fs.config.direction == 'up' || up) {
+			up = true;
+			if (fs && fs.config.direction == 'down') {
+				up = false;
+			}
+		}
+		var reHeight = div[0].offsetTop + div.height() + base;
+		if (up) {
+			dl.css({
+				top: 'auto',
+				bottom: reHeight + 3 + 'px'
+			});
+		} else {
+			dl.css({
+				top: reHeight + 'px',
+				bottom: 'auto'
+			});
+		}
+	};
+
+	Common.prototype.changeShow = function (children, isShow) {
+		//显示于隐藏
+		$('.layui-form-selected').removeClass('layui-form-selected');
+		var top = children.parents('.' + FORM_SELECT),
+		    realShow = top.hasClass(FORM_SELECTED),
+		    id = top.find('dl').attr('xid');
+		$('.' + PNAME + ' .' + FORM_SELECT).not(top).removeClass(FORM_SELECTED);
+		if (isShow) {
+			this.retop(top);
+			top.addClass(FORM_SELECTED);
+			top.find('.' + INPUT).focus();
+			if (!top.find('dl dd[lay-value]:not(.' + FORM_SELECT_TIPS + ')').length) {
+				top.find('dl .' + FORM_NONE).addClass(FORM_EMPTY);
+			}
+		} else {
+			top.removeClass(FORM_SELECTED);
+			this.clearInput(id);
+			top.find('dl .' + FORM_EMPTY).removeClass(FORM_EMPTY);
+			top.find('dl dd.' + DD_HIDE).removeClass(DD_HIDE);
+			top.find('dl dd.' + TEMP).remove();
+			//计算ajax数据是否为空, 然后重新请求数据
+			if (id && data[id] && data[id].config.isEmpty) {
+				this.triggerSearch(top);
+			}
+			this.changePlaceHolder(top.find('.' + LABEL));
+		}
+		if (isShow != realShow) {
+			var openFun = data[id].config.opened || events.opened[id];
+			isShow && openFun && openFun instanceof Function && openFun(id);
+			var closeFun = data[id].config.closed || events.closed[id];
+			!isShow && closeFun && closeFun instanceof Function && closeFun(id);
+		}
+	};
+
+	Common.prototype.changePlaceHolder = function (div) {
+		//显示于隐藏提示语
+		//调整pane模式下的高度
+		var title = div.parents('.' + FORM_TITLE);
+		title[0] || (title = div.parents('dl').prev());
+		if (!title[0]) {
+			return;
+		}
+
+		var id = div.parents('.' + PNAME).find('dl[xid]').attr('xid');
+		if (data[id] && data[id].config.height) {//既然固定高度了, 那就看着办吧
+
+		} else {
+			var height = title.find('.' + NAME)[0].clientHeight;
+			title.css('height', (height > 36 ? height + 4 : height) + 'px');
+			//如果是layui pane模式, 处理label的高度
+			var label = title.parents('.' + PNAME).parent().prev();
+			if (label.is('.layui-form-label') && title.parents('.layui-form-pane')[0]) {
+				height = height > 36 ? height + 4 : height;
+				title.css('height', height + 'px');
+				label.css({
+					height: height + 2 + 'px',
+					lineHeight: height - 18 + 'px'
+				});
+			}
+		}
+
+		var input = title.find('.' + TDIV + ' input'),
+		    isShow = !div.find('span:last')[0] && !title.find('.' + INPUT).val();
+		if (isShow) {
+			var ph = input.attr('back');
+			input.removeAttr('back');
+			input.attr('placeholder', ph);
+		} else {
+			var _ph = input.attr('placeholder');
+			input.removeAttr('placeholder');
+			input.attr('back', _ph);
+		}
+	};
+
+	Common.prototype.indexOf = function (arr, val) {
+		for (var i = 0; i < arr.length; i++) {
+			if (arr[i].value == val || arr[i].value == (val ? val.value : val) || arr[i] == val || JSON.stringify(arr[i]) == JSON.stringify(val)) {
+				return i;
+			}
+		}
+		return -1;
+	};
+
+	Common.prototype.remove = function (arr, val) {
+		var idx = this.indexOf(arr, val ? val.value : val);
+		if (idx > -1) {
+			arr.splice(idx, 1);
+			return true;
+		}
+		return false;
+	};
+
+	Common.prototype.selectAll = function (id, isOn, skipDis) {
+		var _this14 = this;
+
+		var dl = $('[xid="' + id + '"]');
+		if (!dl[0]) {
+			return;
+		}
+		if (dl.find('.xm-select-linkage')[0]) {
+			return;
+		}
+		dl.find('dd[lay-value]:not(.' + FORM_SELECT_TIPS + '):not(.' + THIS + ')' + (skipDis ? ':not(.' + DISABLED + ')' : '')).each(function (index, item) {
+			item = $(item);
+			var val = _this14.getItem(id, item);
+			_this14.handlerLabel(id, dl.find('dd[lay-value="' + val.value + '"]'), true, val, !isOn);
+		});
+	};
+
+	Common.prototype.removeAll = function (id, isOn, skipDis) {
+		var _this15 = this;
+
+		var dl = $('[xid="' + id + '"]');
+		if (!dl[0]) {
+			return;
+		}
+		if (dl.find('.xm-select-linkage')[0]) {
+			//针对多级联动的处理
+			data[id].values.concat([]).forEach(function (item, idx) {
+				var vs = item.value.split('/');
+				var pid = void 0,
+				    li = void 0,
+				    index = 0;
+				do {
+					pid = vs[index++];
+					li = dl.find('.xm-select-linkage-group' + index + ':not(.xm-select-linkage-hide) li[xm-value="' + pid + '"]');
+					li.click();
+				} while (li.length && pid != undefined);
+			});
+			return;
+		}
+		data[id].values.concat([]).forEach(function (item, index) {
+			if (skipDis && dl.find('dd[lay-value="' + item.value + '"]').hasClass(DISABLED)) {} else {
+				_this15.handlerLabel(id, dl.find('dd[lay-value="' + item.value + '"]'), false, item, !isOn);
+			}
+		});
+	};
+
+	Common.prototype.reverse = function (id, isOn, skipDis) {
+		var _this16 = this;
+
+		var dl = $('[xid="' + id + '"]');
+		if (!dl[0]) {
+			return;
+		}
+		if (dl.find('.xm-select-linkage')[0]) {
+			return;
+		}
+		dl.find('dd[lay-value]:not(.' + FORM_SELECT_TIPS + ')' + (skipDis ? ':not(.' + DISABLED + ')' : '')).each(function (index, item) {
+			item = $(item);
+			var val = _this16.getItem(id, item);
+			_this16.handlerLabel(id, dl.find('dd[lay-value="' + val.value + '"]'), !item.hasClass(THIS), val, !isOn);
+		});
+	};
+
+	Common.prototype.skin = function (id) {
+		var skins = ['default', 'primary', 'normal', 'warm', 'danger'];
+		var skin = skins[Math.floor(Math.random() * skins.length)];
+		$('dl[xid="' + id + '"]').parents('.' + PNAME).find('.' + FORM_SELECT).attr('xm-select-skin', skin);
+		this.check(id) && this.commonHandler(id, $('dl[xid="' + id + '"]').parents('.' + PNAME).find('.' + LABEL));
+	};
+
+	Common.prototype.getPosition = function (e) {
+		var x = 0,
+		    y = 0;
+		while (e != null) {
+			x += e.offsetLeft;
+			y += e.offsetTop;
+			e = e.offsetParent;
+		}
+		return { x: x, y: y };
+	};
+
+	Common.prototype.onreset = function () {
+		//监听reset按钮, 然后重置多选
+		$(document).on('click', '[type=reset]', function (e) {
+			$(e.target).parents('form').find('.' + PNAME + ' dl[xid]').each(function (index, item) {
+				var id = item.getAttribute('xid'),
+				    dl = $(item),
+				    dd = void 0,
+				    temp = {};
+				common.removeAll(id);
+				data[id].config.init.forEach(function (val, idx) {
+					if (val && (!temp[val] || data[id].config.repeat) && (dd = dl.find('dd[lay-value="' + val.value + '"]'))[0]) {
+						common.handlerLabel(id, dd, true);
+						temp[val] = 1;
+					}
+				});
+			});
+		});
+	};
+
+	Common.prototype.bindEvent = function (name, id, fun) {
+		if (id && id instanceof Function) {
+			fun = id;
+			id = null;
+		}
+		if (fun && fun instanceof Function) {
+			if (!id) {
+				$.each(data, function (id, val) {
+					data[id] ? data[id].config[name] = fun : events[name][id] = fun;
+				});
+			} else {
+				data[id] ? (data[id].config[name] = fun, delete events[name][id]) : events[name][id] = fun;
+			}
+		}
+	};
+
+	Common.prototype.check = function (id, notAutoRender) {
+		if ($('dl[xid="' + id + '"]').length) {
+			return true;
+		} else if ($('select[xm-select="' + id + '"]').length) {
+			if (!notAutoRender) {
+				this.render(id, $('select[xm-select="' + id + '"]'));
+				return true;
+			}
+		} else {
+			delete data[id];
+			return false;
+		}
+	};
+
+	Common.prototype.render = function (id, select) {
+		common.init(select);
+		common.one($('dl[xid="' + id + '"]').parents('.' + PNAME));
+		common.initVal(id);
+	};
+
+	Common.prototype.log = function (obj) {
+		console.log(obj);
+	};
+
+	var Select4 = function Select4() {
+		this.v = v;
+		this.render();
+	};
+	var common = new Common();
+
+	Select4.prototype.value = function (id, type, isAppend) {
+		if (typeof id != 'string') {
+			return [];
+		}
+		var fs = data[id];
+		if (!common.check(id)) {
+			return [];
+		}
+		if (typeof type == 'string' || type == undefined) {
+			var arr = fs.values.concat([]) || [];
+			if (type == 'val') {
+				return arr.map(function (val) {
+					return val.value;
+				});
+			}
+			if (type == 'valStr') {
+				return arr.map(function (val) {
+					return val.value;
+				}).join(',');
+			}
+			if (type == 'name') {
+				return arr.map(function (val) {
+					return val.name;
+				});
+			}
+			if (type == 'nameStr') {
+				return arr.map(function (val) {
+					return val.name;
+				}).join(',');
+			}
+			return arr;
+		}
+		if (common.isArray(type)) {
+			var dl = $('[xid="' + id + '"]'),
+			    temp = {},
+			    dd = void 0,
+			    isAdd = true;
+			if (isAppend == false) {
+				//删除传入的数组
+				isAdd = false;
+			} else if (isAppend == true) {
+				//追加模式
+				isAdd = true;
+			} else {
+				//删除原有的数据
+				common.removeAll(id);
+			}
+			if (isAdd) {
+				fs.values.forEach(function (val, index) {
+					temp[val.value] = 1;
+				});
+			}
+			type.forEach(function (val, index) {
+				if (val && (!temp[val] || fs.config.repeat)) {
+					if ((dd = dl.find('dd[lay-value="' + val + '"]'))[0]) {
+						common.handlerLabel(id, dd, isAdd, null, true);
+						temp[val] = 1;
+					} else {
+						var name = common.valToName(id, val);
+						if (name) {
+							common.handlerLabel(id, dd, isAdd, common.getItem(id, val), true);
+							temp[val] = 1;
+						}
+					}
+				}
+			});
+		}
+	};
+
+	Select4.prototype.on = function (id, fun, isEnd) {
+		common.bindEvent(isEnd ? 'endOn' : 'on', id, fun);
+		return this;
+	};
+
+	Select4.prototype.filter = function (id, fun) {
+		common.bindEvent('filter', id, fun);
+		return this;
+	};
+
+	Select4.prototype.maxTips = function (id, fun) {
+		common.bindEvent('maxTips', id, fun);
+		return this;
+	};
+
+	Select4.prototype.opened = function (id, fun) {
+		common.bindEvent('opened', id, fun);
+		return this;
+	};
+
+	Select4.prototype.closed = function (id, fun) {
+		common.bindEvent('closed', id, fun);
+		return this;
+	};
+
+	Select4.prototype.config = function (id, config, isJson) {
+		if (id && (typeof id === 'undefined' ? 'undefined' : _typeof(id)) == 'object') {
+			isJson = config == true;
+			config = id;
+			id = null;
+		}
+		if (config && (typeof config === 'undefined' ? 'undefined' : _typeof(config)) == 'object') {
+			if (isJson) {
+				config.header || (config.header = {});
+				config.header['Content-Type'] = 'application/json; charset=UTF-8';
+				config.dataType = 'json';
+			}
+			id ? (ajaxs[id] = $.extend(true, {}, ajaxs[id] || ajax, config), !common.check(id) && this.render(id), data[id] && config.direction && (data[id].config.direction = config.direction), data[id] && config.clearInput && (data[id].config.clearInput = true), config.searchUrl && data[id] && common.triggerSearch($('.' + PNAME + ' dl[xid="' + id + '"]').parents('.' + FORM_SELECT), true)) : ($.extend(true, ajax, config), $.each(ajaxs, function (key, item) {
+				$.extend(true, item, config);
+			}));
+		}
+		return this;
+	};
+
+	Select4.prototype.render = function (id, options) {
+		var _ref2;
+
+		if (id && (typeof id === 'undefined' ? 'undefined' : _typeof(id)) == 'object') {
+			options = id;
+			id = null;
+		}
+		var config = options ? (_ref2 = {
+			init: options.init,
+			disabled: options.disabled,
+			max: options.max,
+			isSearch: options.isSearch,
+			searchUrl: options.searchUrl,
+			isCreate: options.isCreate,
+			radio: options.radio,
+			skin: options.skin,
+			direction: options.direction,
+			height: options.height,
+			formname: options.formname,
+			layverify: options.layverify,
+			layverType: options.layverType,
+			showCount: options.showCount,
+			placeholder: options.placeholder,
+			create: options.create,
+			filter: options.filter,
+			maxTips: options.maxTips,
+			on: options.on
+		}, _defineProperty(_ref2, 'on', options.on), _defineProperty(_ref2, 'opened', options.opened), _defineProperty(_ref2, 'closed', options.closed), _defineProperty(_ref2, 'template', options.template), _defineProperty(_ref2, 'clearInput', options.clearInput), _ref2) : {};
+
+		options && options.searchType != undefined && (config.searchType = options.searchType == 'dl' ? 1 : 0);
+
+		if (id) {
+			fsConfigs[id] = {};
+			$.extend(fsConfigs[id], data[id] ? data[id].config : {}, config);
+		} else {
+			$.extend(fsConfig, config);
+		}
+
+		($('select[' + NAME + '="' + id + '"]')[0] ? $('select[' + NAME + '="' + id + '"]') : $('select[' + NAME + ']')).each(function (index, select) {
+			var sid = select.getAttribute(NAME);
+			common.render(sid, select);
+			setTimeout(function () {
+				return common.setHidnVal(sid, $('select[xm-select="' + sid + '"] + div.' + PNAME + ' .' + LABEL));
+			}, 10);
+		});
+		return this;
+	};
+
+	Select4.prototype.disabled = function (id) {
+		var target = {};
+		id ? common.check(id) && (target[id] = data[id]) : target = data;
+
+		$.each(target, function (key, val) {
+			$('dl[xid="' + key + '"]').prev().addClass(DIS);
+		});
+		return this;
+	};
+
+	Select4.prototype.undisabled = function (id) {
+		var target = {};
+		id ? common.check(id) && (target[id] = data[id]) : target = data;
+
+		$.each(target, function (key, val) {
+			$('dl[xid="' + key + '"]').prev().removeClass(DIS);
+		});
+		return this;
+	};
+
+	Select4.prototype.data = function (id, type, config) {
+		if (!id || !type || !config) {
+			common.log('id: ' + id + ' param error !!!');
+			return this;
+		}
+		if (!common.check(id)) {
+			common.log('id: ' + id + ' not render !!!');
+			return this;
+		}
+		this.value(id, []);
+		this.config(id, config);
+		if (type == 'local') {
+			common.renderData(id, config.arr, config.linkage == true, config.linkageWidth ? config.linkageWidth : '100');
+		} else if (type == 'server') {
+			common.ajax(id, config.url, config.keyword, config.linkage == true, config.linkageWidth ? config.linkageWidth : '100');
+		}
+		return this;
+	};
+
+	Select4.prototype.btns = function (id, btns, config) {
+		if (id && common.isArray(id)) {
+			btns = id;
+			id = null;
+		}
+		if (!btns || !common.isArray(btns)) {
+			return this;
+		};
+		var target = {};
+		id ? common.check(id) && (target[id] = data[id]) : target = data;
+
+		btns = btns.map(function (obj) {
+			if (typeof obj == 'string') {
+				if (obj == 'select') {
+					return quickBtns[0];
+				}
+				if (obj == 'remove') {
+					return quickBtns[1];
+				}
+				if (obj == 'reverse') {
+					return quickBtns[2];
+				}
+				if (obj == 'skin') {
+					return quickBtns[3];
+				}
+			}
+			return obj;
+		});
+
+		$.each(target, function (key, val) {
+			val.config.btns = btns;
+			var dd = $('dl[xid="' + key + '"]').find('.' + FORM_SELECT_TIPS + ':first');
+			if (btns.length) {
+				var show = config && config.show && (config.show == 'name' || config.show == 'icon') ? config.show : '';
+				var html = common.renderBtns(key, show, config && config.space ? config.space : '30px');
+				dd.html(html);
+			} else {
+				var pcInput = dd.parents('.' + FORM_SELECT).find('.' + TDIV + ' input');
+				var _html = pcInput.attr('placeholder') || pcInput.attr('back');
+				dd.html(_html);
+				dd.removeAttr('style');
+			}
+		});
+
+		return this;
+	};
+
+	Select4.prototype.search = function (id, val) {
+		if (id && common.check(id)) {
+			ajaxs[id] = $.extend(true, {}, ajaxs[id] || ajax, {
+				first: true,
+				searchVal: val
+			});
+			common.triggerSearch($('dl[xid="' + id + '"]').parents('.' + FORM_SELECT), true);
+		}
+		return this;
+	};
+
+	Select4.prototype.replace = function (id, type, config) {
+		var _this17 = this;
+
+		if (!id || !type || !config) {
+			common.log('id: ' + id + ' param error !!!');
+			return this;
+		}
+		if (!common.check(id, true)) {
+			common.log('id: ' + id + ' not render !!!');
+			return this;
+		}
+		var oldVals = this.value(id, 'val');
+		this.value(id, []);
+		this.config(id, config);
+		if (type == 'local') {
+			common.renderData(id, config.arr, config.linkage == true, config.linkageWidth ? config.linkageWidth : '100', false, true);
+			this.value(id, oldVals, true);
+		} else if (type == 'server') {
+			common.ajax(id, config.url, config.keyword, config.linkage == true, config.linkageWidth ? config.linkageWidth : '100', false, function (id) {
+				_this17.value(id, oldVals, true);
+			}, true);
+		}
+	};
+
+	return new Select4();
+});
\ No newline at end of file
diff --git a/hxy-web/js/public/public.js b/hxy-web/js/public/public.js
index 4be4bd1..8030690 100644
--- a/hxy-web/js/public/public.js
+++ b/hxy-web/js/public/public.js
@@ -1,5 +1,7 @@
 //系统请求路径
 let PATH_URL="http://127.0.0.1:1917/line"
+//系统请求路径
+let IMG_URL="http://127.0.0.1:1911/bmw/"
 // let PATH_URL=getContextPath();
 //登录页面路径
 let LOGIN_PATH="http://127.0.0.1:8849/ah-bns-web/html/test/test.html";
diff --git a/hxy-web/js/wireManager/header.js b/hxy-web/js/wireManager/header.js
index e0b39e5..d29c214 100644
--- a/hxy-web/js/wireManager/header.js
+++ b/hxy-web/js/wireManager/header.js
@@ -22,7 +22,7 @@ function init(){
 			$("#taskSourceId").val(data.data[0].child[0].parentName + ' / ' + data.data[0].child[0].title);
 			$("#taskSourceId").attr("stationId", data.data[0].child[0].id);
 			$("#taskSourceId").attr("stationName", data.data[0].child[0].title);
-			
+			localStorage.setItem("selectyj",data.data[0].child[0].id)
 			dropdown.render({
 				elem: '#taskSourceId',
 				accordion: true,
@@ -32,7 +32,7 @@ function init(){
 				  $("#taskSourceId").val(`${item.parentName + ' / ' + item.title}`);
 				  $("#taskSourceId").attr("stationId", item.id);
 				  $("#taskSourceId").attr("stationName", item.title);
-				  
+				  localStorage.setItem("selectyj", item.id)
 				  var iframe = $("#indexFrame")[0];
 				  var iframeWindow = iframe.contentWindow;
 				  iframeWindow.setData();
diff --git a/hxy-web/js/wireManager/staff/staffAdd.js b/hxy-web/js/wireManager/staff/staffAdd.js
index 971e1d2..da2cd94 100644
--- a/hxy-web/js/wireManager/staff/staffAdd.js
+++ b/hxy-web/js/wireManager/staff/staffAdd.js
@@ -6,16 +6,23 @@ var examFileNames = [];
 var examFilePaths = [];
 var staffType = "";
 var tree;
-layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
+var transfer;
+var formSelects;
+var olddata;
+layui.use(['element','layer','transfer', 'form', 'upload','laydate','tree'], function () {
     var laydate = layui.laydate;
     var upload = layui.upload;
     var form = layui.form;
     var layer = layui.layer;
     tree = layui.tree;
-
-    $("#line").attr("disabled",true);
-    $('#area').attr('disabled', true);
-    $('#chonsenBtn').show()
+	formSelects= layui.formSelects;
+	 transfer  = layui.transfer ;
+	 formSelects.disabled('proName', true);
+	 $('#gtName').attr('disabled', true);
+	 $('#chonsenBtn').show()
+	if(olddata){
+		setData2(olddata);
+	}
     form.render();
     //人员类型选择
     $('.btnOption1 > div').click(function () {
@@ -24,15 +31,19 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
         $(this).attr('value', value).siblings().attr('value', '');
         staffType = value;
         console.log(staffType)
-        if(staffType==2){
-            $('#line').attr("disabled",false);
-            $('#area').attr('disabled', false);
-            $('#chonsenBtn').hide()
-        }
         if(staffType==1){
-            $("#line").attr("disabled",true);
-            $('#area').attr('disabled', true);
+			formSelects.disabled('proName', false);
+			formSelects.render()
+			initProSelect();
+            $('#gtName').attr('disabled', false);
+            $('#chonsenBtn').hide()
+			$("#userType").val(1);
+        }
+        if(staffType==0){
+            formSelects.disabled('proName', true);
+            $('#gtName').attr('disabled', true);
             $('#chonsenBtn').show()
+			$("#userType").val(0);
         }
         form.render();
 
@@ -41,13 +52,17 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
     //文件上传
     var uploadInst = upload.render({
         elem: '#contractFile' //绑定元素
-        ,url: '' //上传接口
+        ,url: PATH_URL + "/personbase/upload" //上传接口
         ,auto: false //选择文件后不自动上传
+		,multiple: true   //是否允许多文件上传，默认未false
+		,dataType: "json"
+		,exts: 'jpg|png|jpeg|pdf|doc|docx'
+		,number: 1  //最大上传数量
+		,size: 1024 * 5 //最大文件大小，单位k
         ,bindAction: '#submitBt' //指向一个按钮触发上传
         ,choose: function(obj){
             //将每次选择的文件追加到文件队列
             var files = obj.pushFile();
-            
             //预读本地文件，如果是多文件，则会遍历。(不支持ie8/9)
             obj.preview(function(index, file, result){
                 console.log(index); //得到文件索引
@@ -60,14 +75,18 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
                 //delete files[index]; //删除列表中对应的文件，一般在某个事件中使用
             });
         },
+		before: function (obj) {
+			this.data = {
+				photoType: "hxy"
+			};
+		},
         done: function(res){
-            //上传完毕回调
+            console.log(res,"upload");
         },
         error: function(){
             //请求异常回调
         }
     });
-
     // 渲染开始时间选择器
     laydate.render({
         elem: '#startTime',
@@ -94,9 +113,9 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
                 format: 'yyyy-MM-dd',
                 fullPanel: true,
                 // 将开始时间作为结束时间选择器的最小值，包括时分
-                min: value,
-                // 设置结束日期最大值为下个月的最后一天
-                max: getNextMonthLastDay(),
+                // min: value,
+                // // 设置结束日期最大值为下个月的最后一天
+                // max: getNextMonthLastDay(),
                 done: function(value) {
                     var startTime = $("#startTime").val();
                     if (startTime != '' && value != '') {
@@ -108,9 +127,9 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
             });
         },
         // 设置开始日期最小值为下个月的第一天
-        min: getNextMonthFirstDay(),
+        // min: getNextMonthFirstDay(),
         // 设置开始日期最大值为下个月的最后一天
-        max: getNextMonthLastDay()
+        // max: getNextMonthLastDay()
     });
     // 渲染结束时间选择器
     laydate.render({
@@ -119,15 +138,14 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
         format: 'yyyy-MM-dd',
         fullPanel: true,
         // 设置结束日期最小值为下个月的第一天
-        min: getNextMonthFirstDay(),
+        // min: getNextMonthFirstDay(),
         // 设置结束日期最大值为下个月的最后一天
-        max: getNextMonthLastDay()
+        // max: getNextMonthLastDay()
     });
-    
     //监听填写事件-身份证号码
-    $('#idCard').on('input', function() {
+    $('#idNumber').on('input', function() {
         let inputVal = $(this).val();
-        let IDNu = document.getElementById('idCard');
+        let IDNu = document.getElementById('idNumber');
         if (inputVal==''){
             $(this).val('');
         }
@@ -136,7 +154,7 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
             // layer.msg('身份证号码填写完成');
             //出生日期
             let age = inputVal.substring(6, 10) + "-" + inputVal.substring(10, 12) + "-" + inputVal.substring(12, 14);
-            $('#ages').val(age)
+            $('#beBorn').val(age)
             //性别 
             let sew = ''
             var sec = inputVal.substring(16, 17);
@@ -152,7 +170,7 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
         
     });
     //监听填写事件
-    $('#payAll').on('input', function() {
+    $('#wagesMeasure').on('input', function() {
         var inputVal = $(this).val();
         if (inputVal==''){
             $(this).val('');
@@ -166,7 +184,7 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
         }
     });
     //监听填写事件
-    $('#payDay').on('input', function() {
+    $('#wagesDay').on('input', function() {
         var inputVal = $(this).val();
         if (inputVal==''){
             $(this).val('');
@@ -181,8 +199,8 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
     });
     form.verify({
         //数组的两个值分别代表：[正则匹配、匹配不符时的提示文字]
-        phoneNum: [/^1[3-9]\d{9}$/,'手机号格式不正确'],
-        idCard:[/^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}))$/,'身份证号码不正确']
+        tel: [/^1[3-9]\d{9}$/,'手机号格式不正确'],
+        idNumber:[/^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}))$/,'身份证号码不正确']
     });  
     //取消按钮
     $("#closeBt").click(function () {
@@ -193,14 +211,67 @@ layui.use(['layer', 'form', 'upload','laydate','tree'], function () {
     // 验证成功后才会执行下面的操作
     form.on('submit(formDemo)', function (data) {
         console.log(data)
-        // if($("#id").val()==''){
-        //     addData(data); // 新增
-        // }else{
-        //     updateData(data); // 修改
-        // }
+		var userType=$("#userType").val();
+		if(userType==1){
+			var proid="";
+			var dd=formSelects.value('proName', 'all');
+			console.log(dd,"formSelects");
+			if(dd.length>0){
+				$.each(dd,function(index,value){
+					proid=proid+value.value+",";
+				});
+				data.field.proId=proid;
+			}else{
+				layer.msg("请选择工程")
+				return;
+			}
+		}
+        if($("#id").val()==''){
+            addData(data); // 新增
+        }else{
+            updateData(data); // 修改
+        }
     });
 });
 
+
+function initProSelect(arr){
+	var yj_id=localStorage.getItem("selectyj");
+    $.ajax({
+        type:"post",
+        url : PATH_URL + "/personbase/getProDetail",
+        data:{
+			id:yj_id
+        },
+        dataType:"json",
+        success:function(res){
+   //          $("#proName").unbind();
+   //          $("#proName option:gt(0)").remove();
+   //          var html="";
+   //          for(var i=0;i<res.data.length;i++){
+   //              html+="<option value='"+res.data[i].id+"'>"+ res.data[i].title +"</option>";
+   //          }
+   //          $("#proName").append(html);
+			// formSelects.value('proName', [2]); 
+			var data=[];
+			for(var i=0;i<res.data.length;i++){
+				var obj={};
+				obj.value=res.data[i].id;
+				obj.name=res.data[i].title;
+				data.push(obj)
+			}
+			formSelects.data('proName', 'local', {
+			        arr: data
+			});
+			try{
+				var arr=$("#proId").val().split(",");
+				formSelects.value('proName', arr);
+			}catch(e){}
+        },
+        error:function(data){
+        }
+    });
+}
 /**
  * 获取下个月第一天
  * @returns {string}
@@ -239,6 +310,35 @@ function openChosenBox(){
         },
         yes: function (index, layero) {//确认
             console.log(1)
+			var getData = transfer.getData('gtList');
+			var pros=[];
+			var gts=[];
+			$.each(getData,function(index,item){
+				pros.push(item.proName);
+				gts.push(item.value);
+			})
+			var uniqueproArray = $.grep(pros, function (item, index) {
+			  return index === $.inArray(item, pros);
+			});
+			var uniquegtsArray = $.grep(gts, function (item, index) {
+			  return index === $.inArray(item, gts);
+			});
+			var area="";
+			$.each(uniqueproArray,function(index,item){
+				var gt="";
+				$.each(getData,function(index1,item1){
+					if(item==item1.proName){
+						gt=gt+item1.gtName+"/";
+					}
+				})
+				area=area+item+"("+gt+");"
+			})
+			var gtid="";
+			$.each(uniquegtsArray,function(index,item){
+				gtid=gtid+item+",";
+			})
+			$("#gtName").val(area);
+			$("#gtId").val(gtid);
             layer.close(index);
         },
         btn2: function (index, layero) {//取消
@@ -257,33 +357,6 @@ function openChosenBox(){
 function initTree(){
     layui.use(['tree'], function () {
         var tree = layui.tree;
-        var data = [
-            {
-                title: "丽江运检站",id: 1,spread:true,
-                children: [{title: "±500kV永富直流线"}, {title: "500kV草宝甲线 "},{title: "500kV草宝乙线 "}, {title: "500kV大宝Ⅰ回线"}, {title: "500kV大宝Ⅱ回线"}]
-            },
-            {
-                title: "迪庆运检站",id: 1,spread:true,
-                children: [{title: "±500kV永富直流线"}, {title: "500kV草宝甲线 "},{title: "500kV草宝乙线 "}, {title: "500kV大宝Ⅰ回线"}, {title: "500kV大宝Ⅱ回线"}]
-            }, 
-            {
-                title: "昆明运检一站",id: 1,spread:true,
-                children: [{title: "±500kV永富直流线"}, {title: "500kV草宝甲线 "},{title: "500kV草宝乙线 "}, {title: "500kV大宝Ⅰ回线"}, {title: "500kV大宝Ⅱ回线"}]
-            }, 
-            {
-                title: "昆明运检二站",id: 1,spread:true,
-                children: [{title: "±500kV永富直流线"}, {title: "500kV草宝甲线 "},{title: "500kV草宝乙线 "}, {title: "500kV大宝Ⅰ回线"}, {title: "500kV大宝Ⅱ回线"}]
-            }, 
-            {
-                title: "怒江运检站",id: 1,spread:true,
-                children: [{title: "±500kV永富直流线"}, {title: "500kV草宝甲线 "},{title: "500kV草宝乙线 "}, {title: "500kV大宝Ⅰ回线"}, {title: "500kV大宝Ⅱ回线"}]
-            }, 
-            {
-                title: "怒江运检站",id: 1,spread:true,
-                children: [{title: "±500kV永富直流线"}, {title: "500kV草宝甲线 "},{title: "500kV草宝乙线 "}, {title: "500kV大宝Ⅰ回线"}, {title: "500kV大宝Ⅱ回线"}]
-            }, 
-         
-        ];
         var renderTree = function (data) {
             tree.render({
                 elem: '#lineTree',
@@ -293,41 +366,95 @@ function initTree(){
                 accordion: false,
                 click: function (obj) {
                     console.log(obj);
-                    initGtList([])
+                    initGtList(obj.data.id);
                 }
             });
  
         }
-        renderTree(data);
+		var yj_id=localStorage.getItem("selectyj");
+		console.log(yj_id,"yj_id");
+		$.ajax({//id获取详情打开弹窗传值子页面
+		    type: 'post',
+		    url: PATH_URL + "/personbase/getTreeDetail",
+		    dataType: 'json',
+		    data: {
+		        id: yj_id
+		    },
+		    success: function (data) {
+				renderTree(data.data);
+			}
+		})
     });
 }
-function initGtList(arr){
-    layui.use(['transfer'], function () { 
-        var transfer  = layui.transfer ;
-        arr = [
-            {value:'1',title:'N1',name:'N111-500kV草宝甲线'},
-            {value:'2',title:'N2',name:'N111-500kV草宝甲线'},
-            {value:'3',title:'N3',name:'N111-500kV草宝甲线'},
-            {value:'4',title:'N4',name:'N111-500kV草宝甲线'},
-            {value:'5',title:'N5',name:'N111-500kV草宝甲线'},
-            {value:'6',title:'N6',name:'N111-500kV草宝甲线'},
-            {value:'7',title:'N7',name:'N111-500kV草宝甲线'},
-            {value:'8',title:'N8',name:'N111-500kV草宝甲线'},
-            {value:'9',title:'N9',name:'N111-500kV草宝甲线'},
-            {value:'10',title:'N10',name:'N111-500kV草宝甲线'},
-            {value:'11',title:'N11',name:'N111-500kV草宝甲线'},
-            {value:'12',title:'N12',name:'N111-500kV草宝甲线'},
-            {value:'13',title:'N13',name:'N111-500kV草宝甲线'},
-
-        ]
-        transfer.render({
-            elem: '#gtList',
-            data: arr,
-            showSearch: true,
-            title: ['杆塔', '已选']  //自定义标题
-        })
-
-    });
+function initGtList(id){
+	var gtdata=[];
+	try{
+		gtdata=transfer.getData('gtList');
+	}catch(e){}
+	$.ajax({//id获取详情打开弹窗传值子页面
+		type: 'post',
+		url: PATH_URL + "/personbase/getGtDetail",
+		dataType: 'json',
+		data: {
+			id: id,
+			userId:$("#id").val()
+		},
+		success: function (data) {
+			var newvalue=[];
+			var newdata=[];
+			if(gtdata.length>0){
+				$.each(gtdata,function(index,item){
+					item.disabled=false;
+					newvalue.push(item.value);
+					newdata.push(item);
+				});
+				$.each(data.data,function(index,item){
+					var f=0;
+					$.each(newdata,function(index1,item1){
+						if(item.value==item1.value){
+							f=1;
+						}
+					});
+					if(f==0){
+						newdata.push(item);
+					}
+				});
+			}else if(data.datad.length>0){
+				gtdata=data.datad;
+				$.each(gtdata,function(index,item){
+					item.disabled=false;
+					newvalue.push(item.value);
+					newdata.push(item);
+				});
+				$.each(data.data,function(index,item){
+					var f=0;
+					$.each(newdata,function(index1,item1){
+						if(item.value==item1.value){
+							f=1;
+						}
+					});
+					if(f==0){
+						newdata.push(item);
+					}
+				});
+			}else{
+				newdata=data.data;
+			}
+			transfer.render({
+				elem: '#gtList',
+				data: newdata,
+				value:newvalue,
+				showSearch: true,
+				id: 'gtList',
+				title: ['杆塔', '已选']  //自定义标题
+				,onchange: function(obj, index){
+				  var arr = ['左边', '右边'];
+				  // layer.alert('来自 <strong>'+ arr[index] + '</strong> 的数据：'+ JSON.stringify(obj)); //获得被穿梭时的数据
+				}
+			})
+			console.log(transfer.getData('gtList'))
+		}
+	})
 }
 
 /**
@@ -335,55 +462,35 @@ function initGtList(arr){
  * @param formData
  */
 function addData(formData) {
-    if (staffType == "") {
-        layer.msg("请选择人员类型", {icon: 0})
-        return
-    }else {
-        console.log(formData.field);
+		var file=formData.field.file;
+		if(file){
+			layer.msg("请上传合同附件！");
+			return;
+		}
         // 加载提示
-        // let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']});
-        // form请求地址
-        // let formUrl = oiPlanUrl + "/monthlyPlanSubmission/add";
-        // $.ajax({
-        //     type: 'POST',
-        //     async: false, // 默认异步true,false表示同步
-        //     url: formUrl, // 请求地址
-        //     data:{
-        //         "userName": $("#userName").val(),
-        //         "idCard": $("#idCard").val(),
-        //         "sex": $("#sex").val(),
-        //         "ages": $("#ages").val(),
-        //         "phone": $("#phone").val(),
-        //         "address": $("#address").val(),
-        //         "health": $("#health").val(),
-        //         "level": $("#level").val(),
-        //         "line": $("#line").val(),
-        //         "area": $("#area").val(),
-        //         "payAll": $("#payAll").val(),
-        //         "payDay": $("#payDay").val(),
-
-        //         "startTime": $("#startTime").val(),
-        //         "endTime": $("#endTime").val(),
-
-
- 
-
-        //     },
-        //     success: function (data) {
-        //         layer.close(loadingMsg); // 关闭提示层
-        //         if(data.code == 200){
-        //             top.layer.msg("添加成功");
-        //             reloading();
-        //         }else{
-        //             layer.alert(data.msg);
-        //         }
-        //     },
-        //     error: function (XMLHttpRequest, textStatus, e) {
-        //         layer.close(loadingMsg);
-        //         layer.msg('数据请求发生异常,请稍后重试', {icon: 16, scrollbar: false});
-        //     }
-        // });
-    }
+        let loadingMsg = layer.msg('数据请求中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']});
+        // form请求地址file
+        let formUrl =  PATH_URL + "/personbase/insertUser";
+       $.ajax({
+           type: 'POST',
+           async: false, // 默认异步true,false表示同步
+           url: formUrl, // 请求地址
+           data:formData.field,
+           success: function (data) {
+               layer.close(loadingMsg); // 关闭提示层
+               if(data.code == 200){
+                   layer.msg("新增成功");
+				     $("#hideUpload1").trigger("click");
+                   reloading();
+               }else{
+                   layer.alert(data.msg);
+               }
+           },
+           error: function (XMLHttpRequest, textStatus, e) {
+               layer.close(loadingMsg);
+               layer.msg('数据请求发生异常,请稍后重试', {icon: 16, scrollbar: false});
+           }
+       });
 }
 
 /**
@@ -395,34 +502,17 @@ function updateData(formData) {
         // 加载提示
         let loadingMsg = layer.msg('数据请求中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']});
         // form请求地址
-        let formUrl = oiPlanUrl + "/monthlyPlanSubmission/update";
+        let formUrl =  PATH_URL + "/personbase/updateUser";
         $.ajax({
             type: 'POST',
             async: false, // 默认异步true,false表示同步
             url: formUrl, // 请求地址
-            data:{
-                "id": $("#id").val(),
-                "userName": $("#userName").val(),
-                "idCard": $("#idCard").val(),
-                "sex": $("#sex").val(),
-                "ages": $("#ages").val(),
-                "phone": $("#phone").val(),
-                "address": $("#address").val(),
-                "health": $("#health").val(),
-                "level": $("#level").val(),
-                "staffType": staffType,
-                
-                "startTime": $("#startTime").val(),
-                "endTime": $("#endTime").val(),
- 
-
- 
-            },
+            data:formData.field,
             success: function (data) {
                 layer.close(loadingMsg); // 关闭提示层
                 if(data.code == 200){
-                    top.layer.msg("修改成功");
-                    reloading();
+                    layer.msg("修改成功");
+                    // reloading();
                 }else{
                     layer.alert(data.msg);
                 }
@@ -439,6 +529,89 @@ function updateData(formData) {
 
 
 
+
+/**
+ * 隐藏提交按钮和关闭按钮
+ */
+function hideSubmit() {
+    // 使用getElementById根据ID选择按钮
+    var submitButton = document.getElementById('submitBt');
+    var closeButton = document.getElementById('closeBt');
+    // 如果按钮存在，则隐藏它
+    if (submitButton) {
+        submitButton.style.display = 'none';
+    }
+    if (closeButton) {
+        closeButton.style.display = 'none';
+    }
+}
+function setData(data){
+	olddata=data;
+}
+/**
+ * 设置数据
+ * @param data
+ */
+function setData2(data) {
+    console.log(data);
+    $("#id").val(data.id);
+    $("#userName").val(data.userName);
+    $("#idNumber").val(data.idNumber);
+	$("#sex").val(data.sex);
+	$("#beBorn").val(data.beBorn);
+	$("#tel").val(data.tel);
+	$("#address").val(data.address);
+	$("#healthStatus").val(data.healthStatus);
+	$("#degree").val(data.degree);
+	$("#gtName").val(data.gtName);
+	$("#wagesMeasure").val(data.wagesMeasure);
+	$("#wagesDay").val(data.wagesDay);
+	$("#startTime").val(data.startTime);
+	$("#endTime").val(data.endTime);
+	$("#bank").val(data.bank);
+	$("#bankCard").val(data.bankCard);
+	$("#unionpayNum").val(data.unionpayNum);
+	$("#bankBranch").val(data.bankBranch);
+    // getTaskSource("taskSourceId",data[0].taskSourceId);
+    // $("#taskSourceId").val(data[0].taskSourceId);
+    // 首先移除所有选项的 pass 类
+    $('.btnOption1 > div').removeClass('pass');
+    // 根据 值 添加 pass 类和设置 value 属性
+    $('.btnOption1 > div').each(function () {
+		console.log($(this).data('value'),"bot");
+        if ($(this).data('value') == data.userType) {
+            $(this).addClass('pass').attr('value', data.userType);
+        } else {
+            $(this).attr('value', '');
+        }
+    });
+	$("#userType").val(data.userType);
+	if(data.userType==1){
+		$("#proId").val(data.proId);
+		// formSelects.disabled('proName', false);
+		initProSelect();
+	    $('#gtName').attr('disabled', false);
+	    $('#chonsenBtn').hide()
+	}
+	if(data.userType==0){
+		$("#gtId").val(data.gtId);
+	    formSelects.disabled('proName', true);
+	    $('#gtName').attr('disabled', true);
+	    $('#chonsenBtn').show()
+	}
+}
+
+
+
+/**
+ * 关闭页面 刷新页面
+ */
+function reloading() {
+    var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+    parent.layer.close(index); //再执行关闭
+    window.parent.location.reload();
+}
+
 function importData() {
     var fileData = new FormData();
     fileData.append('file', $('#file')[0].files[0]);
@@ -461,7 +634,6 @@ function importData() {
             top.layer.close(loadingMsg); //再执行关闭
             if (data.code == 200) {
                 top.layer.alert(data.msg);
-
                 reloading();
             } else {
                 top.layer.alert(data.msg, {icon: 2});
@@ -473,91 +645,3 @@ function importData() {
         }
     });
 }
-
-/**
- * 获取任务来源-下拉数据
- * @param id
- * @param key
- */
-function getTaskSource(id,key) {
-    $("#"+id).empty();
-    $.ajax({
-        type: 'get',
-        url: oiPlanUrl + '/monthlyPlanSubmission/getTaskSource',
-        async: false,
-        success: function (data) {
-            if(data.code == 200){
-                var html = ''
-                for (let i = 0; i < data.data.length; i++) {
-                    if (key == data.data[i].id) {
-                        html += '<option selected  value=\'' + data.data[i].id + '\'>' + data.data[i].name + '</option>';
-                    } else {
-                        html += '<option value=\'' + data.data[i].id + '\'>' + data.data[i].name + '</option>';
-                    }
-                }
-                $("#"+id).append(html);
-            }else{
-                $("#"+id).append('<option value="">--无数据--</option>');
-            }
-            layui.form.render();
-        },
-        error: function (err) {
-            console.log("获取字典表出错：", err);
-        }
-    });
-}
-
-/**
- * 隐藏提交按钮和关闭按钮
- */
-function hideSubmit() {
-    // 使用getElementById根据ID选择按钮
-    var submitButton = document.getElementById('submitBt');
-    var closeButton = document.getElementById('closeBt');
-    // 如果按钮存在，则隐藏它
-    if (submitButton) {
-        submitButton.style.display = 'none';
-    }
-    if (closeButton) {
-        closeButton.style.display = 'none';
-    }
-}
-
-/**
- * 设置数据
- * @param data
- */
-function setData(data) {
-    console.log(data);
-    $("#id").val(data[0].id);
-    $("#userName").val(data[0].userName);
-    $("#content").val(data[0].content);
-    // getTaskSource("taskSourceId",data[0].taskSourceId);
-    // $("#taskSourceId").val(data[0].taskSourceId);
-    // 首先移除所有选项的 pass 类
-    $('.btnOption1 > div').removeClass('pass');
-    // 根据 值 添加 pass 类和设置 value 属性
-    $('.btnOption1 > div').each(function () {
-        if ($(this).data('value') === data[0].workType) {
-            $(this).addClass('pass').attr('value', data[0].workType);
-        } else {
-            $(this).attr('value', '');
-        }
-    });
-
-    $("#startTime").val(data[0].startTime);
-    $("#endTime").val(data[0].endTime);
-   
-
-}
-
-
-
-/**
- * 关闭页面 刷新页面
- */
-function reloading() {
-    var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
-    parent.layer.close(index); //再执行关闭
-    window.parent.location.reload();
-}
\ No newline at end of file
diff --git a/hxy-web/js/wireManager/staff/staffList.js b/hxy-web/js/wireManager/staff/staffList.js
index 0fd80dc..a67102a 100644
--- a/hxy-web/js/wireManager/staff/staffList.js
+++ b/hxy-web/js/wireManager/staff/staffList.js
@@ -2,13 +2,19 @@
  
 var pers = []
 var table,form
+var yjId="";
 layui.use(['form','layer','table'], function () {
     table = layui.table;
     form = layui.form;
-
+	yjId=localStorage.getItem("selectyj");
+	
+	$("#yjId").val(yjId);
     // 触发submit提交 按钮点击或者表单被执行提交时触发
     form.on('submit(query)', function (data) {
         console.log("搜索")
+		yjId=localStorage.getItem("selectyj");
+		$("#yjId").val(yjId);
+		data.field.yjId=yjId;
             // 对表格进行重载。id 即 table表格的id
         table.reload('table', {
             // //设定异步数据接口的额外参数
@@ -19,16 +25,18 @@ layui.use(['form','layer','table'], function () {
     });
     form.on('submit(reset)', function () {
         console.log("重置")
-        $('#search1').val('');
-        $('#search2').val('');
-        $('#search3').val('');
-        $('#search4').val('');
+		yjId=localStorage.getItem("selectyj");
+		$("#yjId").val(yjId);
+        $('#userName').val('');
+        $('#proName').val('');
+        $('#contractState').val('');
+        $('#userState').val('');
         form.render();
         let obj = {
-            search1:'',
-            search2:'',
-            search3:'',
-            search4:''
+            userName:'',
+            proName:'',
+            userState:'',
+            contractState:'',yjId:yjId
         }
             // 对表格进行重载。id 即 table表格的id
         table.reload('table', {
@@ -42,57 +50,38 @@ layui.use(['form','layer','table'], function () {
         switch (obj.event) {
             case 'edit': 
                 console.log('详情',obj) 
-                updateView()
+                updateView(obj.data.id)
                 break;
             case 'del': 
                 console.log('删除',obj) 
-                delView()
+                delView(obj.data.id)
                 break;
         }
     });
     init();
 });
 
-  // 静态数据
-  var tableData = [
-    {id: 1, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 2, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 3, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 4, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 5, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 6, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 7, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 8, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 9, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 10, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 11, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 12, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 13, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 14, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 15, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 16, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 17, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 18, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 19, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 20, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 21, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 22, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 23, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-    {id: 24, name: '李云飞', idCard: '342224196202241356', sex: '男',ages:'55',phone:'15665366624',line:'500kVxxx线',area:'N1/N2/N3/N4/N5/N6/N7/N8/N9/N10',startTime:'2024-01-01',endTime:'2025-01-01',status1:'在职',status2:'已签订',status3:'正式'},
-  ];
-
     
 /**
  * 初始化数据
  */
 function init(){
       // 渲染表格
+	  yjId=localStorage.getItem("selectyj");
+  let obj = {
+	  userName:'',
+	  proName:'',
+	  userState:'',
+	  contractState:'',yjId:yjId
+  }
   table.render({
     elem: '#table',
-    // url: "/sys/achievement",
-    page: true,
+    url: PATH_URL + "/personbase/getList",
+    where:obj,
+    page: true, //开启分页
+    method:'post',
     skin: 'line', // 表格样式
-    data: tableData,
+    // data: tableData,
     cols: [[
         {
             title: '序号',
@@ -100,18 +89,43 @@ function init(){
             align: 'center',
             type: 'numbers'
         },
-        {field:'name', title: '姓 名',align: 'center',},
-        {field:'idCard', title: '身份证号',align: 'center',},
+        {field:'userName', title: '姓 名',align: 'center',},
+        {field:'idNumber', title: '身份证号',align: 'center',},
         {field:'sex', title: '性别',align: 'center',},
-        {field:'ages', title: '年龄',align: 'center',},
-        {field:'phone', title: '联系电话',align: 'center',},
-        {field:'line', title: '管辖线路名称',align: 'center'},
-        {field:'area', title: '范围、基数',align: 'center',width:170},
+        {field:'age', title: '年龄',align: 'center',},
+        {field:'tel', title: '联系电话',align: 'center',},
+        {field:'proName', title: '管辖线路名称',align: 'center'},
+        {field:'gtName', title: '范围、基数',align: 'center',width:170},
         {field:'startTime', title: '协议起始日期',align: 'center', },
         {field:'endTime', title: '协议终止日期',align: 'center', },
-        {field:'status1', title: '人员状态',align: 'center',},
-        {field:'status2', title: '合同状态',align: 'center',},
-        {field:'status3', title: '人员类型',align: 'center',},
+        {field:'userState', title: '人员状态',align: 'center',templet: function(d){
+			var userState=d.userState;
+			if(userState==0){
+				return "离职";
+			}else{
+				return "在职";
+			}
+		}},
+        {field:'contractState', title: '合同状态',align: 'center',templet: function(d){
+			var contractState=d.contractState;
+			if(contractState==0){
+				return "未签订";
+			}else if(contractState==2){
+				return "已过期";
+			}else if(contractState==3){
+				return "临期预警";
+			}else{
+				return "已签订";
+			}
+		}},
+        {field:'userType', title: '人员类型',align: 'center',templet: function(d){
+			var userType=d.userType;
+			if(userType==0){
+				return "正式";
+			}else{
+				return "临时";
+			}
+		}},
         {
             title: '操作',
             toolbar: '#opeator-bar',
@@ -199,15 +213,14 @@ function checkView(id) {
 function updateView(id) { 
         let height = '98%';
         let width = '80%';
-        // $.ajax({//id获取详情打开弹窗传值子页面
-        //     type: 'post',
-        //     contentType: "application/x-www-form-urlencoded",
-        //     url: oiPlanUrl + '/monthlyPlanSubmission/getDataById',
-        //     dataType: 'json',
-        //     data: {
-        //         id: id
-        //     },
-        //     success: function (data) {
+        $.ajax({//id获取详情打开弹窗传值子页面
+            type: 'post',
+            url: PATH_URL + "/personbase/getUserById",
+            dataType: 'json',
+            data: {
+                id: id
+            },
+            success: function (data) {
                 var index = layer.open({
                     title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                     type: 2,
@@ -216,8 +229,9 @@ function updateView(id) {
                     maxmin: false,
                     success: function (layero, index) {
                         //打开页面成功时执行
+						console.log(data,"update")
                         var myIframe = window[layero.find('iframe')[0]['name']];
-                        // myIframe.setData(data.data); //调用子页面的方法
+                         myIframe.setData(data.data); //调用子页面的方法
                     },
                     yes: function (index, layero) {
                         // //提交子页面时执行
@@ -228,8 +242,8 @@ function updateView(id) {
                         // submited.click();
                     }
                 });
-            // }
-        // })
+            }
+        })
  
 }
 
@@ -240,10 +254,10 @@ function updateView(id) {
  * */
 function delView(id) {
  
-        let index = layer.confirm("是否确定删除数据？", function () {
+        let index = layer.confirm("是否确定删除数据？相关数据也会删除！", function () {
             $.ajax({
                 type: 'post',
-                url: oiPlanUrl + '/monthlyPlanSubmission/del',
+                url: PATH_URL + "/personbase/delUserId",
                 dataType: 'json',
                 data: {
                     id: id
diff --git a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
index 4284070..1b9de8f 100644
--- a/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
+++ b/hxy-web/js/wireManager/viewResult/specialPatrolAdd.js
@@ -19,14 +19,16 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
     uploadFile();
 
     form.on('submit(formDemo)', function (data) {
-		add();
+		$("#hideUpload").trigger("click");
     });
 });
-
+var ysUrls=[];
+var urls=[];
+var filenum=0;
 function uploadFile(){
     var uploadcom = upload.render({
         elem: '#test',
-        url: '', //改成您自己的上传接口
+        url: PATH_URL + "/makeInfo/upload", //改成您自己的上传接口
         multiple: true,   //是否允许多文件上传，默认未false
         dataType: "json",
         // data: {"pickId": id},
@@ -66,16 +68,31 @@ function uploadFile(){
             });
         },
         before: function (obj) {
+			 ysUrls=[];
+			 urls=[];
+			 filenum=0;
             this.data = {
-                photoType: "supplyChainBlack"
+                photoType: "hxy",makeId:localStorage.getItem("resultId"),uploadType:'special',remarks:$("#remark").val()
             };
         },
         done: function (data) {
+			console.log(data,"data");
+			urls.push(data.data.url);
+			ysUrls.push(data.data.ysUrl);
+			// insertSpecial(data);
         },
         allDone: function (data) {
-			top.layer.close(loadingMsg);
-			top.layer.msg(data.msg, {icon: 1});
-			reloading();
+			console.log(data,"data");
+			filenum=data.total
+			if(filenum==urls.length){
+				insertSpecial();
+				reloading();
+			}else{
+				layer.msg("传输错误，请重新上传！")
+			}
+			
+			// top.layer.close(loadingMsg);
+			// top.layer.msg(data.msg, {icon: 1});
         },
         error: function (e) {
             //请求异常回调
@@ -83,7 +100,37 @@ function uploadFile(){
         }
     });
 }
-
+function insertSpecial(obj){
+	if(ysUrls.length == 0){
+		layer.msg('请上传文件', {icon: 2});
+		return;
+	}
+	var urld="";
+	var ysurld="";
+	$.each(urls,function(index,item){
+		urld=urld+item+",";
+	});
+	$.each(ysUrls,function(index,item){
+		ysurld=ysurld+item+",";
+	})
+	$.ajax({
+	     type:"post",
+	     url : PATH_URL + "/makeInfo/insertSpecial", 
+		 async:false,
+	     data:{
+				makeId:localStorage.getItem("resultId"),
+				ysUrl:ysurld,url:urld,
+				remarks:$("#remark").val(),
+				makeTime:$("#dataTime").val()
+	     },
+	     dataType:"json",
+	     success:function(res){
+				
+	     },
+	     error:function(data){
+	     }
+	 });
+}
 
 
 function add() {
diff --git a/hxy-web/js/wireManager/viewResult/uploadPhoto.js b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
index 37655c9..0e33d13 100644
--- a/hxy-web/js/wireManager/viewResult/uploadPhoto.js
+++ b/hxy-web/js/wireManager/viewResult/uploadPhoto.js
@@ -4,28 +4,37 @@ var startWorkFiles = {};
 var upload;
 var id;
 var formData;
-
-
+var gtId;
+var month;
+var numTimes;
 layui.use(['form', 'table', 'upload'], function () {
     let form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功
     form.render();
     upload = layui.upload;
-	
-
+	gtId=$("#gtId").val();
+	month=$("#month").val();
+	numTimes=$("#numTimes").val();
     uploadFile();
 
     form.on('submit(formDemo)', function (data) {
 		$("#hideUpload").trigger("click");
     });
 });
-
+function setGtId(gtId,month,numTimes){
+	console.log(gtId,"gtId");
+	console.log(month,"month");
+	$("#gtId").val(gtId);
+	$("#month").val(month);
+	$("#numTimes").val(numTimes);
+}
+var ysUrls="";
+var urls="";
 function uploadFile(){
     var uploadcom = upload.render({
         elem: '#test',
-        url: '', //改成您自己的上传接口
+        url: PATH_URL + "/makeInfo/upload", //改成您自己的上传接口
         multiple: true,   //是否允许多文件上传，默认未false
         dataType: "json",
-        // data: {"pickId": id},
         exts: 'jpg|png',
         //acceptMime: 'image/jpg,image/png,image/jpeg,file/pdf,file/xlsx',
         auto: false,  //是否自动上传 ，默认为true
@@ -62,16 +71,29 @@ function uploadFile(){
             });
         },
         before: function (obj) {
+			 ysUrls="";
+			 urls="";
             this.data = {
-                photoType: "supplyChainBlack"
+                "gtId": gtId,uploadType:"one",photoType:"hxy",month:month,numTimes:numTimes
             };
         },
         done: function (data) {
+			console.log(data,"donedata");
+			ysUrls=data.data.url;
+			urls=data.data.ysUrl;
         },
         allDone: function (data) {
-			top.layer.close(loadingMsg);
-			top.layer.msg(data.msg, {icon: 1});
-			reloading();
+			console.log(data,"allDonedata");
+			if(ysUrls!=null&&urls!=null){
+				insertMakeGt();
+				var iframeWindow = parent.window['layui-layer-iframe' + localStorage.getItem("resultindex")];
+				iframeWindow.reloadData();
+				var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+				parent.layer.close(index);
+			}else{
+				layer.msg("上传错误！")
+			}
+			
         },
         error: function (e) {
             //请求异常回调
@@ -79,7 +101,30 @@ function uploadFile(){
         }
     });
 }
-
+function insertMakeGt(){
+	if(ysUrls.length == 0){
+		layer.msg('请上传文件', {icon: 2});
+		return;
+	}
+	$.ajax({
+	     type:"post",
+	     url : PATH_URL + "/makeInfo/insertMakeGt", 
+		 async:false,
+	     data:{
+			"gtId": gtId,
+			makeMonth:month,
+			sFilePath:ysUrls,
+			filePath:urls,
+			numTimes:numTimes
+	     },
+	     dataType:"json",
+	     success:function(res){
+				
+	     },
+	     error:function(data){
+	     }
+	 });
+}
 
 
 
diff --git a/hxy-web/js/wireManager/viewResult/viewResult.js b/hxy-web/js/wireManager/viewResult/viewResult.js
index 6cc6710..a948d02 100644
--- a/hxy-web/js/wireManager/viewResult/viewResult.js
+++ b/hxy-web/js/wireManager/viewResult/viewResult.js
@@ -2,6 +2,7 @@
  
 var pers = []
 var table,form,laydate
+var yjId=localStorage.getItem("selectyj");
 layui.use(['form','layer','table','laydate'], function () {
     table = layui.table;
     form = layui.form;
@@ -9,12 +10,12 @@ layui.use(['form','layer','table','laydate'], function () {
 
 	//初始化日期选择框
 	laydate.render({
-	    elem: '#dataTime',
+	    elem: '#makeMonth',
 	    type: 'month',
 	});
     // 触发submit提交 按钮点击或者表单被执行提交时触发
     form.on('submit(query)', function (data) {
-        console.log("搜索")
+        console.log(data,"搜索")
          // 对表格进行重载。id 即 table表格的id
         table.reload('table', {
             // //设定异步数据接口的额外参数
@@ -25,13 +26,15 @@ layui.use(['form','layer','table','laydate'], function () {
     });
 	$("#reset").click(function(){
 		console.log("重置")
-		$('#search1').val('');
-		$('#search2').val('');
-		$('#search3').val('');
+		$('#userName').val('');
+		$('#yjName').val('');
+		$('#proName').val('');
+		$('#makeMonth').val('');
 		let obj = {
-		    search1:'',
-		    search2:'',
-			search3:''
+		    userName:'',
+		    yjName:'',
+			proName:'',
+			makeMonth:'',yjId:yjId
 		}
 		 // 对表格进行重载。id 即 table表格的id
 		table.reload('table', {
@@ -45,43 +48,35 @@ layui.use(['form','layer','table','laydate'], function () {
        switch (obj.event) {
             case 'details': 
 			    console.log('详情',obj) 
-			    detailsView(obj.id)
+			    detailsView(obj.data.id,obj.data.userId,obj.data.makeMonth);
                 break;
 			case 'uploadResult':
-				console.log('上传结果',obj) 
-				updateView()
+				console.log('上传结果',obj.data.id,obj.data.userId) 
+				updateView(obj.data.id,obj.data.userId,obj.data.makeMonth);
 				break;
        }
    });
     init();
 });
-
-  // 静态数据
-  var tableData = [
-    {id: 1, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'},
-    {id: 2, sName: '昆明运检一站', lName: '±500kV永富直流线', uName: '张雄',month:'2024-03',alls:'16基',first:'6基',second:'7基',other:'2基',unStation:'3基',days:'2'}
-  ];
-
     
 /**
  * 初始化数据
  */
 function init(){
+	let obj = {
+	    userName:'',
+	    yjName:'',
+		proName:'',
+		makeMonth:'',yjId:yjId
+	}
       // 渲染表格
   table.render({
-    elem: '#table',
-    // url: PATH_URL + "/makeInfo/getListTab",
-    page: true,
-    skin: 'line', // 表格样式
+	elem: '#table',
+	url: PATH_URL + "/makeInfo/getListTab",
+	page: true, //开启分页
+	method:'post',
+	where:obj,
+	skin: 'line', // 表格样式
     cols: [[
         {
             title: '序号',
@@ -89,18 +84,18 @@ function init(){
             align: 'center',
             type: 'numbers'
         },
-        {field:'sName', title: '运检站',align: 'center',},
-        {field:'lName', title: '线路名称',align: 'center',},
-        {field:'uName', title: '姓名',align: 'center',},
+        {field:'yjName', title: '运检站',align: 'center',},
+        {field:'proName', title: '线路名称',align: 'center',},
+        {field:'userName', title: '姓名',align: 'center',},
         {field:'makeMonth', title: '月份',align: 'center',},
-        {field:'alls', title: '负责巡护区段',align: 'center',},
+        {field:'powerNum', title: '负责巡护区段',align: 'center',},
 		{
 			field: '',
 			title: '正常巡视结果(第一次)',
 			align: 'center',
 			templet: function(d){
-				var first = d.first
-				var html = `<span style="color:#19BE6B">${first}</span>`;
+				var oneMake = d.oneMake
+				var html = `<span style="color:#19BE6B">${oneMake}</span>`;
 				return html;
 			},
 		},
@@ -109,8 +104,8 @@ function init(){
 			title: '正常巡视结果(第二次)',
 			align: 'center',
 			templet: function(d){
-				var second = d.second
-				var html = `<span style="color:#19BE6B">${second}</span>`;
+				var twoMake = d.twoMake
+				var html = `<span style="color:#19BE6B">${twoMake}</span>`;
 				return html;
 			},
 		},
@@ -119,8 +114,8 @@ function init(){
 			title: '巡视段外巡视',
 			align: 'center',
 			templet: function(d){
-				var other = d.other
-				var html = `<span style="color:#FF9900">${other}</span>`;
+				var otherMake = d.otherMake
+				var html = `<span style="color:#FF9900">${otherMake}</span>`;
 				return html;
 			},
 		},
@@ -129,8 +124,8 @@ function init(){
 			title: '未巡视',
 			align: 'center',
 			templet: function(d){
-				var unStation = d.unStation
-				var html = `<span style="color:#F56C6C">${unStation}</span>`;
+				var noMake = d.noMake
+				var html = `<span style="color:#F56C6C">${noMake}</span>`;
 				return html;
 			},
 		},
@@ -139,8 +134,8 @@ function init(){
 			title: '特巡天数结果',
 			align: 'center',
 			templet: function(d){
-				var days = d.days
-				var html = `<span style="color:#73A0FA">${days}</span>`;
+				var special = d.special
+				var html = `<span style="color:#73A0FA">${special}</span>`;
 				return html;
 			},
 		},
@@ -151,43 +146,21 @@ function init(){
             width: 200
         }
     ]],
-    data: tableData
+	done: function(res, curr, count){
+		console.log(res)
+	}
   });
      
 }
 
 
 //详情
-function detailsView(id) {
+function detailsView(id,userId,makeMonth) {
+	localStorage.setItem("resultId",id);
+	localStorage.setItem("resultMakeMonth",makeMonth);
+	localStorage.setItem("resultUserId",userId);
     let height = '98%';
     let width = '99%';
-    /* $.ajax({
-        type: 'post',
-        contentType: "application/x-www-form-urlencoded",
-        url: oiPlanUrl + '/monthlyPlanSubmission/getDataById',
-        dataType: 'json',
-        data: {
-            id: id
-        },
-        success: function (data) {
-            var index = layer.open({
-                title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
-                type: 2,
-                content: './wagesReport/producePayrollDetails.html',
-                area: [width, height],
-                maxmin: false,
-                success: function (layero, index) {
-                    console.log(data);
-                    var myIframe = window[layero.find('iframe')[0]['name']];
-                    myIframe.hideSubmit();
-                    // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
-
-                },
-            });
-        }
-    }) */
-	
-	//测试
 	var index = layer.open({
 	    title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
 	    type: 2,
@@ -196,7 +169,7 @@ function detailsView(id) {
 	    maxmin: false,
 	    success: function (layero, index) {
 	        // var myIframe = window[layero.find('iframe')[0]['name']];
-	        // myIframe.hideSubmit();
+	        // myIframe.setDate();
 	        // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
 	
 	    },
@@ -205,36 +178,12 @@ function detailsView(id) {
 
 
 //修改
-function updateView(id) {
+function updateView(id,userId,makeMonth) {
+	localStorage.setItem("resultId",id);
+	localStorage.setItem("resultMakeMonth",makeMonth);
+	localStorage.setItem("resultUserId",userId);
     let height = '98%';
     let width = '99%';
-    /* $.ajax({
-        type: 'post',
-        contentType: "application/x-www-form-urlencoded",
-        url: oiPlanUrl + '/monthlyPlanSubmission/getDataById',
-        dataType: 'json',
-        data: {
-            id: id
-        },
-        success: function (data) {
-            var index = layer.open({
-                title: ['巡视结果上传', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
-                type: 2,
-                content: './wagesReport/producePayrollDetails.html',
-                area: [width, height],
-                maxmin: false,
-                success: function (layero, index) {
-                    console.log(data);
-                    var myIframe = window[layero.find('iframe')[0]['name']];
-                    myIframe.hideSubmit();
-                    // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
-
-                },
-            });
-        }
-    }) */
-	
-	//测试
 	var index = layer.open({
 	    title: ['巡视结果上传', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
 	    type: 2,
@@ -242,6 +191,7 @@ function updateView(id) {
 	    area: [width, height],
 	    maxmin: false,
 	    success: function (layero, index) {
+			localStorage.setItem("resultindex",index);
 	        // var myIframe = window[layero.find('iframe')[0]['name']];
 	        // myIframe.hideSubmit();
 	        // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
diff --git a/hxy-web/js/wireManager/viewResult/viewResultUpdate.js b/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
index 0aaa74b..0db8ea7 100644
--- a/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
+++ b/hxy-web/js/wireManager/viewResult/viewResultUpdate.js
@@ -3,6 +3,9 @@ var currentDate = new Date();
 var tabList=[];
 var month = currentDate.getMonth() + 1;//当前第几月
 var year = currentDate.getFullYear();
+var resultUserId;
+var resultProId;
+var resultMonth;
 layui.use(['form','layer','table','laydate','element'], function () {
     table = layui.table;
     form = layui.form;
@@ -18,24 +21,29 @@ layui.use(['form','layer','table','laydate','element'], function () {
         btns:['now','confirm'], //选择框右下角显示的按钮 清除-现在-确定
         value: formatCurrentMonth(), // 如果你想预设当前日期为选中状态
         done: function (value, date) {//时间回调
-            console.log("date:", date)
+            console.log("date:", date);
+			localStorage.setItem("resultMakeMonth",value);
+			resultMonth=value;
             init(date.year,date.month);
         }
     });
-    
-    
-
+    $("#month").val(localStorage.getItem("resultMakeMonth"));
+	resultMonth=localStorage.getItem("resultMakeMonth")
 	init(year,month)
-	setData(null)
+	setData()
 	
 });
 
 //工程切换
-function projectTab(event){
+function projectTab(event,proId){
+	 resultProId=proId;
+	 localStorage.setItem("resultProId",resultProId);
+	 console.log(resultProId,'resultProId')
 	 //修改所点工程样式
 	 $("#projects>div").removeClass("projectsStyle");
 	 $(event).addClass("projectsStyle")
 	 getView();
+	 getSpecial(localStorage.getItem("resultMakeMonth").substring(0,4),localStorage.getItem("resultMakeMonth").substring(5,7)<10?localStorage.getItem("resultMakeMonth").substring(5,7).replace("0",""):localStorage.getItem("resultMakeMonth").substring(5,7));
  }
  
 function formatCurrentMonth() {
@@ -48,41 +56,79 @@ function formatCurrentMonth() {
  */
 function init(chosenYear,chosenMonth){
     layui.use(['table'], function () {
+		getTab(chosenMonth)
 		getView()
-		
-		
-        let table = layui.table; 
-        let daysInMonth = new Date(chosenYear, chosenMonth, 0).getDate();
-        console.log(daysInMonth)
-        let tableData = [{isWork:['7.1','7.3','7.6','7.8']}]
-        let cols = []
-        for (let k = 1; k <= daysInMonth; k++) {
-            let str = chosenMonth+'.'+k;
-            let obj = {field:'isWork', title: str,align: 'center',width:70,
-                templet: function(d){
-                    if(d.isWork.includes(d.LAY_COL.title)){
-                        return `<i class="layui-icon" style="color: red;">&#xe605;</i> `
-                    }else{
-                        return `<apan></apan>`
-                    }
-                }}
-            cols.push(obj)
-        }
-        table.render({
-            elem: '#isWorkList',
-            // url: "/sys/achievement",
-            // where: obj,
-            //skin: 'line', // 横向边框线
-            cols: [cols],
-            data: tableData
-        });
-        getTab(chosenMonth)
+		getSpecial(chosenYear,chosenMonth)
     })
 }
-
+function getSpecial(chosenYear,chosenMonth){
+	let table = layui.table;
+	let daysInMonth = new Date(chosenYear, chosenMonth, 0).getDate();
+	console.log(daysInMonth)
+	let tableData = []
+	$.ajax({//id获取详情打开弹窗传值子页面
+	    type: 'post',
+	    url: PATH_URL + "/makeInfo/getSpecialData",
+	    dataType: 'json',
+		async:false,
+	    data: {
+	        userId: localStorage.getItem("resultUserId"),proId:localStorage.getItem("resultProId"),makeMonth:localStorage.getItem("resultMakeMonth")
+	    },
+	    success: function (data) {
+			console.log(data,"resultSpecial");
+			var isWorkData=[];
+			$.each(data.data,function(index,item){
+				isWorkData.push(item.makeTime)
+			})
+			var isWork={};
+			isWork.isWork=isWorkData;
+			tableData.push(isWork);
+	    },
+		error:function(e){
+			
+		}
+	})
+	let cols = []
+	for (let k = 1; k <= daysInMonth; k++) {
+	    let str = chosenMonth+'.'+k;
+	    let obj = {field:'isWork', title: str,align: 'center',width:70,
+	        templet: function(d){
+	            if(d.isWork.includes(d.LAY_COL.title)){
+	                return `<i class="layui-icon" style="color: red;">&#xe605;</i> `
+	            }else{
+	                return `<apan></apan>`
+	            }
+	        }}
+	    cols.push(obj)
+	}
+	console.log(tableData,"tableData");
+	table.render({
+	    elem: '#isWorkList',
+	    // url: "/sys/achievement",
+	    // where: obj,
+	    //skin: 'line', // 横向边框线
+	    cols: [cols],
+	    data: tableData
+	});
+}
 
 function getTab(chosenMonth){
     tabList = [{id:'1',projectName:'xxx工程1'},{id:'2',projectName:'xxx工程2'},{id:'3',projectName:'xxx工程3'},{id:'4',projectName:'xxx工程4'}]
+	$.ajax({//id获取详情打开弹窗传值子页面
+	    type: 'post',
+	    url: PATH_URL + "/makeInfo/getProByUser",
+	    dataType: 'json',
+		async:false,
+	    data: {
+	        id: localStorage.getItem("resultUserId")
+	    },
+	    success: function (data) {
+			tabList=data.data;
+	    },
+		error:function(e){
+			
+		}
+	})
     // projectList
     $("#projects").empty()
     let html = ``
@@ -90,9 +136,10 @@ function getTab(chosenMonth){
 		var className = ""
 		if(i == 0){
 			className = "projectsStyle";
+			localStorage.setItem("resultProId",tabList[i].id);
 		}
-		html += `<div class="${className}" onclick="projectTab(this)">
-					<span id="${tabList[i].id}">${tabList[i].projectName}</span>
+		html += `<div class="${className}" onclick="projectTab(this,${tabList[i].id})">
+					<span id="${tabList[i].id}">${tabList[i].proName}</span>
 				</div>`
     }
     $("#projects").append(html);
@@ -104,14 +151,39 @@ function getView(){
 	// ③巡护段外：展示修改、删除图标，上传日期不可选择，照片信息，工程名称，杆塔号；颜色为“#FF9900”；
 	// ④特巡/值守：展示修改、删除图标，上传日期不可选择，照片信息，备注；颜色为“#73A0FA”；
 	// ⑤正在编辑：修改图标绿色背景，可重新上传照片、重新选择日期，编辑即边框闪烁；
-	
+	$.ajax({//id获取详情打开弹窗传值子页面
+	    type: 'post',
+	    url: PATH_URL + "/makeInfo/getById",
+	    dataType: 'json',
+		async:false,
+	    data: {
+	        userId: localStorage.getItem("resultUserId"),makeMonth:localStorage.getItem("resultMakeMonth"),proId:localStorage.getItem("resultProId")
+	    },
+	    success: function (data) {
+			console.log(data,"result");
+			viewList1=data.mgtListone;
+			photoList1=data.vgtListone;
+			viewList2=data.mgtListtwo;
+			photoList2=data.vgtListtwo;
+			viewList3=data.mgtListspe;
+			photoList3=data.mgtListspe;
+			
+	    },
+		error:function(e){
+			
+		}
+	})
 	
 	$("#inspectionTourContent").empty();
 	//杆塔集合
-    viewList1 = [{name:"正常巡视-第一次巡视"},{name:'#2'},{name:'#3'},{name:'#4'},{name:'#5'},{name:'#6'},{name:'#7'},{name:'#8'},{name:'#9'}]
-	//照片集合
-	var path = 'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/c0a62f0b51924a4584ec0c8f011fc2af0074P3wTgy1h3gtizuzvfj30zk0zg7ad.jpg';
-	photoList = [{name:'#2', path:path},{name:'#3', path:path},{name:'#4', path:path},{name:'#5', path:path},{name:'#6', path:path},]
+ //    viewList1 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
+	// {id:"7",name:'#7'},{id:"8",name:'#8'},{id:"9",name:'#9'}]
+	// //照片集合
+	var filePath = 'http://192.168.0.14:1909/file/ynRealName/violationBlack/2024/05/13/c0a62f0b51924a4584ec0c8f011fc2af0074P3wTgy1h3gtizuzvfj30zk0zg7ad.jpg';
+	var sFilePath='../../../image/viewImg.jpg';
+	// photoList1 = [{name:'#2', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#3', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
+	// {name:'#4', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#5', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
+	// {name:'#6', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'}]
 	
     let html = ``;
 	html += `<div style="width: 90%;height: 30px;font-weight: bold;">
@@ -123,31 +195,30 @@ function getView(){
 			</div>
 			<div id="firstViewBox" style="width: 100%;min-height: 200px;margin-bottom: 20px;display: flex;flex-wrap: wrap;">`
     for (let i = 0;i < viewList1.length;i++) {	
-		var name = viewList1[i].name.length>2?viewList1[i].name.substring(0,2) + '...': viewList1[i].name;
+		var gtName = viewList1[i].gtName.length>4?viewList1[i].gtName.substring(0,4) + '...': viewList1[i].gtName;
 		html += `<div class="viewBox">
 					<div style="width: 100%;height:100%">
 						<div class="viewHeader">
 							<img src="../../../image/tower_white.png" alt="">
-							<span style="width: 33%;" title="${viewList1[i].name}">${name}</span>
-							<img src="../../../image/edit_white.png" onclick="towerEdit(this)" style="cursor: pointer;width: 14px;height:16px"  alt="">
-							<img src="../../../image/del_white.png" onclick="towerDel(this)" style="cursor: pointer;width: 14px;height:16px" alt="">
+							<span style="width: 33%;" title="${viewList1[i].gtName}">${gtName}</span>
+							<img src="../../../image/edit_white.png" onclick="towerEdit(this,${viewList1[i].gtId},1)" style="cursor: pointer;width: 14px;height:16px"  alt="">
+							<img src="../../../image/del_white.png" onclick="towerDel(this,${viewList1[i].gtId},1)" style="cursor: pointer;width: 14px;height:16px" alt="">
 						</div>
 						<div class="viewContent">`
 							var flag = false;
-							for (var j = 0; j < photoList.length; j++) {
-								if(viewList1[i].name == photoList[j].name){
+							for (var j = 0; j < photoList1.length; j++) {
+								if(viewList1[i].gtName == photoList1[j].gtName){
 									//照片存在，直接显示
-									html += `<img src="../../../image/viewImg.jpg" alt="" onclick="filePreView('${photoList[j].path}')">`
+									html += `<img src="${IMG_URL+photoList1[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList1[j].filePath}')">`
 									flag = true;
 									break;
 								}
 							}
 							if(!flag){
 								//照片不存在，显示上传照片按钮
-								html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto()">
+								html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList1[i].gtId},1)">
 										<div style="color:#cccccc">上传图片</div>`
 							}
-							
 							html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
 								<button class="layui-btn">
 									<i class="layui-icon layui-icon-refresh-3"></i>
@@ -156,17 +227,26 @@ function getView(){
 							</div>
 						</div>
 						<div class="viewFooter">
-							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;
-							2024-03-15
-						</div>
+							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;`
+							for (var j = 0; j < photoList1.length; j++) {
+								if(viewList1[i].gtName == photoList1[j].gtName){
+									//照片存在，直接显示
+									html += `${photoList1[j].makeTime}`
+									break;
+								}
+							}
+						html +=`</div>
 					</div>
 					
 				</div>`
     }
 	html += `</div>`;
 	
-	
-    viewList2 = [{name:'#2'},{name:'#2'},{name:'#2'},{name:'#2'},{name:'#2'},{name:'#2'},{name:'#2'},{name:'#2'},{name:'#2'}]
+ //    viewList2 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
+	// {id:"7",name:'#7'},{id:"8",name:'#8'},{id:"9",name:'#9'}]
+	// photoList2 = [{name:'#2', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#3', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
+	// {name:'#4', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#5', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
+	// {name:'#6', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'}]
 	html += `<div style="width: 90%;height: 30px;font-weight: bold;">
 				<span style="border: 3px solid #409EFF;width: 20px;height: 10px;margin-left: 2%;margin-right: 1%;"></span>
 				<span style="color:#666666">正常巡视-第二次巡视</span>
@@ -174,18 +254,31 @@ function getView(){
 			</div>
 			<div id="secondViewBox" style="width: 100%;min-height: 200px;margin-bottom: 20px;display: flex;flex-wrap: wrap;">`
     for (let i = 0;i < viewList2.length;i++) {
-		var name = viewList2[i].name.length>2?viewList2[i].name.substring(0,2) + '...': viewList2[i].name;
+		var gtName = viewList2[i].gtName.length>4?viewList2[i].gtName.substring(0,4) + '...': viewList2[i].gtName;
 		html += `<div class="viewBox">
 					<div style="width: 100%;height:100%">
 						<div class="viewHeader">
 							<img src="../../../image/tower_white.png" alt="">
-							<span style="width: 33%;" title="${viewList2[i].name}">${name}</span>
-							<img src="../../../image/edit_white.png" onclick="towerEdit(this)" style="cursor: pointer;width: 14px;height:16px"  alt="">
-							<img src="../../../image/del_white.png" onclick="towerDel(this)" style="cursor: pointer;width: 14px;height:16px" alt="">
+							<span style="width: 33%;" title="${viewList2[i].gtName}">${gtName}</span>
+							<img src="../../../image/edit_white.png" onclick="towerEdit(this,${viewList2[i].gtId},2)" style="cursor: pointer;width: 14px;height:16px"  alt="">
+							<img src="../../../image/del_white.png" onclick="towerDel(this,${viewList2[i].gtId},2)" style="cursor: pointer;width: 14px;height:16px" alt="">
 						</div>
-						<div class="viewContent">
-							<img src="../../../image/viewImg.jpg" alt="" onclick="filePreView('${"s.jpg"}')">
-							<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
+						<div class="viewContent">`
+							var flag = false;
+							for (var j = 0; j < photoList2.length; j++) {
+								if(viewList2[i].gtName == photoList2[j].gtName){
+									//照片存在，直接显示
+									html += `<img src="${IMG_URL+photoList2[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList2[j].filePath}')">`
+									flag = true;
+									break;
+								}
+							}
+							if(!flag){
+								//照片不存在，显示上传照片按钮
+								html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" onclick="uploadPhoto(${viewList2[i].gtId},2)">
+										<div style="color:#cccccc">上传图片</div>`
+							}
+							html += `<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
 								<button class="layui-btn">
 									<i class="layui-icon layui-icon-refresh-3"></i>
 									重新上传
@@ -193,8 +286,15 @@ function getView(){
 							</div>
 						</div>
 						<div class="viewFooter">
-							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;
-							2024-03-15
+							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;`
+							for (var j = 0; j < photoList2.length; j++) {
+								if(viewList2[i].gtName == photoList2[j].gtName){
+									//照片存在，直接显示
+									html += `${photoList2[j].makeTime}`
+									break;
+								}
+							}
+						html +=`
 						</div>
 					</div>
 				</div>`
@@ -203,7 +303,11 @@ function getView(){
 	
 	
 	
-    viewList3 = [{name:'#3'},{name:'#3'},{name:'#3'},{name:'#3'},{name:'#3'},{name:'#3'},{name:'#3'},{name:'#3'},{name:'#3'}]
+ //    viewList3 = [{id:"1",name:"#1"},{id:"2",name:'#2'},{id:"3",name:'#3'},{id:"4",name:'#4'},{id:"5",name:'#5'},{id:"6",name:'#6'},
+	// {id:"7",name:'#7'},{id:"8",name:'#8'},{id:"9",name:'#9'}]
+	// photoList3 = [{name:'#2', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#3', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
+	// {name:'#4', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},{name:'#5', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'},
+	// {name:'#6', filePath:filePath,sFilePath:sFilePath,makeTime:'2024-08-19'}]
 	html += `<div style="width: 90%;height: 30px;font-weight: bold;">
 				<span style="border: 3px solid #409EFF;width: 20px;height: 10px;margin-left: 2%;margin-right: 1%;"></span>特巡 / 值守
 			</div>
@@ -212,17 +316,30 @@ function getView(){
 			</div>
 			<div id="specialViewBox" style="width: 100%;min-height: 200px;margin-bottom: 20px;display: flex;flex-wrap: wrap;">`
     for (let i = 0;i < viewList3.length;i++) {
-		var name = viewList3[i].name.length>2?viewList3[i].name.substring(0,2) + '...': viewList3[i].name;
+		var gtName = viewList3[i].gtName.length>11?viewList3[i].gtName.substring(0,11) + '...': viewList3[i].gtName;
 		html += `<div class="viewBox">
 					<div style="width: 100%;height:100%">
-						<div class="viewHeader">
+						<div class="viewHeader" style="font-size:12px">
 							<img src="../../../image/tower_white.png" alt="">
-							<span style="width: 33%;" title="${viewList3[i].name}">${name}</span>
-							<img src="../../../image/edit_white.png" onclick="towerEdit(this)" style="cursor: pointer;width: 14px;height:16px"  alt="">
-							<img src="../../../image/del_white.png" onclick="towerDel(this)" style="cursor: pointer;width: 14px;height:16px" alt="">
+							<span style="width: 33%;" title="${viewList3[i].gtName}">${gtName}</span>
 						</div>
 						<div class="viewContent">
-							<img src="../../../image/viewImg.jpg" alt="" onclick="filePreView('${"s.jpg"}')">
+							`
+								var flag = false;
+								for (var j = 0; j < photoList3.length; j++) {
+									if(viewList3[i].gtName == photoList3[j].gtName){
+										//照片存在，直接显示
+										html += `<img src="${IMG_URL+photoList3[j].sfilePath}" alt="" onclick="filePreView('${IMG_URL+photoList3[j].filePath}')">`
+										flag = true;
+										break;
+									}
+								}
+								if(!flag){
+									//照片不存在，显示上传照片按钮
+									html += `<img src="../../../image/add2.png" style="width:150px;height:150px;border: 1px solid #E9E9E9;backgroubd:#F9F9F9;cursor: pointer;margin-top: 10px;" alt="" ">
+											<div style="color:#cccccc">上传图片</div>`
+								}
+								html += `
 							<div style="display: none;align-items: center;justify-content: center;position: relative;top:-100%;width:100%;height:100%;z-index:99;background-color: rgba(0,0,0,.2)">
 								<button class="layui-btn">
 									<i class="layui-icon layui-icon-refresh-3"></i>
@@ -232,7 +349,15 @@ function getView(){
 						</div>
 						<div class="viewFooter">
 							<img src="../../../image/calendarIcon.png" width="18">&nbsp;&nbsp;
-							2024-03-15
+							`
+								for (var j = 0; j < photoList3.length; j++) {
+									if(viewList3[i].gtName == photoList3[j].gtName){
+										//照片存在，直接显示
+										html += `${photoList3[j].makeTime}`
+										break;
+									}
+								}
+							html +=`
 						</div>
 					</div>
 					
@@ -245,13 +370,27 @@ function getView(){
 }
 
 //页面赋值
-function setData(data){
-	$("#username").text("张三");
-	$("#phone").text("15856564578");
-	$("#num").text("60");
-	$("#oneNum").text("16");
-	$("#twoNum").text("16");
-	$("#otherNum").text("16");
+function setData(){
+	var id=localStorage.getItem("resultUserId");
+	$.ajax({//id获取详情打开弹窗传值子页面
+	    type: 'post',
+	    url: PATH_URL + "/makeInfo/getUserDetail",
+	    dataType: 'json',
+	    data: {
+	        id: id
+	    },
+	    success: function (data) {
+	        $("#username").text(data.data.userName);
+	        $("#phone").text(data.data.tel);
+	        $("#num").text(data.data.powerNum);
+	        $("#oneNum").text(data.data.oneMake);
+	        $("#twoNum").text(data.data.twoMake);
+	        $("#otherNum").text(data.data.special);
+	    },
+		error:function(e){
+			
+		}
+	})
 }
 
 //文件查看
@@ -288,7 +427,7 @@ function filePreView(url) {
 }
 
 //杆塔信息编辑
-function towerEdit(event){
+function towerEdit(event,id,numTimes){
 	var color = $(event).css("background-color");
 	//通过按钮样式判断按钮状态  
 	if(color == "rgb(22, 186, 170)"){
@@ -311,11 +450,32 @@ function towerEdit(event){
 	
 }
 //杆塔信息删除
-function towerDel(event){
-	layer.confirm("确定删除吗？", function () {
+function towerDel(event,id,numTimes){
+	layer.confirm("确定删除吗？", function (index) {
+		$.ajax({//id获取详情打开弹窗传值子页面
+		    type: 'post',
+		    url: PATH_URL + "/makeInfo/delGtId",
+		    dataType: 'json',
+			async:false,
+		    data: {
+		        gtId:id,makeMonth:localStorage.getItem("resultMakeMonth"),numTimes:numTimes
+		    },
+		    success: function (data) {
+				console.log(data,"确定删除");
+				getView()
+				getSpecial(localStorage.getItem("resultMakeMonth").substring(0,4),localStorage.getItem("resultMakeMonth").substring(5,7)<10?localStorage.getItem("resultMakeMonth").substring(5,7).replace("0",""):localStorage.getItem("resultMakeMonth").substring(5,7));
+				layer.close(index);
+		    },
+			error:function(e){
+				
+			}
+		})
 	})
 }
-
+function reloadData(){
+	getView();
+	getSpecial(localStorage.getItem("resultMakeMonth").substring(0,4),localStorage.getItem("resultMakeMonth").substring(5,7)<10?localStorage.getItem("resultMakeMonth").substring(5,7).replace("0",""):localStorage.getItem("resultMakeMonth").substring(5,7));
+}
 //正常巡视照片导入
 function normalInspectionUpload(){
 	let height = '99%';
@@ -374,7 +534,7 @@ function patrolOutsideAdd(){
 }
 
 //上传单张巡视图片
-function uploadPhoto(){
+function uploadPhoto(id,numTimes){
 	let height = '70%';
 	let width = '60%';
 	var index = parent.layer.open({
@@ -384,8 +544,8 @@ function uploadPhoto(){
 	    area: [width, height],
 	    maxmin: false,
 	    success: function (layero, index) {
-	        // var myIframe = window[layero.find('iframe')[0]['name']];
-	        // myIframe.hideSubmit();
+	        var myIframe = parent.window[layero.find('iframe')[0]['name']];
+	        myIframe.setGtId(id,localStorage.getItem("resultMakeMonth"),numTimes);
 	        // var fnc = myIframe.setData(data.data); //aaa()为子页面的方法
 	
 	    },