From 0c652f652fedd626383d7d3d151f23fee24a7680 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期一, 24 十二月 2018 16:02:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
index 153ec70..46fca8c 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
@@ -29,6 +29,7 @@
<td>甯�</td> <!-- 甯� -->
<td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td>鏈烘埧鍚嶇О</td> <!-- 鏈烘埧鍚嶇О -->
+ <td>闂绫诲瀷</td> <!-- 闂绫诲瀷 -->
</tr>
<tr>
<td>
@@ -71,6 +72,15 @@
<select name="home" id="home" lay-filter="home">
<option value="">璇烽�夋嫨鏈烘埧</option>
</select>
+ </div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="layui-form" lay-filter="homeFilter">
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <select name="ques_type" id="ques_type" lay-filter="ques_type"></select>
</div>
</div>
</div>
@@ -119,14 +129,20 @@
</div>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
+ <script type="text/javascript" src="../pages/js/common.js"></script>
<script type="text/javascript">
layui.use(['form','table', 'upload', 'layer'], function() {
var form = layui.form;
var upload = layui.upload;
var layer = layui.layer;
+
+ var homeQuestion = GLOBAL.HomeQues; // 鏈烘埧闂鍒楄〃
+ $('#ques_type').html(homeQuestion.getOptions());
+ form.render('select', 'ques_type');
// 鍥剧墖涓婁紶
var imgsInfo = $('#imgsInfo');
@@ -154,6 +170,7 @@
,choose: function(obj){
addImgsOpts.files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
var files = this.files = obj.pushFile();
+ imgsInfo.text('');
//璇诲彇鏈湴鏂囦欢
obj.preview(function(index, file, result){
var tr = $(['<tr id="upload-'+ index +'">'
@@ -197,7 +214,6 @@
// 鏇存柊鍐呭
createUploadData();
var formData = new FormData();
-
var files = addImgsOpts.files;
var filesArr = [];
Object.keys(files).forEach(function(key) {
@@ -265,11 +281,12 @@
function createUploadData() {
var home = $('#home').find('option:selected');
var stationid = home.attr('stationid')?home.attr('stationid'):0;
-
+ var error_state = $('#ques_type').val();
var json = addImgsOpts.json;
json.record_time = date.format('yyyy-MM-dd hh:mm:ss'); // 鎻愪氦鏃ユ湡
json.error_descript = $('#desc').val(); // 闂鎻忚堪
json.stationId = stationid;
+ json.error_state = error_state;
}
// 鏌ヨ鐪佷笅鎷夋
--
Gitblit v1.9.1