diff --git a/public/index.html b/public/index.html index 67cc82f17..43fc8c1d7 100644 --- a/public/index.html +++ b/public/index.html @@ -8,8 +8,8 @@ <%= webpackConfig.name %> - - + + diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue index 164282c8a..fef6d8cf0 100644 --- a/src/layout/components/Entry.vue +++ b/src/layout/components/Entry.vue @@ -135,11 +135,11 @@ export default { }, goEmpty() {}, goToCaseShow() { - const href = 'https://joylink.club/helps/西安铁路职业技术学院.pdf'; + const href = 'https://joylink.club/oss/portal/cases/西安铁路职业技术学院.pdf'; window.open(href, '_blank'); }, goToCase() { - const href = 'https://joylink.club/helps/贵州装备制造职业学院机电技术专业实训室建设.pdf'; + const href = 'https://joylink.club/oss/portal/cases/贵州装备制造职业学院机电技术专业实训室建设.pdf'; window.open(href, '_blank'); }, goToTraining() { diff --git a/src/views/drts/scene/update.vue b/src/views/drts/scene/update.vue index 51e415d5c..ff0db89f9 100644 --- a/src/views/drts/scene/update.vue +++ b/src/views/drts/scene/update.vue @@ -114,7 +114,7 @@ - + {{ $t('global.confirm') }} diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index bdcba72e6..0be77d74a 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/src/views/newMap/chatView/chatBox.vue @@ -51,6 +51,7 @@ 呼叫中 +
@@ -321,6 +322,7 @@ export default { item.children.forEach(data =>{ if (data.id == val.memberId) { data.active = false; + data.isConnect = false; } }); } @@ -417,8 +419,10 @@ export default { if (val.memberId == item.id && val.memberId != this.myMemberId) { if (item.active) { item.loading = false; + item.isConnect = true; } else { item.active = true; + item.isConnect = true; } } }); @@ -459,6 +463,7 @@ export default { data.children && data.children.forEach(item => { if (memberId == item.id) { item.active = true; + item.isConnect = true; } }); }); @@ -468,16 +473,39 @@ export default { }, // 创建会话 拨打电话 createCoversition() { - if (this.memberIdList.length) { + if (this.memberIdList.length || this.memberObject) { this.createLoading = true; - this.treeData.forEach(data => { - data.children && data.children.forEach(item => { - if (item.active) { - item.loading = true; - } + if (this.memberIdList.length > 0) { + // this.memberObject + this.treeData.forEach(data => { + data.children && data.children.forEach(item => { + if (item.active) { + item.loading = true; + } + }); }); - }); + } else { + // allTrain + if (this.memberObject == 'ALL_STATION') { + const stationList = this.treeData[1].children; + const length = stationList.length; + stationList.forEach((item, index) => { + if (index != length - 1) { + item.active = true; + item.loading = true; + } else { + item.active = false; + } + }); + } + } startConversition(this.group, this.memberIdList, this.memberObject).then(resp => { + if (this.memberObject == 'ALL_STATION') { + const stationList = this.treeData[1].children; + const length = stationList.length; + stationList[length - 1].active = false; + stationList[length - 1].isConnect = true; + } this.messageList = []; this.memberIdList = []; this.memberObject = ''; @@ -606,10 +634,26 @@ export default { }, // 点击按钮事件 handleCheckChange(data, jude = false) { + this.memberObject = ''; if (data.userId && data.userId == this.$store.state.user.id) { return; } if (data.value == 'allConcentrateStation' || data.value == 'allStation' || data.value == 'allTrain') { + const stationList = this.treeData[1].children; + const length = stationList.length; + if (data.active) { + stationList.forEach((item, index) => { + if (index != length - 1) { + item.disabled = true; + } + }); + } else { + stationList.forEach((item, index) => { + if (index != length - 1) { + item.disabled = false; + } + }); + } data.active = !data.active; this.memberObject = data.sign; } else { @@ -661,6 +705,7 @@ export default { if (item.children && item.children.length) { item.children.forEach(data =>{ data.active = false; + data.isConnect = false; data.loading = false; }); } @@ -851,6 +896,20 @@ export default { border-radius:4px; font-size: 14px; } + .content_connect{ + position: absolute; + width: 73px; + height: 73px; + left: 5px; + top: 0; + display: flex; + justify-content: center; + align-items: center; + background: rgba(0,0,0,0); + flex-direction: column; + border-radius:4px; + font-size: 14px; + } } .menuTrainListBtn { background: #fff;