Merge branch 'web-v2' into web-v2-pro

src/views/safetyCheck/components/addPage/addPage.vue

@@ -574,6 +574,18 @@
                 i--
               }
             }else{
+              if(list[i].level == 3){
+                if(list[i].children[0]){
+                  let mainPoint=[]
+                  for(let b=0;b<list[i].children.length;b++){
+                    mainPoint.push(list[i].children[b].name)
+                    list[i].mainPoint=mainPoint.join(',')
+                  }
+                }else{
+                  list[i].mainPoint='';
+                }
+              }
+
               delete list[i].children
             }
           }

src/views/safetyCheck/dataStatistics/safetyHazardStatistics.vue

@@ -91,7 +91,9 @@
       </el-table-column>
       <el-table-column label="不符合项" align="center" prop="hazardCheckPoint" show-overflow-tooltip width="260">
         <template slot-scope="scope">
-          {{scope.row.hazardCheckCode}} {{scope.row.hazardCheckPoint}}
+          <span>{{scope.row.hazardCheckCode}}</span>
+          <span v-if="scope.row.checkCategory==1">{{scope.row.hazardCheckPoint}}</span>
+          <span v-if="scope.row.checkCategory!=1">{{scope.row.hazardCheckName}}</span>
         </template>
       </el-table-column>
       <el-table-column label="历史出现次数" align="center" prop="sumTotal" show-overflow-tooltip width="120"/>