Merge remote-tracking branch 'origin/master'

master
mengjiao 4 months ago
commit 5bbd709aa6

@ -69,4 +69,26 @@ export function getdictlist(data) {
method: 'get',
params: data
});
}
}
export function getworkFaultReason(data) {
return request({
url: '/device/deviceInterface/getworkFaultReason',
method: 'get',
params: data
});
}
export function getworkFaultDesc(data) {
return request({
url: '/device/deviceInterface/getworkFaultDesc',
method: 'get',
params: data
});
}
export function getWave(data) {
return request({
url: '/device/deviceInterface/getWave',
method: 'get',
params: data
});
}

@ -96,4 +96,10 @@ export function getBomList(query) {
});
}
// 删除生产报工物料消耗
export function deleteConsume(workorderCode) {
return request({
url: '/mes/reportWorkConsume/deleteConsume/' + workorderCode,
method: 'delete'
});
}

@ -85,3 +85,18 @@ export function delFile(id) {
method: 'delete'
});
}
// 查询检验节点维护详细
export function listBelongToStandars() {
return request({
url: '/quality/checkType/listBelongToStandars',
method: 'get'
});
}
// 查询检验节点维护详细
export function listBelongToLines() {
return request({
url: '/quality/checkType/listBelongToLines',
method: 'get'
});
}

@ -207,4 +207,93 @@ export function getTableCPKList(query) {
method: 'get',
params: query
});
}
}
//白坯质量报表头部
export function getMonthOfDateTitle(query) {
return request({
url: '/quality/staticTable/getMonthOfDateTitle',
method: 'get',
params: query
});
}
export function getMonthOfData(query) {
return request({
url: '/quality/staticTable/getMonthOfData',
method: 'get',
params: query
});
}
export function getMonthOfLine(query) {
return request({
url: '/quality/staticTable/getMonthOfLine',
method: 'get',
params: query
});
}
export function getMonthOfDataRework(query) {
return request({
url: '/quality/staticTable/getMonthOfDataRework',
method: 'get',
params: query
});
}
export function getMonthOfLineRework(query) {
return request({
url: '/quality/staticTable/getMonthOfLineRework',
method: 'get',
params: query
});
}
export function getMonthOfDataDefect(query) {
return request({
url: '/quality/staticTable/getMonthOfDataDefect',
method: 'get',
params: query
});
}
export function getDefectItemTitle(query) {
return request({
url: '/quality/staticTable/getDefectItemTitle',
method: 'get',
params: query
});
}
export function getDefectItemData(query) {
return request({
url: '/quality/staticTable/getDefectItemData',
method: 'get',
params: query
});
}
export function getDefectItemLine(query) {
return request({
url: '/quality/staticTable/getDefectItemLine',
method: 'get',
params: query
});
}
export function getDefectItemDataPC(query) {
return request({
url: '/quality/staticTable/getDefectItemDataPC',
method: 'get',
params: query
});
}
export function getDefectItemLinePC(query) {
return request({
url: '/quality/staticTable/getDefectItemLinePC',
method: 'get',
params: query
});
}

