Merge branch 'bug_fix' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into bug_fix

src/views/Platform/presentation/Acceptance.vue

@@ -35,6 +35,8 @@
           <el-form-item v-if="showData" label="完成结果" prop="safeInfo" style="flex: 2;text-align:right;"><el-input v-model="ClientData.safeInfo" style="width: 50vw;" /></el-form-item>
         </div>
 
+        <el-form-item label="SDL链接 : " style="white-space: nowrap;"><el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></el-form-item>
+
         <div style="display: flex; white-space: nowrap;">
           <el-form-item label="开发人员" style="flex: 1;" prop="developer"><el-input v-model="ClientData.developer" style="width:30vw;" /></el-form-item>
           <el-form-item label="开发周期" style="flex: 1;text-align:right;" prop="devTimeEnd">
@@ -51,8 +53,6 @@
           </el-form-item>
         </div>
 
-        <el-form-item label="SDL链接 : "><el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></el-form-item>
-
         <div class="backStyle" style="margin-bottom:2%;">二. 项目背景</div>
         <div id="editorElem" class="toolbar" />
         <div id="editorElem1" class="text" />

src/views/Platform/presentation/ResultPageyL.vue

@@ -17,16 +17,24 @@
               <div class="marage">测试结果 : <span :style="status1">{{ status }}</span></div><br>
               <div class="marage">开发人员 : {{ ClientDatayl.developer }}</div><br>
               <div class="marage">开发周期 : {{ ClientDatayl.devTimeEnd }} 至 {{ ClientDatayl.devTimeStart }}</div><br>
-              <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div>
+              <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div><br>
             </div>
             <div style="flex:1">
               <div class="marage">准入结果 : {{ ClientDatayl.launchInfo }}</div><br>
               <div class="marage">测试人员 : {{ ClientDatayl.tester }}</div><br>
               <div class="marage">测试周期 : {{ ClientDatayl.testTimeEnd }} 至 {{ ClientDatayl.testTimeStart }} </div><br>
-              <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div>
+              <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div><br>
             </div>
           </div>
-
+          <div style="display:flex;">
+            <div style="flex:1">
+              <div class="marage">涉及安全项 : <span :style="getInfoBtnDisabled">{{ ClientDatayl.getInfoBtn }}</span></div><br>
+            </div>
+            <div style="flex:1">
+              <div v-show="showData" class="marage">完成结果 : {{ ClientDatayl.safeInfo }}</div>
+            </div>
+          </div>
+          <div style="white-space: nowrap;">SDL链接 : <el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></div>
           <div class="titleStyle">二. 项目背景</div><br>
 
           <div class="rich" v-html="editorElem" />
@@ -124,16 +132,26 @@
               <div class="marage">测试结果 : <span :style="status1">{{ status }}</span></div><br>
               <div class="marage">开发人员 : {{ ClientDatayl.developer }}</div><br>
               <div class="marage">开发周期 : {{ ClientDatayl.devTimeEnd }} 至 {{ ClientDatayl.devTimeStart }}</div><br>
-              <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div>
+              <div class="marage">准出延期 : <span :style="taskLateDisabled">{{ ClientDatayl.taskLateStatus }}</span></div><br>
             </div>
             <div style="flex:1">
               <div class="marage">准入结果 : {{ ClientDatayl.launchInfo }}</div><br>
               <div class="marage">测试人员 : {{ ClientDatayl.tester }}</div><br>
               <div class="marage">测试周期 : {{ ClientDatayl.testTimeEnd }} 至 {{ ClientDatayl.testTimeStart }} </div><br>
-              <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div>
+              <div v-show="showDelay1" class="marage">延期原因 : {{ ClientDatayl.taskLateReason }}</div><br>
+            </div>
+          </div>
+          <div style="display:flex;">
+            <div style="flex:1">
+              <div class="marage">涉及安全项 : <span :style="getInfoBtnDisabled">{{ ClientDatayl.getInfoBtn }}</span></div><br>
+            </div>
+            <div style="flex:1">
+              <div v-show="showData" class="marage">完成结果 : {{ ClientDatayl.safeInfo }}</div>
             </div>
           </div>
 
+          <div style="white-space: nowrap;">SDL链接 : <el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></div>
+
           <div class="titleStyle">二. 项目背景</div>
 
           <div class="rich" v-html="editorElem1" />
