projects/mescc/zhp
nach projects/mescc/develop
vor 2 Monaten zusammengeführt
@@ -27,11 +27,11 @@ | |||
</el-form-item> | |||
<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 周" | |||
placeholder="选择周" style="width: 180px" @change="onValueChange"> | |||
placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}"> | |||
</el-date-picker> | |||
至 | |||
<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> | |||
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> | |||
{{ date1 }} 至 {{ date2 }},共 {{ weekNum }} 周 | |||
@@ -20,11 +20,11 @@ | |||
</el-form-item> | |||
<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 周" | |||
placeholder="选择周" style="width: 180px" @change="onValueChange"> | |||
placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}"> | |||
</el-date-picker> | |||
至 | |||
<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> | |||
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> | |||
{{ date1 }} 至 {{ date2 }},共 {{ weekNum }} 周 | |||
@@ -84,7 +84,7 @@ | |||
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" /> | |||
</el-col> --> | |||
</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" /> | |||
</div> | |||
<!-- <div class="containerBottom"> | |||
@@ -107,7 +107,8 @@ export default { | |||
return { | |||
otherProps: [], | |||
title: '', | |||
currentMenu:'邯郸', | |||
currentMenu: '邯郸', | |||
showTable:false, | |||
listQuery: { | |||
start: 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() { | |||
this.tableH = this.tableHeight(137) / 2 - 70; | |||
@@ -18,11 +18,11 @@ | |||
</el-form-item> | |||
<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 周" | |||
placeholder="选择周" style="width: 180px" @change="onValueChange"> | |||
placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}"> | |||
</el-date-picker> | |||
至 | |||
<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> | |||
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> | |||
{{ date1 }} 至 {{ date2 }},共 {{ weekNum }} 周 | |||
@@ -103,7 +103,7 @@ | |||
:chartId="chartId" :chartNum="chartNum" /> | |||
<!-- </el-col> --> | |||
</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" /> | |||
</div> | |||
<!-- <div class="containerBottom"> | |||
@@ -126,6 +126,7 @@ export default { | |||
return { | |||
otherProps: [], | |||
start: undefined, | |||
showTable:false, | |||
currentMenu: '邯郸', | |||
end: undefined, | |||
title: '', | |||
@@ -897,6 +898,7 @@ export default { | |||
} | |||
} | |||
this.tableData = res.data.length != 0 ? this.dataArr : [] | |||
this.showTable = !this.showTable | |||
// this.tableProps = otherProps | |||
// res.data.list.forEach((ele) => { | |||
// console.log(ele); | |||
@@ -914,7 +916,7 @@ export default { | |||
// }) | |||
// console.log(dataArr) | |||
// this.tableProps.push() | |||
this.listQuery.total = res.data.total | |||
// this.listQuery.total = res.data.total | |||
// if (this.listQuery.total > 0) { | |||
// this.tableData.forEach(item => { | |||
// item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--' | |||
@@ -18,11 +18,11 @@ | |||
</el-form-item> | |||
<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 周" | |||
placeholder="选择周" style="width: 180px" @change="onValueChange"> | |||
placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}"> | |||
</el-date-picker> | |||
至 | |||
<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> | |||
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> | |||
{{ date1 }} 至 {{ date2 }},共 {{ weekNum }} 周 | |||
@@ -103,7 +103,7 @@ | |||
:chartId="chartId" :chartNum="chartNum" /> | |||
<!-- </el-col> --> | |||
</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" /> | |||
</div> | |||
<!-- <div class="containerBottom"> | |||
@@ -128,7 +128,8 @@ export default { | |||
start: undefined, | |||
currentMenu:'邯郸', | |||
end: undefined, | |||
title:'', | |||
title: '', | |||
showTable:false, | |||
listQuery: { | |||
pageNo: 1, | |||
pageSize:999, | |||
@@ -425,6 +426,9 @@ export default { | |||
}, | |||
watch: { | |||
// 监听左侧菜单栏是否展开 | |||
dataArr(val) { | |||
this.tableData = val | |||
}, | |||
isOpen(val) { | |||
if (this.$route.name === "productionSituationTablets") { | |||
this.chartNum++; | |||
@@ -1048,7 +1052,7 @@ export default { | |||
// } else { | |||
// } | |||
}) | |||
console.log("fto", ele.titleValue, fto); | |||
} else { | |||
ele.productionSituationDataVOList.forEach((item) => { | |||
console.log(item); | |||
@@ -1239,8 +1243,13 @@ export default { | |||
} | |||
} | |||
} | |||
console.log(this.dataArr[0]['item'],this.chartMsg.series[0].data) | |||
this.tableData = res.data.length != 0 ? this.dataArr : [] | |||
console.log(this.dataArr) | |||
console.log(this.tableData); | |||
// this.$nextTick(() => { | |||
this.tableData = this.dataArr | |||
this.showTable = !this.showTable | |||
// }) | |||
// this.$forceUpdate() | |||
// this.tableProps = otherProps | |||
// res.data.list.forEach((ele) => { | |||
// console.log(ele); | |||
@@ -1258,7 +1267,7 @@ export default { | |||
// }) | |||
// console.log(dataArr) | |||
// this.tableProps.push() | |||
this.listQuery.total = res.data.total | |||
// this.listQuery.total = res.data.total | |||
// if (this.listQuery.total > 0) { | |||
// this.tableData.forEach(item => { | |||
// item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--' | |||
@@ -20,11 +20,11 @@ | |||
</el-form-item> | |||
<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 周" | |||
placeholder="选择周" style="width: 180px" @change="onValueChange"> | |||
placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}"> | |||
</el-date-picker> | |||
至 | |||
<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> | |||
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px"> | |||
{{ date1 }} 至 {{ date2 }},共 {{ weekNum }} 周 | |||
@@ -84,7 +84,7 @@ | |||
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" /> | |||
</el-col> --> | |||
</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" /> | |||
</div> | |||
<!-- <div class="containerBottom"> | |||
@@ -108,6 +108,7 @@ export default { | |||
start: undefined, | |||
end: undefined, | |||
title: '', | |||
showTable:false, | |||
listQuery: { | |||
pageNo: 1, | |||
pageSize: 999, | |||
@@ -729,6 +730,7 @@ export default { | |||
console.log(dataArr) | |||
this.tableData = res.data.length != 0 ? dataArr : [] | |||
this.showTable = !this.showTable | |||
// this.tableProps.push() | |||
}, | |||
_setTableHeight() { | |||