From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-fault-manage-details.html | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
index ac4f523..d864373 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
@@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>鏁呴殰璇︽儏</title>
<link rel="stylesheet" type="text/css" href="../pages/css/base.css">
- <link rel="stylesheet" type="text/css" href="../jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="../src/css/layui.css">
<link rel="stylesheet" type="text/css" href="../pages/css/mylayui.css">
<style type="text/css">
@@ -40,8 +39,6 @@
</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>
<script type="text/html" id="detailImgs">
@@ -65,7 +62,8 @@
elem: '#imgCarousel',
arrow: 'always',
width: '100%',
- height: '500px'
+ height: '500px',
+ autoplay: false
};
//甯歌杞挱
@@ -78,11 +76,6 @@
laytpl(detailImgsTpl).render(imgs, function(html) {
$('#imgCarousel').html(html);
detailsImgs.reload(options);
- });
-
- // 鍒囨崲浜嬩欢
- carousel.on('change(imgCarousel)', function(obj) {
- //console.info(obj);
});
});
</script>
--
Gitblit v1.9.1