三维场景切换

2023-04-14 14:26:08 +08:00 · 2023-04-14 14:26:08 +08:00 · 17c8898a13
parent cb7869b4dc
commit 17c8898a13
19 changed files with 205 additions and 189 deletions
--- a/public/EPS_Yzpq/Build/WebglQidong.data.unityweb
+++ b/public/EPS_Yzpq/Build/WebglQidong.data.unityweb
--- a/public/EPS_Yzpq/Build/WebglQidong.framework.js.unityweb
+++ b/public/EPS_Yzpq/Build/WebglQidong.framework.js.unityweb
--- a/public/EPS_Yzpq/Build/WebglQidong.wasm.unityweb
+++ b/public/EPS_Yzpq/Build/WebglQidong.wasm.unityweb
--- a/public/EPS_Yzpq/Build/Webglrg.framework.js.br
+++ b/public/EPS_Yzpq/Build/Webglrg.framework.js.br
--- a/public/EPS_Yzpq/Build/Webglrg.loader.js
+++ b/public/EPS_Yzpq/Build/Webglrg.loader.js
--- a/public/EPS_Yzpq/Build/Webglrg.wasm.br
+++ b/public/EPS_Yzpq/Build/Webglrg.wasm.br
--- a/public/EPS_Yzpq/Build/启东南苑路仓库.data.unityweb
+++ b/public/EPS_Yzpq/Build/启东南苑路仓库.data.unityweb
--- a/public/EPS_Yzpq/Build/启东南苑路仓库.framework.js.unityweb
+++ b/public/EPS_Yzpq/Build/启东南苑路仓库.framework.js.unityweb
--- a/public/EPS_Yzpq/Build/启东南苑路仓库.loader.js
+++ b/public/EPS_Yzpq/Build/启东南苑路仓库.loader.js
--- a/public/EPS_Yzpq/Build/启东南苑路仓库.wasm.unityweb
+++ b/public/EPS_Yzpq/Build/启东南苑路仓库.wasm.unityweb
--- a/public/EPS_Yzpq/index.html
+++ b/public/EPS_Yzpq/index.html
@ -1,14 +1,13 @@
 <!DOCTYPE html>
 <html lang="en-us">
-
-<head>
+  <head>
    <meta charset="utf-8">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    <title>Unity WebGL Player | ElectricPowerStorage_Digital Twin</title>
    <link rel="shortcut icon" href="TemplateData/favicon.ico">
    <link rel="stylesheet" href="TemplateData/style.css">
-</head>
-<style>
+  </head>
+  <style>
    body,
  html {
    width: 100%;
@ -17,9 +16,8 @@
    padding: 0;
    overflow: hidden;
  }
-</style>
-
-<body>
+  </style>
+  <body>
    <div id="unity-container" style="width: 100%;height:100%" class="unity-desktop">
      <canvas id="unity-canvas" style="width: 100%;height:100%"></canvas>
      <div id="unity-loading-bar">
