master
lion 2 weeks ago
parent 9db3e5bbbe
commit cde5c4aeb6

@ -2,7 +2,12 @@
ENV='development' ENV='development'
# 后端本地 Laravelphp artisan serve 默认 8000 # 后端本地 Laravelphp artisan serve 默认 8000
VUE_APP_PRO_API = http://127.0.0.1:8000 #VUE_APP_PRO_API = http://127.0.0.1:8000
VUE_APP_BASE_API = http://127.0.0.1:8000 #VUE_APP_BASE_API = http://127.0.0.1:8000
VUE_APP_UPLOAD_API = http://127.0.0.1:8000/api/admin/upload-file #VUE_APP_UPLOAD_API = http://127.0.0.1:8000/api/admin/upload-file
VUE_APP_PRO_API = https://suzhoukeji-test.ali251.langye.net
VUE_APP_BASE_API = https://suzhoukeji-test.ali251.langye.net
VUE_APP_UPLOAD_API = https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file

@ -266,12 +266,6 @@
width: 120, width: 120,
fixed: 'left' fixed: 'left'
}, },
{
prop: 'user.is_schoolmate_text',
label: '校友',
align: 'center',
width: 120,
},
{ {
prop: 'username', prop: 'username',
label: '姓名', label: '姓名',
@ -289,7 +283,14 @@
return (<div>{row.user.mobile}</div>) return (<div>{row.user.mobile}</div>)
} }
} }
},{ },
{
prop: 'user.is_schoolmate_text',
label: '校友',
align: 'center',
width: 120,
},
{
prop: 'user.is_company_schoolmate_text', prop: 'user.is_company_schoolmate_text',
label: '是否校友企业', label: '是否校友企业',
align: 'center', align: 'center',
@ -311,7 +312,24 @@
label: '企查查名称', label: '企查查名称',
align: 'left', align: 'left',
width: 200, width: 200,
}, { },{
prop: 'user.company_tag',
label: '企业资质',
align: 'center',
width: 180,
customFn:(row)=>{
const companyTag = row.user.company ? row.user.company.company_tag : ''
return (
<div
title={companyTag}
style="width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;"
>
{companyTag}
</div>
)
}
}, {
prop: 'is_yh_invested', prop: 'is_yh_invested',
label: '集团标签', label: '集团标签',
align: 'center', align: 'center',
@ -333,6 +351,18 @@
return (<div>{row.user.company_position}</div>) return (<div>{row.user.company_position}</div>)
} }
} }
},{
prop: 'user.education',
label: '最高学历',
align: 'center',
width: 120,
customFn:(row)=>{
if(this.getPropValueIfExists(row.change_data,'education')){
return (<div style='color:red'>{this.getPropValueIfExists(row.change_data,'education')}</div>)
}else{
return (<div>{row.user.education}</div>)
}
}
},{ },{
prop: 'user.sex', prop: 'user.sex',
label: '性别', label: '性别',
@ -364,19 +394,20 @@
return (<div>{row.user.birthday}</div>) return (<div>{row.user.birthday}</div>)
} }
} }
}, {
prop: 'user.email',
label: '邮箱',
align: 'center',
width: 180,
customFn:(row)=>{
if(this.getPropValueIfExists(row.change_data,'email')){
return (<div style='color:red'>{this.getPropValueIfExists(row.change_data,'email')}</div>)
}else{
return (<div>{row.user.email}</div>)
}
}
}, },
//{
// prop: 'user.email',
// label: '',
// align: 'center',
// width: 180,
// customFn:(row)=>{
// if(this.getPropValueIfExists(row.change_data,'email')){
// return (<div style='color:red'>{this.getPropValueIfExists(row.change_data,'email')}</div>)
// }else{
// return (<div>{row.user.email}</div>)
// }
// }
//},
// { // {
// prop: 'score', // prop: 'score',
// label: '', // label: '',

