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] =?UTF-8?q?=E7=BB=BC=E6=B2=BB=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=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 df56c1e47..f1e3076b7 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 e664a0b26..4e46de453 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 0b6448265..754226597 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 042115b8d..3239c6aa0 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 5572a1491..793cbb8f4 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 332b944d6..9d2cb7f15 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 520492674..4383f1d75 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 05cf46ebd..017dc8d71 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 2d8ca7510..eaf0bed8c 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 0d8eb828a..ac1d831ea 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>