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

src/router/index.js

@@ -115,7 +115,7 @@ export const moduleShujuRoutes = {
       name: "home2",
       meta: {
         title: "主页2",
-        isTab: true,
+        isTab: false,
       },
     },
     {
@@ -125,7 +125,7 @@ export const moduleShujuRoutes = {
       name: "visual-basicinfo-people",
       meta: {
         title: "个人详情",
-        isTab: true,
+        isTab: false,
       },
     },
     {
@@ -135,7 +135,7 @@ export const moduleShujuRoutes = {
       name: "visual-basicinfo-people-list",
       meta: {
         title: "人员列表",
-        isTab: true,
+        isTab: false,
       },
     },
   ],

src/views/modules/communityService/dqfwzx/cpts/edit.vue

@@ -176,15 +176,40 @@
               <div class="item-info">
                 <el-input
                   class="item_width_1"
+                  style="width: 150px"
                   maxlength="50"
                   show-word-limit
                   placeholder="事项名"
                   v-model="item.matterName"
                   :disabled="item.matterId != undefined"
                 />
+                <el-upload
+                  :disabled="item.matterId != undefined"
+                  class="avatar-uploader"
+                  :action="uploadUlr"
+                  :data="{ customerId: customerId }"
+                  :show-file-list="false"
+                  :on-success="
+                    (response, file, fileList) =>
+                      handleImgSuccess(index, response, file, fileList)
+                  "
+                  :before-upload="beforeImgUpload"
+                >
+                  <img
+                    v-if="item.matterImg"
+                    :src="item.matterImg"
+                    style="width: 36px; height: 36px"
+                    class="function-icon"
+                  />
+                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
 
+                <div class="hint">（事项封面，图片小于1M）</div>
+              </div>
+
+              <div class="item-pic">
                 <el-select
-                  style="margin-left: 10px"
+                  style="width: 150px; margin-left: 0"
                   v-model="item.appointmentType"
                   filterable
                   placeholder="预约类型"
@@ -200,7 +225,7 @@
                 </el-select>
 
                 <el-time-select
-                  style="margin-left: 10px"
+                  style="width: 120px; margin-left: 20px"
                   v-model="item.startTime"
                   :picker-options="{
                     start: '00:00',
@@ -213,6 +238,7 @@
                 </el-time-select>
                 <span style="margin: 0 5px">至</span>
                 <el-time-select
+                  style="width: 120px"
                   v-model="item.endTime"
                   :picker-options="{
                     start: '00:00',
@@ -224,33 +250,8 @@
                   :disabled="item.matterId != undefined"
                 >
                 </el-time-select>
-              </div>
-              <div class="item-pic">
-                <el-upload
-                  :disabled="item.matterId != undefined"
-                  class="avatar-uploader"
-                  :action="uploadUlr"
-                  :data="{ customerId: customerId }"
-                  :show-file-list="false"
-                  :on-success="
-                    (response, file, fileList) =>
-                      handleImgSuccess(index, response, file, fileList)
-                  "
-                  :before-upload="beforeImgUpload"
-                >
-                  <img
-                    v-if="item.matterImg"
-                    :src="item.matterImg"
-                    style="width: 50px; height: 50px"
-                    class="function-icon"
-                  />
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                </el-upload>
-
-                <div class="hint">（事项封面，图片小于1M）</div>
-
                 <el-button
-                  style="margin-left: auto"
+                  style="margin-left: 20px"
                   size="small"
                   @click="handleDelStaff(index)"
                   >删除</el-button
@@ -637,28 +638,24 @@ export default {
 <style lang="scss" scoped>
 .m-staffs {
   margin-left: auto;
-  width: 950px;
+  width: 520px;
 
   .item {
-    display: flex;
+    // display: flex;
+    // align-items: flex-start;
+    padding-bottom: 20px;
+    margin-bottom: 20px;
+    border-bottom: 4px dashed #f7f8f9;
+
     .item-info {
       display: flex;
-      margin: 0 20px;
-      width: 65%;
-      justify-content: space-around;
-      align-items: center;
-      margin-bottom: 7px;
-    }
-    .item-pic {
-      display: flex;
-      width: 35%;
-      align-items: center;
-      .hint {
-        font-size: 14px;
-        color: #999999;
-        margin-left: 10px;
-      }
+      align-items: flex-start;
+      margin: 0 0;
+      // margin-bottom: 7px;
+
       .avatar-uploader {
+        margin: 0 0 0 20px;
+
         ::v-deep .el-upload {
           cursor: pointer;
           position: relative;
@@ -671,8 +668,8 @@ export default {
           border-color: #409eff;
         }
         .avatar {
-          width: 50px;
-          height: 50px;
+          width: 36px;
+          height: 36px;
           display: block;
         }
         .avatar-uploader-icon {
@@ -680,12 +677,23 @@ export default {
           border-radius: 6px;
           font-size: 28px;
           color: #8c939d;
-          width: 50px;
-          height: 50px;
-          line-height: 50px;
+          width: 36px;
+          height: 36px;
+          line-height: 36px;
           text-align: center;
         }
       }
+      .hint {
+        // width: 75%;
+        font-size: 14px;
+        color: #999999;
+        margin-left: 0;
+      }
+    }
+    .item-pic {
+      display: flex;
+      align-items: center;
+      // justify-content: space-around;
     }
   }
 }

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

@@ -106,7 +106,7 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :title="formTitle"
-      width="1150px"
+      width="850px"
       top="5vh"
       class="dialog-h"
       @closed="handleClose"

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

@@ -791,6 +791,11 @@ export default {
         color: #fff;
       }
     }
+    ::v-deep .el-breadcrumb__item:first-child {
+      .el-breadcrumb__inner {
+        color: #a0c3d9;
+      }
+    }
   }
   
   </style>

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;
@@ -247,5 +251,10 @@ export default {
         color: #fff;
       }
     }
+    ::v-deep .el-breadcrumb__item:first-child {
+      .el-breadcrumb__inner {
+        color: #a0c3d9;
+      }
+    }
   }
 </style>

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>`
                 }
                 
               })