Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

src/assets/scss/modules/visual/duoyuanfenxi.scss

@@ -76,7 +76,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100% - 50px);
+      height: calc(100% - 40px);
       overflow-y: auto;
       @include scrollBar;
       /deep/ .table-status {

src/views/modules/base/community/community.vue

@@ -48,7 +48,7 @@
 
               </el-input>
             </el-form-item>
-            <el-form-item label="房主手机"
+            <el-form-item label="联系方式"
                           prop="ownerPhone">
               <el-input v-model="ownerPhone"
                         class="item_width_2"
@@ -269,7 +269,7 @@ export default {
 
     await this.loadOrgData()
     await this.loadTree()
-    await this.loadOpenNode()
+    // await this.loadOpenNode()
 
     await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
     if (this.treeData.length > 0) {
@@ -347,6 +347,8 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
+        this.openNodes = []
+        this.openNodes.push(data[0].id)
 
         this.treeData = data
         if (!isRefresh && data.length > 0) {

src/views/modules/base/community/communityTable.vue

@@ -2,6 +2,12 @@
   <div>
 
     <div class="div_btn">
+      <el-button v-if="showYhymInfo"
+                      style=""
+                      class="diy-button--reset"
+                      size="small"
+                      :loading="yhymLoading"
+                      @click="handleYhymInfo">补全一户一码信息</el-button>
       <el-button style=""
                  class="diy-button--add"
                  size="small"
@@ -66,7 +72,7 @@
       <el-button style="margin-left:10px"
                  class="diy-button--reset"
                  size="small"
-                 @click="handleExport">导出</el-button>
+                 @click="handleExportOpen">导出</el-button>
       <el-button v-if="agencyObj.level == 'community'"
                  style="margin-left:10px"
                  class="diy-button--qrcode"
@@ -76,11 +82,11 @@
                  class="diy-button--more"
                  size="small"
                  @click="deleteBatch">批量删除</el-button>
-      <el-button style=";margin-left:10px"
+      <!-- <el-button style=";margin-left:10px"
                  class="diy-button--export"
                  size="small"
                  :disabled="yihuyidangDisabled"
-                 @click="handleExportYihuyidang()">导出一户一档</el-button>
+                 @click="handleExportYihuyidang()">导出一户一档</el-button> -->
 
     </div>
 
@@ -183,6 +189,31 @@
                       @dialogOk="addFormOk"></community-form>
     </el-dialog>
 
+    <el-dialog
+        title="导出"
+        :visible.sync="dialogVisible"
+        width="30%"
+        :before-close="handleClose">
+        <div>
+          <el-button class="diy-button--reset"
+                 size="small"
+                 @click="handleExport">导出房屋数据</el-button>
+          <el-button class="diy-button--export"
+                 size="small"
+                 :disabled="yihuyidangDisabled"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
+          <el-button class="diy-button--qrcode"
+                 size="small"
+                 :disabled="yihuyimaDisabled"
+                 :loading="exportBtn"
+                 @click="handleExportYihuyima()">导出一户一码</el-button>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <!-- <el-button type="primary" @click="dialogVisible = false">确 定</el-button> -->
+        </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -208,6 +239,9 @@ export default {
       tableLoading: true,
 
       showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
+      roleList: [],//角色列表
+      showYhymInfo: false, // 是否显示补全一户一码信息按钮
+      yhymLoading: false,
 
       agencyObj: {},//树所选的组织对象
 
@@ -225,7 +259,9 @@ export default {
       fileName: "",
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
       yihuyidangDisabled: false,
-
+      yihuyimaDisabled: false,
+      exportBtn: false,
+      dialogVisible: false // 导出
     }
   },
   components: {
@@ -246,7 +282,13 @@ export default {
 
     async loadTable (fromTree, treeObj) {
       console.log(111, this.staffAgencyId)
-
+      // 是否显示补全一户一码信息按钮
+      this.roleList = localStorage.getItem('roleList')
+      if (this.roleList.indexOf('root_manager') > -1 || this.roleList.indexOf('manager') > -1) {
+        this.showYhymInfo = true
+      } else {
+        this.showYhymInfo = false
+      }
       this.tableLoading = true
       if (fromTree) {
         this.agencyObj = treeObj
@@ -330,6 +372,34 @@ export default {
       })
     },
 
+    // 补全一户一码点击事件
+    async handleYhymInfo () {
+      this.yhymLoading = true
+      const url = "/gov/org/house/createBatchHouseCodeAndUrl"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.yhymLoading = false
+        this.$message({
+          type: "success",
+          message: "批量生成成功"
+        });
+      } else if (code > 8000) {
+        this.yhymLoading = false
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
+      } else {
+        this.yhymLoading = false
+        this.$message.error(msg)
+      }
+    },
+
     handleEdit (row) {
       this.formTitle = '修改小区'
       this.formShow = true
@@ -486,7 +556,11 @@ export default {
         // this.download(res.data, '1.png')
       })
     },
-    //导出表格
+    // 导出按钮点击事件
+    handleExportOpen () {
+      this.dialogVisible = true
+    },
+    //导出表格 以前是导出 现在改成导出房屋数据
     async handleExport () {
       let title = this.agencyObj.label
       title = title + '—小区列表'
@@ -512,6 +586,10 @@ export default {
 
     },
 
+    handleClose(done) {
+      this.dialogVisible = false
+    },
+
     // 下载文件
     download (data, downFileName) {
       if (!data) {
@@ -613,6 +691,41 @@ export default {
     },
 
 
+    // 导出一户一码
+
+    handleExportYihuyima () {
+      this.exportBtn = true
+      this.yihuyimaDisabled = true
+      let title = this.agencyObj.label
+      title = title + '-一户一码'
+      let url = "/gov/org/house/downloadZip"
+
+
+      let params = {
+        level: this.agencyObj.level,
+        id: this.agencyObj.id
+      }
+
+
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.Zip')
+          this.exportBtn = false
+          this.yihuyimaDisabled = false
+        },
+        (rspMsg, data) => {
+          this.exportBtn = false
+          this.yihuyimaDisabled = false
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+
 
     // 上传文件之前的钩子
     beforeUpload (file, type) {

src/views/modules/base/community/roomForm.vue

@@ -40,6 +40,25 @@
           </el-input>
         </el-form-item>
 
+        <div v-if="formType === 'detail'">
+          <el-form-item label="房屋编码"
+                        prop="houseCode"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      maxlength="30"
+                      v-model="dataForm.houseCode">
+            </el-input>
+          </el-form-item>
+          <div v-if="dataForm.houseQrcodeUrl"
+               style="display: flex;flex-direction: column;">
+            <img style="margin-left: 70px;width: 200px;"
+                 :src="dataForm.houseQrcodeUrl">
+            <a style="margin-left: 80px"
+               :href="dataForm.houseQrcodeUrl"
+               target="_blank">下载</a>
+          </div>
+        </div>
         <el-form-item label="房屋类型"
                       prop="houseType"
                       label-width="150px"
@@ -91,13 +110,13 @@
                     v-model="dataForm.ownerName">
           </el-input>
         </el-form-item>
-        <el-form-item label="房主电话"
+        <el-form-item label="联系方式"
                       prop="ownerPhone"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     type='number'
-                    placeholder="请输入房主电话"
+                    placeholder="请输入联系方式"
                     v-model="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
@@ -136,260 +155,260 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex'
+import { mapGetters } from 'vuex'
-    import { Loading } from 'element-ui' // 引入Loading服务
+import { Loading } from 'element-ui' // 引入Loading服务
-    import { requestPost, requestGet } from '@/js/dai/request'
+import { requestPost, requestGet } from '@/js/dai/request'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      unitList: [],
+
+      houseId: '', //房屋ID
+      houseType: '1',
+      purpose: '1',
+      rentFlag: 0,
+      dataForm: {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '',//房屋类型【楼房，平房，别墅】
+        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+        ownerPhone: '', //联系方式
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: ''
+      },
+
+      keyWords: '',
+      agencyObj: {},
 
+    }
+  },
+  components: {},
+  mounted () {
 
-    let loading // 加载动画
+  },
-    export default {
-        data () {
-            return {
-                formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-                btnDisable: false,
-                unitList: [],
 
-                houseId: '', //房屋ID
+  methods: {
-                houseType: '1',
+    async initForm (type, row, agencyObj) {
-                purpose: '1',
+
-                rentFlag: 0,
+      this.$refs.ref_form.resetFields();
-                dataForm: {
+      this.agencyObj = agencyObj
-                    neighborHoodId: '', // 所属小区ID
+      this.formType = type
-                    buildingId: '',//所属楼栋ID
+      if (row) {
-                    buildingUnitId: '',//所属单元ID
+
-                    doorName: '',//门牌号
+        this.houseId = row.houseId
-                    houseType: '',//房屋类型【楼房，平房，别墅】
+        await this.loadHouseInfo()
-                    purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        // this.dataForm = JSON.parse(JSON.stringify(row))
-                    rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+        // this.houseId = this.dataForm.houseId
-                    ownerPhone: '', //房主电话
+
-                    ownerName: '', //房主名字
+        // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
-                    ownerIdCard: '', //房主身份证
+        // this.dataForm = { ...  this.dataForm }
-                    remark: ''
+        // this.houseType = this.dataForm.houseTypeKey
-                },
+        // this.purpose = this.dataForm.purposeKey
-
+        // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
-                keyWords: '',
+
-                agencyObj: {},
+      } else {
-
+
-            }
+        this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
-        },
+        this.dataForm.buildingId = this.agencyObj.id
-        components: {},
+      }
-        mounted () {
+
-
+
-        },
+      await this.loadUnitList()
-
+
-        methods: {
+    },
-            async initForm (type, row, agencyObj) {
+
-
+    async loadHouseInfo () {
-                this.$refs.ref_form.resetFields();
+
-                this.agencyObj = agencyObj
+      const url = "/gov/org/ichouse/" + this.houseId
-                this.formType = type
+
-                if (row) {
+      const { data, code, msg } = await requestGet(url)
-
+
-                    this.houseId = row.houseId
+      if (code === 0) {
-                    await this.loadHouseInfo()
+        // debugger
-                    // this.dataForm = JSON.parse(JSON.stringify(row))
+        this.dataForm = { ...data }
-                    // this.houseId = this.dataForm.houseId
+
-
+        this.houseType = this.dataForm.houseType
-                    // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+        this.purpose = this.dataForm.purpose
-                    // this.dataForm = { ...  this.dataForm }
+        this.rentFlag = parseInt(this.dataForm.rentFlag)
-                    // this.houseType = this.dataForm.houseTypeKey
+
-                    // this.purpose = this.dataForm.purposeKey
+
-                    // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
+      } else {
-
+        this.$message.error(msg)
-                } else {
+      }
-
+
-                    this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+    },
-                    this.dataForm.buildingId = this.agencyObj.id
+
-                }
+    //加载单元
-
+    async loadUnitList () {
-
+      const url = '/gov/org/building/buildingunitlist'
-                await this.loadUnitList()
+
-
+      let params = {
-            },
+        buildingId: this.dataForm.buildingId
-
+      }
-            async loadHouseInfo () {
+
-
+      const { data, code, msg } = await requestPost(url, params)
-                const url = "/gov/org/ichouse/" + this.houseId
+
-
+      if (code === 0) {
-                const { data, code, msg } = await requestGet(url)
+        this.unitList = data
-
+      } else {
-                if (code === 0) {
+        this.$message.error(msg)
-                    // debugger
+      }
-                    this.dataForm = { ...data }
+    },
-
+
-                    this.houseType = this.dataForm.houseType
+    async handleComfirm () {
-                    this.purpose = this.dataForm.purpose
+      this.btnDisable = true
-                    this.rentFlag = parseInt(this.dataForm.rentFlag)
+      setTimeout(() => {
-
+        this.btnDisable = false
-
+      }, 10000)
-                } else {
+
-                    this.$message.error(msg)
+      this.dataForm.houseType = this.houseType
-                }
+      this.dataForm.purpose = this.purpose
-
+      this.dataForm.rentFlag = this.rentFlag
-            },
+      this.$refs['ref_form'].validate((valid, messageObj) => {
-
+        if (!valid) {
-            //加载单元
+          this.btnDisable = false
-            async loadUnitList () {
+          app.util.validateRule(messageObj)
-                const url = '/gov/org/building/buildingunitlist'
+        } else {
-
+          this.addRoom()
-                let params = {
+        }
-                    buildingId: this.dataForm.buildingId
+
-                }
+      })
-
+    },
-                const { data, code, msg } = await requestPost(url, params)
+
-
+    async addRoom () {
-                if (code === 0) {
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-                    this.unitList = data
+      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
-                } else {
+        this.btnDisable = false
-                    this.$message.error(msg)
+        this.$message({
-                }
+          type: 'warning',
-            },
+          message: '请输入正确的身份证号码'
-
+        })
-            async handleComfirm () {
+        return false;
-                this.btnDisable = true
+      }
-                setTimeout(() => {
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-                    this.btnDisable = false
+      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
-                }, 10000)
+        this.btnDisable = false
-
+        this.$message({
-                this.dataForm.houseType = this.houseType
+          type: 'warning',
-                this.dataForm.purpose = this.purpose
+          message: '请输入正确的手机号码'
-                this.dataForm.rentFlag = this.rentFlag
+        })
-                this.$refs['ref_form'].validate((valid, messageObj) => {
+        return false;
-                    if (!valid) {
+      }
-                        this.btnDisable = false
+
-                        app.util.validateRule(messageObj)
+      let url = ''
-                    } else {
+
-                        this.addRoom()
+      if (this.formType === 'add') {
-                    }
+        url = '/gov/org/house/houseadd'
-
+      } else {
-                })
+        url = '/gov/org/house/houseupdate'
-            },
+        this.dataForm.houseId = this.houseId
-
+      }
-            async addRoom () {
+
-                const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+      const { data, code, msg } = await requestPost(url, this.dataForm)
-                if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
+      this.btnDisable = false
-                    this.btnDisable = false
+      if (code === 0) {
-                    this.$message({
+        this.$message({
-                        type: 'warning',
+          type: 'success',
-                        message: '请输入正确的身份证号码'
+          message: '操作成功'
-                    })
+        })
-                    return false;
+        this.resetData()
-                }
+        this.$emit('dialogOk')
-                const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+
-                if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
+      } else {
-                    this.btnDisable = false
+
-                    this.$message({
+        this.$message.error(msg)
-                        type: 'warning',
+      }
-                        message: '请输入正确的手机号码'
+
-                    })
+    },
-                    return false;
+
-                }
+    handleCancle () {
-
+      this.resetData()
-                let url = ''
+      this.$emit('dialogCancle')
-
+
-                if (this.formType === 'add') {
+    },
-                    url = '/gov/org/house/houseadd'
+
-                } else {
+    resetData () {
-                    url = '/gov/org/house/houseupdate'
+      this.houseId = '' //房屋ID
-                    this.dataForm.houseId = this.houseId
+      this.houseType = '1'
-                }
+      this.purpose = '1'
-
+      this.rentFlag = 0
-                const { data, code, msg } = await requestPost(url, this.dataForm)
+      this.dataForm = {
-                this.btnDisable = false
+        neighborHoodId: '', // 所属小区ID
-                if (code === 0) {
+        buildingId: '',//所属楼栋ID
-                    this.$message({
+        buildingUnitId: '',//所属单元ID
-                        type: 'success',
+        doorName: '',//门牌号
-                        message: '操作成功'
+        houseType: '1',//房屋类型【楼房，平房，别墅】
-                    })
+        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-                    this.resetData()
+        rentFlag: 0,//是否出租【是：1，否：0】
-                    this.$emit('dialogOk')
+        ownerPhone: '', //联系方式
-
+        ownerName: '', //房主名字
-                } else {
+        ownerIdCard: '', //房主身份证
-
+        remark: '' // 备注
-                    this.$message.error(msg)
+      }
-                }
+
-
+    },
-            },
+    // 开启加载动画
-
+    startLoading () {
-            handleCancle () {
+      loading = Loading.service({
-                this.resetData()
+        lock: true, // 是否锁定
-                this.$emit('dialogCancle')
+        text: '正在加载……', // 加载中需要显示的文字
-
+        background: 'rgba(0,0,0,.7)' // 背景颜色
-            },
+      })
-
+    },
-            resetData () {
+    // 结束加载动画
-                this.houseId = '' //房屋ID
+    endLoading () {
-                this.houseType = '1'
+      // clearTimeout(timer);
-                this.purpose = '1'
+      if (loading) {
-                this.rentFlag = 0
+        loading.close()
-                this.dataForm = {
+      }
-                    neighborHoodId: '', // 所属小区ID
-                    buildingId: '',//所属楼栋ID
-                    buildingUnitId: '',//所属单元ID
-                    doorName: '',//门牌号
-                    houseType: '1',//房屋类型【楼房，平房，别墅】
-                    purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-                    rentFlag: 0,//是否出租【是：1，否：0】
-                    ownerPhone: '', //房主电话
-                    ownerName: '', //房主名字
-                    ownerIdCard: '', //房主身份证
-                    remark: '' // 备注
-                }
-
-            },
-            // 开启加载动画
-            startLoading () {
-                loading = Loading.service({
-                    lock: true, // 是否锁定
-                    text: '正在加载……', // 加载中需要显示的文字
-                    background: 'rgba(0,0,0,.7)' // 背景颜色
-                })
-            },
-            // 结束加载动画
-            endLoading () {
-                // clearTimeout(timer);
-                if (loading) {
-                    loading.close()
-                }
-            }
-        },
-        computed: {
-            dataRule () {
-                return {
-                    buildingUnitId: [
-                        { required: true, message: '所属单元不能为空', trigger: 'blur' },
-                    ],
-                    doorName: [
-                        { required: true, message: '门牌号不能为空', trigger: 'blur' }
-                    ],
-                    houseType: [
-                        { required: true, message: '房屋类型不能为空', trigger: 'blur' }
-                    ],
-                    purpose: [
-                        { required: true, message: '房屋用途不能为空', trigger: 'blur' }
-                    ],
-                    rentFlag: [
-                        { required: true, message: '是否出租不能为空', trigger: 'blur' }
-                    ],
-                    ownerPhone: [
-                        { required: false }
-                    ],
-                    ownerName: [
-                        { required: false }
-                    ],
-                    ownerIdCard: [
-                        { required: false }
-                    ],
-                    remark: [
-                        { required: false }
-                    ],
-                }
-            },
-
-        },
-        props: {}
     }
+  },
+  computed: {
+    dataRule () {
+      return {
+        buildingUnitId: [
+          { required: true, message: '所属单元不能为空', trigger: 'blur' },
+        ],
+        doorName: [
+          { required: true, message: '门牌号不能为空', trigger: 'blur' }
+        ],
+        houseType: [
+          { required: true, message: '房屋类型不能为空', trigger: 'blur' }
+        ],
+        purpose: [
+          { required: true, message: '房屋用途不能为空', trigger: 'blur' }
+        ],
+        rentFlag: [
+          { required: true, message: '是否出租不能为空', trigger: 'blur' }
+        ],
+        ownerPhone: [
+          { required: false }
+        ],
+        ownerName: [
+          { required: false }
+        ],
+        ownerIdCard: [
+          { required: false }
+        ],
+        remark: [
+          { required: false }
+        ],
+      }
+    },
+
+  },
+  props: {}
+}
 </script>
 <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>

src/views/modules/base/community/roomTable.vue

@@ -102,7 +102,7 @@
                          width="90">
         </el-table-column>
         <el-table-column prop="ownerPhone"
-                         label="房主电话"
+                         label="联系方式"
                          width="110">
         </el-table-column>
         <el-table-column prop="ownerIdCard"
@@ -213,6 +213,7 @@ export default {
       // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
       agencyObj: {},//树所选的小区对象
+      agencyLevel: '',//树对应的level， grid neighborHood building agency
 
 
       validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
@@ -339,6 +340,20 @@ export default {
 
       }
 
+      if (this.agencyObj.level === 'grid') {
+        this.agencyLevel = 'grid'
+
+      } else if (this.agencyObj.level === 'neighborHood') {
+        this.agencyLevel = 'neighborHood'
+
+      } else if (this.agencyObj.level === 'building') {
+        this.agencyLevel = 'building'
+
+      } else {
+        this.agencyLevel = 'agency'
+
+      }
+
       // if (fromTree) {
       //   this.agencyObj = treeObj
 
@@ -346,7 +361,7 @@ export default {
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        level: this.agencyObj.level,
+        level: this.agencyLevel,
         id: this.agencyObj.id,
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,

src/views/modules/cabaseinfo/caloudong-add-or-update.vue

@@ -0,0 +1,251 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="楼宇类型" prop="buildingType">
+          <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
+      </el-form-item>
+      <el-form-item label="楼宇名称" prop="buildingName">
+          <el-input v-model="dataForm.buildingName" placeholder="楼宇名称"></el-input>
+      </el-form-item>
+      <el-form-item label="用途分类" prop="buildingUse">
+          <el-input v-model="dataForm.buildingUse" placeholder="用途分类"></el-input>
+      </el-form-item>
+      <el-form-item label="楼宇状态" prop="buildingStatus">
+          <el-input v-model="dataForm.buildingStatus" placeholder="楼宇状态"></el-input>
+      </el-form-item>
+      <el-form-item label="楼宇结构" prop="buildingStructure">
+          <el-input v-model="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
+      </el-form-item>
+      <el-form-item label="使用现状" prop="buildingUseage">
+          <el-input v-model="dataForm.buildingUseage" placeholder="使用现状"></el-input>
+      </el-form-item>
+      <el-form-item label="建筑时间" prop="constructionTime">
+          <el-input v-model="dataForm.constructionTime" placeholder="建筑时间"></el-input>
+      </el-form-item>
+      <el-form-item label="所处位置" prop="buildingAddr">
+          <el-input v-model="dataForm.buildingAddr" placeholder="所处位置"></el-input>
+      </el-form-item>
+      <el-form-item label="小区（单位）名称" prop="communityName">
+          <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称"></el-input>
+      </el-form-item>
+      <el-form-item label="楼栋长" prop="buildingLeader">
+          <el-input v-model="dataForm.buildingLeader" placeholder="楼栋长"></el-input>
+      </el-form-item>
+      <el-form-item label="楼层数" prop="layerCount">
+          <el-input v-model="dataForm.layerCount" placeholder="楼层数"></el-input>
+      </el-form-item>
+      <el-form-item label="地下楼层数" prop="basementLayerCount">
+          <el-input v-model="dataForm.basementLayerCount" placeholder="地下楼层数"></el-input>
+      </el-form-item>
+      <el-form-item label="住宅开始层数" prop="houseBeginLayer">
+          <el-input v-model="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
+      </el-form-item>
+      <el-form-item label="单元数" prop="unitCount">
+          <el-input v-model="dataForm.unitCount" placeholder="单元数"></el-input>
+      </el-form-item>
+      <el-form-item label="每层每单元户数" prop="layerRoomCount">
+          <el-input v-model="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
+      </el-form-item>
+      <el-form-item label="总房屋数" prop="roomCount">
+          <el-input v-model="dataForm.roomCount" placeholder="总房屋数"></el-input>
+      </el-form-item>
+      <el-form-item label="电梯数量" prop="elevatorCount">
+          <el-input v-model="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
+      </el-form-item>
+      <el-form-item label="建筑面积" prop="buildingArea">
+          <el-input v-model="dataForm.buildingArea" placeholder="建筑面积"></el-input>
+      </el-form-item>
+      <el-form-item label="物业公司" prop="buildingPmc">
+          <el-input v-model="dataForm.buildingPmc" placeholder="物业公司"></el-input>
+      </el-form-item>
+      <el-form-item label="介绍" prop="buildingDesc">
+          <el-input v-model="dataForm.buildingDesc" placeholder="介绍"></el-input>
+      </el-form-item>
+      <el-form-item label="标绘状态" prop="pointStatus">
+          <el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
+      </el-form-item>
+      <el-form-item label="经度" prop="longitude">
+          <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
+      </el-form-item>
+      <el-form-item label="纬度" prop="latitude">
+          <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
+      </el-form-item>
+      <el-form-item label="数据来源" prop="platCode">
+          <el-input v-model="dataForm.platCode" 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: {
+        buildingId: '',
+        buildingType: '',
+        gridId: '',
+        buildingName: '',
+        buildingUse: '',
+        buildingStatus: '',
+        buildingStructure: '',
+        buildingUseage: '',
+        constructionTime: '',
+        buildingAddr: '',
+        communityName: '',
+        buildingLeader: '',
+        layerCount: '',
+        basementLayerCount: '',
+        houseBeginLayer: '',
+        unitCount: '',
+        layerRoomCount: '',
+        roomCount: '',
+        elevatorCount: '',
+        buildingArea: '',
+        buildingPmc: '',
+        buildingDesc: '',
+        pointStatus: '',
+        longitude: '',
+        latitude: '',
+        platCode: '',
+        createBy: '',
+        createDate: '',
+        updateBy: '',
+        updateDate: '',
+        deleteFlag: '',
+        versions: '',
+        communityId: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        buildingType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingUse: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingStructure: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingUseage: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        constructionTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingAddr: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingLeader: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        layerCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        basementLayerCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseBeginLayer: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unitCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        layerRoomCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        roomCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        elevatorCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingArea: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingPmc: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingDesc: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        pointStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        longitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        latitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        platCode: [
+          { 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.post(`/opendata/caLoudong/getLouDongDetails`, { buildingId: 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.buildingId ? 'post' : 'put']('/axis/caLoudong/', 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/cabaseinfo/caloudong.vue

@@ -0,0 +1,155 @@
+<template>
+  <div class="mod-axis__caLoudong}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="楼宇名称" prop="buildingName">
+          <el-input
+            v-model="dataForm.buildingName"
+            placeholder="楼宇名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="小区（单位）名称" prop="communityName">
+          <el-input
+            v-model="dataForm.communityName"
+            placeholder="小区（单位）名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <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="buildingName"
+          label="楼宇名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingUse"
+          label="用途分类"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingAddr"
+          label="所处位置"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="communityName"
+          label="小区（单位）名称"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="layerCount"
+          label="楼层数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="unitCount"
+          label="单元数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="roomCount"
+          label="总房屋数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="elevatorCount"
+          label="电梯数量"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingPmc"
+          label="物业公司"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.buildingId)"
+              >查看</el-button
+            >
+          </template>
+        </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>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./caloudong-add-or-update";
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/opendata/caLoudong/getPage",
+        getDataListIsPage: true,
+        deleteURL: "",
+        deleteIsBatch: true,
+      },
+      dataForm: {
+        buildingName: "",
+        communityName: "",
+      },
+    };
+  },
+  components: {
+    AddOrUpdate,
+  },
+};
+</script>

src/views/modules/cabaseinfo/capingfang-add-or-update.vue

@@ -0,0 +1,251 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="楼宇类型" prop="buildingType">
+          <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
+      </el-form-item>
+      <el-form-item label="楼宇名称" prop="buildingName">
+          <el-input v-model="dataForm.buildingName" placeholder="楼宇名称"></el-input>
+      </el-form-item>
+      <el-form-item label="用途分类" prop="buildingUse">
+          <el-input v-model="dataForm.buildingUse" placeholder="用途分类"></el-input>
+      </el-form-item>
+      <el-form-item label="楼宇状态" prop="buildingStatus">
+          <el-input v-model="dataForm.buildingStatus" placeholder="楼宇状态"></el-input>
+      </el-form-item>
+      <el-form-item label="楼宇结构" prop="buildingStructure">
+          <el-input v-model="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
+      </el-form-item>
+      <el-form-item label="使用现状" prop="buildingUseage">
+          <el-input v-model="dataForm.buildingUseage" placeholder="使用现状"></el-input>
+      </el-form-item>
+      <el-form-item label="建筑时间" prop="constructionTime">
+          <el-input v-model="dataForm.constructionTime" placeholder="建筑时间"></el-input>
+      </el-form-item>
+      <el-form-item label="所处位置" prop="buildingAddr">
+          <el-input v-model="dataForm.buildingAddr" placeholder="所处位置"></el-input>
+      </el-form-item>
+      <el-form-item label="小区（单位）名称" prop="communityName">
+          <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称"></el-input>
+      </el-form-item>
+      <el-form-item label="楼栋长" prop="buildingLeader">
+          <el-input v-model="dataForm.buildingLeader" placeholder="楼栋长"></el-input>
+      </el-form-item>
+      <el-form-item label="楼层数" prop="layerCount">
+          <el-input v-model="dataForm.layerCount" placeholder="楼层数"></el-input>
+      </el-form-item>
+      <el-form-item label="地下楼层数" prop="basementLayerCount">
+          <el-input v-model="dataForm.basementLayerCount" placeholder="地下楼层数"></el-input>
+      </el-form-item>
+      <el-form-item label="住宅开始层数" prop="houseBeginLayer">
+          <el-input v-model="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
+      </el-form-item>
+      <el-form-item label="单元数" prop="unitCount">
+          <el-input v-model="dataForm.unitCount" placeholder="单元数"></el-input>
+      </el-form-item>
+      <el-form-item label="每层每单元户数" prop="layerRoomCount">
+          <el-input v-model="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
+      </el-form-item>
+      <el-form-item label="总房屋数" prop="roomCount">
+          <el-input v-model="dataForm.roomCount" placeholder="总房屋数"></el-input>
+      </el-form-item>
+      <el-form-item label="电梯数量" prop="elevatorCount">
+          <el-input v-model="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
+      </el-form-item>
+      <el-form-item label="建筑面积" prop="buildingArea">
+          <el-input v-model="dataForm.buildingArea" placeholder="建筑面积"></el-input>
+      </el-form-item>
+      <el-form-item label="物业公司" prop="buildingPmc">
+          <el-input v-model="dataForm.buildingPmc" placeholder="物业公司"></el-input>
+      </el-form-item>
+      <el-form-item label="介绍" prop="buildingDesc">
+          <el-input v-model="dataForm.buildingDesc" placeholder="介绍"></el-input>
+      </el-form-item>
+      <el-form-item label="标绘状态" prop="pointStatus">
+          <el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
+      </el-form-item>
+      <el-form-item label="经度" prop="longitude">
+          <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
+      </el-form-item>
+      <el-form-item label="纬度" prop="latitude">
+          <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
+      </el-form-item>
+      <el-form-item label="数据来源" prop="platCode">
+          <el-input v-model="dataForm.platCode" 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: {
+        buildingId: '',
+        buildingType: '',
+        gridId: '',
+        buildingName: '',
+        buildingUse: '',
+        buildingStatus: '',
+        buildingStructure: '',
+        buildingUseage: '',
+        constructionTime: '',
+        buildingAddr: '',
+        communityName: '',
+        buildingLeader: '',
+        layerCount: '',
+        basementLayerCount: '',
+        houseBeginLayer: '',
+        unitCount: '',
+        layerRoomCount: '',
+        roomCount: '',
+        elevatorCount: '',
+        buildingArea: '',
+        buildingPmc: '',
+        buildingDesc: '',
+        pointStatus: '',
+        longitude: '',
+        latitude: '',
+        platCode: '',
+        createBy: '',
+        createDate: '',
+        updateBy: '',
+        updateDate: '',
+        deleteFlag: '',
+        versions: '',
+        communityId: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        buildingType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingUse: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingStructure: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingUseage: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        constructionTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingAddr: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingLeader: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        layerCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        basementLayerCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseBeginLayer: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unitCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        layerRoomCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        roomCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        elevatorCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingArea: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingPmc: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingDesc: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        pointStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        longitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        latitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        platCode: [
+          { 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.post(`/opendata/caPingfang/getPingFangDetails`, { buildingId: 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.buildingId ? 'post' : 'put']('/axis/caLoudong/', 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/cabaseinfo/capingfang.vue

@@ -0,0 +1,155 @@
+<template>
+  <div class="mod-axis__caPingfang}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="楼宇名称" prop="buildingName">
+          <el-input
+            v-model="dataForm.buildingName"
+            placeholder="楼宇名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="小区（单位）名称" prop="communityName">
+          <el-input
+            v-model="dataForm.communityName"
+            placeholder="小区（单位）名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <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="buildingName"
+          label="楼宇名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingUse"
+          label="用途分类"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingAddr"
+          label="所处位置"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="communityName"
+          label="小区（单位）名称"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="layerCount"
+          label="楼层数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="unitCount"
+          label="单元数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="roomCount"
+          label="总房屋数"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="elevatorCount"
+          label="电梯数量"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="buildingPmc"
+          label="物业公司"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.buildingId)"
+              >查看</el-button
+            >
+          </template>
+        </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>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./capingfang-add-or-update";
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/opendata/caPingfang/getPage",
+        getDataListIsPage: true,
+        deleteURL: "",
+        deleteIsBatch: true,
+      },
+      dataForm: {
+        buildingName: "",
+        communityName: "",
+      },
+    };
+  },
+  components: {
+    AddOrUpdate,
+  },
+};
+</script>

src/views/modules/cabaseinfo/carental-add-or-update.vue

@@ -0,0 +1,204 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="房屋编号" prop="houseName">
+          <el-input v-model="dataForm.houseName" placeholder="房屋编号"></el-input>
+      </el-form-item>
+      <el-form-item label="房屋地址" prop="houseAddress">
+          <el-input v-model="dataForm.houseAddress" placeholder="房屋地址"></el-input>
+      </el-form-item>
+      <el-form-item label="建筑用途" prop="houseUse">
+          <el-input v-model="dataForm.houseUse" placeholder="建筑用途"></el-input>
+      </el-form-item>
+      <el-form-item label="建筑面积（平方米）" prop="houseArea">
+          <el-input v-model="dataForm.houseArea" placeholder="建筑面积（平方米）"></el-input>
+      </el-form-item>
+      <el-form-item label="证件代码" prop="idType">
+          <el-input v-model="dataForm.idType" placeholder="证件代码"></el-input>
+      </el-form-item>
+      <el-form-item label="证件号码" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号码"></el-input>
+      </el-form-item>
+      <el-form-item label="房主姓名" prop="residentName">
+          <el-input v-model="dataForm.residentName" placeholder="房主姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="房主联系方式" prop="telephone">
+          <el-input v-model="dataForm.telephone" placeholder="房主联系方式"></el-input>
+      </el-form-item>
+      <el-form-item label="房主现居详址" prop="curliveAddress">
+          <el-input v-model="dataForm.curliveAddress" placeholder="房主现居详址"></el-input>
+      </el-form-item>
+      <el-form-item label="出租用途" prop="rentUse">
+          <el-input v-model="dataForm.rentUse" placeholder="出租用途"></el-input>
+      </el-form-item>
+      <el-form-item label="隐患类型" prop="troubleType">
+          <el-input v-model="dataForm.troubleType" placeholder="隐患类型"></el-input>
+      </el-form-item>
+      <el-form-item label="承租人公民身份证号码" prop="renterCardNumber">
+          <el-input v-model="dataForm.renterCardNumber" placeholder="承租人公民身份证号码"></el-input>
+      </el-form-item>
+      <el-form-item label="承租人证件类型" prop="renterCardType">
+          <el-input v-model="dataForm.renterCardType" placeholder="承租人证件类型"></el-input>
+      </el-form-item>
+      <el-form-item label="承租人姓名" prop="renterName">
+          <el-input v-model="dataForm.renterName" placeholder="承租人姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="承租人联系方式" prop="renterPhone">
+          <el-input v-model="dataForm.renterPhone" placeholder="承租人联系方式"></el-input>
+      </el-form-item>
+      <el-form-item label="经度" prop="longitude">
+          <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
+      </el-form-item>
+      <el-form-item label="纬度" prop="latitude">
+          <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
+      </el-form-item>
+      <el-form-item label="标绘状态" prop="pointStatus">
+          <el-input v-model="dataForm.pointStatus" 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: {
+        rentalId: '',
+        gridId: '',
+        houseId: '',
+        houseName: '',
+        houseAddress: '',
+        houseUse: '',
+        houseArea: '',
+        idType: '',
+        idCard: '',
+        residentName: '',
+        telephone: '',
+        curliveAddress: '',
+        rentUse: '',
+        troubleType: '',
+        renterId: '',
+        renterCardNumber: '',
+        renterCardType: '',
+        renterName: '',
+        renterPhone: '',
+        longitude: '',
+        latitude: '',
+        pointStatus: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        houseName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseUse: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseArea: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        telephone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        curliveAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        rentUse: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        troubleType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        renterCardNumber: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        renterCardType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        renterName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        renterPhone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        longitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        latitude: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        pointStatus: [
+          { 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.post(`/opendata/caRental/getRentalDetails`, { rentalId: 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.rentalId ? 'post' : 'put']('/axis/caRental/', 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/cabaseinfo/carental.vue

@@ -0,0 +1,156 @@
+<template>
+  <div class="mod-axis__caRental}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="房屋编号" prop="houseName">
+          <el-input
+            v-model="dataForm.houseName"
+            placeholder="房屋编号"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="房主姓名" prop="residentName">
+          <el-input
+            v-model="dataForm.residentName"
+            placeholder="房主姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="承租人姓名" prop="renterName">
+          <el-input
+            v-model="dataForm.renterName"
+            placeholder="承租人姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <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="houseName"
+          label="房屋编号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="houseAddress"
+          label="房屋地址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="houseArea"
+          label="建筑面积（平方米）"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="residentName"
+          label="房主姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="telephone"
+          label="房主联系方式"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="rentUse"
+          label="出租用途"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="renterName"
+          label="承租人姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="renterPhone"
+          label="承租人联系方式"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.rentalId)"
+              >查看</el-button
+            >
+          </template>
+        </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>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./carental-add-or-update";
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/opendata/caRental/getPage",
+        getDataListIsPage: true,
+        deleteURL: "",
+        deleteIsBatch: true,
+      },
+      dataForm: {
+        houseName: "",
+        residentName: "",
+        renterName: "",
+      },
+    };
+  },
+  components: {
+    AddOrUpdate,
+  },
+};
+</script>

src/views/modules/cabaseinfo/caresident-add-or-update.vue

@@ -0,0 +1,216 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.residentId ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form disabled :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="人口性质" prop="residentProperty">
+          <el-input v-model="dataForm.residentProperty" placeholder="人口性质"></el-input>
+      </el-form-item>
+      <el-form-item label="居民分类" prop="residentType">
+          <el-input v-model="dataForm.residentType" placeholder="居民分类"></el-input>
+      </el-form-item>
+      <el-form-item label="证件类型" prop="idType">
+          <el-input v-model="dataForm.idType" placeholder="证件类型"></el-input>
+      </el-form-item>
+      <el-form-item label="证件号码（公民身份证号）" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号码（公民身份证号）"></el-input>
+      </el-form-item>
+      <el-form-item label="姓名" prop="residentName">
+          <el-input v-model="dataForm.residentName" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+          <el-input v-model="dataForm.sex" placeholder="性别"></el-input>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday">
+          <el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>
+      </el-form-item>
+      <el-form-item label="民族" prop="nation">
+          <el-input v-model="dataForm.nation" placeholder="民族"></el-input>
+      </el-form-item>
+      <el-form-item label="联系方式" prop="telephone">
+          <el-input v-model="dataForm.telephone" placeholder="联系方式"></el-input>
+      </el-form-item>
+      <el-form-item label="户籍详址" prop="householdAddressDetail">
+          <el-input v-model="dataForm.householdAddressDetail" placeholder="户籍详址"></el-input>
+      </el-form-item>
+      <el-form-item label="现住详址" prop="curliveAddressDetail">
+          <el-input v-model="dataForm.curliveAddressDetail" placeholder="现住详址"></el-input>
+      </el-form-item>
+      <el-form-item label="学历" prop="education">
+          <el-input v-model="dataForm.education" placeholder="学历"></el-input>
+      </el-form-item>
+      <el-form-item label="职业" prop="occupation">
+          <el-input v-model="dataForm.occupation" placeholder="职业"></el-input>
+      </el-form-item>
+      <el-form-item label="婚姻状况" prop="marriageStatus">
+          <el-input v-model="dataForm.marriageStatus" placeholder="婚姻状况"></el-input>
+      </el-form-item>
+      <el-form-item label="政治面貌" prop="party">
+          <el-input v-model="dataForm.party" placeholder="政治面貌"></el-input>
+      </el-form-item>
+      <el-form-item label="宗教信仰" prop="religious">
+          <el-input v-model="dataForm.religious" placeholder="宗教信仰"></el-input>
+      </el-form-item>
+      <el-form-item label="有无皈依（已受洗）" prop="conversionState">
+          <el-input v-model="dataForm.conversionState" 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: {
+        residentId: '',
+        gridId: '',
+        residentProperty: '',
+        residentType: '',
+        idType: '',
+        idCard: '',
+        residentName: '',
+        sex: '',
+        birthday: '',
+        nation: '',
+        telephone: '',
+        householdProv: '',
+        householdCity: '',
+        householdCounty: '',
+        householdTown: '',
+        householdVillage: '',
+        householdAddressDetail: '',
+        curliveProv: '',
+        curliveCity: '',
+        curliveCounty: '',
+        curliveTown: '',
+        curliveVillage: '',
+        curliveAddressDetail: '',
+        nativeAddressProv: '',
+        nativeAddressCity: '',
+        nativeAddressCounty: '',
+        formerName: '',
+        education: '',
+        occupation: '',
+        occupationType: '',
+        serviceAddress: '',
+        marriageStatus: '',
+        party: '',
+        religious: '',
+        conversionState: '',
+        nationality: '',
+        platCode: '',
+        createBy: '',
+        createDate: '',
+        updateBy: '',
+        updateDate: '',
+        deleteFlag: '',
+        versions: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        residentProperty: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        birthday: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        nation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        telephone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        householdAddressDetail: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        curliveAddressDetail: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        education: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        occupation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        party: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        religious: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        conversionState: [
+          { 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.post(`/opendata/caResident/getResidentDetails`, { idCard: 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.residentId ? 'post' : 'put']('/axis/caResident/', 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/cabaseinfo/caresident.vue

@@ -0,0 +1,147 @@
+<template>
+  <div class="mod-axis__caResident}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="身份证号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="姓名" prop="residentName">
+          <el-input
+            v-model="dataForm.residentName"
+            placeholder="姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="telephone">
+          <el-input
+            v-model="dataForm.telephone"
+            placeholder="联系方式"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <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="idCard"
+          label="证件号码（公民身份证号）"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="residentName"
+          label="姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sex"
+          label="性别"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="birthday"
+          label="出生日期"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="telephone"
+          label="联系方式"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="householdAddressDetail"
+          label="户籍详址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="curliveAddressDetail"
+          label="现住详址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.idCard)"
+              >查看</el-button
+            >
+          </template>
+        </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>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./caresident-add-or-update";
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/opendata/caResident/getPage",
+        getDataListIsPage: true,
+        deleteURL: "",
+        deleteIsBatch: true,
+      },
+      dataForm: {
+        idCard: "",
+        residentName: "",
+        telephone: "",
+      },
+    };
+  },
+  components: {
+    AddOrUpdate,
+  },
+};
+</script>

src/views/modules/cabaseinfo/carotators-add-or-update.vue

@@ -0,0 +1,309 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="公民身份证号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="公民身份证号"></el-input>
+      </el-form-item>
+      <el-form-item label="证件类型" prop="idType">
+          <el-input v-model="dataForm.idType" placeholder="证件类型"></el-input>
+      </el-form-item>
+          <el-form-item label="姓名" prop="rotatorsName">
+          <el-input v-model="dataForm.rotatorsName" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="曾用名" prop="formerName">
+          <el-input v-model="dataForm.formerName" placeholder="曾用名"></el-input>
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+          <el-input v-model="dataForm.sex" placeholder="性别"></el-input>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday">
+          <el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>
+      </el-form-item>
+      <el-form-item label="民族" prop="nation">
+          <el-input v-model="dataForm.nation" placeholder="民族"></el-input>
+      </el-form-item>
+      <el-form-item label="婚姻状况" prop="marriageStatus">
+          <el-input v-model="dataForm.marriageStatus" placeholder="婚姻状况"></el-input>
+      </el-form-item>
+      <el-form-item label="政治面貌" prop="party">
+          <el-input v-model="dataForm.party" placeholder="政治面貌"></el-input>
+      </el-form-item>
+      <el-form-item label="学历" prop="education">
+          <el-input v-model="dataForm.education" placeholder="学历"></el-input>
+      </el-form-item>
+      <el-form-item label="宗教信仰" prop="religious">
+          <el-input v-model="dataForm.religious" placeholder="宗教信仰"></el-input>
+      </el-form-item>
+      <el-form-item label="职业类别" prop="occupationType">
+          <el-input v-model="dataForm.occupationType" placeholder="职业类别"></el-input>
+      </el-form-item>
+      <el-form-item label="职业" prop="occupation">
+          <el-input v-model="dataForm.occupation" placeholder="职业"></el-input>
+      </el-form-item>
+      <el-form-item label="联系方式" prop="telephone">
+          <el-input v-model="dataForm.telephone" placeholder="联系方式"></el-input>
+      </el-form-item>
+      <el-form-item label="户籍门(楼)详址" prop="householdAddressDetail">
+          <el-input v-model="dataForm.householdAddressDetail" placeholder="户籍门(楼)详址"></el-input>
+      </el-form-item>
+      <el-form-item label="现住地社区/村" prop="curliveAddressVillage">
+          <el-input v-model="dataForm.curliveAddressVillage" placeholder="现住地社区/村"></el-input>
+      </el-form-item>
+      <el-form-item label="现住门(楼)详址" prop="curliveAddressDetail">
+          <el-input v-model="dataForm.curliveAddressDetail" placeholder="现住门(楼)详址"></el-input>
+      </el-form-item>
+      <el-form-item label="是否重点关注人员" prop="isFocusPerson">
+          <el-input v-model="dataForm.isFocusPerson" 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: {
+        rotatorsId: '',
+        idCard: '',
+        idType: '',
+        rotatorsName: '',
+        formerName: '',
+        sex: '',
+        birthday: '',
+        nation: '',
+        nativeAddressProv: '',
+        nativeAddressCity: '',
+        nativeAddressCountry: '',
+        marriageStatus: '',
+        party: '',
+        education: '',
+        religious: '',
+        occupationType: '',
+        occupation: '',
+        serviceAddress: '',
+        telephone: '',
+        householdAddressProv: '',
+        householdAddressCity: '',
+        householdAddressCountry: '',
+        householdAddressTown: '',
+        householdAddressVillage: '',
+        householdAddressDetail: '',
+        curliveAddressProv: '',
+        curliveAddressCity: '',
+        curliveAddressCountry: '',
+        curliveAddressTown: '',
+        curliveAddressVillage: '',
+        curliveAddressDetail: '',
+        inflowReason: '',
+        certificateType: '',
+        certificateNumber: '',
+        signDate: '',
+        endDate: '',
+        residenceType: '',
+        isFocusPerson: '',
+        createBy: '',
+        createDate: '',
+        updateBy: '',
+        updateDate: '',
+        deleteFlag: '',
+        platcode: '',
+        gridId: '',
+        versions: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        idCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        idType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        rotatorsName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        formerName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        birthday: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        nation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        nativeAddressProv: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        nativeAddressCity: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        nativeAddressCountry: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        marriageStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        party: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        education: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        religious: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        occupationType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        occupation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        serviceAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        telephone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        householdAddressProv: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        householdAddressCity: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        householdAddressCountry: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        householdAddressTown: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        householdAddressVillage: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        householdAddressDetail: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        curliveAddressProv: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        curliveAddressCity: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        curliveAddressCountry: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        curliveAddressTown: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        curliveAddressVillage: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        curliveAddressDetail: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        inflowReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        certificateType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        certificateNumber: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        endDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residenceType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        isFocusPerson: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updateBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updateDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deleteFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        platcode: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        versions: [
+          { 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.post(`/opendata/caRotators/getRotatorsDetails`, { idCard: 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.rotatorsId ? 'post' : 'put']('/axis/caRotators/', 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/cabaseinfo/carotators.vue

@@ -0,0 +1,141 @@
+<template>
+  <div class="mod-axis__caRotators}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="身份证号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="姓名" prop="residentName">
+          <el-input
+            v-model="dataForm.residentName"
+            placeholder="姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="telephone">
+          <el-input
+            v-model="dataForm.telephone"
+            placeholder="联系方式"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <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="idCard"
+          label="公民身份证号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="rotatorsName"
+          label="姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sex"
+          label="性别"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="birthday"
+          label="出生日期"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="householdAddressDetail"
+          label="户籍门(楼)详址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="curliveAddressDetail"
+          label="现住门(楼)详址"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.idCard)"
+              >查看</el-button
+            >
+          </template>
+        </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>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./carotators-add-or-update";
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/opendata/caRotators/getPage",
+        getDataListIsPage: true,
+        deleteURL: "",
+        deleteIsBatch: true,
+      },
+      dataForm: {
+        idCard: "",
+        residentName: "",
+        telephone: "",
+      },
+    };
+  },
+  components: {
+    AddOrUpdate,
+  },
+};
+</script>

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

@@ -3,7 +3,7 @@
     <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"
+        <el-form-item label="所属组织" label-width="100px"
                       prop="agencyId">
           <!-- <el-select
                   v-model.trim="dataForm.agencyId"
@@ -18,12 +18,12 @@
             >
             </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'}" popper-class="cascader-block">
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
             <template slot-scope="{ node, data }">
               <div @click="cascaderClick(data)">
                 <!-- <span class="block"></span> -->
-                <span>{{ data.agencyName }}</span>
+                <span>{{ data.objectName }}</span>
-                <span v-if="!node.isLeaf"> ({{ data.subAgencyList.length }}) </span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
               </div>
             </template>
           </el-cascader>
@@ -56,19 +56,19 @@
         </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 width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
+        <el-table-column 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="100" 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="100" prop="houseCount" 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="110" 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="110" 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="110" 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="110" 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="110" 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="110" 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="110" 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="110" 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="110" 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-column width="110" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
@@ -198,9 +198,9 @@ export default {
       })
     },
     cascaderClick (nodeData) {
-      this.dataForm.agencyId = nodeData.agencyId;
+      this.dataForm.agencyId = nodeData.objectId;
-      this.dataForm.level = nodeData.level
+      this.dataForm.level = nodeData.objectType
-      this.$refs.cascaderUnit.checkedValue = nodeData.agencyId;
+      this.$refs.cascaderUnit.checkedValue = nodeData.objectId;
       this.$refs.cascaderUnit.computePresentText();
       this.$refs.cascaderUnit.toggleDropDownVisible(false);
 
@@ -208,17 +208,17 @@ export default {
     getGridList() {
       const { user } = this.$store.state
       this.$http
-              .post('/gov/org/customeragency/agencygridtree')
+              .post('/gov/org/userhouse/service/serviceScopeTree')
               .then(({ data: res }) => {
                 if (res.code !== 0) {
                   return this.$message.error(res.msg)
                 } else {
                   console.log('获取查询详情成功', res.data)
                   // this.optionsA = res.data
+                  // console.log(this.optionsA);
                   this.optionsA.push(res.data)
-                  this.dataForm.agencyId = res.data.agencyId
+                  this.dataForm.agencyId = res.data.objectId
-                  this.dataForm.level = res.data.level
+                  this.dataForm.level = res.data.objectType
-                  this.getDataList()
                 }
               })
               .catch(() => {

src/views/modules/shequzhili/event/cpts/add.vue

@@ -312,6 +312,7 @@ export default {
 
       //地图相关
       keyWords: '',
+      isFirst: true,//地图是否首次加载，首次加载不给地址赋值
 
       //图片相关  oss/file/uploadvariedfile
       dialogImageUrl: 'oss/file/uploadvariedfile',
@@ -620,7 +621,7 @@ export default {
         this.handleMoveCenter()
       })
       this.handleMoveCenter()
-      this.convert()
+      // this.convert()
     },
 
     setMarker (lat, lng) {
@@ -699,8 +700,14 @@ export default {
       geocoder
         .getAddress({ location: location }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          this.formData.address = result.result.address
+
-          // 显示搜索到的地址
+          if (!this.isFirst) {//再次查询时再赋值
+            this.formData.address = result.result.address
+          }
+
+          if (this.isFirst) {
+            this.isFirst = false
+          }
         });
     },
 

src/views/modules/visual/communityGovern/duoyuanDialog.vue

@@ -0,0 +1,335 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>详情</span>
+        </div>
+
+        <div class="btn-close" @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <!-- <div class="list-title">需求内容</div> -->
+        <div class="list-wr">
+          <div class="list left-list" v-infinite-scroll="getServicelist" style="overflow:auto">
+            <template v-if="servicelist.length > 0">
+            <div class="left-item" :class="activeIndex == index ? 'active-item' : ''" v-for="(item, index) in servicelist" :key="index" @click="toDetail(index)">
+              <div class="item-time">{{item.reportTime || '2022-05-18'}}</div>
+              <div class="item-content">{{item.content || '本周加班本周加班本周加班本周加班本周加班本周加班'}}</div>
+            </div>
+            </template>
+            <screen-nodata class="nodata" v-else></screen-nodata>
+          </div>
+          <div class="dashed-line"></div>
+          <div class="list right-list">
+            <template v-if="info.content">
+              <!-- <div class="item-title">需求内容</div> -->
+              <div class="item">
+                <span class="item-field">所属网格：</span>
+                <span>{{ info.gridName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">需求类型：</span>
+                <span>{{ info.categoryName }}</span>
+              </div>
+              <!-- <div class="item">
+                <span class="item-field">需求状态：</span>
+                <span>{{ info.statusName }}</span>
+              </div> -->
+              <div class="item">
+                <span class="item-field">上报类型：</span>
+                <span>{{ info.reportTypeName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">上报人：</span>
+                <span>{{ info.reportUserName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">上报人联系方式	：</span>
+                <span>{{ info.reportUserMobile }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">上报时间	：</span>
+                <span>{{ info.reportTime }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">需求人	：</span>
+                <span>{{ info.demandUserName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">服务时间	：</span>
+                <span>{{ info.wantServiceTime }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">需求内容：</span>
+                <div>{{ info.content }}</div>
+              </div>
+              <div class="item">
+                <span class="item-field">服务方	：</span>
+                <span>{{ info.serviceShowName }}</span>
+              </div>
+              <div class="item">
+                <span class="item-field">实际服务时间	：</span>
+                <span>{{ info.serviceStartTime }} 至 {{ info.serviceEndTime }}</span>
+              </div>
+              <!-- <div class="item">
+                <span class="item-field">完成情况	：</span>
+                <span>{{ info.finishDesc }}</span>
+              </div> -->
+              <div class="item">
+                <span class="item-field">评价	：</span>
+                <span>
+                  <el-rate :value="info.score" disabled></el-rate>
+                </span>
+              </div>
+            </template>
+            <screen-nodata class="nodata" v-else></screen-nodata>
+          </div>
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import ScreenNodata from "@/views/modules/visual/components/screen-nodata"
+import cptCard from '@/views/modules/visual/cpts/card'
+import { requestPost } from '@/js/dai/request'
+
+export default {
+  name: 'dialogInfo',
+  props: {
+    userId: {
+      type: String,
+      default: '',
+    },
+    gridName: {
+      type: String,
+      default: '',
+    },
+    orgId: {
+      type: String,
+      default: ''
+    }
+  },
+
+  components: {
+    cptCard,
+    ScreenNodata
+  },
+
+  data() {
+    return {
+      pageNo: 1,
+      pageSize: 10,
+      servicelist: [],
+      info: {
+        // content: '受到供应链等不可抗力的影响，大多数车企的销量都呈现环比下滑的趋势，不过像供应链断供这样的问题只是暂时的，在复工复产后，5、6月份的销量也许就会恢复到正常水平。长远来看新能源的发展还是非常可观的，其市场格局正在逐步稳定，新能源汽车的前景仍然大有可为。',
+        // gridName: '第一网格',
+        // categoryName: '便民服务',
+        // statusName: '待处理',
+        // reportTypeName: '自身上报',
+        // reportUserName: '张三',
+        // reportUserMobile: '13794049999',
+        // reportTime: '2022-05-18 14:47:00',
+        // wantServiceTime: '2022-05-18 14:47:00',
+        // serviceShowName: '李四',
+        // serviceStartTime: '2022-05-18 14:47:00',
+        // serviceEndTime: '2022-05-18 14:47:00',
+        // finishDesc: '已解决',
+        // score: '3.5'
+      },
+      loadType: 'loading',
+      activeIndex: 0
+    }
+  },
+  created () {
+    this.servicelist = []
+  },
+  methods: {
+    // 获取组织需求列表
+    async getServicelist () {
+      if (this.loadType == 'none') {
+        return
+      }
+      const url = '/heart/residemand/service-list'
+      const params = {
+        serverId: this.orgId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        type: 'community_org', // 志愿者：volunteer；社区自组织：community_org；
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        if (this.pageNo == 1) {
+          this.getDemandDetail(data.list[0].demandRecId)
+        }
+        this.pageNo++
+        this.servicelist = this.servicelist.concat(data.list)
+        this.loadType = this.servicelist.length < data.total ? 'loading' : 'none'
+      } else {
+        this.$message.error(msg)
+      }
+    },    
+    // 获取需求详情
+    async getDemandDetail (id) {
+      this.info = {}
+      const url = '/heart/userdemand/demandDetail'
+      const params = {
+        demandRecId: id, // 需求id
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.info = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    toDetail (index) {
+      this.activeIndex = index
+      this.getDemandDetail(this.servicelist[index].demandRecId)
+    },
+    handleClose() {
+      this.$emit("close")
+    },
+  }
+}
+</script>
+
+<style lang="scss" src="@/assets/scss/modules/visual/people.scss" scoped></style>
+<style lang="scss" scoped>
+@mixin scrollBar {
+    &::-webkit-scrollbar {
+        /*滚动条整体样式*/
+        width: 8px; /*高宽分别对应横竖滚动条的尺寸*/
+        height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        border-radius: 8px;
+        box-shadow: inset 0 0 5px rgba(#00023f, 0.2);
+        background: linear-gradient(270deg, #0063fe, #0095ff);
+    }
+    &::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        box-shadow: inset 0 0 5px rgba(#00023f, 0.2);
+        border-radius: 8px;
+        background: darken(#0c81fe, 20);
+    }
+}
+.m-pop {
+  .wrap {
+    .list {
+      display: block;
+      width: calc(100% - 280px);
+      max-height: 600px;
+      overflow: auto;
+      @include scrollBar;
+      .item-title {
+        padding: 0;
+        font-size: 22px;
+        font-family: PingFang SC;
+        font-weight: 800;
+        color: #ffffff;
+        margin-bottom: 15px;
+      }
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+        .item-field {
+          // width: 100px;
+          flex-shrink: 0;
+        }
+        .item-content {
+          width: 100%;
+          max-height: 420px;
+          overflow-y: auto;
+          @include scrollBar;
+        }
+        ::v-deep p {
+          margin: 0;
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        .item-imgs {
+          width: 100%;
+          display: flex;
+          flex-wrap: wrap;
+          
+          img {
+            display: block;
+            width: 240px;
+            height: 240px;
+            margin-right: 10px;
+          }
+        }
+      }
+      .item-desc {
+        font-size: 16px;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 20px 0 10px 62px;
+      font-size: 20px;
+      cursor: pointer;
+    }
+}
+.list-wr {
+  display: flex;
+  padding: 0 20px;
+  .dashed-line {
+    width: 1px;
+    height: 600px;
+    margin: 0 15px;
+    border: 1px dashed #1257c9;
+  }
+  .left-list {
+    width: 280px !important;
+    height: 600px;
+    overflow: auto;
+    padding: 10px 0 !important;
+    @include scrollBar;
+    .active-item {
+      border: 1px solid #0063FE !important;
+      box-shadow: 0px 0px 10px #0063fe inset;
+    }
+    .left-item {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      box-sizing: border-box;
+      margin-top: 0;
+      margin-bottom: 20px;
+      font-size: 16px;
+      cursor: pointer;
+      color: #ffffff;
+      padding: 5px;
+      border: 1px solid transparent;
+      .item-content {
+        margin-top: 10px;
+        width: 100%;    
+        overflow: hidden;    
+        text-overflow: ellipsis;    
+        white-space: nowrap;
+      }
+    }
+  }
+  .right-list {
+    padding: 0 15px !important;
+  }
+}
+</style>

src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue

@@ -21,6 +21,7 @@
             </template>
             <screen-nodata class="nodata" v-else></screen-nodata>
           </div>
+          <div class="dashed-line"></div>
           <div class="list right-list">
             <template v-if="info.content">
               <!-- <div class="item-title">需求内容</div> -->
@@ -290,6 +291,12 @@ export default {
 .list-wr {
   display: flex;
   padding: 0 20px;
+  .dashed-line {
+    width: 1px;
+    height: 600px;
+    margin: 0 15px;
+    border: 1px dashed #1257c9;
+  }
   .left-list {
     width: 280px !important;
     height: 600px;
@@ -322,7 +329,7 @@ export default {
     }
   }
   .right-list {
-    padding: 0 25px !important;
+    padding: 0 15px !important;
   }
 }
 </style>

src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue

@@ -62,6 +62,8 @@
                         @clickFeature="clickMap"
                         :showIconLayer="true"
                         :showPolygonLayer="true"
+                        :showPolIconLayer="true"
+                        :areaScale="0.1"
                         :clickType="'popup'"
                         :isAddOpenlay="true"></screen-map>
           </div>
@@ -149,7 +151,7 @@ export default {
         ],
         header: ['序号', '组织列表', '操作'],
         list: [],
-        pageSize: 10,
+        pageSize: 5,
         pageNo: 1,
         total: 0,
         categoryCode: ''
@@ -216,7 +218,7 @@ export default {
             name: item.categoryName,
             code: item.categoryCode,
             color: item.color, // colorArray[index]
-            selected: index == 0 ? true : false
+            selected: false
           }
           this.pieData.push(ob)
         })
@@ -302,14 +304,21 @@ export default {
       this.clickPie() // this.clickPie(maxIndex)
 
       let fun = function (params) {
-        _that.clickPie(params.dataIndex)
+        _that.clickPie(params)
       }
       this.$refs.pieChart.handleClick(fun)
     },
 
-    clickPie (seriesIndex) {
+    clickPie (params) {
+      let dataIndex = params ? params.dataIndex : null
+      let componentIndex = params ? params.componentIndex : null
+      if (componentIndex === 2) { // 点击中心
+        dataIndex = -1
+        this.categoryCode = ''
+        this.$refs.pieChart.clear()
+      }
       this.pieData.forEach((element, index) => {
-        if (index === seriesIndex) {
+        if (index === dataIndex) {
           element.label = {
             show: true,
           }
@@ -320,9 +329,6 @@ export default {
             }
           }
           this.categoryCode = element.code
-          this.demand.pageNo = 1
-          this.getTable()
-          this.getMapData()
         } else {
           element.label = {
             show: false,
@@ -339,6 +345,9 @@ export default {
       this.pieOption.series[1].data = this.pieData
       // this.$refs.pieChart.hideLoading()
       this.$refs.pieChart.setOption(this.pieOption)
+      this.demand.pageNo = 1
+      this.getTable()
+      this.getMapData()
     },
 
     toUserInfo (uid) {
@@ -362,8 +371,9 @@ export default {
           if (item.coordinates && item.coordinates.length > 0) {
             if (!this.isRepeatItem(item.name)) {
               let colorIndex = index < polygonColorArray.length ? index : 0
-              item.fillColor = transparent,
+              item.fillColor = 'rgba(0, 229, 237, 0.16)'
-                item.color = polygonColorArray[colorIndex]
+              item.color = '#00E5ED'
+                // item.color = polygonColorArray[colorIndex]
               subPolygonList.push(item)
             }
           }
@@ -449,7 +459,10 @@ export default {
       if (this.isfirstInit) {
         // this.agencyInfo.level = 'agency'
         //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
-        this.$refs.map.loadMap(this.agencyInfo, this.polygonList, null, this.distributionsList, this.iconUrlArray, null)
+        const polygonIconArray = [
+          'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+        ]
+        this.$refs.map.loadMap(this.agencyInfo, this.polygonList, polygonIconArray, this.distributionsList, this.iconUrlArray, null)
       } else {
         this.$refs.map.refreshMap(this.agencyInfo, this.polygonList, this.distributionsList, false)
       }
@@ -457,10 +470,11 @@ export default {
 
     // 点击项目
     async clickMap (feature) {
-      if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
+      // 点击显示下级区域
-        await this.loadOrgData(feature.values_.level, feature.values_.id)
+      // if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
-        this.loadMap()
+      //   await this.loadOrgData(feature.values_.level, feature.values_.id)
-      }
+      //   this.loadMap()
+      // }
       console.log('标注信息', feature.values_.properties)
       if (!feature.values_.properties) {
         return
@@ -738,11 +752,11 @@ export default {
 .map-tips {
   width: 100%;
   display: flex;
-  // justify-content: center;
+  justify-content: center;
   align-items: center;
   flex-wrap: wrap;
   box-sizing: border-box;
-  padding: 6px 0 0 100px;
+  // padding: 6px 0 0 100px;
   // padding-top: 10px;
   // padding-bottom: 10px;
 

src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js

@@ -74,7 +74,7 @@ export function pieOption (_charts) {
           avoidLabelOverlap: false,
           // top: top + '%',
           // height: '80%',
-          // selectedMode: 'single',
+          selectedMode: 'single',
           left: 'center',
           width: 480,
           label: {

src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue

@@ -636,9 +636,9 @@ export default {
 
           };
           // element.selected = !element.selected
-          // isSelected = element.selected
         } else {
 
+
           element.selected = false
           element.label = {
             show: false,

src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js

@@ -1,10 +1,10 @@
 
 export function pieOption (_charts) {
-  const center= ['50%', '120px']
+  const center= ['50%', '140px']
     return {
       title: {
         text: '0',
-        top: 95,
+        top: 115,
         left: 'center',
         textStyle: {
           width: '100%',
@@ -94,7 +94,7 @@ export function pieOption (_charts) {
                 padding: [0, 6, 0, 6]
               },
               a: {
-                fontSize: 25,
+                fontSize: 18,
                 color: '#fff',
                 padding: [0, 6, 6, 6]
               },
@@ -110,7 +110,7 @@ export function pieOption (_charts) {
           labelLine: {
             show: false,
             smooth: 0.2,
-            length: 40,
+            length: 20,
             length2: 0,
             maxSurfaceAngle: 80
           },

src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue

@@ -508,16 +508,22 @@ export default {
       this.clickPie() // this.clickPie(maxIndex)
 
       let fun = function (params) {
-        _that.clickPie(params.dataIndex)
+        _that.clickPie(params)
       }
       this.$refs.pieChart.handleClick(fun)
 
     },
 
-    clickPie (seriesIndex) {
+    clickPie (params) {
-      let isSelected = false
+      let dataIndex = params ? params.dataIndex : null
+      let componentIndex = params ? params.componentIndex : null
+      if (componentIndex === 2) { // 点击中心
+        dataIndex = -1
+        this.categoryCode = ''
+        this.$refs.pieChart.clear()
+      }
       this.pieData.forEach((element, index) => {
-        if (index === seriesIndex) {
+        if (index === dataIndex) {
           element.label = {
             show: true,
           }
@@ -529,12 +535,6 @@ export default {
           }
           this.categoryCode = element.categoryCode
           element.selected = !element.selected
-          isSelected = element.selected
-          // if (isSelected) {
-          //   this.categoryCode = element.categoryCode
-          // } else {
-          //   this.categoryCode = ''
-          // }          
         } else {
           element.label = {
             show: false,
@@ -600,15 +600,23 @@ export default {
       this.clickGridPie() // this.clickGridPie(maxIndex)
 
       let fun = function (params) {
-        _that.clickGridPie(params.dataIndex)
+        _that.clickGridPie(params)
       }
       this.$refs.gridPieChart.handleClick(fun)
 
     },
 
-    clickGridPie (seriesIndex) {
+    clickGridPie (params) {
+      let dataIndex = params ? params.dataIndex : null
+      let componentIndex = params ? params.componentIndex : null
+      if (componentIndex === 2) { // 点击中心
+        dataIndex = -1
+        this.tableOrgId = ''
+        this.tableOrgType = ''
+        this.$refs.gridPieChart.clear()
+      }
       this.gridPieData.forEach((element, index) => {
-        if (index === seriesIndex) {
+        if (index === dataIndex) {
           element.label = {
             show: true,
           }