diff --git a/frontend/src/api/device/device/deviceData.ts b/frontend/src/api/device/device/deviceData.ts
index 827d457..d49aeab 100644
--- a/frontend/src/api/device/device/deviceData.ts
+++ b/frontend/src/api/device/device/deviceData.ts
@@ -48,8 +48,8 @@ const data = [
{
id: '1', //装置序号ID
name: '240001', //设备名称
- dev_Type: 'PQS-882A',//设备类型
- dev_Chns: 1, //设备通道数
+ dev_Type: 'PQS-882B4',//设备类型
+ dev_Chns: 4, //设备通道数
check_Result: '未检测', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
@@ -81,8 +81,8 @@ const data = [
{
id: '4', //装置序号ID
name: '240004', //设备名称
- dev_Type: 'PQS-882A',//设备类型
- dev_Chns: 1, //设备通道数
+ dev_Type: 'PQS-882B4',//设备类型
+ dev_Chns: 4, //设备通道数
check_Result: '未检测', //检测结果
report_State: '未生成', //报告状态
document_State: '未归档', //归档状态
diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue
index 852f672..9218e33 100644
--- a/frontend/src/views/home/components/channelsTest.vue
+++ b/frontend/src/views/home/components/channelsTest.vue
@@ -6,7 +6,7 @@
-
当前源输出为:Ua=Ub=Uc=57.74V Ia=Ib=Ic=1A; 电压误差为:±0.1Un%; 电流误差为:±0.5%
+
{{ outputDsc }}
设备已合格 {{ qualified }} 台/共 {{ total }}
@@ -20,13 +20,13 @@
-
+
-
+
- 被检设备2
+ 240002
@@ -34,9 +34,12 @@
-
+
+
+
+
@@ -50,8 +53,9 @@
import { SuccessFilled, Failed } from '@element-plus/icons-vue'
const activeIndex = ref(0)
-const activeTotalNum = ref(3)
+const activeTotalNum = ref(4)
const qualified = ref(0)
+const outputDsc = ref('电压误差为:±0.1Un%; 电流误差为:±0.5%')
const total = ref(0)
const activities = [
@@ -87,7 +91,7 @@ const tableData1 = ref([
{
id: '1',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备1',
+ deviceName: '240001',
MonitorIdx: 1,
Ua: 1.0003,
Ub: 1.0003,
@@ -100,7 +104,7 @@ const tableData1 = ref([
{
id: '2',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备1',
+ deviceName: '240001',
MonitorIdx: 2,
Ua: 1.0003,
Ub: 1.0003,
@@ -113,7 +117,7 @@ const tableData1 = ref([
{
id: '3',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备1',
+ deviceName: '240001',
MonitorIdx: 3,
Ua: 1.0003,
Ub: 1.0003,
@@ -126,7 +130,7 @@ const tableData1 = ref([
{
id: '4',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备1',
+ deviceName: '240001',
MonitorIdx: 4,
Ua: 1.0003,
Ub: 1.0003,
@@ -141,7 +145,7 @@ const tableData2 = ref([
{
id: '1',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备2',
+ deviceName: '240002',
MonitorIdx: 1,
Ua: 1.0003,
Ub: 1.0003,
@@ -154,7 +158,7 @@ const tableData2 = ref([
{
id: '2',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备2',
+ deviceName: '240002',
MonitorIdx: 2,
Ua: 1.0003,
Ub: 1.0003,
@@ -167,7 +171,7 @@ const tableData2 = ref([
{
id: '3',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备2',
+ deviceName: '240002',
MonitorIdx: 3,
Ua: 1.0003,
Ub: 1.0003,
@@ -180,7 +184,7 @@ const tableData2 = ref([
{
id: '4',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备2',
+ deviceName: '240002',
MonitorIdx: 4,
Ua: 1.0003,
Ub: 1.0003,
@@ -195,7 +199,7 @@ const tableData3 = ref([
{
id: '1',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备3',
+ deviceName: '240003',
MonitorIdx: 1,
Ua: 1.0003,
Ub: 1.0003,
@@ -208,7 +212,7 @@ const tableData3 = ref([
{
id: '2',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备3',
+ deviceName: '240003',
MonitorIdx: 2,
Ua: 1.0003,
Ub: 1.0003,
@@ -221,7 +225,7 @@ const tableData3 = ref([
{
id: '3',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备3',
+ deviceName: '240003',
MonitorIdx: 3,
Ua: 1.0003,
Ub: 1.0003,
@@ -234,7 +238,61 @@ const tableData3 = ref([
{
id: '4',
updateTime: '2024-10-10 10:30:00',
- deviceName: '被检设备3',
+ deviceName: '240003',
+ MonitorIdx: 4,
+ Ua: 1.0003,
+ Ub: 1.0003,
+ Uc: 0.0096,
+ Ia: 1.0003,
+ Ib: 1.0003,
+ Ic: 1.0008,
+ Result: '合格',
+ },
+])
+const tableData4 = ref([
+ {
+ id: '1',
+ updateTime: '2024-10-10 10:30:00',
+ deviceName: '240004',
+ MonitorIdx: 1,
+ Ua: 1.0003,
+ Ub: 1.0003,
+ Uc: 0.0096,
+ Ia: 1.0003,
+ Ib: 1.0003,
+ Ic: 1.0008,
+ Result: '合格',
+ },
+ {
+ id: '2',
+ updateTime: '2024-10-10 10:30:00',
+ deviceName: '240004',
+ MonitorIdx: 2,
+ Ua: 1.0003,
+ Ub: 1.0003,
+ Uc: 0.0096,
+ Ia: 1.0003,
+ Ib: 1.0003,
+ Ic: 1.0008,
+ Result: '合格',
+ },
+ {
+ id: '3',
+ updateTime: '2024-10-10 10:30:00',
+ deviceName: '240004',
+ MonitorIdx: 3,
+ Ua: 1.0003,
+ Ub: 1.0003,
+ Uc: 0.0096,
+ Ia: 1.0003,
+ Ib: 1.0003,
+ Ic: 1.0008,
+ Result: '合格',
+ },
+ {
+ id: '4',
+ updateTime: '2024-10-10 10:30:00',
+ deviceName: '240004',
MonitorIdx: 4,
Ua: 1.0003,
Ub: 1.0003,
@@ -264,7 +322,10 @@ watch(testStatus, function (newValue, oldValue) {
let timer = setInterval(() => {
if (activeIndex.value < activeTotalNum.value) {
activeIndex.value++
- qualified.value = activeIndex.value
+ if(activeIndex.value > 1)
+ qualified.value = activeIndex.value -1;//演示效果,实际运行时使用后端传来的真实数据即可
+ else
+ qualified.value = activeIndex.value;
}
else if (activeIndex.value === activeTotalNum.value) {
clearInterval(timer)
@@ -279,60 +340,15 @@ watch(testStatus, function (newValue, oldValue) {
}, 1000);
}
})
-// watch(activeIndex, function (newValue, oldValue) {
-// if(activeIndex.value === 1)
-// {
-// activities.value.length = 0;
-// activities.value.push({
-// content: '开始检测',
-// timestamp: '2018-04-12 20:46',
-// size: 'large',
-// color: '#0bbd87',
-// icon: SuccessFilled,
-// });
-// }
-// if(activeIndex.value === 2)
-// {
-// activities.value.push({
-// content: 'GPS上送时刻',
-// timestamp: '2018-04-03 20:46',
-// color: '#0bbd87',
-// icon: SuccessFilled,
-// size: 'large',
-// });
-// }
-// if(activeIndex.value === 3)
-// {
-// activities.value.push({
-// content: '设备最早上送时刻',
-// timestamp: '2018-04-03 20:46',
-// color: '#0bbd87',
-// icon: SuccessFilled,
-// size: 'large',
-// });
+watch(activeIndex, function (newValue, oldValue) {
-// deviceOperatorData.value.length = 0;
-// deviceOperatorData.value = deviceData.value;
-// }
-// if(activeIndex.value > 3)
-// {
-// activities.value.push({
-// content: '设备最晚上送时刻',
-// timestamp: '2018-04-03 20:46',
-// color: '#0bbd87',
-// icon: SuccessFilled,
-// size: 'large',
-// });
-// activities.value.push({
-// content: '检测结束',
-// timestamp: '2018-04-03 20:46',
-// color: '#0bbd87',
-// icon: SuccessFilled,
-// size: 'large',
-// });
-// }
-// })
+if(activeIndex.value === 1)
+{
+ outputDsc.value = "电压误差为:±0.1Un%; 电流误差为:±0.5%;当前源输出为:Ua=Ub=Uc=57.74V Ia=Ib=Ic=1A";
+}
+
+})
const emit = defineEmits(['update:testStatus']);
//监听sn
diff --git a/frontend/src/views/home/components/channelsTestTable.vue b/frontend/src/views/home/components/channelsTestTable.vue
index 2b14a96..3db3852 100644
--- a/frontend/src/views/home/components/channelsTestTable.vue
+++ b/frontend/src/views/home/components/channelsTestTable.vue
@@ -32,8 +32,9 @@
- {{ scope.row.Result }}
-
+ {{ scope.row.Result }}
+ {{ scope.row.Result }}
+
diff --git a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
index 6820952..a2d5b28 100644
--- a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
+++ b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
@@ -38,106 +38,188 @@
- 设备已合格 {{ qualified }} 台/共 {{ 103 }}
- 台
+ 数据已合格 {{ qualified }} 项/共 {{ 103 }}
+ 项
-
-
-
-
-
-
-
- {{ scope.row.resultValue1 }}
-
+
+
+ 被检通道1
+
+
-
-
-
-
-
-
- {{ scope.row.resultValue2 }}
-
+
+
+
+ {{ scope.row.resultValue1 }}
+
+
+
+
+
+
+
+ 被检通道2
+
+
+
+
+
+
+
+ {{ scope.row.resultValue2 }}
+
-
+
+
+ 被检通道3
+
+
+
+
-
-
- {{ scope.row.resultValue3 }}
-
+
+
+ {{ scope.row.resultValue3 }}
+
-
-
-
-
- {{ scope.row.resultValue4 }}
-
+
+
+ 被检通道4
+
+
+
+
+
+
+ {{ scope.row.resultValue4 }}
+
+
-
-
-
-
- {{ scope.row.resultValue5 }}
-
+
+
+ 被检通道5
+
+
+
+
+
+
+ {{ scope.row.resultValue5 }}
+
+
-
-
-
-
- {{ scope.row.resultValue6 }}
-
+
+
+ 被检通道6
+
+
+
+
+
+
+ {{ scope.row.resultValue6 }}
+
+
-
-
-
-
- {{ scope.row.resultValue7 }}
-
+
+
+ 被检通道7
+
+
+
+
+
+
+ {{ scope.row.resultValue7 }}
+
+
-
-
-
-
- {{ scope.row.resultValue8 }}
-
+
+
+ 被检通道8
+
+
+
+
+
+
+ {{ scope.row.resultValue8 }}
+
+
+
@@ -263,7 +345,9 @@ const handleCancel = () => {
//clearInterval(timer.value);
reportDisabled.value = true;
activeIndex.value = 0;
+ qualified.value = 0;
tableData.value.length = 0;
+ columnList.value.length = 0;
tableData.value = JSON.parse(JSON.stringify(operatorTableData.value));
};
@@ -401,9 +485,23 @@ const testLogList = ref([
log: '暂无数据,等待检测开始',
},
])
-
+const columnList = ref([]);
const tableKey = ref(0);
+function tableCell ({row,columnIndex}){
+ let items = columnList?.value.filter((item) => item === row.id)
+if(columnIndex === 0 && items.length > 0)
+{
+ // console.log(row.id,items.length,columnList?.value)
+ return 'warning-row'
+}
+
+ if(columnIndex === 0)
+ {
+ return 'header-row'
+ }
+
+}
const tableRowClassName = ({
row,
rowIndex,
@@ -442,6 +540,8 @@ function traverseTableData(data: any[], id: string): void {
if (getRandomInt(10) > 8 && activeIndex.value > 2) {
item[field1] = "danger";
item[field2] = "×";
+ columnList.value.push(activeIndex.value.toString());
+ console.log(id,activeIndex.value,columnList.value)
}
else {
item[field1] = "success";
@@ -1867,7 +1967,22 @@ const resumeTimer = () => {
-