From e5af672515304909b84a6fffb10e86024da5cf87 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 28 Jul 2020 13:03:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=9B=BE?=
 =?UTF-8?q?=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

---
 .../newMapdraft/mapoperate/ImageControl.vue   | 18 +-------
 .../newMap/newMapdraft/mapoperate/arrow.vue   | 10 +++--
 .../newMapdraft/mapoperate/controlLamp.vue    | 45 ++++---------------
 .../newMap/newMapdraft/mapoperate/counter.vue | 12 +----
 .../newMapdraft/mapoperate/delayunlock.vue    | 13 ++----
 .../newMapdraft/mapoperate/lcControl.vue      | 15 +------
 .../newMap/newMapdraft/mapoperate/line.vue    | 13 +-----
 .../newMap/newMapdraft/mapoperate/power.vue   | 10 +----
 .../newMap/newMapdraft/mapoperate/text.vue    | 10 +----
 .../newMapdraft/mapoperate/zcControl.vue      | 18 +-------
 10 files changed, 26 insertions(+), 138 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue b/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
index ffc2f5a08..52628ea4d 100644
--- a/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
@@ -15,7 +15,7 @@
         ref="createForm"
         :create-form="makeForm"
         :add-model="addModel"
-        :create-rules="createRules"
+        :create-rules="rules"
         @create="create"
       />
     </el-tab-pane>
@@ -153,22 +153,6 @@ export default {
 
             };
             return form;
-        },
-        createRules: function () {
-            return {
-                width: [
-                    { required: true, message: this.$t('map.pleaseEnterImageWidth'), trigger: 'blur' }
-                ],
-                height: [
-                    { required: true, message: this.$t('map.pleaseEnterImageHeight'), trigger: 'blur' }
-                ],
-                'position.x': [
-                    { required: true, message: this.$t('map.pleaseEnterXCoordinate'), trigger: 'blur' }
-                ],
-                'position.y': [
-                    { required: true, message: this.$t('map.pleaseEnterYCoordinate'), trigger: 'blur' }
-                ]
-            };
         }
     },
     mounted() {
diff --git a/src/views/newMap/newMapdraft/mapoperate/arrow.vue b/src/views/newMap/newMapdraft/mapoperate/arrow.vue
index 569673333..03bbdb66b 100644
--- a/src/views/newMap/newMapdraft/mapoperate/arrow.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/arrow.vue
@@ -15,7 +15,7 @@
         ref="createForm"
         :create-form="createForm"
         :add-model="addModel"
-        :create-rules="makeRules"
+        :create-rules="rules"
         @create="create"
       />
     </el-tab-pane>
@@ -77,9 +77,13 @@ export default {
             rules: {
                 code: [
                     { required: true, message: this.$t('rules.pleaseSelectLine'), trigger: 'blur' }
+                ],
+                'position.x': [
+                    { required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
+                ],
+                'position.y': [
+                    { required: true, message: this.$t('rules.trainPositionY'), trigger: 'blur' }
                 ]
-            },
-            makeRules: {
             }
         };
     },
diff --git a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
index ef258b642..6aaed7dbb 100644
--- a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
@@ -5,14 +5,14 @@
         ref="dataform"
         :form="form"
         :edit-model="editModel"
-        :rules="editRules"
+        :rules="rules"
         :type="editModel.type"
         @updateMapModel="updateMapModel"
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
       <div class="view-control-content">
-        <config-list ref="make" :form="formMake" :form-model="addModel" :rules="createRules" />
+        <config-list ref="make" :form="formMake" :form-model="addModel" :rules="rules" />
         <div style="color: #99a9bf;font-size: 12px;text-align: center;">
           <span>提示:设置归属车站时，坐标会默认设置为车站下方50px</span>
         </div>
@@ -130,23 +130,6 @@ export default {
                 pfNum: 0,
                 switchCode: ''
             },
-            rules: {
-                code: [
-                    { required: true, message: this.$t('rules.selectSaidLampType'), trigger: 'change' }
-                ],
-                name: [
-                    { required: true, message: this.$t('rules.enterSaidLampName'), trigger: 'blur' }
-                ],
-                'position.x': [
-                    { required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
-                ],
-                'position.y': [
-                    { required: true, message: this.$t('rules.trainPositionY'), trigger: 'blur' }
-                ],
-                stationCode: [
-                    { required: true, message: this.$t('rules.pleaseSelectStationCode'), trigger: 'change'}
-                ]
-            },
             field: ''
         };
     },
