diff --git a/src/components/hidden_view/index.vue b/src/components/hidden_view/index.vue index 400fbb6..6ef3171 100644 --- a/src/components/hidden_view/index.vue +++ b/src/components/hidden_view/index.vue @@ -28,19 +28,19 @@ diff --git a/src/views/confined_space/job_data/index.vue b/src/views/confined_space/job_data/index.vue index 2c73a36..83134f8 100644 --- a/src/views/confined_space/job_data/index.vue +++ b/src/views/confined_space/job_data/index.vue @@ -86,6 +86,15 @@ > 添加监控 + + 查看验收视频 + + @@ -133,6 +147,7 @@ import { getTaskSetps, getConfinedSpaceList, } from "@/request/eight_work.js"; +import LayoutVideo from "@/components/video/index.vue"; const props = defineProps({ entrance: { @@ -153,6 +168,11 @@ const getStepList = async () => { }; getStepList(); +const fnPreviewVideo = (VIDEO_PATH) => { + data.videoDialog.visible = true; + data.videoDialog.src = VIDEO_PATH; +}; + const router = useRouter(); const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getConfinedSpaceList, { @@ -163,6 +183,10 @@ const data = reactive({ visible: false, flowList: {}, }, + videoDialog: { + visible: false, + src: "", + }, }); const fnFlowChart = async (CONFINEDSPACE_ID) => { const { flowList } = await getConfinedSpaceFlow({ CONFINEDSPACE_ID }); diff --git a/src/views/confined_space/job_data/view.vue b/src/views/confined_space/job_data/view.vue index c6ad447..d0a75ba 100644 --- a/src/views/confined_space/job_data/view.vue +++ b/src/views/confined_space/job_data/view.vue @@ -3,7 +3,7 @@ - - + - + - + - + - + - + @@ -50,6 +50,7 @@ + @@ -92,17 +93,18 @@ + - -
+ 受限空间安全作业票 @@ -15,32 +15,32 @@ 作业申请单位 {{ data.info.APPLY_DEPARTMENT_NAME }} 作业申请时间{{ data.info.CREATTIME }}{{ data.info.CREATTIME }}
受限空间名称 {{ data.info.LIMITSPACE_NAME }} 受限空间内原有介质名称{{ data.info.MEDIUM_NAME }}{{ data.info.MEDIUM_NAME }}
作业内容{{ data.info.WORK_CONTENT }}{{ data.info.WORK_CONTENT }}
作业单位 {{ data.info.CONFIRM_DEPARTMENT_NAME }} 作业负责人{{ data.info.CONFIRM_USER_NAME }}{{ data.info.CONFIRM_USER_NAME }}
关联的其他特殊作业及安全作业票编号{{ data.info.SPECIAL_WORK }}{{ data.info.SPECIAL_WORK }}
风险辨识结果{{ data.info.RISK_IDENTIFICATION }}{{ data.info.RISK_IDENTIFICATION }}
气体分析氧气含量 取样分析时间 分析部位分析地点 分析人
{{ item.OXYGEN_CONTENT }} {{ item.ANALYZE_TIME }}{{ item.ANALYZE_PART }} {{ item.ANALYZE_PLACE }} {{ item.ANALYZE_USER }}
作业实施时间 + {{ data.info.WORK_START_DATE }}至{{ data.info.WORK_END_DATE }}止
+ @@ -168,7 +170,7 @@ - - - - - - - + + + - - - - - + + + - + @@ -50,6 +50,10 @@ + + + +
序号
+
监护人:
+
安全交底人:
@@ -224,7 +226,7 @@
+
接受交底人:
-
作业负责人意见:{{ data.signs.CONFIRM[0].DESCR }}
-
- 签字: - - {{ data.signs.CONFIRM[0].SIGN_TIME[index] }} -
-
+
作业人:
+
作业负责人意见:{{ data.signs.CONFIRM[0].DESCR }}
+
+ 签字: + + {{ data.signs.CONFIRM[0].SIGN_TIME[index] }} +
+
+
所在单位意见:{{ data.signs.LEADER[0].DESCR }}
+
完工验收:{{ data.signs.ACCEPT[0].DESCR }}
- 清单信息 + {{ + listType === "1" ? "风险管控清单信息" : "隐患排查清单信息" + }} {{ info.LIST_NAME ? info.LIST_NAME : info.CUSTOM_NAME }} diff --git a/src/views/hazard_investigation/checklist_inspection_status/index.vue b/src/views/hazard_investigation/checklist_inspection_status/index.vue index 6f0d964..0677d0a 100644 --- a/src/views/hazard_investigation/checklist_inspection_status/index.vue +++ b/src/views/hazard_investigation/checklist_inspection_status/index.vue @@ -183,7 +183,7 @@ @@ -234,20 +234,28 @@ import { layoutFnGetInventoryType, layoutFnGetTroubleshootingCycle, } from "@/assets/js/data_dictionary.js"; -import { getRiskStandardStatusList } from "@/request/hazard_investigation.js"; +import { + getCorpinfo, + getRiskStandardStatusList, +} from "@/request/hazard_investigation.js"; import { useRouter } from "vue-router"; -import { SPECIAL_ENTERPRISES } from "@/assets/js/constant.js"; -import { useUserStore } from "@/pinia/user.js"; import dayjs from "dayjs"; +import { reactive } from "vue"; +const data = reactive({ + WHETHER_HAZARDS: "", +}); const router = useRouter(); -const userStore = useUserStore(); -const CORPINFO_ID = userStore.getUserInfo.CORPINFO_ID; const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getRiskStandardStatusList); const troubleshootingCycleList = await layoutFnGetTroubleshootingCycle(); const inventoryLevelList = await layoutFnGetInventoryLevel(); const inventoryTypeList = await layoutFnGetInventoryType(); +const fnGetCorpinfo = async () => { + const resData = await getCorpinfo(); + data.WHETHER_HAZARDS = resData.pd.WHETHER_HAZARDS; +}; +fnGetCorpinfo(); const fnGetDataTransfer = () => { fnGetData({ DEPTIDS: searchForm.value.DEPTIDS?.join(","), diff --git a/src/views/hazard_investigation/delete_inventory_management/components/list.vue b/src/views/hazard_investigation/delete_inventory_management/components/list.vue index db522bf..f5bac49 100644 --- a/src/views/hazard_investigation/delete_inventory_management/components/list.vue +++ b/src/views/hazard_investigation/delete_inventory_management/components/list.vue @@ -122,7 +122,7 @@ show-overflow-tooltip /> @@ -190,9 +196,8 @@ import { layoutFnGetInventoryType, layoutFnGetTroubleshootingType, } from "@/assets/js/data_dictionary.js"; -import { SPECIAL_ENTERPRISES } from "@/assets/js/constant.js"; -import { useUserStore } from "@/pinia/user.js"; import { + getCorpinfo, getDeleteCustomList, getDeleteInventoryManagementList, setCustomBatchDelete, @@ -201,6 +206,7 @@ import { setInventoryManagementBatchDelete, } from "@/request/hazard_investigation.js"; import { useRouter } from "vue-router"; +import { reactive } from "vue"; const tabName = defineProps({ name: { @@ -209,19 +215,24 @@ const tabName = defineProps({ default: "", }, }); - +const data = reactive({ + WHETHER_HAZARDS: "", +}); const router = useRouter(); const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } = tabName.name === "risk" ? useListData(getDeleteInventoryManagementList) : useListData(getDeleteCustomList); -const userStore = useUserStore(); -const CORPINFO_ID = userStore.getUserInfo.CORPINFO_ID; const buttonJurisdiction = await useButtonJurisdiction("stoplistmanager"); const inventoryTypeList = await layoutFnGetInventoryType(); const troubleshootingTypeList = await layoutFnGetTroubleshootingType(); const inventoryLevelList = await layoutFnGetInventoryLevel(); +const fnGetCorpinfo = async () => { + const resData = await getCorpinfo(); + data.WHETHER_HAZARDS = resData.pd.WHETHER_HAZARDS; +}; +fnGetCorpinfo(); const fnGetDataTransfer = () => { fnGetData({ DEPTIDS: searchForm.value.DEPTIDS?.join(","), diff --git a/src/views/hazard_investigation/delete_inventory_management/view.vue b/src/views/hazard_investigation/delete_inventory_management/view.vue index 26c9421..6196846 100644 --- a/src/views/hazard_investigation/delete_inventory_management/view.vue +++ b/src/views/hazard_investigation/delete_inventory_management/view.vue @@ -5,7 +5,10 @@ {{ info.NAME }} - + @@ -57,7 +60,7 @@ import { getInventoryManagementView } from "@/request/hazard_investigation.js"; import { ref } from "vue"; const route = useRoute(); -const { LISTMANAGER_ID } = route.query; +const { LISTMANAGER_ID, WHETHER_HAZARDS } = route.query; const info = ref({}); const { list } = useListData(getInventoryManagementView, { otherParams: { LISTMANAGER_ID }, diff --git a/src/views/hazard_investigation/delete_inventory_management/view_custom.vue b/src/views/hazard_investigation/delete_inventory_management/view_custom.vue index b9128f0..6e4c444 100644 --- a/src/views/hazard_investigation/delete_inventory_management/view_custom.vue +++ b/src/views/hazard_investigation/delete_inventory_management/view_custom.vue @@ -5,7 +5,10 @@ {{ info.NAME }} - + @@ -72,7 +75,7 @@ import { getCustomStopView } from "@/request/hazard_investigation.js"; import { ref } from "vue"; const route = useRoute(); -const { CUSTOM_ID } = route.query; +const { CUSTOM_ID, WHETHER_HAZARDS } = route.query; const info = ref({}); const { list } = useListData(getCustomStopView, { otherParams: { CUSTOM_ID }, diff --git a/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue b/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue index c0005ae..df3ab47 100644 --- a/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue +++ b/src/views/hazard_investigation/inventory_management/components/checkstandard_add.vue @@ -7,7 +7,7 @@ - + - + - 清单信息 + 风险管控清单信息 {{ info.NAME }} diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue index d31f987..c12ee30 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue @@ -1,6 +1,6 @@ @@ -149,6 +163,7 @@ import { getHighWorkList, getTaskSetps, } from "@/request/eight_work.js"; +import LayoutVideo from "@/components/video/index.vue"; const props = defineProps({ entrance: { @@ -166,6 +181,11 @@ const getStepList = async () => { { STEP_NAME: "验收归档", STEP_ID: "99" }, ]; }; +const fnPreviewVideo = (VIDEO_PATH) => { + data.videoDialog.visible = true; + data.videoDialog.src = VIDEO_PATH; +}; + getStepList(); const router = useRouter(); const { list, pagination, searchForm, fnGetData, fnResetPagination } = @@ -177,6 +197,10 @@ const data = reactive({ visible: false, flowList: {}, }, + videoDialog: { + visible: false, + src: "", + }, }); const fnFlowChart = async (HIGHWORK_ID) => { const { flowList } = await getHighWorkFlow({ HIGHWORK_ID }); diff --git a/src/views/high/job_data/view.vue b/src/views/high/job_data/view.vue index bd13e58..28720d8 100644 --- a/src/views/high/job_data/view.vue +++ b/src/views/high/job_data/view.vue @@ -197,26 +197,6 @@
-
作业负责人意见:{{ data.signs.CONFIRM[0].DESCR }}
-
- 签字: - - {{ data.signs.CONFIRM[0].SIGN_TIME[index] }} -
-
作业人:
@@ -237,6 +217,26 @@
+
作业负责人意见:{{ data.signs.CONFIRM[0].DESCR }}
+
+ 签字: + + {{ data.signs.CONFIRM[0].SIGN_TIME[index] }} +
+
diff --git a/src/views/hot_work/job_data/index.vue b/src/views/hot_work/job_data/index.vue index 121af53..e47db65 100644 --- a/src/views/hot_work/job_data/index.vue +++ b/src/views/hot_work/job_data/index.vue @@ -108,6 +108,15 @@ > 流程图 + + 查看验收视频 + + @@ -141,6 +155,7 @@ import { useRouter } from "vue-router"; import useListData from "@/assets/js/useListData.js"; import { reactive, ref } from "vue"; import FlowChart from "./components/flow_chart.vue"; +import LayoutVideo from "@/components/video/index.vue"; import { getHotWorkList, getTaskSetps, @@ -166,6 +181,11 @@ const getStepList = async () => { }; getStepList(); +const fnPreviewVideo = (VIDEO_PATH) => { + data.videoDialog.visible = true; + data.videoDialog.src = VIDEO_PATH; +}; + const router = useRouter(); const { list, pagination, searchForm, fnGetData, fnResetPagination } = useListData(getHotWorkList, { @@ -176,6 +196,10 @@ const data = reactive({ visible: false, flowList: {}, }, + videoDialog: { + visible: false, + src: "", + }, }); const fnFlowChart = async (HOTWORK_ID) => { const { flowList } = await getHotWorkFlow({ HOTWORK_ID }); diff --git a/src/views/hot_work/job_data/view.vue b/src/views/hot_work/job_data/view.vue index 15edf1f..2ef5455 100644 --- a/src/views/hot_work/job_data/view.vue +++ b/src/views/hot_work/job_data/view.vue @@ -42,7 +42,7 @@ 气体取样分析时间 {{ item.ANALYZE_TIME }} 代表性气体{{ item.ANALYZE_PLACE }}{{ item.ANALYZE_GAS }}
分析结果/%分析人 {{ item.ANALYZE_USER }}
分析地点{{ item.ANALYZE_PLACE }}
关联的其他特殊作业及安全作业票编号