修改接口

8 months ago · 1e43d12a44
parent 63e10d16bf
commit 1e43d12a44
2 changed files with 128 additions and 130 deletions
--- a/src/views/board/finalAssembly/index.vue
+++ b/src/views/board/finalAssembly/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <div class="headTitle">总装生产可视化平台</div>
+    <div class="headTitle">总装生产数据监控平台</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 }}
--- a/src/views/model/model.vue
+++ b/src/views/model/model.vue
@ -9,20 +9,22 @@
      <div class="time" id="time">{{ time }}</div>
      <div class="date" id="date">{{ date }}</div>
      <div class="logo"></div>
-      <div class="cgtd1">
-        <span>参</span>
-        <span>观</span>
-        <span>通</span>
-        <span>道</span>
-      </div>
-      <div class="cgtd2">
-        <span>参</span>
-        <span>观</span>
-        <span>通</span>
-        <span>道</span>
+      <div v-if="num1 >= 30">
+        <div class="cgtd1">
+          <span>参</span>
+          <span>观</span>
+          <span>通</span>
+          <span>道</span>
+        </div>
+        <div class="cgtd2">
+          <span>参</span>
+          <span>观</span>
+          <span>通</span>
+          <span>道</span>
+        </div>
+        <div class="currentPosition1" v-if="$route.query.id === '1'"><span>当前位置</span></div>
+        <div class="currentPosition2" v-if="$route.query.id === '2'"><span>当前位置</span></div>
      </div>
-      <div class="currentPosition1" v-if="$route.query.id === '1'"><span>当前位置</span></div>
-      <div class="currentPosition2" v-if="$route.query.id === '2'"><span>当前位置</span></div>
      <div class="tool">
        <el-row>
          <el-col :span="4">
