Ver código fonte

Merge branch 'master' of http://120.26.64.82:10880/BFFE/dz2.1

zhaoke 1 ano atrás
pai
commit
31dbf21e42

+ 9 - 3
src/views/statisticsCharts/components/newBarStatisticsCharts.vue

@@ -12,7 +12,7 @@
     >
     <PublicPageHeader class="TablePage_header" :page-title="dataTitle ? dataTitle : pageTitle">
       <template slot="d_foot">
-        <SimpleQuery v-if="simpleQueryFlag" :selectOptions="advancedQueryValue" :simple-query-item="simpleQueryItem" @queryValue="queryValue" />
+        <SimpleQuery v-if="simpleQueryFlag" :selectOptions="advancedQueryValue" :simple-query-item="simpleQueryItem" @queryValue="queryValue" @changeSelect="changeSelect"/>
       </template>
     </PublicPageHeader>
       <!-- <StatisticsHeader
@@ -453,6 +453,10 @@ export default {
         return Promise.reject(error.message || '失败')
       }
     },
+    changeSelect(data){
+      console.log(data)
+      this.admin.io = data
+    },
     setChartsData(listValues) {
       const xAxisData = []
       const yAxisData = [0]
@@ -479,10 +483,12 @@ export default {
         this.seriesKey = 'out_num'
       } else if (this.admin.io === '中转') {
         this.seriesKey = 'trans_num'
-      } else if (this.admin.baggageType === '正常') {
+      } else if (this.admin.io === '正常') {
         this.seriesKey = 'bag_num'
-      } else if (this.admin.baggageType === '异常') {
+      } else if (this.admin.io === '异常') {
         this.seriesKey = 'exception_num'
+      }else if (this.admin.io === '全部') {
+        this.seriesKey = 'bag'
       }else if (this.rol){
         this.seriesKey = this.rol
       }

+ 2 - 0
src/views/statisticsCharts/views/baggage/baggageAllStatisticsCharts.vue

@@ -18,6 +18,8 @@ export default {
     return {
       querySettings: {
         serviceid: '',
+        xAxisKey: 'flight_date',
+        // seriesKey: 'out_num'
       },
       formData: {
         td: '日',