From 70c2b3067919f55def9a3f54db3b34daa817c479 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 31 May 2022 10:50:35 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cabaseinfo/caloudong-add-or-update.vue    | 370 ++++++++++++++
 src/views/modules/cabaseinfo/caloudong.vue    | 108 ++++
 .../cabaseinfo/capingfang-add-or-update.vue   | 370 ++++++++++++++
 src/views/modules/cabaseinfo/capingfang.vue   | 108 ++++
 .../cabaseinfo/carental-add-or-update.vue     | 342 +++++++++++++
 src/views/modules/cabaseinfo/carental.vue     | 104 ++++
 .../cabaseinfo/caresident-add-or-update.vue   | 440 +++++++++++++++++
 src/views/modules/cabaseinfo/caresident.vue   | 118 +++++
 .../cabaseinfo/carotators-add-or-update.vue   | 461 ++++++++++++++++++
 src/views/modules/cabaseinfo/carotators.vue   | 121 +++++
 10 files changed, 2542 insertions(+)
 create mode 100644 src/views/modules/cabaseinfo/caloudong-add-or-update.vue
 create mode 100644 src/views/modules/cabaseinfo/caloudong.vue
 create mode 100644 src/views/modules/cabaseinfo/capingfang-add-or-update.vue
 create mode 100644 src/views/modules/cabaseinfo/capingfang.vue
 create mode 100644 src/views/modules/cabaseinfo/carental-add-or-update.vue
 create mode 100644 src/views/modules/cabaseinfo/carental.vue
 create mode 100644 src/views/modules/cabaseinfo/caresident-add-or-update.vue
 create mode 100644 src/views/modules/cabaseinfo/caresident.vue
 create mode 100644 src/views/modules/cabaseinfo/carotators-add-or-update.vue
 create mode 100644 src/views/modules/cabaseinfo/carotators.vue

diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
new file mode 100644
index 00000000..52942152
--- /dev/null
+++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
@@ -0,0 +1,370 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.buildingId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="楼宇类型" prop="buildingType">
+          <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
+      </el-form-item>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></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-item label="创建人" prop="createBy">
+          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createDate">
+          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改人" prop="updateBy">
+          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改时间" prop="updateDate">
+          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除状态" prop="deleteFlag">
+          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="versions">
+          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段1" prop="attribute1">
+          <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段2" prop="attribute2">
+          <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段3" prop="attribute3">
+          <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段4" prop="attribute4">
+          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段5" prop="attribute5">
+          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
+      </el-form-item>
+          <el-form-item label="小区主键" prop="attribute6">
+          <el-input v-model="dataForm.attribute6" placeholder="小区主键"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段7" prop="attribute7">
+          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段8" prop="attribute8">
+          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段9" prop="attribute9">
+          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段10" prop="attribute10">
+          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
+      </el-form-item>
+          <el-form-item label="小区主键" prop="communityId">
+          <el-input v-model="dataForm.communityId" 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: '',;
+        attribute1: '',;
+        attribute2: '',;
+        attribute3: '',;
+        attribute4: '',;
+        attribute5: '',;
+        attribute6: '',;
+        attribute7: '',;
+        attribute8: '',;
+        attribute9: '',;
+        attribute10: '',;
+        communityId: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {;
+        buildingType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        gridId: [
+          { 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' }
+        ],;
+        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' }
+        ],;
+        versions: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute1: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute2: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute3: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute4: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute5: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute6: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute7: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute8: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute9: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute10: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        communityId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.buildingId); {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.buildingId}`;).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.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', 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>
diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
new file mode 100644
index 00000000..378306ed
--- /dev/null
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -0,0 +1,108 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__caLoudong}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caLoudong:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caLoudong:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="buildingId" label="楼栋ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingType" label="楼宇类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></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="buildingStatus" label="楼宇状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingStructure" label="楼宇结构" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingUseage" label="使用现状" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="constructionTime" label="建筑时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingLeader" label="楼栋长" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="basementLayerCount" label="地下楼层数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseBeginLayer" 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="layerRoomCount" 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="buildingArea" 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 prop="buildingDesc" label="介绍" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="pointStatus" label="标绘状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute1" label="扩展字段1" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute2" label="扩展字段2" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute3" label="扩展字段3" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute6" label="小区主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':caLoudong:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':caLoudong:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './'
+
+    export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '//caLoudong/page',
+        getDataListIsPage: true,
+        deleteURL: '//caLoudong',
+        deleteIsBatch: true
+      },
+      dataForm: {;
+        buildingId: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
new file mode 100644
index 00000000..52942152
--- /dev/null
+++ b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
@@ -0,0 +1,370 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.buildingId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="楼宇类型" prop="buildingType">
+          <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
+      </el-form-item>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></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-item label="创建人" prop="createBy">
+          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createDate">
+          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改人" prop="updateBy">
+          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改时间" prop="updateDate">
+          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除状态" prop="deleteFlag">
+          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="versions">
+          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段1" prop="attribute1">
+          <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段2" prop="attribute2">
+          <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段3" prop="attribute3">
+          <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段4" prop="attribute4">
+          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段5" prop="attribute5">
+          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
+      </el-form-item>
+          <el-form-item label="小区主键" prop="attribute6">
+          <el-input v-model="dataForm.attribute6" placeholder="小区主键"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段7" prop="attribute7">
+          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段8" prop="attribute8">
+          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段9" prop="attribute9">
+          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段10" prop="attribute10">
+          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
+      </el-form-item>
+          <el-form-item label="小区主键" prop="communityId">
+          <el-input v-model="dataForm.communityId" 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: '',;
+        attribute1: '',;
+        attribute2: '',;
+        attribute3: '',;
+        attribute4: '',;
+        attribute5: '',;
+        attribute6: '',;
+        attribute7: '',;
+        attribute8: '',;
+        attribute9: '',;
+        attribute10: '',;
+        communityId: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {;
+        buildingType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        gridId: [
+          { 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' }
+        ],;
+        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' }
+        ],;
+        versions: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute1: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute2: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute3: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute4: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute5: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute6: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute7: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute8: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute9: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute10: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        communityId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.buildingId); {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.buildingId}`;).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.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', 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>
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
new file mode 100644
index 00000000..5792cb81
--- /dev/null
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -0,0 +1,108 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__caPingfang}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caPingfang:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caPingfang:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="buildingId" label="楼栋ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingType" label="楼宇类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></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="buildingStatus" label="楼宇状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingStructure" label="楼宇结构" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingUseage" label="使用现状" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="constructionTime" label="建筑时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingLeader" label="楼栋长" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="basementLayerCount" label="地下楼层数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseBeginLayer" 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="layerRoomCount" 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="buildingArea" 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 prop="buildingDesc" label="介绍" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="pointStatus" label="标绘状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute1" label="扩展字段1" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute2" label="扩展字段2" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute3" label="扩展字段3" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute6" label="小区主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':caPingfang:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':caPingfang:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './'
+
+    export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '//caPingfang/page',
+        getDataListIsPage: true,
+        deleteURL: '//caPingfang',
+        deleteIsBatch: true
+      },
+      dataForm: {;
+        buildingId: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/cabaseinfo/carental-add-or-update.vue b/src/views/modules/cabaseinfo/carental-add-or-update.vue
new file mode 100644
index 00000000..81e66bfb
--- /dev/null
+++ b/src/views/modules/cabaseinfo/carental-add-or-update.vue
@@ -0,0 +1,342 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.rentalId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋ID" prop="houseId">
+          <el-input v-model="dataForm.houseId" placeholder="房屋ID"></el-input>
+      </el-form-item>
+          <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="承租人ID" prop="renterId">
+          <el-input v-model="dataForm.renterId" placeholder="承租人ID"></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-item label="数据来源" prop="platCode">
+          <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createBy">
+          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createDate">
+          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改人" prop="updateBy">
+          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改时间" prop="updateDate">
+          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除状态" prop="deleteFlag">
+          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="versions">
+          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="承租单位" prop="attribute1">
+          <el-input v-model="dataForm.attribute1" placeholder="承租单位"></el-input>
+      </el-form-item>
+          <el-form-item label="承租日期" prop="attribute2">
+          <el-input v-model="dataForm.attribute2" placeholder="承租日期"></el-input>
+      </el-form-item>
+          <el-form-item label="承租期限" prop="attribute3">
+          <el-input v-model="dataForm.attribute3" placeholder="承租期限"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段4" prop="attribute4">
+          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段5" prop="attribute5">
+          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段6" prop="attribute6">
+          <el-input v-model="dataForm.attribute6" placeholder="扩展字段6"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段7" prop="attribute7">
+          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段8" prop="attribute8">
+          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段9" prop="attribute9">
+          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段10" prop="attribute10">
+          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></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: '',;
+        platCode: '',;
+        createBy: '',;
+        createDate: '',;
+        updateBy: '',;
+        updateDate: '',;
+        deleteFlag: '',;
+        versions: '',;
+        attribute1: '',;
+        attribute2: '',;
+        attribute3: '',;
+        attribute4: '',;
+        attribute5: '',;
+        attribute6: '',;
+        attribute7: '',;
+        attribute8: '',;
+        attribute9: '',;
+        attribute10: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {;
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        houseId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        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' }
+        ],;
+        renterId: [
+          { 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' }
+        ],;
+        platCode: [
+          { 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' }
+        ],;
+        versions: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute1: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute2: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute3: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute4: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute5: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute6: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute7: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute8: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute9: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute10: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.rentalId); {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.rentalId}`;).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.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', 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>
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
new file mode 100644
index 00000000..87573be5
--- /dev/null
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -0,0 +1,104 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__caRental}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.rentalId" placeholder="rentalId" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caRental:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caRental:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="rentalId" label="出租房ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseId" label="房屋ID" header-align="center" align="center"></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"></el-table-column>
+        <el-table-column prop="houseUse" label="建筑用途" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseArea" label="建筑面积（平方米）" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idType" label="证件代码" header-align="center" align="center"></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="telephone" label="房主联系方式" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveAddress" 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="troubleType" label="隐患类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="renterId" label="承租人ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="renterCardNumber" label="承租人公民身份证号码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="renterCardType" 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 prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="pointStatus" label="标绘状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute1" label="承租单位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute2" label="承租日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute3" label="承租期限" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute6" label="扩展字段6" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':caRental:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':caRental:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './'
+
+    export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '//caRental/page',
+        getDataListIsPage: true,
+        deleteURL: '//caRental',
+        deleteIsBatch: true
+      },
+      dataForm: {;
+        rentalId: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/cabaseinfo/caresident-add-or-update.vue b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
new file mode 100644
index 00000000..148cc82f
--- /dev/null
+++ b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
@@ -0,0 +1,440 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.residentId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <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="householdProv">
+          <el-input v-model="dataForm.householdProv" placeholder="户籍省"></el-input>
+      </el-form-item>
+          <el-form-item label="户籍市" prop="householdCity">
+          <el-input v-model="dataForm.householdCity" placeholder="户籍市"></el-input>
+      </el-form-item>
+          <el-form-item label="户籍县(区)" prop="householdCounty">
+          <el-input v-model="dataForm.householdCounty" placeholder="户籍县(区)"></el-input>
+      </el-form-item>
+          <el-form-item label="户籍镇街" prop="householdTown">
+          <el-input v-model="dataForm.householdTown" placeholder="户籍镇街"></el-input>
+      </el-form-item>
+          <el-form-item label="户籍社区/村" prop="householdVillage">
+          <el-input v-model="dataForm.householdVillage" 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="curliveProv">
+          <el-input v-model="dataForm.curliveProv" placeholder="现住省"></el-input>
+      </el-form-item>
+          <el-form-item label="现住市" prop="curliveCity">
+          <el-input v-model="dataForm.curliveCity" placeholder="现住市"></el-input>
+      </el-form-item>
+          <el-form-item label="现住县(区)" prop="curliveCounty">
+          <el-input v-model="dataForm.curliveCounty" placeholder="现住县(区)"></el-input>
+      </el-form-item>
+          <el-form-item label="现住镇街" prop="curliveTown">
+          <el-input v-model="dataForm.curliveTown" placeholder="现住镇街"></el-input>
+      </el-form-item>
+          <el-form-item label="现住社区/村" prop="curliveVillage">
+          <el-input v-model="dataForm.curliveVillage" 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="nativeAddressProv">
+          <el-input v-model="dataForm.nativeAddressProv" placeholder="籍贯省"></el-input>
+      </el-form-item>
+          <el-form-item label="籍贯市" prop="nativeAddressCity">
+          <el-input v-model="dataForm.nativeAddressCity" placeholder="籍贯市"></el-input>
+      </el-form-item>
+          <el-form-item label="籍贯县(区)" prop="nativeAddressCounty">
+          <el-input v-model="dataForm.nativeAddressCounty" 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="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="occupationType">
+          <el-input v-model="dataForm.occupationType" placeholder="职业类别"></el-input>
+      </el-form-item>
+          <el-form-item label="服务处所" prop="serviceAddress">
+          <el-input v-model="dataForm.serviceAddress" 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-item label="国籍" prop="nationality">
+          <el-input v-model="dataForm.nationality" 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-item label="创建人" prop="createBy">
+          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createDate">
+          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改人" prop="updateBy">
+          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改时间" prop="updateDate">
+          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除状态" prop="deleteFlag">
+          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="versions">
+          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段1" prop="attribute1">
+          <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段2" prop="attribute2">
+          <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段3" prop="attribute3">
+          <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段4" prop="attribute4">
+          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段5" prop="attribute5">
+          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段6" prop="attribute6">
+          <el-input v-model="dataForm.attribute6" placeholder="扩展字段6"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段7" prop="attribute7">
+          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段8" prop="attribute8">
+          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段9" prop="attribute9">
+          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
+      </el-form-item>
+          <el-form-item label="扩展字段10" prop="attribute10">
+          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></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: '',;
+        attribute1: '',;
+        attribute2: '',;
+        attribute3: '',;
+        attribute4: '',;
+        attribute5: '',;
+        attribute6: '',;
+        attribute7: '',;
+        attribute8: '',;
+        attribute9: '',;
+        attribute10: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {;
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        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' }
+        ],;
+        householdProv: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        householdCity: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        householdCounty: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        householdTown: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        householdVillage: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        householdAddressDetail: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        curliveProv: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        curliveCity: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        curliveCounty: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        curliveTown: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        curliveVillage: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        curliveAddressDetail: [
+          { 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' }
+        ],;
+        nativeAddressCounty: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        formerName: [
+          { 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' }
+        ],;
+        occupationType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        serviceAddress: [
+          { 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' }
+        ],;
+        religious: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        conversionState: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        nationality: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        platCode: [
+          { 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' }
+        ],;
+        versions: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute1: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute2: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute3: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute4: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute5: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute6: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute7: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute8: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute9: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute10: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.residentId); {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.residentId}`;).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.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', 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>
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
new file mode 100644
index 00000000..29324d61
--- /dev/null
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -0,0 +1,118 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__caResident}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.residentId" placeholder="residentId" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="residentId" label="人口ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentProperty" label="人口性质" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentType" label="居民分类" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idType" label="证件类型" header-align="center" align="center"></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="nation" 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="householdProv" label="户籍省" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdCity" label="户籍市" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdCounty" label="户籍县(区)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdTown" label="户籍镇街" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdVillage" label="户籍社区/村" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdAddressDetail" label="户籍详址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveProv" label="现住省" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveCity" label="现住市" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveCounty" label="现住县(区)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveTown" label="现住镇街" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveVillage" label="现住社区/村" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveAddressDetail" label="现住详址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nativeAddressProv" label="籍贯省" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nativeAddressCity" label="籍贯市" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nativeAddressCounty" label="籍贯县(区)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="formerName" label="曾用名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="education" label="学历" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="occupation" label="职业" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="occupationType" label="职业类别" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="serviceAddress" label="服务处所" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="marriageStatus" label="婚姻状况" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="party" label="政治面貌" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="religious" label="宗教信仰" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="conversionState" label="有无皈依（已受洗）" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nationality" label="国籍" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute1" label="扩展字段1" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute2" label="扩展字段2" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute3" label="扩展字段3" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute6" label="扩展字段6" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':caResident:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':caResident:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './'
+
+    export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '//caResident/page',
+        getDataListIsPage: true,
+        deleteURL: '//caResident',
+        deleteIsBatch: true
+      },
+      dataForm: {;
+        residentId: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/cabaseinfo/carotators-add-or-update.vue b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
new file mode 100644
index 00000000..6cc3ab12
--- /dev/null
+++ b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
@@ -0,0 +1,461 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.rotatorsId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="公民身份证号" 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="nativeAddressProv">
+          <el-input v-model="dataForm.nativeAddressProv" placeholder="籍贯省"></el-input>
+      </el-form-item>
+          <el-form-item label="籍贯市" prop="nativeAddressCity">
+          <el-input v-model="dataForm.nativeAddressCity" placeholder="籍贯市"></el-input>
+      </el-form-item>
+          <el-form-item label="籍贯县(区)" prop="nativeAddressCountry">
+          <el-input v-model="dataForm.nativeAddressCountry" 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="serviceAddress">
+          <el-input v-model="dataForm.serviceAddress" 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="householdAddressProv">
+          <el-input v-model="dataForm.householdAddressProv" placeholder="户籍地省"></el-input>
+      </el-form-item>
+          <el-form-item label="户籍地市" prop="householdAddressCity">
+          <el-input v-model="dataForm.householdAddressCity" placeholder="户籍地市"></el-input>
+      </el-form-item>
+          <el-form-item label="户籍地县(区)" prop="householdAddressCountry">
+          <el-input v-model="dataForm.householdAddressCountry" placeholder="户籍地县(区)"></el-input>
+      </el-form-item>
+          <el-form-item label="户籍地镇街" prop="householdAddressTown">
+          <el-input v-model="dataForm.householdAddressTown" placeholder="户籍地镇街"></el-input>
+      </el-form-item>
+          <el-form-item label="户籍地社区/村" prop="householdAddressVillage">
+          <el-input v-model="dataForm.householdAddressVillage" 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="curliveAddressProv">
+          <el-input v-model="dataForm.curliveAddressProv" placeholder="现住地省"></el-input>
+      </el-form-item>
+          <el-form-item label="现住地市" prop="curliveAddressCity">
+          <el-input v-model="dataForm.curliveAddressCity" placeholder="现住地市"></el-input>
+      </el-form-item>
+          <el-form-item label="现住地县(区)" prop="curliveAddressCountry">
+          <el-input v-model="dataForm.curliveAddressCountry" placeholder="现住地县(区)"></el-input>
+      </el-form-item>
+          <el-form-item label="现住地镇街" prop="curliveAddressTown">
+          <el-input v-model="dataForm.curliveAddressTown" 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="inflowReason">
+          <el-input v-model="dataForm.inflowReason" placeholder="流入原因"></el-input>
+      </el-form-item>
+          <el-form-item label="办证类型" prop="certificateType">
+          <el-input v-model="dataForm.certificateType" placeholder="办证类型"></el-input>
+      </el-form-item>
+          <el-form-item label="证件号码" prop="certificateNumber">
+          <el-input v-model="dataForm.certificateNumber" placeholder="证件号码"></el-input>
+      </el-form-item>
+          <el-form-item label="登记日期" prop="signDate">
+          <el-input v-model="dataForm.signDate" placeholder="登记日期"></el-input>
+      </el-form-item>
+          <el-form-item label="证件到期日期" prop="endDate">
+          <el-input v-model="dataForm.endDate" placeholder="证件到期日期"></el-input>
+      </el-form-item>
+          <el-form-item label="住所类型" prop="residenceType">
+          <el-input v-model="dataForm.residenceType" 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-item label="创建人" prop="createBy">
+          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createDate">
+          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改人" prop="updateBy">
+          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
+      </el-form-item>
+          <el-form-item label="最后修改时间" prop="updateDate">
+          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识（正常的数据存：normal，逻辑删除的标识为：delete）" prop="deleteFlag">
+          <el-input v-model="dataForm.deleteFlag" placeholder="删除标识（正常的数据存：normal，逻辑删除的标识为：delete）"></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-item label="网格id" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格id"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="versions">
+          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="是否注销" prop="attribute1">
+          <el-input v-model="dataForm.attribute1" placeholder="是否注销"></el-input>
+      </el-form-item>
+          <el-form-item label="注销原因" prop="attribute2">
+          <el-input v-model="dataForm.attribute2" placeholder="注销原因"></el-input>
+      </el-form-item>
+          <el-form-item label="" prop="attribute3">
+          <el-input v-model="dataForm.attribute3" placeholder=""></el-input>
+      </el-form-item>
+          <el-form-item label="" prop="attribute4">
+          <el-input v-model="dataForm.attribute4" placeholder=""></el-input>
+      </el-form-item>
+          <el-form-item label="" prop="attribute5">
+          <el-input v-model="dataForm.attribute5" placeholder=""></el-input>
+      </el-form-item>
+          <el-form-item label="" prop="attribute6">
+          <el-input v-model="dataForm.attribute6" placeholder=""></el-input>
+      </el-form-item>
+          <el-form-item label="" prop="attribute7">
+          <el-input v-model="dataForm.attribute7" placeholder=""></el-input>
+      </el-form-item>
+          <el-form-item label="" prop="attribute8">
+          <el-input v-model="dataForm.attribute8" placeholder=""></el-input>
+      </el-form-item>
+          <el-form-item label="" prop="attribute9">
+          <el-input v-model="dataForm.attribute9" placeholder=""></el-input>
+      </el-form-item>
+          <el-form-item label="" prop="attribute10">
+          <el-input v-model="dataForm.attribute10" 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: '',;
+        attribute1: '',;
+        attribute2: '',;
+        attribute3: '',;
+        attribute4: '',;
+        attribute5: '',;
+        attribute6: '',;
+        attribute7: '',;
+        attribute8: '',;
+        attribute9: '',;
+        attribute10: ''
+      }
+    }
+  },
+  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' }
+        ],;
+        attribute1: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute2: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute3: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute4: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute5: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute6: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute7: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute8: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute9: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],;
+        attribute10: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.rotatorsId); {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.rotatorsId}`;).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.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', 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>
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
new file mode 100644
index 00000000..02ba324a
--- /dev/null
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -0,0 +1,121 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__caRotators}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.rotatorsId" placeholder="rotatorsId" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caRotators:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':caRotators:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="rotatorsId" label="主键id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="公民身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idType" 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="formerName" 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="nation" label="民族" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nativeAddressProv" label="籍贯省" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nativeAddressCity" label="籍贯市" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nativeAddressCountry" label="籍贯县(区)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="marriageStatus" label="婚姻状况" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="party" label="政治面貌" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="education" label="学历" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="religious" label="宗教信仰" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="occupationType" label="职业类别" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="occupation" label="职业" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="serviceAddress" 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="householdAddressProv" label="户籍地省" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdAddressCity" label="户籍地市" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdAddressCountry" label="户籍地县(区)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdAddressTown" label="户籍地镇街" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdAddressVillage" label="户籍地社区/村" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdAddressDetail" label="户籍门(楼)详址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveAddressProv" label="现住地省" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveAddressCity" label="现住地市" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveAddressCountry" label="现住地县(区)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveAddressTown" label="现住地镇街" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveAddressVillage" label="现住地社区/村" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="curliveAddressDetail" label="现住门(楼)详址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="inflowReason" label="流入原因" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="certificateType" label="办证类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="certificateNumber" label="证件号码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="signDate" label="登记日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="endDate" label="证件到期日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residenceType" label="住所类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="isFocusPerson" label="是否重点关注人员" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deleteFlag" label="删除标识（正常的数据存：normal，逻辑删除的标识为：delete）" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="platcode" label="数据来源编码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute1" label="是否注销" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute2" label="注销原因" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute3" label="" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute4" label="" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute5" label="" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute6" label="" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute7" label="" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute8" label="" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute9" label="" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="attribute10" label="" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':caRotators:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':caRotators:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+    import mixinViewModule from '@/mixins/view-module'
+    import AddOrUpdate from './'
+
+    export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '//caRotators/page',
+        getDataListIsPage: true,
+        deleteURL: '//caRotators',
+        deleteIsBatch: true
+      },
+      dataForm: {;
+        rotatorsId: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From d116b386648c1581e231345f5c8a6f1983ea6c1a Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 31 May 2022 10:52:48 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong-add-or-update.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
index 52942152..f2bd01e8 100644
--- a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
@@ -142,8 +142,8 @@
   data () {
     return {
       visible: false,
-      dataForm: {;
-        buildingId: '',;
+      dataForm: {
+        buildingId: '',
         buildingType: '',;
         gridId: '',;
         buildingName: '',;

From 927903967367d90a6aab9b3f1ffd5384a08751e9 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 31 May 2022 11:02:03 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cabaseinfo/caloudong-add-or-update.vue    | 168 ++++----
 src/views/modules/cabaseinfo/caloudong.vue    |   2 +-
 .../cabaseinfo/capingfang-add-or-update.vue   | 373 ++++++++++--------
 src/views/modules/cabaseinfo/capingfang.vue   |   2 +-
 .../cabaseinfo/carental-add-or-update.vue     | 336 ++++++++--------
 5 files changed, 464 insertions(+), 417 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
index f2bd01e8..56965ac6 100644
--- a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
@@ -144,177 +144,177 @@
       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: '',;
-        attribute1: '',;
-        attribute2: '',;
-        attribute3: '',;
-        attribute4: '',;
-        attribute5: '',;
-        attribute6: '',;
-        attribute7: '',;
-        attribute8: '',;
-        attribute9: '',;
-        attribute10: '',;
+        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: '',
+        attribute1: '',
+        attribute2: '',
+        attribute3: '',
+        attribute4: '',
+        attribute5: '',
+        attribute6: '',
+        attribute7: '',
+        attribute8: '',
+        attribute9: '',
+        attribute10: '',
         communityId: ''
       }
     }
   },
   computed: {
     dataRule () {
-      return {;
+      return {
         buildingType: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         gridId: [
           { 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' }
-        ],;
+        ],
         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' }
-        ],;
+        ],
         versions: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute1: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute2: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute3: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute4: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute5: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute6: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute7: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute8: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute9: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute10: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         communityId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
@@ -333,7 +333,7 @@
     },
     // 获取信息
     getInfo () {
-      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.buildingId}`;).then(({ data: res }) => {
+      this.$http.get(]]#`/${moduleName}/${pathName}/#[[${this.dataForm.buildingId}`;).then(({ data: res }) => {
         if (res.code !== 0) {
           ;return this.$message.error(res.msg);
         }
diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 378306ed..7ea7c63f 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -96,7 +96,7 @@
         deleteURL: '//caLoudong',
         deleteIsBatch: true
       },
-      dataForm: {;
+      dataForm: {
         buildingId: ''
       }
     }
diff --git a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
index 52942152..d941575b 100644
--- a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
@@ -1,136 +1,161 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.buildingId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="楼宇类型" prop="buildingType">
-          <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
+  <el-dialog
+    :visible.sync="visible"
+    :title="!dataForm.buildingId ? $t('add') : $t('update')"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmitHandle()"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
+    >
+      <el-form-item label="楼宇类型" prop="buildingType">
+        <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
       </el-form-item>
