+
+
-
+
@@ -40,6 +38,7 @@
@handleSelectView="handleSelectView"
@handleSelectLogicalView="handleSelectLogicalView"
@handleSelectPhysicalView="handleSelectPhysicalView"
+ @handleSelectHybridView="handleSelectHybridView"
/>
@@ -57,7 +56,6 @@ import { EventBus } from '@/scripts/event-bus';
import ConfigMap from './configMap';
import DataRelation from './dataRelation/index';
-import { setTimeout } from 'timers';
export default {
name: 'MapView',
@@ -80,8 +78,7 @@ export default {
autoSaveTask: null,
selected: null,
mapInfo: { name: this.$t('map.pleaseSelectMap') },
- timeDemon: null,
- loading: false
+ timeDemon: null
};
},
watch: {
@@ -89,7 +86,7 @@ export default {
this.initAutoSaveTask();
},
$route() {
- this.$$nextTick(() => {
+ this.$nextTick(() => {
this.loadInitPage();
});
}
@@ -125,10 +122,7 @@ export default {
this.$refs.configMap.doShow();
},
selectViewDraft(data) {
- this.loading = true;
- setTimeout(() => {
- this.viewDraft = data;
- }, 300);
+ this.viewDraft = data;
},
loadInitPage() {
this.$store.dispatch('training/changeMode', { mode: TrainingMode.MAP_EDIT });
@@ -180,6 +174,11 @@ export default {
this.$refs.jlmapVisual.setLevelVisible(handle);
}
},
+ handleSelectHybridView(handle) {
+ if (this.$refs && this.$refs.jlmapVisual) {
+ this.$refs.jlmapVisual.setLevelVisible(handle);
+ }
+ },
clickEvent(em) {
var device = this.getDeviceByEm(em);
this.onSelect(device);
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
index 318ef4799..048fad5f9 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
@@ -1,22 +1,26 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
+
+ {{ $t('map.updateObj') }}
+ {{ $t('map.deleteObj') }}
+
+
-
- {{ $t('map.create') }}
-
+
+
+ {{ $t('map.create') }}
+
+
@@ -109,6 +113,10 @@ export default {
const form = {
labelWidth: '150px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
@@ -271,7 +279,11 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
index ea2ddb263..d9ca8026a 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
@@ -1,14 +1,16 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
+
+ {{ $t('map.updateObj') }}
+ {{ $t('map.deleteObj') }}
+
+
@@ -25,9 +27,11 @@
-
- {{ $t('map.create') }}
-
+
+
+ {{ $t('map.create') }}
+
+
@@ -117,6 +121,10 @@ export default {
const form = {
labelWidth: '120px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
@@ -250,4 +258,9 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
index ae323b0cf..c269233c5 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
@@ -329,7 +329,7 @@ export default {
},
resizeCardHeight() {
var padding = 0;
- this.cardHeights = this.cardHeight - padding - 90;
+ this.cardHeights = this.cardHeight - padding - 74;
},
handleSelectControlPage(device) {
const type = device._type;
@@ -394,7 +394,7 @@ export default {
/deep/ .map-draft-group {
float: right;
- margin: 10px 5px;
+ margin: 6px 5px;
}
/deep/ .view-control {
@@ -405,6 +405,19 @@ export default {
.mapEdit .el-tabs__nav-wrap.is-scrollable {
padding: 0 20px;
}
+ .mapEdit .el-tabs__header .el-tabs__item.is-active {
+ border-bottom-color: #f5f7fa;
+ background: #f5f7fa;
+ }
+ .mapEdit .el-tabs__active-bar{
+ background: transparent;
+ }
+
+ .card .el-tabs__nav .el-tabs__item.is-active {
+ border-bottom: 2px solid #E4E7ED;
+ background: #409eff;
+ color: #fff;
+ }
.mapEdit .el-tabs__nav-prev {
width: 20px;
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
index 048176fa8..9ce723829 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
@@ -1,14 +1,16 @@
-
+
-
- {{ $t('map.updateObj') }}
- {{ $t('map.deleteObj') }}
-
+
+
+ {{ $t('map.updateObj') }}
+ {{ $t('map.deleteObj') }}
+
+
@@ -37,9 +39,11 @@
-
- {{ $t('map.create') }}
-
+
+
+ {{ $t('map.create') }}
+
+
@@ -127,6 +131,10 @@ export default {
const form = {
labelWidth: '150px',
items: {
+ code: {
+ name: '',
+ item: []
+ },
draw: {
name: this.$t('map.drawData'),
item: [
@@ -240,7 +248,11 @@ export default {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
index a94353c4a..2fcbbfedc 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
@@ -1,14 +1,16 @@