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'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java | 3
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 3
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 10 +
modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml | 2
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 1
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 37 ++++---
modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml | 4
modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java | 2
web/src/views/modules/project/Environ.vue | 6
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 30 ++++-
web/src/views/modules/project/Environ-AddOrUpdate.vue | 149 ++++++++++++++++++++---------
modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 10 +
modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml | 4
14 files changed, 174 insertions(+), 89 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..d048a09 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
@@ -27,6 +27,8 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -67,7 +69,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");
@@ -84,8 +86,12 @@
public Result insert(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(softwareTestOrderDto, AddGroup.class, DefaultGroup.class);
- Map<String,String> map = new HashMap<>();
- map.put("funCode","environ");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "environ");
+ map.put("year",year);
+ softwareTestOrderDto.getEnviron().setYear(year);
softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = environService.save(softwareTestOrderDto);
@@ -96,15 +102,15 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody Environ environ) {
+ public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class);
- environService.update(environ);
+ ValidatorUtils.validateEntity(softwareTestOrderDto, UpdateGroup.class, DefaultGroup.class);
+ Boolean result = environService.save(softwareTestOrderDto);
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteEnviron")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids) {
@@ -115,4 +121,14 @@
return Result.ok();
}
+ @PostMapping("uploadDiagram")
+ @ApiOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
+ @LogOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
+ public Result uploadDiagram(@RequestBody Long[] ids) {
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ environService.delete(ids);
+
+ return Result.ok();
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
index 4558101..b81f694 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -32,6 +32,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -100,8 +102,12 @@
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), AddGroup.class, DefaultGroup.class);
- Map<String,String> map = new HashMap<>();
- map.put("funCode","software_test_order");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "software_test_order");
+ map.put("year",year);
+ softwareTestOrderDto.getSoftwareTestOrder().setYear(year);
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = softwareTestOrderService.save(softwareTestOrderDto);
return Result.ok();
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
index 2e55186..e43a4ab 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
@@ -64,6 +64,9 @@
@ApiModelProperty(value = "鐥呮瘨搴撶増鏈�")
private String virusDatabaseVersion;
+ @ApiModelProperty(value = "骞翠唤")
+ private String year;
+
@TableField(exist = false)
@ApiModelProperty(value = "涓撲笟瀹為獙瀹ゅ悕绉�")
private String agencyName;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java
index 26f6414..7ae89e1 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java
@@ -31,7 +31,7 @@
private String itemName;
@ApiModelProperty(value = "鐢ㄩ��")
- private String usage;
+ private String purposes;
@ApiModelProperty(value = "鐘舵��")
private String state;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java
index d8dcfcb..2c9b926 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java
@@ -34,7 +34,7 @@
private String version;
@ApiModelProperty(value = "鐢ㄩ��")
- private String usage;
+ private String purposes;
@ApiModelProperty(value = "鎻愪緵鍗曚綅")
private String provideUnit;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
index f7803b0..209d676 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -167,6 +167,9 @@
@ApiModelProperty(value = "娴嬭瘯绾у埆")
private Integer testLevel;
+ @ApiModelProperty(value = "骞翠唤")
+ private String year;
+
@TableField(exist = false)
@ApiModelProperty(value = "杞欢绫诲瀷")
private String softwareType;
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..9b9fb1a 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
@@ -13,9 +13,8 @@
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
@@ -52,15 +51,14 @@
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);
Environ environ = this.get(environId);
data.setEnviron(environ);
+ data.setTestAgencyInfo(testAgencyInfoService.get(environId));
projectId = environ.getProjectId();
-
List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
data.setSoftwareResourcesList(softwareResourcesList);
@@ -70,17 +68,15 @@
List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
data.setEnvironAnalysisList(environAnalysesList);
} else {
- Project project = projectService.get(projectId);
- data.getEnviron().setSoftwareName(project.getSoftwareName());
- data.getEnviron().setSoftwareIdentity(project.getSoftwareIdentity());
+ Environ environ =new Environ();
+ data.setEnviron(environ);
+ }
+ if (projectId != null) {
+ data.setProjectId(projectId);
+ data.setProject(projectService.get(projectId));
}
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));
- }
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
return data;
}
@@ -109,8 +105,12 @@
if (environId != null)
baseDao.updateById(softwareTestOrderDto.getEnviron());
else {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
Map<String, String> map = new HashMap<>();
map.put("funCode", "environ");
+ map.put("year",year);
+ softwareTestOrderDto.getEnviron().setYear(year);
softwareTestOrderDto.getEnviron().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getEnviron());
@@ -146,7 +146,12 @@
environAnalysisService.insert(environAnalysis);
}
}
-
+ if (softwareTestOrderDto.getTestAgencyInfo().getId() == 10000) {
+ softwareTestOrderDto.getTestAgencyInfo().setId(environId);
+ testAgencyInfoService.insert(softwareTestOrderDto.getTestAgencyInfo());
+ } else {
+ testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
+ }
sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
return true;
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index 5a5327a..0450243 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -27,10 +27,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
@@ -96,8 +94,12 @@
if (softwareTestOrderId != null)
baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
else {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
Map<String, String> map = new HashMap<>();
map.put("funCode", "software_test_order");
+ map.put("year",year);
+ softwareTestOrderDto.getSoftwareTestOrder().setYear(year);
softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
index dc5a2f0..6843d79 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
@@ -5,7 +5,7 @@
<select id="getList" resultType="com.zt.life.modules.project.model.Environ">
SELECT a.*, p.*
- FROM software_test_order a
+ FROM environ a
INNER JOIN project p ON p.id = a.project_id
<where>
a.is_delete = 0 and p.is_delete = 0
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml
index db884be..2f417ec 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml
@@ -8,8 +8,8 @@
from environ_hardware_resources a
<where>
a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
+ <if test="environId!=null">
+ and environ_id = ${environId}
</if>
</where>
<if test="orderBySql!=null">
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
index d55ed3e..7eff245 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
@@ -8,8 +8,8 @@
from environ_software_resources a
<where>
a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
+ <if test="environId!=null">
+ and environ_id = ${environId}
</if>
</where>
<if test="orderBySql!=null">
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)
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