From 2d14040e40bca87aa1054b7746c20c7d874ee5d3 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 13 Apr 2023 17:06:03 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=B9=B4=E9=BE=84=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 11 +++++------
 src/views/modules/base/resi.vue     |  6 +++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index b7af8fca7..f78eed5ea 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -285,7 +285,7 @@ export default {
       return _form
     }
     let itemList = this.formList.map(item => {
-      if (item.itemType == 'inputRange' && item.funType == 'agetoyear') {
+      if (item.itemType == 'inputRange' && item.funType == '') {
         item.columnName = 'age'
       }
       return {
@@ -510,11 +510,10 @@ export default {
     },
     handleAgeChange(val) {
       console.log('val----age---', val)
-      if (val.end) {
-        const s = this.computedBirth(val.end)
-        const e = this.computedBirth(val.start)
-        this.form.BIRTHDAY = [s, e]
-      }
+        // const s = this.computedBirth(val.end)
+        // const e = this.computedBirth(val.start)
+        
+        this.form.BIRTHDAY = [val.start,val.end ]
     },
     handleChangeAgency(val) {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 750e0087c..723ce58aa 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -669,8 +669,12 @@ export default {
       this.getTableData();
     },
     handleSearch (val) {
-      console.log("searchhh--", val);
       this.currentPage = 1;
+      val.forEach(item=>{
+        if(item.columnName == "BIRTHDAY"){
+          item.queryType = 'agerange'
+        }
+      })
       this.conditions = val;
       this.getTableData();
     },

From 6c00b46dea889f5f35e8bf5bd87a73b82121228c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 14 Apr 2023 09:37:37 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B9=B4=E9=BE=84columnName=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/rangeInput.vue |   9 +-
 src/views/components/resiSearch.vue | 959 +++++++++++++++-------------
 src/views/modules/base/resi.vue     |   6 +-
 3 files changed, 515 insertions(+), 459 deletions(-)

diff --git a/src/views/components/rangeInput.vue b/src/views/components/rangeInput.vue
index 5c726a67b..b740a5fc0 100644
--- a/src/views/components/rangeInput.vue
+++ b/src/views/components/rangeInput.vue
@@ -10,7 +10,7 @@
                   :type="inputType"
                   clearable
                   placeholder="请输入"
-                  @change="handleChange" />
+                  @change="handleChange($event,'s')" />
       </el-form-item>
       <div class="div_middle">-</div>
       <el-form-item prop="end">
@@ -20,7 +20,7 @@
                   :type="inputType"
                   clearable
                   placeholder="请输入"
-                  @change="handleChange"
+                  @change="handleChange($event,'e')"
                   @blur="handleBlur" />
       </el-form-item>
     </div>
@@ -87,10 +87,9 @@ export default {
     },
   },
   methods: {
-    handleChange (val) {
-
+    handleChange (val,type) {
       // if ()
-      this.$emit('change', { ...this.inputForm })
+      this.$emit('change', { ...this.inputForm },type)
     },
     handleBlur () {
 
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index f78eed5ea..e14edd837 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -1,24 +1,26 @@
 <template>
   <div class="resi-container">
     <!-- <el-card class="resi-card"> -->
-      <el-row class="resi-row-box" :class="!isArrow && 'resi-row-more'">
-        <el-row v-if="showGrid" class="resi-row">
-          <el-col :span="6">
-            <div class="resi-cell">
-              <div class="resi-cell-label">所属组织</div>
-              <div class="resi-cell-value">
-                <el-cascader class="customer_cascader"
-                             ref="myCascader"
-                             v-model="agencyIdArray"
-                             filterable
-                             :options="orgOptions"
-                             :props="orgOptionProps"
-                             :show-all-levels="false"
-                             @change="handleChangeAgency"></el-cascader>
-              </div>
+    <el-row class="resi-row-box" :class="!isArrow && 'resi-row-more'">
+      <el-row v-if="showGrid" class="resi-row">
+        <el-col :span="6">
+          <div class="resi-cell">
+            <div class="resi-cell-label">所属组织</div>
+            <div class="resi-cell-value">
+              <el-cascader
+                class="customer_cascader"
+                ref="myCascader"
+                v-model="agencyIdArray"
+                filterable
+                :options="orgOptions"
+                :props="orgOptionProps"
+                :show-all-levels="false"
+                @change="handleChangeAgency"
+              ></el-cascader>
             </div>
-          </el-col>
-<!--          <el-col :span="6">
+          </div>
+        </el-col>
+        <!--          <el-col :span="6">
             <div class="resi-cell">
               <div class="resi-cell-label">所属网格</div>
               <div class="resi-cell-value">
@@ -41,199 +43,217 @@
               </div>
             </div>
           </el-col>-->
-          <el-col :span="18">
-            <div class="resi-cell">
-              <div class="resi-cell-label">所属房屋</div>
-              <div class="resi-cell-value">
-                <el-select
-                  v-model.trim="form.VILLAGE_ID"
-                  placeholder="请选择小区"
-                  size="small"
-                  filterable
-                  clearable
-                  class="resi-cell-select"
-                  @clear="handleClearVillage"
-                  @change="handleChangeV"
+        <el-col :span="18">
+          <div class="resi-cell">
+            <div class="resi-cell-label">所属房屋</div>
+            <div class="resi-cell-value">
+              <el-select
+                v-model.trim="form.VILLAGE_ID"
+                placeholder="请选择小区"
+                size="small"
+                filterable
+                clearable
+                class="resi-cell-select"
+                @clear="handleClearVillage"
+                @change="handleChangeV"
+              >
+                <el-option
+                  v-for="item in optionsV"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-                  <el-option
-                    v-for="item in optionsV"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-select
-                  v-model.trim="form.BUILD_ID"
-                  placeholder="楼号"
-                  size="small"
-                  filterable
-                  clearable
-                  style="width: 120px;"
-                  class="resi-cell-select"
-                  :disabled="changeVDisabled"
-                  @clear="handleClearBuild"
-                  @change="handleChangeB"
+                </el-option>
+              </el-select>
+              <el-select
+                v-model.trim="form.BUILD_ID"
+                placeholder="楼号"
+                size="small"
+                filterable
+                clearable
+                style="width: 120px"
+                class="resi-cell-select"
+                :disabled="changeVDisabled"
+                @clear="handleClearBuild"
+                @change="handleChangeB"
+              >
+                <el-option
+                  v-for="item in optionsB"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-                  <el-option
-                    v-for="item in optionsB"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-select
-                  v-model.trim="form.UNIT_ID"
-                  :disabled="changeBDisabled"
-                  placeholder="单元"
-                  size="small"
-                  filterable
-                  clearable
-                  style="width: 120px;"
-                  class="resi-cell-select"
-                  @click="handleClearDan"
-                  @change="handleChangeD"
+                </el-option>
+              </el-select>
+              <el-select
+                v-model.trim="form.UNIT_ID"
+                :disabled="changeBDisabled"
+                placeholder="单元"
+                size="small"
+                filterable
+                clearable
+                style="width: 120px"
+                class="resi-cell-select"
+                @click="handleClearDan"
+                @change="handleChangeD"
+              >
+                <el-option
+                  v-for="item in optionsD"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-                  <el-option
-                    v-for="item in optionsD"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-select
-                  v-model.trim="form.HOME_ID"
-                  :disabled="changeDDisabled"
-                  placeholder="房号"
-                  size="small"
-                  filterable
-                  clearable
-                  style="width: 120px;"
-                  class="resi-cell-select"
+                </el-option>
+              </el-select>
+              <el-select
+                v-model.trim="form.HOME_ID"
+                :disabled="changeDDisabled"
+                placeholder="房号"
+                size="small"
+                filterable
+                clearable
+                style="width: 120px"
+                class="resi-cell-select"
+              >
+                <el-option
+                  v-for="item in optionsH"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-                  <el-option
-                    v-for="item in optionsH"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </div>
+                </el-option>
+              </el-select>
             </div>
-          </el-col>
-        </el-row>
-        <el-row
-          v-for="(item, index) in sliceList(itemList, 4)"
-          :key="index"
-          class="resi-row"
-        >
-          <el-col v-for="n in item" :key="n.id" :span="computdSpan(item.length)">
-            <div class="resi-cell">
-              <div class="resi-cell-label" :class="item.length != 4 && 'resi-cell-label1'">{{ n.label }}</div>
-              <div
-                class="resi-cell-value"
-                :class="n.itemType === 'radio' && 'resi-cell-value-radio'"
+          </div>
+        </el-col>
+      </el-row>
+      <el-row
+        v-for="(item, index) in sliceList(itemList, 4)"
+        :key="index"
+        class="resi-row"
+      >
+        <el-col v-for="n in item" :key="n.id" :span="computdSpan(item.length)">
+          <div class="resi-cell">
+            <div
+              class="resi-cell-label"
+              :class="item.length != 4 && 'resi-cell-label1'"
+            >
+              {{ n.label }}
+            </div>
+            <div
+              class="resi-cell-value"
+              :class="n.itemType === 'radio' && 'resi-cell-value-radio'"
+            >
+              <el-input
+                v-if="n.itemType === 'input' || n.itemType === 'textarea'"
+                v-model.trim="form[n.columnName]"
+                class="resi-cell-input"
+                size="small"
+                clearable
+                placeholder="请输入内容"
               >
-                <el-input
-                  v-if="n.itemType === 'input' || n.itemType === 'textarea'"
-                  v-model.trim="form[n.columnName]"
-                  class="resi-cell-input"
-                  size="small"
-                  clearable
-                  placeholder="请输入内容"
-                >
-                </el-input>
-                <template v-else-if="n.itemType == 'inputRange'">
-                  <!-- <el-input
+              </el-input>
+              <template v-else-if="n.itemType == 'inputRange'">
+                <!-- <el-input
                     v-model.trim="form[n.columnName]"
-                    class="resi-cell-input"
+                    class="resi-cell-input"F
                     size="small"
                     clearable
                     placeholder="请输入内容"
                   /> -->
-                  <inputRange v-model="form[n.columnName]" :type="n.validType" @change="handleAgeChange" />
-                </template>
-                <template v-else-if="n.itemType === 'datepicker'">
-                  <el-date-picker
-                    v-if="n.queryType === 'daterange'"
-                    v-model.trim="form[n.columnName]"
-                    type="daterange"
-                    align="right"
-                    unlink-panels
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    class="resi-cell--daterange"
-                    size="small"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
-                  >
-                  </el-date-picker>
-                  <el-date-picker
-                    v-else
-                    v-model.trim="form[n.columnName]"
-                    class="resi-cell-input"
-                    type="date"
-                    size="small"
-                    clearable
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                  >
-                  </el-date-picker>
-                </template>
-                <el-select
-                  v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
+                <inputRange
+                  v-model="ageObj"
+                  :type="n.validType"
+                  @change="handleAgeChange"
+                />
+              </template>
+              <template v-else-if="n.itemType === 'datepicker'">
+                <el-date-picker
+                  v-if="n.queryType === 'daterange'"
                   v-model.trim="form[n.columnName]"
-                  placeholder="请选择"
+                  type="daterange"
+                  align="right"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  class="resi-cell--daterange"
                   size="small"
-                  clearable
-                  class="resi-cell-select"
-                  :collapse-tags="n.multiSelect == 1 ? true : false"
-                  :multiple="n.multiSelect == 1 ? true : false"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
                 >
-                  <el-option
-                    v-for="item in n.options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-cascader
-                  v-else-if="n.itemType === 'cascader'"
+                </el-date-picker>
+                <el-date-picker
+                  v-else
                   v-model.trim="form[n.columnName]"
-                  :options="n.options"
-                  :props="{ checkStrictly: true }"
-                  clearable
+                  class="resi-cell-input"
+                  type="date"
                   size="small"
-                  class="resi-cell-select"
+                  clearable
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期"
                 >
-                </el-cascader>
-                <template v-else-if="n.itemType === 'checkbox'">
-                  <el-checkbox-group v-model="form[n.columnName]">
-                    <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ns.label}}</el-checkbox>
-                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
-                  </el-checkbox-group>
-                </template>
-              </div>
+                </el-date-picker>
+              </template>
+              <el-select
+                v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
+                v-model.trim="form[n.columnName]"
+                placeholder="请选择"
+                size="small"
+                clearable
+                class="resi-cell-select"
+                :collapse-tags="n.multiSelect == 1 ? true : false"
+                :multiple="n.multiSelect == 1 ? true : false"
+              >
+                <el-option
+                  v-for="item in n.options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+              <el-cascader
+                v-else-if="n.itemType === 'cascader'"
+                v-model.trim="form[n.columnName]"
+                :options="n.options"
+                :props="{ checkStrictly: true }"
+                clearable
+                size="small"
+                class="resi-cell-select"
+              >
+              </el-cascader>
+              <template v-else-if="n.itemType === 'checkbox'">
+                <el-checkbox-group v-model="form[n.columnName]">
+                  <el-checkbox
+                    v-for="ns in n.options"
+                    :key="ns.value"
+                    :label="ns.value"
+                    >{{ ns.label }}</el-checkbox
+                  >
+                  <!-- <el-checkbox label="n.la"></el-checkbox> -->
+                </el-checkbox-group>
+              </template>
             </div>
-          </el-col>
-        </el-row>
+          </div>
+        </el-col>
       </el-row>
-      <el-row v-if="isArrow" class="resi-search">
-        <!-- <el-col :span="20">
+    </el-row>
+    <el-row v-if="isArrow" class="resi-search">
+      <!-- <el-col :span="20">
           <el-button type="primary" size="mini">查询</el-button>
         </el-col> -->
-        <el-col :span="24">
-          <el-button type="primary" size="small" @click="handleSearch">查询</el-button>
-          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
-        </el-col>
-      </el-row>
-      <!-- <div v-if="isArrow" class="resi-down" @click="handleOpenSearch">
+      <el-col :span="24">
+        <el-button type="primary" size="small" @click="handleSearch"
+          >查询</el-button
+        >
+        <el-button class="diy-button--reset" size="small" @click="resetForm"
+          >重置</el-button
+        >
+      </el-col>
+    </el-row>
+    <!-- <div v-if="isArrow" class="resi-down" @click="handleOpenSearch">
         <img v-if="openSearch" src="../../assets/img/arrow-up.png" />
         <img v-else src="../../assets/img/arrow-down.png" />
       </div> -->
@@ -242,79 +262,84 @@
 </template>
 
 <script>
-import inputRange from './rangeInput.vue'
+import inputRange from "./rangeInput.vue";
 export default {
-  name: 'ResiSearch',
+  name: "ResiSearch",
   components: {
-    inputRange
+    inputRange,
   },
   props: {
     formList: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     columnName: {
       type: String,
-      default: ''
+      default: "",
     },
     showGrid: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isArrow: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     let initForm = (arr, columnName) => {
-      let _form = {}
+      let _form = {};
       // console.log('formInfo', obj)
       // if (Object.keys(obj).length > 0) {
       //   _form = { ...obj }
       //   return _form
       // }
       arr.forEach((item) => {
-        if (item.itemType == 'checkbox') _form[item.columnName] = []
-        else if (item.queryType == 'resi_category' && columnName ){
-           _form[item.columnName] = [columnName]
-        } else if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
-        else if (item.itemType == 'inputRange') _form[item.columnName] = { start: '', end: ''}
-        else _form[item.columnName] = ''
-      })
-      return _form
-    }
-    let itemList = this.formList.map(item => {
-      if (item.itemType == 'inputRange' && item.funType == '') {
-        item.columnName = 'age'
+        if (item.itemType == "checkbox") _form[item.columnName] = [];
+        else if (item.queryType == "resi_category" && columnName) {
+          _form[item.columnName] = [columnName];
+        } else if (columnName && columnName === item.columnName)
+          _form[item.columnName] = "1";
+        else if (item.itemType == "inputRange")
+          _form[item.columnName] = { start: "", end: "" };
+        else _form[item.columnName] = "";
+      });
+      return _form;
+    };
+    let itemList = this.formList.map((item) => {
+      if (item.itemType == "inputRange" && item.funType == "") {
+        item.columnName = "age";
       }
       return {
-        ...item
-      }
-    })
-    let form = initForm(itemList, this.columnName)
-    let tempFormList = itemList.map(item => {
-
+        ...item,
+      };
+    });
+    let form = initForm(itemList, this.columnName);
+    let tempFormList = itemList.map((item) => {
       return {
         ...item,
-        isChange:( item.queryType == 'resi_category' && this.columnName) || this.columnName === item.columnName ? true : false
-      }
-    })
+        isChange:
+          (item.queryType == "resi_category" && this.columnName) ||
+          this.columnName === item.columnName
+            ? true
+            : false,
+      };
+    });
     let constForm = {
       ...form,
-      GRID_ID: '',
-      VILLAGE_ID: '',
-      BUILD_ID: '',
-      UNIT_ID: '',
-      HOME_ID: ''
-    }
+      GRID_ID: "",
+      VILLAGE_ID: "",
+      BUILD_ID: "",
+      UNIT_ID: "",
+      HOME_ID: "",
+    };
     let orgOptionProps = {
       multiple: false,
-      value: 'agencyId',
-      label: 'agencyName',
-      children: 'subAgencyList',
-      checkStrictly: true
-    }
+      value: "agencyId",
+      label: "agencyName",
+      children: "subAgencyList",
+      checkStrictly: true,
+    };
 
     return {
       pageLoading: false,
@@ -326,91 +351,93 @@ export default {
       optionsG: [],
       orgOptions: [],
       orgOptionProps,
-      agencyIdArray:[],
-      value: '',
+      agencyIdArray: [],
+      value: "",
       itemList,
       fixedList: [],
       fixedForm: {
-        AGENCY_ID: '',
-        GRID_ID: '',
-        VILLAGE_ID: '',
-        BUILD_ID: '',
-        UNIT_ID: '',
-        HOME_ID: ''
+        AGENCY_ID: "",
+        GRID_ID: "",
+        VILLAGE_ID: "",
+        BUILD_ID: "",
+        UNIT_ID: "",
+        HOME_ID: "",
       },
       constForm,
       form: {
         ...form,
-        AGENCY_ID: '',
-        GRID_ID: '',
-        VILLAGE_ID: '',
-        BUILD_ID: '',
-        UNIT_ID: '',
-        HOME_ID: ''
+        AGENCY_ID: "",
+        GRID_ID: "",
+        VILLAGE_ID: "",
+        BUILD_ID: "",
+        UNIT_ID: "",
+        HOME_ID: "",
       },
       tempFormList,
       pickerOptions: {
         shortcuts: [
           {
-            text: '最近一周',
+            text: "最近一周",
             onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-              picker.$emit('pick', [start, end])
-            }
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
           },
           {
-            text: '最近一个月',
+            text: "最近一个月",
             onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-              picker.$emit('pick', [start, end])
-            }
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
           },
           {
-            text: '最近三个月',
+            text: "最近三个月",
             onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-              picker.$emit('pick', [start, end])
-            }
-          }
-        ]
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
 
-      queryType:{
-        'AGENCY_ID':'like'
-      }
-    }
+      queryType: {
+        AGENCY_ID: "like",
+      },
+      ageObj: {},
+    };
   },
   computed: {
     sliceList() {
       return function (data, count) {
+        console.log(data);
         if (data !== undefined) {
-          let index = 0
-          let arrTemp = []
+          let index = 0;
+          let arrTemp = [];
           for (let i = 0; i < data.length; i++) {
-            index = parseInt(i / count)
+            index = parseInt(i / count);
             if (arrTemp.length <= index) {
-              arrTemp.push([])
+              arrTemp.push([]);
             }
-            arrTemp[index].push(data[i])
+            arrTemp[index].push(data[i]);
           }
-          return arrTemp
+          return arrTemp;
         }
-      }
+      };
     },
