mt-fe-group
/
yudao-dev
11
0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

修改bug

pull/200/head
‘937886381’ 7 månader sedan
förälder
009cf3b8e6
incheckning
03ee5e1037
14 ändrade filer med 250 tillägg och 85 borttagningar
Delad Vy
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      .env.dev
  2. +18
    -0
      src/assets/icons/svg/info.svg
  3. +24
    -0
      src/assets/icons/svg/task.svg
  4. +24
    -0
      src/assets/icons/svg/tasks.svg
  5. +5
    -5
      src/views/OperationalOverview/AGVBoard.vue
  6. +9
    -9
      src/views/OperationalOverview/coldBoard.vue
  7. +5
    -5
      src/views/OperationalOverview/components/ISRAChart.vue
  8. +8
    -1
      src/views/OperationalOverview/components/baseContainer/index.vue
  9. +69
    -33
      src/views/OperationalOverview/components/pileBarChart.vue
  10. +3
    -3
      src/views/quality/base/qualityScrapLog/add-or-updata.vue
  11. +3
    -2
      src/views/quality/base/qualityScrapLog/index.vue
  12. +15
    -8
      src/views/quality/monitoring/originalGlassRetrace/index.vue
  13. +19
    -5
      src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
  14. +46
    -12
      src/views/quality/monitoring/qualityInspectionRecord/index.vue

+ 2
- 2
.env.dev Visa fil

@@ -1,7 +1,7 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-02-01 16:49:38
# @LastEditTime: 2024-02-18 13:46:30
# @LastEditors: zhp
# @Description:
###
@@ -22,7 +22,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.0.30:8888'
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'



+ 18
- 0
src/assets/icons/svg/info.svg Visa fil

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="25px" height="26px" viewBox="0 0 25 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>库位信息</title>
<g id="新增看板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="周转看板" transform="translate(-996.000000, -618.000000)">
<g id="编组-26备份-3" transform="translate(972.000000, 596.000000)">
<g id="库位信息" transform="translate(24.000000, 22.000000)">
<rect id="矩形" x="0" y="0" width="24" height="24"></rect>
<g id="信息" transform="translate(1.000000, 2.000000)" fill-rule="nonzero">
<rect id="矩形" x="0" y="0" width="24" height="24"></rect>
<polygon id="路径" fill="#59D0E2" points="6.87951585 6.64119413 10.014693 6.64119413 10.014693 10.0613874 6.87951585 10.0613874"></polygon>
<path d="M19.42625,1.5 L4.57625,1.5 C3.45125001,1.5 2.51375,2.43750001 2.51375,3.56250001 L2.51375,20.4375 C2.51375,21.5625 3.45125001,22.5 4.57625,22.5 L19.46375,22.5 C20.58875,22.5 21.52625,21.5625 21.52625,20.4375 L21.52625,3.56250001 C21.48875,2.43750001 20.58875,1.5 19.42625,1.5 Z M5.66375,6.9375 C5.66375,6.1125 6.33875,5.4375 7.16375,5.4375 L9.63875,5.4375 C10.46375,5.4375 11.13875,6.1125 11.13875,6.9375 L11.13875,9.6375 C11.13875,10.4625 10.46375,11.1375 9.63875,11.1375 L7.16375,11.1375 C6.33875,11.1375 5.66375,10.4625 5.66375,9.6375 L5.66375,6.9375 Z M17.58875,18.5625 L6.41375001,18.5625 C6.00125002,18.5625 5.66375,18.225 5.66375,17.8125 C5.66375,17.4 6.00125,17.0625 6.41375001,17.0625 L17.55125,17.0625 C17.96375,17.0625 18.30125,17.4 18.30125,17.8125 C18.30125,18.225 18.00125,18.5625 17.58875,18.5625 Z M17.58875,15.1875 L6.41375001,15.1875 C6.00125002,15.1875 5.66375,14.85 5.66375,14.4375 C5.66375,14.025 6.00125,13.6875 6.41375001,13.6875 L17.55125,13.6875 C17.96375,13.6875 18.30125,14.025 18.30125,14.4375 C18.30125,14.85 18.00125,15.1875 17.58875,15.1875 Z M17.58875,10.65 L13.83875,10.65 C13.42625,10.65 13.08875,10.3125 13.08875,9.90000001 C13.08875,9.48750002 13.42625,9.14999999 13.83875,9.14999999 L17.58875,9.14999999 C18.00125,9.14999999 18.33875,9.48749999 18.33875,9.90000001 C18.33875,10.3125 18.00125,10.65 17.58875,10.65 Z M17.58875,7.425 L13.83875,7.425 C13.42625,7.425 13.08875,7.08750001 13.08875,6.675 C13.08875,6.26249998 13.42625,5.925 13.83875,5.925 L17.58875,5.925 C18.00125,5.925 18.33875,6.2625 18.33875,6.675 C18.33875,7.08749999 18.00125,7.425 17.58875,7.425 Z" id="形状" fill="#59D0E2"></path>
</g>
</g>
</g>
</g>
</g>
</svg>

