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

src/api/defectManage.js

@@ -127,6 +127,7 @@ export function bugDownload(data) {
   return request({
     url: TeamManagement + '/bug/downLoad',
     method: 'post',
-    data
+    data,
+    responseType: 'blob' // 表明返回服务器返回的数据类型
   })
 }

src/views/Platform/presentation/Templates/DailyReport.vue

@@ -191,7 +191,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 ._radio {
   margin: 3% 0;
   color: #333B4A;

src/views/ToConfigure/configure.vue

@@ -52,7 +52,7 @@
       <el-dialog :title="title_name" :visible.sync="dialogFormVisible" width="40%" center :close-on-click-modal="false">
         <el-form ref="form" label-position="left" :model="form" :rules="rules" label-width="110px">
           <el-form-item label="团队名称" prop="teamName">
-            <el-input v-model="form.teamName" autocomplete="off" placeholder="请输入团队名称，不得超过20个汉字" @blur="blur_teamName(form.teamName)" />
+            <el-input v-model="form.teamName" autocomplete="off" placeholder="请输入团队名称，不得超过20个汉字" @blur="blur_teamName(form)" />
           </el-form-item>
           <el-form-item label="团队属性" prop="teamAttribute">
             <el-select v-model="form.teamAttribute" style="width: 100%;" placeholder="请选择">
@@ -375,7 +375,7 @@ export default {
       }
     },
     blur_teamName(e) { // 团队名称重复
-      teamIsTeamNameRepetition({ teamName: e }).then(res => {
+      teamIsTeamNameRepetition({ teamName: e.teamName, teamId: e.teamId }).then(res => {
         if (res.data === true) {
           this.$set(this.form, 'teamName', '')
           this.$message({ message: '团队名称已存在，请重新设置', type: 'error' })

src/views/projectManage/bugList/bugindex.vue

@@ -472,8 +472,6 @@
 </template>
 
 <script>
-import axios from 'axios'
-import { mockUrl } from '@/apiConfig/api'
 import BugDetails from './details/index'
 import createdBug from '@/views/projectManage/bugList/file/createdBug'
 import {
@@ -483,7 +481,8 @@ import {
   settingGetBizList,
   taskListCreate,
   releaseList,
-  settingQueryBizModuleList
+  settingQueryBizModuleList,
+  bugDownload
 } from '@/api/defectManage'
 import { memberQueryMemberInfoByIDAPorName } from '@/api/projectIndex'
 import '@/views/projectManage/bugList/css/index.css'
@@ -831,12 +830,7 @@ export default {
       )
     },
     async download() { // 下载导出Excel
-      const res = await axios({
-        method: 'post',
-        url: mockUrl + '/bug/downLoad', // 请求地址
-        data: this.indexPage, // 参数
-        responseType: 'blob' // 表明返回服务器返回的数据类型
-      })
+      const res = await bugDownload(this.indexPage)
       const aLink = document.createElement('a')
       const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
       aLink.href = URL.createObjectURL(blob)

src/views/projectManage/taskList/taskViewDetails.vue

@@ -347,7 +347,14 @@
         </span>
       </el-dialog>
       <!-- 删除 -->
-      <el-dialog :visible.sync="centerDialogVisible_task" width="30%" center :close-on-click-modal="false">
+      <el-dialog
+        :visible.sync="centerDialogVisible_task"
+        width="30%"
+        center
+        :close-on-click-modal="false"
+        title="提示"
+        top="35vh"
+      >
         <div align="center">
           确定要删除
           <span style="color:red;">{{ task_form.name }}</span> 的任务吗?
@@ -1079,7 +1086,7 @@ export default {
 }
 </script>
 
-<style lang="stylus">
+<style lang="scss">
 .footer .el-tabs__nav-wrap::after {
   background-color: #FFFFFF !important;
 }
@@ -1143,10 +1150,6 @@ export default {
   justify-content: center;
 }
 
-.dialog .el-dialog__header {
-  padding: 0;
-}
-
 .el-dropdown-menu__item:not(.is-disabled):hover {
   background-color: #f6f7fa;
   color: #606266;