diff --git a/public/model1/Texture/1352f34fdf1d4d70aa70db1c78830be2.jpg b/public/model1/Texture/1352f34fdf1d4d70aa70db1c78830be2.jpg
new file mode 100644
index 0000000..f60fe53
Binary files /dev/null and b/public/model1/Texture/1352f34fdf1d4d70aa70db1c78830be2.jpg differ
diff --git a/public/model1/Texture/42a9b5dc53464f7c8401cb8137c72465.jpg b/public/model1/Texture/42a9b5dc53464f7c8401cb8137c72465.jpg
new file mode 100644
index 0000000..963cfbb
Binary files /dev/null and b/public/model1/Texture/42a9b5dc53464f7c8401cb8137c72465.jpg differ
diff --git a/public/model1/Texture/5d3830f2ee99487aa69232da1ca459e1.jpg b/public/model1/Texture/5d3830f2ee99487aa69232da1ca459e1.jpg
new file mode 100644
index 0000000..972d85a
Binary files /dev/null and b/public/model1/Texture/5d3830f2ee99487aa69232da1ca459e1.jpg differ
diff --git a/public/model1/Texture/7e809ba9a8d64eb4b8ad4ce32eabe949.jpg b/public/model1/Texture/7e809ba9a8d64eb4b8ad4ce32eabe949.jpg
new file mode 100644
index 0000000..badabec
Binary files /dev/null and b/public/model1/Texture/7e809ba9a8d64eb4b8ad4ce32eabe949.jpg differ
diff --git a/public/model1/Texture/9a006d1db61948719afca68c419656ae.jpg b/public/model1/Texture/9a006d1db61948719afca68c419656ae.jpg
new file mode 100644
index 0000000..ad2b0ac
Binary files /dev/null and b/public/model1/Texture/9a006d1db61948719afca68c419656ae.jpg differ
diff --git a/public/model1/Texture/b96aa6fce4ec4cd4bf5ec515d8a839fd.jpg b/public/model1/Texture/b96aa6fce4ec4cd4bf5ec515d8a839fd.jpg
new file mode 100644
index 0000000..42d99ea
Binary files /dev/null and b/public/model1/Texture/b96aa6fce4ec4cd4bf5ec515d8a839fd.jpg differ
diff --git a/public/model1/Texture/bf817fe3a3784cf3a6c4957726ffc373.jpg b/public/model1/Texture/bf817fe3a3784cf3a6c4957726ffc373.jpg
new file mode 100644
index 0000000..f769fa8
Binary files /dev/null and b/public/model1/Texture/bf817fe3a3784cf3a6c4957726ffc373.jpg differ
diff --git a/public/model1/Texture/fb79295fd42c46fca660b562e3117605.jpg b/public/model1/Texture/fb79295fd42c46fca660b562e3117605.jpg
new file mode 100644
index 0000000..f93b5fc
Binary files /dev/null and b/public/model1/Texture/fb79295fd42c46fca660b562e3117605.jpg differ
diff --git a/public/model1/addition/20f2164cfb2a4a66a3b10085e58ae3f1.mrmb b/public/model1/addition/20f2164cfb2a4a66a3b10085e58ae3f1.mrmb
new file mode 100644
index 0000000..7746c88
Binary files /dev/null and b/public/model1/addition/20f2164cfb2a4a66a3b10085e58ae3f1.mrmb differ
diff --git a/public/model1/fileList.json b/public/model1/fileList.json
new file mode 100644
index 0000000..8049155
--- /dev/null
+++ b/public/model1/fileList.json
@@ -0,0 +1 @@
+{"sky":{"a":"sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","b":"sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg"},"mat":["mat/ab30446d8f7c4799acc9896d99888c86.json"],"box":{"max":[-413.9531555175781,259.8915100097656,-281.6982727050781],"min":[-950.13037109375,254.0809783935547,-804.098388671875]},"m":["m/d19d13fb0040469ea961d0fab4872f8d.mrmb","m/d3a5691468b84a0d91e8379a240f08da.mrmb","m/b33a1250ae47406bbe47df744ddaf669.mrmb","m/5e1fef1609744e099b36a15c330c1648.mrmb"],"addition":["addition/20f2164cfb2a4a66a3b10085e58ae3f1.mrmb"]}
\ No newline at end of file
diff --git a/public/model1/m/5e1fef1609744e099b36a15c330c1648.mrmb b/public/model1/m/5e1fef1609744e099b36a15c330c1648.mrmb
new file mode 100644
index 0000000..b6179cb
Binary files /dev/null and b/public/model1/m/5e1fef1609744e099b36a15c330c1648.mrmb differ
diff --git a/public/model1/m/b33a1250ae47406bbe47df744ddaf669.mrmb b/public/model1/m/b33a1250ae47406bbe47df744ddaf669.mrmb
new file mode 100644
index 0000000..886aded
Binary files /dev/null and b/public/model1/m/b33a1250ae47406bbe47df744ddaf669.mrmb differ
diff --git a/public/model1/m/d19d13fb0040469ea961d0fab4872f8d.mrmb b/public/model1/m/d19d13fb0040469ea961d0fab4872f8d.mrmb
new file mode 100644
index 0000000..79ffbe7
Binary files /dev/null and b/public/model1/m/d19d13fb0040469ea961d0fab4872f8d.mrmb differ
diff --git a/public/model1/m/d3a5691468b84a0d91e8379a240f08da.mrmb b/public/model1/m/d3a5691468b84a0d91e8379a240f08da.mrmb
new file mode 100644
index 0000000..496d018
Binary files /dev/null and b/public/model1/m/d3a5691468b84a0d91e8379a240f08da.mrmb differ
diff --git a/public/model1/mat/ab30446d8f7c4799acc9896d99888c86.json b/public/model1/mat/ab30446d8f7c4799acc9896d99888c86.json
new file mode 100644
index 0000000..4ca22cf
--- /dev/null
+++ b/public/model1/mat/ab30446d8f7c4799acc9896d99888c86.json
@@ -0,0 +1 @@
+{"a":[{"ee":"wire_018035031","ii":32,"a":0,"b":[0.0706,0.1373,0.1216],"jr":1,"j":1},{"ee":"wire_015035031","ii":32,"a":1,"b":[0.0588,0.1373,0.1216],"jr":1,"j":1},{"ee":"Material__23445","ii":20,"a":2,"b":[1,1,1],"c":0,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23446","ii":20,"a":3,"b":[1,1,1],"c":1,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23439","ii":20,"a":4,"b":[1,1,1],"c":2,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23440","ii":20,"a":5,"b":[1,1,1],"c":3,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23441","ii":20,"a":6,"b":[1,1,1],"c":4,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23442","ii":20,"a":7,"b":[1,1,1],"c":5,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23443","ii":20,"a":8,"b":[1,1,1],"c":6,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23444","ii":20,"a":9,"b":[1,1,1],"c":7,"jr":1,"j":1,"x":[0,0]}],"b":{"0":"9a006d1db61948719afca68c419656ae.jpg","1":"1352f34fdf1d4d70aa70db1c78830be2.jpg","2":"5d3830f2ee99487aa69232da1ca459e1.jpg","3":"42a9b5dc53464f7c8401cb8137c72465.jpg","4":"bf817fe3a3784cf3a6c4957726ffc373.jpg","5":"7e809ba9a8d64eb4b8ad4ce32eabe949.jpg","6":"b96aa6fce4ec4cd4bf5ec515d8a839fd.jpg","7":"fb79295fd42c46fca660b562e3117605.jpg"},"version":"1","z":{"0":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/fad579949ce14dff83899729637e8854.jpg","1":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/820f1a3b1e75491f87b51293d89f4914.jpg","2":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/ce91a7beefcb433995353c534deee39b.jpg","3":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/a5155a53f07b4bf4ab4f24e5f1a0f45a.jpg","4":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/64cc28b0ab1a46829051429e512a9886.jpg","5":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/16be241694e247dda0e0f5df682d40fa.jpg","6":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/276128df056c4ab9bb1556afb3773a5b.jpg","7":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/51d6713ba2804319abadcc1b12284807.jpg"}}
\ No newline at end of file
diff --git a/public/model1/sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr b/public/model1/sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr
new file mode 100644
index 0000000..fb99836
Binary files /dev/null and b/public/model1/sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr differ
diff --git a/public/model1/sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg b/public/model1/sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg
new file mode 100644
index 0000000..15b04f7
Binary files /dev/null and b/public/model1/sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg differ
diff --git a/src/views/board/liner/index.vue b/src/views/board/liner/index.vue
index c04dbd0..d442336 100644
--- a/src/views/board/liner/index.vue
+++ b/src/views/board/liner/index.vue
@@ -24,7 +24,7 @@
计划数量
- 入库数量
+ 完成数量
生产进度
diff --git a/src/views/model/model.vue b/src/views/model/model.vue
index 9a7e3e1..5ed1a59 100644
--- a/src/views/model/model.vue
+++ b/src/views/model/model.vue
@@ -550,64 +550,66 @@ export default {
const viewer = new AMRT.Viewer('container', param)
let num = 0
let modelArr = [
- '1733002676922355712',
- '1733002653367144448',
- '1733000805830758400',
- '1733000710250958848',
- '1733000650326937600',
- '1733000643133706240',
- '1733000491190849536',
- '1733000457527365632',
- '1733000436912361472',
- '1733000276484427776',
- '1733000223309041664',
- '1733000212462571520',
-
- '1733000038533173248',
- '1733000034217234432',
- '1732999987471716352',
- '1732999849172930560',
-
- '1732999837521154048',
- '1732999828495011840',
- '1732999786233204736',
- '1732999740666286080',
- '1732999667089805312',
- '1732999638983774208',
- '1732999634021912576',
- '1732999618410713088',
-
- '1732999607128035328',
- '1732999597858623488',
- '1732999559069700096',
- '1732999554745372672',
- '1732999550429433856',
- '1732999507391680512',
- '1732999493042966528',
- '1732999471010287616',
- '1732999442811981824',
- '1732999424952635392',
- '1732999411254038528',
- '1732999390441902080',
- '1732999384255303680',
- '1732999376583921664',
- '1732999305662435328',
- '1732999305557577728',
- '1732999301107421184',
+ '../../model1/',
+ // '1733002676922355712',
+ // '1733002653367144448',
+ // '1733000805830758400',
+ // '1733000710250958848',
+ // '1733000650326937600',
+ // '1733000643133706240',
+ // '1733000491190849536',
+ // '1733000457527365632',
+ // '1733000436912361472',
+ // '1733000276484427776',
+ // '1733000223309041664',
+ // '1733000212462571520',
+ //
+ // '1733000038533173248',
+ // '1733000034217234432',
+ // '1732999987471716352',
+ // '1732999849172930560',
+
+ // '1732999837521154048',
+ // '1732999828495011840',
+ // '1732999786233204736',
+ // '1732999740666286080',
+ // '1732999667089805312',
+ // '1732999638983774208',
+ // '1732999634021912576',
+ // '1732999618410713088',
+ //
+ // '1732999607128035328',
+ // '1732999597858623488',
+ // '1732999559069700096',
+ // '1732999554745372672',
+ // '1732999550429433856',
+ // '1732999507391680512',
+ // '1732999493042966528',
+ // '1732999471010287616',
+ // '1732999442811981824',
+ // '1732999424952635392',
+ // '1732999411254038528',
+ // '1732999390441902080',
+ // '1732999384255303680',
+ // '1732999376583921664',
+ // '1732999305662435328',
+ // '1732999305557577728',
+ // '1732999301107421184',
// 1-1
- '1733052342019952640',
- '1733052332985421824',
- '1733052278396555264',
- '1733052278291697664',
- '1733052273975758848',
- '1733052268669964288',
+ // '1733052342019952640',
+ // '1733052332985421824',
+ // '1733052278396555264',
+ // '1733052278291697664',
+ // '1733052273975758848',
+ // '1733052268669964288',
]
modelArr.forEach(e => {
- let model = viewer.loadModel(e, {
+ viewer.loadModel(e, {
background: false,
focus: false,
id: e,
+ offline: true,
onLoad: function (m) {
num += 1
if (num === modelArr.length) {