From 9c1673c3cd9a73855ecfa40f5e717f7c4bbb2e1a Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 08 四月 2022 10:59:12 +0800
Subject: [PATCH] 'lct'
---
src/views/safetyproduction/new.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index 1b9717b..f0e9581 100644
--- a/src/views/safetyproduction/new.vue
+++ b/src/views/safetyproduction/new.vue
@@ -17,10 +17,10 @@
</div>
<div class="box-right" v-if="lists == '' ? false : true">
<div class="btns">
- <el-button type="primary" class="btn" @click="open(0)"
+ <el-button type="primary" class="btn" @click="open(1)"
>添加</el-button
>
- <el-button type="primary" class="btn" @click="open(-1)"
+ <el-button type="primary" class="btn" @click="open(0)"
>暂存</el-button
>
</div>
@@ -69,7 +69,9 @@
type="expand"
>
<template slot-scope="scope">
- <el-table :data="scope.row.deductionList" :cell-style="{background:'#fff',color:'#606266'}">
+ <el-table border :data="scope.row.deductionList"
+ :header-cell-style="{background:'#eef1f6',color:'#606266'}" :cell-style="{background:'#fff',color:'#606266'}"
+ >
<el-table-column
prop="name"
align="center"
@@ -223,14 +225,16 @@
trees.push(this.list.itemList[i].elementA);
}
this.treeList = Array.from(new Set(trees));
- var arr = this.checkSameDataA(this.list.itemList);
+ var arr = this.checkSameDataA(this.list.itemList);
for (var i = 0; i < arr.length; i++) {
var cser=[]
- for(var j=0;j<arr[i].child.length;j++){
+ for(var j=0;j<arr[i].child.length;j++){
var capB = {
safetySelfInspectionId: "",
safetyInspectionItemId: "",
}
+ arr[i].child[j].deductionList= arr[i].child[j].selfDeductionList
+ console.log(arr[i].child[j])
capB.safetySelfInspectionId=arr[i].child[j].safetySelfInspectionId
capB.safetyInspectionItemId=arr[i].child[j].safetyInspectionItemId
cser.push(capB)
@@ -286,7 +290,7 @@
if(this.list.length!=0){
var capA = { elementAName: "", id: [], child: [] };
var atte = [];
-
+
capA.elementAName = this.list[0].elementAName;
for (var i = 0; i < this.list.length; i++) {
var capB = {
@@ -356,7 +360,7 @@
query: {
idX: data.safetyInspectionItemId,
name:this.id,
- id:this.itemId
+ id:this.itemId
},
});
} else {
@@ -365,7 +369,7 @@
query: {
idX: data.id,
name:this.id,
- id:this.itemId
+ id:this.itemId
},
});
}
@@ -373,7 +377,6 @@
open(type) {
this.dialogVisible = true;
this.form.status = type;
- console.log("xxxxx",this.lists)
var arr = [];
for (var i = 0; i < this.lists.length; i++) {
// this.lists[i].id;
@@ -441,7 +444,7 @@
}
.box-left {
width: 20%;
- min-height: 800px;
+ min-height: 850px;
background-color: white;
border-radius: 5px;
}
@@ -453,6 +456,8 @@
width: 79%;
background-color: white;
border-radius: 5px;
+ height: 850px;
+ overflow-y:overlay;
}
.title {
font-size: 16px;
@@ -474,4 +479,7 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
+.box-right /deep/ .el-table__expanded-cell{
+ background-color: #fff !important;
+}
</style>
--
Gitblit v1.9.2