From dfefba58aeae9fff0ef0463acf3d112f78d72629 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.8>
Date: 星期一, 29 十月 2018 17:21:45 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/Test.jsp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/Test.jsp b/gx_tieta/WebRoot/Test.jsp
index fd5245d..77b967f 100644
--- a/gx_tieta/WebRoot/Test.jsp
+++ b/gx_tieta/WebRoot/Test.jsp
@@ -20,10 +20,8 @@
<link rel="stylesheet" type="text/css" href="styles.css">
-->
<link rel="stylesheet" type="text/css" href="css/basic.css" />
- <script type="text/javascript" src="js/frame.js"></script>
<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="js/buildNav.js"></script>
</head>
<body>
<!-- <form action="MyFileAction!UploadTestFile" method="post" enctype="multipart/form-data" id="up-form1">
@@ -38,7 +36,7 @@
<img alt="" id="im" src="">
</form>
</body>
-
+ <script type="text/javascript" src="js/VoiceUtil.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -48,6 +46,11 @@
//console.info(json);
<% } %>
+
+ setTimeout(function() {
+ voice.play("杩欐槸鎴戠涓�娆″仛璇煶鎾姤鍦� 2018-01-01 01:56:23");
+ },2000);
+
//涓婁紶logo
$('#up-file1').click(function(){
uploadlogo();
--
Gitblit v1.9.1