-    changeVDisabled () {
-      return !this.form.VILLAGE_ID
+    changeVDisabled() {
+      return !this.form.VILLAGE_ID;
     },
-    changeBDisabled () {
-      return !this.form.BUILD_ID
+    changeBDisabled() {
+      return !this.form.BUILD_ID;
     },
-    changeDDisabled () {
-      return !this.form.UNIT_ID
+    changeDDisabled() {
+      return !this.form.UNIT_ID;
     },
   },
   watch: {
@@ -419,310 +446,344 @@ export default {
         // console.log('valpppp----', val, val2)
         for (let n in val) {
           if (this.constForm[n] !== val[n]) {
-            this.handleChangeForm(n)
-            console.log('nnnnnn', n)
+            this.handleChangeForm(n);
+            console.log("nnnnnn", n);
           }
         }
-        this.constForm = { ...val }
+        this.constForm = { ...val };
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
-  created () {
+  created() {
     // this.initForm()
     // console.log('formcccc---', this.form)
-    this.getOrgTreeList()
-    this.getGridList()
-    this.getValiheList()
-    if (this.columnName) this.handleChangeForm(this.columnName)
+    this.getOrgTreeList();
+    this.getGridList();
+    this.getValiheList();
+    if (this.columnName) this.handleChangeForm(this.columnName);
   },
   methods: {
     initForm() {
       this.formList.forEach((item) => {
-        this.$set(this.form, item.columnName, '')
-      })
-      console.log('formcccc---', this.form)
+        this.$set(this.form, item.columnName, "");
+      });
+      console.log("formcccc---", this.form);
     },
     computdSpan(len) {
-      return len == 1 ? 24 : 6
+      return len == 1 ? 24 : 6;
     },
     handleClearVillage() {
-      this.form.BUILD_ID = ''
-      this.form.HOME_ID = ''
+      this.form.BUILD_ID = "";
+      this.form.HOME_ID = "";
     },
     handleClearBuild() {
-      this.form.BUILD_ID = ''
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
+      this.form.BUILD_ID = "";
+      this.form.UNIT_ID = "";
+      this.form.HOME_ID = "";
     },
     handleClearDan() {
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
+      this.form.UNIT_ID = "";
+      this.form.HOME_ID = "";
     },
     resetForm(formName) {
-      for(const n in this.form) {
-        if (n == 'age') {
-          this.form.age = {
-            start: '',
-            end: ''
-          }
-        } else if (typeof this.form[n] == 'object') this.form[n] = []
-        else this.form[n] = ''
-
+      for (const n in this.form) {
+        if (typeof this.form[n] == "object") this.form[n] = [];
+        else this.form[n] = "";
       }
-      this. agencyIdArray=[]
+
+      this.ageObj = {};
+      this.agencyIdArray = [];
       // let arr3 = [...arr1, ...arr]
-      this.$emit('search', [])
+      this.$emit("search", []);
       // this.handleSearch()
       // this.orgOptions = [];
     },
     handleSearch() {
       // console.log('formmmmm---', this.form)
-      const itemTypes = ['daterange', 'timerange', 'checkbox']
-      let a = this.tempFormList.filter(item => item.itemType != 'inputRange')
-      let arr = a.filter((n) => n.isChange).map((item) => {
+      const itemTypes = ["daterange", "timerange", "checkbox"];
+      let a = this.tempFormList.filter((item) => item.itemType != "inputRange");
+      let arr = a
+        .filter((n) => n.isChange)
+        .map((item) => {
           return {
             queryType: item.queryType,
             tableName: item.tableName,
             columnName: item.columnName,
             // columnValue: []
-            columnValue: this.form[item.columnName] &&
+            columnValue:
+              this.form[item.columnName] &&
               (itemTypes.includes(item.queryType) ||
-              itemTypes.includes(item.itemType) || item.multiSelect == 1
+              itemTypes.includes(item.itemType) ||
+              item.multiSelect == 1
                 ? this.form[item.columnName]
-                : [this.form[item.columnName].toString()])
-          }
-        })
-      const arr2 = arr.filter(item => item.columnValue.length > 0)
+                : [this.form[item.columnName].toString()]),
+          };
+        });
+      const arr2 = arr.filter((item) => item.columnValue.length > 0);
       let arr1 = this.fixedList
         .filter((n) => n.columnValue.length > 0)
         .map((item) => {
           return {
-            ...item
-          }
-        })
-      let arr3 = [...arr1, ...arr2]
-      this.$emit('search', arr3)
-      return arr3
+            ...item,
+          };
+        });
+      let arr3 = [];
+      var objKey = JSON.stringify(this.ageObj) == "{}";
+      if (objKey) {
+        arr3 = [...arr1, ...arr2];
+        this.$emit("search", arr3);
+        return arr3;
+      } else {
+        let temp = [];
+        for (let i in this.ageObj) {
+          temp.push(this.ageObj[i]);
+        }
+        let arr4 = [
+          {
+            columnName: "",
+            columnValue: temp,
+            queryType: "agerange",
+            tableName: "ic_resi_user",
+          },
+        ];
+        arr3 = [...arr1, ...arr2, ...arr4];
+
+        this.$emit("search", arr3);
+        return arr3;
+      }
     },
     handleOpenSearch() {
-      this.openSearch = !this.openSearch
+      this.openSearch = !this.openSearch;
     },
