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

src/assets/scss/modules/visual/communityManage.css

@@ -0,0 +1,42 @@
+.div_del {
+  position: absolute;
+  left: 10px;
+  bottom: 0;
+}
+
+.div_search {
+  display: flex;
+}
+
+.div_search .resi-cell {
+  display: flex;
+  align-items: center;
+}
+
+.div_search .resi-cell .resi-cell-label {
+  width: 70px;
+  box-sizing: border-box;
+  margin-right: 15px;
+  text-align: right;
+}
+
+.div_search .resi-cell .resi-cell-input {
+  width: 180px;
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+
+.setFormBoxHeight {
+  max-height: 99px;
+  overflow: hidden;
+}
+
+.setFormBoxHeightAuto {
+  height: auto;
+}

src/assets/scss/modules/visual/communityManage.min.css

@@ -0,0 +1 @@
+.div_del{position:absolute;left:10px;bottom:0}.div_search{display:flex}.div_search .resi-cell{display:flex;align-items:center}.div_search .resi-cell .resi-cell-label{width:70px;box-sizing:border-box;margin-right:15px;text-align:right}.div_search .resi-cell .resi-cell-input{width:180px}.el-row{display:flex;flex-wrap:wrap;margin-top:10px;margin-right:50px}.setFormBoxHeight{max-height:99px;overflow:hidden}.setFormBoxHeightAuto{max-height:auto}

src/assets/scss/modules/visual/communityManage.scss

@@ -35,3 +35,10 @@
   margin-top: 10px;
   margin-right: 50px;
 }
+.setFormBoxHeight{
+  max-height: 99px;
+  overflow: hidden;
+}
+.setFormBoxHeightAuto{
+  height: auto;
+}

src/views/components/rangeInput.vue

@@ -102,8 +102,9 @@ export default {
 <style lang="scss" scoped>
 .flex-div {
   display: flex;
-  align-items: center;
+  align-items: inherit;
   max-width: 200px;
+  height: 37px;
 }
 // .wd50 {
 //   // width: 45%;

src/views/components/resiSearch.vue

@@ -3,11 +3,12 @@
     <!-- <el-card class="resi-card"> -->
     <div>
 
-      <el-form :inline="true"  :label-width="'100px'" class="header_form_box" v-for="(item, index) in sliceList(itemList, 4)"
+      <el-form :inline="true"  :label-width="'100px'" class="header_form_box" v-for="(item, index) in sliceList(itemList, 4)" :class="boxHeight?'setFormBoxHeightAuto':'setFormBoxHeight'"
               :key="index">
         <el-form-item  v-for="n in item"
                 :key="n.id"
                 :span="computdSpan(item.length)"
+                class="margin0"
               >
           <div class="resi-cell">
             <div class="resi-cell-label"
@@ -202,7 +203,7 @@
                    size="small"
                    plain
                    @click="handleSmartSearch">智能查询</el-button>
-        <span class="font_color_blue">收起 <i class="el-icon-arrow-up"></i></span>
+        <span class="font_color_blue" style="cursor:pointer;" @click="boxHeight = !boxHeight">{{boxHeight?'收起':'展开'}} <i :class="boxHeight?'el-icon-arrow-up':'el-icon-arrow-down'"></i></span>
       </el-col>
     </el-row>
 
@@ -287,6 +288,7 @@ export default {
     }
 
     return {
+      boxHeight:false,
       pageLoading: false,
       openSearch: false,
       optionsV: [],
@@ -811,7 +813,7 @@ export default {
 
 <style lang="scss" scope>
 @import "@/assets/scss/modules/management/list-main.scss";
-
+@import "@/assets/scss/modules/visual/communityManage.scss";
 .header_form_box{
   display: flex;
   flex-wrap: wrap;