ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改样式

Browse Source
This commit is contained in:
GGJ
2024-12-05 15:22:46 +08:00
parent 8e2a22cf61
commit ea4edfadd0
10 changed files with 1619 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/ProTable/index.vue
View File

@@ -10,7 +10,7 @@
/>
<!-- 表格主体 -->
<div class='card table-main'>
<div class='table-main' :class='{ card: showCard }' >
<!-- 表格头部 操作按钮 -->
<div class='table-header'>
<div class='header-button-lf'>
@@ -126,6 +126,7 @@ export interface ProTableProps {
requestError?: (params: any) => void; // 表格 api 请求错误监听 ==> 非必传
dataCallback?: (data: any) => any; // 返回数据的回调函数，可以对数据进行处理 ==> 非必传
title?: string; // 表格标题 ==> 非必传
showCard?: boolean; // 下个是否需要卡片
pagination?: boolean; // 是否需要分页组件 ==> 非必传（默认为true）
initParam?: any; // 初始化请求参数 ==> 非必传（默认为{}）
border?: boolean; // 是否带有纵向边框 ==> 非必传（默认为true）
@@ -141,6 +142,7 @@ const props = withDefaults(defineProps<ProTableProps>(), {
pagination: true,
initParam: {},
border: true,
showCard: true,
toolButton: true,
rowKey: 'id',
searchCol: () => ({ xs: 1, sm: 2, md: 2, lg: 3, xl: 4 }),

68
frontend/src/styles/element.scss
View File

@@ -500,6 +500,18 @@
}
}
.el-message-box__headerbtn{
top: 5px;
}
.el-message-box__close{
svg{
color: #fff;
}
:hover{
color: #409eff;
}
}
.el-message-box__content{
padding: 10px ;
border-bottom: 1px solid #cccccc;
@@ -508,3 +520,59 @@
padding: 10px;}
}
.form-one {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.el-form-item {
display: flex;
width: 98%;
margin-bottom: 15px !important;
.el-form-item__content {
flex: 1;
.el-select,
.el-cascader,
.el-input__inner,
.el-date-editor {
width: 100%;
}
}
}
}
.form-two {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.el-form-item {
display: flex;
width: 48%;
.el-form-item__content {
flex: 1;
.el-select,
.el-cascader,
.el-input__inner,
.el-date-editor {
width: 100%;
}
}
}
}
.form-three {
display: flex;
flex-wrap: wrap;
// justify-content: space-between;
.el-form-item {
display: flex;
width: 32.3%;
.el-form-item__content {
flex: 1;
.el-select,
.el-cascader,
.el-input__inner,
.el-date-editor {
width: 100%;
}
}
}
}

52
frontend/src/views/home/components/channelsTest.vue
View File

@@ -8,31 +8,34 @@
<!-- <div>系数校准表</div> -->
<div>当前源输出为：Ua=Ub=Uc=57.74V Ia=Ib=Ic=1A； 电压误差为：±0.1Un%； 电流误差为：±0.5%</div>
<div>
<el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">通道系数已校准3台/共3台</el-button>
<el-button type="primary" :disabled="true" v-if="activeIndex === activeTotalNum">通道系数已校准3台/共3台</el-button>
<span style=" font-size: 18px;font-weight: 600;">
设备已合格 <span style="color: #67C23A">{{ qualified }}</span> 台/共 <span style="color: green">{{ total }}</span>
台
</span>
<!-- <el-button type="primary" loading
v-if="activeIndex > 0 && activeIndex < activeTotalNum">通道系数已校准3台/共3台</el-button>
<el-button type="primary" :disabled="true" v-if="activeIndex === activeTotalNum">通道系数已校准3台/共3台</el-button> -->
</div>
</div>
<div class="right-content">
<el-tabs type="border-card">
<el-empty description="暂无数据，等待检测开始" v-if="activeIndex === 0" />
<el-tab-pane label="被检设备1" v-if="activeIndex > 0">
<channelsTestTable
:tableData="tableData1"
></channelsTestTable>
<channelsTestTable :tableData="tableData1"></channelsTestTable>
</el-tab-pane>
<el-tab-pane label="被检设备2" v-if="activeIndex > 1">
<template #label>
<span class="custom-tabs-label">
<span>被检设备2</span>
<el-icon><Failed /></el-icon>
<el-icon>
<Failed />
</el-icon>
</span>
</template>
<channelsTestTable
:tableData="tableData2"></channelsTestTable>
<channelsTestTable :tableData="tableData2"></channelsTestTable>
</el-tab-pane>
<el-tab-pane label="被检设备3" v-if="activeIndex > 2">
<channelsTestTable
:tableData="tableData3"></channelsTestTable>
<channelsTestTable :tableData="tableData3"></channelsTestTable>
</el-tab-pane>
</el-tabs>
@@ -48,7 +51,8 @@ import { SuccessFilled,Failed } from '@element-plus/icons-vue'
const activeIndex = ref(0)
const activeTotalNum = ref(3)
const qualified = ref(0)
const total = ref(0)
const activities = [
{
@@ -254,24 +258,24 @@ const ts = ref('');
//监听goods_sn的变化
watch(testStatus, function (newValue, oldValue) {
ts.value = props.testStatus;
if(ts.value==='start')
{
if (ts.value === 'start') {
ts.value = 'process'
let timer = setInterval(() => {
if(activeIndex.value < activeTotalNum.value)
if (activeIndex.value < activeTotalNum.value) {
activeIndex.value++
else if(activeIndex.value === activeTotalNum.value)
{
qualified.value = activeIndex.value
}
else if (activeIndex.value === activeTotalNum.value) {
clearInterval(timer)
ts.value = 'success'
}
else
{
else {
clearInterval(timer)
ts.value = 'success'
}
total.value = activeTotalNum.value
}, 1000);
}
})
@@ -341,10 +345,12 @@ emit('update:testStatus',ts.value)
<style scoped>
.right-title {
display: flex;
flex-direction: row; /* 横向排列 */
flex-direction: row;
/* 横向排列 */
justify-content: space-between;
margin-bottom: 10px;
}
.right-content {
/* max-height: 400px; */
}
@@ -352,14 +358,20 @@ emit('update:testStatus',ts.value)
.custom-tabs-label .el-icon {
vertical-align: middle;
}
.custom-tabs-label span {
vertical-align: middle;
margin-left: 4px;
}
.dialog-content {
height: 472px;
}
.el-tabs--border-card {
height: 435px;
height: 425px;
}
.el-icon svg {
color: #ff7171;
}
</style>

6
frontend/src/views/home/components/channelsTestTable.vue
View File

@@ -1,11 +1,11 @@
<template>
<div class="table-container">
<div class="table-container table-main">
<el-table :data="tableData" :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" >
<el-table-column prop="id" label="序号" width="70" />
<el-table-column prop="updateTime" label="上送时刻" />
<el-table-column prop="deviceName" label="设备名称" />
<el-table-column prop="updateTime" label="上送时刻" width="180"/>
<!-- <el-table-column prop="deviceName" label="设备名称" /> -->
<el-table-column prop="MonitorIdx" label="监测点序号" />
<el-table-column label="电压通道" >

165
frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
View File

@@ -2,67 +2,58 @@
<el-dialog title="数据查询" :model-value='visible' @close="handleCancel" draggable height="650px" width="1165px">
<div class="change-errsys-dialog">
<div class="change-errsys-title">
<el-form :model='formContent'>
<el-row :gutter="24" >
<el-col :span="8">
<el-form :model='formContent' label-width="auto" class="form-three">
<el-form-item label="设备名称:">
<el-input v-model='deviceName' :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检测脚本:">
<el-input v-model='testScriptName' :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="数据处理原则:">
<el-input v-model='dataRule' :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" >
<el-col :span="8">
<el-form-item label="误差体系">
<el-form-item label="误差体系:">
<el-select v-model="error_Sys_Id" autocomplete="off">
<el-option
v-for="plan in testErrSystDataList"
:key="plan.id"
:label="plan.label"
:value="plan.id"
:disabled = "plan.label === errorSysName"
>
<el-option v-for="plan in testErrSystDataList" :key="plan.id" :label="plan.label" :value="plan.id"
:disabled="plan.label === errorSysName">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item >
<el-form-item label=" ">
<el-button type="primary" :icon="VideoPlay" @click="dealData">数据计算</el-button>
<el-button type="primary" :icon="Postcard" :disabled="reportDisabled" @click="openReportDlg">报告生成</el-button>
<el-button type="primary" :icon="Postcard" :disabled="reportDisabled"
@click="openReportDlg">报告生成</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="change-errsys-content">
<div class="tabs-title">
<el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">合格92项/共103项</el-button>
<el-button type="primary" v-if="activeIndex >= activeTotalNum" disabled>合格92项/共103项</el-button>
<!-- <el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">合格92项/共103项</el-button>
<el-button type="primary" v-if="activeIndex >= activeTotalNum" disabled>合格92项/共103项</el-button> -->
<span style=" font-size: 18px;font-weight: 600;">
设备已合格 <span style="color: #67C23A">{{ qualified }}</span> 台/共 <span style="color: green">{{ 103 }}</span>
台
</span>
</div>
<div class="dialog-content">
<el-table :data="tableData" row-key="id" height="545px" :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%" border>
<el-table :data="tableData" row-key="id" height="450px"
:header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' }" style="width: 100%"
border>
<el-table-column fixed prop="scriptItemName" label="检测项目" width="210px" />
<el-table-column label="被检通道1" align="center">
<template #default="scope">
<el-tooltip :content="scope.row.resultType1 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button
:disabled = "scope.row.resultType1=='info'"
:type="scope.row.resultType1"
size="small"
@click="handleClick(scope.row)"
>
<el-button :disabled="scope.row.resultType1 == 'info'" :type="scope.row.resultType1" size="small"
@click="handleClick(scope.row)">
{{ scope.row.resultValue1 }}
</el-button>
</el-tooltip>
@@ -73,12 +64,8 @@
<el-table-column label="被检通道2" align="center">
<template #default="scope">
<el-tooltip :content="scope.row.resultType2 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button
:disabled = "scope.row.resultType2=='info'"
:type="scope.row.resultType2"
size="small"
@click="handleClick(scope.row)"
>
<el-button :disabled="scope.row.resultType2 == 'info'" :type="scope.row.resultType2" size="small"
@click="handleClick(scope.row)">
{{ scope.row.resultValue2 }}
</el-button>
</el-tooltip>
@@ -88,12 +75,8 @@
<el-table-column label="被检通道3" align="center">
<template #default="scope">
<el-tooltip :content="scope.row.resultType3 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button
:disabled = "scope.row.resultType3=='info'"
:type="scope.row.resultType3"
size="small"
@click="handleClick(scope.row)"
>
<el-button :disabled="scope.row.resultType3 == 'info'" :type="scope.row.resultType3" size="small"
@click="handleClick(scope.row)">
{{ scope.row.resultValue3 }}
</el-button>
</el-tooltip>
@@ -103,12 +86,8 @@
<el-table-column label="被检通道4" align="center">
<template #default="scope">
<el-tooltip :content="scope.row.resultType4 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button
:disabled = "scope.row.resultType4=='info'"
:type="scope.row.resultType4"
size="small"
@click="handleClick(scope.row)"
>
<el-button :disabled="scope.row.resultType4 == 'info'" :type="scope.row.resultType4" size="small"
@click="handleClick(scope.row)">
{{ scope.row.resultValue4 }}
</el-button>
</el-tooltip>
@@ -118,12 +97,8 @@
<el-table-column p label="被检通道5" align="center">
<template #default="scope">
<el-tooltip :content="scope.row.resultType5 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button
:disabled = "scope.row.resultType5=='info'"
:type="scope.row.resultType5"
size="small"
@click="handleClick(scope.row)"
>
<el-button :disabled="scope.row.resultType5 == 'info'" :type="scope.row.resultType5" size="small"
@click="handleClick(scope.row)">
{{ scope.row.resultValue5 }}
</el-button>
</el-tooltip>
@@ -133,13 +108,8 @@
<el-table-column label="被检通道6" align="center">
<template #default="scope">
<el-tooltip :content="scope.row.resultType6 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button
tip
:disabled = "scope.row.resultType6=='info'"
:type="scope.row.resultType6"
size="small"
@click="handleClick(scope.row)"
>
<el-button tip :disabled="scope.row.resultType6 == 'info'" :type="scope.row.resultType6" size="small"
@click="handleClick(scope.row)">
{{ scope.row.resultValue6 }}
</el-button>
</el-tooltip>
@@ -149,12 +119,8 @@
<el-table-column label="被检通道7" align="center">
<template #default="scope">
<el-tooltip :content="scope.row.resultType7 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button
:disabled = "scope.row.resultType7=='info'"
:type="scope.row.resultType7"
size="small"
@click="handleClick(scope.row)"
>
<el-button :disabled="scope.row.resultType7 == 'info'" :type="scope.row.resultType7" size="small"
@click="handleClick(scope.row)">
{{ scope.row.resultValue7 }}
</el-button>
</el-tooltip>
@@ -164,12 +130,8 @@
<el-table-column label="被检通道8" align="center">
<template #default="scope">
<el-tooltip :content="scope.row.resultType8 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button
:disabled = "scope.row.resultType8=='info'"
:type="scope.row.resultType8"
size="small"
@click="handleClick(scope.row)"
>
<el-button :disabled="scope.row.resultType8 == 'info'" :type="scope.row.resultType8" size="small"
@click="handleClick(scope.row)">
{{ scope.row.resultValue8 }}
</el-button>
</el-tooltip>
@@ -193,10 +155,8 @@
</div>
</div>
<ReportPopup :visible="reportDialogVisible" @update:visible="reportDialogVisible = $event"></ReportPopup>
<dataCheckSingleChannelSingleTestPopup
:visible="dataCheckSingleChannelSingleTestDialogVisable"
@update:visible="dataCheckSingleChannelSingleTestDialogVisable = $event"
></dataCheckSingleChannelSingleTestPopup>
<dataCheckSingleChannelSingleTestPopup :visible="dataCheckSingleChannelSingleTestDialogVisable"
@update:visible="dataCheckSingleChannelSingleTestDialogVisable = $event"></dataCheckSingleChannelSingleTestPopup>
</el-dialog>
</template>
@@ -223,7 +183,7 @@ import ReportPopup from './reportPopup.vue'
import dataCheckSingleChannelSingleTestPopup from './dataCheckSingleChannelSingleTestPopup.vue'
const qualified = ref(0)
const reportDisabled = ref(true)
const reportDialogVisible = ref(false)
const deviceName = ref('被检设备1');
@@ -238,8 +198,7 @@ const reportDisabled = ref(true)
label: "name",
pid: "pid",
};
const judge = (label:string) =>
{
const judge = (label: string) => {
console.log(label, errorSysName.value)
if (label === errorSysName.value)
return true
@@ -391,8 +350,7 @@ function getRandomInt(max: number): number {
const updateLog = () => {
const currentTime = ref(new Date().toLocaleString());
switch(activeIndex.value)
{
switch (activeIndex.value) {
case 1:
testLogList.value.length = 0; // 清空数组
testLogList.value.push({
@@ -476,20 +434,16 @@ const dataCheckSingleChannelSingleTestDialogVisable = ref(false);
function traverseTableData(data: any[], id: string): void {
data.forEach(item => {
// 处理当前节点的数据
if(item.id === id)
{
for(let i = 1;i<=8;i++)
{
if (item.id === id) {
for (let i = 1; i <= 8; i++) {
let field1 = "resultType" + i
let field2 = "resultValue" + i
if(getRandomInt(10)>8 && activeIndex.value>2)
{
if (getRandomInt(10) > 8 && activeIndex.value > 2) {
item[field1] = "danger";
item[field2] = "×";
}
else
{
else {
item[field1] = "success";
item[field2] = "√";
}
@@ -1832,12 +1786,10 @@ const startTimer = () => {
timer.value = setInterval(() => {
console.log(activeIndex.value, 111)
if(activeIndex.value <= activeTotalNum.value)
{
if (activeIndex.value <= activeTotalNum.value) {
activeIndex.value++;
switch(activeIndex.value)
{
switch (activeIndex.value) {
case 1:
updateTableData("1-1-1")
updateTableData("1-1-2")
@@ -1890,14 +1842,13 @@ const startTimer = () => {
// }
}
else
{
else {
console.log(activeIndex.value, 222)
clearInterval(timer.value)
reportDisabled.value = false;
console.log(activeIndex.value, 333)
}
qualified.value = 92
}, 100);
};
@@ -1917,7 +1868,6 @@ const resumeTimer = () => {
</script>
<style scoped>
.change-errsys-dialog {
display: flex;
flex-direction: column;
@@ -1939,5 +1889,14 @@ const resumeTimer = () => {
justify-content: flex-end;
margin-bottom: 10px;
}
</style>
<style lang="scss" scoped>
:deep(.el-button--small) {
height: 20px !important;
width: 20px !important;
}
:deep(.el-table--default td) {
padding: 5px 0 !important;
}
</style>

17
frontend/src/views/home/components/dataCheckPopup.vue
View File

@@ -2,30 +2,20 @@
<el-dialog title="数据查询" :model-value='visible' @close="handleCancel" width="1065px" draggable>
<div class="data-check-dialog">
<div class="data-check-title">
<el-form :model='formContent'>
<el-row :gutter="24" >
<el-col :span="8">
<el-form :model='formContent' label-width="auto" class="form-three ">
<el-form-item label="检测脚本:" >
<el-input v-model='testScriptName' :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="误差体系:" >
<el-input v-model='errorSysName' :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="数据处理原则:" >
<el-input v-model='dataRule' :disabled="true"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" >
<el-col :span="8">
<el-form-item label="设备名称:" >
<el-input v-model='deviceName' :disabled="true"/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label='复检次数:'>
<el-select v-model="reCheckIdx">
@@ -38,7 +28,6 @@
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label='通道号:'>
<el-select v-model="monitorIdx">
<el-option
@@ -49,8 +38,6 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="data-check-content">

4
frontend/src/views/home/components/dataCheckRawDataTable.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="table-container">
<el-table :data="tableData" stripe :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" height="310px" style="width: 100%" >
<div class="table-container table-main">
<el-table :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" height="310px" style="width: 100%" >
<el-table-column prop="id" label="序号" width="70" />
<el-table-column prop="updateTime" label="数据时间" />
<el-table-column prop="L1" label="L1（V）" />

6
frontend/src/views/home/components/dataCheckResultTable.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="table-container">
<div class="table-container table-main">
<el-table :data="tableData" max-height="300" :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" >
<el-table :data="tableData" height="310px" :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" >
<el-table-column prop="id" label="序号" width="70" />
<el-table-column prop="standardValue" label="标准值（V）" />
@@ -102,7 +102,7 @@ text-align: center; /* 所有单元格文字居中 */
}
.table-container {
max-height: 400px; /* 根据需要调整高度 */
/* max-height: 400px; */
overflow-y: auto; /* 允许垂直滚动 */
overflow-x: hidden; /* 隐藏水平滚动条 */
}

17
frontend/src/views/home/components/test.vue
View File

@@ -41,7 +41,7 @@
<!-- <el-table :key="tableKey" :data="tableData" :row-class-name="tableRowClassName" row-key="id" height="545px" :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" border> -->
<!-- <el-table :data="tableData" :row-class-name="tableRowClassName" row-key="id" height="545px" :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%" border> -->
<div class="dialog-content ">
<el-table :data="tableData" :cell-class-name="tableCell" row-key="id" height="545px" :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%" border>
<el-table :data="tableData" :cell-class-name="tableCell" row-key="id" height="450px" :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%" border>
<el-table-column fixed prop="scriptItemName" label="检测项目" width="250px">
<!-- <template #default="scope">
<div :style="{ backgroundColor: '#003078' }">
@@ -226,8 +226,8 @@
</el-table-column> -->
</el-table>
</div>
<div >
<el-collapse model-value="0" accordion>
<div style="height: 98px;">
<el-collapse model-value="1" accordion>
<el-collapse-item title="检测日志：" name="1">
<div ref="scrollContainer" class="dialog-log">
<p v-for="(item, index) in testLogList" :key="index" :style="{color:item.type==='error'?'#F56C6C':'var(--el-text-color-regular)'}">
@@ -1925,7 +1925,7 @@ watch(ts, function (newValue, oldValue) {
margin-bottom:10px;
}
.dialog-content{
max-height: 545px;
max-height: 450px;
overflow-y: auto;
}
@@ -1939,3 +1939,12 @@ watch(ts, function (newValue, oldValue) {
</style>
<style lang="scss" scoped>
:deep(.el-button--small) {
height: 20px !important;
width: 20px !important;
}
:deep(.el-table--default td ){
padding: 5px 0 !important;
}
</style>

70
frontend/src/views/home/components/timeTest.vue
View File

@@ -2,7 +2,8 @@
<div>
<div class="test-dialog">
<div class="dialog-left">
<el-steps direction="vertical" :active="activeIndex" :process-status="currentStepStatus" finish-status="success">
<el-steps direction="vertical" :active="activeIndex" :process-status="currentStepStatus"
finish-status="success">
<el-step title="开始检测" :description="startTime" />
<el-step title="GPS完成上送" :description="gpsTime" />
<el-step title="设备开始上送时刻" :description="devStartTime" />
@@ -27,20 +28,19 @@
<div class="dialog-right">
<div class="right-title">
<!-- <div>设备上送时刻表</div> -->
<span style=" font-size: 18px;font-weight: 600;">
设备已合格 <span style="color: #67C23A">{{ qualified }}</span> 台/共 <span style="color: green">4</span> 台
</span>
<div>
<el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">设备已合格3台/共4台</el-button>
<el-button type="primary" disabled="true" v-if="activeIndex === activeTotalNum">设备已合格3台/共4台</el-button>
<!-- <el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">设备已合格3台/共4台</el-button>
<el-button type="primary" disabled="true" v-if="activeIndex === activeTotalNum">设备已合格3台/共4台</el-button> -->
</div>
</div>
<div class="right-content">
<ProTable
ref='proTable'
:pagination = 'false'
:toolButton = 'false'
:columns='columns'
:data='deviceOperatorData'
stripe :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%; height:390px" border
>
<ProTable ref='proTable' :pagination='false' :toolButton='false' :showCard='false' :columns='columns'
:data='deviceOperatorData' stripe :header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }" style="width: 100%; height:435px" border>
</ProTable>
<!-- <el-table :data="deviceOperatorData" stripe :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" border>
@@ -78,6 +78,7 @@ interface Activity {
color?: string;
icon?: any;
}
const qualified = ref(0)
const activities = ref<Activity[]>([
{
content: '开始检测',
@@ -171,14 +172,12 @@ const columns = reactive([
label: '检测结果',
width: 100,
render: (scope) => {
if(scope.row.Result === '不合格')
{
if (scope.row.Result === '不合格') {
return (
<el-tag type='danger'>{scope.row.Result}</el-tag>
)
}
else
{
else {
return (
<span>{scope.row.Result}</span>
)
@@ -189,20 +188,17 @@ const columns = reactive([
//监听testStatus的变化
watch(testStatus, function (newValue, oldValue) {
ts.value = props.testStatus;
if(ts.value==='start')
{
if (ts.value === 'start') {
ts.value = 'process'
let timer = setInterval(() => {
if (activeIndex.value < activeTotalNum.value - 2)
activeIndex.value++
else if(activeIndex.value === activeTotalNum.value -2)
{
else if (activeIndex.value === activeTotalNum.value - 2) {
activeIndex.value++
activeIndex.value++
}
else
{
else {
clearInterval(timer)
ts.value = 'success'
}
@@ -224,8 +220,7 @@ function formatDateTime(date) {
watch(activeIndex, function (newValue, oldValue) {
if(activeIndex.value === 1)
{
if (activeIndex.value === 1) {
startTime.value = formatDateTime(new Date());
// activities.value.length = 0;
@@ -237,8 +232,7 @@ if(activeIndex.value === 1)
// icon: SuccessFilled,
// });
}
if(activeIndex.value === 2)
{
if (activeIndex.value === 2) {
gpsTime.value = formatDateTime(new Date());
// activities.value.push({
// content: 'GPS上送时刻',
@@ -248,8 +242,7 @@ if(activeIndex.value === 2)
// size: 'large',
// });
}
if(activeIndex.value === 3)
{
if (activeIndex.value === 3) {
// activities.value.push({
// content: '设备最早上送时刻',
// timestamp: '2018-04-03 20:46',
@@ -260,9 +253,9 @@ if(activeIndex.value === 3)
devStartTime.value = formatDateTime(new Date());
deviceOperatorData.value.length = 0;
deviceOperatorData.value = deviceData.value;
qualified.value = 3
}
if(activeIndex.value > 3)
{
if (activeIndex.value > 3) {
devEndTime.value = formatDateTime(new Date());
finishTime.value = formatDateTime(new Date());
@@ -291,11 +284,11 @@ watch(ts, function (newValue, oldValue) {
</script>
<style scoped>
.test-dialog {
display: flex;
flex-direction: row; /* 横向排列 */
flex-direction: row;
/* 横向排列 */
/* margin-top: 20px; */
/* min-height: 300px; */
height: 472px;
@@ -303,21 +296,28 @@ watch(ts, function (newValue, oldValue) {
margin-right: 20px;
} */
}
.dialog-left {
margin-left: 20px;
width: 20%;
}
.dialog-right {
margin-top: 25px;
margin-left: 20px;
/* margin-top: 25px;
margin-left: 20px; */
width: 80%;
}
.right-title {
height: 32px;
display: flex;
flex-direction: row; /* 横向排列 */
flex-direction: row;
/* 横向排列 */
justify-content: flex-end;
margin-bottom: 10px;
/* margin-bottom: 10px; */
}
/* width: 100%;
height: auto;
background: #fff;