Explorar el Código

增加从场景切换出来刷新机制(清除饿了么查看图片冲突)

shaogen1995 hace 4 años
padre
commit
bf2aa5e971

+ 2 - 2
houtai/src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 import axios from 'axios'
 const service = axios.create({
 const service = axios.create({
   // baseURL: 'http://192.168.0.135:8012/', // 本地调试
   // baseURL: 'http://192.168.0.135:8012/', // 本地调试
-  // baseURL: 'http://192.168.0.245:8005/', // 线上调试
-  baseURL: '', // build
+  baseURL: 'http://192.168.0.245:8005/', // 线上调试
+  // baseURL: '', // build
   timeout: 5000
   timeout: 5000
 })
 })
 // 请求拦截器
 // 请求拦截器

+ 1 - 1
houtai/src/views/login.vue

@@ -18,7 +18,7 @@
       <div class="row">
       <div class="row">
         <el-input v-model="from.passWord" placeholder="密码" show-password></el-input>
         <el-input v-model="from.passWord" placeholder="密码" show-password></el-input>
       </div>
       </div>
-      <div class="btn" @click="login">登 </div>
+      <div class="btn" @click="login">登 </div>
     </div>
     </div>
   </div>
   </div>
 </div>
 </div>

+ 2 - 9
houtai/src/views/tab1/tab1Add.vue

@@ -108,7 +108,7 @@
           <div class="el-upload__tip" v-else>
           <div class="el-upload__tip" v-else>
             <p class="upHint">格式要求:</p>
             <p class="upHint">格式要求:</p>
             <p class="upHint">
             <p class="upHint">
-              1、支持视频格式文件(例如:AVI、mov、rmvb、rm、FLV、mp4、3GP)
+              1、支持mp4视频格式文件。
             </p>
             </p>
             <p class="upHint">2、最大支持2G的视频文件。</p>
             <p class="upHint">2、最大支持2G的视频文件。</p>
           </div>
           </div>
@@ -233,14 +233,7 @@ export default {
         })
         })
       } else if (this.conLeftId === 'video') {
       } else if (this.conLeftId === 'video') {
         const sizeOk = file.size / 1024 / 1024 < 2048
         const sizeOk = file.size / 1024 / 1024 < 2048
-        const typeOk =
-          file.type === 'video/mp4' ||
-          file.type === 'video/avi' ||
-          file.type === 'video/quicktime' ||
-          file.type === 'video/rm' ||
-          (file.type === '' &&
-            (file.name.includes('.flv') || file.name.includes('.rmvb'))) ||
-          file.type === 'video/3gpp'
+        const typeOk = file.type === 'video/mp4'
         return new Promise((resolve, reject) => {
         return new Promise((resolve, reject) => {
           if (file.name.length > 32) {
           if (file.name.length > 32) {
             this.$message.error('视频名字不能超过32个字')
             this.$message.error('视频名字不能超过32个字')

+ 2 - 9
houtai/src/views/tab4/tab4Add.vue

@@ -76,7 +76,7 @@
             <div class="el-upload__tip" slot="tip">
             <div class="el-upload__tip" slot="tip">
               <p class="upHint">格式要求:</p>
               <p class="upHint">格式要求:</p>
               <p class="upHint">
               <p class="upHint">
-                1、支持视频格式文件(例如:AVI、mov、rmvb、rm、FLV、mp4、3GP)
+                1、支持mp4视频格式文件。
               </p>
               </p>
               <p class="upHint">2、最大支持2G的视频文件。</p>
               <p class="upHint">2、最大支持2G的视频文件。</p>
             </div>
             </div>
@@ -176,14 +176,7 @@ export default {
     beforeFujian (file) {
     beforeFujian (file) {
       console.log('附件上传前', file)
       console.log('附件上传前', file)
       const sizeOk = file.size / 1024 / 1024 < 2048
       const sizeOk = file.size / 1024 / 1024 < 2048
-      const typeOk =
-        file.type === 'video/mp4' ||
-        file.type === 'video/avi' ||
-        file.type === 'video/quicktime' ||
-        file.type === 'video/rm' ||
-        (file.type === '' &&
-          (file.name.includes('.flv') || file.name.includes('.rmvb'))) ||
-        file.type === 'video/3gpp'
+      const typeOk = file.type === 'video/mp4'
       return new Promise((resolve, reject) => {
       return new Promise((resolve, reject) => {
         if (file.name.length > 32) {
         if (file.name.length > 32) {
           this.$message.error('视频名字不能超过32个字')
           this.$message.error('视频名字不能超过32个字')

+ 11 - 6
web/src/pages/Home.vue

@@ -101,12 +101,12 @@
       </div>
       </div>
     </div>
     </div>
     <!-- 小地图 -->
     <!-- 小地图 -->
-    <exhibition class="exhibition"/>
+    <exhibition class="exhibition" />
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
-import exhibition from '@/components/exhibition';
+import exhibition from "@/components/exhibition";
 import popup from "@/views/popup";
 import popup from "@/views/popup";
 import guiLoading from "@/views/gui/loading";
 import guiLoading from "@/views/gui/loading";
 import hotspotList from "@/views/gui/hotspotlist";
 import hotspotList from "@/views/gui/hotspotlist";
@@ -133,7 +133,7 @@ export default {
     vError,
     vError,
     vrCon,
     vrCon,
     vOther,
     vOther,
-    exhibition
+    exhibition,
   },
   },
 
 
   data() {
   data() {
@@ -153,9 +153,14 @@ export default {
 
 
   methods: {
   methods: {
     //点击跳转
     //点击跳转
-    jump(url){
-      if (url === "tab1") return
+    jump(url) {
+      if (url === "tab1") return;
       this.$router.push(url).catch(() => {});
       this.$router.push(url).catch(() => {});
+      this.$nextTick(() => {
+        setTimeout(() => {
+          location.reload(true);
+        }, 100);
+      });
     },
     },
     hideWelcome() {
     hideWelcome() {
       this.showWelcome = false;
       this.showWelcome = false;
@@ -204,7 +209,7 @@ export default {
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
-.exhibition{
+.exhibition {
   position: absolute;
   position: absolute;
   top: 50px;
   top: 50px;
   right: 0;
   right: 0;

+ 2 - 0
web/src/views/tab3/index.vue

@@ -227,12 +227,14 @@ export default {
             // 左按钮
             // 左按钮
             const tempLeft = document.querySelector(".el-image-viewer__prev");
             const tempLeft = document.querySelector(".el-image-viewer__prev");
             tempLeft.addEventListener("click", () => {
             tempLeft.addEventListener("click", () => {
+              console.log(99811111);
               this.imgBigNum--;
               this.imgBigNum--;
               if (this.imgBigNum === 0) this.imgBigNum = this.srcList.length;
               if (this.imgBigNum === 0) this.imgBigNum = this.srcList.length;
             });
             });
             // 右按钮
             // 右按钮
             const tempRight = document.querySelector(".el-image-viewer__next");
             const tempRight = document.querySelector(".el-image-viewer__next");
             tempRight.addEventListener("click", () => {
             tempRight.addEventListener("click", () => {
+              console.log(99822222222);
               this.imgBigNum++;
               this.imgBigNum++;
               if (this.imgBigNum === this.srcList.length + 1)
               if (this.imgBigNum === this.srcList.length + 1)
                 this.imgBigNum = 1;
                 this.imgBigNum = 1;