From de623a5ec5884b91c0c56ecdbb9222b828a648a5 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 08 四月 2022 09:13:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/safetyproduction/checklist.vue | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/views/safetyproduction/checklist.vue b/src/views/safetyproduction/checklist.vue
index 778720d..1010be4 100644
--- a/src/views/safetyproduction/checklist.vue
+++ b/src/views/safetyproduction/checklist.vue
@@ -64,34 +64,69 @@
>
</el-row>
<el-row>
- <el-col :span="2"><p class="title">企业达标标准：</p></el-col>
- <el-col :span="9"
+ <el-col :span="2"><p class="titles">企业达标标准：</p></el-col>
+ <el-col :span="22"
><p class="title-type">
{{ item.enterpriseStandard }}
</p></el-col
>
- <el-col :span="2" :offset="1"
- ><p class="title">评审方法：</p></el-col
+ <!-- <el-col :span="2" :offset="1"
+ ><p class="titles">评审方法：</p></el-col
>
<el-col :span="10"
+ ><p class="title-type">
+ {{ item.reviewMethod }}
+ </p></el-col
+ > -->
+ </el-row>
+ <el-row>
+ <!-- <el-col :span="2"><p class="titles">企业达标标准：</p></el-col>
+ <el-col :span="9"
+ ><p class="title-type">
+ {{ item.enterpriseStandard }}
+ </p></el-col
+ > -->
+ <el-col :span="2"
+ ><p class="titles">评审方法：</p></el-col
+ >
+ <el-col :span="22"
><p class="title-type">
{{ item.reviewMethod }}
</p></el-col
>
</el-row>
<el-row>
- <el-col :span="2"><p class="title">否决项：</p></el-col>
- <el-col :span="9"
+ <el-col :span="2"><p class="titles">否决项：</p></el-col>
+ <el-col :span="22"
><p class="title-type">
{{ item.veto }}
</p></el-col
>
- <el-col :span="2" :offset="1"
- ><p class="title">扣分项：</p></el-col
+ <!-- <el-col :span="2" :offset="1"
+ ><p class="titles">扣分项：</p></el-col
>
<el-col :span="10"
><p class="title-type">
- {{ item.deductionList[index].name}}
+ {{ item.deductionList}}
+ </p></el-col
+ > -->
+ </el-row>
+ <el-row>
+ <!-- <el-col :span="2"><p class="titles">否决项：</p></el-col>
+ <el-col :span="9"
+ ><p class="title-type">
+ {{ item.veto }}
+ </p></el-col
+ > -->
+ <el-col :span="2"
+ ><p class="titles">扣分项：</p></el-col
+ >
+ <el-col :span="22"
+ ><p class="title-type">
+ <!-- {{ item.deductionList}} -->
+ <span style="line-height:20px" v-for="(item,index) in item.deductionList" :key="index">
+ {{item.name}}
+ </span>
</p></el-col
>
</el-row>
@@ -373,11 +408,13 @@
});
},
safetyInspectionItemL(data) {
- this.listQuery.filter.elementB = data.value;
- safetyInspectionItemList(this.listQuery).then((res) => {
- this.list = res.data.result.records;
- console.log("xxx",this.list)
- });
+ if (data.type== 1) {
+ this.listQuery.filter.elementB = data.value;
+ safetyInspectionItemList(this.listQuery).then((res) => {
+ this.list = res.data.result.records;
+ console.log(123,this.list)
+ });
+ }
},
safetyInspectionItemC(id, type) {
this.show = false;
--
Gitblit v1.9.2