qinzhipeng_v il y a 6 ans
Parent
commit
93a1ba09c2

+ 16 - 12
src/views/Platform/presentation/Acceptance.vue

@@ -16,9 +16,11 @@
     <el-form-item label="一、项目概述" />
     <el-row :gutter="20" type="flex">
       <el-col :span="12">
-        <el-form-item label="测试结果" class="backStyle">
-          <el-radio v-model="status" style="margin: 0 87px;" label="1" @change="changeStatus(1)">通过</el-radio>
-          <el-radio v-model="status" style="padding-right: 150px;" label="2" @change="changeStatus">不通过</el-radio>
+        <el-form-item label="测试结果" class="backStyle" prop="status">
+          <el-radio-group v-model="ClientData.status">
+            <el-radio style="margin: 0 87px;" label="1" @change="changeStatus(1)">通过</el-radio>
+            <el-radio style="padding-right: 150px;" label="2" @change="changeStatus">不通过</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="准入结果" prop="smokeTestResult" class="backStyle" style="margin-left:69px;"><el-input v-model="ClientData.smokeTestResult" style="width:31.1vw;" placeholder="准入次数/通过次数/失败次数" /></el-form-item>
       </el-col>
@@ -43,13 +45,13 @@
     </el-row>
     <el-row :gutter="20" type="flex">
       <el-col :span="12">
-        <el-form-item label="准出延期" class="backStyle">
-          <el-radio-group v-model="taskLateStatus">
-            <el-radio v-model="taskLateStatus" style="margin: 0 90px;" label="2" @change="lateStatusChange(2)">否</el-radio>
-            <el-radio v-model="taskLateStatus" style="padding-right: 187px;" label="1" @change="lateStatusChange(1)">是</el-radio>
+        <el-form-item label="准出延期" class="backStyle" prop="taskLateStatus">
+          <el-radio-group v-model="ClientData.taskLateStatus">
+            <el-radio style="margin: 0 90px;" label="2" @change="lateStatusChange(2)">否</el-radio>
+            <el-radio style="padding-right: 187px;" label="1" @change="lateStatusChange(1)">是</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-show="showDelay" label="延期原因" prop="taskLateReason" class="backStyle" style="margin-left:73px;"><el-input v-model="ClientData.taskLateReason" style="width:31.3vw;" /></el-form-item>
+        <el-form-item v-if="showDelay" label="延期原因" prop="taskLateReason" class="backStyle" style="margin-left:73px;"><el-input v-model="ClientData.taskLateReason" style="width:31.3vw;" /></el-form-item>
       </el-col>
     </el-row>
     <el-form-item label="二、项目背景" class="backStyle" />
@@ -243,13 +245,15 @@ export default {
         this.showButton = false
         this.ClientData = this.$route.query.data
         if (this.ClientData.status === 1) {
-          this.status = '1'
-        } else { this.status = '2' }
+          this.ClientData.status = '1'
+        } else {
+          this.ClientData.status = '2'
+        }
         if (this.ClientData.taskLateStatus === 1) {
-          this.taskLateStatus = '1'
+          this.ClientData.taskLateStatus = '1'
           this.showDelay = true
         } else {
-          this.taskLateStatus = '2'
+          this.ClientData.taskLateStatus = '2'
           this.showDelay = false
         }
       }

+ 15 - 11
src/views/Platform/presentation/ClientAcceptance.vue

@@ -16,9 +16,11 @@
     <el-row :gutter="20"><el-col :span="12"><el-form-item label="一、项目概述" class="backStyle" /></el-col></el-row>
     <el-row :gutter="20" type="flex">
       <el-col :span="12">
-        <el-form-item label="测试结果" class="backStyle">
-          <el-radio v-model="status" style="margin: 0 90px;" label="1" @change="changeStatus(1)">通过</el-radio>
-          <el-radio v-model="status" style="padding-right: 140px;" label="2" @change="changeStatus">不通过</el-radio>
+        <el-form-item label="测试结果" class="backStyle" prop="status">
+          <el-radio-group v-model="ClientData.status">
+            <el-radio style="margin: 0 90px;" label="1" @change="changeStatus(1)">通过</el-radio>
+            <el-radio style="padding-right: 140px;" label="2" @change="changeStatus">不通过</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="准入结果" prop="smokeTestResult" class="backStyle" style="margin-left:77px;"><el-input v-model="ClientData.smokeTestResult" style="width:30.5vw;" placeholder="准入次数/通过次数/失败次数" /></el-form-item>
       </el-col>
@@ -43,11 +45,13 @@
     </el-row>
     <el-row :gutter="20" type="flex">
       <el-col :span="12">
-        <el-form-item label="准出延期" class="backStyle">
-          <el-radio v-model="taskLateStatus" style="margin: 0 90px;" label="2" @change="clickshow">否</el-radio>
-          <el-radio v-model="taskLateStatus" style="padding-right: 177px;" label="1" @change="clickshow(1)">是</el-radio>
+        <el-form-item label="准出延期" class="backStyle" prop="taskLateStatus">
+          <el-radio-group v-model="ClientData.taskLateStatus">
+            <el-radio style="margin: 0 90px;" label="2" @change="clickshow">否</el-radio>
+            <el-radio style="padding-right: 177px;" label="1" @change="clickshow(1)">是</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item v-show="showDelay" prop="taskLateReason" label="延期原因" class="backStyle" style="margin-left:82px;"><el-input v-model="ClientData.taskLateReason" style="width:30.5vw;" /></el-form-item>
+        <el-form-item v-if="showDelay" prop="taskLateReason" label="延期原因" class="backStyle" style="margin-left:82px;"><el-input v-model="ClientData.taskLateReason" style="width:30.5vw;" /></el-form-item>
       </el-col>
     </el-row>
     <el-form-item label="二、项目背景" class="backStyle" />
@@ -180,15 +184,15 @@ export default {
         this.pftResult = this.ClientData.pftResult
         this.sctResult = this.ClientData.sctResult
         if (this.ClientData.status === 1) {
-          this.status = '1'
+          this.ClientData.status = '1'
         } else {
-          this.status = '2'
+          this.ClientData.status = '2'
         }
         if (this.ClientData.taskLateStatus === 1) {
-          this.taskLateStatus = '1'
+          this.ClientData.taskLateStatus = '1'
           this.showDelay = true
         } else {
-          this.taskLateStatus = '2'
+          this.ClientData.taskLateStatus = '2'
           this.showDelay = false
         }
       }

+ 1 - 1
src/views/Platform/presentation/DailyNewsAdded.vue

@@ -225,7 +225,7 @@ export default {
         .catch(action => { action === 'cancel' ? this.$router.go(-1) : '' })
     },
     getCreateData(ele) {
-      this.$refs['ClientData'].validate((valid) => {
+      this.$refs['fromCreateData'].validate((valid) => {
         if (valid) {
           this.fromCreateData = ele
           this.fromCreateData.testExplain = this.testExplain

+ 28 - 21
src/views/Platform/presentation/PresentReport.vue

@@ -18,10 +18,12 @@
       <el-row :gutter="20" type="flex">
         <el-col :span="12">
           <el-form-item label="是否延期" prop="lateStatus">
-            <el-radio v-model="lateStatus" style="margin: 0 90px;" label="2" @change="lateStatusChange">否</el-radio>
-            <el-radio v-model="lateStatus" style="padding-right: 185px;" label="1" @change="lateStatusChange(1)">是</el-radio>
+            <el-radio-group v-model="dataChange.lateStatus">
+              <el-radio style="margin: 0 90px;" label="2" @change="lateStatusChange">否</el-radio>
+              <el-radio style="padding-right: 185px;" label="1" @change="lateStatusChange(1)">是</el-radio>
+            </el-radio-group>
           </el-form-item>
-          <el-form-item v-show="showDelay" label="延期原因" prop="latereason" style="margin-left:75px;"><el-input v-model="dataChange.latereason" style="width:29.8vw;" /></el-form-item>
+          <el-form-item v-if="showDelay" label="延期原因" prop="latereason" style="margin-left:75px;"><el-input v-model="dataChange.latereason" style="width:29.8vw;" /></el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="23">
@@ -46,20 +48,24 @@
       </el-row>
       <el-row :gutter="20" type="flex">
         <el-col :span="12">
-          <el-form-item label="新增Apollo" prop="configInfo">
-            <el-radio v-model="configInfo" style="margin: 0 83px;" label="2" @change="changeApollo">否</el-radio>
-            <el-radio v-model="configInfo" style="padding-right: 185px;" label="1" @change="changeApollo(1)">是</el-radio>
+          <el-form-item label="新增Apollo" prop="configIn">
+            <el-radio-group v-model="dataChange.configIn">
+              <el-radio style="margin: 0 83px;" label="2" @change="changeApollo">否</el-radio>
+              <el-radio style="padding-right: 185px;" label="1" @change="changeApollo(1)">是</el-radio>
+            </el-radio-group>
           </el-form-item>
-          <el-form-item v-show="showApollo" label="Apollo名称" prop="configInfo" style="margin-left:75px;"><el-input v-model="dataChange.configInfo" style="width:28.5vw;" /></el-form-item>
+          <el-form-item v-if="showApollo" label="Apollo名称" prop="configInfo" style="margin-left:75px;"><el-input v-model="dataChange.configInfo" style="width:28.5vw;" /></el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20" type="flex">
         <el-col :span="12">
-          <el-form-item label="依赖组件" prop="dependentComponents">
-            <el-radio v-model="dependentComponents" style="margin: 0 90px;" label="2" @change="changeRelyOn">否</el-radio>
-            <el-radio v-model="dependentComponents" style="padding-right: 185px;" label="1" @change="changeRelyOn(1)">是</el-radio>
+          <el-form-item label="依赖组件" prop="dependent">
+            <el-radio-group v-model="dataChange.dependent">
+              <el-radio style="margin: 0 90px;" label="2" @change="changeRelyOn">否</el-radio>
+              <el-radio style="padding-right: 185px;" label="1" @change="changeRelyOn(1)">是</el-radio>
+            </el-radio-group>
           </el-form-item>
-          <el-form-item v-show="showRelyOn" label="组件名称" prop="dependentComponents" style="margin-left:75px;"><el-input v-model="dataChange.dependentComponents" style="width:29.3vw;" /></el-form-item>
+          <el-form-item v-if="showRelyOn" label="组件名称" prop="dependentComponents" style="margin-left:75px;"><el-input v-model="dataChange.dependentComponents" style="width:29.3vw;" /></el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="23">
@@ -125,8 +131,8 @@ export default {
         pmUi: [{ required: true, message: 'PM & UI不能为空', trigger: 'change' }],
         lateStatus: [{ required: true, message: '是否延期不能为空', trigger: 'change' }],
         latereason: [{ required: true, message: '延期原因不能为空', trigger: 'change' }],
-        dependentComponents: [{ required: true, message: '依赖组建不能为空', trigger: 'change' }],
-        configInfo: [{ required: true, message: '新增Apollo不能为空', trigger: 'change' }],
+        dependent: [{ required: true, message: '依赖组建不能为空', trigger: 'change' }],
+        configIn: [{ required: true, message: '新增Apollo不能为空', trigger: 'change' }],
         priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
         packageUrl: [{ required: true, message: '测试地址不能为空', trigger: 'change' }],
         packageBranch: [{ required: true, message: '打包分支不能为空', trigger: 'change' }],
@@ -174,24 +180,24 @@ export default {
         this.showButton = false
         this.dataChange = this.$route.query.data
         if (this.dataChange.lateStatus === 1) {
-          this.lateStatus = '1'
+          this.dataChange.lateStatus = '1'
           this.showDelay = true
         } else {
-          this.lateStatus = '2'
+          this.dataChange.lateStatus = '2'
           this.showDelay = false
         }
-        if (this.dataChange.lateStatus === 1) {
-          this.configInfo = '1'
+        if (this.dataChange.configInfo === 1) {
+          this.dataChange.configIn = '1'
           this.showApollo = true
         } else {
-          this.configInfo = '2'
+          this.dataChange.configIn = '2'
           this.showApollo = false
         }
         if (this.dataChange.dependentComponents === 1) {
-          this.dependentComponents = '1'
+          this.dataChange.dependent = '1'
           this.showRelyOn = true
         } else {
-          this.dependentComponents = '2'
+          this.dataChange.dependent = '2'
           this.showRelyOn = false
         }
       }
@@ -213,7 +219,8 @@ export default {
       this.$refs['dataChange'].validate((valid) => {
         if (valid) {
           this.dataChange = ele
-          this.dataChange.joinTest = this.DetailsOfProposal
+          typeof (this.DetailsOfProposal) === 'string' ? this.dataChange.joinTest = this.DetailsOfProposal : ''
+          // this.dataChange.joinTest = this.DetailsOfProposal
           this.dataChange.taskId = this.$route.query.id
           this.dataChange.bizId = this.bizIdData
           this.dataChange.type = 1

+ 1 - 1
src/views/Platform/presentation/acceptTheReport.vue

@@ -95,7 +95,7 @@
           <el-row :gutter="23"><el-col :span="23"><el-form-item label="打包分支 ">{{ fromCreateData.packageBranch }}</el-form-item></el-col></el-row>
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="提测环境 ">{{ fromCreateData.env }}</el-form-item>
+              <el-form-item label="提测环境 ">{{ fromCreateData.env }}</el-form-item><br>
               <el-form-item label="优先级 ">{{ fromCreateData.priority }}</el-form-item>
             </el-col>
           </el-row>

+ 44 - 32
src/views/Platform/presentation/presentationReport.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="margin:2% 9%;">
     <!-- 提测报告,新增服务端报告 -->
-    <el-form :inline="true" :model="fromCreateData" :rules="serviceDataRules">
+    <el-form ref="fromCreateData" :inline="true" :model="fromCreateData" :rules="serviceDataRules">
       <el-row :gutter="20">
         <el-col :span="13">
           <el-form-item label=" " prop="name">
@@ -9,7 +9,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="2">
-          <el-form-item label="by" prop="by" style="margin-left:6vw;background: white">
+          <el-form-item label="by" prop="submitter" style="margin-left:6vw;background: white">
             <el-input v-model="fromCreateData.submitter" style="width:20vw; margin-left:30px; border:2px solid #ccc;border-radius: 4px;" placeholder="who" />
           </el-form-item>
         </el-col>
@@ -25,11 +25,13 @@
       </el-row>
       <el-row :gutter="20" type="flex">
         <el-col :span="12">
-          <el-form-item label="是否延期">
-            <el-radio v-model="lateStatus" style="margin: 0 95px;" label="1" @change="lateStatusChange">是</el-radio>
-            <el-radio v-model="lateStatus" style="padding-right: 185px;" label="2" @change="lateStatusChange">否</el-radio>
+          <el-form-item label="是否延期" prop="lateStatus">
+            <el-radio-group v-model="fromCreateData.lateStatus">
+              <el-radio style="margin: 0 95px;" label="1" @change="lateStatusChange">是</el-radio>
+              <el-radio style="padding-right: 185px;" label="2" @change="lateStatusChange">否</el-radio>
+            </el-radio-group>
           </el-form-item>
-          <el-form-item v-show="showDelay" label="延期原因" prop="lateReason" style="margin-left:75px;">
+          <el-form-item v-if="showDelay" label="延期原因" prop="lateReason" style="margin-left:75px;">
             <el-input v-model="fromCreateData.lateReason" style="width:29.5vw;" />
           </el-form-item>
         </el-col>
@@ -47,17 +49,19 @@
               <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
-          <el-form-item label="是否跟版" style="margin-left:75px;"><el-input v-model="fromCreateData.isEdition" style="width:30vw;" /></el-form-item>
+          <el-form-item label="是否跟版" prop="isEdition" style="margin-left:75px;"><el-input v-model="fromCreateData.isEdition" style="width:29.3vw;" /></el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="涉及安全项">
-            <el-radio v-model="lateSta" style="margin: 0 109px;" label="1" @change="showStatusData">是</el-radio>
-            <el-radio v-model="lateSta" label="2" @change="showStatusData">否</el-radio>
+          <el-form-item label="涉及安全项" prop="lateSta">
+            <el-radio-group v-model="fromCreateData.lateSta">
+              <el-radio style="margin: 0 109px;" label="1" @change="showStatusData">是</el-radio>
+              <el-radio label="2" @change="showStatusData">否</el-radio>
+            </el-radio-group>
             <a href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" style="color:blue; font-size:13px;padding-right: 10px;">普惠SDL准入标准</a>
           </el-form-item>
-          <el-form-item v-show="showData" label="完成结果" prop="safeInfo" style="margin-left:75px;">
+          <el-form-item v-if="showData" label="完成结果" prop="safeInfo" style="margin-left:75px;">
             <el-input v-model="fromCreateData.safeInfo" style="width:29.2vw;" />
           </el-form-item>
         </el-col>
@@ -140,7 +144,7 @@ export default {
       bizIdData: localStorage.getItem('key'),
       serviceDataRules: {
         name: [{ required: true, message: '报告标题不能为空', trigger: 'change' }],
-        // by: [{ required: true, message: 'by不能为空', trigger: 'change' }],
+        submitter: [{ required: true, message: 'by不能为空', trigger: 'change' }],
         devTimeStart: [{ required: true, message: '开发时间不能为空', trigger: 'change' }],
         safeInfo: [{ required: true, message: '涉及安全项不能为空', trigger: 'change' }],
         lateStatus: [{ required: true, message: '是否延期不能为空', trigger: 'change' }],
@@ -151,7 +155,9 @@ export default {
         prdUrl: [{ required: true, message: 'prd地址不能为空', trigger: 'change' }],
         devUrl: [{ required: true, message: '设计方案不能为空', trigger: 'change' }],
         selfTestInfo: [{ required: true, message: '自测结果不能为空', trigger: 'change' }],
-        testSuggest: [{ required: true, message: '测试建议不能为空', trigger: 'change' }]
+        testSuggest: [{ required: true, message: '测试建议不能为空', trigger: 'change' }],
+        isEdition: [{ required: true, message: '是否跟版不能为空', trigger: 'change' }],
+        lateSta: [{ required: true, message: '涉及安全项不能为空', trigger: 'change' }]
       },
       objData: '',
       showButton: true,
@@ -199,17 +205,17 @@ export default {
         this.showButton = false
         this.fromCreateData = this.$route.query.data
         if (this.fromCreateData.lateStatus === 1) {
-          this.lateStatus = '1'
+          this.fromCreateData.lateStatus = '1'
           this.showDelay = true
         } else {
-          this.lateStatus = '2'
+          this.fromCreateData.lateStatus = '2'
           this.showDelay = false
         }
         if (this.fromCreateData.safeInfo !== null) {
-          this.lateSta = '1'
+          this.fromCreateData.lateSta = '1'
           this.showData = true
         } else {
-          this.lateSta = '2'
+          this.fromCreateData.lateSta = '2'
           this.showData = false
         }
       }
@@ -243,22 +249,28 @@ export default {
         .catch(action => { action === 'cancel' ? this.$router.go(-1) : '' })
     },
     getCreateData(ele) {
-      this.fromCreateData = ele
-      typeof (this.editorContent) === 'string' ? this.fromCreateData.joinTest = this.editorContent : ''
-      typeof (this.DetailsOfProposal) === 'string' ? this.fromCreateData.moduleInfo = this.DetailsOfProposal : ''
-      this.fromCreateData.lateReason = ele.lateReason
-      this.fromCreateData.lateStatus = this.lateStatus
-      this.fromCreateData.taskId = this.$route.query.id
-      this.fromCreateData.bizId = this.bizIdData
-      this.fromCreateData.type = 2
-      this.userData = { id: '', ename: this.userInformation, name: this.userNames }
-      this.objData = { launchTestInfo: this.fromCreateData, user: this.userData }
-      launchTestCreate(this.objData).then(res => {
-        if (res.code === 200) {
-          this.$message({ type: 'success', message: '保存成功' })
-          this.$router.go(-1)
+      this.$refs['fromCreateData'].validate((valid) => {
+        if (valid) {
+          this.fromCreateData = ele
+          typeof (this.editorContent) === 'string' ? this.fromCreateData.joinTest = this.editorContent : ''
+          typeof (this.DetailsOfProposal) === 'string' ? this.fromCreateData.moduleInfo = this.DetailsOfProposal : ''
+          this.fromCreateData.lateReason = ele.lateReason
+          this.fromCreateData.lateStatus = this.lateStatus
+          this.fromCreateData.taskId = this.$route.query.id
+          this.fromCreateData.bizId = this.bizIdData
+          this.fromCreateData.type = 2
+          this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+          this.objData = { launchTestInfo: this.fromCreateData, user: this.userData }
+          launchTestCreate(this.objData).then(res => {
+            if (res.code === 200) {
+              this.$message({ type: 'success', message: '保存成功' })
+              this.$router.go(-1)
+            } else {
+              this.$message.error('保存失败')
+            }
+          })
         } else {
-          this.$message.error('保存失败')
+          return false
         }
       })
     },

+ 2 - 2
src/views/Platform/projectPage.vue

@@ -643,7 +643,7 @@ export default {
       curIndex: 1, // 初始页
       pageSize: 5, //    每页的数据
       total: 0,
-      noTestString: [{ name: '测试', value: 0 }, { name: '测', value: 1 }],
+      noTestString: [{ name: '测试', value: 0 }, { name: '测', value: 1 }],
       typeString: [{ name: '服务端', value: 1 }, { name: '客户端', value: 2 }],
       stageStrings: [{ name: '正常', value: 1 }, { name: 'delay', value: 2 }, { name: 'pending', value: 3 }],
       priorityStrings: [{ name: 'p0', value: 0 }, { name: 'p1', value: 1 }, { name: 'p2', value: 2 }, { name: 'p3', value: 3 }],
@@ -1041,7 +1041,7 @@ export default {
             this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { id: ele.id }})
             break
           case 3:
-            this.$router.push({ path: '/Platform/presentation/Acceptance', query: { daidta: ele.id }})
+            this.$router.push({ path: '/Platform/presentation/Acceptance', query: { id: ele.id }})
             break
           case 4:
             this.$router.push({ path: '/Platform/defectManagement', query: { id: ele.id, code: 4 }})