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

src/views/iscs/iscsDraw/iscsAcsOperate/index.vue

@@ -82,6 +82,7 @@ export default {
         }
     },
     mounted() {
+        this.$emit('iscsChange', this.$route.params.id);
     },
     beforeDestroy() {
 

src/views/iscs/iscsDraw/iscsAfcOperate/index.vue

@@ -103,6 +103,7 @@ export default {
         }
     },
     mounted() {
+        this.$emit('iscsChange', this.$route.params.id);
     },
     beforeDestroy() {
 

src/views/iscs/iscsDraw/iscsBasOperate/index.vue

@@ -170,6 +170,9 @@ export default {
             enabledTab: 'frozenPump'
         };
     },
+    mounted() {
+        this.$emit('iscsChange', this.$route.params.id);
+    },
     methods:{
         createDataModel(model) {
             const newModel = deviceFactory(model._type, model);

src/views/iscs/iscsDraw/iscsCctvOperate/index.vue

@@ -93,9 +93,9 @@ export default {
         }
     },
     mounted() {
+        this.$emit('iscsChange', this.$route.params.id);
     },
     beforeDestroy() {
-
     },
     methods: {
         createDataModel(model) {

src/views/iscsSystem/index.vue

@@ -152,7 +152,9 @@ export default {
         },
         // 右键点击事件
         onContextMenu(em) {
+            if (em.eventTarget) {
                 this.$store.dispatch('iscs/setUpdateDeviceData', em.eventTarget.model);
+            }
         },
         // 绘图时调用，元素可拖拽
         drawIscsInit() {