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

Merge branch 'projects/mesxc-test' into projects/mesxc-zjl

Browse Source
This commit is contained in:
朱菊兰 2024-04-03 16:27:32 +08:00
commit 3ec82a6a41
67 changed files with 934 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -1,8 +1,8 @@
### ###
# @Author: Do not edit # @Author: Do not edit
# @Date: 2023-08-29 09:40:39 # @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-04-01 08:31:57 # @LastEditTime: 2024-04-03 11:22:19
# @LastEditors: zhp # @LastEditors: DY
# @Description: # @Description:
### ###
# 开发环境配置 # 开发环境配置

4
src/mixins/lb/tableHeightMixin.js
View File

@ -5,6 +5,7 @@ export default {
}; };
}, },
created() { created() {
this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
window.addEventListener('resize', this._setTableHeight); window.addEventListener('resize', this._setTableHeight);
}, },
destroyed() { destroyed() {
@ -12,7 +13,8 @@ export default {
}, },
methods: { methods: {
_setTableHeight() { _setTableHeight() {
this.tableH = this.tableHeight(260); this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
// this.tableH = this.tableHeight(260);
}, },
}, },
}; };

10
src/views/OperationalOverview/AGVBoard.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-03-29 16:49:00 * @LastEditTime: 2024-04-03 10:54:53
* @Description: * @Description:
--> -->
<template> <template>
@ -34,7 +34,7 @@
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
<base-container :beilv="1" :size="'eqStatus'" :title="'周转进度'" :title-icon="'order'" :back="'energy'"> <base-container :beilv="1" :size="'eqStatus'" :title="'周转进度'" :title-icon="'order'" :back="'energy'">
<div class="order" style="width:100%; overflow: hidden scroll;height: 350px;"> <div class="order" style="width:100%; overflow: hidden scroll;height: 350px;">
<el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: 1em"> <el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: .5em">
<!-- <p v-if="op.outRate === 1" class="now-secondary-title" <!-- <p v-if="op.outRate === 1" class="now-secondary-title"
style="font-size: 14px; opacity: calc(.6);color:#4679FD"> style="font-size: 14px; opacity: calc(.6);color:#4679FD">
<i class="el-icon-check" /> <i class="el-icon-check" />
@ -42,7 +42,7 @@
</p> --> </p> -->
<!-- <p class="now-secondary-title">{{ op.name }}</p> --> <!-- <p class="now-secondary-title">{{ op.name }}</p> -->
<p class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</p> <p class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</p>
<el-progress style="width: 910px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10" <el-progress style="width: 935px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
define-back-color="rgba(32, 57, 96, 1)" :percentage="op.outRate * 100" class="custom-progress-bar" /> define-back-color="rgba(32, 57, 96, 1)" :percentage="op.outRate * 100" class="custom-progress-bar" />
</el-row> </el-row>
</div> </div>
@ -606,8 +606,10 @@ export default {
background-image: linear-gradient(to right, #4573fe, #47f8dc); background-image: linear-gradient(to right, #4573fe, #47f8dc);
} }
::v-deep .el-progress__text { ::v-deep .el-progress__text {
width: 50px;
margin-top: -70px; margin-top: -70px;
margin-left: 820px; margin-left: 834px;
text-align: right;
// background-color: unset; // background-color: unset;
// background-image: linear-gradient(to right, #4573fe, #47f8dc); // background-image: linear-gradient(to right, #4573fe, #47f8dc);
} }

168
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-02 15:01:40 * @LastEditTime: 2024-04-03 15:54:51
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -41,10 +41,11 @@
</div> --> </div> -->
<!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 --> <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
<div v-if="coldDetData" class="myLegend"> <div v-if="coldDetData" class="myLegend">
<div class=" barCircleLegend"></div>
<div class=" barCircle"></div>
<h4 class="barText">产线良品率</h4>
<div class="barLegend"></div> <div class="barLegend"></div>
<h4 class="barText">产线产量</h4> <h4 class="barCircleText">产线产量</h4>
<div class="barCircle"></div>
<h4 class="barCircleText">产线良品率</h4>
</div> </div>
<double-y-chart ref="productChart" :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList" <double-y-chart ref="productChart" :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList"
:height="359" :show-legend="true" /> :height="359" :show-legend="true" />
@ -309,6 +310,7 @@ export default {
window.location.reload() window.location.reload()
}, 86400000) }, 86400000)
// this.getData() // this.getData()
// this.getReaiData()
}, },
destroyed() { destroyed() {
this.CutWebsocketClose() this.CutWebsocketClose()
@ -410,7 +412,7 @@ export default {
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡') topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡')
productList.push(ele.productArea) productList.push(ele.productArea)
wasteList.push(ele.wastArea) wasteList.push(ele.wastArea)
nameWasteList.push('缺陷面积:' + ele.wastArea + '㎡') nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
// yieldList.push({ // yieldList.push({
// name: '良品', // name: '良品',
// yield:ele.yield // yield:ele.yield
@ -427,39 +429,82 @@ export default {
this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]]) this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
}) })
}, },
getData() { // getReaiData() {
let detData = [ // let detData = [
{ // {
name: '1', // name: '1',
run: '运行', // run: '运行',
}, // },
{ // {
name: '2', // name: '2',
run: '未运行', // run: '未运行',
}, // },
{ // {
name: '3', // name: '3',
run: '运行', // run: '运行',
}, // },
{ // {
name: '4', // name: '4',
run: '未运行', // run: '未运行',
}, // },
{ // {
name: '1', // name: '1',
run: '运行', // run: '运行',
}, // },
] // ]
this.realEqList = detData.map((item, index) => [ // let arr = []
// console.log(item) // let index = 0
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''} // for (let i in detData) {
</span>`, // index++,
`<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`, // arr.push([
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.run == '运行' ? '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.run || ''}</span>`, // `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
]) // </span>`,
this.realEqConfig.data = this.realEqList // // `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
this.$refs['realEqScrollBoard'].updateRows(this.realEqList) // // </span>`,
}, // `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
// `<span style="color:rgba(255,255,255,0.5)"><div style="${detData[i] == '运行' ? '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> ${detData[i] || ''}</span>`,
// ])
// }
// // this.$nextTick(() => {
// this.annealFunConfig.data = arr
// this.$refs['annealFunScrollBoard'].updateRows(arr)
// // })
// },
// getData() {
// let detData = [
// {
// name: '1',
// run: '运行',
// },
// {
// name: '2',
// run: '未运行',
// },
// {
// name: '3',
// run: '运行',
// },
// {
// name: '4',
// run: '未运行',
// },
// {
// name: '1',
// run: '运行',
// },
// ]
// this.realEqList = detData.map((item, index) => [
// // console.log(item)
// `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
// </span>`,
// `<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`,
// `<span style="color:rgba(255,255,255,0.5)"><div style="${item.run == '运行' ? '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.run || ''}</span>`,
// ])
// // this.$nextTick(() => {
// this.realEqConfig.data = this.realEqList
// this.$refs['realEqScrollBoard'].updateRows(this.realEqList)
// // })
// },
CutWebsocketClose(e) { CutWebsocketClose(e) {
this.Cutws.ws.onclose = (event) => { console.log(event );} this.Cutws.ws.onclose = (event) => { console.log(event );}
}, },
@ -604,16 +649,16 @@ export default {
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡') topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡')
productList.push(ele.productArea) productList.push(ele.productArea)
wasteList.push(ele.wastArea) wasteList.push(ele.wastArea)
nameWasteList.push('缺陷面积:' + ele.wastArea + '㎡') nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
sumAreaList.push(ele.sumArea) sumAreaList.push(ele.sumArea)
yieldList.push(parseFloat((ele.yield * 100).toFixed(3))) yieldList.push(parseFloat((ele.yield * 100).toFixed(2)))
}) })
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]]) this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]])
this.$refs.thirdPileChart.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.fourthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[4]], [wasteList[5]])
this.$refs.fifthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList) this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
}) })
} }
@ -700,6 +745,25 @@ export default {
// this.funWebsocket.onclose = this.funWebsocketClose // this.funWebsocket.onclose = this.funWebsocketClose
// } // }
}, },
NumFormat(value) {
if (!value) return '0.00'
value = value.toFixed(2)
var intPart = Math.trunc(value) // 获取整数部分
// var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
var floatPart = '.00' // 预定义小数部分
var value2Array = value.split('.')
// =2表示数据有小数位
if (value2Array.length === 2) {
floatPart = value2Array[1].toString() // 拿到小数部分
if (floatPart.length === 1) {
return intPart + '.' + floatPart + '0'
} else {
return intPart + '.' + floatPart
}
} else {
return intPart + floatPart
}
},
// funWebsocketOnOpen() { // funWebsocketOnOpen() {
// console.log('socket连接成功') // console.log('socket连接成功')
// this.SJGWebsocket.onmessage() // this.SJGWebsocket.onmessage()
@ -797,7 +861,7 @@ export default {
.myLegend{ .myLegend{
position: absolute; position: absolute;
top: -20px; top: -20px;
right: 50px; right: 20px;
font-size: 12px; font-size: 12px;
color: rgba(255,255,255,.6); color: rgba(255,255,255,.6);
.barLegend{ .barLegend{
@ -807,19 +871,29 @@ export default {
height: 10px; height: 10px;
display: inline-block; display: inline-block;
margin-right: 5px; margin-right: 5px;
border-radius: 30%;
} }
.barText{ .barText{
// float: right; // float: right;
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
} }
.barCircleLegend{
width: 15px;
height: 1px;
background-color: rgba(255, 209, 96, 1);
position: absolute;
left: -4.1715px;
top: 21.7px;
}
.barCircle{ .barCircle{
width: 7px; width: 6px;
height: 7px; height: 6px;
border-radius: 50%; border-radius: 50%;
background-color: rgba(255, 209, 96, 1); background-color: rgba(255, 209, 96, 1);
display: inline-block; display: inline-block;
margin-right: 5px; margin-right: 10px;
margin-bottom: 1.7px;
} }
.barCircleText{ .barCircleText{
display: inline-block; display: inline-block;

27
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-01 09:12:56 * @LastEditTime: 2024-04-03 15:14:24
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -101,7 +101,8 @@ export default {
position: 'top', //在上方显示 position: 'top', //在上方显示
textStyle: { //数值样式 textStyle: { //数值样式
color: '#ced1d5', color: '#ced1d5',
fontSize: 12 fontSize: 12,
fontWight: 'bolder'
} }
}, },
} }
@ -193,18 +194,19 @@ export default {
axisLine: { axisLine: {
lineStyle: { lineStyle: {
type: 'solid', type: 'solid',
color: '#213259', // 左边线的颜色 color: '#25528f', // 左边线的颜色
width: '1' // 坐标线的宽度 width: '1' // 坐标线的宽度
} }
}, },
axisLabel: { axisLabel: {
textStyle: { textStyle: {
align: 'left',
color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
} }
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: '#213259' color: '#25528f'
} }
}, },
data: nameList data: nameList
@ -226,6 +228,7 @@ export default {
nameTextStyle: {// y轴上方单位的颜色 nameTextStyle: {// y轴上方单位的颜色
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
align: "left", align: "left",
padding: [0, 0, 0, 8]
}, },
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
@ -233,19 +236,20 @@ export default {
show: true, show: true,
lineStyle: { lineStyle: {
type: 'solid', type: 'solid',
color: '#213259', // 左边线的颜色 color: '#25528f', // 左边线的颜色
width: '1' // 坐标线的宽度 width: '1' // 坐标线的宽度
} }
}, },
axisLabel: { axisLabel: {
textStyle: { textStyle: {
color: '#ced1d5', // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
formatter: '{value}%' formatter: '{value}%',
align:'left',
} }
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: '#213259' color: '#25528f'
} }
} }
// type: 'value' // type: 'value'
@ -270,6 +274,7 @@ export default {
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
// fontSize: 10, // fontSize: 10,
align: "right", align: "right",
padding:[0,4,0,0]
}, },
position: 'left', position: 'left',
alignTicks: true, alignTicks: true,
@ -277,19 +282,21 @@ export default {
show: true, show: true,
lineStyle: { lineStyle: {
type: 'solid', type: 'solid',
color: '#213259', // 左边线的颜色 color: '#25528f', // 左边线的颜色
width: '1' // 坐标线的宽度 width: '1' // 坐标线的宽度
} }
}, },
axisLabel: { axisLabel: {
// padding: [0, 20, 0, 0],
textStyle: { textStyle: {
margin: 60,
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
formatter: '{value} 片' formatter: '{value} 片'
} }
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: '#213259' color: '#25528f'
} }
} }
// type: 'value' // type: 'value'

