wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

地图相关展示默认值为0，清单检查情况完善隐患排查清单

pull/1/head
dearlin 2024-02-04 08:50:52 +08:00
parent eb43ac1e95
commit a1eca8d05d
7 changed files with 171 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/request/hazard_investigation.js
View File

@ -95,10 +95,15 @@ export const setCheckStandardSupplementaryRecordingSubmit = (params) =>
post("/customCheckrecord/recording", params); // 隐患排查清单检查情况检查记录补录提交
export const setCheckStandardSubmit = (params) =>
post("/customCheckrecord/add", params); // 清单排查提交
export const getDeleteCustomList = (params) => post("/customStop/list", params); // 删除清单管理列表
export const setDeleteCustomRecovery = (params) =>
post("/customStop/restore", params); // 删除清单管理恢复
export const setCustomBatchDelete = (params) =>
post("/customStop/deleteAll", params); // 清单管理批量删除
export const getCustomStopView = (params) => post("/customStop/goEdit", params); // 清单管理查看
export const getCustomCheckRecordList = (params) =>
post("/customCheckrecord/list", params); // 隐患清单排查列表
export const getCustomCheckRecordView = (params) =>
post("/customCheckrecord/goEdit", params); // 隐患清单排查查询单个
export const setDeleteCustommCheckrecord = (params) =>
post("/customCheckrecord/delete", params); // 删除隐患清单排查记录

108
src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
View File