@@ -207,11 +190,17 @@ export default {
             };
             return form;
         },
-        editRules: function () {
+        rules: function () {
             return {
                 type: [
                     { required: true, message: this.$t('rules.selectSaidLampType'), trigger: 'change' }
                 ],
+                code: [
+                    { required: true, message: this.$t('rules.pleaseSelectEncoding'), trigger: 'change' }
+                ],
+                name: [
+                    { required: true, message: this.$t('rules.enterSaidLampName'), trigger: 'blur' }
+                ],
                 'position.x': [
                     { required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
                 ],
@@ -226,22 +215,6 @@ export default {
                 ]
             };
         },
-        createRules: function () {
-            return {
-                type: [
-                    { required: true, message: this.$t('rules.selectSaidLampType'), trigger: 'change' }
-                ],
-                name: [
-                    { required: true, message: this.$t('rules.enterSaidLampName'), trigger: 'blur' }
-                ],
-                stationCode: [
-                    { required: true, message: this.$t('rules.pleaseSelectStationCode'), trigger: 'change'}
-                ],
-                switchCode: [
-                    { required: true, message: '请选择所属道岔!', trigger: 'change'}
-                ]
-            };
-        },
         isButtonType() {
             return this.field == 'switchSelectCode';
         }
diff --git a/src/views/newMap/newMapdraft/mapoperate/counter.vue b/src/views/newMap/newMapdraft/mapoperate/counter.vue
index 3b49ff3c8..c9ad95e0b 100644
--- a/src/views/newMap/newMapdraft/mapoperate/counter.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/counter.vue
@@ -15,7 +15,7 @@
         ref="createForm"
         :create-form="formMake"
         :add-model="addModel"
-        :create-rules="createRules"
+        :create-rules="rules"
         @create="create"
       />
     </el-tab-pane>
@@ -75,16 +75,6 @@ export default {
             'stationList',
             'lineCode'
         ]),
-        createRules: function () {
-            return {
-                type: [
-                    { required: true, message: this.$t('map.selectCounterType'), trigger: 'change' }
-                ],
-                stationCode: [
-                    { required: true, message: this.$t('map.selectStation'), trigger: 'change' }
-                ]
-            };
-        },
         rules: function () {
             return {
                 code: [
diff --git a/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue b/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
index 0122a5308..ac94a72d7 100644
--- a/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/delayunlock.vue
@@ -5,7 +5,7 @@
         ref="dataform"
         :form="form"
         :edit-model="editModel"
-        :rules="editRules"
+        :rules="rules"
         type="DelayUnlock"
         @updateMapModel="updateMapModel"
       />
@@ -15,7 +15,7 @@
         ref="createForm"
         :create-form="formMake"
         :add-model="addModel"
-        :create-rules="createRules"
+        :create-rules="rules"
         @create="create"
       />
     </el-tab-pane>
@@ -71,14 +71,7 @@ export default {
             'stationList',
             'lineCode'
         ]),
-        createRules: function () {
-            return {
-                stationCode: [
-                    { required: true, message: this.$t('map.selectStation'), trigger: 'change' }
-                ]
-            };
-        },
-        editRules: function () {
+        rules: function () {
             return {
                 code: [
                     { required: true, message: this.$t('map.pleaseSelectDevice'), trigger: 'change' }
diff --git a/src/views/newMap/newMapdraft/mapoperate/lcControl.vue b/src/views/newMap/newMapdraft/mapoperate/lcControl.vue
index 0d5902afb..89aa89c59 100644
--- a/src/views/newMap/newMapdraft/mapoperate/lcControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/lcControl.vue
@@ -15,7 +15,7 @@
         ref="createForm"
         :create-form="createForm"
         :add-model="addModel"
-        :create-rules="createRules"
+        :create-rules="rules"
         @create="create"
       />
     </el-tab-pane>
@@ -87,19 +87,6 @@ export default {
             'lcList',
             'lineCode'
         ]),
-        createRules: function () {
-            return {
-                name: [
-                    { required: true, message: this.$t('rules.pleaseEnterStatusSignal'), trigger: 'blur' }
-                ],
-                'position.x': [
-                    { required: true, message: this.$t('map.pleaseEnterXCoordinate'), trigger: 'blur' }
-                ],
-                'position.y': [
-                    { required: true, message: this.$t('map.pleaseEnterYCoordinate'), trigger: 'blur' }
-                ]
-            };
-        },
         form() {
             const form = {
                 labelWidth: '150px',
diff --git a/src/views/newMap/newMapdraft/mapoperate/line.vue b/src/views/newMap/newMapdraft/mapoperate/line.vue
index 0feab76fd..321241f77 100644
--- a/src/views/newMap/newMapdraft/mapoperate/line.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/line.vue
@@ -15,7 +15,7 @@
         ref="createForm"
         :create-form="createForm"
         :add-model="addModel"
-        :create-rules="makeRules"
+        :create-rules="rules"
         @create="create"
       />
     </el-tab-pane>
@@ -78,17 +78,6 @@ export default {
                 width: [
                     { required: true, message: this.$t('rules.pleaseSelectLineWidth'), trigger: 'blur' }
                 ]
-            },
-            makeRules: {
-                code: [
-                    { required: true, message: this.$t('rules.pleaseSelectLine'), trigger: 'blur' }
-                ],
-                type: [
-                    { required: true, message: this.$t('rules.pleaseSelectLineType'), trigger: 'change' }
-                ],
-                width: [
-                    { required: true, message: this.$t('rules.pleaseSelectLineWidth'), trigger: 'blur' }
-                ]
             }
         };
     },
diff --git a/src/views/newMap/newMapdraft/mapoperate/power.vue b/src/views/newMap/newMapdraft/mapoperate/power.vue
index f7ab714a1..c04be1929 100644
--- a/src/views/newMap/newMapdraft/mapoperate/power.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/power.vue
@@ -15,7 +15,7 @@
         ref="createForm"
         :create-form="createForm"
         :add-model="addModel"
-        :create-rules="makeRules"
+        :create-rules="rules"
         @create="create"
       />
     </el-tab-pane>
@@ -76,14 +76,6 @@ export default {
                 width: [
                     { required: true, message: this.$t('rules.pleaseSelectLineWidth'), trigger: 'blur' }
                 ]
-            },
-            makeRules: {
-                code: [
-                    { required: true, message: this.$t('rules.pleaseSelectLine'), trigger: 'blur' }
-                ],
-                width: [
-                    { required: true, message: this.$t('rules.pleaseSelectLineWidth'), trigger: 'blur' }
-                ]
             }
         };
     },
diff --git a/src/views/newMap/newMapdraft/mapoperate/text.vue b/src/views/newMap/newMapdraft/mapoperate/text.vue
index 07413ec65..f81cbf524 100644
--- a/src/views/newMap/newMapdraft/mapoperate/text.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/text.vue
@@ -16,7 +16,7 @@
         ref="createForm"
         :create-form="createForm"
         :add-model="addModel"
-        :create-rules="makeRules"
+        :create-rules="rules"
         @create="create"
       />
     </el-tab-pane>
@@ -84,14 +84,6 @@ export default {
                 ],
                 fontColor: [
                     { required: true, message: this.$t('rules.textFontColor'), trigger: 'blur' }
-                ]
-            },
-            makeRules: {
-                code: [
-                    { required: true, message: this.$t('rules.selectText'), trigger: 'blur' }
-                ],
-                content: [
-                    { required: true, message: this.$t('rules.pleaseEnterContent'), trigger: 'blur' }
                 ],
                 'position.x': [
                     { required: true, message: this.$t('rules.pleaseEnterXCoordinate'), trigger: 'blur' }
diff --git a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
index fbfdad9c5..38c52b405 100644
--- a/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/zcControl.vue
@@ -16,7 +16,7 @@
         ref="createForm"
         :create-form="formMake"
         :add-model="addModel"
-        :create-rules="createRules"
+        :create-rules="rules"
         @create="create"
       />
     </el-tab-pane>
@@ -140,22 +140,6 @@ export default {
                 }
             };
             return form;
-        },
-        createRules: function () {
-            return {
-                name: [
-                    { required: true, message: this.$t('rules.pleaseEnterStatusSignal'), trigger: 'blur' }
-                ],
-                'position.x': [
-                    { required: true, message: this.$t('rules.trainPositionX'), trigger: 'blur' }
-                ],
-                'position.y': [
-                    { required: true, message: this.$t('rules.trainPositionY'), trigger: 'blur' }
-                ],
-                concentrateStationList:[
-                    { required: true, message: this.$t('rules.selectConcentrateStation'), trigger: 'change' }
-                ]
-            };
         }
     },
     watch: {

From 66b9d7f85afb45e3f8c386eb7271698413c189cf Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 28 Jul 2020 13:56:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E5=BD=95=E5=88=B6?=
 =?UTF-8?q?=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/router/index_Common.js                    |  3 +-
 src/router/index_HEB.js                       |  3 +-
 src/views/newMap/displayNew/menuSchema.vue    | 15 +++---
 .../mapoperate/components/operateProperty.vue |  3 ++
 src/views/scriptManage/display/indexNew.vue   | 47 -------------------
 .../display/tipScriptRecordNew.vue            |  3 +-
 6 files changed, 15 insertions(+), 59 deletions(-)
 delete mode 100644 src/views/scriptManage/display/indexNew.vue

diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index e656c028d..d2d2f5a5d 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -62,7 +62,6 @@ const LessonDetail = () => import('@/views/lesson/details');
 
 const ScriptmanageHome = () => import('@/views/scriptManage/home');
 const ScriptDisplay = () => import('@/views/scriptManage/display/index');
-const ScriptDisplayNew = () => import('@/views/scriptManage/display/indexNew');
 const PracticeDisplayNew = () => import('@/views/competitionManage/practiceList/display/index');
 
 const IbpHome = () => import('@/views/ibp/home');
@@ -285,7 +284,7 @@ export const publicAsyncRoute = [
     },
     { // 剧本编辑 战场图
         path: '/scriptDisplayNew/:mode',
-        component: ScriptDisplayNew,
+        component: DisplayNew,
         hidden: true
     },
     { // 实操试题编辑 战场图
diff --git a/src/router/index_HEB.js b/src/router/index_HEB.js
index e3f6cd26f..d5b47e6cc 100644
--- a/src/router/index_HEB.js
+++ b/src/router/index_HEB.js
@@ -54,7 +54,6 @@ const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen');
 
 const ScriptmanageHome = () => import('@/views/scriptManage/home');
 const ScriptDisplay = () => import('@/views/scriptManage/display/index');
-const ScriptDisplayNew = () => import('@/views/scriptManage/display/indexNew');
 
 const IbpHome = () => import('@/views/ibp/home');
 const IbpDraw = () => import('@/views/ibp/ibpDraw/index');
@@ -224,7 +223,7 @@ export const publicAsyncRoute = [
     },
     { // 剧本编辑 战场图
         path: '/scriptDisplayNew/:mode',
-        component: ScriptDisplayNew,
+        component: DisplayNew,
         hidden: true
     },
 
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 52ed62795..84be4da13 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
     <div class="schema" :style="{top: offset+'px'}">
-      <el-select v-if="(isScript&&!isScriptCommand) || isDesignPlatform" v-model="swch" size="small" :placeholder="$t('display.schema.selectProduct')" @change="switchMode">
+      <!-- (isScript&&!isScriptCommand) ||  -->
+      <el-select v-if="isDesignPlatform" v-model="swch" size="small" :placeholder="$t('display.schema.selectProduct')" @change="switchMode">
         <el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
-	  <!-- showSelectStation&&((!isScriptCommand&&swch=='01')||(isScriptCommand && isLocalStation)) -->
+      <!-- showSelectStation&&((!isScriptCommand&&swch=='01')||(isScriptCommand && isLocalStation)) -->
       <el-select v-if="showSelectStation && isLocalStation && !isScript" v-model="showStationContent" style="width: 100px;" size="small" @change="switchStationModeInfo">
         <el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -12,7 +13,7 @@
         <el-button v-if="isDemon && isDesignPlatform && !dataError" size="small" :disabled="viewDisabled" type="success" @click="viewScriptRoles">{{ $t('display.schema.selectRoles') }}</el-button>
         <!-- 加载剧本 -->
         <el-button v-if="isDemon && !isDesignPlatform && !isScheduling && !dataError" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
-		<!-- 运行图加载 -->
+        <!-- 运行图加载 -->
         <el-button v-if="notScript && runing && !dataError" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
         <el-button v-if="!runing && notScript && !dataError" size="small" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
         <el-button v-if="mode==OperateMode.FAULT && !dataError" size="small" type="danger" @click="setFault">自动故障设置</el-button>
@@ -244,12 +245,12 @@ export default {
                         list = [...list, ...data];
                     }
                 }
-			});
+            });
             if (swch == '01') {
-				this.$emit('switchStationMode', this.showStationContent); // 设置显示集中站元素
+                this.$emit('switchStationMode', this.showStationContent); // 设置显示集中站元素
             } else {
-				this.$jlmap.updateShowStation(list, ''); // 显示全部元素
-			}
+                this.$jlmap.updateShowStation(list, ''); // 显示全部元素
+            }
             this.$jlmap.updateShowMode(list, showMode); // 二次过滤
         },
         switchStationModeInfo(val) {
diff --git a/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue b/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
index 158d4e089..a5fa59a43 100644
--- a/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/components/operateProperty.vue
@@ -66,6 +66,9 @@ export default {
         },
         resetFields() {
             this.$refs.dataform && this.$refs.dataform.resetFields();
+        },
+        clearValidate() {
+            this.$refs.dataform && this.$refs.dataform.clearValidate();
         }
     }
 };
