完善

src/views/check/checkstandard/modules/DetailSbCheck.vue

@@ -112,6 +112,8 @@ export default {
     return {
       confirmLoading: false,
       mdl: {},
+      queryParam: {
+      },
       levelMap: {},
       model: {
         'id': null,

src/views/dashboard/CheckJobReportWeek.vue

@@ -205,6 +205,7 @@ export default {
       this.chart.legend({
         position: 'bottom'
       })
+      // 折线数据
       this.chart.line().position('week*totalUseHours')
       this.chart.point().position('week*totalUseHours').size(4).shape('circle').style({
         stroke: '#fff',

src/views/dashboard/RepairReportSbInfo.vue

@@ -165,7 +165,7 @@ export default {
     getCharts (id, data) {
       this.chart && this.chart.destroy()// 防止点击搜索按钮新增一个
       this.chart = new Chart({
-        container: 'container',
+        container: id,
         autoFit: true,
         height: 400
       })
@@ -187,6 +187,12 @@ export default {
       this.chart.legend({
         position: 'bottom'
       })
+      // 折线数据
+      this.chart.line().position('year*workYear')
+      this.chart.point().position('year*workYear').size(4).shape('circle').style({
+        stroke: '#fff',
+        lineWidth: 1
+      })
       this.chart.render()
     },
     doExport () {

src/views/dashboard/RepairReportSbInfoFee.vue

@@ -13,7 +13,7 @@
             <a-row>
               <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
                 <div style="padding: 10px">
-                  <div id="container" style="width: 100%;overflow-x:auto"></div>
+                  <div id="container2" style="width: 100%;overflow-x:auto"></div>
                 </div>
               </a-col>
             </a-row>
@@ -44,24 +44,24 @@
         </a-tabs>
       </div>
     </a-card>
-    <print-in-repair-report ref="basePrintModal" @ok="handleOk"/>
-    <detail-repair-report ref="detailModal" @ok="handleOk"/>
+    <print-in-repair-report-fee ref="basePrintModal" @ok="handleOk"/>
+    <detail-repair-report-fee ref="detailModal" @ok="handleOk"/>
   </div>
 </template>
 
 <script>
 import { getSbInfoReportFee, exportSbInfoReportFee, exportSbInfoReportFeeYear } from '@/api/report/application-form'
 import { Chart } from '@antv/g2'
-import PrintInRepairReport from '@/views/dashboard/modules/PrintInRepairReport'
-import DetailRepairReport from '@/views/dashboard/modules/DetailRepairReport'
+import PrintInRepairReportFee from '@/views/dashboard/modules/PrintInRepairReportFee'
+import DetailRepairReportFee from '@/views/dashboard/modules/DetailRepairReportFee'
 import moment from 'moment'
 // const DataSet = require('@antv/data-set')
 export default {
   name: 'RepairReportSbInfoFee',
   components: {
-    PrintInRepairReport,
+    PrintInRepairReportFee,
     Chart,
-    DetailRepairReport
+    DetailRepairReportFee
   },
   props: {
     sbId: {
@@ -158,14 +158,15 @@ export default {
           }) */
           this.tableData.forEach(function (data) {
             data.year = data.year + ''
+            console.log('data: ' + data)
           })
-          this.getCharts('container', this.tableData)// 调用统计图
+          this.getCharts('container2', this.tableData)// 调用统计图
         })
     },
     getCharts (id, data) {
       this.chart && this.chart.destroy()// 防止点击搜索按钮新增一个
       this.chart = new Chart({
-        container: 'container',
+        container: id,
         autoFit: true,
         height: 400
       })
@@ -187,6 +188,12 @@ export default {
       this.chart.legend({
         position: 'bottom'
       })
+      // 折线数据
+      this.chart.line().position('year*workYear')
+      this.chart.point().position('year*workYear').size(4).shape('circle').style({
+        stroke: '#fff',
+        lineWidth: 1
+      })
       this.chart.render()
     },
     doExport () {