@ -59,7 +57,7 @@
        if (type == 'error') div.style = 'background: red; padding: 10px;';
        else {
          if (type == 'warning') div.style = 'background: yellow; padding: 10px;';
-        setTimeout(function () {
+          setTimeout(function() {
            warningBanner.removeChild(div);
            updateBannerVisibility();
          }, 5000);
@ -68,11 +66,11 @@
      }

      var buildUrl = "Build";
-    var loaderUrl = buildUrl + "/WebglQidong.loader.js";
+      var loaderUrl = buildUrl + "/启东南苑路仓库.loader.js";
      var config = {
-      dataUrl: buildUrl + "/WebglQidong.data.unityweb",
-      frameworkUrl: buildUrl + "/WebglQidong.framework.js.unityweb",
-      codeUrl: buildUrl + "/WebglQidong.wasm.unityweb",
+        dataUrl: buildUrl + "/启东南苑路仓库.data.unityweb",
+        frameworkUrl: buildUrl + "/启东南苑路仓库.framework.js.unityweb",
+        codeUrl: buildUrl + "/启东南苑路仓库.wasm.unityweb",
        streamingAssetsUrl: "StreamingAssets",
        companyName: "DefaultCompany",
        productName: "ElectricPowerStorage_Digital Twin",
@ -120,8 +118,8 @@
        createUnityInstance(canvas, config, (progress) => {
          progressBarFull.style.width = 100 * progress + "%";
        }).then((unityInstance) => {
-        loadingBar.style.display = "none"; 
          unityInstanceA = unityInstance
+          loadingBar.style.display = "none";
          fullscreenButton.onclick = () => {
            unityInstance.SetFullscreen(1);
          };
@ -143,7 +141,7 @@
    // 库房的定位
    function selectHome(val) {
      console.log(val,'库房的定位');
-      unityInstanceA.SendMessage("Manager", "Unity_WarehouseList", val);
+      unityInstanceA.SendMessage("Manager", "Unity_WarehouseList",val);
    }
    // 库外的按钮
    function outHome() {
@ -174,6 +172,5 @@
      unityInstanceA.SendMessage("Manager","Unity_LocateWarehouseNo",val+'')
    }
    </script>
-</body>
-
+  </body>
 </html>
--- a/public/config.js
+++ b/public/config.js
@ -0,0 +1,3 @@
+const config = {
+    VUE_APP_API_BASE_URL: 'http://20.47.106.51:30005/gwcpedge/',
+}
--- a/public/index.html
+++ b/public/index.html
@ -5,7 +5,8 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>启东南苑路数字孪生仓库</title>
+    <title>启东南苑路仓库</title>
+    <script src="./config.js"></script>
  </head>
  <body>
    <noscript>
--- a/src/App.vue
+++ b/src/App.vue
@ -7,10 +7,10 @@
    </div>
    <!-- 头部 -->
    <header class="nav">
-      <div class="wether">
+      <!-- <div class="wether">
        <img src="@/assets/images/cloudy.png" alt="" />
        <span class="tianqi">多云</span>
-      </div>
+      </div> -->
      <el-select v-model="value" placeholder="请选择">
        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" >
        </el-option>
@ -21,8 +21,8 @@

      <ul>
        <li v-for="(s, i) in liImgs" class="nav-li" :key="i" @click="handleBtn($event, i)">
-          <el-dropdown trigger="click" placement="bottom" v-if="i == 0" :hide-on-click="false" ref="drop1">
-            <span class="downPull"><img :src="i==index ? s.selectImg : s.img" alt="" /></span>
+          <el-dropdown trigger="click" placement="bottom" v-if="i == 0" :hide-on-click="false" ref="drop1" @visible-change="visibleChange1">
+            <span class="downPull"><img :src="drop1 ? s.selectImg : s.img" alt="" /></span>
            <el-dropdown-menu slot="dropdown">
              <ul class="menuContent">
                <!-- <li v-for="(num, index) in 15" :key="index" @click="shelfHanlder($event)">LD1_B01-{{ num < 10 ? "0" + num
@ -40,8 +40,8 @@
          </el-dropdown>

          <el-dropdown trigger="click" placement="bottom" v-else-if="i == 2" :hide-on-click="true"
-            >
-            <span class="downPull"><img :src="i==index ? s.selectImg : s.img" alt="" /></span>
+          @visible-change="visibleChange2">
+            <span class="downPull"><img :src="drop2 ? s.selectImg : s.img" alt="" /></span>
            <el-dropdown-menu slot="dropdown">
              <ul class="menuContent">
                <!-- <li @click="selectHomeN($event)">B01</li>
@ -64,11 +64,11 @@
      </ul>
    </header>
    <!-- 右侧边栏 -->
-    <aside class="right-aside">
+    <!-- <aside class="right-aside">
      <span v-for="(s, i) in heatList" :class="`span${i}`" :key="i">
        {{ s }}
      </span>
-    </aside>
+    </aside> -->
    <router-view />
  </div>
 </template>
@ -116,11 +116,15 @@ export default {
      navLiState: false,

      loadShow:true,
+
+
+      drop1:false,
+      drop2:false
    };
  },
  created() {
    this.$nextTick(() => {
-      // getVisualStorageList({ wareHouseCode: "HA1" }).then((res) => {
+      // getVisualStorageList({ wareHouseCode: "FF1" }).then((res) => {
      //   console.log(res, "shuju");
      // });
    });
@ -133,9 +137,16 @@ export default {
    // this.load()
  },
  methods: {
+    // 下拉菜单隐藏图片改为未选中
+    visibleChange1(bool) {
+      this.drop1 = bool;
+    },
+    visibleChange2(bool) {
+      this.drop2 = bool;
+    },
    // 根据仓位号查找unity场景位置
    searchHouse(){
-      console.log(1111);
+      // console.log(1111);
      if (this.value == "仓位号") {
          this.$refs.dome.contentWindow.wareHouse(this.input3)
        } else if (this.value == "物料编码") {
--- a/src/api/index.js
+++ b/src/api/index.js
@ -1,59 +1,62 @@
 // 测试请求是否能跨域
 // export const getWather = (params) => {
-//     return axios.get('api/Handler/Weather.ashx', {
+//     return axios.get('Handler/Weather.ashx', {
 //         params
 //     })
 // };
 import axios from 'axios'
+// axios.defaults.baseURL = 'http://20.47.106.51:30005/gwcpedge/'
+axios.defaults.baseURL = config.VUE_APP_API_BASE_URL
+
 export const getVisualStorageList = (params) => {
-    return axios.get('api/visualStorage/getVisualStorageList', {
+    return axios.get('visualStorage/getVisualStorageList', {
        params
    })

 }
 // 获取仓位得接口
 export const byPosition = (params) => {
-    return axios.get('api/visualStorage/getVisualStorageListByPosition', {
+    return axios.get('visualStorage/getVisualStorageListByPosition', {
        params
    })
 }
 // 获取物料和批次
 export const byBatchAndMateri = (params) => {
-    return axios.get('api/visualStorage/getVisualStorageListByBatchAndMateriel', {
+    return axios.get('visualStorage/getVisualStorageListByBatchAndMateriel', {
        params
    })
 }

 // 仓库使用率
 export const getWarehouseUsages = (params) => {
-    return axios.get('api/visualStorage/getWarehouseUsages', {
+    return axios.get('visualStorage/getWarehouseUsages', {
        params
    })
 }
 // 每月的周转率
 export const getTurnoverRate = (params) => {
-    return axios.get('api/visualStorage/getTurnoverRateList', {
+    return axios.get('visualStorage/getTurnoverRateList', {
        params
    })
 }

 // 当月出入库金额
 export const getChangeAmount = (params) => {
-    return axios.get('api/visualStorage/getChangeAmount', {
+    return axios.get('visualStorage/getChangeAmount', {
        params
    })
 }

 // 积压物质
 export const getBacklogMaterialInfo = (params) => {
-    return axios.get('api/visualStorage/getBacklogMaterialInfo', {
+    return axios.get('visualStorage/getBacklogMaterialInfo', {
        params
    })
 }

 // 库龄结构
 export const getInventoryAgeInfo = (params) => {
-    return axios.get('api/visualStorage/getInventoryAgeInfo', {
+    return axios.get('visualStorage/getInventoryAgeInfo', {
        params
    })
 }
@ -61,14 +64,14 @@ export const getInventoryAgeInfo = (params) => {
 // 库存构成

 export const getStore = (params) => {
-    return axios.get('api/visualStorage/getInventoryConstitute', {
+    return axios.get('visualStorage/getInventoryConstitute', {
        params
    })
 }

 // 库容预测
 export const getMaterialDataList = (params) => {
-    return axios.get('api/visualStorage/getMaterialDataList', {
+    return axios.get('visualStorage/getMaterialDataList', {
        params
    })
 }
--- a/src/component/OverView.vue
+++ b/src/component/OverView.vue
@ -64,22 +64,24 @@ export default {
    },
    created() {
        // 仓库的使用率
-        // getWarehouseUsages({wareHouseCode:'HA1'}).then(res=>{
-        //     console.log(res,'仓库使用率');
-        //     this.storeData = res.data.data
-        //     this.drawStore(this.storeData)
-        //     // console.log(this.storeData,'......');
-        // })
-        // getTurnoverRate({wareHouseCode:'HA1'}).then(res=>{
-        //     console.log(res,'每月的周转率');
-        //     this.drawTurnoverChart(res.data.data.rateList)
-        // })
-        //  getBacklogMaterialInfo({wareHouseCode:'HA1'}).then(res=>{
-        //     console.log(res,'积压物资');
-        //     this.drawOverStock(res.data.data)
-        // })
-        // },
+        getWarehouseUsages({wareHouseCode:'FF1'}).then(res=>{
+            console.log(res,'仓库使用率');
+            this.storeData = res.data.data
+            this.drawStore(this.storeData)
+            // console.log(this.storeData,'......');
+        })
+        // 每月周转率
+        getTurnoverRate({wareHouseCode:'FF1'}).then(res=>{
+            console.log(res,'每月的周转率');
+            this.drawTurnoverChart(res.data.data.rateList)
+        })
        // 积压物资
+         getBacklogMaterialInfo({wareHouseCode:'FF1'}).then(res=>{
+            console.log(res,'积压物资');
+            this.drawOverStock(res.data.data)
+        })
+    
+        
    },
    methods: {
        // 仓库使用率的ecahrt图
@ -161,7 +163,7 @@ export default {
                        icon: "circle",
                        itemWidth: 4,
                        itemHeight: 6, //'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow', 'none'
-                        left: '65%',
+                        left: '60%',
                        top: tops1[i],
                        // width:'1000',
                        backgroundColor: colorList[i],
--- a/src/component/Stock.vue
+++ b/src/component/Stock.vue
@ -78,14 +78,14 @@ export default {
    created() {
        // 库存结构

-        //      getStore({wareHouseCode:'HA1'}).then(res=>{
-        //     // console.log(res,'库存结构');
-        //     if(res.data.code==200){
-        //         // console.log(res.data.data,'kulin');
-        //         this.ulList = res.data.data.infoList
-        //         // console.log(this.ulList);
-        //     }
-        // })
+             getStore({wareHouseCode:'FF1'}).then(res=>{
+            // console.log(res,'库存结构');
+            if(res.data.code==200){
+                // console.log(res.data.data,'kulin');
+                this.ulList = res.data.data.infoList
+                // console.log(this.ulList);
+            }
+        })
    },
    computed: {

--- a/src/views/index.vue
+++ b/src/views/index.vue
@ -101,23 +101,23 @@ export default {
    this.view = "OverView";
    // },2000)
    // 获取仓位号接口
-    // byPosition({ wareHouseCode: "HA1", position: "B01-010102" }).then((res) => {
-    //   console.log(res, "仓位号");
-    // });
-    // // 获取物料批次
-    // byBatchAndMateri({ batch:"2021093009",wareHouseCode:'HA1' }).then((res) => {
-    //     console.log(res,'物料批次');
-    // });
+    byPosition({ wareHouseCode: "FF1", position: "B01-010102" }).then((res) => {
+      console.log(res, "仓位号");
+    });
+    // 获取物料批次
+    byBatchAndMateri({ batch:"2021093009",wareHouseCode:'FF1' }).then((res) => {
+        console.log(res,'物料批次');
+    });
    // // 仓库的使用率
-    // getWarehouseUsages({wareHouseCode:'HA1'}).then(res=>{
+    // getWarehouseUsages({wareHouseCode:'FF1'}).then(res=>{
    //     console.log(res,'仓库使用率');
    // })
    //每月的周转率
-    // getTurnoverRate({wareHouseCode:'HA1'}).then(res=>{
+    // getTurnoverRate({wareHouseCode:'FF1'}).then(res=>{
    //     console.log(res,'每月的周转率');
    // })
    // 当月出入库金额
-    // getChangeAmount({wareHouseCode:'HA1'}).then(res=>{
+    // getChangeAmount({wareHouseCode:'FF1'}).then(res=>{
    //     console.log(res,'当月出入库金额');
    // })
    // 积压物资
@ -125,19 +125,19 @@ export default {


    // 库龄结构
-    // getInventoryAgeInfo({wareHouseCode:'HA1'}).then(res=>{
-    //     console.log(res,'库龄结构');
-    // })
+    getInventoryAgeInfo({wareHouseCode:'FF1'}).then(res=>{
+        console.log(res,'库龄结构');
+    })

    // 库存构成
-    // getStore({wareHouseCode:'HA1'}).then(res=>{
-    //     console.log(res,'库存结构');
-    // })
+    getStore({wareHouseCode:'FF1'}).then(res=>{
+        console.log(res,'库存结构');
+    })

    // 库容预测
-    // getMaterialDataList({method:'getYckc',LGUNM:"HA1",NY:"202304"}).then(res=>{
-    //     console.log(res,'库容预测');
-    // })
+    getMaterialDataList({method:'getYckc',LGUNM:"FF1",NY:"202304"}).then(res=>{
+        console.log(res,'库容预测');
+    })
  },
  created() {},
  computed: {},
--- a/vue.config.js
+++ b/vue.config.js
@ -4,7 +4,7 @@
 // })
 module.exports = {
  // 打包文件配置
-  publicPath: "/",
+  publicPath: "./",
  assetsDir: "static",
  lintOnSave: false,
  devServer: {