diff --git a/src/views/scriptManage/display/indexNew.vue b/src/views/scriptManage/display/indexNew.vue
deleted file mode 100644
index d31af7f92..000000000
--- a/src/views/scriptManage/display/indexNew.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <!-- <div class="script-parent"> -->
-  <!-- <div class="script-card" :style="{width: widthLeft+'px'}"> -->
-  <!-- <tip-script-record ref="tipTaskRecord" :group="group" :width="widthLeft" /> -->
-  <!-- </div> -->
-  <!-- <drap-left :width-left="widthLeft" :min="780" :max="980" @drapWidth="drapWidth" /> -->
-  <!-- <div class="script-display"> -->
-  <display ref="display" :size="size" />
-  <!--   -->
-  <!-- <tip-script-record-new ref="tipTaskRecordNew" :group="group" /> -->
-  <!-- </div> -->
-  <!-- </div> -->
-</template>
-
-<script>
-import Display from '@/views/newMap/displayNew/index';
-// import TipScriptRecordNew from './tipScriptRecordNew';
-// import drapLeft from '@/views/components/drapLeft/index';
-
-export default {
-    name: 'ScriptDisplayNew',
-    components: {
-        Display
-        // TipScriptRecordNew
-        // drapLeft
-    },
-    data() {
-        return {
-            // widthLeft: 780,
-            size: {
-                width: document.documentElement.clientWidth,
-                height: document.documentElement.clientHeight
-            },
-            group: this.$route.query.group
-        };
-    },
-    watch: {
-        '$store.state.app.windowSizeCount': function() {
-            this.$nextTick(function() {
-                this.size = { width: this.$store.state.app.width, height: this.$store.state.app.height};
-            });
-        }
-    },
-    methods: {
-    }
-};
-</script>
diff --git a/src/views/scriptManage/display/tipScriptRecordNew.vue b/src/views/scriptManage/display/tipScriptRecordNew.vue
index 32349bdb1..0089c1663 100644
--- a/src/views/scriptManage/display/tipScriptRecordNew.vue
+++ b/src/views/scriptManage/display/tipScriptRecordNew.vue
@@ -7,7 +7,8 @@
             <div class="scriptPanelLeft">
               <div class="panelLeftSelect">
                 <span style="font-size:13px;">当前剧本角色:</span>
-                <el-select v-model="memberId" filterable placeholder="请选择" :disabled="!backDisabled||isPause" @change="changeRole">
+                <!-- :disabled="!backDisabled||isPause" -->
+                <el-select v-model="memberId" filterable placeholder="请选择" @change="changeRole">
                   <el-option v-for="member in memberList" :key="member.id" :label="member.name" :value="member.id" />
                 </el-select>
               </div>

From 594087489aaec19022f857895eff6ba83d2e6ce6 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 28 Jul 2020 14:11:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2bug&=E9=80=9A=E5=8F=B7=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E7=AE=A1=E7=90=86&?=
 =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E6=8C=89=E9=92=AEoffset=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/haerbin_01/menus/menuBar.vue        |  17 +--
 .../jlmap3d/maintainer/jl3dmaintainer.vue     | 118 +++++++++---------
 src/views/newMap/jointTrainingNew/index.vue   |  32 +++--
 3 files changed, 92 insertions(+), 75 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
index 72099f239..dd97cec0b 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
@@ -157,6 +157,9 @@ export default {
     mounted() {
         this.version = this.$store.state.map.version;
         this.initMenu();
+        if (this.$store.state.socket.simulationRoleList && this.$store.state.socket.simulationRoleList.length) {
+            this.checkRoleChange(this.$store.state.socket.simulationRoleList);
+        }
     },
     methods: {
         initMenu() {
@@ -234,13 +237,13 @@ export default {
             this.$nextTick(() => {
                 EventBus.$emit('closeMenu');
             });
-		},
-		checkRoleChange(list) {
-			list.forEach(item => {
-				if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId && item.type === 'STATION_SUPERVISOR') {
-					this.switchShowStation(this.centralizedMap[item.deviceCode]);
-				}
-			});
+        },
+        checkRoleChange(list) {
+            list.forEach(item => {
+                if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId && item.type === 'STATION_SUPERVISOR') {
+                    this.switchShowStation(this.centralizedMap[item.deviceCode]);
+                }
+            });
         }
     }
 };