@ -3,7 +3,7 @@
<el-divider content-position="left">清单信息</el-divider>
<el-descriptions border :column="2">
<el-descriptions-item label="清单名称">
{{ info.LIST_NAME }}
{{ info.LIST_NAME ? info.LIST_NAME : info.CUSTOM_NAME }}
</el-descriptions-item>
<el-descriptions-item label="排查清单类型">
{{ info.SCREENTYPENAME }}
@ -66,7 +66,8 @@
</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">检查内容</el-divider>
<div class="print_no_use">
<!--1风险管控清单 -->
<div v-if="listType === '1'" class="print_no_use">
<layout-table :data="inspectionList" :show-pagination="false">
<el-table-column label="序号" width="70" type="index" />
<el-table-column prop="RISKUNITNAME" label="风险点（单元）" />
@ -109,7 +110,7 @@
</el-table-column>
</layout-table>
</div>
<table class="print_use">
<table v-if="listType === '1'" class="print_use">
<thead>
<tr>
<th width="55">序号</th>
@ -153,6 +154,97 @@
</tr>
</tbody>
</table>
<!--2隐患排查清单 -->
<div v-if="listType === '2'" class="print_no_use">
<layout-table :data="inspectionList" :show-pagination="false">
<el-table-column label="序号" width="70" type="index" />
<el-table-column prop="CHECK_CATEGORY_NAME" label="检查类别" />
<el-table-column prop="CHECK_ITEM_NAME" label="检查项目" />
<el-table-column prop="CHECK_CONTENT" label="检查内容" />
<el-table-column prop="CHECK_STANDARD" label="检查标准" />
<el-table-column prop="REFERENCE_BASIS" label="参考依据" />
<el-table-column prop="CHECK_RESULT" label="检查结果" />
<el-table-column label="状态" width="100">
<template v-slot="{ row }">
<template v-if="row.ISNORMAL === 0">
<el-button
v-if="row.IMGCOUNT > 0"
type="primary"
text
link
@click="entrance && fnQualified(row.RECORDITEM_ID)"
>
合格
</el-button>
<div v-else>合格</div>
</template>
<el-button
v-else-if="row.ISNORMAL === 1"
type="primary"
text
link
@click="
entrance &&
router.push({
path: hiddenPath[entrance],
query: { HIDDEN_ID: row.HIDDEN_ID },
})
"
>
不合格
</el-button>
<div v-else-if="row.ISNORMAL === 2">不涉及</div>
<div v-else>存在未整改隐患</div>
</template>
</el-table-column>
</layout-table>
</div>
<table v-if="listType === '2'" class="print_use">
<thead>
<tr>
<th width="55">序号</th>
<th width="125">检查类别</th>
<th width="100">检查项目</th>
<th>检查内容</th>
<th width="120">检查标准</th>
<th>参考依据</th>
<th width="100">检查结果</th>
<th>状态</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in inspectionList" :key="index">
<td>{{ index + 1 }}</td>
<td>{{ item.CHECK_CATEGORY_NAME }}</td>
<td>{{ item.CHECK_ITEM_NAME }}</td>
<td>{{ item.CHECK_CONTENT }}</td>
<td>{{ item.CHECK_STANDARD }}</td>
<td>{{ item.REFERENCE_BASIS }}</td>
<td>{{ item.CHECK_RESULT }}</td>
<template v-if="item.ISNORMAL === 0">
<template v-if="item.IMGCOUNT > 0">
<td>
<el-button type="primary" text link> 合格 </el-button>
</td>
</template>
<template v-else>
<td>合格</td>
</template>
</template>
<template v-else-if="item.ISNORMAL === 1">
<td>
<el-button type="primary" text link> 不合格 </el-button>
</td>
</template>
<template v-else-if="item.ISNORMAL === 2">
<td>不涉及</td>
</template>
<template v-else>
<td>存在未整改隐患</td>
</template>
</tr>
</tbody>
</table>
<el-divider content-position="left">其他隐患</el-divider>
<div class="print_no_use">
<layout-table :data="otherHiddenList" :show-pagination="false">
@ -209,6 +301,7 @@ import { useRouter } from "vue-router";
import { reactive, ref } from "vue";
import {
getChecklistInspectionStatusRecordView,
getCustomCheckRecordView,
getChecklistInspectionStatusRecordViewOtherHiddenDangerList,
} from "@/request/hazard_investigation.js";
import { getViewImg } from "@/request/api.js";
@ -232,6 +325,11 @@ const props = defineProps({
required: true,
default: "",
},
listType: {
type: String,
required: true,
default: "",
},
});
const hiddenPath = {
checklist_inspection_status:
@ -251,7 +349,9 @@ const data = reactive({
mapDialogVisible: false,
});
const { list: inspectionList } = useListData(
getChecklistInspectionStatusRecordView,
props.listType === 1
? getChecklistInspectionStatusRecordView
: getCustomCheckRecordView,
{
otherParams: { CHECKRECORD_ID: props.checkRecordId },
usePagination: false,

3
src/views/hazard_investigation/checklist_inspection_status/index.vue
View File

@ -210,7 +210,8 @@
router.push({
path: '/hazard_investigation/checklist_inspection_status/inspection_record',
query: {
LISTMANAGER_ID: row.LISTMANAGER_ID,
LIST_ID: row.LISTMANAGER_ID,
LIST_TYPE: row.list_type,
},
})
"

26
src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue
View File

@ -86,6 +86,7 @@
path: '/hazard_investigation/checklist_inspection_status/inspection_record/view',
query: {
CHECKRECORD_ID: row.CHECKRECORD_ID,
LIST_TYPE: LIST_TYPE,
},
})
"
@ -114,7 +115,8 @@
CHECKRECORD_ID: row.CHECKRECORD_ID,
DATESTART: row.DATESTART,
DATEEND: row.DATEEND,
LISTMANAGER_ID,
LIST_TYPE: LIST_TYPE,
LIST_ID,
},
})
"
@ -136,6 +138,8 @@ import { serialNumber } from "@/assets/js/utils";
import {
getChecklistInspectionStatusRecordList,
setChecklistInspectionStatusRecordDelete,
setDeleteCustommCheckrecord,
getCustomCheckRecordList,
} from "@/request/hazard_investigation.js";
import { debounce } from "throttle-debounce";
import { ElMessage, ElMessageBox } from "element-plus";
@ -144,15 +148,23 @@ import useListData from "@/assets/js/useListData.js";
const route = useRoute();
const router = useRouter();
const { LISTMANAGER_ID } = route.query;
const { LIST_ID, LIST_TYPE } = route.query;
const info = ref({});
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getChecklistInspectionStatusRecordList, {
otherParams: { LISTMANAGER_ID },
useListData(
LIST_TYPE === "1"
? getChecklistInspectionStatusRecordList
: getCustomCheckRecordList,
{
otherParams:
LIST_TYPE === "1"
? { LISTMANAGER_ID: LIST_ID }
: { CUSTOM_ID: LIST_ID },
callbackFn: (list, resData) => {
info.value = resData.ls;
},
});
}
);
const fnGetDataTransfer = () => {
fnGetData({
STARTTIME: searchForm.value.dates?.[0],
@ -170,7 +182,9 @@ const fnDelete = debounce(
1000,
async (CHECKRECORD_ID) => {
await ElMessageBox.confirm("确定要删除吗？", { type: "warning" });
await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID });
LIST_TYPE === "1"
? await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID })
: await setDeleteCustommCheckrecord({ CHECKRECORD_ID });
ElMessage.success("删除成功");
fnResetPaginationTransfer();
},

3
src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue
View File

@ -4,6 +4,7 @@
<inspection-record-view
:entrance="entrance"
:check-record-id="CHECKRECORD_ID"
:list-type="LIST_TYPE"
/>
</div>
<div class="tc mt-10">
@ -23,7 +24,7 @@ defineProps({
},
});
const route = useRoute();
const { CHECKRECORD_ID } = route.query;
const { CHECKRECORD_ID, LIST_TYPE } = route.query;
</script>
<style scoped lang="scss"></style>