-          <el-form-item label="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      <el-form-item label="网格ID" prop="gridId">
+        <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
       </el-form-item>
-          <el-form-item label="楼宇名称" prop="buildingName">
-          <el-input v-model="dataForm.buildingName" placeholder="楼宇名称"></el-input>
+      <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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 label="数据来源" prop="platCode">
+        <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
       </el-form-item>
-          <el-form-item label="创建人" prop="createBy">
-          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
+      <el-form-item label="创建人" prop="createBy">
+        <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
       </el-form-item>
-          <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+      <el-form-item label="创建时间" prop="createDate">
+        <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
       </el-form-item>
-          <el-form-item label="最后修改人" prop="updateBy">
-          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
+      <el-form-item label="最后修改人" prop="updateBy">
+        <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
       </el-form-item>
-          <el-form-item label="最后修改时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
+      <el-form-item label="最后修改时间" prop="updateDate">
+        <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
       </el-form-item>
-          <el-form-item label="删除状态" prop="deleteFlag">
-          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
+      <el-form-item label="删除状态" prop="deleteFlag">
+        <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
       </el-form-item>
-          <el-form-item label="乐观锁" prop="versions">
-          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
+      <el-form-item label="乐观锁" prop="versions">
+        <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段1" prop="attribute1">
-          <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
+      <el-form-item label="扩展字段1" prop="attribute1">
+        <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段2" prop="attribute2">
-          <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
+      <el-form-item label="扩展字段2" prop="attribute2">
+        <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段3" prop="attribute3">
-          <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
+      <el-form-item label="扩展字段3" prop="attribute3">
+        <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段4" prop="attribute4">
-          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
+      <el-form-item label="扩展字段4" prop="attribute4">
+        <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段5" prop="attribute5">
-          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
+      <el-form-item label="扩展字段5" prop="attribute5">
+        <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
       </el-form-item>
-          <el-form-item label="小区主键" prop="attribute6">
-          <el-input v-model="dataForm.attribute6" placeholder="小区主键"></el-input>
+      <el-form-item label="小区主键" prop="attribute6">
+        <el-input v-model="dataForm.attribute6" placeholder="小区主键"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段7" prop="attribute7">
-          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
+      <el-form-item label="扩展字段7" prop="attribute7">
+        <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段8" prop="attribute8">
-          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
+      <el-form-item label="扩展字段8" prop="attribute8">
+        <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段9" prop="attribute9">
-          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
+      <el-form-item label="扩展字段9" prop="attribute9">
+        <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段10" prop="attribute10">
-          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
+      <el-form-item label="扩展字段10" prop="attribute10">
+        <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
       </el-form-item>
-          <el-form-item label="小区主键" prop="communityId">
-          <el-input v-model="dataForm.communityId" placeholder="小区主键"></el-input>
+      <el-form-item label="小区主键" prop="communityId">
+        <el-input v-model="dataForm.communityId" placeholder="小区主键"></el-input>
       </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{
+        $t("confirm")
+      }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -142,179 +167,179 @@
   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: '',;
-        attribute1: '',;
-        attribute2: '',;
-        attribute3: '',;
-        attribute4: '',;
-        attribute5: '',;
-        attribute6: '',;
-        attribute7: '',;
-        attribute8: '',;
-        attribute9: '',;
-        attribute10: '',;
+      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: '',
+        attribute1: '',
+        attribute2: '',
+        attribute3: '',
+        attribute4: '',
+        attribute5: '',
+        attribute6: '',
+        attribute7: '',
+        attribute8: '',
+        attribute9: '',
+        attribute10: '',
         communityId: ''
       }
     }
   },
   computed: {
     dataRule () {
-      return {;
+      return {
         buildingType: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         gridId: [
           { 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' }
-        ],;
+        ],
         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' }
-        ],;
+        ],
         versions: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute1: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute2: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute3: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute4: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute5: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute6: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute7: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute8: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute9: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute10: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         communityId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index 5792cb81..492ef845 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -96,7 +96,7 @@
         deleteURL: '//caPingfang',
         deleteIsBatch: true
       },
-      dataForm: {;
+      dataForm: {
         buildingId: ''
       }
     }
diff --git a/src/views/modules/cabaseinfo/carental-add-or-update.vue b/src/views/modules/cabaseinfo/carental-add-or-update.vue
index 81e66bfb..f008c00d 100644
--- a/src/views/modules/cabaseinfo/carental-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carental-add-or-update.vue
@@ -1,124 +1,146 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.rentalId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+  <el-dialog
+    :visible.sync="visible"
+    :title="!dataForm.rentalId ? $t('add') : $t('update')"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmitHandle()"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
+    >
+      <el-form-item label="网格ID" prop="gridId">
+        <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
       </el-form-item>
-          <el-form-item label="房屋ID" prop="houseId">
-          <el-input v-model="dataForm.houseId" placeholder="房屋ID"></el-input>
+      <el-form-item label="房屋ID" prop="houseId">
+        <el-input v-model="dataForm.houseId" placeholder="房屋ID"></el-input>
       </el-form-item>
-          <el-form-item label="房屋编号" prop="houseName">
-          <el-input v-model="dataForm.houseName" placeholder="房屋编号"></el-input>
+      <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 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 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 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 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 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 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 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 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 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 label="隐患类型" prop="troubleType">
+        <el-input v-model="dataForm.troubleType" placeholder="隐患类型"></el-input>
       </el-form-item>
-          <el-form-item label="承租人ID" prop="renterId">
-          <el-input v-model="dataForm.renterId" placeholder="承租人ID"></el-input>
+      <el-form-item label="承租人ID" prop="renterId">
+        <el-input v-model="dataForm.renterId" placeholder="承租人ID"></el-input>
       </el-form-item>
-          <el-form-item label="承租人公民身份证号码" prop="renterCardNumber">
-          <el-input v-model="dataForm.renterCardNumber" placeholder="承租人公民身份证号码"></el-input>
+      <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 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 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 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 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 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 label="标绘状态" prop="pointStatus">
+        <el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
       </el-form-item>
-          <el-form-item label="数据来源" prop="platCode">
-          <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
+      <el-form-item label="数据来源" prop="platCode">
+        <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
       </el-form-item>
-          <el-form-item label="创建人" prop="createBy">
-          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
+      <el-form-item label="创建人" prop="createBy">
+        <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
       </el-form-item>
-          <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+      <el-form-item label="创建时间" prop="createDate">
+        <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
       </el-form-item>
-          <el-form-item label="最后修改人" prop="updateBy">
-          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
+      <el-form-item label="最后修改人" prop="updateBy">
+        <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
       </el-form-item>
-          <el-form-item label="最后修改时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
+      <el-form-item label="最后修改时间" prop="updateDate">
+        <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
       </el-form-item>
-          <el-form-item label="删除状态" prop="deleteFlag">
-          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
+      <el-form-item label="删除状态" prop="deleteFlag">
+        <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
       </el-form-item>
-          <el-form-item label="乐观锁" prop="versions">
-          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
+      <el-form-item label="乐观锁" prop="versions">
+        <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
       </el-form-item>
-          <el-form-item label="承租单位" prop="attribute1">
-          <el-input v-model="dataForm.attribute1" placeholder="承租单位"></el-input>
+      <el-form-item label="承租单位" prop="attribute1">
+        <el-input v-model="dataForm.attribute1" placeholder="承租单位"></el-input>
       </el-form-item>
-          <el-form-item label="承租日期" prop="attribute2">
-          <el-input v-model="dataForm.attribute2" placeholder="承租日期"></el-input>
+      <el-form-item label="承租日期" prop="attribute2">
+        <el-input v-model="dataForm.attribute2" placeholder="承租日期"></el-input>
       </el-form-item>
-          <el-form-item label="承租期限" prop="attribute3">
-          <el-input v-model="dataForm.attribute3" placeholder="承租期限"></el-input>
+      <el-form-item label="承租期限" prop="attribute3">
+        <el-input v-model="dataForm.attribute3" placeholder="承租期限"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段4" prop="attribute4">
-          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
+      <el-form-item label="扩展字段4" prop="attribute4">
+        <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段5" prop="attribute5">
-          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
+      <el-form-item label="扩展字段5" prop="attribute5">
+        <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段6" prop="attribute6">
-          <el-input v-model="dataForm.attribute6" placeholder="扩展字段6"></el-input>
+      <el-form-item label="扩展字段6" prop="attribute6">
+        <el-input v-model="dataForm.attribute6" placeholder="扩展字段6"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段7" prop="attribute7">
-          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
+      <el-form-item label="扩展字段7" prop="attribute7">
+        <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段8" prop="attribute8">
-          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
+      <el-form-item label="扩展字段8" prop="attribute8">
+        <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段9" prop="attribute9">
-          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
+      <el-form-item label="扩展字段9" prop="attribute9">
+        <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
       </el-form-item>
-          <el-form-item label="扩展字段10" prop="attribute10">
-          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
+      <el-form-item label="扩展字段10" prop="attribute10">
+        <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
       </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{
+        $t("confirm")
+      }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -130,45 +152,45 @@
   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: '',;
-        platCode: '',;
-        createBy: '',;
-        createDate: '',;
-        updateBy: '',;
-        updateDate: '',;
-        deleteFlag: '',;
-        versions: '',;
-        attribute1: '',;
-        attribute2: '',;
-        attribute3: '',;
-        attribute4: '',;
-        attribute5: '',;
-        attribute6: '',;
-        attribute7: '',;
-        attribute8: '',;
-        attribute9: '',;
+      dataForm: {
+        rentalId: '',
+        gridId: '',
+        houseId: '',
+        houseName: '',
+        houseAddress: '',
+        houseUse: '',
+        houseArea: '',
+        idType: '',
+        idCard: '',
+        residentName: '',
+        telephone: '',
+        curliveAddress: '',
+        rentUse: '',
+        troubleType: '',
+        renterId: '',
+        renterCardNumber: '',
+        renterCardType: '',
+        renterName: '',
+        renterPhone: '',
+        longitude: '',
+        latitude: '',
+        pointStatus: '',
+        platCode: '',
+        createBy: '',
+        createDate: '',
+        updateBy: '',
+        updateDate: '',
+        deleteFlag: '',
+        versions: '',
+        attribute1: '',
+        attribute2: '',
+        attribute3: '',
+        attribute4: '',
+        attribute5: '',
+        attribute6: '',
+        attribute7: '',
+        attribute8: '',
+        attribute9: '',
         attribute10: ''
       }
     }
@@ -178,115 +200,115 @@
       return {;
         gridId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         houseId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         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' }
-        ],;
+        ],
         renterId: [
           { 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' }
-        ],;
+        ],
         platCode: [
           { 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' }
-        ],;
+        ],
         versions: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute1: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute2: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute3: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute4: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute5: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute6: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute7: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute8: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute9: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute10: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]

From 72db0e165b20e3d63f880a21d36cb0325dbb9bab Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 31 May 2022 13:25:42 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cabaseinfo/caloudong-add-or-update.vue    |  31 ++-
 src/views/modules/cabaseinfo/caloudong.vue    |  23 +-
 .../cabaseinfo/capingfang-add-or-update.vue   | 234 +++++++---------
 src/views/modules/cabaseinfo/capingfang.vue   |  23 +-
 .../cabaseinfo/carental-add-or-update.vue     | 217 +++++++--------
 src/views/modules/cabaseinfo/carental.vue     |  25 +-
 .../cabaseinfo/caresident-add-or-update.vue   | 241 +++++++++--------
 src/views/modules/cabaseinfo/caresident.vue   |  25 +-
 .../cabaseinfo/carotators-add-or-update.vue   | 253 +++++++++---------
 src/views/modules/cabaseinfo/carotators.vue   |  25 +-
 10 files changed, 520 insertions(+), 577 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
index 56965ac6..df56c1e4 100644
--- a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
@@ -136,9 +136,8 @@
 </template>
 
 <script>
