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

src/assets/scss/people-info.scss

@@ -8,11 +8,20 @@
 
     .wrap {
         position: relative;
-        margin: 120px auto;
-        padding: 20px;
-        width: 1000px;
+        margin: 5vh auto;
+        height: 90vh;
+        width: 1040px;
         background-color: #fff;
 
+        .wrap2 {
+            box-sizing: border-box;
+            padding: 20px;
+            height: 90vh;
+            width: 1040px;
+            overflow-y: auto;
+            overflow-x: hidden;
+        }
+
         .title {
             padding: 10px;
             font-size: 22px;
@@ -33,6 +42,7 @@
 
         .btn-close {
             position: absolute;
+            z-index: 2;
             top: -30px;
             right: -30px;
             cursor: pointer;

src/views/modules/communityService/dqfwzx/index.vue

@@ -81,6 +81,7 @@
                   @click="handleOrder(scope.$index)"
                   type="text"
                   size="small"
+                  style="color: #1c6afd"
                   >预约</el-button
                 >
 
@@ -88,7 +89,7 @@
                   @click="handleOrderList(scope.$index)"
                   type="text"
                   size="small"
-                  style="margin-right: 10px; color: #00a7a9"
+                  style="margin-right: 10px; color: #1c6afd"
                   >预约记录</el-button
                 >
               </template>
@@ -420,14 +421,14 @@ export default {
           top: 5px;
           right: 5px;
           font-size: 14px;
-          color: rgb(235, 192, 4);
+          color: #00a7a9;
           width: 50px;
           line-height: 30px;
           text-align: center;
           cursor: pointer;
           &:hover {
             // text-decoration: underline;
-            color: rgb(250, 208, 23);
+            color: #00a7a9;
           }
         }
         .item-name {

src/views/modules/importRecord/index.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="resi-container">
     <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <h2 type="success" size="small">导入记录</h2>
-      </div>
+
       <el-table
         :data="tableData"
         border

src/views/modules/shequ/cpts/fangwu-info.vue

@@ -202,6 +202,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>

src/views/modules/shequ/cpts/people-more.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="m-pop">
     <div class="wrap">
-      <div class="title">
-        <span>更多信息</span>
-      </div>
-
       <div class="btn-close" @click="handleClose">
         <img src="@/assets/img/shuju/people/close.png" />
       </div>
+      <div class="wrap2">
+        <div class="title">
+          <span>更多信息</span>
+        </div>
 
         <div
           :key="'fieldSubList' + index"
@@ -137,7 +137,11 @@
             </div>
           </div>
           <div class="list" v-else>
-          <div class="item" :key="field.itemId" v-for="field in group.itemList">
+            <div
+              class="item"
+              :key="field.itemId"
+              v-for="field in group.itemList"
+            >
               <span class="item-field">{{ field.label }}：</span>
               <span
                 v-if="
@@ -169,6 +173,7 @@
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -499,8 +504,4 @@ export default {
 };
 </script>
 
-<style
-  lang="scss"
-  src="@/assets/scss/people-info.scss"
-  scoped
-></style>
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>

src/views/modules/shequ/cpts/xuqiu-info.vue

@@ -219,6 +219,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>