@@ -212,6 +230,7 @@ export default {
     return {
       showDelay1: false,
       taskLateStatus: '',
+      getInfoBtnDisabled: { color: 'green' },
       taskLateDisabled: { color: 'green' },
       pftResult1: { colocr: 'green' },
       sctResult1: { colocr: 'green' },
@@ -221,6 +240,7 @@ export default {
       pftResultChange: { color: '' },
       safeResultChange: { color: '' },
       moniterResultChange: { color: '' },
+      showData: false,
       status: '',
       acceptanceResult: '',
       sctResult: '',
@@ -295,6 +315,15 @@ export default {
           this.taskLateDisabled.color = 'red'
           this.showDelay1 = true
         }
+        if (this.ClientDatayl.safeInfo !== '') {
+          this.ClientDatayl.getInfoBtn = '是'
+          this.getInfoBtnDisabled.color = 'red'
+          this.showData = true
+        } else {
+          this.ClientDatayl.getInfoBtn = '否'
+          this.getInfoBtnDisabled.color = 'green'
+          this.showData = false
+        }
         switch (this.ClientDatayl.pftResult) {
           case 1: this.pftResult = '通过'; this.pftResult1.color = 'green'; break
           case 2: this.pftResult = '未通过'; this.pftResult1.color = 'red'; break

src/views/Platform/workbench.vue

@@ -7,9 +7,9 @@
         <el-tab-pane label="待处理" name="first">
           <div style="white-space:nowrap;margin:1% 0;"><img v-show="img" style="width:10px;height:10px;margin: 0 1% 0.45% 0" :src="imgUrl"><span class="titStyle">近期代办</span></div>
           <div style="height:44em;">
-            <el-badge v-show="show1" :value="num1" class="item"><el-button type="primary" class="itemName" size="small" plain @click="clickNum(1)">{{ oneData.name }}</el-button></el-badge>
-            <el-badge v-show="show2" :value="num2" class="item"><el-button type="primary" class="itemName" size="small" plain @click="clickNum(2)">{{ oneData1.name }}</el-button></el-badge>
-            <el-badge v-show="show3" :value="num3" class="item"><el-button type="primary" class="itemName" size="small" plain @click="clickNum(3)">{{ oneData2.name }}</el-button></el-badge>
+            <el-badge v-show="show1" :value="num1" class="item"><el-button type="primary" class="itemName" size="small" style="overflow: hidden; text-overflow:ellipsis;" plain @click="clickNum(1)">{{ oneData.name }}</el-button></el-badge>
+            <el-badge v-show="show2" :value="num2" class="item"><el-button type="primary" class="itemName" size="small" style="overflow: hidden; text-overflow:ellipsis;" plain @click="clickNum(2)">{{ oneData1.name }}</el-button></el-badge>
+            <el-badge v-show="show3" :value="num3" class="item"><el-button type="primary" class="itemName" size="small" style="overflow: hidden; text-overflow:ellipsis;" plain @click="clickNum(3)">{{ oneData2.name }}</el-button></el-badge>
             <el-badge v-show="show1" style="margin-bottom:24px;"><el-button type="primary" size="small" @click="clickNum(4)"> 更 多 </el-button></el-badge>
             <div align="center" style="background:#FFFFFF; height:60vh%; text-align:center; border-radius:8px;">
               <div align="center" style="height:35em;">
@@ -28,13 +28,13 @@
                 主题 <el-input v-model="bugOrTask1.title" size="small" placeholder="主题" clearable style="width: 14%;margin: 2% 5% 2% 1%;" />
 
                 <el-button type="primary" size="small" style="margin:2% 0%;" @click="clickQuery(bugOrTask1)">查询</el-button>
-                <!-- <div align="center" style="height:30em;"> -->
+
                 <el-table v-if="bug" :data="tableType" border max-height="390" :header-cell-style="getRowClass" style="width:95%;" align="center" @row-click="clickQueryTableTask">
                   <el-table-column type="index" label="序号" width="150" align="center" />
                   <el-table-column label="类型" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.isBugOrTask }}</template></el-table-column>
                   <el-table-column label="主题" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.bugName }}</template></el-table-column>
-                  <el-table-column label="优先级" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.priority }}</template></el-table-column>
-                  <el-table-column label="状态" min-width="100" align="center"><template slot-scope="scope"><el-tag type="success">{{ scope.row.status }}</el-tag></template></el-table-column>
+                  <el-table-column label="优先级" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.priorityName }}</template></el-table-column>
+                  <el-table-column label="状态" min-width="100" align="center"><template slot-scope="scope"><el-tag type="success">{{ scope.row.bugStatusName }}</el-tag></template></el-table-column>
                   <el-table-column label="最近更新时间" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.gmtModify }}</template></el-table-column>
                 </el-table>
                 <el-table v-if="task" :data="tableType" border max-height="390" :header-cell-style="getRowClass" style="width: 95%" align="center" @row-click="clickQueryTableTask">
@@ -86,9 +86,9 @@
                 <el-table v-if="bugShow" :data="tableData" :header-cell-style="getRowClass" border max-height="390" style="width: 95%" align="center" @row-click="clickQueryTableTask">
                   <el-table-column type="index" label="序号" width="150" align="center" />
                   <el-table-column label="主题" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.bugName }}</template></el-table-column>
-                  <el-table-column label="进展" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.stage }}</template></el-table-column>
-                  <el-table-column label="优先级" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.priority }}</template></el-table-column>
-                  <el-table-column label="状态" min-width="100" align="center"><template slot-scope="scope"><el-tag type="success">{{ scope.row.status }}</el-tag></template></el-table-column>
+                  <el-table-column label="进展" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.stageName }}</template></el-table-column>
+                  <el-table-column label="优先级" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.priorityName }}</template></el-table-column>
+                  <el-table-column label="状态" min-width="100" align="center"><template slot-scope="scope"><el-tag type="success">{{ scope.row.bugStatusName }}</el-tag></template></el-table-column>
                   <el-table-column label="最近更新时间" min-width="100" align="center"><template slot-scope="scope">{{ scope.row.gmtModify }}</template></el-table-column>
                 </el-table>
               </div>
