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

调整哈尔滨综合监控绘图宽度，高度显示， 综合监控名称动态显示

Browse Source
This commit is contained in:
zyy 2020-03-12 18:36:05 +08:00
parent 6031ca59eb
commit cb4c615345
17 changed files with 325 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/baseUrl.js
View File

@ -7,7 +7,7 @@ export function getBaseUrl() {
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://192.168.8.125:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛automaticRouteButtonList

10
src/views/iscs/iscsSystem/config/acs/standACS.vue
View File

@ -1,24 +1,24 @@
<template>
<div>
<div class="standACS_title">会展中心站门禁站台层</div>
<div class="standACS_title">{{ $route.query.stationName }}门禁站台层</div>
<div>
<iscsSystem ref="iscsPlate" :widthCanvas="990" />
<iscsSystem ref="iscsPlate" :width-canvas="990" :canvas-height="500" />
</div>
</div>
</template>
<script>
import iscsSystem from "../canvas/iscsCanvas";
import iscsSystem from '../canvas/iscsCanvas';
export default {
components: {
iscsSystem
},
data() {
return {
mes: "1111"
mes: '1111'
};
},
mounted() {
this.$refs.iscsPlate.show("61");
this.$refs.iscsPlate.show('61');
},
methods: {}
};

10
src/views/iscs/iscsSystem/config/acs/stationHallACS.vue
View File

@ -1,24 +1,24 @@
<template>
<div>
<div class="stationHall_title">会展中心站门禁站厅层</div>
<div class="stationHall_title">{{ $route.query.stationName }}门禁站厅层</div>
<div>
<iscsSystem ref="iscsPlate" :widthCanvas="990" />
<iscsSystem ref="iscsPlate" :width-canvas="990" :canvas-height="600" />
</div>
</div>
</template>
<script>
import iscsSystem from "../canvas/iscsCanvas";
import iscsSystem from '../canvas/iscsCanvas';
export default {
components: {
iscsSystem
},
data() {
return {
mes: "1111"
mes: '1111'
};
},
mounted() {
this.$refs.iscsPlate.show("62");
this.$refs.iscsPlate.show('62');
},
methods: {}
};

10
src/views/iscs/iscsSystem/config/afc/afc.vue
View File

@ -1,24 +1,24 @@
<template>
<div>
<div class="afc_title">会展中心站售检票</div>
<div class="afc_title">{{ $route.query.stationName }}售检票</div>
<div>
<iscsSystem ref="iscsPlate" :widthCanvas="990" />
<iscsSystem ref="iscsPlate" :width-canvas="1200" :canvas-height="650" />
</div>
</div>
</template>
<script>
import iscsSystem from "../canvas/iscsCanvas";
import iscsSystem from '../canvas/iscsCanvas';
export default {
components: {
iscsSystem
},
data() {
return {
mes: "1111"
mes: '1111'
};
},
mounted() {
this.$refs.iscsPlate.show("51");
this.$refs.iscsPlate.show('51');
},
methods: {}
};

2
src/views/iscs/iscsSystem/config/bas/controlBAS.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="control-bas-box">
<div class="title-name">会展中心站大系统模式表</div>
<div class="title-name">{{ $route.query.stationName }}大系统模式表</div>
<div class="control-bas">
<el-table :data="tableData" :header-row-style="tableTitleStyle" :cell-style="rowStyle" :span-method="objectSpanMethod" style="float: left;">
<el-table-column label="日期" width="300">

2
src/views/iscs/iscsSystem/config/bas/controlPermissionBAS.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="permission-box">
<div class="title-name">会展中心站控制权移交</div>
<div class="title-name">{{ $route.query.stationName }}控制权移交</div>
<div class="content-box">
<div class="content-top">
<div class="content-left">

30
src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
View File

@ -28,6 +28,10 @@ export default {
widthCanvas: {
type: Number,
default: 1200
},
canvasHeight: {
type: Number,
default: 500
}
},
data() {
@ -55,18 +59,18 @@ export default {
},
computed: {
...mapGetters([
'canvasWidth',
'canvasHeight'
// 'canvasWidth',
// 'canvasHeight'
]),
iscsId() {
return ['iscs', (Math.random().toFixed(5)) * 100000].join('_');
},
width() {
return this.$store.state.config.width;
},
height() {
return this.$store.state.config.height;
}
// width() {
// return this.$store.state.config.width;
// },
// height() {
// return this.$store.state.config.height;
// }
},
watch: {
'$store.state.config.canvasSizeCount': function (val) {
@ -98,8 +102,8 @@ export default {
dom: document.getElementById(this.iscsId),
config: {
renderer: 'canvas',
width: this.width,
height: this.height
width: this.canvasWidth,
height: this.canvasHeight
},
options: {
scaleRate: 1,
@ -167,9 +171,9 @@ export default {
},
reSize() {
this.$nextTick(() => {
this.width = this.$store.state.config.width;
this.height = this.$store.state.config.height;
this.$iscs && this.$iscs.resize({ width: this.width, height: this.height });
// this.width = this.$store.state.config.width;
// this.height = this.$store.state.config.height;
// this.$iscs && this.$iscs.resize({ width: this.width, height: this.height });
});
},
back() {

36
src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
View File

@ -6,9 +6,9 @@
<div class="cctv-box-top-lefttop">选择显示终端</div>
<div class="cctv-box-top-left1">
<div class="each-cctv-box-top-btn">单画面</div>
<div class="each-cctv-box-top-btn">站厅<br/>默认画面</div>
<div class="each-cctv-box-top-btn">站厅<br>默认画面</div>
<div class="each-cctv-box-top-btn active">四画面</div>
<div class="each-cctv-box-top-btn">站台<br/>默认画面</div>
<div class="each-cctv-box-top-btn">站台<br>默认画面</div>
<div class="each-cctv-box-top-btn">大屏</div>
</div>
<div class="cctv-box-top-right1">
@ -43,16 +43,16 @@
v-for="item in descriptionList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
:value="item.value"
/>
</el-select>
</div>
<div style="margin-top: 20px;position: relative;left: 30px; width: 230px">
<el-input
v-model="textarea"
type="textarea"
:rows="6"
v-model="textarea">
</el-input>
/>
</div>
<div style="position: relative;left: 30px; width: 230px; display: flex; justify-content: space-between;margin-top: 10px">
<div class="each-cctv-box-top-gray-btn">预设位置</div>
@ -65,17 +65,17 @@
<div class="cctv-box-top-right-btn1" />
<div class="cctv-box-top-right-btn1 cctv-btn-gray" />
<div>
<div class="cctv-box-top-right-btn2"></div>
<div class="cctv-box-top-right-btn2 cctv-btn-gray"></div>
<div class="cctv-box-top-right-btn2 cctv-btn-gray"></div>
<div class="cctv-box-top-right-btn2 cctv-btn-gray"></div>
<div class="cctv-box-top-right-btn2 cctv-btn-gray"></div>
<div class="cctv-box-top-right-btn2" style="width: 40px;"></div>
<div class="cctv-box-top-right-btn2 cctv-btn-gray"></div>
<div class="cctv-box-top-right-btn2 cctv-btn-gray"></div>
<div class="cctv-box-top-right-btn2 cctv-btn-gray"></div>
<div class="cctv-box-top-right-btn2 cctv-btn-gray"></div>
<div class="cctv-box-top-right-btn2" style="margin-right: 0"></div>
<div class="cctv-box-top-right-btn2" />
<div class="cctv-box-top-right-btn2 cctv-btn-gray" />
<div class="cctv-box-top-right-btn2 cctv-btn-gray" />
<div class="cctv-box-top-right-btn2 cctv-btn-gray" />
<div class="cctv-box-top-right-btn2 cctv-btn-gray" />
<div class="cctv-box-top-right-btn2" style="width: 40px;" />
<div class="cctv-box-top-right-btn2 cctv-btn-gray" />
<div class="cctv-box-top-right-btn2 cctv-btn-gray" />
<div class="cctv-box-top-right-btn2 cctv-btn-gray" />
<div class="cctv-box-top-right-btn2 cctv-btn-gray" />
<div class="cctv-box-top-right-btn2" style="margin-right: 0" />
</div>
<div class="cctv-box-top-right-btn1" />
<div class="cctv-box-top-right-btn1 cctv-btn-gray" />
@ -102,7 +102,7 @@
<div id="cctv-43" class="cctv-box-content-btn" @click="changeCCTV('43')">云台</div>
</div>
<div class="cctv-box-content-draw">
<iscsSystem ref="iscsPlate" :widthCanvas="1490" />
<iscsSystem ref="iscsPlate" :width-canvas="1490" :canvas-height="400" />
</div>
</div>
<div class="cctv-box-bottom">

12
src/views/iscs/iscsSystem/config/cctv/timeEditCCTV.vue
View File

@ -2,7 +2,7 @@
<div class="edit-cctv-box">
<div class="title-name">CCTV时序编辑</div>
<div class="edit-cctv-top">
<div class="edit-cctv-top-title"></div>
<div class="edit-cctv-top-title" />
<div class="edit-cctv-top-content">
<div class="edit-cctv-top-contentL">
<el-table
@ -61,7 +61,7 @@
</div>
</div>
<div class="edit-cctv-bottom">
<div class="edit-cctv-bottom-title"></div>
<div class="edit-cctv-bottom-title" />
<div class="edit-cctv-bottom-content">
<div class="edit-cctv-bottom-contentL">
<div class="edit-cctv-bottom-contentLL">
@ -80,13 +80,13 @@
</div>
<div class="edit-cctv-bottom-contentLR">
<div class="edit-cctv-bottom-contentLRTitle">位置描述</div>
<div class="edit-cctv-bottom-contentLRGroup"></div>
<div class="edit-cctv-bottom-contentLRGroup" />
</div>
</div>
<div class="edit-cctv-bottom-contentR">
<div class="edit-cctv-bottom-contentRL">
<div class="edit-cctv-bottom-contentRLlabel">显示时间（秒）</div>
<div class="edit-cctv-bottom-contentRLtext"></div>
<div class="edit-cctv-bottom-contentRLtext" />
<div class="edit-cctv-bottom-contentRLBtn1">加入</div>
<div class="edit-cctv-bottom-contentRLBtn1">移除</div>
<div class="edit-cctv-bottom-contentRLBtn1">全部删除</div>
@ -98,7 +98,7 @@
</div>
<div class="edit-cctv-bottom-contentRCT2">
<div class="edit-cctv-bottom-contentRCT2title">序列描述</div>
<div class="edit-cctv-bottom-contentRCT2text"></div>
<div class="edit-cctv-bottom-contentRCT2text" />
</div>
<div class="edit-cctv-bottom-contentRContent">
<el-table
@ -132,7 +132,7 @@
</div>
<div class="edit-cctv-bottom-foot">
<div class="edit-cctv-bottom-footL">信息提示：</div>
<div class="edit-cctv-bottom-footC"></div>
<div class="edit-cctv-bottom-footC" />
<div class="edit-cctv-bottom-footR">
<div class="edit-cctv-bottom-footRbtn">车站时序</div>
</div>

6
src/views/iscs/iscsSystem/config/fire-alarm/stand.vue
View File

@ -1,8 +1,8 @@
<template>
<div>
<div class="stand_title">会展中心站火灾报警站台报警</div>
<div class="stand_title">{{ $route.query.stationName }}火灾报警站台报警</div>
<div class="">
<iscsSystem ref="iscsPlate" :widthCanvas="1520" />
<iscsSystem ref="iscsPlate" :width-canvas="1520" :canvas-height="500" />
</div>
</div>
</template>
@ -23,7 +23,7 @@ export default {
},
methods: {
},
}
};
</script>

6
src/views/iscs/iscsSystem/config/fire-alarm/stationHall.vue
View File

@ -1,8 +1,8 @@
<template>
<div>
<div class="stationHall_title">会展中心站火灾报警站厅报警</div>
<div class="stationHall_title">{{ $route.query.stationName }}火灾报警站厅报警</div>
<div class="">
<iscsSystem ref="iscsPlate" :widthCanvas="1300" />
<iscsSystem ref="iscsPlate" :width-canvas="1300" :canvas-height="650" />
</div>
</div>
</template>
@ -23,7 +23,7 @@ export default {
},
methods: {
},
}
};
</script>

2
src/views/iscs/iscsSystem/config/fire-alarm/system.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="">
系统报警
{{ $route.query.stationName }}系统报警
</div>
</template>

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

@ -28,11 +28,11 @@
<div class="secondary-title">实时信息显示内容</div>
<div class="information-context-box">
<el-input
v-model="addModel.infoContent"
type="textarea"
:rows="4"
placeholder="请输入内容"
v-model="addModel.infoContent">
</el-input>
/>
</div>
</div>
</el-col>
@ -47,8 +47,8 @@
</div>
<div style="margin-top: 10px">
<div style="display: inline;">名称：</div>
<input class="pis-dialog-input" style="width: 550px;" v-model="addModel.infoTitle"/>
<input v-show="addModel.infoType !== 'emergency'" class="pis-dialog-input" style="width: 140px;" v-model="addModel.infoTime"/>
<input v-model="addModel.infoTitle" class="pis-dialog-input" style="width: 550px;">
<input v-show="addModel.infoType !== 'emergency'" v-model="addModel.infoTime" class="pis-dialog-input" style="width: 140px;">
<div v-show="addModel.infoType !== 'emergency'" style="display: inline;">次</div>
</div>
<div v-show="addModel.infoType !== 'realTime'" class="secondary-title" style="margin-top: 10px">{{ this.message[this.addModel.infoType].title + '内容显示' }}</div>
@ -71,8 +71,8 @@
v-for="item in infoList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
: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'}">
@ -90,7 +90,7 @@
</el-col>
<el-col :span="21">
<el-form-item :prop="description" label-width="0">
<input v-model="form.description" style="width:600px;" />
<input v-model="form.description" style="width:600px;">
</el-form-item>
</el-col>
</el-row>
@ -103,16 +103,18 @@
v-model="form.startDate"
type="date"
size="mini"
placeholder="选择日期"/>
placeholder="选择日期"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :prop="endTime" label="结束时间">
<el-time-picker
arrow-control
v-model="form.endTime"
arrow-control
size="mini"
placeholder="选择时间"/>
placeholder="选择时间"
/>
</el-form-item>
</el-col>
</el-row>
@ -120,8 +122,8 @@
<el-col :span="12">
<el-form-item :prop="startTime" label="开始时间">
<el-time-picker
arrow-control
v-model="form.startTime"
arrow-control
size="mini"
placeholder="选择时间"
/>
@ -133,7 +135,8 @@
v-model="form.endDate"
type="date"
size="mini"
placeholder="选择日期"/>
placeholder="选择日期"
/>
</el-form-item>
</el-col>
</el-row>
@ -141,8 +144,8 @@
<el-col :span="12">
<el-form-item :prop="durationTime" label="延续时间">
<el-time-picker
arrow-control
v-model="form.durationTime"
arrow-control
size="mini"
placeholder="选择时间"
/>
@ -310,7 +313,7 @@ export default {
this.showRealTimeInfo = item.content;
}
}
}
};
</script>
<style scoped>

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

