jinx hace 1 año
padre
commit
bb887fdd79
Se han modificado 5 ficheros con 1679 adiciones y 1874 borrados
  1. 4 1
      hot/vue.config.js
  2. 1647 1853
      scene/public/static/js/Hot.js
  3. 1 0
      scene/src/main.js
  4. 12 2
      scene/src/views/gui/menu.vue
  5. 15 18
      scene/vue.config.js

+ 4 - 1
hot/vue.config.js

@@ -1,3 +1,6 @@
 module.exports = {
 module.exports = {
-  publicPath: "./"
+  publicPath: "./",
+  devServer: {
+    port: 8089,
+  },
 };
 };

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1647 - 1853
scene/public/static/js/Hot.js


+ 1 - 0
scene/src/main.js

@@ -21,6 +21,7 @@ Vue.use(Viewer, {
   },
   },
 });
 });
 
 
+window.project_env = process.env.NODE_ENV
 Vue.config.productionTip = false;
 Vue.config.productionTip = false;
 Vue.use(ElementUI);
 Vue.use(ElementUI);
 
 

+ 12 - 2
scene/src/views/gui/menu.vue

@@ -172,7 +172,12 @@
             <img class="active" :src="i.activeIcon" alt="" />
             <img class="active" :src="i.activeIcon" alt="" />
             <div class="tip-box">{{ i.name }}</div>
             <div class="tip-box">{{ i.name }}</div>
           </div>
           </div>
-          <div class="button-item" v-if="(i.action == 'play' && !guideIsPlay) || (i.action == 'pause' && guideIsPlay)" v-for="(i, index) in playButtons" @click.stop="hanlderButtons(i, i.type)">
+          <div
+            class="button-item"
+            v-if="(i.action == 'play' && !guideIsPlay && mode == 'panorama') || (i.action == 'pause' && guideIsPlay && mode == 'panorama')"
+            v-for="(i, index) in playButtons"
+            @click.stop="hanlderButtons(i, i.type)"
+          >
             <img class="normal" :src="i.normalIcon" alt="" />
             <img class="normal" :src="i.normalIcon" alt="" />
             <img class="active" :src="i.activeIcon" alt="" />
             <img class="active" :src="i.activeIcon" alt="" />
             <div class="tip-box">{{ i.name }}</div>
             <div class="tip-box">{{ i.name }}</div>
@@ -213,7 +218,12 @@
           <img class="active" :src="i.activeIcon" alt="" />
           <img class="active" :src="i.activeIcon" alt="" />
         </div>
         </div>
 
 
-        <div class="button-item" v-if="(i.action == 'play' && !guideIsPlay) || (i.action == 'pause' && guideIsPlay)" v-for="(i, index) in playButtons" @click.stop="hanlderButtons(i, i.type)">
+        <div
+          class="button-item"
+          v-if="(i.action == 'play' && !guideIsPlay && mode == 'panorama') || (i.action == 'pause' && guideIsPlay && mode == 'panorama')"
+          v-for="(i, index) in playButtons"
+          @click.stop="hanlderButtons(i, i.type)"
+        >
           <img class="normal" :src="i.normalIcon" alt="" />
           <img class="normal" :src="i.normalIcon" alt="" />
           <img class="active" :src="i.activeIcon" alt="" />
           <img class="active" :src="i.activeIcon" alt="" />
         </div>
         </div>

+ 15 - 18
scene/vue.config.js

@@ -12,24 +12,21 @@ module.exports = {
       },
       },
     },
     },
   },
   },
-  // devServer: {
-  //   headers: {
-  //     "Cache-Control": "no-store",
-  //   },
-  //   https: false,
-  //   proxy: {
-  //     // "/page": {
-  //     //   target: "http://192.168.0.12:8081",
-  //     //   changeOrigin: true,
-  //     //   rewrite: (path) => path.replace(/^\/page/, ""),
-  //     // },
-  //     // "/js": {
-  //     //   target: "http://192.168.0.12:8081",
-  //     //   changeOrigin: true,
-  //     //   // rewrite: (path) => path.replace(/^\/page/, ""),
-  //     // },
-  //   },
-  // },
+  devServer: {
+    port: 8090,
+    // proxy: {
+      // "/page": {
+      //   target: "http://192.168.0.12:8081",
+      //   changeOrigin: true,
+      //   rewrite: (path) => path.replace(/^\/page/, ""),
+      // },
+      // "/js": {
+      //   target: "http://192.168.0.12:8081",
+      //   changeOrigin: true,
+      //   // rewrite: (path) => path.replace(/^\/page/, ""),
+      // },
+    // },
+  },
 };
 };
 
 
 function getLessVariables(file) {
 function getLessVariables(file) {