Merge remote-tracking branch 'origin/master'

vue/src/views/dataMap/companyDataMap.vue

@@ -195,6 +195,14 @@
             <p class="company-name">
               {{ nowCheckCompany.companyName }}
             </p>
+            <p class="label-text flex-box justify-between">
+              <span>
+                联系人：{{ nowCheckCompany.userName }}
+              </span>
+              <span>
+                联系电话：{{ nowCheckCompany.userMobile }}
+              </span>
+            </p>
             <p class="label-text">
               所属行业：{{ nowCheckCompany.industryName }}
             </p>
@@ -206,14 +214,7 @@
                 企业状态：{{ nowCheckCompany.recordStatusName }}
               </span>
             </p>
-            <p class="label-text flex-box justify-between">
-              <span>
-                联系人：{{ nowCheckCompany.userName }}
-              </span>
-              <span>
-                联系电话：{{ nowCheckCompany.userMobile }}
-              </span>
-            </p>
+
             <p class="label-text">标签</p>
             <!-- 标签 -->
             <div class="company-label-box"
@@ -236,7 +237,7 @@
           <a-radio-group v-model:value="dataType" button-style="solid" size="small"
                          style="margin-bottom: 10px">
             <a-radio-button value="post">岗位</a-radio-button>
-            <a-radio-button value="signin">服务记录</a-radio-button>
+            <a-radio-button value="signin">服务</a-radio-button>
           </a-radio-group>
           <!-- 岗位列表 -->
           <div v-if="dataType == 'post'" class="dataType-box">

vue/src/views/dataScreen/html/css/style.css

@@ -411,6 +411,10 @@
   animation: imagesLoop 15s linear 1s infinite normal;
 }
 
+.chart-box:hover .text-list {
+  animation-play-state: paused;
+}
+
 .text-list-item {
   width: 100%;
   height: 48px;

vue/src/views/jobUserManager/signinMgt/index.vue

@@ -171,7 +171,7 @@ export default defineComponent({
       {title: '外出类型', dataIndex: 'signinTypeName', key: 'signinTypeName', align: "center"},
       {title: '走访企业', dataIndex: 'companyName', key: 'companyName', align: "center"},
       {title: '走访人员', dataIndex: 'jobUserName', key: 'jobUserName', align: "center"},
-      {title: '走访内容', dataIndex: 'content', key: 'content', align: "center", isDefaultClose: false},
+      {title: '走访内容', dataIndex: 'content', width:300, key: 'content', align: "center", isDefaultClose: false},
       {title: '操作', key: 'operation', width: 150, align: 'center', isDisabled: true, isDefaultClose: true},
     ];
     // 响应式表格定义