优化详情页字体颜色（报告）

src/views/reportManagement/ReleaseReport/components/releaseDetails.vue

@@ -16,7 +16,7 @@
     </el-header>
     <el-container>
       <el-main class="report-main">
-        <div class="title"><div class="blur-column" />报告内容</div>
+        <div class="title"><div class="blur-column spanColor" />报告内容</div>
         <el-row>
           <el-col :span="24" class="task-bot">
             <span class="from-names">测试结果：</span>
@@ -28,13 +28,13 @@
           <el-col :span="12" class="Layout_space_between task-bot">
             <span class="from-name">
               <span class="test-details">计划准出时间：</span>
-              {{ details.releasePlanTime }}
+              <span class="spanColor">{{ details.releasePlanTime }}</span>
             </span>
           </el-col>
           <el-col :span="12">
             <span class="from-namev">
               <span class="test-details">实际准出时间：</span>
-              {{ details.releaseActualTime }}
+              <span class="spanColor">{{ details.releaseActualTime }}</span>
             </span>
           </el-col>
         </el-row>
@@ -43,7 +43,7 @@
           <el-col :span="24" class="Layout_space_between task-bot">
             <span class="from-namea">
               <span class="test-details">准出延期原因 :</span>
-              {{ details.delayReason }}
+              <span class="spanColor">{{ details.delayReason }}</span>
             </span>
           </el-col>
         </el-row>
@@ -52,13 +52,13 @@
           <el-col :span="12" class="Layout_space_between task-bot">
             <span class="from-name">
               <span class="test-details">计划开发周期：</span>
-              {{ details.devPlanTimeStart }} 至 {{ details.devPlanTimeEnd }}
+              <span class="spanColor">{{ details.devPlanTimeStart }} 至 {{ details.devPlanTimeEnd }}</span>
             </span>
           </el-col>
           <el-col :span="12" class="Layout_space_between">
             <span class="from-namer">
               <span class="test-details">实际开发周期：</span>
-              {{ details.devActualTimeStart }} 至 {{ details.devActualTimeEnd }}
+              <span class="spanColor">{{ details.devActualTimeStart }} 至 {{ details.devActualTimeEnd }}</span>
             </span>
           </el-col>
         </el-row>
@@ -67,13 +67,13 @@
           <el-col :span="12" class="Layout_space_between task-bot">
             <span class="from-name">
               <span class="test-details">计划测试周期：</span>
-              {{ details.testPlanTimeStart }} 至 {{ details.testPlanTimeEnd }}
+              <span class="spanColor">{{ details.testPlanTimeStart }} 至 {{ details.testPlanTimeEnd }}</span>
             </span>
           </el-col>
           <el-col :span="12" class="Layout_space_between task-bot">
             <span class="from-namer">
               <span class="test-details">实际测试周期：</span>
-              {{ details.testActualTimeStart }} 至 {{ details.testActualTimeEnd }}
+              <span class="spanColor">{{ details.testActualTimeStart }} 至 {{ details.testActualTimeEnd }}</span>
             </span>
           </el-col>
         </el-row>
@@ -83,7 +83,7 @@
             <span class="from-name">
               <span class="test-details">开发人员：</span>
               <span v-for="(item, index) in details.devObject" :key="index">
-                {{ item.name }}
+                <span class="spanColor">{{ item.name }}</span>
                 <span v-if="index < details.devObject.length - 1">,</span>
               </span>
             </span>
@@ -92,7 +92,7 @@
             <span class="from-namer">
               <span class="test-details">测试人员：</span>
               <span v-for="(item, index) in details.testerObject" :key="index">
-                {{ item.name }}
+                <span class="spanColor">{{ item.name }}</span>
                 <span v-if="index < details.testerObject.length - 1">,</span>
               </span>
             </span>
