From e132d7d87ff834eb231bd39c82c3be22bae2d80b Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 09:10:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/inspectionManagement/reportForInspection/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
index e48728d..a2d7b1e 100644
--- a/src/views/inspectionManagement/reportForInspection/index.vue
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -123,13 +123,13 @@
min-width="8%"
/>
<el-table-column
- prop="condition"
+ prop="type"
label="鐘舵��"
min-width="8%"
>
<template slot-scope="scope">
- <span :style="{ color: scope.row.condition === 1 ? 'green' : 'red' }">
- {{ scope.row.condition === 1 ? '宸叉娴�':'鏈娴�' }}
+ <span :style="{ color: scope.row.type === 1 ? 'green' : 'red' }">
+ {{ scope.row.type === 1 ? '宸叉娴�':'鏈娴�' }}
</span>
</template>
</el-table-column>
@@ -386,6 +386,7 @@
// console.log(res)
this.inspectionTable = res.data.row
this.data = res.data.row
+ console.log(res.data.row);
this.total = res.data.total
},
async search(){
--
Gitblit v1.9.3