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

src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js

@@ -529,7 +529,20 @@ export const operateEnum = {
             ]
         },
         RAIL_FILL_IN_REGISTER:{
-            name:'填写行车簿册'
+            name:'填写行车簿册',
+            isList:true,
+            params:[
+                {
+                    code:'stationCode',
+                    name:'车站为',
+                    function:getStationNameById
+                },
+                {
+                    code:'line',
+                    name:'单条记录',
+                    function:getRecordByLine
+                }
+            ]
         },
         RAIL_FILL_IN_TICKET:{
             name:'填写票据'
@@ -633,6 +646,7 @@ export const operateEnum = {
 
 // 转换函数
 export function covertOperate(operationType, operationParamMap) {
+    debugger;
     if (operationType == 'Set_Fault' || operationType == 'Cancel_Fault') {
         let deviceName = '';
         const device = store.getters['map/getDeviceByCode'](operationParamMap.code) || {};
@@ -983,6 +997,12 @@ function getDeviceNameById(deviceCode) {
     return device.name;
 }
 
+function getRecordByLine(line) {
+    // '{"stationCode":"Station58852","line":{"moonDay":"","hourMinute":"","result":"","noticeTime":{"moonDay":"","hourMinute":"","info":""},"arriveTime":{"moonDay":"","hourMinute":"","info":""},"endTime":{"moonDay":"","hourMinute":"","info":""}}}'
+    return '，结果为' + line.result;
+    // JSON.stringify(line);
+}
+
 function getTripNumberByCode(code) {
     return code.slice(3, code.length || 0);
 }

src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/route.vue

@@ -98,7 +98,7 @@
         >{{ $t('map.activate') }}</el-button>
       </el-form-item>
       <el-form-item v-if="!addModel.multiRoute">
-        <el-select v-model="addModel.pathSwitchPosition.normal" :placeholder="$t('map.pleaseSelect')">
+        <el-select key="123" v-model="addModel.pathSwitchPosition.normal" :placeholder="$t('map.pleaseSelect')">
           <el-option
             v-for="item in SwitchLocateTypeList"
             :key="item.value"
@@ -448,7 +448,7 @@ export default {
                 this.addModel = {
                     ...this.initModelData()
                 };
-                this.$refs.form.resetFields();
+                // this.$refs.form.resetFields();
             }
             this.isModify = false;
         },