11
src/views/hazard_investigation/inspection_record/index.vue
View File

@ -103,6 +103,7 @@
path: '/hazard_investigation/inspection_record/view',
query: {
CHECKRECORD_ID: row.CHECKRECORD_ID,
LIST_TYPE: row.LIST_TYPE,
},
})
"
@ -114,7 +115,7 @@
type="primary"
text
link
@click="fnDelete(row.CHECKRECORD_ID)"
@click="fnDelete(row.LIST_TYPE, row.CHECKRECORD_ID)"
>
删除
</el-button>
@ -132,6 +133,7 @@
DATESTART: row.DATESTART,
DATEEND: row.DATEEND,
LISTMANAGER_ID: row.LISTMANAGER_ID,
LIST_TYPE,
},
})
"
@ -153,6 +155,7 @@ import { serialNumber } from "@/assets/js/utils";
import {
getInspectionRecordList,
setChecklistInspectionStatusRecordDelete,
setDeleteCustommCheckrecord,
} from "@/request/hazard_investigation.js";
import { debounce } from "throttle-debounce";
import { ElMessage, ElMessageBox } from "element-plus";
@ -186,9 +189,11 @@ const fnResetPaginationTransfer = () => {
const buttonJurisdiction = await useButtonJurisdiction("checkrecord");
const fnDelete = debounce(
1000,
async (CHECKRECORD_ID) => {
async (LIST_TYPE, CHECKRECORD_ID) => {
await ElMessageBox.confirm("确定要删除吗？", { type: "warning" });
await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID });
LIST_TYPE === "1"
? await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID })
: await setDeleteCustommCheckrecord({ CHECKRECORD_ID });
ElMessage.success("删除成功");
fnResetPaginationTransfer();
},

23
src/views/hazard_investigation/inventory_troubleshooting/inspect.vue
View File

@ -244,7 +244,7 @@
v-model:form="data.unQualifiedDialog.form"
:type="data.unQualifiedDialog.type"
:hidden-type="data.unQualifiedDialog.hiddenType"
:list-manager-id="LISTMANAGER_ID"
:list-manager-id="LIST_ID"
:info="{ ...data.unQualifiedDialog.info, ...info.value }"
:longitude="data.longitude"
:latitude="data.latitude"
@ -262,6 +262,7 @@ import {
setHiddenDangerDelete,
setInventoryTroubleshootingSubmit,
setChecklistInspectionStatusRecordSupplementaryRecordingSubmit,
getCheckStandardManagementView,
} from "@/request/hazard_investigation.js";
import { useRoute, useRouter } from "vue-router";
import useListData from "@/assets/js/useListData.js";
@ -283,7 +284,7 @@ import { WarningFilled } from "@element-plus/icons-vue";
const route = useRoute();
const router = useRouter();
const { LISTMANAGER_ID, CHECKRECORD_ID, DATEEND, DATESTART } = route.query;
const { LIST_ID, CHECKRECORD_ID, DATEEND, DATESTART, LIST_TYPE } = route.query;
// entrance: supplementaryRecording是补录，空值是正常录入
const props = defineProps({
entrance: {
@ -337,10 +338,16 @@ const data = reactive({
},
},
});
const { list: inspectionList } = useListData(getInventoryManagementView, {
otherParams: { LISTMANAGER_ID },
const { list: inspectionList } = useListData(
LIST_TYPE === "1"
? getInventoryManagementView
: getCheckStandardManagementView,
{
otherParams:
LIST_TYPE === "1" ? { LISTMANAGER_ID: LIST_ID } : { ID: LIST_ID },
usePagination: false,
callbackFn: (list, resData) => {
if (LIST_TYPE === "1") {
for (let i = 0; i < list.length; i++) {
if (list[i].HASHIDDEN <= 0) list[i].ISNORMAL = 0;
if (list[i].ELECTRONIC_FENCE_ID) {
@ -348,13 +355,15 @@ const { list: inspectionList } = useListData(getInventoryManagementView, {
data.canDoCheck = false;
}
}
}
info.value = resData.pd;
},
});
}
);
const { list: otherHiddenList, fnGetData: fnGetOtherHidden } = useListData(
getInventoryTroubleshootingOtherHiddenList,
{
otherParams: { LISTMANAGER_ID },
otherParams: { LIST_ID },
usePagination: false,
key: "hiddenList",
}
@ -501,7 +510,7 @@ const fnSubmit = debounce(
const inspectedList = cloneDeep(data.form.inspectedList);
if (inspectedList.length > 0) inspectedList.splice(0, 1);
const params = {
LISTMANAGER_ID,
LIST_ID,
LIST_NAME: info.value.NAME,
CHECK_TIME: data.form.CHECK_TIME,
DESCR: data.form.DESCR,