@@ -88,6 +88,9 @@
+
+
+
内胆库剩余:{{ linerNum }}% 箱壳库剩余:{{ caseNum }}%
@@ -108,11 +111,12 @@ export default {
return {
linerNum: 50,
caseNum: 44,
- meter:30,
+ meter: 30,
title: [
'工单计划',
'小时统计',
'库存统计',
+ '型号统计',
'发泡夹具状态',
],
titlePosition: [
@@ -125,12 +129,16 @@ export default {
left: 53
},
{
- top: 60,
+ top: 70.5,
left: 5.5
},
{
- top: 60,
- left: 53
+ top: 70.5,
+ left: 36.7
+ },
+ {
+ top: 70.5,
+ left: 68.5
},
],
team: '白班',
@@ -152,7 +160,7 @@ export default {
}
},
mounted() {
- getData().then(e=>{
+ getData().then(e => {
this.scrollTableData = e.table1
this.$refs.chart1.setData({
tooltip: {
@@ -271,7 +279,7 @@ export default {
containLabel: true,
},
legend: {
- data: e.chart2.y.map(val=>val.name),
+ data: e.chart2.y.map(val => val.name),
right: 'center',
top: 0,
textStyle: {
@@ -357,6 +365,75 @@ export default {
],
})
this.$refs.chart3.setData({
+ tooltip: {
+ trigger: "axis",
+ axisPointer: {
+ // 坐标轴指示器，坐标轴触发有效
+ type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+ },
+ },
+ grid: {
+ left: "0",
+ right: "4%",
+ bottom: "0",
+ top: 20,
+ containLabel: true,
+ },
+ xAxis: {
+ type: "category",
+ data: e.liner.inventoryStatistics.x,
+ axisLine: {
+ lineStyle: {
+ color: "white",
+ },
+ },
+ axisLabel: {
+ // interval: 0,
+ // rotate: 40,
+ textStyle: {
+ fontFamily: "Microsoft YaHei",
+ },
+ },
+ },
+
+ yAxis: {
+ type: "value",
+ axisLine: {
+ show: false,
+ lineStyle: {
+ color: "white",
+ },
+ },
+ splitLine: {
+ show: false,
+ },
+ axisLabel: {},
+ },
+ series: [
+ {
+ name: e.liner.inventoryStatistics.y.name,
+ type: "bar",
+ barWidth: "30%",
+ barMaxWidth: 50,
+ itemStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: "#4adfff",
+ },
+ {
+ offset: 1,
+ color: "#3d7aff",
+ },
+ ]),
+ },
+ },
+ data: e.liner.inventoryStatistics.y.data,
+ },
+ ],
+ })
+ this.$refs.chart4.setData({
legend: {
data: ['运行中'],
right: 'center',
@@ -443,7 +520,7 @@ export default {
diff --git a/src/views/board/week/index.vue b/src/views/board/week/index.vue
index f4e9f77..54a87fb 100644
--- a/src/views/board/week/index.vue
+++ b/src/views/board/week/index.vue
@@ -98,6 +98,9 @@
+
+
+
@@ -915,7 +918,7 @@ export default {
"{a|" +
params.value +
"%}" +
- "\n{b|终检}"
+ "\n{b|测温}"
);
},
position: "center",
@@ -951,6 +954,85 @@ export default {
},
],
})
+ this.$refs.equipmentPowerSix.setData({
+ series: [
+ {
+ type: "pie",
+ clockWise: false,
+ radius: ['60%', '75%'],
+ itemStyle: {
+ normal: {
+ label: {
+ show: false,
+ },
+ labelLine: {
+ show: false,
+ },
+ shadowBlur: 0,
+ shadowColor: "#5d73ff",
+ },
+ },
+ hoverAnimation: false,
+ center: ["50%", "50%"],
+ data: [
+ {
+ value: 50,
+ label: {
+ normal: {
+ rich: {
+ a: {
+ color: "#5d73ff",
+ align: "center",
+ fontSize: 1.1 * vw,
+ fontWeight: "bold",
+ },
+ b: {
+ color: "#fff",
+ align: "center",
+ fontSize: 0.5 * vw,
+ },
+ },
+ formatter: function (params) {
+ return (
+ "{a|" +
+ params.value +
+ "%}" +
+ "\n{b|终检}"
+ );
+ },
+ position: "center",
+ show: true,
+ textStyle: {
+ fontSize: "14",
+ fontWeight: "normal",
+ color: "#fff",
+ },
+ },
+ },
+ itemStyle: {
+ normal: {
+ color: "#5d73ff",
+ shadowColor: "#5d73ff",
+ shadowBlur: 0,
+ },
+ },
+ },
+ {
+ value: 50,
+ name: "invisible",
+ itemStyle: {
+ normal: {
+ color: "#412a4e",
+ },
+ emphasis: {
+ color: "#412a4e",
+ },
+ },
+ },
+ ],
+ },
+ ],
+ })
this.day()
},
methods: {
@@ -1059,7 +1141,7 @@ export default {
.equipmentPowerFour {
position: absolute;
- width: 19%;
+ width: 13%;
height: 16%;
top: 76%;
left: 30.5%;
@@ -1067,10 +1149,18 @@ export default {
.equipmentPowerFive {
position: absolute;
- width: 19%;
+ width: 13%;
height: 16%;
top: 76%;
- left: 49.5%;
+ left: 43.5%;
+}
+
+.equipmentPowerSix {
+ position: absolute;
+ width: 13%;
+ height: 16%;
+ top: 76%;
+ left: 56.5%;
}
.scrollTableItem {
diff --git a/src/views/model/model.vue b/src/views/model/model.vue
index b90d489..a493672 100644
--- a/src/views/model/model.vue
+++ b/src/views/model/model.vue
@@ -109,24 +109,28 @@ export default {
appsecret: 'rXmhoLAiOPNKzbl7g2qxCV8tFwRdYuZM'
}
const viewer = new AMRT.Viewer('container', param)
- console.log(AMRT)
+ 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',
- // '1720315479907766272',
- // '1720315484513112064',
- // '1720315500866703360',
- // '1720315558030872576',
- // '1720315596551360512',
- // '1720315644550975488',
- // '1720315648946606080',
- // '1720315687114772480',
- // '1720315691422322688',
- // '1720315722275622912',
- // '1720315729129115648',
- // '1720315768454909952',
- // '1720316275214913536',
- // '1720316297822212096',
+ '1720315475507941376',
+ '1720315479907766272',
+ '1720315484513112064',
+ '1720315500866703360',
+ '1720315558030872576',
+ '1720315596551360512',
+ '1720315644550975488',
+ '1720315648946606080',
+ '1720315687114772480',
+ '1720315691422322688',
+ '1720315722275622912',
+ '1720315729129115648',
+ '1720315768454909952',
+ '1720316275214913536',
+ '1720316297822212096',
]
modelArr.forEach(e => {
let model = viewer.loadModel(e, {
@@ -139,21 +143,30 @@ export default {
alert('加载完成');
}
m.on('click', function () {
- // console.log(this)
- // console.log(m)
- // let clickModel = model.getObjectById(this)
- // console.log(clickModel)
- // alert(`${e}`)
- // viewer.operator.restore()
- // viewer.operator.translucenceOthers(this.viewer)
+ console.log(m)
+ console.log(e)
+ console.log(m.getObjectById)
})
}
})
})
+ // viewer.container.addEventListener( 'click', e => {
+ // //通过鼠标拾取模型对象
+ // let object = viewer.picker.intersectObject( e )
+ // if( object ){
+ // console.log( '当前选中模型', object.object )
+ // viewer.operator.restore()
+ // viewer.operator.translucenceOthers(object)
+ // viewer.operator.translucenceOthers(object.object)
+ // }
+ // })
viewer.controls.setTarget(26.3, -19.8, -82)
viewer.controls.setPosition(31, 1721, 584)
viewer.operator.enabled = true
+ // 灯光
+ viewer.sceneManager.setLightness(1)
+
// viewer.controls.startAutoRotate(1)
},
methods: {