+
+
{{ op.name }}
{{ op.name }}
-
+
@@ -53,17 +50,19 @@
-
-
+
+
-
-
+
+
@@ -191,6 +190,15 @@ const inventoryList = [
{
eqName: ' 螺丝刀', eqCode: '备件库', level: '', product: ' 123', productCode: 'WLXX20220919000147', unit: '个', time: '2023年9月10日'
},
+ {
+ eqName: ' 清洗剂', eqCode: '备件库', level: '200mm', product: ' 123', productCode: 'WLXX20220919000147', unit: '瓶', time: '2023年9月10日'
+ },
+ {
+ eqName: ' 清洗剂', eqCode: '备件库', level: '200mm', product: ' 123', productCode: 'WLXX20220919000147', unit: '瓶', time: '2023年9月10日'
+ },
+ {
+ eqName: ' 清洗剂', eqCode: '备件库', level: '200mm', product: ' 123', productCode: 'WLXX20220919000147', unit: '瓶', time: '2023年9月10日'
+ },
{
eqName: ' 清洗剂', eqCode: '备件库', level: '200mm', product: ' 123', productCode: 'WLXX20220919000147', unit: '瓶', time: '2023年9月10日'
}
@@ -267,6 +275,39 @@ export default {
inventoryTableProps,
inventoryList,
locationList,
+ taskConfig: {
+ header: ['序号', '作业号', '执行叉车', '库位', '成品规格', '成品编码', '时间'],
+ headerBGC: 'rgba(32, 55, 96, 0.8)',
+ oddRowBGC: 'rgba(32, 55, 96, 0.8)',
+ evenRowBGC: 'rgba(14, 32, 62, 0.8)',
+ columnWidth: [80, 120, 90, 140, 140, 150,130],
+ align: ['center'],
+ data: [],
+ // index:true,
+ rowNum: 10
+ },
+ inventoryConfig: {
+ header: ['序号', '物件名称', '存放区域', '规格', '数量', '单位', '编码', '入库时间'],
+ headerBGC: 'rgba(32, 55, 96, 0.8)',
+ oddRowBGC: 'rgba(32, 55, 96, 0.8)',
+ evenRowBGC: 'rgba(14, 32, 62, 0.8)',
+ columnWidth: [80, 100, 90, 140, 80, 70, 180, 120],
+ align: ['center'],
+ data: [],
+ // index:true,
+ rowNum: 10
+ },
+ locationConfig: {
+ header: ['序号', '库位名称', '存放物件名称', '数量', '存放位置', '编码', '单位', '入库时间'],
+ headerBGC: 'rgba(32, 55, 96, 0.8)',
+ oddRowBGC: 'rgba(32, 55, 96, 0.8)',
+ evenRowBGC: 'rgba(14, 32, 62, 0.8)',
+ columnWidth: [80, 100, 120, 80, 100, 180, 70, 120],
+ align: ['center'],
+ data: [],
+ // index:true,
+ rowNum: 10
+ },
locationTableProps,
qualityYearList,
isFullScreen: false,
@@ -294,6 +335,20 @@ export default {
{
name: '作业号RQ20230911',
outRate: '0.4'
+ },
+ {
+ name: '作业号RQ20230911',
+ outRate: '0.4'
+ },
+ {
+ name: '作业号RQ20230911',
+ outRate: '0.4'
+ }, {
+ name: '作业号RQ20230911',
+ outRate: '0.4'
+ }, {
+ name: '作业号RQ20230911',
+ outRate: '0.4'
}
],
// qualityTableProps1,
@@ -316,6 +371,16 @@ export default {
},
watch: {
+ isFullScreen: function (val) {
+ if (val) {
+ const _this = this;
+ _this.beilv2 = document.documentElement.clientWidth / 1920
+ console.log(_this.beilv2);
+ } else {
+ const _this = this;
+ _this.beilv2 = document.documentElement.clientWidth / 1920
+ }
+ },
clientWidth(val) {
if (!this.timer) {
this.clientWidth = val
@@ -343,6 +408,9 @@ export default {
}, 86400000)
},
mounted() {
+ this.getTask()
+ this.getInventoryData()
+ this.getLocationData()
const _this = this;
window.onresize = () => {
return (() => {
@@ -355,6 +423,60 @@ export default {
getTimes() {
setInterval(this.getTimesInterval, 1000);
},
+ getTask() {
+ let eqArr = this.qualityYearList.map((item, index) => [
+ `
${index + 1 || ''}
+ `,
+ // formatDate(item.planStartTime) || '',
+ `
+
${item.eqName || ''}
+ `,
+ `
${item.eqCode || ''}`,
+ `
${item.level || ''}`,
+ `
${item.product || ''}`,
+ `
${item.productCode || ''}`,
+ `
${item.time || ''}`,
+
+ ])
+ this.taskConfig.data = eqArr
+ this.$refs['taskScrollBoard'].updateRows(eqArr)
+ },
+ getInventoryData() {
+ let eqArr = this.inventoryList.map((item, index) => [
+ `
${index + 1 || ''}
+ `,
+ // formatDate(item.planStartTime) || '',
+ `
+
${item.eqName || ''}
+ `,
+ `
${item.eqCode || ''}`,
+ `
${item.level || ''}`,
+ `
${item.product || ''}`,
+ `
${item.unit || ''}`,
+ `
${item.productCode || ''}`,
+ `
${item.time || ''}`,
+ ])
+ this.inventoryConfig.data = eqArr
+ this.$refs['inventoryScrollBoard'].updateRows(eqArr)
+ },
+ getLocationData() {
+ let eqArr = this.locationList.map((item, index) => [
+ `
${index + 1 || ''}
+ `,
+ // formatDate(item.planStartTime) || '',
+ `
+
${item.eqName || ''}
+ `,
+ `
${item.eqCode || ''}`,
+ `
${item.product || ''}`,
+ `
${item.level || ''}`,
+ `
${item.productCode || ''}`,
+ `
${item.unit || ''}`,
+ `
${item.time || ''}`,
+ ])
+ this.locationConfig.data = eqArr
+ this.$refs['locationScrollBoard'].updateRows(eqArr)
+ },
getTimesInterval: function () {
let _this = this;
let year = new Date().getFullYear(); //获取当前时间的年份
@@ -401,7 +523,7 @@ export default {
})
return false
}
- screenfull.toggle(this.$refs.container)
+ screenfull.toggle()
}
}
}
@@ -428,22 +550,22 @@ export default {
letter-spacing: 8px;
// word-spacing: 8px;
position: relative;
- .unit{
- position: absolute;
- left: 240px;
- top:25px;
- color: rgba($color: #ffffff, $alpha: 8);
- font-size: 20px;
- letter-spacing: 0px;
- }
- .time{
- position: absolute;
- left: 1400px;
- top:25px;
- color: rgba($color: #ffffff, $alpha: 8);
- font-size: 20px;
- letter-spacing: 0px;
- }
+ .unit {
+ position: absolute;
+ left: 240px;
+ top: 25px;
+ color: rgba(255, 255, 255, 0.80);
+ font-size: 20px;
+ letter-spacing: 0px;
+ }
+ .time {
+ position: absolute;
+ left: 1400px;
+ top: 25px;
+ color: rgba(255, 255, 255, 0.80);
+ font-size: 20px;
+ letter-spacing: 0px;
+ }
.title-button {
color: #00fff0;
font-size: 20px;
@@ -495,7 +617,9 @@ export default {
// .container-main {
// padding: 5px;
// }
-
+.order::-webkit-scrollbar{
+ display: none
+}
diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue
index eca5e055..d95119ec 100644
--- a/src/views/OperationalOverview/components/doubleYChart .vue
+++ b/src/views/OperationalOverview/components/doubleYChart .vue
@@ -1,7 +1,7 @@
@@ -112,7 +112,7 @@ export default {
}
// barBorderRadius: this.borderRadius
},
- barWidth: 12,
+ barWidth: 18,
data: outputNumList
},
{
@@ -166,7 +166,7 @@ export default {
type: 'cross'
}
},
- grid: { top: 90, right: 60, bottom: 20, left: 90, containLabel: true },
+ grid: { top: 90, right: 60, bottom: 20, left: 20, containLabel: true },
legend: {
itemWidth: 10,
itemHeight: 10,
diff --git a/src/views/OperationalOverview/components/linearBarChart.vue b/src/views/OperationalOverview/components/linearBarChart.vue
index 4ab80845..e7070a9f 100644
--- a/src/views/OperationalOverview/components/linearBarChart.vue
+++ b/src/views/OperationalOverview/components/linearBarChart.vue
@@ -118,7 +118,7 @@ export default {
}
// barBorderRadius: this.borderRadius
},
- barWidth: 12,
+ barWidth: 18,
}]
// }
// if (nameList.length !== 0) {
@@ -132,7 +132,7 @@ export default {
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
}
},
- grid: { top: 90, right: 60, bottom: 20, left: 90, containLabel: true },
+ grid: { top: 90, right: 60, bottom: 20, left: 30, containLabel: true },
// legend: {
// itemWidth: 10,
// itemHeight: 10,
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
index a725646f..9f5f57fa 100644
--- a/src/views/OperationalOverview/components/pileBarChart.vue
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -1,7 +1,7 @@
@@ -102,7 +102,7 @@ export default {
}
totalData.push(sum);
}
- console.log('total', totalData);
+ console.log('total', totalData)
this.chart = echarts.init(document.getElementById(this.id))
const series = [
'良品',
@@ -116,11 +116,11 @@ export default {
name,
type: 'bar',
stack: 'total',
- barWidth: 10,
- label: {
- show: true,
- formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
- },
+ barWidth: 12,
+ // label: {
+ // show: true,
+ // formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
+ // },
color:colors[sid],
data: rawData.length != 0 ? rawData[sid].map((d, did) =>
totalData[did] <= 0 ? 0 : d / totalData[did]
@@ -136,6 +136,13 @@ export default {
// })
this.chart.setOption({
legend: {
+ formatter: function (name) {
+ //通过name获取到数组对象中的单个对象
+ let singleData = series.filter(function (item) {
+ return item.name == name
+ })
+ return name + parseFloat((singleData[0].data * 100).toFixed(3)) + '%'
+ },
itemWidth: 12,
itemHeight: 12,
bottom: '20',
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 9adcb6ed..5f1dd7c6 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
- * @LastEditTime: 2024-03-27 16:13:14
+ * @LastEditTime: 2024-03-28 15:31:07
* @Description:
-->
@@ -16,7 +16,7 @@
许昌安彩深加工看板
单位：河南汇融数字科技有限公司
{{ times }}
-
@@ -27,10 +27,8 @@
-
-
@@ -39,11 +37,12 @@
-
+
@@ -250,6 +249,16 @@ export default {
},
watch: {
+ isFullScreen: function (val) {
+ if (val) {
+ const _this = this;
+ _this.beilv2 = document.documentElement.clientWidth / 1920
+ console.log(_this.beilv2);
+ } else {
+ const _this = this;
+ _this.beilv2 = document.documentElement.clientWidth / 1920
+ }
+ },
clientWidth(val) {
if (!this.timer) {
this.clientWidth = val
@@ -294,15 +303,16 @@ export default {
id: '4',
name: '测试工单4',
progressRate: 0.32323
- }, {
- id: '5',
- name: '测试工单',
- progressRate: 0.5555
- }, {
- id: '6',
- name: '测试工单',
- progressRate: 0.66564
- },
+ }
+ // {
+ // id: '5',
+ // name: '测试工单',
+ // progressRate: 0.5555
+ // }, {
+ // id: '6',
+ // name: '测试工单',
+ // progressRate: 0.66564
+ // },
]
this.orderList = detData.map((ele, index) => {
if (ele.progressRate && ele.progressRate != 1) {
@@ -685,7 +695,7 @@ export default {
})
return false
}
- screenfull.toggle(this.$refs.container)
+ screenfull.toggle()
}
}
}
@@ -712,18 +722,17 @@ export default {
position: absolute;
left: 290px;
top: 25px;
- letter-spacing: 0px;
- color: rgba($color: #ffffff, $alpha: 8);
+ color: rgba(255, 255, 255, 0.80);
font-size: 20px;
+ letter-spacing: 0px;
}
-
.time {
position: absolute;
left: 1360px;
+ color: rgba(255, 255, 255, 0.80);
top: 25px;
- letter-spacing: 0px;
- color: rgba($color: #ffffff, $alpha: 8);
font-size: 20px;
+ letter-spacing: 0px;
}
.title-button {
color: #00fff0;
@@ -836,6 +845,9 @@ export default {
margin-left: 3em;
}
}
+.order::-webkit-scrollbar {
+ display: none
+}