Commit 2a23704a authored by 高滢's avatar 高滢

feat(全局): 规范化

parent 5e80c73f
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
.then(res => { .then(res => {
if (res.code === 200) { if (res.code === 200) {
this.tableData = res.rows this.tableData = res.rows
console.log(res.rows); console.log(res.rows)
this.total = res.total this.total = res.total
} }
this.loading = false this.loading = false
......
...@@ -46,7 +46,6 @@ function getLine(arr, cellList, cellLength, level, i, mergeData) { ...@@ -46,7 +46,6 @@ function getLine(arr, cellList, cellLength, level, i, mergeData) {
} else { } else {
return return
} }
} else if (cellLength - 1 == level) { } else if (cellLength - 1 == level) {
let obj = JSON.parse(JSON.stringify(mergeData)) let obj = JSON.parse(JSON.stringify(mergeData))
obj[cellList[level] + 'Item'] = i.text obj[cellList[level] + 'Item'] = i.text
...@@ -56,6 +55,4 @@ function getLine(arr, cellList, cellLength, level, i, mergeData) { ...@@ -56,6 +55,4 @@ function getLine(arr, cellList, cellLength, level, i, mergeData) {
} }
return return
} }
export function geSpanCell(row, column, rowIndex, columnIndex, cellList) { export function geSpanCell(row, column, rowIndex, columnIndex, cellList) {}
}
...@@ -71,13 +71,13 @@ ...@@ -71,13 +71,13 @@
> >
<tr :key="reviewDetailIndex"> <tr :key="reviewDetailIndex">
<td> <td>
{{ v.id}} {{ v.id }}
</td> </td>
<td>{{ v.text }}</td> <td>{{ v.text }}</td>
<td>{{v.text }}</td> <td>{{ v.text }}</td>
<td>{{v.text}}</td> <td>{{ v.text }}</td>
<td>{{v.text}}</td> <td>{{ v.text }}</td>
<td>{{v.text}}</td> <td>{{ v.text }}</td>
</tr> </tr>
</template> </template>
</template> </template>
...@@ -150,7 +150,7 @@ export default { ...@@ -150,7 +150,7 @@ export default {
reviewKeypointId: 1734848011609182209 reviewKeypointId: 1734848011609182209
} }
] ]
}, }
] ]
} }
], ],
...@@ -168,16 +168,14 @@ export default { ...@@ -168,16 +168,14 @@ export default {
} }
} }
}, },
created() { created() {},
},
methods: { methods: {
getRows(i) { getRows(i) {
let n = 0 let n = 0
if (i.reviewDetailsList) { if (i.reviewDetailsList) {
n = i.reviewDetailsList.length n = i.reviewDetailsList.length
} }
return n+1 return n + 1
}, },
getRows2(item) { getRows2(item) {
let n = 0 let n = 0
...@@ -187,7 +185,7 @@ export default { ...@@ -187,7 +185,7 @@ export default {
item.keyPointList.map(i => { item.keyPointList.map(i => {
n += i.reviewDetailsList.length n += i.reviewDetailsList.length
}) })
return n+1 return n + 1
}, },
/* 返回跳转*/ /* 返回跳转*/
goToProcessedReview() { goToProcessedReview() {
...@@ -230,11 +228,11 @@ export default { ...@@ -230,11 +228,11 @@ export default {
margin: 0 8rem 8rem 4rem; margin: 0 8rem 8rem 4rem;
width: 5rem; width: 5rem;
} }
.main-statistics{ .main-statistics {
display: flex; display: flex;
margin: 0 65px; margin: 0 65px;
justify-content: space-between; justify-content: space-between;
.statistics-card{ .statistics-card {
width: 320px; width: 320px;
height: 120px; height: 120px;
background: #5ad8a6; background: #5ad8a6;
...@@ -242,12 +240,12 @@ export default { ...@@ -242,12 +240,12 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 30px; padding: 30px;
.card-left{ .card-left {
color: #f3f3f3; color: #f3f3f3;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
} }
.card-right{ .card-right {
::v-deep.iconfont { ::v-deep.iconfont {
font-size: 50px; font-size: 50px;
} }
...@@ -255,8 +253,8 @@ export default { ...@@ -255,8 +253,8 @@ export default {
} }
} }
} }
.form-custom{ .form-custom {
margin-top:3rem ; margin-top: 3rem;
} }
/* 任务编号,名称,单位样式 */ /* 任务编号,名称,单位样式 */
.task { .task {
...@@ -302,8 +300,8 @@ export default { ...@@ -302,8 +300,8 @@ export default {
::v-deep .el-table--border { ::v-deep .el-table--border {
width: unset !important; width: unset !important;
} }
.table{ .table {
th{ th {
text-align: center; text-align: center;
} }
} }
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<!-- 循环遍历 arr --> <!-- 循环遍历 arr -->
<template v-for="(item, index) in questionnaireSummary"> <template v-for="(item, index) in questionnaireSummary">
<tr :key="index"> <tr :key="index">
<td :rowspan="getRows2(item)"> <td :rowspan="getRows2(item)">
...@@ -126,13 +126,13 @@ ...@@ -126,13 +126,13 @@
> >
<tr :key="reviewDetailIndex"> <tr :key="reviewDetailIndex">
<td> <td>
{{ v.id}} {{ v.id }}
</td> </td>
<td>{{ v.text }}</td> <td>{{ v.text }}</td>
<td>{{v.text }}</td> <td>{{ v.text }}</td>
<td>{{v.text}}</td> <td>{{ v.text }}</td>
<td>{{v.text}}</td> <td>{{ v.text }}</td>
<td>{{v.text}}</td> <td>{{ v.text }}</td>
</tr> </tr>
</template> </template>
</template> </template>
...@@ -148,16 +148,26 @@ ...@@ -148,16 +148,26 @@
<span class="title-content">签字确认</span> <span class="title-content">签字确认</span>
</div> </div>
<div> <div>
<el-form label-width="9.25rem" label-position="top" class="form-custom"> <el-form
label-width="9.25rem"
label-position="top"
class="form-custom"
>
<el-row :gutter="41"> <el-row :gutter="41">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车企负责人:"> <el-form-item label="车企负责人:">
<image-preview width="400px" height="300px"></image-preview> <image-preview
width="400px"
height="300px"
></image-preview>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检验负责人:"> <el-form-item label="检验负责人:">
<image-preview width="400px" height="300px"></image-preview> <image-preview
width="400px"
height="300px"
></image-preview>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -193,11 +203,6 @@ export default { ...@@ -193,11 +203,6 @@ export default {
text: '车辆制造商汽车信息安全管理制度是否明确与其它管理流程(如QMS、ISMS)的适配性。', text: '车辆制造商汽车信息安全管理制度是否明确与其它管理流程(如QMS、ISMS)的适配性。',
reviewStandardId: 1734848011609182208, reviewStandardId: 1734848011609182208,
reviewDetailsList: [ reviewDetailsList: [
{
id: 1734848013714722817,
text: '车辆制造商应提供信息安全管理制度在建设实施中与企业其他管理流程相适配的证明材料。',
reviewKeypointId: 1734848013714722816
},
{ {
id: 1734848013714722817, id: 1734848013714722817,
text: '车辆制造商应提供信息安全管理制度在建设实施中与企业其他管理流程相适配的证明材料。', text: '车辆制造商应提供信息安全管理制度在建设实施中与企业其他管理流程相适配的证明材料。',
...@@ -228,7 +233,7 @@ export default { ...@@ -228,7 +233,7 @@ export default {
reviewKeypointId: 1734848011609182209 reviewKeypointId: 1734848011609182209
} }
] ]
}, }
] ]
} }
], ],
...@@ -245,9 +250,6 @@ export default { ...@@ -245,9 +250,6 @@ export default {
] ]
} }
} }
},
created() {
}, },
methods: { methods: {
getRows(i) { getRows(i) {
...@@ -255,7 +257,7 @@ export default { ...@@ -255,7 +257,7 @@ export default {
if (i.reviewDetailsList) { if (i.reviewDetailsList) {
n = i.reviewDetailsList.length n = i.reviewDetailsList.length
} }
return n+1 return n + 1
}, },
getRows2(item) { getRows2(item) {
let n = 0 let n = 0
...@@ -265,7 +267,7 @@ export default { ...@@ -265,7 +267,7 @@ export default {
item.keyPointList.map(i => { item.keyPointList.map(i => {
n += i.reviewDetailsList.length n += i.reviewDetailsList.length
}) })
return n+1 return n + 1
}, },
/* 返回跳转*/ /* 返回跳转*/
goToProcessedReview() { goToProcessedReview() {
...@@ -308,11 +310,11 @@ export default { ...@@ -308,11 +310,11 @@ export default {
margin: 0 8rem 8rem 4rem; margin: 0 8rem 8rem 4rem;
width: 5rem; width: 5rem;
} }
.main-statistics{ .main-statistics {
display: flex; display: flex;
margin: 0 65px; margin: 0 65px;
justify-content: space-between; justify-content: space-between;
.statistics-card{ .statistics-card {
width: 320px; width: 320px;
height: 120px; height: 120px;
background: #5ad8a6; background: #5ad8a6;
...@@ -320,12 +322,12 @@ export default { ...@@ -320,12 +322,12 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 30px; padding: 30px;
.card-left{ .card-left {
color: #f3f3f3; color: #f3f3f3;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
} }
.card-right{ .card-right {
/*图片*/ /*图片*/
.img { .img {
width: 3rem; width: 3rem;
...@@ -335,8 +337,8 @@ export default { ...@@ -335,8 +337,8 @@ export default {
} }
} }
} }
.form-custom{ .form-custom {
margin-top:3rem ; margin-top: 3rem;
} }
/* 任务编号,名称,单位样式 */ /* 任务编号,名称,单位样式 */
.task { .task {
...@@ -382,8 +384,8 @@ export default { ...@@ -382,8 +384,8 @@ export default {
::v-deep .el-table--border { ::v-deep .el-table--border {
width: unset !important; width: unset !important;
} }
.table{ .table {
th{ th {
text-align: center; text-align: center;
} }
} }
......
...@@ -190,9 +190,8 @@ ...@@ -190,9 +190,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="subtitle" style="margin-top: 20px">报告信息</div> <div class="subtitle" style="margin-top: 20px">报告信息</div>
<el-row style="display: flex">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="8">
<el-form-item label="样品名称" prop="yangpin"> <el-form-item label="样品名称" prop="yangpin">
<el-input <el-input
v-model="model.yangpin" v-model="model.yangpin"
...@@ -201,7 +200,7 @@ ...@@ -201,7 +200,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="生产企业" prop="shengchan"> <el-form-item label="生产企业" prop="shengchan">
<el-input <el-input
v-model="model.shengchan" v-model="model.shengchan"
...@@ -210,7 +209,14 @@ ...@@ -210,7 +209,14 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="商标" prop="shangbiao">
<image-preview :src="image" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="送样者" prop="songyangzhe"> <el-form-item label="送样者" prop="songyangzhe">
<el-input <el-input
v-model="model.songyangzhe" v-model="model.songyangzhe"
...@@ -219,7 +225,7 @@ ...@@ -219,7 +225,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="送样日期 " prop="songyangdata"> <el-form-item label="送样日期 " prop="songyangdata">
<el-date-picker <el-date-picker
v-model="model.songyangdata" v-model="model.songyangdata"
...@@ -231,12 +237,7 @@ ...@@ -231,12 +237,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-col :span="6">
<el-form-item label="商标" prop="shangbiao">
<image-preview :src="image" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="样品数量" prop="shuliang"> <el-form-item label="样品数量" prop="shuliang">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment