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

Merge pull request 'projects/mesxc-zhp' (#300) from projects/mesxc-zhp into projects/mesxc-test

Browse Source 
Reviewed-on: #300
This commit is contained in:
朱菊兰 2024-04-02 15:03:51 +08:00
commit 0dae8cd16d
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
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 13:55:46 * @LastEditTime: 2024-04-02 15:01:40
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -40,7 +40,7 @@
<top-radio-group /> <top-radio-group />
</div> --> </div> -->
<!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 --> <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
<div class="myLegend"> <div v-if="coldDetData" class="myLegend">
<div class="barLegend"></div> <div class="barLegend"></div>
<h4 class="barText">产线产量</h4> <h4 class="barText">产线产量</h4>
<div class="barCircle"></div> <div class="barCircle"></div>
@ -250,6 +250,7 @@ export default {
funWs: undefined, funWs: undefined,
SJGws: undefined, SJGws: undefined,
funWsData: {}, funWsData: {},
coldDetData:[],
SJGWsData: {}, SJGWsData: {},
cxNameList:[], cxNameList:[],
cxDataList:[], cxDataList:[],
@ -352,7 +353,7 @@ export default {
let sumAreaList = [] let sumAreaList = []
// let yieldList = [] // let yieldList = []
// this.cutTableDataList = // this.cutTableDataList =
let coldDetData = [ this.coldDetData = [
{ {
"first": 0.8834, "first": 0.8834,
"lineName": "Y61", "lineName": "Y61",
@ -404,7 +405,7 @@ export default {
"yield": 0.9133 "yield": 0.9133
} }
] ]
coldDetData.forEach((ele, index) => { this.coldDetData.forEach((ele, index) => {
nameList.push(ele.lineName) nameList.push(ele.lineName)
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡') topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡')
productList.push(ele.productArea) productList.push(ele.productArea)
@ -596,6 +597,7 @@ export default {
let wasteList = [] let wasteList = []
let sumAreaList = [] let sumAreaList = []
let yieldList = [] let yieldList = []
this.coldDetData = this.cutWsData.coldDetData
// this.cutTableDataList = // this.cutTableDataList =
this.cutWsData.coldDetData.forEach((ele, index) => { this.cutWsData.coldDetData.forEach((ele, index) => {
nameList.push(ele.lineName) nameList.push(ele.lineName)
@ -649,13 +651,12 @@ export default {
for (let i in this.funWsData.data.annealFanInfo) { for (let i in this.funWsData.data.annealFanInfo) {
index++, index++,
arr.push([ arr.push([
` `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
<span style="color:rgba(255,255,255,0.5)" >${index || ''}
</span>`, </span>`,
`<span style="color:rgba(255,255,255,0.5)" >${i || ''} // `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
</span>`, // </span>`,
`<span style="color:rgba(255,255,255,0.5)">${i.name || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${i.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> ${i.run || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.annealFanInfo[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> ${this.funWsData.data.annealFanInfo[i] || ''}</span>`,
]) ])
} }
this.annealFunConfig.data = arr this.annealFunConfig.data = arr
@ -669,10 +670,10 @@ export default {
for (let i in this.funWsData.data.fanInfo) { for (let i in this.funWsData.data.fanInfo) {
index++, index++,
arr.push([ arr.push([
`<span style="color:rgba(255,255,255,0.5)" >${index || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
`<span style="color:rgba(255,255,255,0.5)" >${i || ''}</span>`, </span>`,
`<span style="color:rgba(255,255,255,0.5)">${i.name || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${i.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> ${i.run || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.fanInfo[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> ${this.funWsData.data.fanInfo[i] || ''}</span>`,
]) ])
} }
this.funConfig.data = arr this.funConfig.data = arr