|
|
@@ -5,7 +5,7 @@
|
|
|
<a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
|
|
|
<div class="extra-wrapper" slot="tabBarExtraContent">
|
|
|
<a-row>
|
|
|
- <a-col :md="3" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-month-picker
|
|
|
style="margin-left: 8px"
|
|
|
:default-value="moment(defaultStartMonth, monthFormat)"
|
|
|
@@ -13,7 +13,7 @@
|
|
|
v-model="queryParam.startMonth"
|
|
|
placeholder="开始月份"
|
|
|
@change="onStartChange" /></a-col>
|
|
|
- <a-col :md="3" :sm="24">
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
<a-month-picker
|
|
|
style="margin-left: 8px"
|
|
|
:default-value="moment(defaultEndMonth, monthFormat)"
|
|
|
@@ -22,13 +22,13 @@
|
|
|
placeholder="结束月份"
|
|
|
@change="onEndChange" />
|
|
|
</a-col>
|
|
|
- <a-col :md="2" :sm="24">
|
|
|
+ <a-col :md="3" :sm="24">
|
|
|
<a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
|
|
|
</a-col>
|
|
|
- <a-col :md="2" :sm="24">
|
|
|
+ <a-col :md="3" :sm="24">
|
|
|
<a-button style="margin-left: 8px" type="primary" @click="handlePrint()">打印</a-button>
|
|
|
</a-col>
|
|
|
- <a-col :md="2" :sm="24">
|
|
|
+ <a-col :md="3" :sm="24">
|
|
|
<a-button style="margin-left: 8px" type="primary" @click="doExport()">导出</a-button>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
@@ -50,6 +50,7 @@
|
|
|
bordered
|
|
|
:data-source="chartsData"
|
|
|
:columns="columns"
|
|
|
+ :pageSize="12"
|
|
|
tableLayout="auto"
|
|
|
:scroll="{x: 1, y: BaseTool.Constant.scrollY }"
|
|
|
rowKey="month">
|
|
|
@@ -68,25 +69,25 @@
|
|
|
</a-tabs>
|
|
|
</div>
|
|
|
</a-card>
|
|
|
- <print-in-check-job-report ref="basePrintModal" @ok="handleOk"/>
|
|
|
- <detail-check-job-report ref="detailModal" @ok="handleOk"/>
|
|
|
+ <print-in-measure-log-report ref="basePrintModal" @ok="handleOk"/>
|
|
|
+ <detail-measure-log-report ref="detailModal" @ok="handleOk"/>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import { getMonthReport, exportMonthReport } from '@/api/report/measure-log'
|
|
|
import { Chart } from '@antv/g2'
|
|
|
-import PrintInCheckJobReport from '@/views/dashboard/modules/PrintInCheckJobReport'
|
|
|
-import DetailCheckJobReport from '@/views/dashboard/modules/DetailCheckJobReport'
|
|
|
+import PrintInMeasureLogReport from '@/views/dashboard/modules/PrintInMeasureLogReport'
|
|
|
+import DetailMeasureLogReport from '@/views/dashboard/modules/DetailMeasureLogReport'
|
|
|
import moment from 'moment'
|
|
|
import { fetchSbTypeTree } from '@/api/sb/type'
|
|
|
|
|
|
export default {
|
|
|
name: 'MeasureLogReport',
|
|
|
components: {
|
|
|
- PrintInCheckJobReport,
|
|
|
+ PrintInMeasureLogReport,
|
|
|
Chart,
|
|
|
- DetailCheckJobReport
|
|
|
+ DetailMeasureLogReport
|
|
|
},
|
|
|
props: {
|
|
|
title: {
|
