From 86590dd1818e00ef0901dbb4f17f108af5e83d76 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期二, 21 十一月 2023 08:53:15 +0800
Subject: [PATCH] 确认表
---
web/src/views/modules/project/Environ-AddOrUpdate.vue | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 22 deletions(-)
diff --git a/web/src/views/modules/project/Environ-AddOrUpdate.vue b/web/src/views/modules/project/Environ-AddOrUpdate.vue
index 01bebf7..457c8bf 100644
--- a/web/src/views/modules/project/Environ-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Environ-AddOrUpdate.vue
@@ -8,16 +8,16 @@
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%" class="confirmDAuto DConfirmForm">
<el-form-item class="marginTopAndMarginBottom" label="涓撲笟瀹為獙瀹ゅ悕绉�" style="width: 49%">
- <el-input v-model="dataForm.environ.agencyName" placeholder="涓撲笟瀹為獙瀹ゅ悕绉�"></el-input>
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="涓撲笟瀹為獙瀹ゅ悕绉�"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="娴嬭瘯鍦扮偣" style="width: 49%">
- <el-input v-model="dataForm.environ.site" placeholder="娴嬭瘯鍦扮偣"></el-input>
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="娴嬭瘯鍦扮偣"></el-input>
</el-form-item>
<el-form-item label="琚祴杞欢" style="width: 49%">
- <el-input v-model="dataForm.environ.softwareName" placeholder="琚祴杞欢"></el-input>
+ <el-input v-model="dataForm.project.softwareName" placeholder="琚祴杞欢"></el-input>
</el-form-item>
<el-form-item label="鐗堟湰" style="width: 49%">
- <el-input v-model="dataForm.environ.softwareIdentity" placeholder="鐗堟湰"></el-input>
+ <el-input v-model="dataForm.project.softwareIdentity" placeholder="鐗堟湰"></el-input>
</el-form-item>
<div class="el-flexConfigDialog el-form-border">
<div class="DFormWidth DAlign DHold">
@@ -26,9 +26,9 @@
<div class="el-wt-border-left" style="padding-left:5px;width: calc(100% - 130px)">
<div style="padding: 5px">杞欢璧勬簮锛�</div>
<div class="table-container">
- <el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.softwareResourcesList"
+ <el-table ref="tableSoftwareList" class="el-software el-margin-top-bot" height="150" border :data="dataForm.softwareResourcesList"
stripe>
- <el-table-column prop="code" align="center" width="80" label="搴忓彿">
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿">
<template slot-scope="scope">
<span v-html="indexFormat(scope.$index)"></span>
</template>
@@ -43,9 +43,9 @@
<el-input v-model="row.version" placeholder="鐗堟湰"></el-input>
</template>
</el-table-column>
- <el-table-column prop="use" align="center" width="180" label="鐢ㄩ��">
+ <el-table-column prop="purposes" align="center" width="180" label="鐢ㄩ��">
<template v-slot="{ row }">
- <el-input v-model="row.usage" placeholder="鐢ㄩ��"></el-input>
+ <el-input v-model="row.purposes" placeholder="鐢ㄩ��"></el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="鎻愪緵鍗曚綅" width="180" align="center">
@@ -61,17 +61,21 @@
</div>
<div style="padding: 5px">纭欢璧勬簮锛�</div>
<div class="table-container">
- <el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.hardwareResourcesList"
+ <el-table ref="tableHardwareList" class="el-software el-margin-top-bot" height="150" border :data="dataForm.hardwareResourcesList"
stripe>
- <el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿">
+ <template slot-scope="scope">
+ <span v-html="indexFormat(scope.$index)"></span>
+ </template>
+ </el-table-column>
<el-table-column prop="itemName" min-width="300" label="纭欢鍜屽浐浠堕」鐩悕绉�">
<template v-slot="{ row }">
<el-input v-model="row.itemName" placeholder="纭欢鍜屽浐浠堕」鐩悕绉�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="usage" align="center" width="180" label="鐢ㄩ��">
+ <el-table-column prop="purposes" align="center" width="180" label="鐢ㄩ��">
<template v-slot="{ row }">
- <el-input v-model="row.usage" placeholder="鐢ㄩ��"></el-input>
+ <el-input v-model="row.purposes" placeholder="鐢ㄩ��"></el-input>
</template>
</el-table-column>
<el-table-column prop="number" align="center" width="80" label="鏁伴噺">
@@ -102,10 +106,14 @@
鍔ㄦ�佹祴璇曠幆澧冨浘
</div>
<div style="width: calc(100% - 120px);">
- <div style="height:150px" class="el-wt-border-left">
+ <div class="el-wt-border-left">
<span>{{dataForm.environ.testEnvirontDiagram}}</span>
-<!-- <config-uploader busi-type="test_order" model-name="dataForm" :dataForm="dataForm"-->
-<!-- v-model="dataForm.files"/>-->
+ <config-uploader busi-type="test_environt_diagram" model-name="dataForm" :dataForm="dataForm"
+ @getImageUrl="getImageUrl"
+ v-model="dataForm.files"/>
+ <div v-if="image.url">
+ <el-image :src="image.url"></el-image>
+ </div>
</div>
</div>
</div>
@@ -115,9 +123,13 @@
</div>
<div class="el-wt-border-left" style="padding-left:5px;width: calc(100% - 130px)">
<div class="table-container">
- <el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.environAnalysisList"
+ <el-table ref="tableEnvironeList" class="el-software el-margin-top-bot" height="150" border :data="dataForm.environAnalysisList"
stripe>
- <el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿">
+ <template slot-scope="scope">
+ <span v-html="indexFormat(scope.$index)"></span>
+ </template>
+ </el-table-column>
<el-table-column prop="realEnviron" min-width="300" label="鐪熷疄鐜">
<template v-slot="{ row }">
<el-input v-model="row.realEnviron" placeholder="鐪熷疄鐜"></el-input>
@@ -202,14 +214,15 @@
export default {
data() {
return {
+ image: {
+ url:'',
+ width:'',
+ height:1,
+ },
dataForm: {
id: '',
environ:{
- code: '',
- agencyName:'',
- site:'',
- softwareName:'',
- softwareIdentity:'',
+ code: '1',
hardSoftwareRes: '',
testEnvirontDiagram: '',
establishStaff:'',
@@ -221,6 +234,14 @@
confirmatDate: '',
isVirusScan: '',
virusDatabaseVersion: '',
+ },
+ project: {
+ softwareIdentity: '',
+ softwareName: '',
+ },
+ testAgencyInfo: {
+ agencyName:'',
+ site:'',
},
softwareResourcesList:[],
hardwareResourcesList:[],
@@ -254,12 +275,28 @@
},
addSoftwareRow(){
this.dataForm.softwareResourcesList.push({})
+ this.$nextTick(()=>{
+ const tableBody=this.$refs.tableSoftwareList.$el.querySelector('.el-table__body-wrapper')
+ tableBody.scrollTop = tableBody.scrollHeight
+ })
},
addHardwareRow(){
this.dataForm.hardwareResourcesList.push({})
+ this.$nextTick(()=>{
+ const tableBody=this.$refs.tableHardwareList.$el.querySelector('.el-table__body-wrapper')
+ tableBody.scrollTop = tableBody.scrollHeight;
+ })
},
addDiscrepancyRow(){
this.dataForm.environAnalysisList.push({})
+ this.$nextTick(()=>{
+ const tableBody=this.$refs.tableEnvironeList.$el.querySelector('.el-table__body-wrapper')
+ tableBody.scrollTop = tableBody.scrollHeight;
+ })
+ },
+ getImageUrl(url){
+ this.image.url = url
+ console.log(this.image.url,' this.image.url')
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
--
Gitblit v1.9.1