From 1cc2bba0c5cfd27e0744f1df8c5bbd41135ae817 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 28 九月 2022 16:02:53 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
index 4bfad78..3ac0afc 100644
--- a/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
+++ b/src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue
@@ -33,8 +33,8 @@
<el-table ref="multipleTableRef" :data="tableData.inspectRecordData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }">
<el-table-column property="taskName" label="任务名称">
<template #default="scope">
- <div :class="hasJump == true && scope.row.startTime.slice(0, 10) == date&&(tableData.params.taskStatus == 4 || tableData.params.taskStatus == 5)?'redTit':''">
- {{scope.row.taskName}}
+ <div :class="hasJump == true && scope.row.startTime.slice(0, 10) == date && (tableData.params.taskStatus == 4 || tableData.params.taskStatus == 5) ? 'redTit' : ''">
+ {{ scope.row.taskName }}
</div>
</template>
</el-table-column>
@@ -66,9 +66,9 @@
<el-table-column prop="execUserName" label="执行人" show-overflow-tooltip></el-table-column>
<el-table-column property="taskStatus" label="任务状态" width="180">
<template #default="scope">
- <el-tag :type="scope.row.resultStatus === 1? 'danger': scope.row.taskStatus === 1 ? 'info' : scope.row.taskStatus === 2 ? '' : scope.row.taskStatus === 3 ? 'success' : 'danger'">
+ <el-tag :type="scope.row.resultStatus === 1 ? 'danger' : scope.row.taskStatus === 1 ? 'info' : scope.row.taskStatus === 2 ? '' : scope.row.taskStatus === 3 ? 'success' : 'danger'">
<span>
- {{ scope.row.resultStatus === 1?'已巡检存在异常':parseNumber(scope.row.taskStatus, '任务状态') }}
+ {{ scope.row.resultStatus === 1 ? '已巡检存在异常' : parseNumber(scope.row.taskStatus, '任务状态') }}
</span>
</el-tag>
</template>
@@ -115,7 +115,7 @@
};
interface stateType {
- isRed:boolean;
+ isRed: boolean;
hasJump: boolean;
date: string;
tableData: {
@@ -135,7 +135,7 @@
validTime: string | null;
createUserId: number | null;
reportTime: string | null;
- resultStatus: number | null
+ resultStatus: number | null;
};
};
workTypeList: Array<type>;
@@ -155,6 +155,7 @@
id: number;
groupName: string;
}
+interface timeType {}
export default {
name: 'index',
components: { inspectRecordDialog },
@@ -196,7 +197,7 @@
taskStatusList: [
{ id: 1, name: '待巡检' },
{ id: 2, name: '巡检中' },
- { id: 3, name: '已巡检正常'},
+ { id: 3, name: '已巡检正常' },
{ id: 5, name: '已巡检存在异常' },
{ id: 4, name: '超时未完成巡检' }
],
@@ -215,16 +216,16 @@
//获取巡检记录数据
const getInspectRecord = async () => {
- const data = JSON.parse(JSON.stringify(state.tableData.params))
- if(state.tableData.params.taskStatus == 3){
- data.taskStatus = 3
- data.resultStatus = 0
+ const data = JSON.parse(JSON.stringify(state.tableData.params));
+ if (state.tableData.params.taskStatus == 3) {
+ data.taskStatus = 3;
+ data.resultStatus = 0;
}
- if(state.tableData.params.taskStatus == 5){
- data.taskStatus = 3
- data.resultStatus = 1
+ if (state.tableData.params.taskStatus == 5) {
+ data.taskStatus = 3;
+ data.resultStatus = 1;
}
- console.log(state.tableData.params.taskStatus,data.taskStatus,'data')
+ console.log(state.tableData.params.taskStatus, data.taskStatus, 'data');
let res = await inspectRecordApi().getInspectRecordList(data);
if (res.data.code === '200') {
state.tableData.inspectRecordData = JSON.parse(JSON.stringify(res.data.data.records));
@@ -320,10 +321,10 @@
const onHandleCurrentChange = (val: number) => {
state.tableData.params.pageIndex = val;
getInspectRecord();
- state.isRed = false
+ state.isRed = false;
};
// 时间格式化
- const timeForm = {
+ const timeForm: timeType = {
hour12: false,
year: 'numeric',
month: '2-digit',
@@ -345,6 +346,7 @@
startTime: null,
validTime: null,
createUserId: null,
+ resultStatus: null,
reportTime: null
};
};
@@ -355,24 +357,23 @@
};
// 页面加载时
onMounted(() => {
- getDateTime()
+ getDateTime();
if (route.query.id) {
- state.hasJump = true
+ state.hasJump = true;
state.tableData.params.taskStatus = Number(route.query.id);
- state.isRed = true
+ state.isRed = true;
getInspectRecord();
getQuotaList();
getDepartmentData();
getClassGroupData();
getInspectTaskPoint();
- }else{
+ } else {
getInspectRecord();
getQuotaList();
getDepartmentData();
getClassGroupData();
getInspectTaskPoint();
}
-
});
return {
@@ -520,7 +521,7 @@
color: #0098f5;
}
}
-.redTit{
+.redTit {
color: red;
}
.el-input {
--
Gitblit v1.9.2