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

Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

Browse Source
This commit is contained in:
sjl
2024-12-13 16:35:55 +08:00
parent 0db5fa650f 53b4616a87
commit fdf826d5f8
3 changed files with 57 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,178 +51,77 @@
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="被检通道1" :min-width="minwidth" align="center"> <el-table-column v-for="(item, index) in monitorList" :key="index" :label="item.label" :min-width="minwidth" align="center">
<template #header> <!-- <template #default="scope">
<span>被检通道1</span> <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-tooltip content = "240001被检通道1" placement="top" style="align-items: bottom;">
<el-icon><InfoFilled /></el-icon>
</el-tooltip>
</template>
<template #default="scope">
<!-- <el-tooltip content = "info" placement="top">
<i class="el-icon-info"></i>
</el-tooltip> -->
<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)"
>
{{ scope.row.resultValue1 }}
</el-button>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="被检通道2" :min-width="minwidth" align="center">
<template #header>
<span>被检通道2</span>
<el-tooltip content = "240001被检通道2" placement="top">
<el-icon><InfoFilled /></el-icon>
</el-tooltip>
</template>
<template #default="scope">
<el-tooltip :content="scope.row.resultType2==='info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button <el-button
:disabled = "scope.row.resultType2=='info'" :disabled = "scope.row.resultType1=='info'"
:type="scope.row.resultType2" :type="scope.row.resultType1"
size="small" size="small"
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
{{ scope.row.resultValue2 }} {{ scope.row.resultValue1 }}
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</template> -->
</template> <el-table-column prop="Ua" label="通道1" align="center">
</el-table-column>
<el-table-column label="被检通道3" :min-width="minwidth" align="center">
<template #header>
<span>被检通道3</span>
<el-tooltip content = "240001被检通道3" placement="top">
<el-icon><InfoFilled /></el-icon>
</el-tooltip>
</template>
<template #default="scope"> <template #default="scope">
<el-tooltip :content="scope.row.resultType3==='info' ? '暂无数据' : '点击查看详情'" placement="top"> <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-button <el-button
:disabled = "scope.row.resultType3=='info'" :disabled = "scope.row.resultType1=='info'"
:type="scope.row.resultType3" :type="scope.row.resultType1"
size="small" size="small"
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
{{ scope.row.resultValue3 }} {{ scope.row.resultValue1 }}
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="被检通道4" :min-width="minwidth" align="center"> <el-table-column prop="Ub" label="通道2" align="center">
<template #header> <template #default="scope">
<span>被检通道4</span> <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-tooltip content = "240001被检通道4" placement="top"> <el-button
<el-icon><InfoFilled /></el-icon> :disabled = "scope.row.resultType1=='info'"
</el-tooltip> :type="scope.row.resultType1"
</template>
<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" size="small"
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
{{ scope.row.resultValue4 }} {{ scope.row.resultValue1 }}
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column p label="被检通道5" :min-width="minwidth" align="center"> <el-table-column prop="Uc" label="通道3" align="center">
<template #header> <template #default="scope">
<span>被检通道5</span> <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-tooltip content = "240002被检通道1" placement="top"> <el-button
<el-icon><InfoFilled /></el-icon> :disabled = "scope.row.resultType1=='info'"
</el-tooltip> :type="scope.row.resultType1"
</template>
<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" size="small"
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
{{ scope.row.resultValue5 }} {{ scope.row.resultValue1 }}
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="被检通道6" :min-width="minwidth" align="center"> <el-table-column prop="Ux" label="通道4" align="center">
<template #header> <template #default="scope">
<span>被检通道6</span> <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
<el-tooltip content = "240002被检通道2" placement="top"> <el-button
<el-icon><InfoFilled /></el-icon> :disabled = "scope.row.resultType1=='info'"
</el-tooltip> :type="scope.row.resultType1"
</template>
<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" size="small"
@click="handleClick(scope.row)" @click="handleClick(scope.row)"
> >
{{ scope.row.resultValue6 }} {{ scope.row.resultValue1 }}
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="被检通道7" :min-width="minwidth" align="center">
<template #header>
<span>被检通道7</span>
<el-tooltip content = "240002被检通道3" placement="top">
<el-icon><InfoFilled /></el-icon>
</el-tooltip>
</template>
<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)"
>
{{ scope.row.resultValue7 }}
</el-button>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column label="被检通道8" :min-width="minwidth" align="center">
<template #header>
<span>被检通道8</span>
<el-tooltip content = "240002被检通道4" placement="top">
<el-icon><InfoFilled /></el-icon>
</el-tooltip>
</template>
<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)"
>
{{ scope.row.resultValue8 }}
</el-button>
</el-tooltip>
</template>
</el-table-column>
<!-- <el-table-column v-for="(item, index) in monitorList" :key="index" :prop="item.prop" :label="item.label"> <!-- <el-table-column v-for="(item, index) in monitorList" :key="index" :prop="item.prop" :label="item.label">
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
@@ -266,53 +165,33 @@ const monitorList = ref([
deviceID: '1', deviceID: '1',
deviceName: '被检设备1', deviceName: '被检设备1',
monitorIdx: 1, monitorIdx: 1,
label:'被检设备1通道1', label:'240001',
prop: 'Result1', prop: 'Result1',
}, },
{ {
deviceID: '1', deviceID: '1',
deviceName: '被检设备1', deviceName: '被检设备1',
monitorIdx: 2, monitorIdx: 2,
label:'被检设备1通道2', label:'240002',
prop: 'Result2', prop: 'Result2',
}, },
{ {
deviceID: '2', deviceID: '2',
deviceName: '被检设备2', deviceName: '被检设备2',
monitorIdx: 1, monitorIdx: 1,
label:'被检设备2通道1', label:'240003',
prop: 'Result3', prop: 'Result3',
}, },
{ {
deviceID: '2', deviceID: '2',
deviceName: '被检设备2', deviceName: '被检设备2',
monitorIdx: 2, monitorIdx: 2,
label:'被检设备2通道2', label:'240004',
prop: 'Result4', prop: 'Result4',
} }
]) ])
const tableData1= [
{
date: '2016-05-03',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{
date: '2016-05-02',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{
date: '2016-05-04',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{
date: '2016-05-01',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
]
const scrollContainer = ref<HTMLElement | null>(null); // 声明 scrollContainer const scrollContainer = ref<HTMLElement | null>(null); // 声明 scrollContainer
const scrollToBottom = () => { const scrollToBottom = () => {
@@ -2143,6 +2022,7 @@ const startTimer = () => {
clearInterval(timer.value) clearInterval(timer.value)
timer.value = null; timer.value = null;
ts.value = 'success' ts.value = 'success'
scrollToBottom();
} }
}, 2000); }, 2000);

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

@@ -35,7 +35,7 @@
</span> </span>
<div class="error-dsc"> <div class="error-dsc">
<div class="green-div"></div> <div class="green-div"></div>
<span style=" color: #67C23A; font-size: 16px;font-weight: 600;"> <span style=" color: #606266; font-size: 16px;font-weight: 600;">
守时误差≤1000ms 守时误差≤1000ms
</span> </span>
@@ -76,7 +76,8 @@
</el-tooltip> </el-tooltip>
</template> --> </template> -->
<template #default="scope"> <template #default="scope">
<el-tag :type="scope.row.Result === '合格' ? 'success' : 'danger'">{{ scope.row.Result }}</el-tag> <el-tag v-if="scope.row.Result === '不合格'" type="danger">{{ scope.row.Result }}</el-tag>
<span v-if="scope.row.Result != '不合格'">{{scope.row.Result}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -355,7 +356,7 @@ watch(ts, function (newValue, oldValue) {
width: 20px; width: 20px;
height: 14px; height: 14px;
border-radius: 4px; border-radius: 4px;
background-color: #67C23A; background-color: #606266;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
} }

12
frontend/src/views/home/tabs/dashboard.vue
View File

@@ -37,7 +37,7 @@
<pie <pie
:customData="{ :customData="{
title: '设备检测状态', title: '设备检测状态',
textAlign: 'right', textAlign: 'center',
}" }"
:legendData="{ :legendData="{
icon: 'circle', icon: 'circle',
@@ -51,7 +51,7 @@
<pie <pie
:customData="{ :customData="{
title: '设备检测结果', title: '设备检测结果',
textAlign: 'right', textAlign: 'center',
}" }"
:legendData="{ :legendData="{
icon: 'circle', icon: 'circle',
@@ -65,7 +65,7 @@
<pie <pie
:customData="{ :customData="{
title: '设备报告状态', title: '设备报告状态',
textAlign: 'right', textAlign: 'center',
label: { label: {
normal: { normal: {
position: 'inner', position: 'inner',
@@ -630,15 +630,17 @@ onUnmounted(() => {
.container_charts { .container_charts {
width: 100%; width: 100%;
//min-height: 180px !important; //min-height: 180px !important;
height:90%; height:100%;
background-color: #eee; background-color: #eee;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 10px; margin-bottom: 10px;
.charts_info { .charts_info {
margin-top: 5px;
border-radius: 4px;
flex: none; flex: none;
width: 33.4%; width: 33.1%;
height: 100% !important; height: 100% !important;
background-color: #fff; background-color: #fff;
// border-radius: 4px; // border-radius: 4px;