-
-
- {{ $t('ibp.save') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ $t('ibp.save') }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/iscs/iscsDraw/iscsCommonElem/button.vue b/src/views/iscs/iscsDraw/iscsCommonElem/button.vue
index af0c963ca..48c31455c 100644
--- a/src/views/iscs/iscsDraw/iscsCommonElem/button.vue
+++ b/src/views/iscs/iscsDraw/iscsCommonElem/button.vue
@@ -56,7 +56,9 @@ export default {
functionList: [
{label: '图元说明', value: 'GraphicEle'},
{label: '公共区域', value: 'PublicArea'},
- {label: '返回', value: 'GoBack'}
+ {label: '操作按钮', value: 'OperatingButton'},
+ {label: '返回', value: 'GoBack'},
+ {label: '至EPS系统及导向照明', value: 'GoEPS'}
],
form: {
code: '',
diff --git a/src/views/iscs/iscsDraw/iscsOperate/stateTable.vue b/src/views/iscs/iscsDraw/iscsOperate/stateTable.vue
index 900d022e5..23ab25552 100644
--- a/src/views/iscs/iscsDraw/iscsOperate/stateTable.vue
+++ b/src/views/iscs/iscsDraw/iscsOperate/stateTable.vue
@@ -124,7 +124,14 @@ export default {
{label: '站内下行左线消火栓按钮', value: 'inDownLeftHydrant'},
{label: '站内上行右线消火栓按钮', value: 'inUpRightHydrant'},
{label: '站间下行左线消火栓按钮', value: 'outDownLeftHydrant'},
- {label: '站间上行右线消火栓按钮', value: 'outUpRightHydrant'}
+ {label: '站间上行右线消火栓按钮', value: 'outUpRightHydrant'},
+ {label: '视屏服务器状态', value: 'videoServerStatus'},
+ {label: '数据服务器状态', value: 'dataServerStatus'},
+ {label: '媒体交换服务区状态', value: 'mediaServerStatus'},
+ {label: '解码器状态', value: 'decoderState'},
+ {label: '四路解码器状态', value: 'quadDecoderState'},
+ {label: '四路解码器模式状态', value: 'quadDecoderModeState'},
+ {label: '控制键盘状态', value: 'controlKeyboardState'}
],
rules: {
width:[{ required: true, message:'请输入设备图形宽度', trigger: 'blur' }],
diff --git a/src/views/iscs/iscsSystem/config/bas/waterSystem.vue b/src/views/iscs/iscsSystem/config/bas/waterSystem.vue
new file mode 100644
index 000000000..7de5cff74
--- /dev/null
+++ b/src/views/iscs/iscsSystem/config/bas/waterSystem.vue
@@ -0,0 +1,36 @@
+
+
+
{{ $route.query.stationName }}机电水系统
+
+
+
+
+
+
+
diff --git a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
index ffeff10f4..68146e714 100644
--- a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
+++ b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
@@ -10,7 +10,7 @@ import Iscs from '@/iscs/iscs';
import { parser } from '@/iscs/utils/parser';
import iscsData from '@/iscs/constant/iscsData';
import { mapGetters } from 'vuex';
-import { exitFullscreen } from '@/utils/screen';
+// import { exitFullscreen } from '@/utils/screen';
// import { handlerIscsEvent } from '@/api/simulation';
// import { IscsOperation } from '@/scripts/ConstDic';
diff --git a/src/views/iscs/iscsSystem/config/cctv/centerStatusCCTV.vue b/src/views/iscs/iscsSystem/config/cctv/centerStatusCCTV.vue
index abb0d16f7..b1b8f1327 100644
--- a/src/views/iscs/iscsSystem/config/cctv/centerStatusCCTV.vue
+++ b/src/views/iscs/iscsSystem/config/cctv/centerStatusCCTV.vue
@@ -1,10 +1,36 @@
- 中心设备状态
+
{{ $route.query.stationName }}闭路电视中心设备状态
+
+
+
+
diff --git a/src/views/iscs/iscsSystem/config/fire-alarm/stand.vue b/src/views/iscs/iscsSystem/config/fire-alarm/stand.vue
index c2f64cf65..ae4c8c054 100644
--- a/src/views/iscs/iscsSystem/config/fire-alarm/stand.vue
+++ b/src/views/iscs/iscsSystem/config/fire-alarm/stand.vue
@@ -1,8 +1,8 @@
{{ $route.query.stationName }}火灾报警站台报警
-
@@ -15,10 +15,23 @@ export default {
},
data() {
return {
+ width: 1100
};
},
+ watch: {
+ '$store.state.iscs.selectedCount': function() {
+ const device = this.$store.state.iscs.selected;
+ if (device && device._type === 'IscsButton' && device.function === 'PublicArea') {
+ this.width = 1520;
+ this.$refs.iscsPlate.show('12');
+ } else if (device && device._type === 'IscsButton' && device.function === 'GoBack') {
+ this.width = 1100;
+ this.$refs.iscsPlate.show('14');
+ }
+ }
+ },
mounted() {
- this.$refs.iscsPlate.show('12');
+ this.$refs.iscsPlate.show('14');
},
methods: {
diff --git a/src/views/iscs/iscsSystem/config/index.vue b/src/views/iscs/iscsSystem/config/index.vue
index a63980158..e1195c63c 100644
--- a/src/views/iscs/iscsSystem/config/index.vue
+++ b/src/views/iscs/iscsSystem/config/index.vue
@@ -26,6 +26,7 @@
+
@@ -58,6 +59,7 @@ import doorFG from './fg/doorFG';
import Sensor from './bas/sensor';
import BigSystem from './bas/bigSystem';
import SmallSystem from './bas/smallSystem';
+import waterSystem from './bas/waterSystem';
import GraphicEle from './graphicEle';
import DeviceControl from './deviceControl';
@@ -90,7 +92,8 @@ export default {
GraphicEle,
DeviceControl,
SmallSystem,
- BigSystem
+ BigSystem,
+ waterSystem
},
data() {
return {
diff --git a/src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue b/src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue
index 6c52b8b8d..ad922c621 100644
--- a/src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue
+++ b/src/views/iscs/iscsSystem/config/pis/emergencyRelease.vue
@@ -8,11 +8,11 @@
-
+
-
+
区域详细
紧急信息清除
清除
diff --git a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
index 860e27ef3..6304bfd68 100644
--- a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
+++ b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
@@ -3,7 +3,7 @@
LCD控制屏
@@ -42,6 +42,7 @@ export default {
columns: ['车站', '选择'],
stationList: ['会展中心站', '世纪大道站', '交通大学站', '市图书馆站', '中心医院站', '未来路站', '火车站', '人民广场站', '体育中心站'],
lcdSwitch: true,
+ activeFlag: false,
selectedAreaList:[]
};
},
@@ -71,7 +72,12 @@ export default {
}
},
selectedAllArea() {
- this.selectedAreaList = [...this.stationList];
+ this.activeFlag = !this.activeFlag;
+ if (this.activeFlag) {
+ this.selectedAreaList = [...this.stationList];
+ } else {
+ this.selectedAreaList = [];
+ }
}
}
};
@@ -120,13 +126,14 @@ export default {
-moz-user-select:none;
-ms-user-select:none;
user-select:none;
- }
- .area_select_button:active {
+ &:active,
+ &.active {
border-top: 2px solid #898888;
border-left: 2px solid #898888;
border-right: 2px solid #FFF;
border-bottom: 2px solid #FFF;
}
+ }
.each_station_info{
vertical-align:top;
font-size: 13px;
diff --git a/src/views/iscs/iscsSystem/config/pis/mainScreen.vue b/src/views/iscs/iscsSystem/config/pis/mainScreen.vue
index de84f3a76..34accbf8c 100644
--- a/src/views/iscs/iscsSystem/config/pis/mainScreen.vue
+++ b/src/views/iscs/iscsSystem/config/pis/mainScreen.vue
@@ -170,30 +170,22 @@ export default {
} else {
let areaIndex;
this.verticalHeader.map((item, index) => {
- if (item.key === data.key) {
+ if (item.key == data.key) {
areaIndex = index;
}
});
const flag = data.active;
- // this.stationList.forEach(station => {
- // station.children.forEach((item, index) => {
- // const elem = station.stationName + '-' + index;
- // if (item.status === 'default' && index === areaIndex && !flag) {
- // const selectedAreaIndex = this.selectedAreaList.indexOf(elem);
- // this.selectedAreaList.splice(selectedAreaIndex, 1);
- // } else if (item.status === 'default' && index === areaIndex && !flag && !this.selectedAreaList.includes(elem)) {
- // this.selectedAreaList.push(elem);
- // }
- // });
- // });
- for (let j = 0; j < this.stationList.length; j++) {
- if (!this.selectedAreaList.includes(areaIndex + '-' + j) && flag) {
- this.selectedAreaList.push(areaIndex + '-' + j);
- } else if (!flag) {
- const index = this.selectedAreaList.indexOf(areaIndex + '-' + j);
- this.selectedAreaList.splice(index, 1);
- }
- }
+ this.stationList.forEach(station => {
+ station.children.forEach((item, index) => {
+ const elem = station.stationName + '-' + index;
+ if (item.status == 'default' && (index + 1) == areaIndex && !flag) {
+ const selectedAreaIndex = this.selectedAreaList.indexOf(elem);
+ this.selectedAreaList.splice(selectedAreaIndex, 1);
+ } else if (item.status == 'default' && (index + 1) == areaIndex && flag) {
+ this.selectedAreaList.push(elem);
+ }
+ });
+ });
}
},
selectedAllLine(data) {
diff --git a/src/views/iscs/iscsSystem/config/pis/stationNetwork.vue b/src/views/iscs/iscsSystem/config/pis/stationNetwork.vue
index ad4290580..af0d3df0c 100644
--- a/src/views/iscs/iscsSystem/config/pis/stationNetwork.vue
+++ b/src/views/iscs/iscsSystem/config/pis/stationNetwork.vue
@@ -1,7 +1,5 @@
-
- 车站网络
-
+