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

iscs调整

Browse Source
This commit is contained in:
joylink_fanyuhong 2022-01-19 14:31:18 +08:00
parent 77040e93f4
commit 9b8fdc0c7e
5 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/baseUrl.js
View File

@ -24,7 +24,7 @@ export function handlerUrl(data) {
if (process.env.NODE_ENV === 'development') {
// const data = null;
// BASE_API = 'https://joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://114.116.51.125/jlcloud';
// BASE_API = 'http://192.168.8.152:9000'; // 袁琪
// BASE_API = 'http://192.168.8.172:9200'; // 旭强
@ -32,7 +32,7 @@ export function handlerUrl(data) {
// BASE_API = 'http://192.168.8.140:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
// BASE_API = data && data.domainName ? 'https://' + data.domainName : BASE_API;
BASE_API = data && data.domainName ? 'http://' + data.domainName : BASE_API;
VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink';

9
src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
View File

@ -179,6 +179,9 @@ export default {
case '13':
div.style.background = '#115577';
break;
case '♬':
div.style.background = '';
break;
}
}
}
@ -236,7 +239,8 @@ export default {
if (this.bgmResources && this.bgmResources[0]) {
const params = {
resourceId: this.bgmResources[0].id,
iscsDeviceCodes: iscsDeviceCodes
iscsDeviceCodes: iscsDeviceCodes,
type: 'BGM'
};
sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
const bgmUrl = this.$store.state.user.resourcesUrl + this.bgmResources[0].url;
@ -299,7 +303,8 @@ export default {
}
const params = {
resourceId: voice.id,
iscsDeviceCodes: iscsDeviceCodes
iscsDeviceCodes: iscsDeviceCodes,
type: this.videoMode
};
sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
this.voiceUrl = this.$store.state.user.resourcesUrl + voice.url;

12
src/views/iscs/iscsSystem/config/broadcast/stationHome.vue
View File

@ -296,6 +296,9 @@ export default {
case '13':
div.style.background = '#115577';
break;
case '♬':
div.style.background = '';
break;
}
}
});
@ -357,6 +360,9 @@ export default {
case '13':
div.style.background = '#115577';
break;
case '♬':
div.style.background = '';
break;
}
}
}
@ -424,7 +430,8 @@ export default {
if (this.bgmResources && this.bgmResources[0]) {
const params = {
resourceId: this.bgmResources[0].id,
iscsDeviceCodes: iscsDeviceCodes
iscsDeviceCodes: iscsDeviceCodes,
type: 'BGM'
};
sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
const bgmUrl = this.$store.state.user.resourcesUrl + this.bgmResources[0].url;
@ -486,7 +493,8 @@ export default {
if (this.resourcesList[this.messageIndex]) {
const params = {
resourceId: this.resourcesList[this.messageIndex].id,
iscsDeviceCodes: iscsDeviceCodes
iscsDeviceCodes: iscsDeviceCodes,
type: this.videoMode
};
sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
this.voiceUrl = this.$store.state.user.resourcesUrl + this.resourcesList[this.messageIndex].url;

32
src/views/iscs/iscsSystem/config/pis/infoBroadcast.vue
View File

@ -10,13 +10,13 @@
<div class="dialog-header">信息广播</div>
<div class="iscs-pis-dialog-info">
<el-radio-group v-model="addModel.infoType" @change="getResourcesList">
<el-radio label="realTime">实时信息</el-radio>
<el-radio label="REAL_TIME">实时信息</el-radio>
<el-radio label="RECORDING">普通信息</el-radio>
<el-radio label="EMERGENCY_RECORDING" class="iscs-pis-dialog-emergencyInfo">紧急信息</el-radio>
</el-radio-group>
</div>
<div v-show="addModel.infoType !== 'realTime'" class="secondary-title">{{ this.message[this.addModel.infoType].title }}</div>
<div v-show="addModel.infoType !== 'realTime'" class="information-description-box">
<div v-show="addModel.infoType !== 'REAL_TIME'" class="secondary-title">{{ this.message[this.addModel.infoType].title }}</div>
<div v-show="addModel.infoType !== 'REAL_TIME'" class="information-description-box">
<div v-for="(item,index) in resourcesList" :key="index">
<div
class="information-box"
@ -27,7 +27,7 @@
</div>
</div>
</div>
<div v-show="addModel.infoType === 'realTime'">
<div v-show="addModel.infoType === 'REAL_TIME'">
<el-row>
<el-col :span="20">
<div>
@ -51,15 +51,15 @@
</el-col>
</el-row>
</div>
<div v-show="addModel.infoType === 'realTime'" style="margin-top: 10px">
<div v-show="addModel.infoType === 'REAL_TIME'" style="margin-top: 10px">
<div style="display: inline;">名称：</div>
<input v-model="addModel.infoTitle" class="pis-dialog-input" style="width: 550px;">
<input v-model="addModel.infoTime" class="pis-dialog-input" style="width: 140px;">
<div style="display: inline;">次</div>
</div>
<div v-show="addModel.infoType !== 'realTime'" class="secondary-title" style="margin-top: 10px">{{ resource.name? resource.name: '' + '内容显示' }}</div>
<div v-show="addModel.infoType !== 'realTime'" class="information-context-box">{{ resource.desc }}</div>
<div v-show="addModel.infoType === 'realTime'" class="information-description-box" style="margin-top: 15px;">
<div v-show="addModel.infoType !== 'REAL_TIME'" class="secondary-title" style="margin-top: 10px">{{ resource.name? resource.name: '' + '内容显示' }}</div>
<div v-show="addModel.infoType !== 'REAL_TIME'" class="information-context-box">{{ resource.desc }}</div>
<div v-show="addModel.infoType === 'REAL_TIME'" class="information-description-box" style="margin-top: 15px;">
<el-row>
<el-col :span="6" style="border-right:2px solid #898888; min-height: 100px">
<div v-for="(item,index) in resourcesList" :key="index">
@ -72,7 +72,7 @@
</el-row>
</div>
<div class="button-group">
<el-select v-show="addModel.infoType === 'realTime'" v-model="value" placeholder="信息选择" size="mini">
<el-select v-show="addModel.infoType === 'REAL_TIME'" v-model="value" :disabled="true" placeholder="信息选择" size="mini">
<el-option
v-for="item in infoList"
:key="item.value"
@ -80,8 +80,8 @@
:value="item.value"
/>
</el-select>
<div v-show="addModel.infoType === 'realTime'" class="pis-button">储存</div>
<div class="button-group-content" :style="{left: addModel.infoType ==='realTime'?'300px':'550px'}">
<div v-show="addModel.infoType === 'REAL_TIME'" class="pis-button">储存</div>
<div class="button-group-content" :style="{left: addModel.infoType ==='REAL_TIME'?'300px':'550px'}">
<div class="pis-button">设定中</div>
<div class="pis-button" @click="releaseBroadcast">发布</div>
<div class="pis-button">取消</div>
@ -205,7 +205,7 @@ export default {
infoList: [],
showRealTimeInfo: '',
message: {
realTime: {
REAL_TIME: {
title: '实时信息',
infoList:[]
},
@ -233,18 +233,18 @@ export default {
},
releaseBroadcast() {
this.visible = false;
if (this.addModel.infoType === 'realTime') {
if (this.addModel.infoType === 'REAL_TIME') {
if (!this.addModel.infoTitle) {
this.$message.error('请输入实时信息标题！');
} else if (!this.addModel.infoContent) {
this.$message.error('请输入实时信息内容！');
} else {
this.$emit('releaseBroadcast', {name: this.addModel.infoTitle, content: this.addModel.infoContent });
this.$emit('releaseBroadcast', {name: this.addModel.infoTitle, content: this.addModel.infoContent }, this.addModel.infoType);
this.addModel.infoContent = '';
this.addModel.infoTitle = '';
}
} else if (this.resource) {
this.$emit('releaseBroadcast', this.resource);
this.$emit('releaseBroadcast', this.resource, this.addModel.infoType);
}
},
selectedRealTimeInfo(item) {
@ -255,7 +255,7 @@ export default {
this.resourceIndex = index;
},
getResourcesList() {
if (this.addModel.infoType === 'realTime') {
if (this.addModel.infoType === 'REAL_TIME') {
return;
}
const params = { system: 'PIS', type: this.addModel.infoType };

5
src/views/iscs/iscsSystem/config/pis/mainScreen.vue
View File

@ -183,7 +183,7 @@ export default {
this.$message.error('广播终止播放失败！');
});
},
releaseBroadcast(voice) {
releaseBroadcast(voice, type) {
const iscsDeviceCodes = [];
this.selectedAreaList.forEach(item => {
if (this.deviceMap[item]) {
@ -198,7 +198,8 @@ export default {
resourceId: voice.id,
iscsDeviceCodes: iscsDeviceCodes,
name: voice.name,
content: voice.content
content: voice.content,
type
};
sendCommandNew(this.$route.query.group, 'ISCS_PIS_Play', params).then(resp => {
const voiceUrl = this.$store.state.user.resourcesUrl + (voice.url || resp.data);