Merge branch '3.3.7-scxjy' of http://192.168.1.43:3000/git/sass-lab-web into 3.3.7-scxjy

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"/>