From 316439a908d0b2363966ebbad23e3b8001291850 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期一, 20 十一月 2023 14:48:46 +0800 Subject: [PATCH] Changes --- web/src/views/modules/project/Environ-AddOrUpdate.vue | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/web/src/views/modules/project/Environ-AddOrUpdate.vue b/web/src/views/modules/project/Environ-AddOrUpdate.vue index 01bebf7..5966765 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"> @@ -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,15 +63,15 @@ <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="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="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="鏁伴噺"> @@ -117,7 +117,7 @@ <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="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> @@ -205,11 +205,7 @@ dataForm: { id: '', environ:{ - code: '', - agencyName:'', - site:'', - softwareName:'', - softwareIdentity:'', + code: '1', hardSoftwareRes: '', testEnvirontDiagram: '', establishStaff:'', @@ -222,6 +218,14 @@ isVirusScan: '', virusDatabaseVersion: '', }, + project: { + softwareIdentity: '', + softwareName: '', + }, + testAgencyInfo: { + agencyName:'', + site:'', + }, softwareResourcesList:[], hardwareResourcesList:[], environAnalysisList:[] -- Gitblit v1.9.1