Merge branch 'http_test' into insist

src/views/projectManage/requirement/list/index.vue

@@ -364,6 +364,9 @@ export default {
       if (this.searchForm.date) {
         this.searchForm.createStartTime = this.searchForm.date[0]
         this.searchForm.createEndTime = this.searchForm.date[1]
+      } else {
+        delete this.searchForm.createStartTime
+        delete this.searchForm.createEndTime
       }
       this.searchForm.bizId = this.bizId
       this.loading = true

src/views/projectManage/taskList/taskIndex.vue

@@ -371,6 +371,9 @@ export default {
       if (this.form_task.date) {
         this.form_task.createTimeBegin = this.form_task.date[0]
         this.form_task.createTimeEnd = this.form_task.date[1]
+      } else {
+        delete this.form_task.createTimeBegin
+        delete this.form_task.createTimeEnd
       }
       taskList(this.form_task).then(res => {
         this.task_table = res.data

src/views/quality/components/requireDrawer.vue

@@ -12,8 +12,14 @@
           <div v-if="Statistics.typeStr === '缺陷'" class="drawer-id">{{ scope.row.bugId }}</div>
           <div v-if="Statistics.typeStr === '任务'" class="drawer-id">{{ scope.row.taskIdSting }}</div>
           <div v-if="Statistics.typeStr === '需求'" class="drawer-id">{{ scope.row.requirementDisplayId }}</div>
-          <div v-if="Statistics.typeStr === '需求' || Statistics.typeStr === '任务'" class="drawer-name" @click="jumper(scope.row)">{{ scope.row.name }}</div>
-          <div v-if="Statistics.typeStr === '缺陷'" class="drawer-name" @click="jumper(scope.row)">{{ scope.row.bugName }}</div>
+          <el-tooltip v-if="Statistics.typeStr === '需求' && scope.row.name.length >= 15 || Statistics.typeStr === '任务' && scope.row.name.length >= 15" class="item" effect="dark" :content="scope.row.name" placement="top">
+            <div class="drawer-name" @click="jumper(scope.row)">{{ scope.row.name | ellipsis }}</div>
+          </el-tooltip>
+          <div v-else class="drawer-name" @click="jumper(scope.row)">{{ scope.row.name | ellipsis }}</div>
+          <el-tooltip v-if="Statistics.typeStr === '缺陷' && scope.row.bugName.length >= 15" class="item" effect="dark" :content="scope.row.bugName" placement="top">
+            <div class="drawer-name" @click="jumper(scope.row)">{{ scope.row.bugName | ellipsis }}</div>
+          </el-tooltip>
+          <div v-else class="drawer-name" @click="jumper(scope.row)">{{ scope.row.bugName | ellipsis }}</div>
         </template>
       </el-table-column>
       <el-table-column label="状态" min-width="180">
@@ -27,7 +33,7 @@
     <el-pagination
       style="text-align: center;"
       :current-page.sync="currentPage"
-      :page-sizes="[10, 20, 30, 40]"
+      :page-sizes="[10]"
       :page-size="10"
       layout="total, sizes, prev, pager, next, jumper"
       :total="total"
@@ -43,6 +49,15 @@ import { getRequirement } from '@/api/requirement.js'
 import { taskList } from '@/api/taskIndex'
 import { bugList, bugGetEnum } from '@/api/defectManage'
 export default {
+  filters: {
+    ellipsis(value) {
+      if (!value) return ''
+      if (value.length > 15) {
+        return value.slice(0, 15) + '...'
+      }
+      return value
+    }
+  },
   props: {
     data: { type: Object, required: true },
     drawer: { type: Boolean, default: false }
@@ -200,4 +215,7 @@ export default {
     right: 0;
     width: 50%;
 }
+>>>.el-table td, .el-table th {
+    padding: 5px 0;
+}
 </style>