diff --git a/hxy-web/html/wireManager/project/projectDetail.html b/hxy-web/html/wireManager/project/projectDetail.html index dc79525..f057272 100644 --- a/hxy-web/html/wireManager/project/projectDetail.html +++ b/hxy-web/html/wireManager/project/projectDetail.html @@ -63,27 +63,6 @@ - -
@@ -157,6 +136,8 @@
+ +
@@ -207,15 +188,15 @@
- +
- - diff --git a/hxy-web/html/wireManager/project/setUpGt.html b/hxy-web/html/wireManager/project/setUpGt.html new file mode 100644 index 0000000..2f18d23 --- /dev/null +++ b/hxy-web/html/wireManager/project/setUpGt.html @@ -0,0 +1,151 @@ + + + + + 护线员考勤 + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+
+ +
+ +
+
+ +
+
+ + + + + + \ No newline at end of file diff --git a/hxy-web/js/wireManager/project/projectDetail.js b/hxy-web/js/wireManager/project/projectDetail.js index 6370ffa..590c135 100644 --- a/hxy-web/js/wireManager/project/projectDetail.js +++ b/hxy-web/js/wireManager/project/projectDetail.js @@ -39,40 +39,7 @@ layui.use(['form','layer','table','element'], function () { return false; // 阻止表单跳转。如果需要表单跳转，去掉这段即可。 }); - - - - - //人员信息 - //initStaffTable() - // 触发submit提交 按钮点击或者表单被执行提交时触发 - form.on('submit(queryUser)', function (data) { - console.log("搜索") - // 对表格进行重载。id 即 table表格的id - table.reload('staffTable', { - // //设定异步数据接口的额外参数 - page:{curr : 1} - ,where: data.field - }) - return false; // 阻止表单跳转。如果需要表单跳转，去掉这段即可。 - }); - form.on('submit(resetUser)', function () { - console.log("重置") - $('#search1').val(''); - $('#search2').val(''); - let obj = { - search1:'', - search2:'' - } - // 对表格进行重载。id 即 table表格的id - table.reload('staffTable', { - // //设定异步数据接口的额外参数 - page:{curr : 1} - ,where: obj - }) - return false; // 阻止表单跳转。如果需要表单跳转，去掉这段即可。 - }); - form.render(); + initStaffTable(); }); //杆塔信息搜索 function queryClick1(){ @@ -106,6 +73,9 @@ function resetClick1(){ } }) } + + + //新增杆塔 function addClick1(){ var height = '80%'; @@ -275,8 +245,11 @@ function importData1(){ function setData(data){ + $("#proId").val(data.proId); + $("#proName").val(data.proName); + var proName = data.proName; - if(proName.length > 10){ + if(proName.length > 8){ proName = proName.substring(0, 8) + '...' } $("#proName").text(proName); @@ -285,7 +258,13 @@ function setData(data){ $(".isTwo").text(data.isTwo == '0'? '单回路': '双回路'); $("#powerNum").text(data.powerNum); $("#lineNum").text(data.lineNum); - $("#lineProName").text(data.proName); + + var proName1 = data.proName; + if(proName1.length > 50){ + proName1 = proName1.substring(0, 50) + '...' + } + $("#lineProName").text(proName1); + $("#lineProName").attr('title', data.proName); $("#yjName").text(data.fgsName + ' / ' + data.yjName); $("#volLevel").text(data.volLevel + 'kV'); @@ -356,13 +335,14 @@ function initGmTableTwo(){ field: '', align: 'center', templet: function(d){ - console.log("sssss:", d.gtTwoName) - let isTwo = d.isTwo; - let html; - if(isTwo == '0' || isTwo == 0){ - html = '单回路' + var gtTwoName = d.gtTwoName; + var gtId = d.gtId; + var gtName = d.gtName; + var gtTwoId = d.gtTwoId; + if(gtTwoName == 'null' || gtTwoName == null){ + html = `` }else{ - html = '双回路' + html = `` } // 返回模板内容 return html; @@ -374,36 +354,105 @@ function initGmTableTwo(){ } }); } +//设置杆塔 +function setUpGt(gtId, gtName){ + var height = '98%'; + var width = '30%'; + var index = parent.layer.open({ + title: ['选择双回路杆塔', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: 'setUpGt.html', + area: [width, height], + maxmin: false, + success: function (layero, index) { + // //打开页面成功时执行 + var myIframe = parent.window[layero.find('iframe')[0]['name']]; + + var proId = $("#proId").val(); + var proName = $("#proName").val(); + //getTaskSource()为子页面的方法 + myIframe.setData(gtId,gtName,proId,proName); + + }, + yes: function (index, layero) { + // //提交子页面时执行 + // // 获取弹出层中的form表单元素 + // var formSubmit = layer.getChildFrame('form', index); + // var submited = formSubmit.find('button')[0]; + // // 触发点击事件，会对表单进行验证，验证成功则提交表单，失败则返回错误信息 + // // var myIframe = window[layero.find('iframe')[0]['name']]; + // // myIframe.selectCheck(); //aaa()为子页面的方法 + // submited.click(); + // example.ajax.reload(); // 刷新页面 + }, + end: function(){ + initGmTableTwo(); + } + }); +} +//取消设置 +function cancelGt(gtId, gtTwoId){ + var index = layer.confirm("确认取消吗?", { icon: 0 }, function(){ + $.ajax({ + type: 'POST', + url: PATH_URL + '/lineProject/delGtRelId', + contentType: "application/json; charset=utf-8", + data: JSON.stringify({ + gtId: gtId, + gtTwoId: gtTwoId + }), + success: function (data) { + if(data.code == 200){ + parent.layer.msg("取消成功", { icon: 1 }); + layer.close(index); + initGmTableTwo(); + }else{ + layer.alert(data.msg); + } + }, + error: function (XMLHttpRequest, textStatus, e) { + layer.close(loadingMsg); + layer.msg('数据请求发生异常,请稍后重试', {icon: 16, scrollbar: false}); + } + }); + }) +} +//杆塔信息搜索 +function queryClick2(){ + // 对表格进行重载。id 即 table表格的id + table.reload('layui_table2', { + // //设定异步数据接口的额外参数 + page:{curr : 1} + ,where: { + 'userName': $("#userName").val() + } + }) +} -function addGm(){ - var height = '42%'; - var width = '38%'; - var index = layer.open({ - title: [`选择工程、杆塔 `, 'color:#3B70A1;background-color:#fff;font-size:20px'], - type: 1, - content: $("#gmDetail").html(), - closeBtn: 1, - area: [width, height], - success: function (layero, index) { +//重置 +function resetClick2(){ + //重置 + $('#userName').val(""); + table.reload('layui_table2', { + where: { + 'userName': '', + } + }) +} - }, - - cancel: function(index, layero){//关闭 - console.log(3) - layer.close(index); - }, - - }); -} // 渲染人员表格 function initStaffTable(){ table.render({ + id: 'layui_table2', elem: '#staffTable', - // url: "/sys/achievement", - page: true, + url: PATH_URL + "/personbase/getList", + where: { + }, + page: true, //开启分页 + method:'post', skin: 'line', // 表格样式 cols: [[ { @@ -415,15 +464,17 @@ function initStaffTable(){ align: 'center', type: 'numbers' }, - {field:'name', title: '姓 名',align: 'center',width:100}, - {field:'idCard', title: '身份证号',align: 'center',}, - {field:'phone', title: '联系电话',align: 'center',width:120}, - {field:'line', title: '管辖线路名称',align: 'center',width:350}, - {field:'area', title: '范围、基数',align: 'center',width:350}, + {field:'userName', title: '姓 名',align: 'center',width:100}, + {field:'idNumber', title: '身份证号',align: 'center',}, + {field:'tel', title: '联系电话',align: 'center',width:120}, + {field:'proName', title: '管辖线路名称',align: 'center',width:350}, + {field:'gtName', title: '范围、基数',align: 'center',width:350}, {field:'startTime', title: '协议起始日期',align: 'center',width:140}, {field:'endTime', title: '协议终止日期',align: 'center',width:140} ]], - data: tableData2 + done: function(res,curr,count){ + //checkPermission(); + } }); } @@ -481,4 +532,15 @@ function exportData1() { + "&type=" + type + "&proId=" + proId + "&proName=" + parentData.proName +} + + + +//导出人员信息 +function exportData() { + // let search1 = $('#search1').val(); + // let search2 = $('#search2').val(); + window.location.href = oiPlanUrl + "/monthlyPlanSubmission/export?token=" + token; + + } \ No newline at end of file diff --git a/hxy-web/js/wireManager/project/projectList.js b/hxy-web/js/wireManager/project/projectList.js index b82de77..4f5973c 100644 --- a/hxy-web/js/wireManager/project/projectList.js +++ b/hxy-web/js/wireManager/project/projectList.js @@ -165,7 +165,7 @@ function checkView(vo) { contentType: "application/json; charset=utf-8", data: JSON.stringify({"proId": vo.proId}), success: function (data) { - console.log("data:", data) + console.log("ssadsad:", data) var index = layer.open({