From a4e6119c4b96c52794238331617756fb4ce414ee Mon Sep 17 00:00:00 2001
From: yuan <yuanliye@joylink.club>
Date: Thu, 10 Jun 2021 15:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=AD=94=E5=99=A8=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A2=9E=E5=8A=A0=E5=8C=BA=E6=AE=B5=E5=81=8F?=
 =?UTF-8?q?=E7=A7=BB=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapoperate/components/operateProperty.vue |  3 +++
 .../mapoperate/responder/index.vue            |  4 ++--
 .../mapoperate/responder/responderBatch.vue   | 19 +++++++++++++------
 .../mapoperate/responder/responderModel.vue   |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue b/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
index c9fad141e..a41298b90 100644
--- a/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
@@ -50,6 +50,9 @@ export default {
                     if (this.type == 'Text') {
                         data.content = `${this.editModel.prepend}::${this.editModel.content}`;
                     }
+                    if (data.type !== 'VB') {
+                        data.signalCode = '';
+                    }
                     this.$emit('updateMapModel', data);
                     this.$emit('clearDeviceSelect');
                 } else {
diff --git a/src/views/newMap/newMapdraft/mapoperate/responder/index.vue b/src/views/newMap/newMapdraft/mapoperate/responder/index.vue
index 19220fe76..26e3e755b 100644
--- a/src/views/newMap/newMapdraft/mapoperate/responder/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/responder/index.vue
@@ -15,7 +15,7 @@
         @deviceSelect="deviceSelect"
       />
     </el-tab-pane>
-    <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
+    <!-- <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
       <responder-create
         ref="respCreate"
         :field="field"
@@ -29,7 +29,7 @@
         @deviceChange="deviceChange"
         @deviceSelect="deviceSelect"
       />
-    </el-tab-pane>
+    </el-tab-pane> -->
     <el-tab-pane class="view-control" label="批量创建" name="third" :lazy="lazy">
         <responder-batch
         ref="respBatch"
diff --git a/src/views/newMap/newMapdraft/mapoperate/responder/responderBatch.vue b/src/views/newMap/newMapdraft/mapoperate/responder/responderBatch.vue
index 4c46548f4..189f08a40 100644
--- a/src/views/newMap/newMapdraft/mapoperate/responder/responderBatch.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/responder/responderBatch.vue
@@ -1,7 +1,7 @@
 <template>
 	<el-form
 		ref="form"
-		label-width="80px"
+		label-width="90px"
 		:model="formData"
 		size="mini"
 		:rules="formRules"
@@ -72,7 +72,7 @@
 			<template v-for="(item, index) in subFormData">
 				<div :key="`subFormUnit${index}`" class="sub-form-unit">
 					<el-row>
-						<el-col :span="12">
+						<el-col :span="10">
 							<el-form-item label="名称">
 								<el-input
 									v-model="item.name"
@@ -85,7 +85,7 @@
 								<el-select
 									v-model="item.type"
 									filterable
-									placeholder="请选择"
+									placeholder="请选择类型"
 								>
 									<el-option
 										v-for="opt in responderTypeList"
@@ -97,8 +97,13 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
-					<el-row v-if="item.type === 'VB'">
-						<el-col :span="24">
+					<el-row>
+						<el-col :span="10">
+							<el-form-item label="区段偏移值">
+								<el-input-number v-model="item.offset" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="14" v-if="item.type === 'VB'">
 							<el-form-item label="信号机">
 								<el-select
 									v-model="item.signalCode"
@@ -233,6 +238,7 @@ export default {
 				return {
 					name: "",
 					type: this.formData.type,
+					offset: 0,
 					signalCode: ""
 				};
 			});
@@ -253,6 +259,7 @@ export default {
 					const models = [];
 					// 分组
 					this.subFormData.forEach(el => {
+						if (el.type !== "VB") el.signalCode = "";
 						el.sectionCode = this.formData.sectionCode;
 						if (!groupMap[el.sectionCode]) {
 							groupMap[el.sectionCode] = [];
@@ -260,7 +267,7 @@ export default {
 						groupMap[el.sectionCode].push(el);
 					});
 
-					// 偏移量计算
+					// 绘图位置计算
 					Object.keys(groupMap).forEach(code => {
 						const section = this.$store.getters[
 							"map/getDeviceByCode"
diff --git a/src/views/newMap/newMapdraft/mapoperate/responder/responderModel.vue b/src/views/newMap/newMapdraft/mapoperate/responder/responderModel.vue
index f2f0d9a11..a842d23f0 100644
--- a/src/views/newMap/newMapdraft/mapoperate/responder/responderModel.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/responder/responderModel.vue
@@ -145,7 +145,7 @@ export default {
                             ] },
                             { prop:'textRotate', label: '文字旋转', type: 'number' },
 							{ prop: 'sectionCode', label: '关联区段', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList, buttonType: 'RelModelSectionCode', hover: this.hover, buttonShowType: this.isSectionButtonType },
-							{ prop: 'signalCode', label: '关联信号机', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.signalList, buttonType: 'RelModelSignalCode', hover: this.hover, buttonShowType: this.isSignalButtonType },
+							this.editModel.type === 'VB'? { prop: 'signalCode', label: '关联信号机', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.signalList, buttonType: 'RelModelSignalCode', hover: this.hover, buttonShowType: this.isSignalButtonType } :'',
 							{ prop: 'stationCode', label: '关联集中站' + ':', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.centralizedStationList }
                         ]
                     },