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

src/components/administrative/ExaminationStatistics.vue

@@ -214,7 +214,7 @@ export default {
       };
       let periods = {
         field: "periods",
-        title: this.$t('fnc.qishu'),
+        title: this.$t('tips.qishu'),
         titleAlign: "left",
         columnAlign: "left",
         isResize: true,
@@ -236,30 +236,7 @@ export default {
           return `<span>${rowData.rejectCount <= 0 ? '' : rowData.rejectCount}</span>`
         }
       };
-      // let receivedPeopleCount = {
-      //   field: "receivedPeopleCount",
-      //   title: this.$t('objFill.v101.SalesModule.col.t2'),
-      //   titleAlign: "left",
-      //   columnAlign: "left",
-      //   isResize: true,
-      //   width: 100,
-      //   orderBy: "",
-      //   formatter: function(rowData, rowIndex, pagingIndex, field) {
-      //     return `<span>${rowData.receivedPeopleCount <= 0 ? '' : rowData.receivedPeopleCount}</span>`
-      //   }
-      // };
-      // let orderCount = {
-      //   field: "orderCount",
-      //   title: this.$t('objFill.v101.SalesModule.col.t3'),
-      //   titleAlign: "left",
-      //   columnAlign: "left",
-      //   isResize: true,
-      //   width: 80,
-      //   orderBy: "",
-      //   formatter: function(rowData, rowIndex, pagingIndex, field) {
-      //     return `<span>${rowData.orderCount <= 0 ? '' : rowData.orderCount}</span>`
-      //   }
-      // };
+      
       let uncollected = {
         field: "uncollected",
         title: this.$t('objFill.v101.SalesModule.col.t4'),
@@ -403,8 +380,7 @@ export default {
       this.columns.push(shaoJian);
       this.columns.push(shenHeShiJian);
       this.columns.push(rejectCount);
-      // this.columns.push(receivedPeopleCount);
-      // this.columns.push(orderCount);
+   
       this.columns.push(uncollected);
       this.columns.push(lateCount);
       this.columns.push(leaveEarlyCount);
@@ -430,7 +406,7 @@ export default {
         if(param.leaveEarlyCount!=''){
           this.msg.OrderBy='a.LeaveEarlyCount '+param.leaveEarlyCount
         }
-        if(param.orderCount!=''){
+        if(param.orderCount && param.orderCount!='' && param.orderCount!='undefined'){
           this.msg.OrderBy='a.OrderCount '+param.orderCount
         }
         if(param.receivedPeopleCount && param.receivedPeopleCount!=''){

src/components/scenicSpot/scenicSpotList.vue

@@ -318,7 +318,7 @@
           </div>
         </div>
         <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
-          <div class="hotelTitle">{{item.Name}}</div>
+          <div class="hotelTitle" style="font-family:Arial;">{{item.Name}}</div>
         </el-tooltip>
         <el-tooltip class="item" effect="dark" :content="item.UpdateName+''+item.UpdateTimeStr" placement="top-start"
           popper-class="max-w250">