feat: 车间生产合格数返回更多字段
This commit is contained in:
parent
789f8da088
commit
2f122360c1
|
@ -3,30 +3,14 @@
|
||||||
<el-header>
|
<el-header>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-select v-model="queryType" @change="queryTypeChange">
|
<el-select v-model="queryType" @change="queryTypeChange">
|
||||||
<el-option v-for="item in typeOptions"
|
<el-option v-for="item in typeOptions" :key="item" :label="item" :value="item">
|
||||||
:key="item"
|
|
||||||
:label="item"
|
|
||||||
:value="item"
|
|
||||||
>
|
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-date-picker
|
<el-date-picker v-if="queryType == '月'" v-model="queryDate" type="month" placeholder="查询月期"
|
||||||
v-if="queryType=='月'"
|
value-format="YYYY-MM" style="width:100%">
|
||||||
v-model="queryDate"
|
|
||||||
type="month"
|
|
||||||
placeholder="查询月期"
|
|
||||||
value-format="YYYY-MM"
|
|
||||||
style="width:100%"
|
|
||||||
>
|
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
<el-date-picker
|
<el-date-picker v-if="queryType == '年'" v-model="queryDate" type="year" placeholder="查询年份"
|
||||||
v-if="queryType=='年'"
|
value-format="YYYY" style="width:100%">
|
||||||
v-model="queryDate"
|
|
||||||
type="year"
|
|
||||||
placeholder="查询年份"
|
|
||||||
value-format="YYYY"
|
|
||||||
style="width:100%"
|
|
||||||
>
|
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -54,8 +38,14 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="型号" prop="型号">
|
<el-table-column label="型号" prop="型号">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="生产数" prop="生产数">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="合格数" prop="合格数">
|
<el-table-column label="合格数" prop="合格数">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="不合格数" prop="不合格数">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="合格率" prop="合格率">
|
||||||
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
@ -83,8 +73,14 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="型号" prop="型号">
|
<el-table-column label="型号" prop="型号">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="生产数" prop="生产数">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="合格数" prop="合格数">
|
<el-table-column label="合格数" prop="合格数">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="不合格数" prop="不合格数">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="合格率" prop="合格率">
|
||||||
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
@ -112,8 +108,14 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="型号" prop="型号">
|
<el-table-column label="型号" prop="型号">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="生产数" prop="生产数">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="合格数" prop="合格数">
|
<el-table-column label="合格数" prop="合格数">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="不合格数" prop="不合格数">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="合格率" prop="合格率">
|
||||||
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
@ -266,7 +268,7 @@
|
||||||
let option = deepCopy(that.basicOption);
|
let option = deepCopy(that.basicOption);
|
||||||
option.xAxis.data = that.xAxisData;
|
option.xAxis.data = that.xAxisData;
|
||||||
option.title.text = '6车间';
|
option.title.text = '6车间';
|
||||||
let exec = that.queryType=='月'?'productStatisticWeek':'productStatisticYear';
|
let exec = that.queryType == '月' ? 'lineWeek' : 'lineMonth';
|
||||||
let obj = {
|
let obj = {
|
||||||
query: { start_date: that.start_date, end_date: that.end_date, dept_name: "6车间" },
|
query: { start_date: that.start_date, end_date: that.end_date, dept_name: "6车间" },
|
||||||
};
|
};
|
||||||
|
@ -485,5 +487,4 @@
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style></style>
|
||||||
</style>
|
|
||||||
|
|
Loading…
Reference in New Issue