Merge branch 'master' of http://39.98.153.250:9080/bowintek/EmploymentSite

vue/src/views/dataMap/siteUserWorkDataMap.vue

@@ -98,9 +98,9 @@
             {{ nowCheckSiteUser.siteUserName }}
           </p>
         </div>
+        <p class="margin-bottom-10">服务记录</p>
         <!-- 服务记录时间轴 -->
         <div v-if="nowCheckSiteUser.signinList && nowCheckSiteUser.signinList.length > 0" class="serviceRecords-list">
-          <p class="margin-bottom-10">服务记录</p>
           <a-timeline>
             <a-timeline-item v-for="(service, key) in nowCheckSiteUser.signinList" :key="key" position="left">
               <p>{{ dayjs(service.signinTime).format('YYYY-MM-DD HH:mm') }}</p>
@@ -108,8 +108,6 @@
               <p v-if="service.signinType == 2">走访{{ service.jobUserName }}人员信息</p>
               <p v-if="service.signinType == 3">外出走访（{{ service.content }}）</p>
               <div class="flex-box" style="flex-wrap: wrap">
-                <!--                <b-preview-visible-file v-for="(item, index) in service.fileList" :key="index"-->
-                <!--                                        :file-id="item.fileId"></b-preview-visible-file>-->
                 <div v-for="(item, index) in service.fileList" :key="index"
                      style="width: 60px; height: 60px; margin-right: 5px; margin-bottom: 5px">
                   <a-image
@@ -196,8 +194,12 @@ const initMap = () => {
 
 // 查询方法
 async function onSearch() {
-  // 清除地图标记点
+  // 清除地图标记点和查询数据
+  siteUserList.value = [];
+  nowCheckSiteUser.value = {siteUserID: null};
+  nowMouseenterSiteUser.value = {siteUserID: null};
   delMapInfo();
+  searchLoading.value = true;
   await getDataMapListBySiteUserWorkMap({...siteUserSearchParam}).then((result: any) => {
     siteUserList.value = result.list;
     paginationTotal.value = result.total;
@@ -235,6 +237,8 @@ async function onSearch() {
         lineList.value.push(line);
       }
     })
+  }).finally(() => {
+    searchLoading.value = false;
   });
 }
 
@@ -429,6 +433,15 @@ export default {
     background-color: white;
     padding: 15px;
     overflow: hidden;
+
+    .serviceRecords-list {
+      width: 100%;
+      height: calc(100% - 80px);
+      overflow: hidden;
+      overflow-y: auto;
+      background-color: white;
+      padding-top: 10px;
+    }
   }
 
   .pagination-box {
@@ -448,14 +461,6 @@ export default {
     align-items: center;
   }
 
-  .serviceRecords-list {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    overflow-y: auto;
-    background-color: white;
-  }
-
   .ant-btn, .ant-input, .ant-picker, .ant-picker-input, .ant-picker-focused {
     border: none !important;
     box-shadow: none !important;