mt-fe-group/yudao-dev
12
0
Fork 0
程式碼 問題 合併請求 版本發布 Wiki 動態

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

瀏覽代碼
This commit is contained in:
朱菊兰 2024-04-03 16:33:32 +08:00
當前提交 3de4d5c5f2
共有 4 個檔案被更改，包括 15 行新增 和 15 行删除
顯示統計資料 下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

16
src/views/OperationalOverview/coldBoard.vue
查看文件

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-04-03 15:54:51
* @LastEditTime: 2024-04-03 16:29:24
* @LastEditors: zhp
* @Description:
-->
@ -617,14 +617,14 @@ export default {
this.cutWsData = event?.data ? JSON.parse(event?.data) : {}
if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'table') {
let cutArr = this.cutWsData.productHourData.map((item, index) => [
`<span style="color:rgba(255,255,255,0.7)" >${index + 1 || ''}
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
</span>`,
`<span style="color:rgba(255,255,255,0.7)" >${item.lineName || ''}
`<span style="color:rgba(255,255,255,0.5)" >${item.lineName || ''}
</span>`,
`<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>`,
`<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)">${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>`
])
@ -657,7 +657,7 @@ export default {
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.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]])
this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[4]], [wasteList[5]])
this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]])
this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
})

6
src/views/OperationalOverview/components/coldDoubleYChart.vue
查看文件

@ -2,7 +2,7 @@
<!--
* @Author: zhp
* @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-04-03 15:14:24
* @LastEditTime: 2024-04-03 16:28:40
* @LastEditors: zhp
* @Description:
-->
@ -100,7 +100,7 @@ export default {
show: true, //开启显示
position: 'top', //在上方显示
textStyle: { //数值样式
color: '#ced1d5',
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 12,
fontWight: 'bolder'
}
@ -200,7 +200,7 @@ export default {
},
axisLabel: {
textStyle: {
align: 'left',
align: 'center',
color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
}
},

4
src/views/OperationalOverview/components/doubleYChart .vue
查看文件

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-04-03 15:10:31
* @LastEditTime: 2024-04-03 16:24:21
* @LastEditors: zhp
* @Description:
-->
@ -105,7 +105,7 @@ export default {
show: true, //开启显示
position: 'top', //在上方显示
textStyle: { //数值样式
color: '#ced1d5',
color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 12,
fontWight:'bolder'
}

4
src/views/OperationalOverview/components/pileBarChart.vue
查看文件

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-12-27 13:54:52
* @LastEditTime: 2024-04-03 15:48:43
* @LastEditTime: 2024-04-03 16:29:52
* @LastEditors: zhp
* @Description:
-->
@ -167,7 +167,7 @@ export default {
let singleData = series.filter(function (item) {
return item.name == name
})
return name + parseFloat((singleData[0].data * 100).toFixed(2)) + '%'
return name + parseFloat((singleData[0].data * 100).toFixed(0)) + '%'
},
itemWidth: 12,
itemHeight: 12,