mt-fe-group/yudao-init
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mescc/zhp #61

Merged
juzi merged 3 commits from projects/mescc/zhp into projects/mescc/develop 2024-06-24 13:30:57 +08:00
Conversation 0 Commits 3 Files Changed 5 +61 -22
5 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5e703350e1 - Show all commits

4
src/views/report/comprehensiveData.vue
View File

@ -27,11 +27,11 @@
</el-form-item> </el-form-item>
<el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime"> <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
至 至
<el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
{{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周 {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周

12
src/views/report/produceConversion.vue
View File

@ -20,11 +20,11 @@
</el-form-item> </el-form-item>
<el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime"> <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
至 至
<el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
{{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周 {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@ -84,7 +84,7 @@
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" /> :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
</el-col> --> </el-col> -->
</el-row> </el-row>
<base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current" <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" /> :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
</div> </div>
<!-- <div class="containerBottom"> <!-- <div class="containerBottom">
@ -107,7 +107,8 @@ export default {
return { return {
otherProps: [], otherProps: [],
title: '', title: '',
currentMenu:'邯郸', currentMenu: '邯郸',
showTable:false,
listQuery: { listQuery: {
start: undefined, start: undefined,
end: undefined, end: undefined,
@ -652,7 +653,8 @@ export default {
// }) // })
// } // }
// } // }
this.tableData =res.data[0].list.length !== 0? dataArr : [] this.tableData = res.data[0].list.length !== 0 ? dataArr : []
this.showTable = !this.showTable
}, },
_setTableHeight() { _setTableHeight() {
this.tableH = this.tableHeight(137) / 2 - 70; this.tableH = this.tableHeight(137) / 2 - 70;

10
src/views/report/productionSituationMW.vue
View File

@ -18,11 +18,11 @@
</el-form-item> </el-form-item>
<el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime"> <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
至 至
<el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
{{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周 {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@ -103,7 +103,7 @@
:chartId="chartId" :chartNum="chartNum" /> :chartId="chartId" :chartNum="chartNum" />
<!-- </el-col> --> <!-- </el-col> -->
</el-row> </el-row>
<base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current" <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" /> :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
</div> </div>
<!-- <div class="containerBottom"> <!-- <div class="containerBottom">
@ -126,6 +126,7 @@ export default {
return { return {
otherProps: [], otherProps: [],
start: undefined, start: undefined,
showTable:false,
currentMenu: '邯郸', currentMenu: '邯郸',
end: undefined, end: undefined,
title: '', title: '',
@ -897,6 +898,7 @@ export default {
} }
} }
this.tableData = res.data.length != 0 ? this.dataArr : [] this.tableData = res.data.length != 0 ? this.dataArr : []
this.showTable = !this.showTable
// this.tableProps = otherProps // this.tableProps = otherProps
// res.data.list.forEach((ele) => { // res.data.list.forEach((ele) => {
// console.log(ele); // console.log(ele);
@ -914,7 +916,7 @@ export default {
// }) // })
// console.log(dataArr) // console.log(dataArr)
// this.tableProps.push() // this.tableProps.push()
this.listQuery.total = res.data.total // this.listQuery.total = res.data.total
// if (this.listQuery.total > 0) { // if (this.listQuery.total > 0) {
// this.tableData.forEach(item => { // this.tableData.forEach(item => {
// item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--' // item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'

49
src/views/report/productionSituationTablets.vue
View File

@ -18,11 +18,11 @@
</el-form-item> </el-form-item>
<el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime"> <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
至 至
<el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
{{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周 {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@ -103,7 +103,7 @@
:chartId="chartId" :chartNum="chartNum" /> :chartId="chartId" :chartNum="chartNum" />
<!-- </el-col> --> <!-- </el-col> -->
</el-row> </el-row>
<base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current" <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" /> :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
</div> </div>
<!-- <div class="containerBottom"> <!-- <div class="containerBottom">
@ -128,7 +128,8 @@ export default {
start: undefined, start: undefined,
currentMenu:'邯郸', currentMenu:'邯郸',
end: undefined, end: undefined,
title:'', title: '',
showTable:false,
listQuery: { listQuery: {
pageNo: 1, pageNo: 1,
pageSize:999, pageSize:999,
@ -425,6 +426,9 @@ export default {
}, },
watch: { watch: {
// 监听左侧菜单栏是否展开 // 监听左侧菜单栏是否展开
dataArr(val) {
this.tableData = val
},
isOpen(val) { isOpen(val) {
if (this.$route.name === "productionSituationTablets") { if (this.$route.name === "productionSituationTablets") {
this.chartNum++; this.chartNum++;
@ -902,6 +906,30 @@ export default {
prop: 'value' + i prop: 'value' + i
}) })
}) })
res.data.list.forEach((ele, index) => {
let i = index + 1
let m = 'value' + i
ele.productionSituationDataVOList.forEach((item) => {
this.dataArr[0]['' + m + ''] = item.ftoInput
this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
this.dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
this.dataArr[1]['' + m + ''] = item.chipYield
this.dataArr[2]['' + m + ''] = item.componentYield
// this.dataArr[3]['' + m + ''] = item.bipvProductOutput
if (this.dataArr[3]) {
this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
this.dataArr[3]['' + m + ''] = item.bipvProductOutput
}
})
// ele.titleValue
// .push({
// label: ele.titleValue,
// props: 'value' + index + 1,
// })
})
// res.data.list.forEach((ele) => { // res.data.list.forEach((ele) => {
res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => { res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
// let i = index + 1 // let i = index + 1
@ -1048,7 +1076,7 @@ export default {
// } else { // } else {
// } // }
}) })
console.log("fto", ele.titleValue, fto);
} else { } else {
ele.productionSituationDataVOList.forEach((item) => { ele.productionSituationDataVOList.forEach((item) => {
console.log(item); console.log(item);
@ -1239,8 +1267,13 @@ export default {
} }
} }
} }
console.log(this.dataArr[0]['item'],this.chartMsg.series[0].data) console.log(this.dataArr)
this.tableData = res.data.length != 0 ? this.dataArr : [] console.log(this.tableData);
// this.$nextTick(() => {
this.tableData = this.dataArr
this.showTable = !this.showTable
// })
// this.$forceUpdate()
// this.tableProps = otherProps // this.tableProps = otherProps
// res.data.list.forEach((ele) => { // res.data.list.forEach((ele) => {
// console.log(ele); // console.log(ele);
@ -1258,7 +1291,7 @@ export default {
// }) // })
// console.log(dataArr) // console.log(dataArr)
// this.tableProps.push() // this.tableProps.push()
this.listQuery.total = res.data.total // this.listQuery.total = res.data.total
// if (this.listQuery.total > 0) { // if (this.listQuery.total > 0) {
// this.tableData.forEach(item => { // this.tableData.forEach(item => {
// item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--' // item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'

8
src/views/report/productionYield.vue
View File

@ -20,11 +20,11 @@
</el-form-item> </el-form-item>
<el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime"> <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
至 至
<el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周" <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange"> placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
</el-date-picker> </el-date-picker>
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
{{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周 {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@ -84,7 +84,7 @@
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" /> :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
</el-col> --> </el-col> -->
</el-row> </el-row>
<base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current" <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" /> :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
</div> </div>
<!-- <div class="containerBottom"> <!-- <div class="containerBottom">
@ -108,6 +108,7 @@ export default {
start: undefined, start: undefined,
end: undefined, end: undefined,
title: '', title: '',
showTable:false,
listQuery: { listQuery: {
pageNo: 1, pageNo: 1,
pageSize: 999, pageSize: 999,
@ -729,6 +730,7 @@ export default {
console.log(dataArr) console.log(dataArr)
this.tableData = res.data.length != 0 ? dataArr : [] this.tableData = res.data.length != 0 ? dataArr : []
this.showTable = !this.showTable
// this.tableProps.push() // this.tableProps.push()
}, },
_setTableHeight() { _setTableHeight() {