he wei
2021-09-03 9b51db4a927f46a65f390d7ec8b01b76431f3209
U 一体机进度
2个文件已修改
66 ■■■■■ 已修改文件
public/theme/science-blue.css 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/historyAio.vue 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/theme/science-blue.css
@@ -927,6 +927,6 @@
}
.dialog-table {
  background: url("./img/science-blue/dw_bg.jpg") no-repeat;
  /* background: url("./img/science-blue/dw_bg.jpg") no-repeat; */
  background-size: 100% 100%;
}
src/pages/dataTest/historyAio.vue
@@ -186,7 +186,7 @@
                            {{item.file_name}}: {{item.stateTxt}}
                            <div
                                :class="['progress-bar', {'progress__bar--yellow': item.percent < 30, 'progress__bar--blue': item.percent >= 30 && item.percent < 60, 'progress__bar--green': item.percent >= 60 && item.percent < 100, 'progress--complete': item.percent >= 100}]"
                                :type="item.type"><span>{{item.percent}}%</span>
                                :type="item.type"><span>{{item.percent}}%{{item.now_block}}--{{item.total_block}}--{{item.state1}}</span>
                            </div>
                        </div>
                    </el-col>
@@ -242,20 +242,20 @@
            :visible.sync="table.show"
            width="800"
            >
            <el-table
                :data="table.data"
                stripe
                height="540"
                style="width: 100%">
                <el-table-column
                    v-for="(item, idx) in table.header"
                    :key="'header_' + idx"
                    :prop="item.prop"
                    :label="item.label"
                    :min-width="item.minWidth"
                    >
                </el-table-column>
            </el-table>
                <el-table
                    :data="table.data"
                    stripe
                    height="540"
                    style="width: 100%">
                    <el-table-column
                        v-for="(item, idx) in table.header"
                        :key="'header_' + idx"
                        :prop="item.prop"
                        :label="item.label"
                        :min-width="item.minWidth"
                        >
                    </el-table-column>
                </el-table>
        </el-dialog>
         <div id="allGraph">
            <div class="chart-contain">
