提交

src/views/incidentList.vue

@@ -211,10 +211,10 @@ export default {
           text: "处理过",
           value: "done"
         },
-        {
-          text: "我创建",
-          value: "create"
-        }
+        // {
+        //   text: "我创建",
+        //   value: "create"
+        // }
       ],
       searchType: "userAll",
       type: "all",
@@ -401,7 +401,9 @@ export default {
         this.type = this.$route.params.type;
         if (this.type === "todo") {
           this.searchType = "todo";
-        } else {
+        }else if(this.type === "done"){
+          this.searchType = "done";
+        }else {
           this.searchType = "userAll";
         }
       }

src/views/my.vue

@@ -66,7 +66,7 @@
             <span>{{ incidentCount.incidentDone || 0 }}</span>
           </div>
         </div>
-        <div class="status" @click="toIncidentList('create')">
+        <!-- <div class="status" @click="toIncidentList('create')">
           <div>
             <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-daipingjia"></use>
@@ -76,7 +76,7 @@
             <span>我创建</span>
             <span>{{ incidentCount.incidentCreate || 0 }}</span>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
     <div class="myRapir">
@@ -149,9 +149,6 @@ export default {
         }).show()
         return;
       }
-      // 本地测试
-      // this.goToWork(online, '123');
-      // return;
       let _this = this;
       this.toast = this.$createToast({
         time: 0,
@@ -159,6 +156,9 @@ export default {
         txt: "正在加载中"
       });
       this.toast.show();
+      // 本地测试
+      // this.goToWork(online, '123');
+      // return;
       //第二个参数 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
       sdk.getLocation(res => {
         // alert(JSON.stringify(res));
@@ -186,18 +186,18 @@ export default {
       this.$http
         .post("service/auth/online", { online, address })
         .then(res => {
-          this.toast.hide();//本地测试
           if (res.data.status == 200) {
-            this.online = online;
-            const t = this.$createToast({
-              type: "txt",
-              txt: online == 1 ? "上班成功" : "下班成功"
-            });
-            t.show();
-            setTimeout(() => {
-              t.hide();
-            }, 1000);
+            this.$http
+              .post("service/auth/showOnlineBtn", {})
+              .then((res) => {
+                this.toast.hide();
+                if(res.data.status == 200){
+                  this.online = res.data.online;
+                  this.showToast(online, '成功');
+                }
+              });
           } else {
+            this.toast.hide();
              this.$createDialog({
               type: 'confirm',
               icon: 'cubeic-alert',
@@ -225,26 +225,19 @@ export default {
                 this.$http
                 .post("service/auth/online", { online, address, confirm:'ok' })
                 .then(res => {
-                  this.toast.hide();
                   if (res.data.status == 200) {
-                    this.online = online;
-                    const t = this.$createToast({
-                      type: "txt",
-                      txt: online == 1 ? "上班成功" : "下班成功"
+                    this.$http
+                    .post("service/auth/showOnlineBtn", {})
+                    .then((res) => {
+                      this.toast.hide();
+                      if(res.data.status == 200){
+                        this.online = res.data.online;
+                        this.showToast(online, '成功')
+                      }
                     });
-                    t.show();
-                    setTimeout(() => {
-                      t.hide();
-                    }, 1000);
                   }else{
-                    const t = this.$createToast({
-                      type: "txt",
-                      txt: online == 1 ? "上班失败" : "下班失败"
-                    });
-                    t.show();
-                    setTimeout(() => {
-                      t.hide();
-                    }, 1000);
+                    this.toast.hide();
+                    this.showToast(online, '失败')
                   }
                 })
               },
@@ -252,6 +245,17 @@ export default {
           }
         });
     },
+    // 展示信息
+    showToast(online, msg){
+      const t = this.$createToast({
+        type: "txt",
+        txt: online == 1 ? "上班"+msg : "下班"+msg
+      });
+      t.show();
+      setTimeout(() => {
+        t.hide();
+      }, 1000);
+    },
     // 工作组
     getGroups() {
       var that = this;
@@ -309,6 +313,8 @@ export default {
                     this.online = res.data.online;
                   }
                 });
+            }else{
+              this.isWorkLoading = false;
             }
           }
         });

src/views/workList.vue

@@ -170,7 +170,9 @@ export default {
       }
       if (this.searchType2 === "1") {
         //实到
-        this.items = arr.filter(v => v.extra2 == "正常");
+        let arr1 = arr.filter(v => v.extra2 == "迟到");
+        let arr2 = arr.filter(v => v.extra2 == "正常");
+        this.items = [...arr1,...arr2];
       } else if (this.searchType2 === "2") {
         //迟到
         this.items = arr.filter(v => v.extra2 == "迟到");