From 2c770a5bcce8fb164db129252bcf6337b986598c Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 21 Jul 2022 18:12:28 +0800
Subject: [PATCH 01/37] =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js                    | 13 ++++++++++---
 src/jmapNew/theme/beijing_01/model.js | 18 ++++++++++++++----
 src/jmapNew/theme/chengdu_01/model.js | 18 ++++++++++++++----
 src/jmapNew/theme/chengdu_03/model.js | 18 ++++++++++++++----
 src/jmapNew/theme/datie_01/model.js   | 20 +++++++++++++++-----
 src/jmapNew/theme/datie_02/model.js   | 19 +++++++++++++++----
 src/jmapNew/theme/datie_jd1a/model.js | 19 +++++++++++++++----
 src/jmapNew/theme/datie_tky/model.js  | 19 +++++++++++++++----
 src/jmapNew/theme/foshan_01/model.js  | 19 +++++++++++++++----
 src/jmapNew/theme/fuzhou_01/model.js  | 19 +++++++++++++++----
 src/jmapNew/theme/haerbin_01/model.js | 19 +++++++++++++++----
 src/jmapNew/theme/nanjing_02/model.js | 19 +++++++++++++++----
 src/jmapNew/theme/ningbo_01/model.js  | 19 +++++++++++++++----
 src/jmapNew/theme/ningbo_03/model.js  | 19 +++++++++++++++----
 src/jmapNew/theme/race_01/model.js    | 18 ++++++++++++++----
 src/jmapNew/theme/xian_01/model.js    | 18 ++++++++++++++----
 src/jmapNew/theme/xian_02/model.js    | 21 +++++++++++++++------
 17 files changed, 245 insertions(+), 70 deletions(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 1391c9e8d..732319c8f 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -85,15 +85,22 @@ class Jlmap {
     }
     reloadStyle(lineCode) {
         if (this.lineCode !== lineCode) {
-            this.handleModelData(this.lineCode, lineCode);
+            this.reloadModelData(this.lineCode, lineCode);
         }
         this.lineCode = lineCode;
         this.style = selectLineCode(lineCode);
         this.$zr.dom.style.backgroundColor = this.style.backgroundColor || '#000';
+        console.log(this.mapDevice, 'mapDevice');
     }
     // 处理私有属性
-    handleModelData(oldLineCode, lineCode) {
-
+    reloadModelData(oldLineCode, lineCode) {
+        // console.log(oldLineCode, lineCode, '-------------12');
+        const propConvert = lineCode ? Vue.prototype.$theme.loadPropConvert(lineCode) : null;
+        const oldPropConvert = oldLineCode ? Vue.prototype.$theme.loadPropConvert(oldLineCode) : null;
+        for (const device in this.mapDevice) {
+            oldPropConvert.deletePrivateProps(device);
+            propConvert.initPrivateProps(device);
+        }
     }
     loadDefaultState() { // 加载默认状态
         const defaultStateDict = {};
diff --git a/src/jmapNew/theme/beijing_01/model.js b/src/jmapNew/theme/beijing_01/model.js
index c7d80a99e..2560bd938 100644
--- a/src/jmapNew/theme/beijing_01/model.js
+++ b/src/jmapNew/theme/beijing_01/model.js
@@ -43,9 +43,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -56,9 +56,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -66,6 +66,16 @@ class Model {
 
         return model;
     }
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/chengdu_01/model.js b/src/jmapNew/theme/chengdu_01/model.js
index b7c5f905f..25920db5e 100644
--- a/src/jmapNew/theme/chengdu_01/model.js
+++ b/src/jmapNew/theme/chengdu_01/model.js
@@ -46,9 +46,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -59,9 +59,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -69,6 +69,16 @@ class Model {
 
         return model;
     }
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/chengdu_03/model.js b/src/jmapNew/theme/chengdu_03/model.js
index c7d80a99e..2560bd938 100644
--- a/src/jmapNew/theme/chengdu_03/model.js
+++ b/src/jmapNew/theme/chengdu_03/model.js
@@ -43,9 +43,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -56,9 +56,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -66,6 +66,16 @@ class Model {
 
         return model;
     }
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/datie_01/model.js b/src/jmapNew/theme/datie_01/model.js
index c7d80a99e..52be6ae09 100644
--- a/src/jmapNew/theme/datie_01/model.js
+++ b/src/jmapNew/theme/datie_01/model.js
@@ -43,22 +43,21 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
         }
-
         return model;
     }
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -66,6 +65,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/datie_02/model.js b/src/jmapNew/theme/datie_02/model.js
index c7d80a99e..9c09fd633 100644
--- a/src/jmapNew/theme/datie_02/model.js
+++ b/src/jmapNew/theme/datie_02/model.js
@@ -43,9 +43,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -56,9 +56,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -66,6 +66,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/datie_jd1a/model.js b/src/jmapNew/theme/datie_jd1a/model.js
index c7d80a99e..9c09fd633 100644
--- a/src/jmapNew/theme/datie_jd1a/model.js
+++ b/src/jmapNew/theme/datie_jd1a/model.js
@@ -43,9 +43,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -56,9 +56,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -66,6 +66,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/datie_tky/model.js b/src/jmapNew/theme/datie_tky/model.js
index c7d80a99e..9c09fd633 100644
--- a/src/jmapNew/theme/datie_tky/model.js
+++ b/src/jmapNew/theme/datie_tky/model.js
@@ -43,9 +43,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -56,9 +56,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -66,6 +66,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/foshan_01/model.js b/src/jmapNew/theme/foshan_01/model.js
index bd6829d9f..ecca1edf7 100644
--- a/src/jmapNew/theme/foshan_01/model.js
+++ b/src/jmapNew/theme/foshan_01/model.js
@@ -45,9 +45,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -58,9 +58,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -68,6 +68,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/fuzhou_01/model.js b/src/jmapNew/theme/fuzhou_01/model.js
index 218474f7c..f9dff7a35 100644
--- a/src/jmapNew/theme/fuzhou_01/model.js
+++ b/src/jmapNew/theme/fuzhou_01/model.js
@@ -45,9 +45,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -58,9 +58,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -68,6 +68,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/haerbin_01/model.js b/src/jmapNew/theme/haerbin_01/model.js
index 53a250e7f..e256d37de 100644
--- a/src/jmapNew/theme/haerbin_01/model.js
+++ b/src/jmapNew/theme/haerbin_01/model.js
@@ -44,9 +44,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -57,9 +57,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -67,6 +67,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/nanjing_02/model.js b/src/jmapNew/theme/nanjing_02/model.js
index 53a250e7f..e256d37de 100644
--- a/src/jmapNew/theme/nanjing_02/model.js
+++ b/src/jmapNew/theme/nanjing_02/model.js
@@ -44,9 +44,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -57,9 +57,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -67,6 +67,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/ningbo_01/model.js b/src/jmapNew/theme/ningbo_01/model.js
index c00fd4260..6a478f5d4 100644
--- a/src/jmapNew/theme/ningbo_01/model.js
+++ b/src/jmapNew/theme/ningbo_01/model.js
@@ -54,9 +54,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -67,9 +67,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -77,6 +77,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/ningbo_03/model.js b/src/jmapNew/theme/ningbo_03/model.js
index c00fd4260..6a478f5d4 100644
--- a/src/jmapNew/theme/ningbo_03/model.js
+++ b/src/jmapNew/theme/ningbo_03/model.js
@@ -54,9 +54,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -67,9 +67,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -77,6 +77,17 @@ class Model {
 
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/race_01/model.js b/src/jmapNew/theme/race_01/model.js
index c00fd4260..311a4d893 100644
--- a/src/jmapNew/theme/race_01/model.js
+++ b/src/jmapNew/theme/race_01/model.js
@@ -54,9 +54,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -67,9 +67,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -77,6 +77,16 @@ class Model {
 
         return model;
     }
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/xian_01/model.js b/src/jmapNew/theme/xian_01/model.js
index bf09f1e11..ee8f58301 100644
--- a/src/jmapNew/theme/xian_01/model.js
+++ b/src/jmapNew/theme/xian_01/model.js
@@ -45,9 +45,9 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -58,9 +58,9 @@ class Model {
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
@@ -68,6 +68,16 @@ class Model {
 
         return model;
     }
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();
diff --git a/src/jmapNew/theme/xian_02/model.js b/src/jmapNew/theme/xian_02/model.js
index 849144e90..9d51fe665 100644
--- a/src/jmapNew/theme/xian_02/model.js
+++ b/src/jmapNew/theme/xian_02/model.js
@@ -48,29 +48,38 @@ class Model {
 
     initPublicProps(model) {
         if (model) {
-            var modelInitial = this.public[model._type];
+            const modelInitial = this.public[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
         }
-
         return model;
     }
 
     initPrivateProps(model) {
         if (model) {
-            var modelInitial = this.private[model._type];
+            const modelInitial = this.private[model._type];
             if (modelInitial) {
-                for (var prop in modelInitial) {
+                for (const prop in modelInitial) {
                     model[prop] = modelInitial[prop];
                 }
             }
         }
-
         return model;
     }
+
+    deletePrivateProps(model) {
+        if (model) {
+            const modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (const prop in modelInitial) {
+                    delete model[prop];
+                }
+            }
+        }
+    }
 }
 
 export default new Model();

From a2ccd822088d913c05ff6f26594a32206654fcce Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 22 Jul 2022 10:16:30 +0800
Subject: [PATCH 02/37] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8D=E5=90=8C=E7=BA=BF=E8=B7=AF=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 732319c8f..654ac2284 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -90,16 +90,14 @@ class Jlmap {
         this.lineCode = lineCode;
         this.style = selectLineCode(lineCode);
         this.$zr.dom.style.backgroundColor = this.style.backgroundColor || '#000';
-        console.log(this.mapDevice, 'mapDevice');
     }
     // 处理私有属性
     reloadModelData(oldLineCode, lineCode) {
-        // console.log(oldLineCode, lineCode, '-------------12');
         const propConvert = lineCode ? Vue.prototype.$theme.loadPropConvert(lineCode) : null;
         const oldPropConvert = oldLineCode ? Vue.prototype.$theme.loadPropConvert(oldLineCode) : null;
-        for (const device in this.mapDevice) {
-            oldPropConvert.deletePrivateProps(device);
-            propConvert.initPrivateProps(device);
+        for (const deviceCode in this.mapDevice) {
+            oldPropConvert.deletePrivateProps(this.mapDevice[deviceCode]);
+            propConvert.initPrivateProps(this.mapDevice[deviceCode]);
         }
     }
     loadDefaultState() { // 加载默认状态

From 3f7696e157681225ff8d06351be6498449ab6825 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 22 Jul 2022 11:20:24 +0800
Subject: [PATCH 03/37] =?UTF-8?q?=E5=A4=A7=E9=93=81=E4=BA=8C=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=E7=82=B9=E7=81=AF=E7=81=AD=E7=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/graph/Signal/index.js       |  2 +-
 src/jmapNew/theme/datie_02/menus/index.vue    |  2 +-
 .../theme/datie_02/menus/menuButton.vue       | 57 ++++++++++++++-----
 src/scripts/cmdPlugin/CommandEnum.js          |  6 +-
 src/scripts/cmdPlugin/OperationHandler.js     |  8 +--
 5 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js
index 4f72e5530..e57f088fa 100644
--- a/src/jmapNew/shape/graph/Signal/index.js
+++ b/src/jmapNew/shape/graph/Signal/index.js
@@ -1163,7 +1163,7 @@ class Signal extends Group {
                 // 灯颜色状态显示
                 exec(SignalAspectMap[model.signalAspect], this.lamps, this.style);
                 // 灯是否点灯显示
-                this.lamps.forEach(lamp => { lamp.setStop(model.signalLight); });
+                // this.lamps.forEach(lamp => { lamp.setStop(model.signalLight); });
             }
             if (model.hasSelected) {
                 this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index c07abe8ef..ba90cf9f0 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -33,7 +33,7 @@
         <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">与中心通信正常</div>
       </div>
     </div>
-    <div v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1405px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
+    <div v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1560px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
       <div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
       <div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + '  ' + dateString + '  ' + time }}</div>
     </div>
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 7e52408dc..a75e36178 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -71,16 +71,16 @@
         <center><b>道岔解封</b></center>
       </span>
     </button>
-    <!--<button :id="Signal.signalLight.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalLight.menuButton.operation, ['Signal'])">-->
-    <!--<span style="color: black">-->
-    <!--<center><b>点灯</b></center>-->
-    <!--</span>-->
-    <!--</button>-->
-    <!--<button :id="Signal.signalDestroy.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalDestroy.menuButton.operation, ['Signal'])">-->
-    <!--<span style="color:#800000">-->
-    <!--<center><b>灭灯</b></center>-->
-    <!--</span>-->
-    <!--</button>-->
+    <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['Signal'])">
+      <span style="color: black">
+        <center><b>点灯</b></center>
+      </span>
+    </button>
+    <button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['Signal'])">
+      <span style="color:#800000">
+        <center><b>灭灯</b></center>
+      </span>
+    </button>
     <button :id="Station.stationMasterLock.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
       <span style="color: #800000">
         <center><b>S引导总锁</b></center>
@@ -213,7 +213,7 @@ export default {
             return this.$store.state.map.stationSGuideMasterLock;
         },
         xGuideMasterLock() {
-        	return this.$store.state.map.stationXGuideMasterLock;
+            return this.$store.state.map.stationXGuideMasterLock;
         },
         isShowBtn() {
             return this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '10';
@@ -243,6 +243,10 @@ export default {
                 return CMD.Signal.CMD_SIGNAL_SET_ROUTE;
             case this.Signal.guide.button.operation: // 办理引导
                 return CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
+            case this.Signal.signalTurnOn.menuButton.operation:
+                return CMD.Signal.CMD_SIGNAL_TURN_ON;
+            case this.Signal.signalTurnOff.menuButton.operation:
+                return CMD.Signal.CMD_SIGNAL_TURN_OFF;
             }
             return '';
         }
@@ -275,7 +279,7 @@ export default {
             }
         },
         '$store.state.map.showCentralizedStationCode': function(val) {
-        	if (val) {
+            if (val) {
                 const station = this.$store.getters['map/getDeviceByCode'](val);
                 this.$store.getters['map/checkStationGuideMaster'](station.code, station.sGuideMasterLock, station.xGuideMasterLock);
             }
@@ -408,7 +412,8 @@ export default {
                     operation: operation
                 };
                 // 以下 会弹出密码框 （总人解，区故解） 铅封按钮
-                const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation, this.Section.defectiveShunting.button.operation];
+                const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation, this.Section.defectiveShunting.button.operation,
+                    this.Signal.signalTurnOff.menuButton.operation];
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.operation = operation;
@@ -558,7 +563,7 @@ export default {
                 val: model.code,
                 cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
             };
-            const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
+            // const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
             if (model._type === 'SignalButton' && model.type === 'PICK') {
                 operate.param = {signalCode: model.signalCode};
                 this.sendCommand(operate);
@@ -656,6 +661,26 @@ export default {
                 this.sendCommand(operate);
             }
         },
+        handleSignalTurnOn(model) {
+            const operate = {
+                over: true,
+                code: model.code,
+                operation: this.$store.state.menuOperation.buttonOperation,
+                cmdType: CMD.Signal.CMD_SIGNAL_TURN_ON,
+                param: {signalCode: model.code}
+            };
+            this.sendCommand(operate);
+        },
+        handleSignalTurnOff(model) {
+            const operate = {
+                over: true,
+                code: model.code,
+                operation: this.$store.state.menuOperation.buttonOperation,
+                cmdType: CMD.Signal.CMD_SIGNAL_TURN_OFF,
+                param: {signalCode: model.code}
+            };
+            this.sendCommand(operate);
+        },
         // CHANGE_DIRECTION
         selectedChange() {
             // 按钮按下时
@@ -687,6 +712,10 @@ export default {
                     this.handelFaultSection(model);
                 } else if (buttonOperation === this.Section.defectiveShunting.button.operation) {
                     this.handelDefectiveShunting(model);
+                } else if (buttonOperation === this.Signal.signalTurnOn.menuButton.operation) {
+                    this.handleSignalTurnOn(model);
+                } else if (buttonOperation === this.Signal.signalTurnOff.menuButton.operation) {
+                    this.handleSignalTurnOff(model);
                 } else {
                     this.clearOperate();
                 }
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index e0fb71cb3..54a4f5407 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -139,7 +139,11 @@ export default {
         /** 设置保护 */
         CMD_SIGNAL_SET_OVERLAP : {value: 'Signal_Set_Overlap', label: '设置保护'},
         /** 冲突进路办理 */
-        CMD_SIGNAL_CONFLICT_ROUTE_SET_CONFIRM:{value: 'Signal_Conflict_Route_Set_Confirm', label: '冲突进路办理'}
+        CMD_SIGNAL_CONFLICT_ROUTE_SET_CONFIRM:{value: 'Signal_Conflict_Route_Set_Confirm', label: '冲突进路办理'},
+        /** 信号机点灯 */
+        CMD_SIGNAL_TURN_ON: {value: 'Signal_Turn_On', label: '信号机点灯'},
+        /** 信号机灭灯 */
+        CMD_SIGNAL_TURN_OFF: {value: 'Signal_Turn_Off', label: '信号机灭灯'}
     },
 
     // 物理区段操作
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 762bf0d50..24d152d7b 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -1774,17 +1774,17 @@ export const OperationEvent = {
             }
         },
         // 点灯  （大铁）
-        signalLight: {
+        signalTurnOn: {
             menuButton: {
                 operation: '3231',
-                domId: '_Tips-Signal-signalLight-MenuButton{BOTTOM}'
+                domId: '_Tips-Signal-signalTurnOn-MenuButton{BOTTOM}'
             }
         },
         // 灭灯 （大铁）
-        signalDestroy: {
+        signalTurnOff: {
             menuButton: {
                 operation: '3232',
-                domId: '_Tips-Signal-signalDestroy-MenuButton{BOTTOM}'
+                domId: '_Tips-Signal-signalTurnOff-MenuButton{BOTTOM}'
             }
         }
     },

From 7595c36413859ad24faaa4c753e3fcd4d625b04c Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 22 Jul 2022 13:57:03 +0800
Subject: [PATCH 04/37] =?UTF-8?q?=E5=A4=A7=E9=93=81=E4=BA=8C=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=E7=81=AD=E7=81=AF=E6=93=8D=E4=BD=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/datie_02/menus/menuButton.vue       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index a75e36178..3557f8ffd 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -76,7 +76,7 @@
         <center><b>点灯</b></center>
       </span>
     </button>
-    <button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['Signal'])">
+    <button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['SignalButton'])">
       <span style="color:#800000">
         <center><b>灭灯</b></center>
       </span>
@@ -672,14 +672,16 @@ export default {
             this.sendCommand(operate);
         },
         handleSignalTurnOff(model) {
-            const operate = {
-                over: true,
-                code: model.code,
-                operation: this.$store.state.menuOperation.buttonOperation,
-                cmdType: CMD.Signal.CMD_SIGNAL_TURN_OFF,
-                param: {signalCode: model.code}
-            };
-            this.sendCommand(operate);
+            if (model.type === 'PICK') {
+                const operate = {
+                    over: true,
+                    code: model.code,
+                    operation: this.$store.state.menuOperation.buttonOperation,
+                    cmdType: CMD.Signal.CMD_SIGNAL_TURN_OFF,
+                    param: {signalCode: model.signalCode}
+                };
+                this.sendCommand(operate);
+            }
         },
         // CHANGE_DIRECTION
         selectedChange() {

From 2c6807debf4f10d86d7af32461ba9da8cf67219e Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 22 Jul 2022 14:27:03 +0800
Subject: [PATCH 05/37] =?UTF-8?q?=E7=8E=B0=E5=9C=B0=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=AB=99=E6=B7=BB=E5=8A=A0=E8=B7=AF=E7=A5=A8=E7=B0=BF=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/menuSchema.vue | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index e5e0c21d2..443377f4f 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -13,6 +13,8 @@
       <template v-if="!dataError">
         <el-button-group v-if="project !== 'bjd'">
           <el-button v-if="$route.query.lineCode === '16'&&!isCtc && project !== 'teaching'" size="small" @click="goCtc">车务终端</el-button>
+          <el-button v-if="$route.query.lineCode ==='16'&&$store.state.training.prdType === '01'" size="small" @click="showTrainTicket">路票</el-button>
+          <el-button v-if="$route.query.lineCode === '16'&&$store.state.training.prdType ==='01'" size="small" @click="showRegisterBook">簿册</el-button>
           <!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goRpManage">管理终端</el-button> -->
           <!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goDsManage">调度台</el-button> -->
           <el-button v-if="isLocalStation && $route.query.lineCode!='08' && $route.query.lineCode!='16' && project !== 'teaching'" size="small" @click="goIbp">IBP盘</el-button>
@@ -37,6 +39,8 @@
     <!-- 加载剧本列表弹窗 -->
     <add-quest ref="addQuest" @selectQuest="selectQuest" />
     <line-board ref="lineBoard" />
+    <train-ticket ref="trainTicket" />
+    <register-book ref="registerBook" />
     <!-- <run-plan-edit v-if="isScheduling && isDepot" ref="runPlanEdit" /> -->
   </div>
 </template>
@@ -56,6 +60,8 @@ import { getIbpInfoByStation } from '@/api/ibp';
 import { loadRunPlanData } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 import { timesSpeedPlayback } from '@/api/rtSimulation';
+import TrainTicket from '../trainTicket/index';
+import RegisterBook from '../registerBook/index';
 
 // 右上角操作
 export default {
@@ -67,7 +73,9 @@ export default {
         AddQuest,
         // RunPlanEdit,
         SelectStation,
-        LineBoard
+        LineBoard,
+        TrainTicket,
+        RegisterBook
     },
     props: {
         offset: {
@@ -238,6 +246,22 @@ export default {
             });
             window.open(routeData.href, '_blank');
         },
+        showTrainTicket() {
+            const stationSupervisorList = [];
+            for (const memberId in this.$store.state.training.memberData) {
+                const item = this.$store.state.training.memberData[memberId];
+                if (item.type === 'STATION_SUPERVISOR') {
+                    const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
+                    const memberData = { labelName: '值班员-' + device.name + (item.name ? `-${item.name }` : ''), id:item.id, userId:item.userId };
+                    stationSupervisorList.push(memberData);
+                }
+            }
+            EventBus.$emit('trainTicketMember', stationSupervisorList);
+            this.$refs.trainTicket.doShow();
+        },
+        showRegisterBook() {
+            this.$refs.registerBook.doShow();
+        },
         // goRpManage() {
         //     const routeData = this.$router.resolve({
         //         path:'/bigTrainRunplanManage',

From 7abc3b37dbb4398aec49caeeb94123797fd5477d Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 22 Jul 2022 15:56:59 +0800
Subject: [PATCH 06/37] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF=20?=
 =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6=20=E9=A1=B5=E9=9D=A2?=
 =?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/views/newMap/displayNew/demonMenu.vue     |  2 +-
 src/views/newMap/displayNew/index.vue         | 46 ++++++++++++++++---
 src/views/newMap/displayNew/menuSchema.vue    | 25 +++++++++-
 .../scriptDisplay/scriptRecord/index.vue      | 46 ++++++++++++++++++-
 src/views/scriptManage/home.vue               |  3 ++
 5 files changed, 110 insertions(+), 12 deletions(-)

diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index 95e3079ac..e60b92277 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -5,7 +5,7 @@
       <el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
         <!-- 地图错误判断 -->
         <!-- 设备视图 -->
-        <el-button v-if="jl3dmodelShow && !isContest && project !== 'bjd' && project !== 'teaching'" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
+        <el-button v-if="jl3dmodelShow && !isContest && project !== 'bjd' && $route.query.lineCode !== '16' && project !== 'teaching'" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
         <!-- 三维视图/数字沙盘 -->
         <el-button v-if="jl3dnameShow && !isContest && project !== 'bjd' && $route.query.lineCode !== '16' && project !== 'teaching'" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
         <!-- cctv视图 -->
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 3698bdfa5..f186447c0 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -1,17 +1,21 @@
 <template>
-  <div class="main" :style="{width: canvasWidth+'px',height:'100%',position:'absolute',overflow:'hidden'}">
+  <div class="main" :style="{width: canvasWidth+'px'}">
     <template>
       <transition name="el-zoom-in-bottom">
-        <map-system-draft ref="mapCanvas" @back="back" />
+        <map-system-draft v-show="!specialDispatch" ref="mapCanvas" @back="back" />
       </transition>
       <menu-demon v-if="isDemon" ref="menuDemon" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" @start="start" @end="end" />
       <menu-lesson v-if="isLesson" ref="lessonMenu" :offset="offset" :data-error="dataError" :offset-bottom="offsetBottom" :tip-bottom="tipBottom" />
       <menu-exam v-if="isExam" ref="menuExam" :offset="offset" :data-error="dataError" :offset-bottom="offsetBottom" />
-      <menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :offset="offset" :text-status-height="textStatusHeight" :data-error="dataError" @start="start" @end="end" />
+      <menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :offset="offset" :text-status-height="textStatusHeight" :data-error="dataError" @start="start" @end="end" @changeShowMap="changeShowMap" />
       <menu-dispather-contest v-if="isContest" ref="menuDispatherContest" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" @start="start" @end="end" />
+      <div v-if="lineCode === '16'" v-show="prdType === '02'&& !showMap" style="position:absolute;width: 100%;top:0;left:0;">
+        <!-- && (isScript || isDemon) -->
+        <dispatcher-station ref="dispatcherStation" @changeShowMap="changeShowMap" />
+      </div>
     </template>
     <menu-train-list v-if="isDemon||isContest||isScript" />
-    <menu-system-time v-if="$route.query.lineCode !== '16'" ref="menuSystemTime" :offset="offset" :group="group" />
+    <menu-system-time v-if="lineCode !== '16'" ref="menuSystemTime" :offset="offset" :group="group" />
   </div>
 </template>
 <script>
@@ -29,6 +33,7 @@ import MenuTrainList from '@/views/newMap/displayNew/menuTrainList';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 import { clearSimulation, getSimulationInfoNew, ranAsPlan, exitRunPlan } from '@/api/simulation';
 import { loadMapDataById } from '@/utils/loaddata';
+import DispatcherStation from '../jointTrainingNew/dispatcherStation';
 import { EventBus } from '@/scripts/event-bus';
 
 export default {
@@ -41,7 +46,8 @@ export default {
         MenuSystemTime,
         MenuTrainList,
         MenuDispatherContest,
-        MenuScript
+        MenuScript,
+        DispatcherStation
     },
     data() {
         return {
@@ -51,7 +57,8 @@ export default {
             textStatusHeight: 0,
             planRunning:false,
             dataError: false,
-            group:''
+            group:'',
+            showMap: false
         };
     },
     computed:{
@@ -87,6 +94,15 @@ export default {
         },
         height() {
             return this.$store.state.app.height;
+        },
+        prdType() {
+            return this.$store.state.training.prdType;
+        },
+        lineCode() {
+            return this.$route.query.lineCode;
+        },
+        specialDispatch() {
+            return (this.lineCode === '14' && this.$store.state.training.prdType === '02') || (this.lineCode === '16' && this.$store.state.training.prdType === '02' && !this.showMap);
         }
     },
     watch:{
@@ -201,7 +217,6 @@ export default {
             this.group = this.$route.query.group;
             this.$store.dispatch('training/reset');
             this.loadSimulationInfo();
-            this.loadMapData();
         },
         // 新版地图根据仿真group获取仿真基础信息
         async loadSimulationInfo() {
@@ -221,6 +236,10 @@ export default {
                     if (resp.data.planRunning) {
                         this.$store.commit('training/start');
                     }
+                    if (this.isScript) {
+                        this.$store.dispatch('training/setPrdType', '02');
+                    }
+                    this.loadMapData();
                 } else {
                     this.$messageBox('此地图数据正在维护中,无法运行！');
                 }
@@ -321,7 +340,20 @@ export default {
             }).catch(() => {
                 this.$messageBox(this.$t('display.demon.endSimulationFail'));
             });
+        },
+        changeShowMap(flag) {
+            this.showMap = flag;
         }
     }
 };
 </script>
+<style scoped lang="scss" rel="stylesheep/scss">
+	.main {
+		display: block;
+		width: 100% !important;
+		height: 100%;
+		overflow: hidden;
+		position: relative;
+		background: #000000;
+	}
+</style>
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index e5e0c21d2..1d3cfe5eb 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height:100%;">
     <div class="schema" :style="{top: offset+'px'}">
       <select-station v-show="!$route.query.joint" v-if="isShowSelectStation && !isScript" ref="selectStation" :style-css="'width: 100px;'" />
       <el-select v-model="speed" style="width: 100px;" size="small" @change="speedChange">
@@ -12,9 +12,12 @@
       </el-select>
       <template v-if="!dataError">
         <el-button-group v-if="project !== 'bjd'">
-          <el-button v-if="$route.query.lineCode === '16'&&!isCtc && project !== 'teaching'" size="small" @click="goCtc">车务终端</el-button>
+          <el-button v-if="$route.query.lineCode === '16'&&!isCtc && project !== 'teaching'&&isLocalStation" size="small" @click="goCtc">车务终端</el-button>
+          <el-button v-if="$route.query.lineCode ==='16'&&isLocalStation" size="small" @click="showTrainTicket">路票</el-button>
+          <el-button v-if="$route.query.lineCode === '16'&&isLocalStation" size="small" @click="showRegisterBook">簿册</el-button>
           <!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goRpManage">管理终端</el-button> -->
           <!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goDsManage">调度台</el-button> -->
+          <el-button v-if="showDispatcherStation" size="small" @click="changeShowMap">调度台</el-button>
           <el-button v-if="isLocalStation && $route.query.lineCode!='08' && $route.query.lineCode!='16' && project !== 'teaching'" size="small" @click="goIbp">IBP盘</el-button>
           <el-button v-if="isScheduling && isDepot && project !== 'teaching'" size="small" type="primary" @click="runPlanEditShow">运行图编辑</el-button>
           <!-- 加载剧本 -->
@@ -37,6 +40,8 @@
     <!-- 加载剧本列表弹窗 -->
     <add-quest ref="addQuest" @selectQuest="selectQuest" />
     <line-board ref="lineBoard" />
+    <train-ticket ref="trainTicket" />
+    <register-book ref="registerBook" />
     <!-- <run-plan-edit v-if="isScheduling && isDepot" ref="runPlanEdit" /> -->
   </div>
 </template>
@@ -47,6 +52,8 @@ import RunPlanView from './demon/runPlanView';
 import FaultChoose from './demon/faultChoose';
 import LineBoard from '../displayCity/lineBoard';
 import AddQuest from './demon/addQuest';
+import TrainTicket from '../trainTicket/index';
+import RegisterBook from '../registerBook/index';
 import { OperateMode } from '@/scripts/ConstDic';
 import { getByGroupStationList } from '@/api/jmap/map';
 import { generateRunPlanInfoSync } from '@/api/jmap/mapdraft.js';
@@ -67,6 +74,8 @@ export default {
         AddQuest,
         // RunPlanEdit,
         SelectStation,
+        TrainTicket,
+        RegisterBook,
         LineBoard
     },
     props: {
@@ -130,6 +139,9 @@ export default {
         isDepot() {
             return this.$route.query.type === 'DEPOT';
         },
+        showDispatcherStation() {
+            return this.$route.query.lineCode === '16' && this.$store.state.training.prdType === '02';
+        },
         isContest() {
             return this.project.includes('drts');
         },
@@ -220,6 +232,9 @@ export default {
         showLineBoard() {
             this.$refs.lineBoard.doShow();
         },
+        changeShowMap() {
+            this.$emit('changeShowMap', false);
+        },
         goCtc() {
             const routeData = this.$router.resolve({
                 path:'/displayNew/demon',
@@ -238,6 +253,12 @@ export default {
             });
             window.open(routeData.href, '_blank');
         },
+        showTrainTicket() {
+            this.$refs.trainTicket.doShow();
+        },
+        showRegisterBook() {
+            this.$refs.registerBook.doShow();
+        },
         // goRpManage() {
         //     const routeData = this.$router.resolve({
         //         path:'/bigTrainRunplanManage',
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index 69c68cd3c..4bf75606e 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width:100%;height:100%;">
     <div class="display-draft">
       <el-button-group>
         <el-button v-if="!isReplaceBg" type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
@@ -25,6 +25,7 @@
       :offset="offset"
       :data-error="dataError"
       :offset-bottom="offsetBottom"
+      @changeShowMap="changeShowMap"
     />
 
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
@@ -93,7 +94,9 @@ export default {
         return {
             isScriptCommand:false,
             isReplaceBg: false,
-            userRole:''
+            userRole:'',
+            centralizedstationList: [],
+            centralizedStationMap: {}
         };
     },
 
@@ -129,6 +132,11 @@ export default {
                 this.$store.dispatch('map/setShowCentralizedStationNum');
             });
         },
+        '$store.state.map.map': function (map) {
+            if (map) {
+                this.setCentralizedstationList(map); // 获取集中站列表
+            }
+        },
         '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识
             getSimulationMemberList(this.group).then(resp => {
                 this.$store.dispatch('training/setMemberList', {memberList:resp.data, userId:this.$store.state.user.id});
@@ -156,7 +164,13 @@ export default {
         },
         '$store.state.scriptRecord.userRole':function (val) {
             this.userRole = val;
+        },
+        '$store.state.training.roleDeviceCode':function (val) {
+            if (val) {
+                this.setShowStation(val);
+            }
         }
+
     },
     beforeDestroy() {
         // this.clearAutoSave();
@@ -192,6 +206,34 @@ export default {
         },
         setReplace(isRp) {
             this.isReplaceBg = isRp;
+        },
+        changeShowMap() {
+            this.$emit('changeShowMap', false);
+        },
+        setShowStation(stationCode) {
+            const showStation = this.centralizedStationMap[stationCode];
+            const list = [];
+            const mapDevice = this.$store.state.map.mapDevice;
+            for (const key in mapDevice) {
+                list.push(mapDevice[key]);
+            }
+            this.$jlmap.updateShowStation(list, showStation);
+            this.$jlmap.setCenter(showStation);
+        },
+        setCentralizedstationList(map) {
+            this.centralizedstationList = [];
+            (map.stationList || []).forEach(item => {
+                if (item.centralized) {
+                    this.centralizedstationList.push({value: item.code, name: item.name});
+                    this.centralizedStationMap[item.code] = item.code;
+                    item.chargeStationCodeList && item.chargeStationCodeList.length && item.chargeStationCodeList.forEach(ele => {
+                        this.centralizedStationMap[ele] = item.code;
+                    });
+                }
+            });
+            // if (this.centralizedstationList.length && !this.showStation) {
+            //     this.showStation = this.centralizedstationList[0].value;
+            // }
         }
     }
 };
diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index 1a6e8c285..d85e8ea78 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -145,6 +145,9 @@ export default {
         },
         drawUp(index, row) {
             scriptRecordNotifyNew(row.id).then(resp => {
+                if (this.loadingProjectList.includes(this.project)) {
+                    this.$store.dispatch('app/transitionAnimations');
+                }
                 const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode, record: true};
                 this.$router.push({ path: `${UrlConfig.scriptDisplayNew}/script`, query });
                 launchFullscreen();

From 7328ac596a7e132063ec1dcedca69b09f73e80b5 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 22 Jul 2022 16:56:59 +0800
Subject: [PATCH 07/37] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF=20?=
 =?UTF-8?q?=E5=89=A7=E6=9C=AC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scriptDisplay/scriptRecord/index.vue      | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index 4bf75606e..dab8dcd91 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -121,6 +121,9 @@ export default {
         },
         isDisable() {
             return this.$store.state.training.started;
+        },
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
         }
     },
     watch: {
@@ -165,9 +168,14 @@ export default {
         '$store.state.scriptRecord.userRole':function (val) {
             this.userRole = val;
         },
-        '$store.state.training.roleDeviceCode':function (val) {
-            if (val) {
-                this.setShowStation(val);
+        // '$store.state.training.roleDeviceCode':function (val) {
+        //     if (val) {
+        //         this.setShowStation(val);
+        //     }
+        // },
+        '$store.state.socket.simulationRoleList':function(list) {
+            if (list && list.length) { // 人员变化监控
+                this.checkRoleChange(list);
             }
         }
 
@@ -210,6 +218,22 @@ export default {
         changeShowMap() {
             this.$emit('changeShowMap', false);
         },
+
+        checkRoleChange(data) {
+            data.forEach(item => {
+                if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && item.type == 'STATION_SUPERVISOR') {
+                    // this.userRole = item.type || 'AUDIENCE';
+                    this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
+                    this.deviceCode = item.deviceCode;
+                    this.setShowStation(item.deviceCode);
+                    // this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]);
+                    this.$nextTick(() => {
+                        if (item.deviceCode && this.$store.state.training.prdType !== '09') { this.setCenter(item.deviceCode); }
+                    });
+                }
+            });
+        },
+
         setShowStation(stationCode) {
             const showStation = this.centralizedStationMap[stationCode];
             const list = [];

From fdb071c9f6bd61bffda02279ab78efd0e74b23ee Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 22 Jul 2022 18:04:12 +0800
Subject: [PATCH 08/37] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/mapsystemNew/index.vue | 58 ++++++++++++-------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/views/newMap/mapsystemNew/index.vue b/src/views/newMap/mapsystemNew/index.vue
index 70b088ec4..13360dbce 100644
--- a/src/views/newMap/mapsystemNew/index.vue
+++ b/src/views/newMap/mapsystemNew/index.vue
@@ -23,9 +23,9 @@ export default {
             topic: '/user/queue/training',
             stomp: null,
             currentMap: null,
-            ierval: null,
+            // ierval: null,
             mouseNum: 1,
-            mouseNumTime: 0,
+            // mouseNumTime: 0,
             mapBoxP: null,
             mode: '',
             groupModel: ''
@@ -78,7 +78,7 @@ export default {
         this.mode = this.$route.params.mode || '';
         this.currentMap = this.$refs.mapCommon;
         this.groupModel = this.$route.query.group;
-        this.checkMouseStatusTimer(); // 鼠标样式变化检测
+        // this.checkMouseStatusTimer(); // 鼠标样式变化检测
         this.$nextTick(() => {
             setTimeout(() => {
                 this.$store.dispatch('config/resetCanvasOffset');
@@ -88,7 +88,7 @@ export default {
     beforeDestroy() {
         this.clearSubscribe();
         this.clearSubscribeNew();
-        this.clearAllTimer();
+        // this.clearAllTimer();
     },
     methods: {
         async mapViewLoaded(loading) {
@@ -161,33 +161,33 @@ export default {
             this.mouseNum = 1;
         },
         // 清除检查在线定时器
-        clearAllTimer() {
-            if (this.ierval) {
-                clearInterval(this.ierval);
-                this.ierval = null;
-            }
-        },
+        // clearAllTimer() {
+        //     if (this.ierval) {
+        //         clearInterval(this.ierval);
+        //         this.ierval = null;
+        //     }
+        // },
         // 设置手标显示状态
         checkMouseStatusTimer() {
-            if (this.ierval) {
-                clearInterval(this.ierval);
-            }
-            this.ierval = setInterval(() => {
-                if (this.mouseNum) {
-                    this.mouseNum = 0;
-                    this.mouseNumTime = 0;
-                    if (this.mapBoxP) {
-                        this.mapBoxP.style.cursor = this.mapBoxP.style.cursor != 'none' ? this.mapBoxP.style.cursor : '';
-                    }
-                } else {
-                    this.mouseNumTime += 1;
-                }
-                if (this.mapBoxP) {
-                    if (this.mouseNumTime >= 12) {
-                        this.mapBoxP.style.cursor = 'none';
-                    }
-                }
-            }, 1000);
+            // if (this.ierval) {
+            //     clearInterval(this.ierval);
+            // }
+            // this.ierval = setInterval(() => {
+            //     if (this.mouseNum) {
+            //         this.mouseNum = 0;
+            //         this.mouseNumTime = 0;
+            //         if (this.mapBoxP) {
+            //             this.mapBoxP.style.cursor = this.mapBoxP.style.cursor != 'none' ? this.mapBoxP.style.cursor : '';
+            //         }
+            //     } else {
+            //         this.mouseNumTime += 1;
+            //     }
+            //     if (this.mapBoxP) {
+            //         if (this.mouseNumTime >= 12) {
+            //             this.mapBoxP.style.cursor = 'none';
+            //         }
+            //     }
+            // }, 1000);
         },
         initMemberUserInfo(isFirst = false) {
             if (this.$route.query.newApi + '' === 'true') {

From 808ce62c8557132edb6644c362f414bdf6894b9c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 Jul 2022 09:58:40 +0800
Subject: [PATCH 09/37] =?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

---
 .../displayNew/scriptDisplay/scriptRecord/index.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index dab8dcd91..bab4b8cf1 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -174,7 +174,7 @@ export default {
         //     }
         // },
         '$store.state.socket.simulationRoleList':function(list) {
-            if (list && list.length) { // 人员变化监控
+            if (list && list.length && this.$route.query.lineCode == '16') { // 人员变化监控
                 this.checkRoleChange(list);
             }
         }
@@ -226,10 +226,11 @@ export default {
                     this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
                     this.deviceCode = item.deviceCode;
                     this.setShowStation(item.deviceCode);
+                    this.$store.dispatch('training/setPrdType', '01');
                     // this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]);
-                    this.$nextTick(() => {
-                        if (item.deviceCode && this.$store.state.training.prdType !== '09') { this.setCenter(item.deviceCode); }
-                    });
+                    // this.$nextTick(() => {
+                    //     if (item.deviceCode && this.$store.state.training.prdType !== '09') { this.setCenter(item.deviceCode); }
+                    // });
                 }
             });
         },
@@ -242,7 +243,9 @@ export default {
                 list.push(mapDevice[key]);
             }
             this.$jlmap.updateShowStation(list, showStation);
-            this.$jlmap.setCenter(showStation);
+            this.$nextTick(()=>{
+                this.$jlmap.setCenter(showStation);
+            });
         },
         setCentralizedstationList(map) {
             this.centralizedstationList = [];

From 78d263562d115b95cc688abeaf439ba16ecacb4e Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 25 Jul 2022 10:11:19 +0800
Subject: [PATCH 10/37] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=A7=E6=9C=AC?=
 =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=91=BD=E4=BB=A4=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/cmdPlugin/CommandEnum.js            | 5 ++++-
 src/views/dispatcherStationManage/cmdManage.vue | 2 +-
 src/views/scriptManage/getAction.vue            | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 54a4f5407..bfd07679c 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -442,7 +442,10 @@ export default {
         CTC_ZONE_SAVE_TRIP_NUMBER:{value:'CTC_ZONE_SAVE_TRIP_NUMBER', label: '调度台行车计划修改车次'},
         CTC_ZONE_SAVE_PLAN_TIME:{value:'CTC_ZONE_SAVE_PLAN_TIME', label: '调度台行车计划修改时间'},
         CTC_ZONE_SAVE_DIRECTION:{value:'CTC_ZONE_SAVE_DIRECTION', label: '调度台行车计划修改出入口'},
-        CTC_ZONE_SAVE_STATION:{value:'CTC_ZONE_SAVE_STATION', label: '调度台行车计划修改到发车站'}
+        CTC_ZONE_SAVE_STATION:{value:'CTC_ZONE_SAVE_STATION', label: '调度台行车计划修改到发车站'},
+        CTC_QUERY_DISPATCH_COMMAND:{value:'CTC_QUERY_DISPATCH_COMMAND', label: '调度台命令查询'},
+        CTC_SIGN_DISPATCH_COMMAND:{value:'CTC_SIGN_DISPATCH_COMMAND', label: '调度台命令发送'},
+        CTC_READ_DISPATCH_COMMAND:{value:'CTC_READ_DISPATCH_COMMAND', label: '调度台命令已读'}
 
     },
     RAIL: {
diff --git a/src/views/dispatcherStationManage/cmdManage.vue b/src/views/dispatcherStationManage/cmdManage.vue
index f925be9f9..d5a4398e2 100644
--- a/src/views/dispatcherStationManage/cmdManage.vue
+++ b/src/views/dispatcherStationManage/cmdManage.vue
@@ -181,7 +181,7 @@ export default {
     },
     beforeDestroy() {},
     mounted() {
-        this.searchCmd();
+        // this.searchCmd();
     },
     methods:{
         tableRowClassName({row, rowIndex}) {
diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue
index 874cdb563..5e2146f0f 100644
--- a/src/views/scriptManage/getAction.vue
+++ b/src/views/scriptManage/getAction.vue
@@ -177,7 +177,7 @@ export default {
                         });
                     });
                     if (operateName) {
-                        const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车'};
+                        const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车', CTC:'车务终端'};
                         const operateTypeName = deviceTypeList[operateType];
                         this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false, condition: element.condition});
                     }

From e9785184ddc5fa7005a7ec36a48ab93fa07bf3fe Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 25 Jul 2022 11:01:01 +0800
Subject: [PATCH 11/37] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/selectStation.vue | 41 +++++++++++++++----
 src/views/newMap/jointTrainingNew/index.vue   | 25 ++++++++++-
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/views/newMap/displayNew/selectStation.vue b/src/views/newMap/displayNew/selectStation.vue
index e81685373..317a2968f 100644
--- a/src/views/newMap/displayNew/selectStation.vue
+++ b/src/views/newMap/displayNew/selectStation.vue
@@ -69,16 +69,27 @@ export default {
                 const member = this.$store.state.training.memberData[val];
                 const station = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
                 if (station) {
-                    this.showStation = station.code;
-                    const showStationCode = this.stationCentralizedMap[station.code];
-                    const mapDevice = this.$store.state.map.mapDevice;
-                    const list = [];
-                    for (const key in mapDevice) {
-                        list.push(mapDevice[key]);
+                    const pictureLineCodeList = ['16'];
+                    if (pictureLineCodeList.includes(this.$route.query.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === station.code && picture.type === 'chainStation');
+                        if (picture) {
+                            const mapDevice = this.$store.state.map.mapDevice;
+                            const list = [];
+                            const deviceList = [];
+                            for (const key in mapDevice) {
+                                list.push(mapDevice[key]);
+                                deviceList.push(key);
+                            }
+                            this.$jlmap.updateShowStation(list, '');
+                            this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                            this.$jlmap.updatePicture(deviceList);
+                            this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                        } else {
+                            this.jmapShowStation(station);
+                        }
+                    } else {
+                        this.jmapShowStation(station);
                     }
-                    this.$store.dispatch('training/setRoleDeviceCode', station.code);
-                    this.$jlmap.updateShowStation(list, showStationCode || station.code);
-                    this.setCenter(showStationCode);
                 }
             }).catch((err) => {
                 console.log(err);
@@ -86,6 +97,18 @@ export default {
                 this.$message.error('调整角色成员失败！');
             });
         },
+        jmapShowStation(station) {
+            this.showStation = station.code;
+            const showStationCode = this.stationCentralizedMap[station.code];
+            const mapDevice = this.$store.state.map.mapDevice;
+            const list = [];
+            for (const key in mapDevice) {
+                list.push(mapDevice[key]);
+            }
+            this.$store.dispatch('training/setRoleDeviceCode', station.code);
+            this.$jlmap.updateShowStation(list, showStationCode || station.code);
+            this.setCenter(showStationCode);
+        },
         setCenter(code) {
             if (this.$store.state.training.prdType === '09' && this.$store.state.map.map.displayList && this.$store.state.map.map.displayList.length) {
                 const tempData = this.$store.state.map.map.displayList.find(item => { return item.stationCodeList.includes(code) && item.type === 'DEPOT_IL'; });
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 97def49f9..6eb2a050a 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -437,6 +437,7 @@ export default {
         setSimulationPrdType(deviceCode) {
             // Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号
             this.showStation = '';
+            const pictureLineCodeList = ['16'];
             let tempData;
             let dataZoom;
             switch (this.userRole) {
@@ -466,8 +467,28 @@ export default {
                     }
                     this.$jlmap.updateShowMode(list, '02');
                 }
-                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
-                this.mapViewLoadedOver && this.switchStationMode(deviceCode);
+                if (pictureLineCodeList.includes(this.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                    const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation');
+                    if (picture) {
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        const deviceList = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                            deviceList.push(key);
+                        }
+                        this.$jlmap.updateShowStation(list, '');
+                        this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                        this.$jlmap.updatePicture(deviceList);
+                        this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                    } else {
+                        this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                        this.mapViewLoadedOver && this.switchStationMode(deviceCode);
+                    }
+                } else {
+                    this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                    this.mapViewLoadedOver && this.switchStationMode(deviceCode);
+                }
                 this.jl3dmaintainershow = false;
                 this.drivingShow = false;
                 break;

From dc287775e8c2d1b14e3c24f82bea1a54dd6a9def Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 25 Jul 2022 11:11:31 +0800
Subject: [PATCH 12/37] =?UTF-8?q?=E9=81=93=E5=B2=94=E9=92=A9=E9=94=81?=
 =?UTF-8?q?=E9=83=BD=E8=B5=B0=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menus/dialog/switchHookLock.vue           | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
index e7e087dfb..de0a33031 100644
--- a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
+++ b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
@@ -45,7 +45,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import { commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
+// import { commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
 import {menuOperate, commitOperate} from '../../utils/menuOperate';
 export default {
     name: 'SwitchHookLock',
@@ -125,37 +125,37 @@ export default {
         },
         commit() {
             this.loading = true;
-            if (this.operation) {
-                commitOperate(menuOperate.Switch.hookLock, {normal: this.normal}, 2).then(({valid})=>{
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
+            // if (this.operation) {
+            commitOperate(menuOperate.Switch.hookLock, {normal: this.normal}, 2).then(({valid})=>{
+                this.loading = false;
+                if (valid) {
                     this.doClose();
-                    console.error(error);
-                    this.$refs.noticeInfo.doShow();
-                });
-            } else {
-                const group = this.$route.query.group;
-                const param = {
-                    commandType: 'Switch_Hook_Lock',
-                    // Switch_Hook_Lock
-                    targetMemberId: this.targetMemberId,
-                    params: {
-                        switchCode: this.selected.code,
-                        normal: this.normal
-                    }
-                };
-                commitTrainSend(group, param).then(({valid, operate})=>{
-                    this.doClose();
-                }).catch((error) => {
-                    console.error(error);
-                    this.$refs.noticeInfo.doShow();
-                    this.doClose();
-                });
-            }
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.doClose();
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+            // } else {
+            //     const group = this.$route.query.group;
+            //     const param = {
+            //         commandType: 'Switch_Hook_Lock',
+            //         // Switch_Hook_Lock
+            //         targetMemberId: this.targetMemberId,
+            //         params: {
+            //             switchCode: this.selected.code,
+            //             normal: this.normal
+            //         }
+            //     };
+            //     commitTrainSend(group, param).then(({valid, operate})=>{
+            //         this.doClose();
+            //     }).catch((error) => {
+            //         console.error(error);
+            //         this.$refs.noticeInfo.doShow();
+            //         this.doClose();
+            //     });
+            // }
 
         }
     }

From 96c1fba89b0c061fb3a015ed3d2c83d9ba0160a6 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 25 Jul 2022 13:18:58 +0800
Subject: [PATCH 13/37] =?UTF-8?q?=E9=81=93=E5=B2=94=E9=92=A9=E9=94=81?=
 =?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/jmapNew/theme/components/menus/dialog/switchHookLock.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
index de0a33031..2507e1141 100644
--- a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
+++ b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
@@ -126,7 +126,7 @@ export default {
         commit() {
             this.loading = true;
             // if (this.operation) {
-            commitOperate(menuOperate.Switch.hookLock, {normal: this.normal}, 2).then(({valid})=>{
+            commitOperate(menuOperate.Switch.hookLock, {normal: this.normal, switchCode: this.selected.code}, 2).then(({valid})=>{
                 this.loading = false;
                 if (valid) {
                     this.doClose();

From 2ff39c6c89dfd315876613a67ac4e88b43c475bb Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 Jul 2022 13:57:33 +0800
Subject: [PATCH 14/37] =?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/views/scriptManage/getAction.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue
index 5e2146f0f..e46bb5e11 100644
--- a/src/views/scriptManage/getAction.vue
+++ b/src/views/scriptManage/getAction.vue
@@ -177,7 +177,7 @@ export default {
                         });
                     });
                     if (operateName) {
-                        const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车', CTC:'车务终端'};
+                        const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车', CTC:'车务终端', RAIL:'票据/簿册'};
                         const operateTypeName = deviceTypeList[operateType];
                         this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false, condition: element.condition});
                     }

From a97a2a7753080f5824ea5abb836df2f71cf4c3cb Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 25 Jul 2022 14:10:59 +0800
Subject: [PATCH 15/37] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/cmdPlugin/CommandEnum.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index bfd07679c..4d2edbf80 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -444,7 +444,8 @@ export default {
         CTC_ZONE_SAVE_DIRECTION:{value:'CTC_ZONE_SAVE_DIRECTION', label: '调度台行车计划修改出入口'},
         CTC_ZONE_SAVE_STATION:{value:'CTC_ZONE_SAVE_STATION', label: '调度台行车计划修改到发车站'},
         CTC_QUERY_DISPATCH_COMMAND:{value:'CTC_QUERY_DISPATCH_COMMAND', label: '调度台命令查询'},
-        CTC_SIGN_DISPATCH_COMMAND:{value:'CTC_SIGN_DISPATCH_COMMAND', label: '调度台命令发送'},
+        CTC_SEND_DISPATCH_COMMAND:{value:'CTC_SEND_DISPATCH_COMMAND', label: '调度台命令发送'},
+        CTC_SIGN_DISPATCH_COMMAND:{value:'CTC_SIGN_DISPATCH_COMMAND', label: '调度台命令签收'},
         CTC_READ_DISPATCH_COMMAND:{value:'CTC_READ_DISPATCH_COMMAND', label: '调度台命令已读'}
 
     },

From 45f1af26022ca5057b86016b8b0860269c5bdefb Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 25 Jul 2022 16:13:09 +0800
Subject: [PATCH 16/37] =?UTF-8?q?=E6=95=85=E9=9A=9C=E9=94=81=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_02.js                | 2 +-
 src/jmapNew/theme/components/menus/dialog/setFault.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js
index 027c7510f..33963848d 100644
--- a/src/jmapNew/config/skinCode/datie_02.js
+++ b/src/jmapNew/config/skinCode/datie_02.js
@@ -89,7 +89,7 @@ class SkinCode extends defaultStyle {
                 unCommunicationOccupiedColor: '#FF0000', 	// 区段非通讯车占用颜色  （红色）
 
                 routeLockColor: '#FFFFFF', 					// 区段进路锁定颜色  （白色）
-                faultLockColor: '#006400', 					// 区段故障锁定颜色
+                faultLockColor: '#00FF00', 					// 区段故障锁定颜色
 
                 undefinedColor: '#0071C1', 					// 区段未定义颜色
                 blockColor: '#00FF00', 						// 区段封锁颜色
diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index 9ee3af586..9dd696b51 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -203,7 +203,8 @@ export default {
                     ];
                 } else if (selected._type === 'Section' && this.popClass === 'datie-02__systerm') {
                     this.faultList = [
-                        {label: '电路故障', value: 'FAULT'}
+                        {label: '电路故障', value: 'FAULT'},
+                        {label: '故障锁闭', value: 'FAULT_LOCK'}
                         // {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}
                     ];
                 } else if (selected._type === 'Switch' && this.popClass === 'haerbin-01__systerm') {

From 856a5b676a9173aa3a39d5f290bbe837985ad385 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 Jul 2022 16:33:04 +0800
Subject: [PATCH 17/37] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=20ctc=20=E5=AF=B9=E5=BA=94=E8=BD=A6=E7=AB=99?=
 =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=94=B9bug=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/cmdPlugin/CommandEnum.js          | 15 +--
 src/views/newMap/displayNew/menuSchema.vue    | 97 ++++++++++++++++++-
 .../component/covertOperation.js              | 63 +++++++++++-
 3 files changed, 164 insertions(+), 11 deletions(-)

diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index bfd07679c..d15de0c72 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -395,25 +395,27 @@ export default {
         CTC_CANCEL_DEPARTURE_NOTICE: {value: 'CTC_CANCEL_DEPARTURE_NOTICE', label: '取消发预'},
         CTC_FINISH_DEPARTURE: {value: 'CTC_FINISH_DEPARTURE', label: '完成发点'},
         CTC_CANCEL_DEPARTURE: {value: 'CTC_CANCEL_DEPARTURE', label: '取消发点'},
-        CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION:{value:'ASSIST_PRESS_DOWN_TURN_DIRECTION', label:'改方'},
+
         CTC_AUTO_TRIGGER: {value: 'CTC_AUTO_TRIGGER', label: '自动触发'},
+
         CTC_ASSIST_PRESS_MAIN_ASSIST:{value: 'ASSIST_PRESS_MAIN_ASSIST', label: '总辅助'},
         CTC_ASSIST_PRESS_RECEIVE_ASSIST:{value: 'ASSIST_PRESS_RECEIVE_ASSIST', label: '接辅助'},
         CTC_ASSIST_PRESS_DELIVER_ASSIST:{value: 'ASSIST_PRESS_DELIVER_ASSIST', label: '发辅助'},
         CTC_ASSIST_PRESS_BLOCK:{value: 'ASSIST_PRESS_BLOCK', label: '阻塞'},
         CTC_ASSIST_PRESS_RESTORE:{value: 'ASSIST_PRESS_RESTORE', label: '复原'},
         CTC_ASSIST_PRESS_ACCIDENT:{value: 'ASSIST_PRESS_ACCIDENT', label: '事故'},
+        CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION:{value:'ASSIST_PRESS_DOWN_TURN_DIRECTION', label:'改方'},
 
         // CTC_BATCH_MODIFY_RUN_PLAN:{value: 'CTC_BATCH_MODIFY_RUN_PLAN', label: '批量修改股道'},
         CTC_MODIFY_SECTION:{value: 'CTC_MODIFY_SECTION', label: '修改股道'},
         CTC_STATION_SEND_OUT_RUN_PLAN:{value: 'CTC_STATION_SEND_OUT_RUN_PLAN', label: '车站发送计划'},
         CTC_CANCEL_TWINKLE:{value: 'CTC_CANCEL_TWINKLE', label: '车站取消红闪'},
-
         // CTC_REMOVE_RUN_PLAN:{value: 'CTC_REMOVE_RUN_PLAN', label: '移除行车日志'},
         CTC_MODIFY_ADJACENT_STATION:{value: 'CTC_MODIFY_ADJACENT_STATION', label: '修改邻站信息'},
         CTC_MODIFY_TRIP_NUMBER:{value: 'CTC_MODIFY_TRIP_NUMBER', label: '修改车次号(大铁CTC)'},
         CTC_SEND_NOTICE:{value: 'CTC_SEND_NOTICE', label: '发送发车预告'},
         CTC_AGREE_NOTICE:{value: 'CTC_AGREE_NOTICE', label: '同意发车预告'},
+
         CTC_LOG_CANCEL_ARRIVE:{value: 'CTC_LOG_CANCEL_ARRIVE', label: '取消到达'},
         CTC_LOG_CANCEL_DEPARTURE:{value: 'CTC_LOG_CANCEL_DEPARTURE', label: '取消出发'},
         CTC_LOG_CANCEL_BLOCK:{value: 'CTC_LOG_CANCEL_BLOCK', label: '取消闭塞'},
@@ -432,10 +434,6 @@ export default {
         CTC_RELEASE_RUN_PLAN_TO_SIMULATION:{value: 'CTC_RELEASE_RUN_PLAN_TO_SIMULATION', label: '运行计划发布至CTC'},
         CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'},
 
-        CTC_ZONE_SAVE_RUN_PLAN:{value:'CTC_ZONE_SAVE_RUN_PLAN', label: '调度台添加行车计划'},
-        CTC_ZONE_DELETE_RUN_PLAN:{value:'CTC_ZONE_DELETE_RUN_PLAN', label: '调度台删除行车计划'},
-        CTC_ZONE_RELEASE_ALL_RUN_PLAN:{value:'CTC_ZONE_RELEASE_ALL_RUN_PLAN', label: '调度台发布所有行车计划'},
-        CTC_ZONE_RELEASE_STATION_RUN_PLAN:{value:'CTC_ZONE_RELEASE_STATION_RUN_PLAN', label: '调度台发布车站行车计划'},
         CTC_STATION_SIGN_RUN_PLAN:{value:'CTC_STATION_SIGN_RUN_PLAN', label: '车站签收阶段计划'},
 
         CTC_ZONE_SAVE_TRACK_SECTION:{value:'CTC_ZONE_SAVE_TRACK_SECTION', label: '调度台行车计划修改股道'},
@@ -443,6 +441,11 @@ export default {
         CTC_ZONE_SAVE_PLAN_TIME:{value:'CTC_ZONE_SAVE_PLAN_TIME', label: '调度台行车计划修改时间'},
         CTC_ZONE_SAVE_DIRECTION:{value:'CTC_ZONE_SAVE_DIRECTION', label: '调度台行车计划修改出入口'},
         CTC_ZONE_SAVE_STATION:{value:'CTC_ZONE_SAVE_STATION', label: '调度台行车计划修改到发车站'},
+        CTC_ZONE_SAVE_RUN_PLAN:{value:'CTC_ZONE_SAVE_RUN_PLAN', label: '调度台添加行车计划'},
+        CTC_ZONE_DELETE_RUN_PLAN:{value:'CTC_ZONE_DELETE_RUN_PLAN', label: '调度台删除行车计划'},
+        CTC_ZONE_RELEASE_ALL_RUN_PLAN:{value:'CTC_ZONE_RELEASE_ALL_RUN_PLAN', label: '调度台发布所有行车计划'},
+        CTC_ZONE_RELEASE_STATION_RUN_PLAN:{value:'CTC_ZONE_RELEASE_STATION_RUN_PLAN', label: '调度台发布车站行车计划'},
+
         CTC_QUERY_DISPATCH_COMMAND:{value:'CTC_QUERY_DISPATCH_COMMAND', label: '调度台命令查询'},
         CTC_SIGN_DISPATCH_COMMAND:{value:'CTC_SIGN_DISPATCH_COMMAND', label: '调度台命令发送'},
         CTC_READ_DISPATCH_COMMAND:{value:'CTC_READ_DISPATCH_COMMAND', label: '调度台命令已读'}
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index dc544d84b..c51b0f211 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -98,7 +98,9 @@ export default {
             swch: '02',
             isScriptCommand:false,
             faultMode: false,
-            speed: 1
+            speed: 1,
+            centralizedstationList: [],
+            centralizedStationMap: {}
             // firstLoad: true
         };
     },
@@ -148,6 +150,9 @@ export default {
         isAdmin() {
             return this.$store.state.user.roles.includes('04') || this.$store.state.user.roles.includes('05');
         },
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        },
         speedList() {
             return this.isAdmin ? [
                 { value: 1, label: '1倍速' },
@@ -201,6 +206,21 @@ export default {
         },
         '$store.state.socket.simulationSpeed': function (val) {
             this.speed = val;
+        },
+        '$store.state.map.map': function (map) {
+            if (map) {
+                this.setCentralizedstationList(map); // 获取集中站列表
+            }
+        },
+        '$store.state.training.simulationUserList': function(list) {
+            if (list && list.length && this.$route.query.lineCode == '16' && this.isCtc && !this.$route.query.joint) {
+                this.checkRoleInit(list);
+            }
+        },
+        '$store.state.socket.simulationRoleList':function(list) {
+            if (list && list.length && this.$route.query.lineCode == '16' && this.isCtc && !this.$route.query.joint) {
+                this.checkRoleChange(list);
+            }
         }
     },
     mounted() {
@@ -236,17 +256,33 @@ export default {
             this.$emit('changeShowMap', false);
         },
         goCtc() {
+            // const routeData = this.$router.resolve({
+            //     path:'/displayNew/demon',
+            //     query:{
+            //         lineCode:this.$route.query.lineCode,
+            //         group: this.$route.query.group,
+            //         prdType: this.$store.state.training.prdType,
+            //         mapId:this.$route.query.mapId,
+            //         project: this.project,
+            //         newApi: this.$route.query.newApi,
+            //         ctc: true,
+            //         try: this.$route.query.try,
+            //         token:getToken(),
+            //         noPreLogout: true
+            //     }
+            // });
             const routeData = this.$router.resolve({
                 path:'/displayNew/demon',
                 query:{
                     lineCode:this.$route.query.lineCode,
                     group: this.$route.query.group,
-                    prdType: this.$route.query.prdType,
+                    prdType: '01',
                     mapId:this.$route.query.mapId,
                     project: this.project,
-                    newApi: this.$route.query.newApi,
+                    newApi: false,
+                    // joint: true,
                     ctc: true,
-                    try: this.$route.query.try,
+                    try: this.$route.query.try || 0,
                     token:getToken(),
                     noPreLogout: true
                 }
@@ -269,6 +305,59 @@ export default {
         showRegisterBook() {
             this.$refs.registerBook.doShow();
         },
+        checkRoleInit(data) {
+            data.forEach(item => {
+                if ((item.admin && item.online) && item.userId == this.userId && item.type == 'STATION_SUPERVISOR') {
+                    this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
+                    this.deviceCode = item.deviceCode;
+                    this.setShowStation(item.deviceCode);
+                    this.$store.dispatch('training/setPrdType', '01');
+                }
+            });
+        },
+        checkRoleChange(data) {
+            data.forEach(item => {
+                if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && item.type == 'STATION_SUPERVISOR') {
+                    // this.userRole = item.type || 'AUDIENCE';
+                    this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
+                    this.deviceCode = item.deviceCode;
+                    // this.setShowStation(item.deviceCode);
+                    this.setShowStation(item.deviceCode);
+                    this.$store.dispatch('training/setPrdType', '01');
+                    // this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]);
+                    // this.$nextTick(() => {
+                    //     if (item.deviceCode && this.$store.state.training.prdType !== '09') { this.setCenter(item.deviceCode); }
+                    // });
+                }
+            });
+        },
+        setShowStation(stationCode) {
+            const showStation = this.centralizedStationMap[stationCode];
+            const list = [];
+            const mapDevice = this.$store.state.map.mapDevice;
+            for (const key in mapDevice) {
+                list.push(mapDevice[key]);
+            }
+            this.$jlmap.updateShowStation(list, showStation);
+            this.$nextTick(()=>{
+                this.$jlmap.setCenter(showStation);
+            });
+        },
+        setCentralizedstationList(map) {
+            this.centralizedstationList = [];
+            (map.stationList || []).forEach(item => {
+                if (item.centralized) {
+                    this.centralizedstationList.push({value: item.code, name: item.name});
+                    this.centralizedStationMap[item.code] = item.code;
+                    item.chargeStationCodeList && item.chargeStationCodeList.length && item.chargeStationCodeList.forEach(ele => {
+                        this.centralizedStationMap[ele] = item.code;
+                    });
+                }
+            });
+            // if (this.centralizedstationList.length && !this.showStation) {
+            //     this.showStation = this.centralizedstationList[0].value;
+            // }
+        },
         // goRpManage() {
         //     const routeData = this.$router.resolve({
         //         path:'/bigTrainRunplanManage',
diff --git a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
index 936eea83c..f8fbe8e02 100644
--- a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
+++ b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
@@ -155,7 +155,42 @@ export const operateEnum = {
     },
     Station:{
         code:'stationCode',
-        type:'车站'
+        type:'车站',
+        // 总辅助
+        ASSIST_PRESS_MAIN_ASSIST:{
+            isList:true,
+            params:[
+                {
+                    code:'labelEnum',
+                    name:'区间'
+                },
+                {
+                    code:'pressDown',
+                    name:'按钮',
+                    result:[
+                        {data:1, name:'按下', judge:'='},
+                        {data:0, name:'弹起', judge:'='}
+                    ]
+                }
+            ]
+        },
+        // 接辅助
+        ASSIST_PRESS_RECEIVE_ASSIST:{
+            code:'labelEnum',
+            name:'区间为'
+        },
+        // 发辅助
+        ASSIST_PRESS_DELIVER_ASSIST:{
+            code:'labelEnum',
+            name:'区间为'
+        }
+        // param:{
+        //     labelEnum:model.labelEnum,
+        //     stationCode:model.stationCode
+        // }
+        // labelEnum:model.labelEnum,
+        // stationCode:model.stationCode,
+        // pressDown:model.pressDown ? 0 : 1 // 1按下、0弹起
     },
     Driver:{
         code:'groupNumber',
@@ -239,6 +274,10 @@ export const operateEnum = {
     }
 };
 
+export const ctcOperateEnum = {
+
+};
+
 // 转换函数
 export function covertOperate(operationType, operationParamMap) {
     if (operationType == 'Set_Fault' || operationType == 'Cancel_Fault') {
@@ -268,6 +307,25 @@ export function covertOperate(operationType, operationParamMap) {
         });
         return tip;
 
+    } else if (operationType.includes('CTC')) {
+        const tip = '请打开';
+        // ctcOperateEnum
+        // 车务终端,找到
+        return tip;
+        //         总辅助按钮
+        // CTC_ASSIST_PRESS_MAIN_ASSIST
+        // labelEnum:model.labelEnum,
+        //                         stationCode:model.stationCode,
+        //                         pressDown:model.pressDown ? 0 : 1 // 1按下、0弹起
+        // CTC_ASSIST_PRESS_RECEIVE_ASSIST
+        // labelEnum;
+        // stationCode;
+        // CTC_ASSIST_PRESS_DELIVER_ASSIST
+        // CTC_ASSIST_PRESS_BLOCK
+        // CTC_ASSIST_PRESS_RESTORE
+        // CTC_ASSIST_PRESS_ACCIDENT
+        // CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION
+
     } else {
         let device = operationType.split('_')[0];
         if (device == 'CM') {
@@ -276,6 +334,9 @@ export function covertOperate(operationType, operationParamMap) {
         if (operationType == 'Train_Load_Spare_Train') {
             device = 'Section';
         }
+        if (operationType.includes('ASSIST')) {
+            device = 'Station';
+        }
         const list = ['Train_Update_Type',
             'Train_Add_Train_Trace',
             'Train_Remove_Train_Trace',

From 472985e919c82dd802d498e9eea09c2080a3dced Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 25 Jul 2022 16:47:13 +0800
Subject: [PATCH 18/37] =?UTF-8?q?=E5=A4=A7=E9=93=8102=20=E6=94=BE=E5=BC=80?=
 =?UTF-8?q?=E9=99=90=E9=80=9F=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_02_1.js     | 1143 +++++++++++++++++
 .../menus/dialog/trainSpeedLimit.vue          |    4 +-
 .../theme/datie_02/menus/menuTrain.vue        |   15 +-
 3 files changed, 1157 insertions(+), 5 deletions(-)
 create mode 100644 src/jmapNew/config/skinCode/datie_02_1.js

diff --git a/src/jmapNew/config/skinCode/datie_02_1.js b/src/jmapNew/config/skinCode/datie_02_1.js
new file mode 100644
index 000000000..33963848d
--- /dev/null
+++ b/src/jmapNew/config/skinCode/datie_02_1.js
@@ -0,0 +1,1143 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+
+class SkinCode extends defaultStyle {
+    constructor() {
+        super();
+        this.fontFamily = '宋体';
+        this[deviceType.Section] = {
+            elemnetType:['name', 'line', 'separator', 'badShunt', 'derailer'],
+            // 'speedLimit', 'speedLimitName','standTrackText','reentryTrackText','transferTrackText',
+            active: {
+                routeColor: true							// 进路触发颜色
+            },
+            name: {
+                z: 10,
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 10,								// 文字离区段距离
+                fontSize: 12, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: 'rgb(192,192,192)', 						// 字体颜色  (银白)
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle', 				// 文字垂直对齐方式
+                approachColor: '#FFFFFF'
+            },
+            logicText: {
+                z: 10,
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 12,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            // standTrackText: {
+            //     z: 10,
+            //     position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+            //     distance: 24,								// 文字离区段距离
+            //     fontSize: 11, 								// 字体大小
+            //     fontWeight: 'normal',						// 字体粗细
+            //     fontColor: '#FFFFFF', 						// 字体颜色
+            //     textAlign: 'center', 						// 水平对齐方式
+            //     textPosition: 'inside', 					// 文字位置
+            //     textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            // },
+            // reentryTrackText: {
+            //     z: 10,
+            //     position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+            //     distance: 36,								// 文字离区段距离
+            //     fontSize: 11, 								// 字体大小
+            //     fontWeight: 'normal',						// 字体粗细
+            //     fontColor: '#FFFFFF', 						// 字体颜色
+            //     textAlign: 'center', 						// 水平对齐方式
+            //     textPosition: 'inside', 					// 文字位置
+            //     textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            // },
+            // transferTrackText: {
+            //     z: 10,
+            //     position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+            //     distance: 36,								// 文字离区段距离
+            //     fontSize: 11, 								// 字体大小
+            //     fontWeight: 'normal',						// 字体粗细
+            //     fontColor: '#FFFFFF', 						// 字体颜色
+            //     textAlign: 'center', 						// 水平对齐方式
+            //     textPosition: 'inside', 					// 文字位置
+            //     textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            // },
+            destinationText: {
+                z: 10,
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 12,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'bold',							// 字体粗细
+                fontColor: 'yellow', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            line: {
+                z: 0,
+                width: 3, 									// 区段宽度
+                beyondWidth: 0, 							// 区段宽超出宽度
+                invadeColor: '#FF0000', 					// 区段侵入颜色     （红色）
+                spareColor: 'rgb(85,120,182)', 						// 区段空闲颜色  (浅蓝)
+
+                communicationOccupiedColor: '#FF0000', 		// 区段通信车占用颜色   （红色）
+                unCommunicationOccupiedColor: '#FF0000', 	// 区段非通讯车占用颜色  （红色）
+
+                routeLockColor: '#FFFFFF', 					// 区段进路锁定颜色  （白色）
+                faultLockColor: '#00FF00', 					// 区段故障锁定颜色
+
+                undefinedColor: '#0071C1', 					// 区段未定义颜色
+                blockColor: '#00FF00', 						// 区段封锁颜色
+                atcExcisionColor: '#A0522D', 				// 区段atc切除颜色
+                atsExcisionColor: '#A0522D', 				// 区段ats切除颜色
+                timeReleaseColor: '#3F3F3F', 				// 区段延时释放颜色
+
+                protectiveLockColor: '#FFFF00', 			// 区段保护锁闭
+
+                protectiveTimeReleaseColor: '#0071C1', 		// 区段保护延时解锁
+                logicalColor: '#FFFF00', 					// 逻辑区段颜色 (未用)
+                logicalTextColor: '#C0C0C0', 				// 逻辑区段名称颜色 (未用)
+                invalidColor: '#B18E38' 					// 区段ARB故障颜色
+            },
+            badShunt:{
+                z: 2,
+                distance: 2, 								// 分路不良 距离区段距离
+                width: 1, 									// 分路不良的宽度
+                lineColor: 'rgb(188,67,180)' 						// 分路不良颜色 （粉红色）
+            },
+            // speedLimit: { 									// 限速元素
+            //     z: 2,
+            //     width: 1, 									// 限速线的宽度
+            //     distance: 5, 								// 限速线距离区段距离
+            //     lineColor: '#C0C000', 						// 限速线颜色 （黄色透明光）
+            //     nameShow: true 							// 名称显示
+            // },
+            // speedLimitName: {
+            //     z: 10,
+            //     leftName: true,	// 左侧限速值是否展示
+            //     rightName: true, // 右侧限速值是否展示
+            //     nameBackgroundIsRect: false,	// 限速值背景是否为矩形
+            //     nameBackgroundBorderWidth: 0, // 限速值背景是否边框宽度
+            //     nameBackgroundBorderColor: '#000', // 限速值背景边框颜色
+            //     limitValueDistance: -15,
+            //     kilometerFontSize: 8,						// 公里标大小
+            //     kilometerColor: '#fff', 					// 公里标颜色
+            //     nameNumberFontSize: 11,						// 限速值大小
+            //     nameNumberColor: '#C00808',					// 限速值颜色
+            //     nameBackground: '#C0C000',					// 限速名称背景颜色
+            //     drogueWidth: 19,							// 浮标宽度
+            //     drogueHeight: 12							// 浮标高度
+            // },
+            separator: {
+                z: 3,										// 分割符层级
+                width: 2, 									// 物理区段分隔符宽度
+                logicWidth:2, // 逻辑区段分隔符宽度
+                endWidth: 2, 								// 尽头分隔符宽度
+                endColor: 'rgb(128,128,128)', 						// 尽头分隔符颜色
+                color: 'rgb(128,128,128)', 							// 区段边界符颜色
+                invadeSpecial:true, // 特殊侵限
+                halfHeight: 3								// 区段分隔符高度的一半
+            },
+            shuttleBack: { 										// 折返进路 (存在此对象 显示折返箭头)
+                z: 10,
+                width: 1.5,
+                color: '#FFFFFF',
+                distance: 5 									// 限速线距离区段距离
+            },
+            derailer: {
+                text: {
+                    color: 'green',
+                    offset: {
+                        x: -5,
+                        y: -15
+                    }
+                },
+                symbol: {
+                    color: 'red'
+                }
+            },
+            trainPosition:{
+                display: false // 列车实时位置显示
+            }
+        };
+
+        this[deviceType.Signal] = {
+            distance: 10,									// 设备距离区段的距离
+            colorSpecial: true,								// 特殊处理灯位颜色
+            post: {
+                standardLength: 6, // 高柱长度
+                standardHeight: 6, // 灯柱高度
+                standardColor: '#FFFFFF',					// 灯柱颜色
+                standardVerticalWidth: 2,						// 灯柱竖杆宽度
+                standardRailWidth: 2						// 灯柱横杆宽度
+            },
+            text: {
+                show: true,									// 信号机名称显示
+                distance: 3,								// 文字和灯杆的距离
+                isAlignCenter: false,						// 信号字体对其方式
+                fontSize: 11,								// 信号机名称字体大小
+                fontWeight: 'bold',							// 信号机名称字体粗细
+                defaultColor: '#FFFFFF',					// 信号灯字体默认色
+                blockColor: '#FFFFFF',						// 信号灯字体锁定颜色
+                checkColor: '#00FF00'						// 信号保护区段检查颜色
+            },
+            remainTimeColor: '#F00',
+            tText: {
+                offsetX: 0,
+                offsetY: -30,
+                fontSize: 11,								// 信号机名称字体大小
+                fontWeight: 'bold',							// 信号机名称字体粗细
+                defaultColor: '#F00',					// 信号灯字体默认色
+                defaultText: 0
+            },
+            lamp: {
+                bgShow: false, // 是否被选中
+                guidName: 'singleRY',						// 成都三号线引导类型
+                borderVariable: false,						// 信号灯边框可变
+                stopWidth: 2,								// 禁止线宽度
+                borderWidth: 2,								// 信号灯边框线宽度
+                borderColor: '#677DBB',						// 信号灯边框线颜色
+                radiusR: 6,									// 信号灯半径
+                grayColor: '#7F7F7F',						// 信号灯灰色
+                redColor: '#FF0000',						// 信号灯红色
+                greenColor: '#00FF00',						// 信号灯绿色
+                yellowColor: '#FFFF00',						// 信号灯黄色
+                whiteColor: '#FFFFFF',						// 信号灯白色
+                blueColor: '#0070C0',						// 信号灯蓝色
+                faultType: 'light',							// 信号机故障类型 （light闪）
+                special:true // 大铁类型信号机
+            },
+            route: {
+                direction: true,							// 自动通过方向
+                offset: { x: 4, y: 0},						// 自动通过偏移量
+                routeColor: '#00FF00',						// 自动进路
+                radiusR: 6
+            },
+            auto: {
+                signalFrontTriangle: true,					// 信号灯前三角展示
+                fleetModeTriangle: true,					// 自动进路显示三角形非箭头
+                direction: false,							// 自动通过方向
+                offset: { x: -4, y: 0},						// 自动通过偏移量
+                width: 5,									// 自动宽度
+                manualControl: '#FFFF00',					// 人工控制
+                autoRoute: '#00FF00',						// 自动进路
+                autoTrigger: '#FFFF00',						// 自动触发
+                outConflict: '#C00808'						// 出车冲突
+            },
+            delay: {
+                direction: false,							// 延时解锁方向
+                offset: { x: -5, y: 0},						// 延时解锁偏移量
+                fontSize: 11,								// 延迟解锁字体大小
+                fontColor: '#C00808',						// 延迟解锁颜色
+                fontWeight: 'bold'							// 字体粗细
+
+            },
+            button: {
+                distance: 5,								// 信号灯按钮距离区段的距离
+                borderDashColor: '#FFFFFF',					// 信号灯按钮边线
+                buttonColor: 'darkgreen',					// 信号灯按钮颜色
+                buttonLightenColor: '#E4EF50'				// 信号灯按钮闪烁颜色
+            },
+            lowButton:{
+                display: false // 现地 信号机按钮
+            },
+            sigBack: {
+                fillColor:'rgba(0,0,0,0)', // 信号背景颜色
+                strokecolor:'#F00', // 信号描边颜色
+                lineWidth: 1,	// 信号背景描边宽度
+                distanceX: 2, // 信号背景x偏移距离
+                distanceY: 1 // 信号背景Y偏移距离
+            }
+        };
+
+        // 供电线路
+        this[deviceType.Power] = {
+            noElectricStrokeColor:'#808080', // 无电颜色
+            defaultStrokeColor: '#F00',								// 线条颜色
+            extendLength: 10									// 延伸长度
+        };
+
+        // 延续保护计时
+        this[deviceType.OverAp] = {
+            show: false
+        };
+
+        // 屏蔽门
+        this[deviceType.Psd] = {
+            // 成都三号线屏蔽门
+            elemnetType:['safetyDoorNormal'],
+            safetyDoorNormal: { 							// 屏蔽门
+                z:0,
+                height: 3, 									// 站台屏蔽门高度
+                distance: 8, 								// 站台和屏蔽门之间的距离
+                defaultColor: '#00FF00', 					// 屏蔽门默认颜色
+                splitDoorColor: '#C00808' 					// 屏蔽门切除颜色
+            }
+        };
+
+        this[deviceType.StationStand] = {
+            // 站台元素 站台
+            elemnetType:['lineStand'],
+            // 站台
+            lineStand:{
+                // 层级
+                z:0,
+                spareColor: '#02cc3d', 								// 站台空闲颜色
+                lineWidth:2 // 线宽
+                // jumpStopColor: '#808080', 						// 站台跳停颜色
+                // designatedJumpStopColor: '#808080', 			// 站台指定列车跳停颜色
+                // headFontSize: 10, 									// 站台首端字体大小
+                // stopColor: '#FFF000'								// 站台列车停站颜色
+            },
+            common: { 										// 通用属性
+                textFontSize: 10, 							// 站台默认字体大小
+                functionButtonShow: '03'					// 功能灯按钮显示条件（prdType）
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                lampColor: '#5A5D5A' // 功能按钮颜色
+            },
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            }
+            // reentry: {},									// 站台折返策略
+            // trainStop: {}, 									// 停车标志
+            // trainDepart: {}, 								// 停车计时
+        };
+
+        this[deviceType.StationCounter] = {
+            text: {
+                distance: 2,							 	// 计数器名称和文字的距离
+                fontColor: '#FFFFFF',		 			 	// 计数器字体颜色
+                borderColor: '#E4EF50'	 				 	// 计数器边框颜色
+            }
+        };
+
+        this[deviceType.StationDelayUnlock] = {
+            text: {
+                distance: 3,								// 延迟解锁和设备之间的距离
+                fontColor: '#FFFFFF',						// 延时解锁字体颜色
+                borderColor: '#FFFFFF'						// 延迟解锁边框颜色
+            }
+        };
+
+        this[deviceType.StationTurnBack] = {					// 站后折返
+            displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            lamp: {
+                fill: '#f1f1f1', // 填充色
+                radiusR: 7									// 控制灯大小
+            },
+            text: {
+                titleTextShow: false,
+                fontWeight: 580,
+                fontSize: 10,
+                distance: 10
+            },
+            rect: {
+                fill: 'rgba(0,0,0,0)',
+                stroke: '#fff',
+                lineWidth: 0,
+                padding: 6
+            }
+        };
+
+        this[deviceType.Station] = {
+            // 成都三号线车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
+            kmPostShow: false,										// 公里标显示
+            kilometerPosition: 'up',							// 公里标朝向
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#FFFF00',					// 控制灯颜色
+                guideColor: '#5A5D5A' // 引导总锁灯颜色
+            },
+            turnBack: { // 按图折返
+                lamp: 1, // 灯数量
+                lampSpace: 60 // 灯间距
+            },
+            StationControl:{
+                text: {
+                    distance: 2,								// 灯和文字之间的距离
+                    fontSize: 11,								// 字体大小
+                    fontFormat: 'consolas',						// 字体格式
+                    fontColor: '#ffffff',						// 字体颜色
+                    fontWeight: 'normal',						// 字体粗细
+                    textAlign: 'middle',						// 字体水平对齐
+                    textVerticalAlign: 'top'					// 字体垂直对齐
+                },
+                lamp: {
+                    count: 4,									// 控制模式的个数
+                    offset: {x: 0, y: 0},						// 偏移量
+                    radiusR: 6,									// 控制模式灯的半径
+                    distance: 46,								// 控制模式之间灯之间的距离
+                    grayColor: '#7F7F7F',						// 控制模式灰色
+                    greenColor: '#00FF00',						// 控制模式绿色
+                    redColor: '#FF0000',						// 控制模式红色
+                    yellowColor: '#FFFF00',						// 控制模式黄色
+                    purpleColor:'#840084', // 控制模式紫色
+                    strokeColor: '#fff',
+                    lineWidth: 1
+                },
+                emergencyControl: {									// 紧急站控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                veryControl: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    lightColor: '#f00',
+                    defaultColor: '#7F7F7F',
+                    text: '非常站控'
+                },
+                selfDiscipline: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '允许自律',
+                    defaultColor: '#7F7F7F',
+                    lightColor: '#ff0'
+                },
+                selfDisciplineControl: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    lightColor: '#0f0',
+                    defaultColor: '#7F7F7F',
+                    text: '自律控制'
+                },
+                veryControlButton: {
+                    offset: { x: 0, y: 0 },
+                    text: '非常站控',
+                    lightColor: '#ff0',
+                    defaultColor: '#ccc'
+                },
+                selfDisciplineThree: {
+                    offset: { x: 0, y: 0 },
+                    text: '分散自律',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                graphRoad: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '按图排路',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                planControl: {
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '计划控制',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                centerCommunication: {
+                    show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '中心通信',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                selfDisciplineCommunication: {
+                    show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '自律机通信',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                allowedTurnBack: {
+                    show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '允许转回',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                },
+                trainControl: {
+                    show: true,
+                    offset: { x: 0, y: 30 },
+                    text: '列控',
+                    lightColor: '#0f0',
+                    defaultColor: '#ccc'
+                }
+            }
+        };
+
+        this[deviceType.Switch] = {
+            text: {
+                show: true,									// 道岔名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                offset: {x: 5, y: -10},						// 道岔名称与区段距离
+                fontSize: 11,								// 字体大小
+                fontColor: '#fff',							// 道岔名称颜色
+                fontWeight: 'normal',						// 字体粗细
+                borderColor: '#FE0000',						// 道岔边框颜色
+                lossColor: '#C00808',						// 道岔失去颜色
+                locateColor: '#00FF00',						// 道岔定位颜色
+                inversionColor: '#FFFF00',					// 道岔反位颜色
+                monolockLocationColor: '#00FF00',			// 道岔单锁'定位'颜色 (绿色)
+                monolockInversionColor: '#FFFF00',			// 道岔单锁'反位'颜色 (黄色)
+                faultFlashing: false						// 故障闪烁
+            },
+            sectionAction: {
+                flag: false, // 道岔 关联区段显示
+                spareColor: '#5b5b5b' // 区段显示颜色
+            },
+            core: {
+                length: 6,									// 道岔单边长度
+                graphShow: true, 							// 图形显示
+                graphInversionColor: '#FFFF00',				// 反位颜色
+                graphLocalColor: '#00FF00'					// 定位颜色
+            },
+            jointImg: {										// 道岔 A B C D四元素属性配置
+                trapezoidLength: 8,							// 直角梯形元素默认长度
+                faultStatus: true,							// 挤岔表示
+                fork: true,									// 挤岔专用（如有挤岔操作 变为true）
+                forKColor: 'red'							// 挤岔颜色 配合挤岔专用
+            },
+            // arcBlcok: {										// 圆形封锁图形
+            //     show: false,									// 显示
+            //     arcBorderColor: 'green',					// 默认边框颜色
+            //     locationColor: 'green',						// 定位封锁颜色
+            //     inversionColor: '#FFFF00'					// 反位封锁颜色
+            // },
+            rectLock: {										// 矩形封锁框图形
+                rectWidth: 18, 								// 矩形框 宽高
+                rectBorderColor: '#fff',					// 矩形边框颜色
+                block: true,								// 封锁显示
+                blockColor: 'red',							// 封锁颜色
+                followName: true							// 位置跟随名称确定
+            },
+            arcBlcok: {										// 圆形封锁图形
+                show: true,									// 显示
+                shapeR: 10,
+                arcBorderColor: 'red',						// 默认边框颜色
+                locationColor: 'red',						// 定位封锁颜色
+                inversionColor: 'red'					// 反位封锁颜色
+            }
+        };
+
+        this[deviceType.LcControl] = {
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#FFFF00'						// 控制灯颜色
+            }
+        };
+        this[deviceType.PowerSupply] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00',					// 控制灯颜色
+                offColor: '#000',
+                strokeColor: '#fff'
+            }
+        };
+        this[deviceType.Maintain] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00'						// 控制灯颜色
+            }
+        };
+        this[deviceType.NoOneReturn] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#FFFFFF'
+            }
+        };
+        this[deviceType.AtsControl] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00',					// 控制灯颜色
+                offColor: '#FF0000'
+            }
+        };
+        this[deviceType.MaintenanceLamps] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3'						// 控制灯颜色
+            }
+        };
+        this[deviceType.ZcCommunication] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00'						// 控制灯颜色
+            }
+        };
+        this[deviceType.ChainControl] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00',					// 控制灯颜色
+                offColor: '#ff0000'
+            }
+        };
+        this[deviceType.IntersiteControl] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00'						// 控制灯颜色
+            }
+        };
+        this[deviceType.CenterCommunication] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00'						// 控制灯颜色
+            }
+        };
+        this[deviceType.LeuControl] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00'						// 控制灯颜色
+            }
+        };
+        this[deviceType.LocalControl] = {
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00',					// 控制灯颜色
+                offColor: '#ff0000'
+            }
+        };
+        this[deviceType.ZcControl] = {
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00'						// 控制灯颜色
+            }
+        };
+
+        this[deviceType.LimitControl] = {
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#ECE9D8'						// 控制灯颜色
+            }
+        };
+
+        this[deviceType.Line] = {
+            lineColor: '#FFFFFF'							// 线条颜色
+        };
+        this[deviceType.Automactic] = {
+            // 是否显示
+            visible: true,
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            subtitleText: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 17 // 等于副标题距离
+            },
+            lamp: {
+                lineDash: null, // 灯的包围框
+                stroke: '#FFFFFF', // 框的颜色
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3',					// 控制灯颜色 (灰色)
+                lightColor: '#FFFF00' // 控制灯亮颜色
+            }
+        };
+        this[deviceType.AutomaticRoute] = {
+            // 是否显示
+            displayCondition: '03', // 显示条件prdType 为01
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3',					// 控制灯颜色 (灰色)
+                lightColor: '#FFFF00' // 控制灯亮颜色
+            }
+        };
+        this[deviceType.AutoTurnBack] = {
+            // 是否显示
+            visibleConditions: '03',
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            subtitleText: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 17 // 等于副标题距离
+            },
+            lamp: {
+                borderShow: false, // 是否显示边框
+                lineDash: null, // 灯的包围框
+                stroke: '#FFFFFF', // 框的颜色
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3',					// 控制灯颜色 (灰色)
+                lightUpColor: '#ffff00'						// 点亮灯颜色
+            },
+            OutFrame: {
+
+            }
+        };
+
+        /** 引导总锁 */
+        this[deviceType.GuideLock] = {
+            // 是否显示
+            displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3',					// 控制灯颜色 (灰色)
+                lightUpColor: '#FF0000'						// 点亮灯颜色
+            }
+        };
+
+        this[deviceType.TrainWindow] = {
+            lineColor: '#4DD43F',							// 车次窗颜色
+            lineDash: null,									// 车次窗虚线间隔
+            lineWidth: 1,									// 车次窗线宽
+            trainWindowSmooth: 0,							// 车次窗矩形圆滑程度
+            show: true											// 车次窗是否显示
+        };
+        this[deviceType.SplitStation] = {
+            lineLength: 15,	// 箭头线长度
+            lineWidth: 2, // 线宽
+            height: 35, // 分隔整体高度
+            strokeColor: '#00FF00', // 线颜色
+            triangleFillColor: '#00FF00', // 三角填充颜色
+            textFill: '#FFFFFF', // 文字颜色
+            verticalDistance: 10, // 箭头三角垂直高度
+            horizontalDistance: 7// 箭头三角水平高度
+        };
+        this[deviceType.Train] = {
+            trainBody: {
+                fontFamily: 'consolas',
+                trainBodyLineWidth: 1, // 车身line宽
+                changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
+                specialTrainType: [
+                    {
+                        type: '03',
+                        serviceNumber: '---',
+                        // nameFormat: 'groupNumber:serviceNumber'
+                        nameFormat:'tripNumber'
+                    },
+                    {
+                        type: '03',
+                        // nameFormat: 'serviceNumber:trainNumber'
+                        nameFormat:'tripNumber'
+                    }
+                ], // 特殊列车类型需设置显示格式
+                lrPadding: 4, // 两边间隔
+                upPadding: 4, // 上边距离
+                trainBodyFillColor: '#88DF8E', // 列车车身填充颜色
+                trainSidelineColor: '#F00',
+                trainSidelineStopColor: '#000',
+                // trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
+                trainNameFormat:'tripNumber'
+            },
+            directionArrow: {
+            },
+            soonerOrLater: {
+                level: 3,
+                trainBody: true,
+                earlyColor: '#00FF00',
+                lateColor: '#800000',
+                normalColor: '#F00'
+            },
+            hsda: {
+                lrPaddingHSDA: 3, // HSDA两边间隔
+                upPaddingHSDA: 4, // HSDA上边距离
+                trainHSDATextFontSize: 9, // 列车HDSA字号
+                textHContent: '扣', // textH文本
+                textSContent: '跳', // textS文本
+                textDContent: '门', // textD文本
+                textAContent: '警' // textA文本
+            },
+            trainNumber: {
+                targetCodePrefix: '000', // 目的地码前缀
+                defaultTargetCode: 'DDD', // 默认目的地码
+                fontColor: '#F00',
+                trainTargetTextAlign: 'left', // 目的地码文字显示位置
+                trainNumberOffset: { x: 24, y: 4}// 目的地码偏移量
+            },
+            trainServer: {
+                serviceNumberPrefix: '000', // 服务号(表号)前缀
+                defaultServiceNumber: 'TTT', // 默认服务号（表号）
+                defaultServerNoColor: '#F00', //  默认服务号状态显示颜色
+                fontColor: '#F00',
+                trainServerOffset: { x: 4, y: 4} // 列车服务号偏移
+            },
+            trainTarget: {
+                tripNumberPrefix: '', // 车次号前缀
+                // defaultTripNumber: 'DDD', // 默认车次号2
+                defaultTripNumber: '    ', // 默认车次号
+                trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
+                trainTargetTextAlign: 'right' // 车次号文字显示位置
+            },
+            trainTargetNumber: {
+                groupNumberPrefix: '000', // 车组号前缀
+                defaultGroupNumber: 'EEE', // 默认车组号
+                trainTargetNumberOffset: {x: -4, y: 4}// 车组号偏移量
+            },
+            trainHead: {
+                trainConntWidth: 10, // 列车竖杠的宽度
+                trainHeadFillColor: '#189B4D', // 列车车头矩形填充颜色
+                trainHeadRectNoChange: true, // 列车车头矩形填充颜色不变
+                trainHeadRectHeight: 20, // 列车车头矩形高度
+                directionStopType:'specialAll', // special 西安二号线 停车 列车方向图标不消失  normal 正常
+                trainHeadHeight: 'trainBox', // 列车车头高度取决于trainBox高度
+                trainHeadArrowWidth: 15, // 列车车头三角宽度
+                trainHeadArrowOffsetX: 0, // 列车车头三角偏移
+                trainHeadRectOffsetX: 10
+            },
+            common: {
+                trainHeight: 20, // 列车高度
+                trainHeadDistance: 2, // 列车和车头之间的间距
+                trainWidth: 48, // 列车长度
+                trainTextFontSize: 12, // 列车字号
+                fontFamily: 'consolas', // 默认字体 族类
+                haveTextHSDA: false, // 是否需创建textHSDA对象
+                haveArrowText: true, // 是否需创建arrowText对象
+                textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+                trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+                trainTip:true // 鼠标悬停列车状态信息框是否显示
+            },
+            trainStatusStyle: {
+                trainTypeStatus: [
+                    {type: '03', serviceNumberColor: '#FFF000', groupNumberColor: '#FFF000'},
+                    {type: '02', trainNumberColor: '#FFF000', groupNumberColor: '#FFF000'}
+                ], // 列车类型对应的识别号样式
+                defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
+                destinationStatusSetText: 'trainWindowBorder', // 目的地状态设置的对应哪个颜色
+                destinationStatus: [
+                    {status: '01', showColor: '#FFFFFF'},
+                    {status: '02', showColor: '#00FF00'},
+                    {status: '03', showColor: '#A0522D'}
+                ], // 目的地状态 01准点 02早点 03晚点 04头码车
+                serverNoType: [
+                    {type: '01', showColor: '#FFFFFF'},
+                    {type: '02', showColor: '#FFF000'}
+                ], // 服务号状态类型 01显示服务号 计划车 02显示车组号: 头码车与人工车
+                directionType: [
+                    {
+                        type: 1,
+                        lineLShow: false,
+                        lineRShow: false,
+                        arrowLShow: false,
+                        arrowRShow: true
+                    },
+                    {
+                        type: 0,
+                        lineLShow: false,
+                        lineRShow: false,
+                        arrowLShow: true,
+                        arrowRShow: false
+                    }
+                ], // 列车运行方向状态类型对应车头显示状态  1从左往右 0从右往左
+                directionStopType: [
+                    {
+                        type: 1,
+                        lineLShow: true,
+                        arrowLShow: false,
+                        lineRShow: false,
+                        arrowRShow: true
+                    },
+                    {
+                        type: 0,
+                        lineLShow: false,
+                        arrowLShow: true,
+                        lineRShow: true,
+                        arrowRShow: false
+                    }
+                ], // 列车停止方向类型对应车头显示状态   1从左往右 0从右往左
+                driveModeStatus: [
+                    {
+                        status: 'AM',
+                        trainLColor: '#FF8000',
+                        trainRColor: '#FF8000'
+                    },
+                    {
+                        status: 'CM',
+                        trainLColor: '#FFFF00',
+                        trainRColor: '#FFFF00'
+                    },
+                    {
+                        status: 'RM',
+                        trainLColor: '#fff',
+                        trainRColor: '#fff'
+                    },
+                    {
+                        status: 'NRM',
+                        trainLColor: '#FF0000',
+                        trainRColor: '#FF0000'
+                    }
+                ], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM  ATP监控下的人工驾驶模式CM  限制人工驾驶模式RM 非限制人工驾驶模式NRM
+                communicationStatus: [
+                    {status: 'CBTC', trainColor: '#000099'},
+                    {status: 'ITC', trainColor: '#747474'},
+                    {status: 'IL', trainColor: '#747474'}
+                ] // 设置通信状态  cbtc级别CBTC  点式通信ITC 联锁级IL
+            }
+        };
+        this[deviceType.FloodGate] = {};
+        this[deviceType.DirectionRod] = {};
+        this[deviceType.IndicatorLight] = {
+            displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            indicator:{
+                radiusR:6,
+                offset:{ x:0, y:20},
+                color:'red'
+            },
+            text:{
+                fontWeight:'normal',
+                fontSize:12,
+                fontFamily:'宋体'
+            }
+        };
+        this[deviceType.DepartArrow] = {
+            triangleLength: 15,
+            lineWidth: 8,
+            length: 35,
+            distance: 15,
+            fill: '#000',
+            stroke: '#fff',
+            fontSize: 11,
+            defaultText: '发车',
+            defaultColor: '#ccc',
+            occupiedColor:'#f00',
+            noOccupiedColor:'#00ff00',
+            blockStatusColor:'#00ff00',
+            noBlockStatusColor:'#ffff00'
+        };
+        this[deviceType.PickArrow] = {
+            triangleLength: 15,
+            lineWidth: 8,
+            length: 35,
+            distance: 15,
+            fill: '#000',
+            stroke: '#fff',
+            fontSize: 11,
+            defaultText: '接车',
+            defaultColor: '#ccc',
+            occupiedColor:'#f00',
+            noOccupiedColor:'#ffff00',
+            blockStatusColor:'#00ff00',
+            noBlockStatusColor:'#ffff00'
+        };
+        this[deviceType.Occlusion] = {
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#ccc'						// 控制灯颜色
+            }
+        };
+        this[deviceType.Accident] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.Recovery] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.PickAssist] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.DepartAssist] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.TotalAssist] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc'
+            }
+        };
+        this[deviceType.AssistStatus] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc',
+                occupiedColor:'#ffffff'
+            }
+        };
+        this[deviceType.SectionOccupied] = {
+            text: {
+                fontSize: 11,
+                fontWeight: 'normal',
+                distance: 5
+            },
+            lamp: {
+                radiusR: 6,
+                controlColor: '#ccc',
+                occupiedColor:'#ff0000'
+            }
+        };
+    }
+}
+
+export default new SkinCode();
diff --git a/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue b/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue
index 6f6b7615d..87c8e1062 100644
--- a/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue
+++ b/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue
@@ -15,7 +15,7 @@
       <div style="width: 96%;">
         <el-form-item label="限速值:" label-width="95px" prop="speedLimit">
           <div style="display: flex;align-items: center;">
-            <el-input v-model="addModel.speedLimit" style="width: 130px;margin-right: 10px;" size="small" />
+            <el-input v-model="addModel.speedLimit" style="width: 115px;margin-right: 10px;" size="small" />
             <span>km/h</span>
             <el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，-1为取消限速" placement="top-start">
               <i class="el-icon-warning" />
@@ -135,7 +135,7 @@ export default {
                     };
                     commitTrainSend(group, param).then(({valid, operate})=>{
                         this.doClose();
-                    }).catch((error) => {
+                    }).catch(() => {
                         this.$refs.noticeInfo.doShow();
                         this.doClose();
                     });
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index 175177c97..3f3dc57dc 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -9,6 +9,7 @@
     <train-delete-number ref="trainDeleteNumber" />
     <train-detail-info ref="trainDetailInfo" />
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
+    <speed-limit ref="speedLimit" pop-class="chengdou-03__systerm" />
     <!-- <train-set-plan ref="trainSetPlan" /> -->
     <update-trip ref="updateTrip" />
   </div>
@@ -33,6 +34,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
+import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 
 export default {
     name: 'MenuTrain',
@@ -46,7 +48,8 @@ export default {
         TrainDeleteNumber,
         TrainDetailInfo,
         SetFault,
-        UpdateTrip
+        UpdateTrip,
+        SpeedLimit
         // TrainSetPlan
     },
     mixins: [
@@ -190,6 +193,10 @@ export default {
                     label: '越红灯行驶',
                     handler: this.handleOverEedLight
                 },
+                {
+                    label: '限速指令',
+                    handler: this.handleSpeedLimit
+                },
                 // {
                 // 	label: '驾驶至',
                 // 	handler: this.handleDriveTo
@@ -312,6 +319,9 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
+        handleSpeedLimit() { // 限速指令
+            this.$refs.speedLimit.doShow(this.selected);
+        },
         // 限速行驶
         limitSpeed() {
             const operate = {
@@ -597,8 +607,7 @@ export default {
         },
         removeTripNumber() {
             commitOperate(menuOperate.Train.removeTrip, {groupNumber:this.selected.groupNumber}, 3).then(({valid, operate})=>{
-                if (valid) {
-                }
+                // if (valid) {}
             }).catch((error)=> {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();

From 5067f0132f8cf8bf0ea4c61513623ca146eed3f6 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 Jul 2022 17:49:38 +0800
Subject: [PATCH 19/37] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=89=A7=E6=9C=AC?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=20=E7=AB=99=E9=95=BF=E3=80=81=E5=8A=A9?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E4=BF=A1=E5=8F=B7=E5=91=98=E3=80=81=E5=AE=A2?=
 =?UTF-8?q?=E8=BF=90=E5=91=98=E3=80=81=E6=89=B3=E9=81=93=E5=91=98=20?=
 =?UTF-8?q?=E3=80=81=E5=BC=95=E5=AF=BC=E5=91=98=E3=80=81=E5=B7=A5=E5=8A=A1?=
 =?UTF-8?q?=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/ConstDic.js                       |  9 +-
 src/views/newMap/chatView/chatBox.vue         | 87 +++++++++++++++++-
 .../scriptPreview/scriptButtonGroup.vue       | 61 ++++++++++++-
 src/views/newMap/displayNew/utils.js          | 22 ++++-
 .../memberManage/addMember.vue                |  9 +-
 .../memberManage/membersManage.vue            | 88 ++++++++++++++++++-
 src/views/scriptManage/addScriptMember.vue    |  9 +-
 src/views/scriptManage/tipScriptRecord.vue    | 42 +++++++++
 8 files changed, 319 insertions(+), 8 deletions(-)

diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index fe00447b5..6b5bd6397 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -168,7 +168,14 @@ export const SimulationType = {
     STATION_SUPERVISOR: '车站值班员',
     DRIVER: '司机',
     MAINTAINER: '通号',
-    STATION_ASSISTANT: '车站助理'
+    STATION_ASSISTANT: '车站助理',
+    STATION_MASTER:'车站站长',
+    STATION_SIGNALER:'车站信号员',
+    STATION_PASSENGER:'车站客运员',
+    STATION_SWITCH_MAN:'车站扳道员',
+    STATION_FACILITATOR:'车站引导员',
+    STATION_WORKER:'车站工务工'
+
 };
 export const UrlConfig = {
     displayNew: '/displayNew',
diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index e29d9a675..18cb42167 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -388,6 +388,13 @@ export default {
                 const maintainerList = {};
                 const parentDepartmentList = {};
                 const parkingLotSignalBuilding = {};
+                const stationAssistant = [];
+                const stationMaster = {};
+                const stationSignaler = {};
+                const stationPassenger = {};
+                const stationSwitchMan = {};
+                const stationFacilitator = {};
+                const stationWorker = {};
                 val.forEach(item => {
                     const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
                     this.memberData[item.id]['active'] = false;
@@ -436,6 +443,41 @@ export default {
                         this.memberData[item.id].labelName = '停车场信号楼' + (item.name || '');
                         parkingLotSignalBuilding[item.id] = this.memberData[item.id];
                         break;
+                    case 'STATION_ASSISTANT':
+                        this.memberData[item.id].label = '车站助理' + (item.name || '');
+                        this.memberData[item.id].labelName = '车站助理' + (item.name || '');
+                        stationAssistant[item.id] = this.memberData[item.id];
+                        break;
+                    case 'STATION_MASTER':
+                        this.memberData[item.id].label = '车站站长' + (item.name || '');
+                        this.memberData[item.id].labelName = '车站站长' + (item.name || '');
+                        stationMaster[item.id] = this.memberData[item.id];
+                        break;
+                    case 'STATION_SIGNALER':
+                        this.memberData[item.id].label = '车站信号员' + (item.name || '');
+                        this.memberData[item.id].labelName = '车站信号员' + (item.name || '');
+                        stationSignaler[item.id] = this.memberData[item.id];
+                        break;
+                    case 'STATION_PASSENGER':
+                        this.memberData[item.id].label = '车站客运员' + (item.name || '');
+                        this.memberData[item.id].labelName = '车站客运员' + (item.name || '');
+                        stationPassenger[item.id] = this.memberData[item.id];
+                        break;
+                    case 'STATION_SWITCH_MAN':
+                        this.memberData[item.id].label = '车站扳道员' + (item.name || '');
+                        this.memberData[item.id].labelName = '车站扳道员' + (item.name || '');
+                        stationSwitchMan[item.id] = this.memberData[item.id];
+                        break;
+                    case 'STATION_FACILITATOR':
+                        this.memberData[item.id].label = '车站引导员' + (item.name || '');
+                        this.memberData[item.id].labelName = '车站引导员' + (item.name || '');
+                        stationFacilitator[item.id] = this.memberData[item.id];
+                        break;
+                    case 'STATION_WORKER':
+                        this.memberData[item.id].label = '车站工务工' + (item.name || '');
+                        this.memberData[item.id].labelName = '车站工务工' + (item.name || '');
+                        stationWorker[item.id] = this.memberData[item.id];
+                        break;
                     }
                 });
                 // { label: '全部集中站', value: 'allConcentrateStation', active: false, sign: 'DEVICE_STATION' },
@@ -483,7 +525,50 @@ export default {
                     id: 'parkingLotSignalBuilding',
                     type: 'role',
                     children: parkingLotSignalBuilding
-                }];
+                },
+                {
+                    label: '车站助理',
+                    id: 'stationAssistant',
+                    type: 'role',
+                    children: stationAssistant
+                },
+                {
+                    label: '车站站长',
+                    id: 'stationMaster',
+                    type: 'role',
+                    children: stationMaster
+                },
+                {
+                    label: '车站信号员',
+                    id: 'stationSignaler',
+                    type: 'role',
+                    children: stationSignaler
+                },
+                {
+                    label: '车站客运员',
+                    id: 'stationPassenger',
+                    type: 'role',
+                    children: stationPassenger
+                },
+                {
+                    label: '车站扳道员',
+                    id: 'stationSwitchMan',
+                    type: 'role',
+                    children: stationSwitchMan
+                },
+                {
+                    label: '车站引导员',
+                    id: 'stationFacilitator',
+                    type: 'role',
+                    children: stationFacilitator
+                },
+                {
+                    label: '车站工务工',
+                    id: 'stationWorker',
+                    type: 'role',
+                    children: stationWorker
+                }
+                ];
                 this.initCommonMemberList();
                 this.filterNode();
                 // this.$nextTick(() => {
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
index 719b7ec96..feadde3fd 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
@@ -258,7 +258,66 @@ export default {
                         id: 'parkingLotSignalBuilding',
                         type: 'role',
                         children: result.deviceListData[7]
-                    }];
+                    },
+                    {
+                        label: '车站助理',
+                        id: 'stationAssistant',
+                        type: 'role',
+                        children: result.deviceListData[8]
+                    },
+                    {
+                        label: '车站站长',
+                        id: 'stationMaster',
+                        type: 'role',
+                        children: result.deviceListData[9]
+                    },
+                    {
+                        label: '车站信号员',
+                        id: 'stationSignaler',
+                        type: 'role',
+                        children: result.deviceListData[10]
+                    },
+                    {
+                        label: '车站客运员',
+                        id: 'stationPassenger',
+                        type: 'role',
+                        children: result.deviceListData[11]
+                    },
+                    {
+                        label: '车站扳道员',
+                        id: 'stationSwitchMan',
+                        type: 'role',
+                        children: result.deviceListData[12]
+                    },
+                    {
+                        label: '车站扳道员',
+                        id: 'stationFacilitator',
+                        type: 'role',
+                        children: result.deviceListData[13]
+                    },
+                    {
+                        label: '车站工务工',
+                        id: 'stationWorker',
+                        type: 'role',
+                        children: result.deviceListData[14]
+                    }
+                    ];
+                    /**
+         * 车站助理
+         */
+                    // STATION_ASSISTANT,
+                    // STATION_MASTER:'车站站长',
+                    // STATION_SIGNALER:'车站信号员',
+                    // STATION_PASSENGER:'车站客运员',
+                    // STATION_SWITCH_MAN:'车站扳道员',
+                    // STATION_FACILITATOR:'车站引导员',
+                    // STATION_WORKER:'车站工务工'
+                    // stationMaster
+                    // stationSignaler
+                    // stationPassenger
+                    // stationSwitchMan
+                    // stationFacilitator
+                    // stationWorker
                     const lastMemberList = result.lastMemberList;
                     this.$emit('setTreeData', treeData);
                     this.$emit('setMemberData', lastMemberList);
diff --git a/src/views/newMap/displayNew/utils.js b/src/views/newMap/displayNew/utils.js
index 6b99aee0b..94fb2fe74 100644
--- a/src/views/newMap/displayNew/utils.js
+++ b/src/views/newMap/displayNew/utils.js
@@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) {
     lastData = JSON.parse(lastData);
     const lastMemberList = [];
     // const electricDispatcherList = [];
-    const deviceListData = [[], [], [], [], [], [], [], []];
+    const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
     const driverList = [];
     lastData.forEach((member, index)=>{
         if (member.userId && member.userId == store.state.user.id) {
@@ -37,7 +37,25 @@ export function covertMemberData (activeTrainList, resp) {
             member.label = member.type + name + userName;
             member.normalName = member.type + name;
         }
-        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼'];
+        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工'];
+
+        /**
+         * 车站助理
+         */
+        // STATION_ASSISTANT,
+        // STATION_MASTER:'车站站长',
+        // STATION_SIGNALER:'车站信号员',
+        // STATION_PASSENGER:'车站客运员',
+        // STATION_SWITCH_MAN:'车站扳道员',
+        // STATION_FACILITATOR:'车站引导员',
+        // STATION_WORKER:'车站工务工'
+        // stationMaster
+        // stationSignaler
+        // stationPassenger
+        // stationSwitchMan
+        // stationFacilitator
+        // stationWorker
+
         const deviceTypeIndex = deviceType.indexOf(member.type);
         if (deviceTypeIndex >= 0) {
             if (deviceTypeIndex == 3) {
diff --git a/src/views/newMap/jointTrainingNew/memberManage/addMember.vue b/src/views/newMap/jointTrainingNew/memberManage/addMember.vue
index 2ba8055b7..8cd7f06c2 100644
--- a/src/views/newMap/jointTrainingNew/memberManage/addMember.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/addMember.vue
@@ -70,7 +70,14 @@ export default {
             typeList: [
                 {label: '行调', value: 'DISPATCHER'},
                 {label: '通号', value: 'MAINTAINER'},
-                {label: '车站值班员', value: 'STATION_SUPERVISOR'}
+                {label: '车站值班员', value: 'STATION_SUPERVISOR'},
+                {label: '车站助理', value: 'STATION_ASSISTANT'},
+                {label: '车站站长', value: 'STATION_MASTER'},
+                {label: '车站信号员', value: 'STATION_SIGNALER'},
+                {label: '车站客运员', value: 'STATION_PASSENGER'},
+                {label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
+                {label: '车站引导员', value: 'STATION_FACILITATOR'},
+                {label: '车站工务工', value: 'STATION_WORKER'}
             ]
         };
     },
diff --git a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
index 73ad6d93d..8ba2c8b59 100644
--- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
@@ -120,7 +120,32 @@ export default {
             }, {
                 labelName: '车站助理',
                 children: []
-            }]
+            },
+            {
+                labelName: '车站站长',
+                children: []
+            },
+            {
+                labelName: '车站信号员',
+                children: []
+            },
+            {
+                labelName: '车站客运员',
+                children: []
+            },
+            {
+                labelName: '车站扳道员',
+                children: []
+            },
+            {
+                labelName: '车站引导员',
+                children: []
+            },
+            {
+                labelName: '车站工务工',
+                children: []
+            }
+            ]
         };
     },
     computed: {
@@ -155,6 +180,12 @@ export default {
                 const maintainerList = [];
                 const ctcOperatorList = [];
                 const stationAssistantList = [];
+                const stationMasterList = [];
+                const stationSignalerList = [];
+                const stationPassengerList = [];
+                const stationSwitchManList = [];
+                const stationFacilitatorList = [];
+                const stationWorkerList = [];
                 val.forEach(item => {
                     const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
                     switch (item.type) {
@@ -190,6 +221,31 @@ export default {
                         this.memberData[item.id].labelName = '车站助理-' + device.name + (item.name ? `-${item.name }` : '');
                         stationAssistantList.push(this.memberData[item.id]);
                         break;
+                    case 'STATION_MASTER':
+                        this.memberData[item.id].labelName = '车站站长-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationMasterList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_SIGNALER':
+                        this.memberData[item.id].labelName = '车站信号员-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationSignalerList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_PASSENGER':
+                        this.memberData[item.id].labelName = '车站客运员-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationPassengerList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_SWITCH_MAN':
+                        this.memberData[item.id].labelName = '车站扳道员-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationSwitchManList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_FACILITATOR':
+                        this.memberData[item.id].labelName = '车站引导员-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationFacilitatorList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_WORKER':
+                        this.memberData[item.id].labelName = '车站工务工-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationWorkerList.push(this.memberData[item.id]);
+                        break;
+
                     }
                 });
                 this.treeData = [{
@@ -224,6 +280,36 @@ export default {
                     labelName: '车站助理',
                     id: 'stationAssistant',
                     children: stationAssistantList
+                },
+                {
+                    labelName: '车站站长',
+                    id: 'stationMaster',
+                    children: stationMasterList
+                },
+                {
+                    labelName: '车站信号员',
+                    id: 'stationSignaler',
+                    children: stationSignalerList
+                },
+                {
+                    labelName: '车站客运员',
+                    id: 'stationPassenger',
+                    children: stationPassengerList
+                },
+                {
+                    labelName: '车站扳道员',
+                    id: 'stationSwitchMan',
+                    children: stationSwitchManList
+                },
+                {
+                    labelName: '车站引导员',
+                    id: 'stationFacilitator',
+                    children: stationFacilitatorList
+                },
+                {
+                    labelName: '车站工务工',
+                    id: 'stationWorker',
+                    children: stationWorkerList
                 }
                 ];
                 EventBus.$emit('trainTicketMember', [...stationSupervisorList, ...stationAssistantList]);
diff --git a/src/views/scriptManage/addScriptMember.vue b/src/views/scriptManage/addScriptMember.vue
index 32b3a3a07..6725c764b 100644
--- a/src/views/scriptManage/addScriptMember.vue
+++ b/src/views/scriptManage/addScriptMember.vue
@@ -72,7 +72,14 @@ export default {
             typeList: [
                 {label: '行调', value: 'DISPATCHER'},
                 {label: '通号', value: 'MAINTAINER'},
-                {label: '车站值班员', value: 'STATION_SUPERVISOR'}
+                {label: '车站值班员', value: 'STATION_SUPERVISOR'},
+                {label: '车站助理', value: 'STATION_ASSISTANT'},
+                {label: '车站站长', value: 'STATION_MASTER'},
+                {label: '车站信号员', value: 'STATION_SIGNALER'},
+                {label: '车站客运员', value: 'STATION_PASSENGER'},
+                {label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
+                {label: '车站引导员', value: 'STATION_FACILITATOR'},
+                {label: '车站工务工', value: 'STATION_WORKER'}
             ]
         };
     },
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 43969e27b..defb3e5a1 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -228,6 +228,48 @@ export default {
                     id: 'parkingLotSignalBuilding',
                     type: 'role',
                     children: result.deviceListData[7]
+                },
+                {
+                    label: '车站助理',
+                    id: 'stationAssistant',
+                    type: 'role',
+                    children: result.deviceListData[8]
+                },
+                {
+                    label: '车站站长',
+                    id: 'stationMaster',
+                    type: 'role',
+                    children: result.deviceListData[9]
+                },
+                {
+                    label: '车站信号员',
+                    id: 'stationSignaler',
+                    type: 'role',
+                    children: result.deviceListData[10]
+                },
+                {
+                    label: '车站客运员',
+                    id: 'stationPassenger',
+                    type: 'role',
+                    children: result.deviceListData[11]
+                },
+                {
+                    label: '车站扳道员',
+                    id: 'stationSwitchMan',
+                    type: 'role',
+                    children: result.deviceListData[12]
+                },
+                {
+                    label: '车站扳道员',
+                    id: 'stationFacilitator',
+                    type: 'role',
+                    children: result.deviceListData[13]
+                },
+                {
+                    label: '车站工务工',
+                    id: 'stationWorker',
+                    type: 'role',
+                    children: result.deviceListData[14]
                 }
                 ];
                 this.memberList = result.lastMemberList;

From 636819e9a5172c273d59ff41a9d67dc0e88841a7 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 Jul 2022 18:06:04 +0800
Subject: [PATCH 20/37] =?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/views/newMap/chatView/chatBox.vue      | 2 +-
 src/views/scriptManage/tipScriptRecord.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index 18cb42167..faa3849bf 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -388,7 +388,7 @@ export default {
                 const maintainerList = {};
                 const parentDepartmentList = {};
                 const parkingLotSignalBuilding = {};
-                const stationAssistant = [];
+                const stationAssistant = {};
                 const stationMaster = {};
                 const stationSignaler = {};
                 const stationPassenger = {};
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index defb3e5a1..3a66d2608 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -260,7 +260,7 @@ export default {
                     children: result.deviceListData[12]
                 },
                 {
-                    label: '车站扳道员',
+                    label: '车站引导员',
                     id: 'stationFacilitator',
                     type: 'role',
                     children: result.deviceListData[13]

From b4b61aa0cf877da92f7d6ffc63021cad8c79dcd6 Mon Sep 17 00:00:00 2001
From: weizhihong <weizhihong@joylink.club>
Date: Tue, 26 Jul 2022 08:45:58 +0800
Subject: [PATCH 21/37] =?UTF-8?q?=E3=80=90=E5=A4=A7=E9=93=81=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E4=B8=AD=E6=96=87=E9=85=8D=E7=BD=AE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/ConstConfig.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index b68910090..8fd30cd23 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -74,7 +74,13 @@ export default {
             {label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher '},
             {label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent department'},
             {label: '停车场信号楼', value: 'PARKING_LOT_SIGNAL_BUILDING', enLabel: 'Parking Signal Building'},
-            {label: '车站助理', value: 'STATION_ASSISTANT', enLabel: 'StationAssistant'}
+            {label: '车站助理', value: 'STATION_ASSISTANT', enLabel: 'StationAssistant'},
+            {label: '车站站长', value: 'STATION_MASTER', enLabel: 'StationMaster'},
+            {label: '车站信号员', value: 'STATION_SIGNALER', enLabel: 'StationSignaler'},
+            {label: '车站客运员', value: 'STATION_PASSENGER', enLabel: 'StationPassenger'},
+            {label: '车站扳道员', value: 'STATION_SWITCH_MAN', enLabel: 'StationSwitchMan'},
+            {label: '车站引导员', value: 'STATION_FACILITATOR', enLabel: 'StationFacilitator'},
+            {label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker'}
         ],
 
         releaseReview: [

From cf76d48025f24e21ecb21358493321d490462f3f Mon Sep 17 00:00:00 2001
From: weizhihong <weizhihong@joylink.club>
Date: Tue, 26 Jul 2022 09:34:50 +0800
Subject: [PATCH 22/37] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E5=91=98=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/ConstConfig.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 8fd30cd23..4d119f4a4 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -80,7 +80,8 @@ export default {
             {label: '车站客运员', value: 'STATION_PASSENGER', enLabel: 'StationPassenger'},
             {label: '车站扳道员', value: 'STATION_SWITCH_MAN', enLabel: 'StationSwitchMan'},
             {label: '车站引导员', value: 'STATION_FACILITATOR', enLabel: 'StationFacilitator'},
-            {label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker'}
+            {label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker'},
+            {label: '设备管理员', value: 'DEVICE_MANAGER', enLabel: 'DeviceManager'}
         ],
 
         releaseReview: [

From 922d4641b741854ec149f3ffbfa42f456debe84a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 10:14:45 +0800
Subject: [PATCH 23/37] =?UTF-8?q?=E5=89=A7=E6=9C=AC=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/ConstDic.js                          |  3 ++-
 src/views/newMap/chatView/chatBox.vue            | 12 ++++++++++++
 .../scriptPreview/scriptButtonGroup.vue          |  6 ++++++
 src/views/newMap/displayNew/utils.js             |  5 +++--
 .../jointTrainingNew/memberManage/addMember.vue  |  3 ++-
 .../memberManage/membersManage.vue               | 16 +++++++++++++++-
 src/views/scriptManage/addScriptMember.vue       |  3 ++-
 src/views/scriptManage/tipScriptRecord.vue       |  6 ++++++
 8 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 6b5bd6397..1c202a92b 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -174,7 +174,8 @@ export const SimulationType = {
     STATION_PASSENGER:'车站客运员',
     STATION_SWITCH_MAN:'车站扳道员',
     STATION_FACILITATOR:'车站引导员',
-    STATION_WORKER:'车站工务工'
+    STATION_WORKER:'车站工务工',
+    DEVICE_MANAGER:'设备管理员'
 
 };
 export const UrlConfig = {
diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index faa3849bf..a44378334 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -395,6 +395,7 @@ export default {
                 const stationSwitchMan = {};
                 const stationFacilitator = {};
                 const stationWorker = {};
+                const deviceManager = {};
                 val.forEach(item => {
                     const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
                     this.memberData[item.id]['active'] = false;
@@ -478,6 +479,11 @@ export default {
                         this.memberData[item.id].labelName = '车站工务工' + (item.name || '');
                         stationWorker[item.id] = this.memberData[item.id];
                         break;
+                    case 'DEVICE_MANAGER':
+                        this.memberData[item.id].label = '设备管理员' + (item.name || '');
+                        this.memberData[item.id].labelName = '设备管理员' + (item.name || '');
+                        deviceManager[item.id] = this.memberData[item.id];
+                        break;
                     }
                 });
                 // { label: '全部集中站', value: 'allConcentrateStation', active: false, sign: 'DEVICE_STATION' },
@@ -567,6 +573,12 @@ export default {
                     id: 'stationWorker',
                     type: 'role',
                     children: stationWorker
+                },
+                {
+                    label: '车站工务工',
+                    id: 'deviceManager',
+                    type: 'role',
+                    children: deviceManager
                 }
                 ];
                 this.initCommonMemberList();
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
index feadde3fd..562b85576 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
@@ -300,6 +300,12 @@ export default {
                         id: 'stationWorker',
                         type: 'role',
                         children: result.deviceListData[14]
+                    },
+                    {
+                        label: '设备管理员',
+                        id: 'deviceManager',
+                        type: 'role',
+                        children: result.deviceListData[15]
                     }
                     ];
                     /**
diff --git a/src/views/newMap/displayNew/utils.js b/src/views/newMap/displayNew/utils.js
index 94fb2fe74..1510119db 100644
--- a/src/views/newMap/displayNew/utils.js
+++ b/src/views/newMap/displayNew/utils.js
@@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) {
     lastData = JSON.parse(lastData);
     const lastMemberList = [];
     // const electricDispatcherList = [];
-    const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+    const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
     const driverList = [];
     lastData.forEach((member, index)=>{
         if (member.userId && member.userId == store.state.user.id) {
@@ -37,7 +37,7 @@ export function covertMemberData (activeTrainList, resp) {
             member.label = member.type + name + userName;
             member.normalName = member.type + name;
         }
-        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工'];
+        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '设备管理员'];
 
         /**
          * 车站助理
@@ -55,6 +55,7 @@ export function covertMemberData (activeTrainList, resp) {
         // stationSwitchMan
         // stationFacilitator
         // stationWorker
+        // 设备管理员  deviceManager  DEVICE_MANAGER
 
         const deviceTypeIndex = deviceType.indexOf(member.type);
         if (deviceTypeIndex >= 0) {
diff --git a/src/views/newMap/jointTrainingNew/memberManage/addMember.vue b/src/views/newMap/jointTrainingNew/memberManage/addMember.vue
index 8cd7f06c2..921c58f1e 100644
--- a/src/views/newMap/jointTrainingNew/memberManage/addMember.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/addMember.vue
@@ -77,7 +77,8 @@ export default {
                 {label: '车站客运员', value: 'STATION_PASSENGER'},
                 {label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
                 {label: '车站引导员', value: 'STATION_FACILITATOR'},
-                {label: '车站工务工', value: 'STATION_WORKER'}
+                {label: '车站工务工', value: 'STATION_WORKER'},
+                {label: '设备管理员', value: 'DEVICE_MANAGER'}
             ]
         };
     },
diff --git a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
index 8ba2c8b59..64b4ee00d 100644
--- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
@@ -144,6 +144,10 @@ export default {
             {
                 labelName: '车站工务工',
                 children: []
+            },
+            {
+                labelName: '设备管理员',
+                children: []
             }
             ]
         };
@@ -186,6 +190,7 @@ export default {
                 const stationSwitchManList = [];
                 const stationFacilitatorList = [];
                 const stationWorkerList = [];
+                const deviceManagerList = [];
                 val.forEach(item => {
                     const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
                     switch (item.type) {
@@ -245,7 +250,11 @@ export default {
                         this.memberData[item.id].labelName = '车站工务工-' + device.name + (item.name ? `-${item.name }` : '');
                         stationWorkerList.push(this.memberData[item.id]);
                         break;
-
+                    case 'DEVICE_MANAGER':
+                        this.memberData[item.id].labelName = '设备管理员-' + device.name + (item.name ? `-${item.name }` : '');
+                        deviceManagerList.push(this.memberData[item.id]);
+                        break;
+                // DEVICE_MANAGER:'设备管理员' deviceManager
                     }
                 });
                 this.treeData = [{
@@ -310,6 +319,11 @@ export default {
                     labelName: '车站工务工',
                     id: 'stationWorker',
                     children: stationWorkerList
+                },
+                {
+                    labelName: '设备管理员',
+                    id: 'deviceManager',
+                    children: deviceManagerList
                 }
                 ];
                 EventBus.$emit('trainTicketMember', [...stationSupervisorList, ...stationAssistantList]);
diff --git a/src/views/scriptManage/addScriptMember.vue b/src/views/scriptManage/addScriptMember.vue
index 6725c764b..b2a0c0f89 100644
--- a/src/views/scriptManage/addScriptMember.vue
+++ b/src/views/scriptManage/addScriptMember.vue
@@ -79,7 +79,8 @@ export default {
                 {label: '车站客运员', value: 'STATION_PASSENGER'},
                 {label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
                 {label: '车站引导员', value: 'STATION_FACILITATOR'},
-                {label: '车站工务工', value: 'STATION_WORKER'}
+                {label: '车站工务工', value: 'STATION_WORKER'},
+                {label: '设备管理员', value: 'DEVICE_MANAGER'}
             ]
         };
     },
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 3a66d2608..2084958fe 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -270,6 +270,12 @@ export default {
                     id: 'stationWorker',
                     type: 'role',
                     children: result.deviceListData[14]
+                },
+                {
+                    label: '设备管理员',
+                    id: 'deviceManager',
+                    type: 'role',
+                    children: result.deviceListData[15]
                 }
                 ];
                 this.memberList = result.lastMemberList;

From 12b3f904dc24476b14789fa1c1b531545f180d4e Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 26 Jul 2022 10:38:32 +0800
Subject: [PATCH 24/37] =?UTF-8?q?=E5=A4=A7=E9=93=8102=20=E6=94=BE=E5=BC=80?=
 =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=8C=A4=E5=B2=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/datie_02_1.js             | 11 +++++++----
 .../theme/components/menus/dialog/setFault.vue        |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/config/skinCode/datie_02_1.js b/src/jmapNew/config/skinCode/datie_02_1.js
index 33963848d..6af7d924b 100644
--- a/src/jmapNew/config/skinCode/datie_02_1.js
+++ b/src/jmapNew/config/skinCode/datie_02_1.js
@@ -80,10 +80,10 @@ class SkinCode extends defaultStyle {
             },
             line: {
                 z: 0,
-                width: 3, 									// 区段宽度
+                width: 4, 									// 区段宽度
                 beyondWidth: 0, 							// 区段宽超出宽度
                 invadeColor: '#FF0000', 					// 区段侵入颜色     （红色）
-                spareColor: 'rgb(85,120,182)', 						// 区段空闲颜色  (浅蓝)
+                spareColor: 'rgb(85,120,182)', 				// 区段空闲颜色  (浅蓝)
 
                 communicationOccupiedColor: '#FF0000', 		// 区段通信车占用颜色   （红色）
                 unCommunicationOccupiedColor: '#FF0000', 	// 区段非通讯车占用颜色  （红色）
@@ -92,7 +92,7 @@ class SkinCode extends defaultStyle {
                 faultLockColor: '#00FF00', 					// 区段故障锁定颜色
 
                 undefinedColor: '#0071C1', 					// 区段未定义颜色
-                blockColor: '#00FF00', 						// 区段封锁颜色
+                blockColor: '#FF00FF', 						// 区段封锁颜色
                 atcExcisionColor: '#A0522D', 				// 区段atc切除颜色
                 atsExcisionColor: '#A0522D', 				// 区段ats切除颜色
                 timeReleaseColor: '#3F3F3F', 				// 区段延时释放颜色
@@ -108,7 +108,7 @@ class SkinCode extends defaultStyle {
                 z: 2,
                 distance: 2, 								// 分路不良 距离区段距离
                 width: 1, 									// 分路不良的宽度
-                lineColor: 'rgb(188,67,180)' 						// 分路不良颜色 （粉红色）
+                lineColor: 'rgb(188,67,180)' 				// 分路不良颜色 （粉红色）
             },
             // speedLimit: { 									// 限速元素
             //     z: 2,
@@ -143,6 +143,9 @@ class SkinCode extends defaultStyle {
                 invadeSpecial:true, // 特殊侵限
                 halfHeight: 3								// 区段分隔符高度的一半
             },
+            block: {
+                blockGlint: true // 区段封锁闪烁显示
+            },
             shuttleBack: { 										// 折返进路 (存在此对象 显示折返箭头)
                 z: 10,
                 width: 1.5,
diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index 9dd696b51..a7a2841cc 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -221,7 +221,7 @@ export default {
                         {label: '失表', value: 'SPLIT'},
                         {label: '定位失表', value: 'NORMAL_SPLIT'},
                         {label: '反位失表', value: 'REVERSE_SPLIT'},
-                        // {label: '挤岔', value: 'SQUEEZE'},
+                        {label: '挤岔', value: 'SQUEEZE'},
                         // {label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
                         {label: '电路故障', value: 'AXLE_FAULT'}
                     ];

From 7cd2ecc2dc24415fd0dde1852bbf067eebe4a64e Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 10:41:08 +0800
Subject: [PATCH 25/37] =?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/views/newMap/chatView/chatBox.vue         |  2 +-
 src/views/newMap/displayCity/utils.js         |  4 +-
 .../displayNew/dispatherContest/sceneList.vue | 33 +++++++++++++
 .../scriptPreview/scriptButtonGroup.vue       |  2 +-
 src/views/newMap/displayNew/utils.js          |  2 +-
 src/views/scriptManage/tipScriptRecord.vue    | 46 ++++++++++++++++++-
 6 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index a44378334..ccb23257c 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -575,7 +575,7 @@ export default {
                     children: stationWorker
                 },
                 {
-                    label: '车站工务工',
+                    label: '设备管理员',
                     id: 'deviceManager',
                     type: 'role',
                     children: deviceManager
diff --git a/src/views/newMap/displayCity/utils.js b/src/views/newMap/displayCity/utils.js
index 6b99aee0b..17393c875 100644
--- a/src/views/newMap/displayCity/utils.js
+++ b/src/views/newMap/displayCity/utils.js
@@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) {
     lastData = JSON.parse(lastData);
     const lastMemberList = [];
     // const electricDispatcherList = [];
-    const deviceListData = [[], [], [], [], [], [], [], []];
+    const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
     const driverList = [];
     lastData.forEach((member, index)=>{
         if (member.userId && member.userId == store.state.user.id) {
@@ -37,7 +37,7 @@ export function covertMemberData (activeTrainList, resp) {
             member.label = member.type + name + userName;
             member.normalName = member.type + name;
         }
-        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼'];
+        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员'];
         const deviceTypeIndex = deviceType.indexOf(member.type);
         if (deviceTypeIndex >= 0) {
             if (deviceTypeIndex == 3) {
diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index a11e183a2..f095b87f3 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -193,6 +193,39 @@ export default {
                             }
                             case 'PARKING_LOT_SIGNAL_BUILDING': {
                                 member.label = '停车场信号楼' + (member.name ? member.name : '');
+                                break;
+                            }
+                            case 'STATION_ASSISTANT': {
+                                member.label = '车站助理' + (member.name ? member.name : '');
+                                break;
+                            }
+                            case 'STATION_MASTER': {
+                                member.label = '车站站长' + (member.name ? member.name : '');
+                                break;
+                            }
+                            case 'STATION_SIGNALER': {
+                                member.label = '车站信号员' + (member.name ? member.name : '');
+                                break;
+                            }
+                            case 'STATION_PASSENGER': {
+                                member.label = '车站客运员' + (member.name ? member.name : '');
+                                break;
+                            }
+                            case 'STATION_SWITCH_MAN': {
+                                member.label = '车站扳道员' + (member.name ? member.name : '');
+                                break;
+                            }
+                            case 'STATION_FACILITATOR': {
+                                member.label = '车站引导员' + (member.name ? member.name : '');
+                                break;
+                            }
+                            case 'STATION_WORKER': {
+                                member.label = '车站工务工' + (member.name ? member.name : '');
+                                break;
+                            }
+                            case 'DEVICE_MANAGER': {
+                                member.label = '设备管理员' + (member.name ? member.name : '');
+                                break;
                             }
                             }
                         });
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
index 562b85576..fe8e8717b 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
@@ -290,7 +290,7 @@ export default {
                         children: result.deviceListData[12]
                     },
                     {
-                        label: '车站扳道员',
+                        label: '车站引导员',
                         id: 'stationFacilitator',
                         type: 'role',
                         children: result.deviceListData[13]
diff --git a/src/views/newMap/displayNew/utils.js b/src/views/newMap/displayNew/utils.js
index 1510119db..493ef0dd3 100644
--- a/src/views/newMap/displayNew/utils.js
+++ b/src/views/newMap/displayNew/utils.js
@@ -37,7 +37,7 @@ export function covertMemberData (activeTrainList, resp) {
             member.label = member.type + name + userName;
             member.normalName = member.type + name;
         }
-        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '设备管理员'];
+        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员'];
 
         /**
          * 车站助理
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 2084958fe..c5ec22226 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -332,7 +332,7 @@ export default {
             const covertmember = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
             const newMember = covertmember[0];
             this.memberList.push(newMember);
-            const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼'];
+            const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员'];
             const index = deviceTypeList.indexOf(newMember.type);
             if (index >= 0) {
                 const treeDataIn = this.treeData[index];
@@ -550,6 +550,39 @@ export default {
                 prdType = '';
                 role.type = 'PARKING_LOT_SIGNAL_BUILDING';
                 this.$store.dispatch('training/setRoles', 'PARKING_LOT_SIGNAL_BUILDING');
+
+            } else if (role.type == '车站助理') {
+                prdType = '';
+                role.type = 'STATION_ASSISTANT';
+                this.$store.dispatch('training/setRoles', 'STATION_ASSISTANT');
+            } else if (role.type == '车站站长') {
+                prdType = '';
+                role.type = 'STATION_MASTER';
+                this.$store.dispatch('training/setRoles', 'STATION_MASTER');
+            } else if (role.type == '车站信号员') {
+                prdType = '';
+                role.type = 'STATION_SIGNALER';
+                this.$store.dispatch('training/setRoles', 'STATION_SIGNALER');
+            } else if (role.type == '车站客运员') {
+                prdType = '';
+                role.type = 'STATION_PASSENGER';
+                this.$store.dispatch('training/setRoles', 'STATION_PASSENGER');
+            } else if (role.type == '车站扳道员') {
+                prdType = '';
+                role.type = 'STATION_SWITCH_MAN';
+                this.$store.dispatch('training/setRoles', 'STATION_SWITCH_MAN');
+            } else if (role.type == '车站引导员') {
+                prdType = '';
+                role.type = 'STATION_FACILITATOR';
+                this.$store.dispatch('training/setRoles', 'STATION_FACILITATOR');
+            } else if (role.type == '车站工务工') {
+                prdType = '';
+                role.type = 'STATION_WORKER';
+                this.$store.dispatch('training/setRoles', 'STATION_WORKER');
+            } else if (role.type == '设备管理员') {
+                prdType = '';
+                role.type = 'DEVICE_MANAGER';
+                this.$store.dispatch('training/setRoles', 'DEVICE_MANAGER');
             } else {
                 prdType = '';
             }
@@ -578,7 +611,16 @@ export default {
                     'DEPOT_DISPATCHER':'车辆段信号楼',
                     'PARENT_DEPARTMENT':'上级部门',
                     'ELECTRIC_DISPATCHER':'电力调度',
-                    'PARKING_LOT_SIGNAL_BUILDING':'停车场信号楼'
+                    'PARKING_LOT_SIGNAL_BUILDING':'停车场信号楼',
+                    'STATION_ASSISTANT':'车站助理',
+                    'STATION_MASTER':'车站站长',
+                    'STATION_SIGNALER':'车站信号员',
+                    'STATION_PASSENGER':'车站客运员',
+                    'STATION_SWITCH_MAN':'车站扳道员',
+                    'STATION_FACILITATOR':'车站引导员',
+                    'STATION_WORKER':'车站工务工',
+                    'DEVICE_MANAGER':'设备管理员'
+
                 };
                 newRole.type = roleTypeEnumMap[newRole.type];
                 this.quickChangeMember.list.push(newRole);

From 82f44d349940de25b9e7853b6f50d5cfbc312b2f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 11:21:58 +0800
Subject: [PATCH 26/37] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6=20?=
 =?UTF-8?q?=E6=94=BE=E5=BC=80=E4=BC=9A=E8=AF=9D=E5=92=8C=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4=20=E4=BF=AE=E6=94=B9=E5=89=A7?=
 =?UTF-8?q?=E6=9C=AC=20=E8=A7=92=E8=89=B2=E7=9A=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/chatView/chatBox.vue         | 32 +++++------
 .../displayNew/dispatherContest/sceneList.vue | 56 ++++++++++++++++---
 src/views/scriptManage/getAction.vue          | 29 +++++-----
 3 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index ccb23257c..9d44fa824 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -445,43 +445,43 @@ export default {
                         parkingLotSignalBuilding[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_ASSISTANT':
-                        this.memberData[item.id].label = '车站助理' + (item.name || '');
-                        this.memberData[item.id].labelName = '车站助理' + (item.name || '');
+                        this.memberData[item.id].label = '车站助理-' + device.name + (item.name || '');
+                        this.memberData[item.id].labelName = '车站助理-' + device.name + ( item.name || '');
                         stationAssistant[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_MASTER':
-                        this.memberData[item.id].label = '车站站长' + (item.name || '');
-                        this.memberData[item.id].labelName = '车站站长' + (item.name || '');
+                        this.memberData[item.id].label = '车站站长-' + device.name + (item.name || '');
+                        this.memberData[item.id].labelName = '车站站长-' + device.name + (item.name || '');
                         stationMaster[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_SIGNALER':
-                        this.memberData[item.id].label = '车站信号员' + (item.name || '');
-                        this.memberData[item.id].labelName = '车站信号员' + (item.name || '');
+                        this.memberData[item.id].label = '车站信号员-' + device.name + (item.name || '');
+                        this.memberData[item.id].labelName = '车站信号员-' + device.name + (item.name || '');
                         stationSignaler[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_PASSENGER':
-                        this.memberData[item.id].label = '车站客运员' + (item.name || '');
-                        this.memberData[item.id].labelName = '车站客运员' + (item.name || '');
+                        this.memberData[item.id].label = '车站客运员-' + device.name + (item.name || '');
+                        this.memberData[item.id].labelName = '车站客运员-' + device.name + (item.name || '');
                         stationPassenger[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_SWITCH_MAN':
-                        this.memberData[item.id].label = '车站扳道员' + (item.name || '');
-                        this.memberData[item.id].labelName = '车站扳道员' + (item.name || '');
+                        this.memberData[item.id].label = '车站扳道员-' + device.name + (item.name || '');
+                        this.memberData[item.id].labelName = '车站扳道员-' + device.name + (item.name || '');
                         stationSwitchMan[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_FACILITATOR':
-                        this.memberData[item.id].label = '车站引导员' + (item.name || '');
-                        this.memberData[item.id].labelName = '车站引导员' + (item.name || '');
+                        this.memberData[item.id].label = '车站引导员-' + device.name + (item.name || '');
+                        this.memberData[item.id].labelName = '车站引导员-' + device.name + (item.name || '');
                         stationFacilitator[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_WORKER':
-                        this.memberData[item.id].label = '车站工务工' + (item.name || '');
-                        this.memberData[item.id].labelName = '车站工务工' + (item.name || '');
+                        this.memberData[item.id].label = '车站工务工-' + device.name + (item.name || '');
+                        this.memberData[item.id].labelName = '车站工务工-' + device.name + (item.name || '');
                         stationWorker[item.id] = this.memberData[item.id];
                         break;
                     case 'DEVICE_MANAGER':
-                        this.memberData[item.id].label = '设备管理员' + (item.name || '');
-                        this.memberData[item.id].labelName = '设备管理员' + (item.name || '');
+                        this.memberData[item.id].label = '设备管理员-' + device.name + (item.name || '');
+                        this.memberData[item.id].labelName = '设备管理员-' + device.name + (item.name || '');
                         deviceManager[item.id] = this.memberData[item.id];
                         break;
                     }
diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index f095b87f3..5c26ad03e 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -196,35 +196,75 @@ export default {
                                 break;
                             }
                             case 'STATION_ASSISTANT': {
-                                member.label = '车站助理' + (member.name ? member.name : '');
+                                const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                                if (device) {
+                                    member.label = '车站助理-' + device.name + (member.name ? member.name : '');
+                                    member.deviceName = device.name;
+                                }
+                                // member.label = '车站助理' + (member.name ? member.name : '');
                                 break;
                             }
                             case 'STATION_MASTER': {
-                                member.label = '车站站长' + (member.name ? member.name : '');
+                                const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                                if (device) {
+                                    member.label = '车站站长-' + device.name + (member.name ? member.name : '');
+                                    member.deviceName = device.name;
+                                }
+                                // member.label = '车站站长' + (member.name ? member.name : '');
                                 break;
                             }
                             case 'STATION_SIGNALER': {
-                                member.label = '车站信号员' + (member.name ? member.name : '');
+                                const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                                if (device) {
+                                    member.label = '车站信号员-' + device.name + (member.name ? member.name : '');
+                                    member.deviceName = device.name;
+                                }
+                                // member.label = '车站信号员' + (member.name ? member.name : '');
                                 break;
                             }
                             case 'STATION_PASSENGER': {
-                                member.label = '车站客运员' + (member.name ? member.name : '');
+                                const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                                if (device) {
+                                    member.label = '车站客运员-' + device.name + (member.name ? member.name : '');
+                                    member.deviceName = device.name;
+                                }
+                                // member.label = '车站客运员' + (member.name ? member.name : '');
                                 break;
                             }
                             case 'STATION_SWITCH_MAN': {
-                                member.label = '车站扳道员' + (member.name ? member.name : '');
+                                const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                                if (device) {
+                                    member.label = '车站扳道员-' + device.name + (member.name ? member.name : '');
+                                    member.deviceName = device.name;
+                                }
+                                // member.label = '车站扳道员' + (member.name ? member.name : '');
                                 break;
                             }
                             case 'STATION_FACILITATOR': {
-                                member.label = '车站引导员' + (member.name ? member.name : '');
+                                const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                                if (device) {
+                                    member.label = '车站引导员-' + device.name + (member.name ? member.name : '');
+                                    member.deviceName = device.name;
+                                }
+                                // member.label = '车站引导员' + (member.name ? member.name : '');
                                 break;
                             }
                             case 'STATION_WORKER': {
-                                member.label = '车站工务工' + (member.name ? member.name : '');
+                                // member.label = '车站工务工' + (member.name ? member.name : '');
+                                const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                                if (device) {
+                                    member.label = '车站工务工-' + device.name + (member.name ? member.name : '');
+                                    member.deviceName = device.name;
+                                }
                                 break;
                             }
                             case 'DEVICE_MANAGER': {
-                                member.label = '设备管理员' + (member.name ? member.name : '');
+                                const device = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
+                                if (device) {
+                                    member.label = '设备管理员-' + device.name + (member.name ? member.name : '');
+                                    member.deviceName = device.name;
+                                }
+                                // member.label = '设备管理员' + (member.name ? member.name : '');
                                 break;
                             }
                             }
diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue
index e46bb5e11..bb4d71574 100644
--- a/src/views/scriptManage/getAction.vue
+++ b/src/views/scriptManage/getAction.vue
@@ -47,7 +47,8 @@
             <el-button v-if="actionInfo.visible && !actionInfo.isModify" type="primary" size="mini" style="margin-left:10px;" @click="modifyAction(actionInfo)">{{ $t('scriptRecord.modifyConversitionButton') }}</el-button>
             <el-button v-if="actionInfo.visible && actionInfo.isModify" :loading="modifyTextLoading" type="danger" size="mini" style="margin-left:10px;" @click="confirmModify(actionInfo)">确定</el-button>
             <el-button v-if="actionInfo.visible && actionInfo.isModify" type="" size="mini" style="margin-left:10px;" @click="cancleModify(actionInfo)">取消</el-button>
-            <el-button v-if="actionInfo.visible && !actionInfo.isModify" type="danger" size="mini" :loading="deleteLoading" @click="deleteAction(actionInfo.id)">删除</el-button>
+            <el-button v-if="actionInfo.isDelete" type="danger" size="mini" :loading="actionInfo.deleteLoading" @click="deleteAction(actionInfo)">删除</el-button>
+            <!-- .deleteLoading,actionInfo.id -->
           </div>
         </el-card>
       </el-timeline-item>
@@ -84,7 +85,7 @@ export default {
             // isModify:false,
             // modifyText:'',
             modifyTextLoading:false,
-            deleteLoading:false,
+            // deleteLoading:false,
             // behaviorName:"",
             memberName: '',
             conditionActionId: ''
@@ -144,16 +145,16 @@ export default {
                     });
                 }
 
-                this.actionInfoList.push({id: element.id, isStartCoversition: true, memberName: memberName, targetName:targetNameList.toString(), condition: element.condition });
+                this.actionInfoList.push({id: element.id, isStartCoversition: true, memberName: memberName, targetName:targetNameList.toString(), condition: element.condition, isDelete:true, deleteLoading:false });
                 break;
             }
             case 'Drive': {
-                this.actionInfoList.push({id: element.id, isDrive: true, memberName: memberName, targetName:this.covertSection(element.targetSectionCode), condition: element.condition});
+                this.actionInfoList.push({id: element.id, isDrive: true, memberName: memberName, targetName:this.covertSection(element.targetSectionCode), isDelete:true, condition: element.condition, deleteLoading:false});
                 break;
             }
             case 'Conversation':
             {
-                this.actionInfoList.push({id: element.id, isCoversition: true, memberName: memberName, reply: element.content, row: element, visible: true, isModify:false, modifyText:'', condition: element.condition});
+                this.actionInfoList.push({id: element.id, isCoversition: true, memberName: memberName, reply: element.content, row: element, visible: true, isModify:false, isDelete:true, modifyText:'', condition: element.condition, deleteLoading:false});
                 break;
             }
             // case 'Exit_Conversation': {
@@ -179,16 +180,16 @@ export default {
                     if (operateName) {
                         const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车', CTC:'车务终端', RAIL:'票据/簿册'};
                         const operateTypeName = deviceTypeList[operateType];
-                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false, condition: element.condition});
+                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false, condition: element.condition, isDelete:true, deleteLoading:false });
                     }
                 } else {
                     // deviceFaultType
                     // element.operationParamMap.faultType;
                     // '(' + operateName.label + ')'
                     if (commandName == 'Set_Fault') {
-                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '设置故障', row: element, visible: false, condition: element.condition});
+                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '设置故障', row: element, visible: false, condition: element.condition, isDelete:true, deleteLoading:false });
                     } else if (commandName == 'Cancel_Fault') {
-                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '取消故障', row: element, visible: false, condition: element.condition});
+                        this.actionInfoList.push({id: element.id, isOperation: true, memberName: memberName, command: '取消故障', row: element, visible: false, condition: element.condition, isDelete:true, deleteLoading:false });
                     }
                 }
                 break;
@@ -210,7 +211,7 @@ export default {
                     Apply_CM_Mode: '转CM模式',
                     Apply_AM_Mode: '转AM模式'
                 };
-                this.actionInfoList.push({id: element.id, isCommand: true, memberName: memberName, command: CommandList[element.commandInitiateVO.commandType], targetName:targetName.name, row: element, visible: false, condition: element.condition});
+                this.actionInfoList.push({id: element.id, isCommand: true, memberName: memberName, command: CommandList[element.commandInitiateVO.commandType], targetName:targetName.name, row: element, visible: false, condition: element.condition, deleteLoading:false});
                 break;
             }
             }
@@ -281,13 +282,13 @@ export default {
                 }
             }
         },
-        deleteAction(actionId) {
-            this.deleteLoading = true;
-            deleteScriptAction(this.group, actionId).then(res=>{
-                this.deleteLoading = false;
+        deleteAction(actionInfo) {
+            actionInfo.deleteLoading = true;
+            deleteScriptAction(this.group, actionInfo.id).then(res=>{
+                actionInfo.deleteLoading = false;
                 this.reloadTable();
             }).catch(error=>{
-                this.deleteLoading = false;
+                actionInfo.deleteLoading = false;
                 this.$messageBox('删除会话/动作失败：' + error.message);
             });
         },

From 7998e3de92de5ade63070e69f566339e92fbdc2f Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 26 Jul 2022 13:03:20 +0800
Subject: [PATCH 27/37] =?UTF-8?q?=E5=A4=A7=E9=93=8102=20=E6=94=BE=E5=BC=80?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=20=20=E7=BA=BF=E8=B7=AF=E9=85=8D=E7=BD=AE=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=8C=BA=E6=95=85=E8=A7=A3=E5=8F=AA?=
 =?UTF-8?q?=E8=83=BD=E5=BA=94=E7=94=A8=E4=BA=8E=E6=95=85=E9=9A=9C=E9=94=81?=
 =?UTF-8?q?=E9=97=AD=E5=8C=BA=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/beijing_01/menus/menuTrain.vue      |  4 +--
 .../theme/chengdu_01/menus/menuTrain.vue      |  4 +--
 .../theme/chengdu_03/menus/menuTrain.vue      |  4 +--
 .../components/menus/dialog/setFault.vue      | 35 ++++++++++++++++---
 .../theme/datie_02/menus/menuTrain.vue        | 10 +++---
 .../theme/datie_jd1a/menus/menuTrain.vue      |  4 +--
 .../theme/foshan_01/menus/menuTrain.vue       |  4 +--
 .../theme/fuzhou_01/menus/menuTrain.vue       |  4 +--
 .../theme/haerbin_01/menus/menuTrain.vue      |  4 +--
 .../theme/nanjing_02/menus/menuTrain.vue      |  4 +--
 .../theme/ningbo_01/menus/menuTrain.vue       |  4 +--
 .../theme/ningbo_03/menus/menuTrain.vue       |  4 +--
 src/jmapNew/theme/race_01/menus/menuTrain.vue |  4 +--
 src/jmapNew/theme/xian_01/menus/menuTrain.vue |  4 +--
 src/jmapNew/theme/xian_02/menus/menuTrain.vue |  4 +--
 src/scripts/cmdPlugin/CommandHandler.js       |  2 +-
 src/views/system/configLine/config.vue        |  9 +++--
 17 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
index be05be643..7827f19bd 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
@@ -255,7 +255,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -450,7 +450,7 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
index 8810f9f67..8a6b4e4a9 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
@@ -168,7 +168,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -346,7 +346,7 @@ export default {
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
index 16fde9204..c08ee9daf 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
@@ -151,7 +151,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -317,7 +317,7 @@ export default {
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index a7a2841cc..6f6ba5ebd 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -16,8 +16,18 @@
           <el-row>
             <el-form ref="form" :model="formModel" :rules="rules">
               <el-col :span="24">
+                <el-form-item prop="speedLimit" label="限速：">
+                  <el-input v-model="formModel.speedLimit" style="width: 115px;margin-right: 10px;" size="small" />
+                  <span>km/h</span>
+                  <el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，-1为取消限速" placement="top-start">
+                    <i class="el-icon-warning" />
+                  </el-tooltip>
+                </el-form-item>
+                <el-form-item prop="driveForward" label="向前行驶：">
+                  <el-switch v-model="formModel.driveForward" active-text="是" inactive-text="否" @change="driveForwardChange" />
+                </el-form-item>
                 <el-form-item prop="targetDeviceCode" label="目的地:">
-                  <el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
+                  <el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" :disabled="formModel.driveForward" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
                     <el-option
                       v-for="item in selectedList"
                       :key="item.code"
@@ -109,6 +119,8 @@ export default {
             faultList: [],
             form: { faultType: ''},
             formModel: {
+                speedLimit: '',
+                driveForward: false,
                 targetDeviceCode: ''
             },
             groupNumber: '',
@@ -146,7 +158,7 @@ export default {
             } else if (this.operation == OperationEvent.MixinCommand.cancelStoppage.menu.operation) {
                 return '取消故障';
             } else if (this.operation == OperationEvent.MixinCommand.collocation.menu.operation) {
-                return '驾驶至';
+                return '驾驶';
             }
             return '';
         }
@@ -339,13 +351,21 @@ export default {
             this.sendCommand(setp);
         },
         handleCollocation() { // 设置托管
+            if (!this.formModel.driveForward && !this.formModel.targetDeviceCode) {
+                this.$message.error('请选择向前行驶或目的地');
+                return;
+            }
             const setp = {
                 over: true,
                 operation: menuOperate.Common.collocation.operation,
                 cmdType: menuOperate.Common.collocation.cmdType,
                 param: {
                     groupNumber: this.groupNumber,
-                    targetDeviceCode: this.formModel.targetDeviceCode
+                    param: {
+                        speedLimit: this.formModel.speedLimit,
+                        driveForward: this.formModel.driveForward,
+                        targetDeviceCode: this.formModel.targetDeviceCode
+                    }
                 }
             };
             this.sendCommand(setp);
@@ -382,13 +402,18 @@ export default {
             });
         },
         deviceSelect(em) {
-            if (this.field == 'selectedCode' && em._type == 'Section') {
+            if (this.field == 'selectedCode' && em._type == 'Section' && !this.formModel.driveForward) {
                 this.formModel.targetDeviceCode = em.code;
                 // this.field = '';
-            } else if (this.field == 'selectedCode' && em._type == 'Train') {
+            } else if (this.field == 'selectedCode' && em._type == 'Train' && !this.formModel.driveForward) {
                 this.formModel.targetDeviceCode = em.code;
                 // this.field = '';
             }
+        },
+        driveForwardChange(val) {
+            if (val) {
+                this.formModel.targetDeviceCode = '';
+            }
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index 3f3dc57dc..f3d9d519e 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -197,10 +197,10 @@ export default {
                     label: '限速指令',
                     handler: this.handleSpeedLimit
                 },
-                // {
-                // 	label: '驾驶至',
-                // 	handler: this.handleDriveTo
-                // },
+                {
+                    label: '驾驶',
+                    handler: this.handleDriveTo
+                },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
@@ -549,7 +549,7 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
index 1df99fa4e..8762e5015 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
@@ -191,7 +191,7 @@ export default {
                     handler: this.handleOverEedLight
                 },
                 // {
-                // 	label: '驾驶至',
+                // 	label: '驾驶',
                 // 	handler: this.handleDriveTo
                 // },
                 {
@@ -536,7 +536,7 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
index 989ada097..fa3ce3e46 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
@@ -159,7 +159,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -330,7 +330,7 @@ export default {
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
index ff95ec78f..8822f8371 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
@@ -133,7 +133,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -325,7 +325,7 @@ export default {
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
index 37c6f32f4..17fda2138 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
@@ -100,7 +100,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -295,7 +295,7 @@ export default {
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
index 6f1fd9ed0..09c4226d9 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
@@ -100,7 +100,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -294,7 +294,7 @@ export default {
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index ab32011e2..4c7737123 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -239,7 +239,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -406,7 +406,7 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
index b46665672..d7f5b1db1 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
@@ -240,7 +240,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -406,7 +406,7 @@ export default {
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue
index c1e53b2a1..c7cb4a6e5 100644
--- a/src/jmapNew/theme/race_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue
@@ -254,7 +254,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -519,7 +519,7 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index 4bd3cac57..3da87a5ad 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -184,7 +184,7 @@ export default {
                             handler: this.handleTurnDirection
                         },
                         {
-                            label: '驾驶至',
+                            label: '驾驶',
                             handler: this.handleDriveTo
                         },
                         {
@@ -464,7 +464,7 @@ export default {
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index 6578d5bba..a3d956b58 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -262,7 +262,7 @@ export default {
                     handler: this.handleTurnDirection
                 },
                 {
-                    label: '驾驶至',
+                    label: '驾驶',
                     handler: this.handleDriveTo
                 },
                 {
@@ -436,7 +436,7 @@ export default {
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 驾驶至（托管）
+        // 驾驶（托管）
         handleDriveTo() {
             commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
                 if (valid) {
diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js
index c18329953..b214fe522 100644
--- a/src/scripts/cmdPlugin/CommandHandler.js
+++ b/src/scripts/cmdPlugin/CommandHandler.js
@@ -46,7 +46,7 @@ class CommandHandle {
                 // },
                 Train_Trust: {
                     operate: 'Train_Trust',
-                    paramList:[{name: 'groupNumber'}, {name: 'targetDeviceCode'}],
+                    paramList:[{name: 'groupNumber'}, {name: 'param'}],
                     simulationRole: 'Center',
                     controlMode: ['OperateCenterControl'],
                     conditionList: []
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index 58340f5bf..36a29971d 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -116,7 +116,8 @@ export default {
                 'tripNumberIsUnique',
                 'standTbStrategyIsInvalid',
                 'updateTripPlanByServiceNumber',
-                'railway'
+                'railway',
+                'SFUCanOnlyApplyForFaultLockSection'
             ],
             selectList: ['runMode', 'singleApproachLockCancelRoute'],
             generalConfig: [
@@ -166,7 +167,8 @@ export default {
                 'tripNumberIsUnique',
                 'standTbStrategyIsInvalid',
                 'updateTripPlanByServiceNumber',
-                'railway'
+                'railway',
+                'SFUCanOnlyApplyForFaultLockSection'
             ],
             rangeList: ['noParkingSM', 'parkingSM'],
             speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@@ -222,7 +224,8 @@ export default {
                 tripNumberIsUnique: '运行图中车次号是否唯一',
                 standTbStrategyIsInvalid: '站台折返策略不生效',
                 updateTripPlanByServiceNumber: '根据服务号更新车次计划',
-                railway: '大铁线路'
+                railway: '大铁线路',
+                SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段'
             }
         };
     },

From 0fde57627905a3be1680815dce8e8a55f3aee062 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 26 Jul 2022 13:21:37 +0800
Subject: [PATCH 28/37] =?UTF-8?q?=E5=A4=A7=E9=93=8102=20=E7=82=B9=E7=81=AF?=
 =?UTF-8?q?=E7=81=AD=E7=81=AF=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/datie_02/menus/menuButton.vue       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 3557f8ffd..e3be09f9e 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -71,16 +71,16 @@
         <center><b>道岔解封</b></center>
       </span>
     </button>
-    <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['Signal'])">
-      <span style="color: black">
-        <center><b>点灯</b></center>
-      </span>
-    </button>
-    <button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['SignalButton'])">
-      <span style="color:#800000">
-        <center><b>灭灯</b></center>
-      </span>
-    </button>
+    <!--    <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['Signal'])">-->
+    <!--      <span style="color: black">-->
+    <!--        <center><b>点灯</b></center>-->
+    <!--      </span>-->
+    <!--    </button>-->
+    <!--    <button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['SignalButton'])">-->
+    <!--      <span style="color:#800000">-->
+    <!--        <center><b>灭灯</b></center>-->
+    <!--      </span>-->
+    <!--    </button>-->
     <button :id="Station.stationMasterLock.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
       <span style="color: #800000">
         <center><b>S引导总锁</b></center>

From 2e48ac5cc6658121468b82f7d4a07bea2d7fbe27 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 13:30:27 +0800
Subject: [PATCH 29/37] =?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/views/newMap/chatView/chatBox.vue | 36 ++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index 9d44fa824..57285ac56 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -1113,6 +1113,14 @@ export default {
             const temMaintainerList = [];
             const temDriverList = [];
             const temDepotDispatcherList = [];
+            const temStationAssistList = [];
+            const temStationMasterList = [];
+            const temStationSignalerList = [];
+            const temStationPassengerList = [];
+            const temStationSwitchManList = [];
+            const temStationFacilitatorList = [];
+            const temStationWorkerList = [];
+            const temDeviceManagerList = [];
             this.$store.state.training.memberList.forEach(item =>{
                 switch (item.type) {
                 case 'DISPATCHER':
@@ -1130,9 +1138,35 @@ export default {
                 case 'DEPOT_DISPATCHER':
                     temDepotDispatcherList.push({memberId: item.id, connect:true });
                     break;
+                case 'STATION_ASSISTANT':
+                    temStationAssistList.push({memberId: item.id, connect:true });
+                    break;
+                case 'STATION_MASTER':
+                    temStationMasterList.push({memberId: item.id, connect:true });
+                    break;
+                case 'STATION_SIGNALER':
+                    temStationSignalerList.push({memberId: item.id, connect:true });
+                    break;
+                case 'STATION_PASSENGER':
+                    temStationPassengerList.push({memberId: item.id, connect:true });
+                    break;
+                case 'STATION_SWITCH_MAN':
+                    temStationSwitchManList.push({memberId: item.id, connect:true });
+                    break;
+                case 'STATION_FACILITATOR':
+                    temStationFacilitatorList.push({memberId: item.id, connect:true });
+                    break;
+                case 'STATION_WORKER':
+                    temStationWorkerList.push({memberId: item.id, connect:true });
+                    break;
+                case 'DEVICE_MANAGER':
+                    temDeviceManagerList.push({memberId: item.id, connect:true });
+                    break;
                 }
             });
-            this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList, ...temDepotDispatcherList];
+            this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList, ...temDepotDispatcherList,
+                ...temStationAssistList, ...temStationMasterList, ...temStationSignalerList, ...temStationPassengerList, ...temStationSwitchManList,
+                ...temStationFacilitatorList, temStationWorkerList, temDeviceManagerList];
             if (this.userRole == 'AUDIENCE' || this.commonConversation) {
                 this.conversitionMemberList = [];
                 this.messageList = [...this.commonMessageList];

From c92d77fb6910989789701d0b338ff6609b01bcfa Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 13:55:26 +0800
Subject: [PATCH 30/37] =?UTF-8?q?=E7=BB=99=20=E4=BF=A1=E5=8F=B7=E5=91=98?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20=E7=8E=B0=E5=9C=B0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/displayNew/scriptDisplay/scriptRecord/index.vue  | 6 ++++--
 src/views/scriptManage/tipScriptRecord.vue                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index bab4b8cf1..3e73c46c3 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -148,8 +148,10 @@ export default {
                     return mem.userId != '' && mem.userId != undefined;
                 });
                 if (member) {
-                    const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT', 'ELECTRIC_DISPATCHER', 'PARKING_LOT_SIGNAL_BUILDING'];
-                    const prdTypeList = ['01', '02', '04', '', '05', '', ''];
+                    const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT',
+                        'ELECTRIC_DISPATCHER', 'PARKING_LOT_SIGNAL_BUILDING', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
+                        'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER'];
+                    const prdTypeList = ['01', '02', '04', '', '05', '', '', '', '', '', '01', '', '', '', '', ''];
                     const index = memberType.indexOf(member.type);
                     let prdType;
                     if (index >= 0) {
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index c5ec22226..0ef8c0728 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -560,7 +560,7 @@ export default {
                 role.type = 'STATION_MASTER';
                 this.$store.dispatch('training/setRoles', 'STATION_MASTER');
             } else if (role.type == '车站信号员') {
-                prdType = '';
+                prdType = '01';
                 role.type = 'STATION_SIGNALER';
                 this.$store.dispatch('training/setRoles', 'STATION_SIGNALER');
             } else if (role.type == '车站客运员') {

From faea986734471fbd1559635e9454177369be32fd Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 15:51:12 +0800
Subject: [PATCH 31/37] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=B0=81=E9=94=81/=E8=A7=A3=E5=B0=81=20?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_02/menus/menuSignal.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
index 0cf472ed0..cefbe4080 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
@@ -86,9 +86,15 @@ export default {
                     },
                     {
                         label: '封锁/解封',
-                        handler: '',
-                        cmdType: ''
+                        handler: this.lockOrUnlock
+                        // cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
+
                     },
+                    // {
+                    //     label: '解封',
+                    //     handler: '',
+                    //     cmdType: ''
+                    // },
                     {
                         label: '总人解',
                         handler: this.humanTrainRoute,

From c26c57930b5de73af630fc54b0ebb7ca42a4a404 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 15:53:19 +0800
Subject: [PATCH 32/37] =?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/jmapNew/theme/datie_02/menus/menuSignal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
index cefbe4080..72d252e7c 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
@@ -319,13 +319,13 @@ export default {
         },
         lockOrUnlock() {
         	if (this.selected.lock) {
-        		commitOperate(menuOperate.Signal.lock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
+        		commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
         			if (valid) {
         				this.$refs.routeControl.doShow(operate, this.selected);
                     }
                 });
             } else {
-        		commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
+        		commitOperate(menuOperate.Signal.lock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
         			if (valid) {
                         this.$refs.routeControl.doShow(operate, this.selected);
                     }

From d79e95425b2ad40707da751ff69f368b85721ab0 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 16:11:31 +0800
Subject: [PATCH 33/37] =?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/jmapNew/theme/datie_02/menus/menuSignal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
index 72d252e7c..14bce60ac 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
@@ -318,7 +318,7 @@ export default {
             });
         },
         lockOrUnlock() {
-        	if (this.selected.lock) {
+        	if (this.selected.blockade) {
         		commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
         			if (valid) {
         				this.$refs.routeControl.doShow(operate, this.selected);

From 246f204eb7b8a1e21d498421e1b34f0ccda7643b Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 16:30:48 +0800
Subject: [PATCH 34/37] =?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/views/newMap/displayNew/menuSchema.vue        |  8 ++++++--
 .../scriptDisplay/scriptRecord/index.vue          | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index c51b0f211..6b99b6028 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -306,8 +306,10 @@ export default {
             this.$refs.registerBook.doShow();
         },
         checkRoleInit(data) {
+            const stationRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
+                'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER'];
             data.forEach(item => {
-                if ((item.admin && item.online) && item.userId == this.userId && item.type == 'STATION_SUPERVISOR') {
+                if ((item.admin && item.online) && item.userId == this.userId && stationRoleList.includes(item.type)) {
                     this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
                     this.deviceCode = item.deviceCode;
                     this.setShowStation(item.deviceCode);
@@ -316,8 +318,10 @@ export default {
             });
         },
         checkRoleChange(data) {
+            const stationRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
+                'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER'];
             data.forEach(item => {
-                if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && item.type == 'STATION_SUPERVISOR') {
+                if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && stationRoleList.includes(item.type)) {
                     // this.userRole = item.type || 'AUDIENCE';
                     this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
                     this.deviceCode = item.deviceCode;
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index 3e73c46c3..a9fb99ad7 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -222,13 +222,22 @@ export default {
         },
 
         checkRoleChange(data) {
+            const stationRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
+                'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER'];
             data.forEach(item => {
-                if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && item.type == 'STATION_SUPERVISOR') {
+                if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && (stationRoleList.includes(item.type) )) {
                     // this.userRole = item.type || 'AUDIENCE';
                     this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
                     this.deviceCode = item.deviceCode;
-                    this.setShowStation(item.deviceCode);
-                    this.$store.dispatch('training/setPrdType', '01');
+
+                    if (item.type == 'STATION_SUPERVISOR' || item.type == 'STATION_SIGNALER') {
+                        this.setShowStation(item.deviceCode);
+                        this.$store.dispatch('training/setPrdType', '01');
+                    } else {
+                        const showStation = this.centralizedStationMap[item.deviceCode];
+                        this.setShowStation('');
+                        this.$jlmap.setCenter(showStation);
+                    }
                     // this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]);
                     // this.$nextTick(() => {
                     //     if (item.deviceCode && this.$store.state.training.prdType !== '09') { this.setCenter(item.deviceCode); }

From 67071c88306747aa907dfcb1bc486279f4512948 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 26 Jul 2022 16:46:10 +0800
Subject: [PATCH 35/37] =?UTF-8?q?=E5=A4=A7=E9=93=8102=20=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=93=8D=E4=BD=9C=E9=A9=BE=E9=A9=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/simulation.js                         |  7 ++++
 .../theme/beijing_01/menus/menuTrain.vue      |  8 ++---
 .../theme/chengdu_01/menus/menuTrain.vue      |  8 ++---
 .../theme/chengdu_03/menus/menuTrain.vue      |  8 ++---
 .../components/menus/dialog/setFault.vue      | 35 ++++++++++---------
 .../theme/datie_02/menus/menuTrain.vue        |  8 ++---
 .../theme/foshan_01/menus/menuTrain.vue       |  8 ++---
 .../theme/fuzhou_01/menus/menuTrain.vue       |  8 ++---
 .../theme/haerbin_01/menus/menuTrain.vue      |  8 ++---
 .../theme/nanjing_02/menus/menuTrain.vue      |  8 ++---
 .../theme/ningbo_01/menus/menuTrain.vue       |  8 ++---
 .../theme/ningbo_03/menus/menuTrain.vue       |  8 ++---
 src/jmapNew/theme/race_01/menus/menuTrain.vue |  8 ++---
 src/jmapNew/theme/xian_01/menus/menuTrain.vue |  8 ++---
 src/jmapNew/theme/xian_02/menus/menuTrain.vue |  8 ++---
 15 files changed, 77 insertions(+), 69 deletions(-)

diff --git a/src/api/simulation.js b/src/api/simulation.js
index 920e00e7e..199ce9b19 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -513,3 +513,10 @@ export function queryIscsResourcesByGroup(group, params) {
         params
     });
 }
+/** 获取机器人驾驶参数 */
+export function getRobotDrivingParam(simulationId, groupNumber) {
+    return request({
+        url: `/simulation/${simulationId}/driveParam/${groupNumber}`,
+        method: 'get'
+    });
+}
diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
index 7827f19bd..61852ce0b 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
@@ -246,10 +246,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
index 8a6b4e4a9..c4c77eec2 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
@@ -159,10 +159,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
index c08ee9daf..13e535c27 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
@@ -142,10 +142,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index 6f6ba5ebd..ce093d2d8 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -19,15 +19,19 @@
                 <el-form-item prop="speedLimit" label="限速：">
                   <el-input v-model="formModel.speedLimit" style="width: 115px;margin-right: 10px;" size="small" />
                   <span>km/h</span>
-                  <el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，-1为取消限速" placement="top-start">
+                  <el-tooltip style="margin-left: 10px;" effect="dark" content="值为5-65之间，不填为取消限速" placement="top-start">
                     <i class="el-icon-warning" />
                   </el-tooltip>
                 </el-form-item>
-                <el-form-item prop="driveForward" label="向前行驶：">
-                  <el-switch v-model="formModel.driveForward" active-text="是" inactive-text="否" @change="driveForwardChange" />
+                <el-form-item prop="through" label="">
+                  <el-radio-group v-model="formModel.through">
+                    <el-radio :label="1">越红灯行驶</el-radio>
+                    <el-radio :label="2">越引导行驶</el-radio>
+                    <el-radio :label="0">无</el-radio>
+                  </el-radio-group>
                 </el-form-item>
                 <el-form-item prop="targetDeviceCode" label="目的地:">
-                  <el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" :disabled="formModel.driveForward" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
+                  <el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" filterable size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
                     <el-option
                       v-for="item in selectedList"
                       :key="item.code"
@@ -95,6 +99,7 @@ import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
 import { menuOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import { mapGetters } from 'vuex';
+import { getRobotDrivingParam } from '@/api/simulation';
 
 export default {
     name: 'SwitchControl',
@@ -120,7 +125,7 @@ export default {
             form: { faultType: ''},
             formModel: {
                 speedLimit: '',
-                driveForward: false,
+                through: 0,
                 targetDeviceCode: ''
             },
             groupNumber: '',
@@ -290,6 +295,11 @@ export default {
                 if (judge) {
                     this.judge = judge;
                     this.groupNumber = selected.groupNumber;
+                    getRobotDrivingParam(this.$route.query.group, this.groupNumber).then(resp => {
+                        this.formModel.speedLimit = resp.data.speedLimit ? resp.data.speedLimit : '';
+                        this.formModel.through = resp.data.through;
+                        this.formModel.targetDeviceCode = resp.data.targetDeviceCode ? resp.data.targetDeviceCode : '';
+                    });
                 }
             }
             if (selected._type) {
@@ -351,10 +361,6 @@ export default {
             this.sendCommand(setp);
         },
         handleCollocation() { // 设置托管
-            if (!this.formModel.driveForward && !this.formModel.targetDeviceCode) {
-                this.$message.error('请选择向前行驶或目的地');
-                return;
-            }
             const setp = {
                 over: true,
                 operation: menuOperate.Common.collocation.operation,
@@ -363,7 +369,7 @@ export default {
                     groupNumber: this.groupNumber,
                     param: {
                         speedLimit: this.formModel.speedLimit,
-                        driveForward: this.formModel.driveForward,
+                        through: this.formModel.through,
                         targetDeviceCode: this.formModel.targetDeviceCode
                     }
                 }
@@ -402,18 +408,13 @@ export default {
             });
         },
         deviceSelect(em) {
-            if (this.field == 'selectedCode' && em._type == 'Section' && !this.formModel.driveForward) {
+            if (this.field == 'selectedCode' && em._type == 'Section') {
                 this.formModel.targetDeviceCode = em.code;
                 // this.field = '';
-            } else if (this.field == 'selectedCode' && em._type == 'Train' && !this.formModel.driveForward) {
+            } else if (this.field == 'selectedCode' && em._type == 'Train') {
                 this.formModel.targetDeviceCode = em.code;
                 // this.field = '';
             }
-        },
-        driveForwardChange(val) {
-            if (val) {
-                this.formModel.targetDeviceCode = '';
-            }
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index f3d9d519e..29f692fd3 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -193,10 +193,10 @@ export default {
                     label: '越红灯行驶',
                     handler: this.handleOverEedLight
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '驾驶',
                     handler: this.handleDriveTo
diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
index fa3ce3e46..fc232cea6 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
@@ -150,10 +150,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
index 8822f8371..ef46aeb00 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
@@ -124,10 +124,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
index 17fda2138..c09e266bc 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
@@ -91,10 +91,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
index 09c4226d9..79b9e8e0b 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
@@ -91,10 +91,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index 4c7737123..237f4f6de 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -230,10 +230,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
index d7f5b1db1..32f5cc2a6 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
@@ -231,10 +231,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue
index c7cb4a6e5..bdd0956ac 100644
--- a/src/jmapNew/theme/race_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue
@@ -233,10 +233,10 @@ export default {
                     label: '确认运行至前方站',
                     handler: this.nextStation
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '越引导信号行驶',
                     handler: this.handleOverFuideSignal
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index 3da87a5ad..71a6e33ef 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -175,10 +175,10 @@ export default {
                             label: '开关门',
                             handler: this.handleOpenOrCloseDoor
                         },
-                        {
-                            label: '限速指令',
-                            handler: this.handleSpeedLimit
-                        },
+                        // {
+                        //     label: '限速指令',
+                        //     handler: this.handleSpeedLimit
+                        // },
                         {
                             label: '换端',
                             handler: this.handleTurnDirection
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index a3d956b58..c83de0af9 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -253,10 +253,10 @@ export default {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                {
-                    label: '限速指令',
-                    handler: this.handleSpeedLimit
-                },
+                // {
+                //     label: '限速指令',
+                //     handler: this.handleSpeedLimit
+                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection

From 2548337fc7f7993c508927d91461bafa665347b5 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 26 Jul 2022 17:43:10 +0800
Subject: [PATCH 36/37] =?UTF-8?q?=E8=BD=A6=E5=8A=A1=E7=BB=88=E7=AB=AF=20?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85ctc=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/views/newMap/mapsystemNew/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/newMap/mapsystemNew/index.vue b/src/views/newMap/mapsystemNew/index.vue
index 13360dbce..e8d8631b5 100644
--- a/src/views/newMap/mapsystemNew/index.vue
+++ b/src/views/newMap/mapsystemNew/index.vue
@@ -118,11 +118,11 @@ export default {
         async subscribe() {
             this.clearSubscribe();
             const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
-            creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
-            creatSubscribe(getTopic('STATE', this.$route.query.group), header);
+            await creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
+            await creatSubscribe(getTopic('STATE', this.$route.query.group), header);
             // if (this.$route.query.ctc == 'true') {
             if (this.$route.query.lineCode == '16') {
-                creatSubscribe(getTopic('CTC', this.$route.query.group), header);
+                await creatSubscribe(getTopic('CTC', this.$route.query.group), header);
             }
             // $route.query.lineCode === '16';
             // if (this.$route.query.dispatcherStation == 'true') {
@@ -133,9 +133,9 @@ export default {
         async subscribeNew() {
             this.clearSubscribeNew();
             const header = { 'X-Token': getToken() };
-            creatSubscribe(getTopic('ATS', this.$route.query.group), header);
-            creatSubscribe(getTopic('SYSTIME', this.$route.query.group), header);
-            creatSubscribe(getTopic('STATE', this.$route.query.group), header);
+            await creatSubscribe(getTopic('ATS', this.$route.query.group), header);
+            await creatSubscribe(getTopic('SYSTIME', this.$route.query.group), header);
+            await creatSubscribe(getTopic('STATE', this.$route.query.group), header);
             await this.$store.dispatch('training/setHasSubscribed');
         },
         clearSubscribeNew() {

From 84c78ef8e4fbc9cb033537a369fd7fe53c766e6d Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 26 Jul 2022 18:05:11 +0800
Subject: [PATCH 37/37] =?UTF-8?q?=E5=88=97=E8=BD=A6=20=E6=95=85=E9=9A=9C?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=81=9C=E8=BD=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/menus/dialog/trainStop.vue     | 133 ++++++++++++++++++
 .../theme/components/utils/menuOperate.js     |   4 +
 .../theme/datie_02/menus/menuTrain.vue        |  20 ++-
 .../theme/datie_jd1a/menus/menuTrain.vue      |  20 ++-
 src/scripts/cmdPlugin/CommandEnum.js          |   3 +-
 src/scripts/cmdPlugin/CommandHandler.js       |   4 +
 src/scripts/cmdPlugin/OperationHandler.js     |   6 +
 7 files changed, 165 insertions(+), 25 deletions(-)
 create mode 100644 src/jmapNew/theme/components/menus/dialog/trainStop.vue

diff --git a/src/jmapNew/theme/components/menus/dialog/trainStop.vue b/src/jmapNew/theme/components/menus/dialog/trainStop.vue
new file mode 100644
index 000000000..690a5334f
--- /dev/null
+++ b/src/jmapNew/theme/components/menus/dialog/trainStop.vue
@@ -0,0 +1,133 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :class="popClass"
+    class="stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="340px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="80px" :model="addModel" @submit.native.prevent>
+      <div style="width: 96%;">
+        <el-form-item label="是否EB:" label-width="95px" prop="speedLimit">
+          <div style="display: flex;align-items: center;">
+            <el-checkbox v-model="addModel.eb" />
+          </div>
+        </el-form-item>
+      </div>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button @click="doClose">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" :pop-class="popClass" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import NoticeInfo from '../childDialog/noticeInfo';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+export default {
+    name: 'TrainAddPlan',
+    components: {
+        NoticeInfo
+    },
+    props: {
+        popClass: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            selected: {},
+            addModel: {
+                eb: false // 限速值
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'memberList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return '输入限速值';
+        }
+    },
+    watch:{
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.dialogShow && this.popClass === 'ningbo-01__systerm') {
+                this.commit();
+            }
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            this.groupNumber = selected.groupNumber;
+            this.addModel = { eb:false };
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$root.$emit('dialogClose', this.selected);
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    console.log(this.groupNumber, '----------');
+                    commitOperate(menuOperate.Train.driverStop, {groupNumber:this.groupNumber, eb: this.addModel.eb}, 3)
+                        .then(({ valid }) => {
+                            this.loading = false;
+                            if (valid) {
+                                this.doClose();
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                            this.doClose();
+                            this.$refs.noticeInfo.doShow();
+                        });
+                } else {
+                    return false;
+                }
+            });
+        }
+    }
+};
+</script>
+<style scoped>
+    .foshan-01__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index 47b96f37a..a403394e5 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -526,6 +526,10 @@ export const menuOperate = {
             // 删车次号 (大铁线路 车组号)
             operation: OperationEvent.Train.removeTrip.menu.operation,
             cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE
+        },
+        driverStop: {
+            operation: OperationEvent.Train.driverStop.menu.operation,
+            cmdType: CMD.Driver.CMD_DRIVER_STOP
         }
     },
     CTC: {
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index 29f692fd3..e084d7e15 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -10,6 +10,7 @@
     <train-detail-info ref="trainDetailInfo" />
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
     <speed-limit ref="speedLimit" pop-class="chengdou-03__systerm" />
+    <train-stop ref="trainStop" pop-class="chengdou-03__systerm" />
     <!-- <train-set-plan ref="trainSetPlan" /> -->
     <update-trip ref="updateTrip" />
   </div>
@@ -35,6 +36,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
+import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
 
 export default {
     name: 'MenuTrain',
@@ -49,7 +51,8 @@ export default {
         TrainDetailInfo,
         SetFault,
         UpdateTrip,
-        SpeedLimit
+        SpeedLimit,
+        TrainStop
         // TrainSetPlan
     },
     mixins: [
@@ -585,18 +588,11 @@ export default {
             });
         },
         handleParkingTrain() {
-            const group = this.$route.query.group;
-            const param = {
-                commandType: 'Parking_Train',
-                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-                params: {}
-            };
-            commitTrainSend(group, param).then(({valid, operate}) => {
-            }).catch((error)=> {
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
+            commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.trainStop.doShow(operate, this.selected);
+                }
             });
-
         },
         modifyTripNumber() {
             commitOperate(menuOperate.Train.updateTrip, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
index 8762e5015..368493192 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
@@ -11,6 +11,7 @@
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
     <!-- <train-set-plan ref="trainSetPlan" /> -->
     <update-trip ref="updateTrip" />
+    <train-stop ref="trainStop" pop-class="chengdou-03__systerm" />
   </div>
 </template>
 
@@ -33,6 +34,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
+import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
 
 export default {
     name: 'MenuTrain',
@@ -46,7 +48,8 @@ export default {
         TrainDeleteNumber,
         TrainDetailInfo,
         SetFault,
-        UpdateTrip
+        UpdateTrip,
+        TrainStop
         // TrainSetPlan
     },
     mixins: [
@@ -572,18 +575,11 @@ export default {
             });
         },
         handleParkingTrain() {
-            const group = this.$route.query.group;
-            const param = {
-                commandType: 'Parking_Train',
-                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-                params: {}
-            };
-            commitTrainSend(group, param).then(({valid, operate}) => {
-            }).catch((error)=> {
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
+            commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.trainStop.doShow(operate, this.selected);
+                }
             });
-
         },
         modifyTripNumber() {
             commitOperate(menuOperate.Train.updateTrip, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 6d3c55853..601fb8d72 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -91,7 +91,8 @@ export default {
         CMD_DRIVER_PRESELECTION_MODE_UP:{value:'Driver_Preselection_Mode_Up', label:'列车预选模式升'},
         CMD_DRIVER_DOOR_MODE:{value:'Driver_Door_Mode', label:'列车门模式'},
         CMD_DRIVER_DOOR_SELECTION:{value:'Driver_Door_Selection', label:'列车门选择'},
-        CMD_DRIVER_CONFIRM:{value:'Driver_Confirm', label:'确认'}
+        CMD_DRIVER_CONFIRM:{value:'Driver_Confirm', label:'确认'},
+        CMD_DRIVER_STOP:{value: 'Driver_Stop', label: '停车'}
     },
 
     // 信号机操作
diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js
index b214fe522..768043571 100644
--- a/src/scripts/cmdPlugin/CommandHandler.js
+++ b/src/scripts/cmdPlugin/CommandHandler.js
@@ -73,6 +73,10 @@ class CommandHandle {
                 Train_Calculate_Interval: {
                     operate: 'Train_Calculate_Interval',
                     paramList: [{name: 'calculateParam'}]
+                },
+                Driver_Stop: {
+                    operate: 'Driver_Stop',
+                    paramList: [{name: 'groupNumber'}, {name: 'eb'}]
                 }
             }
         };
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 24d152d7b..765385b35 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -3431,6 +3431,12 @@ export const OperationEvent = {
                 operation: '70v',
                 domId: '_Tips-Train-removeTrip-Menu'
             }
+        },
+        driverStop: {
+            menu: {
+                operation: '70w',
+                domId: '_Tips-Train-driverStop-Menu'
+            }
         }
     },