panxiandiao_i 5 vuotta sitten
vanhempi
sitoutus
9926d0847b

+ 1 - 1
src/views/projectManage/projectList/projectViewDetails.vue

@@ -296,7 +296,7 @@
               :data="all_task"
               :data="all_task"
               style="width: 100%;"
               style="width: 100%;"
               size="mini"
               size="mini"
-              :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF' }"
+              :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF', textAlign: 'center' }"
               show-overflow-tooltip="true"
               show-overflow-tooltip="true"
             >
             >
               <el-table-column label="任务名称" min-width="100" align="center" show-overflow-tooltip>
               <el-table-column label="任务名称" min-width="100" align="center" show-overflow-tooltip>

+ 10 - 10
src/views/projectManage/requirement/details/index.vue

@@ -151,44 +151,44 @@
         style="width: 100%;"
         style="width: 100%;"
         highlight-current-row
         highlight-current-row
         :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF',textAlign: 'center'}"
         :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF',textAlign: 'center'}"
-        :cell-style="{textAlign: 'center','font-size':'14px','font-family':'MicrosoftYaHei'}"
+        :cell-style="{'font-size':'14px','font-family':'MicrosoftYaHei'}"
       >
       >
-        <el-table-column prop="name" label="任务名" min-width="20%">
+        <el-table-column prop="name" label="任务名" min-width="20%" align="center">
           <template v-slot="scope">
           <template v-slot="scope">
             <div style="cursor: pointer;" @click="getToTaskDetails(scope.row.id)">{{ scope.row.name }}</div>
             <div style="cursor: pointer;" @click="getToTaskDetails(scope.row.id)">{{ scope.row.name }}</div>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="beginTime" label="排期" min-width="15%">
+        <el-table-column prop="beginTime" label="排期" min-width="15%" align="center">
           <template
           <template
             v-slot="scope"
             v-slot="scope"
           >{{ getSchedule(scope.row) }}</template>
           >{{ getSchedule(scope.row) }}</template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="statusString" label="状态" min-width="10%">
+        <el-table-column prop="statusString" label="状态" min-width="10%" align="center">
           <template v-slot="scope">
           <template v-slot="scope">
             <div style="color: #FF9500">{{ scope.row.statusString }}</div>
             <div style="color: #FF9500">{{ scope.row.statusString }}</div>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="stageString" label="任务健康状态" min-width="12%">
+        <el-table-column prop="stageString" label="任务健康状态" min-width="12%" align="center">
           <template v-slot="scope">
           <template v-slot="scope">
             <div class="double-line">{{ scope.row.stageString }}</div>
             <div class="double-line">{{ scope.row.stageString }}</div>
             <div class="double-line-tow">{{ scope.row.lateMsg }}</div>
             <div class="double-line-tow">{{ scope.row.lateMsg }}</div>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="rate" label="任务进展" min-width="15%">
+        <el-table-column prop="rate" label="任务进展" min-width="15%" align="left">
           <template v-slot="scope">
           <template v-slot="scope">
             <el-progress :percentage="Number(scope.row.rate?scope.row.rate.substring(0,4).replace(/%/g,''):0)" />
             <el-progress :percentage="Number(scope.row.rate?scope.row.rate.substring(0,4).replace(/%/g,''):0)" />
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="rdObject" label="开发负责人" min-width="10%">
+        <el-table-column prop="rdObject" label="开发负责人" min-width="10%" align="center">
           <template v-slot="scope">{{ scope.row.rdObject?scope.row.rdObject.name:'空' }}</template>
           <template v-slot="scope">{{ scope.row.rdObject?scope.row.rdObject.name:'空' }}</template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="qaObject" label="测试负责人" min-width="10%">
+        <el-table-column prop="qaObject" label="测试负责人" min-width="10%" align="center">
           <template v-slot="scope">{{ scope.row.qaObject?scope.row.qaObject.name:'空' }}</template>
           <template v-slot="scope">{{ scope.row.qaObject?scope.row.qaObject.name:'空' }}</template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="rdList" label="开发" min-width="10%">
+        <el-table-column prop="rdList" label="开发" min-width="10%" align="center">
           <template v-slot="scope">{{ getQaOrRdNameList(scope.row.rdList) }}</template>
           <template v-slot="scope">{{ getQaOrRdNameList(scope.row.rdList) }}</template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="qaList" label="测试" min-width="10%">
+        <el-table-column prop="qaList" label="测试" min-width="10%" align="center">
           <template v-slot="scope">{{ getQaOrRdNameList(scope.row.qaList) }}</template>
           <template v-slot="scope">{{ getQaOrRdNameList(scope.row.qaList) }}</template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>

+ 1 - 2
src/views/projectManage/taskList/taskViewDetails.vue

@@ -755,8 +755,7 @@ export default {
       for (let i = 0; i < arr.length; i++) {
       for (let i = 0; i < arr.length; i++) {
         let pauseTime = dayjs(arr[i].startTime).format('YYYY-MM-DD')
         let pauseTime = dayjs(arr[i].startTime).format('YYYY-MM-DD')
         while (pauseTime <= dayjs(arr[i].endTime).format('YYYY-MM-DD')) {
         while (pauseTime <= dayjs(arr[i].endTime).format('YYYY-MM-DD')) {
-          result[pauseTime] = this.pauseName + arr[i].version + arr[i].name
-          console.log(result[pauseTime])
+          result[pauseTime] = (this.pauseName || '') + arr[i].version + arr[i].name
           pauseTime = dayjs(pauseTime)
           pauseTime = dayjs(pauseTime)
             .add(1, 'day')
             .add(1, 'day')
             .format('YYYY-MM-DD')
             .format('YYYY-MM-DD')

+ 2 - 2
src/views/projectManage/version/list/index.vue

@@ -463,11 +463,11 @@ export default {
   padding: 0
   padding: 0
 }
 }
 .layout_header {
 .layout_header {
-  margin: 2%;
+  margin: 1%;
   line-height: 60px;
   line-height: 60px;
 }
 }
 .layout_main {
 .layout_main {
-  margin: 0 2% 2% 2%;
+  margin: 0 1% 1% 1%;
   min-height: calc(100vh - 190px);
   min-height: calc(100vh - 190px);
 }
 }
 .div_priority {
 .div_priority {