Parcourir la source

智能大会首页语音更换

panhui il y a 7 ans
Parent
commit
f96c278a7a

+ 5 - 1
src/main/java/com/izouma/awesomeadmin/web/CompanyInfoDetailController.java

@@ -104,7 +104,11 @@ public class CompanyInfoDetailController {
     /**
     * <p>删除。</p>
     */
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @RequestMapping(value
+
+
+
+            = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteCompanyInfoDetail(CompanyInfoDetail record) {
 

+ 18 - 17
src/main/vue/src/pagesPre/Home.vue

@@ -14,25 +14,24 @@
         <transition name="slide-up">
             <div class="box-content" v-if="showBox">
                 <div class="title">
-                    <div class="voice-btn" style="visibility:hidden">
-                    </div>
+                    <div class="voice-btn" style="visibility:hidden"></div>
                     <div class="name">{{message[nowMessage].title}}介绍</div>
                     <div class="voice-btn" v-if="isVoice" @click="changeVoice(false)">
                         <img src="../assetsPre/icon_zanting.png" alt="">
                     </div>
-                        <div class="voice-btn" v-else @click="changeVoice(true)">
-                            <img src="../assetsPre/icon_bofang.png" alt="">
+                    <div class="voice-btn" v-else @click="changeVoice(true)">
+                        <img src="../assetsPre/icon_bofang.png" alt="">
                     </div>
 
-                        </div>
-                        <div class="message">
-                            {{message[nowMessage].content}}
-                        </div>
+                </div>
+                <div class="message">
+                    {{message[nowMessage].content}}
+                </div>
 
-                        <div class="showbtn" @click="goNext" v-if="nowMessage!='展馆'">
-                            查看参展企业列表
-                        </div>
-                    </div>
+                <div class="showbtn" @click="goNext" v-if="nowMessage!='展馆'">
+                    查看参展企业列表
+                </div>
+            </div>
 
         </transition>
         <audio style="display:none" ref='music' :src="message[nowMessage].voice" controls="controls">
@@ -56,17 +55,17 @@ export default {
                 '4号馆': {
                     title: '赋能智造馆',
                     content: '“赋能智造馆”,在4号展馆,重点展示为智能制造实践提供相关动能的内容和领域,如5G应用,工业互联、云制造,人工智能,工业软件,智能终端,传感器、智能芯片等。',
-                    voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
+                    voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-09-10-36-53-4iej31bp.mp3'
                 },
                 '5号馆': {
                     title: '生态智造馆',
                     content: '“生态智造馆”。在5号展馆,重点展示围绕智能制造构建的政策、科技、人才、园区、平台、技术等生态支撑系统。',
-                    voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
+                    voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-09-10-37-29-0zhfed3z.mp3'
                 },
                 '6号馆': {
                     title: '国际及综合应用馆',
                     content: '“国际及综合应用馆”。在6号馆,重点展示世界范围内智能制造领域的关键技术、核心产品、解决方案及相关行业应用等。',
-                    voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
+                    voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-09-10-37-54-1og69577.mp3'
                 },
                 '5A馆': {
                     title: '登陆厅',
@@ -100,7 +99,9 @@ export default {
         },
         changeVoice(value) {
             if (value) {
-                this.$refs.music.play();
+                setTimeout(() => {
+                    this.$refs.music.play();
+                }, 500)
                 this.isVoice = true;
             }
             else {
@@ -128,7 +129,7 @@ export default {
     background-position: center center;
     display: flex;
     flex-direction: column;
-    justify-content:space-between;
+    justify-content: space-between;
     min-height: 480px;
 
     .topImg {

+ 1 - 1
src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.88330763060e10186890877d69171382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2d2ab2933a8c9520f05e.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/admin.ec298cb679344c0b7b7b.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.88330763060e10186890877d69171382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.582a5aaa697406c9f1a1.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/admin.ec298cb679344c0b7b7b.js></script></body></html>

+ 1 - 1
src/main/webapp/WEB-INF/html/index.html

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</style><link href=/static/css/index.952b6d36570383dc68b2083585874f92.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2d2ab2933a8c9520f05e.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/index.c14506727c84857d55c2.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.380fd5848ae3257ec4cef871b8695b05.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.582a5aaa697406c9f1a1.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/index.c14506727c84857d55c2.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;

+ 1 - 1
src/main/webapp/WEB-INF/html/loginAdmin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2d2ab2933a8c9520f05e.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/loginAdmin.97223717073d07360948.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.582a5aaa697406c9f1a1.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/loginAdmin.97223717073d07360948.js></script></body></html>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/main/webapp/static/css/index.380fd5848ae3257ec4cef871b8695b05.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/main/webapp/static/js/13.7e8937d3df9bedf3c721.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/main/webapp/static/js/13.9676c45cb84b4f1351f8.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/main/webapp/static/js/manifest.582a5aaa697406c9f1a1.js


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff