Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 7m40s
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 7m40s
This commit is contained in:
commit
e2e7e9d564
@ -2,7 +2,14 @@
|
|||||||
<div class="menus" :style="{width: width + 'px'}">
|
<div class="menus" :style="{width: width + 'px'}">
|
||||||
<menu-bar ref="menuBar" :selected="selected" />
|
<menu-bar ref="menuBar" :selected="selected" />
|
||||||
<menu-button ref="menuButton" />
|
<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'" />
|
<menu-train ref="menuTrain" :selected="selected" :work="'localWork'" />
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
@ -80,6 +80,7 @@ export default {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
sums[index] = total;
|
sums[index] = total;
|
||||||
|
sums[index] = total;
|
||||||
} else if (index === 3) {
|
} else if (index === 3) {
|
||||||
const values = data.map(item => Number(item[column.property]));
|
const values = data.map(item => Number(item[column.property]));
|
||||||
sums[index] = values.reduce((prev, curr) => {
|
sums[index] = values.reduce((prev, curr) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user