Merge branch 'master' of http://175.27.215.92:3000/yinq/aucma-mes-ui

1 year ago · dd1b4b54cf
parent ada1e3f393 4ef248571a
commit dd1b4b54cf
2 changed files with 51 additions and 75 deletions
--- a/public/index.html
+++ b/public/index.html
@ -1,14 +1,15 @@
 <html>
-  <head lang="zh-CN">
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="renderer" content="webkit">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= webpackConfig.name %></title>
-    <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
-    <script src="<%= BASE_URL %>./Model.js"></script>
-	  <style>
+<head lang="zh-CN">
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="renderer" content="webkit">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <title><%= webpackConfig.name %></title>
+  <!--[if lt IE 11]>
+  <script>window.location.href = '/html/ie.html';</script><![endif]-->
+  <script src="<%= BASE_URL %>./Model.js"></script>
+  <style>
    html,
    body,
    #app {
@ -16,6 +17,7 @@
      margin: 0px;
      padding: 0px;
    }
+
    .chromeframe {
      margin: 0.2em 0;
      background: #ccc;
@ -194,15 +196,15 @@
      opacity: 0.5;
    }
  </style>
-  </head>
-  <body>
-    <div id="app">
-	    <div id="loader-wrapper">
-		    <div id="loader"></div>
-		    <div class="loader-section section-left"></div>
-		    <div class="loader-section section-right"></div>
-		    <div class="load_title">正在加载系统资源，请耐心等待</div>
-        </div>
-	</div>
-  </body>
+</head>
+<body>
+<div id="app">
+  <div id="loader-wrapper">
+    <div id="loader"></div>
+    <div class="loader-section section-left"></div>
+    <div class="loader-section section-right"></div>
+    <div class="load_title">正在加载系统资源，请耐心等待</div>
+  </div>
+</div>
+</body>
 </html>
--- a/src/views/model/model.vue
+++ b/src/views/model/model.vue
@ -34,63 +34,37 @@ export default {
      appsecret: 'rXmhoLAiOPNKzbl7g2qxCV8tFwRdYuZM'
    }
    const viewer = new AMRT.Viewer('container', param)
-    const callback = () => {
-      console.log('click on model')
-    }
-    const callback1 = () => {
-      console.log('click on model123213213')
-    }
    let num = 0
-    viewer.loadModel('1720250797926780928', {
-      background: false,
-      onLoad: function (m) {
-        num+=1
-        if(num === 5){
-          alert('加载完成');
-        }
-        m.on('click', callback)
-      }
-    })
-    viewer.loadModel('1720250751495835648', {
-      background: false,
-      onLoad: function (m) {
-        num+=1
-        if(num === 5){
-          alert('加载完成');
-        }
-        m.on('click', callback1)
-      }
-    })
-    viewer.loadModel('1720250742998175744', {
-      background: false,
-      onLoad: function (m) {
-        num+=1
-        if(num === 5){
-          alert('加载完成');
+    let modelArr = [
+      '1720315475507941376',
+      '1720315479907766272',
+      '1720315484513112064',
+      '1720315500866703360',
+      '1720315558030872576',
+      '1720315596551360512',
+      '1720315644550975488',
+      '1720315648946606080',
+      '1720315687114772480',
+      '1720315691422322688',
+      '1720315722275622912',
+      '1720315729129115648',
+      '1720315768454909952',
+      '1720316275214913536',
+      '1720316297822212096',
+    ]
+    modelArr.forEach(e=>{
+      viewer.loadModel(e, {
+        background: false,
+        onLoad: function (m) {
+          num+=1
+          if(num === modelArr.length){
+            alert('加载完成');
+          }
+          m.on('click', ()=>{alert(`${e}`)})
        }
-        m.on('click', callback1)
-      }
-    })
-    viewer.loadModel('1720250716490174464', {
-      background: false,
-      onLoad: function (m) {
-        num+=1
-        if(num === 5){
-          alert('加载完成');
-        }
-        m.on('click', callback1)
-      }
-    })
-    viewer.loadModel('1720250709951254528', {
-      background: false,
-      onLoad: function (m) {
-        num+=1
-        if(num === 5){
-          alert('加载完成');
-        }
-        m.on('click', callback1)
-      }
+      })
    })
+    viewer.controls.startAutoRotate(1)
  },
  methods: {}
 };