diff --git a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
index 45b095191..e30fbb18a 100644
--- a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
+++ b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
@@ -4,7 +4,7 @@
 
     <div class="display-draft">
       <el-button-group>
-
+        <el-button v-if="isAdmin" @click="memberManage">成员管理</el-button>
         <el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
       </el-button-group>
 
@@ -14,26 +14,24 @@
       v-show="faultlistshow"
       :devicelist="devicelist"
       @selectdevice="selectdevice"
-    >
-    </Devicefault-List>
+    />
     <Fault-Device
       v-show="deviceShow"
-      ref = "faultdevice"
-      @closedevice3dview ="devicemodel"
+      ref="faultdevice"
+      @closedevice3dview="devicemodel"
     />
 
     <div id="testjlmap3d" class="jlmap3ddraw">
       <canvas id="canvastexture" />
     </div>
 
-    <div class="msg" v-show ="msgshow">
+    <div v-show="msgshow" class="msg">
       <div class="msgtext">
-        {{controlmsg}}
+        {{ controlmsg }}
       </div>
     </div>
 
-    <div id="jl3droom" class="roombutton" @click="showroom"></div>
-
+    <div id="jl3droom" class="roombutton" @click="showroom" />
 
   </div>
 
@@ -55,7 +53,6 @@ import { JLmap3dMaintainer } from '@/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js
 import DevicefaultList from '@/views/jlmap3d/maintainer/component/devicefaultlist';
 import FaultDevice from '@/views/jlmap3d/maintainer/component/faultdevice';
 