@@ -271,6 +271,9 @@ export default {
   flex-wrap: wrap;
 }
 .BackgroundCloth {
+  .spanColor {
+    color: #333333;
+  }
   .report-Header {
     margin: 10px 10px 0;
     background: #fff;

src/views/reportManagement/ReleaseReport/releaePreview.vue

@@ -24,41 +24,42 @@
 
       <el-row>
         <el-col :span="24">
-          <span class="from-names">测试结果：</span>
-          <span :class="{'from-value': fromCreateData.passStatus === 0, 'from-value1': fromCreateData.passStatus === 1}"> {{ fromCreateData.passStatus === 0 ? '通过' : '不通过' }}</span>
+          <span class="parent-style">测试结果：
+            <span :class="{'from-value': fromCreateData.passStatus === 0, 'from-value1': fromCreateData.passStatus === 1}"> {{ fromCreateData.passStatus === 0 ? '通过' : '不通过' }}</span>
+          </span>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">计划准出时间：{{ fromCreateData.releasePlanTime }}</span>
+          <span class="parent-style">计划准出时间：<span class="spanColor">{{ fromCreateData.releasePlanTime }}</span></span>
         </el-col>
         <el-col :span="12">
-          <span class="parent-style">实际准出时间：{{ fromCreateData.releaseActualTime }}</span>
+          <span class="parent-style">实际准出时间：<span class="spanColor">{{ fromCreateData.releaseActualTime }}</span></span>
         </el-col>
       </el-row>
 
       <el-row v-if="fromCreateData.releasePlanTime < fromCreateData.releaseActualTime">
         <el-col :span="24" class="Layout_space_between">
-          <span class="parent-style">准出延期原因 : {{ fromCreateData.delayReason }}</span>
+          <span class="parent-style">准出延期原因 : <span class="spanColor">{{ fromCreateData.delayReason }}</span></span>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">计划开发周期：{{ fromCreateData.devPlanTimeStart }} 至 {{ fromCreateData.devPlanTimeEnd }}</span>
+          <span class="parent-style">计划开发周期：<span class="spanColor">{{ fromCreateData.devPlanTimeStart }} 至 {{ fromCreateData.devPlanTimeEnd }}</span></span>
         </el-col>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">实际开发周期：{{ fromCreateData.devActualTimeStart }} 至 {{ fromCreateData.devActualTimeEnd }}</span>
+          <span class="parent-style">实际开发周期：<span class="spanColor">{{ fromCreateData.devActualTimeStart }} 至 {{ fromCreateData.devActualTimeEnd }}</span></span>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">计划测试周期：{{ fromCreateData.testPlanTimeStart }} 至 {{ fromCreateData.testPlanTimeEnd }}</span>
+          <span class="parent-style">计划测试周期：<span class="spanColor">{{ fromCreateData.testPlanTimeStart }} 至 {{ fromCreateData.testPlanTimeEnd }}</span></span>
         </el-col>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">实际测试周期：{{ fromCreateData.testActualTimeStart }} 至 {{ fromCreateData.testActualTimeEnd }}</span>
+          <span class="parent-style">实际测试周期：<span class="spanColor">{{ fromCreateData.testActualTimeStart }} 至 {{ fromCreateData.testActualTimeEnd }}</span></span>
         </el-col>
       </el-row>
 
@@ -66,7 +67,7 @@
         <el-col :span="12" class="Layout_space_between">
           <div class="parent-style">开发人员：
             <span v-for="(item, index) in fromCreateData.devObject" :key="index">
-              {{ item.name }}
+              <span class="spanColor">{{ item.name }}</span>
               <span v-if="index < fromCreateData.devObject.length - 1">,</span>
             </span>
           </div>
@@ -74,7 +75,7 @@
         <el-col :span="12" class="Layout_space_start">
           <div class="parent-style">测试人员：
             <span v-for="(item, index) in fromCreateData.testerObject" :key="index">
-              {{ item.name }}
+              <span class="spanColor">{{ item.name }}</span>
               <span v-if="index < fromCreateData.testerObject.length - 1">,</span>
             </span>
           </div>
@@ -174,6 +175,9 @@ export default {
   margin: 0 0 10px;
   color: #666666;
   opacity: 1;
+  .spanColor {
+    color: #333333;
+  }
   .from-value {
     margin-left: 30px;
     color: rgba(126, 211, 33, 1);

src/views/reportManagement/Testing/TestingPreview.vue

@@ -24,45 +24,45 @@
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">计划提测时间：{{ fromCreateData.deliverTestPlanTime }}</span>
+          <span class="parent-style">计划提测时间：<span class="spanColor">{{ fromCreateData.deliverTestPlanTime }}</span></span>
         </el-col>
         <el-col :span="12">
-          <span class="parent-style">实际提测时间：{{ fromCreateData.deliverTestActualTime }}</span>
+          <span class="parent-style">实际提测时间：<span class="spanColor">{{ fromCreateData.deliverTestActualTime }}</span></span>
         </el-col>
       </el-row>
 
       <el-row v-if="fromCreateData.deliverTestPlanTime < fromCreateData.deliverTestActualTime ">
         <el-col :span="24" class="Layout_space_between">
-          <span class="parent-style">提测延期原因 : {{ fromCreateData.delayReason }}</span>
+          <span class="parent-style">提测延期原因 : <span class="spanColor">{{ fromCreateData.delayReason }}</span></span>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">计划开发时间：{{ fromCreateData.devPlanTimeStart !== null ? fromCreateData.devPlanTimeStart + '至' + fromCreateData.devPlanTimeEnd : '' }}</span>
+          <span class="parent-style">计划开发时间：<span class="spanColor">{{ fromCreateData.devPlanTimeStart !== null ? fromCreateData.devPlanTimeStart + '至' + fromCreateData.devPlanTimeEnd : '' }}</span></span>
         </el-col>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">实际开发时间：{{ fromCreateData.devActualTimeStart !== null ? fromCreateData.devActualTimeStart + '至' + fromCreateData.devActualTimeEnd : '' }}</span>
+          <span class="parent-style">实际开发时间：<span class="spanColor">{{ fromCreateData.devActualTimeStart !== null ? fromCreateData.devActualTimeStart + '至' + fromCreateData.devActualTimeEnd : '' }}</span></span>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">是否跟版：{{ fromCreateData.followVersion === 2 ? '否' : '是' }} </span>
+          <span class="parent-style">是否跟版：<span class="spanColor">{{ fromCreateData.followVersion === 2 ? '否' : '是' }} </span></span>
         </el-col>
         <el-col v-if="fromCreateData.followVersion === 1" :span="12" class="Layout_space_between">
-          <span class="parent-style">跟版客户端：{{ fromCreateData.involveAppString }}</span>
+          <span class="parent-style">跟版客户端：<span class="spanColor">{{ fromCreateData.involveAppString }}</span></span>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">CodeReview：{{ fromCreateData.isCodeReview === 0 ? '否' : '是' }}</span>
+          <span class="parent-style">CodeReview：<span class="spanColor">{{ fromCreateData.isCodeReview === 0 ? '否' : '是' }}</span></span>
         </el-col>
         <el-col v-if="fromCreateData.isCodeReview === 1" :span="12" class="Layout_space_between">
           <div class="parent-style">执行人：
             <span v-for="(item, index) in fromCreateData.codeReviewExecutorObject" :key="index">
-              {{ item.name }}
+              <span class="spanColor">{{ item.name }}</span>
               <span v-if="index < fromCreateData.codeReviewExecutorObject.length - 1">,</span>
             </span>
           </div>
@@ -202,6 +202,9 @@ export default {
     color:#666666;
     opacity:1;
     margin-bottom: 10px;
+    .spanColor {
+      color: #333333;
+    }
   .report-taskList{
     font-size:14px;
     font-family:MicrosoftYaHei;

src/views/reportManagement/components/template/customTemplate.vue

@@ -33,7 +33,6 @@ export default {
     custom: {
       handler(newV) {
         this.customs = newV.map(e => e)
-        console.log(this.customs, '新的志')
         if (newV && newV[0].bool) {
           this.show = true
           this.customs.map(item => {
@@ -44,7 +43,6 @@ export default {
               })
             }
           })
-          console.log(this.customs, '新的志')
           return
         }
         this.show = false
@@ -61,7 +59,6 @@ export default {
       if (item.conditions === '默认展示') {
         return true
       }
-      console.log(this.baseFrom, item.conditions, item)
       if (this.baseFrom[item.conditions] === item.conditions.split('_')[1]) {
         return true
       }
@@ -79,7 +76,6 @@ export default {
           })
         }
       })
-      console.log(checkList.indexOf(conditions) !== -1, '返回的bool')
       return checkList.indexOf(conditions) !== -1
     },
     getFormValue(e) {
@@ -108,7 +104,6 @@ export default {
                 delete item.bools
               }
             }
-            // item.conditions === `${e.fieldKey}_${i}` ? item.bool = true : ''
           })
         }
       })