-    handleAgeChange(val) {
-      console.log('val----age---', val)
-        // const s = this.computedBirth(val.end)
-        // const e = this.computedBirth(val.start)
-        
-        this.form.BIRTHDAY = [val.start,val.end ]
+    handleAgeChange(val, type) {
+      console.log("val----age---", val);
+      if (type == "s") {
+        this.ageObj.start = val.start;
+      } else {
+        this.ageObj.end = val.end;
+      }
+      // const s = this.computedBirth(val.end)
+      // const e = this.computedBirth(val.start)
     },
     handleChangeAgency(val) {
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
       if (obj) {
-        if(obj.level === 'grid'){
-          this.form.GRID_ID =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.form.AGENCY_ID=''
-        }else{
-          this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.form.GRID_ID = ''
+        if (obj.level === "grid") {
+          this.form.GRID_ID =
+            this.agencyIdArray.length > 0
+              ? this.agencyIdArray[this.agencyIdArray.length - 1]
+              : "";
+          this.form.AGENCY_ID = "";
+        } else {
+          this.form.AGENCY_ID =
+            this.agencyIdArray.length > 0
+              ? this.agencyIdArray[this.agencyIdArray.length - 1]
+              : "";
+          this.form.GRID_ID = "";
         }
-
-      }else{
-         this.form.AGENCY_ID=''
-         this.form.GRID_ID = ''
+      } else {
+        this.form.AGENCY_ID = "";
+        this.form.GRID_ID = "";
       }
 
-      this.form.VILLAGE_ID = ''
-      this.form.BUILD_ID = ''
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
-      this.getValiheList()
+      this.form.VILLAGE_ID = "";
+      this.form.BUILD_ID = "";
+      this.form.UNIT_ID = "";
+      this.form.HOME_ID = "";
+      this.getValiheList();
     },
     handleChangeGrid(val) {
-      console.log('val', val)
-      this.form.VILLAGE_ID = ''
-      this.form.BUILD_ID = ''
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
-      this.getValiheList()
+      console.log("val", val);
+      this.form.VILLAGE_ID = "";
+      this.form.BUILD_ID = "";
+      this.form.UNIT_ID = "";
+      this.form.HOME_ID = "";
+      this.getValiheList();
     },
     handleChangeV(val) {
-      console.log('val', val)
-      this.form.BUILD_ID = ''
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
-      this.getBuildList()
+      console.log("val", val);
+      this.form.BUILD_ID = "";
+      this.form.UNIT_ID = "";
+      this.form.HOME_ID = "";
+      this.getBuildList();
     },
     handleChangeB(val) {
-      console.log('val', val)
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
-      this.getUniList()
+      console.log("val", val);
+      this.form.UNIT_ID = "";
+      this.form.HOME_ID = "";
+      this.getUniList();
     },
     handleChangeD(val) {
-      console.log('val', val)
-      this.form.HOME_ID = ''
-      this.getHouseList()
+      console.log("val", val);
+      this.form.HOME_ID = "";
+      this.getHouseList();
     },
     // 监听基础form
     handleChangeForm(val) {
       for (let n in this.fixedForm) {
-
         if (n === val) {
           if (this.fixedList.length > 0) {
-            let _item = {}
-            let hasVal = false
+            let _item = {};
+            let hasVal = false;
             this.fixedList.forEach((item, index) => {
               if (item.columnName == val) {
-                hasVal = true
-                item.columnValue[0] = this.form[val]
-                if (!this.form[val]) this.fixedList.splice(index, 1)
-                console.log('fixedList----val', this.fixedList)
+                hasVal = true;
+                item.columnValue[0] = this.form[val];
+                if (!this.form[val]) this.fixedList.splice(index, 1);
+                console.log("fixedList----val", this.fixedList);
               } else {
                 _item = {
-                  queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
-                  tableName: 'ic_resi_user',
+                  queryType: this.queryType[val]
+                    ? this.queryType[val]
+                    : "equal", //'equal',
+                  tableName: "ic_resi_user",
                   columnName: val,
-                  columnValue: [this.form[val]]
-                }
-                console.log('fixedList----else', _item)
+                  columnValue: [this.form[val]],
+                };
+                console.log("fixedList----else", _item);
                 // this.$set(this.fixedList, index, _item)
               }
-            })
-            if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item)
+            });
+            if (Object.keys(_item).length > 0 && !hasVal)
+              this.fixedList.push(_item);
           } else {
             this.$set(this.fixedList, 0, {
-              queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
-              tableName: 'ic_resi_user',
+              queryType: this.queryType[val] ? this.queryType[val] : "equal", //'equal',
+              tableName: "ic_resi_user",
               columnName: val,
-              columnValue: [this.form[val]]
-            })
+              columnValue: [this.form[val]],
+            });
           }
         }
       }
