fix

web/src/views/system/CheckInRecord/index.vue

@@ -0,0 +1,279 @@
+<template>
+  <div class="app-container"
+       style="height:100%;"
+       v-loading="loadingopt"
+       element-loading-text="操作执行中"
+       element-loading-spinner="el-icon-loading">
+    <div class="head-container">
+      <div style="width:100%;">
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <!-- 搜索 -->
+            <div style="display: inline-block; width: 380px; margin-right: 10px;">
+              <date-range-picker v-model="searchDate" @change="getList" type="datetimerange" class="date-item" style="width: 100% !important;" />
+            </div>
+            <el-input  v-model="selectparameter.fRealname" clearable size="small" placeholder="姓名搜索" style="width: 300px;" class="filter-item" />
+            <span>
+    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="btnsearch" >搜索</el-button>
+    <el-button  class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="btnreset" >重置</el-button>
+        </span>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+    <el-row :gutter="24">
+      <!-- 列表 -->
+      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+        <el-card class="box-card box-cardh map-container" shadow="never" style="overflow:auto;">
+          <!--表格渲染-->
+          <el-table
+            v-loading="loadinglist"
+            element-loading-text="数据加载中"
+            element-loading-spinner="el-icon-loading"
+            :data="tableData"
+            @selection-change="selectionLineChangeHandle"
+            style="width: 100%;" >
+            <el-table-column :selectable="checkboxT" type="selection" width="55" />
+            <el-table-column :show-overflow-tooltip="true" prop="fRealname" label="打卡人" />
+            <el-table-column :show-overflow-tooltip="true" label="打卡类型">
+              <template slot-scope="scope">
+                {{ scope.row.fWorktype === 1 ? '上班打卡' : scope.row.fWorktype === 2 ? '下班打卡' : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="fExpand2" label="所属公园"/>
+            <el-table-column :show-overflow-tooltip="true" prop="fExpand1" label="打卡地点"/>
+            <el-table-column :show-overflow-tooltip="true" prop="fWorktime" align="center" sortable label="打卡时间" />
+          </el-table>
+          <!--分页组件-->
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="totals"
+          ></el-pagination>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-dialog append-to-body
+               width="50%"
+               :close-on-click-modal="false"
+               :destroy-on-close="true"
+               :before-close="dialogClose"
+               :title="`${dialogTitle}`"
+               :visible.sync="dialogFormVisible">
+      <el-scrollbar
+        v-loading="loadingdialog"
+        element-loading-text="数据保存中"
+        element-loading-spinner="el-icon-loading"
+        style="height:280px">
+        <el-form ref="form" :model="dialogModel" label-width="100px" size="small" style="width:80%">
+          <el-row :gutter="20">
+            <el-col :span="24">
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-scrollbar>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogClose" style="border:0px ">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import request from '@/utils/request'
+  import DateRangePicker from '@/components/DateRangePicker'
+  import { downloadFile, downloadFileByPath } from '@/utils/index'
+  export default {
+    name: 'CheckInRecord',
+    components: { DateRangePicker },
+    data() {
+      return {
+        dialogFormVisible: false,
+        dialogTitle: '',
+        dialogModel: {
+          id: null
+        },
+        loadingopt: false,
+        loadinglist: false,
+        loadingdialog: false,
+        downloadLoading: false,
+        parklist: [],
+        pickerOptions: {
+          shortcuts: [
+            {
+              text: '当日',
+              onClick(picker) {
+                picker.$emit('pick', [new Date(), new Date()])
+              }
+            },
+            {
+              text: '本月',
+              onClick(picker) {
+                picker.$emit('pick', [moment(new Date()).format('YYYY-MM-' + '01'), new Date()])
+              }
+            },
+            {
+              text: '今年至今',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date(new Date().getFullYear(), 0)
+                picker.$emit('pick', [start, end])
+              }
+            },
+            {
+              text: '最近六个月',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                start.setMonth(start.getMonth() - 6)
+                picker.$emit('pick', [start, end])
+              }
+            }
+          ]
+        },
+        //  表格 数据
+        tableData: [],
+        dataonLineListSelections: [],
+        bldeleteselect: true,
+        // 分页 : 第1页
+        currentPage: 1,
+        // 总数
+        totals: 0,
+        searchDate: [],
+        // 列表传参
+        selectparameter: {
+          current: 1,
+          size: 10,
+          fRealname: '',
+          workStartTime: null,
+          workwEndTime: null
+        }
+      }
+    },
+    created() {
+      // 获取 列表
+      this.getList()
+    },
+    methods: {
+      dialogClose() {
+        this.dialogFormVisible = false
+        this.dialogModel = {
+          id: null
+        }
+      },
+      btnsearch() {
+        // 获取 列表
+        this.getList()
+      },
+      btnreset() {
+        this.searchDate = []
+        this.selectparameter = {
+          current: 1,
+          size: 10,
+          fRealname: '',
+          workStartTime: null,
+          workwEndTime: null
+        }
+        this.btnsearch()
+      },
+      // 请求列表
+      getList() {
+        this.loadinglist = true
+        if (this.searchDate !== null) {
+          if (this.searchDate.length > 0) {
+            this.selectparameter.workStartTime = this.searchDate[0]
+            this.selectparameter.workwEndTime = this.searchDate[1]
+          }
+        }
+        request({
+          url: '/tbaseemployeeworkrecords/selectEmployeeworkrecordsByPageList',
+          method: 'post',
+          data: this.selectparameter
+        })
+          .then(res => {
+            this.loadinglist = false
+            if (res.status === 200) {
+              this.tableData = res.data.data
+              this.totals = res.data.total
+            } else {
+              this.$message.error('加载失败:' + res.data)
+            }
+          })
+          .catch(err => {
+            this.loadinglist = false
+            this.$message.error(err || '加载失败')
+          })
+      },
+      checkboxT(row, rowIndex) {
+        return row.id !== 1
+      },
+      // 分页功能
+      handleSizeChange(val) {
+        this.selectparameter.size = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.selectparameter.current = val
+        // this.currentPage=val;
+        this.getList()
+      },
+      selectionLineChangeHandle(val) {
+        this.dataonLineListSelections = val
+        if (this.dataonLineListSelections.length > 0) {
+          this.bldeleteselect = false
+        } else {
+          this.bldeleteselect = true
+        }
+      }
+    }
+  }
+</script>
+<style rel="stylesheet/scss" lang="scss">
+  .el-dialog__header {
+    padding: 10px;
+    padding-bottom: 10px;
+  }
+  .el-dialog__headerbtn {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    padding: 0;
+    background: transparent;
+    border: none;
+    outline: none;
+    cursor: pointer;
+    font-size: 16px;
+  }
+  .el-dialog__body {
+    padding: 15px 10px;
+    color: #606266;
+    font-size: 14px;
+    word-break: break-all;
+  }
+  .el-card__body {
+    padding: 0px;
+    height: 100%;
+  }
+
+  .box-cardh {
+    height: calc(100vh - 170px);
+  }
+  .el-scrollbar__wrap{
+    overflow-x: hidden;
+  }
+  .custom-tree-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    padding-right: 8px;
+  }
+  .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+    background-color: #e7faf0;
+  }
+</style>

