update

backstage/src/pages/content/collection/data.js

@@ -41,7 +41,7 @@ let raw = {
     },
     {
       prop: "zone",
-      label: "单元",
+      label: "楼层",
     },
     {
       prop: "createTime",
@@ -68,7 +68,7 @@ let raw = {
     },
     {
       prop: "zone",
-      label: "单元",
+      label: "楼层",
     },
     {
       prop: "createTime",

pano/src/views/menu.vue

@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { getStar, dianzan } from "@/config/api";
+import { getStar, dianzan,getList } from "@/config/api";
 
 export default {
   data() {
@@ -77,6 +77,15 @@ export default {
     };
   },
   methods: {
+    async getData() {
+      let params = {
+        pageNum: 1,
+        pageSize: 1000,
+      };
+      getList("barrage", params, (res) => {
+        this.danmu = res.data.list.map(item=>item.content).reverse()
+      });
+    },
     getStar() {
       getStar((data) => {
         this.likeshuzi = data.data;
@@ -109,6 +118,7 @@ export default {
   },
   mounted() {
     this.getStar()
+    this.getData()
   },
 };
 </script>

web/public/static/js/manage.js

@@ -1,10 +1,11 @@
   
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-// var g_Prefix="http://192.168.0.109:8004/";
 
 var g_Prefix=window.location.origin+'/';
 window.isLocal = true
 
+// var g_Prefix="http://192.168.0.109:8004/";
+
 
 var g_index=null;
 var g_modeldata=null;

web/src/components/popupLayout/Loading.vue

@@ -13,7 +13,8 @@ export default {
     name: "ui-loading",
     data() {
         return {
-           showBg:false
+           showBg:false,
+           title:''
         };
     },
 };

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

@@ -1,48 +1,48 @@
 <template>
   <div class="lunbo " id="jssor_1">
     <ul ref="jssor" class="jssor-wrapper" data-u="slides" @mousedown="mousedown" @mousemove="mousemove">
-      <li
-        class="jssor-slide"
-        @click.stop="handleItem(item)"
-        :class="{ weiyi: i % 2 != 0, flipActive: active.id == item.id }"
-        v-for="(item, i) in piclist"
-        :key="i"
-      >
+      <li class="jssor-slide" @click.stop="handleItem(item)"
+        :class="{ weiyi: i % 2 != 0, flipActive: active.id == item.id }" v-for="(item, i) in piclist" :key="i">
         <div data-u="image">
 
-        <div class="imgdefault">
-          <!-- 'http://192.168.0.109:8004/'+ -->
+          <div class="imgdefault">
+            <!-- 'http://192.168.0.109:8004/'+ -->
 
-          <img :class="{ hideImg: noImg }" :src="item.thumb" alt="" />
-          <p>
-            <strong :title="item.name">{{ item.name }}</strong>
-            <span v-if="item.level!=6" :title="item.title || g_typeStr[item.level]">{{ item.title || g_typeStr[item.level] }}</span>
-            <span :title="item.years ? `（${item.years}）` : ''">{{ item.years ? `（${item.years}）` : "" }}</span>
-          </p>
-        </div>
-
-        <div class="imgactive">
-          <h2>
-            <strong :title="item.name">{{ item.name }}</strong>
-            <span :title="item.years ? `（${item.years}）` : ''">{{ item.years ? `（${item.years}）` : "" }}</span>
-          </h2>
-          <h2>
-            <strong v-if="item.level!=6" :title="item.title || g_typeStr[item.level]">{{ item.title || g_typeStr[item.level] }}</strong>
-          </h2>
-
-          <!-- 'http://192.168.0.245:8004/'+ -->
-          <div v-if="showVideo && item.video"  @click.stop="openVideo(item)" 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" />
+            <img :class="{ hideImg: noImg }" :src="item.thumb" alt="" />
+            <p>
+              <strong :title="item.name">{{ item.name }}</strong>
+              <span v-if="item.level != 6" :title="item.title || g_typeStr[item.level]">{{ item.title ||
+                  g_typeStr[item.level]
+              }}</span>
+              <span :title="item.years ? `（${item.years}）` : ''">{{ item.years ? `（${item.years}）` : "" }}</span>
+            </p>
           </div>
 
-          <p :class="{ novideo: !item.video, nourl: !item.video && !item.url }" v-html="item.description"></p>
+          <div class="imgactive">
+            <h2>
+              <strong :title="item.name">{{ item.name }}</strong>
+              <span :title="item.years ? `（${item.years}）` : ''">{{ item.years ? `（${item.years}）` : "" }}</span>
+            </h2>
+            <h2>
+              <strong v-if="item.level != 6" :title="item.title || g_typeStr[item.level]">{{ item.title ||
+                  g_typeStr[item.level]
+              }}</strong>
+            </h2>
+
+            <!-- 'http://192.168.0.245:8004/'+ -->
+            <div v-if="showVideo && item.video" @click.stop="openVideo(item)" 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>
 
-          <div class="enter" :title="item.urlName" v-if="item.url" @click.stop="open(item)">
-            <span>{{ item.urlName || "-" }}</span>
+            <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.stop="open(item)">
+              <span>{{ item.urlName || "-" }}</span>
+            </div>
           </div>
         </div>
-        </div>
       </li>
     </ul>
   </div>
@@ -50,18 +50,18 @@
 
 <script>
 
- var jssor_1_options = {
-    $AutoPlay: 0,
-    $Idle: 0,
-    $SlideDuration: 5000,
-    $SlideEasing: $Jease$.$Linear,
-    $PauseOnHover: 4,
-    $SlideSpacing:60,
-    $SlideWidth: 340,
-    $SlideHeight: 560,
-    $Loop: 0,
-    $Align: 0
-  };
+var jssor_1_options = {
+  $AutoPlay: 0,
+  $Idle: 0,
+  $SlideDuration: 5000,
+  $SlideEasing: $Jease$.$Linear,
+  $PauseOnHover: 4,
+  $SlideSpacing: 60,
+  $SlideWidth: 340,
+  $SlideHeight: 560,
+  $Loop: 0,
+  $Align: 0
+};
 
 export default {
   props: ["list"],
@@ -82,17 +82,17 @@ export default {
   },
 
   methods: {
-    mousedown(e){
+    mousedown(e) {
       if (this.isStopProp) {
         e.stopPropagation()
       }
     },
-    mousemove(e){
-       if (this.isStopProp) {
+    mousemove(e) {
+      if (this.isStopProp) {
         e.stopPropagation()
       }
     },
-    listenFn(){
+    listenFn() {
       window.jssor_1_slider.$AutoPlay(1)
       this.isStopProp = false
     },
@@ -132,7 +132,7 @@ export default {
         this.active = item;
         if (!this.isStopProp) {
           window.jssor_1_slider.$AutoPlay(0)
-        }        
+        }
         this.TT && clearTimeout(this.TT);
         this.TT = setTimeout(() => {
           this.noImg = true;
@@ -151,18 +151,19 @@ export default {
   mounted() {
     window.jssor_1_slider = new $JssorSlider$("jssor_1", jssor_1_options);
     window.jssor_1_slider.$AutoPlay(0)
-    this.$bus.$on('startLoop',this.listenFn)
+    this.$bus.$on('startLoop', this.listenFn)
   },
 
   destroyed() {
     this.$bus.$off("startLoop", this.listenFn);
   },
-  
+
 };
 </script>
 
 <style lang="less" scoped>
 @jianjinw: 10%;
+
 .lunbo {
   width: 100%;
   position: relative;
@@ -171,6 +172,7 @@ export default {
   bottom: 0;
   left: 0;
   padding: 0 10px;
+
   .jssor-wrapper {
     width: 100%;
     height: 100%;
@@ -178,15 +180,17 @@ export default {
     top: 0;
     position: absolute;
     padding: 0 60px;
+
     .jssor-slide {
       display: inline-block;
       margin: 0;
       position: relative;
-      top: 158px!important;
+      top: 158px !important;
       height: auto;
       // cursor: pointer;
       width: 340px;
       perspective: 1000px;
+
       .imgdefault,
       .imgactive {
         width: 100%;
@@ -199,8 +203,9 @@ export default {
         backface-visibility: hidden;
         transition: 0.6s;
         transform-style: preserve-3d;
+
         //transform: rotateX(0);
-        &::before{
+        &::before {
           filter: blur(2px);
           content: '';
           width: 100%;
@@ -208,22 +213,25 @@ export default {
           position: absolute;
           top: 0;
           left: 0;
-          background: rgba(178,69,81,.2);
+          background: rgba(178, 69, 81, .2);
           z-index: -1;
         }
-        > img {
+
+        >img {
           width: 100%;
           height: 414px;
           position: relative;
           object-fit: cover;
         }
-        > p {
+
+        >p {
           text-align: left;
           font-size: 22px;
           font-weight: bold;
           margin: 10px 0;
           white-space: nowrap;
-          > strong {
+
+          >strong {
             font-size: 22px;
             font-weight: bold;
             width: 90px;
@@ -233,7 +241,8 @@ export default {
             display: inline-block;
             vertical-align: bottom;
           }
-          > span {
+
+          >span {
             display: inline-block;
             font-size: 16px;
             width: 78px;
@@ -243,6 +252,7 @@ export default {
             display: inline-block;
             vertical-align: bottom;
             text-align: center;
+
             &:last-of-type {
               width: auto;
               max-width: 170px;
@@ -250,6 +260,7 @@ export default {
           }
         }
       }
+
       .imgactive {
         position: absolute;
         left: 0;
@@ -259,12 +270,14 @@ export default {
         transform: rotateY(-180deg);
         background: linear-gradient(180deg, rgba(178, 69, 81, 0.5) 0%, rgba(239, 167, 120, 0.5) 100%);
         padding: 20px 26px;
+
         .iivideo {
           width: 100%;
           height: 70%;
           position: relative;
           z-index: 99;
           overflow: hidden;
+
           .bofang {
             position: absolute;
             top: 50%;
@@ -299,12 +312,14 @@ export default {
             left: 0;
           }
         }
-        > h2 {
+
+        >h2 {
           font-size: 24px;
           font-weight: normal;
           margin-bottom: 6px;
           height: 7%;
-          > strong {
+
+          >strong {
             font-size: 24px;
             font-weight: bold;
             width: 120px;
@@ -314,11 +329,13 @@ export default {
             display: inline-block;
             vertical-align: bottom;
           }
+
           &:last-of-type {
-            > strong {
+            >strong {
               width: 300px;
             }
           }
+
           span {
             width: auto;
             max-width: 160px;
@@ -330,7 +347,7 @@ export default {
           }
         }
 
-        > p {
+        >p {
           text-indent: 28px;
           font-weight: normal;
           font-size: 14px;
@@ -373,7 +390,8 @@ export default {
           text-overflow: ellipsis;
           white-space: nowrap;
           vertical-align: bottom;
-          > span {
+
+          >span {
             font-size: 20px;
           }
         }
@@ -382,9 +400,11 @@ export default {
 
     .flipActive {
       width: 360px;
+
       .imgdefault {
         transform: rotateY(-180deg);
-        > img {
+
+        >img {
           width: 100%;
           position: relative;
         }
@@ -393,14 +413,30 @@ export default {
           display: none;
         }
       }
+
       .imgactive {
         transform: rotateY(0deg);
       }
     }
+
     .weiyi {
       transform: translateY(-55px);
     }
   }
 
 }
+
+@media screen and (max-width: 1700px) {
+  .lunbo {
+
+    .jssor-wrapper {
+
+      .jssor-slide {
+        top: 124px !important;
+
+      }
+    }
+  }
+
+}
 </style>

web/src/views/index/index.vue

@@ -121,7 +121,7 @@ export default {
       this.lockUpdate = true
       this.isshowall = true
       this.isshow = true
-      this.$bus.$emit("hovershowType", 'tips');
+      // this.$bus.$emit("hovershowType", 'tips');
       setTimeout(() => {
         this.isshow = false
       }, 4000);
@@ -144,7 +144,7 @@ export default {
                 this.canjump = false
                 this.lockUpdate = true
               // this.bfshipin()
-                this.$bus.$emit("hovershowType", 'tips');
+                // this.$bus.$emit("hovershowType", 'tips');
                   this.isshow = true
                   setTimeout(() => {
                     this.isshow = false