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/inspectIndex/components/inspectRecordDialog.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue b/src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue
index 3724421..f08ccda 100644
--- a/src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue
+++ b/src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue
@@ -17,14 +17,19 @@
</el-col>
<el-col :span="12" style="margin-bottom: 20px">
<el-form-item label="巡检部门" prop="execDepId">
- <el-cascader @change="giveClassGroup" :disabled="!inspectPointConfirm" placeholder="请选择巡检部门" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" clearable filterable class="input-add" v-model="inspectTaskForm.execDepId"> </el-cascader>
+ <el-cascader @change="giveClassGroup" :disabled="!inspectPointConfirm" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" clearable filterable class="input-add" v-model="inspectTaskForm.execDepId"> </el-cascader>
</el-form-item>
</el-col>
<el-col :span="12" style="margin-bottom: 20px">
<el-form-item label="巡检班组" prop="execClassgroupId">
- <el-select v-model="inspectTaskForm.execClassgroupId" :disabled="!inspectPointConfirm" placeholder="请选择巡检班组" class="input-add">
+ <el-select v-model="inspectTaskForm.execClassgroupId" :disabled="!inspectPointConfirm" class="input-add">
<el-option v-for="item in classGroup" :key="item.id" :value="item.id" :label="item.groupName"></el-option>
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" style="margin-bottom: 20px">
+ <el-form-item label="巡检人" prop="execUserName">
+ <el-input v-model="inspectTaskForm.execUserName" :disabled="!inspectPointConfirm" class="input-add"> </el-input>
</el-form-item>
</el-col>
<el-col :span="12" style="margin-bottom: 20px">
@@ -38,10 +43,12 @@
<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">
+ <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 }}
@@ -52,7 +59,7 @@
<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 ? '异常' : '无' }}
+ {{ scope.row.reportResult == 0 ? '正常' : scope.row.reportResult == 1 ? '存在异常' : '无' }}
</div>
</template>
</el-table-column>
@@ -62,6 +69,9 @@
<!-- </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>
@@ -75,7 +85,7 @@
</template>
<script lang="ts">
-import { reactive, toRefs, ref } from 'vue';
+import { toRefs, reactive, defineComponent, ref, onMounted, defineAsyncComponent } from 'vue';
import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
import { ElMessage } from 'element-plus/es';
import { inspectTaskApi } from '/@/api/intellectInspectSystem/inspectTask';
@@ -83,6 +93,7 @@
import { inspectRecordApi } from '/@/api/intellectInspectSystem/inspectRecord';
interface dataState {
title: string;
+ taskAndQuotas: [],
pointTitle: string;
activeName: string;
inspectPointConfirm: boolean;
@@ -93,6 +104,7 @@
execClassgroupId: number | null;
execDepId: number | null;
id: number | null;
+ execUserName: string;
startTime: string | null;
taskName: string | null;
taskType: number | null;
@@ -150,12 +162,16 @@
thirdReferenceSign: number | null;
thirdReferenceValue: number | null;
}
-export default {
+export default defineComponent({
name: 'inspectTaskDialog',
+ components: {
+ SumData: defineAsyncComponent(() => import('/@/views/intellectInspect/inspectIndex/components/sum.vue'))
+ },
setup(props: any, context: any) {
const inspectTaskFormRef = ref();
const data = reactive<dataState>({
title: '',
+ taskAndQuotas: [],
pointTitle: '',
activeName: 'inspectChain',
inspectPointConfirm: false,
@@ -187,6 +203,7 @@
execDepId: null,
id: null,
points: [],
+ execUserName: '',
startTime: null,
taskName: null,
taskType: null,
@@ -206,7 +223,7 @@
],
firstReferenceValueList: [
{ id: 0, name: '正常' },
- { id: 1, name: '异常' }
+ { id: 1, name: '存在异常' }
],
secondReferenceSignList: [
{ id: 1, name: '>' },
@@ -249,7 +266,7 @@
}
};
- const showInspectRecordDialog = (type: string, item: { id: number; uuid: string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: []) => {
+ const showInspectRecordDialog = (type: string, item: { id: number; uuid: string; execUserName:string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: []) => {
data.quotaList = JSON.parse(JSON.stringify(quotaList));
data.timeList = JSON.parse(JSON.stringify(timeType));
data.inspectPointAllList = JSON.parse(JSON.stringify(inspectPointAllList));
@@ -258,7 +275,8 @@
data.classGroupList = JSON.parse(JSON.stringify(classGroupList));
data.ifShowInspectTaskDialog = true;
data.inspectPointConfirm = false;
- data.title = '查看巡检任务';
+ data.title = '查看巡检记录';
+ getSum(item.id)
inspectRecordApi()
.getInspectRecordById({ id: item.id, uuid: item.uuid })
.then((res) => {
@@ -266,7 +284,7 @@
data.inspectTaskForm.execDepId = res.data.data.execDepId;
giveClassGroup();
data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
- console.log(data.inspectTaskForm, 'this data');
+ data.inspectTaskForm.execUserName = item.execUserName;
} else {
}
})
@@ -277,6 +295,19 @@
// const toRefer =(row, column, cellValue, index)=>{
// return row.secondReferenceResult==0?'正常':(row.reportResult==1?'异常':'无')
// }
+
+ const getSum = async (id) =>{
+ let res = await inspectRecordApi().getInspectRecordSum({id:id});
+ if (res.data.code === '200') {
+ data.taskAndQuotas = JSON.parse(JSON.stringify(res.data.data.taskAndQuotas))
+ console.log(data.taskAndQuotas,'666666666666')
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ }
const submitInspectPoint = async () => {
if (data.title === '新增巡检任务' && data.pointTitle === '新增巡检点') {
@@ -415,6 +446,7 @@
...toRefs(data),
inspectTaskFormRef,
deleteFlow,
+ getSum,
// toRefer,
giveQuotaUnit,
giveClassGroup,
@@ -425,7 +457,7 @@
openInspectPointDialog
};
}
-};
+});
</script>
<style scoped lang="scss">
--
Gitblit v1.9.2