Browse Source

优化样式

qinzhipeng_v 5 years ago
parent
commit
62f197dc90

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

@@ -564,7 +564,7 @@ export default {
 .filter {
 .filter {
   font-size: 14px;
   font-size: 14px;
   width: 100%;
   width: 100%;
-  padding: 15px 11px 15px 15px;
+  padding: 15px 11px 0px 15px;
   color: #606266;
   color: #606266;
   cursor: pointer;
   cursor: pointer;
   .mine-filter {
   .mine-filter {
@@ -576,7 +576,7 @@ export default {
       overflow: hidden;
       overflow: hidden;
       text-overflow:ellipsis;
       text-overflow:ellipsis;
       white-space: nowrap;
       white-space: nowrap;
-      margin-bottom: 5px;
+      // margin-bottom: 5px;
     }
     }
   }
   }
 }
 }

+ 12 - 3
src/views/reportManagement/ReleaseReport/components/iconDisplay.vue

@@ -17,7 +17,7 @@
       <div id="lineShow" class="backTop" />
       <div id="lineShow" class="backTop" />
       <div id="barShow" class="backTop" />
       <div id="barShow" class="backTop" />
     </div>
     </div>
-    <div class="backStyle">遗留缺陷</div>
+    <div class="title">遗留缺陷</div>
     <el-table
     <el-table
       :data="tableData"
       :data="tableData"
       border
       border
@@ -31,8 +31,8 @@
           <span class="didi-hover" @click.stop="click_bugName(scope.row.id)">{{ scope.row.bugName }}</span>
           <span class="didi-hover" @click.stop="click_bugName(scope.row.id)">{{ scope.row.bugName }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column prop="priorityLevel" label="缺陷状态" align="center" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="priorityName" label="缺陷等级" align="center" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="bugStatusName" label="缺陷状态" align="center" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="priorityLevel" label="缺陷等级" align="center" min-width="100" show-overflow-tooltip />
       <el-table-column prop="creatorList" label="提报人" align="center" min-width="90" show-overflow-tooltip />
       <el-table-column prop="creatorList" label="提报人" align="center" min-width="90" show-overflow-tooltip />
       <el-table-column prop="assignerList" label="责任人" align="center" min-width="90" show-overflow-tooltip />
       <el-table-column prop="assignerList" label="责任人" align="center" min-width="90" show-overflow-tooltip />
       <el-table-column prop="currentHandlerList" label="修复人" align="center" min-width="90" show-overflow-tooltip />
       <el-table-column prop="currentHandlerList" label="修复人" align="center" min-width="90" show-overflow-tooltip />
@@ -255,4 +255,13 @@ export default {
     width: 400px;
     width: 400px;
     height:400px;
     height:400px;
   }
   }
+
+  .title {
+  font-size:16px;
+  font-family:PingFangSC-Medium;
+  line-height:35px;
+  margin-bottom: 10px;
+  color:rgba(51,59,74,1);
+  opacity:1;
+}
 </style>
 </style>

+ 15 - 14
src/views/reportManagement/ReleaseReport/components/releaseDetails.vue

@@ -19,49 +19,49 @@
         <el-row>
         <el-row>
           <el-col :span="24" class="task-bot">
           <el-col :span="24" class="task-bot">
             <span class="from-names">测试结果: </span>
             <span class="from-names">测试结果: </span>
