06042047

web/public/static/js/main_2020_show.js

@@ -15871,7 +15871,7 @@ window.Modernizr = function(n, e, t) {
 		hot.prototype.examine = function(e, options) { 
             options = options || {}
             
-            if(this.sid == 'OJCzKg113653'){
+            if(this.sid == 'OJCzKg113653'||this.sid == 'pMhfdvO922862'){
                 return window.player.emit('loadLongVideo')
             }
             

web/public/static/js/myShow.js

@@ -1,7 +1,7 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="http://8.135.106.227:8009/";
+// var g_Prefix="http://8.135.106.227:8009/";
 // https://super.4dage.com/
-// var g_Prefix=window.location.origin+'/';
+var g_Prefix=window.location.origin+'/';
 
 var s = window.location.href.split('/');
 s.pop();

web/src/components/mapsvg.vue

@@ -274,13 +274,15 @@
       <g id="_6"  @click="handleClick(6)" data-name="6">
         <path
           id="LJ5"
-          d="M5678.455,4972.729v-27.724h6.233v12.479h22.5v-30.4h-43.579v45.642h14.844Z"
+          d="M5678.455,4972.729v-27.724h6.233v12.479h22.5v-30.4h-43.579v45.642h14.844Z
+          M5762.25,4904.859v15.168h-55.088v37.457h14.782V4944.24h6.231v16.818h17.51v-24.672h24.032a14.454,14.454,0,0,1,14.412,14.411v.09c0,.107,0,.149-.005.3v.028a1.329,1.329,0,0,0,1.328,1.326,1.292,1.292,0,0,0,.55-.122,45.571,45.571,0,0,0,14.43-9.44,35.88,35.88,0,0,0,7.748-11.113,33.869,33.869,0,0,0,2.592-9.035,22.376,22.376,0,0,0,.244-3.729v-14.243Z
+          "
           transform="translate(31.698 -3371.177)"
           fill="#fcd67b"
           opacity="0.8"
           style="isolation: isolate"
         />
-        <g id="_2-3" data-name="2" transform="translate(5718.327 1562.561)">
+        <g id="_2-3" data-name="2" transform="translate(5748.327 1550.561)">
           <ellipse
             id="TR-6"
             data-name="TR"
@@ -308,7 +310,7 @@
             id="_6-2"
             data-name="6"
             class="hovertext"
-            transform="translate(-15.555 5.639)"
+            transform="translate(-5.255 5.839)"
             fill="#fcd67b"
             font-size="7"
             font-family="SourceHanSansCN-Medium, Source Han Sans CN"
@@ -320,7 +322,7 @@
           </text>
         </g>
       </g>
-      <g id="_7-2"  @click="handleClick(7)" data-name="7">
+      <!-- <g id="_7-2"  @click="handleClick(7)" data-name="7">
         <path
           id="LJ1"
           d="M5762.25,4904.859v14.468h-51.638v37.457h14.782V4944.24h6.231v16.818h17.51v-24.672h24.032a14.454,14.454,0,0,1,14.412,14.411v.09c0,.107,0,.149-.005.3v.028a1.329,1.329,0,0,0,1.328,1.326,1.292,1.292,0,0,0,.55-.122,45.571,45.571,0,0,0,14.43-9.44,35.88,35.88,0,0,0,7.748-11.113,33.869,33.869,0,0,0,2.592-9.035,22.376,22.376,0,0,0,.244-3.729v-14.243Z"
@@ -367,7 +369,7 @@
             <tspan x="0" y="0">信息系统工程学院</tspan>
           </text>
         </g>
-      </g>
+      </g> -->
       <g id="_1-2"  @click="handleClick(1)" data-name="1" opacity="0.8">
         <path
           id="LJ8"

web/src/components/welcome/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="welcome">
     <template v-show="!isVideo">
-      <img class="bg" :style="{'z-index': isVideo?-1:0}" :src="require('@/assets/images/bg.jpg')" alt="">
+      <img class="bg" :style="{'z-index': isVideo?-1:0,opacity:isVideo?0:1}" :src="require('@/assets/images/bg.jpg')" alt="">
       <div  v-if="!isVideo" class="we_title">欢迎访问信息工程大学数字史馆</div>
       <span v-if="!isVideo" class="btn" @click="showVideo">开始预览</span>
     </template>
-    <video @click="autoplay" ref="welcome" preload="auto" :poster="require('@/assets/images/videopost.jpg')" :src="require('@/assets/video/welcome.mp4')"></video>
+    <video @click="autoplay" ref="welcome" :style="{opacity:isVideo?1:0}" preload="auto" :poster="require('@/assets/images/videopost.jpg')" :src="require('@/assets/video/welcome.mp4')"></video>
     <span v-if="isVideo" class="btn jump" @click="$bus.$emit('toggleWelcome', false)">跳过</span>
   </div>
 </template>
@@ -52,6 +52,7 @@ export default {
   height: 100%;
   background-color: #000;
   z-index: 999;
+  transition: all ease 0.3s;
   .bg{
     width: 100%;
     height: 100%;

web/src/utils/file.js

@@ -7,7 +7,7 @@ export const mediaTypes = {
 
 // 媒体扩展类型
 export const mediaMimes = {
-    "application":['x-tar','x-compressed','x-zip-compressed','zip','tar'], //压缩包
+    "application":['x-tar','x-rar-compressed','x-compressed','octet-stream', 'x-zip-compressed','zip','tar','rar'], //压缩包
     "image": ["jpg", "png", "jpeg", "bmp", "gif"],
     "audio": ["mp3", "aac", "ogg", "wav" /* , "m4a" */],
     "video": ["mp4", "mov", "quicktime" /* ,"webm", "rmvb", "wmv" */] //ios:mov

web/src/views/uploadflie/index.vue

@@ -100,15 +100,15 @@ export default {
   },
   methods:{
     async save(){
-      if (!this.desc) {
+      if (!String(this.desc).trim()) {
         return this.$showAlert({
             tips:'请填写史料说明'
         })
       }
       let params = {
           "code": this.fileList.length>0?this.fileCode:'',
-          "description": this.desc,
-          "phone": this.contact
+          "description": String(this.desc).trim(),
+          "phone": this.contact.trim()
       }
 
       let result = await this.$http({
@@ -138,7 +138,6 @@ export default {
       }
       this.fileList.splice(i,1);
 
-// /api/web/material/delete
     },
     onFileChange(data) {
       if (this.fileList.length>4) {
@@ -147,7 +146,6 @@ export default {
         })
       }
       
-      console.log(data);
       let tmp = {
         id:'_' + this.$randomWord(false,8,8),
         file:data.files[0],
@@ -155,12 +153,20 @@ export default {
         name:data.files[0].name,
         img:window.URL.createObjectURL(data.files[0])
       }
+
+      let flag = this.fileList.findIndex(item=>{
+        return data.files[0].name == item.name
+      })
       
+      if (flag>-1) {
+        return this.$showAlert({
+            tips:'无法上传同名文件，请重新选择'
+        })
+      }
 
       http.uploadFile(`${this.$serverName}/api/web/material/upload/${this.fileCode}`, tmp, (res)=>{
         tmp.path = res.data.path
         this.fileList.push(tmp)
-        console.log(this.fileList,res);
       }, err=>{
         console.log(err);
       },progress=>{