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-07 16:14:52 +08:00
commit f960ece594
8 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-04-03 17:10:15
* @LastEditTime: 2024-04-07 16:05:59
* @LastEditors: zhp
* @Description:
-->
@ -418,7 +418,7 @@ export default {
// yield:ele.yield
// })
sumAreaList.push(ele.sumArea)
yieldList.push((ele.yield * 100).toFixed(3))
yieldList.push((ele.yield * 100).toFixed(0))
})
this.$nextTick(() => {
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
@ -625,8 +625,8 @@ export default {
`<span style="color:rgba(255,255,255,0.5)">${this.getSize(item.size) || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.productArea) + '㎡' || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.wasteArea) + '㎡' || ''}</span>`,
`<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:#00FFF7' : '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>`
`<div style = "${(item.product * 100).toFixed(0) > 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>
<div style = "${(item.product * 100).toFixed(0) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>`
])
this.cutConfig.data = cutArr
// this.$nextTick(() => {

4
src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
View File

@ -54,7 +54,9 @@ export default {
param: 'inspectionDetContent',
},
{
type: 'button',
type: this.$auth.hasPermi('base:quality-inspection-box-btn:query')
? 'button'
: '',
btnName: '查询',
name: 'search',
color: 'primary',

4
src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
View File

@ -66,7 +66,9 @@ export default {
param: 'nickName',
},
{
type: 'button',
type: this.$auth.hasPermi('base:quality-inspection-box-permissions:query')
? 'button'
: '',
btnName: '查询',
name: 'search',
color: 'primary',

4
src/views/quality/base/qualityInspectionDet/index.vue
View File

@ -92,7 +92,9 @@ export default {
// width: 350,
// },
{
type: 'button',
type: this.$auth.hasPermi('base:quality-inspection-det:query')
? 'button'
: '',
btnName: '查询',
name: 'search',
color: 'primary',

4
src/views/quality/base/qualityInspectionType/index.vue
View File

@ -134,7 +134,9 @@ export default {
param: 'name',
},
{
type: 'button',
type: this.$auth.hasPermi('base:quality-inspection-type:query')
? 'button'
: '',
btnName: '查询',
name: 'search',
color: 'primary',

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

@ -131,7 +131,7 @@ export default {
// width: 350,
},
{
type: 'button',
type: this.$auth.hasPermi(' base: quality - isra - statistics: query') ? 'button' : '',
btnName: '查询',
name: 'search',
color: 'primary',

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

@ -92,7 +92,7 @@ export default {
filterable: true
},
{
type: 'button',
type: this.$auth.hasPermi('base:quality-scrap-det:query') ? 'button' : '',
btnName: '查询',
name: 'search',
color: 'primary',

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

@ -82,7 +82,7 @@ export default {
param: 'name',
},
{
type: 'button',
type: this.$auth.hasPermi('base:quality-scrap-type:query') ? 'button' : '',
btnName: '查询',
name: 'search',
color: 'primary',