-
 import Jlmap3dConfig from '@/views/jlmap3d/simulation/show/configmenu';
 import { ProjectIcon } from '@/scripts/ProjectConfig';
 
@@ -66,11 +63,19 @@ export default {
     name: 'Jl3dMaintainer',
     components: {
         DevicefaultList,
-        FaultDevice,
+        FaultDevice
 
         // Jlmap3dMsg
         // ShowProperty
     },
+    props: {
+        isAdmin: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        }
+    },
     data() {
         return {
             training: {
@@ -89,7 +94,7 @@ export default {
             devicelist:[],
             deviceShow:true,
             msgshow:false,
-            controlmsg:"",
+            controlmsg:''
 
         };
     },
@@ -98,7 +103,7 @@ export default {
         if (this.jlmap3d) {
             this.jlmap3d.webwork.postMessage('off');
             this.jlmap3d.webwork.terminate();
-            console.log("www");
+            console.log('www');
             this.jlmap3d.jsonwebworknew.terminate();
             this.jlmap3d.dispose();
             this.jlmap3d = null;
@@ -137,19 +142,19 @@ export default {
             }
         },
         init: function (skinCode, group) {
-          const mapdata = this.$store.getters['map/map'];
-          const dom = document.getElementById('app');
-          const project = this.$route.query.project;
-          // console.log(project);
-          this.deviceShow = false;
-          if (project) {
+            const mapdata = this.$store.getters['map/map'];
+            const dom = document.getElementById('app');
+            const project = this.$route.query.project;
+            // console.log(project);
+            this.deviceShow = false;
+            if (project) {
 
 		        this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, skinCode, this.$store, group, project);
-          } else {
+            } else {
 
-            this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, skinCode, this.$store, group, '');
-          }
-          this.jlmap3d.eventon();
+                this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, skinCode, this.$store, group, '');
+            }
+            this.jlmap3d.eventon();
         },
         raystand() {
             this.jlmap3d.rayswitch('stand');
@@ -175,53 +180,55 @@ export default {
         showtrainmsg(showtype) {
             this.jlmap3d.showtrainmsg(showtype);
         },
-        resetfaultlist(){
-          this.devicelist = [];
+        resetfaultlist() {
+            this.devicelist = [];
         },
         updatefault(fault) {
-          this.devicelist.push(fault);
+            this.devicelist.push(fault);
         },
-        deletefault(code){
-          console.log(code);
-          console.log(this.devicelist);
-          for(let i=0,leni=this.devicelist.length;i<leni;i++){
-            if(code == this.devicelist[i].code){
-              this.devicelist.splice(i,1);
-              break;
+        deletefault(code) {
+            console.log(code);
+            console.log(this.devicelist);
+            for (let i = 0, leni = this.devicelist.length; i < leni; i++) {
+                if (code == this.devicelist[i].code) {
+                    this.devicelist.splice(i, 1);
+                    break;
+                }
             }
-          }
         },
-        devicemodel(){
-          if (this.deviceShow == false) {
-              this.deviceShow = true;
-          } else {
-              this.deviceShow = false;
-          }
+        devicemodel() {
+            if (this.deviceShow == false) {
+                this.deviceShow = true;
+            } else {
+                this.deviceShow = false;
+            }
         },
-        selectdevice(divicedata){
-          this.deviceShow = true;
-          // console.log(divicedata);
-          this.$refs.faultdevice.showmodel(divicedata);
+        selectdevice(divicedata) {
+            this.deviceShow = true;
+            // console.log(divicedata);
+            this.$refs.faultdevice.showmodel(divicedata);
         },
-        warningmsg(nowmsg){
-          console.log(nowmsg);
-          this.controlmsg = nowmsg;
-          this.msgshow = true;
-          setTimeout(this.warningmsgoff,3000);
+        warningmsg(nowmsg) {
+            console.log(nowmsg);
+            this.controlmsg = nowmsg;
+            this.msgshow = true;
+            setTimeout(this.warningmsgoff, 3000);
         },
-        warningmsgoff(){
-          this.msgshow = false;
+        warningmsgoff() {
+            this.msgshow = false;
 
         },
-        showroom(){
-          this.deviceShow = true;
-          this.$refs.faultdevice.showroom();
+        showroom() {
+            this.deviceShow = true;
+            this.$refs.faultdevice.showroom();
         },
         back() {
             this.$emit('back');
             this.isswitch = false;
         },
-
+        memberManage() {
+            this.$emit('handlerMemberManage');
+        }
     }
 };
 </script>
@@ -324,5 +331,4 @@ export default {
     z-index: -12;
   }
 
-
 </style>
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index b2cfd76b6..90cdd426f 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="main" :style="{width: canvasWidth+'px'}">
     <Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
-    <Jl3d-Maintainer v-if="jl3dmaintainershow" @back="back" />
+    <Jl3d-Maintainer v-if="jl3dmaintainershow" :is-admin="isAdmin" @back="back" @handlerMemberManage="handlerMemberManage" />
     <ibp-plate v-show="ibpShow" ref="ibpPlate" @hideIbp="hideIbp" />
     <template v-show="panelShow" :panelShow="panelShow">
       <transition name="el-zoom-in-bottom">
@@ -247,6 +247,8 @@ export default {
         // 设置菜单和工具栏位置
         setPosition() {
             this.$nextTick(() => {
+                this.offset = 10;
+                this.offsetBottom = 15;
                 const menuBar = document.getElementById('menuBar');
                 const menuTool = document.getElementById('menuTool');
                 const menuBottom = document.getElementById('menuButton');
@@ -289,12 +291,12 @@ export default {
             }
         },
         initMemberUserInfo() {
-			// 获取仿真成员列表
+            // 获取仿真成员列表
             getSimulationMemberList(this.$route.query.group).then(resp => {
                 this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.$store.state.user.id });
             }).catch(() => {
                 this.$messageBox('获取仿真成员列表失败！');
-			});
+            });
             getAllSimulationUser(this.$route.query.group).then(resp => {
                 this.$store.dispatch('training/setSimulationUserList', resp.data);
             }).catch(() => {
@@ -394,9 +396,10 @@ export default {
                 this.$store.dispatch('training/setRoles', 'DISPATCHER');
                 this.hideIbp();
                 this.drivingShow = false;
-                if ((this.lineCode === '07' || this.lineCode === '06') && deviceCode) {
+                if (this.lineCode === '07' || this.lineCode === '06') {
                     this.mapViewLoadedOver && this.setShowStation('');
                 }
+                this.jl3dmaintainershow = false;
                 break;
             case 'STATION_SUPERVISOR':
                 this.$store.dispatch('training/setPrdType', '01');
@@ -406,22 +409,27 @@ export default {
                     this.$refs.menuSchema.chiShowStation = deviceCode;
                     this.mapViewLoadedOver && this.switchStationMode(deviceCode);
                 }
+                this.jl3dmaintainershow = false;
                 this.drivingShow = false;
                 break;
             case 'AUDIENCE':
                 this.$store.dispatch('training/setPrdType', '');
                 this.$store.dispatch('training/setRoles', 'AUDIENCE');
+                this.jl3dmaintainershow = false;
+                this.drivingShow = false;
                 this.hideIbp();
                 break;
             case 'DRIVER':
                 this.$store.dispatch('training/setPrdType', '');
                 this.$store.dispatch('training/setRoles', 'DRIVER');
+                this.jl3dmaintainershow = false;
                 break;
             case 'MAINTAINER':
                 this.$store.dispatch('training/setPrdType', '');
                 this.$store.dispatch('training/setRoles', 'MAINTAINER');
                 this.hideIbp();
                 this.jl3dmaintainershow = true;
+                this.drivingShow = false;
                 break;
             }
         },
@@ -515,13 +523,13 @@ export default {
             });
         },
         setWindowSize() {
-			this.$store.dispatch('config/resize', { width: this.width, height: this.height });
-			if (this.prdType == '07') {
-				this.setBigScreenMode();
-			}
+            this.$store.dispatch('config/resize', { width: this.width, height: this.height });
+            if (this.prdType == '07') {
+                this.setBigScreenMode();
+            }
         },
         switchStationMode(stationCode) {
-			this.showStation = stationCode;
+            this.showStation = stationCode;
             this.setShowStation(this.showStation);
         },
         setShowStation(stationCode) {
@@ -536,7 +544,7 @@ export default {
             this.$jlmap.setCenter(stationCode);
         },
         setStationList(map) {
-			this.stationList = [];
+            this.stationList = [];
             (map.stationList || []).forEach(item => {
                 if (item.centralized) {
                     this.stationList.push({value: item.code, name: item.name});
@@ -545,9 +553,9 @@ export default {
                         this.centralizedStationMap[ele] = item.code;
                     });
                 }
-			});
+            });
             if (this.stationList.length) {
-				this.showStation = this.stationList[0].value;
+                this.showStation = this.stationList[0].value;
             }
         },
         setBigScreenMode() {