iscs调整&站后折返显示调整

src/jmapNew/config/skinCode/xian_01.js

@@ -508,7 +508,7 @@ class SkinCode extends defaultStyle {
                 radiusR: 6									// 控制灯大小
             },
             text: {
-                fontWeight: 'normal',
+                fontWeight: 580,
                 fontSize: 12,
                 distance: 10
             },

src/views/iscs/iscsSystem/config/deviceControl.vue

@@ -100,13 +100,19 @@ export default {
                 FireHydranAlarmButton: '点型火灾探测器',
                 GasFireControl:'气体灭火控制器',
                 LightingGroup: '照明',
-                Electrically: '',
                 VolumeControlDamper: '电动风阀',
                 SmookExhaustFd: '排烟防火阀',
                 Ventilator: '普通风机',
                 AirConditioner: '组合式空调机组',
                 FireDamper: '防火阀',
-                SmookProofFd: '防烟防火阀'
+                SmookProofFd: '防烟防火阀',
+                CoolTower: '冷却塔',
+                Chiller: '冷水机组',
+                ElectricButterflyValve: '电动蝶阀',
+                BalancedElectric: '动态平衡电动调节阀',
+                FrozenPump: '冷冻泵、冷却泵',
+                TunnelFan: '隧道风机',
+                OrbitalVentilator: '排热风机'
             },
             modeMap: {
                 standFAS: '火灾报警',

src/views/iscs/iscsSystem/config/graphicEle.vue

@@ -3,7 +3,7 @@
     v-dialogDrag
     :visible.sync="dialogShow"
     class="graphic_element_dialog"
-    width="480px"
+    :width="width"
     :before-close="doClose"
     :z-index="2000"
     :modal="false"
@@ -21,9 +21,19 @@
         </template>
       </el-table-column>
       <el-table-column prop="deviceType" label="设备类型" />
+      <el-table-column
+        v-if="this.$route.params.mode==='bigSystem'"
+        prop="graphicEle1"
+        label="图元"
+      >
+        <template slot-scope="scope">
+          <img style="height: 30px" :src="graphicEleMap[scope.row.graphicEle1]">
+        </template>
+      </el-table-column>
+      <el-table-column v-if="this.$route.params.mode==='bigSystem'" prop="deviceType1" label="设备类型" />
     </el-table>
     <div style="color: #0DC8DE;font-size: 14px;margin-top: 20px;"><span>注:图元颜色含义</span></div>
-    <div style="color: #0DC8DE;font-size: 14px;margin-left: 20px;"><span>绿色:正常。红色:报警</span></div>
+    <div style="color: #0DC8DE;font-size: 14px;margin-left: 20px;"><span>{{ meaning }}</span></div>
   </el-dialog>
 </template>
 
@@ -32,6 +42,19 @@ import ManualAlarm from '@/assets/iscs_icon/manual_alarm.png';
 import FireHydrant from '@/assets/iscs_icon/fire_hydrant.png';
 import SmokeDetector from '@/assets/iscs_icon/smoke_detector.png';
 import GasFireControl from '@/assets/iscs_icon/gas_fire_control.png';
+import AirConditioner from '@/assets/iscs_icon/air_conditioner.png';
+import Ventilator from '@/assets/iscs_icon/ventilator.png';
+import TunnelFan from '@/assets/iscs_icon/tunnel_fan.png';
+import OrbitalVentilator from '@/assets/iscs_icon/orbital_ventilator.png';
+import FireDamper from '@/assets/iscs_icon/fire_damper.png';
+import SmookExhaustFd from '@/assets/iscs_icon/smook_exhaust_fd.png';
+import VolumeControlDamper from '@/assets/iscs_icon/volume_control_damper.png';
+import SmookProofFd from '@/assets/iscs_icon/smook_proof_fd.png';
+import CoolTower from '@/assets/iscs_icon/cool_tower.png';
+import Chiller from '@/assets/iscs_icon/chiller.png';
+import ElectricButterflyValve from '@/assets/iscs_icon/electric_butterfly_value.png';
+import BalancedElectric from '@/assets/iscs_icon/balanced_electric.png';
+import FrozenPump from '@/assets/iscs_icon/frozen_pump.png';
 
 export default {
     name: 'GraphicEle',
@@ -46,25 +69,38 @@ export default {
                 {graphicEle: 'gasFireControl', deviceType: '气体灭火控制器'}
             ],
             basData: [
-                {graphicEle: 'AirConditioner', deviceType: '组合式空调机组、空调器'},
+                {graphicEle: 'AirConditioner', deviceType: '组合式空调机组、空调器', graphicEle1: 'CoolTower', deviceType1: '冷却塔', height: 60},
-                {graphicEle: 'Ventilator', deviceType: '普通风机'},
+                {graphicEle: 'Ventilator', deviceType: '普通风机', graphicEle1: 'Chiller', deviceType1: '冷水机组', height: 60},
-                {graphicEle: '', deviceType: '隧道风机'},
+                {graphicEle: 'TunnelFan', deviceType: '隧道风机', graphicEle1: 'ElectricButterflyValve', deviceType1: '电动蝶阀'},
-                {graphicEle: '', deviceType: '排热风机'},
+                {graphicEle: 'OrbitalVentilator', deviceType: '排热风机', graphicEle1: 'BalancedElectric', deviceType1: '动态平衡电动调节阀'},
-                {graphicEle: 'FireDamper', deviceType: '防火阀'},
+                {graphicEle: 'FireDamper', deviceType: '防火阀', graphicEle1: 'FrozenPump', deviceType1: '冷冻泵、冷却泵'},
                 {graphicEle: 'SmookExhaustFd', deviceType: '排烟防火阀'},
                 {graphicEle: 'VolumeControlDamper', deviceType: '电动风阀'},
-                {graphicEle: 'SmookProofFd', deviceType: '防烟防火阀'},
+                {graphicEle: 'SmookProofFd', deviceType: '防烟防火阀'}
-                {graphicEle: '', deviceType: '冷却塔'},
+                // {graphicEle: 'CoolTower', deviceType: '冷却塔', height: 60},
-                {graphicEle: '', deviceType: '冷水机组'},
+                // {graphicEle: 'Chiller', deviceType: '冷水机组', height: 60},
-                {graphicEle: '', deviceType: '电动蝶阀'},
+                // {graphicEle: 'ElectricButterflyValve', deviceType: '电动蝶阀'},
-                {graphicEle: '', deviceType: '动态平衡电动调节阀'},
+                // {graphicEle: 'BalancedElectric', deviceType: '动态平衡电动调节阀'},
-                {graphicEle: '', deviceType: '冷冻泵、冷却泵'}
+                // {graphicEle: 'FrozenPump', deviceType: '冷冻泵、冷却泵'}
             ],
             graphicEleMap: {
                 manualAlarm: ManualAlarm,
                 fireHydrant: FireHydrant,
                 smokeDetector: SmokeDetector,
-                gasFireControl: GasFireControl
+                gasFireControl: GasFireControl,
+                AirConditioner: AirConditioner,
+                Ventilator: Ventilator,
+                TunnelFan: TunnelFan,
+                OrbitalVentilator: OrbitalVentilator,
+                FireDamper: FireDamper,
+                SmookExhaustFd: SmookExhaustFd,
+                VolumeControlDamper: VolumeControlDamper,
+                SmookProofFd: SmookProofFd,
+                CoolTower: CoolTower,
+                Chiller: Chiller,
+                ElectricButterflyValve: ElectricButterflyValve,
+                BalancedElectric: BalancedElectric,
+                FrozenPump:FrozenPump
             },
             styleObject: {
                 background: '#465F79',
@@ -72,27 +108,70 @@ export default {
                 borderBottom: '2px solid #FFF',
                 borderRight: '2px solid #FFF',
                 textAlign: 'center'
-            }
+            },
+            tableData: [],
+            title: '',
+            meaning: '',
+            width: '480px'
         };
     },
     computed: {
-        title() {
+        // title() {
-            let title = '';
+        //     let title = '';
-            switch (this.$route.params.mode) {
+        //     switch (this.$route.params.mode) {
-            case 'standFAS':
+        //     case 'standFAS':
-                title = 'fAS火灾图元详情';
+        //         title = 'fAS火灾图元详情';
-            }
+        //         break;
-            return title;
+        //     case 'bigSystem':
+        //         title = 'BAS通风空调图元详情';
+        //         break;
+        //     }
+        //     return title;
+        // },
+        // tableData() {
+        //     let tableData = [];
+        //     switch (this.$route.params.mode) {
+        //     case 'standFAS':
+        //     case 'stationHallFAS':
+        //         tableData = this.standFASData;
+        //         break;
+        //     case 'bigSystem':
+        //         tableData = this.basData;
+        //         break;
+        //     }
+        //     return tableData;
+        // },
+        // meaning() {
+        //     let meaning = '';
+        //     switch (this.$route.params.mode) {
+        //     case 'standFAS':
+        //     case 'stationHallFAS':
+        //         meaning = '绿色:正常。红色:报警';
+        //         break;
+        //     case 'bigSystem':
+        //         meaning = '白色：关闭/停止。绿色：打开/运行。红色：报警。黄色：故障。';
+        //         break;
+        //     }
+        //     return meaning;
+        // }
     },
-        tableData() {
+    watch: {
-            let tableData = [];
+        '$route.params.mode':function() {
             switch (this.$route.params.mode) {
             case 'standFAS':
             case 'stationHallFAS':
-                tableData = this.standFASData;
+                this.title = 'fAS火灾图元详情';
+                this.tableData = this.standFASData;
+                this.meaning = '绿色:正常。红色:报警';
+                this.width = '480px';
+                break;
+            case 'bigSystem':
+                this.title = 'BAS通风空调图元详情';
+                this.width = '600px';
+                this.tableData = this.basData;
+                this.meaning = '白色：关闭/停止。绿色：打开/运行。红色：报警。黄色：故障。';
                 break;
             }
-            return tableData;
         }
     },
     mounted() {

src/views/iscs/iscsSystem/config/index.vue

@@ -119,7 +119,14 @@ export default {
                 'Ventilator',
                 'AirConditioner',
                 'FireDamper',
-                'SmookProofFd'
+                'SmookProofFd',
+                'CoolTower',
+                'Chiller',
+                'ElectricButterflyValve',
+                'BalancedElectric',
+                'FrozenPump',
+                'TunnelFan',
+                'OrbitalVentilator'
             ]
         };
     },
@@ -129,7 +136,6 @@ export default {
         },
         '$store.state.iscs.selectedCount': function() {
             const device = this.$store.state.iscs.selected;
-            console.log(device, '11111111111111');
             if (device && device._type === 'IscsButton' && device.function === 'GraphicEle') {
                 this.$refs.graphicEle.doShow();
             } else if (device && this.deviceList.includes(device._type)) {