Browse Source

优化报告

qinzhipeng_v 5 years ago
parent
commit
ed82306a6c

+ 14 - 1
src/views/projectManage/requirement/requirementDetail.vue

@@ -162,7 +162,16 @@
             <div class="title-left-name">
               <div>需求计划
                 <el-tooltip class="item" effect="dark" :content="isScheduleLocked === 1? '点击解锁排期' : '点击锁定排期'" placement="top">
-                  <span class="titleStatus" :class="isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock'" @click="changeSchedule"> {{ isScheduleLocked === 1 ? '已锁定' : '未锁定' }}</span>
+                  <span
+                    class="titleStatus"
+                    :class="[
+                      isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock',
+                      form_query.needGrey ? 'color_sty': ''
+                    ]"
+                    @click="form_query.needGrey ? changeSchedule : ''"
+                  >
+                    {{ isScheduleLocked === 1 ? '已锁定' : '未锁定' }}
+                  </span>
                 </el-tooltip>
               </div>
             </div><br>
@@ -808,6 +817,10 @@ export default {
    margin: 10px 30px;
 }
 
+.color_sty {
+  color: #eee;
+}
+
 //   >>>.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label:before {
 //     content: '';
 //     color: #F56C6C;

+ 13 - 1
src/views/projectManage/taskList/taskViewDetail.vue

@@ -159,7 +159,16 @@
             <div class="title-left-name">
               <div>任务计划
                 <el-tooltip class="item" effect="dark" :content="isScheduleLocked === 1? '点击解锁排期' : '点击锁定排期'" placement="top">
-                  <span class="titleStatus" :class="isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock'" @click="changeSchedule"> {{ isScheduleLocked === 1 ? '已锁定' : '未锁定' }}</span>
+                  <span
+                    class="titleStatus"
+                    :class="[
+                      isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock',
+                      form_query.needGrey ? 'color_sty': ''
+                    ]"
+                    @click="form_query.needGrey ? changeSchedule: ''"
+                  >
+                    {{ isScheduleLocked === 1 ? '已锁定' : '未锁定' }}
+                  </span>
                 </el-tooltip>
               </div>
             </div>
