|
|
@@ -112,6 +112,23 @@ function getPopoverContent(){
|
|
|
content:`${CooperationName}`,
|
|
|
RoadshowType:RoadshowType
|
|
|
}].filter(item=>item.RoadshowType===RoadshowType)
|
|
|
+ const SalonContent = [
|
|
|
+ {
|
|
|
+ key:'RoadshowPlatform',
|
|
|
+ label:'会议平台：',
|
|
|
+ content:`${RoadshowPlatform}`,
|
|
|
+ RoadshowType:'线上'
|
|
|
+ },{
|
|
|
+ key:'RoadshowCity',
|
|
|
+ label:'会议城市：',
|
|
|
+ content:`${Province}${City}`,
|
|
|
+ RoadshowType:'线下'
|
|
|
+ },{
|
|
|
+ key:'Theme',
|
|
|
+ label:'会议主题：',
|
|
|
+ content:`${Theme}`,
|
|
|
+ RoadshowType:RoadshowType
|
|
|
+ }].filter(item=>item.RoadshowType===RoadshowType)
|
|
|
////ActivityType不为空时，需要显示的内容
|
|
|
const {ResearcherName,SysUserRealName} = selectEventInfo.value
|
|
|
const SuppleContent=[{
|
|
|
@@ -139,6 +156,7 @@ function getPopoverContent(){
|
|
|
const contentMap = {
|
|
|
'路演':RoadshowContent,
|
|
|
'公开会议':MeetingContent,
|
|
|
+ '沙龙':SalonContent,
|
|
|
}
|
|
|
if(ActivityType){
|
|
|
popContentArr.value = [...popContent,...contentMap[ActivityType]||[],...SuppleContent]
|
|
|
@@ -221,7 +239,7 @@ const getReservationList = () => {
|
|
|
? item.Title
|
|
|
: item.ActivityType==='路演'
|
|
|
? `${item.CompanyName}${item.CompanyStatus ? '('+ item.CompanyStatus + ')' : ''}`
|
|
|
- : item.ActivityType==='公开会议'
|
|
|
+ : item.ActivityType==='公开会议' || item.ActivityType==='沙龙'
|
|
|
? item.Theme
|
|
|
: setDynamicTitle(item);
|
|
|
|
bding