|
|
@@ -6,24 +6,10 @@
|
|
|
<el-button style="margin-left:10px" @click="impdata">导出</el-button>
|
|
|
</span>
|
|
|
</div>
|
|
|
- <div style="height: 700px;width: 100%;background-color: rgb(237 237 237 / 23%);margin-top: 10px;display: flex;">
|
|
|
- <div style="height: 700px;width: 30%;margin-left: 1%;">
|
|
|
- <div style="height: 30px;line-height: 30px;"><b>当前占比分布统计</b></div>
|
|
|
- <el-table v-loading="loading" height="750px" :data="datalist">
|
|
|
- <el-table-column label="毛高" align="center" prop="height"></el-table-column>
|
|
|
- <el-table-column label="设备数量" align="center" prop="num"></el-table-column>
|
|
|
- <el-table-column label="占比" align="center" prop="percent"></el-table-column>
|
|
|
- <el-table-column label="明细" align="center">
|
|
|
- <template #default="scope">
|
|
|
- <el-button @click="getDetail(scope.row)">查看明细</el-button>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
- <div style="height: 780px;width: 68%;margin-left: 1%;">
|
|
|
- <div style="height: 300px;width: 100%;">
|
|
|
+ <div style="height: 700px;width: 100%;background-color: rgb(237 237 237 / 23%);margin-top: 10px;">
|
|
|
+ <div style="height: 300px;width: 100%;">
|
|
|
<div style="height: 42px;width: 100%;padding: 5px;line-height: 30px;">
|
|
|
- <span style="position: relative;"><b>毛高({{detailValue.height}})正态及趋势分析</b> 月份：</span>
|
|
|
+ <span style="position: relative;">统计月份：</span>
|
|
|
<el-date-picker
|
|
|
style="width: 180px;"
|
|
|
v-model="queryMonth"
|
|
|
@@ -40,28 +26,44 @@
|
|
|
<div style="height: 100%;width:50%" ref="echatrs1"></div>
|
|
|
<div style="height: 100%;width:50%" ref="echatrs2"></div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div style="height: 30px;line-height: 30px;"><b>毛高({{detailValue.height}})当前明细数据</b></div>
|
|
|
- <el-table class="titletable" cellspacing="0" cellpadding="0" height="450px" width="800px" :data="detailDataList">
|
|
|
- <el-table-column label="设备名" align="center" prop="device"></el-table-column>
|
|
|
- <el-table-column label="机台号" align="center" prop="formula_data_2"></el-table-column>
|
|
|
- <el-table-column label="毛高" align="center" prop="formula_data_15"></el-table-column>
|
|
|
- <el-table-column label="配方号" align="center" prop="formula_data_1"></el-table-column>
|
|
|
- <el-table-column label="米克重" align="center" prop="formula_data_3"></el-table-column>
|
|
|
- <el-table-column label="送经量" align="center" >
|
|
|
- <el-table-column label="GB1" align="center" prop="formula_data_19"></el-table-column>
|
|
|
- <el-table-column label="GB2" align="center" prop="formula_data_20"></el-table-column>
|
|
|
- <el-table-column label="GB3" align="center" prop="formula_data_21"></el-table-column>
|
|
|
- <el-table-column label="GB4" align="center" prop="formula_data_22"></el-table-column>
|
|
|
- <el-table-column label="GB5" align="center" prop="formula_data_23"></el-table-column>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="线纱规格D" align="center">
|
|
|
- <el-table-column label="L1、L5" align="center" prop="formula_data_4"></el-table-column>
|
|
|
- <el-table-column label="L2、L4" align="center" prop="formula_data_5"></el-table-column>
|
|
|
- <el-table-column label="L3" align="center" prop="formula_data_6"></el-table-column>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
+ </div>
|
|
|
+ <div style="height: 700px;width: 100%;display: flex;">
|
|
|
+ <div style="width: 30%;margin-left: 1%;">
|
|
|
+ <div style="height: 30px;line-height: 30px;"><b>当前占比分布统计</b></div>
|
|
|
+ <el-table class="titletable" v-loading="loading" cellspacing="0" cellpadding="0" height="450px" :data="datalist">
|
|
|
+ <el-table-column label="毛高" align="center" prop="height"></el-table-column>
|
|
|
+ <el-table-column label="设备数量" align="center" prop="num"></el-table-column>
|
|
|
+ <el-table-column label="占比" align="center" prop="percent"></el-table-column>
|
|
|
+ <el-table-column label="明细" align="center">
|
|
|
+ <template #default="scope">
|
|
|
+ <el-button @click="getDetail(scope.row)">查看明细</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
</div>
|
|
|
+ <div style="width: 68%;margin-left: 1%;">
|
|
|
+ <div style="height: 30px;line-height: 30px;"><b>毛高({{detailValue.height}})当前明细数据</b></div>
|
|
|
+ <el-table class="titletable" cellspacing="0" cellpadding="0" height="450px" width="800px" :data="detailDataList">
|
|
|
+ <el-table-column label="设备名" align="center" prop="device"></el-table-column>
|
|
|
+ <el-table-column label="机台号" align="center" prop="formula_data_2"></el-table-column>
|
|
|
+ <el-table-column label="毛高" align="center" prop="formula_data_15"></el-table-column>
|
|
|
+ <el-table-column label="配方号" align="center" prop="formula_data_1"></el-table-column>
|
|
|
+ <el-table-column label="米克重" align="center" prop="formula_data_3"></el-table-column>
|
|
|
+ <el-table-column label="送经量" align="center" >
|
|
|
+ <el-table-column label="GB1" align="center" prop="formula_data_19"></el-table-column>
|
|
|
+ <el-table-column label="GB2" align="center" prop="formula_data_20"></el-table-column>
|
|
|
+ <el-table-column label="GB3" align="center" prop="formula_data_21"></el-table-column>
|
|
|
+ <el-table-column label="GB4" align="center" prop="formula_data_22"></el-table-column>
|
|
|
+ <el-table-column label="GB5" align="center" prop="formula_data_23"></el-table-column>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="线纱规格D" align="center">
|
|
|
+ <el-table-column label="L1、L5" align="center" prop="formula_data_4"></el-table-column>
|
|
|
+ <el-table-column label="L2、L4" align="center" prop="formula_data_5"></el-table-column>
|
|
|
+ <el-table-column label="L3" align="center" prop="formula_data_6"></el-table-column>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -274,7 +276,17 @@
|
|
|
left:"5%",
|
|
|
right:"10%",
|
|
|
},
|
|
|
- "legend": {},
|
|
|
+ "legend": {
|
|
|
+ show:true,
|
|
|
+ top:"3",
|
|
|
+ itemGap:150
|
|
|
+ },
|
|
|
+ title: {
|
|
|
+ show:true,
|
|
|
+ text: "正态分布图",
|
|
|
+ left:"center",
|
|
|
+ top:"0",
|
|
|
+ },
|
|
|
color: ['#ff8896', '#409efe'], //分布曲线颜色、次数柱子颜色
|
|
|
//"color": ["#78b4ff", "#f66bc7", "#2bcba7", "#ff8896", "#79c628", "#6c93ee", "#a9abff", "#f7a23f", "#27bae7", "#ff6d9d", "#cb79ff", "#f95b5a", "#ccaf27", "#38b99c", "#93d0ff", "#bd74e0", "#fd77da", "#dea700"],
|
|
|
"xAxis": {
|
|
|
@@ -333,6 +345,7 @@
|
|
|
name: "毛高："+ele.height,
|
|
|
data: ele.trend,
|
|
|
type: "line",
|
|
|
+ symbol: 'none',
|
|
|
itemStyle: {
|
|
|
//color: colors[sers.length],
|
|
|
},
|
|
|
@@ -345,18 +358,20 @@
|
|
|
})
|
|
|
let option = {
|
|
|
grid:{
|
|
|
- top:"5%",
|
|
|
+ top:"15%",
|
|
|
"bottom":"15%",
|
|
|
left:"5%",
|
|
|
- right:"5%",
|
|
|
+ right:"15%",
|
|
|
},
|
|
|
tooltip:{
|
|
|
show:true,
|
|
|
trigger:'axis'
|
|
|
},
|
|
|
title: {
|
|
|
- show:false,
|
|
|
- text: "机台数",
|
|
|
+ show:true,
|
|
|
+ text: "趋势分析",
|
|
|
+ left:"center",
|
|
|
+ top:"0",
|
|
|
},
|
|
|
xAxis: {
|
|
|
type: "category",
|
|
|
@@ -371,8 +386,10 @@
|
|
|
type: "value",
|
|
|
},
|
|
|
legend: {
|
|
|
- show: false,
|
|
|
- bottom: "0",
|
|
|
+ show: true,
|
|
|
+ orient:"vertical",
|
|
|
+ left: 'right',
|
|
|
+ top:"middle",
|
|
|
},
|
|
|
series:sers,
|
|
|
};
|
