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

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>

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) => {