Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-07-12 c562fa2e66f4972ae23fa57ef7412da6e18991ed

 src/views/accidentHidden/majorHidden.vue

@@ -154,13 +154,22 @@
    </el-row>
    <el-table :data="tableData" style="width: 100%">
     <!-- <el-table-column type="selection" width="55" align="center"></el-table-column>-->
      <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
      <el-table-column prop="number" label="编号" align="center" width="120">
          <template slot-scope="scope">
              <div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
          </template>
      </el-table-column>
      <el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
      <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
      <el-table-column prop="checktype" label="检查类别" align="center">
      </el-table-column>
      <el-table-column label="隐患项目" align="center">
        <el-table-column prop="check_date" label="检查时间" :formatter="formatColumnDate" width="120"  align="center"></el-table-column>
        <el-table-column prop="check_date" label="检查时间" width="120"  align="center">
            <template slot-scope="scope">
                <label>{{ formatDate(scope.row.check_date) }}</label><br/>
                <label>{{ scope.row.check_class }}</label>
            </template>
        </el-table-column>
        <el-table-column prop="address" label="地点" align="center"> </el-table-column>
        <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
        <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
@@ -418,6 +427,21 @@
                path:"/fillProgress?id="+row.id
            })
        },
        showDetails(row) {
            this.$router.push({
                path: "/dangerDetails",
                query: {"id": row.id}
            })
        },
        //方法区
        formatDate(data) {
            // 获取单元格数据
            if (data == null) {
                return null
            }
            let dt = new Date(data)
            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
        },
    }
};
</script>