xiao547607 5 년 전
부모
커밋
0dde4a7816
3개의 변경된 파일15개의 추가작업 그리고 20개의 파일을 삭제
  1. 2 2
      .env.development
  2. 9 14
      src/views/base/personDeviceLog-list.vue
  3. 4 4
      src/views/business/workAttendance-list.vue

+ 2 - 2
.env.development

@@ -1,5 +1,5 @@
-#VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
+VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
+#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
 #VUE_APP_BACKEND_URL=http://192.168.33.26:8080/smart-community-server
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 #VUE_APP_BACKEND_URL=http://kr6zr7.natappfree.cc/smart-community-server/

+ 9 - 14
src/views/base/personDeviceLog-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/personDeviceLog">台账信息</a>
+        <a href="/personDeviceLog">考勤记录</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -88,7 +88,7 @@
       >导出数据</el-button>
     </el-row>
     <el-table
-    ref="tablesssssss"
+      ref="tablesssssss"
       :data="tableData"
       style="min-height:400px;"
       v-loading="loading"
@@ -298,22 +298,17 @@ export default {
       //date.get(1);
       var month = parseInt(date.getMonth() + 1);
       //获取三天前时间
-      var day = date.getDate() - 3;
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
+      var day = date.getDate() - 7;
       var startTime =
         date.getFullYear() + "-" + month + "-" + day + " 00:00:00";
 
-      var lastDate = new Date();
-      lastDate.setMonth(date.getMonth() + 1);
-      //设置当前月份+1
-      //lastDate.setDate(0);
-      //获取上个月最后一天=本月最后一天
-      //var lastDay = lastDate.getDate() - 1;
-      //获取三天后时间
-      var lastDay = lastDate.getDate() + 3;
       var endTime =
-        date.getFullYear() + "-" + month + "-" + lastDay + " 23:59:59";
+        date.getFullYear() +
+        "-" +
+        month +
+        "-" +
+        date.getDate() +
+        " 23:59:59";
 
       self.queryModel.timeRanges = [startTime, endTime];
     }

+ 4 - 4
src/views/business/workAttendance-list.vue

@@ -313,19 +313,19 @@ export default {
     getCurrentMonthFirst() {
       var self = this;
       var date = new Date();
-      date.setMonth(date.getMonth() + 1); //本月
       date.setDate(1);
+      var month = parseInt(date.getMonth() + 1)
       var startTime =
-        date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate();
+        date.getFullYear() + "-" + month + "-" + date.getDate();
 
       var lastDate = new Date();
-      lastDate.setMonth(lastDate.getMonth() + 2); //下月
       //设置为第一天
       lastDate.setDate(1);
+      var lastMonth = parseInt(lastDate.getMonth() + 2)
       var endTime =
         lastDate.getFullYear() +
         "-" +
-        lastDate.getMonth() +
+        lastMonth +
         "-" +
         lastDate.getDate();
       self.queryModel.timeRanges = [startTime, endTime];