joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

会话代码调整 3d挂载js路径修改 帮助文档路径修改

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-09-29 13:18:31 +08:00
parent f39ee786b4
commit 9141a6f92c
4 changed files with 71 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/index.html
View File

@ -8,8 +8,8 @@
<!-- cdn.bootcss.com替换成cdnjs.cloudflare.com/ajax/libs -->
<title><%= webpackConfig.name %></title>
<script src="/static/inflate.min.js"></script>
<script src="/static/three.min.js"></script>
<script src="/cbtc/static/inflate.min.js"></script>
<script src="/cbtc/static/three.min.js"></script>
<!--<% if (process.env.VUE_APP_PRO !== 'local') { %>-->
<!--<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/theme-chalk/index.css">-->
<!--<link href="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.css" rel="stylesheet">-->

4
src/layout/components/Entry.vue
View File

@ -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() {

61
src/views/newMap/chatView/chatBox.vue
View File

@ -51,6 +51,7 @@
<i class="el-icon-loading" style="margin-bottom: 4px;" />
<span>呼叫中</span>
</div>
<div v-if="data.isConnect||data.disabled" class="content_connect" />
</div>
</div>
</div>
@ -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,8 +473,10 @@ export default {
},
// 创建会话 拨打电话
createCoversition() {
if (this.memberIdList.length) {
if (this.memberIdList.length || this.memberObject) {
this.createLoading = true;
if (this.memberIdList.length > 0) {
// this.memberObject
this.treeData.forEach(data => {
data.children && data.children.forEach(item => {
if (item.active) {
@ -477,7 +484,28 @@ export default {
}
});
});
} 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;