Browse Source

月报2.0改造(2.6)

洪海涛 4 years ago
parent
commit
77e1a7d471

+ 5 - 5
src/views/monthlyReport/childrenPage/editReport/components/ReadOnlyTable.vue

@@ -38,8 +38,8 @@
                 P0:<span class="p0" @click.stop="query({row: scope.row, column: {property: otherColumns.p0.headerKey}}, 2)">{{ scope.row[otherColumns.p0.headerKey].value }}</span>
                 P1:<span class="p1" @click.stop="query({row: scope.row, column: {property: otherColumns.p1.headerKey}}, 3)">{{ scope.row[otherColumns.p1.headerKey].value }}</span>
               </span>
-              <span v-else class="edit-cell" :class="{'query-colors':item.name === 'P0&P1 过夜率' && scope.row[item.headerKey].value > 30}" @click.stop="query(scope, itemIndex + 2)" v-html="scope.row[item.headerKey].value" />
-              <span v-if="item.name === 'P0&P1 过夜率' && scope.row[item.headerKey].value !== '--'">
+              <span v-else class="edit-cell" :class="{'query-colors':item.name.search(/过夜率/) > -1 && scope.row[item.headerKey].value > 30}" @click.stop="query(scope, itemIndex + 2)" v-html="scope.row[item.headerKey].value" />
+              <span v-if="item.name.search(/过夜率/) > -1 && scope.row[item.headerKey].value !== '--'">
                 <span>%</span>
               </span>
             </div>
@@ -208,9 +208,9 @@ export default {
         if (elm.name === '新增缺陷总数') {
           elm.name = '新增缺陷:总数|P0|P1'
         }
-        if (elm.name === 'P0&P1 24小时过夜率') {
-          elm.name = 'P0&P1 过夜率'
-        }
+        // if (elm.name === 'P0&P1 24小时过夜率') {
+        //   elm.name = 'P0&P1 过夜率'
+        // }
         if (elm.name === '新增P0缺陷' || elm.name === '新增P1缺陷') {
           return false
         }