+ 24
- 0
src/assets/icons/svg/task.svg Visa fil

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>搬运任务</title>
<g id="新增看板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="周转看板" transform="translate(-64.000000, -149.000000)">
<g id="编组-26" transform="translate(40.000000, 127.000000)">
<g id="搬运任务" transform="translate(24.000000, 22.000000)">
<rect id="矩形" x="0" y="0" width="24" height="24"></rect>
<g id="异常" transform="translate(1.000000, 2.000000)" fill-rule="nonzero">
<rect id="矩形" fill="#000000" opacity="0" x="2" y="1" width="17" height="17"></rect>
<g>
<rect id="矩形" fill="#000000" opacity="0" x="5" y="6" width="13" height="13"></rect>
<g id="数量_面性">
<rect id="矩形" fill="#000000" opacity="0" x="2" y="2" width="16" height="16"></rect>
<path d="M11.5012639,11 C11.3917412,11 11.2835161,10.977151 11.184033,10.9329979 L0.441155372,6.16366481 C0.172262497,6.04432342 -1.77635684e-15,5.78507176 -1.77635684e-15,5.49973467 C-1.77635684e-15,5.21439758 0.172262497,4.95514592 0.441155372,4.83580453 L11.184033,0.066471464 C11.3846433,-0.0221571547 11.6153567,-0.0221571547 11.815967,0.066471464 L22.5588446,4.83580453 C22.8277375,4.95514592 23,5.21439758 23,5.49973467 C23,5.78507176 22.8277375,6.04432342 22.5588446,6.16366481 L11.815967,10.9329979 C11.7172585,10.9768087 11.6099339,10.9996587 11.5012639,11 L11.5012639,11 Z M22,14 L11.5,18.4986025 L1,14 L1,15.5733794 L11.1785976,19.935011 C11.3818459,20.021663 11.6155931,20.021663 11.8188415,19.935011 L22,15.5733794 L22,14 Z" id="形状" fill="#59D0E2"></path>
<path d="M22,9 L11.5,13.4953318 L1,9 L1,10.5789585 L11.1785976,14.9350754 C11.3818459,15.0216415 11.6155931,15.0216415 11.8188415,14.9350754 L22,10.5789585 L22,9 Z" id="路径" fill="#59D0E2"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

