Merge branch 'v2.0' of http://8.136.199.33:3000/eta_forum/eta_forum_admin_front into v2.0

src/views/customer/user/Index.vue

@@ -263,7 +263,7 @@ async function handleImportUser(e){
   <!-- 移动用户 -->
   <MoveUser v-model:show="showMoveUser" :data="editUserData" @change="handleRefreshList"/>
   <!-- 确认批量导入的用户 -->
-  <ConfirmImportUser v-model:show="showConfirmImportUser" :data="confirmImportUserData"/>
+  <ConfirmImportUser v-model:show="showConfirmImportUser" :data="confirmImportUserData" @change="handleRefreshList"/>
 </template>
 
 <style lang="scss" scoped>

src/views/customer/user/components/ActionStatisticForChart.vue

@@ -46,7 +46,12 @@ const chartDefaultOpts = {
     enabled: false, //关闭图例
   },
   tooltip: {
-    enabled: false,
+    enabled: true,
+    useHTML: true,
+    formatter: function () {
+      // 显示完整的 x 轴标签
+      return `<div style="font-size: 14px; color: #333;background:#fff;">${this.x}</div>`;
+    }
   },
 }
 

src/views/customer/user/components/ConfirmImportUser.vue

@@ -2,6 +2,7 @@
 import {apiCustomerUser} from '@/api/customer'
 
 const show = defineModel('show', { type: Boolean, default: false })
+const emits = defineEmits(['change'])
 const props=defineProps({
   data:{
     type:Array,
@@ -12,7 +13,7 @@ const props=defineProps({
 const columns = [
   { align: 'center', colKey: 'RealName', title: '姓名' },
   { align: 'center', colKey: 'Mobile', title: '手机号',width:'150px' },
-  { align: 'center', colKey: 'DepartmentName', title: '岗位-部门',width:'150px' },
+  { align: 'center', colKey: 'DepartmentName', title: '岗位-部门'},
   { align: 'center', colKey: 'BusinessName', title: '客户名称' },
   { align: 'center', colKey: 'PositionStatus', title: '在职状态',width:'100px' }, 
 ]
@@ -21,6 +22,7 @@ async function handleSave(){
   const res=await apiCustomerUser.importUser({ValidUser:props.data})
   if(res.Ret!==200) return
   MessagePlugin.success('导入成功')
+  emits('change')
   show.value=false
 }
 
@@ -37,6 +39,7 @@ async function handleSave(){
     :confirmBtn="null"
     class="import-user-wrap"
   >
+    <div>请确认导入信息(已过滤信息不全的联系人)</div>
     <t-table
       rowKey="UserId"
       :data="props.data"

src/views/etaChart/components/MoveClassify.vue

@@ -183,7 +183,7 @@ function handleConfirmClassify() {
 <template>
   <t-dialog
     v-model:visible="show"
-    header="编辑图表分类"
+    header="转移分类"
     draggable
     attach="body"
     top="50px"