@ -143,11 +143,12 @@
<!-- 地图区域 --> <!-- 地图区域 -->
<div class="map-container warehouse-table"> <div class="map-container warehouse-table">
<div class="map-title"> <div class="map-title">
<div style="font-size: 1.1vw; font-weight: bold; color: #93ccfd;">学员分布地图</div>
<div class="map-tabs"> <div class="map-tabs">
<div class="tab" :class="{ active: mapType === 'suzhou' }" @click="mapType = 'suzhou'">苏州</div> <div class="tab" :class="{ active: mapType === 'suzhou' }" @click="mapType = 'suzhou'">苏州</div>
<div class="tab" :class="{ active: mapType === 'national' }" @click="mapType = 'national'">全国</div> <div class="tab" :class="{ active: mapType === 'national' }" @click="mapType = 'national'">全国</div>
</div> </div>
<div style="font-size: 1.1vw; font-weight: bold; color: #fff;" v-if="mapType == 'suzhou'"></div> <!-- <div style="font-size: 1.1vw; font-weight: bold; color: #fff;" v-if="mapType == 'suzhou'"></div> -->
</div> </div>
<div class="map-chart-wrapper"> <div class="map-chart-wrapper">
<div class="suzhou-map-wrapper" v-show="mapType === 'suzhou'"> <div class="suzhou-map-wrapper" v-show="mapType === 'suzhou'">
@ -367,14 +368,10 @@ export default {
// //
activeTab: 'alumni', activeTab: 'alumni',
newsTabs: [ newsTabs: [
{ key: 'alumni', label: '校友动态' }, { key: 'alumni', label: '校友动态' }
{ key: 'industry', label: '业界动态' },
{ key: 'needs', label: '校友需求' }
], ],
newsData: { newsData: {
alumni: [], alumni: []
industry: [],
needs: []
}, },
scrollTimer: null scrollTimer: null
} }
@ -703,14 +700,6 @@ export default {
if (res.article.xiaoyou && Array.isArray(res.article.xiaoyou)) { if (res.article.xiaoyou && Array.isArray(res.article.xiaoyou)) {
this.newsData.alumni = res.article.xiaoyou.map(item => item.title || '') this.newsData.alumni = res.article.xiaoyou.map(item => item.title || '')
} }
//
if (res.article.yejie && Array.isArray(res.article.yejie)) {
this.newsData.industry = res.article.yejie.map(item => item.title || '')
}
//
if (res.article.supply_demands && Array.isArray(res.article.supply_demands)) {
this.newsData.needs = res.article.supply_demands.map(item => item.title || '')
}
} }
// - yearConfigs // - yearConfigs
if (res && res.yearConfigs && Array.isArray(res.yearConfigs)) { if (res && res.yearConfigs && Array.isArray(res.yearConfigs)) {
@ -737,7 +726,7 @@ export default {
this.courseSystemList = courseList this.courseSystemList = courseList
this.courseSystemTotal = { name: '累计', sessions: totalSessions, people: totalPeople } this.courseSystemTotal = { name: '累计', sessions: totalSessions, people: totalPeople }
} }
// // 使 home-v2.suzhou
if (res && res.suzhou && Array.isArray(res.suzhou)) { if (res && res.suzhou && Array.isArray(res.suzhou)) {
// company_areacompany_total // company_areacompany_total
// name // name
@ -752,10 +741,10 @@ export default {
}, {}) }, {})
res.suzhou.forEach(item => { res.suzhou.forEach(item => {
const rawName = item.area || '' const rawName = item.area || item.company_area || ''
const mappedName = nameMap[rawName] || rawName const mappedName = nameMap[rawName] || rawName
if (baseMap[mappedName]) { if (baseMap[mappedName]) {
baseMap[mappedName].value = item.total || 0 baseMap[mappedName].value = item.total_unique || item.total || item.company_total || 0
} }
}) })
@ -1926,43 +1915,41 @@ export default {
.news-container { .news-container {
flex: 4; flex: 4;
background: rgba(6, 19, 54, 0.85); background: linear-gradient(135deg, rgba(59, 130, 246, 0.2) 0%, rgba(99, 102, 241, 0.1) 100%);
border: 1px solid rgba(71, 148, 255, 0.35); border: 1px solid rgba(59, 130, 246, 0.3);
border-radius: 8px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 1vh 1vw; padding: 3.4vh 1.5vw !important;
min-height: 0; min-height: 0;
gap: 1vh!important; gap: 1.5vh !important;
backdrop-filter: blur(10px);
} }
.news-tabs { .news-tabs {
display: flex; display: flex;
justify-content: space-between; justify-content: center;
gap: 1.5vw; align-items: center;
// margin-bottom: 1vh; gap: 0;
} }
.news-tab { .news-tab {
flex: 1; flex: 0 0 auto;
text-align: center; text-align: center;
padding: 0.6vh 0.5vw; padding: 0;
cursor: pointer; cursor: default;
color: #fff; border: none;
border-radius: 2vw; background: transparent;
border:1px solid #3185ed;
// background: rgba(30, 60, 120, 0.4);
transition: all 0.3s ease;
font-size: 1.3vw; font-size: 1.3vw;
text-align: center;
font-weight: bold; font-weight: bold;
color: #93ccfd; color: #93ccfd;
} }
.news-tab.active { .news-tab.active {
color: #fff; color: #93ccfd;
font-weight: 600; font-weight: bold;
background: #3185ed; background: transparent;
box-shadow: 0 2px 8px rgba(59, 130, 246, 0.4); box-shadow: none;
} }
.news-content { .news-content {
@ -1983,7 +1970,7 @@ export default {
} }
.news-item { .news-item {
color: #e7f5ff; color: #fff;
flex-shrink: 0; flex-shrink: 0;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;

Loading…
Cancel
Save