diff --git a/public/models/01changfang/Texture/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr b/public/models/01changfang/Texture/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr new file mode 100644 index 0000000..fb99836 Binary files /dev/null and b/public/models/01changfang/Texture/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr differ diff --git a/public/models/01changfang/Texture/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg b/public/models/01changfang/Texture/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg new file mode 100644 index 0000000..15b04f7 Binary files /dev/null and b/public/models/01changfang/Texture/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg differ diff --git a/public/models/01changfang/fileList.json b/public/models/01changfang/fileList.json index 72ced5e..ae4c42c 100644 --- a/public/models/01changfang/fileList.json +++ b/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/08b5ea5843d94451a0c4672ad705fb2e.json"],"instance":["instance/9d3f64f01c95465e9e015fb7da48c737.mrmb"],"box":{"max":[1643.9346923828125,36.417999267578125,656.109375],"min":[-1077.169921875,-6.0707221031188965,-843.8449096679688]},"m":["m/617164a797ff4561a3e172adc780e6d6.mrmb"],"addition":["addition/2dbf16100d85430c9bfba3b033161313.mrmb"]} \ No newline at end of file +{"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/9d3f64f01c95465e9e015fb7da48c737.mrmb"],"box":{"max":[1643.9346923828125,36.417999267578125,656.109375],"min":[-1077.169921875,-6.0707221031188965,-843.8449096679688]},"m":["m/617164a797ff4561a3e172adc780e6d6.mrmb"],"scene":"scene/scene.json","sceneData":"sceneData/sceneData.json","addition":["addition/2dbf16100d85430c9bfba3b033161313.mrmb"]} \ No newline at end of file diff --git a/public/models/01changfang/mat/08b5ea5843d94451a0c4672ad705fb2e.json b/public/models/01changfang/mat/08b5ea5843d94451a0c4672ad705fb2e.json deleted file mode 100644 index 127d74c..0000000 --- a/public/models/01changfang/mat/08b5ea5843d94451a0c4672ad705fb2e.json +++ /dev/null @@ -1 +0,0 @@ -{"a":[{"ee":"wire_137180228","ii":32,"a":0,"b":[0.5373,0.7059,0.8941],"jr":1,"j":1},{"ee":"wire_075148229","ii":32,"a":1,"b":[0.2941,0.5804,0.898],"jr":1,"j":1},{"ee":"wire_195174000","ii":32,"a":2,"b":[0.7647,0.6824,0],"jr":1,"j":1},{"ee":"wire_145197255","ii":32,"a":3,"b":[0.5686,0.7725,1],"jr":1,"j":1},{"a":4,"re":2}],"b":{},"version":"1","z":{}} \ No newline at end of file diff --git a/public/models/01changfang/mat/mat.json b/public/models/01changfang/mat/mat.json new file mode 100644 index 0000000..5a7cc10 --- /dev/null +++ b/public/models/01changfang/mat/mat.json @@ -0,0 +1 @@ +{"a":[{"gg":0,"hh":0,"ii":32,"jj":true,"kk":2000,"ee":"wire_195174000","a":2,"b":[0.7647,0.6824,0],"d":[0,0,0],"os":false,"e":1,"pv":true,"g":0,"h":0,"jr":1,"i":1,"j":1,"lw":false,"transparent":false,"dt":true,"dw":true,"si":0,"rm":false,"qn":0},{"gg":0,"hh":0,"ii":32,"jj":true,"kk":2000,"ee":"wire_145197255","a":3,"b":[0.5686,0.7725,1],"d":[0,0,0],"os":false,"e":1,"pv":true,"g":0,"h":0,"jr":1,"i":1,"j":1,"lw":false,"transparent":false,"dt":true,"dw":true,"si":0,"rm":false,"qn":0},{"gg":0,"hh":0,"ii":1,"jj":true,"kk":2000,"ee":"wire_075148229","a":1,"b":[0.2901960784313726,0.5803921568627451,0.8941176470588236],"d":[0,0,0],"os":false,"e":1,"pv":true,"g":0,"h":0,"jr":1,"i":1,"j":1,"lw":false,"transparent":false,"dt":true,"dw":true,"si":2,"rm":false,"qn":0},{"gg":0,"hh":0,"ii":1,"jj":true,"kk":2000,"ee":"wire_137180228","a":0,"b":[0.8431372549019608,0.9490196078431372,1],"d":[0,0,0],"os":false,"e":1,"pv":true,"g":0,"h":0,"jr":1,"i":1,"j":1,"lw":false,"transparent":false,"dt":true,"dw":true,"si":2,"rm":false,"qn":0},{"a":4,"re":2}],"b":{},"c":{},"z":{},"ed":true} \ No newline at end of file diff --git a/public/models/01changfang/scene/scene.json b/public/models/01changfang/scene/scene.json new file mode 100644 index 0000000..cf045ec --- /dev/null +++ b/public/models/01changfang/scene/scene.json @@ -0,0 +1 @@ +{"a":{"aa":"#ffffff","ab":0.7},"b":{"bb":0.3,"bc":[0,0.7071067811865475,0.7071067811865475],"bv":true,"ba":"#ffffff"},"c":1,"ei":0.7,"e":"04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","f":{"a":0,"b":0,"v":false},"g":{"d":0,"o":0,"v":false},"k":{"b":0,"h":0,"s":0,"v":false},"q":{"c":[],"d":0,"o":1,"r":[],"v":false},"s":{"r":0,"s":0,"v":false},"u":{"r":0,"s":0,"v":false},"v":true,"ea":0,"ca":"1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg","cb":0.5} \ No newline at end of file diff --git a/public/models/01changfang/sceneData/sceneData.json b/public/models/01changfang/sceneData/sceneData.json new file mode 100644 index 0000000..ca6253b --- /dev/null +++ b/public/models/01changfang/sceneData/sceneData.json @@ -0,0 +1 @@ +{"skybox":{"name":"默认","img":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/sky-box/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","blur":3,"visible":true,"brightness":0.5},"image":{"pc":"","mobile":""},"color":"#000000","shadow":{"visible":false,"strength":10,"decay":1,"offset":0},"animation":{"loop":1,"speed":1,"default":null,"hidden":[]},"hotspotStyle":0,"hotspot":[],"rotation":[0,0,0,"XYZ"],"sizeColor":"#FFF","size":"","enablePlan":false,"cameraSetting":{"autoRotation":false,"autoScaleLimit":false,"scaleLimit":[10,400],"polarAngleLimit":[-90,90],"azimuthAngleLimit":[-360,360]},"view":{"position":[-1.4541451476611817,86.61108151820008,134.07239853766015],"target":[0,0,0]}} \ No newline at end of file diff --git a/src/assets/board/logo.png b/src/assets/board/logo.png index ea4dbc7..108e91b 100644 Binary files a/src/assets/board/logo.png and b/src/assets/board/logo.png differ diff --git a/src/assets/model/dataCentre/bg.jpg b/src/assets/model/dataCentre/bg.jpg new file mode 100644 index 0000000..0c357cf Binary files /dev/null and b/src/assets/model/dataCentre/bg.jpg differ diff --git a/src/layout/boardIndex.vue b/src/layout/boardIndex.vue index 4a1417e..ba41037 100644 --- a/src/layout/boardIndex.vue +++ b/src/layout/boardIndex.vue @@ -61,9 +61,9 @@ export default { background-repeat: no-repeat; background-size: 100% 100%; width: 8vw; - height:4vw; + height:3vw; position: absolute; - top: -1%; + top: 1%; left: 1%; } diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue index 7216ebc..886b444 100644 --- a/src/views/board/foaming/index.vue +++ b/src/views/board/foaming/index.vue @@ -476,6 +476,12 @@ export default { Chart }, name: "Liner", + props: { + id: { + type: String, + default: '' + } + }, data() { return { show: true, @@ -1160,8 +1166,8 @@ export default { e: 'fp-2-05', i: "SCADA_INV_STATS_01('')", f: (e) => { - this.scrollTableData1 = e.slice(0, 6) - this.scrollTableData2 = e.slice(6, 12) + this.scrollTableData1 = e.slice(0, 6) + this.scrollTableData2 = e.slice(6, 12) } }, { @@ -1580,11 +1586,11 @@ export default { this.show = !this.show }, 30 * 1000) console.log(this.$route.query.id) - if (this.$route.query.id === '1') { + if (this.$route.query.id === '1' && this.id === '1') { this.RequestDataSet.forEach(val => { mixData(val) }) - } else if (this.$route.query.id === '2') { + } else if (this.$route.query.id === '2' && this.id === '2') { this.RequestDataSet1.forEach(val => { mixData(val) }) diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue index 17baa7d..b93e42b 100644 --- a/src/views/dashboard/LineChart.vue +++ b/src/views/dashboard/LineChart.vue @@ -8,6 +8,7 @@ import * as echarts from 'echarts'; require('echarts/theme/macarons') // echarts theme import resize from './mixins/resize' +const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100 export default { mixins: [resize], props: { @@ -142,6 +143,18 @@ export default { // } } }, + label: { + normal: { + show: true, + position: "top", + textStyle: { + color: "#a8aab0", + fontStyle: "normal", + fontFamily: "微软雅黑", + fontSize: 0.75 * vw, + }, + }, + }, data: expectedData, animationDuration: 1000, animationEasing: 'quadraticOut' @@ -151,6 +164,18 @@ export default { smooth: false, type: 'bar', barMaxWidth:60, + label: { + normal: { + show: true, + position: "top", + textStyle: { + color: "#a8aab0", + fontStyle: "normal", + fontFamily: "微软雅黑", + fontSize: 0.75 * vw, + }, + }, + }, itemStyle: { normal: { color: '#9fe080', diff --git a/src/views/login.vue b/src/views/login.vue index 785ceb3..163bfd7 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -164,9 +164,9 @@ export default { background-repeat: no-repeat; background-size: 100% 100%; width: 8vw; - height: 4vw; + height: 3vw; position: absolute; - top: -1%; + top: 1%; left: 1%; } diff --git a/src/views/model/boardIndex.vue b/src/views/model/boardIndex.vue index 7c992ec..39229c2 100644 --- a/src/views/model/boardIndex.vue +++ b/src/views/model/boardIndex.vue @@ -3,7 +3,7 @@
- + @@ -77,7 +77,7 @@ export default { }, methods: { exitFun() { - this.exit() + this.exit(true) } } } @@ -120,9 +120,9 @@ export default { background-repeat: no-repeat; background-size: 100% 100%; width: 8vw; - height: 4vw; + height:3vw; position: absolute; - top: -1%; + top: 1%; left: 1%; } diff --git a/src/views/model/dataCentre.vue b/src/views/model/dataCentre.vue index d8634e4..ef5349d 100644 --- a/src/views/model/dataCentre.vue +++ b/src/views/model/dataCentre.vue @@ -1,44 +1,16 @@ diff --git a/src/views/model/factoryIntroduction.vue b/src/views/model/factoryIntroduction.vue index 856ba91..4f6c57a 100644 --- a/src/views/model/factoryIntroduction.vue +++ b/src/views/model/factoryIntroduction.vue @@ -13,14 +13,14 @@
一 园 三 中 心