@ -37,7 +37,7 @@
<div class="screen_station_name">{{ station.stationName }}</div>
</div>
<div v-if="station.children&&station.children.length>0">
<div v-for="(child,index) in station.children" :key="station.stationName+index" class="each_data_info" @click="selectArea(station.stationName,index)" style="text-align: center;">
<div v-for="(child,index) in station.children" :key="station.stationName+index" class="each_data_info" style="text-align: center;" @click="selectArea(station.stationName,index)">
<div v-if="child.status==='default'" class="button_default_content">
<div class="button_default" :style="{background:selectedAreaList.includes(station.stationName + '-' + index)?'#2EFF74':'#CDCDCD'}" />
</div>

2
src/views/iscs/iscsSystem/config/pis/timePreview.vue
View File

@ -45,7 +45,7 @@
<div class="time_preview_footer">
<div class="preview_footer_top">操作</div>
<div class="preview_footer_content">
<div class="each_preview_btn each_preview_back">区域<br/>详细</div>
<div class="each_preview_btn each_preview_back">区域<br>详细</div>
<div class="each_preview_btn each_preview_back">删除</div>
<div class="each_preview_btn each_preview_back">停用</div>
<div class="each_preview_btn each_preview_back1">激活</div>

10
src/views/iscs/iscsSystem/config/psd/psd.vue
View File