-            <span class="from-value">通过</span>
+            <span class="from-value" style="color:rgba(126,211,33,1);">通过</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
         <el-row>
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name">计划准出时间:{{ details.releasePlanTime }}</span>
+            <span class="from-name"><span class="test-details">计划准出时间:</span>{{ details.releasePlanTime }}</span>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
-            <span class="from-namev"> 实际准出时间:{{ details.releaseActualTime }}</span>
+            <span class="from-namev"><span class="test-details">实际准出时间:</span>{{ details.releaseActualTime }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
         <el-row v-if="details.isDelay === 1">
         <el-row v-if="details.isDelay === 1">
           <el-col :span="24" class="Layout_space_between task-bot">
           <el-col :span="24" class="Layout_space_between task-bot">
-            <span class="from-namea">准出延期原因 : {{ details.delayReason }}</span>
+            <span class="from-namea"><span class="test-details">准出延期原因 : </span>{{ details.delayReason }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
         <el-row>
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name">计划开发周期:{{ details.testPlanTimeStart }}</span>
+            <span class="from-name"><span class="test-details">计划开发周期:</span>{{ details.testPlanTimeStart }}</span>
           </el-col>
           </el-col>
           <el-col :span="12" class="Layout_space_between">
           <el-col :span="12" class="Layout_space_between">
-            <span class="from-namer"> 实际开发周期:{{ details.testPlanTimeEnd }}</span>
+            <span class="from-namer"><span class="test-details">实际开发周期:</span>{{ details.testPlanTimeEnd }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
         <el-row>
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name">计划测试周期:{{ details.testActualTimeStart }} </span>
+            <span class="from-name"><span class="test-details">计划测试周期:</span>{{ details.testActualTimeStart }} </span>
           </el-col>
           </el-col>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-namer">实际测试周期:{{ details.testActualTimeEnd }}</span>
+            <span class="from-namer"><span class="test-details">实际测试周期:</span>{{ details.testActualTimeEnd }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
         <el-row>
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name">开发人员:{{ details.developer }}</span>
+            <span class="from-name"><span class="test-details">开发人员:</span>{{ details.developer }}</span>
           </el-col>
           </el-col>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-namer"> 测试人员:{{ details.tester }}</span>
+            <span class="from-namer"><span class="test-details">测试人员:</span>{{ details.tester }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
         <div v-html="details.content" />
         <div v-html="details.content" />
@@ -186,7 +186,7 @@ export default {
     font-family:Microsoft Sans Serif;
     font-family:Microsoft Sans Serif;
     font-weight:400;
     font-weight:400;
     line-height:22px;
     line-height:22px;
-    color:#666666;
+    color:#333;
     opacity:1;
     opacity:1;
     .from-name {
     .from-name {
       width: 140px !important;
       width: 140px !important;
@@ -207,7 +207,6 @@ export default {
     }
     }
     .from-value {
     .from-value {
       margin-left: 30px;
       margin-left: 30px;
-      color:rgba(126,211,33,1);
     }
     }
   .report-taskList{
   .report-taskList{
     font-size:14px;
     font-size:14px;
@@ -255,7 +254,7 @@ export default {
 }
 }
 .report-mains {
 .report-mains {
   min-height: 200px;
   min-height: 200px;
-  padding: 20px ;
+  padding: 20px 30PX;
   margin: 10px 10px 0 0;
   margin: 10px 10px 0 0;
   background: #FFF;
   background: #FFF;
   border-radius:4px;
   border-radius:4px;
@@ -263,7 +262,6 @@ export default {
 .title {
 .title {
   font-size:16px;
   font-size:16px;
   font-family:PingFangSC-Medium;
   font-family:PingFangSC-Medium;
-  line-height:35px;
   margin-bottom: 10px;
   margin-bottom: 10px;
   color:rgba(51,59,74,1);
   color:rgba(51,59,74,1);
   opacity:1;
   opacity:1;
@@ -312,4 +310,7 @@ export default {
 .setLine {
 .setLine {
   padding: 10px 20px;
   padding: 10px 20px;
 }
 }
+.test-details {
+  color: #666666;
+}
 </style>
 </style>

+ 23 - 12
src/views/reportManagement/Testing/components/deliverDetails.vue

@@ -22,34 +22,34 @@
 
 
         <el-row>
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name">计划提测时间:{{ details.deliverTestPlanTime }}</span>
+            <span class="from-name"><span class="test-details">计划提测时间:</span>{{ details.deliverTestPlanTime }}</span>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
-            <span class="from-namev">实际提测时间:{{ details.deliverTestActualTime }}</span>
+            <span class="from-namev"><span class="test-details">实际提测时间:</span>{{ details.deliverTestActualTime }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
         <el-row v-show="details.isDelay === 1">
         <el-row v-show="details.isDelay === 1">
           <el-col :span="24" class="Layout_space_between task-bot">
           <el-col :span="24" class="Layout_space_between task-bot">
-            <span class="from-namea">提测延期原因 : {{ details.delayReason }}</span>
+            <span class="from-namea"><span class="test-details">提测延期原因:</span>{{ details.delayReason }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
         <el-row>
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name">计划开发时间:{{ details.devPlanTimeStart !== null ? details.devPlanTimeStart + '至' + details.devPlanTimeEnd : '' }}</span>
+            <span class="from-name"><span class="test-details">计划开发时间:</span>{{ details.devPlanTimeStart !== null ? details.devPlanTimeStart + '至' + details.devPlanTimeEnd : '' }}</span>
           </el-col>
           </el-col>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-namer">实际开发时间:{{ details.devActualTimeStart !== null ? details.devActualTimeStart + '至' + details.devActualTimeEnd : '' }}</span>
+            <span class="from-namer"><span class="test-details">实际开发时间:</span>{{ details.devActualTimeStart !== null ? details.devActualTimeStart + '至' + details.devActualTimeEnd : '' }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
         <el-row>
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name">是否跟版:{{ details.followVersion === 2 ? '否' : '是' }} </span>
+            <span class="from-name"><span class="test-details">是否跟版:</span>{{ details.followVersion === 2 ? '否' : '是' }} </span>
           </el-col>
           </el-col>
           <el-col v-show="details.followVersion === 1" :span="12" class="Layout_space_between task-bot">
           <el-col v-show="details.followVersion === 1" :span="12" class="Layout_space_between task-bot">
-            <span class="from-namer">跟版客户端:{{ details.involveAppString }}</span>
+            <span class="from-namer"><span class="test-details">跟版客户端:</span>{{ details.involveAppString }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
 
 
@@ -58,10 +58,10 @@
             <span class="from-name">CodeReview:{{ details.isCodeReview === 0 ? '否' : '是' }}</span>
             <span class="from-name">CodeReview:{{ details.isCodeReview === 0 ? '否' : '是' }}</span>
           </el-col>
           </el-col>
           <el-col v-show="details.isCodeReview === 1" :span="12" class="Layout_space_between task-bot">
           <el-col v-show="details.isCodeReview === 1" :span="12" class="Layout_space_between task-bot">
-            <span class="from-namer">执行人:{{ details.codeReviewExecutor }}</span>
+            <span class="from-namer"><span class="test-details">执行人:</span>{{ details.codeReviewExecutor }}</span>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
-        <div class="backStyle">需求列表</div>
+        <div class="title">需求列表</div>
 
 
         <el-table
         <el-table
           :data="tableData"
           :data="tableData"
@@ -233,7 +233,7 @@ export default {
     font-family:Microsoft Sans Serif;
     font-family:Microsoft Sans Serif;
     font-weight:400;
     font-weight:400;
     line-height:22px;
     line-height:22px;
-    color:#666666;
+    color:#333;
     opacity:1;
     opacity:1;
     .from-name {
     .from-name {
       width: 140px !important;
       width: 140px !important;
@@ -302,7 +302,7 @@ export default {
 }
 }
 .report-mains {
 .report-mains {
   min-height: 200px;
   min-height: 200px;
-  padding: 20px ;
+  padding: 20px 30px;
   margin: 10px 10px 0 0;
   margin: 10px 10px 0 0;
   background: #FFF;
   background: #FFF;
   border-radius:4px;
   border-radius:4px;
@@ -310,7 +310,6 @@ export default {
 .title {
 .title {
   font-size:16px;
   font-size:16px;
   font-family:PingFangSC-Medium;
   font-family:PingFangSC-Medium;
-  line-height:35px;
   margin-bottom: 10px;
   margin-bottom: 10px;
   color:rgba(51,59,74,1);
   color:rgba(51,59,74,1);
   opacity:1;
   opacity:1;
@@ -359,4 +358,16 @@ export default {
 .setLine {
 .setLine {
   padding: 10px 20px;
   padding: 10px 20px;
 }
 }
+.test-details {
+  color: #666666;
+}
+
+.title {
+  font-size:16px;
+  font-family:PingFangSC-Medium;
+  line-height:35px;
+  margin-bottom: 10px;
+  color:rgba(51,59,74,1);
+  opacity:1;
+}
 </style>
 </style>

+ 1 - 2
src/views/reportManagement/daily/components/dailyDetails.vue

@@ -170,7 +170,7 @@ export default {
 }
 }
 .report-mains {
 .report-mains {
   min-height: 200px;
   min-height: 200px;
-  padding: 20px ;
+  padding: 20px 30PX;
   margin: 10px 10px 0 0;
   margin: 10px 10px 0 0;
   background: #FFF;
   background: #FFF;
   border-radius:4px;
   border-radius:4px;
@@ -178,7 +178,6 @@ export default {
 .title {
 .title {
   font-size:16px;
   font-size:16px;
   font-family:PingFangSC-Medium;
   font-family:PingFangSC-Medium;
-  line-height:35px;
   margin-bottom: 10px;
   margin-bottom: 10px;
   color:rgba(51,59,74,1);
   color:rgba(51,59,74,1);
   opacity:1;
   opacity:1;

+ 5 - 0
src/views/reportManagement/daily/dailyTemplate.vue

@@ -146,6 +146,11 @@ export default {
 
 
     // 新建
     // 新建
     getCreateData(val) {
     getCreateData(val) {
+      if (this.selectTask) {
+        this.$set(this.fromCreateData, 'taskIds', null)
+        this.taskid_arr = []
+        return false
+      }
       this.$refs.fromCreateData.validate((valid) => {
       this.$refs.fromCreateData.validate((valid) => {
         if (valid) {
         if (valid) {
           this.fromCreateData.bizId = localStorage.getItem('bizId')
           this.fromCreateData.bizId = localStorage.getItem('bizId')

+ 1 - 1
src/views/reportManagement/testPresentation.vue

@@ -22,7 +22,7 @@
             <el-button v-if="history" type="primary" size="medium" @click="getQueryData">新建{{ title }}</el-button>
             <el-button v-if="history" type="primary" size="medium" @click="getQueryData">新建{{ title }}</el-button>
           </div>
           </div>
         </div>
         </div>
-        <el-table v-loading="loading" :data="tableData" size="mini" :header-cell-style="{ background: '#F2F3F6' }" border style="width: 100%" :show-overflow-tooltip="true">
+        <el-table v-loading="loading" :data="tableData" size="medium" :header-cell-style="{ background: '#F2F3F6', color: '#333' }" border style="width: 100%" :show-overflow-tooltip="true">
           <el-table-column label="报告名称" min-width="280" show-overflow-tooltip>
           <el-table-column label="报告名称" min-width="280" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <a v-if="title === '测试日报' || title === '准出报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ scope.row.reportName }}</a>
               <a v-if="title === '测试日报' || title === '准出报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ scope.row.reportName }}</a>