From 86687e3e362499b05587ec4d83a6b1133ce0d2b5 Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期二, 23 八月 2022 11:26:18 +0800 Subject: [PATCH] Default Changelist --- src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue index 9b406f7..5838e2a 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> @@ -238,7 +257,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) => { @@ -409,7 +428,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