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-10-12 18:08:42 +08:00
commit 0715dcc3c7
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/assets/iscs_picture/sdsda90416.png → src/assets/iscs_picture/fanCoil.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

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

@ -41,6 +41,7 @@ import iscsRAFEAFGreen from '@/assets/iscs_picture/iscs-RAF-EAF_green.png';
import iscsRAFEAFGray from '@/assets/iscs_picture/iscs-RAF-EAF_gray.png'; import iscsRAFEAFGray from '@/assets/iscs_picture/iscs-RAF-EAF_gray.png';
import iscsSEF from '@/assets/iscs_picture/iscs-SEF.png'; import iscsSEF from '@/assets/iscs_picture/iscs-SEF.png';
import iscsValue from '@/assets/iscs_picture/iscs-value.png'; import iscsValue from '@/assets/iscs_picture/iscs-value.png';
import fanCoil from '@/assets/iscs_picture/fanCoil.png';
const pictureObj = { const pictureObj = {
'psdLeft': psdLeft, 'psdLeft': psdLeft,
@ -82,7 +83,8 @@ const pictureObj = {
iscsRAFEAFGreen, iscsRAFEAFGreen,
iscsRAFEAFGray, iscsRAFEAFGray,
iscsSEF, iscsSEF,
iscsValue iscsValue,
fanCoil
}; };
export default class Picture extends Group { export default class Picture extends Group {
constructor(device) { constructor(device) {

3
src/views/iscs/iscsDraw/icscComponents/picture.vue
View File

@ -95,7 +95,8 @@ export default {
{ name: '排烟风机(箭头)-灰色', value: 'iscsRAFEAFGray' }, { name: '排烟风机(箭头)-灰色', value: 'iscsRAFEAFGray' },
{ name: '排烟风机(箭头)-绿色', value: 'iscsRAFEAFGreen' }, { name: '排烟风机(箭头)-绿色', value: 'iscsRAFEAFGreen' },
{ name: '排烟风机', value: 'iscsSEF' }, { name: '排烟风机', value: 'iscsSEF' },
{ name: '阀门', value: 'iscsValue' } { name: '阀门', value: 'iscsValue' },
{ name: '风扇机', value: 'fanCoil'}
], ],
rules: { rules: {