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 2020-02-07 18:59:48 +08:00
parent 789d9c8be9
commit 60d6ab5db9
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

4
src/iscs/shape/ArcStatus.js
View File

@ -21,8 +21,8 @@ export default class ArcStatus extends Group {
zlevel: model.zlevel,
z: model.z,
shape: {
cx: this.model.point.x,
cy: this.model.point.y,
cx: 0,
cy: 0,
r: this.model.r
},
style: {

2
src/views/iscs/iscsDraw/iscsPsdOperate/ArcStatus.vue
View File

@ -5,7 +5,7 @@
<el-input-number v-model="form.r" controls-position="right" :min="1" />
</el-form-item>
<el-form-item label="填充色" prop="fillColor">
<el-color-picker v-model="form.fillColor" show-alpha></el-color-picker>
<el-color-picker v-model="form.fillColor"></el-color-picker>
</el-form-item>
<el-form-item label="X轴坐标">
<el-input-number v-model="form.x" controls-position="right" :min="1" />

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

@ -80,12 +80,17 @@
<div class="cctv-box-top-right-btn1"/>
<div class="cctv-box-top-right-btn1 cctv-btn-gray"/>
<div>
<div style="display: inline-block;width: 40px; height: 30px; background: #666666;margin-top: 10px; position: relative; left: -90px;line-height: 30px;">+</div>
<div style="display: inline-block;width: 40px; height: 30px; background: #666666;margin-top: 10px; position: relative; left: -70px;line-height: 30px;">-</div>
<div style="display: inline-block;width: 40px; height: 30px; background: #666666;margin-top: 10px; position: relative; left: -10px;line-height: 30px;">+</div>
<div style="display: inline-block;width: 40px; height: 30px; background: #666666;margin-top: 10px; position: relative; left: 10px;line-height: 30px;">-</div>
<div style="display: inline-block;width: 40px; height: 30px; background: #666666;margin-top: 10px; position: relative; left: 70px;line-height: 30px;">+</div>
<div style="display: inline-block;width: 40px; height: 30px; background: #666666;margin-top: 10px; position: relative; left: 90px;line-height: 30px;">-</div>
<div style="display: inline-block;position: relative; left: -130px; color: #fff;">光圈</div>
<div style="display: inline-block;position: relative; left: 0; color: #fff;">聚焦</div>
<div style="display: inline-block;position: relative; left: 130px; color: #fff;">放大</div>
</div>
<div>
<div class="cctv-box-top-right-btn3 cctv-btn-gray" style="left: -90px;">+</div>
<div class="cctv-box-top-right-btn3 cctv-btn-gray" style="left: -70px;">-</div>
<div class="cctv-box-top-right-btn3 cctv-btn-gray" style="left: -10px;">+</div>
<div class="cctv-box-top-right-btn3 cctv-btn-gray" style="left: 10px;">-</div>
<div class="cctv-box-top-right-btn3 cctv-btn-gray" style="left: 70px;">+</div>
<div class="cctv-box-top-right-btn3 cctv-btn-gray" style="left: 90px;">-</div>
</div>
</div>
</div>
@ -239,6 +244,16 @@ justify-content:center;text-align:center;
margin-top: 10px;
margin-right: 10px;
}
.cctv-box-top-right-btn3{
display: inline-block;
width: 40px;
height: 30px;
background: #666666;
margin-top: 10px;
position: relative;
left: -90px;
line-height: 30px;
}
.cctv-btn-gray{
background: #666666;
border-top: 2px solid #fff;