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:
lVAL 2020-09-28 13:15:54 +08:00
parent 00d4976f66
commit d5c9706311
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/iscs/iscsDraw/icscComponents/circle.vue
View File

@ -2,7 +2,7 @@
<div style="overflow-y: scroll;height: calc(100% - 46px); width: 100%;">
<el-form ref="form" :rules="rules" :model="form" label-width="80px" style="width: 100%;padding: 10px 50px;">
<el-form-item label="半径:" prop="radius">
<el-input-number v-model="form.radius" controls-position="right" :min="5" size="small" />
<el-input-number v-model="form.radius" controls-position="right" :min="3" size="small" />
</el-form-item>
<el-form-item label="填充色:" prop="fillColor">
<el-color-picker v-model="form.fillColor" show-alpha size="small" />

12
src/views/iscs/iscsDraw/iscsPowerMonitoring/index.vue
View File

@ -57,6 +57,14 @@
@createDataModel="createDataModel"
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="三角形" name="IscsTriangle">
<iscs-triangle
ref="iscsTriangle"
style="width: 100%;height: 100%;"
@createDataModel="createDataModel"
@deleteDataModel="deleteDataModel"
/>
</el-tab-pane>
<el-tab-pane label="圆形" name="IscsCircle">
<iscs-circle
@ -121,6 +129,7 @@ import IscsRhombus from '../icscComponents/rhombus';
import IscsTick from '../icscComponents/tick';
import IscsStateTable from '../icscComponents/stateTable';
import IscsArrow from '../icscComponents/arrow';
import IscsTriangle from '../icscComponents/triangle';
import IscsCircle from '../icscComponents/circle';
import IscsPicture from '../icscComponents/picture';
import IscsPower from '../icscComponents/power';
@ -137,7 +146,8 @@ export default {
IscsTick,
IscsStateTable,
IscsArrow,
IscsRadioText,
IscsRadioText,
IscsTriangle,
IscsCircle,
IscsPower,
IscsPicture