bug以及统计

src/views/modules/plugins/change/changedeath.vue

@@ -88,7 +88,7 @@
           <template slot-scope="scope">
             {{
             scope.row.gender == '2'
-            ? "保密"
+            ? "女"
             : scope.row.gender
             }}
           </template>

src/views/modules/plugins/change/changerelocation.vue

@@ -186,7 +186,7 @@
           <template slot-scope="scope">
             {{
             scope.row.gender == '2'
-            ? "保密"
+            ? "女"
             : scope.row.gender
             }}
           </template>

src/views/modules/plugins/change/changewelfare.vue

@@ -79,7 +79,7 @@
           <template slot-scope="scope">
             {{
             scope.row.gender == '2'
-            ? "保密"
+            ? "女"
             : scope.row.gender
             }}
           </template>

src/views/modules/plugins/stats/factagencyuserhousedaily-add-or-update.vue

@@ -0,0 +1,240 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="客户id" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户id"></el-input>
+      </el-form-item>
+          <el-form-item label="数据更新至：yyyyMMdd; " prop="dateId">
+          <el-input v-model="dataForm.dateId" placeholder="数据更新至：yyyyMMdd; "></el-input>
+      </el-form-item>
+          <el-form-item label="组织id" prop="agencyId">
+          <el-input v-model="dataForm.agencyId" placeholder="组织id"></el-input>
+      </el-form-item>
+          <el-form-item label="组织i所属的组织id" prop="pid">
+          <el-input v-model="dataForm.pid" placeholder="组织i所属的组织id"></el-input>
+      </el-form-item>
+          <el-form-item label="组织i所有上级id" prop="pids">
+          <el-input v-model="dataForm.pids" placeholder="组织i所有上级id"></el-input>
+      </el-form-item>
+          <el-form-item label="小区总数" prop="neighbourhoodsCount">
+          <el-input v-model="dataForm.neighbourhoodsCount" placeholder="小区总数"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋总数" prop="houseCount">
+          <el-input v-model="dataForm.houseCount" placeholder="房屋总数"></el-input>
+      </el-form-item>
+          <el-form-item label="自住房屋总数" prop="houseSelfCount">
+          <el-input v-model="dataForm.houseSelfCount" placeholder="自住房屋总数"></el-input>
+      </el-form-item>
+          <el-form-item label="出租房屋总数" prop="houseLeaseCount">
+          <el-input v-model="dataForm.houseLeaseCount" placeholder="出租房屋总数"></el-input>
+      </el-form-item>
+          <el-form-item label="闲置房屋总数" prop="houseIdleCount">
+          <el-input v-model="dataForm.houseIdleCount" placeholder="闲置房屋总数"></el-input>
+      </el-form-item>
+          <el-form-item label="居民总数" prop="userCount">
+          <el-input v-model="dataForm.userCount" placeholder="居民总数"></el-input>
+      </el-form-item>
+          <el-form-item label="常住居民总数" prop="userResiCount">
+          <el-input v-model="dataForm.userResiCount" placeholder="常住居民总数"></el-input>
+      </el-form-item>
+          <el-form-item label="流动居民总数" prop="userFloatCount">
+          <el-input v-model="dataForm.userFloatCount" placeholder="流动居民总数"></el-input>
+      </el-form-item>
+          <el-form-item label="当日新增房屋数" prop="houseIncr">
+          <el-input v-model="dataForm.houseIncr" placeholder="当日新增房屋数"></el-input>
+      </el-form-item>
+          <el-form-item label="当日修改房屋数" prop="houseModify">
+          <el-input v-model="dataForm.houseModify" placeholder="当日修改房屋数"></el-input>
+      </el-form-item>
+          <el-form-item label="当日新增居民数" prop="userIncr">
+          <el-input v-model="dataForm.userIncr" placeholder="当日新增居民数"></el-input>
+      </el-form-item>
+          <el-form-item label="当日修改居民数" prop="userModify">
+          <el-input v-model="dataForm.userModify" placeholder="当日修改居民数"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识 0未删除、1已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0未删除、1已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间：第一次提交审核的时间，注意和历史表的第一条记录时间一致"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        customerId: '',
+        dateId: '',
+        agencyId: '',
+        level: '',
+        pid: '',
+        pids: '',
+        neighbourhoodsCount: '',
+        houseCount: '',
+        houseSelfCount: '',
+        houseLeaseCount: '',
+        houseIdleCount: '',
+        userCount: '',
+        userResiCount: '',
+        userFloatCount: '',
+        houseIncr: '',
+        houseModify: '',
+        userIncr: '',
+        userModify: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        dateId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        agencyId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        level: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        pid: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        pids: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        neighbourhoodsCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseSelfCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseLeaseCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseIdleCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userResiCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userFloatCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseIncr: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseModify: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userIncr: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userModify: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`//factAgencyUserHouseDaily/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('//factAgencyUserHouseDaily/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>

src/views/modules/plugins/stats/factagencyuserhousedaily.vue

@@ -0,0 +1,126 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__factAgencyUserHouseDaily}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="组织机构" label-width="100px"
+                      prop="agencyId">
+          <el-select
+                  v-model.trim="dataForm.agencyId"
+                  placeholder="请选择"
+                  clearable
+          >
+            <el-option
+                    v-for="item in optionsA"
+                    :key="item.agencyId"
+                    :label="item.agencyName"
+                    :value="item.agencyId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="入黑名单时间"
+                      prop="startTime">
+          <el-date-picker v-model="timeRange"
+                          type="daterange"
+                          clearable
+                          size="small"
+                          range-separator="至"
+                          start-placeholder="选择日期"
+                          end-placeholder="选择日期"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @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-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>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './factagencyuserhousedaily-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/data/stats/factAgencyUserHouseDaily/page',
+        getDataListIsPage: true,
+        deleteURL: '/data/stats/factAgencyUserHouseDaily',
+        deleteIsBatch: true
+      },
+      optionsA: [],
+      timeRange: '',
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  created () {
+    this.getGridList()
+    this.getValiheList()
+  },
+  watch: {
+    timeRange (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.dataForm.startTime = val[0];
+        this.dataForm.endTime = val[1];
+      } else {
+        this.dataForm.startTime = "";
+        this.dataForm.endTime = "";
+      }
+    }
+  },
+  methods: {
+    getGridList() {
+      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.optionsA = res.data
+                  this.optionsA.push(res.data)
+                }
+              })
+              .catch(() => {
+                return this.$message.error('网络错误')
+              })
+    },
+  }
+}
+</script>