to another branch

src/views/houseData/basicInfoByLabel.vue

@@ -23,7 +23,7 @@
         <!-- <p class="gayLine noline" /> -->
           <div class="portalTableOperates">
             <a-button type='primary' @click="searchXXXByLabel">查询</a-button>
-            <a-tabs default-active-key="1" @change="changeTbl">
+            <a-tabs :default-active-key="tbl" @change="changeTbl">
               <a-tab-pane key="tbl_community" tab="小区">
                 <TAM ref="childTab" :tableData="tableData_sect" :pagination="pagination" :tbl="tbl" />
               </a-tab-pane>
@@ -425,11 +425,13 @@ export default {
     onCheck(keys, node) {
       // console.log(keys, node.node.$children.length)
       // this.checkedKeys = []
-      console.log(keys, node)
       for(let i = 0; i < keys.length; i++) {
         console.log(keys[i])
         this.checkedKeys.push(keys[i])
       }
+
+      // cf
+      
     },
     getLabelList() {
       this.$ajax.get({

src/views/label/labelRightSide.vue

@@ -61,9 +61,8 @@
                 
                 <a-form-item v-if="index66 !== 0" style="margin-bottom: 20px">
                   <a-select style="width: 80px" placeholder='与上组关系' v-decorator="['relationWithGroup-' + index66 + '-0',{initialValue: item66.relation, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
-                    <a-select-option value='and'>与</a-select-option>
+                    <a-select-option value='and'>且</a-select-option>
                     <a-select-option value='or'>或</a-select-option>
-                    <a-select-option value='ne'>非</a-select-option>
                   </a-select>
                 </a-form-item>
 
@@ -81,9 +80,8 @@
 
               <a-form-item v-if="index !== 0">
                 <a-select style="width: 80px" placeholder='请选择条件' v-decorator="['relation-' + index66 +'-' + index,{initialValue: item.relation, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
-                  <a-select-option value='and'>与</a-select-option>
+                  <a-select-option value='and'>且</a-select-option>
                   <a-select-option value='or'>或</a-select-option>
-                  <a-select-option value='ne'>非</a-select-option>
                 </a-select>
               </a-form-item>
 
@@ -104,8 +102,8 @@
 
               <a-form-item>
                 <a-select style="width: 150px" placeholder='区间' v-decorator="['codition-' + index66 +'-' + index,{initialValue: item.codition, validateTrigger:'blur',rules: [{required: true, message: '请至少选择一项！'}]}]">
-                  <a-select-option value='eq'>等于（精确）</a-select-option>
-                  <a-select-option value='regex'>等于（模糊）</a-select-option>
+                  <a-select-option value='eq'>等于</a-select-option>
+                  <a-select-option value='regex'>包含</a-select-option>
                   <a-select-option value='ne'>不等于</a-select-option>
                   <a-select-option value='gt'>大于</a-select-option>
                   <a-select-option value='gte'>大于等于</a-select-option>