From 23f1bf22c42a904c05cee63e10c9fd8b60dfe8f5 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 20 九月 2022 14:54:56 +0800
Subject: [PATCH] Default Changelist
---
src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
index e61d78d..4aec32f 100644
--- a/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
+++ b/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
@@ -38,16 +38,35 @@
<el-tabs class="active" v-model="activeName">
<el-tab-pane label="巡检链" name="inspectChain">
<el-table :data="inspectTaskForm.points" fit style="width: 100%">
- <el-table-column type="index" label="序号" width="60" />
- <el-table-column prop="region" label="巡检点" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column type="index" label="序号" />
+ <el-table-column prop="point" label="巡检点" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="region" label="所属设备" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="rfid" label="RFID" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="quotaContent" label="指标作业" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="secondReferenceResult" label="记录值" show-overflow-tooltip align="center">
+ <template #default="scope">
+ <div :style="{ color: scope.row.reportResult == 1 ? '#ff0000' : '#409eff' }">
+ {{ scope.row.dataReportType == 1 ? '无' : scope.row.secondReferenceResult }}
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="quotaUnit" label="指标单位" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="reportResult" label="结果" show-overflow-tooltip align="center">
+ <template #default="scope">
+ <div :style="{ color: scope.row.reportResult == 1 ? '#ff0000' : '#409eff' }">
+ {{ scope.row.reportResult == 0 ? '正常' : scope.row.reportResult == 1 ? '存在异常' : '无' }}
+ </div>
+ </template>
+ </el-table-column>
<!-- <el-table-column label="操作" width="150" align="center">-->
<!-- <template #default="scope">-->
<!-- <el-button size="small" text type="danger" @click="onDelCheckUnit(scope.$index, scope.row)">删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
+ </el-tab-pane>
+ <el-tab-pane label="统计数据" name="allData">
+ <sum-data :sumData="taskAndQuotas"></sum-data>
</el-tab-pane>
</el-tabs>
</div>
@@ -61,7 +80,7 @@
</template>
<script lang="ts">
-import { reactive, toRefs, ref } from 'vue';
+import { reactive, toRefs, ref, defineAsyncComponent } from 'vue';
import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
import { ElMessage } from 'element-plus/es';
import { inspectTaskApi } from '/@/api/intellectInspectSystem/inspectTask';
@@ -136,6 +155,9 @@
}
export default {
name: 'inspectTaskDialog',
+ components: {
+ SumData: defineAsyncComponent(() => import('/@/views/intellectInspect/inspectIndex/components/sum.vue'))
+ },
setup(props: any, context: any) {
const inspectTaskFormRef = ref();
const data = reactive<dataState>({
@@ -238,7 +260,7 @@
data.classGroupList = JSON.parse(JSON.stringify(classGroupList));
data.ifShowInspectTaskDialog = true;
data.inspectPointConfirm = false;
- data.title = '查看巡检任务';
+ data.title = '查看巡检记录';
inspectRecordApi()
.getInspectRecordById({ id: value.id, uuid: value.uuid })
.then((res) => {
@@ -247,6 +269,10 @@
giveClassGroup();
data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
} else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
})
.catch((error) => {});
@@ -405,7 +431,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
--
Gitblit v1.9.2