修改内容

whychdw

2021-06-04 d9e071c5362a1de5834ae12c9fe78264d9789430

修改内容

 src/pages/test/closeTest.vue

File was deleted

 src/pages/test/dialog/closeTest.vue

New file
@@ -0,0 +1,115 @@
<template>
    <complete-test-dialog :visible="visible"></complete-test-dialog>
</template>

<script>
import axios from "@/assets/js/axios";
import CompleteTestDialog from "@/pages/test/dialog/completeTestDialog";
import {completeTest} from "@/pages/test/js/api";

export default {
    name: "closeTest",
    components: {CompleteTestDialog},
    model: {
        prop: 'close',
        event: 'changeClose'
    },
    props: {
        id: {
            type: [String, Number],
            default: "",
        },
        close: {
            type: Boolean,
            default: false,
        },
    },
    data() {
        return {
            visible: false,
        }
    },
    watch: {
      close(close) {
          if(close) {
              this.showConfirm();
          }
      }
    },
    methods: {
        showConfirm() {
            if(!this.id) {
                this.$layer.msg("未获取试验信息");
                this.$emit("changeClose", false);
                return;
            }
            this.$prompt("请输入密码", "系统提示", {
                inputType: "password",
            }).then(({value})=>{
                this.$emit("changeClose", false);
                this.checkPwd(value);
            }).catch(error=>{

            });
        },
        // 检测密码
        checkPwd(password) {
            let userName = this.username;
            if(!userName) {
                this.$layer.msg("未获取到用户名");
                return;
            }

            // 设置参数
            let params = {
                userName,
                password,
            };
            axios({
                method: "POST",
                url: "/login/login",
                params: params
            }).then((res) => {
                let rs = res.data;
                if(rs.code) {
                    // 完成试验
                    this.completeTest();
                }else {
                    this.$layer.msg("密码错误");
                }

            });
        },
        completeTest() {
            let experimentId = this.id;
            completeTest(experimentId).then(res=>{
                let rs = res.data;
                if(rs.code == 1) {
                    this.visible = true;
                }else {
                    this.$layer.msg("完成试验失败！");
                }
            }).catch(error=>{

            });
        }
    },
    computed: {
        username() {
            let username = this.$store.state.user.username;
            console.log(username);
            return username?username:"";
        }
    },
    mounted() {

    },
    destroyed() {

    }
}
</script>

<style scoped>

</style>

 src/pages/test/loadTest.vue

@@ -202,7 +202,7 @@
                        </div>
                        <div class="stepBtnCon">
                            <el-button type="primary" size="mini">查看结果</el-button>
                            <el-button type="primary" size="mini">关闭试验</el-button>
                            <el-button type="primary" size="mini" @click="closeTest=true">关闭试验</el-button>
                            <el-button type="primary" size="mini" :disabled="!progressStep" @click="nextStepTest">下步试验</el-button>
                        </div>
                    </div>
@@ -213,6 +213,7 @@
        <mw-drawer :visible.sync="drawer">
            <pre-option-list :type="type" v-if="drawer"></pre-option-list>
        </mw-drawer>
        <close-test v-model="closeTest" :id="experimentId"></close-test>
    </div>
</template>

@@ -229,11 +230,13 @@
import {stopTestPoint} from "@/pages/test/js/api";
import MwDrawer from "@/components/smallModule/mwDrawer";
import PreOptionList from "@/components/smallModule/preOptionList";
import CloseTest from "@/pages/test/dialog/closeTest";

let diagram;
export default {
    name: 'loadTest',
    components: {
        CloseTest,
        LoadTestDialog,
        barChart,
        StatusModule,
@@ -257,6 +260,7 @@
            value1: true,
            value2: true,
            value3: true,
            closeTest: false,
            statusList1: [
                {
                    text: '运行中',
@@ -486,6 +490,10 @@
            });
        },
        updateList(list) {
            if(list && list.length>0) {
                let item = list[0];
                this.experimentId = item.experimentId;
            }
            this.list = list;
        },
        nextStepTest() {

 src/pages/test/noLoadTest.vue

@@ -198,7 +198,7 @@
                        </div>
                        <div class="stepBtnCon">
                            <el-button type="primary" size="mini">查看结果</el-button>
                            <el-button type="primary" size="mini">关闭试验</el-button>
                            <el-button type="primary" size="mini" @click="closeTest=true">关闭试验</el-button>
                            <el-button type="primary" size="mini" :disabled="!progressStep" @click="nextStepTest">下步试验</el-button>
                        </div>
                    </div>
@@ -209,6 +209,7 @@
        <mw-drawer :visible.sync="drawer">
            <pre-option-list :type="type" v-if="drawer"></pre-option-list>
        </mw-drawer>
        <close-test v-model="closeTest" :id="experimentId"></close-test>
    </div>
</template>

@@ -227,10 +228,12 @@
import {stopTestPoint} from "@/pages/test/js/api";
import MwDrawer from "@/components/smallModule/mwDrawer";
import PreOptionList from "@/components/smallModule/preOptionList";
import CloseTest from "@/pages/test/dialog/closeTest";

let diagram;
export default {
    components: {
        CloseTest,
        PreOptionList,
        MwDrawer,
        barChart,
@@ -279,6 +282,7 @@
            value1: true,       // AFE变频器水冷
            value2: true,       // 受试电机水冷
            value3: true,       // 测工电机水冷
            closeTest: false,
            speedValue: 0,
            nbmspeedValue: 0,
            VFValue: 10,
@@ -328,6 +332,7 @@
                color: '#666ee8',
                status: true
            }],
            experimentId: 0,
            list: [],
            drawer: false,
        }
@@ -387,6 +392,10 @@
            });
        },
        updateList(list) {
            if(list && list.length>0) {
                let item = list[0];
                this.experimentId = item.experimentId;
            }
            this.list = list;
        },
        nextStepTest() {