@ -1,24 +1,24 @@
<template>
<div>
<div class="psd_title">会展中心站屏蔽门</div>
<div class="psd_title">{{ $route.query.stationName }}屏蔽门</div>
<div>
<iscsSystem ref="iscsPlate" :widthCanvas="1490" />
<iscsSystem ref="iscsPlate" :width-canvas="1490" :canvas-height="800" />
</div>
</div>
</template>
<script>
import iscsSystem from "../canvas/iscsCanvas";
import iscsSystem from '../canvas/iscsCanvas';
export default {
components: {
iscsSystem
},
data() {
return {
mes: "1111"
mes: '1111'
};
},
mounted() {
this.$refs.iscsPlate.show("31");
this.$refs.iscsPlate.show('31');
},
methods: {}
};

10
src/views/iscs/iscsSystem/nav.vue
View File

@ -34,7 +34,8 @@ export default {
return {
selectIndex: 0,
selectChildIndex: -1,
selectStationIndex: -1,
selectStationIndex: 0,
type: '',
currentSystem: 'center',
systemList: [
{
@ -275,16 +276,19 @@ export default {
this.selectIndex = index;
this.selectChildIndex = 0;
if (item.children.length) {
this.$router.push({ path: `/iscs/system/config/${item.children[0].type}`, query: {currentSystem:this.currentSystem} });
this.type = item.children[0].type;
this.$router.push({ path: `/iscs/system/config/${item.children[0].type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });
}
}
},
selectChildren(item, index) { // 选择子菜单
this.selectChildIndex = index;
this.$router.push({ path: `/iscs/system/config/${item.type}`, query: {currentSystem:this.currentSystem} });
this.type = item.type;
this.$router.push({ path: `/iscs/system/config/${item.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });
},
selectStation(item, index) { // 选择子菜单
this.selectStationIndex = index;
this.$router.push({ path: `/iscs/system/config/${this.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });
},
back() {
this.$router.push({ path: `/design/home` });