@@ -101,7 +101,6 @@
       <el-dialog tltle="详情" :visible.sync="dialogTableVisible" width="70%">
         <el-table :data="gridData" max-height="390" @row-click="clickQueryTable">
           <el-table-column type="index" label="序号" min-width="120" align="center" />
-          <el-table-column label="平台类型" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.typeString }}</template></el-table-column>
           <el-table-column label="主题" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.name }}</template></el-table-column>
           <el-table-column label="进展" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.stageString }}</template></el-table-column>
           <el-table-column label="优先级" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.priorityString }}</template></el-table-column>
@@ -202,14 +201,14 @@ export default {
             start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
             picker.$emit('pick', [start, end])
           }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
+        // }, {
+        //   text: '最近一个月',
+        //   onClick(picker) {
+        //     const end = new Date()
+        //     const start = new Date()
+        //     start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+        //     picker.$emit('pick', [start, end])
+        //   }
         }]
       }
     }
@@ -275,6 +274,7 @@ export default {
 
     // 待处理 查询
     clickQuery(e) {
+      console.log(e)
       if (e.isBugOrTask === 0 || e.isBugOrTask === 1) {
         this.isBugOrTask = e.isBugOrTask
         this.userName = e
@@ -288,7 +288,7 @@ export default {
           res.data.taskInfoList === null ? this.task = false : this.task = true
           res.data.bugBaseInfoList === null ? this.bug = false : this.bug = true
           for (var a of this.tableType) {
-            this.isBugOrTask === 0 ? this.isBugOrTask = '缺陷' : this.isBugOrTask = '任务'
+            e.isBugOrTask === 0 ? this.isBugOrTask = '缺陷' : this.isBugOrTask = '任务'
             a.isBugOrTask = this.isBugOrTask
           }
         })
@@ -365,7 +365,7 @@ export default {
         if (e.value2 !== '') {
           var obj = {
             bizId: this.bizJson,
-            timeType: 2,
+            timeType: 0,
             // status: e.status,
             isBugOrTask: e.isBugOrTask,
             startTime: e.value2[0],

src/views/mock/httpmock.vue

@@ -167,7 +167,7 @@ export default {
         id: null
       },
       importanceOptions: [1, 2, 3],
-      envSelectDataType: '',
+      envSelectDataType: [],
       envSelections,
       methodProtocol: 'http',
       consumerSelections,
@@ -349,38 +349,13 @@ export default {
     },
     // 编辑
     handleUpdate(row) {
-      var queryData = {
-        id: row.id,
-        url: row.url,
-        customName: row.customName,
-        returnDataType: row.returnDataType,
-        actualUrl: row.actualUrl,
-        creator: row.creator,
-        method: row.method,
-        // returnDataTypeStr: row.returnDataTypeStr,
-        mockUrl: row.mockUrl
-      }
-      var rowList = row
+      this.serviceData = row
       this.shouldShow = false
-      updateService(queryData).then(response => {
-        if (response.data) {
-          this.serviceData.id = rowList.id
-          this.serviceData.url = rowList.url
-          this.serviceData.customName = rowList.customName
-          this.serviceData.returnDataType = rowList.returnDataType
-          this.serviceData.status = rowList.status
-          this.serviceData.actualUrl = rowList.actualUrl
-          this.serviceData.creator = rowList.creator
-          this.serviceData.method = rowList.method
-          this.serviceData.returnDataTypeStr = rowList.returnDataTypeStr
-          this.serviceData.mockUrl = rowList.mockUrl
-          this.dialogStatus = 'update'
-          this.dialogFormVisible = true
-          this.showSubmitBtn = true
-          this.$nextTick(() => {
-            this.$refs['serviceDataForms'].clearValidate()
-          })
-        }
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.showSubmitBtn = true
+      this.$nextTick(() => {
+        this.$refs['serviceDataForms'].clearValidate()
       })
     },
     // 查看
@@ -435,20 +410,7 @@ export default {
     updateData(ele) {
       this.$refs['serviceDataForms'].validate((valid) => {
         if (valid) {
-          console.log(ele)
-          const tempData = {
-            id: this.serviceData.id,
-            customName: this.serviceData.customName,
-            url: this.serviceData.url,
-            envChannel: this.serviceData.envChannel,
-            method: ele.method,
-            actualUrl: this.serviceData.actualUrl,
-            status: this.serviceData.status,
-            creator: this.serviceData.creator,
-            returnDataType: ele.returnDataTypeStr,
-            mockUrl: this.serviceData.mockUrl
-          }
-          updateService(tempData).then(response => {
+          updateService(ele).then(response => {
             if (response.code === 200) {
               this.dialogFormVisible = false
               this.getList()