update1519

backstage/src/pages/content/collection/componets/model.vue

@@ -20,7 +20,7 @@
     <el-form-item label="模型文件：" prop="filePath">
       <uploadFile :url="fileUrl" @update="data=>{form.fileName = data.fileName,form.filePath = data.filePath}" :filePath="form.filePath" :desc="'仅支持.4dage格式的模型文件,大小不得超过500m'" >
         <div slot="filePath" v-if="form.filePath">
-          <iframe :src="`/model-page/model.html?m=${form.fileName}`" frameborder="0"></iframe>
+          <iframe :src="`/model-page/Model.html?m=${form.fileName}`" frameborder="0"></iframe>
         </div>
       </uploadFile>
     </el-form-item>
@@ -51,5 +51,7 @@ iframe{
   height: 400px;
   pointer-events: auto!important;
   opacity: 1!important;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
 }
 </style>

edit-backstage/edit.html

@@ -1445,20 +1445,20 @@
                                     <label for="g_specialScene"></label>
                                     <label for="g_specialScene">特殊大场景 <i class="colorRed">-请慎重选择</i> </label>
                                 </li> -->
-                                <li class="editCheckbox">
+                                <!-- <li class="editCheckbox">
                                     <input name="twoData" type="checkbox" value="twoData" id="twoData">
                                     <label for="twoData"></label>
                                     <label for="twoData">启动二代数据 <i class="colorRed">-请慎重选择</i> </label>
-                                </li>
+                                </li> -->
                             </ul>
-                            <ul>
+                            <!-- <ul>
                                 <li>
                                     <label class="remark">注：
-                                        <!-- <br>特殊大场景：一般不勾选，是对某些需要特殊处理的场景设置的。如果勾选了还需要将处理的内容写进SpecialScene.js，否则没有作用。 -->
+                                        <br>特殊大场景：一般不勾选，是对某些需要特殊处理的场景设置的。如果勾选了还需要将处理的内容写进SpecialScene.js，否则没有作用。
                                         <br><br>启动二代数据：和tile贴图有关。
                                     </label>
                                 </li>
-                            </ul>
+                            </ul> -->
                         </li>
                     </ul>
                 </div>

edit-backstage/js/edit.js

