Merge branch 'dev-220411' into test

src/views/modules/visual/basicinfo/peopleList.vue

@@ -68,8 +68,6 @@
           </div>
 
         </div>
-
-      </div>
         <div class="pagination">
           <el-pagination background
                         layout="prev, pager, next, total"
@@ -80,6 +78,7 @@
           </el-pagination>
         </div>
       </div>
+    </div>
 
     <!-- <people v-if="orgLevel==='people'"
             :uid="selUserId"
@@ -112,7 +111,7 @@ export default {
       headerList: [],
       tableData: [],
       searchName: '',
-      pageSize: 7,
+      pageSize: 10,
       pageNo: 1,
       total: 0,
       orgLevel: 'search',
@@ -236,8 +235,13 @@ export default {
   height: 780px;
   margin: 20px auto;
 }
+.warning-table {
+  height: 640px;
+}
 .pagination {
+  padding-right: 0;
   margin-top: 0;
+  text-align: right;
 }
 .g-bread {
     padding: 10px 20px;

src/views/modules/visual/measure/dialogInfo.vue

@@ -92,7 +92,7 @@
           </div>
         </div>
 
-        <div style="padding: 30px 0">
+        <div style="padding: 30px 0; display: flex; justify-content: center;">
           <analyse
             v-if="!loading"
             :single-list="demandList"

src/views/modules/visual/measure/service.vue

@@ -255,7 +255,7 @@ export default {
                 if (item.legendCode == 'unfinished') {
                   desc += `<div><span>尚有 ${item.serviceDemandTotal} 个需求未完成</span></div>`
                 }else {
-                  desc += `<div><span>共有 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个</span></div>`
+                  desc += `<div><span>共有 ${item.totalService} ${unit} ${item.legendName} 完成 ${item.serviceDemandTotal} 个需求</span></div>`
                 }
                 
               })