From a098897b8b37dd9418a8840a5f89cac92757ab4a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 13 十一月 2018 14:03:05 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html | 2 +-
1 files changed, 1 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..153ec70 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: {}
--
Gitblit v1.9.1