mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mesxc-dy #352

Merged
juzi merged 4 commits from projects/mesxc-dy into projects/mesxc-test 2024-04-24 13:30:40 +08:00
Conversation 0 Commits 4 Files Changed 20 +5693 -1263
33 changed files with 5693 additions and 1263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 16186667da - Show all commits

5
.env.dev
View File

@ -1,8 +1,9 @@
### ###
# @Author: zhp # @Author: zhp
# @Date: 2024-04-12 14:30:48 # @Date: 2024-04-12 14:30:48
# @LastEditTime: 2024-04-22 15:19:09 # @LastEditTime: 2024-04-22 15:20:42
# @LastEditors: DY # @LastEditors: DY
# @Description: # @Description:
### ###
# 开发环境配置 # 开发环境配置
@ -13,7 +14,7 @@ VUE_APP_TITLE = MES系统
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.0.33:48082' VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
# 积木报表指向地址 # 积木报表指向地址
VUE_APP_JIMU_API = 'http://192.168.0.33:48082' VUE_APP_JIMU_API = 'http://192.168.0.33:48082'

48
src/api/report/qcReport.js Normal file
View File

@ -0,0 +1,48 @@
/*
* @Author: zhp
* @Date: 2024-04-18 09:27:54
* @LastEditTime: 2024-04-19 16:12:49
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 更新质量检测类型基础
export function getOriginalData(data) {
return request({
url: 'extend/customized-reports/original',
method: 'post',
data: data
})
}
export function getIngredientData(data) {
return request({
url: 'extend/customized-reports/materialCost',
method: 'post',
data: data
})
}
export function getCuttingtData(data) {
return request({
url: 'extend/customized-reports/cutting',
method: 'post',
data: data
})
}
export function getAutoDailyData(data) {
return request({
url: 'base/report-auto-daily/listAll',
method: 'post',
data: data
})
}
export function getQualityRecordReport(data) {
return request({
url: 'base/quality-inspection-record/qualityRecordReport',
method: 'get',
data: data
})
}

138
src/components/ButtonNav/index.vue Normal file
View File

@ -0,0 +1,138 @@
<!--
filename: index.vue
author: liubin
date: 2024-04-02 09:49:36
description:
-->
<template>
<!-- 按钮切换 -->
<div
v-if="buttonMode"
class="button-nav">
<button
v-for="m in menus"
:key="m"
@click="currentMenu = m"
:data-text="m"
:class="[m === currentMenu ? 'active' : '']"></button>
</div>
<!-- 标签切换 -->
<div
v-else
class="custom-tabs"
style="height: 100%; width: 100%">
<el-tabs
class="tag-nav"
v-model="currentMenu"
style="height: 100%">
<el-tab-pane
v-for="(m, idx) in menus"
:key="m"
:label="idx == 0 ? `\u2002${m}\u2002` : `\u3000${m}\u3000`"
:name="m">
<slot :name="`tab${idx + 1}`"></slot>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
export default {
name: 'ButtonNav',
props: {
menus: {
type: Array,
required: true,
default: () => [],
validator: (val) => {
return val.length > 0;
},
},
buttonMode: {
type: Boolean,
default: true,
},
},
data() {
return {
currentMenu: '',
};
},
created() {
this.currentMenu = this.menus[0];
},
watch: {
currentMenu(val) {
this.$emit('change', val);
},
},
};
</script>
<style scoped lang="scss">
.button-nav {
width: 100%;
// padding: 12px 0;
display: flex;
gap: 12px;
* {
user-select: none;
}
button {
cursor: pointer;
appearance: none;
outline: none;
border: none;
background: #fff;
border-radius: 8px;
padding: 20px;
color: #888;
letter-spacing: 2px;
flex: 1;
box-sizing: padding-box;
position: relative;
&::after {
content: attr(data-text);
position: absolute;
top: 10px;
left: 50%;
font-size: 18px;
font-weight: 500;
transform: translate(-50%);
}
&.active {
color: #111;
border-bottom: 4px solid #0b58ff;
}
}
}
</style>
<style scoped>
.custom-tabs >>> .el-tabs__header {
margin-bottom: 8px;
display: inline-block;
/* transform: translateY(-12px); */
}
.custom-tabs >>> .el-tabs__item {
padding-left: 0px !important;
padding-right: 0px !important;
line-height: 36px !important;
height: 36px;
}
.custom-tabs >>> .el-tabs__content {
height: calc(100% - 42px);
}
.custom-tabs >>> .el-tab-pane {
box-sizing: border-box;
height: 100%;
padding: 20px;
border: 10px solid #f002;
}
</style>

