src/views/base/deviceInfo-list.vue

@@ -81,11 +81,11 @@
         <template slot-scope="{row}">
           <div
             v-if="row.isOnline"
-            style="border-radius: 30px;background-color:#F56C6C;width:20px;height:20px;"
+            style="border-radius: 30px;background-color:#67C23A;width:20px;height:20px;"
           ></div>
           <div
             v-if="!row.isOnline"
-            style="border-radius: 30px;background-color:#67C23A;width:20px;height:20px;"
+            style="border-radius: 30px;background-color:#F56C6C;width:20px;height:20px;"
           ></div>
         </template>
       </el-table-column>

src/views/base/personDeviceRelation-BoundList.vue

@@ -197,7 +197,7 @@ export default {
                 });
               } else {
                 self.$message({
-                  type: "error",
+                  type: "warning",
                   message: jsonData.message
                 });
               }

src/views/business/workAttendance-list.vue

@@ -16,7 +16,7 @@
     <el-form
       ref="queryForm"
       :model="queryModel"
-      :rules="ruleValidate" 
+      :rules="ruleValidate"
       inline
       class="demo-form-inline"
     >
@@ -86,7 +86,9 @@ export default {
     return {
       ruleValidate: {
         companyId: [{ required: true, message: "不能为空", trigger: "blur" }],
-        timeRanges: [{ required: true, message: "请选择事件范围", trigger: "blur" }]
+        timeRanges: [
+          { required: true, message: "请选择事件范围", trigger: "blur" }
+        ]
       },
       queryModel: {
         companyId: "",
@@ -157,6 +159,7 @@ export default {
             if (jsonData.result) {
               if (jsonData.data != null) {
                 self.$message({
+                  type: "success",
                   showClose: true,
                   dangerouslyUseHTMLString: true,
                   message: `导出成功,<a href="${jsonData.data}" target="_blank">请点击下载考勤报表</a>&nbsp;`,
@@ -165,7 +168,7 @@ export default {
               }
             } else {
               self.$message({
-                type: "success",
+                type: "warning",
                 message: jsonData.message
               });
             }
@@ -177,21 +180,21 @@ 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 day = date.getDate();
-      if (month < 10) month = "0" + month;
-      if (day < 10) day = "0" + day;
-      var startTime = date.getFullYear() + "-" + month + "-" + day;
+      var startTime =
+        date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate();
 
       var lastDate = new Date();
-      lastDate.setMonth(date.getMonth() + 1);
-      //设置当前月份+1
-      lastDate.setDate(0);
-      //获取上个月最后一天=本月最后一天
-      var lastDay = lastDate.getDate();
-      var endTime = date.getFullYear() + "-" + month + "-" + lastDay;
-
+      lastDate.setMonth(lastDate.getMonth() + 2); //下月
+      //设置为第一天
+      lastDate.setDate(1);
+      var endTime =
+        lastDate.getFullYear() +
+        "-" +
+        lastDate.getMonth() +
+        "-" +
+        lastDate.getDate();
       self.queryModel.timeRanges = [startTime, endTime];
     }
   },