@ -179,6 +181,7 @@ export default {
      params: '',
      viewer: null,
      show: '',
+      num1: 0,
      show1: false,
      nowFlowIndex: null,
      flowItemOptions: [
@ -599,6 +602,7 @@ export default {
    getDateIntervalFun = setInterval(getDate, 1000)
  },
  async mounted() {
+    let that = this
    await isAMRT()
    // const param = {
    //   appkey: 'aveMPyNWzDJm',
@ -608,242 +612,236 @@ export default {
    viewer.sceneManager.setBackground('http://10.100.72.10:8900/docs/img/bg.jpg')
    viewer.controls.setTarget(285.6140415831262, -66.96447327588656, -15.909577343207037)
    viewer.controls.setPosition(289.21362270826876, 1559.17755547545135, 1298.62483706445185)
-    let num1 = 0
    let modelArr = [
      {
-        url: '../../models/01-01-01/',
-        link: '1'
-      },
-      {
-        url: '../../models/01-01-02/',
-        link: '2'
+        url: '../../models/03-01-01/',
+        link: '51'
      },
      {
-        url: '../../models/01-01-03/',
-        link: '3'
+        url: '../../models/01-01-05/',
+        link: '5'
      },
      {
        url: '../../models/01-01-04/',
        link: '4'
      },
      {
-        url: '../../models/01-01-05/',
-        link: '5'
+        url: '../../models/01-01-02/',
+        link: '2'
      },
      {
-        url: '../../models/01-01-06/',
-        link: '6'
+        url: '../../models/01-01-03/',
+        link: '3'
      },
      {
-        url: '../../models/01-02-01/',
-        link: '7'
+        url: '../../models/03-02-05/',
+        link: '57'
      },
      {
-        url: '../../models/01-02-02/',
-        link: '8'
+        url: '../../models/02-03-pt-02/',
+        link: '32'
      },
      {
-        url: '../../models/01-02-03/',
-        link: '9'
+        url: '../../models/03-02-03/',
+        link: '55'
      },
      {
-        url: '../../models/01-02-04/',
-        link: '10'
+        url: '../../models/02-03-pt-05/',
+        link: '35'
      },
      {
-        url: '../../models/01-02-05/',
-        link: '11'
+        url: '../../models/02-04-01-01/',
+        link: '38'
      },
      {
        url: '../../models/01-02-06/',
        link: '12'
      },
      {
-        url: '../../models/01-02-07/',
-        link: '13'
+        url: '../../models/02-03-pt-01/',
+        link: '31'
      },
      {
-        url: '../../models/01-03/',
-        link: '14'
+        url: '../../models/02-01-03-01/',
+        link: '24'
      },
      {
-        url: '../../models/01-04/',
-        link: '15'
+        url: '../../models/01-02-05/',
+        link: '11'
      },
      {
-        url: '../../models/01changfang/',
-        link: '16'
+        url: '../../models/02-03-pt-04/',
+        link: '34'
      },
-
-
      {
-        url: '../../models/02-01/',
-        link: '20'
+        url: '../../models/02-01-02-01/',
+        link: '22'
      },
      {
-        url: '../../models/02-01-01/',
-        link: '21'
+        url: '../../models/01-02-03/',
+        link: '9'
      },
      {
-        url: '../../models/02-01-02-01/',
-        link: '22'
+        url: '../../models/01-02-02/',
+        link: '9'
      },
      {
-        url: '../../models/02-01-02-02/',
-        link: '23'
+        url: '../../models/02-04-02/',
+        link: '40'
      },
      {
-        url: '../../models/02-01-03-01/',
-        link: '24'
+        url: '../../models/02-02-01/',
+        link: '27'
      },
      {
-        url: '../../models/02-01-03-02/',
-        link: '25'
+        url: '../../models/03-02-04/',
+        link: '56'
      },
      {
-        url: '../../models/02-02/',
-        link: '26'
+        url: '../../models/03-02-02/',
+        link: '54'
      },
      {
-        url: '../../models/02-02-01/',
-        link: '27'
+        url: '../../models/02-03-pt-03/',
+        link: '33'
      },
      {
-        url: '../../models/02-02-02/',
-        link: '28'
+        url: '../../models/01-02-04/',
+        link: '10'
      },
      {
-        url: '../../models/02-03/',
-        link: '29'
+        url: '../../models/02-03-pt-06/',
+        link: '36'
      },
      {
-        url: '../../models/02-03-1/',
-        link: '30'
+        url: '../../models/02-01-03-02/',
+        link: '25'
      },
      {
-        url: '../../models/02-03-pt-01/',
-        link: '31'
+        url: '../../models/03-02-01/',
+        link: '53'
      },
      {
-        url: '../../models/02-03-pt-02/',
-        link: '32'
+        url: '../../models/02-01-02-02/',
+        link: '23'
      },
      {
-        url: '../../models/02-03-pt-03/',
-        link: '33'
+        url: '../../models/01-02-01/',
+        link: '7'
      },
      {
-        url: '../../models/02-03-pt-04/',
-        link: '34'
+        url: '../../models/02-02/',
+        link: '26'
      },
      {
-        url: '../../models/02-03-pt-05/',
-        link: '35'
+        url: '../../models/02-04-01-02/',
+        link: '39'
      },
      {
-        url: '../../models/02-03-pt-06/',
-        link: '36'
+        url: '../../models/03-01-02/',
+        link: '52'
      },
      {
-        url: '../../models/02-04/',
-        link: '37'
+        url: '../../models/03-06/',
+        link: '61'
      },
      {
-        url: '../../models/02-04-01-01/',
-        link: '38'
+        url: '../../models/02-02-02/',
+        link: '28'
      },
      {
-        url: '../../models/02-04-01-02/',
-        link: '39'
+        url: '../../models/01-02-07/',
+        link: '13'
      },
      {
-        url: '../../models/02-04-02/',
-        link: '40'
+        url: '../../models/02-03-1/',
+        link: '30'
      },
      {
-        url: '../../models/02-05/',
-        link: '41'
+        url: '../../models/01-04/',
+        link: '15'
      },
      {
-        url: '../../models/02-06/',
-        link: '411'
+        url: '../../models/02-01/',
+        link: '20'
      },
      {
-        url: '../../models/02changfang/',
-        link: '42'
+        url: '../../models/01-01-01/',
+        link: '1'
      },
-
-
      {
-        url: '../../models/03-01-01/',
-        link: '51'
+        url: '../../models/03-09/',
+        link: '64'
      },
      {
-        url: '../../models/03-01-02/',
-        link: '52'
+        url: '../../models/02-01-01/',
+        link: '21'
      },
      {
-        url: '../../models/03-02-01/',
-        link: '53'
+        url: '../../models/03-05/',
+        link: '60'
      },
      {
-        url: '../../models/03-02-02/',
-        link: '54'
+        url: '../../models/03-08/',
+        link: '63'
      },
      {
-        url: '../../models/03-02-03/',
-        link: '55'
+        url: '../../models/03-07/',
+        link: '62'
      },
      {
-        url: '../../models/03-02-04/',
-        link: '56'
+        url: '../../models/01-03/',
+        link: '14'
      },
      {
-        url: '../../models/03-02-05/',
-        link: '57'
+        url: '../../models/01changfang/',
+        link: '16'
      },
      {
-        url: '../../models/03-03/',
-        link: '58'
+        url: '../../models/02changfang/',
+        link: '42'
      },
      {
        url: '../../models/03-04/',
        link: '59'
      },
      {
-        url: '../../models/03-05/',
-        link: '60'
+        url: '../../models/02-03/',
+        link: '29'
      },
      {
-        url: '../../models/03-06/',
-        link: '61'
+        url: '../../models/02-04/',
+        link: '37'
      },
      {
-        url: '../../models/03-07/',
-        link: '62'
+        url: '../../models/01-01-06/',
+        link: '6'
      },
      {
-        url: '../../models/03-08/',
-        link: '63'
+        url: '../../models/03-03/',
+        link: '58'
      },
      {
-        url: '../../models/03-09/',
-        link: '64'
+        url: '../../models/02-05/',
+        link: '41'
+      },
+      {
+        url: '../../models/02-06/',
+        link: '411'
      },
      {
        url: '../../models/03-10/',
        link: '65'
      },
-
    ]
    window.onresize = function () {
-      if (num1 === modelArr.length) {
+      if (that.num1 === modelArr.length) {
        viewer.renderManager.setLoop(true)
        viewer.renderManager.setLoop(false)

      }
    }
-
+    console.log(modelArr.length)

    let num = 9
    const toLoad = (val) => {
@ -852,8 +850,8 @@ export default {
        focus: false,
        offline: true,
        onComplete: function (m) {
-          num1 += 1
-          if (num1 === modelArr.length) {
+          that.num1 += 1
+          if (that.num1 === modelArr.length) {
            viewer.renderManager.setLoop(false)
          }

@ -996,8 +994,8 @@ export default {
  width: 4vw;
  height: 4vw;
  position: absolute;
-  top: 35%;
-  left: 47%;
+  top: 40%;
+  left: 42%;
  transform: translate(-50%, -100%);

  span {