projects/mesxc-zhp #300

Merged
juzi merged 3 commits from projects/mesxc-zhp into projects/mesxc-test 2024-04-02 15:03:51 +08:00
Showing only changes of commit 1fd547893f - Show all commits

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 14:55:15 * @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)