-    import debounce from 'lodash/debounce'
-
-    export default {
+import debounce from 'lodash/debounce'
+export default {
   data () {
     return {
       visible: false,
@@ -323,19 +322,19 @@
   },
   methods: {
     init () {
-      this.visible = true;
+      this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.buildingId); {
+        if (this.dataForm.buildingId) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(]]#`/${moduleName}/${pathName}/#[[${this.dataForm.buildingId}`;).then(({ data: res }) => {
+      this.$http.get(`/axis/caLoudong/${this.dataForm.buildingId}`).then(({ data: res }) => {
         if (res.code !== 0) {
-          ;return this.$message.error(res.msg);
+          return this.$message.error(res.msg)
         }
         this.dataForm = {
           ...this.dataForm,
@@ -346,19 +345,19 @@
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
-        if (!valid); {
+        if (!valid) {
           return false
         }
-        this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.buildingId ? 'post' : 'put']('/axis/caLoudong/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
-            #[[;return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          this.$message({;
-            message;: this.$t('prompt.success'),;
-            type;: 'success',
-            duration;: 500,
-            onClose;: () => {
-              this.visible = false;
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
               this.$emit('refreshDataList')
             }
           })
diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 7ea7c63f..72627e56 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__caLoudong}">
+    <div class="mod-axis__caLoudong}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
@@ -9,13 +9,13 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':caLoudong:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('axis:caLoudong:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':caLoudong:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('axis:caLoudong:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <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="buildingId" label="楼栋ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="buildingType" label="楼宇类型" header-align="center" align="center"></el-table-column>
@@ -62,8 +62,8 @@
         <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission(':caLoudong:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':caLoudong:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caLoudong:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caLoudong:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -83,17 +83,16 @@
 </template>
 
 <script>
-    import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './'
-
-    export default {
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './caLoudong-add-or-update'
+export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '//caLoudong/page',
+        getDataListURL: '/axis/caLoudong/page',
         getDataListIsPage: true,
-        deleteURL: '//caLoudong',
+        deleteURL: '/axis/caLoudong',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
index d941575b..0b644826 100644
--- a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
@@ -1,169 +1,143 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="!dataForm.buildingId ? $t('add') : $t('update')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
-    >
-      <el-form-item label="楼宇类型" prop="buildingType">
-        <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
+  <el-dialog :visible.sync="visible" :title="!dataForm.buildingId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="楼宇类型" prop="buildingType">
+          <el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
       </el-form-item>
-      <el-form-item label="网格ID" prop="gridId">
-        <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
       </el-form-item>
-      <el-form-item label="楼宇名称" prop="buildingName">
-        <el-input v-model="dataForm.buildingName" placeholder="楼宇名称"></el-input>
+          <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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 label="数据来源" prop="platCode">
+          <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
       </el-form-item>
-      <el-form-item label="创建人" prop="createBy">
-        <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
+          <el-form-item label="创建人" prop="createBy">
+          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createDate">
-        <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+          <el-form-item label="创建时间" prop="createDate">
+          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
       </el-form-item>
-      <el-form-item label="最后修改人" prop="updateBy">
-        <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
+          <el-form-item label="最后修改人" prop="updateBy">
+          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
       </el-form-item>
-      <el-form-item label="最后修改时间" prop="updateDate">
-        <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
+          <el-form-item label="最后修改时间" prop="updateDate">
+          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
       </el-form-item>
-      <el-form-item label="删除状态" prop="deleteFlag">
-        <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
+          <el-form-item label="删除状态" prop="deleteFlag">
+          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
       </el-form-item>
-      <el-form-item label="乐观锁" prop="versions">
-        <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
+          <el-form-item label="乐观锁" prop="versions">
+          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段1" prop="attribute1">
-        <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
+          <el-form-item label="扩展字段1" prop="attribute1">
+          <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段2" prop="attribute2">
-        <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
+          <el-form-item label="扩展字段2" prop="attribute2">
+          <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段3" prop="attribute3">
-        <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
+          <el-form-item label="扩展字段3" prop="attribute3">
+          <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段4" prop="attribute4">
-        <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
+          <el-form-item label="扩展字段4" prop="attribute4">
+          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段5" prop="attribute5">
-        <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
+          <el-form-item label="扩展字段5" prop="attribute5">
+          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
       </el-form-item>
-      <el-form-item label="小区主键" prop="attribute6">
-        <el-input v-model="dataForm.attribute6" placeholder="小区主键"></el-input>
+          <el-form-item label="小区主键" prop="attribute6">
+          <el-input v-model="dataForm.attribute6" placeholder="小区主键"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段7" prop="attribute7">
-        <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
+          <el-form-item label="扩展字段7" prop="attribute7">
+          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段8" prop="attribute8">
-        <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
+          <el-form-item label="扩展字段8" prop="attribute8">
+          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段9" prop="attribute9">
-        <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
+          <el-form-item label="扩展字段9" prop="attribute9">
+          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段10" prop="attribute10">
-        <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
+          <el-form-item label="扩展字段10" prop="attribute10">
+          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
       </el-form-item>
-      <el-form-item label="小区主键" prop="communityId">
-        <el-input v-model="dataForm.communityId" placeholder="小区主键"></el-input>
+          <el-form-item label="小区主键" prop="communityId">
+          <el-input v-model="dataForm.communityId" placeholder="小区主键"></el-input>
       </el-form-item>
-    </el-form>
+      </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{
-        $t("confirm")
-      }}</el-button>
+      <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 {
+import debounce from 'lodash/debounce'
+export default {
   data () {
     return {
       visible: false,
@@ -348,19 +322,19 @@
   },
   methods: {
     init () {
-      this.visible = true;
+      this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.buildingId); {
+        if (this.dataForm.buildingId) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.buildingId}`;).then(({ data: res }) => {
+      this.$http.get(`/axis/caPingfang/${this.dataForm.buildingId}`).then(({ data: res }) => {
         if (res.code !== 0) {
-          ;return this.$message.error(res.msg);
+          return this.$message.error(res.msg)
         }
         this.dataForm = {
           ...this.dataForm,
@@ -371,19 +345,19 @@
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
-        if (!valid); {
+        if (!valid) {
           return false
         }
-        this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.buildingId ? 'post' : 'put']('/axis/caPingfang/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
-            #[[;return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          this.$message({;
-            message;: this.$t('prompt.success'),;
-            type;: 'success',
-            duration;: 500,
-            onClose;: () => {
-              this.visible = false;
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
               this.$emit('refreshDataList')
             }
           })
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index 492ef845..c5ddfe1c 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__caPingfang}">
+    <div class="mod-axis__caPingfang}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
@@ -9,13 +9,13 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':caPingfang:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('axis:caPingfang:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':caPingfang:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('axis:caPingfang:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <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="buildingId" label="楼栋ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="buildingType" label="楼宇类型" header-align="center" align="center"></el-table-column>
@@ -62,8 +62,8 @@
         <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission(':caPingfang:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':caPingfang:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caPingfang:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caPingfang:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -83,17 +83,16 @@
 </template>
 
 <script>
-    import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './'
-
-    export default {
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './caPingfang-add-or-update'
+export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '//caPingfang/page',
+        getDataListURL: '/axis/caPingfang/page',
         getDataListIsPage: true,
-        deleteURL: '//caPingfang',
+        deleteURL: '/axis/caPingfang',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/cabaseinfo/carental-add-or-update.vue b/src/views/modules/cabaseinfo/carental-add-or-update.vue
index f008c00d..5572a149 100644
--- a/src/views/modules/cabaseinfo/carental-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carental-add-or-update.vue
@@ -1,154 +1,131 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="!dataForm.rentalId ? $t('add') : $t('update')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
-    >
-      <el-form-item label="网格ID" prop="gridId">
-        <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+  <el-dialog :visible.sync="visible" :title="!dataForm.rentalId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
       </el-form-item>
-      <el-form-item label="房屋ID" prop="houseId">
-        <el-input v-model="dataForm.houseId" placeholder="房屋ID"></el-input>
+          <el-form-item label="房屋ID" prop="houseId">
+          <el-input v-model="dataForm.houseId" placeholder="房屋ID"></el-input>
       </el-form-item>
-      <el-form-item label="房屋编号" prop="houseName">
-        <el-input v-model="dataForm.houseName" placeholder="房屋编号"></el-input>
+          <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 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 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 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 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 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 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 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 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 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 label="隐患类型" prop="troubleType">
+          <el-input v-model="dataForm.troubleType" placeholder="隐患类型"></el-input>
       </el-form-item>
-      <el-form-item label="承租人ID" prop="renterId">
-        <el-input v-model="dataForm.renterId" placeholder="承租人ID"></el-input>
+          <el-form-item label="承租人ID" prop="renterId">
+          <el-input v-model="dataForm.renterId" placeholder="承租人ID"></el-input>
       </el-form-item>
-      <el-form-item label="承租人公民身份证号码" prop="renterCardNumber">
-        <el-input
-          v-model="dataForm.renterCardNumber"
-          placeholder="承租人公民身份证号码"
-        ></el-input>
+          <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 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 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 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 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 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 label="标绘状态" prop="pointStatus">
+          <el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
       </el-form-item>
-      <el-form-item label="数据来源" prop="platCode">
-        <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
+          <el-form-item label="数据来源" prop="platCode">
+          <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
       </el-form-item>
-      <el-form-item label="创建人" prop="createBy">
-        <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
+          <el-form-item label="创建人" prop="createBy">
+          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createDate">
-        <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
+          <el-form-item label="创建时间" prop="createDate">
+          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
       </el-form-item>
-      <el-form-item label="最后修改人" prop="updateBy">
-        <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
+          <el-form-item label="最后修改人" prop="updateBy">
+          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
       </el-form-item>
-      <el-form-item label="最后修改时间" prop="updateDate">
-        <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
+          <el-form-item label="最后修改时间" prop="updateDate">
+          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
       </el-form-item>
-      <el-form-item label="删除状态" prop="deleteFlag">
-        <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
+          <el-form-item label="删除状态" prop="deleteFlag">
+          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
       </el-form-item>
-      <el-form-item label="乐观锁" prop="versions">
-        <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
+          <el-form-item label="乐观锁" prop="versions">
+          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
       </el-form-item>
-      <el-form-item label="承租单位" prop="attribute1">
-        <el-input v-model="dataForm.attribute1" placeholder="承租单位"></el-input>
+          <el-form-item label="承租单位" prop="attribute1">
+          <el-input v-model="dataForm.attribute1" placeholder="承租单位"></el-input>
       </el-form-item>
-      <el-form-item label="承租日期" prop="attribute2">
-        <el-input v-model="dataForm.attribute2" placeholder="承租日期"></el-input>
+          <el-form-item label="承租日期" prop="attribute2">
+          <el-input v-model="dataForm.attribute2" placeholder="承租日期"></el-input>
       </el-form-item>
-      <el-form-item label="承租期限" prop="attribute3">
-        <el-input v-model="dataForm.attribute3" placeholder="承租期限"></el-input>
+          <el-form-item label="承租期限" prop="attribute3">
+          <el-input v-model="dataForm.attribute3" placeholder="承租期限"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段4" prop="attribute4">
-        <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
+          <el-form-item label="扩展字段4" prop="attribute4">
+          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段5" prop="attribute5">
-        <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
+          <el-form-item label="扩展字段5" prop="attribute5">
+          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段6" prop="attribute6">
-        <el-input v-model="dataForm.attribute6" placeholder="扩展字段6"></el-input>
+          <el-form-item label="扩展字段6" prop="attribute6">
+          <el-input v-model="dataForm.attribute6" placeholder="扩展字段6"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段7" prop="attribute7">
-        <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
+          <el-form-item label="扩展字段7" prop="attribute7">
+          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段8" prop="attribute8">
-        <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
+          <el-form-item label="扩展字段8" prop="attribute8">
+          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段9" prop="attribute9">
-        <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
+          <el-form-item label="扩展字段9" prop="attribute9">
+          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
       </el-form-item>
-      <el-form-item label="扩展字段10" prop="attribute10">
-        <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
+          <el-form-item label="扩展字段10" prop="attribute10">
+          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
       </el-form-item>
-    </el-form>
+      </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{
-        $t("confirm")
-      }}</el-button>
+      <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 {
+import debounce from 'lodash/debounce'
+export default {
   data () {
     return {
       visible: false,
@@ -197,7 +174,7 @@
   },
   computed: {
     dataRule () {
-      return {;
+      return {
         gridId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -317,19 +294,19 @@
   },
   methods: {
     init () {
-      this.visible = true;
+      this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.rentalId); {
+        if (this.dataForm.rentalId) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.rentalId}`;).then(({ data: res }) => {
+      this.$http.get(`/axis/caRental/${this.dataForm.rentalId}`).then(({ data: res }) => {
         if (res.code !== 0) {
-          ;return this.$message.error(res.msg);
+          return this.$message.error(res.msg)
         }
         this.dataForm = {
           ...this.dataForm,
@@ -340,19 +317,19 @@
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
-        if (!valid); {
+        if (!valid) {
           return false
         }
-        this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.rentalId ? 'post' : 'put']('/axis/caRental/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
-            #[[;return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          this.$message({;
-            message;: this.$t('prompt.success'),;
-            type;: 'success',
-            duration;: 500,
-            onClose;: () => {
-              this.visible = false;
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
               this.$emit('refreshDataList')
             }
           })
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index 87573be5..2a0c7a9b 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__caRental}">
+    <div class="mod-axis__caRental}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.rentalId" placeholder="rentalId" clearable></el-input>
@@ -9,13 +9,13 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':caRental:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('axis:caRental:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':caRental:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('axis:caRental:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <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="rentalId" label="出租房ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
@@ -58,8 +58,8 @@
         <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission(':caRental:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':caRental:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caRental:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caRental:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -79,20 +79,19 @@
 </template>
 
 <script>
-    import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './'
-
-    export default {
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './caRental-add-or-update'
+export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '//caRental/page',
+        getDataListURL: '/axis/caRental/page',
         getDataListIsPage: true,
-        deleteURL: '//caRental',
+        deleteURL: '/axis/caRental',
         deleteIsBatch: true
       },
-      dataForm: {;
+      dataForm: {
         rentalId: ''
       }
     }
diff --git a/src/views/modules/cabaseinfo/caresident-add-or-update.vue b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
index 148cc82f..52049267 100644
--- a/src/views/modules/cabaseinfo/caresident-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
@@ -166,225 +166,224 @@
 </template>
 
 <script>
-    import debounce from 'lodash/debounce'
-
-    export default {
+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: '',;
-        attribute1: '',;
-        attribute2: '',;
-        attribute3: '',;
-        attribute4: '',;
-        attribute5: '',;
-        attribute6: '',;
-        attribute7: '',;
-        attribute8: '',;
-        attribute9: '',;
+      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: '',
+        attribute1: '',
+        attribute2: '',
+        attribute3: '',
+        attribute4: '',
+        attribute5: '',
+        attribute6: '',
+        attribute7: '',
+        attribute8: '',
+        attribute9: '',
         attribute10: ''
       }
     }
   },
   computed: {
     dataRule () {
-      return {;
+      return {
         gridId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         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' }
-        ],;
+        ],
         householdProv: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         householdCity: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         householdCounty: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         householdTown: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         householdVillage: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         householdAddressDetail: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         curliveProv: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         curliveCity: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         curliveCounty: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         curliveTown: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         curliveVillage: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         curliveAddressDetail: [
           { 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' }
-        ],;
+        ],
         nativeAddressCounty: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         formerName: [
           { 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' }
-        ],;
+        ],
         occupationType: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         serviceAddress: [
           { 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' }
-        ],;
+        ],
         religious: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         conversionState: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         nationality: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         platCode: [
           { 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' }
-        ],;
+        ],
         versions: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute1: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute2: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute3: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute4: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute5: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute6: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute7: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute8: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute9: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute10: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
@@ -393,19 +392,19 @@
   },
   methods: {
     init () {
-      this.visible = true;
+      this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.residentId); {
+        if (this.dataForm.residentId) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.residentId}`;).then(({ data: res }) => {
+      this.$http.get(`/axis/caResident/${this.dataForm.residentId}`).then(({ data: res }) => {
         if (res.code !== 0) {
-          ;return this.$message.error(res.msg);
+          return this.$message.error(res.msg)
         }
         this.dataForm = {
           ...this.dataForm,
@@ -416,19 +415,19 @@
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
-        if (!valid); {
+        if (!valid) {
           return false
         }
-        this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.residentId ? 'post' : 'put']('/axis/caResident/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
-            #[[;return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          this.$message({;
-            message;: this.$t('prompt.success'),;
-            type;: 'success',
-            duration;: 500,
-            onClose;: () => {
-              this.visible = false;
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
               this.$emit('refreshDataList')
             }
           })
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 29324d61..da0b0e17 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__caResident}">
+    <div class="mod-axis__caResident}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.residentId" placeholder="residentId" clearable></el-input>
@@ -9,13 +9,13 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <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(':caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <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="residentId" label="人口ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
@@ -72,8 +72,8 @@
         <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission(':caResident:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':caResident:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caResident:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caResident:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -93,20 +93,19 @@
 </template>
 
 <script>
-    import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './'
-
-    export default {
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './caResident-add-or-update'
+export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '//caResident/page',
+        getDataListURL: '/axis/caResident/page',
         getDataListIsPage: true,
-        deleteURL: '//caResident',
+        deleteURL: '/axis/caResident',
         deleteIsBatch: true
       },
-      dataForm: {;
+      dataForm: {
         residentId: ''
       }
     }
diff --git a/src/views/modules/cabaseinfo/carotators-add-or-update.vue b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
index 6cc3ab12..2d8ca751 100644
--- a/src/views/modules/cabaseinfo/carotators-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
@@ -175,237 +175,236 @@
 </template>
 
 <script>
-    import debounce from 'lodash/debounce'
-
-    export default {
+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: '',;
-        attribute1: '',;
-        attribute2: '',;
-        attribute3: '',;
-        attribute4: '',;
-        attribute5: '',;
-        attribute6: '',;
-        attribute7: '',;
-        attribute8: '',;
-        attribute9: '',;
+      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: '',
+        attribute1: '',
+        attribute2: '',
+        attribute3: '',
+        attribute4: '',
+        attribute5: '',
+        attribute6: '',
+        attribute7: '',
+        attribute8: '',
+        attribute9: '',
         attribute10: ''
       }
     }
   },
   computed: {
     dataRule () {
-      return {;
+      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' }
-        ],;
+        ],
         attribute1: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute2: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute3: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute4: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute5: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute6: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute7: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute8: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute9: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],;
+        ],
         attribute10: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
@@ -414,19 +413,19 @@
   },
   methods: {
     init () {
-      this.visible = true;
+      this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.rotatorsId); {
+        if (this.dataForm.rotatorsId) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.rotatorsId}`;).then(({ data: res }) => {
+      this.$http.get(`/axis/caRotators/${this.dataForm.rotatorsId}`).then(({ data: res }) => {
         if (res.code !== 0) {
-          ;return this.$message.error(res.msg);
+          return this.$message.error(res.msg)
         }
         this.dataForm = {
           ...this.dataForm,
@@ -437,19 +436,19 @@
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
-        if (!valid); {
+        if (!valid) {
           return false
         }
-        this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.rotatorsId ? 'post' : 'put']('/axis/caRotators/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
-            #[[;return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          this.$message({;
-            message;: this.$t('prompt.success'),;
-            type;: 'success',
-            duration;: 500,
-            onClose;: () => {
-              this.visible = false;
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
               this.$emit('refreshDataList')
             }
           })
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index 02ba324a..2208dc23 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-__caRotators}">
+    <div class="mod-axis__caRotators}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.rotatorsId" placeholder="rotatorsId" clearable></el-input>
@@ -9,13 +9,13 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':caRotators:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('axis:caRotators:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':caRotators:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('axis:caRotators:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <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="rotatorsId" label="主键id" header-align="center" align="center"></el-table-column>
         <el-table-column prop="idCard" label="公民身份证号" header-align="center" align="center"></el-table-column>
@@ -75,8 +75,8 @@
         <el-table-column prop="attribute10" label="" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission(':caRotators:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':caRotators:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caRotators:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caRotators:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -96,20 +96,19 @@
 </template>
 
 <script>
-    import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './'
-
-    export default {
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './caRotators-add-or-update'
+export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '//caRotators/page',
+        getDataListURL: '/axis/caRotators/page',
         getDataListIsPage: true,
-        deleteURL: '//caRotators',
+        deleteURL: '/axis/caRotators',
         deleteIsBatch: true
       },
-      dataForm: {;
+      dataForm: {
         rotatorsId: ''
       }
     }

From ad68f7c31fd6274a3664ee29c2cf3ee67fcf1b77 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 31 May 2022 14:18:14 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong.vue  | 18 +++++++++---------
 src/views/modules/cabaseinfo/capingfang.vue |  2 +-
 src/views/modules/cabaseinfo/carental.vue   |  2 +-
 src/views/modules/cabaseinfo/caresident.vue |  2 +-
 src/views/modules/cabaseinfo/carotators.vue |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 72627e56..b2435029 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -9,10 +9,10 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('axis:caLoudong:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button class="diy-button--add" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('axis:caLoudong:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button class="diy-button--delete" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
@@ -60,12 +60,12 @@
         <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
         <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
         <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caLoudong:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caLoudong:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caloudong:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('axis:caloudong:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <el-pagination
         :current-page="page"
@@ -84,15 +84,15 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './caLoudong-add-or-update'
+import AddOrUpdate from './caloudong-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/axis/caLoudong/page',
+        getDataListURL: '/axis/caloudong/page',
         getDataListIsPage: true,
-        deleteURL: '/axis/caLoudong',
+        deleteURL: '/axis/caloudong',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index c5ddfe1c..d48bc29e 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -84,7 +84,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './caPingfang-add-or-update'
+import AddOrUpdate from './capingfang-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index 2a0c7a9b..33be2fec 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -80,7 +80,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './caRental-add-or-update'
+import AddOrUpdate from './carental-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index da0b0e17..7475af28 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -94,7 +94,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './caResident-add-or-update'
+import AddOrUpdate from './caresident-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index 2208dc23..13ad11bc 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -97,7 +97,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './caRotators-add-or-update'
+import AddOrUpdate from './carotators-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {

From 23d81b9b474f2b01936e863506333d80171b5d42 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 31 May 2022 14:44:13 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index b2435029..4c66e7f6 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -6,14 +6,14 @@
           <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button class="diy-button--add" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button class="diy-button--delete" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
@@ -90,9 +90,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/axis/caloudong/page',
+        getDataListURL: '/opendata/caLoudong/page',
         getDataListIsPage: true,
-        deleteURL: '/axis/caloudong',
+        deleteURL: '/opendata/caloudong',
         deleteIsBatch: true
       },
       dataForm: {

From 7ea4a48fc24869c98137c3d9e8d86db0cb6a84fe Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 1 Jun 2022 13:40:48 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E7=BB=BC=E6=B2=BB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong.vue  | 20 +++++---------------
 src/views/modules/cabaseinfo/capingfang.vue | 12 ++++++------
 src/views/modules/cabaseinfo/carental.vue   | 12 ++++++------
 src/views/modules/cabaseinfo/caresident.vue | 12 ++++++------
 src/views/modules/cabaseinfo/carotators.vue | 12 ++++++------
 5 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 4c66e7f6..21ce6384 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caLoudong}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -10,7 +10,7 @@
         </el-form-item>
         <el-form-item>
           <el-button class="diy-button--add" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
         <!-- <el-form-item>
           <el-button class="diy-button--delete" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item> -->
@@ -49,16 +49,6 @@
         <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
         <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute1" label="扩展字段1" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute2" label="扩展字段2" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute3" label="扩展字段3" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute6" label="小区主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
         <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
         <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
@@ -90,13 +80,13 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caLoudong/page',
+        getDataListURL: '/opendata/caLoudong/getPage',
         getDataListIsPage: true,
-        deleteURL: '/opendata/caloudong',
+        deleteURL: '',
         deleteIsBatch: true
       },
       dataForm: {
-        buildingId: ''
+        // buildingId: ''
       }
     }
   },
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index d48bc29e..d057ff42 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caPingfang}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -13,7 +13,7 @@
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('axis:caPingfang:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
@@ -60,12 +60,12 @@
         <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
         <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
         <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('axis:caPingfang:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('axis:caPingfang:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <el-pagination
         :current-page="page"
@@ -90,9 +90,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/axis/caPingfang/page',
+        getDataListURL: '/opendata/caPingfang/getPage',
         getDataListIsPage: true,
-        deleteURL: '/axis/caPingfang',
+        deleteURL: '',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index 33be2fec..adabbcf1 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caRental}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.rentalId" placeholder="rentalId" clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -13,7 +13,7 @@
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('axis:caRental:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
@@ -56,12 +56,12 @@
         <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
         <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
         <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('axis:caRental:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('axis:caRental:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <el-pagination
         :current-page="page"
@@ -86,9 +86,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/axis/caRental/page',
+        getDataListURL: '/opendata/caRental/getPage',
         getDataListIsPage: true,
-        deleteURL: '/axis/caRental',
+        deleteURL: '',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 7475af28..5491cb69 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caResident}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.residentId" placeholder="residentId" clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -13,7 +13,7 @@
         </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-item> -->
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
@@ -70,12 +70,12 @@
         <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
         <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
         <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('axis:caResident:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('axis:caResident:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <el-pagination
         :current-page="page"
@@ -100,9 +100,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/axis/caResident/page',
+        getDataListURL: '/opendata/caResident/getPage',
         getDataListIsPage: true,
-        deleteURL: '/axis/caResident',
+        deleteURL: '',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index 13ad11bc..d7ccee2a 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caRotators}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.rotatorsId" placeholder="rotatorsId" clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -13,7 +13,7 @@
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('axis:caRotators:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
@@ -73,12 +73,12 @@
         <el-table-column prop="attribute8" label="" header-align="center" align="center"></el-table-column>
         <el-table-column prop="attribute9" label="" header-align="center" align="center"></el-table-column>
         <el-table-column prop="attribute10" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('axis:caRotators:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('axis:caRotators:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <el-pagination
         :current-page="page"
@@ -103,9 +103,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/axis/caRotators/page',
+        getDataListURL: '/opendata/caRotators/getPage',
         getDataListIsPage: true,
-        deleteURL: '/axis/caRotators',
+        deleteURL: '',
         deleteIsBatch: true
       },
       dataForm: {

From f087cefd4b161173532c513df707a628634f1771 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 2 Jun 2022 10:50:30 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E7=BB=BC=E6=B2=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong.vue  | 121 +++++++---------
 src/views/modules/cabaseinfo/capingfang.vue | 131 +++++++-----------
 src/views/modules/cabaseinfo/carental.vue   | 130 ++++++++----------
 src/views/modules/cabaseinfo/caresident.vue | 143 +++++++------------
 src/views/modules/cabaseinfo/carotators.vue | 145 +++++++-------------
 5 files changed, 261 insertions(+), 409 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 21ce6384..e664a0b2 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -1,75 +1,55 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caLoudong}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.buildingId" placeholder="buildingId" 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 class="diy-button--add" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item> -->
-        <!-- <el-form-item>
-          <el-button class="diy-button--delete" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="buildingId" label="楼栋ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingType" label="楼宇类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></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="buildingStatus" label="楼宇状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingStructure" label="楼宇结构" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingUseage" label="使用现状" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="constructionTime" label="建筑时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingLeader" label="楼栋长" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="basementLayerCount" label="地下楼层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseBeginLayer" 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="layerRoomCount" 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="buildingArea" 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 prop="buildingDesc" label="介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pointStatus" label="标绘状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caloudong:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caloudong:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+        <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"></el-table-column>
+          <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></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.id)">查看</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>
-  </el-card>
 </template>
 
 <script>
@@ -86,7 +66,8 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        // buildingId: ''
+        buildingName: '',
+        communityName: ''
       }
     }
   },
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index d057ff42..042115b8 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -1,85 +1,55 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caPingfang}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.buildingId" placeholder="buildingId" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caPingfang:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caPingfang:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="buildingId" label="楼栋ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingType" label="楼宇类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></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="buildingStatus" label="楼宇状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingStructure" label="楼宇结构" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingUseage" label="使用现状" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="constructionTime" label="建筑时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingAddr" label="所处位置" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildingLeader" label="楼栋长" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="layerCount" label="楼层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="basementLayerCount" label="地下楼层数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseBeginLayer" 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="layerRoomCount" 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="buildingArea" 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 prop="buildingDesc" label="介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pointStatus" label="标绘状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute1" label="扩展字段1" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute2" label="扩展字段2" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute3" label="扩展字段3" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute6" label="小区主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityId" label="小区主键" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caPingfang:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caPingfang:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+        <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"></el-table-column>
+          <el-table-column prop="communityName" label="小区（单位）名称" header-align="center" align="center"></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.id)">查看</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>
-  </el-card>
 </template>
 
 <script>
@@ -96,7 +66,8 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        buildingId: ''
+        buildingName: '',
+        communityName: ''
       }
     }
   },
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index adabbcf1..332b944d 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -1,81 +1,57 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caRental}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.rentalId" placeholder="rentalId" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caRental:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caRental:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="rentalId" label="出租房ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseId" label="房屋ID" header-align="center" align="center"></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"></el-table-column>
-        <el-table-column prop="houseUse" label="建筑用途" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseArea" label="建筑面积（平方米）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idType" label="证件代码" header-align="center" align="center"></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="telephone" label="房主联系方式" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddress" 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="troubleType" label="隐患类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="renterId" label="承租人ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="renterCardNumber" label="承租人公民身份证号码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="renterCardType" 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 prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pointStatus" label="标绘状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute1" label="承租单位" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute2" label="承租日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute3" label="承租期限" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute6" label="扩展字段6" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caRental:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caRental:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+        <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"></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.id)">查看</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>
-  </el-card>
 </template>
 
 <script>
@@ -92,7 +68,9 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        rentalId: ''
+        houseName: '',
+        residentName: '',
+        renterName: ''
       }
     }
   },
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 5491cb69..05cf46eb 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -1,95 +1,56 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caResident}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.residentId" placeholder="residentId" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @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-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="residentId" label="人口ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentProperty" label="人口性质" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentType" label="居民分类" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idType" label="证件类型" header-align="center" align="center"></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="nation" 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="householdProv" label="户籍省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdCity" label="户籍市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdCounty" label="户籍县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdTown" label="户籍镇街" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdVillage" label="户籍社区/村" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressDetail" label="户籍详址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveProv" label="现住省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveCity" label="现住市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveCounty" label="现住县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveTown" label="现住镇街" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveVillage" label="现住社区/村" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressDetail" label="现住详址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressProv" label="籍贯省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressCity" label="籍贯市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressCounty" label="籍贯县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="formerName" label="曾用名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="education" label="学历" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="occupation" label="职业" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="occupationType" label="职业类别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="serviceAddress" label="服务处所" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="marriageStatus" label="婚姻状况" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="party" label="政治面貌" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="religious" label="宗教信仰" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="conversionState" label="有无皈依（已受洗）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nationality" label="国籍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platCode" label="数据来源" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute1" label="扩展字段1" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute2" label="扩展字段2" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute3" label="扩展字段3" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute4" label="扩展字段4" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute5" label="扩展字段5" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute6" label="扩展字段6" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute7" label="扩展字段7" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute8" label="扩展字段8" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute9" label="扩展字段9" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute10" label="扩展字段10" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caResident:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caResident:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+        <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"></el-table-column>
+          <el-table-column prop="curliveAddressDetail" 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.id)">查看</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>
-  </el-card>
 </template>
 
 <script>
@@ -106,7 +67,9 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        residentId: ''
+        idCard: '',
+        residentName: '',
+        telephone: ''
       }
     }
   },
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index d7ccee2a..0d8eb828 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -1,98 +1,55 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-axis__caRotators}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.rotatorsId" placeholder="rotatorsId" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caRotators:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('axis:caRotators:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="rotatorsId" label="主键id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idCard" label="公民身份证号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idType" 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="formerName" 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="nation" label="民族" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressProv" label="籍贯省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressCity" label="籍贯市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nativeAddressCountry" label="籍贯县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="marriageStatus" label="婚姻状况" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="party" label="政治面貌" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="education" label="学历" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="religious" label="宗教信仰" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="occupationType" label="职业类别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="occupation" label="职业" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="serviceAddress" 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="householdAddressProv" label="户籍地省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressCity" label="户籍地市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressCountry" label="户籍地县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressTown" label="户籍地镇街" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressVillage" label="户籍地社区/村" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="householdAddressDetail" label="户籍门(楼)详址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressProv" label="现住地省" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressCity" label="现住地市" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressCountry" label="现住地县(区)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressTown" label="现住地镇街" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressVillage" label="现住地社区/村" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="curliveAddressDetail" label="现住门(楼)详址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="inflowReason" label="流入原因" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="certificateType" label="办证类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="certificateNumber" label="证件号码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="signDate" label="登记日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="endDate" label="证件到期日期" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residenceType" label="住所类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="isFocusPerson" label="是否重点关注人员" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateBy" label="最后修改人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="最后修改时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deleteFlag" label="删除标识（正常的数据存：normal，逻辑删除的标识为：delete）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="platcode" label="数据来源编码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="versions" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute1" label="是否注销" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute2" label="注销原因" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute3" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute4" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute5" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute6" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute7" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute8" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute9" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="attribute10" label="" header-align="center" align="center"></el-table-column>
-        <!-- <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('axis:caRotators:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('axis:caRotators:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+        <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"></el-table-column>
+          <el-table-column prop="curliveAddressDetail" 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.id)">查看</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>
-  </el-card>
 </template>
 
 <script>
