Merge branch 'http_mock' into usecase_daily_0.0.2

src/views/monthlyReport/childrenPage/editReport/components/SubTitle.vue

@@ -6,7 +6,7 @@
         <span v-if="index === 1">其中P0 bug数<span class="fontWeight" :class="[item.label !== '0' ? 'query-colors' : '' ]">{{ item.label }}</span>个，</span>
         <span v-if="index === 2">P1 bug数<span class="fontWeight">{{ item.label }}</span>个；</span>
         <span v-if="index === 3 && item.label !== '--'">P0&P1平均修复时长<span class="fontWeight" :class="[item.label > 24 ? 'query-colors' : '' ]">{{ item.label }}h</span>；</span>
-        <span v-if="index === 4 && item.label !== '--'">P0&P1 过夜率<span class="fontWeight">{{ item.label }}%</span>；</span>
+        <span v-if="index === 4 && item.label !== '--'">P0&P1 过夜率<span class="fontWeight" :class="[item.label > 30 ? 'query-colors' : '' ]">{{ item.label }}%</span>；</span>
         <span v-if="index === 5">Reopen<span class="fontWeight" :class="[item.label !== '0' ? 'query-colors' : '' ]">{{ item.label }}</span>次。</span>
       </span>
       <!-- 新增bug 78个，其中P0 bug数XX（标红）个，P1 bug数XX个；P0&P1平均修复时长 23.8H；P0&P1 24小时修复率70.0%；reopen XX次。 -->

src/views/projectManage/onlineproblem/index.vue

@@ -35,6 +35,9 @@ export default {
     async listSearch(data) {
       this.chartData = {}
       this.dataList = []
+      if (!data.year) {
+        return
+      }
       const res = await getlist({ ...data, bizId: this.$store.state.global.bizId })
       if (res.code === 200) {
         this.dataList = res.data.list || []

src/views/projectManage/requirement/renderData/chartSearchForm.js

@@ -4,12 +4,14 @@ const data = [
     key: 'name',
     value: '',
     placeholder: '请输入标题或ID或望岳ID',
+    styles: { marginBottom: '15px', width: '380px' },
     type: 'input'
   },
   {
     name: '需求状态',
     key: 'statusList',
     placeholder: '请选择',
+    styles: { marginBottom: '15px', width: '380px' },
     type: 'select',
     multiple: true,
     value: [],
@@ -21,6 +23,7 @@ const data = [
     placeholder: '请选择',
     type: 'select',
     multiple: false,
+    styles: { marginBottom: '15px', width: '380px' },
     value: '',
     option: [] // label===name  value ===id
   },
@@ -32,6 +35,7 @@ const data = [
     hasSlot: true,
     utilName: 'getPerson',
     placeholder: '请输入姓名或邮箱前缀',
+    styles: { marginBottom: '15px', width: '380px' },
     value: '',
     option: []
   },
@@ -39,6 +43,7 @@ const data = [
     name: '需求类型',
     key: 'type',
     placeholder: '请选择',
+    styles: { marginBottom: '15px', width: '380px' },
     type: 'select',
     multiple: false,
     value: '',
@@ -48,6 +53,7 @@ const data = [
     name: '需求来源',
     key: 'sourceTypeList',
     placeholder: '请选择',
+    styles: { marginBottom: '15px', width: '380px' },
     type: 'select',
     multiple: true,
     value: [],
@@ -57,6 +63,7 @@ const data = [
     name: '优先级',
     key: 'priorityList',
     placeholder: '请选择',
+    styles: { marginBottom: '15px', width: '380px' },
     type: 'select',
     multiple: true,
     value: [],
@@ -70,6 +77,7 @@ const data = [
     hasSlot: true,
     utilName: 'getPerson',
     placeholder: '请输入姓名或邮箱前缀',
+    styles: { marginBottom: '15px', width: '380px' },
     value: '',
     option: []
   },
@@ -79,6 +87,7 @@ const data = [
     placeholder: '请选择',
     type: 'select',
     multiple: false,
+    styles: { marginBottom: '15px', width: '380px' },
     value: null,
     option: []
   },
@@ -86,6 +95,7 @@ const data = [
     name: '创建日期',
     key: 'date',
     type: 'dateStartAndEnd',
+    styles: { marginBottom: '15px', width: '380px' },
     value: []
   }
 ]

src/views/projectManage/taskList/renderData/chartSearchForm.js

@@ -4,6 +4,7 @@ const data = [
     key: 'name',
     value: '',
     placeholder: '请输入标题或ID或望岳ID',
+    styles: { marginBottom: '15px', width: '380px' },
     type: 'input'
   },
   {
@@ -12,6 +13,7 @@ const data = [
     placeholder: '请选择',
     type: 'select',
     multiple: true,
+    styles: { marginBottom: '15px', width: '380px' },
     value: '',
     option: [] // label===msg  value ===code
   },
@@ -21,6 +23,7 @@ const data = [
     placeholder: '请选择',
     type: 'select',
     multiple: false,
+    styles: { marginBottom: '15px', width: '380px' },
     value: '',
     option: [] // label===name  value ===id
   },
@@ -30,6 +33,7 @@ const data = [
     placeholder: '请选择',
     type: 'select',
     multiple: false,
+    styles: { marginBottom: '15px', width: '380px' },
     value: '',
     option: [] // label===name  value ===id
   },
@@ -39,6 +43,7 @@ const data = [
     placeholder: '请选择',
     type: 'select',
     multiple: false,
+    styles: { marginBottom: '15px', width: '380px' },
     value: '',
     option: []
   },
@@ -47,6 +52,7 @@ const data = [
     key: 'PersonInCharge',
     type: 'remoteSelect',
     multiple: false,
+    styles: { marginBottom: '15px', width: '380px' },
     hasSlot: true,
     utilName: 'getPerson',
     placeholder: '请输入姓名或邮箱前缀',
@@ -59,6 +65,7 @@ const data = [
     placeholder: '请选择',
     type: 'select',
     multiple: false,
+    styles: { marginBottom: '15px', width: '380px' },
     value: '',
     option: [] // label===msg  value ===code
   },
@@ -67,6 +74,7 @@ const data = [
     key: 'creater',
     type: 'remoteSelect',
     multiple: false,
+    styles: { marginBottom: '15px', width: '380px' },
     hasSlot: true,
     utilName: 'getPerson',
     placeholder: '请输入姓名或邮箱前缀',
@@ -79,6 +87,7 @@ const data = [
     placeholder: '请选择',
     type: 'select',
     multiple: false,
+    styles: { marginBottom: '15px', width: '380px' },
     value: '',
     option: []
   },
@@ -86,6 +95,7 @@ const data = [
     name: '创建日期',
     key: 'date',
     type: 'dateStartAndEnd',
+    styles: { marginBottom: '15px', width: '380px' },
     value: []
   }
 ]

src/views/projectManage/taskList/taskIndex.vue

@@ -333,7 +333,7 @@
         size="small"
         show-overflow-tooltip="true"
       >
-        <el-table-column label="优先级" width="90" prop="priority" sortable align="right">
+        <el-table-column label="优先级" width="90" fixed prop="priority" sortable align="right">
           <template slot-scope="scope">
             <div
               class="div_priority"
@@ -341,7 +341,7 @@
             >{{ scope.row.priorityString }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="任务名称" min-width="250" show-overflow-tooltip align="left">
+        <el-table-column label="任务名称" min-width="250" fixed show-overflow-tooltip align="left">
           <template slot-scope="scope">
             <span style="font-size: 12px;color: rgba(167,174,188,1);">
               {{ scope.row.taskIdSting }}