From 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 23 五月 2022 18:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/safetyproduction/checklist.vue | 95 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 23 deletions(-)
diff --git a/src/views/safetyproduction/checklist.vue b/src/views/safetyproduction/checklist.vue
index 6cf3e28..50966ff 100644
--- a/src/views/safetyproduction/checklist.vue
+++ b/src/views/safetyproduction/checklist.vue
@@ -48,7 +48,7 @@
<p class="titles">标准化要求：</p>
</el-col>
<el-col :span="20">
- <p class="titles-type">
+ <p class="title-type">
{{ item.standardizationRequirements }}
</p>
</el-col>
@@ -64,18 +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="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="titles">扣分项：</p></el-col
+ >
+ <el-col :span="10"
+ ><p class="title-type">
+ {{ 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>
@@ -147,7 +198,6 @@
v-model="form.standardizationRequirements"
placeholder=""
maxlength="250"
- show-word-limit
></el-input>
</el-form-item>
</el-col>
@@ -161,7 +211,6 @@
v-model="form.enterpriseStandard"
placeholder=""
maxlength="250"
- show-word-limit
></el-input>
</el-form-item>
</el-col>
@@ -175,7 +224,6 @@
v-model="form.reviewMethod"
placeholder=""
maxlength="250"
- show-word-limit
></el-input>
</el-form-item>
</el-col>
@@ -192,7 +240,6 @@
v-model="form.veto"
placeholder=""
maxlength="250"
- show-word-limit
></el-input>
</el-form-item>
</el-col>
@@ -357,17 +404,16 @@
},
beforTree() {
safetyInspectionItemTree().then((res) => {
- console.log(res);
this.tree = res.data.result;
});
},
safetyInspectionItemL(data) {
- // console.log(data)
- this.listQuery.filter.elementB = data.value;
- safetyInspectionItemList(this.listQuery).then((res) => {
- // console.log(res.data.result.records);
- this.list = res.data.result.records;
- });
+ if (data.type== 1) {
+ this.listQuery.filter.elementB = data.value;
+ safetyInspectionItemList(this.listQuery).then((res) => {
+ this.list = res.data.result.records;
+ });
+ }
},
safetyInspectionItemC(id, type) {
this.show = false;
@@ -386,7 +432,6 @@
} else {
this.disabled = true;
var i = this.list.findIndex((item) => item.id == id);
- console.log(id);
this.form = this.list[i];
}
},
@@ -439,9 +484,6 @@
}
},
coAdd(val, type) {
- this.$nextTick(() => {
- this.$refs["form"].clearValidate();
- });
this.titleN = type;
if (type == "新增") {
this.dialogVisible = true;
@@ -454,8 +496,11 @@
this.index = this.form.deductionList.findIndex(
(item) => item.name == val.name
);
- this.formInline = val;
+ this.formInline=JSON.parse(JSON.stringify(val));
}
+ this.$nextTick(() => {
+ this.$refs["form"].clearValidate();
+ });
},
listAdd() {
this.$refs["form"].validate((valid) => {
@@ -513,7 +558,7 @@
}
.box-left {
width: 20%;
- min-height: 800px;
+ min-height: 850px;
background-color: white;
border-radius: 5px;
}
@@ -524,11 +569,15 @@
width: 79%;
background-color: rgb(223, 229, 235);
border-radius: 5px;
+ height: 850px;
+ overflow-y:overlay;
}
.box-rights {
width: 79%;
background-color: #fff;
border-radius: 5px;
+ height: 850px;
+ overflow-y:overlay;
}
.box-rightXQ {
margin-bottom: 10px;
@@ -572,4 +621,4 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2