-
+
{{ title }}
+
+
@@ -83,21 +92,39 @@ export default {
data() {
return {
curIndex: 0,
+ time: null,
+ time2:null
// imgUrl: require(`../../../../assets/img/${this.back}.png`),
}
},
created() {
- // console.log(this.back);
- // this.$nextTick(() => {
- // this.$refs.baseContainer.style = `background:url('../../../../assets/img/${this.back}.png') no-repeat;)`
- // })
- // console.log(this.$refs.baseContainer.style)
+ },
+ mounted () {
+ this.time = this.format(new Date().setHours(7,0,0));
+ // console.log(time);
+ //前一天时间
+ this.time2 = this.format(new Date().setHours(7, 0, 0) - 86400000 * 1);
+ console.log(new Date().setHours(7, 0, 0) - 86400000 * 1);
},
methods: {
+ add0(m) {
+ return m < 10 ? '0' + m : m
+ },
+ format(shijianchuo) {
+ //shijianchuo是整数，否则要parseInt转换
+ var time = new Date(shijianchuo);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+ var h = time.getHours();
+ var mm = time.getMinutes();
+ var s = time.getSeconds();
+ return y + '-' + this.add0(m) + '-' + this.add0(d) + ' ' + h + '时'
+ },
changeTab(num) {
this.curIndex = num
this.$emit('tabSelect', num)
- }
+ },
}
}
@@ -198,11 +225,13 @@ export default {
color: #ffffff;
font-size: 24px;
padding: 0.67em;
+ display: flex;
}
.bar-content {
- // padding: 1em;
+ padding: 1em;
flex: 1 auto;
+ position: relative;
}
.no-padding {
diff --git a/src/views/OperationalOverview/components/baseTable.vue b/src/views/OperationalOverview/components/baseTable.vue
index dd9d66f8..877e6d40 100644
--- a/src/views/OperationalOverview/components/baseTable.vue
+++ b/src/views/OperationalOverview/components/baseTable.vue
@@ -1,7 +1,7 @@
@@ -110,12 +110,12 @@ export default {
},
classOption() {
return {
- step: 0.3, // 数值越大速度滚动越快
- limitMoveNum: 1, // 开始无缝滚动的数据量 this.list
+ step: 0.2, // 数值越大速度滚动越快
+ limitMoveNum: 10, // 开始无缝滚动的数据量 this.list
hoverStop: true, // 是否开启鼠标悬停stop
direction: 1, // 0向下 1向上 2向左 3向右
openWatch: true, // 开启数据实时监控刷新dom
- singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+ singleHeight: 0/1, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
waitTime: 1000, // 单步运动停止的时间(默认值1000ms)
};
diff --git a/src/views/OperationalOverview/components/coldDoubleYChart.vue b/src/views/OperationalOverview/components/coldDoubleYChart.vue
new file mode 100644
index 00000000..b8e4ebba
--- /dev/null
+++ b/src/views/OperationalOverview/components/coldDoubleYChart.vue
@@ -0,0 +1,292 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue
index 2ab204d9..2d43f501 100644
--- a/src/views/OperationalOverview/components/doubleYChart .vue
+++ b/src/views/OperationalOverview/components/doubleYChart .vue
@@ -1,13 +1,13 @@
@@ -70,9 +70,9 @@ export default {
mounted() {
console.log('mounted')
console.log('borderRadius: ', this.borderRadius)
- this.$nextTick(() => {
- this.initChart()
- })
+ // this.$nextTick(() => {
+ // this.initChart()
+ // })
},
beforeDestroy() {
if (!this.chart) {
@@ -83,6 +83,7 @@ export default {
},
methods: {
initChart(nameList, passRateList, outputNumList) {
+ console.log(nameList, passRateList)
let series= [
{
name: '产线产量',
@@ -151,11 +152,12 @@ export default {
left: "3%",
right: "5%",
bottom: "3%",
- width: 'auto',
- height: "auto",
containLabel: true
},
legend: {
+ itemWidth: 10,
+ itemHeight: 10,
+ right: '20px',
data: ['产线产量', '产线良品率'],
textStyle: {
fontSize: 12 * this.beilv,
@@ -281,3 +283,8 @@ export default {
}
}
+
diff --git a/src/views/OperationalOverview/components/linearBarChart.vue b/src/views/OperationalOverview/components/linearBarChart.vue
index 449b947b..bf39e572 100644
--- a/src/views/OperationalOverview/components/linearBarChart.vue
+++ b/src/views/OperationalOverview/components/linearBarChart.vue
@@ -173,3 +173,4 @@ export default {
}
}
+
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
index 8aa32129..ecd50270 100644
--- a/src/views/OperationalOverview/components/pileBarChart.vue
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -1,13 +1,13 @@
@@ -133,14 +133,17 @@ export default {
// }
this.chart.setOption({
legend: {
+ // top: '2.5%',
+ // right: '20px',
textStyle: {
color: '#ffffff'
}
},
grid: {
+ top:'80',
left: '3%',
right: '4%',
- bottom: '3%',
+ // bottom: '3%',
width: 'auto',
height: 'auto',
containLabel: true
@@ -213,3 +216,7 @@ export default {
}
}
+
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 73cfe297..28721f07 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-01-12 09:59:58
+ * @LastEditTime: 2024-01-18 13:57:38
* @Description:
-->
@@ -32,22 +32,25 @@
-
+
+
+
-
+
+
-
+
@@ -60,37 +63,15 @@
-->
-
+ {{ op.name }}
+
- {{ op.name }}
-
@@ -99,7 +80,8 @@
-
+
@@ -121,13 +103,13 @@
-
+
-
+
@@ -422,21 +404,26 @@ const qualityYearTableProps = [
]
const qualityYearList = [
- { name: '钢化炉', code: '21321312', status: '运行', error: '否' },
- { name: '磨边机', code: '32323232', status: '运行', error: '否' },
- { name: '镀膜机', code: '32213213', status: '运行', error: '否' },
- { name: '钢化清洗机', code: '21321323', status: '运行', error: '否' },
- { name: '固化机', code: '21321321', status: '运行', error: '否' },
- { name: '磨边清洗机', code: '21321321', status: '运行', error: '否' },
- { name: '预热机', code: '21321321', status: '故障', error: '是' },
- { name: '下片机', code: '21321321', status: '运行', error: '否' },
{
- name: '冷却机', code: '21321321', status: '运行', error: '否' },
+ name: '翻转机', code: 'EQ20240110112358000235', status: '运行', error: '否' },
{
- name: 'A储片机106', code: '21321321', status: '运行', error: '否' },
- { name: '二次清洗机', code: '21321321', status: '运行', error: '否' },
- { name: '二次磨边机', code: '21321321', status: '故障', error: '是' },
- { name: '测试设备', code: '21321321', status: '运行', error: '否' }
+ name: '烘干炉', code: 'EQ20240110112537000241', status: '运行', error: '否' },
+ {
+ name: '清洗机', code: ' EQ20240110112310000232', status: '运行', error: '否' },
+ { name: '钢化清洗机', code: 'EQ20240110111700000208', status: '运行', error: '否' },
+ { name: '固化机', code: 'EQ20240110111700000201', status: '运行', error: '否' },
+ {
+ name: '磨边清洗机', code: ' EQ20240110111700000208', status: '运行', error: '否' },
+ { name: '预热机', code: 'EQ20240110111700000205', status: '故障', error: '是' },
+ { name: '下片机', code: 'EQ20240115151435000279', status: '运行', error: '否' },
+ {
+ name: '冷却机', code: 'EQ20240110111700000203', status: '运行', error: '否' },
+ {
+ name: 'A储片机106', code: 'EQ20240110111700000202', status: '运行', error: '否' },
+ { name: '二次清洗机', code: 'EQ20240110111700000209', status: '运行', error: '否' },
+ {
+ name: '二次磨边机', code: ' EQ20240110110927000181', status: '故障', error: '是' },
+ { name: '测试设备', code: 'EQ20240110111700000201', status: '运行', error: '否' }
]
const qualityMonthTableProps = [
@@ -461,43 +448,43 @@ const qualityMonthList = [
{
productionLineName: 'Y61',
sectionName: '成型',
- count: '199片',
+ count: '3片',
inspectionTypeName: '细长泡'
},
{
productionLineName: 'Y62',
sectionName: '组合落板',
- count: '123片',
+ count: '4片',
inspectionTypeName: '细长泡'
},
{
productionLineName: 'Y61',
sectionName: '磨边',
- count: '212片',
+ count: '6片',
inspectionTypeName: '开口泡'
},
{
productionLineName: 'Y63',
sectionName: '清洗',
- count: '33片',
+ count: '5片',
inspectionTypeName: '结石'
},
{
productionLineName: 'Y64',
sectionName: '打孔',
- count: '332片',
+ count: '2片',
inspectionTypeName: '结石'
},
{
productionLineName: 'Y63',
sectionName: '成型',
- count: '432片',
+ count: '7片',
inspectionTypeName: '开口泡'
},
{
productionLineName: 'Y61',
sectionName: '上片',
- count: '200片',
+ count: '8片',
inspectionTypeName: '结石'
}
]
@@ -547,6 +534,28 @@ export default {
// offsetWidth: null,
qualityYearTableProps,
cxNameList,
+ eqConfig: {
+ header: ['序号', '设备名称', '设备编码', '设备状态', '是否故障'],
+ headerBGC: 'rgba(32, 55, 96, 0.8)',
+ oddRowBGC: 'rgba(32, 55, 96, 0.8)',
+ evenRowBGC: 'rgba(14, 32, 62, 0.8)',
+ columnWidth: [70, 100, 200, 90, 90,],
+ align: ['center'],
+ data: [],
+ // index:true,
+ rowNum: 10
+ },
+ processConfig: {
+ header: ['序号', '产线名称', '工序', '损耗片数', '缺陷类型'],
+ headerBGC: 'rgba(32, 55, 96, 0.8)',
+ oddRowBGC: 'rgba(32, 55, 96, 0.8)',
+ evenRowBGC: 'rgba(14, 32, 62, 0.8)',
+ columnWidth: [70, 130, 100, 120, 110,],
+ align: ['center'],
+ data: [],
+ // index:true,
+ rowNum: 10
+ },
cxDataList,
productLineList:[],
qualityYearList,
@@ -607,8 +616,7 @@ export default {
this.SJGInitWebSocket()
this.getTimes()
this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321])
- this.$refs.productLineChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], ['98', '97', '98.7', '98.5', '98.3',], ['4532', '1223', '3442', '4343', '2232'])
-
+ this.$refs.productLineChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
const _this = this;
_this.beilv2 = document.documentElement.clientWidth / 1920
window.onresize = () => {
@@ -651,13 +659,43 @@ export default {
// console.log('11111', res);
this.productLineList = res.data
})
- // this.$axios.get(
- // 'base/quality-inspection-record/dayStatistics',
- // 'get',
- // ).then((res) => {
- // // console.log('11111', res);
- // this.qualityMonthList = res.data ? res.data : []
- // })
+ this.$axios.get(
+ 'base/quality-inspection-record/dayStatistics',
+ 'get',
+ ).then((res) => {
+ // console.log('11111', res);
+ if (res.data.length !==0) {
+ let processArr = res.data.map((item, index) => [
+ // console.log(item)
+ `
${index + 1 || ''}
+ `,
+ // formatDate(item.planStartTime) || '',
+ `
+
${item.productionLineName || ''}
+ `,
+ `
${item.sectionName || ''}`,
+ `
${item.count || ''}`,
+ `
${item.inspectionTypeName || ''}`,
+ ])
+ this.processConfig.data = processArr
+ this.$refs['processScrollBoard'].updateRows(processArr)
+ } else {
+ let processArr = qualityMonthList.map((item, index) => [
+ // console.log(item)
+ `
${index + 1 || ''}
+ `,
+ // formatDate(item.planStartTime) || '',
+ `
+
${item.productionLineName || ''}
+ `,
+ `
${item.sectionName || ''}`,
+ `
${item.count || ''}`,
+ `
${item.inspectionTypeName || ''}`,
+ ])
+ this.processConfig.data = processArr
+ this.$refs['processScrollBoard'].updateRows(processArr)
+ }
+ })
},
getTimes() {
setInterval(this.getTimesInterval, 1000);
@@ -752,17 +790,31 @@ export default {
});
console.log(this.orderList)
} else if (this.SJGWsData.type === 'equipment') {
- this.equipmentList = this.SJGWsData.detData.map((ele, index) => {
- // if (ele.progressRate != 1) {
- return {
- id: ele.id,
- name: ele.name,
- code: ele.code,
- status: ele.status,
- error: ele.error=== true ? '是' : '否'
- }
- // }
- });
+ // this.equipmentList = this.SJGWsData.detData.map((ele, index) => {
+ // // if (ele.progressRate != 1) {
+ // return {
+ // id: ele.id,
+ // name: ele.name,
+ // code: ele.code,
+ // status: ele.status,
+ // error: ele.error=== true ? '是' : '否'
+ // }
+ // // }
+ // });
+ let eqArr = this.SJGWsData.detData.map((item, index) => [
+ // console.log(item)
+ `
${index + 1 || ''}
+ `,
+ // formatDate(item.planStartTime) || '',
+ `
+
${item.name || ''}
+ `,
+ `
${item.code || ''}`,
+ `
${item.status || ''}`,
+ `
${item.error || ''}`,
+ ])
+ this.eqConfig.data = eqArr
+ this.$refs['eqScrollBoard'].updateRows(eqArr)
// console.log(SJGWsData.orderList)
} else if (this.SJGWsData.type === 'productline') {
// console.log(this.wsData.detData);
@@ -792,6 +844,22 @@ export default {
// console.log(this.EnergyMonitoringList)
// this.$nextTick(() => {
// this.$refs.productLineChart.initChart(Array.from(new Set(nameList)), passRateList, outputNumList)
+ } else {
+ console.log(this.qualityYearList);
+
+ let eqArr = this.qualityYearList.map((item,index) => [
+ `
${index + 1 || ''}
+ `,
+ // formatDate(item.planStartTime) || '',
+ `
+
${item.name || ''}
+ `,
+ `
${item.code || ''}`,
+ `
${item.status || ''}`,
+ `
${item.error || ''}`,
+ ])
+ this.eqConfig.data = eqArr
+ this.$refs['eqScrollBoard'].updateRows(eqArr)
}
},
// 数据发送
@@ -976,10 +1044,6 @@ export default {
background-color: unset;
background-image: linear-gradient(to right, #4573fe, #47f8dc);
}
-// ::v-deep .el-progress-bar__outer {
-// background-color:rgba(71, 248, 220, 1);
-// // background-image: rgba(71, 248, 220, 1))
-// }
.visual-select {
position: absolute;
right: 1em;
@@ -1049,7 +1113,6 @@ export default {
margin-left: 3em;
}
}
-
diff --git a/src/views/databoard/components/Container.vue b/src/views/databoard/components/Container.vue
index e86c92e5..8728eb17 100644
--- a/src/views/databoard/components/Container.vue
+++ b/src/views/databoard/components/Container.vue
@@ -11,7 +11,7 @@
- ![]()
+ ![]()
\ No newline at end of file
diff --git a/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue b/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue
index 58093a92..ab5c2253 100644
--- a/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue
+++ b/src/views/databoard/deepProcessing/WorkOrderMonitoring.vue
@@ -37,10 +37,10 @@ export default {
handler(newVal, oldVal) {
let outArr = this.order.map((item, index) => [
index+1,
- item.name,
+ `${item.name || ''}`,
item.specifications,
item.lines,
- ['等待','已下发','已完成'][item.status],
+ this.getDictDatas(this.DICT_TYPE.ORDER_STATUS)[item.status]?.label,
formatDate(item.planFinishTime),
item.planQuantity,
item.planAssignQuantity
diff --git a/src/views/databoard/deepProcessing/index.vue b/src/views/databoard/deepProcessing/index.vue
index 48d32fd4..f906b1ce 100644
--- a/src/views/databoard/deepProcessing/index.vue
+++ b/src/views/databoard/deepProcessing/index.vue
@@ -117,7 +117,7 @@ export default {
screenfull.toggle(this.$refs.deepProcessingContainerB)
},
resetSize() {
- let deepProcessingContainer = document.querySelector('#deepProcessingContainer')
+ let deepProcessingContainer = document.getElementById('deepProcessingContainer')
let rw = parseFloat(window.innerWidth)
let rh = parseFloat(window.innerHeight)
let bw = parseFloat(deepProcessingContainer.style.width)
@@ -133,10 +133,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
- wx = (rw-264) / bw
+ wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
- wx = (rw-78) / bw
+ wx = (rw-85) / bw
hx = (rh-116) / bh
}
}
diff --git a/src/views/databoard/kiln/GasHandle.vue b/src/views/databoard/kiln/GasHandle.vue
index 6937de1b..ddd776b0 100644
--- a/src/views/databoard/kiln/GasHandle.vue
+++ b/src/views/databoard/kiln/GasHandle.vue
@@ -29,26 +29,26 @@
- {{exhaustGasInfo?.NOX_float ? (Number(exhaustGasInfo.NOX_float)).toFixed(2) : ''}}mg/m³
+ {{exhaustGasInfo?.NOX_float ? (Number(exhaustGasInfo.NOX_float)).toFixed(2) : ''}}mg/m³
二氧化硫
@@ -69,7 +69,7 @@
">
颗粒物浓度
-
{{exhaustGasInfo?.dust_float ? (Number(exhaustGasInfo.dust_float)).toFixed(2) : ''}}mg/m³
+
{{exhaustGasInfo?.dust_float ? (Number(exhaustGasInfo.dust_float)).toFixed(2) : ''}}mg/m³
diff --git a/src/views/databoard/kiln/index.vue b/src/views/databoard/kiln/index.vue
index 7913a92b..ff95bb76 100644
--- a/src/views/databoard/kiln/index.vue
+++ b/src/views/databoard/kiln/index.vue
@@ -6,7 +6,7 @@
class="KilnDataBoard"
style="
position: absolute;
- transform-origin: left top;
+ transform-origin: 16px 8px;
font-size: 16px;
top: 0px;
left: 0px;
@@ -110,7 +110,8 @@ export default {
screenfull.toggle(this.$refs.kilnContainerB)
},
resetSize() {
- let kilnContainerBox = document.querySelector('#kilnContainer')
+ let kilnContainerBox = document.getElementById('kilnContainer')
+ console.log(kilnContainerBox)
let rw = parseFloat(window.innerWidth)
let rh = parseFloat(window.innerHeight)
let bw = parseFloat(kilnContainerBox.style.width)
@@ -126,10 +127,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
- wx = (rw-264) / bw
+ wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
- wx = (rw-78) / bw
+ wx = (rw-85) / bw
hx = (rh-116) / bh
}
}
diff --git a/src/views/databoard/wholePlant/OrderStatus.vue b/src/views/databoard/wholePlant/OrderStatus.vue
index e2ef9be3..945b7d60 100644
--- a/src/views/databoard/wholePlant/OrderStatus.vue
+++ b/src/views/databoard/wholePlant/OrderStatus.vue
@@ -25,7 +25,7 @@ export default {
headerBGC: 'rgba(32, 55, 96, 0.8)',
oddRowBGC: 'rgba(32, 55, 96, 0.8)',
evenRowBGC: 'rgba(14, 32, 62, 0.8)',
- columnWidth: [155, 180, 150],
+ columnWidth: [155, 160, 150],
data: [],
rowNum: 6
}
@@ -33,34 +33,24 @@ export default {
},
mounted() {},
watch:{
- order: {
- handler(newVal, oldVal) {
+ order:{
+ handler() {
let outArr = this.order.map((item) => [
- formatDate(item.planStartTime) || '',
+ formatDate(item.planStartTime) || '',
`${item.customerName || ''}`,
`${item.specifications || ''}`,
- `${item.completeRate?(item.completeRate*100).toFixed(2)+'%':'0%'}
-
-
-
-
-
+ `
${item.completeRate?(item.completeRate*100).toFixed(2)+'%':'0%'}
+
+
`
]);
this.config.data = outArr
this.$refs['orderScrollBoard'].updateRows(outArr)
- }
- }
+ }
+ }
}
}
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/views/databoard/wholePlant/index.vue b/src/views/databoard/wholePlant/index.vue
index dd9cdf37..6591c61b 100644
--- a/src/views/databoard/wholePlant/index.vue
+++ b/src/views/databoard/wholePlant/index.vue
@@ -107,7 +107,7 @@ export default {
screenfull.toggle(this.$refs.wholePlantContainerB)
},
resetSize() {
- let wholePlantContainerBox = document.querySelector('#wholePlantContainer')
+ let wholePlantContainerBox = document.getElementById('wholePlantContainer')
let rw = parseFloat(window.innerWidth)
let rh = parseFloat(window.innerHeight)
let bw = parseFloat(wholePlantContainerBox.style.width)
@@ -123,10 +123,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
- wx = (rw-264) / bw
+ wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
- wx = (rw-78) / bw
+ wx = (rw-85) / bw
hx = (rh-116) / bh
}
}
diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
index 2c639b08..85ee406e 100644
--- a/src/views/equipment/timing-diagram/status/index.vue
+++ b/src/views/equipment/timing-diagram/status/index.vue
@@ -1,4 +1,4 @@
-
+