whyczyk
2021-05-25 17f9722fb23200c964d0c2d36d2025d552f2a3db
负载点列表组件优化
2个文件已修改
84 ■■■■■ 已修改文件
src/components/smallModule/stepList.vue 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/test/dialog/LoadTestDialog.vue 47 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/smallModule/stepList.vue
@@ -58,11 +58,10 @@
        },
        data() {
            return {
                startArr: [],
                endArr: [],
                endTextArr: []
            }
        },
        computed: {
            status() {
                let data = this.data;
@@ -93,19 +92,31 @@
                        break;
                }
                return sizeClass;
            },
            startArr() {
                let data = this.data;
                if (data.start && data.start.indexOf("&&") != -1) {
                    return data.start.split("&&")
            }
                return []
            },
            endArr() {
                let data = this.data;
                if (data.end && data.end.indexOf("&&") != -1) {
                    return data.end.split("&&")
                }
                return []
            },
            endTextArr() {
                let data = this.data;
                if (data.endText && data.endText.indexOf("&&") != -1) {
                    return data.endText.split("&&")
                }
                return []
            },
        },
        mounted() {
            let data = this.data;
            if (data.start && data.start.indexOf("\n") != -1) {
                this.startArr = data.start.split("\n")
            }
            if (data.end && data.end.indexOf("\n") != -1) {
                this.endArr = data.end.split("\n")
            }
            if (data.endText && data.endText.indexOf("\n") != -1) {
                this.endTextArr = data.endText.split("\n")
            }
        }
    }
</script>
src/pages/test/dialog/LoadTestDialog.vue
@@ -1,12 +1,9 @@
<template>
    <div class="el-dialog-wrapper">
        <el-dialog
            :visible.sync="dialogVisible" class="position-absolute dialog-center dialog-no-header" width="840px"
        <el-dialog :visible.sync="dialogVisible" class="position-absolute dialog-center dialog-no-header" width="840px"
            top="0" :modal="false" :destroy-on-close="true" :close-on-press-escape="false" :close-on-click-modal="false"
            :modal-append-to-body="false"
            v-loading="loading" element-loading-text="拼命加载中"
            element-loading-spinner="el-icon-loading"
            element-loading-background="rgba(0, 0, 0, 0)">
            :modal-append-to-body="false" v-loading="loading" element-loading-text="拼命加载中"
            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0)">
            <mw-step v-model="step"></mw-step>
            <div class="step-list">
                <div class="step-item" v-show="step == 0">
@@ -21,23 +18,18 @@
                </div>
            </div>
        </el-dialog>
        <el-dialog
            :visible.sync="testStepCheck" class="position-absolute dialog-center dialog-no-header"
            width="840px" top="0"
            :modal="false" :destroy-on-close="true"
            :close-on-press-escape="false" :close-on-click-modal="false"
        <el-dialog :visible.sync="testStepCheck" class="position-absolute dialog-center dialog-no-header" width="840px"
            top="0" :modal="false" :destroy-on-close="true" :close-on-press-escape="false" :close-on-click-modal="false"
            :modal-append-to-body="false">
            <test-start :type="type" @startTest="startTest" v-if="testStepCheck"></test-start>
        </el-dialog>
        <el-dialog
            :visible.sync="startResult" class="position-absolute dialog-center dialog-no-header"
            width="840px" top="0"
            :modal="false" :destroy-on-close="true"
            :close-on-press-escape="false" :close-on-click-modal="false"
        <el-dialog :visible.sync="startResult" class="position-absolute dialog-center dialog-no-header" width="840px"
            top="0" :modal="false" :destroy-on-close="true" :close-on-press-escape="false" :close-on-click-modal="false"
            :modal-append-to-body="false">
            <heating-up-rs :list="heatingUpList" @updatePoint="updatePoint"></heating-up-rs>
        </el-dialog>
        <test-step-dialog :type="type" :step="testStepKey" :list="list" :end="endStep" :progress="progressStep"></test-step-dialog>
        <test-step-dialog :type="type" :step="testStepKey" :list="list" :end="endStep" :progress="progressStep">
        </test-step-dialog>
    </div>
</template>
@@ -48,10 +40,19 @@
import TestStepConfirm from "@/pages/test/dialog/testStepConfirm";
import testStepConfirmKz from "@/pages/test/dialog/testStepConfirmKz";
import TestStart from "@/pages/test/dialog/testStart";
import {addKzFzTest, experimentPoint, getExitTest, testHeatingUp} from "@/pages/test/js/api";
    import {
        addKzFzTest,
        experimentPoint,
        getExitTest,
        testHeatingUp
    } from "@/pages/test/js/api";
import HeatingUpRs from "@/pages/test/dialog/heatingUpRs";
import {getLabel} from "@/assets/js/tools";
import {constTestType} from "@/pages/test/js/const";
    import {
        getLabel
    } from "@/assets/js/tools";
    import {
        constTestType
    } from "@/pages/test/js/const";
import Timeout from "@/assets/js/tools/Timeout";
import TestStepDialog from "@/pages/test/dialog/testStepDialog";
@@ -147,9 +148,9 @@
                    data = rs.data.map(item => {
                        let start = item.startTime?new Date(item.startTime).format("hh:ss"):'';
                        let end = item.endTime?new Date(item.endTime).format("hh:ss"):'';
                        item.start = item.startTime ? `开始时间\n${start}`: '';
                        item.end = item.endTime ? `完成时间\n${end}`: '';
                        item.endText = item.averagePower ? `平均功率\n${item.averagePower}kW` : '';
                            item.start = item.startTime ? `开始时间&&${start}` : '';
                            item.end = item.endTime ? `完成时间&&${end}` : '';
                            item.endText = item.averagePower ? `平均功率&&${item.averagePower}kW` : '';
                        return item;
                    });
                }