1. 澳柯玛中国区智能制造中心,大规模冷柜生产基地

2. 华中营销中心,辐射晋、陕、甘、皖、鄂、川、渝等

-

3. 华中仓储物流中心,构建统一的物流产业体系智能产业园建成后,形成集生产、销售、仓储物流一体化

+

3. 华中仓储物流中心,构建统一的物流产业体系
智能产业园建成后,形成集生产、销售、仓储物流一体化

技 术 应 用
-

澳云数智自主可控工业互联网平台、数字孪生、大数据分析、 - MES、SCADA、质量分析SPC、能源管理EMS - 混流自动成型钣金线、双进双出高效直线发泡、工业机器人 +

澳云数智自主可控工业互联网平台、数字孪生、大数据分析、
+ MES、SCADA、质量分析SPC、能源管理EMS
+ 混流自动成型钣金线、双进双出高效直线发泡、工业机器人
采用行业领先的R134a混合多元醇发泡体系,产品节能环保

diff --git a/src/views/model/model.vue b/src/views/model/model.vue index b182346..d2d642f 100644 --- a/src/views/model/model.vue +++ b/src/views/model/model.vue @@ -3,6 +3,7 @@
+
河南澳柯玛智能制造中心
@@ -20,39 +21,39 @@
-
数据中心
+
大数据中心
-
- -
现场直播
-
-
-
工艺流程
- - - - - - - - - - - - - - - - - - + +
+ +
现场直播
+
+
+ + + + + + + + + + + + + + + + + +
@@ -145,7 +146,7 @@ export default { }, data() { return { - params:'', + params: '', viewer: null, show: '', show1: false, @@ -188,7 +189,7 @@ export default { height: 4, bgColor: '#2f5597', text: '箱壳
自动成型', - link: 'caseShell2', + link: 'caseShell', }, { top: 35, @@ -217,7 +218,7 @@ export default { height: 4, bgColor: '#f4b183', text: '壳胆
组装', - link: 'caseShell2', + link: 'caseShell', }, { top: 17, @@ -225,8 +226,8 @@ export default { width: 6, height: 4, bgColor: '#7f7f7f', - text: '箱体
预装', - link: 'caseShell2', + text: '预装
箱体库', + link: 'caseShell', }, { top: 17, @@ -252,7 +253,7 @@ export default { width: 6, height: 4, bgColor: '#7f7f7f', - text: '发泡箱体库', + text: '发泡
箱体库', }, { top: 17, @@ -563,8 +564,8 @@ export default { // } const viewer = new AMRT.Viewer('container', {offline: true}) viewer.sceneManager.setBackground('http://10.100.72.10:8900/docs/img/bg.jpg') - viewer.controls.setTarget(274.6358405397289, -37.33559004514912, -36.790464998609494) - viewer.controls.setPosition(269.40613433119415, 1031.916487517178, 1606.6479803575144) + viewer.controls.setTarget(321.2619851034551, -68.14384719285539, -14.54458931238174) + viewer.controls.setPosition(324.86156622859767, 1621.3543644968465, 1351.2054516306407) let modelArr = [ @@ -676,26 +677,27 @@ export default { ] let num = 10 - const setModel = (e,i)=>{ - modelArr.slice(e,i).forEach(val => { - viewer.loadModel(val, { + const setModel = (e, i) => { + modelArr.slice(e, i).forEach(val => { + viewer.loadModel(val, { background: false, focus: false, offline: true, onLoad: function (m) { num += 1 - if(num < modelArr.length){ - setModel(num,num+1) + if (num < modelArr.length) { + setModel(num, num + 1) } m.on('click', function () { + console.log(val) }) } }) }) } - // setModel(0,10) - viewer.operator.enabled = true + setModel(0, 10) + // viewer.operator.enabled = true // setInterval(() => { // console.log(viewer.controls.getView()) @@ -717,18 +719,23 @@ export default { this.show1 = false } }, - exit() { + exit(val) { this.show = '' + if (val) { + this.show1 = true + } }, setNowFlowIndex(k) { this.nowFlowIndex = k }, toLink(e) { - this.show1 = false - console.log(e) - // e.link && this.$router.push(e.link) - this.show = 'board' - this.params = e.link + if (e.link) { + this.show1 = false + console.log(e) + // e.link && this.$router.push(e.link) + this.show = 'board' + this.params = e.link + } } } }; @@ -745,6 +752,16 @@ export default { margin: 0 auto; } +.headTitle { + position: absolute; + top: 5%; + left: 50%; + transform: translate(-50%, -100%); + font-size: 1.5vw; + color: #d6eaed; + letter-spacing: 10px; +} + .container { overflow: hidden; background-image: url("../../assets/model/model/bg.jpg"); @@ -874,7 +891,8 @@ export default { } } } -.whiteSpan{ - color:white; + +.whiteSpan { + color: white; } diff --git a/src/views/register.vue b/src/views/register.vue index ce896f4..e5e4afb 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -154,9 +154,9 @@ export default { background-repeat: no-repeat; background-size: 100% 100%; width: 8vw; - height:4vw; + height:3vw; position: absolute; - top: -1%; + top: 1%; left: 1%; } .register {