-      console.log('fixedList----999', this.fixedList)
+      console.log("fixedList----999", this.fixedList);
       this.tempFormList.forEach((item) => {
-        if (item.columnName === val) item.isChange = true
-      })
+        if (item.columnName === val) item.isChange = true;
+      });
     },
     getOrgTreeList() {
-      const { user } = this.$store.state
+      const { user } = this.$store.state;
       this.$http
-          .post('/gov/org/customeragency/agencygridtree', {})
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            } else {
-              console.log('获取组织树成功', res.data)
-              this.orgOptions=[]
-              this.orgOptions .push( res.data)
-            }
-          })
-          .catch(() => {
-            return this.$message.error('网络错误')
-          })
+        .post("/gov/org/customeragency/agencygridtree", {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取组织树成功", res.data);
+            this.orgOptions = [];
+            this.orgOptions.push(res.data);
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
     },
     getGridList() {
-      const { user } = this.$store.state
+      const { user } = this.$store.state;
       this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+        .post("/gov/org/customergrid/gridoption", {
+          agencyId: user.agencyId,
+          purpose: "query",
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsG = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsG = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
     getValiheList() {
-      const { user } = this.$store.state
+      const { user } = this.$store.state;
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', {
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
           gridId: this.form.GRID_ID,
           agencyId: this.form.AGENCY_ID,
           // agencyId: user.agencyId
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsV = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsV = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
     getBuildList() {
       this.$http
-        .post('/gov/org/icbuilding/buildingoption', {
-          neighborHoodId: this.form.VILLAGE_ID
+        .post("/gov/org/icbuilding/buildingoption", {
+          neighborHoodId: this.form.VILLAGE_ID,
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsB = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
     getUniList() {
       this.$http
-        .post('/gov/org/icbuildingunit/unitoption', {
-          buildingId: this.form.BUILD_ID
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.form.BUILD_ID,
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsD = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
     getHouseList() {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
+        .post("/gov/org/ichouse/houseoption", { unitId: this.form.UNIT_ID })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsH = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsH = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
     computedBirth(age) {
       let now = new Date();
       let nowYear = now.getFullYear();
-      let nowMonth = now.getMonth()+1;
+      let nowMonth = now.getMonth() + 1;
       let nowDay = now.getDate(); // 按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。
-      let subYear = nowYear - age
-      if(nowMonth < 10){
-        nowMonth = '0'+ nowMonth
+      let subYear = nowYear - age;
+      if (nowMonth < 10) {
+        nowMonth = "0" + nowMonth;
       }
-      if(nowDay < 10){
-        nowDay = '0' + nowDay
+      if (nowDay < 10) {
+        nowDay = "0" + nowDay;
       }
-      console.log(subYear+'-'+nowMonth+'-'+nowDay);
-      return subYear + '-' + nowMonth + '-' + nowDay
-    }
-  }
-}
+      console.log(subYear + "-" + nowMonth + "-" + nowDay);
+      return subYear + "-" + nowMonth + "-" + nowDay;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scope>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 723ce58aa..f5c02e7a6 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -670,11 +670,7 @@ export default {
     },
     handleSearch (val) {
       this.currentPage = 1;
-      val.forEach(item=>{
-        if(item.columnName == "BIRTHDAY"){
-          item.queryType = 'agerange'
-        }
-      })
+      console.log(val);
       this.conditions = val;
       this.getTableData();
     },

From b8489a89e9aabc154573f381b3369639a543e2e1 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Fri, 14 Apr 2023 10:05:45 +0800
Subject: [PATCH 3/7] bug

---
 .../census/census-accountActiveList.vue       | 36 ++++++++-------
 src/views/modules/census/census-houseList.vue | 46 +++++++++++--------
 .../modules/census/census-residentList.vue    |  8 ++--
 3 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 62d74b247..d7c2cf47b 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -155,12 +155,13 @@ export default {
 				value: 'agencyId'
 			},
 			tableData: [],
-
+			tableData2: [],
 			formData: {
 				orgId: '',
 				startDate: '',
 				endDate: ''
 			},
+			orgId: '',
 			cateOptions: [],
 			eventTypeCheck: [],
 			pageNo: 1,
@@ -183,10 +184,10 @@ export default {
 		...mapGetters(['clientHeight', 'iframeHeight'])
 	},
 	watch: {
-		'formData.endTime': function(val) {
+		'formData.endDate': function(val) {
 			if (val && val != '') {
 				let arrayTemp = val.split(' ');
-				this.formData.endTime = arrayTemp[0] + ' 23:59:59';
+				this.formData.endDate = arrayTemp[0] + ' 23:59:59';
 			}
 		}
 	},
@@ -194,6 +195,7 @@ export default {
 		console.log(this.$store.state);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
+		this.orgId = this.agencyId;
 		this.getOrgTreeList();
 		this.getTableData();
 		this.getTableData2();
@@ -209,8 +211,10 @@ export default {
 		handleSearch(val) {
 			let tmp = this.formData.orgId;
 			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
-				this.formData.orgId = '';
+				this.orgId = this.agencyId;
 				this.formData.level = '';
+			} else {
+				this.orgId = this.formData.orgId;
 			}
 			console.log(this.formData);
 			this.pageNo = 1;
@@ -240,13 +244,17 @@ export default {
 
 		async handleExport(type) {
 			const url = '/gov/org/staffLoginLog/accountActivityInfo-export';
-			const { formData } = this;
+
+			const { data, code, msg } = await requestPost(url, param);
+
 			axios({
 				url: window.SITE_CONFIG['apiURL'] + url,
 				method: 'post',
 				data: {
 					isActivity: type,
-					...formData
+					orgId: this.orgId,
+					startDate: this.formData.startDate,
+					endDate: this.formData.endDate
 				},
 				responseType: 'blob'
 			})
@@ -291,7 +299,7 @@ export default {
 		async getCountLevel() {
 			const url = '/gov/org/staffLoginLog/getActivityTotal';
 			// const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/count-level';
-			let param = { ...this.formData };
+			let param = { orgId: this.orgId, startDate: this.formData.startDate, endDate: this.formData.endDate };
 			const { data, code, msg } = await requestPost(url, param);
 			console.log('getCountLeveldata', data);
 			if (code === 0) {
@@ -306,11 +314,8 @@ export default {
 
 			const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
 
-			const { formData } = this;
-			const { data, code, msg } = await requestPost(url, {
-				isActivity: 1,
-				...formData
-			});
+			let param = { orgId: this.orgId, isActivity: 1, startDate: this.formData.startDate, endDate: this.formData.endDate };
+			const { data, code, msg } = await requestPost(url, param);
 
 			this.tableLoading = false;
 			if (code === 0) {
@@ -328,11 +333,8 @@ export default {
 
 			const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
 
-			const { formData } = this;
-			const { data, code, msg } = await requestPost(url, {
-				isActivity: 0,
-				...formData
-			});
+			let param = { orgId: this.orgId, isActivity: 0, startDate: this.formData.startDate, endDate: this.formData.endDate };
+			const { data, code, msg } = await requestPost(url, param);
 
 			this.tableLoading2 = false;
 			if (code === 0) {
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index bd3373c60..3860c23c5 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -66,7 +66,7 @@
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.radio}}%</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div>
 											</div>
 										</div>
 									</div>
@@ -98,7 +98,7 @@
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
-												<div class="unit" :style="{ color: color[index] }">{{ item.radio}}%</div>
+												<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div>
 											</div>
 										</div>
 									</div>
@@ -238,7 +238,8 @@ export default {
 			pieData2: [],
 			orgId: '',
 			purpose: '',
-			rentFlag: ''
+			rentFlag: '',
+			orgIdPath: ''
 		};
 	},
 	computed: {
@@ -271,8 +272,7 @@ export default {
 			this.dialogVisible = true;
 			this.pageType = 'view';
 			this.detailId = row.houseId;
-			console.log('detailId', row);
-			console.log('detailId', this.detailId);
+
 			this.detailData = row;
 		},
 		handleClose() {
@@ -290,7 +290,9 @@ export default {
 			const { data, code, msg } = await requestPost(url, {
 				pageSize,
 				pageNo,
-				orgIdPath: this.orgId,
+				orgIdPath: this.orgIdPath,
+				orgId: this.orgId,
+				orgType: this.orgType,
 				timeStart: this.formData.startDate,
 				timeEnd: this.formData.endDate,
 				purpose: this.purpose,
@@ -322,9 +324,11 @@ export default {
 			this.$refs.pieChart.showLoading();
 			let url = '/gov/org/ichouse/getHousePurposeCount';
 			let param = {
-				orgIdPath: this.orgId,
+				orgIdPath: this.orgIdPath,
 				timeStart: this.formData.startDate,
-				timeEnd: this.formData.endDate
+				timeEnd: this.formData.endDate,
+				orgId: this.orgId,
+				orgType: this.orgType
 			};
 			const { data, code, msg } = await requestPost(url, param);
 			this.$refs.pieChart.hideLoading();
@@ -339,15 +343,17 @@ export default {
 			this.$refs.pieChart2.showLoading();
 			let url = '/gov/org/ichouse/getHouseStatusCount';
 			let param = {
-				orgIdPath: this.orgId,
+				orgIdPath: this.orgIdPath,
 				timeStart: this.formData.startDate,
-				timeEnd: this.formData.endDate
+				timeEnd: this.formData.endDate,
+				orgId: this.orgId,
+				orgType: this.orgType
 			};
 			const { data, code, msg } = await requestPost(url, param);
 			this.$refs.pieChart2.hideLoading();
 			if (code === 0) {
 				this.pieData2 = data;
-				console.log('this.pieData2', this.pieData2);
+
 				this.getPie2();
 			} else {
 				this.$message.error(msg);
@@ -398,11 +404,9 @@ export default {
 				};
 			});
 
-			console.log('chartData', this.chartData);
 			this.iniPieChart(this.chartData);
 		},
 		setPieData2() {
-			console.log(this.pieData2)
 			let data = [...this.pieData2.list];
 			let type = {
 				1: '出租',
@@ -420,7 +424,6 @@ export default {
 				};
 			});
 
-			console.log('chartData', this.chartData2);
 			this.iniPieChart2(this.chartData2);
 		},
 		// 获取饼状图
@@ -660,11 +663,13 @@ export default {
 				data: {
 					pageSize,
 					pageNo,
-					orgIdPath: this.orgId,
+					orgIdPath: this.orgIdPath,
 					timeStart: this.formData.startDate,
 					timeEnd: this.formData.endDate,
 					purpose: this.purpose,
-					rentFlag: this.rentFlag
+					rentFlag: this.rentFlag,
+					orgId: this.orgId,
+					orgType: this.orgType
 				},
 				responseType: 'blob'
 			})
@@ -716,18 +721,19 @@ export default {
 			this.getsubData2();
 		},
 		handleChangeAgency(val) {
-			// let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
+			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			let tmp = this.formData.orgId;
 
 			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
 				this.orgId = this.formData.orgId;
+				this.orgIdPath = obj.orgIdPath;
+				this.orgType = obj.level;
+				console.log(this.orgId, this.orgIdPath, this.orgType);
 			} else {
-				console.log('ww');
 				this.orgId = this.agencyId;
 			}
-			console.log('this.orgId', this.orgId);
 		},
-		
+
 		deepTree(arr) {
 			if (Array.isArray(arr)) {
 				return arr.map(item => {
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 144f1ffc2..345177447 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -605,24 +605,24 @@ export default {
 		},
 		handelClickMyPei(param) {
 			this.code = param.data.code;
-			this.codeType = 'education';
+			this.codeType = 'age';
 			this.getTableData();
 		},
 
 		handelClickMyPei2(param) {
 			this.code = param.data.code;
-			this.codeType = 'age';
+			this.codeType = 'education';
 			this.getTableData();
 		},
 		handleClickItem(item) {
 			this.code = item.code;
-			this.codeType = 'education';
+			this.codeType = 'age';
 
 			this.getTableData();
 		},
 		handleClickItem2(item) {
 			this.code = item.code;
-			this.codeType = 'age';
+			this.codeType = 'education';
 			this.getTableData();
 		},
 		async handleExport() {

From 97bc10d0decca91ecfbc55238f6c86078704b423 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Fri, 14 Apr 2023 10:12:35 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=88=BF=E5=B1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-houseList.vue | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 3860c23c5..9c0e2fa6f 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -261,11 +261,8 @@ export default {
 		console.log(this.$store.state);
 		this.user = this.$store.state.user;
 		this.agencyId = this.user.agencyId;
-		this.orgId = this.agencyId;
+
 		this.getOrgTreeList();
-		this.getTableData();
-		this.getsubData();
-		this.getsubData2();
 	},
 	methods: {
 		show(row) {
@@ -700,12 +697,19 @@ export default {
 					if (res.code !== 0) {
 						return this.$message.error(res.msg);
 					} else {
-						console.log('获取组织树成功', res.data);
-						// let { agencyList, subAgencyList } = res.data;
+						let data = res.data;
+						console.log('获取组织树成功', data);
+						// let { agencyList, subAgencyList } = data;
 						// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
 						// this.orgOptions = this.deepTree(_arr);
 						this.orgOptions = [];
-						this.orgOptions.push(res.data);
+						this.orgOptions.push(data);
+						this.orgId = data.agencyId;
+						this.orgIdPath = data.orgIdPath;
+						this.orgType = data.level;
+						this.getTableData();
+						this.getsubData();
+						this.getsubData2();
 					}
 				})
 				.catch(() => {
@@ -728,9 +732,10 @@ export default {
 				this.orgId = this.formData.orgId;
 				this.orgIdPath = obj.orgIdPath;
 				this.orgType = obj.level;
-				console.log(this.orgId, this.orgIdPath, this.orgType);
 			} else {
-				this.orgId = this.agencyId;
+				this.orgId = this.orgOptions.agencyId;
+				this.orgIdPath = this.orgOptions.orgIdPath;
+				this.orgType = this.orgOptions.level;
 			}
 		},
 

From 6eda9461b7f2159d5aa6fcb84313b546de639dff Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Fri, 14 Apr 2023 10:13:51 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-houseList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index 9c0e2fa6f..27a21569e 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -250,10 +250,10 @@ export default {
 		...mapGetters(['clientHeight', 'iframeHeight'])
 	},
 	watch: {
-		'formData.endTime': function(val) {
+		'formData.endDate': function(val) {
 			if (val && val != '') {
 				let arrayTemp = val.split(' ');
-				this.formData.endTime = arrayTemp[0] + ' 23:59:59';
+				this.formData.endDate = arrayTemp[0] + ' 23:59:59';
 			}
 		}
 	},

From a911c842a32228491906da984699be2f07883d04 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 14 Apr 2023 10:31:12 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=90=8C=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index e14edd837..21dfab753 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -520,7 +520,8 @@ export default {
                 : [this.form[item.columnName].toString()]),
           };
         });
-      const arr2 = arr.filter((item) => item.columnValue.length > 0);
+        console.log(arr);
+      const arr2 = arr.filter((item) =>  item.columnValue != null&& item.columnValue.length > 0);
       let arr1 = this.fixedList
         .filter((n) => n.columnValue.length > 0)
         .map((item) => {

From 8bbd76db9a033b0fb3dd4b093344e2e0a5cefd87 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Fri, 14 Apr 2023 10:48:32 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=B1=85=E6=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../census/census-accountActiveList.vue       | 68 +++++++++++++++++--
 1 file changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index d7c2cf47b..1da18b91e 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -72,6 +72,15 @@
 							<el-table-column prop="accountActivityCount" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="accountCount" align="center" width="110" label="总账号数" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
+						<el-pagination
+							@size-change="handleSizeChange"
+							@current-change="handleCurrentChange"
+							:current-page.sync="pageNo"
+							:page-sizes="[10, 20, 50, 100, 200]"
+							:page-size="parseInt(pageSize)"
+							layout="sizes, prev, pager, next, total"
+							:total="total"
+						></el-pagination>
 					</div>
 				</el-col>
 				<el-col :span="12">
@@ -99,6 +108,15 @@
 							<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 							<el-table-column prop="agencyName" align="center" label="组织名称" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
+						<el-pagination
+							@size-change="handleSizeChange2"
+							@current-change="handleCurrentChange2"
+							:current-page.sync="pageNo2"
+							:page-sizes="[10, 20, 50, 100, 200]"
+							:page-size="parseInt(pageSize2)"
+							layout="sizes, prev, pager, next, total"
+							:total="total2"
+						></el-pagination>
 					</div>
 				</el-col>
 			</el-row>
@@ -166,7 +184,10 @@ export default {
 			eventTypeCheck: [],
 			pageNo: 1,
 			pageSize: window.localStorage.getItem('pageSize') || 20,
-			total: 1,
+			pageNo2: 1,
+			pageSize2: window.localStorage.getItem('pageSize2') || 20,
+			total: 0,
+			total2: 0,
 			endPickerOptions: {
 				disabledDate: endDisabledDate
 			},
@@ -178,7 +199,7 @@ export default {
 	},
 	computed: {
 		maxTableHeight() {
-			return this.$store.state.inIframe ? this.clientHeight - 400 + this.iframeHeigh : this.clientHeight - 400;
+			return this.$store.state.inIframe ? this.clientHeight - 439 + this.iframeHeigh : this.clientHeight - 439;
 		},
 
 		...mapGetters(['clientHeight', 'iframeHeight'])
@@ -202,6 +223,24 @@ export default {
 		this.getCountLevel();
 	},
 	methods: {
+		handleSizeChange(val) {
+			this.pageSize = val;
+			window.localStorage.setItem('pageSize', val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.getTableData();
+		},
+		handleSizeChange2(val) {
+			this.pageSize2 = val;
+			window.localStorage.setItem('pageSize2', val);
+			this.getTableData2();
+		},
+		handleCurrentChange2(val) {
+			this.pageNo2 = val;
+			this.getTableData2();
+		},
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			console.log(obj);
@@ -217,7 +256,7 @@ export default {
 				this.orgId = this.formData.orgId;
 			}
 			console.log(this.formData);
-			this.pageNo = 1;
+			this.pageNo = 1;this.pageNo2 = 1;
 			this.getTableData();
 			this.getTableData2();
 			this.getCountLevel();
@@ -314,11 +353,20 @@ export default {
 
 			const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
 
-			let param = { orgId: this.orgId, isActivity: 1, startDate: this.formData.startDate, endDate: this.formData.endDate };
+			let param = {
+				orgId: this.orgId,
+				startDate: this.formData.startDate,
+				endDate: this.formData.endDate,
+				isActivity: 1,
+				isPage: true,
+				pageNo: this.pageNo,
+				pageSize: this.pageSize
+			};
 			const { data, code, msg } = await requestPost(url, param);
 
 			this.tableLoading = false;
 			if (code === 0) {
+				this.total = data.total || 0;
 				this.tableData = data.list
 					? data.list.map(item => {
 							return item;
@@ -333,11 +381,21 @@ export default {
 
 			const url = '/gov/org/staffLoginLog/getAccountActivityInfo';
 
-			let param = { orgId: this.orgId, isActivity: 0, startDate: this.formData.startDate, endDate: this.formData.endDate };
+			let param = {
+				orgId: this.orgId,
+				startDate: this.formData.startDate,
+				endDate: this.formData.endDate,
+				isActivity: 0,
+				isPage: true,
+				pageNo: this.pageNo2,
+				pageSize: this.pageSize2
+			};
 			const { data, code, msg } = await requestPost(url, param);
 
 			this.tableLoading2 = false;
 			if (code === 0) {
+				this.total2 = data.total || 0;
+			console.log(this.total2)
 				this.tableData2 = data.list
 					? data.list.map(item => {
 							return item;