Merge remote-tracking branch 'origin/master'

ebc-middle-platform/src/conf/services.js

@@ -160,6 +160,7 @@ export default {
    // GET_TOKEN: '/gisParam/gisToken',
    GET_MAP_PARAM: '/gisParam/seaMapParam',
    GET_MAP_TAG: '/mapTag/queryPageMapTagInfo', // 查询地图标记信息
    GET_MAP_TAG1: '/mapTag/queryPageMapTagInfo', // 查询地图标记信息
    GET_ALL_MAP_TAG: '/mapTag/queryAllMapTagInfo', // 查询地图标记信息
    GET_ONE_MAP_TAG: '/mapTag/queryOneMapTagInfo', // 查询地图标记信息
    ADD_MAP_TAG: '/mapTag/addMapTagInfo', // 新增地图标记信息
@@ -198,8 +199,8 @@ export default {
    GET_MORE_TRACE: '/trackManagement/queryMoreEmployeeTrace' // 多人轨迹回放
  },
  areaInOutRecord: {
    GET_ATTENDANCE: '/areaInOutRecord/queryPageAttendanceCount', // 分页查询考勤统计分析
    GET_ATTENDANCE_DETAILE: '/areaInOutRecord/queryPageAttendanceRecordDetaile' // 分页查询考勤统计分析
    GET_ATTENDANCE: '/AttendanceManage/queryAttendanceInfo', // 分页查询考勤统计分析
    GET_ATTENDANCE_DETAILE: '/AttendanceManage/queryAttendanceDetailsInfo' // 分页查询考勤统计分析
  },
  excel: {
    EXPROT_MAP_TAG: '/ExportToExcel/exportMapTagInfoToExcel' // 导出地图标记信息

ebc-middle-platform/src/modules/attendance/attendance.vue

@@ -35,10 +35,10 @@
    </div>
    <div>
      <t-table :data="table.data">
        <t-table-column prop="userName" label="姓名"></t-table-column>
        <t-table-column prop="duty" label="职务"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex === 0" prop="IN_DATE" label="打卡时间"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex !== 0" prop="gateDays" label="出勤天数（天）"></t-table-column>
        <t-table-column prop="name" label="姓名"></t-table-column>
        <t-table-column prop="mainJobPositionId" label="职务"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex === 0" :formatter="time_formatter" prop="goToWorkTime" label="打卡时间"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex !== 0" prop="clockingDays" label="出勤天数（天）"></t-table-column>
        <t-table-column
          v-if="queryCondition.currentIndex === 1"
          fixed="right"
@@ -78,8 +78,8 @@
      </div>
      <div>
        <t-table :data="modalData.table">
          <t-table-column prop="date" label="日期"></t-table-column>
          <t-table-column prop="printTime" label="打卡时间" ></t-table-column>
          <t-table-column prop="workDay" label="日期"></t-table-column>
          <t-table-column :formatter="time_formatter" prop="goToWorkTime" label="打卡时间" ></t-table-column>
        </t-table>
      </div>
    </t-modal>
@@ -92,17 +92,17 @@
      </div>
      <div>
        <t-table :data="monthModalData.table.data">
          <t-table-column prop="date" label="日期"></t-table-column>
          <t-table-column prop="printTime" label="打卡时间" ></t-table-column>
          <t-table-column prop="workDay" label="日期"></t-table-column>
          <t-table-column :formatter="time_formatter" prop="goToWorkTime" label="打卡时间" ></t-table-column>
        </t-table>
        <t-pager :total="monthModalData.table.pager.total" :current.sync="monthModalData.table.pager.currentPage"
                 :page-size.sync="monthModalData.table.pager.size"
                 :sizer-range="[10,20,50]"
                 class="px-24 pt-16 float-right"
                 show-elevator show-sizer
                 @on-size-change="onModalSizeChange"
                 @on-change="onModalPagerChange">
        </t-pager>
<!--        <t-pager :total="monthModalData.table.pager.total" :current.sync="monthModalData.table.pager.currentPage"-->
<!--                 :page-size.sync="monthModalData.table.pager.size"-->
<!--                 :sizer-range="[10,20,50]"-->
<!--                 class="px-24 pt-16 float-right"-->
<!--                 show-elevator show-sizer-->
<!--                 @on-size-change="onModalSizeChange"-->
<!--                 @on-change="onModalPagerChange">-->
<!--        </t-pager>-->
      </div>
    </t-modal>
  </div>
@@ -163,9 +163,10 @@ export default {
  methods: {
    changeType(index) {
      this.queryCondition.currentIndex = index
      if (this.queryCondition.singleDateVal == '') {
        this.queryCondition.singleDateVal = this.getTime(2)
      }
      // if (this.queryCondition.singleDateVal == '') {
      //
      // }
      this.queryCondition.singleDateVal = this.getTime(2)
      this.queryCondition.dateType = !(index === 2)
      this.getList()
    },
@@ -191,63 +192,44 @@ export default {
      this.getList()
    },
    getList() {
      this.table.data = [{
        userName: '周杰',
        duty: '员工',
        IN_DATE: '2020-11-25 10:57:02',
        gateDays: 5
      }, {
        userName: '李雷',
        duty: '员工',
        IN_DATE: '2020-11-25 11:05:30',
        gateDays: 5
      }, {
        userName: '刘伟',
        duty: '员工',
        IN_DATE: '2020-11-25 11:03:04',
        gateDays: 5
      }, {
        userName: '韩梅梅',
        duty: '救援',
        IN_DATE: '2020-11-25 11:02:32',
        gateDays: 4
      }]
      this.table.pager.total = 10
      // var mark
      // if (this.queryCondition.currentIndex === 0) {
      //   mark = 'day'
      // } else if (this.queryCondition.currentIndex === 1) {
      //   mark = 'week'
      // } else {
      //   mark = 'month'
      // }
      // var params = new FormData()
      // params.append(
      //     'data',
      //     JSON.stringify({
      //       currentDate: this.queryCondition.singleDateVal,
      //       mark: mark,
      //       userName: this.queryCondition.alarmPerson,
      //       pageNum: this.table.pager.currentPage,
      //       pageSize: this.table.pager.size
      //     })
      // )
      // this.$test
      //     .post(services.areaInOutRecord.GET_ATTENDANCE, {
      //       currentDate: this.queryCondition.singleDateVal,
      //       mark: mark,
      //       userName: this.queryCondition.alarmPerson,
      //       pageNum: this.table.pager.currentPage,
      //       pageSize: this.table.pager.size
      //     })
      //     .then((res) => {
      //       // 请求成功处理...
      //       this.table.data = res.data.list
      //       this.table.pager.total = res.data.total
      //     })
      //     .catch((res) => {
      //       // 请求失败处理...
      //     })
      var mark
      if (this.queryCondition.currentIndex === 0) {
        mark = 'day'
        if (this.queryCondition.singleDateVal == ''){
          this.queryCondition.singleDateVal = this.getTime(2)
        }
      } else if (this.queryCondition.currentIndex === 1) {
        mark = 'week'
        if (this.queryCondition.singleDateVal == ''){
          this.queryCondition.singleDateVal = this.getTime(2)
        }
      } else {
        mark = 'month'
        if (this.queryCondition.singleDateVal == '' || this.queryCondition.singleDateVal.length > 8 ){
          this.queryCondition.singleDateVal = this.getTime(1)
        }
      }
      var startDay = this.getBeforeDate(6, this.queryCondition.singleDateVal)
      this.$test
        .post(services.areaInOutRecord.GET_ATTENDANCE, {
          data: {
            mark: mark,
            currentDate: this.queryCondition.singleDateVal,
            startDay: startDay,
            userName: this.queryCondition.alarmPerson
          },
          pageNumber: this.table.pager.currentPage,
          pageSize: this.table.pager.size
        })
        .then((res) => {
          // 请求成功处理...
          this.table.data = res.data.data
          this.table.pager.total = res.data.total
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    onSearch() {
      this.table.pager.currentPage = 1
@@ -283,23 +265,24 @@ export default {
        data = this.queryCondition.singleDateVal
      }
      this.modalData.date = this.getBeforeDate(6, data) + ' ~ ' + data
      var beginDay = this.getBeforeDate(6, data)
      this.modalData.userName = row.userName
      this.modalData.duty = row.duty
      this.modalData.days = row.gateDays
      var params = new FormData()
      params.append(
        'data',
        JSON.stringify({
          EMPLOYEE_ID: row.EMPLOYEE_ID,
          mark: 'week',
          currentDate: this.queryCondition.singleDateVal
        })
      )
      this.$test
        .post(services.areaInOutRecord.GET_ATTENDANCE_DETAILE, params)
        .post(services.areaInOutRecord.GET_ATTENDANCE_DETAILE, {
          data:{
            id:row.id+"",
            mark:'week',
            beginDay:beginDay,
            endDay:this.queryCondition.singleDateVal
          },
          pageNumber:0,
          pageSize:0
        })
        .then((res) => {
          // 请求成功处理...
          this.modalData.table = res.data.list
          this.modalData.table = res.data
        })
        .catch((res) => {
          // 请求失败处理...
@@ -316,31 +299,40 @@ export default {
      this.monthModalData.duty = row.duty
      this.monthModalData.days = row.gateDays
      this.monthModalData.EMPLOYEE_ID = row.EMPLOYEE_ID
      this.getMonthDetail()
    },
    getMonthDetail() {
      var params = new FormData()
      params.append(
        'data',
        JSON.stringify({
          EMPLOYEE_ID: this.monthModalData.EMPLOYEE_ID,
          mark: 'month',
          currentDate: this.queryCondition.singleDateVal,
          pageNum: this.monthModalData.table.pager.currentPage,
          pageSize: this.monthModalData.table.pager.size
        })
      )
      this.$test
        .post(services.areaInOutRecord.GET_ATTENDANCE_DETAILE, params)
        .post(services.areaInOutRecord.GET_ATTENDANCE_DETAILE, {
          data:{
            id:row.id+"",
            mark:'month',
            beginDay:this.queryCondition.singleDateVal,
            endDay:this.queryCondition.singleDateVal
          },
          pageNumber:0,
          pageSize:0
        })
        .then((res) => {
          // 请求成功处理...
          this.monthModalData.table.data = res.data.list
          this.monthModalData.table.pager.total = res.data.total
          this.monthModalData.table.data = res.data
          // this.monthModalData.table.pager.total = res.data.total
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    getMonthDetail() {
      // var params = new FormData()
      // params.append(
      //   'data',
      //   JSON.stringify({
      //     EMPLOYEE_ID: this.monthModalData.EMPLOYEE_ID,
      //     mark: 'month',
      //     currentDate: this.queryCondition.singleDateVal,
      //     pageNum: this.monthModalData.table.pager.currentPage,
      //     pageSize: this.monthModalData.table.pager.size
      //   })
      // )
    },
    getTime(type) {
      var date = new Date()
      var year = date.getFullYear()
@@ -358,12 +350,12 @@ export default {
    getBeforeDate(days, date) {
      var now
      if (date !== '') {
        var arr = date.split('-')
        now = new Date(arr[0], arr[1], arr[2]).getTime()
        // var arr = date.split('-')
        now = Date.parse(date)
      } else {
        now = new Date().getTime()
      }
      var ago = now - 186400000 * days // 一天的毫秒数为86400000
      var ago = now - 5118400000 // 一天的毫秒数为86400000
      var agoData = new Date(ago)
      var year = agoData.getFullYear()
      var mon = agoData.getMonth() + 1
@@ -371,6 +363,12 @@ export default {
      mon = mon < 10 ? '0' + mon : mon
      day = day < 10 ? '0' + day : day
      return year + '-' + mon + '-' + day
    },
    time_formatter(row, column) {
      if (row.goToWorkTime){
        var json_date = new Date(row.goToWorkTime).toJSON()
        return new Date(new Date(json_date) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
      }
    }
  }
}

ebc-middle-platform/src/modules/orientation/orientation.vue

@@ -934,9 +934,9 @@ export default {
        this.trackMap.remove()
      }
      this.trackMap = new Ai.Map('track-map', {
        // ak: this.$store.getters.getGisToken,
        ak: 'MTYwNzQMTAwMU1UWXdOelE1TXpnME5EYzBOU015T0RFeE1UYz0_',
        center: [39.915599, 122.406568]
        ak: this.$store.getters.getGisToken,
        center: this.$store.getters.getMapParam.center,
        zoom: this.$store.getters.getMapParam.zoom
      })
      var maplayer = Ai.TileLayer(GIS_SEA_LAYER_URL)
      var la = Ai.WMTSLayer(GIS_SEA_URL, {opacity: 0.5})