Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/router/index.js

@@ -729,12 +729,7 @@ export const asyncRouterMap = [{
       component: _import('statistics/orderStatistics'),
       name: '订单统计',
       authority: 'orderStatistics'
-    }, {
-      path: 'vehicleStatistics',
-      component: _import('statistics/vehicleStatistics'),
-      name: '车辆统计',
-      authority: 'vehicleStatistics'
-		}
+    }
   ]
 },
 {
@@ -759,7 +754,12 @@ export const asyncRouterMap = [{
       component: _import('financial/branchCompany'),
       name: '总公司报表',
       authority: 'branchCompany'
-    }
+    }, {
+      path: 'vehicleStatistics',
+      component: _import('financial/vehicleStatistics'),
+      name: '车辆统计',
+      authority: 'vehicleStatistics'
+		}
   ]
 }
 ];

src/views/statistics/vehicleStatistics.vue → src/views/financial/vehicleStatistics.vue

@@ -34,7 +34,7 @@
 								filterable
 								placeholder="请选择"
 								getAllBranchCompanyChange
-							>
+							 >
 								<el-option :key="undefined" label="无" :value="undefined"></el-option>
 								<el-option
 									v-for="item in allBranchCompany"
@@ -65,7 +65,10 @@
 				</el-table-column>
 				<el-table-column align="center" label="停靠车辆数量">
 					<template scope="scope">
-						<span>{{scope.row.vehicleNum}}</span>
+<!-- 						<span>{{scope.row.vehicleNum}}</span>
+ -->					<span v-if="listQuery.type==1">{{scope.row.vehicleNum}}</span>
+						<span v-if="listQuery.type==2">{{Math.ceil(scope.row.vehicleNum/7)}}</span>
+						<span v-if="listQuery.type==3">{{Math.ceil(scope.row.vehicleNum/30)}}</span>
 					</template>
 				</el-table-column>
 			</el-table>

src/views/vehicle/bookInfoViewer.vue

@@ -15,7 +15,7 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
-      <table cellpadding="0" cellspacing="0" style=" width: 100%; border: 2px solid rgba(131, 145, 165, 0.43) ">
+     <!-- <table cellpadding="0" cellspacing="0" style=" width: 100%; border: 2px solid rgba(131, 145, 165, 0.43) ">
         <tbody class="el-date-table" style="">
         <tr style="font-size: 30px">
           <th style="font-size: 30px">日</th>
@@ -34,7 +34,7 @@
           </td>
         </tr> -->
         </tbody>
-      </table>
+      </table> -->
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel4BookInfo('form4BookInfo')">确 定</el-button>
       </div>