From 0c291f930b3e375f3baaf8f1e8c767973c87c140 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 07 十一月 2018 09:27:51 +0800
Subject: [PATCH] 添加处理方案显示
---
gx_tieta/WebRoot/iframe/batt-fault-manage-del.html | 207 ++++++++++++++++++++++++++++++++--------
gx_tieta/WebRoot/batt-fault-manage.jsp | 69 ++++++++++++-
gx_tieta/WebRoot/iframe/batt-fault-manage-details.html | 3
3 files changed, 228 insertions(+), 51 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 383010c..8455d36 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -118,6 +118,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 +149,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 +177,9 @@
case 'delError':
addSubPlan(obj.data);
break;
+ case 'viewError':
+ viewSolveDetails(obj.data);
+ break;
default:
layer.msg('鍔熻兘寮�鍙戜腑...');
break;
@@ -198,9 +203,26 @@
});
}
+ // 鏌ョ湅澶勭悊鏂规鎻忚堪
+ function viewSolveDetails(data) {
+ 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'
+ });
+ }
+
// 鏋勯�犵粨鏋�
function setDetailsOpts(data) {
var rs={
+ title: '鏁呴殰鎻忚堪',
num: data.num,
des: data.question?data.question:'鏆傛棤鎻忚堪锛侊紒锛�'
};
@@ -218,6 +240,35 @@
break;
case 4:
imgs = ['picture_one', 'picture_two', 'picture_three', 'picture_four'];
+ break;
+ }
+
+ rs.imgs = imgs;
+
+ 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;
}
@@ -476,6 +527,7 @@
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;
@@ -486,6 +538,9 @@
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;
}
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-del.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-del.html
index 695d10f..879dbc2 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-del.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-del.html
@@ -10,9 +10,6 @@
<link rel="stylesheet" type="text/css" href="../src/css/layui.css">
<link rel="stylesheet" type="text/css" href="../pages/css/mylayui.css">
<style>
- html, body {
- min-width: 600px;
- }
.bottom-btn {
position: absolute;
bottom: 10px;
@@ -21,17 +18,38 @@
</style>
</head>
<body>
- <div class="layui-page-container mrl8 mrr8">
- <div class="layui-form layui-form-pane" style="margin-bottom: 60px;">
- <label class="layui-form-label">鏁呴殰鎺掗櫎鏂规</label>
- <div class="layui-form-item layui-form-text">
- <div class="layui-input-block">
- <textarea placeholder="鏂规鎻忚堪" class="layui-textarea" name="desc" id="desc" style="height:400px;"></textarea>
- </div>
- </div>
- </div>
- <div class="bottom-btn">
- <button type="button" class="layui-btn layui-btn-normal" id="subPlan">鎻愪氦鏂规</button>
+ <div class="layui-page-container">
+ <!-- 椤甸潰涓婚鍐呭 -->
+ <div class="layui-page-content abs">
+ <div class="abs-container">
+ <div class="layui-upload">
+ <div class="layui-upload-list">
+ <table class="layui-table">
+ <thead>
+ <tr>
+ <th>鍥剧墖棰勮</th>
+ <th>鏂囦欢鍚�</th>
+ <th>澶у皬</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="imgsInfo"></tbody>
+ </table>
+ </div>
+ </div>
+ <div class="layui-form layui-form-pane" style="margin-bottom: 60px;">
+ <label class="layui-form-label">鏂规鎻忚堪</label>
+ <div class="layui-form-item layui-form-text">
+ <div class="layui-input-block">
+ <textarea placeholder="鏂规鎻忚堪" class="layui-textarea" name="desc" id="desc"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="bottom-btn">
+ <button type="button" class="layui-btn layui-btn-normal" id="addImgs">娣诲姞鍥剧墖</button>
+ <button type="button" class="layui-btn layui-btn-normal" id="addImgsAction">鎻愪氦鏂规</button>
</div>
</div>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
@@ -40,8 +58,9 @@
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
<script type="text/javascript">
- layui.use(['form', 'layer'], function() {
+ layui.use(['form', 'layer', 'upload'], function() {
var layer = layui.layer;
+ var upload = layui.upload;
var subPlanData = parent.$('#subPlan').data('data');
var closePage = parent.$('#closeUploadBtn');
@@ -54,37 +73,139 @@
subPlan(subPlanData);
});
- function subPlan(data) {
- if(data.error_dispose.trim()) {
- var load = layer.load(1);
- // 娣诲姞瑙ｅ喅鏂规
- $.ajax({
- type: 'post',
- async: true,
- url: 'Deverror_recordAction!update',
- data: 'json='+JSON.stringify(data),
- dataType: 'json',
- success:function() {
- layer.close(load);
- layer.closeAll();
- layer.msg('娣诲姞鎴愬姛锛�3绉掑悗鑷姩鍏抽棴') ;
- setTimeout(function() {
- closePage.click();
- }, 3000);
- },
- error:function() {
- layer.close(load);
- layer.msg('娣诲姞澶辫触锛�') ;
- }
-
- });
- }else {
- layer.msg('璇疯緭鍏ユ帓闄ょ殑鏂规锛�');
- }
+ // 鍥剧墖涓婁紶
+ var imgsInfo = $('#imgsInfo');
+ var date = new Date();
+ var addImgsOpts = {
+ json:{
+ 'solve_record_time': date.format('yyyy-MM-dd hh:mm:ss'), // 鎻愪氦鏃ユ湡
+ 'error_descript': '',
+ 'error_dispose': '',
+ 'error_en': 1,
+ 'solve_picture_num': 0
+ },
+ files: {}
+ };
+
+ var uploadImgs = upload.render({
+ elem: '#addImgs'
+ ,url: 'Deverror_recordAction!add'
+ ,accept: 'file'
+ ,multiple: true
+ ,number: 4
+ ,auto: false
+ ,bindAction: '#addImgsActionTmp'
+ ,choose: function(obj){
+ addImgsOpts.files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+ var files = this.files = obj.pushFile();
+ //璇诲彇鏈湴鏂囦欢
+ obj.preview(function(index, file, result){
+ var tr = $(['<tr id="upload-'+ index +'">'
+ ,'<td><img src="'+result+'">'
+ ,'<td>'+ file.name +'</td>'
+ ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
+ ,'<td>'
+ ,'<button class="layui-btn layui-btn-xs imgs-reload layui-hide">閲嶄紶</button>'
+ ,'<button class="layui-btn layui-btn-xs layui-btn-danger imgs-delete">鍒犻櫎</button>'
+ ,'</td>'
+ ,'</tr>'].join(''));
+
+ //鍗曚釜閲嶄紶
+ tr.find('.imgs-reload').on('click', function(){
+ obj.upload(index, file);
+ });
+
+ //鍒犻櫎
+ tr.find('.imgs-delete').on('click', function(){
+ delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+ tr.remove();
+ uploadImgs.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+ });
+
+ imgsInfo.append(tr);
+ });
+ }
+ });
+
+ // 鐐瑰嚮娣诲姞鐢熸垚
+ $('#addImgsAction').click(function() {
+ subPlan();
+ });
+
+ // 涓婁紶
+ function subPlan() {
+ // 鏇存柊鍐呭
+ createUploadData();
+ var formData = new FormData();
+
+ var files = addImgsOpts.files;
+ var filesArr = [];
+ Object.keys(files).forEach(function(key) {
+ filesArr.push(files[key]);
+ });
+
+ addImgsOpts.json.solve_picture_num = filesArr.length;
+ var json = JSON.stringify(addImgsOpts.json);
+ formData.append('json', json);
+ for(var i=0;i<filesArr.length; i++) {
+ var _files = filesArr[i];
+ formData.append('file', _files);
+ if(i==0) {
+ formData.append('fileType', 'solve_picture_one');
+ }
+
+ if(i==1) {
+ formData.append('fileType', 'solve_picture_two');
+ }
+
+ if(i==2) {
+ formData.append('fileType', 'solve_picture_three');
+ }
+
+ if(i==3) {
+ formData.append('fileType', 'solve_picture_four');
+ }
+ }
+
+ if(addImgsOpts.json.solve_picture_num>4) {
+ layer.msg('鏈�澶氫笂浼�4寮犲浘鐗�');
+ return;
+ }
+
+ var load = layer.load(1);
+ $.ajax({
+ type: "post",
+ url: "Deverror_recordAction!update",
+ async:true,
+ dataType:'text',
+ data:formData,
+ contentType: false,//杩欓噷
+ processData: false,//杩欎袱涓竴瀹氳缃负false
+ success: function(data){
+ layer.close(load);
+ layer.closeAll();
+ layer.msg('涓婁紶鎴愬姛锛�3绉掑悗鑷姩鍏抽棴') ;
+ setTimeout(function() {
+ closePage.click();
+ }, 3000);
+ },
+ error:function(e){
+ layer.close(load);
+ layer.msg('涓婁紶澶辫触锛�') ;
+ }
+ });
}
- console.log(subPlanData);
+
+ // 鏇存柊涓婁紶鍚庡彴鐨勪俊鎭�
+ function createUploadData() {
+ var json = addImgsOpts.json;
+ json.solve_record_time = date.format('yyyy-MM-dd hh:mm:ss'); // 鎻愪氦鏃ユ湡
+ json.error_dispose = $('#desc').val(); // 鏂规鎻忚堪
+ json.num = subPlanData.num; // 鏍囪瘑
+ json.error_en = 1; // 纭畾
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
index 7292d26..ac4f523 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
@@ -22,7 +22,7 @@
<body>
<div class="layui-page-container mrl8 mrr8">
<fieldset class="layui-elem-field">
- <legend>闂鎻忚堪</legend>
+ <legend id="infoTitle">淇℃伅鎻忚堪</legend>
<div class="layui-field-box" id="detailsText">
</div>
@@ -73,6 +73,7 @@
var detailImgsTpl = $('#detailImgs').html();
var imgs = parent.$('#detailImgs').data('data');
$('#detailsText').text(imgs.des);
+ $('#infoTitle').text(imgs.title);
// 娣诲姞妯℃澘
laytpl(detailImgsTpl).render(imgs, function(html) {
$('#imgCarousel').html(html);
--
Gitblit v1.9.1