前端接口对接

hxy-web/html/wireManager/project/projectAdd.html

@@ -84,7 +84,7 @@
                         <label class="layui-form-label" style="width: 116px;"><i class="tip-required"
                                 style="color: red;font-size: 20px">*</i>电压等级：</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="volLevel" id="volLevel" class="layui-input" lay-verify="required" maxlength="500" placeholder="请填写" style="width: 425px">
+                            <input type="text" name="volLevel" id="volLevel" class="layui-input" lay-verify="required" maxlength="40" placeholder="请填写" style="width: 425px">
                         </div>
                     </div>
                 </div>

hxy-web/js/wireManager/attendance/attendance.js

@@ -67,6 +67,7 @@ layui.use(['form','layer','table','laydate','element'], function () {
 
 //查询
 function queryClick(){
+	var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); 
 	let userName = $('#userName').val();
 	let proName = $('#proName').val();
 	let yjName = $('#yjName').val();
@@ -81,13 +82,15 @@ function queryClick(){
 				proName: proName,
 				yjName: yjName,
 				startMakeMonth: startMakeMonth,
-				endMakeMonth: endMakeMonth
+				endMakeMonth: endMakeMonth,
+				yjId: yjId
 			}
 		})
 	}
 }
 //重置
 function resetClick(){
+	var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); 
 	$('#userName').val("");
 	$('#proName').val("");
 	$('#yjName').val("");
@@ -103,6 +106,7 @@ function resetClick(){
 				yjName: "",
 				startMakeMonth: '',
 				endMakeMonth: $('#makeMonth').val(),
+				yjId: yjId
 			}
 		})
 	}

hxy-web/js/wireManager/project/projectAdd.js

@@ -114,14 +114,6 @@ function addData(formData) {
  * @returns {boolean}
  */
 function updateData(formData) {
-	
-		if(parentData.data.proName === $("#lineProName").val()){
-			layer.msg("您想要修改的杆塔名称与原名称一致，无法修改!", { icon: 0, time: 3000 });
-			$("#lineProName").focus();
-			return;
-		}
-	
-	
 		formData.field.isTwo = workTypeValue;
 		formData.field.yjId = $("#taskSourceId").attr("stationId");
 		formData.field.yjName = $("#taskSourceId").attr("stationName");

hxy-web/js/wireManager/project/projectDetail.js

@@ -275,7 +275,13 @@ function importData1(){
 
 
 function setData(data){
-	$("#proName").text(data.proName);
+	var proName = data.proName;
+	if(proName.length > 10){
+		proName = proName.substring(0, 8) + '...'
+	}
+	$("#proName").text(proName);
+	$("#proName").attr('title', data.proName);
+	
 	$(".isTwo").text(data.isTwo == '0'? '单回路': '双回路');
 	$("#powerNum").text(data.powerNum);
 	$("#lineNum").text(data.lineNum);
@@ -432,7 +438,7 @@ function projectAddUser(){
     var index = layer.open({
         title: ['新增人员', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
-        content: 'projectAddUser.html',
+        content: '../staff/staffAdd.html',
         area: [width, height],
         maxmin: false,
         success: function (layero, index) {
@@ -440,7 +446,7 @@ function projectAddUser(){
             var myIframe = window[layero.find('iframe')[0]['name']];
             //getTaskSource()为子页面的方法
             // myIframe.getTaskSource("taskSourceId","");
-
+    
         },
         yes: function (index, layero) {
             // //提交子页面时执行

hxy-web/js/wireManager/project/projectList.js

@@ -27,23 +27,27 @@ layui.use(['form','layer','table'], function () {
 
 //查询
 function queryClick(){
+	var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); 
 	let fgsName = $('#fgsName').val();
 	let proName = $('#proName').val();
 	table.reload('layui_table', {
 		where: {
 			fgsName: fgsName,
 			proName: proName,
+			yjId: yjId
 		}
 	})
 }
 //重置
 function resetClick(){
+	var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); 
 	$('#fgsName').val("");
 	$('#proName').val("");
 	table.reload('layui_table', {
 		where: {
 			fgsName: "",
 			proName: "",
+			yjId: yjId
 		}
 	})
 }
@@ -237,8 +241,8 @@ function delView(id) {
 			success: function (data) {
 				layer.close(index);
 				if (data.code == 200) {
-					top.layer.alert('删除成功', {icon: 1});
-					// example.ajax.reload(); // 刷新页面
+					parent.layer.alert('删除成功', {icon: 1});
+					init()
 				} else {
 					layer.msg("删除失败", {icon: 2}, function () {
 						// example.ajax.reload(); // 刷新页面
@@ -279,11 +283,12 @@ function importData(){
 
 //导出
 function exportData() {
-	alert(token)
     var fgsName = $("#fgsName").val();
 	var proName = $("#proName").val();
-	
+	var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); 
+	alert(yjId)
     window.location.href = PATH_URL + `/lineProject/exportProData?token=` + token
         + "&fgsName=" + fgsName
 		+ "&proName=" + proName
+		+ "&yjId=" + yjId
 }

hxy-web/js/wireManager/wagesReport/wagesReportList.js

@@ -37,6 +37,7 @@ layui.use(['form','layer','table', 'laydate'], function () {
 
 	
 function queryClick(){
+	var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); 
 	var yjName = $("#yjName").val();
 	var startWagesMonth = $("#wagesMonth").val().split('~')[0];
 	var endWagesMonth = $("#wagesMonth").val().split('~')[1];
@@ -47,11 +48,13 @@ function queryClick(){
 	    ,where:{
 			yjName: yjName,
 			startWagesMonth: startWagesMonth,
-			endWagesMonth: endWagesMonth
+			endWagesMonth: endWagesMonth,
+			yjId: yjId
 		}
 	})
 }
 function resetClick(){
+	var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId"); 
 	$("#yjName").val('');
 	$("#wagesMonth").val(times[0] + "-" + times[1]);
 	
@@ -62,7 +65,8 @@ function resetClick(){
 	    ,where: {
 			yjName: '',
 			startWagesMonth: '',
-			endWagesMonth: ''
+			endWagesMonth: '',
+			yjId: yjId
 		}
 	})
 }