From 43b837c7d49b95d7a3bf86e709b69023dce79fc7 Mon Sep 17 00:00:00 2001 From: lVAL Date: Mon, 12 Oct 2020 17:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A3=8E=E6=89=87=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iscs_picture/{sdsda90416.png => fanCoil.png} | Bin src/iscs/shape/picture.js | 4 +++- src/utils/baseUrl.js | 4 ++-- src/views/iscs/iscsDraw/icscComponents/picture.vue | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) rename src/assets/iscs_picture/{sdsda90416.png => fanCoil.png} (100%) diff --git a/src/assets/iscs_picture/sdsda90416.png b/src/assets/iscs_picture/fanCoil.png similarity index 100% rename from src/assets/iscs_picture/sdsda90416.png rename to src/assets/iscs_picture/fanCoil.png diff --git a/src/iscs/shape/picture.js b/src/iscs/shape/picture.js index aad23c7bd..beee3788b 100644 --- a/src/iscs/shape/picture.js +++ b/src/iscs/shape/picture.js @@ -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 iscsSEF from '@/assets/iscs_picture/iscs-SEF.png'; import iscsValue from '@/assets/iscs_picture/iscs-value.png'; +import fanCoil from '@/assets/iscs_picture/fanCoil.png'; const pictureObj = { 'psdLeft': psdLeft, @@ -82,7 +83,8 @@ const pictureObj = { iscsRAFEAFGreen, iscsRAFEAFGray, iscsSEF, - iscsValue + iscsValue, + fanCoil }; export default class Picture extends Group { constructor(device) { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index a1032fe84..524befeac 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,8 +2,8 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; - BASE_API = 'http://192.168.3.5:9000'; // 袁琪 + BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.175:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 diff --git a/src/views/iscs/iscsDraw/icscComponents/picture.vue b/src/views/iscs/iscsDraw/icscComponents/picture.vue index 0a64d0ba3..d1aced18e 100644 --- a/src/views/iscs/iscsDraw/icscComponents/picture.vue +++ b/src/views/iscs/iscsDraw/icscComponents/picture.vue @@ -95,7 +95,8 @@ export default { { name: '排烟风机(箭头)-灰色', value: 'iscsRAFEAFGray' }, { name: '排烟风机(箭头)-绿色', value: 'iscsRAFEAFGreen' }, { name: '排烟风机', value: 'iscsSEF' }, - { name: '阀门', value: 'iscsValue' } + { name: '阀门', value: 'iscsValue' }, + { name: '风扇机', value: 'fanCoil'} ], rules: {