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:
GYYM
2024-12-06 15:06:38 +08:00
parent 9c3850db98
commit a73417ea02
10 changed files with 63 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
frontend/src/api/device/device/deviceData.ts
View File

@@ -50,10 +50,10 @@ const data = [
name: '240001', //设备名称
dev_Type: 'PQS-882B4',//设备类型
dev_Chns: 4, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -61,10 +61,10 @@ const data = [
name: '240002', //设备名称
dev_Type: 'PQS-882B4',//设备类型
dev_Chns: 4, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -72,10 +72,10 @@ const data = [
name: '240003', //设备名称
dev_Type: 'PQS-882B4',//设备类型
dev_Chns: 4, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -83,10 +83,10 @@ const data = [
name: '240004', //设备名称
dev_Type: 'PQS-882B4',//设备类型
dev_Chns: 4, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -182,10 +182,10 @@ const data = [
name: '240013', //设备名称
dev_Type: 'PQS-882A',//设备类型
dev_Chns: 1, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -193,10 +193,10 @@ const data = [
name: '240014', //设备名称
dev_Type: 'PQS-882A',//设备类型
dev_Chns: 1, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -204,10 +204,10 @@ const data = [
name: '240013', //设备名称
dev_Type: 'PQS-882A',//设备类型
dev_Chns: 1, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -215,10 +215,10 @@ const data = [
name: '240014', //设备名称
dev_Type: 'PQS-882A',//设备类型
dev_Chns: 1, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -226,10 +226,10 @@ const data = [
name: '240017', //设备名称
dev_Type: 'PQS-882A',//设备类型
dev_Chns: 1, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -237,10 +237,10 @@ const data = [
name: '240018', //设备名称
dev_Type: 'PQS-882A',//设备类型
dev_Chns: 1, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -248,10 +248,10 @@ const data = [
name: '240019', //设备名称
dev_Type: 'PQS-882A',//设备类型
dev_Chns: 1, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
{
@@ -259,10 +259,10 @@ const data = [
name: '240020', //设备名称
dev_Type: 'PQS-882A',//设备类型
dev_Chns: 1, //设备通道数
check_Result: '未检测', //检测结果
check_Result: '未检', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
check_State:'未检测',//检测状态
check_State:'未检',//检测状态
reCheck_Num: 0, //复检次数
},
]

2
frontend/src/api/plan/static.json
View File

@@ -2,7 +2,7 @@
"code": "200",
"data": [
{
"name": "未检测",
"name": "未检",
"children": [
{
"id": 4,

22
frontend/src/views/home/components/table.vue
View File

@@ -286,7 +286,7 @@ const selectionShow = ref(true);
//检测状态数据
let checkStatusList = reactive([
{
label: "未检测",
label: "未检",
value: 0,
disabled: false,
},
@@ -309,7 +309,7 @@ let checkStatusList = reactive([
//检测报告状态数据
let checkReportStatusList = reactive([
{
label: "未检测",
label: "未检",
value: 0,
disabled: false,
},
@@ -327,7 +327,7 @@ let checkReportStatusList = reactive([
//检测结果数组
let checkResultList = reactive([
{
label: "未检测",
label: "未检",
value: 0,
disabled: false,
},
@@ -553,7 +553,7 @@ const columns = reactive([
// width: 120,
// render: (scope) => {
// return scope.row.checkStatus == 1
// ? "未检测"
// ? "未检"
// : scope.row.checkStatus == 2
// ? "检测中"
// : scope.row.checkStatus == 3
@@ -756,7 +756,7 @@ function tableHeaderInit(val: number) {
// form.value.checkStatus = 2;//检测状态默认为检测完成
// form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告
// form.value.checkResult = 1;//检测结果默认为不合格
// disableCheckStatus("未检测")
// disableCheckStatus("未检")
// disableCheckStatus("检测中")
// disableCheckStatus("归档")
// disablecheckResultList("未出结果")
@@ -766,11 +766,11 @@ function tableHeaderInit(val: number) {
// form.value.checkStatus = 2;//检测状态默认为检测完成
// form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告
// form.value.checkResult = 2;//检测结果默认为合格
// disableCheckStatus("未检测")
// disableCheckStatus("未检")
// disableCheckStatus("检测中")
// disableCheckStatus("归档")
disablecheckResultList("未检测")
disableCheckReportStatus("未检测")
disablecheckResultList("未检")
disableCheckReportStatus("未检")
columns[columns.length - 1].minWidth = 180;
tableKey.value += 1;
operationShow.value = true;
@@ -782,7 +782,7 @@ function tableHeaderInit(val: number) {
// form.value.checkStatus = 2;//检测状态默认为检测完成
// form.value.checkReportStatus = 1;//检测报告状态默认为已生成报告
// form.value.checkResult = 2;//检测结果默认为合格
// disableCheckStatus("未检测")
// disableCheckStatus("未检")
// disableCheckStatus("检测中")
// disableCheckStatus("归档")
disableCheckReportStatus("未生成报告")
@@ -795,8 +795,8 @@ function tableHeaderInit(val: number) {
selectionShow.value = true;
break;
case 5://数据查询
disablecheckResultList("未检测")
disableCheckReportStatus("未检测")
disablecheckResultList("未检")
disableCheckReportStatus("未检")
columns[columns.length - 1].minWidth = 250;
operationShow.value = true;
documentStateShow.value = true;

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

@@ -1916,10 +1916,20 @@ watch(ts, function (newValue, oldValue) {
:deep(.el-table .warning-row) {
// background-color:var(--el-color-warning-light-9);
//background-color:#bed96557;
color:red;
color:red;
// font-size:30px;
// --el-table-tr-bg-color: var(--el-color-warning-light-9);
// background-color:#f5f7fa;
// position: relative;
}
// :deep(.el-table .warning-row::before) {
// content: '*'; /* 必须设置content属性 */
// position: absolute;
// color:red;
// background-color:#f5f7fa;
// }
.el-table .success-row {
--el-table-tr-bg-color: var(--el-color-success-light-9);
}

2
frontend/src/views/home/components/testPopup.vue
View File

@@ -3,7 +3,7 @@
<div class="steps-container">
<!-- simple -->
<!-- :style="{color:node.label=='未检测'?'#F56C6C':node.label=='检测中'?'#E6A23C':'#67C23A'}" -->
<!-- :style="{color:node.label=='未检'?'#F56C6C':node.label=='检测中'?'#E6A23C':'#67C23A'}" -->
<el-steps class="test-head-steps" simple :active="stepsActiveIndex" process-status="finish" finish-status="success" >
<!-- style="height:100px" -->
<!-- <el-step title="预检测" :icon="getIcon(0)" /> -->

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

@@ -4,11 +4,11 @@
<div class="dialog-left">
<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" />
<el-step title="设备最晚上送时刻" :description="devEndTime" />
<el-step title="检测完成" :description="finishTime" />
<el-step title="开始检测" />
<el-step title="触发设备检测GPS时刻的标准时间" :description="gpsTime" />
<el-step title="设备开始上送" :description="devStartTime" />
<el-step title="设备结束上送" :description="devEndTime" />
<el-step title="检测完成" />
</el-steps>
<!-- <el-timeline style="max-width: 600px">
<el-timeline-item
@@ -164,7 +164,7 @@ const columns = reactive([
},
{
prop: 'ErrorValue',
label: '守时误差',
label: '守时误差（ms）',
// width: 100,
},
{

2
frontend/src/views/home/components/tree.vue
View File

@@ -23,7 +23,7 @@
<template #default='{ node, data }'>
<span class='custom-tree-node' style='display: flex;align-items: center;'>
<Platform v-if='!data.pid' style='width:18px;height: 18px;margin-right:8px;'
:style="{color:node.label=='未检测'?'#F56C6C':node.label=='检测中'?'#E6A23C':'#67C23A'}" />
:style="{color:node.label=='未检'?'#F56C6C':node.label=='检测中'?'#E6A23C':'#67C23A'}" />
<span>{{ node.label }}</span>
<!-- <Menu v-if="data.pid" @click.stop="detail(data)" style="width: 12px;margin-left: 8px;"/> -->
</span>

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

@@ -251,13 +251,13 @@ const chartsData1: any = ref([]),
const getPieData = () => {
chartsData1.value = [
{ value: 12, name: "未检测", itemStyle: { color: '#fac858' } },
{ value: 12, name: "未检", itemStyle: { color: '#fac858' } },
{ value: 0, name: "检测中", itemStyle: { color: '#ee6666' } },
{ value: 6, name: "检测完成", itemStyle: { color: '#91cc75' } },
{ value: 2, name: "归档", itemStyle: { color: '#5470c6' } },
];
chartsData2.value = [
{ value: 12, name: "未检测" , itemStyle: { color: '#fac858' } },
{ value: 12, name: "未检" , itemStyle: { color: '#fac858' } },
{ value: 3, name: "不合格" , itemStyle: { color: '#ee6666' } },
{ value: 5, name: "合格", itemStyle: { color: '#91cc75' } },
// { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项" , itemStyle: { color: '#ee6666' } },
@@ -268,12 +268,12 @@ const getPieData = () => {
// { value: Math.floor(Math.random() * 100) + 1, name: "已生成报告" },
// { value: Math.floor(Math.random() * 100) + 1, name: "未生成报告" },
{ value: 12, name: "未检测" , itemStyle: { color: '#fac858' } },
{ value: 12, name: "未检" , itemStyle: { color: '#fac858' } },
{ value: 4, name: "未生成" , itemStyle: { color: '#ee6666' } },
{ value: 4, name: "已生成", itemStyle: { color: '#91cc75' } },
// { value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } },
// { value: Math.floor(Math.random() * 100) + 1, name: "未检" , itemStyle: { color: '#fac858' } },
// { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项未生成报告" },
// { value: Math.floor(Math.random() * 100) + 1, name: "全部合格未生成报告" },
// { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项已生成报告" },

4
frontend/src/views/plan/autoTest/components/table.vue
View File

@@ -157,7 +157,7 @@ tableHeight.value = window.innerHeight - 630;
//检测状态数据
const checkStatusList = [
{
label: "未检测",
label: "未检",
value: 0,
},
{
@@ -385,7 +385,7 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
// width: 120,
// render: (scope) => {
// return scope.row.checkStatus == 1
// ? "未检测"
// ? "未检"
// : scope.row.checkStatus == 2
// ? "检测中"
// : scope.row.checkStatus == 3

4
frontend/src/views/plan/singlePlanList/index.vue
View File

@@ -36,7 +36,7 @@
<el-form-item label="检测状态">
<el-select v-model="searchForm.checkStatus">
<el-option :value="0" label="全部"></el-option>
<el-option :value="1" label="未检测"></el-option>
<el-option :value="1" label="未检"></el-option>
<el-option :value="2" label="检测中"></el-option>
<el-option :value="3" label="检测完成"></el-option>
</el-select>
@@ -342,7 +342,7 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
width: 120,
render: (scope) => {
return scope.row.checkStatus == 1
? "未检测"
? "未检"
: scope.row.checkStatus == 2
? "检测中"
: scope.row.checkStatus == 3