diff --git a/my-vue-app/src/utils/https.js b/my-vue-app/src/utils/https.js index 68cbdab..00878ef 100644 --- a/my-vue-app/src/utils/https.js +++ b/my-vue-app/src/utils/https.js @@ -5,7 +5,7 @@ import { useUserStore } from '@/stores/user' // 创建axios实例 const service = axios.create({ - baseURL: 'http://192.168.15.121:8890' || '', // API基础路径,支持完整URL + baseURL: 'http://mldash.nycjy.cn/' || '', // API基础路径,支持完整URL timeout: 100000, // 请求超时时间 headers: { 'Content-Type': 'application/json;charset=UTF-8' diff --git a/my-vue-app/src/views/person/components/SalesTimelineWithTaskList.vue b/my-vue-app/src/views/person/components/SalesTimelineWithTaskList.vue index 075e134..dd54cab 100644 --- a/my-vue-app/src/views/person/components/SalesTimelineWithTaskList.vue +++ b/my-vue-app/src/views/person/components/SalesTimelineWithTaskList.vue @@ -347,11 +347,11 @@ const stages = computed(() => { const stageList = [ { id: 0, name: '全部', displayName: '全部', count: totalCount, color: '#f3f4f6' }, - { id: 1, name: '待加微', displayName: '待加微', count: getStageCount('待加微'), color: '#e3f2fd' ,unName:'已加微'}, - { id: 2, name: '待填表单', displayName: '待填表单', count: getStageCount('待填表单'), color: '#90caf9' ,unName:'已填表单'}, - { id: 3, name: '待入群', displayName: '待入群', count: getStageCount('待入群'), color: '#bbdefb' ,unName:'已入群'}, - { id: 4, name: '待联系', displayName: '待联系', count: getStageCount('待联系'), color: '#bbdefb' ,unName:'已联系'}, - { id: 5, name: '待到课', displayName: '待到课', count: getStageCount('待到课'), color: '#bbdefb' ,unName:'已到课'}, + { id: 1, name: '待加微', displayName: '待加微', count: getStageCount('待加微'), color: '#e3f2fd' }, + { id: 2, name: '待填表单', displayName: '待填表单', count: getStageCount('待填表单'), color: '#90caf9' }, + { id: 3, name: '待入群', displayName: '待入群', count: getStageCount('待入群'), color: '#bbdefb' }, + { id: 4, name: '待联系', displayName: '待联系', count: getStageCount('待联系'), color: '#bbdefb' }, + { id: 5, name: '待到课', displayName: '待到课', count: getStageCount('待到课'), color: '#bbdefb'}, { id: 6, name: '课1', displayName: '课1', count: getStageCount('课1'), color: '#81c784' }, { id: 7, name: '课2', displayName: '课2', count: getStageCount('课2'), color: '#64b5f6' }, { id: 8, name: '课3', displayName: '课3', count: getStageCount('课3'), color: '#ffb74d' }, @@ -515,19 +515,21 @@ const closeModal = () => { const getAttendedLessons = (classSituation, classNum) => { // 优先使用 class_num 字段 if (classNum && Array.isArray(classNum) && classNum.length > 0) { - return classNum.sort((a, b) => a - b).join(' '); + const filteredClassNum = classNum.filter(num => num !== -1); + return filteredClassNum.length > 0 ? filteredClassNum.sort((a, b) => a - b).join(' ') : '未到课'; } // 如果没有 class_num,则使用 class_situation if (!classSituation) return '未到课'; if (Array.isArray(classSituation)) { - return classSituation.join(' '); + const filteredSituation = classSituation.filter(item => item !== -1); + return filteredSituation.length > 0 ? filteredSituation.join(' ') : '未到课'; } if (typeof classSituation === 'object') { const lessonNumbers = Object.keys(classSituation) .map(key => parseInt(key)) - .filter(num => !isNaN(num)) + .filter(num => !isNaN(num) && num !== -1) .sort((a, b) => a - b); return lessonNumbers.length > 0 ? lessonNumbers.join(' ') : '未到课'; } diff --git a/my-vue-app/src/views/person/components/StatisticData.vue b/my-vue-app/src/views/person/components/StatisticData.vue index e7839b7..63257b5 100644 --- a/my-vue-app/src/views/person/components/StatisticData.vue +++ b/my-vue-app/src/views/person/components/StatisticData.vue @@ -89,7 +89,6 @@ const hideTooltip = () => {