代码合并

src/module/databoard/index.vue

@@ -4,7 +4,7 @@
       <display-board class="trade_left" title="营业情况">
         <div
           style="height: 100%; display: flex; flex-direction: column; justify-content: space-around; padding: 0 1rem 0 1rem;">
-          <contrast-card v-for="data in yyqk" style="height: 28%;" @click.native="routerTo1(paths[data.title])">
+          <contrast-card v-for="data in yyqk" style="height: 28%;" @click.native="routerTo('/turnover-detail',paths[data.title])">
             <title-content-mark style="width: 40%;color: #369afa;float: left;" :title="data.title"
                                 :content="data.amount" :mark="data.unit"/>
             <div
@@ -133,8 +133,8 @@
       </div>
       <display-board class="trade_right" title="当日订单量占比">
         <div style="height: 100%; display: flex; flex-direction: column; justify-content: space-around; padding: 0 1rem 0 1rem;">
-          <ring-pie-chart ref="transportTypeChart" style="width: 100%;height: 50%;z-index: 999" name="运输类型占比" :data="transportTypeOrderFinishPie" @click.native="routerTo1('/order-proportion')"/>
-          <ring-pie-chart ref="customerChart" style="width: 100%;height: 50%;" name="公司占比" :data="customerOrderFinishPie" @click.native="routerTo1('/order-proportion')"/>
+          <ring-pie-chart ref="transportTypeChart" style="width: 100%;height: 50%;z-index: 999" name="运输类型占比" :data="transportTypeOrderFinishPie" @click.native="routerTo('/order-proportion')"/>
+          <ring-pie-chart ref="customerChart" style="width: 100%;height: 50%;" name="公司占比" :data="customerOrderFinishPie" @click.native="routerTo('/order-proportion')"/>
         </div>
       </display-board>
     </div>
@@ -425,10 +425,11 @@ export default {
         this.charts[chartsKey].resize();
       }
     },
-    routerTo(code) {
-      this.$router.push({path: "/turnover-detail", query: {code: code}});
+    routerTo(path,code) {
+      this.$router.push({path: path, query: {code: code}});
     },
     routerTo1(path){
+      console.log(path)
       this.$router.push({path: path});
     },
     //营业情况