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

src/components/picker/SelDatePicker.vue

@@ -35,7 +35,6 @@ import moment from 'moment'
 import 'moment/locale/zh-cn'
 import locale from 'ant-design-vue/es/date-picker/locale/zh_CN'
 import { getHolidayDayInfo } from '@/api/projectViewDetails'
-import 'ant-design-vue/dist/antd.css'
 export default {
   props: {
     startEnd: {

src/views/projectManage/bugList/details/bugTableDialog.vue

@@ -21,7 +21,7 @@
           <statusChange :status-code="Number(scope.row.status)" :bug-data="scope.row" />
         </template>
       </el-table-column>
-      <el-table-column prop="taskName" label="所属任务" align="center" min-width="250" show-overflow-tooltip />
+      <el-table-column v-if="noShow !== 'taskName'" prop="taskName" label="所属任务" align="center" min-width="250" show-overflow-tooltip />
       <el-table-column prop="creatorList" label="提报人" align="center" />
       <el-table-column prop="assignerList" label="责任人" min-width="150" align="center" show-overflow-tooltip />
       <el-table-column prop="currentHandlerList" label="修复人" min-width="150" align="center" show-overflow-tooltip />
@@ -76,6 +76,18 @@ export default {
       return da[0]
     }
   },
+  props: {
+    noShow: {
+      type: String,
+      default: '',
+      required: false
+    },
+    objId: {
+      type: Object,
+      default: () => null,
+      required: true
+    }
+  },
   data() {
     return {
       tableData: [], // tableData
@@ -95,6 +107,13 @@ export default {
   watch: {
     clickCount(newVal, oldVal) {
       this.drawerShow = false
+    },
+    objId: {
+      handler(newV, oldV) {
+        this.bugGetTableList(newV)
+      },
+      deep: true,
+      immediate: true
     }
   },
   // created() {

src/views/projectManage/projectList/components/mileStone.vue

@@ -219,7 +219,7 @@ export default {
     async mileStoneCreate(milestone, user) {
       const res = await mileStoneCreate({ milestone, user })
       if (res.code === 200) {
-        this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
+        this.$message({ message: '添加成功', type: 'success', duration: 1000, offset: 150 })
       }
       this.dialogFormVisible = false
       this.change()
@@ -227,7 +227,7 @@ export default {
     async mileStoneUpdate(milestone, user) {
       const res = await mileStoneUpdate({ milestone, user })
       if (res.code === 200) {
-        this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
       }
       this.dialogFormVisible = false
       this.change()

src/views/projectManage/projectList/components/modifyProject.vue

@@ -181,7 +181,7 @@ export default {
       const res = await projectUpdate({ projectInfo, user })
       if (res.code === 200) {
         this.modify_project = false
-        this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
       }
     },
     change() {

src/views/projectManage/projectList/components/needsList.vue

@@ -94,7 +94,7 @@ export default {
       const modifier = localStorage.getItem('username')
       const res = await updateRequirementStatus({ id: e.id, status: e.status, modifier: modifier })
       if (res.code === 200) {
-        this.$message({ message: res.msg, type: 'success', offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', offset: 150 })
       }
     },
     needs_link(id) {

src/views/projectManage/projectList/components/scheduleList.vue

@@ -16,15 +16,17 @@
       >
         <template>
           <el-tooltip class="item" effect="dark" content="代表移动，鼠标选中区域可以向上移动" placement="bottom">
-            <div class="sortable-tip" />
+            <div class="sortable-tip">
+              <img :src="move">
+            </div>
           </el-tooltip>
         </template>
       </el-table-column>
       <el-table-column
         prop="type"
         label="类型"
-        width="180"
-        align="center"
+        width="100"
+        align="left"
       >
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}
@@ -33,27 +35,27 @@
       <el-table-column
         prop="desc"
         label="描述"
-        min-width="250"
-        align="center"
+        min-width="150"
+        align="left"
         show-overflow-tooltip
       />
       <el-table-column
         prop="seperateDaysNoHoliday"
         label="排期"
-        min-width="250"
+        min-width="200"
         align="center"
         show-overflow-tooltip
       />
       <el-table-column
         prop="dayLength"
         label="时长"
-        width="200"
+        width="50"
         align="center"
       />
       <el-table-column
         prop="peopleList"
         label="参与人员"
-        min-width="200"
+        min-width="100"
         align="center"
       />
       <el-table-column
@@ -92,6 +94,7 @@ import moment from 'moment'
 import 'moment/locale/zh-cn'
 import { listByTask, scheduleDelete, sortForTask } from '@/api/projectViewDetails'
 import modifySchedule from './modifySchedule'
+import move from '@/assets/麻将@2x.png'
 export default {
   components: {
     modifySchedule
@@ -115,6 +118,7 @@ export default {
   },
   data() {
     return {
+      move: move,
       scheduleList: [],
       scheduleDetail: {},
       visibleSchedule: false,
@@ -155,7 +159,7 @@ export default {
     async sortForTask(arr) {
       const res = await sortForTask(this.id, arr)
       if (res.code === 200) {
-        this.$message({ message: '移动成功', type: 'success', duration: 1000, offset: 150 })
+        this.$message({ message: 'success', type: 'success', duration: 1000, offset: 150 })
       }
     },
     getType(value) {
@@ -243,9 +247,14 @@ export default {
 .sortable-tip {
   height: 26px;
   width: 15px;
-  border:1px solid rgba(0,0,0,0.15);
   border-radius:2px;
   margin: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  img {
+    width: 8px;
+  }
 }
 </style>
 <style>

src/views/projectManage/projectList/projectViewDetails.vue

@@ -116,29 +116,29 @@
       </el-container>
       <!-- 概览 -->
       <!-- 需求 -->
-      <el-container v-show="activeName === '2'" style="height: calc(100vh - 125px);">
-        <section class="main-section">
+      <el-container v-show="activeName === '2'">
+        <section class="main-section contain">
           <needs-list />
         </section>
       </el-container>
       <!-- 需求 -->
       <!-- 任务 -->
-      <el-container v-show="activeName === '3'" class="is-vertical" style="height: calc(100vh - 125px);">
-        <section class="main-section">
+      <el-container v-show="activeName === '3'" class="is-vertical">
+        <section class="main-section contain">
           <tasks-list />
         </section>
       </el-container>
       <!-- 任务 -->
       <!-- 缺陷 -->
-      <el-container v-show="activeName === '4'" class="is-vertical" style="height: calc(100vh - 125px);">
-        <section class="main-section">
-          <bugTableDialog ref="bugTableDialog" />
+      <el-container v-show="activeName === '4'" class="is-vertical">
+        <section class="main-section contain">
+          <bugTableDialog ref="bugTableDialog" :obj-id="{ projectId: Number(this.$route.query.id) }" />
         </section>
       </el-container>
       <!-- 缺陷 -->
       <!-- 统计 -->
-      <el-container v-if="activeName === '5'" class="is-vertical" style="height: calc(100vh - 125px);">
-        <section class="main-section">
+      <el-container v-if="activeName === '5'" class="is-vertical">
+        <section class="main-section contain">
           <data-statistics @change="get_list" />
         </section>
       </el-container>
@@ -271,9 +271,6 @@ export default {
     this.$store.state.data.status = true
     this.$store.state.data.bizId = true
   },
-  mounted() {
-    this.$refs.bugTableDialog.bugGetTableList({ projectId: Number(this.$route.query.id) })
-  },
   destroyed() {
     this.$store.state.data.status = false
     this.$store.state.data.bizId = false
@@ -283,7 +280,7 @@ export default {
       const projectInfo = this.form_query
       const res = await projectUpdate({ projectInfo, user: this.user })
       if (res.code === 200) {
-        this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
       }
     },
     childVal(val) {
@@ -351,7 +348,7 @@ export default {
       const user = this.user
       projectUpdate({ projectInfo, user }).then(res => {
         if (res.code === 200) {
-          this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
+          this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
         }
       })
     },
@@ -379,6 +376,10 @@ export default {
 .main-header::after {
   @include main-header-after;
 }
+.contain {
+  height: calc(100vh - 140px);
+  overflow: scroll;
+}
 .main-section {
   @include main-section;
   .detail-info {

src/views/projectManage/requirement/components/modifySchedule.vue

@@ -230,7 +230,7 @@ export default {
     async scheduleUpdate(params) { // 更新排期
       const res = await scheduleUpdate(params)
       if (res.code === 200) {
-        this.$message({ message: '更新成功', type: 'success', duration: 1000, offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
       }
       this.$emit('update')
       this.cancel()

src/views/projectManage/requirement/components/scheduleList.vue

@@ -16,15 +16,17 @@
       >
         <template>
           <el-tooltip class="item" effect="dark" content="代表移动，鼠标选中区域可以向上移动" placement="bottom">
-            <div class="sortable-tip" />
+            <div class="sortable-tip">
+              <img :src="move">
+            </div>
           </el-tooltip>
         </template>
       </el-table-column>
       <el-table-column
         prop="type"
         label="类型"
-        width="180"
-        align="center"
+        width="100"
+        align="left"
       >
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}
@@ -33,27 +35,27 @@
       <el-table-column
         prop="desc"
         label="描述"
-        min-width="250"
-        align="center"
+        min-width="150"
+        align="left"
         show-overflow-tooltip
       />
       <el-table-column
         prop="seperateDaysNoHoliday"
         label="排期"
-        min-width="250"
+        min-width="200"
         align="center"
         show-overflow-tooltip
       />
       <el-table-column
         prop="dayLength"
         label="时长"
-        width="200"
+        width="50"
         align="center"
       />
       <el-table-column
         prop="peopleList"
         label="参与人员"
-        min-width="200"
+        min-width="100"
         align="center"
       />
       <el-table-column
@@ -93,6 +95,7 @@ import 'moment/locale/zh-cn'
 import { getTaskByRequireId } from '@/api/requirement.js'
 import { listByTask, scheduleDelete, sortForTask } from '@/api/projectViewDetails'
 import modifySchedule from './modifySchedule'
+import move from '@/assets/麻将@2x.png'
 export default {
   components: {
     modifySchedule
@@ -121,6 +124,7 @@ export default {
   },
   data() {
     return {
+      move: move,
       scheduleList: [],
       scheduleDetail: {},
       visibleSchedule: false,
@@ -249,9 +253,13 @@ export default {
 .sortable-tip {
   height: 26px;
   width: 15px;
-  border:1px solid rgba(0,0,0,0.15);
   border-radius:2px;
   margin: auto;
+  justify-content: center;
+  align-items: center;
+  img {
+    width: 8px;
+  }
 }
 </style>
 <style>

src/views/projectManage/requirement/components/taskList.vue

@@ -204,7 +204,7 @@ export default {
         const taskInfoDO = e
         const resTask = await taskUpdate({ taskInfoDO, user })
         if (resTask.code === 200) {
-          this.$message({ message: resTask.msg, type: 'success', offset: 150 })
+          this.$message({ message: '修改成功', type: 'success', offset: 150 })
         }
       }
     },
@@ -218,7 +218,7 @@ export default {
       taskInfoDO.onlineRealTime = this.changeStatusDate
       const resTask = await taskUpdate({ taskInfoDO, user })
       if (resTask.code === 200) {
-        this.$message({ message: resTask.msg, type: 'success', offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', offset: 150 })
       }
     },
     handleSelectionChange(val) { // 任务列表删选操作

src/views/projectManage/requirement/requirementDetail.vue

@@ -47,7 +47,7 @@
         </div>
       </el-header>
       <!-- 概览 -->
-      <el-container v-show="activeName === '1'" class="is-vertical">
+      <el-container v-if="activeName === '1'" class="is-vertical">
         <section class="main-section">
           <div class="el-main-title">
             <div class="title-left-icon" />
@@ -127,7 +127,7 @@
             <ul class="comment-main">
               <li v-for="(item,index) in comments" :key="'comment'+index">
                 <span class="comment-name">{{ item.commentInfo.name }}</span>
-                <span class="comment-gmtCreater">{{ item.commentInfo.gmtCreater }}</span>
+                <span class="comment-gmtCreater">{{ item.commentInfo.gmtCreater }}</span><br>
                 <span class="comment-content">{{ item.commentInfo.content }}</span>
               </li>
             </ul>
@@ -148,22 +148,22 @@
       </el-container>
       <!-- 概览 -->
       <!-- 任务 -->
-      <el-container v-show="activeName === '2'" class="is-vertical" style="height: calc(100vh - 125px);">
-        <section class="main-section">
+      <el-container v-if="activeName === '2'" class="is-vertical">
+        <section class="main-section contain">
           <tasks-list />
         </section>
       </el-container>
       <!-- 任务 -->
       <!-- 缺陷 -->
-      <el-container v-show="activeName === '3'" class="is-vertical" style="height: calc(100vh - 125px);">
-        <section class="main-section">
-          <bugTableDialog ref="bugTableDialog" />
+      <el-container v-if="activeName === '3'" class="is-vertical">
+        <section class="main-section contain">
+          <bugTableDialog ref="bugTableDialog" :obj-id="{ requireId: Number(this.$route.query.id) }" />
         </section>
       </el-container>
       <!-- 缺陷 -->
       <!-- 统计 -->
-      <el-container v-if="activeName === '4'" class="is-vertical" style="height: calc(100vh - 125px);">
-        <section class="main-section">
+      <el-container v-if="activeName === '4'" class="is-vertical">
+        <section class="main-section contain">
           <data-statistics @change="getRequirementById" />
         </section>
       </el-container>
@@ -198,7 +198,7 @@
       <createdBug v-if="bug_open" ref="createdBug" />
       <drawer
         ref="drawer"
-        title="项目成员"
+        title="需求成员"
         center
         :display.sync="display"
         width="28%"
@@ -302,9 +302,6 @@ export default {
     this.$store.state.data.status = true
     this.$store.state.data.bizId = true
   },
-  mounted() {
-    this.$refs.bugTableDialog.bugGetTableList({ requireId: Number(this.$route.query.id) })
-  },
   destroyed() {
     this.$store.state.data.status = false
     this.$store.state.data.bizId = false
@@ -315,7 +312,7 @@ export default {
       requirementInfo.pm = requirementInfo.pm.idap
       const res = await updateRequirement(requirementInfo)
       if (res.code === 200) {
-        this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
       }
       this.getRequirementById()
     },
@@ -383,11 +380,11 @@ export default {
     async updateStatus(status) { // 修改状态
       const res = await updateRequirementStatus({
         id: this.$route.query.id,
-        status: status.code,
+        status: status.value,
         modifier: localStorage.getItem('username')
       })
       if (res.code === 200) {
-        this.$message({ message: '状态修改成功', type: 'success', duration: 1000, offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
       }
       this.getRequirementById()
     },
@@ -403,7 +400,7 @@ export default {
         modifier: localStorage.getItem('username')
       })
       if (res.code === 200) {
-        this.$message({ message: '删除成功', type: 'warning', duration: 1000, offset: 150 })
+        this.$message({ message: '删除成功', type: 'success', duration: 1000, offset: 150 })
       }
     },
     reated_task() { // 新建任务
@@ -436,6 +433,10 @@ export default {
 .main-header::after {
   @include main-header-after;
 }
+.contain {
+  height: calc(100vh - 140px);
+  overflow: scroll;
+}
 .main-section {
   @include main-section;
   .detail-info {
@@ -484,7 +485,6 @@ export default {
         font-size:12px
       }
       .comment-content {
-        margin-left:20px;
         font-size:14px;
         color:#333B4A;
         margin-top: 10px;

src/views/projectManage/taskList/components/reportList.vue

@@ -275,7 +275,7 @@ export default {
       } else if (this.Str === '删除') {
         const res = await launchTestDelete(userData, this.CallBackId)
         if (res.code === 200) {
-          this.$message({ type: 'warning', message: '已删除' })
+          this.$message({ type: 'success', message: '删除成功' })
         }
       }
     },

src/views/projectManage/taskList/components/scheduleList.vue

@@ -16,15 +16,17 @@
       >
         <template>
           <el-tooltip class="item" effect="dark" content="代表移动，鼠标选中区域可以向上移动" placement="bottom">
-            <div class="sortable-tip" />
+            <div class="sortable-tip">
+              <img :src="move">
+            </div>
           </el-tooltip>
         </template>
       </el-table-column>
       <el-table-column
         prop="type"
         label="类型"
-        width="180"
-        align="center"
+        width="100"
+        align="left"
       >
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}
@@ -33,27 +35,27 @@
       <el-table-column
         prop="desc"
         label="描述"
-        min-width="250"
-        align="center"
+        min-width="150"
+        align="left"
         show-overflow-tooltip
       />
       <el-table-column
         prop="seperateDaysNoHoliday"
         label="排期"
-        min-width="250"
+        min-width="200"
         align="center"
         show-overflow-tooltip
       />
       <el-table-column
         prop="dayLength"
         label="时长"
-        width="200"
+        width="50"
         align="center"
       />
       <el-table-column
         prop="peopleList"
         label="参与人员"
-        min-width="200"
+        min-width="100"
         align="center"
       />
       <el-table-column
@@ -92,6 +94,7 @@ import moment from 'moment'
 import 'moment/locale/zh-cn'
 import { listByTask, scheduleDelete, sortForTask } from '@/api/projectViewDetails'
 import modifySchedule from './modifySchedule'
+import move from '@/assets/麻将@2x.png'
 export default {
   components: {
     modifySchedule
@@ -115,6 +118,7 @@ export default {
   },
   data() {
     return {
+      move: move,
       scheduleList: [],
       scheduleDetail: {},
       visibleSchedule: false,
@@ -243,9 +247,14 @@ export default {
 .sortable-tip {
   height: 26px;
   width: 15px;
-  border:1px solid rgba(0,0,0,0.15);
   border-radius:2px;
   margin: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  img {
+    width: 8px;
+  }
 }
 </style>
 <style>

src/views/projectManage/taskList/taskViewDetail.vue

@@ -3,7 +3,7 @@
     <el-container>
       <el-header class="main-header">
         <div class="top-page-title">
-          <div v-if="form_query.stage>0" class="task-stage">
+          <div v-if="form_query.stage >= 2" class="task-stage">
             <div class="task-stage-main">
               <img :src="stageImg">
               <div class="task-stage-title">
@@ -57,7 +57,7 @@
         </div>
       </el-header>
       <!-- 概览 -->
-      <el-container v-show="activeName === '1'" class="is-vertical">
+      <el-container v-if="activeName === '1'" class="is-vertical">
         <section class="main-section">
           <div class="el-main-title">
             <div class="title-left-icon" />
@@ -134,7 +134,7 @@
               <li v-for="(item,index) in comments" :key="'comment'+index">
                 <span class="comment-name">{{ item.commentInfo.name }}</span>
                 <span class="comment-gmtCreater">{{ item.commentInfo.gmtCreater }}</span>
-                <span class="comment-content">{{ item.commentInfo.content }}</span>
+                <span class="comment-content">{{ item.commentInfo.content }}</span><br>
               </li>
             </ul>
             <el-input
@@ -154,20 +154,20 @@
       </el-container>
       <!-- 概览 -->
       <!-- 缺陷 -->
-      <el-container v-show="activeName === '2'" class="is-vertical" style="height: calc(100vh - 125px);">
-        <section class="main-section">
-          <bugTableDialog ref="bugTableDialog" />
+      <el-container v-if="activeName === '2'" class="is-vertical">
+        <section class="main-section contain">
+          <bugTableDialog ref="bugTableDialog" no-show="taskName" :obj-id="{ taskId: Number(this.$route.query.id) }" />
         </section>
       </el-container>
       <!-- 缺陷 -->
       <!-- 报告 -->
-      <el-container v-show="activeName === '3'" class="is-vertical" style="height: calc(100vh - 125px);">
+      <el-container v-if="activeName === '3'" class="is-vertical">
         <report-list />
       </el-container>
       <!-- 报告 -->
       <!-- 统计 -->
-      <el-container v-if="activeName === '4'" class="is-vertical" style="height: calc(100vh - 125px);">
-        <section class="main-section">
+      <el-container v-if="activeName === '4'" class="is-vertical">
+        <section class="main-section contain">
           <data-statistics />
         </section>
       </el-container>
@@ -193,7 +193,7 @@
       <task-dialog v-if="showTaskDialog" :show.sync="showTaskDialog" :task-id="taskIds.id" :status-name="taskIds.statusString" @getList="taskGet" />
       <drawer
         ref="drawer"
-        title="项目成员"
+        title="任务成员"
         center
         :display.sync="display"
         width="28%"
@@ -306,9 +306,6 @@ export default {
     this.$store.state.data.status = true
     this.$store.state.data.bizId = true
   },
-  mounted() {
-    this.$refs.bugTableDialog.bugGetTableList({ taskId: Number(this.$route.query.id) })
-  },
   destroyed() {
     this.$store.state.data.status = false
     this.$store.state.data.bizId = false
@@ -323,7 +320,7 @@ export default {
       }
       const res = await taskUpdate({ taskInfoDO, user })
       if (res.code === 200) {
-        this.$message({ message: '修改', type: 'success', duration: 1000, offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })
       }
       this.taskGet()
     },
@@ -417,13 +414,13 @@ export default {
       const user = { name: this.userNames, ename: this.userInformation, id: '' }
       const res = await tasktaskDelete(user, this.taskId)
       if (res.code === 200) {
-        this.$message({ message: '删除成功', type: 'warning', duration: 1000, offset: 150 })
+        this.$message({ message: '删除成功', type: 'success', duration: 1000, offset: 150 })
       }
     },
     created_bug() { // 缺陷创建
       this.bug_open = true
       this.$nextTick(() => {
-        this.$refs.createdBug.init(1)
+        this.$refs.createdBug.init(1, { id: this.taskId })
       })
     },
     createReport(e, ele) { // 创建报告
@@ -460,6 +457,10 @@ export default {
 .main-header::after {
   @include main-header-after;
 }
+.contain {
+  height: calc(100vh - 140px);
+  overflow: scroll;
+}
 .main-section {
   @include main-section;
   .detail-info {
@@ -508,7 +509,6 @@ export default {
         font-size:12px
       }
       .comment-content {
-        margin-left:20px;
         font-size:14px;
         color:#333B4A;
         margin-top: 10px;

src/views/workbench/team/index.vue

@@ -191,7 +191,7 @@ export default {
       }
     },
     async queryTeamInfoList() { // 获取用户团队列表
-      const res = await queryTeamInfoList({ curIndex: 1, pageSize: 9999 })
+      const res = await queryTeamInfoList({ curIndex: 1, pageSize: 9999, type: 0 })
       if (res.code === 200 && res.data) {
         this.searchEnum.teams = res.data.list
         this.searchEnum.teams.unshift({ teamId: null, teamName: '全部' })