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

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

@@ -58,7 +58,7 @@
                       label-width="150px">
           <el-input-number class="item_width_1"
                            v-model="dataForm.totalFloorNum"
-                           :min="1"
+                           :min="0"
                            label="层数"></el-input-number>
         </el-form-item>
         <el-form-item label="户数"
@@ -67,7 +67,7 @@
                       label-width="150px">
           <el-input-number class="item_width_1"
                            v-model="dataForm.totalHouseNum"
-                           :min="1"
+                           :min="0"
                            label="户数"></el-input-number>
         </el-form-item>
 
@@ -75,6 +75,8 @@
                       prop="longitude"
                       label-width="150px"
                       style="display: block">
+
+          <div style="width:500px">
             <el-input class="item_width_4"
                       maxlength="50"
                       placeholder="请输入关键字"
@@ -100,6 +102,8 @@
                         v-model="dataForm.latitude">
               </el-input>
             </div>
+          </div>
+
         </el-form-item>
       </el-form>
 
@@ -137,7 +141,7 @@ export default {
         neighborHoodId: '',//所属小区id
         buildingName: '',//房屋名称
         // sort: 0,//排序
-        totalUnitNum: 0,//单元数	
+        totalUnitNum: 1,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//户数	
         type: '',//房屋类型
@@ -158,7 +162,7 @@ export default {
 
   methods: {
     async initForm (type, row, agencyObj) {
-
+      this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
       this.dataForm.agencyId = agencyObj.agencyId
       this.dataForm.gridId = agencyObj.gridId
@@ -315,7 +319,7 @@ export default {
         neighborHoodId: '',//所属小区id
         buildingName: '',//房屋名称
         // sort: 0,//排序
-        totalUnitNum: 0,//单元数	
+        totalUnitNum: 1,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//户数	
         type: '',//房屋类型
@@ -347,8 +351,8 @@ export default {
           { required: true, message: '楼栋名称不能为空', trigger: 'blur' },
           {
             min: 1,
-            max: 50,
-            message: '小区名称长度在 1 到 50个字符',
+            max: 10,
+            message: '小区名称长度在 1 到 10个字符',
             trigger: 'blur'
           }
         ],
@@ -358,15 +362,15 @@ export default {
         totalUnitNum: [
           { required: true, message: '单元数不能为空', trigger: 'blur' }
         ],
-        totalFloorNum: [
-          { required: true, message: '层数不能为空', trigger: 'blur' }
-        ],
-        totalHouseNum: [
-          { required: true, message: '户数不能为空', trigger: 'blur' }
-        ],
-        longitude: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
-        ],
+        // totalFloorNum: [
+        //   { required: true, message: '层数不能为空', trigger: 'blur' }
+        // ],
+        // totalHouseNum: [
+        //   { required: true, message: '户数不能为空', trigger: 'blur' }
+        // ],
+        // longitude: [
+        //   { required: true, message: '坐标不能为空', trigger: 'blur' }
+        // ],
       }
     },
 
@@ -374,7 +378,7 @@ export default {
   props: {}
 }
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .item_width_1 {
   width: 500px;
 }
@@ -408,3 +412,9 @@ export default {
   margin-top: 30px;
 }
 </style>
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>

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

@@ -60,6 +60,7 @@
 
     <div class="div_table">
       <el-table :data="tableData"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
@@ -88,15 +89,15 @@
 
         <el-table-column label="操作"
                          fixed="right"
-                         width="170"
+                         width="140"
                          header-align="center"
                          align="center"
                          class="operate">
           <template slot-scope="scope">
-            <el-button type="text"
+            <!-- <el-button type="text"
                        style="color:#feb349;text-decoration: underline;"
                        size="small"
-                       @click="handleToNextLevel(scope.row)">进入</el-button>
+                       @click="handleToNextLevel(scope.row)">进入</el-button> -->
             <el-button type="text"
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"

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

@@ -90,7 +90,7 @@ export default {
   },
   computed: {
     rowHeight () {
-      return (this.clientHeight - 140) + 'px'
+      return (this.clientHeight - 120) + 'px'
     },
     treeHeight () {
       return (this.clientHeight - 200) + 'px'
@@ -264,7 +264,7 @@ export default {
 }
 
 .div_tree {
-  flex: 0 0 400px;
+  flex: 0 0 280px;
   background-color: #ffffff;
   border-radius: 5px;
   padding: 10px;
@@ -276,7 +276,7 @@ export default {
 
 .div_table {
   margin-left: 15px;
-  width: calc(100vw - 680px);
+  width: calc(100vw - 550px);
   background-color: #ffffff;
   border-radius: 5px;
   padding: 10px;

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

@@ -89,6 +89,7 @@
                         prop="longitude"
                         label-width="150px"
                         style="display: block">
+            <div style="width:500px">
               <el-input class="item_width_4"
                         maxlength="50"
                         placeholder="请输入关键字"
@@ -114,6 +115,7 @@
                           v-model="dataForm.latitude">
                 </el-input>
               </div>
+            </div>
           </el-form-item>
         </el-form>
       </div>
@@ -273,7 +275,7 @@ export default {
     },
 
     async initForm (type, row, agencyObj) {
-
+      this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
       // debugger
       map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
@@ -445,6 +447,7 @@ export default {
         longitude: '', //经度
         latitude: '' //纬度
       }
+      this.propertyFormShow = false
     },
     // 开启加载动画
     startLoading () {
@@ -532,3 +535,9 @@ export default {
   margin-top: 30px;
 }
 </style>
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>

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

@@ -65,37 +65,40 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 style="width: 100%">
         <el-table-column prop="neighborHoodName"
                          label="小区名称"
-                         width="180">
+                         min-width="100">
         </el-table-column>
         <el-table-column prop="agencyName"
                          label="所属组织"
-                         width="160">
+                         min-width="100">
         </el-table-column>
         <el-table-column prop="gridName"
                          label="所属网格"
-                         width="140">
+                         min-width="120">
         </el-table-column>
         <el-table-column prop="address"
-                         label="详细地址">
+                         label="详细地址"
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="remark"
-                         label="备注">
+                         label="备注"
+                         min-width="50">
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         width="170"
+                         width="140"
                          header-align="center"
                          align="center"
                          class="operate">
           <template slot-scope="scope">
 
-            <el-button type="text"
+            <!-- <el-button type="text"
                        style="color:#feb349;text-decoration: underline;"
                        size="small"
-                       @click="handleToNextLevel(scope.row)">进入</el-button>
+                       @click="handleToNextLevel(scope.row)">进入</el-button> -->
             <el-button type="text"
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"

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

@@ -74,8 +74,8 @@
                       style="display: block">
           <el-radio-group v-model="rentFlag">
 
-            <el-radio :label="0">否</el-radio>
             <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
 
           </el-radio-group>
         </el-form-item>
@@ -137,7 +137,7 @@ export default {
       houseId: '', //房屋ID
       houseType: '1',
       purpose: '1',
-      rentFlag: 0,
+      rentFlag: 1,
       dataForm: {
         neighborHoodId: '', // 所属小区ID
         buildingId: '',//所属楼栋ID
@@ -145,7 +145,7 @@ export default {
         doorName: '',//门牌号	
         houseType: '',//房屋类型【楼房，平房，别墅】		
         purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
-        rentFlag: 0,//是否出租【是：1，否：0】		
+        rentFlag: 1,//是否出租【是：1，否：0】		
         ownerPhone: '', //房主电话	
         ownerName: '', //房主名字		
         ownerIdCard: '' //房主身份证	
@@ -163,7 +163,7 @@ export default {
 
   methods: {
     async initForm (type, row, agencyObj) {
-
+      this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
       this.dataForm.neighborHoodId = agencyObj.communityId
       this.dataForm.buildingId = agencyObj.id
@@ -282,7 +282,7 @@ export default {
       this.houseId = '' //房屋ID
       this.houseType = '1'
       this.purpose = '1'
-      this.rentFlag = 0
+      this.rentFlag = 1
       this.dataForm = {
         neighborHoodId: '', // 所属小区ID
         buildingId: '',//所属楼栋ID
@@ -290,11 +290,12 @@ export default {
         doorName: '',//门牌号	
         houseType: '1',//房屋类型【楼房，平房，别墅】		
         purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
-        rentFlag: 0,//是否出租【是：1，否：0】		
+        rentFlag: 1,//是否出租【是：1，否：0】		
         ownerPhone: '', //房主电话	
         ownerName: '', //房主名字		
         ownerIdCard: '' //房主身份证	
       }
+
     },
     // 开启加载动画
     startLoading () {
@@ -346,7 +347,7 @@ export default {
   props: {}
 }
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .item_width_1 {
   width: 500px;
 }
@@ -373,3 +374,8 @@ export default {
   margin-top: 30px;
 }
 </style>
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>

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

@@ -60,6 +60,7 @@
 
     <div class="div_table">
       <el-table :data="tableData"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 v-loading="tableLoading"
                 border
                 style="width: 100%">
@@ -98,7 +99,7 @@
         </el-table-column>
         <el-table-column prop="ownerIdCard"
                          label="身份证"
-                         width="160">
+                         width="170">
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"