From 00833231bcb04021f4a69a1b9a7e4e45f7b20f40 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期一, 24 十二月 2018 11:15:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-fault-manage.jsp | 103 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 91 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index aeae78b..3db4193 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -45,7 +45,8 @@
<th>鐪�</th> <!-- 鐪� -->
<th>甯�</th> <!-- 甯� -->
<th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
- <th><s:text name="Computer_site"/></th> <!-- 鏈烘埧绔欑偣 -->
+ <th><s:text name="Computer_site"/></th>
+ <th>闂绫诲瀷</th> <!-- 鏈烘埧绔欑偣 -->
</tr>
<tr>
<td>
@@ -59,6 +60,19 @@
</td>
<td>
<select name="" id="station_name3"></select>
+ </td>
+ <td>
+ <select name="" id="question_name">
+ <option value="0">鐢垫睜闂</option>
+ <option value="1">鐢垫簮闂</option>
+ <option value="2">绌鸿皟闂</option>
+ <option value="3">婕忔按闂</option>
+ <option value="4">BTS璁惧闂</option>
+ <option value="5">GPRS妯″潡闂</option>
+ <option value="6">鏂藉伐瀹夎闂</option>
+ <option value="7">閾侀攤鐢垫睜闂</option>
+ <option value="8">鍏朵粬闂</option>
+ </select>
</td>
</tr>
</tbody>
@@ -118,6 +132,7 @@
<script type="text/html" id="toolBar">
<a class="layui-btn layui-btn-xs" lay-event="details">鏁呴殰璇︽儏</a>
<a class="layui-btn layui-btn-xs" lay-event="delError">鎺掗櫎鏁呴殰鏂规</a>
+ <a class="layui-btn layui-btn-xs" lay-event="viewError">鏌ョ湅鏁呴殰鏂规</a>
</script>
<script type="text/javascript">
var permits;
@@ -148,14 +163,15 @@
,toolbar: false
,cellMinWidth: 80
,cols: [[
- {field:'station_name1', title:'鐪�', align:'center',width:100}
- ,{field:'city', title:'甯�', align:'center',width:100}
- ,{field:'stationName3', title:'鏈烘埧鍚嶇О', align:'center',width:450}
- ,{field:'note', title:'璁板綍鏃堕棿', align:'center',width:150}
+ {field:'stationName3', title:'鏈烘埧鍚嶇О', align:'center',width:450}
+ ,{field:'note', title:'鏁呴殰鎻愬嚭鏃ユ湡', align:'center',width:150}
+ ,{field:'originator', title:'鏁呴殰鎻愬嚭浜�', align:'center',width:150}
,{field:'error_en', title: '鏁呴殰鎺掗櫎鐘舵��', align: 'center',width:150}
- ,{field:'error_dispose', title: '澶勭悊鏂规', align: 'center'}
- ,{field:'question', title:'鏁呴殰鎻忚堪', align:'center'},
- ,{fixed: 'right', title:'鎿嶄綔',toolbar: '#toolBar', width: 200, align:'center'}
+ ,{field:'question', title:'鏁呴殰鎻忚堪', align:'center'}
+ ,{field:'error_dispose', title: '澶勭悊鏂规鎻忚堪', align: 'center'}
+ ,{field:'solve_record_time', title: '澶勭悊鏂规鎻愬嚭鏃ユ湡', align: 'center'}
+ ,{field:'solve_user',title:'鏁呴殰瑙ｅ喅浜�',align: 'center'}
+ ,{fixed: 'right', title:'鎿嶄綔',toolbar: '#toolBar', width: 290, align:'center'}
]]
,data:[]
,page: false
@@ -175,6 +191,9 @@
case 'delError':
addSubPlan(obj.data);
break;
+ case 'viewError':
+ viewSolveDetails(obj.data);
+ break;
default:
layer.msg('鍔熻兘寮�鍙戜腑...');
break;
@@ -189,10 +208,35 @@
layer.open({
type: 2,
title: '<span style="font-weight:bold">>>鏁呴殰璇︽儏</span>',
- area: ['700px', '660px'],
+ area: ['1200px', '660px'],
fixed: false, //涓嶅浐瀹�
- resize: false,
- maxmin: false,
+ resize: true,
+ maxHeight: 660,
+ maxmin: true,
+ content: 'iframe/batt-fault-manage-details.html'
+ });
+ }
+
+ // 鏌ョ湅澶勭悊鏂规鎻忚堪
+ function viewSolveDetails(data) {
+ //console.log(data.error_en_num);
+ // 鍒ゆ柇鏄惁宸插瓨鍦ㄨВ鍐虫柟妗�
+ if(!data.error_en_num) {
+ layer.msg('鏆傛棤瑙ｅ喅鏂规');
+ return;
+ }
+
+
+ var imgOpts = setDelDetailsOpts(data);
+ $('#detailImgs').data('data', imgOpts);
+ layer.open({
+ type: 2,
+ title: '<span style="font-weight:bold">>>澶勭悊鏂规璇︽儏</span>',
+ area: ['1200px', '660px'],
+ fixed: false, //涓嶅浐瀹�
+ resize: true,
+ maxHeight: 660,
+ maxmin: true,
content: 'iframe/batt-fault-manage-details.html'
});
}
@@ -200,6 +244,7 @@
// 鏋勯�犵粨鏋�
function setDetailsOpts(data) {
var rs={
+ title: '鏁呴殰鎻忚堪',
num: data.num,
des: data.question?data.question:'鏆傛棤鎻忚堪锛侊紒锛�'
};
@@ -225,6 +270,35 @@
return rs;
}
+ // 鏋勯�犳煡鐪嬪鐞嗘柟妗堝晩缁撴灉
+ function setDelDetailsOpts(data) {
+ var rs={
+ title: '澶勭悊鏂规鎻忚堪',
+ num: data.num,
+ des: data.error_dispose?data.error_dispose:'鏆傛棤鎻忚堪锛侊紒锛�'
+ };
+ var picture_num = data.picture_num;
+ var imgs = [];
+ switch(picture_num) {
+ case 1:
+ imgs = ['solve_picture_one'];
+ break;
+ case 2:
+ imgs = ['solve_picture_one','solve_picture_two'];
+ break;
+ case 3:
+ imgs = ['solve_picture_one', 'solve_picture_two', 'solve_picture_three'];
+ break;
+ case 4:
+ imgs = ['solve_picture_one', 'solve_picture_two', 'solve_picture_three', 'solve_picture_four'];
+ break;
+ }
+
+ rs.imgs = imgs;
+
+ return rs;
+ }
+
// 娣诲姞瑙ｅ喅鏂规
function addSubPlan(data) {
var subPlanData = setSubPlanData(data);
@@ -234,7 +308,7 @@
uploadIframe = layer.open({
type: 2,
title: '<span style="font-weight:bold">>>鏁呴殰鎺掗櫎鏂规</span>',
- area: ['700px', '560px'],
+ area: ['1200px', '600px'],
fixed: false, //涓嶅浐瀹�
resize: false,
maxmin: false,
@@ -475,16 +549,21 @@
var tmp = {};
var _data = data[i];
var error_en = _data.error_en?'<a class="layui-btn layui-btn-xs layui-bg-blue">宸叉帓闄�</a>':'<a class="layui-btn layui-btn-xs layui-bg-red">鎺掗櫎涓�...</a>';
+ var solve_record_time = _data.error_en?_data.solve_record_time:'';
tmp.station_name1 = _data.stationName1;
tmp.city = _data.stationName2;
tmp.stationName3 = _data.stationName;
tmp.note = _data.record_time;
tmp.question = _data.error_descript;
+ tmp.error_en_num = _data.error_en;
tmp.error_en = error_en;
tmp.error_dispose = _data.error_dispose;
tmp.num = _data.num;
tmp.county = _data.stationName5;
tmp.picture_num = _data.picture_num;
+ tmp.originator = _data.uname;
+ tmp.solve_user = _data.solve_uname;
+ tmp.solve_record_time = solve_record_time;
tOptions.data.push(tmp);
Page.pageAll = _data.page.pageAll;
}
--
Gitblit v1.9.1