From cb2e79e8374725da81b19c518405f1b91c86e601 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 07 四月 2022 14:27:54 +0800
Subject: [PATCH] Merge branch 'master' of D:\workspace\ztqt with conflicts.
---
src/views/safetyproduction/new.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index 7e63649..1b9717b 100644
--- a/src/views/safetyproduction/new.vue
+++ b/src/views/safetyproduction/new.vue
@@ -39,7 +39,7 @@
</el-row>
<el-row>
<el-col :span="22" :offset="1">
- <el-table ref="table" border :data="item.child">
+ <el-table ref="table" border :stripe="true" :data="item.child" :header-cell-style="{background:'#eef1f6',color:'#606266'}" :cell-style="{background:'#fff',color:'#606266'}">
<el-table-column
prop="standardizationRequirements"
align="center"
@@ -69,7 +69,7 @@
type="expand"
>
<template slot-scope="scope">
- <el-table :data="scope.row.deductionList">
+ <el-table :data="scope.row.deductionList" :cell-style="{background:'#fff',color:'#606266'}">
<el-table-column
prop="name"
align="center"
@@ -354,14 +354,18 @@
this.$router.push({
path: "/reviewXG",
query: {
- id: data.safetyInspectionItemId,
+ idX: data.safetyInspectionItemId,
+ name:this.id,
+ id:this.itemId
},
});
} else {
this.$router.push({
path: "/reviewXG",
query: {
- id: data.id,
+ idX: data.id,
+ name:this.id,
+ id:this.itemId
},
});
}
--
Gitblit v1.9.2