@ -91,3 +91,12 @@ export function deleteByMaterialCode(data) {
data: data
});
}
// 修改用户物料关联
export function updateBelongTo(data) {
return request({
url: '/quality/material/updateBelongTo',
method: 'put',
data: data
});
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 KiB

@ -33,6 +33,7 @@ export const constantRoutes = [
{path: '/cs', component: () => import('@/views/cs/index.vue')},
{path: '/cs2', component: () => import('@/views/cs/index2.vue')},
{path: '/cs3', component: () => import('@/views/cs/index3.vue')},
{path: '/cs5', component: () => import('@/views/cs/index5.vue')},
{path: '/cs6', component: () => import('@/views/cs/index4.vue')},
{path: '/cs3_1', component: () => import('@/views/cs/index3_1.vue')},
{

@ -150,7 +150,8 @@
<!-- </div>-->
<div v-for="i in infoData " class="info"
:style="`width: ${i.width}%; height: ${i.height}%;top: ${i.top}%;left: ${i.left}%;transform: rotate(${i.rotate}deg); background: #CB4C4C${i.alpha};border-radius: ${i.radius}%;`">
:style="`width: ${i.width}%; height: ${i.height}%;top: ${i.top}%;left: ${i.left}%;transform: rotate(${i.rotate}deg);
background: ${i.alpha};border-radius: ${i.radius}%; `">
<div :class="i.isRight?'infoModel':'infoModel'" :style="`transform: rotate(${360 -i.rotate}deg);`">
<div class="title">{{ i.equipmentName }}</div>
<div style="color: #fff;
@ -196,7 +197,7 @@ import moment from 'moment';
export default {
data() {
return {
url: "ws://127.0.0.1:9208/websocket/message",
url: "ws://192.168.202.34:9208/websocket/message",
message: "",
text_content: "",
scrollText: "",
@ -213,28 +214,6 @@ export default {
workCenter: null,
factoryCode: null
},
tableData: [
{ time: '08:30', device: '设备A', status: '运行中', output: '1200' },
{ time: '09:15', device: '设备B', status: '待机', output: '800' },
{ time: '08:30', device: '设备A', status: '运行中', output: '1200' },
{ time: '09:15', device: '设备B', status: '待机', output: '800' },
{ time: '08:30', device: '设备A', status: '运行中', output: '1200' },
{ time: '09:15', device: '设备B', status: '待机', output: '800' },
{ time: '08:30', device: '设备A', status: '运行中', output: '1200' },
{ time: '09:15', device: '设备B', status: '待机', output: '800' },
{ time: '08:30', device: '设备A', status: '运行中', output: '1200' },
{ time: '09:15', device: '设备B', status: '待机', output: '800' },
{ time: '08:30', device: '设备A', status: '运行中', output: '1200' },
{ time: '09:15', device: '设备B', status: '待机', output: '800' },
{ time: '08:30', device: '设备A', status: '运行中', output: '1200' },
{ time: '09:15', device: '设备B', status: '待机', output: '800' },
{ time: '08:30', device: '设备A', status: '运行中', output: '1200' },
{ time: '09:15', device: '设备B', status: '待机', output: '800' },
{ time: '08:30', device: '设备A', status: '运行中', output: '1200' },
{ time: '09:15', device: '设备B', status: '待机', output: '800' },
// ...
],
scrollInterval: null,
isRun: [1, 2, 3, 4, 5, 6, 7, 8,9],
infoData: [
@ -244,7 +223,6 @@ export default {
rotate: 14,
width: 2,
height:40,
alpha: '80',
radius:20,
isRight: false,
equipmentName: "包装线11"
@ -255,7 +233,6 @@ export default {
rotate: 14,
width: 2,
height:40,
alpha: '80',
radius:20,
isRight: false,
equipmentName: "包装线10"
@ -266,7 +243,6 @@ export default {
rotate: 10,
width: 2,
height:40,
alpha: '80',
radius:20,
isRight: false,
equipmentName: "包装线09"
@ -277,7 +253,6 @@ export default {
rotate: 7,
width: 2,
height:40,
alpha: '80',
radius:20,
isRight: false,
equipmentName: "包装线08"
@ -351,47 +326,47 @@ export default {
outputData: [
{
left: 13.6,
no:"11"
no:"XL11"
},
{
left: 20.3,
no:"10"
no:"XL10"
},
{
left: 25.3,
no:"09"
no:"XL09"
},
{
left: 33.3,
no:"08"
no:"XL08"
},
{
left: 37.7,
no:"07"
no:"XL07"
},
{
left: 43.9,
no:"06"
no:"XL06"
},
{
left: 48.5,
no:"05"
no:"XL05"
},
{
left: 54.5,
no:"04"
no:"XL04"
},
{
left: 59,
no:"03"
no:"XL03"
},
{
left: 65,
no:"02"
no:"XL02"
},
{
left: 69.5,
no:"01"
no:"XL01"
},
],
arrowData: [
@ -512,6 +487,31 @@ export default {
this.repairOrders = receivedData.map(item => ({
...item,
}))
const descList = receivedData.map(item =>
`${item.params?.equipmentName || '未知'} ${item.orderDesc || '无故障描述'} 维修人:${item.orderRepairmanName}`
);
this.scrollText = descList.join('★★★★★★★★'); //
//
const activeEquipmentNames = new Set(
receivedData
.map(item => item.params?.equipmentName)
.filter(name => name)
);
// infoData
this.infoData.forEach((item, index) => {
if (activeEquipmentNames.has(item.equipmentName)) {
// alpha
this.$set(this.infoData[index], 'alpha', '#CB4C4C80');
} else {
// alpha
if (this.infoData[index].hasOwnProperty('alpha')) {
this.$delete(this.infoData[index], 'alpha');
}
}
});
} else {
console.warn('收到非数组格式数据:', receivedData)
}
@ -519,7 +519,7 @@ export default {
console.error("JSON parsing failed:", error)
this.$notify.error({ title: '数据错误', message: '接收数据格式异常' })
}
};
}.bind(this);;
this.ws.onclose = function (event) {
self.text_content = self.text_content + "已经关闭连接!" + "\n";
};

@ -0,0 +1,99 @@
<template>
<div id="data-view">
<dv-full-screen-container>
<top-header />
<div class="main-content">
<!-- <digital-flop />-->
<cards />
<div class="block-left-right-content">
<ranking-board />
<div class="block-top-bottom-content">
<div class="block-top-content">
<rose-chart />
<water-level-chart />
<scroll-board />
</div>
</div>
</div>
</div>
</dv-full-screen-container>
</div>
</template>
<script>
import topHeader from './index5/topHeader'
import digitalFlop from './index5/digitalFlop'
import rankingBoard from './index5/rankingBoard'
import roseChart from './index5/roseChart'
import waterLevelChart from './index5/waterLevelChart'
import scrollBoard from './index5/scrollBoard'
import cards from './index5/cards'
export default {
name: 'DataView',
components: {
topHeader,
digitalFlop,
rankingBoard,
roseChart,
waterLevelChart,
scrollBoard,
cards
},
data () {
return {}
},
methods: {}
}
</script>
<style lang="less">
#data-view {
width: 100%;
height: 100%;
background-color: #030409;
color: #fff;
#dv-full-screen-container {
background-image: url("~@/assets/board/bg.png");
background-size: 100% 100%;
box-shadow: 0 0 3px blue;
display: flex;
flex-direction: column;
}
.main-content {
flex: 1;
display: flex;
flex-direction: column;
}
.block-left-right-content {
flex: 1;
display: flex;
margin-top: 20px;
}
.block-top-bottom-content {
flex: 1;
display: flex;
flex-direction: column;
box-sizing: border-box;
padding-left: 20px;
}
.block-top-content {
height: 100%;
display: flex;
flex-grow: 0;
box-sizing: border-box;
padding-bottom: 20px;
}
}
</style>

@ -0,0 +1,278 @@
<template>
<div id="cards">
<div
class="card-item"
v-for="(card, i) in cards"
:key="card.title"
>
<div class="card-header">
<div class="card-header-left">{{ card.title }}</div>
<div class="card-header-right">{{ '0' + (i + 1) }}</div>
</div>
<dv-charts class="ring-charts" :option="card.ring" />
<div class="card-footer">
<div class="card-footer-item">
<div class="footer-title">{{ card.desc }}</div>
<div class="footer-detail">
<dv-digital-flop :config="card.total" style="width:70%;height:35px;" />
</div>
</div>
<div class="card-footer-item">
<div class="footer-title">已处理</div>
<div class="footer-detail">
<dv-digital-flop :config="card.num" style="width:70%;height:35px;" />
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import {
getCompletedRate,
} from "@/api/kanban/spectaculars";
export default {
name: 'Cards',
data () {
return {
cards: [
{
title: "点检",
desc: "今日",
total: {
number: [],
content: '{nt}',
textAlign: 'right',
style: {
fill: '#ea6027',
fontWeight: 'bold'
}
},
num: {
number: [],
content: '{nt}',
textAlign: 'right',
style: {
fill: '#26fcd8',
fontWeight: 'bold'
}
},
ring: {
series: [
{
type: 'gauge',
startAngle: -Math.PI / 2,
endAngle: Math.PI * 1.5,
arcLineWidth: 13,
radius: '80%',
data: [],
axisLabel: {
show: false
},
axisTick: {
show: false
},
pointer: {
show: false
},
backgroundArc: {
style: {
stroke: '#224590'
}
},
details: {
show: true,
formatter: '完成占比{value}%',
style: {
fill: '#1ed3e5',
fontSize: 20
}
}
}
],
color: ['#03d3ec']
}
},
],
equipmentinfo: {},
}
},
methods: {
createData () {
// const { randomExtend } = this
const _this = this;
const titles = ['点检', '巡检', '保养', '维修'];
const dataMap = { //
'点检': ['spotInspectionTotal', 'spotInspectionFinish'],
'巡检': ['inspectionTotal', 'inspectionFinish'],
'保养': ['maintenanceTotal', 'maintenanceFinish'],
'维修': ['repairTotal', 'repairFinish']
};
getCompletedRate({
poolName: "ds_1000",
}).then((response) => {
if (response.data) {
_this.equipmentinfo = response.data;
this.cards = titles.map(title => {
const [totalKey, finishKey] = dataMap[title];
const total = this.equipmentinfo[totalKey] || 0; //
const finish = this.equipmentinfo[finishKey] || 0;
const ratio = Number((finish / total).toFixed(2));
return {
title: title,
desc: title === '保养' || '巡检' ? '本月' : '今日',
total: {
number: [total],
content: '{nt}',
textAlign: 'right',
style: {
fill: '#ea6027',
fontWeight: 'bold'
}
},
num: {
number: [finish],
content: '{nt}',
textAlign: 'right',
style: {
fill: '#26fcd8',
fontWeight: 'bold'
}
},
ring: {
series: [
{
type: 'gauge',
startAngle: -Math.PI / 2,
endAngle: Math.PI * 1.5,
arcLineWidth: 13,
radius: '80%',
data: [{ name: '占比', value: ratio || 0 }],
axisLabel: {
show: false
},
axisTick: {
show: false
},
pointer: {
show: false
},
backgroundArc: {
style: {
stroke: '#224590'
}
},
details: {
show: true,
formatter: '完成占比{value}%',
style: {
fill: '#1ed3e5',
fontSize: 20
}
}
}
],
color: ['#03d3ec']
}
}
})
}
});
},
randomExtend (minNum, maxNum) {
if (arguments.length === 1) {
return parseInt(Math.random() * minNum + 1, 10)
} else {
return parseInt(Math.random() * (maxNum - minNum + 1) + minNum, 10)
}
}
},
mounted () {
const { createData } = this
createData()
setInterval(this.createData, 30000)
}
}
</script>
<style lang="less">
#cards {
display: flex;
justify-content: space-between;
height: 45%;
.card-item {
background-color: rgba(6, 30, 93, 0.5);
border-top: 2px solid rgba(1, 153, 209, .5);
width: 22%;
display: flex;
flex-direction: column;
}
.card-header {
display: flex;
height: 20%;
align-items: center;
justify-content: space-between;
.card-header-left {
font-size: 18px;
font-weight: bold;
padding-left: 20px;
}
.card-header-right {
padding-right: 20px;
font-size: 40px;
color: #03d3ec;
}
}
.ring-charts {
height: 55%;
}
.card-footer {
height: 25%;
display: flex;
align-items: center;
justify-content: space-around;
}
.card-footer-item {
padding: 5px 10px 0px 10px;
box-sizing: border-box;
width: 40%;
background-color: rgba(6, 30, 93, 0.7);
border-radius: 3px;
.footer-title {
font-size: 15px;
margin-bottom: 5px;
}
.footer-detail {
font-size: 20px;
color: #1294fb;
display: flex;
font-size: 18px;
align-items: center;
.dv-digital-flop {
margin-right: 5px;
}
}
}
}
</style>

@ -0,0 +1,218 @@
<template>
<div id="digital-flop">
<div
class="digital-flop-item"
v-for="item in digitalFlopData"
:key="item.title"
>
<div class="digital-flop-title">{{ item.title }}</div>
<div class="digital-flop">
<dv-digital-flop
:config="item.number"
style="width:100px;height:50px;"
/>
<div class="unit">{{ item.unit }}</div>
</div>
</div>
<dv-decoration-10 />
</div>
</template>
<script>
export default {
name: 'DigitalFlop',
data () {
return {
digitalFlopData: []
}
},
methods: {
createData () {
const { randomExtend } = this
this.digitalFlopData = [
{
title: '点检',
number: {
number: [randomExtend(20000, 30000)],
content: '{nt}',
textAlign: 'right',
style: {
fill: '#4d99fc',
fontWeight: 'bold'
}
},
unit: '次'
},
{
title: '巡检',
number: {
number: [randomExtend(20, 30)],
content: '{nt}',
textAlign: 'right',
style: {
fill: '#f46827',
fontWeight: 'bold'
}
},
unit: '次'
},
{
title: '保养',
number: {
number: [randomExtend(20, 30)],
content: '{nt}',
textAlign: 'right',
style: {
fill: '#40faee',
fontWeight: 'bold'
}
},
unit: '次'
},
{
title: '维修',
number: {
number: [randomExtend(10, 20)],
content: '{nt}',
textAlign: 'right',
style: {
fill: '#4d99fc',
fontWeight: 'bold'
}
},
unit: '次'
},
// {
// title: '',
// number: {
// number: [randomExtend(5, 10)],
// content: '{nt}',
// textAlign: 'right',
// style: {
// fill: '#f46827',
// fontWeight: 'bold'
// }
// },
// unit: ''
// },
// {
// title: '',
// number: {
// number: [randomExtend(5, 10)],
// content: '{nt}',
// textAlign: 'right',
// style: {
// fill: '#40faee',
// fontWeight: 'bold'
// }
// },
// unit: ''
// },
// {
// title: '',
// number: {
// number: [randomExtend(5, 10)],
// content: '{nt}',
// textAlign: 'right',
// style: {
// fill: '#4d99fc',
// fontWeight: 'bold'
// }
// },
// unit: ''
// },
// {
// title: '',
// number: {
// number: [randomExtend(5, 10)],
// content: '{nt}',
// textAlign: 'right',
// style: {
// fill: '#f46827',
// fontWeight: 'bold'
// }
// },
// unit: ''
// },
// {
// title: '',
// number: {
// number: [randomExtend(5, 10)],
// content: '{nt}',
// textAlign: 'right',
// style: {
// fill: '#40faee',
// fontWeight: 'bold'
// }
// },
// unit: ''
// }
]
},
randomExtend (minNum, maxNum) {
if (arguments.length === 1) {
return parseInt(Math.random() * minNum + 1, 10)
} else {
return parseInt(Math.random() * (maxNum - minNum + 1) + minNum, 10)
}
}
},
mounted () {
const { createData } = this
createData()
setInterval(createData, 30000)
}
}
</script>
<style lang="less">
#digital-flop {
position: relative;
height: 15%;
flex-shrink: 0;
display: flex;
justify-content: space-between;
align-items: center;
background-color: rgba(6, 30, 93, 0.5);
.dv-decoration-10 {
position: absolute;
width: 95%;
left: 2.5%;
height: 5px;
bottom: 0px;
}
.digital-flop-item {
width: 20%;
height: 80%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
border-left: 3px solid rgb(6, 30, 93);
border-right: 3px solid rgb(6, 30, 93);
}
.digital-flop-title {
font-size: 20px;
margin-bottom: 20px;
}
.digital-flop {
display: flex;
}
.unit {
margin-left: 10px;
display: flex;
align-items: flex-end;
box-sizing: border-box;
padding-bottom: 13px;
}
}
</style>

@ -0,0 +1,89 @@
<template>
<div id="ranking-board">
<div class="ranking-board-title">巡检上报问题数量 TOP8</div>
<dv-scroll-ranking-board :config="config" />
</div>
</template>
<script>
import moment from "moment";
import {getworkFaultDesc} from "../../../api/kanban/equipment";
export default {
name: 'RankingBoard',
data () {
return {
config: {
data: [],
rowNum: 9
}
}
},
methods: {
async getdatalist() {
try {
const response = await getworkFaultDesc({ poolName: "ds_1000" });
//
if (response?.data?.length) {
// 1
const processedData = response.data.map(item => ({
name: item.name || '未知分类', //
value: Number(item.value) || 0 //
})).filter(item => item.value > 0); //
// 2
this.config = {
...this.config, //
data: processedData //
};
} else {
//
this.config.data = [{ name: '暂无数据', value: 0 }];
}
} catch (error) {
console.error('数据获取失败:', error);
//
this.config.data = [{ name: '数据异常', value: 0 }];
} finally {
}
}
},
mounted() {
this.getdatalist();
//
this.timer = setInterval(() => {
this.getdatalist();
}, 60000); // 60
},
beforeDestroy() {
clearInterval(this.timer); //
}
}
</script>
<style lang="less">
#ranking-board {
width: 20%;
box-shadow: 0 0 3px blue;
display: flex;
flex-direction: column;
background-color: rgba(6, 30, 93, 0.5);
border-top: 2px solid rgba(1, 153, 209, .5);
box-sizing: border-box;
padding: 0px 30px;
.ranking-board-title {
font-weight: bold;
height: 50px;
display: flex;
align-items: center;
font-size: 20px;
}
.dv-scroll-ranking-board {
flex: 1;
}
}
</style>

@ -0,0 +1,117 @@
<template>
<div id="rose-chart">
<div class="rose-chart-title">设备故障原因分布</div>
<dv-charts :option="option" />
</div>
</template>
<script>
import moment from "moment";
import { getworkFaultReason } from "@/api/kanban/equipment";
export default {
name: 'RoseChart',
data () {
return {
option: {
series: [
{
type: 'pie',
radius: '50%',
roseSort: false,
data: [],
insideLabel: {
show: false
},
outsideLabel: {
formatter: '{name} {percent}%',
labelLineEndLength: 20,
style: {
fill: '#fff'
},
labelLineStyle: {
stroke: '#fff'
}
},
roseType: true
}
],
color: ['#da2f00', '#fa3600', '#ff4411', '#ff724c', '#541200', '#801b00', '#a02200', '#5d1400', '#b72700']
}
}
},
methods: {
async createData() {
try {
const response = await getworkFaultReason({ poolName: "ds_1000" });
if (response.data?.length) {
// 1
const processedData = response.data.map(item => ({
name: item.name || '未知故障', //
value: Number(item.value) || 0 //
}));
// 2
this.option = {
...this.option, //
series: [{
...this.option.series, //
data: processedData, //
//
type: 'pie',
radius: '50%',
roseSort: false,
insideLabel: { show: false },
outsideLabel: {
formatter: '{name} {percent}%',
labelLineEndLength: 20,
style: { fill: '#fff' },
labelLineStyle: { stroke: '#fff' }
},
roseType: true
}]
};
// 3使 ECharts
// this.myChart.setOption(this.option, true);
}
} catch (error) {
console.error('数据获取失败:', error);
//
this.option.series.data = [{ name: '数据异常', value: 100 }];
}
}
},
mounted () {
const { createData } = this
createData()
setInterval(createData, 30000)
}
}
</script>
<style lang="less">
#rose-chart {
width: 30%;
height: 100%;
background-color: rgba(6, 30, 93, 0.5);
border-top: 2px solid rgba(1, 153, 209, .5);
box-sizing: border-box;
.rose-chart-title {
height: 50px;
font-weight: bold;
text-indent: 20px;
font-size: 20px;
display: flex;
align-items: center;
}
.dv-charts-container {
height: calc(~"100% - 50px");
}
}
</style>

@ -0,0 +1,95 @@
<template>
<div id="scroll-board">
<!-- 添加加载状态提示 -->
<div v-if="loading" class="loading-text">...</div>
<!-- 添加数据为空提示 -->
<div v-if="!loading && config.data.length === 0" class="empty-text"></div>
<dv-scroll-board v-else :config="config" />
</div>
</template>
<script>
import { getRepairWorkOrder } from "@/api/kanban/equipment";
import moment from "moment";
export default {
name: 'ScrollBoard',
data() {
return {
loading: false, //
config: {
header: ['序号', '设备', '故障信息', '计划维修时间'], //
data: [],
index: false, // 使
columnWidth: [50, 120, 200, 200], //
align: ['center'],
rowNum: 7,
headerBGC: '#1981f6',
headerHeight: 45,
oddRowBGC: 'rgba(0, 44, 81, 0.8)',
evenRowBGC: 'rgba(10, 29, 50, 0.8)'
}
}
},
methods: {
async getdatalist() {
try {
this.loading = true;
const response = await getRepairWorkOrder({
poolName: "ds_1000"
});
if (response.data?.length > 0) {
//
const processedData = response.data.map((item, index) => {
//
const deviceName = item.equipmentName || '未知设备';
const faultInfo = item.workFaultDesc || '无故障描述';
//
const repairTime = item.workPlanTime ?
moment(item.workPlanTime).format("YYYY-MM-DD HH:mm:ss") :
'--';
//
return [`${index + 1}`, deviceName, faultInfo, repairTime];
});
//
this.config = {
...this.config,
data: processedData
};
}
} catch (error) {
console.error('数据获取失败:', error);
//
this.config.data = [['-', '数据加载失败', '请稍后重试', '-']];
} finally {
this.loading = false;
}
}
},
mounted() {
this.getdatalist();
//
this.timer = setInterval(() => {
this.getdatalist();
}, 60000); // 60
},
beforeDestroy() {
clearInterval(this.timer); //
}
}
</script>
<style lang="less">
#scroll-board {
width: 50%;
box-sizing: border-box;
margin-left: 20px;
height: 100%;
overflow: hidden;
}
</style>

@ -0,0 +1,45 @@
<template>
<div id="top-header">
<dv-decoration-8 class="header-left-decoration" />
<dv-decoration-5 class="header-center-decoration" />
<dv-decoration-8 class="header-right-decoration" :reverse="true" />
<div class="center-title">设备管理综合数据</div>
</div>
</template>
<script>
export default {
name: 'TopHeader'
}
</script>
<style lang="less">
#top-header {
position: relative;
width: 100%;
height: 100px;
display: flex;
justify-content: space-between;
flex-shrink: 0;
.header-center-decoration {
width: 40%;
height: 60px;
margin-top: 30px;
}
.header-left-decoration, .header-right-decoration {
width: 25%;
height: 60px;
}
.center-title {
position: absolute;
font-size: 30px;
font-weight: bold;
left: 50%;
top: 15px;
transform: translateX(-50%);
}
}
</style>

@ -0,0 +1,139 @@
<template>
<div id="water-level-chart">
<div class="water-level-chart-title">设备维修完成情况</div>
<div class="water-level-chart-details">
累计完成<span>{{number}}</span>
</div>
<div class="chart-container">
<dv-water-level-pond :config="config" />
</div>
</div>
</template>
<script>
import {getWave} from "../../../api/kanban/equipment";
export default {
name: 'WaterLevelChart',
data () {
return {
config: {
data: [],
shape: 'round',
waveHeight: 25,
waveNum: 2
},
number: 0
}
},
methods: {
async getdatalist() {
try {
const response = await getWave({ poolName: "ds_1000" });
//
if (response?.data) {
// 1number { number: 123 }
this.number = response.data.number || 0;
// 2data
const processedData = [response.data.ratio];
// config
this.config = {
...this.config, //
data: processedData, //
};
} else {
//
this.number = 0;
this.config = {
...this.config,
data: [0]
};
}
} catch (error) {
console.error('数据获取失败:', error);
//
this.number = 0;
this.config = {
...this.config,
data:[0]
};
}
}
},
mounted() {
this.getdatalist();
//
this.timer = setInterval(() => {
this.getdatalist();
}, 60000); // 60
},
beforeDestroy() {
clearInterval(this.timer); //
}
}
</script>
<style lang="less">
#water-level-chart {
width: 20%;
box-sizing: border-box;
margin-left: 20px;
background-color: rgba(6, 30, 93, 0.5);
border-top: 2px solid rgba(1, 153, 209, .5);
display: flex;
flex-direction: column;
.water-level-chart-title {
font-weight: bold;
height: 50px;
display: flex;
align-items: center;
font-size: 20px;
justify-content: center;
}
.water-level-chart-details {
height: 15%;
display: flex;
justify-content: center;
font-size: 17px;
align-items: flex-end;
span {
font-size: 35px;
font-weight: bold;
color: #58a1ff;
margin: 0 5px;
margin-bottom: -5px;
}
}
.chart-container {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
}
.dv-water-pond-level {
max-width: 90%;
width: 200px;
height: 200px;
border: 10px solid #19c3eb;
border-radius: 50%;
ellipse {
stroke: transparent !important;
}
text {
font-size: 40px;
}
}
}
</style>

@ -144,12 +144,13 @@
top: 28px;
font-size: 5px;
"
v-model="ymdArray"
v-model="ymdArray1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期"
@change="noOkTimeChange"
>
</el-date-picker>
</div>
@ -173,7 +174,7 @@
{{ n.projectName }}
</div>
<div class="itemname2">
{{ n.checkManName }} {{ n.checkTime }}
{{ n.checkManName }} {{ n.checkTime }}|{{ n.className }}|{{ n.defectSubclass }}
</div>
</div>
</div>
@ -193,12 +194,13 @@
top: 28px;
font-size: 5px;
"
v-model="ymdArray"
v-model="ymdArray2"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期"
@change="noOkRadioTimeChange"
>
</el-date-picker>
</div>
@ -220,7 +222,7 @@
<div class="itembottom">
<div class="item-table item-table1">
<div class="titlebox" style="margin-bottom: 14px">
<div class="titlename">年各日产品异常趋势</div>
<div class="titlename">月每日线体异常趋势</div>
</div>
<div
id="echart5"
@ -231,8 +233,7 @@
<div class="titlebox" style="margin-bottom: 14px">
<div class="titlename">产品不合格率同期对比</div>
</div>
<div
id="echart6"
<div id="echart6"
style="margin: auto; width: 900px; height: 304.15px"
></div>
</div>
@ -311,9 +312,12 @@ export default {
yearShow: false,
monthShow: true,
dateShow: false,
ymdArray: [],
ymdStart: null,
ymdEnd: null,
ymdArray1: [],
ymdStart1: null,
ymdEnd1: null,
ymdArray2: [],
ymdStart2: null,
ymdEnd2: null,
};
},
created() {
@ -333,17 +337,17 @@ export default {
getDate() {
let start = this.Fungetdate(0);
let end = this.Fungetdate(0);
this.ymdArray.push(start, end);
this.ymdArray1.push(start, end);
this.ymdArray2.push(start, end);
this.optionDatalist1 = [];
this.optionDatalist2 = [];
this.optionDatalist3 = [];
this.optionDatalist4 = [];
this.ymdStart = moment(this.ymdArray[0]).format("YYYY-MM-DD");
this.ymdEnd = moment(this.ymdArray[1]).format("YYYY-MM-DD");
this.getdatalist(
moment(this.ymdArray[0]).format("YYYY-MM-DD"),
moment(this.ymdArray[1]).format("YYYY-MM-DD")
);
this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD");
this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD");
this.ymdStart2 = moment(this.ymdArray2[0]).format("YYYY-MM-DD");
this.ymdEnd2 = moment(this.ymdArray2[1]).format("YYYY-MM-DD");
this.getdatalist();
this.initChart1();
},
@ -381,11 +385,12 @@ export default {
getDeviceRefreshTime() {
const _this = this;
getDeviceRefreshTime().then((response) => {
if (response.data) {
// console.log(response.data)
this.RefreshTime = response.data;
this.time1 = setInterval(() => {
_this.getdatalist(_this.ymdStart, _this.ymdEnd);
_this.getdatalist();
_this.initChart1();
}, 1000 * 60 * this.RefreshTime);
}
@ -409,6 +414,45 @@ export default {
// }
// });
// },
noOkTimeChange(){
this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD");
this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD");
//
getProduceNoOkList({
typeCode: "produce",
ymdType: this.selectxtclasses,
productDateStart: this.ymdStart1,
productDateEnd: this.ymdEnd1,
factoryCode: "ds_" + this.selectxt,
}).then((response) => {
if (response) {
this.Qualitylist = response;
}
});
},
noOkRadioTimeChange(){
this.ymdStart2 = moment(this.ymdArray2[0]).format("YYYY-MM-DD");
this.ymdEnd2 = moment(this.ymdArray2[1]).format("YYYY-MM-DD");
//
getCheckProjectsPie({
typeCode: "produce",
ymdType: this.selectxtclasses,
productDateStart: this.ymdStart2,
productDateEnd: this.ymdEnd2,
factoryCode: "ds_" + this.selectxt,
}).then((response) => {
if (response) {
this.optionDatalist2 = [];
response.forEach((item) => {
let a = {};
a.name = item.projectName;
a.value = item.quality;
this.optionDatalist2.push(a);
});
this.initChart3();
}
});
},
getdatalist() {
const _this = this;
@ -428,8 +472,8 @@ export default {
getProduceNoOkList({
typeCode: "produce",
ymdType: _this.selectxtclasses,
productDateStart: this.ymdStart,
productDateEnd: this.ymdEnd,
productDateStart: this.ymdStart1,
productDateEnd: this.ymdEnd1,
factoryCode: "ds_" + _this.selectxt,
}).then((response) => {
if (response) {
@ -440,8 +484,8 @@ export default {
getCheckProjectsPie({
typeCode: "produce",
ymdType: _this.selectxtclasses,
productDateStart: this.ymdStart,
productDateEnd: this.ymdEnd,
productDateStart: this.ymdStart2,
productDateEnd: this.ymdEnd2,
factoryCode: "ds_" + _this.selectxt,
}).then((response) => {
if (response) {
@ -549,7 +593,7 @@ export default {
position: "right",
distance: 10, //
show: true,
},
}
},
data: [], // value<EFBFBD>
tooltip: {
@ -662,6 +706,10 @@ export default {
tooltip: {
show: true,
trigger: "item",
formatter: function(params) {
const value = parseInt(params.value) || params.value;
return `${params.seriesName}<br/>${params.name}: ${value} PC`;
}
},
legend: {
show: true,
@ -802,7 +850,7 @@ export default {
crossStyle: {
color: "#999",
},
},
}
},
legend: {
show: true,
@ -906,9 +954,9 @@ export default {
],
series: [
{
name: "不合格比例",
name: "去年不合格率(%)",
type: "line",
stack: "总量",
stack: "",
symbol: "circle",
symbolSize: 8,
yAxisIndex: 1,
@ -921,17 +969,17 @@ export default {
},
},
},
label: {
show: true, //
position: "top", // 'top', 'bottom', 'left', 'right'
formatter: "{c}", // {c}
},
//label: {
// show: true, //
// position: "top", // 'top', 'bottom', 'left', 'right'
// formatter: "{c}", // {c}
//},
data: [],
},
{
name: "本年",
name: "本年不合格率(%)",
type: "line",
stack: "总量",
stack: "",
symbol: "circle",
symbolSize: 8,
yAxisIndex: 1,
@ -944,12 +992,25 @@ export default {
},
},
},
//label: {
// show: true, //
// position: "bottom", // 'top', 'bottom', 'left', 'right'
// formatter: "{c}", // {c}
//},
data: [],
},
{
name: "上年",
name: "去年不合格数量(PC)",
data: [],
type: "bar",
label: { //
show: true,
position: 'top', //
formatter: function(params) {//
const value = parseInt(params.value) || params.value;
return `${value} PC`;
}
},
showBackground: true,
backgroundStyle: {
color: "rgba(180, 180, 180, 0.2)",
@ -965,9 +1026,17 @@ export default {
},
},
{
name: "不合格数量",
name: "本年不合格数量(PC)",
data: [],
type: "bar",
label: { //
show: true,
position: 'top', //
formatter: function(params) {//
const value = parseInt(params.value) || params.value;
return `${value} PC`;
}
},
showBackground: true,
backgroundStyle: {
color: "rgba(180, 180, 180, 0.2)",
@ -1001,8 +1070,10 @@ export default {
let max4 = Math.max(...seriesdata4) + 5;
let legenddata = [];
legenddata.push("上年");
legenddata.push("本年");
legenddata.push("去年不合格数量(PC)");
legenddata.push("本年不合格数量(PC)");
legenddata.push("去年不合格率(%)");
legenddata.push("本年不合格率(%)");
let yAxismax1 = 0;
let yAxismax2 = 0;
if (max1 > max2) {
@ -1508,6 +1579,7 @@ export default {
//
tooltip: {
trigger: "item",
formatter: "{a} <br/>{b} : {c}PC"
},
grid: {
top: "60",
@ -1520,7 +1592,7 @@ export default {
rich: {
a: {
color: "#FFFFFF",
width: 30,
width: 70,
fontSize: 13,
},
b: {
@ -1542,7 +1614,7 @@ export default {
var index;
for (var i = 0, l = data.length; i < l; i++) {
if (data[i].name == name) {
target = data[i].value;
target = data[i].value+"PC";
title = data[i].label;
index = i < 6 ? i : 5;
}
@ -1633,16 +1705,19 @@ export default {
radius: ["44%", "63%"],
center: ["50%", "40%"],
roseType: "radius",
// itemStyle: {
// normal: {
// color: function (params) {
// return colorList[params.dataIndex]
// }
// }
// },
//label: {
// formatter: function(params) {
// // params
// return `${params.name}: ${params.value}PC (${params.percent}%)`;
// }
//},
label: {
show: false,
},
tooltip: {
trigger: 'item', // 使'item'
formatter: '{b}: {c}PC ({d}%)' //
},
emphasis: {
label: {
show: false,

@ -22,13 +22,14 @@
<!-- <option :key="index" :value="x.seriesName" v-for="(x, index) in ceshib">{{ x.seriesName }}</option> -->
</select>
</div>
<!--
<div class="selectborder selectborder1">
<select v-model="selectxtclasses" class="select1" @change="selectline2(selectxtclasses)">
<option :key="index" :value="x.ymdType" v-for="(x, index) in dictDatatype">
{{ x.ymdTypeName }}
</option>
</select>
</div>
</div>-->
</div>
<div class="timebox">
<div class="time">
@ -41,6 +42,26 @@
<div class="item-table item-table1">
<div class="titlebox" style="margin-bottom: 14px;">
<div class="titlename">订单异常信息</div>
<el-date-picker
style="
position: absolute;
margin-left: 10px;
background-color: rgb(20, 41, 69);
color: rgb(255, 255, 255);
left: 370px;
width: 250px;
top: 68px;
font-size: 5px;
"
v-model="ymdArray1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期"
@change="getdatalist"
>
</el-date-picker>
</div>
<div class="table-tbody">
<div class="item">
@ -96,6 +117,27 @@
<div class="item-table item-table1">
<div class="titlebox" style="margin-bottom: 14px;">
<div class="titlename">异常原因分布</div>
<!--
<el-date-picker
style="
position: absolute;
margin-left: 10px;
background-color: rgb(20, 41, 69);
color: rgb(255, 255, 255);
right: 688px;
width: 227px;
top: 165px;
font-size: 5px;
"
v-model="ymdArray2"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期"
@change="noOkTimeChange"
>
</el-date-picker>-->
</div>
<div id="echart2" style="margin: auto; width: 610px; height:296.4px;"></div>
</div>
@ -115,42 +157,70 @@
<div class="item-table item-table1">
<div class="titlebox2" style="margin-bottom: 14px;">
<div class="titlename">订单异常明细</div>
<!--<el-date-picker
style="
position: absolute;
margin-left: 10px;
background-color: rgb(20, 41, 69);
color: rgb(255, 255, 255);
right: 680px;
width: 227px;
top: 600px;
font-size: 5px;
"
v-model="ymdArray4"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期"
@change="noOkRadioTimeChange"
>
</el-date-picker>-->
</div>
<table class="table-thead" border="0" cellpadding="0" cellspacing="0">
<thead>
<tr style="height: 44px;">
<td style="width: 8%;">序号</td>
<!-- <td style="width: 8%;">异常单号</td> -->
<td style="width: 8%;">物料名称</td>
<td style="width: 8%;">订单号</td>
<td style="width: 12%;">物料名称</td>
<td style="width: 11%;">订单号</td>
<td style="width: 8%;">来料时间</td>
<td style="width: 8%;">质检确认时间</td>
<td style="width: 8%;">质检数量</td>
<td style="width: 6%;">质检单位</td>
<td style="width: 8%;">检验人</td>
<td style="width: 8%;">质检不合格</td>
<td style="width: 7%;">质检不合格</td>
<td style="width: 8%;">不良描述</td>
<td style="width: 7%;">不良类型</td>
<td style="width: 8%;">不良数量</td>
</tr>
</thead>
</table>
<div class="table-tbody">
<!-- <vue-seamless-scroll :data="getlistcx" :class-option="classOption" class="wrapscroll"> -->
<vue-seamless-scroll :data="getlistcx" :class-option="classOption" class="wrapscroll">
<table border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
v-for="(n, index) in orderdetail">
<td style="width: 8%;">{{ index + 1 }}</td>
<!-- <td style="width: 8%;">{{ n.orderNo }}</td> -->
<td style="width: 8%;">{{ n.materialName }}</td>
<td style="width: 8%;">{{ n.orderNo }}</td>
<td style="width: 8%;">{{ n.checkTime }}</td>
<td style="width: 12%;">{{ n.materialName }}</td>
<td style="width: 11%;">{{ n.orderNo }}</td>
<td style="width: 8%;">{{ n.incomeTime }}</td>
<td style="width: 8%;">{{ n.checkTime }}</td>
<td style="width: 8%;">{{ n.quality }}</td>
<td style="width: 6%;">{{ n.unit }}</td>
<td style="width: 8%;">{{ n.checkManName }}</td>
<td style="width: 8%;">{{ n.checkResult }}</td>
<td style="width: 7%;">{{ n.checkResult }}</td>
<td style="width: 8%;">{{ n.className }}</td>
<td style="width: 7%;">{{ n.defectSubclass }}</td>
<td style="width: 8%;">{{ n.noOkQuality }}</td>
</tr>
</tbody>
</table>
<!-- </vue-seamless-scroll> -->
</vue-seamless-scroll>
</div>
</div>
@ -244,9 +314,21 @@ export default {
],
RefreshTime:null,
dictDatatype:[],
classOption: {
direction: 1,
hoverstop: true,
step: 0.1,
openNatch: true,
limitMoveNum: 7,
},
ymdArray1:[],
ymdStart1: null,
ymdEnd1: null
};
},
created() { },
created() {
this.getDate();
},
destroyed() {
clearInterval(this.time1);
this.time1 = null;
@ -260,6 +342,24 @@ export default {
this.gettime();
},
methods: {
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate(0);
let end = this.Fungetdate(1);
this.ymdArray1.push(start, end);
this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD");
this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD");
},
Fungetdate(num) {
var dd = new Date();
dd.setDate(dd.getDate());
var y = dd.getFullYear();
var m = dd.getMonth() + 1 + num; //
var d = dd.getDate();
return y + "-" + m + "-" + d;
},
back() {
this.$router.push({ path: "/index" });
},
@ -293,6 +393,7 @@ export default {
}
});
},
/**
getDictData() {
const _this = this;
getDictData(
@ -308,13 +409,17 @@ export default {
_this.getDeviceRefreshTime()
}
});
},
},**/
getdatalist() {
const _this = this;
this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD");
this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD");
getOverallInfo({
ymdType: _this.selectxtclasses,
typeCode: 'material',
factoryCode: 'ds_' + _this.selectxt,
productDateStart: this.ymdStart1,
productDateEnd: this.ymdEnd1
}).then((response) => {
if (response) {
_this.ordermessage = response;
@ -324,6 +429,8 @@ export default {
ymdType: _this.selectxtclasses,
typeCode: 'material',
factoryCode: 'ds_' + _this.selectxt,
productDateStart: this.ymdStart1,
productDateEnd: this.ymdEnd1
}).then((response) => {
if (response) {
_this.optionDatalist2 = []
@ -340,6 +447,8 @@ export default {
ymdType: _this.selectxtclasses,
typeCode: 'material',
factoryCode: 'ds_' + _this.selectxt,
productDateStart: this.ymdStart1,
productDateEnd: this.ymdEnd1
}).then((response) => {
if (response) {
_this.optionDatalist3 = []
@ -369,11 +478,14 @@ export default {
ymdType: _this.selectxtclasses,
typeCode: 'material',
factoryCode: 'ds_' + _this.selectxt,
productDateStart: this.ymdStart1,
productDateEnd: this.ymdEnd1
}).then((response) => {
if (response) {
this.orderdetail = response
this.orderdetail.forEach((item) => {
item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD HH:mm:ss')
item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD')
item.checkTime = moment(item.checkTime).format('YYYY-MM-DD HH:mm:ss')
});
}
});
@ -1342,22 +1454,22 @@ export default {
}
.titlebox {
width: 431px;
height: 38px;
background: url("../../../assets/images/bg-title.png") no-repeat;
background-size: 100% 100%;
// text-align: center;
font-size: 20px;
font-weight: bold;
color: #ffffff;
line-height: 38px;
letter-spacing: 2px;
text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
padding-left: 60px;
// .titlename{
// position: relative;
// left: 24px;
// }
width: 431px;
height: 38px;
background: url("../../../assets/images/bg-title.png") no-repeat;
background-size: 100% 100%;
// text-align: center;
font-size: 20px;
font-weight: bold;
color: #ffffff;
line-height: 38px;
letter-spacing: 2px;
text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
padding-left: 60px;
// .titlename{
// position: relative;
// left: 24px;
// }
}
.titlebox2 {
@ -1392,7 +1504,7 @@ export default {
display: flex;
align-items: center;
justify-content: space-around;
width: 350px;
width: 300px;
margin-left: 50px;
}

@ -50,8 +50,9 @@
</tr>
</thead>
</table>
<div class="table-tbody">
<!-- <vue-seamless-scroll :data="Inspectiondetails" :class-option="classOption" class="wrapscroll"> -->
<vue-seamless-scroll :data="Inspectiondetails" :class-option="classOption" class="wrapscroll" :step="0.1">
<table border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
@ -69,8 +70,9 @@
</tr>
</tbody>
</table>
<!-- </vue-seamless-scroll> -->
</vue-seamless-scroll>
</div>
</div>
<div class="item-table item-table1">
<div class="titlebox2" style="margin-bottom: 14px;">
@ -87,12 +89,13 @@
<td style="width: 10%;">物料名称</td>
<td style="width: 4%;">检验人</td>
<td style="width: 8%;">检验时间</td>
<td style="width: 8%;">检验地点</td>
<td style="width: 4%;">检验状态</td>
</tr>
</thead>
</table>
<div class="table-tbody">
<!-- <vue-seamless-scroll :data="Inspectiondetails" :class-option="classOption" class="wrapscroll"> -->
<vue-seamless-scroll :data="Inspectiondetails1" :class-option="classOption" class="wrapscroll" :step="0.1">
<table border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
@ -105,12 +108,13 @@
<td style="width: 10%;">{{ n.materialName }}</td>
<td style="width: 4%;">{{ n.checkManName }}</td>
<td style="width: 8%;">{{ n.checkTime }}</td>
<td style="width: 8%;">{{ n.checkLoc }}</td>
<td style="width: 4%;" :class="[n.checkStatus == 1 ? 'color1' : 'color2']">{{
n.checkStatus }}</td>
</tr>
</tbody>
</table>
<!-- </vue-seamless-scroll> -->
</vue-seamless-scroll>
</div>
</div>
</div>
@ -176,6 +180,13 @@ export default {
equipmentinfo: [],
RefreshTime: null,
dictDatatype: [],
classOption: {
direction: 1,
hoverstop: true,
step: 0.1,
openNatch: true,
limitMoveNum: 7,
},
};
},
created() { },
@ -251,7 +262,11 @@ export default {
if (response) {
this.Inspectiondetails = response
this.Inspectiondetails.forEach((item) => {
item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD HH:mm:ss')
item.incomeTime = moment(item.incomeTime).format('YYYY-MM-DD HH:mm:ss');
if(item.checkTime!=null){
item.checkTime = moment(item.checkTime).format('YYYY-MM-DD HH:mm:ss')
}
});
}
});

@ -17,15 +17,30 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上班打卡时间" prop="startTime" :label-width="'100px'">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
<el-form-item label="打卡时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
placeholder="请选择上班打卡时间">
</el-date-picker>
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="上班打卡时间" prop="startTime" :label-width="'100px'">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.startTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择上班打卡时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -172,6 +187,7 @@ export default {
loading: true,
//
ids: [],
dateRange: [],
//
single: true,
//
@ -211,7 +227,7 @@ export default {
/** 查询MES打卡记录列表 */
getList() {
this.loading = true;
listAttendanceRecords(this.queryParams).then(response => {
listAttendanceRecords(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.AttendanceRecordsList = response.rows;
this.total = response.total;
this.loading = false;

@ -518,7 +518,7 @@
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button type="warning" @click="clearConsume" >一键清理</el-button>
<el-button type="primary" @click="cancel" v-if="optType == 'view'"></el-button>
<el-button :disabled="loading" type="primary" @click="submitConsume" v-else> </el-button>
<el-button @click="cancel"> </el-button>
@ -704,7 +704,7 @@ import {
submitConsumePS,
submitReportInfo,
getBomList,
getAllLevelConsumeList,
getAllLevelConsumeList,deleteConsume
} from "@/api/mes/reportWorkConsume";
import ReportWorkConsume from "./reportWorkConsume.vue";
import ItemSelectUser from "./selectUser.vue";
@ -1434,9 +1434,7 @@ export default {
});
this.mergedArray = newPConsumeRows;
this.pConsumeRows = newPConsumeRows;
console.log("过滤后:", this.pConsumeRows);
}
console.log(this.pConsumeRows, selection, "wwwwww");
},
// all(zxl)
allConsumeSelection(selection, row) {
@ -1490,6 +1488,16 @@ export default {
this.loading = false; // loading
});
},
/**清理重复报工损耗**/
clearConsume(){
const workorderCode = this.selectRow[0].workorderCode;
this.$modal.confirm('是否确认清理工单号"' + workorderCode + '"的数据项?').then(function() {
return deleteConsume(workorderCode);
}).then(() => {
this.$modal.msgSuccess("清理成功");
this.cancel();
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download(

@ -154,34 +154,40 @@
<!-- 用户绑定 -->
<el-dialog :title="titleUserBind" :visible.sync="openUserBind" width="800px">
<el-table v-loading="userloading" :data="userList" ref="userBindTable" >
<el-table-column label="序号" align="center" type="index" width="50" />
<el-table-column label="员工编号" align="center" prop="userCode" />
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="来料类别" align="center" prop="attr1" >
<template slot-scope="scope">
<el-table v-loading="userloading" :data="userList" ref="userBindTable" >
<el-table-column label="序号" align="center" type="index" width="50" />
<el-table-column label="员工编号" align="center" prop="userCode" />
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="来料类别" align="center" prop="attr1" >
<template slot-scope="scope">
<dict-tag
:options="dict.type.order_type_ll"
:value="scope.row.attr1"
/>
</template>
</el-table-column>
<el-table-column fixed="right" align="center" label="操作" width="100">
<template slot-scope="scope">
<el-button
size="small"
type="danger"
plain
@click="deleteUser(scope.row)"
>
移除</el-button>
</template>
</el-table-column>
</el-table>
<div class="button-container">
<el-button size="mini" type="primary" @click="addUser()" >新增员工</el-button>
</div>
<div slot="footer" class="dialog-footer">
</el-table-column>
<el-table-column label="所属线体/标准" align="center" prop="attr2List" >
<template slot-scope="scope">
<el-select v-model="scope.row.attr2List" placeholder="请选择" clearable @change="selectBelongTo(scope.row)" multiple>
<el-option
v-for="item in belongToOptions"
:key="item.typeCode"
:label="item.typeName"
:value="item.typeCode"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column fixed="right" align="center" label="操作" width="100">
<template slot-scope="scope">
<el-button size="small" type="danger" plain @click="deleteUser(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
<div class="button-container">
<el-button size="mini" type="primary" @click="addUser()" >新增员工</el-button>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleClose" > </el-button>
</div>
</el-dialog>
@ -193,8 +199,10 @@
</template>
<script>
import { listCheckType, getCheckType, delCheckType, addCheckType, updateCheckType } from "@/api/quality/checkType";
import{ getSelectedUsers, addUserBind, deleteByMaterialCode} from "@/api/quality/userbind";
import { listCheckType, getCheckType, delCheckType, addCheckType, updateCheckType,
listBelongToStandars,listBelongToLines
} from "@/api/quality/checkType";
import{ getSelectedUsers, addUserBind, deleteByMaterialCode,updateBelongTo} from "@/api/quality/userbind";
import ItemSelectUser from "./selectUser.vue";
import ItemConfFile from "./confFile.vue";
export default {
@ -214,19 +222,22 @@ export default {
multiple: true,
//
showSearch: true,
openUserBind: false,
materialCode: "",
materialName: "",
attr1: "",
openUserBind: false,
materialCode: "",
materialName: "",
attr1: "",
//
total: 0,
//
checkTypeList: [],
userList: [],
userRows: [],
userList: [],
userRows: [],
belongToOptions:[],
belongToStandars:[],
belongToLines:[],
//
title: "",
titleUserBind: "",
titleUserBind: "",
//
open: false,
//
@ -240,7 +251,7 @@ export default {
attr1: null,
factoryCode: null,
},
getUserParams: {
getUserParams: {
pageNum: 1,
pageSize: 10,
userCode: null,
@ -261,6 +272,8 @@ export default {
},
created() {
this.getList();
this.getBelongToLinesList();
this.getBelongToStandars()
},
methods: {
/** 查询检验节点维护列表 */
@ -272,6 +285,19 @@ export default {
this.loading = false;
});
},
/** 查询所属线体选择列表 */
getBelongToLinesList() {
listBelongToLines().then(response => {
this.belongToLines = response;
});
},
/** 查询所属标准选择列表 */
getBelongToStandars() {
listBelongToStandars().then(response => {
this.belongToStandars = response;
});
},
//
cancel() {
this.open = false;
@ -363,103 +389,121 @@ export default {
...this.queryParams
}, `checkType_${new Date().getTime()}.xlsx`)
},
/** 人员绑定按钮操作页面 */
handleBind(row){
//this.reset();
this.userloading = true;
//使
this.materialCode = row.orderCode;
this.materialName = row.checkName;
this.attr1 = row.attr1;
/** 人员绑定按钮操作页面 */
handleBind(row){
//this.reset();
this.userloading = true;
//使
this.materialCode = row.orderCode;
this.materialName = row.checkName;
this.attr1 = row.attr1;
this.getUserParams.materialCode = row.orderCode;
if(row.orderCode == 'checkTypeSC'|| row.orderCode == 'checkTypeSCXJ' ||
row.orderCode=='checkTypeCPPC' || row.orderCode=='checkTypeCP'){
this.belongToOptions = this.belongToLines;
}else if(row.orderCode == 'checkTypeLL'){
this.belongToOptions = this.belongToStandars;
}
console.log("======"+this.belongToOptions)
//
getSelectedUsers(this.getUserParams).then(response => {
this.userList = response.rows;
this.openUserBind = true;
this.titleUserBind = "人员绑定详情";
this.userloading = false;
this.userloading = false;
});
},
getSelectUserList() {
this.userloading = true;
//this.getUserParams.materialCode = orderCode;
getSelectedUsers(this.getUserParams).then(response => {
this.userList = response.rows;
this.userloading = false;
});
},
userSelection(selection) {
const allRows = this.userRows.concat(selection)
this.userRows = allRows.reduce((acc, cur) => {
const hasDuplicate = acc.some(item => item.materialCode === cur.materialCode);
if (!hasDuplicate) {
acc.push(cur);
}
return acc;
}, []);
},
//
handleClose() {
this.openUserBind = false;
},
//
addUser() {
this.$refs.itemSelectUser.showFlag = true;
this.$refs.itemSelectUser.getList();
},
//
},
getSelectUserList() {
this.userloading = true;
//this.getUserParams.materialCode = orderCode;
getSelectedUsers(this.getUserParams).then(response => {
this.userList = response.rows;
this.userloading = false;
});
},
userSelection(selection) {
const allRows = this.userRows.concat(selection)
this.userRows = allRows.reduce((acc, cur) => {
const hasDuplicate = acc.some(item => item.materialCode === cur.materialCode);
if (!hasDuplicate) {
acc.push(cur);
}
return acc;
}, []);
},
//
handleClose() {
this.openUserBind = false;
},
//
addUser() {
this.$refs.itemSelectUser.showFlag = true;
this.$refs.itemSelectUser.getList();
},
//
onSelectUser(obj) {
let data = {
materialCode: this.materialCode,
materialName: this.materialName,
attr1List: [],
userCodes: [],
userNames: [],
materialCode: this.materialCode,
materialName: this.materialName,
attr1List: [],
userCodes: [],
userNames: [],
}
obj.forEach((item, index) => {
data.userCodes.push(item.userCode);
data.userNames.push(item.userName);
data.attr1List.push(item.attr1);
});
addUserBind(data).then(response => {
if(response.code === 200) {
this.$modal.msgSuccess("人员绑定成功");
}else{
this.$modal.msgError(response.msg);
}
this.getSelectUserList();
});
},
deleteUser(row) {
const userCode = row.userCode;
const userName = row.userName;
const data = {
materialCode: this.materialCode,
userCode: userCode,
userName: userName,
}
this.$modal.confirm('是否确认删除用户名为"' + userName + '"的数据项?').then(function() {
return deleteByMaterialCode(data);
}).then(response => {
obj.forEach((item, index) => {
data.userCodes.push(item.userCode);
data.userNames.push(item.userName);
data.attr1List.push(item.attr1);
});
addUserBind(data).then(response => {
if(response.code === 200) {
this.$modal.msgSuccess("删除成功");
}else{
this.$modal.msgError(response.msg);
this.$modal.msgSuccess("人员绑定成功");
}else{
this.$modal.msgError(response.msg);
}
this.getSelectUserList();
});
},
deleteUser(row) {
const userCode = row.userCode;
const userName = row.userName;
const data = {
materialCode: this.materialCode,
userCode: userCode,
userName: userName,
}
this.getSelectUserList();
}).catch(() => {});
},
this.$modal.confirm('是否确认删除用户名为"' + userName + '"的数据项?').then(function() {
return deleteByMaterialCode(data);
}).then(response => {
if(response.code === 200) {
this.$modal.msgSuccess("删除成功");
}else{
this.$modal.msgError(response.msg);
}
this.getSelectUserList();
}).catch(() => {});
},
//
handleFile(row) {
this.checkType = row.orderCode;
this.checkType = row.orderCode;
this.$refs.itemConfFile.initFunc(this.checkType);
this.$refs.itemConfFile.showFlag = true;
this.$refs.itemConfFile.getList();
},
//
selectBelongTo(row){
const data = {
id: row.id,
attr2List: row.attr2List
}
updateBelongTo(data).then(response => {
this.$modal.msgSuccess("分配成功");
});
}
}
};
</script>

@ -0,0 +1,211 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
<el-form-item label="检验月份" prop="yearMonthDate">
<el-date-picker
v-model="queryParams.yearMonthDate"
type="month"
placeholder="选择月">
</el-date-picker>
</el-form-item>
<el-form-item label="白坯名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入白坯名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
<span style="color:firebrick;font-size: small; text-align: center;padding-left:30px">说明空白处表示当日未生产</span>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="hourProList" border>
<el-table-column label="序号" type="index" align="center" :index="indexMethod" fixed/>
<el-table-column label="不良项目" align="center" prop="dataType" min-width="100" fixed/>
<template v-for="(column, index) in showTitles">
<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
</template>
<el-table-column label="累计" align="center" prop="rowSum" min-width="100"/>
</el-table>
</div>
</template>
<script>
import {getMonthOfDateTitle, getMonthOfDataDefect} from "@/api/quality/qcTable";
import moment from 'moment';
export default {
name: "BpReworkRate",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
hourProList: [],
activeName: 'first',
showTitles:[],//
//
title: "",
//
open: false,
//
queryParams: {
yearMonthDate:null,
yearMonth:null,
productDateArray: [],
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
productDate: null,
equTypeCode: "equ_type_hf"
},
//
form: {},
// list
workShift: [],
equipmentTypeOption:[
],
spanArr: [],
position: 0
};
},
created() {
this.getDate();
this.getList();
},
methods: {
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0);
this.queryParams.yearMonthDate = start;
},
Fungetdate (num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
var y = dd.getFullYear();
var m = dd.getMonth() + 1;//
return y + "-" + m ;
},
/** 查询设备小时产量列表 */
getList() {
if(this.queryParams.yearMonthDate!=null){
this.queryParams.yearMonth = moment(this.queryParams.yearMonthDate).format('YYYY-MM');
}else{
this.$message.error("请填写月份");
return
}
this.loading = true;
//Table
getMonthOfDateTitle(this.queryParams).then(response => {
this.showTitles = [];
for(let i=0;i<=response.length-1;i++){
var pobj={};
pobj.id="monthNum"+i;
pobj.titleName = response[i];
this.showTitles.push(pobj)
}
});
//Table
getMonthOfDataDefect(this.queryParams).then(response => {
this.hourProList = response;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
prepareId: null,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
wetDetailPlanId: null,
productDate: null,
shiftId: null,
ancestors: null,
status: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null
};
this.spanArr = [];
this.position = 0;
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/staticTable/getMonthOfDataDefectExport', {
...this.queryParams
}, `bpDefect_${new Date().getTime()}.xlsx`)
},
//
indexMethod(index) {
return index + 1;
},
}
};
</script>

@ -0,0 +1,342 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
<el-form-item label="检验月份" prop="yearMonthDate">
<el-date-picker
v-model="queryParams.yearMonthDate"
type="month"
placeholder="选择月">
</el-date-picker>
</el-form-item>
<el-form-item label="白坯名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入白坯名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
<span style="color:firebrick;font-size: small; text-align: center;padding-left:30px">说明空白处表示当日未生产</span>
</el-form-item>
</el-form>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="图表" name="first">
<el-form ref="form" :model="form" label-width="80px">
<el-row>
<el-col :span="24" style="text-align:center">
<h2>{{form.column080090}} {{form.column090100}} </h2>
</el-col>
</el-row>
<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
<el-descriptions-item label="产品名称" class="my-description-item1">{{form.materialName}}</el-descriptions-item>
<el-descriptions-item label="抽样数" class="my-description-item1">{{form.sampleQty}}</el-descriptions-item>
<el-descriptions-item label="生产车间" class="my-description-item1">{{form.workCenter}}</el-descriptions-item>
<el-descriptions-item label="不良品数" class="my-description-item1">{{form.noOkQty}}</el-descriptions-item>
<el-descriptions-item label="不良率" class="my-description-item1">{{form.noOkNumRate}}</el-descriptions-item>
<el-descriptions-item label="合格率" class="my-description-item1">{{form.okNumRate}}</el-descriptions-item>
</el-descriptions>
</el-form>
<div id="echartss" style="width:1200px;height:450px;"></div>
</el-tab-pane>
<el-tab-pane label="报表" name="second">
<el-table v-loading="loading" :data="itemProList" border>
<el-table-column label="序号" type="index" align="center" :index="indexMethod" fixed/>
<el-table-column label="项目" align="center" prop="dataType" min-width="100" fixed/>
<template v-for="(column, index) in showTitles">
<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {getDefectItemTitle,getDefectItemData,getDefectItemLine} from "@/api/quality/qcTable";
import moment from 'moment';
import * as echarts from "echarts";
export default {
name: "BpDefectItem",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
itemProList: [],
activeName: 'first',
showTitles:[],//
//
title: "",
//
open: false,
//
queryParams: {
yearMonthDate:null,
yearMonth:null,
productDateArray: [],
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
productDate: null,
equTypeCode: "equ_type_hf"
},
//
form: {},
// list
workShift: [],
equipmentTypeOption:[
{equipmentTypeCode:"equ_type_cxj",equipmentTypeName:"成型机"},
{equipmentTypeCode:"equ_type_hf",equipmentTypeName:"烘房"}
],
spanArr: [],
position: 0,
content_style: {
'text-align': 'center',
'min-width': '200px',
'word-break': 'break-all'
},
label_style: {
'color': '#000',
'text-align': 'center',
'font-weight': '600',
'height': '40px',
'background-color': '#d6dbe1',
'min-width': '100px',
'word-break': 'keep-all'
},
};
},
created() {
this.getDate();
this.getList();
},
methods: {
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0);
this.queryParams.yearMonthDate = start;
},
Fungetdate (num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
var y = dd.getFullYear();
var m = dd.getMonth() + 1;//
return y + "-" + m ;
},
/** 查询设备小时产量列表 */
getList() {
if(this.queryParams.yearMonthDate!=null){
this.queryParams.yearMonth = moment(this.queryParams.yearMonthDate).format('YYYY-MM');
}else{
this.$message.error("请填写月份");
return
}
this.spanArr = [];
this.position = 0;
this.loading = true;
//Table
getDefectItemTitle(this.queryParams).then(response => {
this.showTitles = [];
for(let i=0;i<=response.length-1;i++){
var pobj={};
pobj.id="item"+i;
pobj.titleName = response[i];
this.showTitles.push(pobj)
}
});
//Table
getDefectItemData(this.queryParams).then(response => {
this.itemProList = response;
this.getTbody();
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
prepareId: null,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
wetDetailPlanId: null,
productDate: null,
shiftId: null,
ancestors: null,
status: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null
};
this.resetForm("form");
this.spanArr = [];
this.position = 0;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/staticTable/getDefectItemDataExport', {
...this.queryParams
}, `bpDefectItem_${new Date().getTime()}.xlsx`)
},
handleClick(){
this.$nextTick(()=>{
this.$refs.tables.doLayout()//table
})
},
async getTbody(){
this.loading=true
this.$nextTick(()=>{
this.$refs.tables.doLayout()//table
})
let _this = this
getDefectItemLine(this.queryParams).then(response => {
_this.form = response;
_this.getEcharts(response.supplierCodes,response.columns1,response.columns2)
});
},
getEcharts(xData,yDataLeft,yDdataRight){
var _this=this
var chartDom = document.getElementById('echartss');
var myChart = echarts.init(chartDom);
var option;
option = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'cross',
crossStyle: {
color: '#999'
}
}
},
legend: {
data: ['不良率', '累计不良率']
},
xAxis: {
type: 'category',
data: xData//['', '', '', '', '']
},
yAxis: [
{
type: 'value',
name: '不良率(%)',
min: 0,
max: 100,
interval: 5,
axisLabel: {
formatter: '{value} %'
}
},
{
type: 'value',
name: '累计不良率',
min: 0,
//max: 100,
interval: 20,
axisLabel: {
formatter: '{value} %'
}
}
],
series: [
{
name: '不良率',
type: 'bar',
data: yDataLeft, //[15, 10, 8, 5, 2],
label: {
show: true, //
position: 'top', // 'top', 'bottom', 'left', 'right'
formatter: '{c}%' // {c}
},
},
{
name: '累计不良率',
type: 'line',
yAxisIndex: 1,
data: yDdataRight //[15, 25, 33, 38, 40]
}
]
};
option && myChart.setOption(option);
},
//
indexMethod(index) {
return index + 1;
},
}
};
</script>
<style scoped>
.my-description-item1 {
width: 200px; /* 或者你想要的任何宽度 */
}
</style>

@ -0,0 +1,342 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
<el-form-item label="检验月份" prop="yearMonthDate">
<el-date-picker
v-model="queryParams.yearMonthDate"
type="month"
placeholder="选择月">
</el-date-picker>
</el-form-item>
<el-form-item label="白坯名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入白坯名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
<span style="color:firebrick;font-size: small; text-align: center;padding-left:30px">说明空白处表示当日未生产</span>
</el-form-item>
</el-form>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="图表" name="first">
<el-form ref="form" :model="form" label-width="80px">
<el-row>
<el-col :span="24" style="text-align:center">
<h2>{{form.column080090}} {{form.column090100}} 黑蚊香白坯性能不良排列图</h2>
</el-col>
</el-row>
<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
<el-descriptions-item label="产品名称" class="my-description-item1">{{form.materialName}}</el-descriptions-item>
<el-descriptions-item label="抽检批次" class="my-description-item1">{{form.sampleQty}}</el-descriptions-item>
<el-descriptions-item label="生产车间" class="my-description-item1">{{form.workCenter}}</el-descriptions-item>
<el-descriptions-item label="不合格批次" class="my-description-item1">{{form.noOkQty}}</el-descriptions-item>
<el-descriptions-item label="批次不合格率" class="my-description-item1">{{form.noOkNumRate}}</el-descriptions-item>
<el-descriptions-item label="批次合格率" class="my-description-item1">{{form.okNumRate}}</el-descriptions-item>
</el-descriptions>
</el-form>
<div id="echartss" style="width:1200px;height:450px;"></div>
</el-tab-pane>
<el-tab-pane label="报表" name="second">
<el-table v-loading="loading" :data="itemProList" border>
<el-table-column label="序号" type="index" align="center" :index="indexMethod" fixed/>
<el-table-column label="项目" align="center" prop="dataType" min-width="100" fixed/>
<template v-for="(column, index) in showTitles">
<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {getDefectItemTitle,getDefectItemDataPC,getDefectItemLinePC} from "@/api/quality/qcTable";
import moment from 'moment';
import * as echarts from "echarts";
export default {
name: "BpDefectItemPC",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
itemProList: [],
activeName: 'first',
showTitles:[],//
//
title: "",
//
open: false,
//
queryParams: {
yearMonthDate:null,
yearMonth:null,
productDateArray: [],
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
productDate: null,
equTypeCode: "equ_type_hf"
},
//
form: {},
// list
workShift: [],
equipmentTypeOption:[
{equipmentTypeCode:"equ_type_cxj",equipmentTypeName:"成型机"},
{equipmentTypeCode:"equ_type_hf",equipmentTypeName:"烘房"}
],
spanArr: [],
position: 0,
content_style: {
'text-align': 'center',
'min-width': '200px',
'word-break': 'break-all'
},
label_style: {
'color': '#000',
'text-align': 'center',
'font-weight': '600',
'height': '40px',
'background-color': '#d6dbe1',
'min-width': '100px',
'word-break': 'keep-all'
},
};
},
created() {
this.getDate();
this.getList();
},
methods: {
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0);
this.queryParams.yearMonthDate = start;
},
Fungetdate (num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
var y = dd.getFullYear();
var m = dd.getMonth() + 1;//
return y + "-" + m ;
},
/** 查询设备小时产量列表 */
getList() {
if(this.queryParams.yearMonthDate!=null){
this.queryParams.yearMonth = moment(this.queryParams.yearMonthDate).format('YYYY-MM');
}else{
this.$message.error("请填写月份");
return
}
this.spanArr = [];
this.position = 0;
this.loading = true;
//Table
getDefectItemTitle(this.queryParams).then(response => {
this.showTitles = [];
for(let i=0;i<=response.length-1;i++){
var pobj={};
pobj.id="item"+i;
pobj.titleName = response[i];
this.showTitles.push(pobj)
}
});
//Table
getDefectItemDataPC(this.queryParams).then(response => {
this.itemProList = response;
this.getTbody();
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
prepareId: null,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
wetDetailPlanId: null,
productDate: null,
shiftId: null,
ancestors: null,
status: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null
};
this.resetForm("form");
this.spanArr = [];
this.position = 0;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/staticTable/getDefectItemDataPCExport', {
...this.queryParams
}, `bpDefectItemPC_${new Date().getTime()}.xlsx`)
},
handleClick(){
this.$nextTick(()=>{
this.$refs.tables.doLayout()//table
})
},
async getTbody(){
this.loading=true
this.$nextTick(()=>{
this.$refs.tables.doLayout()//table
})
let _this = this
getDefectItemLinePC(this.queryParams).then(response => {
_this.form = response;
_this.getEcharts(response.supplierCodes,response.columns1,response.columns2)
});
},
getEcharts(xData,yDataLeft,yDdataRight){
var _this=this
var chartDom = document.getElementById('echartss');
var myChart = echarts.init(chartDom);
var option;
option = {
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'cross',
crossStyle: {
color: '#999'
}
}
},
legend: {
data: ['不良率', '累计不良率']
},
xAxis: {
type: 'category',
data: xData//['', '', '', '', '']
},
yAxis: [
{
type: 'value',
name: '不良率(%)',
min: 0,
max: 100,
interval: 5,
axisLabel: {
formatter: '{value} %'
}
},
{
type: 'value',
name: '累计不良率',
min: 0,
//max: 100,
interval: 20,
axisLabel: {
formatter: '{value} %'
}
}
],
series: [
{
name: '不良率',
type: 'bar',
data: yDataLeft, //[15, 10, 8, 5, 2],
label: {
show: true, //
position: 'top', // 'top', 'bottom', 'left', 'right'
formatter: '{c}%' // {c}
},
},
{
name: '累计不良率',
type: 'line',
yAxisIndex: 1,
data: yDdataRight //[15, 25, 33, 38, 40]
}
]
};
option && myChart.setOption(option);
},
//
indexMethod(index) {
return index + 1;
},
}
};
</script>
<style scoped>
.my-description-item1 {
width: 200px; /* 或者你想要的任何宽度 */
}
</style>

@ -0,0 +1,359 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
<el-form-item label="检验月份" prop="yearMonthDate">
<el-date-picker
v-model="queryParams.yearMonthDate"
type="month"
placeholder="选择月">
</el-date-picker>
</el-form-item>
<el-form-item label="白坯名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入白坯名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
<span style="color:firebrick;font-size: small; text-align: center;padding-left:30px">说明空白处表示当日未生产</span>
</el-form-item>
</el-form>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="报表" name="first">
<el-table v-loading="loading" :data="hourProList" :span-method="objectSpanMethod" border>
<el-table-column label="序号" type="index" align="center" :index="indexMethod" fixed/>
<el-table-column label="白坯名称" align="center" prop="materialName" min-width="100" fixed/>
<el-table-column label="日期" align="center" prop="dataType" min-width="100" fixed/>
<template v-for="(column, index) in showTitles">
<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
</template>
<el-table-column label="累计" align="center" prop="rowSum" min-width="100"/>
</el-table>
</el-tab-pane>
<el-tab-pane label="图表" name="second">
<div id="echartss" style="width:1200px;height:450px;"></div>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {getMonthOfDateTitle, getMonthOfData,getMonthOfLine} from "@/api/quality/qcTable";
import moment from 'moment';
import * as echarts from "echarts";
export default {
name: "BpNookRate",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
hourProList: [],
activeName: 'first',
showTitles:[],//
//
title: "",
//
open: false,
//
queryParams: {
yearMonthDate:null,
yearMonth:null,
productDateArray: [],
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
productDate: null,
equTypeCode: "equ_type_hf"
},
//
form: {},
// list
workShift: [],
equipmentTypeOption:[
{equipmentTypeCode:"equ_type_cxj",equipmentTypeName:"成型机"},
{equipmentTypeCode:"equ_type_hf",equipmentTypeName:"烘房"}
],
spanArr: [],
position: 0
};
},
created() {
this.getDate();
this.getList();
},
methods: {
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0);
this.queryParams.yearMonthDate = start;
},
Fungetdate (num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
var y = dd.getFullYear();
var m = dd.getMonth() + 1;//
return y + "-" + m ;
},
/** 查询设备小时产量列表 */
getList() {
if(this.queryParams.yearMonthDate!=null){
this.queryParams.yearMonth = moment(this.queryParams.yearMonthDate).format('YYYY-MM');
}else{
this.$message.error("请填写月份");
return
}
this.spanArr = [];
this.position = 0;
this.loading = true;
//Table
getMonthOfDateTitle(this.queryParams).then(response => {
this.showTitles = [];
for(let i=0;i<=response.length-1;i++){
var pobj={};
pobj.id="monthNum"+i;
pobj.titleName = response[i];
this.showTitles.push(pobj)
}
});
//Table
getMonthOfData(this.queryParams).then(response => {
this.hourProList = response;
this.rowspan();
this.loading = false;
});
//
this.getTbody();
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
prepareId: null,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
wetDetailPlanId: null,
productDate: null,
shiftId: null,
ancestors: null,
status: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null
};
this.resetForm("form");
this.spanArr = [];
this.position = 0;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/staticTable/getMonthOfDataExport', {
...this.queryParams
}, `bpNoOkRate_${new Date().getTime()}.xlsx`)
},
handleClick(){
this.$nextTick(()=>{
this.$refs.tables.doLayout()//table
})
},
async getTbody(){
this.loading=true
this.$nextTick(()=>{
this.$refs.tables.doLayout()//table
})
let _this = this
let xData=[]
let yData=[]
getMonthOfLine(this.queryParams).then(response => {
response.map((item,index)=>{
xData.push(item.ymdms),
yData.push(item.noOkBatchRate)
})
_this.getEcharts(xData,yData)
});
},
getEcharts(xData,yData){
var _this=this
var chartDom = document.getElementById('echartss');
var myChart = echarts.init(chartDom);
var option;
option = {
grid: {
y: '5%',
x:'1%',
y2: '6%',
x2: '1%',
width:'96%',
containLabel: true
},
xAxis: {
type: 'category',
name: '日',
splitLine: {
show: true //线
},
axisTick:{
show:false,
inside:true,
},
axisLabel:{
rotate: 50,
fontSize:11
},
data: xData
},
yAxis: {
type: 'value',
show:true,
// boundaryGap:true,
axisLine:{
// show:true,
},
axisLabel:{
formatter:'{value}%'
}
},
series: [
{
name:'不良率%',
data: yData,
type: 'line',
symbol: "circle",
symbolSize: 5,
label:{
show:true,
fontSize:11
},
lineStyle: {
color: "rgba(12, 115, 242, 1)"
},
areaStyle:{
normal: {
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
offset: 0,
color: "#fff" // 0%
}, {
offset: 1,
color: "rgba(12, 115, 242, 1)" // 100%
}], false)
},
}
}
]
};
option && myChart.setOption(option);
},
//
indexMethod(index) {
return index + 1;
},
/**
* 1. 若是objectSpanMethod不返回任何东西表格不会变化
* 2. 最外层的判断一般是先从第几列开始合并
* 3. 这次从第0行合并2个下次就要从第3行开始合并0行加俩就到3行了
* 4. 这种方式是有多少条数据合并多少条数据比如本案例中有7条数据从第0条合并到第7条
* 5. return { rowspan: 0, colspan: 0 } //
* */
rowspan() {
this.hourProList.forEach((item, index) => {
if (index === 0) {
this.spanArr.push(1);
this.position = 0;
} else {
if (
this.hourProList[index].materialName ===
this.hourProList[index - 1].materialName
) {
this.spanArr[this.position] += 1;
this.spanArr.push(0);
} else {
this.spanArr.push(1);
this.position = index;
}
}
});
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 1) {
const _row = this.spanArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col,
};
}
},
}
};
</script>

@ -0,0 +1,359 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
<el-form-item label="检验月份" prop="yearMonthDate">
<el-date-picker
v-model="queryParams.yearMonthDate"
type="month"
placeholder="选择月">
</el-date-picker>
</el-form-item>
<el-form-item label="白坯名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入白坯名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
<span style="color:firebrick;font-size: small; text-align: center;padding-left:30px">说明空白处表示当日未生产</span>
</el-form-item>
</el-form>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="报表" name="first">
<el-table v-loading="loading" :data="hourProList" :span-method="objectSpanMethod" border>
<el-table-column label="序号" type="index" align="center" :index="indexMethod" fixed/>
<el-table-column label="白坯名称" align="center" prop="materialName" min-width="100" fixed/>
<el-table-column label="日期" align="center" prop="dataType" min-width="100" fixed/>
<template v-for="(column, index) in showTitles">
<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
</template>
<el-table-column label="累计" align="center" prop="rowSum" min-width="100"/>
</el-table>
</el-tab-pane>
<el-tab-pane label="图表" name="second">
<div id="echartss" style="width:1200px;height:450px;"></div>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {getMonthOfDateTitle, getMonthOfDataRework,getMonthOfLineRework} from "@/api/quality/qcTable";
import moment from 'moment';
import * as echarts from "echarts";
export default {
name: "BpReworkRate",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
hourProList: [],
activeName: 'first',
showTitles:[],//
//
title: "",
//
open: false,
//
queryParams: {
yearMonthDate:null,
yearMonth:null,
productDateArray: [],
pageNum: 1,
pageSize: 10,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
productDate: null,
equTypeCode: "equ_type_hf"
},
//
form: {},
// list
workShift: [],
equipmentTypeOption:[
{equipmentTypeCode:"equ_type_cxj",equipmentTypeName:"成型机"},
{equipmentTypeCode:"equ_type_hf",equipmentTypeName:"烘房"}
],
spanArr: [],
position: 0
};
},
created() {
this.getDate();
this.getList();
},
methods: {
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0);
this.queryParams.yearMonthDate = start;
},
Fungetdate (num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
var y = dd.getFullYear();
var m = dd.getMonth() + 1;//
return y + "-" + m ;
},
/** 查询设备小时产量列表 */
getList() {
if(this.queryParams.yearMonthDate!=null){
this.queryParams.yearMonth = moment(this.queryParams.yearMonthDate).format('YYYY-MM');
}else{
this.$message.error("请填写月份");
return
}
this.spanArr = [];
this.position = 0;
this.loading = true;
//Table
getMonthOfDateTitle(this.queryParams).then(response => {
this.showTitles = [];
for(let i=0;i<=response.length-1;i++){
var pobj={};
pobj.id="monthNum"+i;
pobj.titleName = response[i];
this.showTitles.push(pobj)
}
});
//Table
getMonthOfDataRework(this.queryParams).then(response => {
this.hourProList = response;
this.rowspan();
this.loading = false;
});
//
this.getTbody();
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
prepareId: null,
workorderCode: null,
workorderName: null,
parentOrder: null,
orderId: null,
orderCode: null,
productId: null,
productCode: null,
prodType: null,
productName: null,
productSpc: null,
wetDetailPlanId: null,
productDate: null,
shiftId: null,
ancestors: null,
status: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null
};
this.spanArr = [];
this.position = 0;
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/staticTable/getMonthOfDataReworkExport', {
...this.queryParams
}, `bpReworkRate_${new Date().getTime()}.xlsx`)
},
handleClick(){
this.$nextTick(()=>{
this.$refs.tables.doLayout()//table
})
},
async getTbody(){
this.loading=true
this.$nextTick(()=>{
this.$refs.tables.doLayout()//table
})
let _this = this
let xData=[]
let yData=[]
getMonthOfLineRework(this.queryParams).then(response => {
response.map((item,index)=>{
xData.push(item.ymdms),
yData.push(item.noOkBatchRate)
})
_this.getEcharts(xData,yData)
});
},
getEcharts(xData,yData){
var _this=this
var chartDom = document.getElementById('echartss');
var myChart = echarts.init(chartDom);
var option;
option = {
grid: {
y: '5%',
x:'1%',
y2: '6%',
x2: '1%',
width:'96%',
containLabel: true
},
xAxis: {
type: 'category',
name: '日',
splitLine: {
show: true //线
},
axisTick:{
show:false,
inside:true,
},
axisLabel:{
rotate: 50,
fontSize:11
},
data: xData
},
yAxis: {
type: 'value',
show:true,
// boundaryGap:true,
axisLine:{
// show:true,
},
axisLabel:{
formatter:'{value}%'
}
},
series: [
{
name:'不良率%',
data: yData,
type: 'line',
symbol: "circle",
symbolSize: 5,
label:{
show:true,
fontSize:11
},
lineStyle: {
color: "rgba(12, 115, 242, 1)"
},
areaStyle:{
normal: {
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
offset: 0,
color: "#fff" // 0%
}, {
offset: 1,
color: "rgba(12, 115, 242, 1)" // 100%
}], false)
},
}
}
]
};
option && myChart.setOption(option);
},
//
indexMethod(index) {
return index + 1;
},
/**
* 1. 若是objectSpanMethod不返回任何东西表格不会变化
* 2. 最外层的判断一般是先从第几列开始合并
* 3. 这次从第0行合并2个下次就要从第3行开始合并0行加俩就到3行了
* 4. 这种方式是有多少条数据合并多少条数据比如本案例中有7条数据从第0条合并到第7条
* 5. return { rowspan: 0, colspan: 0 } //
* */
rowspan() {
this.hourProList.forEach((item, index) => {
if (index === 0) {
this.spanArr.push(1);
this.position = 0;
} else {
if (
this.hourProList[index].materialName ===
this.hourProList[index - 1].materialName
) {
this.spanArr[this.position] += 1;
this.spanArr.push(0);
} else {
this.spanArr.push(1);
this.position = index;
}
}
});
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 1) {
const _row = this.spanArr[rowIndex];
const _col = _row > 0 ? 1 : 0;
return {
rowspan: _row,
colspan: _col,
};
}
},
}
};
</script>
Loading…
Cancel
Save