web/src/views/system_manage/logs/loginloglist.vue

@@ -9,10 +9,7 @@
         <el-row :gutter="24">
           <el-col :span="24">
             <!-- 搜索 -->
-            <date-range-picker v-model="searchDate"
-                               @change="getList"
-                               type="datetimerange"
-                               class="date-item" />
+            <date-range-picker v-model="searchDate" @change="getList" type="datetimerange" class="date-item" />
             <el-input  v-model="selectparameter.fLoginname" clearable size="small" placeholder="姓名搜索" style="width: 150px;" class="filter-item" />
             <span>
     <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="btnsearch" >搜索</el-button>

wxproject/packageA/pages/recordDetail/recordDetail.js

@@ -61,8 +61,8 @@ Page({
     var data = {
       size: 15,
       current: that.data.pageNum,
-      startTime: that.data.time3,
-      endTime: that.data.time4,
+      workStartTime: that.data.time3,
+      workEndTime: that.data.time4,
       fExpand2: that.data.objectName,
       fRealname: that.data.directorName,
       fExpandint1: that.data.fUserid,
@@ -164,29 +164,31 @@ Page({
   // 筛选日期（开始）
   bindDateChange3(e) {
     let val = e.detail.value;
-    let times = new Date(val + ' 00:00:00').getTime();
+    let timeStr = val + ' 00:00:00';
+    let times = new Date(timeStr).getTime();
     if (this.data.time4) {
-      if (times >= this.data.time4) {
+      if (times >= new Date(this.data.time4).getTime()) {
         return app.toast('不能大于结束时间');
       }
     }
     this.setData({
       date3: val,
-      time3: times,
+      time3: timeStr,
     });
   },
   // 筛选日期（结束）
   bindDateChange4(e) {
     let val = e.detail.value;
-    let times = new Date(val + ' 23:59:59').getTime();
+    let timeStr = val + ' 23:59:59';
+    let times = new Date(timeStr).getTime();
     if (this.data.time3) {
-      if (times <= this.data.time3) {
+      if (times <= new Date(this.data.time3).getTime()) {
         return app.toast('不能小于开始时间');
       }
     }
     this.setData({
       date4: val,
-      time4: times,
+      time4: timeStr,
     });
   },