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

src/jmapNew/theme/haerbin_01/menus/menuButton.vue

@@ -513,7 +513,9 @@ export default {
                 { name: '强解区段', cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true }
             ] : [
                 { name: '封锁道岔', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, show: false },
+                { name: '解封道岔', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, show: false, securityCommand: true },
                 { name: '单锁道岔', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, show: false },
+                { name: '取消锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, operate: OperationEvent.Switch.unlock.menuButton, show: false, securityCommand: true },
                 { name: '转换定位', cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION, operate: OperationEvent.Switch.locate.menuButton, show: false, disabledName: 'normalPosition' },
                 { name: '转换反位', cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION, operate: OperationEvent.Switch.reverse.menuButton, show: false, disabledName: 'reversePosition' }
                 // { name: '封锁区段', cmdType: CMD.Switch.CMD_SWITCH_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show: false }

src/views/drts/scene/create.vue

@@ -50,7 +50,7 @@ export default {
                     { prop: 'description', label: '场景描述', type: 'textarea' },
                     { prop: 'disposalProcesses', label: '处置流程', type: 'textarea' },
                     { prop: 'operationScore', label: '运营部分总分', type: 'number', min: 0, max: 100, step:1, precision:1 },
-                    { prop:'scriptId', label:'关联剧本', type:'select', options:this.scriptList},
+                    { prop:'scriptId', label:'关联剧本', type:'select', options:this.scriptList, optionValue:'value', optionLabel:'label' },
                     { prop:'main', label:'是否主场景', type:'switch' }
                 ]
             };

src/views/drts/scene/index.vue

@@ -94,9 +94,9 @@ export default {
             }
         };
     },
-    mounted() {
+    created() {
         getScriptPageListOnlineNew().then(response=>{
-            this.scriptList = response.data.list.map(elem => { return { value: elem.id, label: elem.name }; });
+            this.scriptList = response.data.list.map(elem => { return { value: parseInt(elem.id), label: elem.name }; });
             // this.queryForm.queryObject.scriptId.config.data = this.scriptList;
         });
     },

src/views/drts/scene/operateStatistic.vue

@@ -3,7 +3,7 @@
     <div class="OperateStatisticIn">
       <div class="OperateStatisticInName">编辑运营统计</div>
       <div class="OperateStatisticContent">
-        <el-form ref="form" :rules="rules" :model="formModel" label-width="140px" class="statisticForm">
+        <el-form ref="dataform" :rules="rules" :model="formModel" label-width="140px" class="statisticForm">
           <el-form-item label="每一项分值" :required="true" prop="score">
             <el-input-number
               v-model="formModel.score"
@@ -82,7 +82,7 @@ export default {
         },
         confirm() {
             const self = this;
-            this.$refs.dataform.validateForm(() => {
+            this.$refs.dataform.validate(() => {
                 const itemVOS = self.formModel.itemVOS;
                 if (itemVOS.length > 0) {
                     let result = true;

src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%; height: 100%;">
+  <div class="iscsCanvas">
     <div :id="iscsId" v-loading="loading" :style="{ width: widthCanvas +'px', height: canvasHeight +'px' }" class="iscs-canvas" />
   </div>
 </template>
@@ -23,6 +23,10 @@ export default {
         canvasHeight: {
             type: Number,
             default: 500
+        },
+        scaleRate:{
+            type: Number,
+            default: 1
         }
     },
     data() {
@@ -47,7 +51,7 @@ export default {
                     height: this.canvasHeight
                 },
                 options: {
-                    scaleRate: 1,
+                    scaleRate: this.scaleRate,
                     offsetX: 0,
                     offsetY: 0
                 },
@@ -78,5 +82,11 @@ export default {
     .iscs-canvas{
         margin: 0 auto;
     }
+    .iscsCanvas{
+        width: 100%;
+        height: 100%;
+        overflow-y: auto;
+        overflow-x: hidden;
+    }
 </style>
 

src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue

@@ -2,7 +2,7 @@
   <div class="Substation">
     <div class="Substation_header">黄山主变电所接线图</div>
     <div>
-      <iscsSystem ref="iscsPlate" :width-canvas="width" :canvas-height="height" />
+      <iscsSystem ref="iscsPlate" :width-canvas="width" :canvas-height="height" :scale-rate="scaleRate" />
     </div>
     <!-- <div class="psdSystem_footer">
       <div class="prevButton">{{}}</div>
@@ -26,7 +26,10 @@ export default {
             return window.innerWidth;
         },
         height() {
-            return 800;
+            return 970;
+        },
+        scaleRate() {
+            return window.innerWidth / 2200;
         }
     },
     mounted() {