合并

src/components/Calendar/calendar.vue

@@ -3,6 +3,8 @@
   .wh_item_date:hover {
     background: #71c7a5;
     cursor: pointer;
+    color: #fff;
+    border-radius: 50%;
   }
 }
 * {
@@ -115,7 +117,8 @@ wh_content_item_tag {
 .wh_content_item > .wh_isMark {
   margin: auto;
   border-radius: 100px;
-  background: blue;
+  background: #7d7df5;
+  color: #fff;
   z-index: 2;
 }
 .wh_content_item .wh_other_dayhide {
@@ -154,6 +157,7 @@ wh_content_item_tag {
         <div class="wh_content_item" v-for="(item,index) in list" :key="index" @click="clickDay(item,index)">
           <div
             class="wh_item_date"
+            :style="{background:item.isMark?theme:''}"
             v-bind:class="[{ wh_isMark: item.isMark},{wh_other_dayhide:item.otherMonth!=='nowMonth'},{wh_want_dayhide:item.dayHide},{wh_isToday:item.isToday},{wh_chose_day:item.chooseDay},setClass(item)]"
           >{{item.id}}</div>
         </div>
@@ -163,6 +167,8 @@ wh_content_item_tag {
 </template>
 <script>
 import timeUtil from "./calendar";
+import { mapGetters } from "vuex";
+const c = console.log.bind(document);
 export default {
   data() {
     return {
@@ -202,6 +208,9 @@ export default {
     this.intStart();
     this.myDate = new Date();
   },
+  computed:{
+    ...mapGetters(['theme'])
+  },
   methods: {
     intStart() {
       timeUtil.sundayStart = this.sundayStart;

src/views/Customer/index.vue

@@ -233,8 +233,10 @@
           <div class="labeltext">违禁标签：</div>
           <el-select
             v-model="searchForm.sensitiveWords"
+            multiple
             clearable
             filterable
+            collapse-tags
             placeholder="请选择"
             class="div-inpbox"
           >
@@ -515,7 +517,7 @@ export default {
         timeType: "0",
         clientStage: "",
         orderBy:'',
-        sensitiveWords:'',
+        sensitiveWords:[],
       },
       clientStagelist: [],
       sensitiveList:[],//违禁词
@@ -572,6 +574,7 @@ export default {
         ...this.searchForm,
       };
       obj.keywordIds = obj.keywordsId.join(",");
+      obj.sensitiveWords = JSON.stringify(obj.sensitiveWords);
       (obj.dateType = this.searchForm.staDate
         ? null
         : this.searchForm.dateType),
@@ -596,7 +599,7 @@ export default {
         searchForm: "",
         timeType: "0",
         orderBy:'',
-        sensitiveWords:'',
+        sensitiveWords:[],
         projectId:
           this.orgType == 3
             ? localStorage.getItem("houseId")
@@ -605,7 +608,7 @@ export default {
       this.findbypage();
     },
     houseChange() {
-      this.searchForm.sensitiveWords=''
+      this.searchForm.sensitiveWords=[]
       this.searchForm.keywordsId=[]
       this.findbypage();
       this.findKeywords();

src/views/Statistics/ConsultantBrand.vue

@@ -6,6 +6,7 @@
         <div style="margin-left: 26px">
           <el-select
             v-model="houseId"
+            filterable
             placeholder="请选择"
             @change="houseChange"
           >
@@ -773,7 +774,7 @@ export default {
         if (num != 0) {
           item.zxl1 = Math.floor((item.zxl / num) * 100);
         } else {
-          item.zxl1 = 0
+          item.zxl1 = 0;
         }
       });
       console.log(arr, "arr2");