From b9bc80def4e77e1bd2b224747a4dbf0b486e4c1d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 02 Apr 2021 16:49:12 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

---
 src/views/healthcode/healthcode.vue |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 3140694..0d0fcc7 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -8,6 +8,8 @@
                :before-open="beforeOpen"
                v-model="form"
                ref="crud"
+               :row-style="rowStyle"
+               :search.sync="search"
                @row-update="rowUpdate"
                @row-save="rowSave"
                @row-del="rowDel"
@@ -52,6 +54,7 @@
       return {
         form: {},
         query: {},
+        search:{},
         loading: true,
         page: {
           pageSize: 10,
@@ -66,7 +69,7 @@
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
-          activeClass: 3,
+          activeClass: 0,
           border: true,
           index: true,
           viewBtn: true,
@@ -159,9 +162,10 @@
             {
               label: "健康码颜色",
               search: true,
-              searchLabelWidth:100,
+              searchLabelWidth:120,
               prop: "type",
-              searchSpan: 3,
+              searchSpan: 4,
+              searchValue: this.getHealthcodeType(),
               width:210,
               type: "select",
               dicData: [
@@ -181,8 +185,13 @@
             }
           ]
         },
-        data: []
+        data: [],
+        isActive: false,
+        recorder: null,
       };
+    },
+    mounted:{
+
     },
     computed: {
       ...mapGetters(["permission"]),
@@ -202,7 +211,6 @@
         return ids.join(",");
       }
     },
-
     methods: {
       beforeOpen(done, type) {
       },
@@ -232,8 +240,23 @@
       refreshChange() {
         this.onLoad(this.page, this.query);
       },
+      rowStyle({row, column, rowIndex}){
+         if(row.type=="3"){
+           return {
+             color:"#fe1515"
+           }
+         }
+      },
+      getHealthcodeType(){
+          if (this.$route.query.type != undefined) {
+              var type = this.$route.query.type+"";
+              this.$route.query = {};
+              return type;
+          }
+      },
       getHealthcodeData(e) {
-        this.activeClass = e;
+        var that = this;
+        that.activeClass = e;
         //status 0:本日  1：本月  2：本年   type: 1:绿色   2：黄色  3：红色
         var params = {
           status: e
@@ -248,8 +271,8 @@
           ...params,
         };
 
-        if (this.$route.query.status && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
-            if (this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type != "" ) {
+        if (this.$route.query.status!=undefined && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
+            if (this.$route.query.type != undefined) {
               this.activeClass = this.$route.query.status;
               this.page.currentPage = 1;
               params = {
@@ -263,10 +286,10 @@
                 type:this.$route.query.status
               };
             }
-        }else if(this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type != "" ){
+        }else if(this.$route.query.type != undefined){
           params = {
             type: this.$route.query.type,
-            beginTime: this.$route.query.startTime,
+            begTime: this.$route.query.startTime,
             endTime: this.$route.query.endTime
           }
         }else{
@@ -274,6 +297,7 @@
                 status:this.$route.query.status,
                 type:this.$route.query.type
             }
+            
         }
 
         if (dateTime) {
@@ -303,3 +327,10 @@
     }
   };
 </script>
+<style scoped>
+  .el-button.btn-color {
+    color: rgb(255, 255, 255);
+    background-color: rgb(64, 158, 255);
+    border-color: rgb(64, 158, 255);
+  }
+</style>
\ No newline at end of file

--
Gitblit v1.9.3