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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
fan 2020-06-15 18:00:39 +08:00
commit 38a5aeec67
18 changed files with 145 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/iscs/constant/iscsData.js
View File

File diff suppressed because one or more lines are too long

4
src/iscs/shape/bas/smookProofFd.js
View File

@ -97,6 +97,10 @@ export default class smookProofFd extends Group {
this.grouper.add(this.polygon1);
this.grouper.add(this.polyline2);
this.grouper.add(this.polyline3);
if (this.model.rotate) {
this.grouper.origin = [this.model.width / 2, this.model.width * 1.368 / 2];
this.grouper.rotation = Math.PI / 180 * Number(this.model.rotate);
}
this.add(this.grouper);
}
setModel(dx, dy) {

4
src/iscs/shape/bas/ventilator.js
View File

@ -114,9 +114,9 @@ export default class ventilator extends Group {
this.grouper.add(this.rhombus2);
this.grouper.add(this.triangle);
this.grouper.add(this.line);
if (!this.model.isRight) {
if (this.model.rotate) {
this.grouper.origin = [this.model.width / 2, this.model.width * 1.368 / 2];
this.grouper.scale = [-1, 1];
this.grouper.rotation = Math.PI / 180 * Number(this.model.rotate);
}
this.add(this.grouper);

10
src/views/designUser/mapmanage/operateMenu.vue
View File

@ -253,3 +253,13 @@ export default {
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
/deep/ {
.menu-item{
background: #f1ecec;
.pop-menu {
background: #5F9EA0;
}
}
}
</style>

12
src/views/iscs/iscsDesign/demonList.vue
View File

@ -128,6 +128,18 @@ export default {
id: '22',
type: 'interface'
},
{
name: '小系统B端',
mode: 'bas',
id: '22-1',
type: 'interface'
},
{
name: '小系统A端(二)',
mode: 'bas',
id: '22-2',
type: 'interface'
},
{
name: '水系统',
mode: 'bas',

2
src/views/iscs/iscsDraw/iscsBasOperate/fireDamper.vue
View File

@ -5,7 +5,7 @@
<el-input v-model="form.code" :disabled="true" />
</el-form-item>
<el-form-item label="图形宽度" prop="width">
<el-input-number v-model="form.width" :min="15" />
<el-input-number v-model="form.width" :min="10" />
</el-form-item>
<el-form-item label="方向" prop="direction">
<el-select v-model="form.direction" placeholder="请选择类型">

10
src/views/iscs/iscsDraw/iscsBasOperate/smookProofFd.vue
View File

@ -5,7 +5,10 @@
<el-input v-model="form.code" :disabled="true" />
</el-form-item>
<el-form-item label="图形宽度" prop="width">
<el-input-number v-model="form.width" :min="20" />
<el-input-number v-model="form.width" :min="10" />
</el-form-item>
<el-form-item label="旋转角度" prop="rotate">
<el-input-number v-model="form.rotate" />
</el-form-item>
<el-form-item label="X轴坐标" prop="x">
<el-input-number v-model="form.x" controls-position="right" :min="1" />
@ -34,6 +37,7 @@ export default {
form:{
code:'',
width: 20,
rotate: 0,
x: 10,
y: 10
},
@ -69,6 +73,7 @@ export default {
this.form.width = model.width;
this.form.x = model.point.x;
this.form.y = model.point.y;
this.form.rotate = model.rotate || 0;
}
}
},
@ -87,6 +92,7 @@ export default {
_type: 'SmookProofFd',
code: this.isUpdate ? this.form.code : getUID('SmookProofFd', this.iscs.smookProofFdList),
width: this.form.width,
rotate: this.form.rotate,
color:'#00ff00'
};
this.$emit('createSmookProofFd', smookProofFdModel);
@ -104,6 +110,7 @@ export default {
this.form = {
code:'',
width: 20,
rotate: 0,
x: 10,
y: 10
};
@ -116,6 +123,7 @@ export default {
y: this.form.y
},
_type: 'SmookProofFd',
rotate: 0,
code: this.form.code,
width: this.form.width,
color:'#00ff00'

10
src/views/iscs/iscsDraw/iscsBasOperate/ventilator.vue
View File

@ -7,8 +7,8 @@
<el-form-item label="图形宽度" prop="width">
<el-input-number v-model="form.width" :min="40" />
</el-form-item>
<el-form-item label="排风机朝右" prop="isRight">
<el-checkbox v-model="form.isRight" />
<el-form-item label="旋转角度" prop="rotate">
<el-input-number v-model="form.rotate" />
</el-form-item>
<el-form-item label="X轴坐标" prop="x">
<el-input-number v-model="form.x" controls-position="right" :min="1" />
@ -36,7 +36,7 @@ export default {
buttonText: '立即创建',
form:{
code:'',
isRight:true,
rotate: 0,
width: 40,
x: 10,
y: 10
@ -73,7 +73,7 @@ export default {
this.form.width = model.width;
this.form.x = model.point.x;
this.form.y = model.point.y;
this.form.isRight = model.isRight;
this.form.rotate = model.rotate || 0;
}
}
},
@ -92,7 +92,7 @@ export default {
_type: 'Ventilator',
code: this.isUpdate ? this.form.code : getUID('Ventilator', this.iscs.ventilatorList),
width: this.form.width,
isRight:this.form.isRight,
rotate: this.form.rotate,
color:'#00ff00'
};
this.$emit('createVentilator', chillerModel);

5
src/views/iscs/iscsDraw/iscsCommonElem/button.vue
View File

@ -58,7 +58,10 @@ export default {
{label: '公共区域', value: 'PublicArea'},
{label: '操作按钮', value: 'OperatingButton'},
{label: '返回', value: 'GoBack'},
{label: '至EPS系统及导向照明', value: 'GoEPS'}
{label: '至EPS系统及导向照明', value: 'GoEPS'},
{label: '至B端小系统', value: 'GoBMiniSystem'},
{label: '至A端小系统(一)', value: 'GoAMiniSystem1'},
{label: '至A端小系统(二)', value: 'GoAMiniSystem2'}
],
form: {
code: '',

20
src/views/iscs/iscsSystem/config/bas/smallSystem.vue
View File

@ -2,7 +2,7 @@
<div class="bigSystemBox">
<div class="title-name">{{ $route.query.stationName }}机电小系统</div>
<div class="">
<iscsSystem ref="iscsPlate" :width-canvas="1300" :canvas-height="650" />
<iscsSystem ref="iscsPlate" :width-canvas="width" :canvas-height="750" />
</div>
</div>
</template>
@ -14,9 +14,25 @@ export default {
},
data() {
return {
mes: '1111'
mes: '1111',
width: 1200
};
},
watch: {
'$store.state.iscs.selectedCount': function() {
const device = this.$store.state.iscs.selected;
if (device && device._type === 'IscsButton' && device.function === 'GoBMiniSystem') { // 至B端小系统
this.width = 1400;
this.$refs.iscsPlate.iscsLoadData('22-1');
} else if (device && device._type === 'IscsButton' && device.function === 'GoAMiniSystem1') { // 至A端小系统(一) 默认
this.width = 1200;
this.$refs.iscsPlate.iscsLoadData('22');
} else if (device && device._type === 'IscsButton' && device.function === 'GoAMiniSystem2') { // 至A端小系统(二)
this.width = 1200;
this.$refs.iscsPlate.iscsLoadData('22-2');
}
}
},
mounted() {
this.$refs.iscsPlate.show('22');
},

10
src/views/jointTraining/menuDraft/operateMenu.vue
View File

@ -133,3 +133,13 @@ export default {
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
/deep/ {
.menu-item{
background: #f1ecec;
.pop-menu {
background: #5F9EA0;
}
}
}
</style>

10
src/views/jsxt/refereeList/display.vue
View File

@ -283,3 +283,13 @@ export default {
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
/deep/ {
.menu-item{
background: #f1ecec;
.pop-menu {
background: #5F9EA0;
}
}
}
</style>

10
src/views/lesson/operateMenu.vue
View File

@ -118,3 +118,13 @@ export default {
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
/deep/ {
.menu-item{
background: #f1ecec;
.pop-menu {
background: #5F9EA0;
}
}
}
</style>

10
src/views/newMap/jointTrainingNew/menuDraft/operateMenu.vue
View File

@ -133,3 +133,13 @@ export default {
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
/deep/ {
.menu-item{
background: #f1ecec;
.pop-menu {
background: #5F9EA0;
}
}
}
</style>

10
src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
View File

@ -312,3 +312,13 @@ export default {
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
/deep/ {
.menu-item{
background: #f1ecec;
.pop-menu {
background: #5F9EA0;
}
}
}
</style>

8
src/views/newMap/newMapdraft/index.vue
View File

@ -651,6 +651,14 @@ export default {
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
@import "src/styles/mixin.scss";
/deep/ {
.menu-item{
background: #f1ecec;
.pop-menu {
background: #5F9EA0;
}
}
}
.mask{
opacity: 0;
background: #000;

5
src/views/newMap/newMapdraft/mapoperate/switch/index.vue
View File

@ -1,7 +1,7 @@
<template>
<el-tabs v-model="activeName" class="card">
<el-tab-pane class="view-control" :label="$t('map.property')" name="first" :lazy="lazy">
<switch-model ref="switchModel" @updateMapModel="updateMapModel" />
<switch-model ref="switchModel" @updateMapModel="updateMapModel" @setCenter="setCenter" />
</el-tab-pane>
<el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
<create-switch ref="createSwitch" @updateMapModel="updateMapModel" />
@ -53,6 +53,9 @@ export default {
// }
},
methods: {
setCenter(code) {
this.$emit('setCenter', code);
},
filterSections(query, item) {
return item.pinyin.indexOf(query) > -1;
},

10
src/views/trainRoom/content-menu.vue
View File

@ -85,3 +85,13 @@ export default {
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
/deep/ {
.menu-item{
background: #f1ecec;
.pop-menu {
background: #5F9EA0;
}
}
}
</style>