From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +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 | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
index 1346e26..18bdbc6 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
@@ -118,7 +118,6 @@
</form>
</div>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
- <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
@@ -137,6 +136,7 @@
'record_time': date.format('yyyy-MM-dd hh:mm:ss'), // 鎻愪氦鏃ユ湡
'error_descript': '',
'stationId': '',
+ 'error_dispose': '',
'picture_num':4
},
files: {}
@@ -154,6 +154,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 +'">'
--
Gitblit v1.9.1