Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/jmapNew/map.js

@@ -157,14 +157,13 @@ class Jlmap {
     }
 
     setUpdateScreen(opts) {
+        const scale = 0.3;
         this.$painter.updateTransform1(
             [
-                { scaleRate: 0.3, offsetY: -100 },
-                { scaleRate: 0.3, offsetY: -300 },
-                { scaleRate: 0.3, offsetY: -500 },
-                { scaleRate: 0.3, offsetY: -700 },
-                { scaleRate: 0.3, offsetY: -900 },
-                { scaleRate: 0.3, offsetY: -1100 }
+                { scaleRate: scale, offsetY: -100 },
+                { scaleRate: scale, offsetY: -300 },
+                { scaleRate: scale, offsetY: -500 },
+                { scaleRate: scale, offsetY: -700 }
             ],
             {width: opts.width, height: opts.height});
     }

src/jmapNew/theme/ningbo_01/model.js

@@ -42,6 +42,15 @@ class Model {
         };
     }
 
+    handleScreenProps(viewModel) { // 大屏隐藏元素
+        const model = viewModel.model;
+        if (model._type == deviceType.OutFrame ||
+			model._type == deviceType.Text ||
+			model._type == deviceType.AutoTurnBack) {
+            return true;
+        }
+    }
+
     initPublicProps(model) {
         if (model) {
             var modelInitial = this.public[model._type];

src/jmapNew/transformHandleScreen.js

@@ -1,5 +1,7 @@
 
 import {createTransform, createBoundingRect} from './utils/parser';
+import Vue from 'vue';
+import store from '@/store/index_APP_TARGET';
 
 class TransformHandle {
     constructor(painter) {
@@ -21,10 +23,15 @@ class TransformHandle {
         if (view) {
             for (let i = 0; i < this.transform.length; i++) {
                 view.transform = this.transform[i];
-                view.decomposeTransform();
+                view.decomposeTransform(); // 修改 transform 后同步位置
+                const propConvert = Vue.prototype.$theme.loadPropConvert(store.state.map.map.skinVO.code);
+                if (propConvert.handleScreenProps && propConvert.handleScreenProps(view)) {
+                    view.hide();
+                    return;
+                }
                 if (this.checkVisible(view)) { view.show(); return; } else { view.hide(); }
             }
-            view.dirty();
+            view.dirty(); // 更新
         }
     }
 

src/views/iscs/iscsSystem/config/bas/sensor.vue

@@ -0,0 +1,122 @@
+<template>
+  <div class="sensor-box">
+    <div class="title-name">{{ $route.query.stationName }}机电传感器</div>
+    <div class="sensorList">
+      <div class="sensorDataA">
+        <div class="sensorDataATitle">A端</div>
+        <div class="sensorDataAList">
+          <div class="sensorDataAImitate">
+            <table class="imitate">
+              <tr>
+                <th class="imitateTD1">模拟量</th>
+                <th class="imitateTD2">温度 <span>℃</span></th>
+                <th class="imitateTD2">湿度 <span>%</span></th>
+              </tr>
+              <tr v-for="(imitate,index) in sensorDataA.imitateList" :key="index">
+                <td class="imitateTD1">{{ imitate.temperature }}</td>
+                <td class="imitateTD2">{{ imitate.temperature }}</td>
+                <td class="imitateTD2">{{ imitate.humidity }}</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+    name:'Sensor',
+    data() {
+        return {
+            sensorDataA:{
+                imitateList:[
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                ],
+                co2SensorList:[]
+            },
+            sensorDataB:{
+            }
+        };
+    }
+};
+</script>
+<style lang="scss" scoped>
+.title-name{
+    width: 100%;
+    text-align: center;
+    font-size: 26px;
+    margin-top: 30px;
+    color: #56E5DE;
+}
+.sensorList{
+    width: 1300px;
+    height: 627px;
+    border: 1px #8b939c solid;
+    margin: 8px auto;
+}
+.sensorDataA{
+    width: 650px;
+    border-right: 1px #8b939c solid;
+    height: 100%;
+}
+.sensorDataATitle{
+  padding:5px 0px;
+  text-align:center;
+  color: #56E5DE;
+  font-size:14px;
+  border-bottom: 1px #8b939c solid;
+}
+.imitate{
+  width:400px;
+  border-spacing: 0;
+}
+.imitate th{
+    padding: 3px 0px;
+    border-right: 1px #8b939c solid;
+    font-size:14px;
+    color:#fff;
+}
+.imitate th span {
+  color: #56E5DE;
+}
+.imitateTD1{
+  width:200px
+}
+.imitateTD2{
+width:100px
+}
+.imitate tr{
+  border-bottom: 1px #8b939c solid;
+  display: inline-block;
+}
+.imitate tr td{
+    height: 23px;
+    border-right: 1px #8b939c solid;
+    line-height: 23px;
+    font-size: 14px;
+}
+</style>

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

@@ -24,6 +24,7 @@
     <stationHallACS v-else-if="mode === 'stationHallACS'" />
     <standACS v-else-if="mode === 'standACS'" />
     <doorFG v-else-if="mode === 'doorFG'" />
+    <sensor v-else-if="mode==='sensor'" />
   </div>
 </template>
 
@@ -52,6 +53,7 @@ import AFC from './afc/afc';
 import stationHallACS from './acs/stationHallACS';
 import standACS from './acs/standACS';
 import doorFG from './fg/doorFG';
+import Sensor from './bas/sensor';
 
 export default {
     components: {
@@ -78,7 +80,8 @@ export default {
         AFC,
         stationHallACS,
         standACS,
-        doorFG
+        doorFG,
+        Sensor
     },
     data() {
         return {

src/views/iscsSystem/index.vue

@@ -167,8 +167,6 @@ export default {
         },
         reSize() {
             this.$nextTick(() => {
-                this.width = this.$store.state.config.width;
-                this.height = this.$store.state.config.height;
                 this.$iscs && this.$iscs.resize({ width: this.width, height: this.height });
             });
         },