Merge branch 'dev'

src/attendance/view/AttendanceNew/ApplyRecord.vue

@@ -13,7 +13,7 @@
             <div class="content">
               <div class="title">
                 <div class="detail">{{ item.type_mark }}申请</div>
-                <div :class="{ wait: item.status == 0, refuse: item.status == -1 }" class="status">{{ filtetatus(item.status) }}</div>
+                <div :class="{ wait: item.status == 0, refuse: item.status == -1 }" class="status">{{ filterStatus(item.status) }}</div>
               </div>
               <div v-if="item.type == 4" class="desc">请假类型:{{ item.holiday_name }}</div>
               <div class="desc">申请时间:{{ item.application_time }}</div>

src/point/view/integral/deptRank.vue

@@ -1,17 +1,22 @@
 <template>
   <div class="mrd-container">
     <van-nav-bar title="部门对比" left-text="返回" @click-left="$route_back" left-arrow />
+
+    <!-- 条件筛选 -->
     <van-dropdown-menu v-if="showSearchBar">
-<!--  A/B分    -->
+      <!-- 时间选择 -->
       <van-dropdown-item @open="calendarOpen">
         <van-icon name="calendar-o" slot="title" size="1.5em" />
       </van-dropdown-item>
+      <!-- 部门选择 -->
       <van-dropdown-item :title="searchForm.deptName" ref="deptDropdownItem">
         <DeptSelectorDropdown @onConfirm="onConfirmDept" />
       </van-dropdown-item>
+      <!-- 规则选择 -->
       <van-dropdown-item title="规则" ref="ruleDropdownItem">
         <RuleCategorySelDropdown @onConfirm="onConfirmRule" @onCancel="searchForm.ruleId = 0"/>
       </van-dropdown-item>
+      <!--  积分类型 A/B分    -->
       <van-dropdown-item>
         <van-icon name="list-switch" slot="title" size="1.5em" />
         <template slot="default">
@@ -31,6 +36,8 @@
         </template>
       </van-dropdown-item>
     </van-dropdown-menu>
+
+    <!-- 数据列表 -->
     <div class="mrd-content">
       <scroller
         ref="scroller"
@@ -86,7 +93,7 @@
 <script>
 import Vue from 'vue';
 import moment from "moment/moment";
-import { DropdownMenu, DropdownItem ,Calendar,Switch} from 'vant';
+import { DropdownMenu, DropdownItem, Calendar, Switch} from 'vant';
 import DeptSelectorDropdown from '@/components/DeptSelectorDropdown';
 import RuleCategorySelDropdown from '@/components/RuleCategorySelDropdown';
 import ReconnectingWebSocket from "reconnecting-websocket";
@@ -105,6 +112,7 @@ export default {
     startDate.setTime(startDate.getTime() - 3600 * 1000 * 24 * 7);
     startDate = moment(startDate).format('YYYY-MM-DD');
     let endDate = moment().format('YYYY-MM-DD');
+    // 获取积分类型
     let pts = this.$getTypes.map(type => {
       return {value:type.id,text:type.name,code:type.code}
     });
@@ -119,18 +127,18 @@ export default {
     maxDate.setDate(0);
 
     return{
-      pts:pts,
+      pts: pts,
       searchForm:{
         startDate:startDate,
         endDate:endDate,
         deptId:0,
         deptName:'全公司',
         deptIncludeSub:false,
-        ptId:ptB ? ptB.value : 0,
+        ptId: ptB ? ptB.value : 0,
         ptName: ptB ? ptB.text : '',
-        ruleId:0,
-        ruleIncludeSub:false,
-        itemId:0
+        ruleId: 0,
+        ruleIncludeSub: false,
+        itemId: 0
       },
       dataList:[],
       showCalendar:false,

src/point/view/pointHome.vue

@@ -254,7 +254,6 @@ export default {
     return {
       // deptRank:false,
       userMonth:{task:{reward:{},deduction:{},exec:{}},ratio:{}},
-
       // rankingList: [], // 我的排名列表
       rankingTotal: 0, // 我的排名列表数
       situationChart: '', // 管理者奖扣
@@ -637,7 +636,7 @@ export default {
     opneWebSocket() {
       let data={type:"es_info",recorder_id:this.userInfo.id,month:this.month};
       this.$socketApiTow.sendData(data, (res) => {
-        if (res.code == 1&&res.type=='es_info') {
+        if (res.code == 1 && res.type=='es_info') {
             let data = res.result;
             var task = data.task;
             var ratio = task.ratio.enable== 0 ? '-' : `${task.ratio.reward_ratio}:1`
@@ -796,6 +795,7 @@ export default {
     },
     onWsMessage(event){
       let msg = event.data ?  JSON.parse(event.data) : null;
+      console.log(msg);
       if (!msg) return;
       let type = msg.type || 'none';
       switch (type){
@@ -879,7 +879,6 @@ export default {
       this.pk.pkTimeScope[0] = val[0]
       this.pk.pkTimeScope[1] = val[1]
       this.pk.pkTimeScopeStr = this.$moment(this.pk.pkTimeScope[0]).format("MM/DD") + "-" + this.$moment(this.pk.pkTimeScope[1]).format("MM/DD");
-      // if (this.pk.pkDocList.length > this.pk.currentDocIndex) this.getPkRankList(this.pk.pkDocList[this.pk.currentDocIndex].id)
       if (this.pk.pkDocList.length > this.pk.currentDocIndex) this.rwsPkRankList(this.pk.pkDocList[this.pk.currentDocIndex].id)
     }
   }

src/utils/auth.js

@@ -220,7 +220,7 @@ export function getUserData() {
 // 获取积分类型
 export function getTypes(id) {
   if (id) {
-    var arr = (window.plus ? JSON.parse(plus.storage.getItem('SET_POINT_TYPES')) : JSON.parse(localStorage.getItem('SET_POINT_TYPES')))||store.getters.point_types
+    var arr = (window.plus ? JSON.parse(plus.storage.getItem('SET_POINT_TYPES')) : JSON.parse(localStorage.getItem('SET_POINT_TYPES'))) || store.getters.point_types
     var item = arr.filter(element => {
       return typeof (id) === 'string' ? element.code == id : element.id == id
     })