@@ -109,7 +66,9 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        rotatorsId: ''
+        idCard: '',
+        residentName: '',
+        telephone: ''
       }
     }
   },

From c106f6aa4cdaef9c213805b77efb926954f05f1a Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 2 Jun 2022 17:16:22 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E7=BB=BC=E6=B2=BB=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cabaseinfo/caloudong-add-or-update.vue    | 178 ++----------
 src/views/modules/cabaseinfo/caloudong.vue    |   2 +-
 .../cabaseinfo/capingfang-add-or-update.vue   | 180 ++----------
 src/views/modules/cabaseinfo/capingfang.vue   |   2 +-
 .../cabaseinfo/carental-add-or-update.vue     | 187 ++----------
 src/views/modules/cabaseinfo/carental.vue     |   2 +-
 .../cabaseinfo/caresident-add-or-update.vue   | 271 ++----------------
 src/views/modules/cabaseinfo/caresident.vue   |   2 +-
 .../cabaseinfo/carotators-add-or-update.vue   | 199 ++-----------
 src/views/modules/cabaseinfo/carotators.vue   |   2 +-
 10 files changed, 139 insertions(+), 886 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
index df56c1e4..f1e3076b 100644
--- a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue
@@ -1,136 +1,82 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.buildingId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="楼宇类型" prop="buildingType">
+  <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="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="楼宇名称" prop="buildingName">
+      <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-form-item label="用途分类" prop="buildingUse">
           <el-input v-model="dataForm.buildingUse" placeholder="用途分类"></el-input>
       </el-form-item>
