修改接口

public/models/01changfang/fileList.json

@@ -1 +1 @@
-{"sky":{"a":"sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","b":"sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg"},"mat":["mat/mat.json"],"instance":["instance/ac2ab7084a284ec7a8e423e549fde6e9.mrmb"],"box":{"max":[1643.9346923828125,36.417999267578125,656.109375],"min":[-1077.169921875,-6.0707221031188965,-843.8449096679688]},"m":["m/89497d03d6654f0da05752e164f91ee7.mrmb"],"scene":"scene/scene.json","sceneData":"sceneData/sceneData.json","addition":["addition/4a1183172be4466586f0aba659cfaa0e.mrmb"]}
+{"sky":{"a":"sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","b":"sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg"},"mat":["mat/mat.json"],"instance":["instance/46d48a67aa554c4983cb0d191c1c0af1.mrmb"],"box":{"max":[1643.9346923828125,36.417999267578125,656.109375],"min":[-1077.169921875,-6.0707221031188965,-843.8449096679688]},"m":["m/3ded9fbaeb94477ea21aba9d79e2b7cc.mrmb"],"scene":"scene/scene.json","sceneData":"sceneData/sceneData.json","addition":["addition/220530f3157f46188e043490d520c4ad.mrmb"]}

src/views/board/foaming/index.vue

@@ -2045,20 +2045,20 @@ export default {
   }
 }
 .left2{
-  background-image: url("../../../assets/board/left.png");
+  background-image: url("../../../assets/board/right.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   position: absolute;
   transform: translate(-50%,-50%);
-  top: 44%;
-  left: 43%;
+  top: 49%;
+  left: 55%;
   width: 5vw;
-  height: 4.05vw;
+  height: 2.86vw;
   span{
     position: absolute;
     transform: translate(-50%,-50%);
-    top: 28%;
-    left: 43%;
+    top: 37%;
+    left: 57%;
     font-size: 1vw;
     color: #fff;
   }

src/views/board/foaming/index2.vue

@@ -796,10 +796,10 @@ export default {
   background-size: 100% 100%;
   position: absolute;
   transform: translateX(-50%);
-  top: 35%;
+  top: 21%;
   left: 50%;
-  width: 36vw;
-  height: 8.7vw;
+  width: 40vw;
+  height: 20vw;
 }
 
 .app-container {

src/views/board/liner/index.vue

@@ -632,7 +632,7 @@ export default {
   top: 54.5%;
   left: 50%;
   width: 93%;
-  height: 8.71vw;
+  height: 10.34vw;
 }
 
 .headTitle {

src/views/board/scanDown/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="headTitle">{{ line }}线成品入库数据监控平台</div>
+    <div class="headTitle">{{ line }}{{line === '' ? '' : '线'}}成品入库数据监控平台</div>
     <div class="title" v-for="(i,k) in title"
          :style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'">
       {{ i }}
@@ -1043,6 +1043,11 @@ export default {
         mixData(val)
       })
       this.line = '二'
+    }else if (this.$route.query.id === '3' || this.id === '3') {
+      this.RequestDataSet1.forEach(val => {
+        mixData(val)
+      })
+      this.line = ''
     }else{
       this.RequestDataSet.forEach(val => {
         mixData(val)

src/views/model/boardIndex.vue

@@ -7,7 +7,7 @@
       <foaming2 v-if="show === 'foaming2'"/>
       <pourInto f v-if="show === 'pourInto'"/>
       <finalAssembly v-if="show === 'finalAssembly'"/>
-      <scanDown v-if="show === 'scanDown'" id="1"/>
+      <scanDown v-if="show === 'scanDown'" id="3"/>
       <week v-if="show === 'week'"/>
     </div>
     <div class="time" id="time">{{ time }}</div>

src/views/model/model.vue

@@ -11,28 +11,34 @@
       <div class="currentPosition"><span>当前位置</span></div>
       <div class="tool">
         <el-row>
-          <el-col :span="5">
+          <el-col :span="4">
             <div class="toolItem" @click="click1('companyIntroduction')">
               <img class="icon" src="@/assets/model/model/companyIntroduction.png"/>
               <div class="whiteSpan grid-content bg-purple">公司介绍</div>
             </div>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="4">
             <div class="toolItem" @click="click1('factoryIntroduction')">
               <img class="icon" src="@/assets/model/model/factoryIntroduction.png"/>
               <div class="whiteSpan grid-content bg-purple">工厂介绍</div>
             </div>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="4">
             <div class="toolItem" @click="click1('dataCentre')">
               <img class="icon" src="@/assets/model/model/dataCentre.png"/>
               <div class="whiteSpan grid-content bg-purple">大数据中心</div>
             </div>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="4">
             <div class="toolItem" @click="click2()">
               <img class="icon" src="@/assets/model/model/process.png"/>
-              <div class="whiteSpan grid-content bg-purple-light">工艺流程</div>
+              <div class="whiteSpan grid-content bg-purple-light">智慧管控</div>
+            </div>
+          </el-col>
+          <el-col :span="4">
+            <div class="toolItem" @click="click1('equipment')">
+              <img class="icon" src="@/assets/model/model/process.png"/>
+              <div class="whiteSpan grid-content bg-purple-light">仓储物流</div>
             </div>
           </el-col>
           <el-col :span="4">
@@ -208,7 +214,7 @@ export default {
           height: 4,
           bgColor: '#ed7d31',
           text: '箱壳预装',
-          link: 'foaming',
+          link: 'caseShell',
         },
         {
           top: 35,
@@ -217,7 +223,7 @@ export default {
           height: 4,
           bgColor: '#7f7f7f',
           text: '箱壳<br>集存库',
-          link: 'foaming',
+          link: 'caseShell',
         },
 
         // 一二合
@@ -228,7 +234,6 @@ export default {
           height: 4,
           bgColor: '#f4b183',
           text: '壳胆<br>组装',
-          link: 'caseShell',
         },
         {
           top: 17,
@@ -264,6 +269,7 @@ export default {
           height: 4,
           bgColor: '#7f7f7f',
           text: '发泡<br>箱体库',
+          link: 'finalAssembly',
         },
         {
           top: 17,
@@ -272,7 +278,6 @@ export default {
           height: 4,
           bgColor: '#ffc000',
           text: '焊接',
-          link: 'pourInto',
         },
         {
           top: 17,
@@ -309,7 +314,6 @@ export default {
           height: 4,
           bgColor: '#2f5597',
           text: '门壳<br>自动成型',
-          link: 'liner',
         },
         {
           top: 68,
@@ -318,7 +322,6 @@ export default {
           height: 4,
           bgColor: '#ed7d31',
           text: '门壳预装',
-          link: 'liner',
         },
         {
           top: 68,
@@ -855,7 +858,7 @@ export default {
         toLoad(val)
       })
     }
-    setModel(0, 10)
+    // setModel(0, 10)
 
     // viewer.operator.enabled = true