30
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-03-29 16:26:28 * @LastEditTime: 2024-04-03 15:10:31
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -167,19 +167,19 @@ export default {
type: 'cross' type: 'cross'
} }
}, },
grid: { top: 90, right: 70, bottom: 20, left: 20, containLabel: true }, grid: { top: 70, right: 20, bottom: 10, left: 10, containLabel: true },
legend: { // legend: {
itemWidth: 10, // itemWidth: 10,
itemHeight: 10, // itemHeight: 10,
top: '0%', // top: '2%',
right: '20px', // right: '30px',
data: ['产线良品率', '产线产量'], // data: ['产线良品率', '产线产量'],
textStyle: { // textStyle: {
fontSize: 12 * this.beilv, // fontSize: 12 * this.beilv,
color: '#ced1d5', // color: '#ced1d5',
fontWight: 'bolder' // fontWight: 'bolder'
} // }
}, // },
xAxis: { xAxis: {
axisTick: { axisTick: {
show: false show: false
@ -227,6 +227,7 @@ export default {
nameTextStyle: {// y轴上方单位的颜色 nameTextStyle: {// y轴上方单位的颜色
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
align: "left", align: "left",
padding: [0, 0, 0, 8]
}, },
position: 'right', position: 'right',
alignTicks: true, alignTicks: true,
@ -271,6 +272,7 @@ export default {
nameTextStyle: { nameTextStyle: {
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
// fontSize: 10, // fontSize: 10,
padding: [0, 4, 0, 0],
align: "right", align: "right",
}, },
// position: 'left', // position: 'left',

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

@ -113,7 +113,7 @@ export default {
textStyle: { //数值样式 textStyle: { //数值样式
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 12, fontSize: 12,
fontWeight: 'bolder' fontWeight: 'normal'
} }
}, },
} }
@ -133,7 +133,7 @@ export default {
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow' type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
} }
}, },
grid: { top: 90, right: 60, bottom: 20, left: 30, containLabel: true }, grid: { top: 70, right: 40, bottom: 10, left: 40, containLabel: true },
// legend: { // legend: {
// itemWidth: 10, // itemWidth: 10,
// itemHeight: 10, // itemHeight: 10,
@ -175,7 +175,7 @@ export default {
name: '单位kwh', name: '单位kwh',
nameTextStyle: { nameTextStyle: {
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 10, fontSize: 12,
align: 'right', align: 'right',
}, },
type: 'value', type: 'value',

16
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-01 09:14:45 * @LastEditTime: 2024-04-03 15:48:43
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -114,6 +114,10 @@ export default {
totalData.push(sum); totalData.push(sum);
} }
// } // }
// rawData[1].map((d, did) =>
// console.log((d / totalData[did]).toFixed(3))
// // totalData[did] <= 0 ? 0 : d / totalData[did]
// )
console.log('total', totalData) console.log('total', totalData)
const series = [ const series = [
'良品', '良品',
@ -163,15 +167,15 @@ export default {
let singleData = series.filter(function (item) { let singleData = series.filter(function (item) {
return item.name == name return item.name == name
}) })
return name + parseFloat((singleData[0].data * 100).toFixed(3)) + '%' return name + parseFloat((singleData[0].data * 100).toFixed(2)) + '%'
}, },
itemWidth: 12, itemWidth: 12,
itemHeight: 12, itemHeight: 12,
bottom: '20', bottom: '20',
left: '20', left: '20',
icon: 'rect', icon: 'roundRect',
textStyle: { textStyle: {
color: 'rgba(255,255,255,.6)', color: 'rgba(255,255,255,.9)',
fontSize:12, fontSize:12,
} }
}, },
@ -204,7 +208,7 @@ export default {
splitNumber: 50, splitNumber: 50,
// boundaryGap: [20, 20], // boundaryGap: [20, 20],
textStyle: { textStyle: {
color: 'rgba(255,255,255,.6)', color: 'rgba(255,255,255,.9)',
verticalAlign: 'bottom', verticalAlign: 'bottom',
fontSize: 16, fontSize: 16,
align: 'left', align: 'left',
@ -232,7 +236,7 @@ export default {
splitNumber: 50, splitNumber: 50,
// boundaryGap: [20, 20], // boundaryGap: [20, 20],
textStyle: { textStyle: {
color: 'rgba(255,255,255,.6)', color: 'rgba(255,255,255,.9)',
verticalAlign: 'bottom', verticalAlign: 'bottom',
fontSize: 16, fontSize: 16,
align: 'right', align: 'right',

172
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-02 09:46:46 * @LastEditTime: 2024-04-03 15:59:25
* @Description: * @Description:
--> -->
<template> <template>
@ -39,11 +39,11 @@
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%"> <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%">
<base-container :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'"> <base-container :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'">
<div class="order" style="width: 100%; overflow: hidden scroll; height: 350px"> <div class="order" style="width: 100%; overflow: hidden scroll; height: 350px">
<el-row v-for="op in orderList" :key="op.id" style="margin-bottom: 1em"> <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em">
<!-- <el-col :span="12"> --> <!-- <el-col :span="12"> -->
<p class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</p> <p class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</p>
<el-progress style="width: 610px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10" <el-progress style="width: 620px;" text-color="rgba(255, 255, 255, .6)" :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>
@ -67,6 +67,13 @@
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
<base-container :show-time="true" :no-content-padding="true" :height="318 + 338 + 16" :size="'eqStatus'" <base-container :show-time="true" :no-content-padding="true" :height="318 + 338 + 16" :size="'eqStatus'"
:title="'产线产量及良品率'" :title-icon="'productLine'"> :title="'产线产量及良品率'" :title-icon="'productLine'">
<div class="myLegend">
<div class=" barCircleLegend"></div>
<div class=" barCircle"></div>
<h4 class="barText">产线良品率</h4>
<div class="barLegend"></div>
<h4 class="barCircleText">产线产量</h4>
</div>
<double-y-chart ref="productLineChart" :id="'doubleYChart'" :height="390" :show-legend="true" /> <double-y-chart ref="productLineChart" :id="'doubleYChart'" :height="390" :show-legend="true" />
</base-container> </base-container>
</el-col> </el-col>
@ -373,6 +380,26 @@ export default {
id: '4', id: '4',
name: '测试工单4', name: '测试工单4',
progressRate: 0.32323, progressRate: 0.32323,
},
{
id: '4',
name: '测试工单4',
progressRate: 0.32323,
},
{
id: '4',
name: '测试工单4',
progressRate: 0.32323,
},
{
id: '4',
name: '测试工单4',
progressRate: 0.32323,
},
{
id: '4',
name: '测试工单4',
progressRate: 0.32323,
}, },
// { // {
// id: '5', // id: '5',
@ -389,7 +416,7 @@ export default {
return { return {
id: ele.id, id: ele.id,
name: ele.name, name: ele.name,
progressRate: parseFloat((ele.progressRate * 100).toFixed(3)), progressRate: parseFloat((ele.progressRate * 100).toFixed(2)),
}; };
} }
}); });
@ -417,28 +444,61 @@ export default {
`<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
]); ]);
this.eqConfig.data = eqArr; this.eqConfig.data = eqArr;
let arr = ['D64', 'D62', 'D61', 'D63', 'D65'] let data = [
// let arr = [5, 6, 2, 4, 7, 9, 15]; {
// 因为7个数，所以长度减去一次为最大循环次数 lineName: 'D62',
for (let i = 0; i < arr.length - 1; i++) { outputNum: '11111',
passRate: '0.9873'
},
{
lineName: 'D63',
outputNum: '23212',
passRate: '0.9873'
},
{
lineName: 'D61',
outputNum: '423323',
passRate: '0.9873'
},
{
lineName: 'D64',
outputNum: '43434',
passRate: '0.9873'
},
]
let nameList = [];
let passRateList = [];
let outputNumList = [];
// let arr = ['D64', 'D62', 'D61', 'D63', 'D65']
for (let i = 0; i < data.length - 1; i++) {
// 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换； // 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换；
for (let j = 0; j < arr.length - i - 1; j++) { for (let j = 0; j < data.length - i - 1; j++) {
// 当前一个值大于后一个值 // 当前一个值大于后一个值
if (arr[j].substr(arr[j].length - 1, 1) > arr[j + 1].substr(arr[j + 1].length - 1, 1)) { if (data[j].lineName.substr(data[j].lineName.length - 1, 1) > data[j + 1].lineName.substr(data[j + 1].lineName.length - 1, 1)) {
// 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果 // 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果
let temp = arr[j]; let temp = data[j];
arr[j] = arr[j + 1]; data[j] = data[j + 1];
arr[j + 1] = temp; data[j + 1] = temp;
} }
} }
} }
console.log(arr); data.forEach((ele) => {
this.$refs['eqScrollBoard'].updateRows(eqArr); // if (item.id == ele.productionLineId) {
// if (item.name.substr(0, 1) == "D") {
// console.log(ele)
nameList.push(ele.lineName);
outputNumList.push(ele.outputNum);
passRateList.push(ele.passRate);
// }
// }
});
this.$nextTick(() => {
this.$refs.productLineChart.initChart( this.$refs.productLineChart.initChart(
arr, nameList,
[98, 97, 98.7, 98.5, 98.3], passRateList,
[3134, 2323, 3232, 3233, 2321] outputNumList
); );
})
// this.getList() // this.getList()
this.initWebSocket(); this.initWebSocket();
this.SJGInitWebSocket(); this.SJGInitWebSocket();
@ -630,7 +690,7 @@ export default {
return { return {
id: ele.id, id: ele.id,
name: ele.name, name: ele.name,
progressRate: parseFloat((ele.progressRate * 100).toFixed(3)), progressRate: parseFloat((ele.progressRate * 100).toFixed(2)),
}; };
} }
}); });
@ -661,6 +721,19 @@ export default {
let nameList = []; let nameList = [];
let passRateList = []; let passRateList = [];
let outputNumList = []; let outputNumList = [];
// let arr = ['D64', 'D62', 'D61', 'D63', 'D65']
for (let i = 0; i < this.SJGWsData.detData.length - 1; i++) {
// 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换；
for (let j = 0; j < this.SJGWsData.detData.length - i - 1; j++) {
// 当前一个值大于后一个值
if (this.SJGWsData.detData[j].lineName.substr(this.SJGWsData.detData[j].lineName.length - 1, 1) > this.SJGWsData.detData[j + 1].lineName.substr(this.SJGWsData.detData[j + 1].lineName.length - 1, 1)) {
// 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果
let temp = this.SJGWsData.detData[j];
this.SJGWsData.detData[j] = this.SJGWsData.detData[j + 1];
this.SJGWsData.detData[j + 1] = temp;
}
}
}
this.SJGWsData.detData.forEach((ele) => { this.SJGWsData.detData.forEach((ele) => {
// if (item.id == ele.productionLineId) { // if (item.id == ele.productionLineId) {
// if (item.name.substr(0, 1) == "D") { // if (item.name.substr(0, 1) == "D") {
@ -671,19 +744,6 @@ export default {
// } // }
// } // }
}); });
// let arr = ['D64', 'D62', 'D61', 'D63', 'D65']
for (let i = 0; i < nameList.length - 1; i++) {
// 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换；
for (let j = 0; j < nameList.length - i - 1; j++) {
// 当前一个值大于后一个值
if (nameList[j].substr(nameList[j].length - 1, 1) > nameList[j + 1].substr(nameList[j + 1].length - 1, 1)) {
// 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果
let temp = nameList[j];
nameList[j] = nameList[j + 1];
nameList[j + 1] = temp;
}
}
}
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.productLineChart.initChart( this.$refs.productLineChart.initChart(
nameList, nameList,
@ -742,6 +802,51 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.myLegend {
position: absolute;
top: -28px;
right: 20px;
font-size: 12px;
color: rgba(255, 255, 255, .6);
.barLegend {
// float: left;
background: linear-gradient(#9DD5FF, #1295FF);
width: 10px;
height: 10px;
display: inline-block;
margin-right: 5px;
border-radius: 30%;
}
.barText {
// float: right;
display: inline-block;
margin-right: 10px;
}
.barCircleLegend {
width: 15px;
height: 1px;
background-color: rgba(255, 209, 96, 1);
position: absolute;
left: -4.1715px;
top: 21.7px;
}
.barCircle {
width: 6px;
height: 6px;
border-radius: 50%;
background-color: rgba(255, 209, 96, 1);
display: inline-block;
margin-right: 10px;
margin-bottom: 1.7px;
}
.barCircleText {
display: inline-block;
}
}
.visual-container { .visual-container {
width: 1920px; width: 1920px;
height: 1080px; height: 1080px;
@ -815,8 +920,9 @@ export default {
background-image: linear-gradient(to right, #4573fe, #47f8dc); background-image: linear-gradient(to right, #4573fe, #47f8dc);
} }
::v-deep .el-progress__text { ::v-deep .el-progress__text {
width: 50px;
margin-top: -70px; margin-top: -70px;
margin-left: 490px; margin-left: 510px;
// background-color: unset; // background-color: unset;
// background-image: linear-gradient(to right, #4573fe, #47f8dc); // background-image: linear-gradient(to right, #4573fe, #47f8dc);
} }

30
src/views/base/coreAlarmLog/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -33,38 +34,49 @@ import {
getcoreAlarmLogPage getcoreAlarmLogPage
} from '@/api/base/coreAlarmLog'; } from '@/api/base/coreAlarmLog';
import {DICT_TYPE, getDictDatas, publicFormatter } from "@/utils/dict"; import {DICT_TYPE, getDictDatas, publicFormatter } from "@/utils/dict";
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'alarmTime', prop: 'alarmTime',
label: '报警时间', label: '报警时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'alarmSource', prop: 'alarmSource',
label: '报警来源' label: '报警来源',
width: 200,
showOverflowtooltip: true
}, },
{ {
prop: 'alarmType', prop: 'alarmType',
label: '报警类型' label: '报警类型',
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'alarmGrade', prop: 'alarmGrade',
label: '报警级别', label: '报警级别',
filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL) filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL),
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'alarmReason', prop: 'alarmReason',
label: '报警原因' label: '报警原因',
showOverflowtooltip: true
}, },
{ {
prop: 'alarmContent', prop: 'alarmContent',
label: '报警详细' label: '报警详细',
showOverflowtooltip: true
} }
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -74,7 +86,7 @@ export default {
tableBtn: [].filter((v)=>v), tableBtn: [].filter((v)=>v),
tableData: [], tableData: [],
listQuery: { listQuery: {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 0, total: 0,
alarmSource: undefined, alarmSource: undefined,

4
src/views/base/coreCustomer/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-20 16:20:39 * @LastEditTime: 2024-04-02 16:46:17
* @Description: * @Description:
--> -->
<template> <template>
@ -96,7 +96,7 @@ export default {
dataRule: { dataRule: {
code: [{ required: true, message: "客户编号不能为空", trigger: "blur" }], code: [{ required: true, message: "客户编号不能为空", trigger: "blur" }],
name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }], name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }],
contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }], // contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
telephone: [ telephone: [
{ required: false, trigger: "blur", message: "手机号不能为空" }, { required: false, trigger: "blur", message: "手机号不能为空" },
{ {

34
src/views/base/coreCustomer/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,41 +46,56 @@ import {
getCustomerPage, getCustomerPage,
deleteCustomer deleteCustomer
} from '@/api/base/coreCustomer'; } from '@/api/base/coreCustomer';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '客户名称' label: '客户名称',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '客户编码' label: '客户编码',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'contact', prop: 'contact',
label: '联系人' label: '联系人',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'telephone', prop: 'telephone',
label: '联系电话' label: '联系电话',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'address', prop: 'address',
label: '地址' label: '地址',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
minWidth: 150,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

6
src/views/base/coreDepartment/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,6 +46,7 @@ import {
getCoreDepartmentPage, getCoreDepartmentPage,
deleteCoreDepartment deleteCoreDepartment
} from '@/api/base/coreDepartment'; } from '@/api/base/coreDepartment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
@ -71,7 +73,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

4
src/views/base/coreEquipment/components/EquipmentInfoForm.vue
View File

@ -64,8 +64,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="进场日期" prop="enterTime" :rules="[]"> <el-form-item label="进厂日期" prop="enterTime" :rules="[]">
<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进场日期" <el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进厂日期"
value-format="timestamp"></el-date-picker> value-format="timestamp"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>

14
src/views/base/coreEquipment/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -78,7 +79,7 @@
queryParams: { queryParams: {
equipmentId: form.id, equipmentId: form.id,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
}, },
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:core-equipment-attr:update') this.$auth.hasPermi('base:core-equipment-attr:update')
@ -118,6 +119,7 @@ import {
} from '@/api/base/equipment'; } from '@/api/base/equipment';
import Editor from '@/components/Editor'; import Editor from '@/components/Editor';
import AssetsUpload from './components/AssetsUpload.vue'; import AssetsUpload from './components/AssetsUpload.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'Equipment', name: 'Equipment',
@ -125,7 +127,7 @@ export default {
Editor, Editor,
EquipmentDrawer, EquipmentDrawer,
}, },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
searchBarKeys: ['name', 'code'], searchBarKeys: ['name', 'code'],
@ -157,8 +159,8 @@ export default {
width: 180, width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
}, },
{ prop: 'name', label: '设备名称' }, { prop: 'name', label: '设备名称', width: 180, showOverflowtooltip: true },
{ width: 256, prop: 'code', label: '设备编码' }, { width: 250, prop: 'code', label: '设备编码' },
{ prop: 'equipmentTypeName', label: '设备类型' }, { prop: 'equipmentTypeName', label: '设备类型' },
{ prop: 'enName', label: '英文名称' }, { prop: 'enName', label: '英文名称' },
{ prop: 'abbr', label: '缩写' }, { prop: 'abbr', label: '缩写' },
@ -484,7 +486,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
code: '', code: '',
name: '', name: '',
special: false special: false

18
src/views/base/coreEquipmentLineBind/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -51,13 +52,13 @@
import moment from 'moment'; import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import DialogForm from './dialogForm.vue'; import DialogForm from './dialogForm.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// import { getAccessToken } from '@/utils/auth'; // import { getAccessToken } from '@/utils/auth';
export default { export default {
name: 'EquipmentLineBind', name: 'EquipmentLineBind',
components: { DialogForm }, components: { DialogForm },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
basePath: '/base/core-equipment-bind-section', basePath: '/base/core-equipment-bind-section',
@ -81,12 +82,13 @@ export default {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
fixed: true, fixed: true,
width: 180, width: 150,
showOverflowtooltip: true,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
}, },
{ prop: 'productionLineName', label: '产线名称' }, { prop: 'productionLineName', label: '产线名称', width: 120, showOverflowtooltip: true },
{ prop: 'workshopSectionName', label: '工段名称' }, { prop: 'workshopSectionName', label: '工段名称', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名称' }, { prop: 'equipmentName', label: '设备名称', width: 150, showOverflowtooltip: true },
{ prop: 'sort', label: '工段中排序' }, { prop: 'sort', label: '工段中排序' },
{ {
prop: 'lineDataType', prop: 'lineDataType',
@ -236,7 +238,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
equipmentName: null, equipmentName: null,
productionLineId: null, productionLineId: null,
}, },

8
src/views/base/coreEquipmentType/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -50,6 +51,7 @@
<script> <script>
import moment from 'moment'; import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
createEquipmentType, createEquipmentType,
@ -65,7 +67,7 @@ import {
export default { export default {
name: 'EquipmentType', name: 'EquipmentType',
components: {}, components: {},
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
searchBarKeys: ['name'], searchBarKeys: ['name'],
@ -171,7 +173,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
name: '', name: '',
}, },
// 表单参数 // 表单参数

30
src/views/base/coreHotMaterial/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -43,38 +44,51 @@ import basicPage from '../../core/mixins/basic-page';
import { parseTime } from '../../core/mixins/code-filter'; import { parseTime } from '../../core/mixins/code-filter';
import { getHotMaterialPage, deleteHotMaterial } from '@/api/base/coreHotMaterial'; import { getHotMaterialPage, deleteHotMaterial } from '@/api/base/coreHotMaterial';
import { publicFormatter } from "@/utils/dict"; import { publicFormatter } from "@/utils/dict";
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '原料名称' label: '原料名称',
minWidth: 250,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '原料编码' label: '原料编码',
width: 250,
showOverflowtooltip: true
}, },
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('unit_dict') filter: publicFormatter('unit_dict'),
width: 90,
showOverflowtooltip: true
}, },
{ {
prop: 'dailyCost', prop: 'dailyCost',
label: '每日消耗量' label: '每日消耗量',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
width: 120,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

6
src/views/base/coreMajor/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,6 +46,7 @@ import {
getCoreMajorPage, getCoreMajorPage,
deleteCoreMajor deleteCoreMajor
} from '@/api/base/coreMajor'; } from '@/api/base/coreMajor';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
@ -71,7 +73,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

15
src/views/base/coreProduct/add-or-updata.vue
View File

@ -2,15 +2,17 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-13 13:54:01 * @LastEditTime: 2024-03-27 13:47:24
* @Description: * @Description:
--> -->
<template> <template>
<el-drawer <el-drawer
:visible.sync="visible" :visible.sync="visible"
:show-close="false" :show-close="false"
:wrapper-closable="isdetail" :wrapper-closable="true"
class="drawer" class="drawer"
:before-close="beforeClose"
@closed="$emit('destroy')"
size="60%"> size="60%">
<small-title slot="title" :no-padding="true"> <small-title slot="title" :no-padding="true">
{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }} {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
@ -262,6 +264,15 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
beforeClose(done) {
if (!this.isdetail) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => {});
}
},
clearArea() { clearArea() {
this.$set(this.dataForm, 'area', 0) this.$set(this.dataForm, 'area', 0)
this.$set(this.dataForm, 'weight', 0) this.$set(this.dataForm, 'weight', 0)

35
src/views/base/coreProduct/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -26,7 +27,8 @@
<add-or-update <add-or-update
v-if="addOrUpdateVisible" v-if="addOrUpdateVisible"
ref="addOrUpdate" ref="addOrUpdate"
@refreshDataList="getDataList" /> @refreshDataList="getDataList"
@destroy="addOrUpdateVisible = false" />
</div> </div>
</template> </template>
@ -39,43 +41,58 @@ import {
getCoreProductPage, getCoreProductPage,
deleteCoreProduct deleteCoreProduct
} from '@/api/base/coreProduct'; } from '@/api/base/coreProduct';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '产品名称' label: '产品名称',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '产品编码' label: '产品编码',
width: 190,
showOverflowtooltip: true
}, },
{ {
prop: 'productType', prop: 'productType',
label: '产品类型', label: '产品类型',
filter: publicFormatter('product_type') filter: publicFormatter('product_type'),
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'specifications', prop: 'specifications',
label: '规格' label: '规格',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('unit_dict') filter: publicFormatter('unit_dict'),
width: 90,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注', label: '备注',
width: 120,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

38
src/views/base/coreProductionLine/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -48,34 +49,47 @@ import {
import { getStatus } from '@/api/core/base/productionLine'; import { getStatus } from '@/api/core/base/productionLine';
import codeFilter from '../../core/mixins/code-filter'; import codeFilter from '../../core/mixins/code-filter';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'factoryName', prop: 'factoryName',
label: '工厂' label: '工厂',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'roomNameDict', prop: 'roomNameDict',
label: '车间名称', label: '车间名称',
filter: publicFormatter('workshop') filter: publicFormatter('workshop'),
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '产线名称' label: '产线名称',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '产线编码' label: '产线编码',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'enabled', prop: 'enabled',
label: '当前状态', label: '当前状态',
filter: codeFilter('lineStatus') filter: codeFilter('lineStatus'),
width: 120,
showOverflowtooltip: true
}, },
// { // {
// prop: 'tvalue', // prop: 'tvalue',
@ -83,16 +97,20 @@ const tableProps = [
// }, // },
{ {
prop: 'description', prop: 'description',
label: '描述' label: '描述',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
width: 120,
showOverflowtooltip: true
} }
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

4
src/views/base/coreSupplier/add-or-updata.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2023-11-22 10:27:43 * @LastEditTime: 2024-04-02 16:46:49
* @Description: * @Description:
--> -->
<template> <template>
@ -79,7 +79,7 @@ export default {
dataRule: { dataRule: {
code: [{ required: true, message: "供应商编号不能为空", trigger: "blur" }], code: [{ required: true, message: "供应商编号不能为空", trigger: "blur" }],
name: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }], name: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }],
contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }], // contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
telephone: [ telephone: [
{ required: false, trigger: "blur", message: "手机号不能为空" }, { required: false, trigger: "blur", message: "手机号不能为空" },
{ {

34
src/views/base/coreSupplier/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,41 +46,56 @@ import {
getCoreSupplierPage, getCoreSupplierPage,
deleteCoreSupplier deleteCoreSupplier
} from '@/api/base/coreSupplier'; } from '@/api/base/coreSupplier';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '供应商编码' label: '供应商编码',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '供应商名称' label: '供应商名称',
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'contact', prop: 'contact',
label: '联系人' label: '联系人',
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'telephone', prop: 'telephone',
label: '联系电话' label: '联系电话',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'address', prop: 'address',
label: '地址' label: '地址',
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
minWidth: 90,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

40
src/views/base/coreWorker/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -46,20 +47,27 @@ import {
deleteCoreWorker deleteCoreWorker
} from '@/api/base/coreWorker'; } from '@/api/base/coreWorker';
import moment from 'moment'; import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '创建时间', label: '创建时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '姓名' label: '姓名',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '员工号' label: '员工号',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'sex', prop: 'sex',
@ -70,32 +78,44 @@ const tableProps = [
prop: 'entryTime', prop: 'entryTime',
label: '入职时间', label: '入职时间',
filter: (val) => val ? moment(val).format('yyyy-MM-DD') : '', filter: (val) => val ? moment(val).format('yyyy-MM-DD') : '',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'telephone', prop: 'telephone',
label: '联系电话' label: '联系电话',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'status', prop: 'status',
label: '状态', label: '状态',
filter: (val) => ['', '在职', '离职'][val] filter: (val) => ['', '在职', '离职'][val],
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'departmentName', prop: 'departmentName',
label: '部门' label: '部门',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'majorName', prop: 'majorName',
label: '专业' label: '专业',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
width: 150,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

12
src/views/base/coreWorkshopSection/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,12 +46,14 @@ import {
getCWSectionPage, getCWSectionPage,
deleteCWSection deleteCWSection
} from '@/api/base/coreWorkshopSection'; } from '@/api/base/coreWorkshopSection';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
}, },
{ {
prop: 'code', prop: 'code',
@ -70,12 +73,13 @@ const tableProps = [
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

6
src/views/base/material/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -40,6 +41,7 @@ import {
} from '@/api/base/material'; } from '@/api/base/material';
import { listData } from "@/api/system/dict/data"; import { listData } from "@/api/system/dict/data";
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
@ -75,7 +77,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

6
src/views/base/materialProductBom/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -38,6 +39,7 @@ import {
getMaterialPBPage, getMaterialPBPage,
deleteMaterialPB deleteMaterialPB
} from '@/api/base/materialProductBom'; } from '@/api/base/materialProductBom';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
@ -55,7 +57,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
components: { components: {
AddOrUpdate, AddOrUpdate,
}, },

34
src/views/base/packagingPrintLog/index.vue
View File

@ -7,32 +7,15 @@
--> -->
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
:formConfigs="formConfig" <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
ref="searchBarForm"
@headBtnClick="buttonClick" />
<base-table
:table-props="tableProps"
:page="listQuery.pageNo"
:limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData">
<method-btn <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
<pagination <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
:limit.sync="listQuery.pageSize"
:page.sync="listQuery.pageNo"
:total="listQuery.total"
@pagination="getDataList" /> @pagination="getDataList" />
<add-or-update <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList" />
</div> </div>
</template> </template>
@ -41,6 +24,7 @@ import AddOrUpdate from './add-or-updata';
// import unitDict from './unitDict'; // import unitDict from './unitDict';
import basicPage from '../mixins/basic-page'; import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter'; import { parseTime } from '../mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
getPackingModel, getPackingModel,
} from '@/api/base/printModel.js' } from '@/api/base/printModel.js'
@ -91,7 +75,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -314,7 +298,7 @@ export default {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.pageNo = 1; this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10; this.listQuery.pageSize = 20;
this.listQuery.workOrderId = val.workOrderId; this.listQuery.workOrderId = val.workOrderId;
if (val.createTime && val.createTime.length != 0) { if (val.createTime && val.createTime.length != 0) {
this.listQuery.createTime = val.createTime this.listQuery.createTime = val.createTime
@ -329,7 +313,7 @@ export default {
case 'reset': case 'reset':
this.$refs.searchBarForm.resetForm(); this.$refs.searchBarForm.resetForm();
this.listQuery = { this.listQuery = {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
}; };

15
src/views/base/packagingPrintModel/index.vue
View File

@ -2,13 +2,14 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2023-12-04 13:38:45 * @LastEditTime: 2024-04-03 15:08:38
* @Description: * @Description:
--> -->
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"> <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
:table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
@ -25,7 +26,9 @@ import AddOrUpdate from './add-or-updata';
import basicPage from '../mixins/basic-page'; import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter'; import { parseTime } from '../mixins/code-filter';
import printModelDesign from '../custom/index' import printModelDesign from '../custom/index'
import { updatePackingModel,} from '@/api/base/printModel.js'; import { updatePackingModel, } from '@/api/base/printModel.js';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
deletePackingModel, deletePackingModel,
getPackingModelPage, getPackingModelPage,
@ -59,7 +62,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -162,7 +165,7 @@ export default {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.pageNo = 1; this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10; this.listQuery.pageSize = 20;
this.listQuery.packagingCode = val.packagingCode; this.listQuery.packagingCode = val.packagingCode;
this.listQuery.createTime = val.createTime; this.listQuery.createTime = val.createTime;
this.getDataList(); this.getDataList();
@ -170,7 +173,7 @@ export default {
case 'reset': case 'reset':
this.$refs.searchBarForm.resetForm(); this.$refs.searchBarForm.resetForm();
this.listQuery = { this.listQuery = {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
}; };

36
src/views/base/packagingPrintType/index.vue
View File

@ -2,37 +2,20 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2023-12-04 13:44:01 * @LastEditTime: 2024-04-03 15:09:06
* @Description: * @Description:
--> -->
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
:formConfigs="formConfig" <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
ref="searchBarForm"
@headBtnClick="buttonClick" />
<base-table
:table-props="tableProps"
:page="listQuery.pageNo"
:limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData">
<method-btn <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
<pagination <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
:limit.sync="listQuery.pageSize"
:page.sync="listQuery.pageNo"
:total="listQuery.total"
@pagination="getDataList" /> @pagination="getDataList" />
<add-or-update <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList" />
</div> </div>
</template> </template>
@ -41,6 +24,7 @@ import AddOrUpdate from './add-or-updata';
// import unitDict from './unitDict'; // import unitDict from './unitDict';
import basicPage from '../mixins/basic-page'; import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter'; import { parseTime } from '../mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
deletePackingType, deletePackingType,
getPackingTypePage, getPackingTypePage,
@ -64,7 +48,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -154,7 +138,7 @@ export default {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.pageNo = 1; this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10; this.listQuery.pageSize = 20;
this.listQuery.packagingCode = val.packagingCode; this.listQuery.packagingCode = val.packagingCode;
this.listQuery.createTime = val.createTime; this.listQuery.createTime = val.createTime;
this.getDataList(); this.getDataList();
@ -162,7 +146,7 @@ export default {
case 'reset': case 'reset':
this.$refs.searchBarForm.resetForm(); this.$refs.searchBarForm.resetForm();
this.listQuery = { this.listQuery = {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
}; };

17
src/views/core/analysis/balanceAnalysis/chart.vue
View File

@ -106,6 +106,10 @@ export default {
activeIndex(val) { activeIndex(val) {
this.initChart(val); this.initChart(val);
}, },
daterange(val) {
console.log('222', val)
this.templateOption.xAxis.data = val
},
}, },
methods: { methods: {
/** /**
@ -124,8 +128,8 @@ export default {
}, },
/** 初始化/设置 图表 */ /** 初始化/设置 图表 */
initChart(val) { initChart(val) {
console.log('tableData', this.tableData);
if (!this.chart) this.chart = echarts.init(this.$refs.chartDiv); if (!this.chart) this.chart = echarts.init(this.$refs.chartDiv);
this.chart.clear();
switch (val) { switch (val) {
case 0: case 0:
const eqCt = this.tableData.map((row) => ({ const eqCt = this.tableData.map((row) => ({
@ -139,7 +143,7 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '设备CT' }, yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
series: eqCt, series: eqCt,
}); }, true);
break; break;
case 1: case 1:
const eqTt = this.tableData.map((row) => ({ const eqTt = this.tableData.map((row) => ({
@ -153,7 +157,7 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '设备TT' }, yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
series: eqTt, series: eqTt,
}); }, true);
break; break;
case 2: case 2:
const plCt = this.tableData.map((row) => ({ const plCt = this.tableData.map((row) => ({
@ -167,7 +171,7 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '产线CT' }, yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
series: plCt, series: plCt,
}); }, true);
break; break;
case 3: case 3:
const plTt = this.tableData.map((row) => ({ const plTt = this.tableData.map((row) => ({
@ -181,9 +185,10 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '产线TT' }, yAxis: { ...this.templateOption.yAxis, name: '产线TT' },
series: plTt, series: plTt,
}); }, true);
break; break;
default: default:
this.activeIndex = 0
const eqCt2 = this.tableData.map((row) => ({ const eqCt2 = this.tableData.map((row) => ({
name: row.equName, name: row.equName,
type: 'line', type: 'line',
@ -195,7 +200,7 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '设备CT' }, yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
series: eqCt2, series: eqCt2,
}); }, true);
} }
}, },
}, },

12
src/views/core/analysis/balanceAnalysis/index.vue
View File

@ -18,13 +18,15 @@
:page="1" :page="1"
:limit="999" :limit="999"
:table-props="tableProps" :table-props="tableProps"
:table-data="tableData" /> :table-data="tableData"
:max-height="tableH" />
<div v-if="tableData.length == 0" class="no-data-bg"></div> <div v-if="tableData.length == 0" class="no-data-bg"></div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph"> <el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph">
<div class="graph" style="height: 800px"> <div class="graph" style="height: 800px">
<!-- graph --> <!-- graph -->
<AnalysisChart <AnalysisChart
ref="analysisChart"
v-if="activeName == 'graph'" v-if="activeName == 'graph'"
:table-data="tableData" :table-data="tableData"
:daterange="dateArr"></AnalysisChart> :daterange="dateArr"></AnalysisChart>
@ -47,13 +49,14 @@ import BalanceChart from '../balanceChart';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import AnalysisChart from './chart.vue'; import AnalysisChart from './chart.vue';
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
components: { components: {
BalanceChart, BalanceChart,
AnalysisChart, AnalysisChart,
}, },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
activeName: 'table', activeName: 'table',
@ -176,6 +179,11 @@ export default {
// const p = this.tableProps // const p = this.tableProps
// const d = this.tableData // const d = this.tableData
// debugger; // debugger;
if (this.activeName == 'graph') {
this.$nextTick(() => {
this.$refs['analysisChart'].initChart()
})
}
this.ready = true; this.ready = true;
}, },

6
src/views/core/base/factory/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -41,6 +42,7 @@
import AddOrUpdate from './add-or-updata'; import AddOrUpdate from './add-or-updata';
import basicPage from '../../mixins/basic-page'; import basicPage from '../../mixins/basic-page';
import { parseTime } from '../../mixins/code-filter'; import { parseTime } from '../../mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
deleteFactory, deleteFactory,
getFactoryPage getFactoryPage
@ -71,7 +73,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

2
src/views/core/mixins/basic-page.js
View File

@ -17,7 +17,7 @@ export default {
}, },
tableData: [], tableData: [],
listQuery: { listQuery: {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
}, },

11
src/views/core/monitoring/data24/index.vue
View File

@ -27,13 +27,16 @@
import { getPdlDataOneDay } from '@/api/core/monitoring/data24' import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
import { parseTime } from '../../mixins/code-filter'; import { parseTime } from '../../mixins/code-filter';
import { getSchedulingMonitoringRecord1 } from '@/api/monitoring/teamProduction' import { getSchedulingMonitoringRecord1 } from '@/api/monitoring/teamProduction'
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'productionLineData24', name: 'productionLineData24',
mixins: [tableHeightMixin],
components: {}, components: {},
props: {}, props: {},
data() { data() {
return { return {
heightNum: 240,
urlOptions: { urlOptions: {
getDataListURL: getPdlDataOneDay getDataListURL: getPdlDataOneDay
}, },
@ -56,9 +59,9 @@ export default {
}, },
computed: {}, computed: {},
mounted() { mounted() {
window.addEventListener('resize', () => { // window.addEventListener('resize', () => {
this.tableH = this.tableHeight(240) // this.tableH = this.tableHeight(240)
}) // })
this.getList(); this.getList();
}, },
methods: { methods: {
@ -115,7 +118,7 @@ export default {
/** 把 list 里的数据转换成 tableProps 对应的格式 */ /** 把 list 里的数据转换成 tableProps 对应的格式 */
convertList(list) { convertList(list) {
// let sectionArr= [] // let sectionArr= []
let temp = Object.values(list.datamap) let temp = list.datamap ? Object.values(list?.datamap) : []
console.log('111', temp) console.log('111', temp)
temp.forEach(item => { temp.forEach(item => {

22
src/views/equipment/analysis/Statistics/index.vue
View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -33,6 +34,7 @@ import {
getEqAnalysis, getEqAnalysis,
exportEqAnalysisExcel, exportEqAnalysisExcel,
} from '@/api/equipment/analysis/statistics'; } from '@/api/equipment/analysis/statistics';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
// { // {
@ -52,35 +54,49 @@ const tableProps = [
{ {
prop: 'lineName', prop: 'lineName',
label: '产线', label: '产线',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'sectionName', prop: 'sectionName',
label: '工段', label: '工段',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'equipmentName', prop: 'equipmentName',
label: '设备名称', label: '设备名称',
minWidth: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'equipmentType', prop: 'equipmentType',
label: '设备类型', label: '设备类型',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'workTime', prop: 'workTime',
label: '工作时间累积(h)', label: '工作时间累积(h)',
width: 160,
showOverflowtooltip: true
}, },
{ {
prop: 'repairCount', prop: 'repairCount',
label: '维修次数', label: '维修次数',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'maintainCount', prop: 'maintainCount',
label: '保养次数', label: '保养次数',
width: 120,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
const today = new Date(); const today = new Date();
@ -110,7 +126,7 @@ export default {
tableBtn: [].filter((v) => v), tableBtn: [].filter((v) => v),
tableData: [], tableData: [],
listQuery: { listQuery: {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
recordTime: [ recordTime: [

6
src/views/equipment/analysis/efficiency/components/pieChart.vue
View File

@ -75,6 +75,12 @@ export default {
}, },
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: (v) => {
const num = String(v.value)?.split('.').length === 2 ? v.value?.toFixed(2) : v.value
return `<div>
<span>${v.name}: ${num}</span>
</div>`
}
}, },
legend: { legend: {
show: false, show: false,

6
src/views/equipment/analysis/exception/index.vue
View File

@ -19,7 +19,7 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
max-height="600" :max-height="tableH"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun">
<!-- <method-btn <!-- <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
@ -42,14 +42,16 @@
<script> <script>
import moment from 'moment'; import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'ExceptionAnalysis', name: 'ExceptionAnalysis',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
components: {}, components: {},
props: {}, props: {},
data() { data() {
return { return {
heightNum: 220,
searchBarKeys: ['name', 'code'], searchBarKeys: ['name', 'code'],
// tableBtn: [ // tableBtn: [
// this.$auth.hasPermi('base:equipment-group:update') // this.$auth.hasPermi('base:equipment-group:update')

9
src/views/equipment/analysis/quality/index.vue
View File

@ -48,9 +48,11 @@
<script> <script>
import moment from 'moment'; import moment from 'moment';
import LineChart from './components/lineChart.vue'; import LineChart from './components/lineChart.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'QualityAnalysis', name: 'QualityAnalysis',
mixins: [tableHeightMixin],
components: { LineChart }, components: { LineChart },
props: {}, props: {},
data() { data() {
@ -58,7 +60,6 @@ export default {
const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()]; const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
return { return {
dialogVisible: false, dialogVisible: false,
tableH: this.tableHeight(260),
urls: { urls: {
page: '/analysis/equipment-analysis/quality', page: '/analysis/equipment-analysis/quality',
}, },
@ -254,9 +255,9 @@ export default {
this.fillProductOptions(); this.fillProductOptions();
}, },
mounted() { mounted() {
window.addEventListener('resize', () => { // window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260) // this.tableH = this.tableHeight(260)
}) // })
this.$refs['search-bar'].headBtnClick('search'); this.$refs['search-bar'].headBtnClick('search');
}, },
methods: { methods: {

21
src/views/equipment/base/alarm/Record/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -61,6 +62,8 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import AddOrUpdate from './AddOrUpdate.vue'; import AddOrUpdate from './AddOrUpdate.vue';
import moment from 'moment'; import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
const btn = { const btn = {
@ -89,7 +92,7 @@ const btn = {
export default { export default {
name: 'Record', name: 'Record',
components: { AddOrUpdate }, components: { AddOrUpdate },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
readOnly: false, readOnly: false,
@ -116,17 +119,17 @@ export default {
// : undefined, // : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'productionLine', label: '产线' }, { prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
{ prop: 'workshopSection', label: '工段' }, { prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
{ prop: 'equipment', label: '设备名称' }, { prop: 'equipment', label: '设备名称', width: 120, showOverflowtooltip: true },
{ {
prop: 'alarmGrade', prop: 'alarmGrade',
label: '报警级别', label: '报警级别',
filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL), filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
}, },
{ prop: 'createTime', label: '报警时间', filter: timeFilter }, { prop: 'createTime', label: '报警时间', filter: timeFilter, width: 150, showOverflowtooltip: true },
{ prop: 'alarmCode', label: '设备报警码' }, { prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true },
{ prop: 'alarmContent', label: '报警内容' }, { prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true },
{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn }, { prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, { prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
// { prop: 'remark', label: '备注' }, // { prop: 'remark', label: '备注' },
@ -203,7 +206,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
lineId: null, lineId: null,
equipmentId: null, equipmentId: null,
recordTime: [], recordTime: [],

8
src/views/equipment/base/config/AlarmGroup/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -70,7 +71,7 @@
queryParams: { queryParams: {
equipmentGroupId: alarmForm.id, equipmentGroupId: alarmForm.id,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
}, },
tableBtn: [ tableBtn: [
this.$auth.hasPermi('equipment:alarm-group:update') this.$auth.hasPermi('equipment:alarm-group:update')
@ -109,10 +110,11 @@ import { publicFormatter } from '@/utils/dict';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
// import { getAccessToken } from '@/utils/auth'; // import { getAccessToken } from '@/utils/auth';
import BasicDrawer from './components/BasicDrawer.vue'; import BasicDrawer from './components/BasicDrawer.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'EquipmentGroup', name: 'EquipmentGroup',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
components: { BasicDrawer }, components: { BasicDrawer },
data() { data() {
return { return {

10
src/views/equipment/base/config/BindGroup/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -72,7 +73,7 @@
queryParams: { queryParams: {
equipmentGroupId: alarmForm.id, equipmentGroupId: alarmForm.id,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
}, },
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:equipment-group:update') this.$auth.hasPermi('base:equipment-group:update')
@ -112,11 +113,12 @@ import moment from 'moment';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import BasicDrawer from './components/BasicDrawer.vue'; import BasicDrawer from './components/BasicDrawer.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'EquipmentBindGroup', name: 'EquipmentBindGroup',
components: { BasicDrawer }, components: { BasicDrawer },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
searchBarKeys: ['groupId', 'equipmentName'], searchBarKeys: ['groupId', 'equipmentName'],
@ -254,7 +256,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
equipmentName: null, equipmentName: null,
groupId: null, groupId: null,
}, },

24
src/views/equipment/base/config/DataCollection/CollectionConfig.vue
View File

@ -19,7 +19,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -127,10 +128,11 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
import BasicDrawer from './components/BasicDrawer.vue'; import BasicDrawer from './components/BasicDrawer.vue';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import AddOrUpdate from './add-or-updata'; import AddOrUpdate from './add-or-updata';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'EquipmentPlcConnect', name: 'EquipmentPlcConnect',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
components: { BasicDrawer, AddOrUpdate }, components: { BasicDrawer, AddOrUpdate },
data() { data() {
return { return {
@ -156,14 +158,14 @@ export default {
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'productionLine', label: '产线' }, { prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
{ prop: 'workshopSection', label: '工段' }, { prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名' }, { prop: 'equipmentName', label: '设备名', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentCode', label: '设备编码' }, { prop: 'equipmentCode', label: '设备编码', width: 200, showOverflowtooltip: true },
{ prop: 'plcCode', label: '关联表编码' }, { prop: 'plcCode', label: '关联表编码', width: 220, showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名' }, { prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
{ prop: 'plcName', label: '标识名称' }, { prop: 'plcName', label: '标识名称', width: 150, showOverflowtooltip: true },
{ prop: 'bindingParameters', label: '绑定参数数量' }, { prop: 'bindingParameters', label: '绑定参数数量', width: 120, showOverflowtooltip: true },
// { // {
// _action: 'params-bind', // _action: 'params-bind',
// label: '查看绑定', // label: '查看绑定',
@ -269,7 +271,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
plcId: null, plcId: null,
equipmentId: null, equipmentId: null,
}, },

18
src/views/equipment/base/config/DataCollection/TableConfig.vue
View File

@ -20,7 +20,8 @@
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
ref="pageTable" ref="pageTable"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -60,6 +61,7 @@ import {
exportEquipmentPlcExcel, exportEquipmentPlcExcel,
} from '@/api/base/equipmentPlc'; } from '@/api/base/equipmentPlc';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const switchBtn = { const switchBtn = {
name: 'SwitchBtn', name: 'SwitchBtn',
@ -99,7 +101,7 @@ const switchBtn = {
export default { export default {
name: 'EquipmentPlc', name: 'EquipmentPlc',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
components: {}, components: {},
data() { data() {
return { return {
@ -127,16 +129,16 @@ export default {
// width: 180, // width: 180,
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), // filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
// }, // },
{ prop: 'code', label: '编码' }, { prop: 'code', label: '编码', width: 180, showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名' }, { prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
{ prop: 'name', label: '标识名称' }, { prop: 'name', label: '标识名称', width: 150, showOverflowtooltip: true },
{ prop: 'enName', label: '英文名称' }, { prop: 'enName', label: '英文名称', width: 150, showOverflowtooltip: true },
{ {
prop: 'collection', prop: 'collection',
label: '是否采集', label: '是否采集',
subcomponent: switchBtn, subcomponent: switchBtn,
}, },
{ prop: 'description', label: '描述' }, { prop: 'description', label: '描述', minWidth: 150, showOverflowtooltip: true },
], ],
searchBarFormConfig: [ searchBarFormConfig: [
{ {
@ -240,7 +242,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
plcTableName: null, plcTableName: null,
name: null, name: null,
}, },

20
src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
View File

@ -15,6 +15,7 @@
background: '#f2f4f9', background: '#f2f4f9',
color: '#606266', color: '#606266',
}" }"
:max-height="tableH"
class="waiting-list-table"> class="waiting-list-table">
<el-table-column <el-table-column
type="selection" type="selection"
@ -37,8 +38,9 @@
<el-table-column <el-table-column
v-if="selectedBox[0]" v-if="selectedBox[0]"
label="巡检单名称" label="巡检单名称"
:show-overflow-tooltip="true"
prop="name"></el-table-column> prop="name"></el-table-column>
<el-table-column v-if="selectedBox[1]" label="部门" prop="planName"> <el-table-column v-if="selectedBox[1]" label="部门" :show-overflow-tooltip="true" prop="planName">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.department || '---' }} {{ scope.row.department || '---' }}
</template> </template>
@ -46,6 +48,7 @@
<el-table-column <el-table-column
v-if="selectedBox[2]" v-if="selectedBox[2]"
label="巡检时间" label="巡检时间"
width="150"
prop="actualCheckTime"> prop="actualCheckTime">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.actualCheckTime | timeFilter }} {{ scope.row.actualCheckTime | timeFilter }}
@ -54,6 +57,8 @@
<el-table-column <el-table-column
v-if="selectedBox[3]" v-if="selectedBox[3]"
label="班次" label="班次"
width="180"
:show-overflow-tooltip="true"
prop="groupClass"> prop="groupClass">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.groupClass || '---' }} {{ scope.row.groupClass || '---' }}
@ -62,6 +67,7 @@
<el-table-column <el-table-column
v-if="selectedBox[4]" v-if="selectedBox[4]"
label="确认截止时间" label="确认截止时间"
width="150"
prop="confirmDueTime"> prop="confirmDueTime">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.confirmDueTime | timeFilter }} {{ scope.row.confirmDueTime | timeFilter }}
@ -70,6 +76,7 @@
<el-table-column <el-table-column
v-if="selectedBox[5]" v-if="selectedBox[5]"
width="150" width="150"
:show-overflow-tooltip="true"
label="备注" label="备注"
prop="remark"> prop="remark">
<template slot-scope="scope"> <template slot-scope="scope">
@ -172,6 +179,7 @@ export default {
true true
], ],
selectedPlan: [], selectedPlan: [],
tableH: this.tableHeight(260)
}; };
}, },
computed: { computed: {
@ -182,6 +190,16 @@ export default {
})); }));
}, },
}, },
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
},
destroyed() {
window.removeEventListener('resize', () => {
this.tableH = this.tableHeight(260)
});
},
methods: { methods: {
checkSelectable(row, index) { checkSelectable(row, index) {
return true; return true;

2
src/views/equipment/base/inspection/Confirm/index.vue
View File

@ -139,7 +139,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
maintainPlanId: null, maintainPlanId: null,
startTime: null, startTime: null,
special: false, special: false,

8
src/views/equipment/base/inspection/Record/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -65,6 +66,7 @@ import addRecord from './addRecord.vue';
import AddContent from './addContent.vue'; import AddContent from './addContent.vue';
import { exportCheckOrderExcel, deleteEqCheckLog } from '@/api/equipment/base/inspection/record' import { exportCheckOrderExcel, deleteEqCheckLog } from '@/api/equipment/base/inspection/record'
import { parseTime } from '../../../../core/mixins/code-filter'; import { parseTime } from '../../../../core/mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@ -91,7 +93,7 @@ const btn = {
export default { export default {
name: 'EquipmentInspectionRecord', name: 'EquipmentInspectionRecord',
components: { addRecord, AddContent }, components: { addRecord, AddContent },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addOrUpdateVisible: false, addOrUpdateVisible: false,
@ -250,7 +252,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
special: false, special: false,
name: null, name: null,
actualCheckTime: null, actualCheckTime: null,

10
src/views/equipment/base/inspection/Settings/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -53,13 +54,14 @@ import addOrUpdata from './add-or-updata.vue';
import add from './add.vue'; import add from './add.vue';
import { parseTime } from '../../../../core/mixins/code-filter'; import { parseTime } from '../../../../core/mixins/code-filter';
import { groupClassesListAll } from '@/api/monitoring/teamProduction'; import { groupClassesListAll } from '@/api/monitoring/teamProduction';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// import { publicFormatter } from '@/utils/dict'; // import { publicFormatter } from '@/utils/dict';
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
export default { export default {
name: 'EquipmentCheckSetting', name: 'EquipmentCheckSetting',
components: { addOrUpdata, add }, components: { addOrUpdata, add },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addOrUpdateVisible: false, addOrUpdateVisible: false,
@ -102,7 +104,7 @@ export default {
{ {
prop: 'code', prop: 'code',
label: '巡检单编码', label: '巡检单编码',
minWidth: 150, minWidth: 170,
showOverflowtooltip: true, showOverflowtooltip: true,
}, },
{ prop: 'department', label: '部门', showOverflowtooltip: true }, { prop: 'department', label: '部门', showOverflowtooltip: true },
@ -225,7 +227,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
equipmentId: null, equipmentId: null,
name: null, name: null,
special: false, special: false,

15
src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue
View File

@ -7,12 +7,13 @@
<template> <template>
<el-drawer <el-drawer
:visible="visible" :visible.sync="visible"
:show-close="false" :show-close="false"
:wrapper-closable="false" :wrapper-closable="true"
class="drawer" class="drawer"
custom-class="mes-drawer" custom-class="mes-drawer"
size="60%" size="60%"
:before-close="beforeClose"
@closed="$emit('destroy')"> @closed="$emit('destroy')">
<SmallTitle slot="title">编辑</SmallTitle> <SmallTitle slot="title">编辑</SmallTitle>
@ -344,6 +345,7 @@ export default {
label: '设备名称', label: '设备名称',
prop: 'equipmentId', prop: 'equipmentId',
url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false', url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
bind: { clearable: true, filterable: true },
// method: 'post', // method: 'post',
// queryParams: { // queryParams: {
// pageNo: 1, // pageNo: 1,
@ -443,6 +445,15 @@ export default {
this.getList('line'); this.getList('line');
}, },
methods: { methods: {
beforeClose(done) {
// if (!this.isdetail) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => {});
// }
},
handleSearchBarBtnClick(btn) { handleSearchBarBtnClick(btn) {
switch (btn.btnName) { switch (btn.btnName) {
case 'search': case 'search':

15
src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
View File

@ -15,6 +15,7 @@
background: '#f2f4f9', background: '#f2f4f9',
color: '#606266', color: '#606266',
}" }"
:max-height="tableH"
class="waiting-list-table"> class="waiting-list-table">
<el-table-column <el-table-column
type="selection" type="selection"
@ -36,8 +37,9 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="selectedBox[0]" v-if="selectedBox[0]"
width="128" width="160"
label="设备保养单号" label="设备保养单号"
:show-overflow-tooltip="true"
prop="maintainOrderNumber"></el-table-column> prop="maintainOrderNumber"></el-table-column>
<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName"> <el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
<template slot-scope="scope"> <template slot-scope="scope">
@ -224,6 +226,7 @@ export default {
true, true,
], ],
selectedPlan: [], selectedPlan: [],
tableH: this.tableHeight(260),
}; };
}, },
computed: { computed: {
@ -234,6 +237,16 @@ export default {
})); }));
}, },
}, },
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
},
destroyed() {
window.removeEventListener('resize', () => {
this.tableH = this.tableHeight(260)
});
},
methods: { methods: {
checkSelectable(row, index) { checkSelectable(row, index) {
return ( return (

1
src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
View File

@ -335,6 +335,7 @@ export default {
label: '设备名称', label: '设备名称',
prop: 'equipmentId', prop: 'equipmentId',
url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false', url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
bind: { clearable: true, filterable: true },
// method: 'post', // method: 'post',
// queryParams: { // queryParams: {
// pageNo: 1, // pageNo: 1,

2
src/views/equipment/base/maintain/Confirm/index.vue
View File

@ -197,7 +197,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
maintainPlanId: null, maintainPlanId: null,
startTime: null, startTime: null,
special: false, special: false,

10
src/views/equipment/base/maintain/Monitor/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<!-- <method-btn <!-- <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -59,6 +60,7 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record' import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import AddContent from '../PlanConfig/addContent.vue'; import AddContent from '../PlanConfig/addContent.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const remainBox = { const remainBox = {
name: 'RemainBox', name: 'RemainBox',
@ -116,7 +118,7 @@ const btn = {
export default { export default {
name: 'Monitor', name: 'Monitor',
components: { AddContent }, components: { AddContent },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addContent: false, addContent: false,
@ -129,7 +131,7 @@ export default {
// width: 180, // width: 180,
// filter: parseTime(createTime), // filter: parseTime(createTime),
// }, // },
{ prop: 'code', label: '保养计划单号', minWidth: 118, showOverflowtooltip: true }, { prop: 'code', label: '保养计划单号', width: 150, showOverflowtooltip: true },
{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true }, { prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true }, { prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true }, { prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@ -205,7 +207,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
special: false, special: false,
equipmentName: null, equipmentName: null,
createTime: null, createTime: null,

46
src/views/equipment/base/maintain/PlanConfig/index.vue
View File

@ -9,11 +9,12 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="120"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -53,6 +54,7 @@ import { parseTime, toDay } from '../../../../core/mixins/code-filter';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import { getPlanPage } from '@/api/equipment/base/maintain/planconfig'; import { getPlanPage } from '@/api/equipment/base/maintain/planconfig';
import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record'; import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
// { // {
@ -62,46 +64,64 @@ const tableProps = [
// }, // },
{ {
prop: 'name', prop: 'name',
label: '保养计划名称' label: '保养计划名称',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'departmentName', prop: 'departmentName',
label: '部门' label: '部门',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'lineName', prop: 'lineName',
label: '产线名' label: '产线名',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'maintenancePeriod', prop: 'maintenancePeriod',
label: '保养频率(天/次)' label: '保养频率(天/次)',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'firstMaintenanceTime', prop: 'firstMaintenanceTime',
label: '首次保养时间', label: '首次保养时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'maintainDuration', prop: 'maintainDuration',
label: '保养时长' label: '保养时长',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'maintainer', prop: 'maintainer',
label: '计划保养人员' label: '计划保养人员',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'confirmTimeLimit', prop: 'confirmTimeLimit',
label: '确认时限', label: '确认时限',
filter: toDay filter: toDay,
width: 130,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
width: 150,
showOverflowtooltip: true
} }
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -111,7 +131,7 @@ export default {
tableProps, tableProps,
addContent: false, addContent: false,
listQuery: { listQuery: {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 0, total: 0,
special: false, special: false,

8
src/views/equipment/base/maintain/Record/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -65,6 +66,7 @@ import Editor from '@/components/Editor';
import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record'; import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
import AddContent from './addContent.vue'; import AddContent from './addContent.vue';
import { parseTime } from '../../../../core/mixins/code-filter'; import { parseTime } from '../../../../core/mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@ -91,7 +93,7 @@ const btn = {
export default { export default {
name: 'EquipmentMaintainRecord', name: 'EquipmentMaintainRecord',
components: { AddContent }, components: { AddContent },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addContent: false, addContent: false,
@ -337,7 +339,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
special: false, special: false,
maintainPlanId: null, maintainPlanId: null,
maintainPlanId: null, maintainPlanId: null,

16
src/views/equipment/base/repair/index.vue
View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -58,12 +59,13 @@ import { deleteRepair, exportRepairLogExcel } from '@/api/equipment/base/repair'
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import htmls from './htmls.vue' import htmls from './htmls.vue'
import DialogForm from './Repair--add.vue'; import DialogForm from './Repair--add.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
export default { export default {
name: 'EquipmentRepair', name: 'EquipmentRepair',
components: { CustomDialogForm, DialogForm }, components: { CustomDialogForm, DialogForm },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addOrUpdateVisible: false, addOrUpdateVisible: false,
@ -102,11 +104,11 @@ export default {
// width: 180, // width: 180,
// filter: parseTime, // filter: parseTime,
// }, // },
{ prop: 'repairOrderNumber', label: '维修单号' }, { prop: 'repairOrderNumber', label: '维修单号', width: 180, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名' }, { prop: 'lineName', label: '产线名', width: 120, showOverflowtooltip: true },
{ prop: 'sectionName', label: '工段名' }, { prop: 'sectionName', label: '工段名', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true }, { prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
{ prop: 'faultDetail', label: '故障明细', subcomponent: htmls }, { prop: 'faultDetail', label: '故障明细', subcomponent: htmls, width: 180, showOverflowtooltip: true },
// { prop: 'maintenanceDetail', label: '维修明细', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true }, // { prop: 'maintenanceDetail', label: '维修明细', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true },
{ {
prop: 'maintenanceStartTime', prop: 'maintenanceStartTime',
@ -193,7 +195,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
special: false, special: false,
maintenanceResult: null, maintenanceResult: null,
createTime: null, createTime: null,

6
src/views/extend/processEquMaterialBom/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo" <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :table-data="tableData"> :limit="listQuery.pageSize" :table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -16,7 +16,7 @@
<script> <script>
import AddOrUpdate from './add-or-updata'; import AddOrUpdate from './add-or-updata';
// import DetailOrUpdate from './detail-or-updata'; // import DetailOrUpdate from './detail-or-updata';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import basicPage from '../../core/mixins/basic-page'; import basicPage from '../../core/mixins/basic-page';
import StatusBtn from './statusBtn.vue' import StatusBtn from './statusBtn.vue'
import { import {
@ -54,7 +54,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

6
src/views/extend/processEquValueBom/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo" <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :table-data="tableData"> :limit="listQuery.pageSize" :table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -16,7 +16,7 @@
<script> <script>
import AddOrUpdate from './add-or-updata'; import AddOrUpdate from './add-or-updata';
// import DetailOrUpdate from './detail-or-updata'; // import DetailOrUpdate from './detail-or-updata';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import basicPage from '../../core/mixins/basic-page'; import basicPage from '../../core/mixins/basic-page';
import StatusBtn from './statusBtn.vue' import StatusBtn from './statusBtn.vue'
import { import {
@ -54,7 +54,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

5
src/views/monitoring/equipmentProcessAmount/index.vue
View File

@ -88,7 +88,8 @@
:page="1" :page="1"
:limit="999" :limit="999"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<!-- <method-btn <!-- <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -119,9 +120,11 @@
<script> <script>
import Graph from './graph.vue'; import Graph from './graph.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'EquipmentProcessAmount', name: 'EquipmentProcessAmount',
mixins: [tableHeightMixin],
components: { Graph }, components: { Graph },
props: {}, props: {},
data() { data() {

5
src/views/quality/base/qualityIsra/index.vue
View File

@ -10,7 +10,7 @@
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" /> <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
<!-- 列表 --> <!-- 列表 -->
<base-table :table-props="tableProps" :page="1" :limit="10" :table-data="list"> <base-table :max-height="tableH" :table-props="tableProps" :page="1" :limit="20" :table-data="list">
</base-table> </base-table>
</el-row> </el-row>
@ -85,6 +85,7 @@ import {
import moment from 'moment'; import moment from 'moment';
// import DialogForm from './dialogForm.vue'; // import DialogForm from './dialogForm.vue';
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// import basicPageMixin from '@/mixins/lb/basicPageMixin'; // import basicPageMixin from '@/mixins/lb/basicPageMixin';
export default { export default {
@ -92,7 +93,7 @@ export default {
// components: { // components: {
// DialogForm, // DialogForm,
// }, // },
// mixins: [basicPageMixin], mixins: [tableHeightMixin],
data() { data() {
return { return {
list: [], list: [],

45
src/views/quality/base/qualityScrapDet/index.vue
View File

@ -1,38 +1,16 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
:formConfigs="formConfig" <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
ref="searchBarForm" :limit="listQuery.pageSize" :table-data="tableData">
@headBtnClick="buttonClick" /> <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
<base-table
v-loading="dataListLoading"
:table-props="tableProps"
:page="listQuery.pageNo"
:limit="listQuery.pageSize"
:table-data="tableData">
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
<pagination <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
:limit.sync="listQuery.pageSize"
:page.sync="listQuery.pageNo"
:total="listQuery.total"
@pagination="getDataList" /> @pagination="getDataList" />
<base-dialog <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
:dialogTitle="addOrEditTitle" @confirm="handleConfirm" :before-close="handleCancel" width="40%">
:dialogVisible="addOrUpdateVisible" <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="40%">
<add-or-update
ref="addOrUpdate"
@refreshDataList="successSubmit"></add-or-update>
</base-dialog> </base-dialog>
</div> </div>
</template> </template>
@ -46,6 +24,7 @@ import {
deleteQualityScrapDet, deleteQualityScrapDet,
} from '@/api/base/qualityScrapDet'; } from '@/api/base/qualityScrapDet';
import { getList, } from "@/api/base/qualityScrapType"; import { getList, } from "@/api/base/qualityScrapType";
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
@ -71,7 +50,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -177,7 +156,7 @@ export default {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.pageNo = 1; this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10; this.listQuery.pageSize = 20;
this.listQuery.content = val.content ? val.content : undefined; this.listQuery.content = val.content ? val.content : undefined;
this.listQuery.typeId = val.typeId ? val.typeId : undefined; this.listQuery.typeId = val.typeId ? val.typeId : undefined;
this.getDataList(); this.getDataList();
@ -185,7 +164,7 @@ export default {
case 'reset': case 'reset':
this.$refs.searchBarForm.resetForm(); this.$refs.searchBarForm.resetForm();
this.listQuery = { this.listQuery = {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
}; };

10
src/views/quality/base/qualityScrapLog/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo" <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :table-data="tableData"> :limit="listQuery.pageSize" :table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -19,7 +19,7 @@
<script> <script>
import AddOrUpdate from './add-or-updata'; import AddOrUpdate from './add-or-updata';
import DetailOrUpdate from './detail-or-updata'; import DetailOrUpdate from './detail-or-updata';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import basicPage from './basic-page'; import basicPage from './basic-page';
import { parseTime } from '../../../core/mixins/code-filter'; import { parseTime } from '../../../core/mixins/code-filter';
import { import {
@ -68,7 +68,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -214,7 +214,7 @@ export default {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.pageNo = 1; this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10; this.listQuery.pageSize = 20;
this.listQuery.workOrderId = val.workOrderId ? val.workOrderId : undefined; this.listQuery.workOrderId = val.workOrderId ? val.workOrderId : undefined;
// this.listQuery.teamId = val.teamId ? val.teamId : undefined; // this.listQuery.teamId = val.teamId ? val.teamId : undefined;
this.getDataList(); this.getDataList();
@ -222,7 +222,7 @@ export default {
case 'reset': case 'reset':
this.$refs.searchBarForm.resetForm(); this.$refs.searchBarForm.resetForm();
this.listQuery = { this.listQuery = {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
}; };

45
src/views/quality/base/qualityScrapType/index.vue
View File

@ -1,38 +1,16 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
:formConfigs="formConfig" <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
ref="searchBarForm" :limit="listQuery.pageSize" :table-data="tableData">
@headBtnClick="buttonClick" /> <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
<base-table
v-loading="dataListLoading"
:table-props="tableProps"
:page="listQuery.pageNo"
:limit="listQuery.pageSize"
:table-data="tableData">
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
<pagination <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
:limit.sync="listQuery.pageSize"
:page.sync="listQuery.pageNo"
:total="listQuery.total"
@pagination="getDataList" /> @pagination="getDataList" />
<base-dialog <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
:dialogTitle="addOrEditTitle" @confirm="handleConfirm" :before-close="handleCancel" width="40%">
:dialogVisible="addOrUpdateVisible" <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="40%">
<add-or-update
ref="addOrUpdate"
@refreshDataList="successSubmit"></add-or-update>
</base-dialog> </base-dialog>
</div> </div>
</template> </template>
@ -41,6 +19,7 @@
import AddOrUpdate from './add-or-updata'; import AddOrUpdate from './add-or-updata';
import basicPage from '../../../core/mixins/basic-page'; import basicPage from '../../../core/mixins/basic-page';
import { parseTime } from '../../../core/mixins/code-filter'; import { parseTime } from '../../../core/mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
getQualityScrapTypePage, getQualityScrapTypePage,
deleteQualityScrapType deleteQualityScrapType
@ -71,7 +50,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -159,14 +138,14 @@ export default {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.pageNo = 1; this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10; this.listQuery.pageSize = 20;
this.listQuery.name = val.name ? val.name : undefined; this.listQuery.name = val.name ? val.name : undefined;
this.getDataList(); this.getDataList();
break; break;
case 'reset': case 'reset':
this.$refs.searchBarForm.resetForm(); this.$refs.searchBarForm.resetForm();
this.listQuery = { this.listQuery = {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
}; };

6
src/views/quality/monitoring/currentData/index.vue
View File

@ -8,7 +8,8 @@
<el-tab-pane :label="'\u2002表格数据\u2002'" name="table"> <el-tab-pane :label="'\u2002表格数据\u2002'" name="table">
<!-- 列表 --> <!-- 列表 -->
<div class="blue-title">产品名：{{ productDetail.name }} 产品规格：{{ productDetail.specifications }}</div> <div class="blue-title">产品名：{{ productDetail.name }} 产品规格：{{ productDetail.specifications }}</div>
<base-table class="base-table__margin" :table-props="productProps" :page="1" :limit="10" :table-data="list"> <base-table :max-height="tableH" class="base-table__margin" :table-props="productProps" :page="1"
:limit="10" :table-data="list">
</base-table> </base-table>
<div v-for="(item,index) in downProps" :key="index"> <div v-for="(item,index) in downProps" :key="index">
<div class="blue-title">工单名称:{{ list[index].workOrderName }}</div> <div class="blue-title">工单名称:{{ list[index].workOrderName }}</div>
@ -51,6 +52,7 @@ import {
getProductList, getProductList,
getWorkOrderList getWorkOrderList
} from '@/api/monitoring/statisticalData'; } from '@/api/monitoring/statisticalData';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// import Editor from '@/components/Editor'; // import Editor from '@/components/Editor';
import moment from 'moment'; import moment from 'moment';
// import DialogForm from './dialogForm.vue'; // import DialogForm from './dialogForm.vue';
@ -61,7 +63,7 @@ export default {
// components: { // components: {
// DialogForm, // DialogForm,
// }, // },
// mixins: [basicPageMixin], mixins: [tableHeightMixin],
data() { data() {
return { return {
list: [], list: [],

31
src/views/quality/monitoring/qualityInspectionRecord/index.vue
View File

@ -1,43 +1,22 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<SearchBar <SearchBar :isFold="true" :formConfigs="searchBarFormConfig" ref="search-bar"
:formConfigs="searchBarFormConfig"
ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" /> @headBtnClick="handleSearchBarBtnClick" />
<!-- 列表 --> <!-- 列表 -->
<base-table <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
:table-props="tableProps"
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun">
<method-btn <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
:width="120"
fixed="right"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" /> @clickBtn="handleTableBtnClick" />
</base-table> </base-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" />
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<base-dialog <base-dialog :dialogTitle="title" :dialogVisible="open" width="50%" @close="cancel" @cancel="cancel"
:dialogTitle="title"
:dialogVisible="open"
width="50%"
@close="cancel"
@cancel="cancel"
@confirm="submitForm"> @confirm="submitForm">
<DialogForm v-if="open" ref="form" v-model="form" /> <DialogForm v-if="open" ref="form" v-model="form" />
</base-dialog> </base-dialog>

22
src/views/quality/monitoring/statisticalData/index.vue
View File

@ -1,17 +1,11 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<SearchBar <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar"
:formConfigs="searchBarFormConfig"
ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" /> @headBtnClick="handleSearchBarBtnClick" />
<!-- 列表 --> <!-- 列表 -->
<base-table <base-table :max-height="tableH" :table-props="tableProps" :page="1" :limit="10" :table-data="list">
:table-props="tableProps"
:page="1"
:limit="10"
:table-data="list">
<!-- <method-btn <!-- <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -51,6 +45,7 @@ import {
} from '@/api/monitoring/statisticalData'; } from '@/api/monitoring/statisticalData';
// import Editor from '@/components/Editor'; // import Editor from '@/components/Editor';
import moment from 'moment'; import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// import DialogForm from './dialogForm.vue'; // import DialogForm from './dialogForm.vue';
// import basicPageMixin from '@/mixins/lb/basicPageMixin'; // import basicPageMixin from '@/mixins/lb/basicPageMixin';
@ -59,7 +54,7 @@ export default {
// components: { // components: {
// DialogForm, // DialogForm,
// }, // },
// mixins: [basicPageMixin], mixins: [tableHeightMixin],
data() { data() {
return { return {
list: [], list: [],
@ -111,6 +106,12 @@ export default {
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',
},
{
type: 'button',
btnName: '返回',
name: 'back',
color: 'primary',
}, },
// { // {
// type: this.$auth.hasPermi( // type: this.$auth.hasPermi(
@ -373,8 +374,9 @@ export default {
this.queryParams.productionId = val.productionId ? val.productionId : undefined this.queryParams.productionId = val.productionId ? val.productionId : undefined
this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined
this.queryParams.endTime = val.checkTime ? val.checkTime[1] : undefined this.queryParams.endTime = val.checkTime ? val.checkTime[1] : undefined
this.getList() this.getList()
} else if (val.btnName === 'back') {
this.$router.go(-1)
} }
// console.log(val); // console.log(val);
} }