-          <el-form-item label="楼宇状态" prop="buildingStatus">
+      <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-form-item label="楼宇结构" prop="buildingStructure">
           <el-input v-model="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
       </el-form-item>
-          <el-form-item label="使用现状" prop="buildingUseage">
+      <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-form-item label="建筑时间" prop="constructionTime">
           <el-input v-model="dataForm.constructionTime" placeholder="建筑时间"></el-input>
       </el-form-item>
-          <el-form-item label="所处位置" prop="buildingAddr">
+      <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-form-item label="小区（单位）名称" prop="communityName">
           <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称"></el-input>
       </el-form-item>
-          <el-form-item label="楼栋长" prop="buildingLeader">
+      <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-form-item label="楼层数" prop="layerCount">
           <el-input v-model="dataForm.layerCount" placeholder="楼层数"></el-input>
       </el-form-item>
-          <el-form-item label="地下楼层数" prop="basementLayerCount">
+      <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-form-item label="住宅开始层数" prop="houseBeginLayer">
           <el-input v-model="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
       </el-form-item>
-          <el-form-item label="单元数" prop="unitCount">
+      <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-form-item label="每层每单元户数" prop="layerRoomCount">
           <el-input v-model="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
       </el-form-item>
-          <el-form-item label="总房屋数" prop="roomCount">
+      <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-form-item label="电梯数量" prop="elevatorCount">
           <el-input v-model="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
       </el-form-item>
-          <el-form-item label="建筑面积" prop="buildingArea">
+      <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-form-item label="物业公司" prop="buildingPmc">
           <el-input v-model="dataForm.buildingPmc" placeholder="物业公司"></el-input>
       </el-form-item>
-          <el-form-item label="介绍" prop="buildingDesc">
+      <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-form-item label="标绘状态" prop="pointStatus">
           <el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
       </el-form-item>
-          <el-form-item label="经度" prop="longitude">
+      <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-form-item label="纬度" prop="latitude">
           <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
       </el-form-item>
-          <el-form-item label="数据来源" prop="platCode">
+      <el-form-item label="数据来源" prop="platCode">
           <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
       </el-form-item>
-          <el-form-item label="创建人" prop="createBy">
-          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改人" prop="updateBy">
-          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
-      </el-form-item>
-          <el-form-item label="删除状态" prop="deleteFlag">
-          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="versions">
-          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段1" prop="attribute1">
-          <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段2" prop="attribute2">
-          <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段3" prop="attribute3">
-          <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段4" prop="attribute4">
-          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段5" prop="attribute5">
-          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
-      </el-form-item>
-          <el-form-item label="小区主键" prop="attribute6">
-          <el-input v-model="dataForm.attribute6" placeholder="小区主键"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段7" prop="attribute7">
-          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段8" prop="attribute8">
-          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段9" prop="attribute9">
-          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段10" prop="attribute10">
-          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
-      </el-form-item>
-          <el-form-item label="小区主键" prop="communityId">
-          <el-input v-model="dataForm.communityId" placeholder="小区主键"></el-input>
-      </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
     </template>
   </el-dialog>
 </template>
@@ -174,16 +120,6 @@ export default {
         updateDate: '',
         deleteFlag: '',
         versions: '',
-        attribute1: '',
-        attribute2: '',
-        attribute3: '',
-        attribute4: '',
-        attribute5: '',
-        attribute6: '',
-        attribute7: '',
-        attribute8: '',
-        attribute9: '',
-        attribute10: '',
         communityId: ''
       }
     }
