页面调整

src/App.vue

@@ -128,11 +128,11 @@ export default {
 .dialog-h {
   .el-dialog__body {
     position: relative;
-    height: 72vh;
+    height: 82vh;
     box-sizing: border-box;
     padding: 0 10px 20px !important;
     .dialog-h-content {
-      height: calc(72vh - 80px);
+      height: calc(82vh - 80px);
       box-sizing: border-box;
       overflow: auto;
     }
@@ -149,7 +149,8 @@ export default {
   &::-webkit-scrollbar-corner,
     /* 滚动条角落 */
   &::-webkit-scrollbar-thumb,
-  &::-webkit-scrollbar-track {      /*滚动条的轨道*/
+  &::-webkit-scrollbar-track {
+    /*滚动条的轨道*/
     border-radius: 4px;
   }
 

src/assets/scss/modules/visual/communityManageForm.scss

@@ -0,0 +1,32 @@
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  margin-top: 20px;
+  text-align: center;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div class="dialog-h-content scroll-h">
 
       <el-form ref="ref_form"
                :inline="true"
@@ -109,8 +109,10 @@
 
     </div>
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
+      <el-button size="small"
-      <el-button v-if="formType != 'detail'"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -382,42 +384,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-.item_width_1 {
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
-  width: 500px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
-
-.div_map {
-  margin-top: 10px;
-}
-
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-</style>
-
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
 </style>

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

@@ -184,6 +184,7 @@
                :title="formTitle"
                top="5vh"
                width="900px"
+               class="dialog-h"
                @closed="diaClose">
       <build-form ref="ref_form"
                   @dialogCancle="addFormCancle"

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div class="dialog-h-content scroll-h">
       <div v-show="!propertyFormShow">
         <el-form ref="ref_form"
                  :inline="true"
@@ -73,6 +73,7 @@
                       v-model="dataForm.address">
             </el-input>
           </el-form-item>
+
           <el-form-item label="备注"
                         prop="remark"
                         label-width="150px"
@@ -139,8 +140,10 @@
       </div>
     </div>
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
+      <el-button size="small"
-      <el-button v-if="formType != 'detail'"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -503,43 +506,9 @@ export default {
   props: {}
 }
 </script>
-<style scoped>
+<style lang="scss" scoped >
-.item_width_1 {
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
-  width: 500px;
+</style>
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
 
-.div_map {
-  margin-top: 10px;
-}
 
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-</style>
 
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
-</style>

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

@@ -134,6 +134,14 @@
                          label="所属网格"
                          min-width="120">
         </el-table-column>
+        <!-- <el-table-column prop="总单元数"
+                         label="所属网格"
+                         min-width="80">
+        </el-table-column>
+        <el-table-column prop="总户数"
+                         label="所属网格"
+                         min-width="80">
+        </el-table-column> -->
         <el-table-column prop="address"
                          label="详细地址"
                          min-width="180">
@@ -204,6 +212,7 @@
                :title="formTitle"
                width="850px"
                top="5vh"
+               class="dialog-h"
                @closed="diaClose">
       <community-form ref="ref_form"
                       @dialogCancle="addFormCancle"
@@ -771,3 +780,4 @@ export default {
   line-height: 20px;
 }
 </style>
+

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
                :inline="false"
                :model="dataForm"
@@ -112,8 +112,10 @@
 
     </div>
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
+      <el-button size="small"
-      <el-button v-if="formType != 'detail'"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -163,7 +165,7 @@ export default {
 
   methods: {
     async initForm (type, row, agencyObj) {
-      debugger
+
       this.$refs.ref_form.resetFields();
       this.agencyObj = agencyObj
       this.dataForm.neighborHoodId = agencyObj.neighborHoodId
@@ -349,34 +351,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-.item_width_1 {
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
-  width: 500px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-</style>
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
 </style>

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

@@ -175,6 +175,8 @@
                :close-on-press-escape="false"
                :title="formTitle"
                width="900px"
+               top="5vh"
+               class="dialog-h"
                @closed="diaClose">
       <room-form ref="ref_form"
                  @dialogCancle="addFormCancle"

src/views/modules/base/grid.vue

@@ -2,25 +2,24 @@
   <div>
     <div class="resi-container">
       <el-card class="resi-card">
-        <el-row class="resi-row-box" :class="openSearch && 'resi-row-more'">
+        <el-row class="resi-row-box"
-          <el-row class="resi-row" :gutter="20">
+                :class="openSearch && 'resi-row-more'">
+          <el-row class="resi-row"
+                  :gutter="20">
             <el-col span="6">
               <div class="resi-cell">
                 <div class="resi-cell-label">所属组织</div>
-                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
+                <div class="resi-cell-value"
-                  <el-select
+                     :class="'resi-cell-value-radio'">
-                    v-model="fmData.agencyId"
+                  <el-select v-model="fmData.agencyId"
                              placeholder="请选择"
                              size="small"
                              clearable
-                    class="resi-cell-select"
+                             class="resi-cell-select">
-                  >
+                    <el-option v-for="item in options"
-                    <el-option
-                      v-for="item in options"
                                :key="item.value"
                                :label="item.label"
-                      :value="item.value"
+                               :value="item.value">
-                    >
                     </el-option>
                   </el-select>
                 </div>
@@ -30,54 +29,60 @@
             <el-col span="6">
               <div class="resi-cell">
                 <div class="resi-cell-label">所属组织</div>
-                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
+                <div class="resi-cell-value"
-                  <el-input
+                     :class="'resi-cell-value-radio'">
-                    v-model="fmData.agencyId"
+                  <el-input v-model="fmData.agencyId"
                             class="resi-cell-input"
                             size="small"
                             clearable
-                    placeholder="请输入内容"
+                            placeholder="请输入内容">
-                  >
                   </el-input>
                 </div>
               </div>
+
             </el-col>
+
           </el-row>
         </el-row>
-        <el-row class="resi-search">
+        <div class="resi-card-btn">
-          <el-col span="24">
+          <el-button type="primary"
-            <el-button type="primary" size="mini" @click="handleSearch"
+                     size="mini"
-              >查询</el-button
+                     @click="handleSearch">查询</el-button>
-            >
+        </div>
-          </el-col>
+
-        </el-row>
       </el-card>
     </div>
 
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="warning" size="small">导出</el-button>
+        <el-button type="yellow"
-        <el-button type="success" size="small" @click="handleAdd"
+                   size="small">导出</el-button>
-          >新增</el-button
+        <el-button size="small"
-        >
+                   type="green"
+                   @click="handleAdd">新增</el-button>
       </div>
-      <el-table :data="tableData" border style="width: 100%">
+      <el-table :data="tableData"
-        <el-table-column prop="date" label="日期" width="180">
+                border
+                style="width: 100%">
+        <el-table-column prop="date"
+                         label="日期"
+                         width="180">
         </el-table-column>
-        <el-table-column prop="name" label="姓名" width="180">
+        <el-table-column prop="name"
+                         label="姓名"
+                         width="180">
         </el-table-column>
-        <el-table-column prop="address" label="地址"> </el-table-column>
+        <el-table-column prop="address"
+                         label="地址"> </el-table-column>
       </el-table>
       <div>
-        <el-pagination
+        <el-pagination @size-change="handleSizeChange"
-          @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="currentPage"
                        :page-sizes="[100, 200, 300, 400]"
                        :page-size="100"
                        layout="sizes, prev, pager, next"
-          :total="1000"
+                       :total="1000">
-        >
         </el-pagination>
       </div>
     </el-card>
@@ -223,7 +228,7 @@ export default {
   }
 }
 .resi-row-box {
-  height: 104px;
+  height: 84px;
   overflow: hidden;
   transition: height 0.5s;
 }
@@ -234,6 +239,11 @@ export default {
 .resi-row {
   margin-bottom: 20px;
 }
+.resi-card-btn {
+  position: absolute;
+  right: 20px;
+  bottom: 15px;
+}
 .resi-search {
   .el-col {
     text-align: right;

src/views/modules/communityParty/regionalParty/activitys.vue

@@ -203,6 +203,7 @@
                :title="formTitle"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="diaClose">
       <activitys-form ref="ref_form"
                       :unitList="unitList"
@@ -216,9 +217,11 @@
                :title="'活动详情'"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="detailClosed">
       <activitys-detail ref="ref_detail"
-                        :serviceList="serviceList"></activitys-detail>
+                        :serviceList="serviceList"
+                        @diaClose="diaClose"></activitys-detail>
     </el-dialog>
 
   </div>
@@ -630,7 +633,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 460)
+      return (this.clientHeight - 430)
 
     },
     rowHeight () {

src/views/modules/communityParty/regionalParty/activitysDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div>
+
-      <div>
+    <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
@@ -96,6 +96,10 @@
       </el-form>
     </div>
 
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+
     </div>
 
   </div>
@@ -124,7 +128,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaClose')
 
+    },
     async initForm (row) {
 
       this.startLoading()
@@ -278,6 +286,11 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+
 <style  lang="scss" scoped>
 .detail_span {
   width: 500px;
@@ -294,9 +307,5 @@ export default {
     margin: 0 0;
   }
 }
-
-.div_map {
-  position: relative;
-}
 </style>
 

src/views/modules/communityParty/regionalParty/activitysForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
 
-    <div>
+    <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
@@ -192,8 +192,10 @@
     </div>
 
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
+      <el-button size="small"
-      <el-button v-if="formType != 'detail'"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -556,6 +558,11 @@ export default {
   }
 }
 </script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
 <style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
@@ -569,16 +576,6 @@ export default {
     z-index: 2000000000;
   }
 }
-.item_width_2 {
-  width: 600px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
 
 .div_map {
   position: relative;
@@ -590,19 +587,6 @@ export default {
   left: 5px;
 }
 
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-
 .tinymce_view {
   height: 400px;
   overflow: auto;
@@ -618,8 +602,3 @@ export default {
 }
 </style>
 
-<style lang=scss>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
-</style>

src/views/modules/communityParty/regionalParty/finishList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="dialog-h-content scroll-h">
     <div class="div_table">
       <el-button type="green"
                  size="small"

src/views/modules/communityParty/regionalParty/units.vue

@@ -186,16 +186,20 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         width="190"
+                         width="250"
                          header-align="center"
                          align="center"
                          class="operate">
           <template slot-scope="scope">
-            <div>
+
             <el-button type="text"
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       style="color:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
             <el-button type="text"
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
@@ -204,18 +208,12 @@
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleScore(scope.row)">积分记录</el-button>
-            </div>
-            <div>
-              <el-button type="text"
-                         style="color:#00A7A9;text-decoration: underline;"
-                         size="small"
-                         @click="handleEdit(scope.row)">修改</el-button>
 
             <el-button type="text"
                        style="color:#D51010;text-decoration: underline;"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
-            </div>
+
           </template>
         </el-table-column>
       </el-table>
@@ -238,6 +236,7 @@
                :title="formTitle"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="editDiaClose">
       <units-form ref="ref_form"
                   :typeList="typeList"
@@ -251,8 +250,10 @@
                :title="'单位详情'"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="diaClose">
-      <units-detail ref="ref_detail"></units-detail>
+      <units-detail ref="ref_detail"
+                    @diaClose="diaClose"></units-detail>
     </el-dialog>
 
     <!-- 完成情况 -->
@@ -262,6 +263,7 @@
                :title="finishDiaTitle"
                width="950px"
                top="5vh"
+               class="dialog-h"
                @closed="diaClose">
       <finish-list ref="ref_finish"></finish-list>
     </el-dialog>
@@ -664,7 +666,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 460)
+      return (this.clientHeight - 430)
 
     },
     rowHeight () {

src/views/modules/communityParty/regionalParty/unitsDetail.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <div class="dialog-h-content scroll-h">
 
       <el-form ref="ref_form"
                :inline="true"
@@ -78,6 +79,12 @@
       </el-form>
 
     </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+
+    </div>
+  </div>
 </template>
 
 <script>
@@ -104,6 +111,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaClose')
+
+    },
 
     async initForm (row) {
       this.startLoading()
@@ -249,7 +261,9 @@ export default {
   }
 }
 </script>
-
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
 <style scoped>
 .detail_span {
   width: 500px;
@@ -259,10 +273,6 @@ export default {
   font-size: 16px;
 }
 
-.div_map {
-  position: relative;
-}
-
 .form {
   margin-top: 30px;
 }

src/views/modules/communityParty/regionalParty/unitsForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div>
+
-      <div>
+    <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
@@ -144,10 +144,11 @@
       </el-form>
     </div>
 
-    </div>
     <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
+      <el-button size="small"
-      <el-button v-if="formType != 'detail'"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -509,20 +510,6 @@ export default {
 }
 </script>
 <style scoped>
-.item_width_1 {
-  width: 500px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
-
 .div_map {
   position: relative;
 }
@@ -532,25 +519,8 @@ export default {
   top: 5px;
   left: 5px;
 }
-
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
 </style>
 
-<style lang=scss>
+<style lang="scss" scoped >
-.el-dialog__body {
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
-  padding: 0 10px 20px !important;
-}
 </style>