From 2d30c5f0e743d7bda6b282bc836c780e8d4dadb7 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Sun, 19 Jan 2020 18:34:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?iscs=20=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs/shape/bas/coolTower.js | 27 +++++++++++++++++++++++++++ src/iscs/shape/components/pathsvg.js | 4 ++++ src/views/system/iscsSystem/nav.vue | 10 +++++----- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/iscs/shape/bas/coolTower.js b/src/iscs/shape/bas/coolTower.js index e69de29bb..3e08913a7 100644 --- a/src/iscs/shape/bas/coolTower.js +++ b/src/iscs/shape/bas/coolTower.js @@ -0,0 +1,27 @@ +import Group from 'zrender/src/container/Group'; +import createPathSvg from '../components/pathsvg'; + +export default class coolTower extends Group { + constructor(device) { + super(); + this.model = device.model; + this.zlevel = device.model.zlevel; + this.z = device.model.z; + this._type = device.model._type; + this.code = device.model.code; + this.create(); + } + create() { + this.grouper = new Group({ + id: this.model.code, + position: [this.model.point.x, this.model.point.y] + }); + this.path = createPathSvg(this.model); + this.add(this.grouper); + this.grouper.add(this.path); + } + setModel(dx, dy) { + this.model.point.x += dx; + this.model.point.y += dy; + } +} diff --git a/src/iscs/shape/components/pathsvg.js b/src/iscs/shape/components/pathsvg.js index 13eb68c91..6115f3a19 100644 --- a/src/iscs/shape/components/pathsvg.js +++ b/src/iscs/shape/components/pathsvg.js @@ -23,6 +23,10 @@ const map = { VolumeControlDamper: { width: 42, path: 'M3,36H43V99H3V36Zm4,3H40V96H7V39Zm6,4H34V63H13V43Zm0,30H34V93H13V73Zm20,2h8v5H33V75Zm0-20h8v5H33V55ZM20,29h5v8H20V29ZM23,3C34.6,3,44,9.268,44,17S34.6,31,23,31,2,24.732,2,17,11.4,3,23,3Zm0,4c12.261,0,16,6.134,16,10s-3.72,8.837-15,9S8,20.866,8,17,10.74,7,23,7ZM14,25V7l4-1,6,7,4-6,5,1V26H28V16l-4,4-5-4V26ZM27,62h5V75H27V62ZM15.617,88.076l2.649,3.265L9.777,98.228,7.128,94.963ZM13.4,45.987l2.619-3.215L7.622,35.991,5,39.206Z' + }, + CoolTower:{ + width: 67, + path:'M36,4L24,10L48,10M14,13L55,13L55,15L52,15L52,24L61,30L57,30L50,25L50,15L20,15L17,15L14,15 M18,15L18,22L8,30L12,30L20,23L20,15 M22,23L28,19L34,23L28,27 M34,17L36,17L36,29L34,29 M5,30L7,30L7,35L62,35L62,30L64,30L64,37L5,37 M5,30L64,30L64,32L5,32 M5,37L5,64L64,64L64,37L62,37L62,51L7,51L7,37 M15,37L11,42L14,43L17,39L20,43L23,42L19,37 M26,37L22,42L25,43L28,39L31,43L34,42L30,37 M39,37L35,42L38,43L41,39L44,43L47,42L43,37 M52,37L48,42L51,43L54,39L57,43L60,42L57,37 M36,23L42,19L48,23L42,27' } }; diff --git a/src/views/system/iscsSystem/nav.vue b/src/views/system/iscsSystem/nav.vue index b79b40771..4e7d6f8eb 100644 --- a/src/views/system/iscsSystem/nav.vue +++ b/src/views/system/iscsSystem/nav.vue @@ -69,23 +69,23 @@ export default { children: [ { name: '主画面', - type: 'PIS' + type: 'MainScreen' }, { name: 'LCD屏控制', - type: 'PIS' + type: 'LCDcontrol' }, { name: '计时一览', - type: 'PIS' + type: 'TimePreview' }, { name: '车站网络', - type: 'PIS' + type: 'StationNetwork' }, { name: '紧急发布一览', - type: 'PIS' + type: 'EmergencyRelease' } ] }, { From f42c48a0c42387a63ef7f7bdb99a94d52a01f83b Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Sun, 19 Jan 2020 18:36:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4iscs=E4=B8=BA=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 4 +- src/router/index.js | 73 ++++++++++++++++------- src/views/system/iscsDesign/demonList.vue | 2 +- src/views/system/iscsSystem/index.vue | 9 +-- 4 files changed, 60 insertions(+), 28 deletions(-) diff --git a/src/permission.js b/src/permission.js index eaa108d9e..1c44bf217 100644 --- a/src/permission.js +++ b/src/permission.js @@ -16,7 +16,7 @@ function hasPermission(roles, permissionRoles) { const whiteList = ['/login', '/design/login', '/xty/login', '/designxty/login', '/gzb/login', '/designgzb/login', '/jlmap3d/devicetrain', '/hyd/login']; // 不重定向白名单 -const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/]; +const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/]; function isDesignPage(toRoutePath) { return designPageRegex.some(item => { @@ -34,7 +34,7 @@ const loginHydPage = whiteList[7]; const loginDesignPageMenu = { design: loginDesignPage, designxty: loginDesignXtyPage, - designgzb: loginDesignGzbPage, + designgzb: loginDesignGzbPage }; const loginPageMenu = { login: loginPage, diff --git a/src/router/index.js b/src/router/index.js index 6247a7f89..c2079e5ee 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -785,27 +785,27 @@ export const asyncRouter = [ i18n: 'router.ibpDraw' } }, - { - path:'iscs/design', - component: IscsDesign, - meta: { - i18n: 'router.iscsDraw' - }, - children: [ - { - path: 'edit/:id/:mode', - component: IscsDraw, - hidden: true - } - ] - }, - { - path: 'iscs/system', - component: IscsSystem, - meta: { - i18n: 'router.iscsSystem' - } - }, + // { + // path:'iscs/design', + // component: IscsDesign, + // meta: { + // i18n: 'router.iscsDraw' + // }, + // children: [ + // { + // path: 'edit/:id/:mode', + // component: IscsDraw, + // hidden: true + // } + // ] + // }, + // { + // path: 'iscs/system', + // component: IscsSystem, + // meta: { + // i18n: 'router.iscsSystem' + // } + // }, { path: 'dictionary', component: Dictionary, @@ -970,6 +970,37 @@ export const asyncRouter = [ ] } ] + }, + { // iscs系统 + path: '/iscs', + component: Layout, + meta: { + i18n: 'router.iscsSystem', + roles: [admin] + }, + children: [ + { + path:'design', + component: IscsDesign, + meta: { + i18n: 'router.iscsDraw' + }, + children: [ + { + path: 'edit/:id/:mode', + component: IscsDraw, + hidden: true + } + ] + }, + { + path: 'system', + component: IscsSystem, + meta: { + i18n: 'router.iscsSystem' + } + } + ] } ]; diff --git a/src/views/system/iscsDesign/demonList.vue b/src/views/system/iscsDesign/demonList.vue index 20486c838..42159fbde 100644 --- a/src/views/system/iscsDesign/demonList.vue +++ b/src/views/system/iscsDesign/demonList.vue @@ -131,7 +131,7 @@ export default { case 'system' : break; case 'interface': - this.$router.push({ path: `/system/iscs/design/edit/${obj.id}/${obj.mode}` }); + this.$router.push({ path: `/iscs/design/edit/${obj.id}/${obj.mode}` }); break; } }, diff --git a/src/views/system/iscsSystem/index.vue b/src/views/system/iscsSystem/index.vue index a1182c110..9b5bd1239 100644 --- a/src/views/system/iscsSystem/index.vue +++ b/src/views/system/iscsSystem/index.vue @@ -2,7 +2,8 @@
- + +
@@ -11,13 +12,13 @@ diff --git a/src/views/system/iscsSystem/config/pis/lcdControl.vue b/src/views/system/iscsSystem/config/pis/lcdControl.vue new file mode 100644 index 000000000..a1a15a367 --- /dev/null +++ b/src/views/system/iscsSystem/config/pis/lcdControl.vue @@ -0,0 +1,10 @@ + + diff --git a/src/views/system/iscsSystem/config/pis/mainScreen.vue b/src/views/system/iscsSystem/config/pis/mainScreen.vue new file mode 100644 index 000000000..a1a15a367 --- /dev/null +++ b/src/views/system/iscsSystem/config/pis/mainScreen.vue @@ -0,0 +1,10 @@ + + diff --git a/src/views/system/iscsSystem/config/pis/stationNetwork.vue b/src/views/system/iscsSystem/config/pis/stationNetwork.vue new file mode 100644 index 000000000..a1a15a367 --- /dev/null +++ b/src/views/system/iscsSystem/config/pis/stationNetwork.vue @@ -0,0 +1,10 @@ + + diff --git a/src/views/system/iscsSystem/config/pis/timePreview.vue b/src/views/system/iscsSystem/config/pis/timePreview.vue new file mode 100644 index 000000000..a1a15a367 --- /dev/null +++ b/src/views/system/iscsSystem/config/pis/timePreview.vue @@ -0,0 +1,10 @@ + + From 41db7b6494ea36e11196e2efac7c73746b63d992 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Sun, 19 Jan 2020 19:10:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?iscs=20=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs/shape/bas/jetFan.js | 27 +++++++++++++++++++++++++ src/iscs/shape/bas/orbitalVentilator.js | 27 +++++++++++++++++++++++++ src/iscs/shape/components/pathsvg.js | 10 ++++++++- 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/iscs/shape/bas/jetFan.js b/src/iscs/shape/bas/jetFan.js index e69de29bb..464f59d90 100644 --- a/src/iscs/shape/bas/jetFan.js +++ b/src/iscs/shape/bas/jetFan.js @@ -0,0 +1,27 @@ +import Group from 'zrender/src/container/Group'; +import createPathSvg from '../components/pathsvg'; + +export default class jetFan extends Group { + constructor(device) { + super(); + this.model = device.model; + this.zlevel = device.model.zlevel; + this.z = device.model.z; + this._type = device.model._type; + this.code = device.model.code; + this.create(); + } + create() { + this.grouper = new Group({ + id: this.model.code, + position: [this.model.point.x, this.model.point.y] + }); + this.path = createPathSvg(this.model); + this.add(this.grouper); + this.grouper.add(this.path); + } + setModel(dx, dy) { + this.model.point.x += dx; + this.model.point.y += dy; + } +} diff --git a/src/iscs/shape/bas/orbitalVentilator.js b/src/iscs/shape/bas/orbitalVentilator.js index e69de29bb..9f5ba312b 100644 --- a/src/iscs/shape/bas/orbitalVentilator.js +++ b/src/iscs/shape/bas/orbitalVentilator.js @@ -0,0 +1,27 @@ +import Group from 'zrender/src/container/Group'; +import createPathSvg from '../components/pathsvg'; + +export default class orbitalVentilator extends Group { + constructor(device) { + super(); + this.model = device.model; + this.zlevel = device.model.zlevel; + this.z = device.model.z; + this._type = device.model._type; + this.code = device.model.code; + this.create(); + } + create() { + this.grouper = new Group({ + id: this.model.code, + position: [this.model.point.x, this.model.point.y] + }); + this.path = createPathSvg(this.model); + this.add(this.grouper); + this.grouper.add(this.path); + } + setModel(dx, dy) { + this.model.point.x += dx; + this.model.point.y += dy; + } +} diff --git a/src/iscs/shape/components/pathsvg.js b/src/iscs/shape/components/pathsvg.js index 6115f3a19..d6dfde748 100644 --- a/src/iscs/shape/components/pathsvg.js +++ b/src/iscs/shape/components/pathsvg.js @@ -22,11 +22,19 @@ const map = { }, VolumeControlDamper: { width: 42, - path: 'M3,36H43V99H3V36Zm4,3H40V96H7V39Zm6,4H34V63H13V43Zm0,30H34V93H13V73Zm20,2h8v5H33V75Zm0-20h8v5H33V55ZM20,29h5v8H20V29ZM23,3C34.6,3,44,9.268,44,17S34.6,31,23,31,2,24.732,2,17,11.4,3,23,3Zm0,4c12.261,0,16,6.134,16,10s-3.72,8.837-15,9S8,20.866,8,17,10.74,7,23,7ZM14,25V7l4-1,6,7,4-6,5,1V26H28V16l-4,4-5-4V26ZM27,62h5V75H27V62ZM15.617,88.076l2.649,3.265L9.777,98.228,7.128,94.963ZM13.4,45.987l2.619-3.215L7.622,35.991,5,39.206Z' + path: 'M23,28.935V34H41V97H1V34H5.615l0.007-.009L5.633,34H18V28.856C7.824,27.885,0,22.053,0,15,0,7.268,9.4,1,21,1S42,7.268,42,15C42,22.282,33.659,28.264,23,28.935ZM38,58H32v3H30V71h2v2h6V58Zm0,36V78H32V91H14.258l-3.629,3H38ZM11,87.6V71H25V61H11V43.667L5,38.819V92.4ZM9.346,37l4.669,3.772L13.83,41H32V53h6V37H9.346ZM12,6.581C7.281,8.661,6,12.359,6,15c0,2.42,1.85,5.4,6,7.251V6.581ZM21,5a30.248,30.248,0,0,0-3.934.243L22,11l3.762-5.642A30.068,30.068,0,0,0,21,5Zm5,9-4,4-5-4v9.66A29.382,29.382,0,0,0,22,24a32.355,32.355,0,0,0,4-.295V14Zm5-7.077V22.4c4.357-1.814,6-4.843,6-7.4C37,12.5,35.429,9.047,31,6.923Z' }, CoolTower:{ width: 67, path:'M36,4L24,10L48,10M14,13L55,13L55,15L52,15L52,24L61,30L57,30L50,25L50,15L20,15L17,15L14,15 M18,15L18,22L8,30L12,30L20,23L20,15 M22,23L28,19L34,23L28,27 M34,17L36,17L36,29L34,29 M5,30L7,30L7,35L62,35L62,30L64,30L64,37L5,37 M5,30L64,30L64,32L5,32 M5,37L5,64L64,64L64,37L62,37L62,51L7,51L7,37 M15,37L11,42L14,43L17,39L20,43L23,42L19,37 M26,37L22,42L25,43L28,39L31,43L34,42L30,37 M39,37L35,42L38,43L41,39L44,43L47,42L43,37 M52,37L48,42L51,43L54,39L57,43L60,42L57,37 M36,23L42,19L48,23L42,27' + }, + JetFan:{ + width:68, + path:'M39,110L4,92V89H72v3ZM5,24H72V87H5V24ZM9,83H68V28H9V83Zm29.5-1A26.5,26.5,0,1,1,65,55.5,26.5,26.5,0,0,1,38.5,82ZM51,75l7-7-2-2-7,7ZM35,64l-5-4-2,2,5,4ZM26,75l2-2-8-7-2,2Zm0-38-9,8,3,2,8-7Zm7,10-5,5,3,2,5-5Zm9,6H36v6h6V53Zm2,13,5-5-2-2-5,5ZM43,47l5,5,2-3-5-5Zm9-12-3,2,8,8,2-2ZM4,20L39,2,72,20v3H4V20Z' + }, + OrbitalVentilator:{ + width:70, + path:'M37,96L2,78V75H70v3ZM4,3H72V72H4V3ZM8,68H68V7H8V68Zm29.5-2C22.312,66,10,53.016,10,37S22.312,8,37.5,8,65,20.984,65,37,52.688,66,37.5,66Zm12.972-7.66,7.264-7.66L55.66,48.491,48.4,56.151ZM33.868,46.3l-5.189-4.377L26.6,44.113l5.189,4.377ZM24.528,58.34L26.6,56.151l-8.3-7.66-2.075,2.189Zm0-41.585-9.34,8.755L18.3,27.7l8.3-7.66ZM31.793,27.7L26.6,33.17l3.113,2.189,5.189-5.472Zm9.34,6.566H34.906V40.83h6.226V34.264Zm2.075,14.226L48.4,43.019,46.321,40.83,41.132,46.3ZM42.17,27.7l5.189,5.472,2.075-3.283-5.189-5.472Zm9.34-13.132L48.4,16.755l8.3,8.755,2.076-2.189Z' } };