Squashed commit of the following:

commit 30763300ac
Author: dong <58670809@qq.com>
Date:   Wed Apr 12 18:31:39 2023 +0800

    修改前端配置带id

commit cde33feb22
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 18:07:47 2023 +0800

    宁波三进路选择表示样式不取消

commit 34a94e2c6d
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 17:58:11 2023 +0800

    区域选择界面调整

commit 52af1d994b
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 13:33:03 2023 +0800

    系统管理-教学考试数据管理

commit 6187b449c1
Author: dong <58670809@qq.com>
Date:   Fri Apr 7 15:22:33 2023 +0800

    代码调整

commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date:   Fri Mar 31 16:52:08 2023 +0800

    【删除注释】

src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue

@@ -30,9 +30,9 @@
             </template>
           </el-table-column>
           <el-table-column prop="name" label="车站名" align="center" width="100" :show-overflow-tooltip="true" />
-          <el-table-column prop="control" label="控制状态" align="center" width="70">
+          <el-table-column prop="controller" label="控制状态" align="center" width="70">
             <template slot-scope="scope">
-              <div>{{ getControlStatus(scope.row.code) }}</div>
+              <div>{{ getControlStatus(scope.row.controller) }}</div>
             </template>
           </el-table-column>
           <el-table-column prop="stationCode" label="" align="center">
@@ -93,9 +93,12 @@ export default {
         }
     },
     watch: {
-        '$store.state.map.mapStateLoadedCount': function () {
+        '$store.state.map.mapStationStateUpdateCount': function() {
             if (this.show) {
-                this.tableData = [...this.tableData];
+                this.tableData.forEach(item => {
+                    const station = this.$store.getters['map/getDeviceByCode'](item.code);
+                    item.controller = station.controller;
+                });
             }
         }
     },
@@ -122,24 +125,18 @@ export default {
                 this.memberId = this.$store.state.training.myMemberId;
                 const centralizedStationCode = this.stationCentralizedMap[this.$store.state.training.roleDeviceCode];
                 const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
-                this.$set(centralizedStation, 'apply', false);
+                const data = { code: centralizedStation.code, name: centralizedStation.name, apply: false, release: false, distribution: false, controller: null };
-                this.$set(centralizedStation, 'release', false);
+                this.tableData.push(data);
-                this.$set(centralizedStation, 'distribution', false);
-                this.tableData.push(centralizedStation);
                 centralizedStation.chargeStationCodeList.forEach(elem => {
                     const station = this.$store.getters['map/getDeviceByCode'](elem);
-                    this.$set(station, 'apply', false);
+                    const data1 = { code: station.code, name: station.name, apply: false, release: false, distribution: false, controller: null };
-                    this.$set(station, 'release', false);
+                    this.tableData.push(data1);
-                    this.$set(station, 'distribution', false);
-                    this.tableData.push(station);
                 });
             } else if (this.$store.state.training.roles === 'DISPATCHER') {
                 this.memberId = this.$store.state.training.myMemberId;
                 this.stationList.forEach(item => {
-                    this.$set(item, 'apply', false);
+                    const data = { code: item.code, name: item.name, apply: false, release: false, distribution: false, controller: null };
-                    this.$set(item, 'release', false);
+                    this.tableData.push(data);
-                    this.$set(item, 'distribution', false);
-                    this.tableData.push(item);
                 });
             }
             this.show = true;
@@ -154,9 +151,8 @@ export default {
                 }
             });
         },
-        getControlStatus(code) {
+        getControlStatus(controller) {
-            const newStation = this.$store.getters['map/getDeviceByCode'](code);
+            return controller === this.memberId ? '自控' : '未控';
-            return newStation.controller === this.memberId ? '自控' : '未控';
         },
         getDisabled(code, type) {
             const newStation = this.$store.getters['map/getDeviceByCode'](code);
@@ -172,9 +168,8 @@ export default {
             }
         },
         getController(station) {
-            const newStation = this.$store.getters['map/getDeviceByCode'](station.code);
+            if (station.controller) {
-            if (newStation.controller) {
+                const controller = this.$store.state.training.memberData[station.controller];
-                const controller = this.$store.state.training.memberData[newStation.controller];
                 return controller.label;
             } else {
                 return '';

src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue

@@ -324,6 +324,7 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
+            this.restoreBeforeDevices();
             this.$refs.table.setCurrentRow();
             this.$refs.endTable.setCurrentRow();
             this.$refs.singleTable.setCurrentRow();

src/views/system/frontProjectConfigManage/add.vue

@@ -85,7 +85,7 @@ export default {
                     this.loading = true;
                     const data = Object.assign({}, this.formModel);
                     // 检查项目markKey
-                    checkFrontProjectExist({markKey:data.markKey}).then(res=>{
+                    checkFrontProjectExist({markKey:data.markKey, id: data.id}).then(res=>{
                         if (!res.data) {
                             if (data.id) {
                                 // 更新前端项目配置

src/views/system/userExam/index.vue

@@ -39,6 +39,14 @@ export default {
                         config: {
                             data: this.$ConstSelect.examResultList
                         }
+                    },
+                    userMobile: {
+                        type: 'text',
+                        label: '手机号'
+                    },
+                    userId: {
+                        type: 'text',
+                        label: '用户Id'
                     }
                 }
 

src/views/system/userTraining/index.vue

@@ -35,6 +35,14 @@ export default {
                     userName: {
                         type: 'text',
                         label: this.$t('system.userName')
+                    },
+                    userMobile: {
+                        type: 'text',
+                        label: '手机号'
+                    },
+                    userId: {
+                        type: 'text',
+                        label: '用户Id'
                     }
                 }