diff --git a/src/assets/board/logo.png b/src/assets/board/logo.png new file mode 100644 index 0000000..ea4dbc7 Binary files /dev/null and b/src/assets/board/logo.png differ diff --git a/src/layout/boardIndex.vue b/src/layout/boardIndex.vue index 4ae6eed..4a1417e 100644 --- a/src/layout/boardIndex.vue +++ b/src/layout/boardIndex.vue @@ -3,6 +3,7 @@
{{ time }}
{{ date }}
+ @@ -55,4 +56,14 @@ export default { top: 3.2%; left: 94.1%; } +.logo{ + background-image: url("../assets/board/logo.png"); + background-repeat: no-repeat; + background-size: 100% 100%; + width: 8vw; + height:4vw; + position: absolute; + top: -1%; + left: 1%; +} diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue index 280b36b..5ce0e69 100644 --- a/src/views/board/foaming/index.vue +++ b/src/views/board/foaming/index.vue @@ -1,6 +1,6 @@ @@ -133,21 +127,7 @@ export default { name: "Liner", data() { return { - selectOptions: [ - { - value: '1', - label: '老线' - }, - { - value: '2', - label: '新线' - }, - { - value: '3', - label: '合计' - }, - ], - selectValue: '2', + selectValue: '1', title: [ '产量统计', '三日订单执行情况', @@ -601,7 +581,7 @@ export default { b: { color: "#fff", align: "center", - fontSize: 0.5 * vw, + fontSize: 0.9 * vw, }, }, formatter: function (params) { @@ -680,7 +660,7 @@ export default { b: { color: "#fff", align: "center", - fontSize: 0.5 * vw, + fontSize: 0.9 * vw, }, }, formatter: function (params) { @@ -759,7 +739,7 @@ export default { b: { color: "#fff", align: "center", - fontSize: 0.5 * vw, + fontSize: 0.9 * vw, }, }, formatter: function (params) { @@ -838,7 +818,7 @@ export default { b: { color: "#fff", align: "center", - fontSize: 0.5 * vw, + fontSize: 0.9 * vw, }, }, formatter: function (params) { @@ -917,7 +897,7 @@ export default { b: { color: "#fff", align: "center", - fontSize: 0.5 * vw, + fontSize: 0.9 * vw, }, }, formatter: function (params) { @@ -996,7 +976,7 @@ export default { b: { color: "#fff", align: "center", - fontSize: 0.5 * vw, + fontSize: 0.9 * vw, }, }, formatter: function (params) { @@ -1179,7 +1159,7 @@ export default { text-overflow: ellipsis; text-align: center; display: inline-block; - width: calc(100% / 7); + width: calc(100% / 6); } .totalNum { @@ -1191,10 +1171,25 @@ export default { font-size: 0.8vw; } +.info1 { + position: absolute; + top: 11.5%; + left: 44.5%; + transform: translateY(-50%); + color: #fff; + font-size: 0.8vw; +} + .classSelect { position: absolute; - top: 6%; - left: 4%; - width: 5vw; + top: 1%; + left: 15%; +} +.el-radio{ + color: #fff !important; +} +.el-button{ + background:#00000000 !important; + color: #fff !important; } diff --git a/src/views/model/model.vue b/src/views/model/model.vue index 67e786c..466fcbe 100644 --- a/src/views/model/model.vue +++ b/src/views/model/model.vue @@ -1,71 +1,88 @@ @@ -100,6 +117,394 @@ export default { return { viewer: null, show: '', + show1: false, + nowFlowIndex: null, + flowItemOptions: [ + // 一层 + { + top: 2, + left: 1, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '内胆自助成型' + }, + { + top: 2, + left: 9.3, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '内胆预装' + }, + { + top: 2, + left: 17.6, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '内胆集存库' + }, + + // 二层 + { + top: 35, + left: 1, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '箱壳自动成型' + }, + { + top: 35, + left: 9.3, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '箱壳预装' + }, + { + top: 35, + left: 17.6, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '箱壳集存库' + }, + + // 一二合 + { + top: 17, + left: 25.9, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '壳胆组装' + }, + { + top: 17, + left: 34.2, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '箱体预装' + }, + { + top: 17, + left: 42.5, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '箱体发泡' + }, + { + top: 17, + left: 50.8, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '门体安装' + }, + { + top: 17, + left: 59.1, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '发泡箱体库' + }, + { + top: 17, + left: 67.4, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '焊接' + }, + { + top: 17, + left: 75.7, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '抽空灌注' + }, + { + top: 17, + left: 84, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '性能检测' + }, + { + top: 17, + left: 92.3, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '包装入库' + }, + + // 三层 + { + top: 68, + left: 1, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '门壳自动成型' + }, + { + top: 68, + left: 17.6, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '门壳预装' + }, + { + top: 68, + left: 34.2, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '门体发泡' + }, + { + top: 68, + left: 50.8, + width: 6, + height: 4, + bgColor: '#00aa00', + text: '箱、门匹配输送' + } + ], + wireOptions: [ + // 一层 + { + top: 15, + left: 7, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 15, + left: 15.3, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 15, + left: 23.6, + width: 1, + height: 0.25, + bgColor: '#4472c4', + }, + + // 二层 + { + top: 48, + left: 7, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 48, + left: 15.3, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 48, + left: 23.6, + width: 1, + height: 0.25, + bgColor: '#4472c4', + }, + + // 一二合 + { + top: 31, + left: 24.6, + width: 1, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 31, + left: 31.9, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 31, + left: 40.2, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 31, + left: 48.5, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 31, + left: 56.8, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 31, + left: 65.1, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 31, + left: 73.4, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 31, + left: 81.7, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 31, + left: 90, + width: 2, + height: 0.25, + bgColor: '#4472c4', + }, + + // 三层 + { + top: 80, + left: 7, + width: 10, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 80, + left: 23.6, + width: 10, + height: 0.25, + bgColor: '#4472c4', + }, + { + top: 80, + left: 40.2, + width: 10, + height: 0.25, + bgColor: '#4472c4', + }, + ], + wireOptions1: [ + { + top: 15, + left: 24.6, + width: 0.25, + height: 5, + bgColor: '#4472c4', + }, + { + top: 46.1, + left: 54.2, + width: 0.25, + height: 3.3, + bgColor: '#4472c4', + }, + ], + arrowsOptions: [ + + // 一层 + { + top: 13, + left: 8.5, + }, + { + top: 13, + left: 16.8, + }, + + // 二层 + { + top: 46.3, + left: 8.5, + }, + { + top: 46.3, + left: 16.8, + }, + + // 一二合 + { + top: 29.3, + left: 25.1, + }, + { + top: 29.3, + left: 33.4, + }, + { + top: 29.3, + left: 41.7, + }, + { + top: 29.3, + left: 50, + }, + { + top: 29.3, + left: 58.3, + }, + { + top: 29.3, + left: 66.6, + }, + { + top: 29.3, + left: 74.9, + }, + { + top: 29.3, + left: 83.2, + }, + { + top: 29.3, + left: 91.5, + }, + + // 三层 + { + top: 78.2, + left: 16.8, + }, + { + top: 78.2, + left: 33.4, + }, + { + top: 78.2, + left: 50, + }, + ] } }, async mounted() { @@ -109,11 +514,6 @@ export default { appsecret: 'rXmhoLAiOPNKzbl7g2qxCV8tFwRdYuZM' } const viewer = new AMRT.Viewer('container', param) - console.log(viewer) - console.log(viewer.core) - console.log(viewer.core?.Object3D) - // const gui = new dat.GUI() - // console.log(gui) let num = 0 let modelArr = [ // '1720315475507941376', @@ -147,8 +547,8 @@ export default { // '1730412089115283456', // '1730412127476387840', // '1730412170082127872', - '1730434866786471936', - '1730434916656746496', + // '1730434866786471936', + // '1730434916656746496', // '1730412271693336576', // '1730412211886755840', @@ -204,9 +604,20 @@ export default { methods: { click1(e) { this.show = e + this.show1 = false + }, + click2() { + if (this.show1 === false) { + this.show1 = true + } else { + this.show1 = false + } }, exit() { this.show = '' + }, + setNowFlowIndex(k) { + this.nowFlowIndex = k } } }; @@ -219,16 +630,16 @@ export default { .container { width: 100vw; - height: 100vh + height: 33.33vw; + //height: 100vh; } .tool { position: absolute; width: 60%; - height: 20vh; - top: 80%; + top: 98%; left: 50%; - transform: translateX(-50%); + transform: translate(-50%, -100%); text-align: center; font-size: 1vw; @@ -243,6 +654,14 @@ export default { overflow: hidden; } +.test { + top: 20%; + width: 100vw; + height: 33.33vw; + //height: 100vh; + position: absolute; +} + .children-enter-active { animation: children-in 1s; } @@ -261,4 +680,76 @@ export default { left: 0; } } + +.flowChart { + width: 96vw; + height: 15vw; + position: absolute; + transform: translateX(-50%); + left: 50%; + top: 1%; + + .flowItem { + position: absolute; + border-radius: 0.5vw; + text-align: center; + color: #fff; + font-size: 1.05vw; + border: 0.25vw solid #fff; + + span { + display: inline-block; + transform: translate(-50%, -50%); + position: absolute; + top: 50%; + left: 50%; + width: 90%; + } + } + + .wire { + position: absolute; + border-radius: 0.15vw; + } + + .wire1 { + position: absolute; + transform: translateX(-100%); + border-radius: 0.15vw; + } + + .arrows { + position: absolute; + width: 0; + height: 0; + border-top: 0.4vw solid transparent; + border-bottom: 0.4vw solid transparent; + border-left: 0.8vw solid #4472c4; + } + + .arrows1 { + position: absolute; + width: 0; + height: 0; + border-left: 0.4vw solid transparent; + border-right: 0.4vw solid transparent; + border-bottom: 0.8vw solid #4472c4; + } + + .wireAnimation { + animation: 2s linear 0s infinite normal none running current_winkle; + } + + @keyframes current_winkle { + 0% { + border: 0.25vw solid #fff; + } + 50% { + border: 0.25vw solid #F70E0E; + } + 100% { + border: 0.25vw solid #fff; + } + } +}