@@ -149,12 +144,7 @@ export default {
         }
       }
       const label = custom[key].label
-      // const value = e[key] + custom[key].values
       const value = e[key]
-
-      // this.customs.forEach(elm => {
-      //   elm.conditions = ''
-      // })
       const keys = []
       const params = {
         [`${label}_${value}`]: `${value}`
@@ -170,12 +160,6 @@ export default {
         keys,
         params
       })
-      // this.$emit('formData', {
-      //   customs: this.customs,
-      //   keys,
-      //   params
-      // })
-      // console.log(e, this.customs, this.baseFrom, 'xcdjks ncjksdjnk')
     }
   }
 }

src/views/reportManagement/components/template/nodule.vue

@@ -3,8 +3,8 @@
     <el-col v-for="(item, index) in data.customFields" :key="index" :span="12" class="Layout_space_between">
       <span v-show="item.bool" class="parent-style">
         <span class="parent-fieldName">{{ item.fieldName }}：</span>
-        <span v-if="item.type !== 4">{{ item.content }}</span>
-        <span v-else>{{ item.contents.join('，') }}</span>
+        <span v-if="item.type !== 4" class="content">{{ item.content }}</span>
+        <span v-else class="content">{{ item.contents.join('，') }}</span>
       </span>
     </el-col>
   </el-row>
