Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -103,9 +103,9 @@
           <button class="hollowFixedBtn" @click="getStatement">
             {{ $t("pub.searchBtn") }}
           </button>
-          <button class="normalBtn" @click="exportExcel">
+          <!-- <button class="normalBtn" @click="exportExcel">
             导出
-          </button>
+          </button> -->
         </li>
       </ul>
     </div>

src/components/Restaurant/restaurantRankingList.vue

@@ -288,17 +288,17 @@
       </el-table-column>
       <el-table-column prop="UserNum" label="使用次数">
       </el-table-column>
-      <el-table-column prop="PriceNormalPeopleNum" label="常规团使用次数">
+      <el-table-column prop="PriceNormalUseNum" label="常规团使用次数">
       </el-table-column>
-      <el-table-column prop="PriceNormalUseNum" label="常规团使用人数">
+      <el-table-column prop="PriceNormalPeopleNum" label="常规团使用人数">
       </el-table-column>
-      <el-table-column prop="PriceOneDayTripPeopleNum" label="小包团使用次数">
+      <el-table-column prop="PriceOneDayTripUseNum" label="小包团使用次数">
       </el-table-column>
-      <el-table-column prop="PriceOneDayTripUseNum" label="小包团使用人数">
+      <el-table-column prop="PriceOneDayTripPeopleNum" label="小包团使用人数">
       </el-table-column>
-      <el-table-column prop="PricePacketGroupPeopleNum" label="当地游团使用次数">
+      <el-table-column prop="PricePacketGroupUseNum" label="当地游团使用次数">
       </el-table-column>
-      <el-table-column prop="PricePacketGroupUseNum" label="当地游团使用人数">
+      <el-table-column prop="PricePacketGroupPeopleNum" label="当地游团使用人数">
       </el-table-column>
       <el-table-column :label="$t('system.table_operation')" width="150">
         <template slot-scope="scope">

src/router/config.js

@@ -1529,6 +1529,14 @@ export default {
                 title: '餐厅使用排行'
               },
             },
+            {
+              path: '/domesticRestaurantList', //餐厅使用排行
+              name: 'domesticRestaurantList',
+              component: resolve => require(['@/components/Restaurant/domesticRestaurantList'], resolve),
+              meta: {
+                title: '国内餐厅信息管理'
+              },
+            },
             {
               path: '/demesticRestaurantInfoManage', //国内餐厅信息管理
               name: 'demesticRestaurantInfoManage',