tremble 3 år sedan
förälder
incheckning
401ffaef07

+ 3 - 3
.env.prod

@@ -1,6 +1,6 @@
 VUE_APP_MAIN_COLOR=''
 VUE_APP_STATIC_DIR=static
 VUE_APP_INNERNET=https://fcb.intranet.4dkankan.com
-VUE_APP_CDN=https://4dkk.4dage.com
-VUE_APP_PROXY_URL='http://www.4dkankan.com/qjkankan/'
-VUE_APP_URL_FILL=/qjkankan
+VUE_APP_CDN=''
+VUE_APP_PROXY_URL=''
+VUE_APP_URL_FILL=''

+ 1 - 1
src/components/audio/index.vue

@@ -13,7 +13,7 @@
       </div>
     </div>
     <div v-if="showTime" class="namecon">
-      <div class="audio-name">{{name}}</div>
+      <div class="audio-name" :title="name">{{name}}</div>
       <div class="audio-right">
         <div class="audio-time">
           <span class="audio-length-current" ref="audioCurTime">00:00</span>

+ 4 - 1
src/framework/show/index.vue

@@ -33,7 +33,7 @@
       <preview
         :item="currentHotspot"
         :show="showPreview"
-        @close="showPreview = false"
+        @close="showPreview = false,currentHotspot=''"
       />
 
       <ul class="aside" >
@@ -359,6 +359,7 @@ export default {
     window.__krfn = __krfn;
 
     this.$bus.on("clickHotspot", (data) => {
+      console.log(data);
       let someData = this.activeItem.someData
       if (typeof someData == 'string') {
         someData = JSON.parse(this.activeItem.someData);
@@ -366,6 +367,8 @@ export default {
       let idx = someData.hotspots.findIndex((item) => item.name == data);
 
       this.currentHotspot = someData.hotspots[idx];
+
+      console.log(this.currentHotspot);
     });
     this.getSceneInfo();
   },

+ 1 - 1
src/framework/show/popup/imgview.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="imgcon">
-    <img @click.stop class="v-image"  v-viewer :src="image[current].icon"/>
+    <img @click.stop class="v-image"  v-viewer :src="$cdn + image[current].filePath"/>
     <span class="scale" @click="viewImg">
       <img :src="require('@/assets/images/icons/tool_full@2x.png')" alt="">
     </span>

+ 1 - 1
src/framework/show/popup/preview.vue

@@ -24,7 +24,7 @@
           </template>
           <template v-else-if="item.hotspotType=='audio'">
             <div class="v-audio">
-              <v-audio :vkey="item.id" :showTime=true :name="item.audio.name" :idleft="`_${$randomWord(true,8,8)}`" :idright="`_${$randomWord(true,8,8)}`" :myAudioUrl="item.audio[0].filePath"></v-audio>
+              <v-audio :vkey="item.id" :showTime=true :name="item.audio[0].fileName" :idleft="`_${$randomWord(true,8,8)}`" :idright="`_${$randomWord(true,8,8)}`" :myAudioUrl="item.audio[0].filePath"></v-audio>
             </div>
           </template>
           <video :poster="item.video.icon" v-else controls autoplay :src="item.video[0].filePath"></video>