|
|
@@ -4,12 +4,9 @@
|
|
|
v-model="dateRange"
|
|
|
style="width: 240px; margin-right: 8px"
|
|
|
size="mini"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- type="daterange"
|
|
|
- range-separator="-"
|
|
|
+ type="date"
|
|
|
+ value-format="yyyyMMdd"
|
|
|
:clearable="false"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
></el-date-picker>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -24,33 +21,35 @@
|
|
|
<el-button icon="el-icon-download" size="mini" @click="onExport"
|
|
|
>导出</el-button
|
|
|
>
|
|
|
- <el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
- <el-tab-pane label="违章查处情况" name="violationSituationTableRef">
|
|
|
- <ViolationSituationTable ref="violationSituationTableRef" />
|
|
|
- </el-tab-pane>
|
|
|
- <el-tab-pane label="作业计划执行情况" name="executionStatusTableRef">
|
|
|
- <ExecutionStatusTable ref="executionStatusTableRef" />
|
|
|
- </el-tab-pane>
|
|
|
- <el-tab-pane
|
|
|
- label="人员到岗到位履职情况"
|
|
|
- name="personnelDutyStatusTableRef"
|
|
|
- >
|
|
|
- <PersonnelDutyStatusTable ref="personnelDutyStatusTableRef" />
|
|
|
- </el-tab-pane>
|
|
|
- <el-tab-pane
|
|
|
- v-if="false"
|
|
|
- label="其他重要情况"
|
|
|
- name="otherSafetySituationsTableRef"
|
|
|
- >
|
|
|
- <OtherSafetySituationsTable ref="otherSafetySituationsTableRef" />
|
|
|
- </el-tab-pane>
|
|
|
- <el-tab-pane
|
|
|
- label="明日作业计划安排情况"
|
|
|
- name="tomorrowPlanSituationTableRef"
|
|
|
- >
|
|
|
- <TomorrowPlanSituationTable ref="tomorrowPlanSituationTableRef" />
|
|
|
- </el-tab-pane>
|
|
|
- </el-tabs>
|
|
|
+ <div v-loading="loading">
|
|
|
+ <el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
+ <el-tab-pane label="违章查处情况" name="violationSituationTableRef">
|
|
|
+ <ViolationSituationTable ref="violationSituationTableRef" />
|
|
|
+ </el-tab-pane>
|
|
|
+ <el-tab-pane label="作业计划执行情况" name="executionStatusTableRef">
|
|
|
+ <ExecutionStatusTable ref="executionStatusTableRef" />
|
|
|
+ </el-tab-pane>
|
|
|
+ <el-tab-pane
|
|
|
+ label="人员到岗到位履职情况"
|
|
|
+ name="personnelDutyStatusTableRef"
|
|
|
+ >
|
|
|
+ <PersonnelDutyStatusTable ref="personnelDutyStatusTableRef" />
|
|
|
+ </el-tab-pane>
|
|
|
+ <el-tab-pane
|
|
|
+ v-if="false"
|
|
|
+ label="其他重要情况"
|
|
|
+ name="otherSafetySituationsTableRef"
|
|
|
+ >
|
|
|
+ <OtherSafetySituationsTable ref="otherSafetySituationsTableRef" />
|
|
|
+ </el-tab-pane>
|
|
|
+ <el-tab-pane
|
|
|
+ label="明日作业计划安排情况"
|
|
|
+ name="tomorrowPlanSituationTableRef"
|
|
|
+ >
|
|
|
+ <TomorrowPlanSituationTable ref="tomorrowPlanSituationTableRef" />
|
|
|
+ </el-tab-pane>
|
|
|
+ </el-tabs>
|
|
|
+ </div>
|
|
|
<pagination
|
|
|
v-show="total > 0"
|
|
|
:total="total"
|
|
|
@@ -68,6 +67,7 @@ import OtherSafetySituationsTable from "./components/other-safety-situations-tab
|
|
|
import TomorrowPlanSituationTable from "./components/tomorrow-plan-situation-table.vue";
|
|
|
import PersonnelDutyStatusTable from "./components/personnel-duty-status-table.vue";
|
|
|
import moment from "moment";
|
|
|
+import { getReportDay } from "@/api/secure/daily-newspaper";
|
|
|
export default {
|
|
|
components: {
|
|
|
ViolationSituationTable,
|
|
|
@@ -81,11 +81,9 @@ export default {
|
|
|
return {
|
|
|
activeName: "violationSituationTableRef",
|
|
|
// 日期范围
|
|
|
- dateRange: [
|
|
|
- moment().subtract(7, "days").startOf("day").format("YYYY-MM-DD"),
|
|
|
- moment().endOf("day").format("YYYY-MM-DD"),
|
|
|
- ],
|
|
|
+ dateRange: moment().subtract(1, "days").endOf("day").format("YYYYMMDD"),
|
|
|
total: 0,
|
|
|
+ loading: false,
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
@@ -103,17 +101,24 @@ export default {
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
- handleQuery() {
|
|
|
+ async handleQuery() {
|
|
|
+ this.loading = true;
|
|
|
+ const { appointmentList, illegalList, nextDayList, planList } =
|
|
|
+ await getReportDay(this.dateRange);
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs[this.activeName].getList(this.dateRange);
|
|
|
+ this.$refs["violationSituationTableRef"].tableData = illegalList;
|
|
|
+ this.$refs["executionStatusTableRef"].tableData = planList;
|
|
|
+ this.$refs["personnelDutyStatusTableRef"].tableData = appointmentList;
|
|
|
+ this.$refs["tomorrowPlanSituationTableRef"].tableData = nextDayList;
|
|
|
});
|
|
|
+ this.loading = false;
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
- this.dateRange = [
|
|
|
- moment().subtract(7, "days").startOf("day").format("YYYY-MM-DD"),
|
|
|
- moment().endOf("day").format("YYYY-MM-DD"),
|
|
|
- ];
|
|
|
+ this.dateRange = moment()
|
|
|
+ .subtract(1, "days")
|
|
|
+ .endOf("day")
|
|
|
+ .format("YYYYMMDD");
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
onExport() {},
|
cfofpp