From a089845484b1c050adc2dab79d9713b9f0e949f1 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 10:28:02 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/project/Environ.vue | 6 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 2
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 1
web/src/views/modules/project/Environ-AddOrUpdate.vue | 63 ++++++++++++++++---------------
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 8 +--
5 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
index b696495..ea12363 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -67,7 +67,7 @@
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<SoftwareTestOrderDto> getDto(Long projectId, Long environId) {
+ public Result<SoftwareTestOrderDto> getDto(Long environId, Long projectId) {
SoftwareTestOrderDto data = environService.getDto(environId, projectId);
if (projectId != null) {
OssDto ossDto = sysOssConfigService.getOssByBusiType(projectId, "environ");
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
index 556abeb..75206fd 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -52,7 +52,7 @@
private TestAgencyInfoService testAgencyInfoService;
- public SoftwareTestOrderDto getDto(Long projectId, Long environId) {
+ public SoftwareTestOrderDto getDto(Long environId, Long projectId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (environId != null) {
data.setId(environId);
@@ -71,16 +71,14 @@
data.setEnvironAnalysisList(environAnalysesList);
} else {
Project project = projectService.get(projectId);
+ Environ environ = new Environ();
+ data.setEnviron(environ);
data.getEnviron().setSoftwareName(project.getSoftwareName());
data.getEnviron().setSoftwareIdentity(project.getSoftwareIdentity());
}
if (data.getTestAgencyInfo() == null)
data.getEnviron().setAgencyName(testAgencyInfoService.get(10000L).getAgencyName());
data.getEnviron().setSite(testAgencyInfoService.get(10000L).getSite());
- if (projectId != null) {
- data.setOrderId(projectId);
- data.setSoftwareTestOrder(softwareTestOrderService.get(projectId));
- }
return data;
}
diff --git a/web/src/views/modules/project/Environ-AddOrUpdate.vue b/web/src/views/modules/project/Environ-AddOrUpdate.vue
index 0d3e81c..1b7dd98 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.environ.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.environ.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.environ.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.environ.softwareIdentity" placeholder="鐗堟湰"></el-input>
</el-form-item>
<div class="el-flexConfigDialog el-form-border">
<div class="DFormWidth DAlign DHold">
@@ -83,7 +83,7 @@
</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>
</div>
</div>
</div>
@@ -115,20 +115,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 +139,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 +162,27 @@
return {
dataForm: {
id: '',
- code: '',
- agencyName:'',
- site:'',
- softwareName:'',
- softwareIdentity:'',
- hardSoftwareRes: '',
- testEnvirontDiagram: '',
+ environ:{
+ code: '',
+ agencyName:'',
+ site:'',
+ softwareName:'',
+ softwareIdentity:'',
+ hardSoftwareRes: '',
+ testEnvirontDiagram: '',
+ establishStaff:'',
+ establishDate:'',
+ environAnalysis: '',
+ environEstablish: '',
+ environConfirmat: '',
+ confirmatStaff: '',
+ confirmatDate: '',
+ isVirusScan: '',
+ virusDatabaseVersion: '',
+ },
softwareResourcesList:[],
hardwareResourcesList:[],
- environAnalysisList:[],
- establishStaff:'',
- establishDate:'',
- environAnalysis: '',
- environEstablish: '',
- environConfirmat: '',
- confirmatStaff: '',
- confirmatDate: '',
- isVirusScan: '',
- virusDatabaseVersion: '',
- softwareData:[]
+ environAnalysisList:[]
}
}
},
@@ -196,7 +197,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})
diff --git a/web/src/views/modules/project/Environ.vue b/web/src/views/modules/project/Environ.vue
index 31489a1..eaefd96 100644
--- a/web/src/views/modules/project/Environ.vue
+++ b/web/src/views/modules/project/Environ.vue
@@ -4,13 +4,13 @@
<zt-table-wraper query-url="/project/Environ/page" delete-url="/project/Environ" v-slot="{ table }" @dataLoaded="dataLoaded">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
- <el-input v-model="dataForm.code" placeholder="璇疯緭鍏ョ紪鍙�" clearable></el-input>
+ <el-input v-model="dataForm.code" placeholder="璇疯緭鍏ョ紪鍙�" clearable></el-input>
</el-form-item>
<el-form-item>
-<!-- <zt-button type="query" @click="table.query()"/>-->
+ <zt-button type="query" @click="table.query()"/>
<zt-button type="primary" class="el-icon-edit" perm="project:add" @click="add()">鏂板</zt-button>
- <zt-button type="add" perm="project:add" @click="table.editHandle()"/>
+ <!--<zt-button type="add" perm="project:add" @click="table.editHandle()"/>-->
<zt-button type="delete" perm="project:delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index b1e8a9b..139e0ed 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -442,7 +442,6 @@
softwareType: '',
tenantId: '',
testLevel: '',
-
},
testAgencyInfo: {
agencyName:'',
--
Gitblit v1.9.1