1111

backstage/src/pages/layout/aside.vue

@@ -20,7 +20,8 @@ export default {
       routes,
       main,
       menu:[],
-      tmpRoute:[]
+      tmpRoute:[],
+      replaceLock:false
     }
   },
   computed: {
@@ -47,15 +48,23 @@ export default {
           let temp = this.tmpRoute.filter(item=>{
             return item.key == newVal
           })
-          this.$store.commit("SetActiveMenu", temp[0]);
+
+          this.$store.commit("SetActiveMenu", temp[0] || this.tmpRoute[0]);
         }
       }
+    },
+    tmpRoute(newVal,oldVal){
+      if (oldVal.length<=0&&!this.replaceLock&&newVal[0].key != "scene") {
+        // this.$router.
+          // this.$store.commit("SetActiveMenu", newVal[0]);
+          this.goto(newVal[0],true)
+      }
     }
   },
   methods: {
-    goto (item) {
+    goto (item,replace=null) {
       let path = {path:`/${item.key}${item.param?`/${item.param.map(tt=>tt.default).join('/')}`:''}`}
-      this.$router.push(path)
+      replace ? this.$router.replace(path) :  this.$router.push(path)
     },
     async getResource(){
       let result = await this.$http({
@@ -68,38 +77,44 @@ export default {
         result.data.forEach(sub=>{
 
           if (item.name == sub.name) {
-            
+
             if (sub.name =='操作日志') {
               sub.authority = sub.children[0].authority
             }
+            
+            let ttmp = ''
+
+            for (let i = 0; i < sub.children.length; i++) {
+              let item = sub.children[i];
+              if (item.children) {
+                ttmp = item.children.find(tttt=>tttt.authority)
+                break
+              } else{
+                ttmp = item.authority
+                break
+              }
+            }
 
-            if (sub.authority) {
+            if (ttmp) {
+              sub.authority = true
               tmp = sub
             }
+
+            // if (sub.authority) {
+            // }
           }
         })
 
-        // if (item.type == "system") {
-        //   // if (window.localStorage.getItem("role") == 'sys_admin') {
-        //   //     tmp = item
-        //   // }
-        //   // else{
-        //   //   tmp = ''
-        //   // }
-        //   tmp = item
-
-        // }
         return tmp ? Object.assign(item,tmp) : tmp
       });
 
-      // console.log(this.tmpRoute);
 
       let temp = this.tmpRoute.filter(item=>{
           return item.key == this.activeIdx
         })
-      this.$store.commit("SetActiveMenu", temp[0]);
 
-      // console.log(temp[0]);
+      this.$store.commit("SetActiveMenu", temp[0] || this.tmpRoute[0]);
+
 
       this.menu = main.filter(item=>{
         let route = []
@@ -112,7 +127,6 @@ export default {
         return route.length>0 && item
       })
 
-      console.log(this.menu);
     }
   },
   created () {

backstage/src/pages/system/role/componets/manage.vue

@@ -27,6 +27,7 @@ export default {
 
       item.children &&
         item.children.forEach((sub) => {
+          console.log(sub);
           if (sub.children) {
             sub.children.forEach((son) => {
              
@@ -47,7 +48,7 @@ export default {
 
     this.data.resources = tmp;
 
-    console.log(this.data.resources);
+    console.log(this.data.resources, 111111);
 
     return {
       form: this.data,
@@ -64,6 +65,7 @@ export default {
     },
     handleNodeClick() {},
     handleCheck(data, data1) {
+      console.log(data1);
       this.form.resources = data1.checkedKeys;
     },
   },

web/public/static/js/main_2020_show.js

@@ -7975,7 +7975,8 @@ window.Modernizr = function(n, e, t) {
         }
         function s(e, t) {
             setTimeout(function() {
-                if (h.isHelpEnabled()) {
+                // h.isHelpEnabled()
+                if (false) {
                     if (t(),
                     u.init(),
                     C.addClass("fadeIn landing " + u.deviceType),

web/src/components/exhibition/index.vue

@@ -99,11 +99,15 @@ export default {
     handleItem(item) {
       this.currentName = item.name;
       let { x, y, z, w } = item.quaternion;
-      item.pano &&
-        player.blackToPano({
-          pano: player.model.panos.index[item.pano],
-          quaternion: new THREE.Quaternion(x, y, z, w),
-        });
+      if(item.pano){
+        window.player.director.stopTour()
+        setTimeout(() => {
+            player.blackToPano({
+            pano: player.model.panos.index[item.pano],
+            quaternion: new THREE.Quaternion(x, y, z, w),
+          });
+        },500);
+      }
     },
   },
   watch: {

web/src/newcomponents/hovercom/commentator/index.vue

@@ -48,7 +48,7 @@ let list = [
 export default {
   data() {
     return {
-      active: list[0],
+      active: list[2],
       commentalist:list
     };
   },
@@ -63,7 +63,7 @@ export default {
   mounted() {
     let id = localStorage.getItem('xunirole')
     let active = list.find(item=>item.id==id)
-    this.active = active || list[0]
+    this.active = active || list[2]
   },
 };
 </script>

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

@@ -30,14 +30,16 @@
             </h2>
 
             <!-- 'http://192.168.0.245:8004/'+ -->
-            <div v-if="item.video && (active.id == item.id)" class="iivideo" :class="{iimask:showBofang}">
+            <div
+             v-if="item.video && (active.id == item.id)" class="iivideo"
+             :class="{iimask:showBofang, iinourl:item.url}">
               <img class="bofang" :src="require(`@/assets/images/expert/bofang.png`)" v-if="showBofang"/>
               <img class="poster" :src="item.thumb" v-if="showBofang"/>
             </div>
 
             <p :class="{ novideo: !item.video, nourl:!item.video&&!item.url }" v-html="item.description"></p>
 
-            <div class="enter" :title="item.urlName" v-if="item.url" @click="open(item)">
+            <div class="enter" :title="item.urlName" v-if="item.url" @click.stop="open(item)">
               <span>{{ item.urlName || "-" }}</span>
             </div>
           </div>
@@ -146,7 +148,7 @@ export default {
             >strong{
               font-size: 22px;
               font-weight: bold;
-              width: 110px;
+              width: 100px;
               overflow: hidden;
               text-overflow:ellipsis;
               white-space: nowrap;
@@ -156,12 +158,16 @@ export default {
             > span {
               display: inline-block;
               font-size: 16px;
-              width: 100px;
+              width: 60px;
               overflow: hidden;
               text-overflow:ellipsis;
               white-space: nowrap;
               display: inline-block;
               vertical-align: bottom;
+              &:last-of-type{
+                width: auto;
+                max-width: 160px;
+              }
             }
           }
         }
@@ -203,6 +209,10 @@ export default {
 
           }
 
+          .iinourl{
+            height: 60%;
+          }
+
           .iimask{
             &::before{
               content: '';
@@ -224,7 +234,7 @@ export default {
             >strong{
               font-size: 24px;
               font-weight: bold;
-              width: 160px;
+              width: 120px;
               overflow: hidden;
               text-overflow:ellipsis;
               white-space: nowrap;
@@ -237,7 +247,8 @@ export default {
               }
             }
             span{
-              width: 100px;
+              width: auto;
+              max-width: 160px;
               overflow: hidden;
               text-overflow:ellipsis;
               white-space: nowrap;