+ 24
- 0
src/assets/icons/svg/tasks.svg Visa fil

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>搬运任务</title>
<g id="新增看板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="周转看板" transform="translate(-64.000000, -149.000000)">
<g id="编组-26" transform="translate(40.000000, 127.000000)">
<g id="搬运任务" transform="translate(24.000000, 22.000000)">
<rect id="矩形" x="0" y="0" width="24" height="24"></rect>
<g id="异常" transform="translate(1.000000, 2.000000)" fill-rule="nonzero">
<rect id="矩形" fill="#000000" opacity="0" x="2" y="1" width="17" height="17"></rect>
<g>
<rect id="矩形" fill="#000000" opacity="0" x="5" y="6" width="13" height="13"></rect>
<g id="数量_面性">
<rect id="矩形" fill="#000000" opacity="0" x="2" y="2" width="16" height="16"></rect>
<path d="M11.5012639,11 C11.3917412,11 11.2835161,10.977151 11.184033,10.9329979 L0.441155372,6.16366481 C0.172262497,6.04432342 -1.77635684e-15,5.78507176 -1.77635684e-15,5.49973467 C-1.77635684e-15,5.21439758 0.172262497,4.95514592 0.441155372,4.83580453 L11.184033,0.066471464 C11.3846433,-0.0221571547 11.6153567,-0.0221571547 11.815967,0.066471464 L22.5588446,4.83580453 C22.8277375,4.95514592 23,5.21439758 23,5.49973467 C23,5.78507176 22.8277375,6.04432342 22.5588446,6.16366481 L11.815967,10.9329979 C11.7172585,10.9768087 11.6099339,10.9996587 11.5012639,11 L11.5012639,11 Z M22,14 L11.5,18.4986025 L1,14 L1,15.5733794 L11.1785976,19.935011 C11.3818459,20.021663 11.6155931,20.021663 11.8188415,19.935011 L22,15.5733794 L22,14 Z" id="形状" fill="#59D0E2"></path>
<path d="M22,9 L11.5,13.4953318 L1,9 L1,10.5789585 L11.1785976,14.9350754 C11.3818459,15.0216415 11.6155931,15.0216415 11.8188415,14.9350754 L22,10.5789585 L22,9 Z" id="路径" fill="#59D0E2"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

+ 5
- 5
src/views/OperationalOverview/AGVBoard.vue Visa fil

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-02-01 15:35:10
* @LastEditTime: 2024-02-18 08:54:06
* @Description:
-->
<template>
@@ -29,13 +29,13 @@
<el-row class="container-main flex-col" type="flex">
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15 * beilv" type="flex" class="flex-1">
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
<base-container :beilv="1" :size="'middle'" :title="'搬运任务'" :title-icon="'5_1'" :back="'energy'">
<base-container :beilv="1" :size="'middle'" :title="'搬运任务'" :title-icon="'task'" :back="'energy'">
<base-table1 :page="1" :limit="999" :show-index="false" :beilv="1" :table-config="qualityYearTableProps"
:table-data="qualityYearList" />
</base-container>
</el-col>
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
<base-container :beilv="1" :size="'middle'" :title="'周转进度'" :title-icon="'5_3'" :back="'energy'">
<base-container :beilv="1" :size="'middle'" :title="'周转进度'" :title-icon="'order'" :back="'energy'">
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
<top-radio-group />
</div> -->
@@ -87,7 +87,7 @@

<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="12 * beilv" type="flex" class="flex-1">
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
<base-container :beilv="1" :height="256" :size="'middle'" :title="'库存管理'" :title-icon="'5_5'"
<base-container :beilv="1" :height="256" :size="'middle'" :title="'库存管理'" :title-icon="'productLine'"
:back="'energy'">
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
<top-radio-group />
@@ -110,7 +110,7 @@
</base-container>
</el-col>
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
<base-container :beilv="1" :height="318 + 338 + 16" :size="'middle'" :title="'库位信息'" :title-icon="'5_4'"
<base-container :beilv="1" :height="318 + 338 + 16" :size="'middle'" :title="'库位信息'" :title-icon="'info'"
:back="'energy'">
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
<top-radio-group />


