Merge remote-tracking branch 'origin/develop' into local-test

成都三号线现地仿真无特殊操作调整
实训测验统计得分调整
2024-09-24 10:59:32 +08:00 · 2024-09-24 10:59:08 +08:00 · 2024-09-18 14:00:17 +08:00
2 changed files with 8 additions and 0 deletions
--- a/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue
@ -2,7 +2,14 @@
  <div class="menus" :style="{width: width + 'px'}">
    <menu-bar ref="menuBar" :selected="selected" />
    <menu-button ref="menuButton" />
+
+	<menu-station-stand ref="menuStationStand" :selected="selected" :work="'localWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'localWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'localWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'localWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'localWork'" />
    <menu-train ref="menuTrain" :selected="selected" :work="'localWork'" />
+
  </div>
 </template>
 <script>
--- a/src/views/newMap/display/trainingList/testResult.vue
+++ b/src/views/newMap/display/trainingList/testResult.vue
@ -80,6 +80,7 @@ export default {
                        });
                    }
                    sums[index] = total;
+                    sums[index] = total;
                } else if (index === 3) {
                    const values = data.map(item => Number(item[column.property]));
                    sums[index] = values.reduce((prev, curr) => {
Author	SHA1	Message	Date
joylink_fanyuhong	e2e7e9d564	Merge remote-tracking branch 'origin/develop' into local-test Some checks failed local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 7m40s Details	2024-09-24 10:59:32 +08:00
joylink_fanyuhong	cbdfc57243	成都三号线现地仿真无特殊操作调整	2024-09-24 10:59:08 +08:00
joylink_fanyuhong	5c81fc4dcf	实训测验统计得分调整	2024-09-18 14:00:17 +08:00