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

src/views/Platform/presentation/testPresentation.vue

@@ -97,7 +97,7 @@
               </el-table-column>
             </el-table>
           </template>
-          <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange" @current-change="handleCurrentChangeTest" />
+          <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20, total]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange" @current-change="handleCurrentChangeTest" />
         </el-tab-pane>
       </el-tabs>
       <!-- 日报/准出/提测选择任务 -->
@@ -145,6 +145,7 @@ export default {
   data() {
     return {
       activeName: 'first',
+      nowType: 0, // 当前报告类型
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       bizJson: localStorage.getItem('bizId'),
@@ -198,12 +199,15 @@ export default {
       this.curIndex = 1
       switch (Number(tab.index)) {
         case 0:
+          this.nowType = 0
           this.getList()
           break
         case 1:
+          this.nowType = 1
           this.getListPern()
           break
         case 2:
+          this.nowType = 2
           this.getListTest()
           break
       }
@@ -382,7 +386,17 @@ export default {
     },
     handleSizeChange(size) {
       this.pageSize = size
-      this.getList(this.z_name)
+      switch (this.nowType) {
+        case 0:
+          this.getList(this.z_name)
+          break
+        case 1:
+          this.getListPern(this.z_name)
+          break
+        case 2:
+          this.getListTest(this.z_name)
+          break
+      }
     },
     handleCurrentChange(curIndex) {
       this.curIndex = curIndex

src/views/projectManage/bugList/bugindex.vue

@@ -392,7 +392,9 @@
             >
               <el-table-column label="优先级" prop="priorityCode" sortable align="center">
                 <template slot-scope="scope" style="text-align: center;">
-                  <span class="div_priority" :style="{ background: priorityColors[scope.row.priorityCode] }"> {{ scope.row.priorityLevel | oneA }}</span>
+                  <span class="div_priority" :class="[{'high': scope.row.priorityLevel === 'High'},{'medium': scope.row.priorityLevel === 'Medium'},{'low': scope.row.priorityLevel === 'Low'}]">
+                    {{ scope.row.priorityLevel | oneA }}
+                  </span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -432,10 +434,11 @@
             <el-button v-if="type !== 'list'" type="primary" size="mini" class="download" @click="download">导出</el-button>
             <div align="right">
               <el-pagination
+                :page-sizes="[15, 30, 45, total]"
                 :current-page="currentPage4"
                 :page-size="pageSize"
                 background
-                layout="total, prev, pager, next, jumper"
+                layout="total, sizes, prev, pager, next, jumper"
                 :total="total"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
@@ -629,22 +632,10 @@ export default {
       this.indexPage.curIndex = this.curIndex
       const res = await bugList(this.indexPage)
       if (res.code === 200) {
-        const data = res.data
-        const newData = await this.setCode(data)
-        this.tableData = newData
+        this.tableData = res.data
         this.total = res.total
       }
     },
-    setCode(data) {
-      return new Promise((resolve, reject) => {
-        data.map(item1 => {
-          this.priorityLevelEnumList.map(item => {
-            item1.priorityLevel === item.name ? item1.priorityCode = item.code : ''
-          })
-        })
-        resolve(data)
-      })
-    },
     getBugSelfList(type, pageSize) {
       if (type) {
         this.bugListType = type
@@ -840,4 +831,15 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+.high {
+  background-color: #F56C6C;
+}
+.medium {
+  background-color: #FF8952;
+}
+.low {
+  background-color: #7ED321;
+}
+</style>
 

src/views/projectManage/projectList/projectIndex.vue

@@ -135,9 +135,9 @@
         <el-pagination
           background
           :current-page="currentPage"
-          :page-sizes="[15, 20, 25, 30]"
+          :page-sizes="[15, 20, 25, 30, total]"
           :page-size="15"
-          layout="total, prev, pager, next, jumper"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="total"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"

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

@@ -117,7 +117,7 @@
       <div align="right">
         <el-pagination
           background
-          layout="total, prev, pager, next, jumper"
+          layout="total, sizes, prev, pager, next, jumper"
           :current-page="searchForm.curIndex"
           :page-size="searchForm.pageSize"
           :page-sizes="[15,30,45,total]"

src/views/projectManage/taskList/taskIndex.vue

@@ -182,9 +182,9 @@
         <el-pagination
           background
           :current-page="currentPage"
-          :page-sizes="[15]"
+          :page-sizes="[15,30,45,total]"
           :page-size="15"
-          layout="total, prev, pager, next, jumper"
+          layout="total, sizes, prev, pager, next, jumper"
           :total="total"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"

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

@@ -55,36 +55,39 @@
         </div>
       </el-main>
       <div class="layout_main version_list_layout_main">
-        <el-table
-          v-loading="loading"
-          :data="tableData"
-          style="width: 100%;"
-          highlight-current-row
-          :header-cell-style="{ color: '#4A4A4A', fontSize: '14px', fontWeight: '500' }"
-        >
-          <el-table-column prop="priority" label="优先级" min-width="7%" align="center">
-            <template v-slot="scope">
-              <div class="div_priority" :style="{background: priorityColors[scope.row.priority%priorityColors.length]}">{{ 'P'+scope.row.priority }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="requirementName" label="需求名称" min-width="33%">
-            <template v-slot="scope">
-              <div class="biz-id">REQUIREMENT-{{ scope.row.requirementId }}</div>
-              <div>
-                <el-tooltip class="item" effect="dark" placement="bottom" :content="scope.row.requirementName" :disabled="scope.row.requirementName.length < 16">
-                  <div style="cursor: pointer;" @click="getToRequirementDetails(scope.row.requirementId)">
-                    {{ getRequirementName(scope.row.requirementName) }}
-                    <div v-if="scope.row.delay" class="div_requirement_name">{{ searchTitle.version +'版本已延期' }}</div>
+        <el-row>
+          <el-col :span="24">
+            <el-table
+              v-loading="loading"
+              :data="tableData"
+              style="width: 100%;"
+              highlight-current-row
+              :header-cell-style="{ color: '#4A4A4A', fontSize: '14px', fontWeight: '500' }"
+            >
+              <el-table-column prop="priority" label="优先级" min-width="7%" align="center">
+                <template v-slot="scope">
+                  <div class="div_priority" :style="{background: priorityColors[scope.row.priority%priorityColors.length]}">{{ 'P'+scope.row.priority }}</div>
+                  <div :class="[{ active: isActive=='h' }, { active1: isActive=='l' },{ active1: isActive=='l' }]" />
+                </template>
+              </el-table-column>
+              <el-table-column prop="requirementName" label="需求名称" min-width="33%">
+                <template v-slot="scope">
+                  <div class="biz-id">REQUIREMENT-{{ scope.row.requirementId }}</div>
+                  <div>
+                    <el-tooltip class="item" effect="dark" placement="bottom" :content="scope.row.requirementName" :disabled="scope.row.requirementName.length < 16">
+                      <div style="cursor: pointer;" @click="getToRequirementDetails(scope.row.requirementId)">
+                        {{ getRequirementName(scope.row.requirementName) }}
+                        <div v-if="scope.row.delay" class="div_requirement_name">{{ searchTitle.version +'版本已延期' }}</div>
+                      </div>
+                    </el-tooltip>
                   </div>
-                </el-tooltip>
-              </div>
-              <div class="pm-status">
-                <span>PM：{{ scope.row.pmName }}</span>
-                <span>状态：{{ versionEnum.requirementStatusMap[scope.row.status] }}</span>
-              </div>
-            </template>
-          </el-table-column>
-          <!-- <el-table-column prop="bizId" label="业务线" min-width="8%">
+                  <div class="pm-status">
+                    <span>PM：{{ scope.row.pmName }}</span>
+                    <span>状态：{{ versionEnum.requirementStatusMap[scope.row.status] }}</span>
+                  </div>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column prop="bizId" label="业务线" min-width="8%">
             <template v-slot="scope">
               {{ versionEnum.bizTypeMap[scope.row.bizId] }}
             </template>
@@ -95,35 +98,41 @@
               {{ versionEnum.requirementStatusMap[scope.row.status] }}
             </template>
           </el-table-column> -->
-          <el-table-column prop="statusInfoCountList" label="任务状态分布" min-width="30%" align="center">
-            <template v-slot="scope">
-              <version-chart
-                :chart-id="'taskCount' + scope.$index"
-                :option="taskOptionList[scope.$index]"
-                style="position: relative;bottom: 30px"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column prop="statusInfoHealthyList" label="任务健康分布" min-width="30%" align="center">
-            <template v-slot="scope">
-              <version-chart
-                :chart-id="'taskHealthCount' + scope.$index"
-                :option="taskHealthOptionList[scope.$index]"
-                style="position: relative;bottom: 30px"
+              <el-table-column prop="statusInfoCountList" label="任务状态分布" min-width="30%" align="center">
+                <template v-slot="scope">
+                  <version-chart
+                    :chart-id="'taskCount' + scope.$index"
+                    :option="taskOptionList[scope.$index]"
+                    style="position: relative;bottom: 30px"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="statusInfoHealthyList" label="任务健康分布" min-width="30%" align="center">
+                <template v-slot="scope">
+                  <version-chart
+                    :chart-id="'taskHealthCount' + scope.$index"
+                    :option="taskHealthOptionList[scope.$index]"
+                    style="position: relative;bottom: 30px"
+                  />
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+          <el-col :span="24">
+            <div align="right">
+              <el-pagination
+                background
+                layout="total, sizes, prev, pager, next, jumper"
+                :current-page="searchForm.curIndex"
+                :page-size="searchForm.pageSize"
+                :page-sizes="[15,30,45]"
+                :total="total"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
               />
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-          background
-          layout="->,total, prev, pager, next, jumper"
-          :current-page="searchForm.curIndex"
-          :page-size="searchForm.pageSize"
-          :page-sizes="[15,30,45,total]"
-          :total="total"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        />
+            </div>
+          </el-col>
+        </el-row>
       </div>
     </div>
   </el-container>