@@ -277,7 +277,7 @@ EditTools.prototype.initSaveAll = function () {
         camera_start: $("#camera-start")[0].data,
         loadlogo: $("#loadlogo").is(":checked"),
         special: $("#g_specialScene").is(":checked"),
-        vision_version: $("#twoData").is(":checked") ? "1.1.562.17209" : false,
+        vision_version: "1.1.562.17209" ,
 
         /************************************** 方奕卓 场景可配置项 ******************************************/
         hotImageScale: $("#hotImgScale").is(":checked"),
@@ -470,9 +470,9 @@ SceneInformation.prototype.init = function (data, data2) {
   }
 
   //启动二代的数据
-  if (data.vision_version === "1.1.562.17209" || data.vision_version) {
-    $twoData[0].checked = true;
-  }
+  // if (data.vision_version === "1.1.562.17209" || data.vision_version) {
+  //   $twoData[0].checked = true;
+  // }
 };
 
 /**

web/public/static/css/main.css

@@ -3722,10 +3722,10 @@ a.hasHover:hover, a:active {
     display: none;
     width: 86px;
     position: absolute;
-    bottom: 50px;
+    bottom: -6px;
     transition: all .3s;
     z-index: 100;
-    left: -19px;
+    left: -90px;
 }
 
 #drawer, #drawer-container.drawerOpen, #drawer-container.duringTour {
@@ -3750,8 +3750,8 @@ a.hasHover:hover, a:active {
 }
 
 .gui-floor.open .container .floorChoice:hover {
-    border: 1px solid #19bbed;
-    /* color:#19bbed */
+    border: 1px solid #FFE0A6;
+    /* color:#FFE0A6 */
 }
 
 .gui-floor.open .container .floorChoice.active {

web/src/components/exhibition/data.js

@@ -118,12 +118,12 @@ let data = {
       {
         id: 5,
         name: "第五专题 保健求精",
-        pano: "796913a8e6a341d6bf0960b0ac9eea4a",
+        pano: "e0cd9e7e0c56442d8eba1b5675af2edd",
         quaternion: {
-          w: 0.9335262561486131,
-          x: 0.01776417317937213,
-          y: -0.35800385663414275,
-          z: 0.006812494377793779,
+          w: 0.7796894509208903,
+          x: 0.05547368430247829,
+          y: -0.6221316104038129,
+          z: 0.04426369360915031
         },
       },
 
@@ -433,7 +433,6 @@ let region = {
   ],
 
   '第五专题 保健求精': [
-    '796913a8e6a341d6bf0960b0ac9eea4a',
     '4b6e9c3ff09945bbaa32754937fe1d3b',
     'c9a043c5f3ea4c1a90dfdda74c5c1691',
     '7f1fe65d3d584bbd97428103a641b2aa',
@@ -454,6 +453,7 @@ let region = {
   ],
 
   '第六专题 医疗优质': [
+    '796913a8e6a341d6bf0960b0ac9eea4a',
     'd58abfae28504f1e91179d20c356f5fd',
     'a9c5ef5b210148368af280c8037d4c5f',
     'a9c1af7fa1044523ae487296290e5c2b',

web/src/mixins/index.js

@@ -157,6 +157,11 @@ Vue.mixin({
     },
     formatTime,
     changetohttp(url){
+
+      if (url[0] == '/') {
+        return url
+      }
+
       if (url.indexOf('https')<0||url.indexOf('http')<0) {
         url = 'http://' + url
       }

web/src/newcomponents/xunirenwu/normal.vue

@@ -7,7 +7,7 @@
         backgroundImage: `url(${require(`@/assets/images/project/commentator/xuliezhen/${active}/${currentItem.img}`)})`,
       }"
     ></div> -->
-    <div @click="action" class="tttttt canclk"  title="点击获取帮助"></div>
+    <div v-if="isMainScene" @click="action" class="tttttt canclk"  title="点击获取帮助"></div>
   </div>
 </template>
 
@@ -26,6 +26,7 @@ export default {
   data(){
     return {
       aa:3,
+      isMainScene: window.number == '1149_2',
       isSmall:false
     }
   },
@@ -78,7 +79,7 @@ export default {
         });
         this.isSmall = this.active != 'male'
         if (this.aa == 3) {
-          this.$emit("welcome",true);
+         this.isMainScene && this.$emit("welcome",true);
         }
       };
 

web/src/views/expert/carousel/bigpic.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="lunbo" ref="bgsw" v-swiper:mySwiper="swiperOptions">
-    <ul class="swiper-wrapper">
+    <ul class="swiper-wrapper" :class="{touming: isloaing}">
       <li
         class="swiper-slide"
         @click.stop="handleItem(item)"
@@ -53,11 +53,24 @@ import { directive } from "vue-awesome-swiper";
 // import style (<= Swiper 5.x)
 import "swiper/css/swiper.css";
 
+
+let SIZE = 6
+
 export default {
   props: ["list"],
   data() {
+
+    let pagesPrev = this.list.slice(0,Math.round(this.list.length/2))
+    let pagesNext = this.list.slice(Math.round(this.list.length/2) - SIZE ,this.list.length)
+
+
+    let isshortData = this.list.length < 100
+    if (isshortData) {
+      pagesPrev = this.list
+    }
+
     return {
-      piclist: [...this.list],
+      piclist: [...pagesPrev],
       active: "",
       showBofang: "",
       hadvideo: false,
@@ -66,6 +79,11 @@ export default {
       noImg: false,
       TO: null,
       TT: null,
+      pagesNext:[...pagesNext],
+      pagesPrev:[...pagesPrev],
+      isshortData,
+      currrnt:'prev',
+      isloaing:false
     };
   },
   directives: {
@@ -134,7 +152,56 @@ export default {
       return {
         slidesPerView: "auto",
         observer:true,
-        freeMode: true
+        observeParents: true,
+        freeMode: true,
+        on:{
+          reachEnd: ()=>{
+            if (this.isshortData) {
+              return
+            }
+            if (this.currrnt == 'prev') {
+              this.$showLoading();
+              this.isloaing = true
+              setTimeout(() => {
+                this.piclist = this.pagesNext
+                this.currrnt = 'next'
+                this.$refs.bgsw.swiper.slideTo(2, 0, false);
+              }, 500);
+              
+              setTimeout(() => {
+                
+                // this.$refs.bgsw.swiper.updateProgress()
+                // mySwiper.updateSlides();
+                this.$hideLoading();
+                this.isloaing = false
+              }, 2000);
+            }
+         
+          },
+          reachBeginning: ()=>{
+            if (this.isshortData) {
+              return
+            }
+            if (this.currrnt == 'next') {
+              this.$showLoading();
+                this.isloaing = true
+              this.currrnt = 'prev'
+
+              setTimeout(() => {
+                this.piclist = this.pagesPrev
+                this.$refs.bgsw.swiper.slideTo(this.pagesPrev.length - SIZE, 0, false);
+              }, 500);
+              
+              setTimeout(() => {
+                this.$hideLoading();
+                this.isloaing = false
+
+              }, 2000);
+              
+              // this.$refs.bgsw.swiper.slideTo(0,1000,false)
+            }
+          },
+        },
       };
     },
   },
@@ -363,6 +430,10 @@ export default {
       transform: translateY(-55px);
     }
   }
+
+  .touming{
+    // opacity: 0;
+  }
 }
 </style>
 

web/src/views/expert/index.vue

@@ -86,15 +86,15 @@ let expertlist = [
     id: "zongcheng",
     sub: [
       {
-        title: "百岁专家",
-        id: "loyal_1",
-        parentid: "zongcheng",
-      },
-      {
         title: "英模代表专家",
         id: "loyal_2",
         parentid: "zongcheng",
       },
+      {
+        title: "百岁专家",
+        id: "loyal_1",
+        parentid: "zongcheng",
+      }
     ],
   },
   {
@@ -174,7 +174,7 @@ export default {
         {
           pageNum: this.pageNum,
           pageSize: 1000,
-          type: this.key? null : (this.nowActive.id || "loyal_1"),
+          type: this.key? null : (this.nowActive.id || "loyal_2"),
           searchKey: this.key
         },
         (data) => {
@@ -363,6 +363,7 @@ export default {
     position: absolute;
     right: 30px;
     top: 30px;
+    z-index: 99999;
   }
 }
 

web/src/views/scene/gui/menu.vue

@@ -223,9 +223,9 @@
     <div class="pinBottom right hideTarget">
       <div class="rightViewContainer clearfix">
 
-        <xunirenwu :active="xunirenwu"/>
+        <xunirenwu :active="xunirenwu" v-if="isMainScene"/>
 
-        <div class="commentator">
+        <div v-if="isMainScene" class="commentator">
           <img  title="虚拟人物切换" class="tttttt icon" @click="clickItem(curecom)" :src="require('@/assets/images/icon/bigscene/change.png')" />
         </div>
         <div class="gui-floor tttttt" title="楼层切换">
@@ -294,8 +294,10 @@ import { getList  } from "@/config/api";
 export default {
   components: {Danmaku,xunirenwu},
   data() {
+    let isMainScene = window.number
     return {
       isShowList:false,
+      isMainScene:isMainScene,
       isGuide: true,
       isdianzan:false,
       music:false,
@@ -306,7 +308,23 @@ export default {
         "用爱心浇灌生命之树常青，用奉献书写神圣历史使命",
         "忠诚信仰，血脉传承，追求卓越攀高峰",
       ],
-      subList:[{
+      
+      subActive:'',
+      xunirenwu:'male',
+      quotes:[
+        "我是光荣的白衣天使，在春风里绽放笑容",
+        "救死扶伤的行列里，我们是排头兵",
+        "用爱心浇灌生命之树常青，用奉献书写神圣历史使命",
+        "忠诚信仰，血脉传承，追求卓越攀高峰",
+        "以医疗工作为中心，一切为了病人",
+        "忠诚保健、甘于奉献、精益求精、勇攀高峰",
+        "服务满腔热忱 技术精益求精"
+      ],
+    };
+  },
+  computed: {
+    subList(){
+      return  this.isMainScene ? [{
           name: "互动留言",
           link: "/message",
           id: 2,
@@ -329,22 +347,23 @@ export default {
           link: "/message",
           id: 4,
           img: "Q&A",
-        }],
-      subActive:'',
-      xunirenwu:'male',
-      quotes:[
-        "我是光荣的白衣天使，在春风里绽放笑容",
-        "救死扶伤的行列里，我们是排头兵",
-        "用爱心浇灌生命之树常青，用奉献书写神圣历史使命",
-        "忠诚信仰，血脉传承，追求卓越攀高峰",
-        "以医疗工作为中心，一切为了病人",
-        "忠诚保健、甘于奉献、精益求精、勇攀高峰",
-        "服务满腔热忱 技术精益求精"
-      ],
-    };
+        }] : [{
+          name: "互动留言",
+          link: "/message",
+          id: 2,
+          img: "chat",
+        },
+        {
+          name: "捐赠",
+          link: "/message",
+          id: 3,
+          img: "donate",
+        }]
+    }
   },
-  computed: {},
   mounted(){
+      this.isMainScene = window.number == '1149_2'
+
       this.$bus.$on('resetbtnactive',()=>{
         this.subActive = ''
       })
@@ -359,6 +378,7 @@ export default {
       $('.tttttt').tooltipster({
           delay: 300,
       });
+    
   },
   methods: {
     handleguide(e, outclk){

web/src/views/scene/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="scene-body">
-    <iframe  :class="{showifr:canshow}" ref="ifr" :src="`scene.html?m=${sceneCode}&qust=1&visit=${visit}`" allowfullscreen="true" frameborder="0"></iframe>
+    <iframe :class="{showifr:canshow}" ref="ifr" :src="`scene.html?m=${sceneCode}&qust=1&visit=${visit}`" allowfullscreen="true" frameborder="0"></iframe>
    
-    <template v-if="!isShowHP">
+    <template v-if="!isShowHP && sceneCode == '1149_2'" >
        <returnhome/>
     </template>
 
-    <video class="flyin animate__animated" :class="{ animate__fadeOut: fadevideo,delaycls:delaytime}" ref="flyin" muted :src="require('@/assets/video/feilou.mp4')"></video>
+    <video v-if="sceneCode == '1149_2'" class="flyin animate__animated" :class="{ animate__fadeOut: fadevideo,delaycls:delaytime}" ref="flyin" muted :src="require('@/assets/video/feilou.mp4')"></video>
 
   </div>
 </template>
@@ -37,6 +37,10 @@ export default {
     }
   },
   mounted(){
+    if(this.sceneCode != '1149_2'){
+      this.canshow = true
+    }
+
     window.addEventListener("message", (res) => {
         if (Object.prototype.toString.call(res.data) == "[object Object]") {
           let data = res.data.data;
@@ -53,14 +57,19 @@ export default {
           }
 
           if (res.data.source === "loadfinish") {
-            this.$refs.flyin.play()
-            this.$refs.flyin.addEventListener('ended',()=>{
-              this.canshow = true
-              this.fadevideo = true
-              setTimeout(() => {
-                this.delaytime = true
-              }, 1000);
-            })
+            if(this.sceneCode == '1149_2'){
+               this.$refs.flyin.play()
+              this.$refs.flyin.addEventListener('ended',()=>{
+                this.canshow = true
+                this.fadevideo = true
+                setTimeout(() => {
+                  this.delaytime = true
+                }, 1000);
+              })
+            } else{
+                this.canshow = true
+            }
+           
           }
         }
       });

web/src/views/scene/scene.vue

@@ -56,7 +56,7 @@
         <v-other/>
         
     </div>
-    <exhibition class="exhibition" :isShow="isShowEXH" @isShow="handleShow" :style="{zIndex:showType?0:99}"/>
+    <exhibition v-if="isMainScene" class="exhibition" :isShow="isShowEXH" @isShow="handleShow" :style="{zIndex:showType?0:99}"/>
     <hovercom @close="handlepopClose" :showType="showType"/>
     <huizhang :visit="visit" @close="()=>{showhuizhang = false}" :showhuizhang="showhuizhang"/>
 
@@ -123,6 +123,10 @@ export default {
         this.loading=false
         this.getHotSpotList();
 
+        
+
+        this.isMainScene = window.number == '1149_2'
+        
 
          window.parent.postMessage(
             {
@@ -143,6 +147,7 @@ export default {
         });
 
          window.player.director.on("tour.end", () => {
+           console.log('tour.end')
            this.$bus.$emit("resetxlzmode")
         });
 
@@ -258,7 +263,8 @@ export default {
         timer:null,
         cp:'',
         visit:0,
-        isShowEXH:false
+        isShowEXH:false,
+        isMainScene: false
       }
   }
 }