+ 9
- 9
src/views/OperationalOverview/coldBoard.vue Visa fil

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-02-01 15:35:43
* @LastEditTime: 2024-02-20 15:05:31
* @LastEditors: zhp
* @Description:
-->
@@ -718,17 +718,17 @@ export default {
let cutArr = this.cutWsData.productHourData.map((item, index) => [
// console.log(item)
`
<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
<span style="color:rgba(255,255,255,0.7)" >${index + 1 || ''}
</span>`,
// formatDate(item.planStartTime) || '',
`
<span style="color:rgba(255,255,255,0.5)" >${item.lineName || ''}
<span style="color:rgba(255,255,255,0.7)" >${item.lineName || ''}
</span>`,
`<span style="color:rgba(255,255,255,0.5)">${this.formatTime(item.time) || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${this.getSize(item.size) || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.productArea + '㎡' || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.wasteArea + '㎡' || ''}</span>`,
`<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:rgba(255,255,255,0.5)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>
`<span style="color:rgba(255,255,255,0.7)">${this.formatTime(item.time) || ''}</span>`,
`<span style="color:rgba(255,255,255,0.7)">${this.getSize(item.size) || ''}</span>`,
`<span style="color:rgba(255,255,255,0.7)">${item.productArea + '㎡' || ''}</span>`,
`<span style="color:rgba(255,255,255,0.7)">${item.wasteArea + '㎡' || ''}</span>`,
`<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:rgba(255,255,255,0.7)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>
<div style = "${(item.product * 100).toFixed(2) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>`
])
this.cutConfig.data = cutArr
@@ -981,7 +981,7 @@ background: linear-gradient(to bottom,rgba(60,
height: 290px;
width: 1px;
position: absolute;
left: 66.2%;
left: 66.3%;
top: 12%;
background: linear-gradient(to bottom, rgba(60,
231,


+ 5
- 5
src/views/OperationalOverview/components/ISRAChart.vue Visa fil

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-01-29 13:45:56
* @LastEditTime: 2024-01-29 14:56:38
* @LastEditTime: 2024-02-18 14:20:01
* @LastEditors: zhp
* @Description:
-->
@@ -85,11 +85,11 @@ export default {
},
},
legend: {
bottom: '2%',
bottom: '10%',
left: 'center',
itemWidth: 18,
itemHeight:18,
icon: 'circle',
itemWidth: 20,
itemHeight:12,
icon: 'rect',
textStyle: {
color: '#fff'
},


+ 8
- 1
src/views/OperationalOverview/components/baseContainer/index.vue Visa fil

@@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-01-19 15:58:17
* @LastEditors: zhp
* @LastEditTime: 2024-02-01 15:25:14
* @LastEditTime: 2024-02-20 15:25:02
* @Description: file content
* @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
-->
@@ -162,6 +162,8 @@ export default {
width: 100%;
// background-color: rgba($color: #061027, $alpha: 0.15);
position: relative;
// filter: blur(.5px);
opacity: calc(.8);
// border: 2px solid;
// background: url('../../../../assets/img/energy.png') no-repeat;
// background-size: 100% 100%;
@@ -272,4 +274,9 @@ export default {
border: none;
}
}
// .base-container::after{
// z-index: -1;
// width: 100%;
// filter: blur(2px);
// }
</style>

+ 69
- 33
src/views/OperationalOverview/components/pileBarChart.vue Visa fil

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-27 13:54:52
* @LastEditTime: 2024-01-25 14:08:27
* @LastEditTime: 2024-02-21 14:38:54
* @LastEditors: zhp
* @Description:
-->
@@ -91,43 +91,78 @@ export default {
},
methods: {
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
let rawData = []
rawData.push(passRateList,wasteList)
// console.log(1)
const totalData = [];
for (let i = 0; i < rawData[0].length; ++i) {
let sum = 0;
for (let j = 0; j < rawData.length; ++j) {
sum += rawData[j][i];
}
totalData.push(sum);
}
let colors = ['#0fdedb', '#2359ec' ]
console.log('total', totalData);
this.chart = echarts.init(document.getElementById(this.id))
let series = [
{
// 辅助系列
name: '良品',
const series = [
'良品',
'废品',
// 'Affiliate Ad',
// 'Video Ad',
// 'Search Engine'
].map((name, sid) => {
// console.log(sid)
return {
name,
type: 'bar',
stack: 'total',
// silent: true,
// itemStyle: {
color: '#0fdedb',
// },
// barCategoryGap: '10%',
barWidth: 10,
data: passRateList
},
{
type: 'bar',
stack: 'total',
name: '废品',
// barCategoryGap: '10%',
data: wasteList,
// barWidth: 10,
// barWidth: 15,
// label: {
// position: [10, 10],
// normal: {
// position: [800, -24],
// show: true,
// textStyle: {
// color: '#2359ec',
// fontSize: 16,
// },
// },
// },
}
]
label: {
show: true,
formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
},
color:colors[sid],
data: rawData[sid].map((d, did) =>
totalData[did] <= 0 ? 0 : d / totalData[did]
)
};
});
// let series = [
// {
// // 辅助系列
// name: '良品',
// type: 'bar',
// stack: 'total',
// // silent: true,
// // itemStyle: {
// color: '#0fdedb',
// // },
// // barCategoryGap: '10%',
// barWidth: 10,
// data: passRateList
// },
// {
// type: 'bar',
// stack: 'total',
// name: '废品',
// // barCategoryGap: '10%',
// data: wasteList,
// // barWidth: 10,
// // barWidth: 15,
// // label: {
// // position: [10, 10],
// // normal: {
// // position: [800, -24],
// // show: true,
// // textStyle: {
// // color: '#2359ec',
// // fontSize: 16,
// // },
// // },
// // },
// }
// ]
// for (i = 0; i < 5; i++) {
// series.push({

@@ -137,6 +172,7 @@ export default {
legend: {
// top: '2.5%',
// right: '20px',
icon: 'rect',
textStyle: {
color: '#ffffff'
}


+ 3
- 3
src/views/quality/base/qualityScrapLog/add-or-updata.vue Visa fil

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-11-06 15:15:30
* @LastEditTime: 2023-11-21 14:11:18
* @LastEditTime: 2024-02-18 14:07:08
* @LastEditors: zhp
* @Description:
-->
@@ -102,11 +102,11 @@ export default {
sourceList: [
{
id: 1,
name: '手动',
name: '平板端',
},
{
id: 2,
name: '自动',
name: '网页端',
}
],
dataForm: {


+ 3
- 2
src/views/quality/base/qualityScrapLog/index.vue Visa fil

@@ -130,8 +130,9 @@ export default {
AddOrUpdate,
DetailOrUpdate
},
created() {
mounted() {
this.getDict()
this.getDataList()
},
methods: {
otherMethods(val) {
@@ -214,7 +215,7 @@ export default {
pageNo: 1,
total: 1,
};
this.getDataList();
this.getDataList()
break;
case 'add':
this.addOrEditTitle = '新增';


+ 15
- 8
src/views/quality/monitoring/originalGlassRetrace/index.vue Visa fil

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-01 14:55:51
* @LastEditors: zhp
* @LastEditTime: 2023-12-06 14:08:00
* @LastEditTime: 2024-02-20 08:46:05
* @Description:
-->
<template>
@@ -69,6 +69,11 @@ const tableProps = [
prop: 'productionOutputTime',
label: '深加工下片时间',
filter: parseTime
},
{
prop: 'scrapDetail',
label: '详情',
filter: parseTime
}
];

@@ -83,18 +88,20 @@ export default {
// },
tableProps,
// tableBtn: [
// this.$auth.hasPermi(`base:packaging-print-log:update`)
// ? {
// // this.$auth.hasPermi(`base:packaging-print-log:update`)
// // ?
// {
// type: 'edit',
// btnName: '编辑',
// }
// : undefined,
// this.$auth.hasPermi(`base:packaging-print-log:delete`)
// ? {
// },
// // : undefined,
// // this.$auth.hasPermi(`base:packaging-print-log:delete`)
// // ?
// {
// type: 'delete',
// btnName: '删除',
// }
// : undefined,
// // : undefined,

// ].filter((v) => v),
list: [],


+ 19
- 5
src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue Visa fil

@@ -47,8 +47,10 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="检测人员" prop="checkPerson">
<el-input v-model="innerDataForm.checkPerson" clearable @change="$emit('update', innerDataForm)"
placeholder="请输入检测人员" />
<el-select v-model="innerDataForm.checkPerson" placeholder="请选择检测人员" clearable filterable multiple
@change="$emit('update', innerDataForm)">
<el-option v-for="opt in userList" :key="opt.value" :label="opt.label" :value="opt.label" />
</el-select>
</el-form-item>
</el-col>

@@ -65,8 +67,8 @@
<el-select v-model="innerDataForm.source" placeholder="请选择来源" filterable clearable
@change="$emit('update', innerDataForm)">
<el-option v-for="opt in [
{ label: '手动', value: 1 },
{ label: '自动', value: 2 },
{ label: '平板端', value: 1 },
{ label: '网页端', value: 2 },
]" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
@@ -104,13 +106,14 @@ export default {
inspectionDetList: [],
productionLineList: [],
sectionList: [],
userList:[],
workOrderList:[],
innerDataForm: {},
cacheInspectionDetList: null,
};
},
mounted() {
Promise.all([this.getProductLineList(), this.getInspectionDetList(), this.getWorkOrderList()]).then(
Promise.all([this.getProductLineList(), this.getInspectionDetList(), this.getWorkOrderList(),this.getUserList()]).then(
() => {
this.formLoading = false;
}
@@ -180,6 +183,17 @@ export default {
value: item.id,
}));
},
async getUserList() {
const response = await this.$axios('base/quality-inspection-box-btn-auth/getUserList', {
pageNo: 1,
pageSize: 999
})
console.log(response);
this.userList = response.data.map((item) => ({
label: item.username,
value: item.id,
}));
},

// 获取检测内容列表
async getInspectionDetList() {


+ 46
- 12
src/views/quality/monitoring/qualityInspectionRecord/index.vue Visa fil

@@ -155,7 +155,16 @@ export default {
selectOptions: [],
param: 'inspectionDetContent',
filterable: true
},
},
{
type: 'select',
label: '检测人员',
placeholder: '请选择检测人员',
selectOptions: [],
param: 'checkPerson',
filterable: true,
multiple:true,
},
{
type: 'datePicker',
label: '时间段',
@@ -217,17 +226,27 @@ export default {
// width: 128,
prop: 'workOrderName',
label: '工单名称',
},
{
// width: 128,
prop: 'productionLineName',
label: '产线',
},
{
// width: 128,
prop: 'sectionName',
label: '工段',
},
{
// width: 128,
prop: 'inspectionDetContent',
label: '检测内容',
},
{
// width: 128,
prop: 'productionLineName',
label: '产线',
},
// {
// // width: 128,
// prop: 'productionLineName',
// label: '产线',
// },
{
// width: 128,
prop: 'checkPerson',
@@ -244,11 +263,11 @@ export default {
width: 90,
prop: 'source',
label: '来源',
filter: (val) => ['未知', '手动', '自动'][val],
filter: (val) => ['平板端', '网页端'][val],
},
],
// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
searchBarKeys: ['inspectionDetContent', 'checkTime', 'workOrderId'],
searchBarKeys: ['inspectionDetContent', 'checkTime', 'workOrderId','checkPerson'],
form: {
id: undefined,
// workOrderId:undefined,
@@ -269,7 +288,8 @@ export default {
pageSize: 10,
workOrderId:null,
inspectionDetContent: null,
checkTime: [],
checkTime: [],
checkPerson:undefined,
// productionLineId: null,
},
};
@@ -351,12 +371,24 @@ export default {
};
}
);
});
})
this.$axios('base/quality-inspection-box-btn-auth/getUserList', {
pageNo: 1,
pageSize: 999
}).then((res) => {
// console.log(response);
this.searchBarFormConfig[2].selectOptions = res.data.map((item) => ({
name: item.username,
id: item.username,
}));
})
},
/** 查询列表 */
getList() {
this.loading = true;
// 执行查询
// 执行查询
let str = this.queryParams.checkPerson ? this.queryParams.checkPerson.join() :undefined
this.queryParams.checkPerson = str
getQualityInspectionRecordPage(this.queryParams).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
@@ -424,7 +456,9 @@ export default {
if (!valid) {
return;
}
// 修改的提交
// 修改的提交
let str = this.form.checkPerson.join()
this.form.checkPerson = str
if (this.form.id != null) {
updateQualityInspectionRecord(this.form).then((response) => {
this.$modal.msgSuccess('修改成功');


Skriv Förhandsgranska
Laddar…
Avbryt
Spara