60
src/views/OperationalOverview/coldBoard.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 16:50:26 * @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-04-11 09:55:04 * @LastEditTime: 2024-04-19 16:06:21
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -625,8 +625,8 @@ export default {
`<span style="color:rgba(255,255,255,0.5)">${this.getSize(item.size) || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${this.getSize(item.size) || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.productArea) + '㎡' || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.productArea) + '㎡' || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.wasteArea) + '㎡' || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.wasteArea) + '㎡' || ''}</span>`,
`<div style = "${(item.product * 100).toFixed(0) > 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div> `<div style = "${(item.product * 100).toFixed(0) >= 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>
<div style = "${(item.product * 100).toFixed(0) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>` <div style = "${(item.product * 100).toFixed(0) <= 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>`
]) ])
this.cutConfig.data = cutArr this.cutConfig.data = cutArr
// this.$nextTick(() => { // this.$nextTick(() => {
@ -635,32 +635,34 @@ export default {
// this.cutConfig.data = cutArr // this.cutConfig.data = cutArr
// this.$refs['cutScrollBoard'].updateRows(cutArr) // this.$refs['cutScrollBoard'].updateRows(cutArr)
} else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') { } else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
let nameList = [] if (this.cutWsData.coldDetData.length !== 0) {
let nameWasteList = [] let nameList = []
let topNameList = [] let nameWasteList = []
let productList = [] let topNameList = []
let wasteList = [] let productList = []
let sumAreaList = [] let wasteList = []
let yieldList = [] let sumAreaList = []
this.coldDetData = this.cutWsData.coldDetData let yieldList = []
// this.cutTableDataList = this.coldDetData = this.cutWsData.coldDetData
this.cutWsData.coldDetData.forEach((ele, index) => { // this.cutTableDataList =
nameList.push(ele.lineName) this.cutWsData.coldDetData.forEach((ele, index) => {
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡') nameList.push(ele.lineName)
productList.push(ele.productArea) topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡')
wasteList.push(ele.wastArea) productList.push(ele.productArea)
nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡') wasteList.push(ele.wastArea)
sumAreaList.push(ele.sumArea) nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
yieldList.push(parseFloat((ele.yield * 100).toFixed(0))) sumAreaList.push(ele.sumArea)
}) yieldList.push(parseFloat((ele.yield * 100).toFixed(0)))
this.$nextTick(() => { })
this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$nextTick(() => {
this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]]) this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]]) this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]])
this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]]) this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]])
this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]]) this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]])
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList) this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
}) this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
})
}
} }
}; };
// if (typeof (WebSocket) === 'undefined') { // if (typeof (WebSocket) === 'undefined') {

64
src/views/OperationalOverview/components/ISRAChart.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 13:45:56 * @Date: 2024-01-29 13:45:56
* @LastEditTime: 2024-04-15 09:28:21 * @LastEditTime: 2024-04-17 15:48:21
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -125,23 +125,29 @@ export default {
fontSize: 20, fontSize: 20,
color: '#fff00', color: '#fff00',
}, },
}, },
legend: { grid: {
bottom: '10%', left: '1%',
left: 'center', right: '1%',
itemWidth: 12, bottom: '0',
itemHeight:12, containLabel: true
icon: 'roundRect', },
textStyle: { // legend: {
color: '#fff' // bottom: '10%',
}, // left: 'center',
data:this.chartData && this.chartData.length > 0 && this.chartData.map((item,index)=>({ // itemWidth: 12,
name:item.name, // itemHeight:12,
itemStyle:{ // icon: 'roundRect',
color: this.colors[index%4] // textStyle: {
} // color: '#fff'
})) // },
}, // data:this.chartData && this.chartData.length > 0 && this.chartData.map((item,index)=>({
// name:item.name,
// itemStyle:{
// color: this.colors[index%4]
// }
// }))
// },
series:[{ series:[{
name: 'ISRA缺陷检测', name: 'ISRA缺陷检测',
type: 'pie', type: 'pie',
@ -168,7 +174,7 @@ export default {
}, },
textStyle: { // 提示文字的样式 textStyle: { // 提示文字的样式
// color: '#595959', // color: '#595959',
fontSize: 16 fontSize: 18
} }
} }
}, },
@ -213,15 +219,19 @@ export default {
.isra-chart { .isra-chart {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute;
top: 7%;
} }
.isra-chart-tooltip {
background: #0a2b4f77 !important;
border: none !important;
backdrop-filter: blur(12px);
}
.isra-chart-tooltip * {
color: #fff !important;
}
</style> </style>
<style> <style>
.isra-chart-tooltip {
background: #0a2b4f77 !important;
border: none !important;
backdrop-filter: blur(12px);
}
.isra-chart-tooltip * {
color: #fff !important;
}
</style> </style>

14
src/views/OperationalOverview/components/coldDoubleYChart.vue
View File

@ -2,7 +2,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-09-21 09:06:28 * @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-04-09 15:24:39 * @LastEditTime: 2024-04-16 13:39:25
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -156,6 +156,8 @@ export default {
this.chart.setOption({ this.chart.setOption({
// color: colors, // color: colors,
tooltip: { tooltip: {
trigger: 'item',
className: "isra-chart-tooltip",
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'cross' type: 'cross'
@ -318,8 +320,16 @@ export default {
} }
</script> </script>
<style> <style>
.coldProductChart{ .coldProductChart{
top: -10px; top: -10px;
} }
.isra-chart-tooltip {
background: #0a2b4f77 !important;
border: none !important;
backdrop-filter: blur(12px);
}
.isra-chart-tooltip * {
color: #fff !important;
}
</style> </style>

13
src/views/OperationalOverview/components/doubleYChart .vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-09-21 09:06:28 * @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-04-09 15:24:28 * @LastEditTime: 2024-04-16 13:37:38
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -162,6 +162,8 @@ export default {
this.chart.setOption({ this.chart.setOption({
// color: colors, // color: colors,
tooltip: { tooltip: {
trigger: 'item',
className: "isra-chart-tooltip",
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'cross' type: 'cross'
@ -327,4 +329,13 @@ export default {
width: 100%; width: 100%;
top: -30px; top: -30px;
} }
.isra-chart-tooltip {
background: #0a2b4f77 !important;
border: none !important;
backdrop-filter: blur(12px);
}
.isra-chart-tooltip * {
color: #fff !important;
}
</style> </style>

11
src/views/OperationalOverview/components/linearBarChart.vue
View File

@ -128,6 +128,8 @@ export default {
this.chart.setOption({ this.chart.setOption({
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
trigger: 'item',
className: "isra-chart-tooltip",
axisPointer: { axisPointer: {
// 坐标轴指示器，坐标轴触发有效 // 坐标轴指示器，坐标轴触发有效
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow' type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
@ -226,4 +228,13 @@ export default {
width: 100%; width: 100%;
top: -30px; top: -30px;
} }
.isra-chart-tooltip {
background: #0a2b4f77 !important;
border: none !important;
backdrop-filter: blur(12px);
}
.isra-chart-tooltip * {
color: #fff !important;
}
</style> </style>

295
src/views/OperationalOverview/components/pileBarChart.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-27 13:54:52 * @Date: 2023-12-27 13:54:52
* @LastEditTime: 2024-04-03 18:12:18 * @LastEditTime: 2024-04-19 15:43:08
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -101,11 +101,14 @@ export default {
});; });;
}, },
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) { initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
let rawData = [] if (topNameList.length === 0 && nameWasteList.length === 0 && passRateList === 0 && wasteList === 0) {
let colors = ['#0fdedb', '#2359ec'] return
} else {
let rawData = []
let colors = ['#0fdedb', '#2359ec']
rawData.push(passRateList, wasteList) rawData.push(passRateList, wasteList)
const totalData = []; const totalData = [];
// if (rawData.length != 0 && raw,Data,length != 0) { // if (rawData.length != 0 && raw,Data,length != 0) {
for (let i = 0; i < rawData[0].length; ++i) { for (let i = 0; i < rawData[0].length; ++i) {
let sum = 0; let sum = 0;
for (let j = 0; j < rawData.length; ++j) { for (let j = 0; j < rawData.length; ++j) {
@ -113,150 +116,152 @@ export default {
} }
totalData.push(sum); totalData.push(sum);
} }
// } // }
// rawData[1].map((d, did) => // rawData[1].map((d, did) =>
// console.log((d / totalData[did]).toFixed(3)) // console.log((d / totalData[did]).toFixed(3))
// // totalData[did] <= 0 ? 0 : d / totalData[did] // // totalData[did] <= 0 ? 0 : d / totalData[did]
// ) // )
console.log('total', totalData) console.log('total', totalData)
const series = [ const series = [
'良品', '良品',
'废品', '废品',
// 'Affiliate Ad', // 'Affiliate Ad',
// 'Video Ad', // 'Video Ad',
// 'Search Engine' // 'Search Engine'
].map((name, sid) => { ].map((name, sid) => {
// console.log(sid) // console.log(sid)
return { return {
name, name,
type: 'bar', type: 'bar',
stack: 'total', stack: 'total',
barWidth: 12, barWidth: 12,
// label: { // label: {
// show: true, // show: true,
// formatter: (params) => Math.round(params.value * 1000) / 10 + '%' // formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
// }, // },
color:colors[sid], color: colors[sid],
data: rawData.length != 0 ? rawData[sid].map((d, did) => data: rawData.length != 0 ? rawData[sid].map((d, did) =>
totalData[did] <= 0 ? 0 : (d / totalData[did]).toFixed(4) totalData[did] <= 0 ? 0 : (d / totalData[did]).toFixed(4)
) : [] ) : []
}; };
}); });
// this.charts.resize({ // this.charts.resize({
// //width: width, // //width: width,
// //height: height, // //height: height,
// // es6解构 // // es6解构
// width, // width,
// height // height
// }) // })
this.chart = echarts.init(document.getElementById(this.id)) this.chart = echarts.init(document.getElementById(this.id))
let isFinished = false //标记 isFinished let isFinished = false //标记 isFinished
this.chart.on('finished', _ => { this.chart.on('finished', _ => {
if (!isFinished) { if (!isFinished) {
console.log('我只执行一次') console.log('我只执行一次')
isFinished = true isFinished = true
// this.isLoading = false //关闭loading // this.isLoading = false //关闭loading
this.chart.resize() //重新渲染charts大小 this.chart.resize() //重新渲染charts大小
}
console.log(113, 'finished')
})
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(0)) + '%'
},
itemWidth: 12,
itemHeight: 12,
bottom: '20',
left: '20',
icon: 'roundRect',
textStyle: {
color: 'rgba(255,255,255,.9)',
fontSize:12,
} }
}, console.log(113, 'finished')
grid: { })
top:'0', this.chart.setOption({
left: '3%', legend: {
right: '4%', formatter: function (name) {
// bottom: '3%', //通过name获取到数组对象中的单个对象
width: 'auto', let singleData = series.filter(function (item) {
height: '95', return item.name == name
containLabel: true })
}, return name + parseFloat((singleData[0].data * 100).toFixed(2)) + '%'
yAxis: [
{
type: 'category',
inverse: true,
splitLine: {
show: false
}, },
axisTick: { itemWidth: 12,
show: false itemHeight: 12,
}, bottom: '20',
axisLine: { left: '20',
show: false icon: 'roundRect',
}, textStyle: {
axisLabel: { color: 'rgba(255,255,255,.9)',
show: true, fontSize: 12,
inside: true, }
interval: 0, //横轴信息全部显
splitNumber: 50,
// boundaryGap: [20, 20],
textStyle: {
color: 'rgba(255,255,255,.9)',
verticalAlign: 'bottom',
fontSize: 16,
align: 'left',
padding: [0, 0, 10, -5]
}
},
data: topNameList
}, },
{ grid: {
type: 'category', top: '0',
inverse: true, left: '3%',
splitLine: { right: '4%',
show: false // bottom: '3%',
width: 'auto',
height: '95',
containLabel: true
},
yAxis: [
{
type: 'category',
inverse: true,
splitLine: {
show: false
},
axisTick: {
show: false
},
axisLine: {
show: false
},
axisLabel: {
show: true,
inside: true,
interval: 0, //横轴信息全部显
splitNumber: 50,
// boundaryGap: [20, 20],
textStyle: {
color: 'rgba(255,255,255,.9)',
verticalAlign: 'bottom',
fontSize: 16,
align: 'left',
padding: [0, 0, 10, -5]
}
},
data: topNameList
}, },
axisTick: { {
show: false type: 'category',
}, inverse: true,
axisLine: { splitLine: {
show: false show: false
}, },
axisLabel: { axisTick: {
show: true, show: false
inside: true, },
interval: 0, //横轴信息全部显 axisLine: {
splitNumber: 50, show: false
// boundaryGap: [20, 20], },
textStyle: { axisLabel: {
color: 'rgba(255,255,255,.9)', show: true,
verticalAlign: 'bottom', inside: true,
fontSize: 16, interval: 0, //横轴信息全部显
align: 'right', splitNumber: 50,
padding: [0, 0, 10, -5] // boundaryGap: [20, 20],
} textStyle: {
}, color: 'rgba(255,255,255,.9)',
data: nameWasteList verticalAlign: 'bottom',
} fontSize: 16,
], align: 'right',
xAxis: { padding: [0, 0, 10, -5]
// max: 120, }
show: false, },
}, data: nameWasteList
series:series }
}) ],
this.$nextTick(() => { xAxis: {
setTimeout(() => { // max: 120,
this.resize() show: false,
},1000); },
}) series: series
})
this.$nextTick(() => {
setTimeout(() => {
this.resize()
}, 1000);
})
}
// this.chart.resize({ // this.chart.resize({
// width: 'auto', // width: 'auto',
// height: 90 // height: 90

136
src/views/OperationalOverview/processingBoard.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-07-19 15:18:30 * @Date: 2021-07-19 15:18:30
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-04-10 16:10:11 * @LastEditTime: 2024-04-18 08:42:00
* @Description: * @Description:
--> -->
<template> <template>
@ -42,21 +42,24 @@
<el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;"> <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
<!-- <el-col :span="12"> --> <!-- <el-col :span="12"> -->
<!-- <div style="height: 34px;"> --> <!-- <div style="height: 34px;"> -->
<span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span> <span style="display: inline-block;width: 330px;">
<el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider> <span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
<!-- <span v-if="op.size" class="split"></span> --> <el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
<span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{ <!-- <span v-if="op.size" class="split"></span> -->
op.specifications }}</span> <span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
<el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider> op.specifications }}</span>
<span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{ <el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
op.planQuantity }}</span> <span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
op.planQuantity }}</span>
</span>
<span v-if="op.actualQuantity" class="orderFinish" <span v-if="op.actualQuantity" class="orderFinish"
style="font-size: 14px;opacity: calc(.6);margin-left: 130px;">{{ style="font-size: 14px;margin-left: 130px;">{{
op.actualQuantity op.actualQuantity
}}</span> }}</span>
<el-divider class="split" v-if="op.actualQuantity" direction="vertical"></el-divider> <el-divider class="split" style="background-color: rgba(0, 255, 247, 1)" v-if="op.actualQuantity"
direction="vertical"></el-divider>
<!-- </div> --> <!-- </div> -->
<el-progress style="width: 620px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10" <el-progress style="width: 620px;" text-color="rgba(0, 255, 247, 1)" :stroke-width="10"
define-back-color="rgba(32, 57, 96, 1)" :percentage="op.progressRate" class="custom-progress-bar" /> define-back-color="rgba(32, 57, 96, 1)" :percentage="op.progressRate" class="custom-progress-bar" />
</el-row> </el-row>
</div> </div>
@ -108,80 +111,79 @@ const qualityYearList = [
{ {
name: '翻转机', name: '翻转机',
code: 'EQ20240110112358000235', code: 'EQ20240110112358000235',
status: '运行', status: '正常',
error: '否', error: true,
}, },
{ {
name: '烘干炉', name: '烘干炉',
code: 'EQ20240110112537000241', code: 'EQ20240110112537000241',
status: '运行', status: '计划停机',
error: '否', error: true,
}, },
{ {
name: '清洗机', name: '清洗机',
code: ' EQ20240110112310000232', code: ' EQ20240110112310000232',
status: '运行', status: '正常',
error: '否', error: true,
}, },
{ {
name: '钢化清洗机', name: '钢化清洗机',
code: 'EQ20240110111700000208', code: 'EQ20240110111700000208',
status: '运行', status: '正常',
error: '否', error: true,
}, },
{ {
name: '固化机', name: '固化机',
code: 'EQ20240110111700000201', code: 'EQ20240110111700000201',
status: '运行', status: '正常',
error: '否', error: 'true',
}, },
{ {
name: '磨边清洗机', name: '磨边清洗机',
code: ' EQ20240110111700000208', code: ' EQ20240110111700000208',
status: '运行', status: '正常',
error: '否', error: true,
}, },
{ {
name: '预热机', name: '预热机',
code: 'EQ20240110111700000205', code: 'EQ20240110111700000205',
status: '故障', status: '故障',
error: '是', error: true,
}, },
{ {
name: '下片机', name: '下片机',
code: 'EQ20240115151435000279', code: 'EQ20240115151435000279',
status: '运行', error: true,
error: '否',
}, },
{ {
name: '冷却机', name: '冷却机',
code: 'EQ20240110111700000203', code: 'EQ20240110111700000203',
status: '运行', status: '正常',
error: '否', error: true,
}, },
{ {
name: 'A储片机106', name: 'A储片机106',
code: 'EQ20240110111700000202', code: 'EQ20240110111700000202',
status: '运行', status: '正常',
error: '否', error: true,
}, },
{ {
name: '二次清洗机', name: '二次清洗机',
code: 'EQ20240110111700000209', code: 'EQ20240110111700000209',
status: '运行', status: '正常',
error: '否', error: true,
}, },
{ {
name: '二次磨边机', name: '二次磨边机',
code: ' EQ20240110110927000181', code: ' EQ20240110110927000181',
status: '故障', status: '正常',
error: '是', error: true,
}, },
{ {
name: '测试设备', name: '测试设备',
code: 'EQ20240110111700000201', code: 'EQ20240110111700000201',
status: '运行', status: '正常',
error: '否', error: true,
}, },
]; ];
const qualityMonthList = [ const qualityMonthList = [
@ -230,37 +232,37 @@ const qualityMonthList = [
]; ];
const orderProcessList = [ const orderProcessList = [
{ {
id: '1', id: 1,
outRate: '.8', outRate: '.8',
name: '凯盛0322', name: '凯盛0322',
}, },
{ {
id: '2', id: 2,
outRate: '.4', outRate: '.4',
name: '光伏玻璃4.0', name: '光伏玻璃4.0',
}, },
{ {
id: '3', id: 3,
outRate: '.5', outRate: '.5',
name: '光伏玻璃3.0', name: '光伏玻璃3.0',
}, },
{ {
id: '4', id: 4,
outRate: '.3', outRate: '.3',
name: '光伏玻璃2.0', name: '光伏玻璃2.0',
}, },
{ {
id: '5', id: 5,
outRate: '.5', outRate: '.5',
name: '光伏玻璃1.0', name: '光伏玻璃1.0',
}, },
{ {
id: '6', id: 6,
outRate: '.8', outRate: '.8',
name: '光伏玻璃', name: '光伏玻璃',
}, },
{ {
id: '7', id: 7,
outRate: '.8', outRate: '.8',
name: '统计订单', name: '统计订单',
}, },
@ -380,7 +382,7 @@ export default {
progressRate: 0.933333, progressRate: 0.933333,
specifications: '1100*5554*22', specifications: '1100*5554*22',
plan: 11111, plan: 11111,
finish:111, actualQuantity:111,
}, },
{ {
id: '2', id: '2',
@ -388,7 +390,7 @@ export default {
progressRate: 0.932323, progressRate: 0.932323,
size: '1100*5554*22', size: '1100*5554*22',
plan: 11111, plan: 11111,
finish: 111, actualQuantity: 111,
}, },
{ {
id: '3', id: '3',
@ -396,7 +398,7 @@ export default {
progressRate: 0.23232, progressRate: 0.23232,
size: '1100*5554*22', size: '1100*5554*22',
plan: 11111, plan: 11111,
finish: 111, actualQuantity: 111,
}, },
{ {
id: '4', id: '4',
@ -404,7 +406,7 @@ export default {
progressRate: 0.32323, progressRate: 0.32323,
size: '1100*5554*22', size: '1100*5554*22',
plan: 11111, plan: 11111,
finish: 111, actualQuantity: 111,
}, },
{ {
id: '5', id: '5',
@ -412,7 +414,7 @@ export default {
progressRate: 0.32323, progressRate: 0.32323,
size: '1100*5554*22', size: '1100*5554*22',
plan: 11111, plan: 11111,
finish: 111, actualQuantity: 111,
}, },
{ {
id: '6', id: '6',
@ -420,7 +422,7 @@ export default {
size: '1100*5554*22', size: '1100*5554*22',
progressRate: 0.32323, progressRate: 0.32323,
plan: 11111, plan: 11111,
finish: 111, actualQuantity: 111,
}, },
{ {
id: '7', id: '7',
@ -428,7 +430,7 @@ export default {
size: '1100*5554*22', size: '1100*5554*22',
progressRate: 0.32323, progressRate: 0.32323,
plan: 11111, plan: 11111,
finish: 111, actualQuantity: 111,
}, },
{ {
id: '8', id: '8',
@ -436,7 +438,7 @@ export default {
progressRate: 0.32323, progressRate: 0.32323,
size: '1100*5554*22', size: '1100*5554*22',
plan: 11111, plan: 11111,
finish: 111, actualQuantity: 111,
}, },
// { // {
// id: '5', // id: '5',
@ -456,7 +458,7 @@ export default {
progressRate: parseFloat((ele.progressRate * 100).toFixed(0)), progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
specifications: ele.specifications ? '规格' + ele.specifications :null, specifications: ele.specifications ? '规格' + ele.specifications :null,
planQuantity: ele.plan ? '计划' + ele.plan + '片' : null, planQuantity: ele.plan ? '计划' + ele.plan + '片' : null,
finish: ele.finish + '片', actualQuantity: ele.actualQuantity + '片',
}; };
} }
}); });
@ -480,8 +482,8 @@ export default {
<span style="color:rgba(255,255,255,0.5)" >${item.name || ''} <span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
</span>`, </span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div> ${item.status || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div> ${item.status || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == '是' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div> ${item.error || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:13px 10px 0 0 '}"></div> ${item.error == true ? '是' : '否' || ''}</span>`,
]); ]);
this.eqConfig.data = eqArr; this.eqConfig.data = eqArr;
let data = [ let data = [
@ -747,8 +749,8 @@ export default {
`<span style="color:rgba(255,255,255,0.5)">${ `<span style="color:rgba(255,255,255,0.5)">${
item.code || '' item.code || ''
}</span>`, }</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.status || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.status || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == '是' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.error || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == 'false' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%; background-color: red;float:left;margin:10px 10px 0 0 '}"></div> ${item.error == true ?'是' :'否' || ''}</span>`,
]); ]);
this.eqConfig.data = eqArr; this.eqConfig.data = eqArr;
// this.$nextTick(() => { // this.$nextTick(() => {
@ -790,7 +792,23 @@ export default {
outputNumList outputNumList
); );
}) })
} else if (this.SJGInitWebSocket === 'inspection') { } else if (this.SJGWsData.type === 'inspection') {
let processArr = this.SJGWsData.detData.map((item, index) => [
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
</span>`,
`<span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''
}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.count || ''
}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''
}</span>`,
]);
this.processConfig.data = processArr;
// this.$nextTick(() => {
this.$refs['processScrollBoard'].updateRows(processArr);
// })
} }
}; };
}, },
@ -975,7 +993,7 @@ export default {
font-size: 14px; font-size: 14px;
line-height: 2em; line-height: 2em;
text-align: right; text-align: right;
color: #fff; color: rgba(0, 255, 247, 1);
} }
.orderPlan { .orderPlan {
display: inline-block; display: inline-block;

849
src/views/base/custom/index.vue
View File

@ -1,19 +1,24 @@
<template> <template>
<el-drawer :visible.sync="drawer" :append-to-body="true" size="80%" > <el-drawer
<small-title slot="title" :no-padding="true"> :visible.sync="drawer"
<!-- <template v-for="demo in demoList"> --> :append-to-body="true"
<!-- <el-button :key="demo.name" :type="demo.name === curDemo ? 'primary' : ' '" @click="curDemo = demo.name"> --> size="80%">
<!-- {{ $t('module.packingManage.printModelDesign') }} --> <small-title
模板设计 slot="title"
<!-- </el-button> --> :no-padding="true">
<!-- </template> --> <!-- <template v-for="demo in demoList"> -->
</small-title> <!-- <el-button :key="demo.name" :type="demo.name === curDemo ? 'primary' : ' '" @click="curDemo = demo.name"> -->
<el-card> <!-- {{ $t('module.packingManage.printModelDesign') }} -->
<el-row style="margin-bottom: 10px"> 模板设计
<el-col :span="4"> <!-- </el-button> -->
<!-- 模板选择 --> <!-- </template> -->
</small-title>
<el-card>
<el-row style="margin-bottom: 10px">
<!-- <el-col :span="4"> -->
<!-- 模板选择 -->
<!-- <el-select <!-- <el-select
v-model="mode" v-model="mode"
filterable filterable
:default-value="0" :default-value="0"
@ -25,393 +30,469 @@
{{ opt.name }} {{ opt.name }}
</el-option> </el-option>
</el-select> --> </el-select> -->
</el-col> <!-- </el-col> -->
<el-col :span="20"> <el-col :span="24">
<!-- 纸张设置 --> <!-- 纸张设置 -->
<el-button-group style="margin:0 10px"> <el-button-group style="margin: 0 10px">
<el-button v-for="(value,type) in paperTypes" :key="type" :type="curPaperType === type ? 'primary' : ' '" <el-button
@click="setPaper(type,value)"> v-for="(value, type) in paperTypes"
{{ type }} :key="type"
</el-button> :type="curPaperType === type ? 'primary' : ' '"
</el-button-group> @click="setPaper(type, value)">
<el-input-number style="margin:0 10px" :value="scaleValue " :precision="2" :step="0.1" :min="scaleMin" {{ type }}
:max="scaleMax" @change="changeScale" /> </el-button>
<el-popover v-model="paperPopVisible" placement="bottom" width="300" title="设置纸张宽高(mm)"> </el-button-group>
<div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 10px"> <el-input-number
<el-input v-model="paperWidth" type="number" style=" width: 100px; text-align: center" place="宽（mm）" />~ style="margin: 0 10px; width: 140px"
<el-input v-model="paperHeight" type="number" style=" width: 100px; text-align: center" place="高（mm）" /> :value="scaleValue"
</div> :precision="2"
<div> :step="0.1"
<el-button type="primary" style="width: 100%" size="mini" @click="otherPaper">确定</el-button> :min="scaleMin"
</div> :max="scaleMax"
<el-button slot="reference" type="primary" style="margin:0 10px">自定义宽高</el-button> @change="changeScale" />
</el-popover> <el-popover
v-model="paperPopVisible"
placement="bottom"
width="300"
title="设置纸张宽高(mm)">
<div
style="
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 10px;
">
<el-input
v-model="paperWidth"
type="number"
style="width: 100px; text-align: center"
place="宽（mm）" />
~
<el-input
v-model="paperHeight"
type="number"
style="width: 100px; text-align: center"
place="高（mm）" />
</div>
<div>
<el-button
type="primary"
style="width: 100%"
size="mini"
@click="otherPaper">
确定
</el-button>
</div>
<el-button
slot="reference"
type="primary"
style="margin: 0 10px">
自定义宽高
</el-button>
</el-popover>
<!-- <a-button-group>--> <!-- <a-button-group>-->
<!-- <template v-for="(value,type) in paperTypes">--> <!-- <template v-for="(value,type) in paperTypes">-->
<!-- <a-button :type="curPaperType === type ? 'primary' : 'info'" @click="setPaper(type,value)" :key="type">--> <!-- <a-button :type="curPaperType === type ? 'primary' : 'info'" @click="setPaper(type,value)" :key="type">-->
<!-- {{ type }}--> <!-- {{ type }}-->
<!-- </a-button>--> <!-- </a-button>-->
<!-- </template>--> <!-- </template>-->
<!-- <a-popover v-model="paperPopVisible" title="设置纸张宽高(mm)" trigger="click">--> <!-- <a-popover v-model="paperPopVisible" title="设置纸张宽高(mm)" trigger="click">-->
<!-- <div slot="content">--> <!-- <div slot="content">-->
<!-- <a-input-group compact style="margin: 10px 10px">--> <!-- <a-input-group compact style="margin: 10px 10px">-->
<!-- <a-input type="number" v-model="paperWidth" style=" width: 100px; text-align: center"--> <!-- <a-input type="number" v-model="paperWidth" style=" width: 100px; text-align: center"-->
<!-- placeholder="宽(mm)"/>--> <!-- placeholder="宽(mm)"/>-->
<!-- <a-input style=" width: 30px; border-left: 0; pointer-events: none; backgroundColor: #fff"--> <!-- <a-input style=" width: 30px; border-left: 0; pointer-events: none; backgroundColor: #fff"-->
<!-- placeholder="~" disabled--> <!-- placeholder="~" disabled-->
<!-- />--> <!-- />-->
<!-- <a-input type="number" v-model="paperHeight" style="width: 100px; text-align: center; border-left: 0"--> <!-- <a-input type="number" v-model="paperHeight" style="width: 100px; text-align: center; border-left: 0"-->
<!-- placeholder="高(mm)"/>--> <!-- placeholder="高(mm)"/>-->
<!-- </a-input-group>--> <!-- </a-input-group>-->
<!-- <a-button type="primary" style="width: 100%" @click="otherPaper">确定</a-button>--> <!-- <a-button type="primary" style="width: 100%" @click="otherPaper">确定</a-button>-->
<!-- </div>--> <!-- </div>-->
<!-- <a-button :type="'other'==curPaperType?'primary':''">自定义纸张</a-button>--> <!-- <a-button :type="'other'==curPaperType?'primary':''">自定义纸张</a-button>-->
<!-- </a-popover>--> <!-- </a-popover>-->
<!-- </a-button-group>--> <!-- </a-button-group>-->
<!-- 预览/打印 --> <!-- 预览/打印 -->
<el-button-group> <el-button-group>
<el-button type="primary" icon="redo" @click="rotatePaper()">旋转</el-button> <el-button
<el-button type="primary" icon="el-icon-view" @click="preView"> type="primary"
预览 icon="redo"
</el-button> @click="rotatePaper()">
<!-- <el-button type="primary" icon="el-icon-printer" @click="print"> 旋转
</el-button>
<el-button
type="primary"
icon="el-icon-view"
@click="preView">
预览
</el-button>
<!-- <el-button type="primary" icon="el-icon-printer" @click="print">
直接打印 直接打印
</el-button> --> </el-button> -->
<el-button type="primary" icon="el-icon-s-management" @click="save"> <el-button
保存 type="primary"
</el-button> icon="el-icon-s-management"
<el-button type="danger" icon="el-icon-delete" @click="clearPaper"> @click="save">
清空 保存
</el-button> </el-button>
</el-button-group> <el-button
<!-- 保存/清空 --> type="danger"
icon="el-icon-delete"
</el-col> @click="clearPaper">
</el-row> 清空
<el-row :gutter="24"> </el-button>
<el-col :span="4"> </el-button-group>
<el-card style="height: 100vh"> <!-- 保存/清空 -->
<el-row> </el-col>
<el-col :span="24" class="rect-printElement-types hiprintEpContainer" /> </el-row>
</el-row> <el-row :gutter="24">
</el-card> <el-col :span="4">
</el-col> <el-card style="height: 100vh">
<el-col :span="16"> <el-row>
<el-card class="card-design"> <el-col
<div id="hiprint-printTemplate" class="hiprint-printTemplate" /> :span="24"
</el-card> class="rect-printElement-types hiprintEpContainer" />
</el-col> </el-row>
<el-col :span="4" class="params_setting_container"> </el-card>
<el-card> </el-col>
<el-row class="hinnn-layout-sider"> <el-col :span="16">
<div id="PrintElementOptionSetting" /> <el-card class="card-design">
</el-row> <div
</el-card> id="hiprint-printTemplate"
</el-col> class="hiprint-printTemplate" />
</el-row> </el-card>
<!-- 预览 --> </el-col>
<print-preview ref="preView" /> <el-col
</el-card> :span="4"
</el-drawer> class="params_setting_container">
<el-card>
<el-row class="hinnn-layout-sider">
<div id="PrintElementOptionSetting" />
</el-row>
</el-card>
</el-col>
</el-row>
<!-- 预览 -->
<print-preview ref="preView" />
</el-card>
</el-drawer>
</template> </template>
<script> <script>
import printPreview from './preview';
import printPreview from './preview' import { MessageBox } from 'element-ui';
import { MessageBox } from 'element-ui' import { hiprint } from 'vue-plugin-hiprint';
import { hiprint } from 'vue-plugin-hiprint' import providers from './providers';
import providers from './providers'
// import printData from './print-data' // import printData from './print-data'
import $ from 'jquery' import $ from 'jquery';
import SmallTitle from './SmallTitle.vue' import SmallTitle from './SmallTitle.vue';
let hiprintTemplate = null let hiprintTemplate = null;
export default { export default {
name: 'PrintCustom', name: 'PrintCustom',
components: { printPreview, SmallTitle }, components: { printPreview, SmallTitle },
// props: { // props: {
// modelData: { // modelData: {
// type: String, // type: String,
// default: '' // default: ''
// } // }
// }, // },
data() { data() {
return { return {
// paperPopVisible: false, // paperPopVisible: false,
// 模板选择 // 模板选择
mode: 0, mode: 0,
template: null, template: null,
modeList: [], modeList: [],
// 当前纸张 // 当前纸张
curPaper: { curPaper: {
// type: 'other', // type: 'other',
// width: 220, // width: 220,
// height: 80 // height: 80
}, },
printData:{}, printData: {},
drawer: false, drawer: false,
// 纸张类型 // 纸张类型
paperTypes: { paperTypes: {
'A3': { A3: {
width: 420, width: 420,
height: 296.6 height: 296.6,
}, },
'A4': { A4: {
width: 210, width: 210,
height: 297 height: 297,
}, },
'A5': { A5: {
width: 210, width: 210,
height: 147.6 height: 147.6,
}, },
'B3': { A6: {
width: 500, width: 95,
height: 352.6 height: 125,
}, },
'B4': { B3: {
width: 250, width: 500,
height: 352.6 height: 352.6,
}, },
'B5': { B4: {
width: 250, width: 250,
height: 175.6 height: 352.6,
} },
}, B5: {
scaleValue: 1, width: 250,
scaleMax: 5, height: 175.6,
scaleMin: 0.5, },
// 自定义纸张 },
paperPopVisible: false, scaleValue: 1,
paperWidth: '210', scaleMax: 5,
paperHeight: '297' scaleMin: 0.5,
} // 自定义纸张
}, paperPopVisible: false,
computed: { paperWidth: '210',
curPaperType() { paperHeight: '297',
let type = 'other' };
const types = this.paperTypes },
for (const key in types) { computed: {
const item = types[key] curPaperType() {
const { width, height } = this.curPaper let type = 'other';
if (item.width === width && item.height === height) { const types = this.paperTypes;
type = key for (const key in types) {
} const item = types[key];
} const { width, height } = this.curPaper;
return type if (item.width === width && item.height === height) {
} type = key;
}, }
created() { }
// $('.hiprintEpContainer').empty() return type;
}, },
destroyed () { },
$('.hiprintEpContainer').empty() created() {
console.log(11111) // $('.hiprintEpContainer').empty()
}, },
methods: { destroyed() {
// handleClose() { $('.hiprintEpContainer').empty();
// $('.hiprintEpContainer').empty() console.log(11111);
// }, },
closed() { methods: {
$('.hiprintEpContainer').empty() // handleClose() {
$('.hiprint-printTemplate').empty() // $('.hiprintEpContainer').empty()
}, // },
init(data) { closed() {
this.drawer = true $('.hiprintEpContainer').empty();
this.modelData = data $('.hiprint-printTemplate').empty();
this.modeList = providers.map((e) => { },
return { type: e.type, name: e.name, value: e.value } init(data) {
}) this.drawer = true;
this.changeMode() this.modelData = data;
}, this.modeList = providers.map((e) => {
changeMode() { return { type: e.type, name: e.name, value: e.value };
// hiprintTemplate.clear() });
// console.log(this.modelData) this.changeMode();
this.$nextTick(() => { },
const { mode } = this changeMode() {
const provider = providers[mode] // hiprintTemplate.clear()
hiprint.init({ // console.log(this.modelData)
providers: [provider.f] this.$nextTick(() => {
}) const { mode } = this;
const provider = providers[mode];
hiprint.init({
providers: [provider.f],
});
// $('#hiprint-printTemplate').empty() // $('#hiprint-printTemplate').empty()
// console.log(JSON.parse(this.modelData)) // console.log(JSON.parse(this.modelData))
hiprint.setConfig() hiprint.setConfig();
// 替换配置 // 替换配置
hiprint.setConfig({ hiprint.setConfig({
movingDistance: 2.5, movingDistance: 2.5,
text: { text: {
supportOptions: [ supportOptions: [
{ {
name: 'styler', name: 'styler',
hidden: true hidden: true,
}, },
{ {
name: 'formatter', name: 'formatter',
hidden: true hidden: true,
} },
] ],
} },
}) });
// console.log(this.modelData) // console.log(this.modelData)
// console.log($('#hiprint-printTemplate').empty()) // console.log($('#hiprint-printTemplate').empty())
// if () { // if () {
// console.log(this.modelData); // console.log(this.modelData);
// $('.hiprintEpContainer').empty() // $('.hiprintEpContainer').empty()
// hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) // hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
// $('.hiprint-printTemplate').empty() // $('.hiprint-printTemplate').empty()
// hiprintTemplate = new hiprint.PrintTemplate({ // hiprintTemplate = new hiprint.PrintTemplate({
// template: JSON.parse(this.modelData), // template: JSON.parse(this.modelData),
// settingContainer: '#PrintElementOptionSetting', // settingContainer: '#PrintElementOptionSetting',
// paginationContainer: '.hiprint-printPagination' // paginationContainer: '.hiprint-printPagination'
// }) // })
// } else { // } else {
$('.hiprintEpContainer').empty() $('.hiprintEpContainer').empty();
console.log(this.modelData || {}); console.log(this.modelData || {});
hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) hiprint.PrintElementTypeManager.build(
$('.hiprint-printTemplate').empty() '.hiprintEpContainer',
// const templates = this.$ls.get('KEY_TEMPLATES', {}) provider.value
const template = provider.value );
// console.log(template) $('.hiprint-printTemplate').empty();
if (this.modelData) { // const templates = this.$ls.get('KEY_TEMPLATES', {})
hiprintTemplate = new hiprint.PrintTemplate({ const template = provider.value;
template: JSON.parse(this.modelData), // console.log(template)
settingContainer: '#PrintElementOptionSetting', if (this.modelData) {
paginationContainer: '.hiprint-printPagination' hiprintTemplate = new hiprint.PrintTemplate({
}) template: JSON.parse(this.modelData),
} else { settingContainer: '#PrintElementOptionSetting',
hiprintTemplate = new hiprint.PrintTemplate({ paginationContainer: '.hiprint-printPagination',
template:{}, });
settingContainer: '#PrintElementOptionSetting', } else {
paginationContainer: '.hiprint-printPagination' hiprintTemplate = new hiprint.PrintTemplate({
}) template: {},
} settingContainer: '#PrintElementOptionSetting',
// } paginationContainer: '.hiprint-printPagination',
hiprintTemplate.design('#hiprint-printTemplate') });
// console.log(hiprintTemplate) }
console.log(hiprintTemplate); // }
// hiprintTemplate.design('#hiprint-printTemplate', { grid: true }) hiprintTemplate.design('#hiprint-printTemplate');
// 获取当前放大比例, 当zoom时传true 才会有 // console.log(hiprintTemplate)
this.scaleValue = hiprintTemplate.editingPanel.scale || 1 console.log(hiprintTemplate);
// this.scaleValue = hiprintTemplate.editingPanel.scale || 1 // hiprintTemplate.design('#hiprint-printTemplate', { grid: true })
}) // 获取当前放大比例, 当zoom时传true 才会有
}, this.scaleValue = hiprintTemplate.editingPanel.scale || 1;
/** // this.scaleValue = hiprintTemplate.editingPanel.scale || 1
* 设置纸张大小 });
* @param type [A3, A4, A5, B3, B4, B5, other] },
* @param value {width,height} mm /**
*/ * 设置纸张大小
setPaper(type, value) { * @param type [A3, A4, A5, B3, B4, B5, other]
try { * @param value {width,height} mm
if (Object.keys(this.paperTypes).includes(type)) { */
this.curPaper = { type: type, width: value.width, height: value.height } setPaper(type, value) {
hiprintTemplate.setPaper(value.width, value.height) try {
} else { if (Object.keys(this.paperTypes).includes(type)) {
this.curPaper = { type: 'other', width: value.width, height: value.height } this.curPaper = {
hiprintTemplate.setPaper(value.width, value.height) type: type,
} width: value.width,
} catch (error) { height: value.height,
this.$message.error(`操作失败: ${error}`) };
} hiprintTemplate.setPaper(value.width, value.height);
}, } else {
changeScale(currentValue, oldValue) { this.curPaper = {
let big = false type: 'other',
currentValue <= oldValue ? big = false : big = true width: value.width,
let scaleValue = this.scaleValue height: value.height,
if (big) { };
scaleValue += 0.1 hiprintTemplate.setPaper(value.width, value.height);
if (scaleValue > this.scaleMax) scaleValue = 5 }
} else { } catch (error) {
scaleValue -= 0.1 this.$message.error(`操作失败: ${error}`);
if (scaleValue < this.scaleMin) scaleValue = 0.5 }
} },
if (hiprintTemplate) { changeScale(currentValue, oldValue) {
// scaleValue: 放大缩小值, false: 不保存(不传也一样), 如果传 true, 打印时也会放大 let big = false;
hiprintTemplate.zoom(scaleValue) currentValue <= oldValue ? (big = false) : (big = true);
this.scaleValue = scaleValue let scaleValue = this.scaleValue;
} if (big) {
}, scaleValue += 0.1;
clearPaper() { if (scaleValue > this.scaleMax) scaleValue = 5;
MessageBox.confirm('是否确认清空模板信息?', '警告', { } else {
confirmButtonText: '确定', scaleValue -= 0.1;
cancelButtonText: '取消', if (scaleValue < this.scaleMin) scaleValue = 0.5;
type: 'warning' }
}).then(() => { if (hiprintTemplate) {
try { // scaleValue: 放大缩小值, false: 不保存(不传也一样), 如果传 true, 打印时也会放大
hiprintTemplate.clear() hiprintTemplate.zoom(scaleValue);
} catch (error) { this.scaleValue = scaleValue;
this.$message.error(`操作失败: ${error}`) }
} },
}).catch((err) => { clearPaper() {
console.log(err) MessageBox.confirm('是否确认清空模板信息?', '警告', {
}) confirmButtonText: '确定',
}, cancelButtonText: '取消',
otherPaper() { type: 'warning',
const value = {} })
value.width = this.paperWidth .then(() => {
value.height = this.paperHeight try {
this.paperPopVisible = false hiprintTemplate.clear();
this.setPaper('other', value) } catch (error) {
}, this.$message.error(`操作失败: ${error}`);
rotatePaper() { }
if (hiprintTemplate) { })
hiprintTemplate.rotatePaper() .catch((err) => {
} console.log(err);
}, });
preView() { },
const { width } = this.curPaper otherPaper() {
this.$refs.preView.show(hiprintTemplate, this.printData, width) const value = {};
}, value.width = this.paperWidth;
print() { value.height = this.paperHeight;
// if (window.hiwebSocket.opened) { this.paperPopVisible = false;
const printerList = hiprintTemplate.getPrinterList() this.setPaper('other', value);
console.log(printerList) },
hiprintTemplate.print2(this.printData, { printer: '', title: '预览打印' }) rotatePaper() {
// return if (hiprintTemplate) {
// } hiprintTemplate.rotatePaper();
// this.$message.error('客户端未连接,无法直接打印') }
}, },
save() { preView() {
// console.log(hiprintTemplate.getJson()) const { width } = this.curPaper;
const { mode } = this this.$refs.preView.show(hiprintTemplate, this.printData, width);
const provider = providers[mode] },
// console.log(hiprintTemplate.getJson()) print() {
this.setTemplate({ // if (window.hiwebSocket.opened) {
name: provider.value, const printerList = hiprintTemplate.getPrinterList();
json: hiprintTemplate.getJson() console.log(printerList);
}) hiprintTemplate.print2(this.printData, {
}, printer: '',
setTemplate(payload) { title: '预览打印',
// const templates = this.$ls.get('KEY_TEMPLATES', {}) });
// console.log(payload.json) // return
// templates[payload.name] = payload.json // }
// this.$ls.set('KEY_TEMPLATES', templates) // this.$message.error('客户端未连接,无法直接打印')
this.$message.info('保存成功') },
// console.log(JSON.stringify(payload.json)) save() {
this.drawer = false // console.log(hiprintTemplate.getJson())
this.$emit('saveData', payload.json) const { mode } = this;
$('.hiprintEpContainer').empty() const provider = providers[mode];
// this.$parent.$parent.getModelData(payload.json) // console.log(hiprintTemplate.getJson())
} this.setTemplate({
} name: provider.value,
} json: hiprintTemplate.getJson(),
});
},
setTemplate(payload) {
// const templates = this.$ls.get('KEY_TEMPLATES', {})
// console.log(payload.json)
// templates[payload.name] = payload.json
// this.$ls.set('KEY_TEMPLATES', templates)
this.$message.info('保存成功');
// console.log(JSON.stringify(payload.json))
this.drawer = false;
this.$emit('saveData', payload.json);
$('.hiprintEpContainer').empty();
// this.$parent.$parent.getModelData(payload.json)
},
},
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// build 拖拽 // build 拖拽
::v-deep .hiprint-printElement-type >li>ul>li>a { ::v-deep .hiprint-printElement-type > li > ul > li > a {
padding: 4px 4px; padding: 4px 4px;
color: #1296db; color: #1296db;
line-height: 1; line-height: 1;
height: auto; height: auto;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
// 设计容器 // 设计容器
.card-design { .card-design {
// overflow: hidden; // overflow: hidden;
overflow-x: auto; overflow-x: auto;
overflow-y: auto; overflow-y: auto;
} }
</style> </style>

45
src/views/base/packagingPrintLog2/components/InputArea.vue Normal file
View File

@ -0,0 +1,45 @@
<template>
<div class="tableInner">
<el-input
v-if="list.isEdit"
type="number"
v-model="list[itemProp]"
@blur="changeInput" />
<span v-else>{{ list[itemProp] }}</span>
</div>
</template>
<script>
export default {
name: 'InputArea',
props: {
injectData: {
type: Object,
default: () => ({}),
},
itemProp: {
type: String,
},
},
data() {
return {
list: {},
};
},
mounted() {
this.initData();
},
watch: {
injectData() {
this.initData();
},
},
methods: {
initData() {
this.list = this.injectData;
},
changeInput() {
this.$emit('emitData', this.list);
},
},
};
</script>

226
src/views/base/packagingPrintLog2/components/OtherMsg.vue Normal file
View File

@ -0,0 +1,226 @@
<template>
<div class="other-msg-box">
<el-radio-group
v-model="chooseMsg"
@change="changeChoose">
<el-radio :label="1">
<div style="display: inline-block">
<el-form
:inline="true"
:model="printMsg1"
class="demo-form-inline">
<el-form-item label="客户">
<el-select
size="small"
v-model="printMsg1.customerId"
filterable
placeholder="客户">
<el-option
v-for="item in customerList"
:key="item.id"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="封箱人员工号">
<el-input
v-model="printMsg1.sealWorker"
size="small"
placeholder="封箱人员工号"></el-input>
</el-form-item>
<el-form-item label="打包人员工号">
<el-input
v-model="printMsg1.packWorker"
size="small"
placeholder="打包人员工号"></el-input>
</el-form-item>
<el-form-item label="流程卡号">
<el-input
v-model="printMsg1.processCard"
size="small"
style="width: 120px"
placeholder="流程卡号"></el-input>
</el-form-item>
<el-form-item label="托盘规格">
<el-input
v-model="printMsg1.pallet"
size="small"
style="width: 120px"
placeholder="托盘规格"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input
v-model="printMsg1.remark"
size="small"
placeholder="备注"></el-input>
</el-form-item>
</el-form>
</div>
</el-radio>
<el-radio :label="2">
<div style="display: inline-block">
<el-form
:inline="true"
:model="printMsg2"
class="demo-form-inline">
<el-form-item label="客户">
<el-select
size="small"
v-model="printMsg2.customerId"
filterable
placeholder="客户">
<el-option
v-for="item in customerList"
:key="item.id"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="封箱人员工号">
<el-input
v-model="printMsg2.sealWorker"
size="small"
placeholder="封箱人员工号"></el-input>
</el-form-item>
<el-form-item label="打包人员工号">
<el-input
v-model="printMsg2.packWorker"
size="small"
placeholder="打包人员工号"></el-input>
</el-form-item>
<el-form-item label="流程卡号">
<el-input
v-model="printMsg2.processCard"
size="small"
style="width: 120px"
placeholder="流程卡号"></el-input>
</el-form-item>
<el-form-item label="托盘规格">
<el-input
v-model="printMsg2.pallet"
size="small"
style="width: 120px"
placeholder="托盘规格"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input
v-model="printMsg2.remark"
size="small"
placeholder="备注"></el-input>
</el-form-item>
</el-form>
</div>
</el-radio>
<el-radio :label="3">
<div style="display: inline-block">
<el-form
:inline="true"
:model="printMsg3"
class="demo-form-inline">
<el-form-item label="客户">
<el-select
size="small"
v-model="printMsg3.customerId"
filterable
placeholder="客户">
<el-option
v-for="item in customerList"
:key="item.id"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="封箱人员工号">
<el-input
v-model="printMsg3.sealWorker"
size="small"
placeholder="封箱人员工号"></el-input>
</el-form-item>
<el-form-item label="打包人员工号">
<el-input
v-model="printMsg3.packWorker"
size="small"
placeholder="打包人员工号"></el-input>
</el-form-item>
<el-form-item label="流程卡号">
<el-input
v-model="printMsg3.processCard"
size="small"
style="width: 120px"
placeholder="流程卡号"></el-input>
</el-form-item>
<el-form-item label="托盘规格">
<el-input
v-model="printMsg3.pallet"
size="small"
style="width: 120px"
placeholder="托盘规格"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input
v-model="printMsg3.remark"
size="small"
placeholder="备注"></el-input>
</el-form-item>
</el-form>
</div>
</el-radio>
</el-radio-group>
</div>
</template>
<script>
import { getCustomerList } from '@/api/base/packingInfo';
export default {
name: 'OtherMsg',
props: {
printMsg1: {
type: Object,
default: () => ({}),
},
printMsg2: {
type: Object,
default: () => ({}),
},
printMsg3: {
type: Object,
default: () => ({}),
},
},
data() {
return {
chooseMsg: 1,
customerList: [],
};
},
mounted() {
this.getCList();
},
methods: {
getCList() {
getCustomerList().then((res) => {
console.log(res);
console.log('customer');
this.customerList = res.data;
});
},
changeChoose(val) {
this.$emit('changeChoose', val);
},
},
};
</script>
<style lang="scss" scoped>
.other-msg-box {
.el-radio {
display: block;
line-height: 36px;
.demo-form-inline {
width: 100%;
white-space: normal;
}
.el-form-item {
margin-bottom: 0px;
}
}
}
</style>

182
src/views/base/packagingPrintLog2/components/Printed.vue Normal file
View File

@ -0,0 +1,182 @@
<template>
<div class="show-box">
<!-- 搜索工作栏 -->
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick2" />
<!-- 列表 -->
<base-table
:page="queryParams2.pageNo"
:limit="queryParams2.pageSize"
:table-props="tableProps"
:table-data="list2">
<method-btn
v-if="tableBtn2.length"
slot="handleBtn"
:width="240"
label="操作"
:method-list="tableBtn2"
@clickBtn="handleClick2" />
</base-table>
<pagination
:page.sync="queryParams2.pageNo"
:limit.sync="queryParams2.pageSize"
:total="total2"
@pagination="getList2" />
</div>
</template>
<script>
import { parseTime } from '@/utils/ruoyi';
import { getPackingPage } from '@/api/base/packingInfo';
import { getCorePLList } from '@/api/base/coreProductionLine';
const tableProps = [
{
prop: 'packagingCode',
label: '成品周转编号',
minWidth: 180,
showOverflowtooltip: true,
},
{
prop: 'lineId',
label: '产线',
showOverflowtooltip: true,
},
{
prop: 'specifications',
label: '规格',
showOverflowtooltip: true,
},
{
prop: 'check',
label: '判定',
showOverflowtooltip: true,
},
{
prop: 'workStation',
label: '工位号',
showOverflowtooltip: true,
},
{
prop: 'num',
label: '片数',
},
{
prop: 'remark',
label: '备注1',
showOverflowtooltip: true,
},
{
prop: 'printStatus',
label: '打印状态',
filter: (val) => (val == 1 ? '未打印' : '已打印'),
},
{
prop: 'createTime',
label: '时间',
filter: parseTime,
minWidth: 160,
showOverflowtooltip: true,
},
{
prop: 'groupClass',
label: '班次',
showOverflowtooltip: true,
},
];
export default {
name: 'Printed',
data() {
return {
formConfig: [
{
type: 'select',
label: '产线',
selectOptions: [],
param: 'lineId',
filterable: true,
},
{
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'timeVal',
defaultSelect: [],
width: 350,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary',
},
],
// 查询参数
queryParams2: {
pageNo: 1,
pageSize: 20,
printStatus: '2',
lineId: '',
createTime: [],
},
total2: 0,
tableProps,
list2: [],
tableBtn2: [
this.$auth.hasPermi('base:order-group:update')
? {
type: 'reprint',
btnName: '重打',
}
: undefined,
this.$auth.hasPermi('base:order-group:query')
? {
type: 'detail',
btnName: '详情',
}
: undefined,
this.$auth.hasPermiAnd([
'base:order-group:update',
'base:core-product:query',
'base:core-customer:query',
])
? {
type: 'edit',
btnName: '编辑',
}
: undefined,
].filter((v) => v),
};
},
mounted() {
this.getLineList();
},
methods: {
getLineList() {
getCorePLList().then((res) => {
console.log(res);
this.formConfig[0].selectOptions = res.data;
});
},
getList2() {
getPackingPage({ ...this.queryParams2 }).then((res) => {
console.log(res);
this.list2 = res.data.records || [];
this.total2 = res.data.total;
});
},
buttonClick2(val) {
console.log(val);
this.queryParams2.lineId = val.lineId;
this.queryParams2.createTime = val.timeVal;
this.getList2();
},
handleClick2() {},
},
};
</script>

0
src/views/base/packagingPrintLog2/components/PrintedEdit.vue Normal file
View File

332
src/views/base/packagingPrintLog2/components/UnPrint.vue Normal file
View File

@ -0,0 +1,332 @@
<template>
<div class="show-box">
<!-- 单选 -->
<other-msg
:printMsg1="printMsg1"
:printMsg2="printMsg2"
:printMsg3="printMsg3"
@changeChoose="changeChoose" />
<!-- 搜索工作栏 -->
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick" />
<!-- 列表 -->
<base-table
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-props="tableProps"
:table-data="list"
@emitFun="inputChange">
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="260"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList" />
<!-- 预览 -->
<print-preview ref="preView" />
</div>
</template>
<script>
import { parseTime } from '@/utils/ruoyi';
import inputArea from './InputArea.vue';
const tableProps = [
{
prop: 'packagingCode',
label: '成品周转编号',
minWidth: 160,
showOverflowtooltip: true,
},
{
prop: 'lineId',
label: '产线',
showOverflowtooltip: true,
},
{
prop: 'specifications',
label: '规格',
showOverflowtooltip: true,
},
{
prop: 'check',
label: '判定',
showOverflowtooltip: true,
},
{
prop: 'workStation',
label: '工位号',
showOverflowtooltip: true,
},
{
prop: 'num',
label: '片数',
subcomponent: inputArea,
minWidth: 120,
},
{
prop: 'remark',
label: '备注1',
showOverflowtooltip: true,
},
{
prop: 'printStatus',
label: '打印状态',
filter: (val) => (val == 1 ? '未打印' : '已打印'),
},
{
prop: 'createTime',
label: '时间',
filter: parseTime,
minWidth: 160,
showOverflowtooltip: true,
},
{
prop: 'groupClass',
label: '班次',
showOverflowtooltip: true,
},
];
import OtherMsg from './OtherMsg';
import { getPackingPage, updatePacking } from '@/api/base/packingInfo';
import { getCorePLList } from '@/api/base/coreProductionLine';
import printPreview from './preview';
import printTemplate from '../print-template';
export default {
name: 'UnPrint',
components: { OtherMsg, printPreview },
data() {
return {
printMsg1: {
customerId: '',
sealWorker: '',
packWorker: '',
processCard: '',
pallet: '',
remark: '',
},
printMsg2: {
customerId: '',
sealWorker: '',
packWorker: '',
processCard: '',
pallet: '',
remark: '',
},
printMsg3: {
customerId: '',
sealWorker: '',
packWorker: '',
processCard: '',
pallet: '',
remark: '',
},
chooseMsg: 1, //单选
formConfig: [
{
type: 'select',
label: '产线',
selectOptions: [],
param: 'lineId',
filterable: true,
},
{
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'timeVal',
defaultSelect: [],
width: 350,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary',
},
],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 20,
printStatus: '1',
lineId: '',
createTime: [],
},
total: 0,
tableProps,
list: [],
tableBtn: [
this.$auth.hasPermiAnd([
'base:order:query',
'base:order-con-group-order:create',
])
? {
type: 'view',
btnName: '预览',
}
: undefined,
this.$auth.hasPermi('base:order-group:update')
? {
type: 'print',
btnName: '打印',
}
: undefined,
this.$auth.hasPermi('base:order-group:update')
? {
type: 'printed',
btnName: '已打印',
}
: undefined,
this.$auth.hasPermiAnd([
'base:order-group:update',
'base:core-product:query',
'base:core-customer:query',
])
? {
type: 'edit',
btnName: '编辑',
showParam: {
type: '&',
data: [
{
type: 'unequal',
name: 'isEdit',
value: true,
},
],
},
}
: undefined,
this.$auth.hasPermiAnd([
'base:order-group:update',
'base:core-product:query',
'base:core-customer:query',
])
? {
type: 'save',
btnName: '保存',
showParam: {
type: '&',
data: [
{
type: 'equal',
name: 'isEdit',
value: true,
},
],
},
}
: undefined,
this.$auth.hasPermi('base:order-group:query')
? {
type: 'delete',
btnName: '删除',
}
: undefined,
].filter((v) => v),
printData: {},
};
},
mounted() {
this.getLineList();
console.log(printTemplate);
console.log('================printTemplate');
},
methods: {
getLineList() {
getCorePLList().then((res) => {
this.formConfig[0].selectOptions = res.data;
});
},
getList() {
getPackingPage({ ...this.queryParams }).then((res) => {
this.list = res.data.records || [];
this.total = res.data.total;
});
},
// 单选
changeChoose(val) {
this.chooseMsg = val;
},
buttonClick(val) {
this.queryParams.lineId = val.lineId;
this.queryParams.createTime = val.timeVal;
this.getList();
},
handleClick(val) {
console.log(val);
switch (val.type) {
case 'edit':
this.editNum(val.data);
break;
case 'save':
this.saveNum(val.data);
break;
case 'view':
this.preView();
break;
case 'print':
this.printTemp();
break;
default:
}
},
// 编辑
editNum(val) {
let obj = this.list[val._pageIndex - 1];
obj.isEdit = true;
this.$set(this.list, val._pageIndex - 1, obj);
},
// 保存
saveNum(val) {
// 调用修改接口
updatePacking({ id: val.id, num: val.num }).then(() => {
this.getList();
});
},
// 输入框改变num
inputChange(val) {
this.list[val._pageIndex - 1][val.prop] = val[val.prop];
},
// 预览
preView() {
var hiprintTemplate = new hiprint.PrintTemplate({
template: printTemplate,
});
this.$refs.preView.show(hiprintTemplate);
},
// 打印
printTemp() {
console.log('11');
var printData = {};
let hiprintTemplate = this.$print(
undefined,
printTemplate,
printData,
{},
{
styleHandler: () => {
let css =
'<link href="http://hiprint.io/Content/hiprint/css/print-lock.css" media="print" rel="stylesheet">';
return css;
},
}
);
console.log(hiprintTemplate);
},
},
};
</script>

69
src/views/base/packagingPrintLog2/components/UnPrintEdit.vue Normal file
View File

@ -0,0 +1,69 @@
<template>
<el-form
ref="unPrintEdit"
:rules="rules"
label-width="130px"
:model="form">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item
label="成品周转编号"
prop="packagingCode">
<el-input
readonly
v-model="form.packagingCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item
label="片数"
prop="num">
<el-input-number
v-model="form.num"
:min="0"
:max="999999"
style="width: 100%"
label="片数"></el-input-number>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<script>
import { getPacking } from '@/api/base/packingInfo';
export default {
name: 'UnPrintEdit',
data() {
return {
form: {
id: '',
packagingCode: '',
num: null,
},
rules: {
num: [{ required: true, message: '片数不能为空', trigger: 'blur' }],
},
};
},
methods: {
init(id) {
console.log('init');
this.form.id = id;
getPacking(id).then((res) => {
console.log(res);
});
},
submitForm() {
this.$refs['unPrintEdit'].validate((valid) => {
if (valid) {
console.log('保存');
this.$emit('successSubmit');
}
});
},
formClear() {
this.$refs.unPrintEdit.resetFields();
},
},
};
</script>

100
src/views/base/packagingPrintLog2/components/preview.vue Normal file
View File

@ -0,0 +1,100 @@
<template>
<base-dialog
dialogTitle="预览"
:dialogVisible="visible"
width="50%"
@cancel="hideModal"
:before-close="hideModal">
<!-- <div>
<el-button
:loading="waitShowPrinter"
type="primary"
icon="printer"
@click.stop="print">
打印
</el-button>
<el-button
type="primary"
icon="printer"
@click.stop="toPdf">
pdf
</el-button>
</div> -->
<div id="preview_content" />
<template slot="footer">
<el-button
key="close"
@click="hideModal">
关闭
</el-button>
</template>
</base-dialog>
</template>
<script>
export default {
name: 'PrintPreview',
props: {},
data() {
return {
visible: false,
spinning: true,
waitShowPrinter: false,
// 纸张宽 mm
width: 0,
// 模板
hiprintTemplate: {},
// 数据
printData: {},
};
},
computed: {},
watch: {},
created() {},
mounted() {},
methods: {
hideModal() {
this.visible = false;
},
show(hiprintTemplate, printData, width = '210') {
this.visible = true;
this.spinning = true;
this.width = width;
this.hiprintTemplate = hiprintTemplate;
this.printData = printData;
console.log(hiprintTemplate);
console.log(printData);
setTimeout(() => {
// eslint-disable-next-line no-undef
$('#preview_content').html(hiprintTemplate.getHtml(printData));
this.spinning = false;
}, 500);
},
print() {
this.waitShowPrinter = true;
this.hiprintTemplate.print(
this.printData,
{},
{
callback: () => {
console.log('callback');
this.waitShowPrinter = false;
},
}
);
},
toPdf() {
this.hiprintTemplate.toPdf({}, '打印预览');
},
},
};
</script>
<!-- <style lang="less" scoped>
/deep/ .ant-modal-body {
padding: 0px;
}
/deep/ .ant-modal-content {
margin-bottom: 24px;
}
</style> -->

47
src/views/base/packagingPrintLog2/index.vue Normal file
View File

@ -0,0 +1,47 @@
<template>
<div class="packagingPrintLog-box">
<div style="width: 100%">
<ButtonNav
:menus="['未打印', '已打印']"
:button-mode="true"
@change="currentMenu"></ButtonNav>
</div>
<!-- 未打印 -->
<UnPrint v-if="activeMenu == '未打印'" />
<!-- 已打印 -->
<Printed v-else />
</div>
</template>
<script>
import ButtonNav from '@/components/ButtonNav';
import UnPrint from './components/UnPrint';
import Printed from './components/Printed';
export default {
name: 'packagingPrintLog',
components: { ButtonNav, UnPrint, Printed },
data() {
return {
activeMenu: '未打印',
};
},
methods: {
currentMenu(val) {
console.log(val);
this.activeMenu = val;
},
},
};
</script>
<style lang="scss" scoped>
.packagingPrintLog-box {
min-height: calc(100vh - 120px - 8px);
background-color: #f2f4f9;
.show-box {
min-height: calc(100vh - 128px - 52px);
margin-top: 8px;
padding: 16px;
border-radius: 8px;
background-color: #fff;
}
}
</style>

554
src/views/base/packagingPrintLog2/print-template.js Normal file
View File

@ -0,0 +1,554 @@
export default {
panels: [
{
index: 0,
name: 1,
height: 125,
width: 95,
paperHeader: 0,
paperFooter: 354.33070866141736,
printElements: [
{
options: {
left: 5,
top: 5,
height: 30,
width: 256.5,
right: 262.2421875,
bottom: 34.9921875,
vCenter: 133.9921875,
hCenter: 19.9921875,
coordinateSync: false,
widthHeightSync: false,
borderColor: 'green',
backgroundColor: 'green',
},
printElementType: { title: '矩形', type: 'rect' },
},
{
options: {
left: 35,
top: 15,
height: 20,
width: 195,
title: '厂内镀膜/钢化片周转标签',
coordinateSync: false,
widthHeightSync: false,
fontSize: 16.5,
color: '#ffffff',
qrCodeLevel: 0,
right: 232.9921875,
bottom: 35.24609375,
vCenter: 135.4921875,
hCenter: 25.24609375,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: { left: 50, top: 35, height: 52.5, width: 9 },
printElementType: { title: '竖线', type: 'vline' },
},
{
options: {
left: 5,
top: 35,
height: 309,
width: 256.5,
right: 261.4921875,
bottom: 343.9921875,
vCenter: 133.2421875,
hCenter: 189.4921875,
},
printElementType: { title: '矩形', type: 'rect' },
},
{
options: {
left: 10,
top: 42.5,
height: 18,
width: 36,
title: '线别',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 45.99609375,
bottom: 60.4921875,
vCenter: 27.99609375,
hCenter: 51.4921875,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 55,
top: 42.5,
height: 18,
width: 200,
title: '判定：良品/保留/再检',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 93.4921875,
bottom: 59.25,
vCenter: 75.4921875,
hCenter: 50.25,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 5,
top: 62.5,
height: 9,
width: 256.5,
right: 259.9921875,
bottom: 72.4921875,
vCenter: 132.4921875,
hCenter: 67.9921875,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 55,
top: 70,
height: 18,
width: 46,
title: '备注：',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 91.2421875,
bottom: 86.25,
vCenter: 73.2421875,
hCenter: 77.25,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 190,
top: 87.5,
height: 169.5,
width: 9,
right: 199.74609375,
bottom: 255.75,
vCenter: 195.24609375,
hCenter: 171,
},
printElementType: { title: '竖线', type: 'vline' },
},
{
options: {
left: 5,
top: 87.5,
height: 9,
width: 256.5,
right: 260.7421875,
bottom: 96.75,
vCenter: 132.4921875,
hCenter: 92.25,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 77.5,
top: 90,
height: 15,
width: 36,
title: '规格',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 113.49609375,
bottom: 105.4921875,
vCenter: 95.49609375,
hCenter: 97.9921875,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 207.5,
top: 100,
height: 18,
width: 36,
title: '用户',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 242.7421875,
bottom: 116.25,
vCenter: 224.7421875,
hCenter: 107.25,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 25,
top: 102.5,
height: 15,
width: 156,
title: '长*宽*厚度（单位：mm）',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 179.25,
bottom: 117.4921875,
vCenter: 101.25,
hCenter: 109.9921875,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 5,
top: 117.5,
height: 9,
width: 256.5,
right: 263.7421875,
bottom: 125.7421875,
vCenter: 135.4921875,
hCenter: 121.2421875,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 130,
top: 145,
height: 55.5,
width: 9,
right: 138.99609375,
bottom: 199.5,
vCenter: 134.49609375,
hCenter: 171.75,
},
printElementType: { title: '竖线', type: 'vline' },
},
{
options: {
left: 5,
top: 145,
height: 9,
width: 256.5,
right: 260.25,
bottom: 154.2421875,
vCenter: 132,
hCenter: 149.7421875,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 45,
top: 155,
height: 18,
width: 36,
title: '编号',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 82.2421875,
bottom: 171.75,
vCenter: 64.2421875,
hCenter: 162.75,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 135,
top: 155,
height: 18,
width: 49.5,
title: '工位号',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 186,
bottom: 172.9921875,
vCenter: 161.25,
hCenter: 163.9921875,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 197.5,
top: 155,
height: 18,
width: 60,
title: '流程卡号',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 256.74609375,
bottom: 143.7421875,
vCenter: 226.74609375,
hCenter: 134.7421875,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 5,
top: 175,
height: 9,
width: 256.5,
right: 259.2421875,
bottom: 183.75,
vCenter: 130.9921875,
hCenter: 179.25,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 50,
top: 200,
height: 58.5,
width: 9,
right: 58.9921875,
bottom: 259.5,
vCenter: 54.4921875,
hCenter: 230.25,
},
printElementType: { title: '竖线', type: 'vline' },
},
{
options: {
left: 110,
top: 200,
height: 58.5,
width: 9,
right: 117.75,
bottom: 256.9921875,
vCenter: 113.25,
hCenter: 227.7421875,
},
printElementType: { title: '竖线', type: 'vline' },
},
{
options: {
left: 5,
top: 200,
height: 9,
width: 256.5,
right: 262.9921875,
bottom: 210.24609375,
vCenter: 134.7421875,
hCenter: 205.74609375,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 10,
top: 210,
height: 18,
width: 36,
title: '日期',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 45.99609375,
bottom: 228,
vCenter: 27.99609375,
hCenter: 219,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 67.5,
top: 210,
height: 18,
width: 36,
title: '班次',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 103.5,
bottom: 228,
vCenter: 85.5,
hCenter: 219,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 207.5,
top: 210,
height: 18,
width: 36,
title: '片数',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 243.4921875,
bottom: 228,
vCenter: 225.4921875,
hCenter: 219,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 5,
top: 230,
height: 9,
width: 256.5,
right: 261.4921875,
bottom: 239.25,
vCenter: 133.2421875,
hCenter: 234.75,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 5,
top: 257.5,
height: 9,
width: 256.5,
right: 261.4921875,
bottom: 266.49609375,
vCenter: 133.2421875,
hCenter: 261.99609375,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 10,
top: 262.5,
height: 18,
width: 87,
title: '封箱人员工号：',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 46.9921875,
bottom: 279.24609375,
vCenter: 28.9921875,
hCenter: 270.24609375,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 5,
top: 280,
height: 9,
width: 256.5,
right: 262.2421875,
bottom: 289.2421875,
vCenter: 133.9921875,
hCenter: 284.7421875,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 10,
top: 285,
height: 18,
width: 87,
title: '打包人员工号：',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 96.4921875,
bottom: 301.74609375,
vCenter: 52.9921875,
hCenter: 292.74609375,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 5,
top: 300,
height: 9,
width: 256.5,
right: 264.4921875,
bottom: 308.49609375,
vCenter: 136.2421875,
hCenter: 303.99609375,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 10,
top: 305,
height: 18,
width: 247.5,
title: '备注1：单层镀/双层镀/丝印打孔/打孔钢片',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 96.99609375,
bottom: 322.9921875,
vCenter: 53.49609375,
hCenter: 313.9921875,
},
printElementType: { title: '文本', type: 'text' },
},
{
options: {
left: 5,
top: 322.5,
height: 9,
width: 256.5,
right: 262.2421875,
bottom: 332.7421875,
vCenter: 133.9921875,
hCenter: 328.2421875,
},
printElementType: { title: '横线', type: 'hline' },
},
{
options: {
left: 10,
top: 327.5,
height: 18,
width: 87,
title: '备注2：',
coordinateSync: false,
widthHeightSync: false,
fontSize: 12,
qrCodeLevel: 0,
right: 97.9921875,
bottom: 343.74609375,
vCenter: 54.4921875,
hCenter: 334.74609375,
},
printElementType: { title: '文本', type: 'text' },
},
],
paperNumberLeft: 372.5,
paperNumberTop: 337.5,
paperNumberContinue: true,
watermarkOptions: {},
},
]
}

410
src/views/base/packagingPrintModel/add-or-updata.vue
View File

@ -6,138 +6,130 @@
* @Description: * @Description:
--> -->
<template> <template>
<el-dialog class="baseDialog" :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="30%" show-close="true"> <el-dialog
<small-title slot="title" :no-padding="true"> class="baseDialog"
{{ !dataForm.id ? '新增' : '编辑' }} :visible.sync="visible"
</small-title> :show-close="true"
:wrapper-closable="false"
width="50%">
<small-title
slot="title"
:no-padding="true">
{{ !dataForm.id ? '新增' : '编辑' }}
</small-title>
<div class="content"> <div class="content">
<div class="visual-part"> <div class="visual-part">
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px" <el-form
@keyup.enter.native="dataFormSubmit"> ref="dataForm"
<el-row :gutter="20"> :model="dataForm"
<el-col :span="12"> :rules="dataRule"
<el-form-item label="模板名称" prop="name"> label-width="100px"
<el-input v-model="dataForm.name" clearable placeholder="请输入模板名称" /> @keyup.enter.native="dataFormSubmit">
</el-form-item> <el-row :gutter="20">
</el-col> <el-col :span="24">
<el-col :span="12"> <el-form-item
<el-form-item label="标签类型" prop="typeId"> label="模板名称"
<el-select v-model="dataForm.typeId" style="width: 100%;" placeholder="请选择标签类型" clearable> prop="name">
<el-option v-for="dict in typeList" :key="dict.id" :label="dict.name" :value="dict.id" /> <el-input
</el-select> v-model="dataForm.name"
</el-form-item> clearable
</el-col> placeholder="请输入模板名称" />
</el-row> </el-form-item>
<el-row :gutter="20"> </el-col>
<el-col :span="12"> <el-col :span="24">
<el-form-item label="打印方式" prop="printModel"> <el-form-item
<el-select v-model="dataForm.printModel" style="width: 100%;" placeholder="请选择打印方式" clearable> label="标签类型"
<el-option v-for="dict in printModelList" :key="dict.id" :label="dict.name" :value="dict.id" /> prop="typeId">
</el-select> <el-select
</el-form-item> v-model="dataForm.typeId"
</el-col> style="width: 100%"
<el-col :span="12"> placeholder="请选择标签类型"
<el-form-item label="标签备注" prop="remark"> clearable>
<el-input v-model="dataForm.remark" clearable placeholder="请输入标签备注" /> <el-option
</el-form-item> v-for="dict in typeList"
</el-col> :key="dict.id"
</el-row> :label="dict.name"
<el-row :gutter="20"> :value="dict.id" />
<el-col :span="12"> </el-select>
<el-form-item label="模板设计" prop="content"> </el-form-item>
<el-button icon="el-icon-edit" @click="btnClickDesign()">模板设计</el-button> </el-col>
</el-form-item> </el-row>
</el-col> <el-row :gutter="20">
<!-- <el-col :span="12"> <el-col :span="24">
<el-form-item label="单位平方数" prop="area"> <el-form-item
<el-input v-model="dataForm.area" placeholder="请输入单位平方数" /> label="打印方式"
</el-form-item> prop="printModel">
</el-col> --> <el-select
</el-row> v-model="dataForm.printModel"
<!-- <el-row :gutter="20"> style="width: 100%"
<el-col :span="24"> placeholder="请选择打印方式"
<el-form-item label="完成单位产品用时" prop="processTime"> clearable>
<el-input v-model="dataForm.processTime" placeholder="请输入完成单位产品用时" /> <el-option
</el-form-item> v-for="dict in printModelList"
</el-col> :key="dict.id"
</el-row> --> :label="dict.name"
</el-form> :value="dict.id" />
</el-select>
<!-- <small-title </el-form-item>
style="margin: 16px 0; padding-left: 8px" </el-col>
:no-padding="true"> <el-col :span="24">
产品属性列表 <el-form-item
</small-title> label="标签备注"
prop="remark">
<div class="attr-list"> <el-input
<base-table v-model="dataForm.remark"
:table-props="tableProps" clearable
:page="listQuery.pageNo" placeholder="请输入标签备注" />
:limit="listQuery.pageSize" </el-form-item>
:add-button-show="isdetail ? null : '添加属性'" </el-col>
@emitButtonClick="addNew()" </el-row>
:table-data="productAttributeList"> <el-row :gutter="20">
<method-btn <el-col :span="24">
v-if="!isdetail" <el-form-item
slot="handleBtn" label="模板设计"
:width="120" prop="content">
label="操作" <el-button
:method-list="tableBtn" icon="el-icon-edit"
@clickBtn="handleClick" /> @click="btnClickDesign()">
</base-table> 模板设计
<pagination </el-button>
v-show="listQuery.total > 0" </el-form-item>
:total="listQuery.total" </el-col>
:page.sync="listQuery.pageNo" </el-row>
:limit.sync="listQuery.pageSize" </el-form>
:page-sizes="[5, 10, 15]" </div>
@pagination="getList" /> </div>
</div> --> <template slot="footer">
</div> <el-button
</div> style=""
@click="goback()">
<!-- <div style="position: absolute; bottom: 24px; right: 24px"> 取消
<el-button style="margin-right: 10px" @click="goback()">返回</el-button>
<el-button v-if="isdetail" type="primary" @click="goEdit()">
编辑
</el-button> </el-button>
<span v-if="!isdetail"> <el-button
<el-button type="primary" @click="dataFormSubmit()">保存</el-button> type="primary"
<el-button @click="dataFormSubmit()">
v-if="dataForm.id && !isdetail" 确定
type="primary" </el-button>
@click="addNew()"> </template>
添加属性 <print-model-design
</el-button> v-if="modelShow"
</span> ref="printModelDesign"
</div> --> @saveData="getModelData" />
<template slot="footer"> </el-dialog>
<el-button style="" @click="goback()">取消</el-button>
<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
编辑
</el-button> -->
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
</template>
<print-model-design v-if="modelShow" ref="printModelDesign" @saveData="getModelData" />
</el-dialog>
</template> </template>
<script> <script>
import { import {
createPackingModel, createPackingModel,
updatePackingModel, updatePackingModel,
getPackingModel, getPackingModel,
// getWorkOrderList, getTypeList,
// getCode,
// getCustomerList,
getTypeList
} from '@/api/base/printModel.js'; } from '@/api/base/printModel.js';
// import productAttrAdd from './attr-add'; // import productAttrAdd from './attr-add';
import { parseTime } from '../mixins/code-filter'; import { parseTime } from '../mixins/code-filter';
import SmallTitle from './SmallTitle'; import SmallTitle from './SmallTitle';
import printModelDesign from '../custom/index' import printModelDesign from '../custom/index';
const tableBtn = [ const tableBtn = [
{ {
@ -166,42 +158,42 @@ const tableProps = [
]; ];
export default { export default {
components: { SmallTitle, printModelDesign }, components: { SmallTitle, printModelDesign },
data() { data() {
return { return {
visible: false, visible: false,
addOrUpdateVisible: false, addOrUpdateVisible: false,
tableBtn, tableBtn,
tableProps, tableProps,
modelShow:false, modelShow: false,
typeList:[], typeList: [],
dataForm: { dataForm: {
id: null, id: null,
// name: '', // 产品名称 // name: '', // 产品名称
name: '', // 产品编码 name: '', // 产品编码
// area: 0, // 单位平方数(float only) // area: 0, // 单位平方数(float only)
typeId: null, // 产品类型id typeId: null, // 产品类型id
printModel: null, // 单位产品用时 (s) printModel: null, // 单位产品用时 (s)
content: '', // 规格 content: '', // 规格
remark: '', // 单位id remark: '', // 单位id
}, },
printModelList: [ printModelList: [
{ {
id: 1, id: 1,
name:'自动' name: '自动',
}, },
{ {
id: 2, id: 2,
name: '手动' name: '手动',
}, },
], ],
listQuery: { listQuery: {
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
total: 0, total: 0,
}, },
dataRule: { dataRule: {
typeId: [ typeId: [
{ {
required: true, required: true,
message: '打印类型不能为空', message: '打印类型不能为空',
@ -221,7 +213,7 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
printModel: [ printModel: [
{ {
required: true, required: true,
message: '模板类型不能为空', message: '模板类型不能为空',
@ -229,11 +221,11 @@ export default {
}, },
], ],
content: [ content: [
{ {
required: true, required: true,
message: '模板不能为空', message: '模板不能为空',
trigger: 'blur', trigger: 'blur',
}, },
], ],
processTime: [ processTime: [
{ {
@ -251,30 +243,30 @@ export default {
}, },
// isdetail: false, // isdetail: false,
}; };
}, },
methods: { methods: {
getModelData(data) { getModelData(data) {
console.log(data) console.log(data);
this.content = JSON.stringify(data) this.content = JSON.stringify(data);
this.dataForm.content = JSON.stringify(data) this.dataForm.content = JSON.stringify(data);
}, },
btnClickDesign() { btnClickDesign() {
console.log(11111) console.log(11111);
this.modelShow = true this.modelShow = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.printModelDesign.init(this.dataForm.content) this.$refs.printModelDesign.init(this.dataForm.content);
console.log(this.dataForm.content) console.log(this.dataForm.content);
}) });
// this.$router.push({ // this.$router.push({
// path: '/printModelDesign' // path: '/printModelDesign'
// }) // })
}, },
// initData() { // initData() {
// this.productAttributeList.splice(0); // this.productAttributeList.splice(0);
// this.listQuery.total = 0; // this.listQuery.total = 0;
// }, // },
init(id) { init(id) {
this.getDict() this.getDict();
// this.initData(); // this.initData();
// this.isdetail = isdetail || false; // this.isdetail = isdetail || false;
this.dataForm.id = id || null; this.dataForm.id = id || null;
@ -284,34 +276,34 @@ export default {
this.$refs['dataForm'].resetFields(); this.$refs['dataForm'].resetFields();
if (this.dataForm.id) { if (this.dataForm.id) {
// 获取产品详情 // 获取产品详情
getPackingModel(id).then((response) => { getPackingModel(id).then((response) => {
this.dataForm = response.data; this.dataForm = response.data;
}); });
// 获取产品的属性列表 // 获取产品的属性列表
// this.getList(); // this.getList();
} else { } else {
// getCode().then((res) => { // getCode().then((res) => {
// this.dataForm.packagingCode = res.data; // this.dataForm.packagingCode = res.data;
// }); // });
} }
}); });
}, },
getDict() { getDict() {
// 获取产品的属性列表 // 获取产品的属性列表
// getCustomerList().then((response) => { // getCustomerList().then((response) => {
// console.log(response); // console.log(response);
// this.customerList = response.data // this.customerList = response.data
// // this.listQuery.total = response.data.total; // // this.listQuery.total = response.data.total;
// }) // })
getTypeList().then((response) => { getTypeList().then((response) => {
console.log(response); console.log(response);
this.typeList = response.data this.typeList = response.data;
// this.listQuery.total = response.data.total; // this.listQuery.total = response.data.total;
}) });
// getWorkOrderList().then((response) => { // getWorkOrderList().then((response) => {
// // console.log(response); // // console.log(response);
// this.workOrderList = response.data // this.workOrderList = response.data
// // this.listQuery.total = response.data.total; // // this.listQuery.total = response.data.total;
// }) // })
}, },
@ -353,7 +345,7 @@ export default {
if (valid) { if (valid) {
// 修改的提交 // 修改的提交
if (this.dataForm.id) { if (this.dataForm.id) {
updatePackingModel(this.dataForm).then((response) => { updatePackingModel(this.dataForm).then((response) => {
this.$modal.msgSuccess('修改成功'); this.$modal.msgSuccess('修改成功');
this.visible = false; this.visible = false;
this.$emit('refreshDataList'); this.$emit('refreshDataList');
@ -361,7 +353,7 @@ export default {
return; return;
} }
// 添加的提交 // 添加的提交
createPackingModel(this.dataForm).then((response) => { createPackingModel(this.dataForm).then((response) => {
this.$modal.msgSuccess('新增成功'); this.$modal.msgSuccess('新增成功');
this.visible = false; this.visible = false;
this.$emit('refreshDataList'); this.$emit('refreshDataList');
@ -439,35 +431,31 @@ export default {
} }
</style> --> </style> -->
<style> <style>
.baseDialog .el-dialog__header { .baseDialog .el-dialog__header {
font-size: 16px; font-size: 16px;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
font-weight: 500; font-weight: 500;
padding: 13px 24px; padding: 13px 24px;
border-bottom: 1px solid #e9e9e9; border-bottom: 1px solid #e9e9e9;
} }
.baseDialog .el-dialog__header .titleStyle::before{ .baseDialog .el-dialog__header .titleStyle::before {
content: ''; content: '';
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 16px; height: 16px;
background-color: #0B58FF; background-color: #0b58ff;
border-radius: 1px; border-radius: 1px;
margin-right: 8px; margin-right: 8px;
position: relative; position: relative;
top: 2px; top: 2px;
} }
.baseDialog .el-dialog__body { .baseDialog .el-dialog__body {
padding-left: 24px; padding-left: 24px;
padding-right: 24px; padding-right: 24px;
} }
.baseDialog .btnTextStyle { .baseDialog .btnTextStyle {
letter-spacing:6px; letter-spacing: 6px;
padding: 9px 10px 9px 16px; padding: 9px 10px 9px 16px;
font-size: 14px; font-size: 14px;
} }
</style> </style>

339
src/views/base/packagingPrintType/add-or-updata.vue
View File

@ -6,106 +6,72 @@
* @Description: * @Description:
--> -->
<template> <template>
<el-dialog class="baseDialog" :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="40%" show-close="true"> <el-dialog
<small-title slot="title" :no-padding="true"> class="baseDialog"
{{ !dataForm.id ? '新增' : '编辑' }} :visible.sync="visible"
</small-title> :show-close="true"
:wrapper-closable="false"
width="50%">
<small-title
slot="title"
:no-padding="true">
{{ !dataForm.id ? '新增' : '编辑' }}
</small-title>
<div class="content"> <div class="content">
<div class="visual-part"> <div class="visual-part">
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="auto" <el-form
@keyup.enter.native="dataFormSubmit"> ref="dataForm"
<el-row :gutter="20"> :model="dataForm"
<el-col :span="12"> :rules="dataRule"
<el-form-item label="名称" prop="name"> label-width="auto"
<el-input v-model="dataForm.name" clearable placeholder="名称" /> @keyup.enter.native="dataFormSubmit">
</el-form-item> <el-row :gutter="20">
</el-col> <el-col :span="24">
<el-col :span="12"> <el-form-item
<el-form-item label="类型描述" prop="description"> label="名称"
<el-input v-model="dataForm.description" clearable placeholder="类型描述" /> prop="name">
</el-form-item> <el-input
</el-col> v-model="dataForm.name"
</el-row> clearable
<!-- <el-row :gutter="20"> placeholder="名称" />
<el-col :span="24"> </el-form-item>
<el-form-item label="完成单位产品用时" prop="processTime"> </el-col>
<el-input v-model="dataForm.processTime" placeholder="请输入完成单位产品用时" /> <el-col :span="24">
</el-form-item> <el-form-item
</el-col> label="类型描述"
</el-row> --> prop="description">
</el-form> <el-input
v-model="dataForm.description"
<!-- <small-title clearable
style="margin: 16px 0; padding-left: 8px" placeholder="类型描述" />
:no-padding="true"> </el-form-item>
产品属性列表 </el-col>
</small-title> </el-row>
</el-form>
<div class="attr-list"> </div>
<base-table </div>
:table-props="tableProps" <template slot="footer">
:page="listQuery.pageNo" <el-button
:limit="listQuery.pageSize" style=""
:add-button-show="isdetail ? null : '添加属性'" @click="goback()">
@emitButtonClick="addNew()" 取消
:table-data="productAttributeList">
<method-btn
v-if="!isdetail"
slot="handleBtn"
:width="120"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
</base-table>
<pagination
v-show="listQuery.total > 0"
:total="listQuery.total"
:page.sync="listQuery.pageNo"
:limit.sync="listQuery.pageSize"
:page-sizes="[5, 10, 15]"
@pagination="getList" />
</div> -->
</div>
</div>
<!-- <div style="position: absolute; bottom: 24px; right: 24px">
<el-button style="margin-right: 10px" @click="goback()">返回</el-button>
<el-button v-if="isdetail" type="primary" @click="goEdit()">
编辑
</el-button> </el-button>
<span v-if="!isdetail"> <el-button
<el-button type="primary" @click="dataFormSubmit()">保存</el-button> type="primary"
<el-button @click="dataFormSubmit()">
v-if="dataForm.id && !isdetail" 确定
type="primary" </el-button>
@click="addNew()"> </template>
添加属性 </el-dialog>
</el-button>
</span>
</div> -->
<template slot="footer">
<el-button style="" @click="goback()">取消</el-button>
<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
编辑
</el-button> -->
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
</template>
</el-dialog>
</template> </template>
<script> <script>
import { import {
createPackingType, createPackingType,
updatePackingType, updatePackingType,
getPackingType, getPackingType,
// getWorkOrderList,
// getCode,
// getCustomerList,
// getModelList
} from '@/api/base/modelType.js'; } from '@/api/base/modelType.js';
// import productAttrAdd from './attr-add';
import { parseTime } from '../mixins/code-filter'; import { parseTime } from '../mixins/code-filter';
import SmallTitle from './SmallTitle'; import SmallTitle from './SmallTitle';
@ -142,20 +108,15 @@ export default {
visible: false, visible: false,
addOrUpdateVisible: false, addOrUpdateVisible: false,
tableBtn, tableBtn,
tableProps, tableProps,
customerList: [], customerList: [],
modelList:[], modelList: [],
workOrderList:[], workOrderList: [],
productAttributeList: [], productAttributeList: [],
dataForm: { dataForm: {
id: null, id: null,
// name: '', // 产品名称 name: '', // 产品编码
name: '', // 产品编码 description: null, // 产品类型id
// area: 0, // 单位平方数(float only)
description: null, // 产品类型id
// workOrderId: null, // 单位产品用时 (s)
// customerId: '', // 规格
// content: '', // 单位id
}, },
listQuery: { listQuery: {
pageSize: 10, pageSize: 10,
@ -171,18 +132,10 @@ export default {
}, },
], ],
}, },
// isdetail: false,
}; };
}, },
methods: { methods: {
// initData() { init(id) {
// this.productAttributeList.splice(0);
// this.listQuery.total = 0;
// },
init(id) {
// this.getDict()
// this.initData();
// this.isdetail = isdetail || false;
this.dataForm.id = id || null; this.dataForm.id = id || null;
this.visible = true; this.visible = true;
@ -191,76 +144,20 @@ export default {
if (this.dataForm.id) { if (this.dataForm.id) {
// 获取产品详情 // 获取产品详情
getPackingType(id).then((response) => { getPackingType(id).then((response) => {
this.dataForm = response.data; this.dataForm = response.data;
}); });
// 获取产品的属性列表
// this.getList();
} else {
// getCode().then((res) => {
// this.dataForm.packagingCode = res.data;
// });
} }
}); });
}, },
// getDict() {
// // 获取产品的属性列表
// getCustomerList().then((response) => {
// console.log(response);
// this.customerList = response.data
// // this.listQuery.total = response.data.total;
// })
// getModelList().then((response) => {
// console.log(response);
// this.modelList = response.data
// // this.listQuery.total = response.data.total;
// })
// getWorkOrderList().then((response) => {
// // console.log(response);
// this.workOrderList = response.data
// // this.listQuery.total = response.data.total;
// })
// },
// handleClick(raw) {
// if (raw.type === 'delete') {
// this.$confirm(
// `确定对${
// raw.data.name
// ? '[名称=' + raw.data.name + ']'
// : '[序号=' + raw.data._pageIndex + ']'
// }进行删除操作?`,
// '提示',
// {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning',
// }
// )
// .then(() => {
// deleteProductAttr(raw.data.id).then(({ data }) => {
// this.$message({
// message: '操作成功',
// type: 'success',
// duration: 1500,
// onClose: () => {
// this.getList();
// },
// });
// });
// })
// .catch(() => {});
// } else {
// this.addNew(raw.data.id);
// }
// },
// 表单提交 // 表单提交
dataFormSubmit() { dataFormSubmit() {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
// 修改的提交 // 修改的提交
if (this.dataForm.id) { if (this.dataForm.id) {
updatePackingType(this.dataForm).then((response) => { updatePackingType(this.dataForm).then((response) => {
this.$modal.msgSuccess('修改成功'); this.$modal.msgSuccess('修改成功');
this.visible = false; this.visible = false;
this.$emit('refreshDataList'); this.$emit('refreshDataList');
@ -268,7 +165,7 @@ export default {
return; return;
} }
// 添加的提交 // 添加的提交
createPackingType(this.dataForm).then((response) => { createPackingType(this.dataForm).then((response) => {
this.$modal.msgSuccess('新增成功'); this.$modal.msgSuccess('新增成功');
this.visible = false; this.visible = false;
this.$emit('refreshDataList'); this.$emit('refreshDataList');
@ -294,88 +191,32 @@ export default {
}, },
}; };
</script> </script>
<!-- <style scoped>
.drawer >>> .el-drawer {
border-radius: 8px 0 0 8px;
display: flex;
flex-direction: column;
}
.drawer >>> .el-form-item__label {
padding: 0;
}
.drawer >>> .el-drawer__header {
margin: 0;
padding: 32px 32px 24px;
border-bottom: 1px solid #dcdfe6;
}
.drawer >>> .el-drawer__body {
flex: 1;
height: 1px;
display: flex;
flex-direction: column;
}
.drawer >>> .content {
padding: 30px 24px;
flex: 1;
display: flex;
flex-direction: column;
/* height: 100%; */
}
.drawer >>> .visual-part {
flex: 1 auto;
max-height: 76vh;
overflow: hidden;
overflow-y: scroll;
padding-right: 10px; /* 调整滚动条样式 */
}
.drawer >>> .el-form,
.drawer >>> .attr-list {
padding: 0 16px;
}
.drawer-body__footer {
display: flex;
justify-content: flex-end;
padding: 18px;
}
</style> -->
<style> <style>
.baseDialog .el-dialog__header { .baseDialog .el-dialog__header {
font-size: 16px; font-size: 16px;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
font-weight: 500; font-weight: 500;
padding: 13px 24px; padding: 13px 24px;
border-bottom: 1px solid #e9e9e9; border-bottom: 1px solid #e9e9e9;
} }
.baseDialog .el-dialog__header .titleStyle::before{ .baseDialog .el-dialog__header .titleStyle::before {
content: ''; content: '';
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 16px; height: 16px;
background-color: #0B58FF; background-color: #0b58ff;
border-radius: 1px; border-radius: 1px;
margin-right: 8px; margin-right: 8px;
position: relative; position: relative;
top: 2px; top: 2px;
} }
.baseDialog .el-dialog__body { .baseDialog .el-dialog__body {
padding-left: 24px; padding-left: 24px;
padding-right: 24px; padding-right: 24px;
} }
.baseDialog .btnTextStyle { .baseDialog .btnTextStyle {
letter-spacing:6px; letter-spacing: 6px;
padding: 9px 10px 9px 16px; padding: 9px 10px 9px 16px;
font-size: 14px; font-size: 14px;
} }
</style> </style>

257
src/views/energy/analysis/qoqAnalysis/components/lineChart.vue
View File

@ -1,138 +1,131 @@
<template> <template>
<div <div
id="analysischartLine" id="analysischartLine"
style="width: 100%" style="width: 100%"
:style="{ height: chartHeight + 'px' }" :style="{ height: chartHeight + 'px' }"></div>
></div>
</template> </template>
<script> <script>
import * as echarts from 'echarts' import * as echarts from 'echarts';
import resize from '@/utils/chartMixins/resize' import resize from '@/utils/chartMixins/resize';
export default { export default {
name: "LineChart", name: 'LineChart',
mixins: [resize], mixins: [resize],
data() { data() {
return { return {
chartDom: '', chartDom: '',
chart: '', chart: '',
chartHeight: this.tableHeight(370) chartHeight: this.tableHeight(370),
} };
}, },
props: { props: {
chartData: { chartData: {
type: Array, type: Array,
required: true, required: true,
default: () => { default: () => {
return [] return [];
} },
} },
}, },
watch: { watch: {
chartData: function () { chartData: function () {
this.getChart() this.getChart();
} },
}, },
mounted() { mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.chartHeight = this.tableHeight(370) this.chartHeight = this.tableHeight(370);
}) });
}, },
methods: { methods: {
getChart() { getChart() {
if ( if (
this.chart !== null && this.chart !== null &&
this.chart !== '' && this.chart !== '' &&
this.chart !== undefined this.chart !== undefined
) { ) {
this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例 this.chart.dispose(); // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
} }
this.chartDom = document.getElementById('analysischartLine') this.chartDom = document.getElementById('analysischartLine');
this.chart = echarts.init(this.chartDom) this.chart = echarts.init(this.chartDom);
if (this.chartData.length === 0) { if (this.chartData.length === 0) {
return false return false;
} }
let arr = this.chartData[0].type // [水，电，煤] let arr = this.chartData[0].type; // [水，电，煤]
let keys = Object.keys(this.chartData[0]) let keys = Object.keys(this.chartData[0]);
let yData = [ let yData = [
{ {
name: '本期', name: '本期',
type: 'bar', type: 'bar',
data: [], data: [],
barWidth: 20, barWidth: 20,
label: { },
show: true, {
position: 'top' name: '上期',
} type: 'bar',
}, data: [],
{ barWidth: 20,
name: '上期', },
type: 'bar', ];
data: [], for (let j = 0; j < arr.length; j++) {
barWidth: 20, for (let k = 0; k < keys.length; k++) {
label: { if (keys[k].indexOf(arr[j] + '_上期') > -1) {
show: true, yData[1].data.push(this.chartData[0][keys[k]]);
position: 'top' }
} if (keys[k].indexOf(arr[j] + '_能源消耗') > -1) {
} yData[0].data.push(this.chartData[0][keys[k]]);
] }
for (let j = 0; j < arr.length; j++) { }
for (let k = 0; k < keys.length; k++) { }
if (keys[k].indexOf(arr[j]+'_上期') > -1) { var option = {
yData[1].data.push(this.chartData[0][keys[k]]) color: ['#288AFF', '#8EF0AB'],
} tooltip: {
if (keys[k].indexOf(arr[j]+'_能源消耗') > -1) { trigger: 'axis',
yData[0].data.push(this.chartData[0][keys[k]]) axisPointer: {
} type: 'shadow',
} },
} formatter: function (params) {
var option = { return (
color:['#288AFF','#8EF0AB'], params[0].axisValue +
tooltip: { `<br>` +
trigger: 'axis', params
axisPointer: { .map((item) => {
type: 'shadow' let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`;
}, let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`;
formatter: function(params) { let value = item.value ? item.value : '-';
return ( let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`;
params[0].axisValue + return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
`<br>` +
params.map((item) => {
let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`
let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
let value = item.value ? item.value : '-'
let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`
return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
<span>${str}${seriesNameStr}</span> <span>${str}${seriesNameStr}</span>
<span>${valueStr}</span> <span>${valueStr}</span>
</span>` </span>`;
}).join(``) })
) .join(``)
} );
}, },
legend: { },
right: '1%', legend: {
icon: 'rect', right: '1%',
itemHeight: 8, icon: 'rect',
itemWidth: 8 itemHeight: 8,
}, itemWidth: 8,
grid: { },
left: '1%', grid: {
right: '1%', left: '1%',
bottom: '3%', right: '1%',
containLabel: true bottom: '3%',
}, containLabel: true,
yAxis: { },
type: 'value', yAxis: {
boundaryGap: [0, 0.01] type: 'value',
}, boundaryGap: [0, 0.01],
xAxis: { },
type: 'category', xAxis: {
data: arr type: 'category',
}, data: arr,
series: yData },
} series: yData,
option && this.chart.setOption(option); };
} option && this.chart.setOption(option);
} },
} },
</script> };
</script>

27
src/views/energy/analysis/trendAnalysis/index.vue
View File

@ -74,29 +74,12 @@ export default {
}, },
// 导出excel // 导出excel
exportExl(params) { exportExl(params) {
exportTrend({ ...params }).then((res) => { exportTrend({ ...params })
// let fileName = ''; .then((response) => {
// const contentDisposition = res.headers['content-disposition']; this.$download.excel(response, '走势分析.xls');
// if (contentDisposition) {
// fileName = decodeURIComponent(
// contentDisposition.slice(
// contentDisposition.indexOf('filename=') + 9
// )
// );
// }
const blob = new Blob([res.data]);
const reader = new FileReader();
reader.readAsDataURL(blob);
reader.onload = (e) => {
const a = document.createElement('a');
a.download = '走势分析';
a.href = e.target.result;
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
this.$message.success('导出成功'); this.$message.success('导出成功');
}; })
}); .catch(() => {});
}, },
}, },
}; };

237
src/views/report/Environmental/productionDayR/index.vue Normal file
View File

@ -0,0 +1,237 @@
<!--
* @Author: zhp
* @Date: 2024-01-24 15:15:24
* @LastEditTime: 2024-04-18 16:49:31
* @LastEditors: zhp
* @Description:
-->
<template>
<div class="app-container">
<div>
<!-- <el-alert title="自定义 close-text" type="warning" close-text="知道了">
</el-alert> -->
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
<el-form-item label="日" prop="time">
<el-date-picker v-model="listQuery.time" value-format="timestamp" type="datetime"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
@click="getDataList">查询</el-button>
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
plain @click="handleExport">导出</el-button>
</el-form-item>
</el-form>
</div>
<inputTable :date="date" :data="tableData" :time="[startTimeStamp]" :sum="all" :type="listQuery.reportType"
@refreshDataList="getDataList" />
<!-- <pagination
:limit.sync="listQuery.pageSize"
:page.sync="listQuery.pageNo"
:total="listQuery.total"
@pagination="getDataList" /> -->
</div>
</template>
<script>
// import { parseTime } from '../../core/mixins/code-filter';
import { getAutoDailyData } from '@/api/report/qcReport';
import inputTable from './inputTable.vue';
// import { getCorePLList } from '@/api/base/coreProductionLine';
import moment from 'moment'
import FileSaver from 'file-saver'
// import * as XLSX from 'xlsx'
export default {
components: { inputTable },
data() {
return {
urlOptions: {
getDataListURL: getAutoDailyData,
// exportURL: exportGlasscExcel
},
listQuery: {
// pageSize: 10,
// pageNo: 1,
// total: 0,
// reportType: 2,
time: ''
},
date: '许昌安彩新能科技有限公司2024年4月份生产日报',
time: '',
startTimeStamp: '',
endTimeStamp: '',
tableData: [],
proLineList: [],
all: {}
};
},
created() {
// this.getDict()
this.getTodayStartTimeAndEndTime()
this.getDataList()
},
methods: {
getTodayStartTimeAndEndTime() {
this.listQuery.time = new Date()
// this.changeTime(this.time)
},
async getDict() {
// 产线列表
// const res = await getCorePLList();
// this.proLineList = res.data;
},
// 获取数据列表
multipliedByHundred(str) {
console.log(str);
// console.log(str)
if (str != 0) {
let floatVal = parseFloat(str);
if (isNaN(floatVal)) {
return 0;
}
floatVal = Math.round(str * 10000) / 100;
let strVal = floatVal.toString();
let searchVal = strVal.indexOf('.');
if (searchVal < 0) {
searchVal = strVal.length;
strVal += '.';
}
while (strVal.length <= searchVal + 2) {
strVal += '0';
}
return parseFloat(strVal);
}
},
async getDataList() {
// const res = await getCorePLList()
// this.proLineList = res.data;
this.dataListLoading = true
if (this.listQuery.time.length == 0) {
this.$message({
message: '请选择时间',
type: 'warning'
})
return false
}
await this.urlOptions.getDataListURL(this.listQuery).then(res => {
console.log(res.data.datas);
let arr = res.data.datas
let obj = res.data.reportAutoYdailyRespVO
obj.lineName = '合计'
arr.push(obj)
// this.tableData.push(res.data.reportAutoYdailyRespVO)
this.tableData = arr
this.listQuery.total = res.data.length;
this.dataListLoading = false;
});
},
add0(m) {
return m < 10 ? '0' + m : m
},
format(shijianchuo) {
//shijianchuo是整数，否则要parseInt转换
var time = moment(new Date(shijianchuo)).format('YYYY-MM-DD HH:mm:ss')
// console.log(time)
// 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 time
},
// changeTime(val) {
// if (val) {
// // console.log(val)
// // console.log(val.setHours(7, 0, 0))
// // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
// // let time = this.format(val.setHours(7, 0, 0))
// // this.startTimeStamp = this.format(val.setHours(0, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
// // this.startTimeStamp = this.format(val.setHours(7, 0, 0) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
// // console.log(this.listQuery.reportTime);
// this.listQuery.time = this.format(val.setHours(0, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
// // this.listQuery.time[0] = this.format(val.setHours(7, 0, 0) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
// // console.log(this.listQuery.reportTime);
// } else {
// this.listQuery.time = ''
// }
// },
//时间戳转为yy-mm-dd hh:mm:ss
timeFun(unixtimestamp) {
var unixtimestamp = new Date(unixtimestamp);
var year = 1900 + unixtimestamp.getYear();
var month = "0" + (unixtimestamp.getMonth() + 1);
var date = "0" + unixtimestamp.getDate();
return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
},
buttonClick(val) {
this.listQuery.time = val.time ? val.time : undefined;
switch (val.btnName) {
case 'search':
this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10;
this.getDataList();
break;
case 'export':
this.handleExport();
break;
default:
console.log(val);
}
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
var xlsxParam = { raw: true };
/* 从表生成工作簿对象 */
import('xlsx').then(excel => {
var wb = excel.utils.table_to_book(
document.querySelector("#exportTable"),
xlsxParam
);
/* 获取二进制字符串作为输出 */
var wbout = excel.write(wb, {
bookType: "xlsx",
bookSST: true,
type: "array",
});
try {
FileSaver.saveAs(
//Blob 对象表示一个不可变、原始数据的类文件对象。
//Blob 表示的不一定是JavaScript原生格式的数据。
//File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
//返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
new Blob([wbout], { type: "application/octet-stream" }),
//设置导出文件名称
"许昌安彩日原片生产汇总.xlsx"
);
} catch (e) {
if (typeof console !== "undefined") console.log(e, wbout);
}
return wbout;
//do something......
})
},
},
};
</script>
<style scoped>
/* .blueTip { */
/* padding-bottom: 10px; */
/* } */
.blueTip::before {
display: inline-block;
content: '';
width: 4px;
height: 18px;
background: #0B58FF;
border-radius: 1px;
margin-right: 8PX;
margin-top: 8px;
}
</style>

273
src/views/report/Environmental/productionDayR/inputTable.vue Normal file
View File

@ -0,0 +1,273 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 15:49:48
* @LastEditTime: 2024-04-18 16:30:42
* @LastEditors: zhp
* @Description:
-->
<template>
<div>
<el-row style="float: right; margin-bottom: 5px">
<el-button v-if="!edit && this.$auth.hasPermi('base:report-auto-original-glass:update')" :disabled="noData"
size="small" @click="edit = true">编辑</el-button>
<el-button v-if="edit" size="small" @click="handleReturn()">返回</el-button>
<el-button v-if="edit" size="small" @click="updateData">保存</el-button>
</el-row>
<el-table :id="id" :data="data" border style="width: 100%">
<el-table-column v-for="(item, index) in cols" :key="index" :prop="item.prop" :label="item.label"
:align="item.align ? item.align : 'left'">
<el-table-column v-for="(it, index1) in item.children" :key="index1" :prop="it.prop" :label="it.label"
:align="item.align ? item.align : 'left'">
<el-table-column v-for="(y, index2) in it.children" :key="index2" :prop="y.prop" :label="y.label">
<template slot-scope="scope">
<span v-if="!edit">{{ scope.row[y.prop] }}</span>
<el-input type="number" @change="handleChange" :disabled="y.prop == 'dailyOutputTrend' || y.prop === 'originalGlassStatisticsTrend'
|| y.prop === 'actualProductTrend' || y.prop === 'originalGlassPassTrend' || y.prop === 'originalGlassPassNow' || y.prop === 'originalGlassPassHis'
" v-else v-model="scope.row[y.prop]"></el-input>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
<!-- <el-input type="textarea" v-model="remark" placeholder="备注" :disabled="!edit" :autosize="{ minRows: 2, maxRows: 6}">
</el-input> -->
</div>
</template>
<script>
import { updateGlass, updateGlassRemark } from '@/api/report/glass';
const cols = [
{
prop: 'xc',
label: '许昌安彩新能科技有限公司2024年4月份生产日报',
align: 'center',
children: [
{
prop: 'lineName',
label: '生产线',
},
{
prop: 'm',
label: '尺寸(长、宽、厚)毫米',
align: 'center',
children: [
{
prop: 'length',
label: '长',
},
{
prop: 'width',
label: '宽',
},
{
prop: 'thick',
label: '高',
}
]
},
{
prop: 'm',
label: '良品数',
align: 'center',
children: [
{
prop: 'earlyNum',
label: '早班',
},
{
prop: 'nightNum',
label: '晚班',
},
{
prop: 'num',
label: '合计',
}
]
},
{
prop: 'weight',
label: '良品重量(吨)',
},
{
prop: 'y',
label: '良品玻璃面积（㎡）',
align: 'center',
children: [
{
prop: 'earlyArea',
label: '早班',
},
{
prop: 'nightArea',
label: '晚班',
},
{
prop: 'area',
label: '合计',
}
]
},
{
prop: 'y',
label: '原片良品率',
align: 'center',
children: [
{
prop: 'earlyRate',
label: '早班',
},
{
prop: 'nightRate',
label: '晚班',
},
{
prop: 'rate',
label: '合计',
}
]
},
{
prop: 'monthArea',
label: '月累计面积',
},
{
prop: 'remark',
label: '备注',
}
]
}
]
export default {
props: {
data: {
type: Array,
default: () => [],
},
id: {
type: String,
default:'exportTable'
},
time: {
type: Array,
default: () => [],
},
date: {
type: String,
default:''
},
sum: {
type: Object,
default: () => {},
},
type: {
type: Number,
default: 3,
}
},
data() {
return {
cols,
remark:null,
edit: false,
noData:false,
};
},
watch: {
data: {
handler(newv, oldv) {
if (newv.length != 0) {
this.noData = false
} else {
this.noData = true
}
}
},
time: {
immediate: true,
handler(newv, oldv) {
if (newv[0] !== '') {
this.cols[0].label = this.date + '(' + newv[0] + '-' + newv[1] + ')'
} else {
this.cols[0].label = this.date
}
}
},
// type: {
// immediate: true,
// handler(newv, oldv) {
// let text1 = '', text2 = '', text3 = ''
// if (newv === 3) {
// text1 = '本周'
// text2 = '上周'
// text3 = '原片合计（片/周）'
// } else if (newv === 4) {
// text1 = '本月'
// text2 = '上月'
// text3 = '原片合计（片/月）'
// } else if (newv === 2) {
// text1 = '今日'
// text2 = '昨日'
// text3 = '原片合计（片/日）'
// } else {
// text1 = '本年'
// text2 = '上年'
// text3 = '原片合计（片/年）'
// }
// this.cols[0].children[1].children[0].label = text1
// this.cols[0].children[1].children[1].label = text2
// this.cols[0].children[2].children[0].label = text1
// this.cols[0].children[2].children[1].label = text2
// this.cols[0].children[3].children[0].label = text1
// this.cols[0].children[3].children[1].label = text2
// this.cols[0].children[4].children[0].label = text1
// this.cols[0].children[4].children[1].label = text2
// this.cols[0].children[2].label = text3
// }
// }
},
methods: {
handleReturn() {
this.edit = false
console.log(this.$parent.getDataList());
},
handleChange(e) {
},
updateData() {
// let obj = {}
// this.data.forEach((ele, index) => {
// if (ele.det === false) {
// this.data[index].lineId = ''
// this.data[index].remark = this.remark
// obj = ele
// delete this.data[index].dailyOutputTrend
// delete this.data[index].originalGlassStatisticsTrend
// delete this.data[index].actualProductTrend
// delete this.data[index].originalGlassPassTrend
// this.data.splice(index, 1)
// }
// })
// let updateArr = this.data
// updateArr.forEach((ele, index) => {
// delete ele.dailyOutputTrend
// delete ele.originalGlassStatisticsTrend
// delete ele.actualProductTrend
// delete ele.originalGlassPassTrend
// });
// this.data.forEach((ele, index) => {
// delete ele.dailyOutputTrend
// delete ele.originalGlassStatisticsTrend
// delete ele.actualProductTrend
// delete ele.originalGlassPassTrend
// });
updateGlass(updateArr).then(response => {
updateGlassRemark(obj).then(res => {
this.$modal.msgSuccess("修改成功");
this.edit = false;
this.$emit("refreshDataList");
});
});
}
}
};
</script>

220
src/views/report/Environmental/productionDayR/secondTable.vue Normal file
View File

@ -0,0 +1,220 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 16:32:03
* @LastEditTime: 2024-04-18 16:34:49
* @LastEditors: zhp
* @Description:
-->
<template>
<div>
<el-row style="float: right; margin-bottom: 5px">
<el-button v-if="!edit && this.$auth.hasPermi('base:report-auto-original-glass:update')" :disabled="noData"
size="small" @click="edit = true">编辑</el-button>
<el-button v-if="edit" size="small" @click="handleReturn()">返回</el-button>
<el-button v-if="edit" size="small" @click="updateData">保存</el-button>
</el-row>
<el-table :id="id" :data="data" border style="width: 100%">
<el-table-column v-for="(item, index) in cols" :key="index" :prop="item.prop" :label="item.label"
:align="item.align ? item.align : 'left'">
<el-table-column v-for="(it, index1) in item.children" :key="index1" :prop="it.prop" :label="it.label"
:align="item.align ? item.align : 'left'">
<el-table-column v-for="(y, index2) in it.children" :key="index2" :prop="y.prop" :label="y.label">
<template slot-scope="scope">
<span v-if="!edit">{{ scope.row[y.prop] }}</span>
<el-input type="number" @change="handleChange" :disabled="y.prop == 'dailyOutputTrend' || y.prop === 'originalGlassStatisticsTrend'
|| y.prop === 'actualProductTrend' || y.prop === 'originalGlassPassTrend' || y.prop === 'originalGlassPassNow' || y.prop === 'originalGlassPassHis'
" v-else v-model="scope.row[y.prop]"></el-input>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
<!-- <el-input type="textarea" v-model="remark" placeholder="备注" :disabled="!edit" :autosize="{ minRows: 2, maxRows: 6}">
</el-input> -->
</div>
</template>
<script>
import { updateGlass, updateGlassRemark } from '@/api/report/glass';
const cols = [
{
prop: 'xc',
label: '许昌安彩新能科技有限公司2024年4月份生产日报',
align: 'center',
children: [
{
prop: 'lineName',
label: '生产线',
},
{
prop: '拉引速度(米/分)',
label: '班次',
},
{
prop: 'width2',
label: '板宽（mm）',
},
{
prop: 'weight2',
label: '板重(g)',
},
{
prop: 'lineName',
label: '拉引量(吨/班)',
},
{
prop: 'm',
label: '尺寸(长、宽、厚)毫米',
align: 'center',
children: [
{
prop: 'length',
label: '长',
},
{
prop: 'width',
label: '宽',
},
{
prop: 'thick',
label: '高',
}
]
}
]
}
]
export default {
props: {
data: {
type: Array,
default: () => [],
},
id: {
type: String,
default:'exportTable'
},
time: {
type: Array,
default: () => [],
},
date: {
type: String,
default:''
},
sum: {
type: Object,
default: () => {},
},
type: {
type: Number,
default: 3,
}
},
data() {
return {
cols,
remark:null,
edit: false,
noData:false,
};
},
watch: {
data: {
handler(newv, oldv) {
if (newv.length != 0) {
this.noData = false
} else {
this.noData = true
}
}
},
time: {
immediate: true,
handler(newv, oldv) {
if (newv[0] !== '') {
this.cols[0].label = this.date + '(' + newv[0] + '-' + newv[1] + ')'
} else {
this.cols[0].label = this.date
}
}
},
// type: {
// immediate: true,
// handler(newv, oldv) {
// let text1 = '', text2 = '', text3 = ''
// if (newv === 3) {
// text1 = '本周'
// text2 = '上周'
// text3 = '原片合计（片/周）'
// } else if (newv === 4) {
// text1 = '本月'
// text2 = '上月'
// text3 = '原片合计（片/月）'
// } else if (newv === 2) {
// text1 = '今日'
// text2 = '昨日'
// text3 = '原片合计（片/日）'
// } else {
// text1 = '本年'
// text2 = '上年'
// text3 = '原片合计（片/年）'
// }
// this.cols[0].children[1].children[0].label = text1
// this.cols[0].children[1].children[1].label = text2
// this.cols[0].children[2].children[0].label = text1
// this.cols[0].children[2].children[1].label = text2
// this.cols[0].children[3].children[0].label = text1
// this.cols[0].children[3].children[1].label = text2
// this.cols[0].children[4].children[0].label = text1
// this.cols[0].children[4].children[1].label = text2
// this.cols[0].children[2].label = text3
// }
// }
},
methods: {
handleReturn() {
this.edit = false
console.log(this.$parent.getDataList());
},
handleChange(e) {
},
updateData() {
// let obj = {}
// this.data.forEach((ele, index) => {
// if (ele.det === false) {
// this.data[index].lineId = ''
// this.data[index].remark = this.remark
// obj = ele
// delete this.data[index].dailyOutputTrend
// delete this.data[index].originalGlassStatisticsTrend
// delete this.data[index].actualProductTrend
// delete this.data[index].originalGlassPassTrend
// this.data.splice(index, 1)
// }
// })
// let updateArr = this.data
// updateArr.forEach((ele, index) => {
// delete ele.dailyOutputTrend
// delete ele.originalGlassStatisticsTrend
// delete ele.actualProductTrend
// delete ele.originalGlassPassTrend
// });
// this.data.forEach((ele, index) => {
// delete ele.dailyOutputTrend
// delete ele.originalGlassStatisticsTrend
// delete ele.actualProductTrend
// delete ele.originalGlassPassTrend
// });
updateGlass(updateArr).then(response => {
updateGlassRemark(obj).then(res => {
this.$modal.msgSuccess("修改成功");
this.edit = false;
this.$emit("refreshDataList");
});
});
}
}
};
</script>

434
src/views/report/ingredientReport/day.vue Normal file
View File

@ -0,0 +1,434 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 14:08:46
* @LastEditTime: 2024-04-19 15:11:14
* @LastEditors: zhp
* @Description:
-->
<template>
<div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<!-- <el-table show-summary :header-cell-style="{
background: '#F2F4F9',
color: '#606266'
}" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%"
:span-method="objectSpanMethod">
<el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center">
</el-table-column>
</el-table> -->
<!-- <el-table border style="margin-top: 50px;" :data="transData">
<el-table-column v-for="(item, index) in transTitle" :label="item" :key="index" align="center">
<template slot-scope="scope">
{{scope.row[index]}}
</template>
</el-table-column>
</el-table> -->
<el-table class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
<el-table-column label="原料样式" align="right" width="150">
<el-table-column prop="className" label="时间" width="120">
</el-table-column>
</el-table-column>
<el-table-column prop="putType" label="" width="180">
</el-table-column>
<!-- <el-table-column prop label="参考标准及评价方法">
<el-table-column prop="activityName"></el-table-column>
<el-table-column prop="message"></el-table-column>
</el-table-column> -->
<el-table-column v-for="(item,index) in codeList " :prop="item" :label="item">
</el-table-column>
</el-table>
<!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@pagination="getDataList" /> -->
<!-- <base-dialog
:dialogTitle="addOrEditTitle"
:dialogVisible="addOrUpdateVisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="30%"> -->
<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
<!-- </base-dialog> -->
</div>
</template>
<script>
// import AddOrUpdate from './add-or-updata';
// import basicPage from '../../../core/mixins/basic-page';
// import { parseTime } from '../../../core/mixins/code-filter';
import {
getIngredientData
} from '@/api/report/qcReport';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import FileSaver from 'file-saver'
// import { getList, } from "@/api/base/qualityScrapType";
const headers = [
// {
// prop: 'createTime',
// label: '添加时间',
// filter: parseTime
// },
{
prop: 'classType',
label: '时间'
},
{
prop: 'equipmentName',
label: ''
},
{
prop: 'num',
label: '片数'
},
{
prop: 'area',
label: '面积'
},
{
prop: 'countNum',
label: '托数',
// filter: (val) => val == false ? '不合格' : '合格',
},
{
prop: 'size',
label: '规格',
// filter: (val) => val == 1 ? 'A' : val == 2 ? 'B' : 'C',
},
// {
// prop: 'checkerName',
// label: '检测人员'
// },
// {
// prop: 'checkTime',
// label: '检测时间',
// filter: parseTime
// },
];
export default {
mixins: [ tableHeightMixin],
data() {
return {
urlOptions: {
getDataListURL: getIngredientData,
// deleteURL: deleteQualityHotMaterial,
// exportURL: exportFactoryExcel,
},
codeList: ['sj1', 'sj2', 'sj3', 'sj4', 'sj5', 'sj7', 'sj8', 'sj10', 'sj11', 'sj12', 'sj13', 'sj14' ],
tableData: [],
listQuery: {
startTime: undefined,
endTime:undefined
},
formConfig: [
{
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp",
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'checkTime',
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
width: 250
},
{
type:'button',
btnName: '查询',
name: 'search',
color: 'primary',
},
{
type:'button',
btnName: '导出',
name: 'export',
color: 'success',
plain: true
},
],
};
},
components: {
// AddOrUpdate,
},
created() {
},
mounted() {
// this.formConfig[1].defaultSelect[]
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
this.getDataList()
// this.getSpanArr(this.tableData)
// this.getDict();
},
methods: {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
let spanOneArr = [], concatOne = 0;
this.tableData.map((item, index) => {
if (index === 0) {
spanOneArr.push(1);
} else {
//第一列需合并相同内容的判断条件
if (item.className === this.tableData[index - 1].className) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
};
}
});
if (columnIndex === 0) {
const _row = spanOneArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
},
handleExport() {
// 处理查询参数
console.log(this.$refs);
var xlsxParam = { raw: true };
/* 从表生成工作簿对象 */
import('xlsx').then(excel => {
var wb = excel.utils.table_to_book(
document.querySelector("#exportTable"),
xlsxParam
);
/* 获取二进制字符串作为输出 */
var wbout = excel.write(wb, {
bookType: "xlsx",
bookSST: true,
type: "array",
});
try {
FileSaver.saveAs(
//Blob 对象表示一个不可变、原始数据的类文件对象。
//Blob 表示的不一定是JavaScript原生格式的数据。
//File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
//返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
new Blob([wbout], { type: "application/octet-stream" }),
//设置导出文件名称
"原片各线堆垛表.xlsx"
);
} catch (e) {
if (typeof console !== "undefined") console.log(e, wbout);
}
return wbout;
//do something......
})
},
// otherMethods(val) {
// if (val.type === 'detail') {
// this.addOrUpdateVisible = true;
// this.addOrEditTitle = "详情";
// this.$nextTick(() => {
// this.$refs.addOrUpdate.init(val.data.id, true);
// });
// }
// },
// 获取数据列表
getDataList() {
this.dataListLoading = true;
this.listQuery.startTime = '1713197388000';
this.listQuery.endTime = '1713254961000';
this.urlOptions.getDataListURL(this.listQuery).then(res => {
// console.log(res)
// console.log(res.data)
let arr = [
{
classType: 1,
className:'白班(8:00-20:00)',
'sj1': null,
'sj2': null,
'sj3': null,
'sj4': null,
'sj5': null,
'sj7': null,
'sj8': null,
'sj10': null,
'sj11': null,
'sj12': null,
'sj13': null,
'sj14': null,
putType: '投入数量'
},
{
classType: 1,
className: '白班(8:00-20:00)',
'sj1': null,
'sj2': null,
'sj3': null,
'sj4': null,
'sj5': null,
'sj7': null,
'sj8': null,
'sj10': null,
'sj11': null,
'sj12': null,
'sj13': null,
'sj14': null,
putType: '投入次数'
},
{
classType: 2,
className: '夜班(20:00-8:00)',
'sj1': null,
'sj2': null,
'sj3': null,
'sj4': null,
'sj5': null,
'sj7': null,
'sj8': null,
'sj10': null,
'sj11': null,
'sj12': null,
'sj13': null,
'sj14': null,
putType: '投入数量',
},
{
classType:2,
className: '夜班(20:00-8:00)',
'sj1': null,
'sj2': null,
'sj3': null,
'sj4': null,
'sj5': null,
'sj7': null,
'sj8': null,
'sj10': null,
'sj11': null,
'sj12': null,
'sj13': null,
'sj14': null,
putType: '投入次数',
},
{
classType: 1,
className: '全天',
'sj1': null,
'sj2': null,
'sj3': null,
'sj4': null,
'sj5': null,
'sj7': null,
'sj8': null,
'sj10': null,
'sj11': null,
'sj12': null,
'sj13': null,
'sj14': null,
putType: '投入数量',
},
{
classType: 2,
className: '全天',
'sj1': null,
'sj2': null,
'sj3': null,
'sj4': null,
'sj5': null,
'sj7': null,
'sj8': null,
'sj10': null,
'sj11': null,
'sj12': null,
'sj13': null,
'sj14': null,
putType: '投入次数',
}
]
res.data.forEach((ele) => {
this.codeList.forEach((item) => {
if (ele.classType === 1 && ele.code == item) {
// console.log(arr[0][item])
arr[0][item] = ele.putNum
arr[1][item] = ele.useNum
} else if (ele.classType === 2 && ele.code == item) {
arr[2][item] = ele.putNum
arr[3][item] = ele.useNum
} else if (ele.classType === 3 && ele.code == item) {
arr[4][item] = ele.putNum
arr[5][item] = ele.useNum
}
})
})
// console.log(arr)
this.tableData = arr
this.dataListLoading = false;
});
},
buttonClick(val) {
switch (val.btnName) {
case 'search':
this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
this.getDataList();
break;
case 'export':
this.handleExport();
break;
default:
console.log(val);
}
},
},
};
</script>
<style>
.baseTable .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}
.baseTable .el-table .el-table__cell {
padding: 0;
height: 35px;
}
.el-table thead.is-group th {
background: none;
}
.el-table thead.is-group tr:first-of-type th:first-of-type {
border-bottom: none;
}
.el-table thead.is-group tr:first-of-type th:first-of-type:before {
content: '';
position: absolute;
width: 1px;
height: 75px;
/*这里需要自己调整，根据td的宽度和高度*/
top: 0;
left: 0;
background-color: grey;
opacity: 0.3;
display: block;
transform: rotate(-53deg);
/*这里需要自己调整，根据线的位置*/
transform-origin: top;
}
.el-table thead.is-group tr:last-of-type th:first-of-type:before {
content: '';
position: absolute;
width: 1px;
height: 75px;
/*这里需要自己调整，根据td的宽度和高度*/
bottom: 0;
right: 0;
background-color: grey;
opacity: 0.3;
display: block;
transform: rotate(-54deg);
/*这里需要自己调整，根据线的位置*/
transform-origin: bottom;
}
</style>

85
src/views/report/productionDayR/index.vue Normal file
View File

@ -0,0 +1,85 @@
<template>
<div class="app-container">
<div>开发中</div>
<!-- 搜索工作栏 -->
<!-- <search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick" />
<div class="report-box">
<div class="top-box">
<div class="left-top">
<base-table
:table-props="tableProp1"
:table-data="tableData"
:span-method="spanMethod"
:max-height="tableH" />
</div>
<div class="right-top"></div>
</div>
<div class="bottom-box">
<div class="left-bottom"></div>
<div class="right-bottom"></div>
</div>
</div> -->
</div>
</template>
<script>
const tableProp1 = [
{
prop: 'col1',
label: '生产线',
fixed: true,
},
];
export default {
name: 'productionDayR',
data() {
return {
formConfig: [
{
type: 'datePicker',
label: '日',
dateType: 'date',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd',
placeholder: '日',
param: 'searchTime',
width: 150,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary',
},
{
type: 'separate',
},
{
type: this.$auth.hasPermi('base:group-classes:create')
? 'button'
: '',
btnName: '导出',
name: 'add',
color: 'primary',
plain: true,
},
],
};
},
mounted() {},
methods: {},
};
</script>
<style lang="scss" scoped>
.report-box {
.left-top,
.right-top,
.left-bottom,
.right-bottom {
display: inline-block;
border: 1px solid red;
}
}
</style>

261
src/views/report/qcReport/cutDayReport/index.vue Normal file
View File

@ -0,0 +1,261 @@
<template>
<div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :table-data="tableData">
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
@clickBtn="handleClick" /> -->
</base-table>
<!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@pagination="getDataList" /> -->
<!-- <base-dialog
:dialogTitle="addOrEditTitle"
:dialogVisible="addOrUpdateVisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="30%"> -->
<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
<!-- </base-dialog> -->
</div>
</template>
<script>
// import AddOrUpdate from './add-or-updata';
// import basicPage from '../../../core/mixins/basic-page';
// import { parseTime } from '../../../core/mixins/code-filter';
import {
getOriginalData
} from '@/api/report/qcReport';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import FileSaver from 'file-saver'
// import { getList, } from "@/api/base/qualityScrapType";
const tableProps = [
// {
// prop: 'createTime',
// label: '添加时间',
// filter: parseTime
// },
{
prop: 'lineName',
label: '产线'
},
{
prop: 'equipmentName',
label: ''
},
{
prop: 'num',
label: '片数'
},
{
prop: 'area',
label: '面积'
},
{
prop: 'countNum',
label: '托数',
// filter: (val) => val == false ? '不合格' : '合格',
},
{
prop: 'size',
label: '规格',
// filter: (val) => val == 1 ? 'A' : val == 2 ? 'B' : 'C',
},
// {
// prop: 'checkerName',
// label: '检测人员'
// },
// {
// prop: 'checkTime',
// label: '检测时间',
// filter: parseTime
// },
];
export default {
mixins: [ tableHeightMixin],
data() {
return {
urlOptions: {
getDataListURL: getOriginalData,
// deleteURL: deleteQualityHotMaterial,
// exportURL: exportFactoryExcel,
},
tableProps,
tableData: [],
listQuery: {
startTime: undefined,
endTime:undefined
},
formConfig: [
// {
// type: 'input',
// label: '报废原因',
// placeholder: '报废原因',
// param: 'content',
// },
// {
// type: 'select',
// label: '原料名称',
// selectOptions: [],
// labelField: 'name',
// valueField: 'id',
// param: 'materialId',
// filterable: true
// },
{
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd HH:mm:ss',
// valueFormat: "yyyy-MM-dd HH:mm:ss",
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'checkTime',
defaultSelect: [],
width: 250
},
{
type: this.$auth.hasPermi('base:quality-hot-material:query') ? 'button' : '',
btnName: '查询',
name: 'search',
color: 'primary',
},
// {
// type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'separate' : '',
// // type: 'separate',
// },
{
type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'button' : '',
btnName: '导出',
name: 'export',
color: 'success',
plain: true
},
],
};
},
components: {
// AddOrUpdate,
},
created() { },
mounted() {
this.getDataList()
// this.getDict();
},
methods: {
handleExport() {
// 处理查询参数
var xlsxParam = { raw: true };
/* 从表生成工作簿对象 */
import('xlsx').then(excel => {
var wb = excel.utils.table_to_book(
document.querySelector("#exportTable"),
xlsxParam
);
/* 获取二进制字符串作为输出 */
var wbout = excel.write(wb, {
bookType: "xlsx",
bookSST: true,
type: "array",
});
try {
FileSaver.saveAs(
//Blob 对象表示一个不可变、原始数据的类文件对象。
//Blob 表示的不一定是JavaScript原生格式的数据。
//File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
//返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
new Blob([wbout], { type: "application/octet-stream" }),
//设置导出文件名称
"原片各线堆垛表.xlsx"
);
} catch (e) {
if (typeof console !== "undefined") console.log(e, wbout);
}
return wbout;
//do something......
})
},
// otherMethods(val) {
// if (val.type === 'detail') {
// this.addOrUpdateVisible = true;
// this.addOrEditTitle = "详情";
// this.$nextTick(() => {
// this.$refs.addOrUpdate.init(val.data.id, true);
// });
// }
// },
// 获取数据列表
getDataList() {
this.dataListLoading = true;
this.listQuery.startTime = '1711095616000';
this.listQuery.endTime = '1711183743000';
this.urlOptions.getDataListURL(this.listQuery).then(response => {
this.tableData = response.data
// this.listQuery.total = response.data.total;
this.dataListLoading = false;
});
},
// deleteHandle(id, name, index, data) {
// this.$confirm(`确认要删除序号${index}?`, "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning",
// })
// .then(() => {
// this.urlOptions.deleteURL(id).then(({ data }) => {
// this.$message({
// message: "操作成功",
// type: "success",
// duration: 1500,
// onClose: () => {
// this.getDataList();
// },
// });
// });
// })
// .catch(() => { });
// },
// async getDict() {
// // 物料列表
// const res = await getHotMaterialAllList();
// this.formConfig[0].selectOptions = res.data;
// },
buttonClick(val) {
switch (val.btnName) {
case 'search':
// this.listQuery.pageNo = 1;
// this.listQuery.pageSize = 20;
// this.listQuery.materialId = val.materialId ? val.materialId : undefined;
// this.listQuery.startTime = '1706144404000';
// this.listQuery.endTime = '1706230804000';
this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
this.getDataList();
break;
// case 'reset':
// this.$refs.searchBarForm.resetForm();
// this.listQuery = {
// pageSize: 20,
// pageNo: 1,
// total: 1,
// };
// this.getDataList();
// break;
// case 'add':
// this.addOrEditTitle = '新增';
// this.addOrUpdateVisible = true;
// this.addOrUpdateHandle();
// break;
case 'export':
this.handleExport();
break;
default:
console.log(val);
}
},
},
};
</script>

435
src/views/report/qcReport/fullInspection/index.vue Normal file
View File

@ -0,0 +1,435 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 14:08:46
* @LastEditTime: 2024-04-19 15:48:59
* @LastEditors: zhp
* @Description:
-->
<template>
<div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<!-- <el-table show-summary :header-cell-style="{
background: '#F2F4F9',
color: '#606266'
}" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%"
:span-method="objectSpanMethod">
<el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center">
</el-table-column>
</el-table> -->
<!-- <el-table border style="margin-top: 50px;" :data="transData">
<el-table-column v-for="(item, index) in transTitle" :label="item" :key="index" align="center">
<template slot-scope="scope">
{{scope.row[index]}}
</template>
</el-table-column>
</el-table> -->
<el-table class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
<el-table-column label="原料样式" align="right" width="150">
<el-table-column prop="className" label="时间" width="120">
</el-table-column>
</el-table-column>
<el-table-column prop="putType" label="" width="180">
</el-table-column>
<!-- <el-table-column prop label="参考标准及评价方法">
<el-table-column prop="activityName"></el-table-column>
<el-table-column prop="message"></el-table-column>
</el-table-column> -->
<el-table-column v-for="(item, index) in codeList " :prop="item" :label="item">
</el-table-column>
</el-table>
<!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@pagination="getDataList" /> -->
<!-- <base-dialog
:dialogTitle="addOrEditTitle"
:dialogVisible="addOrUpdateVisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="30%"> -->
<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
<!-- </base-dialog> -->
</div>
</template>
<script>
// import AddOrUpdate from './add-or-updata';
// import basicPage from '../../../core/mixins/basic-page';
// import { parseTime } from '../../../core/mixins/code-filter';
import {
getQualityRecordReport
} from '@/api/report/qcReport';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import FileSaver from 'file-saver'
// import { getList, } from "@/api/base/qualityScrapType";
const headers = [
// {
// prop: 'createTime',
// label: '添加时间',
// filter: parseTime
// },
{
prop: 'classType',
label: '时间'
},
{
prop: 'equipmentName',
label: ''
},
{
prop: 'num',
label: '片数'
},
{
prop: 'area',
label: '面积'
},
{
prop: 'countNum',
label: '托数',
// filter: (val) => val == false ? '不合格' : '合格',
},
{
prop: 'size',
label: '规格',
// filter: (val) => val == 1 ? 'A' : val == 2 ? 'B' : 'C',
},
// {
// prop: 'checkerName',
// label: '检测人员'
// },
// {
// prop: 'checkTime',
// label: '检测时间',
// filter: parseTime
// },
];
export default {
mixins: [tableHeightMixin],
data() {
return {
urlOptions: {
getDataListURL: getQualityRecordReport,
// deleteURL: deleteQualityHotMaterial,
// exportURL: exportFactoryExcel,
},
codeList: ['sj1', 'sj2', 'sj3', 'sj4', 'sj5', 'sj7', 'sj8', 'sj10', 'sj11', 'sj12', 'sj13', 'sj14'],
tableData: [],
listQuery: {
"productionLineId": 1696716506443354114, "startTime": "2024-01-19 07:00:00"
},
formConfig: [
{
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp",
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'checkTime',
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
width: 250
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary',
},
{
type: 'button',
btnName: '导出',
name: 'export',
color: 'success',
plain: true
},
],
};
},
components: {
// AddOrUpdate,
},
created() {
},
mounted() {
// this.formConfig[1].defaultSelect[]
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
this.getDataList()
// this.getSpanArr(this.tableData)
// this.getDict();
},
methods: {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
let spanOneArr = [], concatOne = 0;
this.tableData.map((item, index) => {
if (index === 0) {
spanOneArr.push(1);
} else {
//第一列需合并相同内容的判断条件
if (item.className === this.tableData[index - 1].className) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
};
}
});
if (columnIndex === 0) {
const _row = spanOneArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
},
handleExport() {
// 处理查询参数
console.log(this.$refs);
var xlsxParam = { raw: true };
/* 从表生成工作簿对象 */
import('xlsx').then(excel => {
var wb = excel.utils.table_to_book(
document.querySelector("#exportTable"),
xlsxParam
);
/* 获取二进制字符串作为输出 */
var wbout = excel.write(wb, {
bookType: "xlsx",
bookSST: true,
type: "array",
});
try {
FileSaver.saveAs(
//Blob 对象表示一个不可变、原始数据的类文件对象。
//Blob 表示的不一定是JavaScript原生格式的数据。
//File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
//返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
new Blob([wbout], { type: "application/octet-stream" }),
//设置导出文件名称
"原片各线堆垛表.xlsx"
);
} catch (e) {
if (typeof console !== "undefined") console.log(e, wbout);
}
return wbout;
//do something......
})
},
// otherMethods(val) {
// if (val.type === 'detail') {
// this.addOrUpdateVisible = true;
// this.addOrEditTitle = "详情";
// this.$nextTick(() => {
// this.$refs.addOrUpdate.init(val.data.id, true);
// });
// }
// },
// 获取数据列表
getDataList() {
this.dataListLoading = true;
// this.listQuery.startTime = '1713197388000';
// this.listQuery.endTime = '1713254961000';
this.urlOptions.getDataListURL(this.listQuery).then(res => {
console.log(res.data);
// console.log(res)
// console.log(res.data)
// let arr = [
// {
// classType: 1,
// className: '白班(8:00-20:00)',
// 'sj1': null,
// 'sj2': null,
// 'sj3': null,
// 'sj4': null,
// 'sj5': null,
// 'sj7': null,
// 'sj8': null,
// 'sj10': null,
// 'sj11': null,
// 'sj12': null,
// 'sj13': null,
// 'sj14': null,
// putType: '投入数量'
// },
// {
// classType: 1,
// className: '白班(8:00-20:00)',
// 'sj1': null,
// 'sj2': null,
// 'sj3': null,
// 'sj4': null,
// 'sj5': null,
// 'sj7': null,
// 'sj8': null,
// 'sj10': null,
// 'sj11': null,
// 'sj12': null,
// 'sj13': null,
// 'sj14': null,
// putType: '投入次数'
// },
// {
// classType: 2,
// className: '夜班(20:00-8:00)',
// 'sj1': null,
// 'sj2': null,
// 'sj3': null,
// 'sj4': null,
// 'sj5': null,
// 'sj7': null,
// 'sj8': null,
// 'sj10': null,
// 'sj11': null,
// 'sj12': null,
// 'sj13': null,
// 'sj14': null,
// putType: '投入数量',
// },
// {
// classType: 2,
// className: '夜班(20:00-8:00)',
// 'sj1': null,
// 'sj2': null,
// 'sj3': null,
// 'sj4': null,
// 'sj5': null,
// 'sj7': null,
// 'sj8': null,
// 'sj10': null,
// 'sj11': null,
// 'sj12': null,
// 'sj13': null,
// 'sj14': null,
// putType: '投入次数',
// },
// {
// classType: 1,
// className: '全天',
// 'sj1': null,
// 'sj2': null,
// 'sj3': null,
// 'sj4': null,
// 'sj5': null,
// 'sj7': null,
// 'sj8': null,
// 'sj10': null,
// 'sj11': null,
// 'sj12': null,
// 'sj13': null,
// 'sj14': null,
// putType: '投入数量',
// },
// {
// classType: 2,
// className: '全天',
// 'sj1': null,
// 'sj2': null,
// 'sj3': null,
// 'sj4': null,
// 'sj5': null,
// 'sj7': null,
// 'sj8': null,
// 'sj10': null,
// 'sj11': null,
// 'sj12': null,
// 'sj13': null,
// 'sj14': null,
// putType: '投入次数',
// }
// ]
// res.data.forEach((ele) => {
// this.codeList.forEach((item) => {
// if (ele.classType === 1 && ele.code == item) {
// // console.log(arr[0][item])
// arr[0][item] = ele.putNum
// arr[1][item] = ele.useNum
// } else if (ele.classType === 2 && ele.code == item) {
// arr[2][item] = ele.putNum
// arr[3][item] = ele.useNum
// } else if (ele.classType === 3 && ele.code == item) {
// arr[4][item] = ele.putNum
// arr[5][item] = ele.useNum
// }
// })
// })
// // console.log(arr)
// this.tableData = arr
// this.dataListLoading = false;
});
},
buttonClick(val) {
switch (val.btnName) {
case 'search':
this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
this.getDataList();
break;
case 'export':
this.handleExport();
break;
default:
console.log(val);
}
},
},
};
</script>
<style>
.baseTable .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}
.baseTable .el-table .el-table__cell {
padding: 0;
height: 35px;
}
.el-table thead.is-group th {
background: none;
}
.el-table thead.is-group tr:first-of-type th:first-of-type {
border-bottom: none;
}
.el-table thead.is-group tr:first-of-type th:first-of-type:before {
content: '';
position: absolute;
width: 1px;
height: 75px;
/*这里需要自己调整，根据td的宽度和高度*/
top: 0;
left: 0;
background-color: grey;
opacity: 0.3;
display: block;
transform: rotate(-53deg);
/*这里需要自己调整，根据线的位置*/
transform-origin: top;
}
.el-table thead.is-group tr:last-of-type th:first-of-type:before {
content: '';
position: absolute;
width: 1px;
height: 75px;
/*这里需要自己调整，根据td的宽度和高度*/
bottom: 0;
right: 0;
background-color: grey;
opacity: 0.3;
display: block;
transform: rotate(-54deg);
/*这里需要自己调整，根据线的位置*/
transform-origin: bottom;
}
</style>

384
src/views/report/qcReport/lineReport.vue Normal file
View File

@ -0,0 +1,384 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 10:01:33
* @LastEditTime: 2024-04-18 16:26:48
* @LastEditors: zhp
* @Description:
-->
<template>
<div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<el-table :header-cell-style="{
background: '#F2F4F9',
color: '#606266'
}" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%"
:span-method="objectSpanMethod">
<el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center">
</el-table-column>
</el-table>
<!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@pagination="getDataList" /> -->
<!-- <base-dialog
:dialogTitle="addOrEditTitle"
:dialogVisible="addOrUpdateVisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="30%"> -->
<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
<!-- </base-dialog> -->
</div>
</template>
<script>
// import AddOrUpdate from './add-or-updata';
// import basicPage from '../../../core/mixins/basic-page';
// import { parseTime } from '../../../core/mixins/code-filter';
import {
getOriginalData
} from '@/api/report/qcReport';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import FileSaver from 'file-saver'
// import { getList, } from "@/api/base/qualityScrapType";
const tableProps = [
// {
// prop: 'createTime',
// label: '添加时间',
// filter: parseTime
// },
{
prop: 'lineName',
label: '产线'
},
{
prop: 'equipmentName',
label: ''
},
{
prop: 'num',
label: '片数'
},
{
prop: 'area',
label: '面积'
},
{
prop: 'countNum',
label: '托数',
// filter: (val) => val == false ? '不合格' : '合格',
},
{
prop: 'size',
label: '规格',
// filter: (val) => val == 1 ? 'A' : val == 2 ? 'B' : 'C',
},
// {
// prop: 'checkerName',
// label: '检测人员'
// },
// {
// prop: 'checkTime',
// label: '检测时间',
// filter: parseTime
// },
];
export default {
mixins: [ tableHeightMixin],
data() {
return {
urlOptions: {
getDataListURL: getOriginalData,
// deleteURL: deleteQualityHotMaterial,
// exportURL: exportFactoryExcel,
},
tableProps,
tableData: [],
mergeArr: [],//记录合并行数
pos: 0,
listQuery: {
startTime: undefined,
endTime:undefined
},
formConfig: [
// {
// type: 'input',
// label: '报废原因',
// placeholder: '报废原因',
// param: 'content',
// },
// {
// type: 'select',
// label: '原料名称',
// selectOptions: [],
// labelField: 'name',
// valueField: 'id',
// param: 'materialId',
// filterable: true
// },
{
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp",
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'checkTime',
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
width: 250
},
{
type:'button',
btnName: '查询',
name: 'search',
color: 'primary',
},
// {
// type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'separate' : '',
// // type: 'separate',
// },
{
type:'button',
btnName: '导出',
name: 'export',
color: 'success',
plain: true
},
],
};
},
components: {
// AddOrUpdate,
},
created() { },
mounted() {
// this.formConfig[1].defaultSelect[]
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
this.getDataList()
// this.getSpanArr(this.tableData)
// this.getDict();
},
methods: {
getSummaries(param) {
console.log(columns)
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
// const data = data.map(item => !Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] += ' ';
} else {
sums[index] = '-';
}
});
return sums;
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
let spanOneArr = [], concatOne = 0;
this.tableData.map((item, index) => {
if (index === 0) {
spanOneArr.push(1);
} else {
//第一列需合并相同内容的判断条件
if (item.lineName === this.tableData[index - 1].lineName) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
};
}
});
if (columnIndex === 0) {
const _row = spanOneArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
},
handleExport() {
// 处理查询参数
console.log(this.$refs);
var xlsxParam = { raw: true };
/* 从表生成工作簿对象 */
import('xlsx').then(excel => {
var wb = excel.utils.table_to_book(
document.querySelector("#exportTable"),
xlsxParam
);
/* 获取二进制字符串作为输出 */
var wbout = excel.write(wb, {
bookType: "xlsx",
bookSST: true,
type: "array",
});
try {
FileSaver.saveAs(
//Blob 对象表示一个不可变、原始数据的类文件对象。
//Blob 表示的不一定是JavaScript原生格式的数据。
//File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
//返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
new Blob([wbout], { type: "application/octet-stream" }),
//设置导出文件名称
"原片各线堆垛表.xlsx"
);
} catch (e) {
if (typeof console !== "undefined") console.log(e, wbout);
}
return wbout;
//do something......
})
},
// otherMethods(val) {
// if (val.type === 'detail') {
// this.addOrUpdateVisible = true;
// this.addOrEditTitle = "详情";
// this.$nextTick(() => {
// this.$refs.addOrUpdate.init(val.data.id, true);
// });
// }
// },
// 获取数据列表
getDataList() {
this.dataListLoading = true;
this.listQuery.startTime = '1711095616000';
this.listQuery.endTime = '1711183743000';
this.urlOptions.getDataListURL(this.listQuery).then(response => {
// this.getSpanArr(this.tableData)
// response.data.forEach((ele) => {
// console.log(ele.size.substring(2, ele.size.length - 2))
// // console.log(Object.prototype.toString.call(ele.size))
// // // if (Object.prototype.toString.call(ele.size) === Array) {
// // console.log(11111)
// // console.log();
// // }
// })
this.tableData = response.data.map((ele) => {
return {
area:ele.area,
countNum: ele.countNum,
equipmentName: ele.equipmentName,
lineName: ele.lineName,
num: ele.num,
// size: typeof (ele.size)
size: ele.size.match(/\[(.+?)\]/g) ? ele.size.substring(1, ele.size.length - 1) : ele.size
}
})
let obj = {}
response.data.reduce((prev, curr) => {
console.log(prev, curr)
})
// this.tableData.forEach((ele) => {
// ele.size.substring(2, ele.size.length - 2)
// // console.log(Object.prototype.toString.call(ele.size))
// // // if (Object.prototype.toString.call(ele.size) === Array) {
// // console.log(11111)
// // console.log();
// // }
// })
// let obj = {}
// this.tableData.forEach(ele => {
// obj.num += ele.num
// obj.area += ele.num
// obj.count += ele.num
// })
// console.log(obj);
// this.listQuery.total = response.data.total;
this.dataListLoading = false;
});
},
// deleteHandle(id, name, index, data) {
// this.$confirm(`确认要删除序号${index}?`, "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning",
// })
// .then(() => {
// this.urlOptions.deleteURL(id).then(({ data }) => {
// this.$message({
// message: "操作成功",
// type: "success",
// duration: 1500,
// onClose: () => {
// this.getDataList();
// },
// });
// });
// })
// .catch(() => { });
// },
// async getDict() {
// // 物料列表
// const res = await getHotMaterialAllList();
// this.formConfig[0].selectOptions = res.data;
// },
buttonClick(val) {
switch (val.btnName) {
case 'search':
// this.listQuery.pageNo = 1;
// this.listQuery.pageSize = 20;
// this.listQuery.materialId = val.materialId ? val.materialId : undefined;
// this.listQuery.startTime = '1706144404000';
// this.listQuery.endTime = '1706230804000';
this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
this.getDataList();
break;
// case 'reset':
// this.$refs.searchBarForm.resetForm();
// this.listQuery = {
// pageSize: 20,
// pageNo: 1,
// total: 1,
// };
// this.getDataList();
// break;
// case 'add':
// this.addOrEditTitle = '新增';
// this.addOrUpdateVisible = true;
// this.addOrUpdateHandle();
// break;
case 'export':
this.handleExport();
break;
default:
console.log(val);
}
},
},
};
</script>
<style>
.baseTable .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}
.baseTable .el-table .el-table__cell {
padding: 0;
height: 35px;
}
</style>

406
src/views/report/qcReport/optimizeCutData.vue Normal file
View File

@ -0,0 +1,406 @@
<!--
* @Author: zhp
* @Date: 2024-04-18 15:07:53
* @LastEditTime: 2024-04-18 15:26:50
* @LastEditors: zhp
* @Description:
-->
<template>
<div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<el-table show-summary :header-cell-style="{
background: '#F2F4F9',
color: '#606266'
}" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%"
:span-method="objectSpanMethod">
<el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center">
</el-table-column>
</el-table>
<!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@pagination="getDataList" /> -->
<!-- <base-dialog
:dialogTitle="addOrEditTitle"
:dialogVisible="addOrUpdateVisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="30%"> -->
<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
<!-- </base-dialog> -->
</div>
</template>
<script>
// import AddOrUpdate from './add-or-updata';
// import basicPage from '../../../core/mixins/basic-page';
// import { parseTime } from '../../../core/mixins/code-filter';
import {
getCuttingtData
} from '@/api/report/qcReport';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import FileSaver from 'file-saver'
// import { getList, } from "@/api/base/qualityScrapType";
const tableProps = [
// {
// prop: 'createTime',
// label: '添加时间',
// filter: parseTime
// },
{
prop: 'lineName',
label: '产线'
},
{
prop: 'dataType',
label: ''
},
{
prop: 'type',
label: '类别'
},
{
prop: 'pieces',
label: '片数'
},
{
prop: 'area',
label: '面积'
},
{
prop: 'rate',
label: '占比',
// filter: (val) => val == false ? '不合格' : '合格',
},
// {
// prop: 'checkerName',
// label: '检测人员'
// },
// {
// prop: 'checkTime',
// label: '检测时间',
// filter: parseTime
// },
];
export default {
mixins: [ tableHeightMixin],
data() {
return {
urlOptions: {
getDataListURL: getCuttingtData,
// deleteURL: deleteQualityHotMaterial,
// exportURL: exportFactoryExcel,
},
tableProps,
tableData: [],
mergeArr: [],//记录合并行数
pos: 0,
listQuery: {
startTime: undefined,
endTime:undefined
},
formConfig: [
// {
// type: 'input',
// label: '报废原因',
// placeholder: '报废原因',
// param: 'content',
// },
// {
// type: 'select',
// label: '原料名称',
// selectOptions: [],
// labelField: 'name',
// valueField: 'id',
// param: 'materialId',
// filterable: true
// },
{
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp",
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'checkTime',
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
width: 250
},
{
type:'button',
btnName: '查询',
name: 'search',
color: 'primary',
},
// {
// type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'separate' : '',
// // type: 'separate',
// },
{
type:'button',
btnName: '导出',
name: 'export',
color: 'success',
plain: true
},
],
};
},
components: {
// AddOrUpdate,
},
created() { },
mounted() {
// this.formConfig[1].defaultSelect[]
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
this.getDataList()
// this.getSpanArr(this.tableData)
// this.getDict();
},
methods: {
getSummaries(param) {
console.log(columns)
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] += ' ';
} else {
sums[index] = '-';
}
});
return sums;
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
let spanOneArr = [], concatOne = 0;
let spanTwoArr = [], concatTwo = 0;
this.tableData.map((item, index) => {
// console.log(inde);
if (index === 0) {
spanOneArr.push(1);
spanTwoArr.push(1);
} else {
//第一列需合并相同内容的判断条件
if (item.lineName === this.tableData[index - 1].lineName) {
spanOneArr[concatOne] += 1;
spanOneArr.push(0);
} else {
spanOneArr.push(1);
concatOne = index;
};
if (item.dataType === this.tableData[index - 1].dataType) {
spanTwoArr[concatTwo] += 1;
spanTwoArr.push(0);
} else {
spanTwoArr.push(1);
concatTwo = index;
};
}
});
if (columnIndex === 0) {
const _row = spanOneArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
if (columnIndex === 1) {
const _row = spanTwoArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col
}
}
},
handleExport() {
// 处理查询参数
console.log(this.$refs);
var xlsxParam = { raw: true };
/* 从表生成工作簿对象 */
import('xlsx').then(excel => {
var wb = excel.utils.table_to_book(
document.querySelector("#exportTable"),
xlsxParam
);
/* 获取二进制字符串作为输出 */
var wbout = excel.write(wb, {
bookType: "xlsx",
bookSST: true,
type: "array",
});
try {
FileSaver.saveAs(
//Blob 对象表示一个不可变、原始数据的类文件对象。
//Blob 表示的不一定是JavaScript原生格式的数据。
//File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
//返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
new Blob([wbout], { type: "application/octet-stream" }),
//设置导出文件名称
"原片各线堆垛表.xlsx"
);
} catch (e) {
if (typeof console !== "undefined") console.log(e, wbout);
}
return wbout;
//do something......
})
},
// otherMethods(val) {
// if (val.type === 'detail') {
// this.addOrUpdateVisible = true;
// this.addOrEditTitle = "详情";
// this.$nextTick(() => {
// this.$refs.addOrUpdate.init(val.data.id, true);
// });
// }
// },
// 获取数据列表
getDataList() {
this.dataListLoading = true;
this.listQuery.startTime = '1706144404000';
this.listQuery.endTime = '1706230804000';
this.urlOptions.getDataListURL(this.listQuery).then(response => {
// this.getSpanArr(this.tableData)
// response.data.forEach((ele) => {
// console.log(ele.size.substring(2, ele.size.length - 2))
// // console.log(Object.prototype.toString.call(ele.size))
// // // if (Object.prototype.toString.call(ele.size) === Array) {
// // console.log(11111)
// // console.log();
// // }
// })
this.tableData = response.data.map((ele) => {
return {
dataType: ele.dataType == 1 ? '成品' : ele.dataType == 2 ? '取样' : '废版',
code: ele.code,
putNum: ele.putNum,
lineName: ele.lineName,
type: ele.type,
pieces: ele.pieces,
area: ele.area,
rate: ele.rate
// useNum: ele.useNum,
// num: ele.num,
// size: typeof (ele.size)
// size: ele.size.match(/\[(.+?)\]/g) ? ele.size.substring(1, ele.size.length - 1) : ele.size
}
})
// let obj = {}
// response.data.reduce((prev, curr) => {
// console.log(prev, curr)
// })
// this.tableData.forEach((ele) => {
// ele.size.substring(2, ele.size.length - 2)
// // console.log(Object.prototype.toString.call(ele.size))
// // // if (Object.prototype.toString.call(ele.size) === Array) {
// // console.log(11111)
// // console.log();
// // }
// })
// let obj = {}
// this.tableData.forEach(ele => {
// obj.num += ele.num
// obj.area += ele.num
// obj.count += ele.num
// })
// console.log(obj);
// this.listQuery.total = response.data.total;
this.dataListLoading = false;
});
},
// deleteHandle(id, name, index, data) {
// this.$confirm(`确认要删除序号${index}?`, "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning",
// })
// .then(() => {
// this.urlOptions.deleteURL(id).then(({ data }) => {
// this.$message({
// message: "操作成功",
// type: "success",
// duration: 1500,
// onClose: () => {
// this.getDataList();
// },
// });
// });
// })
// .catch(() => { });
// },
// async getDict() {
// // 物料列表
// const res = await getHotMaterialAllList();
// this.formConfig[0].selectOptions = res.data;
// },
buttonClick(val) {
switch (val.btnName) {
case 'search':
// this.listQuery.pageNo = 1;
// this.listQuery.pageSize = 20;
// this.listQuery.materialId = val.materialId ? val.materialId : undefined;
// this.listQuery.startTime = '1706144404000';
// this.listQuery.endTime = '1706230804000';
this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
this.getDataList();
break;
// case 'reset':
// this.$refs.searchBarForm.resetForm();
// this.listQuery = {
// pageSize: 20,
// pageNo: 1,
// total: 1,
// };
// this.getDataList();
// break;
// case 'add':
// this.addOrEditTitle = '新增';
// this.addOrUpdateVisible = true;
// this.addOrUpdateHandle();
// break;
case 'export':
this.handleExport();
break;
default:
console.log(val);
}
},
},
};
</script>
<style>
.baseTable .el-table__body tr.current-row>td.el-table__cell {
background-color: #EAF1FC;
}
.baseTable .el-table .el-table__cell {
padding: 0;
height: 35px;
}
</style>