@@ -194,9 +130,6 @@ export default {
         buildingType: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         buildingName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -265,57 +198,6 @@ export default {
         ],
         platCode: [
           { 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' }
-        ],
-        versions: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute1: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute2: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute3: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute4: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute5: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute6: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute7: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute8: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute9: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute10: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        communityId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -325,14 +207,14 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.buildingId) {
+        if (this.dataForm.id) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/axis/caLoudong/${this.dataForm.buildingId}`).then(({ data: res }) => {
+      this.$http.post(`/opendata/caLoudong/getLouDongDetails`, { buildingId: this.dataForm.id }).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index e664a0b2..4e46de45 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -33,7 +33,7 @@
           <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.id)">查看</el-button>
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.buildingId)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
index 0b644826..75422659 100644
--- a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue
@@ -1,136 +1,82 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.buildingId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="楼宇类型" prop="buildingType">
+  <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="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="楼宇名称" prop="buildingName">
+      <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-form-item label="用途分类" prop="buildingUse">
           <el-input v-model="dataForm.buildingUse" placeholder="用途分类"></el-input>
       </el-form-item>
-          <el-form-item label="楼宇状态" prop="buildingStatus">
+      <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-form-item label="楼宇结构" prop="buildingStructure">
           <el-input v-model="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
       </el-form-item>
-          <el-form-item label="使用现状" prop="buildingUseage">
+      <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-form-item label="建筑时间" prop="constructionTime">
           <el-input v-model="dataForm.constructionTime" placeholder="建筑时间"></el-input>
       </el-form-item>
-          <el-form-item label="所处位置" prop="buildingAddr">
+      <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-form-item label="小区（单位）名称" prop="communityName">
           <el-input v-model="dataForm.communityName" placeholder="小区（单位）名称"></el-input>
       </el-form-item>
-          <el-form-item label="楼栋长" prop="buildingLeader">
+      <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-form-item label="楼层数" prop="layerCount">
           <el-input v-model="dataForm.layerCount" placeholder="楼层数"></el-input>
       </el-form-item>
-          <el-form-item label="地下楼层数" prop="basementLayerCount">
+      <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-form-item label="住宅开始层数" prop="houseBeginLayer">
           <el-input v-model="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
       </el-form-item>
-          <el-form-item label="单元数" prop="unitCount">
+      <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-form-item label="每层每单元户数" prop="layerRoomCount">
           <el-input v-model="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
       </el-form-item>
-          <el-form-item label="总房屋数" prop="roomCount">
+      <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-form-item label="电梯数量" prop="elevatorCount">
           <el-input v-model="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
       </el-form-item>
-          <el-form-item label="建筑面积" prop="buildingArea">
+      <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-form-item label="物业公司" prop="buildingPmc">
           <el-input v-model="dataForm.buildingPmc" placeholder="物业公司"></el-input>
       </el-form-item>
-          <el-form-item label="介绍" prop="buildingDesc">
+      <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-form-item label="标绘状态" prop="pointStatus">
           <el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
       </el-form-item>
-          <el-form-item label="经度" prop="longitude">
+      <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-form-item label="纬度" prop="latitude">
           <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
       </el-form-item>
-          <el-form-item label="数据来源" prop="platCode">
+      <el-form-item label="数据来源" prop="platCode">
           <el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
       </el-form-item>
-          <el-form-item label="创建人" prop="createBy">
-          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改人" prop="updateBy">
-          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
-      </el-form-item>
-          <el-form-item label="删除状态" prop="deleteFlag">
-          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="versions">
-          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段1" prop="attribute1">
-          <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段2" prop="attribute2">
-          <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段3" prop="attribute3">
-          <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段4" prop="attribute4">
-          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段5" prop="attribute5">
-          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
-      </el-form-item>
-          <el-form-item label="小区主键" prop="attribute6">
-          <el-input v-model="dataForm.attribute6" placeholder="小区主键"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段7" prop="attribute7">
-          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段8" prop="attribute8">
-          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段9" prop="attribute9">
-          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段10" prop="attribute10">
-          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
-      </el-form-item>
-          <el-form-item label="小区主键" prop="communityId">
-          <el-input v-model="dataForm.communityId" placeholder="小区主键"></el-input>
-      </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
     </template>
   </el-dialog>
 </template>
@@ -174,16 +120,6 @@ export default {
         updateDate: '',
         deleteFlag: '',
         versions: '',
-        attribute1: '',
-        attribute2: '',
-        attribute3: '',
-        attribute4: '',
-        attribute5: '',
-        attribute6: '',
-        attribute7: '',
-        attribute8: '',
-        attribute9: '',
-        attribute10: '',
         communityId: ''
       }
     }
@@ -194,9 +130,6 @@ export default {
         buildingType: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         buildingName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -265,57 +198,6 @@ export default {
         ],
         platCode: [
           { 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' }
-        ],
-        versions: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute1: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute2: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute3: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute4: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute5: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute6: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute7: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute8: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute9: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute10: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        communityId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -325,14 +207,14 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.buildingId) {
+        if (this.dataForm.id) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/axis/caPingfang/${this.dataForm.buildingId}`).then(({ data: res }) => {
+      this.$http.post(`/opendata/caPingfang/getPingFangDetails`, { buildingId: this.dataForm.id }).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -348,7 +230,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.buildingId ? 'post' : 'put']('/axis/caPingfang/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.buildingId ? 'post' : 'put']('/axis/caLoudong/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index 042115b8..3239c6aa 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -33,7 +33,7 @@
           <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.id)">查看</el-button>
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.buildingId)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/modules/cabaseinfo/carental-add-or-update.vue b/src/views/modules/cabaseinfo/carental-add-or-update.vue
index 5572a149..793cbb8f 100644
--- a/src/views/modules/cabaseinfo/carental-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carental-add-or-update.vue
@@ -1,124 +1,64 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.rentalId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="房屋ID" prop="houseId">
-          <el-input v-model="dataForm.houseId" placeholder="房屋ID"></el-input>
-      </el-form-item>
-          <el-form-item label="房屋编号" prop="houseName">
+  <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-form-item label="房屋地址" prop="houseAddress">
           <el-input v-model="dataForm.houseAddress" placeholder="房屋地址"></el-input>
       </el-form-item>
-          <el-form-item label="建筑用途" prop="houseUse">
+      <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-form-item label="建筑面积（平方米）" prop="houseArea">
           <el-input v-model="dataForm.houseArea" placeholder="建筑面积（平方米）"></el-input>
       </el-form-item>
-          <el-form-item label="证件代码" prop="idType">
+      <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-form-item label="证件号码" prop="idCard">
           <el-input v-model="dataForm.idCard" placeholder="证件号码"></el-input>
       </el-form-item>
-          <el-form-item label="房主姓名" prop="residentName">
+      <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-form-item label="房主联系方式" prop="telephone">
           <el-input v-model="dataForm.telephone" placeholder="房主联系方式"></el-input>
       </el-form-item>
-          <el-form-item label="房主现居详址" prop="curliveAddress">
+      <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-form-item label="出租用途" prop="rentUse">
           <el-input v-model="dataForm.rentUse" placeholder="出租用途"></el-input>
       </el-form-item>
-          <el-form-item label="隐患类型" prop="troubleType">
+      <el-form-item label="隐患类型" prop="troubleType">
           <el-input v-model="dataForm.troubleType" placeholder="隐患类型"></el-input>
       </el-form-item>
-          <el-form-item label="承租人ID" prop="renterId">
-          <el-input v-model="dataForm.renterId" placeholder="承租人ID"></el-input>
-      </el-form-item>
-          <el-form-item label="承租人公民身份证号码" prop="renterCardNumber">
+      <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-form-item label="承租人证件类型" prop="renterCardType">
           <el-input v-model="dataForm.renterCardType" placeholder="承租人证件类型"></el-input>
       </el-form-item>
-          <el-form-item label="承租人姓名" prop="renterName">
+      <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-form-item label="承租人联系方式" prop="renterPhone">
           <el-input v-model="dataForm.renterPhone" placeholder="承租人联系方式"></el-input>
       </el-form-item>
-          <el-form-item label="经度" prop="longitude">
+      <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-form-item label="纬度" prop="latitude">
           <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
       </el-form-item>
-          <el-form-item label="标绘状态" prop="pointStatus">
+      <el-form-item label="标绘状态" prop="pointStatus">
           <el-input v-model="dataForm.pointStatus" 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-item label="创建人" prop="createBy">
-          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改人" prop="updateBy">
-          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
-      </el-form-item>
-          <el-form-item label="删除状态" prop="deleteFlag">
-          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="versions">
-          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="承租单位" prop="attribute1">
-          <el-input v-model="dataForm.attribute1" placeholder="承租单位"></el-input>
-      </el-form-item>
-          <el-form-item label="承租日期" prop="attribute2">
-          <el-input v-model="dataForm.attribute2" placeholder="承租日期"></el-input>
-      </el-form-item>
-          <el-form-item label="承租期限" prop="attribute3">
-          <el-input v-model="dataForm.attribute3" placeholder="承租期限"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段4" prop="attribute4">
-          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段5" prop="attribute5">
-          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段6" prop="attribute6">
-          <el-input v-model="dataForm.attribute6" placeholder="扩展字段6"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段7" prop="attribute7">
-          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段8" prop="attribute8">
-          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段9" prop="attribute9">
-          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段10" prop="attribute10">
-          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
-      </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
     </template>
   </el-dialog>
 </template>
@@ -151,36 +91,13 @@ export default {
         renterPhone: '',
         longitude: '',
         latitude: '',
-        pointStatus: '',
-        platCode: '',
-        createBy: '',
-        createDate: '',
-        updateBy: '',
-        updateDate: '',
-        deleteFlag: '',
-        versions: '',
-        attribute1: '',
-        attribute2: '',
-        attribute3: '',
-        attribute4: '',
-        attribute5: '',
-        attribute6: '',
-        attribute7: '',
-        attribute8: '',
-        attribute9: '',
-        attribute10: ''
+        pointStatus: ''
       }
     }
   },
   computed: {
     dataRule () {
       return {
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        houseId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         houseName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -214,9 +131,6 @@ export default {
         troubleType: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        renterId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         renterCardNumber: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -237,57 +151,6 @@ export default {
         ],
         pointStatus: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        platCode: [
-          { 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' }
-        ],
-        versions: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute1: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute2: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute3: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute4: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute5: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute6: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute7: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute8: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute9: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute10: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -297,14 +160,14 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.rentalId) {
+        if (this.dataForm.id) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/axis/caRental/${this.dataForm.rentalId}`).then(({ data: res }) => {
+      this.$http.post(`/opendata/caRental/getRentalDetails`, { rentalId: this.dataForm.id }).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index 332b944d..9d2cb7f1 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -35,7 +35,7 @@
           <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.id)">查看</el-button>
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.rentalId)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/modules/cabaseinfo/caresident-add-or-update.vue b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
index 52049267..4383f1d7 100644
--- a/src/views/modules/cabaseinfo/caresident-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
@@ -1,166 +1,61 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.residentId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="人口性质" prop="residentProperty">
+  <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-form-item label="居民分类" prop="residentType">
           <el-input v-model="dataForm.residentType" placeholder="居民分类"></el-input>
       </el-form-item>
-          <el-form-item label="证件类型" prop="idType">
+      <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-form-item label="证件号码（公民身份证号）" prop="idCard">
           <el-input v-model="dataForm.idCard" placeholder="证件号码（公民身份证号）"></el-input>
       </el-form-item>
-          <el-form-item label="姓名" prop="residentName">
+      <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-form-item label="性别" prop="sex">
           <el-input v-model="dataForm.sex" placeholder="性别"></el-input>
       </el-form-item>
-          <el-form-item label="出生日期" prop="birthday">
+      <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-form-item label="民族" prop="nation">
           <el-input v-model="dataForm.nation" placeholder="民族"></el-input>
       </el-form-item>
-          <el-form-item label="联系方式" prop="telephone">
+      <el-form-item label="联系方式" prop="telephone">
           <el-input v-model="dataForm.telephone" placeholder="联系方式"></el-input>
       </el-form-item>
-          <el-form-item label="户籍省" prop="householdProv">
-          <el-input v-model="dataForm.householdProv" placeholder="户籍省"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍市" prop="householdCity">
-          <el-input v-model="dataForm.householdCity" placeholder="户籍市"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍县(区)" prop="householdCounty">
-          <el-input v-model="dataForm.householdCounty" placeholder="户籍县(区)"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍镇街" prop="householdTown">
-          <el-input v-model="dataForm.householdTown" placeholder="户籍镇街"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍社区/村" prop="householdVillage">
-          <el-input v-model="dataForm.householdVillage" placeholder="户籍社区/村"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍详址" prop="householdAddressDetail">
+      <el-form-item label="户籍详址" prop="householdAddressDetail">
           <el-input v-model="dataForm.householdAddressDetail" placeholder="户籍详址"></el-input>
       </el-form-item>
-          <el-form-item label="现住省" prop="curliveProv">
-          <el-input v-model="dataForm.curliveProv" placeholder="现住省"></el-input>
-      </el-form-item>
-          <el-form-item label="现住市" prop="curliveCity">
-          <el-input v-model="dataForm.curliveCity" placeholder="现住市"></el-input>
-      </el-form-item>
-          <el-form-item label="现住县(区)" prop="curliveCounty">
-          <el-input v-model="dataForm.curliveCounty" placeholder="现住县(区)"></el-input>
-      </el-form-item>
-          <el-form-item label="现住镇街" prop="curliveTown">
-          <el-input v-model="dataForm.curliveTown" placeholder="现住镇街"></el-input>
-      </el-form-item>
-          <el-form-item label="现住社区/村" prop="curliveVillage">
-          <el-input v-model="dataForm.curliveVillage" placeholder="现住社区/村"></el-input>
-      </el-form-item>
-          <el-form-item label="现住详址" prop="curliveAddressDetail">
+      <el-form-item label="现住详址" prop="curliveAddressDetail">
           <el-input v-model="dataForm.curliveAddressDetail" placeholder="现住详址"></el-input>
       </el-form-item>
-          <el-form-item label="籍贯省" prop="nativeAddressProv">
-          <el-input v-model="dataForm.nativeAddressProv" placeholder="籍贯省"></el-input>
-      </el-form-item>
-          <el-form-item label="籍贯市" prop="nativeAddressCity">
-          <el-input v-model="dataForm.nativeAddressCity" placeholder="籍贯市"></el-input>
-      </el-form-item>
-          <el-form-item label="籍贯县(区)" prop="nativeAddressCounty">
-          <el-input v-model="dataForm.nativeAddressCounty" 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="education">
+      <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-form-item label="职业" prop="occupation">
           <el-input v-model="dataForm.occupation" 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="serviceAddress">
-          <el-input v-model="dataForm.serviceAddress" placeholder="服务处所"></el-input>
-      </el-form-item>
-          <el-form-item label="婚姻状况" prop="marriageStatus">
+      <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-form-item label="政治面貌" prop="party">
           <el-input v-model="dataForm.party" placeholder="政治面貌"></el-input>
       </el-form-item>
-          <el-form-item label="宗教信仰" prop="religious">
+      <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-form-item label="有无皈依（已受洗）" prop="conversionState">
           <el-input v-model="dataForm.conversionState" placeholder="有无皈依（已受洗）"></el-input>
       </el-form-item>
-          <el-form-item label="国籍" prop="nationality">
-          <el-input v-model="dataForm.nationality" 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-item label="创建人" prop="createBy">
-          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改人" prop="updateBy">
-          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
-      </el-form-item>
-          <el-form-item label="删除状态" prop="deleteFlag">
-          <el-input v-model="dataForm.deleteFlag" placeholder="删除状态"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="versions">
-          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段1" prop="attribute1">
-          <el-input v-model="dataForm.attribute1" placeholder="扩展字段1"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段2" prop="attribute2">
-          <el-input v-model="dataForm.attribute2" placeholder="扩展字段2"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段3" prop="attribute3">
-          <el-input v-model="dataForm.attribute3" placeholder="扩展字段3"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段4" prop="attribute4">
-          <el-input v-model="dataForm.attribute4" placeholder="扩展字段4"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段5" prop="attribute5">
-          <el-input v-model="dataForm.attribute5" placeholder="扩展字段5"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段6" prop="attribute6">
-          <el-input v-model="dataForm.attribute6" placeholder="扩展字段6"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段7" prop="attribute7">
-          <el-input v-model="dataForm.attribute7" placeholder="扩展字段7"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段8" prop="attribute8">
-          <el-input v-model="dataForm.attribute8" placeholder="扩展字段8"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段9" prop="attribute9">
-          <el-input v-model="dataForm.attribute9" placeholder="扩展字段9"></el-input>
-      </el-form-item>
-          <el-form-item label="扩展字段10" prop="attribute10">
-          <el-input v-model="dataForm.attribute10" placeholder="扩展字段10"></el-input>
-      </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
     </template>
   </el-dialog>
 </template>
@@ -214,26 +109,13 @@ export default {
         updateBy: '',
         updateDate: '',
         deleteFlag: '',
-        versions: '',
-        attribute1: '',
-        attribute2: '',
-        attribute3: '',
-        attribute4: '',
-        attribute5: '',
-        attribute6: '',
-        attribute7: '',
-        attribute8: '',
-        attribute9: '',
-        attribute10: ''
+        versions: ''
       }
     }
   },
   computed: {
     dataRule () {
       return {
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         residentProperty: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -261,69 +143,18 @@ export default {
         telephone: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        householdProv: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        householdCity: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        householdCounty: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        householdTown: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        householdVillage: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         householdAddressDetail: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        curliveProv: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        curliveCity: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        curliveCounty: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        curliveTown: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        curliveVillage: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         curliveAddressDetail: [
           { 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' }
-        ],
-        nativeAddressCounty: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        formerName: [
-          { 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' }
         ],
-        occupationType: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        serviceAddress: [
-          { 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' }
         ],
@@ -332,60 +163,6 @@ export default {
         ],
         conversionState: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        nationality: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        platCode: [
-          { 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' }
-        ],
-        versions: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute1: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute2: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute3: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute4: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute5: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute6: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute7: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute8: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute9: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute10: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -395,14 +172,14 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.residentId) {
+        if (this.dataForm.id) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/axis/caResident/${this.dataForm.residentId}`).then(({ data: res }) => {
+      this.$http.post(`/opendata/caResident/getResidentDetails`, { idCard: this.dataForm.id }).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 05cf46eb..017dc8d7 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -34,7 +34,7 @@
           <el-table-column prop="curliveAddressDetail" 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.id)">查看</el-button>
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.idCard)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/modules/cabaseinfo/carotators-add-or-update.vue b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
index 2d8ca751..eaf0bed8 100644
--- a/src/views/modules/cabaseinfo/carotators-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
@@ -1,175 +1,64 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.rotatorsId ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="公民身份证号" prop="idCard">
+  <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-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-form-item label="曾用名" prop="formerName">
           <el-input v-model="dataForm.formerName" placeholder="曾用名"></el-input>
       </el-form-item>
-          <el-form-item label="性别" prop="sex">
+      <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-form-item label="出生日期" prop="birthday">
           <el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>
       </el-form-item>
-          <el-form-item label="民族" prop="nation">
+      <el-form-item label="民族" prop="nation">
           <el-input v-model="dataForm.nation" placeholder="民族"></el-input>
       </el-form-item>
-          <el-form-item label="籍贯省" prop="nativeAddressProv">
-          <el-input v-model="dataForm.nativeAddressProv" placeholder="籍贯省"></el-input>
-      </el-form-item>
-          <el-form-item label="籍贯市" prop="nativeAddressCity">
-          <el-input v-model="dataForm.nativeAddressCity" placeholder="籍贯市"></el-input>
-      </el-form-item>
-          <el-form-item label="籍贯县(区)" prop="nativeAddressCountry">
-          <el-input v-model="dataForm.nativeAddressCountry" placeholder="籍贯县(区)"></el-input>
-      </el-form-item>
-          <el-form-item label="婚姻状况" prop="marriageStatus">
+      <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-form-item label="政治面貌" prop="party">
           <el-input v-model="dataForm.party" placeholder="政治面貌"></el-input>
       </el-form-item>
-          <el-form-item label="学历" prop="education">
+      <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-form-item label="宗教信仰" prop="religious">
           <el-input v-model="dataForm.religious" placeholder="宗教信仰"></el-input>
       </el-form-item>
-          <el-form-item label="职业类别" prop="occupationType">
+      <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-form-item label="职业" prop="occupation">
           <el-input v-model="dataForm.occupation" placeholder="职业"></el-input>
       </el-form-item>
-          <el-form-item label="服务处所" prop="serviceAddress">
-          <el-input v-model="dataForm.serviceAddress" placeholder="服务处所"></el-input>
-      </el-form-item>
-          <el-form-item label="联系方式" prop="telephone">
+      <el-form-item label="联系方式" prop="telephone">
           <el-input v-model="dataForm.telephone" placeholder="联系方式"></el-input>
       </el-form-item>
-          <el-form-item label="户籍地省" prop="householdAddressProv">
-          <el-input v-model="dataForm.householdAddressProv" placeholder="户籍地省"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍地市" prop="householdAddressCity">
-          <el-input v-model="dataForm.householdAddressCity" placeholder="户籍地市"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍地县(区)" prop="householdAddressCountry">
-          <el-input v-model="dataForm.householdAddressCountry" placeholder="户籍地县(区)"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍地镇街" prop="householdAddressTown">
-          <el-input v-model="dataForm.householdAddressTown" placeholder="户籍地镇街"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍地社区/村" prop="householdAddressVillage">
-          <el-input v-model="dataForm.householdAddressVillage" placeholder="户籍地社区/村"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍门(楼)详址" prop="householdAddressDetail">
+      <el-form-item label="户籍门(楼)详址" prop="householdAddressDetail">
           <el-input v-model="dataForm.householdAddressDetail" placeholder="户籍门(楼)详址"></el-input>
       </el-form-item>
-          <el-form-item label="现住地省" prop="curliveAddressProv">
-          <el-input v-model="dataForm.curliveAddressProv" placeholder="现住地省"></el-input>
-      </el-form-item>
-          <el-form-item label="现住地市" prop="curliveAddressCity">
-          <el-input v-model="dataForm.curliveAddressCity" placeholder="现住地市"></el-input>
-      </el-form-item>
-          <el-form-item label="现住地县(区)" prop="curliveAddressCountry">
-          <el-input v-model="dataForm.curliveAddressCountry" placeholder="现住地县(区)"></el-input>
-      </el-form-item>
-          <el-form-item label="现住地镇街" prop="curliveAddressTown">
-          <el-input v-model="dataForm.curliveAddressTown" placeholder="现住地镇街"></el-input>
-      </el-form-item>
-          <el-form-item label="现住地社区/村" prop="curliveAddressVillage">
+      <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-form-item label="现住门(楼)详址" prop="curliveAddressDetail">
           <el-input v-model="dataForm.curliveAddressDetail" placeholder="现住门(楼)详址"></el-input>
       </el-form-item>
-          <el-form-item label="流入原因" prop="inflowReason">
-          <el-input v-model="dataForm.inflowReason" placeholder="流入原因"></el-input>
-      </el-form-item>
-          <el-form-item label="办证类型" prop="certificateType">
-          <el-input v-model="dataForm.certificateType" placeholder="办证类型"></el-input>
-      </el-form-item>
-          <el-form-item label="证件号码" prop="certificateNumber">
-          <el-input v-model="dataForm.certificateNumber" placeholder="证件号码"></el-input>
-      </el-form-item>
-          <el-form-item label="登记日期" prop="signDate">
-          <el-input v-model="dataForm.signDate" placeholder="登记日期"></el-input>
-      </el-form-item>
-          <el-form-item label="证件到期日期" prop="endDate">
-          <el-input v-model="dataForm.endDate" placeholder="证件到期日期"></el-input>
-      </el-form-item>
-          <el-form-item label="住所类型" prop="residenceType">
-          <el-input v-model="dataForm.residenceType" placeholder="住所类型"></el-input>
-      </el-form-item>
-          <el-form-item label="是否重点关注人员" prop="isFocusPerson">
+      <el-form-item label="是否重点关注人员" prop="isFocusPerson">
           <el-input v-model="dataForm.isFocusPerson" placeholder="是否重点关注人员"></el-input>
       </el-form-item>
-          <el-form-item label="创建人" prop="createBy">
-          <el-input v-model="dataForm.createBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createDate">
-          <el-input v-model="dataForm.createDate" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改人" prop="updateBy">
-          <el-input v-model="dataForm.updateBy" placeholder="最后修改人"></el-input>
-      </el-form-item>
-          <el-form-item label="最后修改时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="最后修改时间"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识（正常的数据存：normal，逻辑删除的标识为：delete）" prop="deleteFlag">
-          <el-input v-model="dataForm.deleteFlag" placeholder="删除标识（正常的数据存：normal，逻辑删除的标识为：delete）"></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-item label="网格id" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格id"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="versions">
-          <el-input v-model="dataForm.versions" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="是否注销" prop="attribute1">
-          <el-input v-model="dataForm.attribute1" placeholder="是否注销"></el-input>
-      </el-form-item>
-          <el-form-item label="注销原因" prop="attribute2">
-          <el-input v-model="dataForm.attribute2" placeholder="注销原因"></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="attribute3">
-          <el-input v-model="dataForm.attribute3" placeholder=""></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="attribute4">
-          <el-input v-model="dataForm.attribute4" placeholder=""></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="attribute5">
-          <el-input v-model="dataForm.attribute5" placeholder=""></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="attribute6">
-          <el-input v-model="dataForm.attribute6" placeholder=""></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="attribute7">
-          <el-input v-model="dataForm.attribute7" placeholder=""></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="attribute8">
-          <el-input v-model="dataForm.attribute8" placeholder=""></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="attribute9">
-          <el-input v-model="dataForm.attribute9" placeholder=""></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="attribute10">
-          <el-input v-model="dataForm.attribute10" placeholder=""></el-input>
-      </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
     </template>
   </el-dialog>
 </template>
@@ -226,17 +115,7 @@ export default {
         deleteFlag: '',
         platcode: '',
         gridId: '',
-        versions: '',
-        attribute1: '',
-        attribute2: '',
-        attribute3: '',
-        attribute4: '',
-        attribute5: '',
-        attribute6: '',
-        attribute7: '',
-        attribute8: '',
-        attribute9: '',
-        attribute10: ''
+        versions: ''
       }
     }
   },
@@ -377,36 +256,6 @@ export default {
         ],
         versions: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute1: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute2: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute3: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute4: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute5: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute6: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute7: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute8: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute9: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        attribute10: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -416,14 +265,14 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
-        if (this.dataForm.rotatorsId) {
+        if (this.dataForm.id) {
           this.getInfo()
         }
       })
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/axis/caRotators/${this.dataForm.rotatorsId}`).then(({ data: res }) => {
+      this.$http.post(`/opendata/caRotators/getRotatorsDetails`, { idCard: this.dataForm.id }).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index 0d8eb828..ac1d831e 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -33,7 +33,7 @@
           <el-table-column prop="curliveAddressDetail" 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.id)">查看</el-button>
+              <el-button type="text" class="div-table-button--detail" size="small" @click="addOrUpdateHandle(scope.row.idCard)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>

From b596dbc816cb682a5b6bc22fdede1b61bba54837 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 7 Jun 2022 15:45:26 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong.vue  | 4 ++--
 src/views/modules/cabaseinfo/capingfang.vue | 4 ++--
 src/views/modules/cabaseinfo/carental.vue   | 2 +-
 src/views/modules/cabaseinfo/caresident.vue | 4 ++--
 src/views/modules/cabaseinfo/carotators.vue | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 4e46de45..75b59c7e 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -24,8 +24,8 @@
           <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"></el-table-column>
-          <el-table-column prop="communityName" 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>
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index 3239c6aa..255d992c 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -24,8 +24,8 @@
           <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"></el-table-column>
-          <el-table-column prop="communityName" 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>
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index 9d2cb7f1..f6101c1a 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -26,7 +26,7 @@
         <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"></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>
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 017dc8d7..818ddacd 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -30,8 +30,8 @@
           <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"></el-table-column>
-          <el-table-column prop="curliveAddressDetail" 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>
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index ac1d831e..b9802b89 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -29,8 +29,8 @@
           <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"></el-table-column>
-          <el-table-column prop="curliveAddressDetail" 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>

From 5d4519dcd2dc19fe6cee8acc7bdefb15ee62a355 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 7 Jun 2022 18:32:40 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong.vue  | 195 +++++++++++++------
 src/views/modules/cabaseinfo/capingfang.vue | 195 +++++++++++++------
 src/views/modules/cabaseinfo/carental.vue   | 199 ++++++++++++++------
 src/views/modules/cabaseinfo/caresident.vue | 189 +++++++++++++------
 src/views/modules/cabaseinfo/carotators.vue | 182 ++++++++++++------
 5 files changed, 659 insertions(+), 301 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 75b59c7e..5a07d25f 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -1,78 +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>
+  <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>
+      </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-module'
-import AddOrUpdate from './caloudong-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./caloudong-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caLoudong/getPage',
+        getDataListURL: "/opendata/caLoudong/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        buildingName: '',
-        communityName: ''
-      }
-    }
+        buildingName: "",
+        communityName: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index 255d992c..69404307 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -1,78 +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>
+  <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>
+      </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-module'
-import AddOrUpdate from './capingfang-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./capingfang-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caPingfang/getPage',
+        getDataListURL: "/opendata/caPingfang/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        buildingName: '',
-        communityName: ''
-      }
-    }
+        buildingName: "",
+        communityName: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index f6101c1a..0980e803 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -1,81 +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>
+  <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>
+      </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-module'
-import AddOrUpdate from './carental-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./carental-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caRental/getPage',
+        getDataListURL: "/opendata/caRental/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        houseName: '',
-        residentName: '',
-        renterName: ''
-      }
-    }
+        houseName: "",
+        residentName: "",
+        renterName: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 818ddacd..0cba7cd8 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -1,80 +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>
+  <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>
+      </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-module'
-import AddOrUpdate from './caresident-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./caresident-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caResident/getPage',
+        getDataListURL: "/opendata/caResident/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        idCard: '',
-        residentName: '',
-        telephone: ''
-      }
-    }
+        idCard: "",
+        residentName: "",
+        telephone: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index b9802b89..c171dad8 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -1,79 +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>
+  <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>
+      </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-module'
-import AddOrUpdate from './carotators-add-or-update'
+import mixinViewModule from "@/mixins/view-post";
+import AddOrUpdate from "./carotators-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opendata/caRotators/getPage',
+        getDataListURL: "/opendata/caRotators/getPage",
         getDataListIsPage: true,
-        deleteURL: '',
-        deleteIsBatch: true
+        deleteURL: "",
+        deleteIsBatch: true,
       },
       dataForm: {
-        idCard: '',
-        residentName: '',
-        telephone: ''
-      }
-    }
+        idCard: "",
+        residentName: "",
+        telephone: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>