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

src/views/newMap/displayNew/menuSchema.vue

@@ -271,7 +271,7 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     .schema {
-        z-index: 360;
+        z-index: 36;
         display: inline;
         position: absolute;
         right: 5px;

src/views/newMap/newMapdraft/mapoperate/arrow.vue

@@ -127,6 +127,11 @@ export default {
             return form;
         }
     },
+    watch: {
+        '$store.state.map.deleteCount': function (val) {
+            this.deleteObj();
+        }
+    },
     methods: {
         deviceChange(code) {
             this.$emit('setCenter', code);

src/views/newMap/newMapdraft/mapoperate/controlLamp.vue

@@ -213,9 +213,11 @@ export default {
             if (this.activeName === 'first') {
                 this.$refs.dataform.resetFields();
                 this.editModel.type = type;
+                this.editModel._type = type;
             } else {
                 this.$refs.make.resetFields();
                 this.addModel.type = type;
+                this.addModel._type = type;
             }
         },
         hover(field) {

src/views/newMap/newMapdraft/mapoperate/espDraft.vue

@@ -101,13 +101,6 @@ export default {
             });
 
             return rules;
-        },
-        createRules() {
-            return {
-                standCode: [
-                    { required: true, message: this.$t('rules.stationCode'), trigger: 'change' }
-                ]
-            };
         }
     },
     watch: {

src/views/scriptManage/getAction.vue

@@ -134,7 +134,7 @@ export default {
                 this.actionInfoList.push({id: element.id, isClose: true, memberName: memberName});
                 break;
             }
-            case 'Command':
+            case 'Operation':
             {
                 // const command = CommandHandler.getScriptDefinition(element.operationType);
                 const commandName = element.operationType;