@@ -15,41 +15,6 @@ export default {
   props: {
     data: { type: Object, required: true }
   }
-  // data() {
-  //   return {
-  //     customs: []
-  //   }
-  // },
-  // watch: {
-  //   data: {
-  //     handler(newV) {
-  //       if (newV.customFields) {
-  //         this.customs = newV.customFields.map(item => ({
-  //           ...item,
-  //           bools: item.conditions === '默认展示' || this.getBoolValue(item.conditions)
-  //         }))
-  //       }
-  //     },
-  //     immediate: true
-  //   }
-  // },
-  // methods: {
-  //   getBoolValue(conditions) {
-  //     const checkList = []
-  //     this.customs.forEach(item => {
-  //       if (item.content && item.type < 4) {
-  //         checkList.push(`${item.fieldKey}_${item.content}`)
-  //       }
-  //       if (item.contents && item.type === 4) {
-  //         item.contents.forEach(contentItem => {
-  //           checkList.push(`${item.fieldKey}_${contentItem}`)
-  //         })
-  //       }
-  //     })
-  //     console.log(checkList.indexOf(conditions) !== -1)
-  //     return checkList.indexOf(conditions) !== -1
-  //   }
-  // }
 }
 </script>
 
@@ -69,7 +34,9 @@ export default {
     margin-bottom: 10px;
     .parent-fieldName {
       display: inline-block;
-      // min-width: 100px;
+    }
+    .content {
+      color:#333333;
     }
 }
 </style>