@@ -883,6 +892,9 @@ export default {
 .el-btn-size {
    margin: 10px 30px;
 }
+.color_sty {
+  color: #eee;
+}
 </style>
 
 <style>

+ 6 - 2
src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -327,7 +327,8 @@ export default {
     font-size:14px;
     font-family:MicrosoftYaHei;
     line-height:19px;
-    color:rgba(51,51,51,1);
+    color:#333;
+     font-weight:500;
     margin: 1% 0;
   }
 
@@ -340,6 +341,9 @@ export default {
     line-height:22px;
     color:#666666;
     opacity:1;
+    >>> .el-form-item__label {
+    color: #333;
+}
     .from-name {
       width: 140px !important;
     }
@@ -357,7 +361,7 @@ export default {
 }
 .sodu {
   color:#C0C4CC;
-  margin-left: 10px;
+  margin-left: 15px;
 }
 
   .from-margin {

+ 11 - 3
src/views/reportManagement/ReleaseReport/releaePreview.vue

@@ -2,7 +2,7 @@
   <!-- 预览准出报告 -->
   <div class="parent-style">
     <div class="backStyle"> 邮件列表</div>
-    <div class="Layout_space_between report-margin" style="margin-bottom: 10px;">
+    <div class="Layout_space_between report-margin bottom_mar">
       <div class="div1">收件人</div>
       <searchTeam :value.sync="form.name" :clearable="true" :multiple="true" style="width:100%" />
     </div>
@@ -10,8 +10,9 @@
       <div class="div1">抄送</div>
       <searchTeam :value.sync="form.names" :clearable="true" :multiple="true" style="width:100%" />
     </div>
+    <div class="backStyle"> 报告预览</div>
     <div id="repot-list">
-      <div class="Layout_space_between">
+      <div class="Layout_space_between" style="border-bottom: 0.5px solid #eee;margin-bottom: 15px;">
         <div class="reportName">{{ fromCreateData.reportName }}</div>
         <div>报告人:{{ userNames }}</div>
       </div>
@@ -56,7 +57,7 @@
         </el-col>
       </el-row>
 
-      <el-row>
+      <el-row class="Above">
         <el-col :span="12" class="Layout_space_between">
           <span class="parent-style">开发人员:{{ fromCreateData.developer }}</span>
         </el-col>
@@ -169,6 +170,7 @@ export default {
     line-height: 19px;
 }
   .backStyle {
+    color: #333;
     font-size: 14px;
     font-weight: bold;
     border-radius: 4px;
@@ -183,4 +185,10 @@ export default {
   .report-margin {
     margin-left: 20px;
   }
+  .bottom_mar {
+    margin-bottom: 10px;
+  }
+  .Above {
+    margin-bottom: 20px;
+  }
 </style>

+ 3 - 1
src/views/reportManagement/Testing/TestingPreview.vue

@@ -10,8 +10,9 @@
       <div class="div1">抄送</div>
       <searchTeam :value.sync="form.names" :clearable="true" :multiple="true" style="width:100%" />
     </div>
+    <div class="backStyle"> 报告预览</div>
     <div id="repot-list">
-      <div class="Layout_space_between">
+      <div class="Layout_space_between" style="border-bottom: 0.5px solid #eee;margin-bottom: 15px;">
         <div class="report-tit">{{ fromCreateData.reportName }}</div>
         <div>报告人:{{ userNames }}</div>
       </div>
@@ -193,6 +194,7 @@ export default {
     line-height: 19px;
 }
   .backStyle {
+    color: #333;
     font-size: 14px;
     font-weight: bold;
     border-radius: 4px;

+ 7 - 3
src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -330,11 +330,12 @@ export default {
 
 <style lang="scss" scoped>
   .backStyle {
-    font-size:16px;
+    font-size:14px;
     font-family:MicrosoftYaHei;
     line-height:19px;
-    color:rgba(51,51,51,1);
     margin: 1% 0;
+    color: #333;
+    font-weight:500;
   }
 
 .report-container {
@@ -346,6 +347,9 @@ export default {
     line-height:22px;
     color:#666666;
     opacity:1;
+    >>> .el-form-item__label {
+    color: #333;
+}
     .from-name {
       width: 150px !important;
     }
@@ -363,7 +367,7 @@ export default {
 }
 .sodu {
   color:#C0C4CC;
-  margin-left: 10px;
+  margin-left: 20px;
 }
 
   .from-margin {

+ 1 - 1
src/views/reportManagement/components/ReleaseReport.vue

@@ -16,7 +16,7 @@
           <el-col :span="5" class="creator">创建人</el-col>
         </el-row>
 
-        <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden; margin: 30px 0;">
+        <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden; margin: 15px 0;">
           <el-row v-for="(item, index) in selectTemplate" :key="index" type="flex" justify="center" @mouseover.native="item.operation = true" @mouseleave.native="item.operation = false">
             <el-col :span="19">
               <el-radio v-model="fromData.radio" class="creatorList" :label="item.id">{{ item.moduleName }}</el-radio>

+ 1 - 1
src/views/reportManagement/components/TestingReport.vue

@@ -16,7 +16,7 @@
           <el-col :span="5" class="creator">创建人</el-col>
         </el-row>
 
-        <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden">
+        <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden; margin: 15px 0;">
           <el-row v-for="(item, index) in selectTemplate" :key="index" type="flex" justify="center" @mouseover.native="item.operation = true" @mouseleave.native="item.operation = false">
             <el-col :span="19">
               <el-radio v-model="fromData.radio" class="creatorList" :label="item.id">{{ item.moduleName }}</el-radio>

+ 1 - 0
src/views/reportManagement/daily/dailyPreview.vue

@@ -61,6 +61,7 @@ export default {
   watch: {
     dailyId: {
       handler(newV) {
+        console.log(newV)
         this.daily_Id = newV
         this.dailyReportGetV2(newV)
       },