From 1a22013d13f485e73d4760e0e618eb8e304af993 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Mon, 30 May 2022 14:54:58 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=BA=A7=E8=81=94=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/factagencyuserhousedaily.vue        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 42e37b0c..8be6e5eb 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -4,7 +4,7 @@
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="组织机构" label-width="100px"
                       prop="agencyId">
-          <el-select
+          <!-- <el-select
                   v-model.trim="dataForm.agencyId"
                   placeholder="请选择"
                   clearable
@@ -16,7 +16,14 @@
                     :value="item.agencyId"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
+          <el-cascader
+            v-model.trim="dataForm.agencyId"
+            :options="optionsA"
+            :props="{ expandTrigger: 'hover',children:'subAgencyList',label:'agencyName',value:'agencyId' }"
+            @change="handleChange"
+            clearable>
+          </el-cascader>
         </el-form-item>
         <el-form-item label="入黑名单时间"
                       prop="startTime">
@@ -104,6 +111,14 @@ export default {
     }
   },
   methods: {
+    handleChange(value){
+      console.log(value[1])
+      if(Array.isArray(value) && value.length > 0){
+        this.dataForm.agencyId = value[1]
+      }else{
+        this.dataForm.agencyId = null
+      }
+    },
     getGridList() {
       const { user } = this.$store.state
       this.$http

From a1efe6df60e28a24ffed16ce587b9e5e5f1d3a4f Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Mon, 30 May 2022 15:09:34 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/stats/factagencyuserhousedaily.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 8be6e5eb..b12ab5ff 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -20,6 +20,7 @@
           <el-cascader
             v-model.trim="dataForm.agencyId"
             :options="optionsA"
+            ref="cascaderUnit"
             :props="{ expandTrigger: 'hover',children:'subAgencyList',label:'agencyName',value:'agencyId' }"
             @change="handleChange"
             clearable>
@@ -113,6 +114,8 @@ export default {
   methods: {
     handleChange(value){
       console.log(value[1])
+      const checkedNodes = this.$refs['cascaderUnit'].getCheckedNodes()
+      console.log(checkedNodes) // 获取当前点击的节点
       if(Array.isArray(value) && value.length > 0){
         this.dataForm.agencyId = value[1]
       }else{

From 4b930a06468c0963010e148ad7444bf89573fb28 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Mon, 30 May 2022 16:10:07 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E5=92=8C=E4=B8=80=E7=BA=A7=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/factagencyuserhousedaily.vue        | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index b12ab5ff..7f0392fd 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -17,13 +17,13 @@
             >
             </el-option>
           </el-select> -->
-          <el-cascader
-            v-model.trim="dataForm.agencyId"
-            :options="optionsA"
-            ref="cascaderUnit"
-            :props="{ expandTrigger: 'hover',children:'subAgencyList',label:'agencyName',value:'agencyId' }"
-            @change="handleChange"
-            clearable>
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}">
+            <template slot-scope="{ node, data }">
+              <div @click="cascaderClick(data)">
+                <span>{{ data.agencyName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.subAgencyList.length }}) </span>
+              </div>
+            </template>
           </el-cascader>
         </el-form-item>
         <el-form-item label="入黑名单时间"
@@ -90,7 +90,7 @@ export default {
       timeRange: '',
       dataForm: {
         id: ''
-      }
+      },
     }
   },
   components: {
@@ -98,7 +98,7 @@ export default {
   },
   created () {
     this.getGridList()
-    this.getValiheList()
+    // this.getValiheList()
   },
   watch: {
     timeRange (val) {
@@ -112,15 +112,13 @@ export default {
     }
   },
   methods: {
-    handleChange(value){
-      console.log(value[1])
-      const checkedNodes = this.$refs['cascaderUnit'].getCheckedNodes()
-      console.log(checkedNodes) // 获取当前点击的节点
-      if(Array.isArray(value) && value.length > 0){
-        this.dataForm.agencyId = value[1]
-      }else{
-        this.dataForm.agencyId = null
-      }
+    cascaderClick (nodeData) {
+      this.dataForm.agencyId = nodeData.agencyId;
+      this.dataForm.level = nodeData.level
+      this.$refs.cascaderUnit.checkedValue = nodeData.agencyId;
+      this.$refs.cascaderUnit.computePresentText();
+      this.$refs.cascaderUnit.toggleDropDownVisible(false);
+      
     },
     getGridList() {
       const { user } = this.$store.state
@@ -133,6 +131,8 @@ export default {
                   console.log('获取查询详情成功', res.data)
                   // this.optionsA = res.data
                   this.optionsA.push(res.data)
+                  this.dataForm.agencyId = res.data.agencyId
+                  this.dataForm.level = res.data.level
                 }
               })
               .catch(() => {

From 9588eec73b8cbe9c3d4cbbe2c8179877b5181251 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Tue, 31 May 2022 10:21:05 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BA=A7=E8=81=94?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/stats/factagencyuserhousedaily.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 7f0392fd..917751d6 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__factAgencyUserHouseDaily}">
+    <div class="mode-block">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="组织机构" label-width="100px"
                       prop="agencyId">
@@ -17,9 +17,10 @@
             >
             </el-option>
           </el-select> -->
-          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}">
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" popper-class="cascader-block">
             <template slot-scope="{ node, data }">
               <div @click="cascaderClick(data)">
+                <!-- <span class="block"></span> -->
                 <span>{{ data.agencyName }}</span>
                 <span v-if="!node.isLeaf"> ({{ data.subAgencyList.length }}) </span>
               </div>
@@ -142,3 +143,16 @@ export default {
   }
 }
 </script>
+<style>
+.block{ 
+  position: absolute;
+  left: 0px;
+  display: inline-block;
+  width: 35px;
+  height: 50px;
+  background: #fff;
+}
+.cascader-block .el-cascader-node>.el-radio{ 
+  display: none;
+}
+</style>

From 16e83d202b3c7df620ad36c00c23bc9421e13b4c Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 11:06:07 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=80=BB=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/factagencyuserhousedaily.vue        | 166 ++++++++++++++++--
 1 file changed, 147 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 917751d6..8071612e 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -1,6 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mode-block">
+    <div class="mode-block resi-container">
+      <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="组织机构" label-width="100px"
                       prop="agencyId">
@@ -40,24 +41,34 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+      </el-card>
+      <el-card class="resi-card-table">
+        <div class="resi-row-btn">
+          <el-button @click="handleTotal"
+                     class="diy-button--add"
+                     size="small">总计</el-button>
+          <el-button @click="handleChu"
+                     class="diy-button--reset"
+                     size="small">导出</el-button>
+        </div>
+      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseSelfCount" label="自住房屋总" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
+        <el-table-column width="80" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="80" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="120" prop="houseSelfCount" label="自住房屋总数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
@@ -68,8 +79,33 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
+      </el-card>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <el-dialog
+              title="总计"
+              :visible.sync="totalVisible"
+              width="60%">
+        <template>
+          <el-table
+                  :data="tableData"
+                  style="width: 100%">
+            <el-table-column width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
+            <el-table-column width="80" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="80" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="120" prop="houseSelfCount" label="自住房屋总数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
+            <el-table-column width="100" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
+          </el-table>
+        </template>
+      </el-dialog>
     </div>
   </el-card>
 </template>
@@ -88,10 +124,12 @@ export default {
         deleteIsBatch: true
       },
       optionsA: [],
+      totalVisible: false,
       timeRange: '',
       dataForm: {
         id: ''
       },
+      tableData: []
     }
   },
   components: {
@@ -113,13 +151,30 @@ export default {
     }
   },
   methods: {
+    handleTotal () {
+      this.tableData = []
+      this.$http
+              .get('/data/stats/factAgencyUserHouseDaily/total',{params: this.dataForm})
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                } else {
+                  console.log('获取查询详情成功', res.data)
+                  this.tableData.push(res.data)
+                }
+              })
+              .catch(() => {
+                return this.$message.error('网络错误')
+              })
+      this.totalVisible = true
+    },
     cascaderClick (nodeData) {
       this.dataForm.agencyId = nodeData.agencyId;
       this.dataForm.level = nodeData.level
       this.$refs.cascaderUnit.checkedValue = nodeData.agencyId;
       this.$refs.cascaderUnit.computePresentText();
       this.$refs.cascaderUnit.toggleDropDownVisible(false);
-      
+
     },
     getGridList() {
       const { user } = this.$store.state
@@ -144,7 +199,7 @@ export default {
 }
 </script>
 <style>
-.block{ 
+.block{
   position: absolute;
   left: 0px;
   display: inline-block;
@@ -152,7 +207,80 @@ export default {
   height: 50px;
   background: #fff;
 }
-.cascader-block .el-cascader-node>.el-radio{ 
+.cascader-block .el-cascader-node>.el-radio{
   display: none;
 }
 </style>
+<style lang="scss" scoped>
+  .blacklist-reason {
+    width: 100%;
+    height: 80px;
+    border: 1px solid #e4e4e4;
+    border-radius: 4px;
+    resize: none;
+    padding: 8px;
+    box-sizing: border-box;
+  }
+</style>
+<style lang="scss" scoped>
+  @import "@/assets/scss/buttonstyle.scss";
+
+  .resi-container .resi-card-table {
+    ::v-deep .el-table th {
+      color: #fff;
+      background-color: rgba(33, 149, 254, 1);
+      // border-right: 1px solid rgba(33, 149, 254, 1);
+    }
+  }
+  .resi-table {
+    ::v-deep .el-button--text {
+      text-decoration: underline;
+    }
+    ::v-deep .btn-color-del {
+      margin-left: 10px;
+      color: rgba(213, 16, 16, 1);
+    }
+    ::v-deep .btn-color-edit {
+      color: rgba(0, 167, 169, 1);
+    }
+  }
+  .form-wr {
+    .input-width {
+      width: 260px;
+
+    }
+    .input-width-textarea {
+      width: 500px;
+    }
+    .imsg-list {
+      display: flex;
+      align-items: center;
+      .imgs-item {
+        position: relative;
+        margin-right: 10px;
+        .el-icon-delete {
+          position: absolute;
+          top: 0;
+          right: 0;
+          font-size: 18px;
+          color: red;
+          z-index: 3;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  .div-content {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .resi-row-btn {
+    margin-bottom: 13px;
+    .upload-btn {
+      display: inline-block;
+      margin: 0 10px;
+    }
+  }
+</style>

From 8fcdf95cf533f050f63fe273dd7cce89ae9b0655 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 11:13:20 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/factagencyuserhousedaily.vue        | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 8071612e..597c874b 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -47,10 +47,10 @@
       </el-card>
       <el-card class="resi-card-table">
         <div class="resi-row-btn">
-          <el-button @click="handleTotal"
+          <el-button @click="totalHandle"
                      class="diy-button--add"
                      size="small">总计</el-button>
-          <el-button @click="handleChu"
+          <el-button @click="exportHandle"
                      class="diy-button--reset"
                      size="small">导出</el-button>
         </div>
@@ -121,7 +121,8 @@ export default {
         getDataListURL: '/data/stats/factAgencyUserHouseDaily/page',
         getDataListIsPage: true,
         deleteURL: '/data/stats/factAgencyUserHouseDaily',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/data/stats/factAgencyUserHouseDaily/export'
       },
       optionsA: [],
       totalVisible: false,
@@ -151,7 +152,7 @@ export default {
     }
   },
   methods: {
-    handleTotal () {
+    totalHandle () {
       this.tableData = []
       this.$http
               .get('/data/stats/factAgencyUserHouseDaily/total',{params: this.dataForm})
@@ -168,6 +169,34 @@ export default {
               })
       this.totalVisible = true
     },
+    exportHandle () {
+      const url = this.mixinViewModuleOptions.exportURL
+      this.$http({
+        method: 'GET',
+        url,
+        responseType: 'blob',
+        params: this.dataForm
+      }).then(res => {
+        // this.download(res.data, title + '.xls')
+        if (res.headers["content-disposition"]) {
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        } else this.$message.error('下载失败')
+      }).catch(err => {
+        console.log('err', err)
+        return this.$message.error('网络错误')
+      })
+    },
     cascaderClick (nodeData) {
       this.dataForm.agencyId = nodeData.agencyId;
       this.dataForm.level = nodeData.level

From e56f40e25928710245ea7207a6f95d229d0752c2 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 13:25:32 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/stats/factagencyuserhousedaily.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 597c874b..d3a6ffe4 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -59,7 +59,7 @@
         <el-table-column width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
         <el-table-column width="80" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
         <el-table-column width="80" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
-        <el-table-column width="120" prop="houseSelfCount" label="自住房屋总数" header-align="center" align="center"></el-table-column>
+        <el-table-column width="100" prop="houseSelfCount" label="自住房屋数" header-align="center" align="center"></el-table-column>
         <el-table-column width="100" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
         <el-table-column width="100" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
         <el-table-column width="100" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>

From a10dd3856cfe09c72eb9b0e893215a41b40af9af Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 31 May 2022 15:59:43 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/view-module.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index ebde6a3e..dcfabd2e 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -44,16 +44,16 @@ export default {
     query () {
       this.dataListLoading = true
       this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL,
-        {
-          params: {
-            order: this.order,
-            orderField: this.orderField,
-            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-            ...this.dataForm
+          this.mixinViewModuleOptions.getDataListURL,
+          {
+            params: {
+              order: this.order,
+              orderField: this.orderField,
+              page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+              limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+              ...this.dataForm
+            }
           }
-        }
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {