From 2f7e7ad6c61ac3f239a4e9a87cde634a9c3fcf00 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 20 十一月 2023 14:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/Environ-AddOrUpdate.vue | 149 +++++++++++++++++++++++++++++++++----------------
1 files changed, 100 insertions(+), 49 deletions(-)
diff --git a/web/src/views/modules/project/Environ-AddOrUpdate.vue b/web/src/views/modules/project/Environ-AddOrUpdate.vue
index 0d3e81c..5966765 100644
--- a/web/src/views/modules/project/Environ-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Environ-AddOrUpdate.vue
@@ -3,21 +3,21 @@
<el-form :model="dataForm" style="padding: 0" :inline="true" ref="dataForm" :disabled="dataForm.disabled" label-width="130px" class="confirmFormAuto">
<div class="DConfirmForm">
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: 0">
- <span>{{dataForm.code}}</span>
+ <span>{{dataForm.environ.code}}</span>
</el-form-item>
</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.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.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.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.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">
@@ -28,7 +28,7 @@
<div class="table-container">
<el-table 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">
@@ -63,12 +63,32 @@
<div class="table-container">
<el-table 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="itemName" min-width="300" label="纭欢鍜屽浐浠堕」鐩悕绉�"></el-table-column>
- <el-table-column prop="usage" align="center" width="180" label="鐢ㄩ��"></el-table-column>
- <el-table-column prop="number" align="center" width="80" label="鏁伴噺"></el-table-column>
- <el-table-column prop="state" align="center" width="120" label="鐘舵��"></el-table-column>
- <el-table-column prop="provideUnit" align="center" width="180" label="鎻愪緵鍗曚綅"></el-table-column>
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿"></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="purposes" align="center" width="180" label="鐢ㄩ��">
+ <template v-slot="{ row }">
+ <el-input v-model="row.purposes" placeholder="鐢ㄩ��"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="number" align="center" width="80" label="鏁伴噺">
+ <template v-slot="{ row }">
+ <el-input v-model="row.number" placeholder="鏁伴噺"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="state" align="center" width="120" label="鐘舵��">
+ <template v-slot="{ row }">
+ <el-input v-model="row.state" placeholder="鐘舵��"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="provideUnit" align="center" width="180" label="鎻愪緵鍗曚綅">
+ <template v-slot="{ row }">
+ <el-input v-model="row.provideUnit" placeholder="鎻愪緵鍗曚綅"></el-input>
+ </template>
+ </el-table-column>
</el-table>
<div class="icon-container" @click="addHardwareRow()">
<!-- 鏀剧疆鍥哄畾鐨勫浘鏍� -->
@@ -83,7 +103,9 @@
</div>
<div style="width: calc(100% - 120px);">
<div style="height:150px" class="el-wt-border-left">
- <span>{{dataForm.testEnvirontDiagram}}</span>
+ <span>{{dataForm.environ.testEnvirontDiagram}}</span>
+<!-- <config-uploader busi-type="test_order" model-name="dataForm" :dataForm="dataForm"-->
+<!-- v-model="dataForm.files"/>-->
</div>
</div>
</div>
@@ -95,12 +117,32 @@
<div class="table-container">
<el-table 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="realEnviron" min-width="300" label="鐪熷疄鐜"></el-table-column>
- <el-table-column prop="testEnviron" align="center" width="100" label="娴嬭瘯鐜"></el-table-column>
- <el-table-column prop="environDifference" align="center" width="100" label="鐜宸紓"></el-table-column>
- <el-table-column prop="resultImpact" align="center" width="160" label="瀵规祴璇曠粨鏋滃奖鍝�"></el-table-column>
- <el-table-column prop="measure" align="center" width="180" label="鎺柦"></el-table-column>
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿"></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>
+ </template>
+ </el-table-column>
+ <el-table-column prop="testEnviron" align="center" width="100" label="娴嬭瘯鐜">
+ <template v-slot="{ row }">
+ <el-input v-model="row.testEnviron" placeholder="娴嬭瘯鐜"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="environDifference" align="center" width="100" label="鐜宸紓">
+ <template v-slot="{ row }">
+ <el-input v-model="row.environDifference" placeholder="鐜宸紓"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="resultImpact" align="center" width="160" label="瀵规祴璇曠粨鏋滃奖鍝�">
+ <template v-slot="{ row }">
+ <el-input v-model="row.resultImpact" placeholder="瀵规祴璇曠粨鏋滃奖鍝�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="measure" align="center" width="180" label="鎺柦">
+ <template v-slot="{ row }">
+ <el-input v-model="row.measure" placeholder="鎺柦"></el-input>
+ </template>
+ </el-table-column>
</el-table>
<div class="icon-container" @click="addDiscrepancyRow()">
<!-- 鏀剧疆鍥哄畾鐨勫浘鏍� -->
@@ -115,20 +157,20 @@
</div>
<div style="width: calc(100% - 120px)" class="DConfirmForm el-wt-border-left">
<el-form-item class="marginTopAndMarginBottom" label="浜哄憳" style="width: 49%">
- <el-input v-model="dataForm.establishStaff" placeholder="浜哄憳"></el-input>
+ <el-input v-model="dataForm.environ.establishStaff" placeholder="浜哄憳"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="鏃ユ湡" style="width: 48%">
<el-date-picker
- v-model="dataForm.establishDate"
+ v-model="dataForm.environ.establishDate"
type="date"
placeholder="鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item label-width="180px" class="isKill" label="鏄惁杩涜鐜鐥呮瘨鏌ユ潃" style="width: 49%">
- <zt-dict v-model="dataForm.isVirusScan" dict="is_or_not" :radio="true"></zt-dict>
+ <zt-dict v-model="dataForm.environ.isVirusScan" dict="is_or_not" :radio="true"></zt-dict>
</el-form-item>
<el-form-item label="鐥呮瘨搴撶増鏈�" style="width: 48%">
- <el-input v-model="dataForm.virusDatabaseVersion" placeholder="璇疯緭鍏ョ梾姣掑簱鐗堟湰"></el-input>
+ <el-input v-model="dataForm.environ.virusDatabaseVersion" placeholder="璇疯緭鍏ョ梾姣掑簱鐗堟湰"></el-input>
</el-form-item>
</div>
</div>
@@ -139,12 +181,12 @@
<div style="width: calc(100% - 120px)" class="DConfirmForm el-wt-border-left">
<!-- 鍗曚綅鍚嶇О -->
<el-form-item class="marginTopAndMarginBottom" label="浜哄憳" style="width: 49%">
- <el-input v-model="dataForm.confirmatStaff" placeholder="浜哄憳"></el-input>
+ <el-input v-model="dataForm.environ.confirmatStaff" placeholder="浜哄憳"></el-input>
</el-form-item>
<!-- 鑱旂郴浜� -->
<el-form-item class="marginTopAndMarginBottom" label="鏃ユ湡" style="width: 48%">
<el-date-picker
- v-model="dataForm.confirmatDate"
+ v-model="dataForm.environ.confirmatDate"
type="date"
placeholder="鏃ユ湡">
</el-date-picker>
@@ -162,26 +204,31 @@
return {
dataForm: {
id: '',
- code: '',
- agencyName:'',
- site:'',
- softwareName:'',
- softwareIdentity:'',
- hardSoftwareRes: '',
- testEnvirontDiagram: '',
+ environ:{
+ code: '1',
+ hardSoftwareRes: '',
+ testEnvirontDiagram: '',
+ establishStaff:'',
+ establishDate:'',
+ environAnalysis: '',
+ environEstablish: '',
+ environConfirmat: '',
+ confirmatStaff: '',
+ confirmatDate: '',
+ isVirusScan: '',
+ virusDatabaseVersion: '',
+ },
+ project: {
+ softwareIdentity: '',
+ softwareName: '',
+ },
+ testAgencyInfo: {
+ agencyName:'',
+ site:'',
+ },
softwareResourcesList:[],
hardwareResourcesList:[],
- environAnalysisList:[],
- establishStaff:'',
- establishDate:'',
- environAnalysis: '',
- environEstablish: '',
- environConfirmat: '',
- confirmatStaff: '',
- confirmatDate: '',
- isVirusScan: '',
- virusDatabaseVersion: '',
- softwareData:[]
+ environAnalysisList:[]
}
}
},
@@ -196,7 +243,7 @@
// 鑾峰彇淇℃伅
async getInfo() {
let params = {
- orderId: this.dataForm.id,
+ environId: this.dataForm.id,
projectId: this.dataForm.projectId
}
let res = await this.$http.get(`/project/Environ/getDto`,{params: params})
@@ -210,10 +257,14 @@
return index += 1
},
addSoftwareRow(){
- this.dataForm.softwareData.push({})
+ this.dataForm.softwareResourcesList.push({})
},
- addHardwareRow(){},
- addDiscrepancyRow(){},
+ addHardwareRow(){
+ this.dataForm.hardwareResourcesList.push({})
+ },
+ addDiscrepancyRow(){
+ this.dataForm.environAnalysisList.push({})
+ },
// 琛ㄥ崟鎻愪氦
async formSubmit() {
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/Environ/', this.dataForm)
--
Gitblit v1.9.1