Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
This commit is contained in:
@@ -112,15 +112,21 @@
|
|||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
<div class="page">
|
<div class="page">
|
||||||
<div class="loading-container">
|
<div class="black-container">
|
||||||
<el-progress
|
<!-- <el-progress-->
|
||||||
v-if="loading"
|
<!-- v-if="loading"-->
|
||||||
type="circle"
|
<!-- type="circle"-->
|
||||||
>
|
<!-- >-->
|
||||||
<template #default="{}">
|
<!-- <template #default="{}">-->
|
||||||
<span class="Loading">Loading</span>
|
<!-- <span class="Loading">Loading</span>-->
|
||||||
</template>
|
<!-- </template>-->
|
||||||
</el-progress>
|
<!-- </el-progress>-->
|
||||||
|
<div class="loading-container" v-if="showLoading">
|
||||||
|
<div style="width: 80%;height: 80%;" class="loading-box">
|
||||||
|
<Loading style="color: #003078;"/>
|
||||||
|
</div>
|
||||||
|
<div style="color:#fff;width: 80%;text-align: center;">Loading...</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style="margin-top: 10px;">
|
<div style="margin-top: 10px;">
|
||||||
<span>标准源加量输出:{{hour}}时{{minute}}分{{second}}秒</span>
|
<span>标准源加量输出:{{hour}}时{{minute}}分{{second}}秒</span>
|
||||||
@@ -175,7 +181,7 @@ import Tree from './tree.vue'
|
|||||||
import Commun from './communication.vue'
|
import Commun from './communication.vue'
|
||||||
import {type CascaderOption, ElMessage} from 'element-plus'
|
import {type CascaderOption, ElMessage} from 'element-plus'
|
||||||
import { getTreeData } from '@/api/check/test'
|
import { getTreeData } from '@/api/check/test'
|
||||||
import {CirclePlus, Delete, Check, CopyDocument, View, EditPen, VideoPlay,VideoPause} from '@element-plus/icons-vue'
|
import {CirclePlus, Delete, Check, CopyDocument, View, EditPen, VideoPlay, VideoPause, Loading} from '@element-plus/icons-vue'
|
||||||
import type { TestScript } from '@/api/device/interface/testScript'
|
import type { TestScript } from '@/api/device/interface/testScript'
|
||||||
import TestProjectPopup from '@/views/machine/testScript/components/testProjectPopup.vue'
|
import TestProjectPopup from '@/views/machine/testScript/components/testProjectPopup.vue'
|
||||||
import { CheckData } from '@/api/check/interface'
|
import { CheckData } from '@/api/check/interface'
|
||||||
@@ -233,7 +239,7 @@ const testProjectPopupRef = ref()
|
|||||||
const tableData: any = ref([])
|
const tableData: any = ref([])
|
||||||
const tabData: any = ref([])
|
const tabData: any = ref([])
|
||||||
|
|
||||||
const loading = ref(true)
|
const showLoading = ref(false)
|
||||||
const column = ref([
|
const column = ref([
|
||||||
{
|
{
|
||||||
label: 'L1',
|
label: 'L1',
|
||||||
@@ -426,6 +432,9 @@ const stopLoading = async () => {
|
|||||||
|
|
||||||
|
|
||||||
const startTimeCount = () => {
|
const startTimeCount = () => {
|
||||||
|
// Loading效果展示
|
||||||
|
showLoading.value = true
|
||||||
|
|
||||||
hour.value = 0
|
hour.value = 0
|
||||||
minute.value = 0
|
minute.value = 0
|
||||||
second.value = 0
|
second.value = 0
|
||||||
@@ -448,6 +457,8 @@ const stopTimeCount = () => {
|
|||||||
if (timer) {
|
if (timer) {
|
||||||
clearInterval(timer)
|
clearInterval(timer)
|
||||||
}
|
}
|
||||||
|
//Loading效果关闭
|
||||||
|
showLoading.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取左边树数据
|
// 获取左边树数据
|
||||||
@@ -553,7 +564,7 @@ defineExpose({
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
||||||
.loading-container {
|
.black-container {
|
||||||
background-color: #000;
|
background-color: #000;
|
||||||
width: 300px;
|
width: 300px;
|
||||||
height: 300px;
|
height: 300px;
|
||||||
@@ -561,6 +572,29 @@ defineExpose({
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
margin-left: 20px;
|
margin-left: 20px;
|
||||||
|
|
||||||
|
.loading-container{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-box {
|
||||||
|
animation: rotate 2s linear infinite;
|
||||||
|
font-size: 30px; /* 增大图标的大小 */
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes rotate {
|
||||||
|
from {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
transform: rotate(360deg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user