Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/views/pile/merchant/components/revenue.vue

@@ -55,7 +55,13 @@
         <el-table @selection-change="handleSelectionChange" :data="reportList">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="交易日期" align="center" prop="tradeDate" />
-            <el-table-column label="站点名称" align="center" prop="stationName" />
+            <el-table-column label="站点名称" align="center" prop="stationName" >
+<!--                <template slot-scope="scope">-->
+
+<!--                    <span class="link-type" @click="goStationOrderReport(scope)">{{ scope.row.stationName }}</span>-->
+<!--                </template>-->
+            </el-table-column>
+
             <el-table-column
                 label="用电度数"
                 align="center"
@@ -147,6 +153,16 @@ export default {
                 }
             );
         },
+        goStationOrderReport(scope) {
+            this.$router.push({
+                path: 'station/orderReport',
+                name: 'Report',
+                params: {
+                    id: scope.row.id,
+                    stationName: scope.row.stationName,
+                }
+            });
+        },
         handleQuery() {
             let arr = this.createTimeRange[0]
             let str = this.createTimeRange[1]