@@ -396,6 +396,7 @@
    '3': '放电',
    '4': '活化'
};
export default {
    data () {
        let baseURL = this.$axios.defaults.baseURL;
@@ -1889,10 +1890,13 @@
                        // 1;  //下载文件
                        // 2;  //生成文件
                        // 3;  //导出数据
                        if (state <= 1) {
                            percent = now_block == 0 ? 0 : (now_block / total_block * 60).toHold(2);
                        // 用户终止的状态为6(导数据库时停止), 7(下载文件时停止)
                        if (state <= 1 || 7 == state) {
                            // percent = now_block == 0 ? 0 : (now_block / total_block * 60).toHold(2);
                            percent = now_block == 0 ? 0 : (now_block / total_block * 60);
                        } else {
                            percent = (now_block == 0 ? 0 : (now_block / total_block * 40).toHold(2)) + 60;
                            // percent = (now_block == 0 ? 0 : (now_block / total_block * 40).toHold(2)) + 60;
                            percent = (now_block == 0 ? 0 : (now_block / total_block * 40)) + 60;
                        }
                        if (fileName && flag != 0) {
                            list.push({
@@ -1900,7 +1904,11 @@
                                state: flag,
                                type: TYPE[flag],
                                stateTxt: STATE[flag],
                                percent: percent
                                percent: percent.toFixed(2)
                                ,now_block
                                ,total_block
                                ,state1: state
                            });
                        }
                    }
@@ -2306,13 +2314,13 @@
    /* opacity: 0; */
    /* border: 1px solid; */
    border-radius: 4px;
    background-size: 100px 30px, 130px 30px, 130px 30px;
    background-size: 0 0, 130px 30px, 130px 30px;
    background-position: -20% center, right center, left center;
    background-repeat: no-repeat, no-repeat, no-repeat;
    -webkit-transition: opacity 0.2s ease, width 0.8s ease-out, background-color 1s ease, border-color 0.3s ease, box-shadow 1s ease;
            transition: opacity 0.2s ease, width 0.8s ease-out, background-color 1s ease, border-color 0.3s ease, box-shadow 1s ease;
    -webkit-animation: pulse 2s ease-out infinite;
            animation: pulse 2s ease-out infinite;
    -webkit-animation: pulse 2s linear infinite;
            animation: pulse 2s linear infinite;
    background-color: rgba(85, 182, 101, 0.95);
    /* --color: rgba(85, 182, 101, 0.95); */
    background-image: -webkit-linear-gradient(0deg,  10%,  30%,  70%,  80%,  90%)
@@ -2336,10 +2344,10 @@
.progress__bar--yellow {
    background-color: rgba(232, 158, 0, 0.95);
    /* --color: rgba(232, 158, 0, 0.95); */
    background-image: -webkit-linear-gradient(0deg, rgba(255, 174, 2, 0) 10%, rgba(255, 183, 28, 0.8) 30%, #ffd375 70%, rgba(255, 183, 28, 0.8) 80%, rgba(255, 174, 2, 0) 90%)
    background-image: -webkit-linear-gradient(left, transparent 60%, #fff 100%)
        ,-webkit-linear-gradient(left, rgba(255, 191, 54, 0) 0%, #ffbf36 100%)
        ,-webkit-linear-gradient(right, rgba(255, 191, 54, 0) 0%, #ffbf36 100%);
    background-image: linear-gradient(90deg, rgba(255, 174, 2, 0) 10%, rgba(255, 183, 28, 0.8) 30%, #ffd375 70%, rgba(255, 183, 28, 0.8) 80%, rgba(255, 174, 2, 0) 90%)
    background-image: linear-gradient(left, transparent 60%, #fff 100%)
        ,linear-gradient(to right, rgba(255, 191, 54, 0) 0%, #ffbf36 100%)
        ,linear-gradient(to left, rgba(255, 191, 54, 0) 0%, #ffbf36 100%);
    border-color: #ffc74f;
@@ -2348,10 +2356,10 @@
.progress__bar--green {
    background-color: rgba(0, 178, 23, 0.95);
    /* --color: rgba(0, 178, 23, 0.95); */
    background-image: -webkit-linear-gradient(0deg, rgba(0, 203, 26, 0) 10%, rgba(0, 229, 30, 0.8) 30%, #67fa7b 70%, rgba(0, 229, 30, 0.8) 80%, rgba(0, 203, 26, 0) 90%)
    background-image: -webkit-linear-gradient(left, transparent 60%, #fff 100%)
        ,-webkit-linear-gradient(left, rgba(0, 254, 33, 0) 0%, #00fe21 100%)
        ,-webkit-linear-gradient(right, rgba(0, 254, 33, 0) 0%, #00fe21 100%);
    background-image: linear-gradient(90deg, rgba(0, 203, 26, 0) 10%, rgba(0, 229, 30, 0.8) 30%, #67fa7b 70%, rgba(0, 229, 30, 0.8) 80%, rgba(0, 203, 26, 0) 90%)
    background-image: linear-gradient(left, transparent 60%, #fff 100%)
        ,linear-gradient(to right, rgba(0, 254, 33, 0) 0%, #00fe21 100%)
        ,linear-gradient(to left, rgba(0, 254, 33, 0) 0%, #00fe21 100%);
    border-color: #19ff37;
@@ -2360,10 +2368,10 @@
.progress__bar--blue {
    background-color: rgba(18, 135, 204, 0.95);
    /* --color: rgba(18, 135, 204, 0.95); */
    background-image: -webkit-linear-gradient(0deg, rgba(20, 151, 227, 0) 10%, rgba(37, 162, 236, 0.8) 30%, #7dcbf8 70%, rgba(37, 162, 236, 0.8) 80%, rgba(20, 151, 227, 0) 90%)
    background-image: -webkit-linear-gradient(left, transparent 60%, #fff 100%)
        ,-webkit-linear-gradient(left, rgba(61, 172, 238, 0) 0%, #3dacee 100%)
        ,-webkit-linear-gradient(right, rgba(61, 172, 238, 0) 0%, #3dacee 100%);
    background-image: linear-gradient(90deg, rgba(20, 151, 227, 0) 10%, rgba(37, 162, 236, 0.8) 30%, #7dcbf8 70%, rgba(37, 162, 236, 0.8) 80%, rgba(20, 151, 227, 0) 90%)
    background-image: linear-gradient(left, transparent 60%, #fff 100%)
        ,linear-gradient(to right, rgba(61, 172, 238, 0) 0%, #3dacee 100%)
        ,linear-gradient(to left, rgba(61, 172, 238, 0) 0%, #3dacee 100%);
    border-color: #54b6f0;