From 1134d42c3ccd19e30fc76984ad4c75adf5b85c5e Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 13 Oct 2020 13:08:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs/status/elType.js | 6 ++++++ src/iscs/status/grType.js | 3 +++ src/iscs/status/mapElement.js | 25 +++++++++++++++++++++++++ src/iscs/status/mapGroup.js | 13 +++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 src/iscs/status/elType.js create mode 100644 src/iscs/status/grType.js create mode 100644 src/iscs/status/mapElement.js create mode 100644 src/iscs/status/mapGroup.js diff --git a/src/iscs/status/elType.js b/src/iscs/status/elType.js new file mode 100644 index 000000000..bd803a23e --- /dev/null +++ b/src/iscs/status/elType.js @@ -0,0 +1,6 @@ +export default { + Fixed: 'Fixed', // 固定值 + A: 'a', // 远 + B: 'b', // 红框 阀门 + C: 'c' // 数组 +}; diff --git a/src/iscs/status/grType.js b/src/iscs/status/grType.js new file mode 100644 index 000000000..3f5520a66 --- /dev/null +++ b/src/iscs/status/grType.js @@ -0,0 +1,3 @@ +export default { + A: 'a' // 远 红框 阀门 +}; diff --git a/src/iscs/status/mapElement.js b/src/iscs/status/mapElement.js new file mode 100644 index 000000000..4a0031ce5 --- /dev/null +++ b/src/iscs/status/mapElement.js @@ -0,0 +1,25 @@ +import elType from './elType'; + +export default { + [elType.A]: { + defval: 'stateA', + stateMap: { + stateA: {}, + stateB: {} + } + }, // 远 + [elType.B]: { + defval: 'stateA', + stateMap: { + stateA: {}, + stateB: {} + } + }, // 红框 阀门 + [elType.C]: { + defval: 'stateA', + stateMap: { + stateA: {}, + stateB: {} + } + } // 数组 +}; diff --git a/src/iscs/status/mapGroup.js b/src/iscs/status/mapGroup.js new file mode 100644 index 000000000..28dbcf1bc --- /dev/null +++ b/src/iscs/status/mapGroup.js @@ -0,0 +1,13 @@ +import elType from './elType'; +import grType from './grType'; + +export default { + [grType.A]: { + name: '', + elemList: [ + {type: elType.A}, + {type: elType.B}, + {type: elType.C} + ] + } +}; From 8ad2b2b3a36992f4c330f96836f7782071b7b572 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 13 Oct 2020 14:01:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=AD=97=E5=85=B8=E5=8F=8A=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{xcntr6951799.png => iscs-dangwei.png} | Bin .../{sfzxcrf1830.png => iscs-dibian.png} | Bin .../{zdse958.png => iscs-pt1.png} | Bin .../{sdxcfh039.png => iscs-sensor.png} | Bin src/iscs/shape/picture.js | 12 ++++++-- src/iscs/shape/rect.js | 8 +++-- src/iscs/shape/text.js | 4 +++ src/iscs/status/mapElement.js | 28 ++++++++++++++---- .../iscs/iscsDraw/icscComponents/picture.vue | 8 +++-- .../iscs/iscsDraw/icscComponents/rect.vue | 14 ++++----- 10 files changed, 55 insertions(+), 19 deletions(-) rename src/assets/iscs_picture/{xcntr6951799.png => iscs-dangwei.png} (100%) rename src/assets/iscs_picture/{sfzxcrf1830.png => iscs-dibian.png} (100%) rename src/assets/iscs_picture/{zdse958.png => iscs-pt1.png} (100%) rename src/assets/iscs_picture/{sdxcfh039.png => iscs-sensor.png} (100%) diff --git a/src/assets/iscs_picture/xcntr6951799.png b/src/assets/iscs_picture/iscs-dangwei.png similarity index 100% rename from src/assets/iscs_picture/xcntr6951799.png rename to src/assets/iscs_picture/iscs-dangwei.png diff --git a/src/assets/iscs_picture/sfzxcrf1830.png b/src/assets/iscs_picture/iscs-dibian.png similarity index 100% rename from src/assets/iscs_picture/sfzxcrf1830.png rename to src/assets/iscs_picture/iscs-dibian.png diff --git a/src/assets/iscs_picture/zdse958.png b/src/assets/iscs_picture/iscs-pt1.png similarity index 100% rename from src/assets/iscs_picture/zdse958.png rename to src/assets/iscs_picture/iscs-pt1.png diff --git a/src/assets/iscs_picture/sdxcfh039.png b/src/assets/iscs_picture/iscs-sensor.png similarity index 100% rename from src/assets/iscs_picture/sdxcfh039.png rename to src/assets/iscs_picture/iscs-sensor.png diff --git a/src/iscs/shape/picture.js b/src/iscs/shape/picture.js index beee3788b..9fdbc5c25 100644 --- a/src/iscs/shape/picture.js +++ b/src/iscs/shape/picture.js @@ -42,6 +42,10 @@ 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'; +import iscsSensor from '@/assets/iscs_picture/iscs-sensor.png'; +import iscsDangwei from '@/assets/iscs_picture/iscs-dangwei.png'; +import iscsDibian from '@/assets/iscs_picture/iscs-dibian.png'; +import iscsPt1 from '@/assets/iscs_picture/iscs-pt1.png'; const pictureObj = { 'psdLeft': psdLeft, @@ -83,8 +87,12 @@ const pictureObj = { iscsRAFEAFGreen, iscsRAFEAFGray, iscsSEF, - iscsValue, - fanCoil + iscsValue, + fanCoil, + iscsSensor, + iscsDangwei, + iscsDibian, + iscsPt1 }; export default class Picture extends Group { constructor(device) { diff --git a/src/iscs/shape/rect.js b/src/iscs/shape/rect.js index c389ce27d..d180fb6a5 100644 --- a/src/iscs/shape/rect.js +++ b/src/iscs/shape/rect.js @@ -20,8 +20,8 @@ export default class rect extends Group { const lineDash = model.type == 'dashed' ? [8, 5] : [0, 0]; this.iscsRect = new Rect({ zlevel: model.zlevel, - z: model.z, - z2: model.z2||0, + z: model.z, + z2: model.z2 || 0, shape: { x: 0, y: 0, @@ -38,6 +38,10 @@ export default class rect extends Group { this.grouper.add(this.iscsRect); this.add(this.grouper); } + setState(model) { + this.iscsRect.setStyle('fill', model.fillColor); + this.iscsRect.setStyle('stroke', model.strokeColor); + } setModel(dx, dy) { this.model.point.x += dx; this.model.point.y += dy; diff --git a/src/iscs/shape/text.js b/src/iscs/shape/text.js index 0b3a481ba..1969de132 100644 --- a/src/iscs/shape/text.js +++ b/src/iscs/shape/text.js @@ -49,6 +49,10 @@ export default class text extends Group { this.model.point.x += dx; this.model.point.y += dy; } + setState(model) { + this.textName.setStyle('text', model.context); + this.textName.setStyle('textBackgroundColor', model.gbColor); + } setSize(width, height) { this.model.width = width; this.model.height = height; diff --git a/src/iscs/status/mapElement.js b/src/iscs/status/mapElement.js index 4a0031ce5..80011c4ce 100644 --- a/src/iscs/status/mapElement.js +++ b/src/iscs/status/mapElement.js @@ -4,22 +4,38 @@ export default { [elType.A]: { defval: 'stateA', stateMap: { - stateA: {}, - stateB: {} + stateA: { + gbColor: 'rgba(157, 171, 0, 1)', + context: '远' + }, + stateB: { + gbColor: 'rgba(157, 171, 0, 1)', + context: '近' + } } }, // 远 [elType.B]: { defval: 'stateA', stateMap: { - stateA: {}, - stateB: {} + stateA: { + fillColor: 'red', + strokeColor: 'red' + }, + stateB: { + fillColor: 'rgba(0, 255, 13, 1)', + strokeColor: 'rgba(0, 255, 13, 1)' + } } }, // 红框 阀门 [elType.C]: { defval: 'stateA', stateMap: { - stateA: {}, - stateB: {} + stateA: { + context: '8.3' + }, + stateB: { + context: '7.6' + } } } // 数组 }; diff --git a/src/views/iscs/iscsDraw/icscComponents/picture.vue b/src/views/iscs/iscsDraw/icscComponents/picture.vue index d1aced18e..a2244519e 100644 --- a/src/views/iscs/iscsDraw/icscComponents/picture.vue +++ b/src/views/iscs/iscsDraw/icscComponents/picture.vue @@ -95,8 +95,12 @@ export default { { name: '排烟风机(箭头)-灰色', value: 'iscsRAFEAFGray' }, { name: '排烟风机(箭头)-绿色', value: 'iscsRAFEAFGreen' }, { name: '排烟风机', value: 'iscsSEF' }, - { name: '阀门', value: 'iscsValue' }, - { name: '风扇机', value: 'fanCoil'} + { name: '阀门', value: 'iscsValue' }, + { name: '风扇机', value: 'fanCoil'}, + { name: '烟杆传感器', value: 'iscsSensor' }, + { name: '抵挡图', value: 'iscsDangwei' }, + { name: '地变图', value: 'iscsDibian' }, + { name: 'PT1', value: 'iscsPt1' } ], rules: { diff --git a/src/views/iscs/iscsDraw/icscComponents/rect.vue b/src/views/iscs/iscsDraw/icscComponents/rect.vue index 94df84b43..675db4798 100644 --- a/src/views/iscs/iscsDraw/icscComponents/rect.vue +++ b/src/views/iscs/iscsDraw/icscComponents/rect.vue @@ -1,7 +1,7 @@ @@ -34,7 +38,6 @@ import IscsCctvOperate from './iscsCctvOperate/index'; import IscsAfcOperate from './iscsAfcOperate/index'; import IscsAcsOperate from './iscsAcsOperate/index'; import IscsNetOperate from './IscsNetOperate/index'; - import IscsAutomatic from './iscsAutomatic/index'; import IscsCommunication from './iscsCommunication/index'; import IscsFireAlarm from './iscsFireAlarm/index'; @@ -42,7 +45,6 @@ import IscsPowerMonitoring from './iscsPowerMonitoring/index'; import IscsSignalSystem from './iscsSignalSystem/index'; import IscsPsd from './iscsPsd/index'; import IscsEnvironment from './iscsEnvironment/index'; - import { saveIscsElement } from '@/api/iscs'; export default { @@ -72,7 +74,8 @@ export default { height: this.$store.state.app.height - 60 }, widthLeft: Number(localStore.get('LeftWidth')) || 450, - draftShow: false + draftShow: false, + tableShow: false }; }, computed:{ @@ -97,9 +100,12 @@ export default { this.$refs.iscsPlate.show(mode, system, part); this.$refs.iscsPlate.drawIscsInit(); }, - clickRightBtn() { + clickDraftBtn() { this.draftShow = !this.draftShow; - }, + }, + clickTableBtn() { + this.tableShow = !this.tableShow; + }, handleSave(data) { const param = { graphData: data, @@ -121,7 +127,17 @@ export default { diff --git a/src/views/iscs/iscsSystem/bottom.vue b/src/views/iscs/iscsSystem/bottom.vue deleted file mode 100644 index 694d3cf67..000000000 --- a/src/views/iscs/iscsSystem/bottom.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/src/views/iscs/iscsSystem/index.vue b/src/views/iscs/iscsSystem/index.vue index 2222b172d..bbc491cc4 100644 --- a/src/views/iscs/iscsSystem/index.vue +++ b/src/views/iscs/iscsSystem/index.vue @@ -14,7 +14,6 @@ - @@ -23,7 +22,6 @@ import TopNav from './nav.vue'; import GroupNav from './groupNav.vue'; import StationNav from './stationNav.vue'; import MenuBar from './menuBar.vue'; -// import bottom from './bottom.vue'; export default { components: { @@ -31,7 +29,6 @@ export default { GroupNav, MenuBar, StationNav - // bottom }, data() { return { From a0da15d73152c7f2bc4f5733c0d00e3d5471b364 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 13 Oct 2020 14:10:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B9=E5=90=91=E6=9D=86=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/newMapdraft/mapoperate/directionRod.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/newMap/newMapdraft/mapoperate/directionRod.vue b/src/views/newMap/newMapdraft/mapoperate/directionRod.vue index f7fdf8a38..52d93615e 100644 --- a/src/views/newMap/newMapdraft/mapoperate/directionRod.vue +++ b/src/views/newMap/newMapdraft/mapoperate/directionRod.vue @@ -212,6 +212,7 @@ export default { startStationCode: this.addModel.startStationCode, endStationCode: this.addModel.endStationCode, deviceStationCode: section.stationCode, + right: this.addModel.right, position: { x: section.points[0].x, y: section.points[0].y - this.addModel.height From 04b6dbfba10563e94a48367c5ebbcd51266ebeeb Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Tue, 13 Oct 2020 14:33:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=A8=A1=E6=9D=BF=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs/status/elType.js | 8 ++++---- src/iscs/status/grType.js | 2 +- src/iscs/status/mapElement.js | 6 +++--- src/iscs/status/mapGroup.js | 3 +-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/iscs/status/elType.js b/src/iscs/status/elType.js index bd803a23e..fff8348a9 100644 --- a/src/iscs/status/elType.js +++ b/src/iscs/status/elType.js @@ -1,6 +1,6 @@ export default { - Fixed: 'Fixed', // 固定值 - A: 'a', // 远 - B: 'b', // 红框 阀门 - C: 'c' // 数组 + Fixed: { lab: 'Fixed', describe: '状态值不做处理，请选择该类型'}, // 固定值 + A: { lab: 'a', describe: '文字 远/近 状态转换类型'}, // 远 + B: { lab: 'b', describe: '开关阀门矩形 状态转换类型'}, // 红框 阀门 + C: { lab: 'c', describe: '电流电压文字转换类型'} // 数组 }; diff --git a/src/iscs/status/grType.js b/src/iscs/status/grType.js index 3f5520a66..62b45df35 100644 --- a/src/iscs/status/grType.js +++ b/src/iscs/status/grType.js @@ -1,3 +1,3 @@ export default { - A: 'a' // 远 红框 阀门 + A: { lab: 'a', describe: '自定义模板类型'} // 远 红框 阀门 }; diff --git a/src/iscs/status/mapElement.js b/src/iscs/status/mapElement.js index 80011c4ce..1eca0bf7c 100644 --- a/src/iscs/status/mapElement.js +++ b/src/iscs/status/mapElement.js @@ -1,7 +1,7 @@ import elType from './elType'; export default { - [elType.A]: { + [elType.A.lab]: { defval: 'stateA', stateMap: { stateA: { @@ -14,7 +14,7 @@ export default { } } }, // 远 - [elType.B]: { + [elType.B.lab]: { defval: 'stateA', stateMap: { stateA: { @@ -27,7 +27,7 @@ export default { } } }, // 红框 阀门 - [elType.C]: { + [elType.C.lab]: { defval: 'stateA', stateMap: { stateA: { diff --git a/src/iscs/status/mapGroup.js b/src/iscs/status/mapGroup.js index 28dbcf1bc..88ee7bb04 100644 --- a/src/iscs/status/mapGroup.js +++ b/src/iscs/status/mapGroup.js @@ -2,8 +2,7 @@ import elType from './elType'; import grType from './grType'; export default { - [grType.A]: { - name: '', + [grType.A.lab]: { elemList: [ {type: elType.A}, {type: elType.B},