diff --git a/src/jmap/mouseController.js b/src/jmap/mouseController.js
index 51c040d00..7cfa6e7ce 100644
--- a/src/jmap/mouseController.js
+++ b/src/jmap/mouseController.js
@@ -239,7 +239,7 @@ class MouseController extends Eventful {
         const deviceList = Object.values(this.$jmap.mapDevice);
         const includeDeviceList = [];
         deviceList.forEach( item =>{
-            if (item.instance._type == deviceType.Section) {
+            if (item.instance && item.instance._type == deviceType.Section) {
                 let deviceBoundingRect = {};
                 if (item.type == '03') {
                     deviceBoundingRect = {
@@ -260,7 +260,7 @@ class MouseController extends Eventful {
                     includeDeviceList.push(item);
                 }
             }
-            if (item.instance._type == deviceType.Switch) {
+            if (item.instance && item.instance._type == deviceType.Switch) {
                 const deviceBoundingRect = {
                     x1: item.intersection.x,
                     y1: item.intersection.y,
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index bcdd27725..13416f734 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -7,11 +7,18 @@ import { deepAssign } from '@/utils/index';
  * 查询向上受影响的Devices
  * @param {Object} map
  * @param {Object} device
- * @param {Array} effectedDeviceList
+ * @param {Array} list
  */
-function queryEffectedModels(map, device, effectedDeviceList) {
+function queryDeleteModels(map, device, dict) {
+    function setDisPose(model, dict) {
+        if (!dict[model.code] || !dict[model.code]._dispose) {
+            dict[model.code] = {...model, _dispose: true };
+        }
+    }
+
     if (device && map) {
-        effectedDeviceList.push(device);
+        setDisPose(device, dict);
+
         switch (device._type) {
         // 查询ink关联项
         case deviceType.Link:
@@ -19,7 +26,7 @@ function queryEffectedModels(map, device, effectedDeviceList) {
             if (map.sectionList && map.sectionList.length) {
                 map.sectionList.forEach(elem => {
                     if (elem.linkCode === device.code) {
-                        queryEffectedModels(map, elem, effectedDeviceList);
+                        queryDeleteModels(map, elem, dict);
                     }
                 });
             }
@@ -28,27 +35,18 @@ function queryEffectedModels(map, device, effectedDeviceList) {
             if (map.signalList && map.signalList.length) {
                 map.signalList.forEach(elem => {
                     if (elem.linkCode === device.code) {
-                        effectedDeviceList.push(elem);
+                        setDisPose(elem, dict);
                     }
                 });
             }
             break;
             // 移除区段关联项
         case deviceType.Section:
-            // 查询物理区段关联的逻辑区段
-            if (map.sectionList && map.sectionList.length && device.type === '01') {
+            // 删除所属逻辑区段
+            if (map.sectionList && map.sectionList.length && device.type == '01') {
                 map.sectionList.forEach(elem => {
-                    if (elem.type !== '01' && elem.parentCode === device.code) {
-                        effectedDeviceList.push(elem);
-                    }
-                });
-            }
-
-            // 查询区段关联车次窗
-            if (map.trainWindowList && map.trainWindowList.length) {
-                map.trainModelList.forEach(elem => {
-                    if (elem.sectionCode == device.code) {
-                        effectedDeviceList.push(elem);
+                    if (elem.type != '01' && elem.parentCode == device.code) {
+                        setDisPose(elem, dict);
                     }
                 });
             }
@@ -56,22 +54,27 @@ function queryEffectedModels(map, device, effectedDeviceList) {
             // 查询区段关联的道岔
             if (map.switchList && map.switchList.length) {
                 map.switchList.forEach(elem => {
-                    if (elem.sectionACode === device.code ||
-							elem.sectionBCode === device.code ||
-							elem.sectionCCode === device.code) {
-                        effectedDeviceList.push(elem);
+                    if (elem.sectionACode == device.code || elem.sectionBCode == device.code || elem.sectionCCode == device.code) {
+                        queryDeleteModels(map, elem, dict);
                     }
                 });
             }
 
-            // 查询区段关联的车站
-            if (map.stationList && map.stationList.length) {
-                map.stationList.forEach(elem => {
-                    if (elem.sectionCode === device.code) {
-                        effectedDeviceList.push(elem);
+            break;
+        case deviceType.Switch:
+            map.sectionList.forEach(elem => {
+                if (elem.type == '03' && elem.relSwitchCode == device.code) {
+                    setDisPose(elem, dict);
+                }
+                if (elem.relSwitchCode == device.code && elem.type != '03') {
+                    if (!dict[elem.code] || !dict[elem.code]._dispose) {
+                        const copyModel = deepAssign({}, elem);
+                        copyModel.relSwitchCode = '';
+                        copyModel.isSwitchSection = false;
+                        dict[elem.code] = copyModel;
                     }
-                });
-            }
+                }
+            });
             break;
         }
     }
@@ -315,6 +318,9 @@ const map = {
         map: (state) => {
             return state.map;
         },
+        safetyDoorList: (state) => {
+            return state.map.safetyDoorList || [];
+        },
         lineCode: (state) => {
             if (state.map && state.map.skinVO) {
                 return state.map.skinVO.code;
@@ -601,6 +607,14 @@ const map = {
             if (Vue.prototype.$jlmap) {
                 Vue.prototype.$jlmap.clear();
             }
+        },
+        updateMapStandData: (state, { models, type }) => {
+            models.forEach(item => {
+                if (!state.mapDevice[item.code]) {
+                    state.mapDevice[item.code] = item;
+                    state.map[type].push(item);
+                }
+            });
         }
     },
 
@@ -643,19 +657,20 @@ const map = {
                 }
 
                 // 查找向上关联需要一起删除的设备
-                const effectedModelList = [];
+                const dict = {};
                 models.forEach((model) => {
                     if (model['_dispose']) {
-                        queryEffectedModels(state.map, model, effectedModelList);
+                        queryDeleteModels(state.map, model, dict);
                     } else {
-                        effectedModelList.push(model);
+                        dict[model.code] = model;
                     }
                 });
 
-                handleOperation(state, effectedModelList);
+                const list = Object.values(dict);
+                handleOperation(state, list);
 
-                commit('mapRender', effectedModelList);
-                resolve(effectedModelList);
+                commit('mapRender', list);
+                resolve(list);
             });
         },
 
@@ -704,6 +719,10 @@ const map = {
 
         operateTrainModel: ({ commit }, { model, type }) => {
             commit('operateTrainModel', { model, type });
+        },
+
+        updateMapStandData: ({ commit }, { models, type }) => {
+            commit('updateMapStandData', { models, type });
         }
 
     }
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index 84ae3bfdb..b34ec5851 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -178,9 +178,10 @@ export default {
 
         confirm() {
             const roleName = this.memberList.find(elem=>{ return elem.id == this.form.role; });
+            this.$emit('selectQuest', this.row, this.form.role, this.mapLocation, roleName.role);
             this.doClose();
             this.roleDoClose();
-            this.$emit('selectQuest', this.row, this.form.role, this.mapLocation, roleName.role);
+
         },
 
         roleDoClose() {
diff --git a/src/views/display/designIndex.vue b/src/views/display/designIndex.vue
index db5ae1d11..3d08a026c 100644
--- a/src/views/display/designIndex.vue
+++ b/src/views/display/designIndex.vue
@@ -585,11 +585,11 @@ export default {
             if (this.isDrive) {
                 this.panelShow = false;
                 this.drivingShow = true;
-                this.$refs.Jl3dDrive.show(this.mapId,this.group);
+                this.$refs.Jl3dDrive.show(this.mapId, this.group);
             } else {
                 this.panelShow = false;
                 this.simulationShow = true;
-                this.$refs.Jl3dSimulation.show(this.mapId,this.group);
+                this.$refs.Jl3dSimulation.show(this.mapId, this.group);
             }
         },
         showScheduling() {
diff --git a/src/views/mapdraft/dataRelation/parkOperate/index.vue b/src/views/mapdraft/dataRelation/parkOperate/index.vue
index bff361fb5..9cb48cc88 100644
--- a/src/views/mapdraft/dataRelation/parkOperate/index.vue
+++ b/src/views/mapdraft/dataRelation/parkOperate/index.vue
@@ -6,6 +6,7 @@
 <script>
 
 export default {
+    name: 'ParkOperate',
     components: {
     },
     props: {
diff --git a/src/views/mapdraft/dataRelation/safetyDoorOperate/index.vue b/src/views/mapdraft/dataRelation/safetyDoorOperate/index.vue
index 86c71f319..55508a711 100644
--- a/src/views/mapdraft/dataRelation/safetyDoorOperate/index.vue
+++ b/src/views/mapdraft/dataRelation/safetyDoorOperate/index.vue
@@ -1,12 +1,54 @@
 <template>
   <div style="height: 100%;">
-    11111
+    <div style="height: calc(100% - 46px);">
+      <template v-if="!display">
+        <el-scrollbar wrap-class="scrollbar-wrapper">
+          <el-form ref="form" :model="editModel" label-width="120px" size="mini">
+            <el-form-item label="屏蔽门code" prop="code">
+              <el-select v-model="editModel.code" clearable :filterable="true" @change="deviceChange">
+                <el-option
+                  v-for="item in safetyDoorList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="名字" prop="name">
+              <el-input v-model="editModel.name" />
+            </el-form-item>
+            <el-form-item label="所属站台" prop="stationStandCode">
+              <el-select v-model="editModel.stationStandCode" disabled>
+                <el-option
+                  v-for="item in stationStandList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-scrollbar>
+      </template>
+      <template v-if="display">
+        <div style="text-align: center;padding-top: 20px;">暂无数据</div>
+      </template>
+    </div>
+    <div class="button_box">
+      <el-button-group class="map-draft-group">
+        <el-button type="primary" size="small" @click="create">批量创建</el-button>
+        <el-button type="danger" size="small" @click="editObject">修改</el-button>
+      </el-button-group>
+    </div>
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
+import { deepAssign } from '@/utils/index';
+import { getUID } from '@/jmap/utils/Uid';
 
 export default {
+    name: 'SafetyDoorOperate',
     components: {
 
     },
@@ -26,25 +68,85 @@ export default {
     },
     data() {
         return {
-            display: true
+            display: true,
+            editModel: {
+                code: '',
+                name: '',
+                stationCode: '',
+                stationStandCode: ''
+            }
         };
     },
     computed: {
         ...mapGetters('map', [
-            'map'
+            'map',
+            'safetyDoorList',
+            'stationStandList'
         ])
     },
+    watch: {
+        '$store.state.map.map': function(val) {
+            if (val) {
+                this.init();
+            }
+        }
+    },
     mounted () {
         this.init();
     },
     methods: {
         init() {
             this.display = true;
-            console.log(this.map);
-            if (this.$store.state.map.map.safetyDoorList && this.$store.state.map.map.safetyDoorList.length) {
-                this.display = false;
+            const mapObject = this.map;
+            if (mapObject) {
+                if (mapObject.safetyDoorList && mapObject.safetyDoorList.length) {
+                    this.display = false;
+                } else {
+                    mapObject.safetyDoorList = [];
+                }
+            }
+        },
+        deviceChange(code) {
+            this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
+        },
+        deviceSelect(selected) {
+            this.$refs.form.resetFields();
+            if (selected && selected._type.toUpperCase() === 'PSD'.toUpperCase()) { // ESP
+                this.editModel = deepAssign(this.editModel, selected);
+            }
+        },
+        editObject() {
+            console.log(this.editModel, 111);
+        },
+        hasPSD(data) {
+            let falg = false;
+            this.map.safetyDoorList.forEach(item => {
+                if (item.stationStandCode == data.code) {
+                    falg = true;
+                }
+            });
+            return falg;
+        },
+        create() {
+            const arr = [];
+            this.map.stationStandList.forEach(item => {
+                if (item.visible && item.hasDoor && !this.hasPSD(item)) {
+                    arr.push({
+                        _type: 'PSD',
+                        code: getUID('PSD'),
+                        name: getUID('PSD'),
+                        stationCode: item.stationCode,
+                        stationStandCode: item.code
+                    });
+                }
+            });
+            if (arr.length) {
+                this.display = false;
+                this.$message('创建完成');
+                this.$store.dispatch('map/updateMapStandData', {models: arr, type: 'safetyDoorList'});
+            } else {
+                this.$message('暂无车站');
             }
-            console.log(this.$store.state.map.map);
         }
     }
 };
diff --git a/src/views/mapdraft/mapoperate/ImageControl.vue b/src/views/mapdraft/mapoperate/ImageControl.vue
index 1dbf0e38b..2552c1afc 100644
--- a/src/views/mapdraft/mapoperate/ImageControl.vue
+++ b/src/views/mapdraft/mapoperate/ImageControl.vue
@@ -183,9 +183,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.form.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'ImageControl'.toUpperCase()) {
-                this.$refs.form.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             }
diff --git a/src/views/mapdraft/mapoperate/buttonDraft.vue b/src/views/mapdraft/mapoperate/buttonDraft.vue
index cf822ad38..8a4c6b97d 100644
--- a/src/views/mapdraft/mapoperate/buttonDraft.vue
+++ b/src/views/mapdraft/mapoperate/buttonDraft.vue
@@ -196,9 +196,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.form.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() == 'ButtonControl'.toUpperCase()) {
-                this.$refs.form.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             }
diff --git a/src/views/mapdraft/mapoperate/counter.vue b/src/views/mapdraft/mapoperate/counter.vue
index 351a01b26..fe9f4760c 100644
--- a/src/views/mapdraft/mapoperate/counter.vue
+++ b/src/views/mapdraft/mapoperate/counter.vue
@@ -178,9 +178,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.form.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'Counter'.toUpperCase()) {
-                this.$refs.form.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             } else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
diff --git a/src/views/mapdraft/mapoperate/delayunlock.vue b/src/views/mapdraft/mapoperate/delayunlock.vue
index e08bc9535..3f50a5633 100644
--- a/src/views/mapdraft/mapoperate/delayunlock.vue
+++ b/src/views/mapdraft/mapoperate/delayunlock.vue
@@ -161,9 +161,9 @@ export default {
         },
         deviceSelect(selected) {
             this.$nextTick(() => {
+                this.$refs.form.resetFields();
+                this.$refs.make.resetFields();
                 if (selected && selected._type.toUpperCase() === 'DelayUnlock'.toUpperCase()) {
-                    this.$refs.form.resetFields();
-                    this.$refs.make.resetFields();
                     this.activeName = 'first';
                     this.editModel = deepAssign(this.editModel, selected);
                 } else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
diff --git a/src/views/mapdraft/mapoperate/lcControl.vue b/src/views/mapdraft/mapoperate/lcControl.vue
index 493e72f34..85ab25e8c 100644
--- a/src/views/mapdraft/mapoperate/lcControl.vue
+++ b/src/views/mapdraft/mapoperate/lcControl.vue
@@ -168,9 +168,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.form.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'LcControl'.toUpperCase()) {
-                this.$refs.form.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             }
diff --git a/src/views/mapdraft/mapoperate/limitControl.vue b/src/views/mapdraft/mapoperate/limitControl.vue
index 8393d97f0..ca371e788 100644
--- a/src/views/mapdraft/mapoperate/limitControl.vue
+++ b/src/views/mapdraft/mapoperate/limitControl.vue
@@ -159,9 +159,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.form.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'LimitControl'.toUpperCase()) {
-                this.$refs.form.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             }
diff --git a/src/views/mapdraft/mapoperate/line.vue b/src/views/mapdraft/mapoperate/line.vue
index 386f0db5c..ea5127960 100644
--- a/src/views/mapdraft/mapoperate/line.vue
+++ b/src/views/mapdraft/mapoperate/line.vue
@@ -191,9 +191,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.form.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'Line'.toUpperCase()) {
-                this.$refs.form.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             }
diff --git a/src/views/mapdraft/mapoperate/section.vue b/src/views/mapdraft/mapoperate/section.vue
index d2a61958b..1f2d3d5fa 100644
--- a/src/views/mapdraft/mapoperate/section.vue
+++ b/src/views/mapdraft/mapoperate/section.vue
@@ -133,9 +133,9 @@
       </div>
     </el-tab-pane>
     <el-tab-pane class="view-control" label="批量操作" name="five">
-      <el-form ref="oprt" label-width="130px" size="mini">
+      <el-form label-width="130px" size="mini">
         <el-form-item label="选择link:">
-          <el-select v-model="linkCode" filterable multiple size="mini">
+          <el-select v-model="linkCodeList" filterable multiple size="mini">
             <el-option
               v-for="item in linkList"
               :key="item.code"
@@ -258,7 +258,7 @@ export default {
                 lengthFact: 0,
                 isCurve: false
             },
-            linkCode: '',
+            linkCodeList: [],
             tableData: [],
             oldPoint: [], // 区段未修改前 坐标
             addModel: {
@@ -283,8 +283,7 @@ export default {
                     { required: true, message: this.$t('rules.pleaseSelectSectionName'), trigger: 'change' }
                 ],
                 splitNumber: [
-                    { required: true, message: this.$t('rules.pleaseEnterSplit'), trigger: 'blur' },
-                    { type: 'number', message: this.$t('rules.pleaseEnterSplitNumber'), min: '20' }
+                    { required: true, message: this.$t('rules.pleaseEnterSplit'), trigger: 'blur' }
                 ],
                 trainPosType: [
                     { required: true, message: this.$t('rules.pleaseSelectTrainDir'), trigger: 'change' }
@@ -948,12 +947,7 @@ export default {
         // 删除对象
         deleteObj() {
             const models = [];
-            const switchList = [];
             const selected = this.$store.getters['map/getDeviceByCode'](this.editModel.code);
-            this.switchList.forEach(switchEle => {
-                selected.relSwitchCode == switchEle.code && switchList.push(this.$store.getters['map/getDeviceByCode'](switchEle.code));
-            });
-            this.delSectionSwitch(switchList, models);
             if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
                 const _that = this;
                 this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
@@ -961,13 +955,6 @@ export default {
                     cancelButtonText: this.$t('tip.cancel'),
                     type: 'warning'
                 }).then(() => {
-                    if (selected.type == '01') {
-                        this.sectionList.forEach(section => {
-                            if (section.parentCode == selected.code) { // 删除所属逻辑区段
-                                models.push(deepAssign(section, { _dispose: true }));
-                            }
-                        });
-                    }
                     models.push(deepAssign(selected, { _dispose: true }));
                     _that.$emit('updateMapModel', models);
                     _that.deviceSelect();
@@ -1175,15 +1162,10 @@ export default {
         // 按link批量删除区段
         delRelevanceSection() {
             const models = [];
-            const switchList = [];
-            this.linkCode.forEach(linkCode => {
+            this.linkCodeList.forEach(code => {
                 this.sectionList.forEach(section => {
-                    if (section.linkCode == linkCode) {
-                        const selectedSection = this.$store.getters['map/getDeviceByCode'](section.code);
-                        models.push(deepAssign(selectedSection, { _dispose: true }));
-                        this.switchList.forEach(switchEle => {
-                            section.relSwitchCode == switchEle.code && switchList.push(this.$store.getters['map/getDeviceByCode'](switchEle.code));
-                        });
+                    if (section.linkCode == code) {
+                        models.push({...section, _dispose: true });
                     }
                 });
             });
@@ -1192,31 +1174,14 @@ export default {
                 cancelButtonText: this.$t('tip.cancel'),
                 type: 'warning'
             }).then(async () => {
-                this.delSectionSwitch(switchList, models);
+                // this.delSectionSwitch(switchList, models);
                 this.$emit('updateMapModel', models);
                 this.deviceSelect();
-                this.linkCode = '';
+                this.linkCodeList = [];
             }).catch(() => {
                 this.$message.info(this.$t('tip.cancelledDelete'));
             });
         },
-        // 删除道岔/ 关联的道岔区段以及 道岔绑定关系
-        delSectionSwitch(switchList, models) {
-            switchList.forEach((switchs) => {
-                this.sectionList.forEach(elem => {
-                    if (elem.type == '03' && elem.relSwitchCode == switchs.code) {
-                        models.push(deepAssign(this.$store.getters['map/getDeviceByCode'](elem.code), { _dispose: true }));
-                    }
-                    if (elem.relSwitchCode == switchs.code && elem.type != '03') {
-                        const copyModel = deepAssign({}, elem);
-                        copyModel.relSwitchCode = '';
-                        copyModel.isSwitchSection = false;
-                        models.push(copyModel);
-                    }
-                });
-                models.push(deepAssign(switchs, { _dispose: true }));
-            });
-        },
         // 多选区段设置集中站
         handleScetionStationCode() {
             this.$refs['operationModel'].validate((valid) => {
diff --git a/src/views/mapdraft/mapoperate/signal.vue b/src/views/mapdraft/mapoperate/signal.vue
index 1e640940b..02565de38 100644
--- a/src/views/mapdraft/mapoperate/signal.vue
+++ b/src/views/mapdraft/mapoperate/signal.vue
@@ -328,9 +328,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.dataform.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-                this.$refs.dataform.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
                 this.editModel.potLampType = selected.potLampType || '01';
diff --git a/src/views/mapdraft/mapoperate/station.vue b/src/views/mapdraft/mapoperate/station.vue
index 9576343c6..94e462aec 100644
--- a/src/views/mapdraft/mapoperate/station.vue
+++ b/src/views/mapdraft/mapoperate/station.vue
@@ -188,9 +188,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.dataform.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
-                this.$refs.dataform.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
                 this.editModel.runPlanName = selected.runPlanName || '';
diff --git a/src/views/mapdraft/mapoperate/stationcontrol.vue b/src/views/mapdraft/mapoperate/stationcontrol.vue
index c3a7c5eaa..a074e67ec 100644
--- a/src/views/mapdraft/mapoperate/stationcontrol.vue
+++ b/src/views/mapdraft/mapoperate/stationcontrol.vue
@@ -174,9 +174,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.dataform.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'StationControl'.toUpperCase()) {
-                this.$refs.dataform.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             } else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
diff --git a/src/views/mapdraft/mapoperate/stationstand.vue b/src/views/mapdraft/mapoperate/stationstand.vue
index 47441b953..93d71d1bc 100644
--- a/src/views/mapdraft/mapoperate/stationstand.vue
+++ b/src/views/mapdraft/mapoperate/stationstand.vue
@@ -231,9 +231,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.dataform.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                this.$refs.dataform.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             } else if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
diff --git a/src/views/mapdraft/mapoperate/switch.vue b/src/views/mapdraft/mapoperate/switch.vue
index 7493592ba..8d5347433 100644
--- a/src/views/mapdraft/mapoperate/switch.vue
+++ b/src/views/mapdraft/mapoperate/switch.vue
@@ -156,8 +156,8 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.dataform.resetFields();
             if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
-                this.$refs.dataform.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             }
@@ -476,7 +476,6 @@ export default {
                 });
             }
             return models;
-            // this.$emit('updateMapModel', models);
         }
     }
 };
diff --git a/src/views/mapdraft/mapoperate/text.vue b/src/views/mapdraft/mapoperate/text.vue
index 3a33328f4..136a37d7c 100644
--- a/src/views/mapdraft/mapoperate/text.vue
+++ b/src/views/mapdraft/mapoperate/text.vue
@@ -176,9 +176,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.form.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'Text'.toUpperCase()) {
-                this.$refs.form.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
                 [this.editModel.prepend, this.editModel.content] = selected.content.split('::');
diff --git a/src/views/mapdraft/mapoperate/trainwindow.vue b/src/views/mapdraft/mapoperate/trainwindow.vue
index be8315e38..2f969877e 100644
--- a/src/views/mapdraft/mapoperate/trainwindow.vue
+++ b/src/views/mapdraft/mapoperate/trainwindow.vue
@@ -145,8 +145,8 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.form.resetFields();
             if (selected && selected._type.toUpperCase() === 'TrainWindow'.toUpperCase()) {
-                this.$refs.form.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             }
diff --git a/src/views/mapdraft/mapoperate/zcControl.vue b/src/views/mapdraft/mapoperate/zcControl.vue
index 9d0fc3513..ba87a30cb 100644
--- a/src/views/mapdraft/mapoperate/zcControl.vue
+++ b/src/views/mapdraft/mapoperate/zcControl.vue
@@ -165,9 +165,9 @@ export default {
             this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code));
         },
         deviceSelect(selected) {
+            this.$refs.dataform.resetFields();
+            this.$refs.make.resetFields();
             if (selected && selected._type.toUpperCase() === 'ZcControl'.toUpperCase()) {
-                this.$refs.dataform.resetFields();
-                this.$refs.make.resetFields();
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
             }
diff --git a/src/views/scriptManage/create.vue b/src/views/scriptManage/create.vue
index b83e72804..61e04cfbf 100644
--- a/src/views/scriptManage/create.vue
+++ b/src/views/scriptManage/create.vue
@@ -47,15 +47,13 @@ export default {
         rules() {
             const crules = {
                 name: [
-                    // { required: true, message: this.$t('scriptRecord.inputScriptName'), trigger: 'blur' },
-                    // { required: true, message: this.$t('scriptRecord.inputScriptName'), trigger: 'change' }
                     { validator: this.validateScriptName, trigger: 'blur' },
                     { validator: this.validateScriptName, trigger: 'change' }
+                ],
+                description: [
+                    { validator: this.validateDescription, trigger: 'blur' },
+                    { validator: this.validateDescription, trigger: 'change' }
                 ]
-                // description:[
-                //     { required: true, message: this.$t('scriptRecord.inputScriptDescription'), trigger: 'blur' },
-                //     { required: true, message: this.$t('scriptRecord.inputScriptDescription'), trigger: 'change' }
-                // ]
             };
             return crules;
         }
@@ -69,6 +67,14 @@ export default {
                 return callback();
             }
         },
+        validateDescription(rule, value, callback) {
+            if (value.trim().length === 0) {
+                this.formModel.description = this.formModel.name.replace(/\s/g, '');
+                return callback(new Error(this.$t('scriptRecord.inputScriptDescription')));
+            } else {
+                return callback();
+            }
+        },
         doShow(questid) {
             if (questid) {
                 getQuestById(questid).then(resp=>{
diff --git a/src/views/system/commandDictionary/edit.vue b/src/views/system/commandDictionary/edit.vue
index 1a1d5b6d1..ff7b23146 100644
--- a/src/views/system/commandDictionary/edit.vue
+++ b/src/views/system/commandDictionary/edit.vue
@@ -137,6 +137,12 @@ export default {
             if (this.$route.query.id) {
                 getCommandDetail(this.$route.query.id).then(res => {
                     this.formModel = res.data;
+                    if (!this.formModel.paramList) {
+                        this.formModel.paramList = [];
+                    }
+                    if (!this.formModel.conditionList) {
+                        this.formModel.conditionList = [];
+                    }
                     this.operateList = Object.values(Commands[this.formModel.operateObject]);
                 });
             }
diff --git a/src/views/system/commandDictionary/index.vue b/src/views/system/commandDictionary/index.vue
index 999c7afeb..bf7e251ea 100644
--- a/src/views/system/commandDictionary/index.vue
+++ b/src/views/system/commandDictionary/index.vue
@@ -150,7 +150,6 @@ export default {
         },
         convertField(fieldValue, operateObject, converFormat) {
             if (Commands) {
-                // debugger;
                 const enumList = Object.values(Commands[operateObject]);
                 if (enumList && converFormat && converFormat.length >= 2) {
                     const value = converFormat[0];
diff --git a/src/views/system/commandDictionary/showCondition.vue b/src/views/system/commandDictionary/showCondition.vue
index 9e0f06fd6..20ec955cc 100644
--- a/src/views/system/commandDictionary/showCondition.vue
+++ b/src/views/system/commandDictionary/showCondition.vue
@@ -24,6 +24,7 @@ export default {
     },
     methods: {
         doShow(data) {
+            this.dialogVisible = true;
             this.conditionList = data;
         },
         handleClose() {
diff --git a/src/views/trainRoom/e-chat.vue b/src/views/trainRoom/e-chat.vue
index 84002d14e..e3bf91cf5 100644
--- a/src/views/trainRoom/e-chat.vue
+++ b/src/views/trainRoom/e-chat.vue
@@ -140,16 +140,15 @@ export default {
         justify-content: space-between;
 
 		&__head {
-			height: 30px;
 			display: flex;
 			align-items: center;
 			background: #f0f0f0;
 			border-bottom: 1px solid #ccc;
-			padding: 10px;
 
 			&--title {
 				font-size: 16px;
 				font-weight: bold;
+                padding:10px 0px 10px 10px;
 			}
 		}
 
@@ -216,6 +215,8 @@ export default {
 				outline: none;
 				resize: none;
 				font-size: 16px;
+                padding-left: 10px;
+                padding-top: 10px;
 			}
 
             &--send {
diff --git a/src/views/trainRoom/e-device.vue b/src/views/trainRoom/e-device.vue
index 9678ff7fe..b296c1943 100644
--- a/src/views/trainRoom/e-device.vue
+++ b/src/views/trainRoom/e-device.vue
@@ -119,9 +119,11 @@ export default {
 			&--title {
 				font-size: 14px;
 				font-weight: bold;
+        margin-left:10px;
 			}
 
 			&--add {
+        margin-right:2px;
 				/deep/ .el-button.is-circle {
 					padding: 5px;
 				}
diff --git a/src/views/trainRoom/e-members.vue b/src/views/trainRoom/e-members.vue
index 08aa1a2c3..8f2261b02 100644
--- a/src/views/trainRoom/e-members.vue
+++ b/src/views/trainRoom/e-members.vue
@@ -59,7 +59,7 @@ export default {
             return { label: 'nickName' };
         },
         treeHeight() {
-            return this.height - 40;
+            return this.height - 64;
         },
         filterMembers() {
             return this.members.filter(e =>{ return e.nickName.includes(this.filterText); });
@@ -97,7 +97,6 @@ export default {
 		border: 1px solid #ccc;
 
 		&__head {
-			height: 30px;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -105,13 +104,14 @@ export default {
 			border-bottom: 1px solid #ccc;
 
 			&--title {
+                padding:10px 0px;
 				font-size: 16px;
 				font-weight: bold;
 			}
 
 			&--notes {
 				font-size: 16px;
-				height: 100%;
+                padding:10px 0px;
 				display: flex;
 				align-items: flex-end;
 			}
@@ -124,6 +124,7 @@ export default {
 				height: auto;
 				min-height: calc(100%-200px);
 				max-height: calc(100%-200px);
+                border-bottom: 1px #ccc solid;
 
 				&::-webkit-scrollbar {
 					display: none;
diff --git a/src/views/trainRoom/e-role.vue b/src/views/trainRoom/e-role.vue
index effec5372..ed5938b51 100644
--- a/src/views/trainRoom/e-role.vue
+++ b/src/views/trainRoom/e-role.vue
@@ -129,9 +129,11 @@ export default {
 			&--title {
 				font-size: 14px;
 				font-weight: bold;
+        margin-left:10px;
 			}
 
 			&--add {
+        margin-right:2px;
 				/deep/ .el-button.is-circle {
 					padding: 5px;
 				}
diff --git a/src/views/trainRoom/e-roles.vue b/src/views/trainRoom/e-roles.vue
index 5f28cf240..d61092568 100644
--- a/src/views/trainRoom/e-roles.vue
+++ b/src/views/trainRoom/e-roles.vue
@@ -365,7 +365,7 @@ export default {
                 this.loading = true;
                 await putJointTrainingExit(this.group);
                 this.loading = false;
-                this.$router.push({ path: `/trainingPlatform/detail/${this.$route.query.subSystem}`, query: {mapId: this.room.mapId}});
+                history.go(-1);
             } catch (error) {
                 this.$emit('message', {type:'error', message: this.$t('error.operationFailure')});
             }
@@ -381,7 +381,6 @@ export default {
 		background: #fff;
 
 		&__head {
-			height: 60px;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -393,6 +392,7 @@ export default {
 			&--title {
 				display: flex;
 				align-items: flex-end;
+                padding: 10px 0px;
 
 				.label {
 					font-size: 16px;