From 6b7827bd91422e8132640c264879d1be3ae34351 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 11 Jun 2021 18:17:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?zc=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/mouseController.js                |  28 ++---
 src/views/newMap/newDesignUser/demonList.vue  |   2 +-
 .../newMapdraft/mapoperate/config/list.vue    |  18 +++
 .../newMap/newMapdraft/mapoperate/index.vue   |  10 +-
 .../newMapdraft/mapoperate/zcControl.vue      | 113 ++++++------------
 5 files changed, 80 insertions(+), 91 deletions(-)

diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js
index 2ca7e4804..007fea5ca 100644
--- a/src/jmapNew/mouseController.js
+++ b/src/jmapNew/mouseController.js
@@ -97,23 +97,23 @@ class MouseController extends Eventful {
     }
 
     mousemove(e) {
-		if (this._dragging) {
-			const oldX = this._x;
-			const oldY = this._y;
+        if (this._dragging) {
+            const oldX = this._x;
+            const oldY = this._y;
 
-			const dx = e.offsetX - oldX;
-			const dy = e.offsetY - oldY;
+            const dx = e.offsetX - oldX;
+            const dy = e.offsetY - oldY;
 
-			this._x = e.offsetX;
-			this._y = e.offsetY;
+            this._x = e.offsetX;
+            this._y = e.offsetY;
 
-			if (e.which == 1) {
-				this._preventDefaultMouseMove && eventTool.stop(e.event);
-				this.trigger(this.events.__Pan, { dx, dy, oldX, oldY, newX: this._x, newY: this._y });
-			} else if (e.which === 3 && this._zoomOnMouseWheel && this._previewOrMapDraw) {
-				this.handleMouseMoveRight({x: e.offsetX, y: e.offsetY});
-			}
-		}
+            if (e.which == 1) {
+                this._preventDefaultMouseMove && eventTool.stop(e.event);
+                this.trigger(this.events.__Pan, { dx, dy, oldX, oldY, newX: this._x, newY: this._y });
+            } else if (e.which === 3 && this._zoomOnMouseWheel && this._previewOrMapDraw) {
+                this.handleMouseMoveRight({x: e.offsetX, y: e.offsetY});
+            }
+        }
     }
 
     mouseup(e) {
diff --git a/src/views/newMap/newDesignUser/demonList.vue b/src/views/newMap/newDesignUser/demonList.vue
index fe2232f8a..a094adb5d 100644
--- a/src/views/newMap/newDesignUser/demonList.vue
+++ b/src/views/newMap/newDesignUser/demonList.vue
@@ -109,7 +109,7 @@ export default {
                             lineCode: elem.lineCode
                         },
                         {
-                            id: '1',
+                            id: '2',
                             name: '系统配置绘图',
                             type: 'mapSystem',
                             mapId: elem.id,
diff --git a/src/views/newMap/newMapdraft/mapoperate/config/list.vue b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
index 48f18b520..e35051b57 100644
--- a/src/views/newMap/newMapdraft/mapoperate/config/list.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
@@ -294,6 +294,24 @@
               </div>
             </div>
           </template>
+          <template v-if="checkFieldType(item,'checkBoxDevice')">
+            <div :key="item.prop" class="coordinate">
+              <span class="title">{{ item.label }}</span>
+              <div class="list-box">
+                <div>
+                  <el-button
+                    size="small"
+                    :type="item.buttonShowType ? 'danger' : 'primary'"
+                    @click="item.hover(item.buttonType)"
+                  >激活选择</el-button>
+                </div>
+                <div v-for="(nor,indexIn) in formModel[item.prop]" :key="nor" class="list-content" @mouseenter="item.mouseenter(nor)" @mouseleave="item.mouseleave(nor)">
+                  <div class="name">{{ item.getName(nor) }}</div>
+                  <div class="close" @click="formModel[item.prop].splice(indexIn, 1);"><i class="el-icon-close" /></div>
+                </div>
+              </div>
+            </div>
+          </template>
         </template>
       </fieldset>
     </template>
diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue
index b64de62cd..1664d54cd 100644
--- a/src/views/newMap/newMapdraft/mapoperate/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/index.vue
@@ -196,11 +196,19 @@ export default {
             } else if (controlLampTypeList.includes(type)) {
                 this.enabledTab = 'ControlLamp';
             } else {
-                this.enabledTab = type;
+                if (this.$refs['ZcControl'] && this.$refs['ZcControl'][0].field == 'checkZcSection') {
+                    this.enabledTab = 'ZcControl';
+                } else {
+                    this.enabledTab = type;
+                }
             }
         },
         deviceSelect(type) {
+            // if (this.$refs['ZcControl'].field != 'checkZcSection') {
             this.selectDevice = type;
+            // } else {
+            //     this.selectDevice = 'ZcControl';
+            // }
         },
         saveMapEvent() {
             this.$emit('saveMapEvent');
diff --git a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
index 0bf3f5b50..d21549558 100644
--- a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-tabs v-model="activeName" class="card" @tab-click="handleClick">
+  <el-tabs v-model="activeName" class="card">
     <el-tab-pane class="view-control" :label="$t('map.property')" name="first" :lazy="lazy">
       <div class="view-control-content">
         <config-list ref="dataform" :form="form" :form-model="editModel" :rules="rules" />
@@ -54,7 +54,7 @@ export default {
                 code: '',
                 name: '',
                 // visible: '',
-                concentrateStationList:[],
+                // concentrateStationList:[],
                 position: {
                     x: 0,
                     y: 0
@@ -64,12 +64,13 @@ export default {
                 code: '',
                 name: '',
                 // visible: '',
-                concentrateStationList:[],
+                // concentrateStationList:[],
                 position: {
                     x: 0,
                     y: 0
                 }
             },
+            field:'',
             rules: {
                 code: [
                     { required: true, message: this.$t('rules.pleaseSelectEncoding'), trigger: 'change' }
@@ -80,9 +81,9 @@ export default {
                 // visible: [
                 //     { required: true, message: this.$t('rules.visible'), trigger: 'change' }
                 // ],
-                concentrateStationList:[
-                    { required: true, message: this.$t('rules.selectConcentrateStation'), trigger: 'change' }
-                ],
+                // concentrateStationList:[
+                //     { required: true, message: this.$t('rules.selectConcentrateStation'), trigger: 'change' }
+                // ],
                 'position.x': [
                     { required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
                 ],
@@ -94,9 +95,11 @@ export default {
     },
     computed: {
         ...mapGetters('map', [
-            'zcList',
-            'stationList'
+            'zcList'
         ]),
+        isButtonType() {
+            return this.field == 'checkZcSection';
+        },
         form() {
             const form = {
                 labelWidth: '150px',
@@ -114,8 +117,8 @@ export default {
                             { prop: 'position', label: this.$t('map.stateSignalsPlotCoordinates'), type: 'coordinate', width: '140px', children: [
                                 { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
                                 { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
-                            ] },
-                            { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation, deviceChange: this.changeConcentrateStation }
+                            ] }
+                            // { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation, deviceChange: this.changeConcentrateStation }
                         ]
                     }
                 }
@@ -134,7 +137,10 @@ export default {
                                 { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
                                 { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
                             ] },
-                            { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation, deviceChange: this.changeConcentrateStation }
+
+                            { prop:'sectionList', label:'关联区段: ', type: 'checkBoxDevice', getName:this.getName, mouseenter:this.mouseenter, mouseleave:this.mouseleave, buttonShowType:this.isButtonType, hover:this.hover, buttonType:'checkZcSection'}
+                            //
+                            // { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation, deviceChange: this.changeConcentrateStation }
                         ]
                     }
                 }
@@ -143,51 +149,28 @@ export default {
         }
     },
     watch: {
-        stationList() {
-            this.getConcertrateStation();
-        }
-    },
-    mounted() {
-        this.getConcertrateStation();
     },
+    // mounted() {
+    //     this.getConcertrateStation();
+    // },
     methods: {
         deviceChange(code) {
             this.$emit('setCenter', code);
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
-        changeConcentrateStation() {},
-        handleClick() {
-            this.getConcertrateStation();
-        },
         deviceSelect(selected) {
+            // debugger;
+            // 待调整
             this.$refs.dataform && this.$refs.dataform.resetFields();
             this.$refs.make && this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'ZcControl'.toUpperCase()) {
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
-                this.getConcertrateStation();
             }
         },
-        getConcertrateStation() {
-            // 被选中的集中站站数据
-            const beConcentrateStation = {};
-            this.zcList.forEach(data=>{
-                data.concentrateStationList.forEach(concentrate=>{
-                    beConcentrateStation[concentrate] = data.code;
-                });
-            });
-            this.concertrateStation = this.stationList.filter(station=>{
-                // if (this.activeName == 'first') {
-                // return station.centralized && !( beConcentrateStation[station.code] && (beConcentrateStation[station.code] != this.editModel.code));
-                return station.centralized;
-                // } else {
-                // return station.centralized && !( beConcentrateStation[station.code]);
-                // }
-            });
-        },
         create() {
             const uid = getUID('ZcControl', this.zcList);
-            let models = [];
+            const models = [];
             const model = {
                 _type: 'ZcControl',
                 code: uid,
@@ -195,16 +178,11 @@ export default {
                 position: {
                     x: this.addModel.position.x,
                     y: this.addModel.position.y
-                },
-                concentrateStationList:this.addModel.concentrateStationList
+                }
             };
             models.push(model);
-            model.concentrateStationList.forEach(stationCode=>{
-                const arr = this.setStationStand(stationCode, model.code);
-                models = [...models, ...arr];
-            });
+
             this.$emit('updateMapModel', models);
-            this.getConcertrateStation();
             this.$refs.createForm.resetForm();
         },
         // 修改对象
@@ -212,11 +190,7 @@ export default {
             this.$refs['dataform'].validate((valid) => {
                 if (valid) {
                     const data = Object.assign({_type: 'ZcControl'}, this.editModel);
-                    let models = [data];
-                    data.concentrateStationList.forEach(stationCode=>{
-                        const arr = this.setStationStand(stationCode, data.code);
-                        models = [...models, ...arr];
-                    });
+                    const models = [data];
                     this.$emit('updateMapModel', models);
                     this.$emit('deviceSelect', '');
                 }
@@ -231,16 +205,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    this.concertrateStation.forEach(station=>{
-                        selected.concentrateStationList.forEach(stationCode=>{
-                            switch (stationCode) {
-                            case station.code: {
-                                this.setStationStand(station.code, '');
-                                break;
-                            }
-                            }
-                        });
-                    });
                     this.$emit('updateMapModel', {...selected, _dispose: true});
                     this.$refs.dataform && this.$refs.dataform.resetFields();
                 }).catch(() => {
@@ -248,19 +212,18 @@ export default {
                 });
             }
         },
-        // 设置车站所属ZC区域
-        setStationStand(stationCode, code) {
-            const arr = [];
-            this.stationList.forEach(elem=>{
-                if (elem.code == stationCode) {
-                    const station = deepAssign({}, elem);
-                    // const station = Object.assign({}, elem);
-                    station.zcCode = code;
-                    arr.push(station);
-                    // this.$emit('updateMapModel', station);
-                }
-            });
-            return arr; // 返回设置的车站list
+        getName(code) {
+            const section = this.$store.getters['map/getDeviceByCode'](code);
+            return section.name || '';
+        },
+        mouseenter(code) {
+
+        },
+        mouseleave(code) {
+
+        },
+        hover(field) {
+            this.field = field === this.field ? '' : field;
         }
         // changeConcertrateStation(data) {
         //     if (data.length > 0) {

From 580ef87fa7db6d7df8e9254f1ca8b6a3a0671ace Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 15 Jun 2021 10:11:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=97=E7=9B=91=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ibp/constant/deviceRender.js       | 10 +++++-----
 src/ibp/constant/deviceType.js         | 22 +++++++++++-----------
 src/views/ibp/ibpsystem/index.vue      |  1 +
 src/views/newMap/displayBaSiDi/tmt.vue | 20 ++++++++++++++++----
 4 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/ibp/constant/deviceRender.js b/src/ibp/constant/deviceRender.js
index d15732b9b..519938c43 100644
--- a/src/ibp/constant/deviceRender.js
+++ b/src/ibp/constant/deviceRender.js
@@ -17,11 +17,11 @@ deviceRender[deviceType.SquareButton] = {
 };
 
 /** WarnButton渲染配置*/
-deviceRender[deviceType.WarnButton] = {
-    _type: deviceType.WarnButton,
-    zlevel: 1,
-    z: 4
-};
+// deviceRender[deviceType.WarnButton] = {
+//     _type: deviceType.WarnButton,
+//     zlevel: 1,
+//     z: 4
+// };
 
 /** Arrow渲染配置*/
 deviceRender[deviceType.Arrow] = {
diff --git a/src/ibp/constant/deviceType.js b/src/ibp/constant/deviceType.js
index b183e5e12..248bcd454 100644
--- a/src/ibp/constant/deviceType.js
+++ b/src/ibp/constant/deviceType.js
@@ -1,18 +1,18 @@
 const deviceType = {
     IbpText: 'IbpText',
-    SquareButton: 'SquareButton',
-    Arrow: 'Arrow',
-    TipBox: 'TipBox',
+    SquareButton: 'SquareButton', // 方形按钮
+    Arrow: 'Arrow', // 箭头
+    TipBox: 'TipBox', // 提示框
     Background: 'Background',
-    CircularLamp: 'CircularLamp',
+    CircularLamp: 'CircularLamp', // 圆形灯
     IbpLine: 'IbpLine',
-    AppendageBox: 'AppendageBox',
-    Alarm: 'Alarm',
-    Elevator: 'Elevator',
-    Key: 'Key',
-    TeleTerminal: 'TeleTerminal',
-    Clock: 'Clock',
-    RotateTip: 'RotateTip',
+    AppendageBox: 'AppendageBox', // 扶梯框
+    Alarm: 'Alarm', // 蜂鸣器
+    Elevator: 'Elevator', // 电梯
+    Key: 'Key', // 钥匙
+    TeleTerminal: 'TeleTerminal', // 电话端子
+    Clock: 'Clock', // 数字时钟
+    RotateTip: 'RotateTip', // 旋转提示
     CheckBox: 'CheckBox'
 };
 
diff --git a/src/views/ibp/ibpsystem/index.vue b/src/views/ibp/ibpsystem/index.vue
index 3be73e932..e781cf82e 100644
--- a/src/views/ibp/ibpsystem/index.vue
+++ b/src/views/ibp/ibpsystem/index.vue
@@ -167,6 +167,7 @@ export default {
                         jsonData = jsonData.replace(/R<next>/g, '');
                     }
                     const ibpDatas = JSON.parse(jsonData).drawData;
+                    console.log(JSON.stringify(ibpDatas));
                     this.stationCode = deviceCode;
                     getIbpInitialState(this.$route.query.group, this.stationCode).then(resp => {
                         if (resp.data) {
diff --git a/src/views/newMap/displayBaSiDi/tmt.vue b/src/views/newMap/displayBaSiDi/tmt.vue
index 04a78cbfc..1f4d7034a 100644
--- a/src/views/newMap/displayBaSiDi/tmt.vue
+++ b/src/views/newMap/displayBaSiDi/tmt.vue
@@ -62,7 +62,7 @@
               </el-table-column>
               <el-table-column prop="address" label="位置" width="60">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.section }}</span>
+                  <span>{{ getSectionPosition(scope.row.sectionCode) }}</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -110,8 +110,16 @@
             <div style="margin-top: 20px;height: 20px;">插入位置（之前）：</div>
             <el-table :data="tableData" border style="width: 280px;" height="180">
               <el-table-column prop="date" label="方向" width="60" />
-              <el-table-column prop="name" label="列车号" width="157" />
-              <el-table-column prop="address" label="位置" width="60" />
+              <el-table-column prop="name" label="列车号" width="157">
+                <template slot-scope="scope">
+                  <span>{{ getTrainCode(scope.row) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="address" label="位置" width="60">
+                <template slot-scope="scope">
+                  <span>{{ getSectionPosition(scope.row.sectionCode) }}</span>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -180,7 +188,11 @@
                   <span>{{ getTrainCode(scope.row) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="address" label="位置" width="60" />
+              <el-table-column prop="address" label="位置" width="60">
+                <template slot-scope="scope">
+                  <span>{{ getSectionPosition(scope.row.sectionCode) }}</span>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
           <div style="width: 250px;display: flex;justify-content: space-between;margin-top: 20px;margin-left: 10px;align-items: center;height: 25px;">

From a0861633f2c49a04c1cf32e29653dfc3ea3778e9 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 15 Jun 2021 15:33:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?zc=20=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E5=8C=BA=E6=AE=B5=E5=88=97=E8=A1=A8=EF=BC=88=E8=AE=A1?=
 =?UTF-8?q?=E8=BD=B4=E5=8C=BA=E6=AE=B5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/mouseController.js                | 25 +++++++-
 .../newMapdraft/mapoperate/config/list.vue    | 12 +++-
 .../newMapdraft/mapoperate/zcControl.vue      | 60 ++++++++++++++++---
 3 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js
index 007fea5ca..360f9286f 100644
--- a/src/jmapNew/mouseController.js
+++ b/src/jmapNew/mouseController.js
@@ -112,6 +112,7 @@ class MouseController extends Eventful {
                 this.trigger(this.events.__Pan, { dx, dy, oldX, oldY, newX: this._x, newY: this._y });
             } else if (e.which === 3 && this._zoomOnMouseWheel && this._previewOrMapDraw) {
                 this.handleMouseMoveRight({x: e.offsetX, y: e.offsetY});
+                this.isMoveRight = true;
             }
         }
     }
@@ -121,10 +122,23 @@ class MouseController extends Eventful {
             this._dragging = false;
         }
         if (this._zoomOnMouseWheel && this.$jmap.mapDevice['check_box'] && this._previewOrMapDraw ) {
+            console.log(this.isMoveRight, 'mouseup');
             this.eventTarget = this.$jmap.mapDevice['check_box'].instance;
             this.handleBoundingRect(this.eventTarget);
-            var em = this.checkEvent(e);
+            let em;
+            if (!this.isMoveRight) {
+                em = this.checkEvent(e);
+            } else {
+                em = {
+                    clientX:e.offsetX,
+                    clientY:e.offsetY,
+                    eventTarget:this.eventTarget,
+                    deviceCode:'check_box',
+                    deviceType:'CheckBox'
+                };
+            }
             this.trigger(this.events.Selected, em);
+
         }
     }
 
@@ -157,8 +171,13 @@ class MouseController extends Eventful {
     }
 
     contextmenu(e) {
-        var em = this.checkEvent(e);
-        this.trigger(this.events.Contextmenu, em);
+        // 判断是否正在右键拖选 若不是则弹出右键菜单
+        if (!this.isMoveRight) {
+            var em = this.checkEvent(e);
+            this.trigger(this.events.Contextmenu, em);
+        } else {
+            this.isMoveRight = false;
+        }
     }
 
     moveEvent(e) {
diff --git a/src/views/newMap/newMapdraft/mapoperate/config/list.vue b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
index e35051b57..f49ad6a5c 100644
--- a/src/views/newMap/newMapdraft/mapoperate/config/list.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/config/list.vue
@@ -304,10 +304,16 @@
                     :type="item.buttonShowType ? 'danger' : 'primary'"
                     @click="item.hover(item.buttonType)"
                   >激活选择</el-button>
+                  <el-button
+                    size="small"
+                    @click="item.clear()"
+                  >清空</el-button>
                 </div>
-                <div v-for="(nor,indexIn) in formModel[item.prop]" :key="nor" class="list-content" @mouseenter="item.mouseenter(nor)" @mouseleave="item.mouseleave(nor)">
-                  <div class="name">{{ item.getName(nor) }}</div>
-                  <div class="close" @click="formModel[item.prop].splice(indexIn, 1);"><i class="el-icon-close" /></div>
+                <div class="list-content">
+                  <div v-for="(nor,indexIn) in formModel[item.prop]" :key="nor" class="each-content" @mouseenter="item.mouseenter(nor)" @mouseleave="item.mouseleave(nor)">
+                    <div class="name">{{ item.getName(nor) }}</div>
+                    <div class="close" @click="formModel[item.prop].splice(indexIn, 1);"><i class="el-icon-close" /></div>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
index d21549558..0f5c7a72f 100644
--- a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
@@ -53,6 +53,7 @@ export default {
             editModel: {
                 code: '',
                 name: '',
+                managedSectionList:[],
                 // visible: '',
                 // concentrateStationList:[],
                 position: {
@@ -95,7 +96,8 @@ export default {
     },
     computed: {
         ...mapGetters('map', [
-            'zcList'
+            'zcList',
+            'seclectDeviceList'
         ]),
         isButtonType() {
             return this.field == 'checkZcSection';
@@ -117,7 +119,8 @@ export default {
                             { prop: 'position', label: this.$t('map.stateSignalsPlotCoordinates'), type: 'coordinate', width: '140px', children: [
                                 { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
                                 { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
-                            ] }
+                            ] },
+                            { prop:'managedSectionList', label:'管理区段列表: ', type: 'checkBoxDevice', getName:this.getName, mouseenter:this.mouseenter, mouseleave:this.mouseleave, buttonShowType:this.isButtonType, hover:this.hover, buttonType:'checkZcSection', clear:this.clear}
                             // { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation, deviceChange: this.changeConcentrateStation }
                         ]
                     }
@@ -136,9 +139,7 @@ export default {
                             { prop: 'position', label: this.$t('map.stateSignalsPlotCoordinates'), type: 'coordinate', width: '140px', children: [
                                 { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
                                 { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
-                            ] },
-
-                            { prop:'sectionList', label:'关联区段: ', type: 'checkBoxDevice', getName:this.getName, mouseenter:this.mouseenter, mouseleave:this.mouseleave, buttonShowType:this.isButtonType, hover:this.hover, buttonType:'checkZcSection'}
+                            ] }
                             //
                             // { prop:'concentrateStationList', label:this.$t('map.concentrateStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.concertrateStation, deviceChange: this.changeConcentrateStation }
                         ]
@@ -159,15 +160,28 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
-            // debugger;
             // 待调整
-            this.$refs.dataform && this.$refs.dataform.resetFields();
-            this.$refs.make && this.$refs.make.resetFields();
-            if (selected && selected._type.toUpperCase() === 'ZcControl'.toUpperCase()) {
+            // this.$refs.make && this.$refs.make.resetFields();
+            if (selected && selected._type.toUpperCase() === 'CheckBox'.toUpperCase()) {
+                this.activeName = 'first';
+                this.seclectDeviceList.forEach(item => {
+                    if (item._type == 'Section' && (item.type == '01' || item.type == '04') && !this.editModel.managedSectionList.includes(selected.code)) {
+                        this.editModel.managedSectionList.push(item.code);
+                    }
+                });
+            } else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                if (selected._type == 'Section' && (selected.type == '01' || selected.type == '04') && !this.editModel.managedSectionList.includes(selected.code)) {
+                    this.editModel.managedSectionList.push(selected.code);
+                }
+            } else if (selected && selected._type.toUpperCase() === 'ZcControl'.toUpperCase()) {
+                this.$refs.dataform && this.$refs.dataform.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             }
         },
+        clear() {
+            this.editModel.managedSectionList = [];
+        },
         create() {
             const uid = getUID('ZcControl', this.zcList);
             const models = [];
@@ -263,3 +277,31 @@ export default {
         color: #3E44BE;
     }
 </style>
+<style lang="scss">
+    .view-control-content .list-box .list-content{
+        margin-left:10px;
+        margin-top:10px;
+        margin-right:10px;
+        padding:5px;
+
+    }
+    .view-control-content .list-box .each-content{
+        background: #e2e2e2;
+        margin: 5px;
+        border-radius: 5px;
+        height: 30px;
+        line-height: 30px;
+        padding-left: 10px;
+        padding-right: 7px;
+        display: inline-block;
+        cursor: pointer;
+        font-size: 14px;
+    }
+    .view-control-content .list-box .each-content .name{
+        display: inline-block;
+    }
+    .view-control-content .list-box .each-content .close{
+        display: inline-block;
+        cursor: pointer;
+    }
+</style>