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-18 17:42:58 +08:00
parent f1c77eca34
commit 39a2a21b95
3 changed files with 16 additions and 15 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';

10
src/views/iscs/iscsSystem/config/broadcast/stateTable.vue
View File

@ -16,17 +16,17 @@
<el-col :span="3"><div style="background: #880000;color: #000; text-align: center">2</div></el-col>
<el-col :span="9"><div>联动消防广播</div></el-col>
<el-col :span="3"><div style="background: #778877;color: #000; text-align: center">9</div></el-col>
<el-col :span="9"><div>中心普通语录</div></el-col>
<el-col :span="9"><div>中心普通预录</div></el-col>
</el-row>
<el-row style="margin-bottom: 10px" :gutter="10">
<el-col :span="3"><div style="background: #0000FF;color: #000; text-align: center">3</div></el-col>
<el-col :span="9"><div>环调话筒广播</div></el-col>
<el-col :span="3"><div style="background: #555454;color: #000; text-align: center">11</div></el-col>
<el-col :span="9"><div>车站普通语录</div></el-col>
<el-col :span="9"><div>车站普通预录</div></el-col>
</el-row>
<el-row style="margin-bottom: 10px" :gutter="10">
<el-col :span="3"><div style="background: #554488;color: #000; text-align: center">4</div></el-col>
<el-col :span="9"><div>中心紧急语录</div></el-col>
<el-col :span="9"><div>中心紧急预录</div></el-col>
<el-col :span="3"><div style="background: #556688;color: #000; text-align: center">12</div></el-col>
<el-col :span="9"><div>ATS预录</div></el-col>
</el-row>
@ -38,12 +38,12 @@
</el-row>
<el-row style="margin-bottom: 10px" :gutter="10">
<el-col :span="3"><div style="background: #FF00FF;color: #000; text-align: center">6</div></el-col>
<el-col :span="9"><div>车站紧急语录</div></el-col>
<el-col :span="9"><div>车站紧急预录</div></el-col>
<el-col :span="3"><div style="background: #115577;color: #000; text-align: center">13</div></el-col>
<el-col :span="9"><div>设备通讯失败</div></el-col>
</el-row>
<el-row style="margin-bottom: 10px" :gutter="10">
<el-col :span="3"><div><img style="width: 15px;" :src="musicIcon"></div></el-col>
<el-col :span="3"><div style="color: #000;font-size: 16px">♬</div></el-col>
<el-col :span="9"><div>背景音乐</div></el-col>
<el-col :span="3"><div style="background: #FFFFFF;width: 22px;height: 13px;"><div class="pa-check-box-small" /></div></el-col>
<el-col :span="9"><div>被选择</div></el-col>

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

@ -20,37 +20,37 @@
<el-col :span="3">
<div v-if="checkHasDevice('LCD')" class="broadcast-mode-button" @click="selectedArea('LCD')">
<div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('LCD')? '#2EFF74':'#CDCDCD'}" />
<div style="position: relative; left: 25px;display: inline-block">{{ deviceMap['LCD'].state }}</div>
<div style="position: relative; left: 25px;display: inline-block;color: #000;">{{ deviceMap['LCD'].state }}</div>
</div>
</el-col>
<el-col :span="3">
<div v-if="checkHasDevice('UP_STAND')" class="broadcast-mode-button" @click="selectedArea('UP_STAND')">
<div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('UP_STAND')? '#2EFF74':'#CDCDCD'}" />
<div style="position: relative; left: 25px;display: inline-block">{{ deviceMap['UP_STAND'].state }}</div>
<div style="position: relative; left: 25px;display: inline-block;color: #000;">{{ deviceMap['UP_STAND'].state }}</div>
</div>
</el-col>
<el-col :span="3">
<div v-if="checkHasDevice('DOWN_STAND')" class="broadcast-mode-button" @click="selectedArea('DOWN_STAND')">
<div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('DOWN_STAND')? '#2EFF74':'#CDCDCD'}" />
<div style="position: relative; left: 25px;display: inline-block">{{ deviceMap['DOWN_STAND'].state }}</div>
<div style="position: relative; left: 25px;display: inline-block;color: #000;">{{ deviceMap['DOWN_STAND'].state }}</div>
</div>
</el-col>
<el-col :span="3">
<div v-if="checkHasDevice('ADMINISTRATIVE_AREA')" class="broadcast-mode-button" @click="selectedArea('ADMINISTRATIVE_AREA')">
<div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('ADMINISTRATIVE_AREA')? '#2EFF74':'#CDCDCD'}" />
<div style="position: relative; left: 25px;display: inline-block">{{ deviceMap['ADMINISTRATIVE_AREA'].state }}</div>
<div style="position: relative; left: 25px;display: inline-block;color: #000;">{{ deviceMap['ADMINISTRATIVE_AREA'].state }}</div>
</div>
</el-col>
<el-col :span="3">
<div v-if="checkHasDevice('GATE')" class="broadcast-mode-button" @click="selectedArea('GATE')">
<div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('GATE')? '#2EFF74':'#CDCDCD'}" />
<div style="position: relative; left: 25px;display: inline-block">{{ deviceMap['GATE'].state }}</div>
<div style="position: relative; left: 25px;display: inline-block;color: #000;">{{ deviceMap['GATE'].state }}</div>
</div>
</el-col>
<el-col :span="3">
<div v-if="checkHasDevice('TRANSFER_CHANNEL')" class="broadcast-mode-button" @click="selectedArea('TRANSFER_CHANNEL')">
<div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('TRANSFER_CHANNEL')? '#2EFF74':'#CDCDCD'}" />
<div style="position: relative; left: 25px;display: inline-block">{{ deviceMap['TRANSFER_CHANNEL'].state }}</div>
<div style="position: relative; left: 25px;display: inline-block;color: #000;">{{ deviceMap['TRANSFER_CHANNEL'].state }}</div>
</div>
</el-col>
</el-row>
@ -249,7 +249,7 @@ export default {
queryIscsDeviceCod(params2).then(resp => {
this.iscsDeviceList = resp.data;
this.iscsDeviceList.forEach(device => {
device.state = this.iscsDeviceState[device.code] ? this.iscsDeviceState[device.code].state : '0';
this.$set(device, 'state', this.iscsDeviceState[device.code] ? this.iscsDeviceState[device.code].state : '0');
this.iscsDeviceMap[device.code] = device;
});
});
@ -450,13 +450,13 @@ export default {
top: 13px;
width: 50px;
left: 30%;
cursor: pointer;
font-size: 13px;
line-height: 28px;
border-top: 2px solid #fff;
border-left: 2px solid #fff;
border-right: 2px solid #454541;
border-bottom: 2px solid #454541;
cursor: default;
&.active,
&:hover{
background: #EBB570;
@ -535,6 +535,7 @@ export default {
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
cursor: pointer;
}
.broadcast-content{
border-bottom: 1px solid #ECECEC;