From 63606632aa0a852f8af1501b3c3ddaa395cd8960 Mon Sep 17 00:00:00 2001 From: mengfanliang Date: Tue, 3 Sep 2024 15:37:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=AE=A1=E7=90=86,=E6=96=B0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=A2=AB=E6=A3=80=E6=9F=A5=E4=BA=BA=E7=AD=BE=E5=AD=97?= =?UTF-8?q?/=E7=94=B3=E8=BE=A9=E7=9A=84=E8=8F=9C=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mock/safetyEnvirData.js | 176 ++++ components/uni-drawer/uni-drawer.vue | 169 ++++ .../safety_environmental_inspection/index.vue | 2 +- safetyEnvirSubPackages/api/index.js | 3 + .../pages/inspected/detail.vue | 852 +++++++++++++++++- .../pages/inspected/list.vue | 20 +- static/video.png | Bin 0 -> 1214 bytes styles/common.scss | 248 +++-- utils/tools.js | 26 + 9 files changed, 1417 insertions(+), 79 deletions(-) create mode 100644 components/uni-drawer/uni-drawer.vue create mode 100644 static/video.png create mode 100644 utils/tools.js diff --git a/Mock/safetyEnvirData.js b/Mock/safetyEnvirData.js index 2fc7b6d..aada659 100644 --- a/Mock/safetyEnvirData.js +++ b/Mock/safetyEnvirData.js @@ -340,6 +340,75 @@ export const initiateList = [ }, ]; +export const inspectedList = [ + { + ISDELETE: "0", + INSPECTION_TYPE_NAME: "季度安全检查", + INSPECTED_SITEUSER_ID: "440d55fb769d4ce08a022c42a06c8435", + INSPECTION_ORIGINATOR_ID: "1", + INSPECTION_ORIGINATOR_NAME: "系统管理员", + INSPECTION_SUBJECT: "安全", + INSPECTED_EXPLAIN: "", + INSPECTION_ID: "4e906353c6904706bfae27b63a245b68", + INSPECTION_TYPE: "INSPECTION_TYPE001", + CREATOR: "1", + INSPECTION_TYPE_OTHER: "", + INSPECTION_USER_NAME: "齐老零", + INSPECTED_SITEUSER_SIGN_TIME: "", + INSPECTION_USER_ID: "1,440d55fb769d4ce08a022c42a06c8435", + OPERATTIME: "2024-07-10 17:29:14", + INSPECTED_DEPARTMENT_ID: "a0975250f26344e0b61a3b44242a0301", + INSPECTION_TIME_START: "2024-07-10 00:00", + INSPECTED_CORPINFO_ID_NAME: "唐山曹妃甸煤炭港务有限公司", + INSPECTION_SOURCE: "4", + INSPECTED_DEPARTMENT_NAME: "测试厂队部门", + INSPECTION_LEADDEPARTMENT_ID: "a0975250f26344e0b61a3b44242a0301", + INSPECTION_LEADDEPARTMENT_NAME: "测试厂队部门", + INSPECTION_PLACE: "测试07101726", + CORPINFO_ID: "6aa255d41602497fa0f934a822820df4", + INSPECTED_SITEUSER_SIGN_IMG: "", + INSPECTION_TIME_END: "2024-07-12 00:00", + SHOW_INSPECTION_USER_NAME: "系统管理员18788888888,曹煤炭测试人员0", + INSPECTION_STATUS: "0", + OPERATOR: "1", + INSPECTED_SITEUSER_NAME: "齐老零", + CREATTIME: "2024-07-10 17:29:14", + }, + { + ISDELETE: "0", + INSPECTION_TYPE_NAME: "季度检查", + INSPECTED_SITEUSER_ID: "440d55fb769d4ce08a022c42a06c8435", + INSPECTION_ORIGINATOR_ID: "1", + INSPECTION_ORIGINATOR_NAME: "系统管理员", + INSPECTION_SUBJECT: "安全", + INSPECTED_EXPLAIN: "", + INSPECTION_ID: "4aa2d6a115424d27bf26cc4cafddb203", + INSPECTION_TYPE: "INSPECTION_TYPE005", + CREATOR: "1", + INSPECTION_TYPE_OTHER: "", + INSPECTION_USER_NAME: "齐老零0", + INSPECTED_SITEUSER_SIGN_TIME: "", + INSPECTION_USER_ID: "1,440d55fb769d4ce08a022c42a06c8435", + OPERATTIME: "2024-07-10 17:11:40", + INSPECTED_DEPARTMENT_ID: "a0975250f26344e0b61a3b44242a0301", + INSPECTION_TIME_START: "2024-07-10 00:00", + INSPECTED_CORPINFO_ID_NAME: "唐山曹妃甸煤炭港务有限公司", + INSPECTION_SOURCE: "4", + INSPECTED_DEPARTMENT_NAME: "测试厂队部门", + INSPECTION_LEADDEPARTMENT_ID: "a0975250f26344e0b61a3b44242a0301", + INSPECTION_LEADDEPARTMENT_NAME: "测试厂队部门", + INSPECTION_PLACE: "测试07101711", + CORPINFO_ID: "6aa255d41602497fa0f934a822820df4", + INSPECTED_SITEUSER_SIGN_IMG: "", + INSPECTION_TIME_END: "2024-07-11 00:00", + SHOW_INSPECTION_USER_NAME: "系统管理员18788888888,曹煤炭测试人员0", + INSPECTION_STATUS: "0", + OPERATOR: "1", + INSPECTED_SITEUSER_NAME: "齐老零0", + CREATTIME: "2024-07-10 17:11:40", + }, +]; + export const exPlainList = [ { OPERATTIME: "2024-03-30 17:38:00", @@ -402,3 +471,110 @@ export const exPlainList = [ CREATTIME: "2024-03-30 17:39:09", }, ]; + +export const inspectedFormData = { + ISDELETE: "0", + INSPECTION_TYPE_NAME: "月度安全检查", + INSPECTED_SITEUSER_ID: "fbf52b408e354169a4d112c700528e4d", + INSPECTION_ORIGINATOR_ID: "fbf52b408e354169a4d112c700528e4d", + INSPECTION_ORIGINATOR_NAME: "齐老零", + INSPECTION_SUBJECT: "安全", + INSPECTED_EXPLAIN: "", + INSPECTION_ID: "ab2d8779b2b749018d6daddda04db2fb", + INSPECTED_DEPARTMENT_NAMES: "分公司级测试部门", + INSPECTION_TYPE: "INSPECTION_TYPE002", + CREATOR: "fbf52b408e354169a4d112c700528e4d", + situationList: [ + { + OPERATTIME: "2024-09-02 14:15:42", + ISDELETE: "0", + INSPECTION_ID: "ab2d8779b2b749018d6daddda04db2fb", + OPERATOR: "fbf52b408e354169a4d112c700528e4d", + SITUATION: "毫无变化", + CREATOR: "fbf52b408e354169a4d112c700528e4d", + INSPECTION_SITUATION_ID: "42e511306368476eb43a827f08efa613", + CORPINFO_ID: "13cf0f4ec77e4d98ae8cdd9c3386ae0c", + CREATTIME: "2024-09-02 14:15:42", + }, + ], + inspectorList: [ + { + INSPECTION_USER_ID: "fbf52b408e354169a4d112c700528e4d", + OPERATTIME: "2024-09-02 14:15:42", + ISDELETE: "0", + CORPINFO_ID: "13cf0f4ec77e4d98ae8cdd9c3386ae0c", + INSPECTION_DEPARTMENT_ID: "16579f1de79743198884a56350c113cc", + INSPECTION_USER_OPINION: "无意间", + INSPECTION_USER_SIGN_IMG: + "/uploadFiles/file/13cf0f4ec77e4d98ae8cdd9c3386ae0c/20240902/7001ac7f8ff144d481130d1a6f40dc59.jpeg", + INSPECTION_ID: "ab2d8779b2b749018d6daddda04db2fb", + OPERATOR: "fbf52b408e354169a4d112c700528e4d", + CREATOR: "fbf52b408e354169a4d112c700528e4d", + INSPECTION_INSPECTOR_ID: "3b1fee08cde547f88a3b310671d6163f", + INSPECTION_DEPARTMENT_NAME: "分公司级测试部门", + INSPECTION_USER_SIGN_TIME: "2024-09-02 14:15:42", + INSPECTION_USER_NAME: "齐老零", + CREATTIME: "2024-09-02 14:15:42", + }, + ], + INSPECTION_USER_NAME: "齐老零", + INSPECTED_SITEUSER_SIGN_TIME: "", + INSPECTION_USER_ID: "fbf52b408e354169a4d112c700528e4d", + OPERATTIME: "2024-09-02 14:15:41", + INSPECTED_DEPARTMENT_ID: "16579f1de79743198884a56350c113cc", + INSPECTION_TIME_START: "2024-09-30 23:59", + INSPECTION_SOURCE: "5", + INSPECTED_DEPARTMENT_NAME: "分公司级测试部门", + INSPECTION_LEADDEPARTMENT_ID: "16579f1de79743198884a56350c113cc", + INSPECTION_LEADDEPARTMENT_NAME: "分公司级测试部门", + INSPECTION_PLACE: "环境变量", + CORPINFO_ID: "13cf0f4ec77e4d98ae8cdd9c3386ae0c", + INSPECTED_SITEUSER_SIGN_IMG: "", + INSPECTION_TIME_END: "2024-10-31 23:59", + INSPECTION_STATUS: "2", + OPERATOR: "fbf52b408e354169a4d112c700528e4d", + INSPECTED_SITEUSER_NAME: "齐老零", + CREATTIME: "2024-09-02 14:15:41", + hiddenList: [ + // { + // HIDDEN_ID: '19cspifijsodi202302', + // HIDDENDESCR: '根本不懂', + // HIDDENPART: '没有部位', + // HIDDENPART_NAME: '特别的多事儿', + // HIDDENLEVEL: '特级隐患', + // ISRELEVANT: '0', + // CREATOR: '9fisu2mkd92m32sasdfs23423adg780', + // CREATOR_NAME: '力战', + // HIDDENLEVEL_NAME: '就放过啦', + // HIDDENTYPE_NAME: '特级隐患', + // LONGITUDE: '12.0921', + // LATITUDE: '34.30293', + // DISCOVERYTIME: '2024-09-03', + // POSITIONDESC: '隐患能有啥详情的描述信息的呢,组壁咚', + // hiddenImgs: [ + // { + // IMGFILES_ID: 'fasdfaevcxz34r4', + // FILEPATH: 'https://cdn.uviewui.com/uview/album/1.jpg' + // }, + // { + // IMGFILES_ID: 'fasdfaevcxz34rjgfj4', + // FILEPATH: 'https://uviewui.com/common/logo.png' + // }, + // { + // IMGFILES_ID: 'fasdfaevfasdfasdfcxz34r4', + // FILEPATH: 'https://img.zcool.cn/community/010d5c5b9d17c9a8012099c8781b7e.jpg@1280w_1l_2o_100sh.jpg' + // }, + // { + // IMGFILES_ID: 'fas5353452dfaevcxz34r4', + // FILEPATH: 'https://img0.baidu.com/it/u=3422287847,344441285&fm=253&fmt=auto&app=138&f=JPEG?w=604&h=500' + // } + // ], + // hiddenVideos: [ + // { + // IMGFILES_ID: '12312342342341234sdfserf', + // FILEPATH: 'http://vjs.zencdn.net/v/oceans.mp4' + // } + // ] + // } + ], +}; diff --git a/components/uni-drawer/uni-drawer.vue b/components/uni-drawer/uni-drawer.vue new file mode 100644 index 0000000..45b7ecb --- /dev/null +++ b/components/uni-drawer/uni-drawer.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/pages/safety_environmental_inspection/index.vue b/pages/safety_environmental_inspection/index.vue index fca3708..9b97ebe 100644 --- a/pages/safety_environmental_inspection/index.vue +++ b/pages/safety_environmental_inspection/index.vue @@ -34,7 +34,7 @@ export default { title: '被检查人签字/申辩', url: '/safetyEnvirSubPackages/pages/inspected/list', vector: '2', - NUM: 100 + NUM: 0 }, { title: '隐患指派及验收', diff --git a/safetyEnvirSubPackages/api/index.js b/safetyEnvirSubPackages/api/index.js index b434773..1639112 100644 --- a/safetyEnvirSubPackages/api/index.js +++ b/safetyEnvirSubPackages/api/index.js @@ -122,3 +122,6 @@ export const getInspectedList = (params) => post( `/app/safetyenvironmentalexplain/list?showCount=${params.showCount}¤tPage=${params.currentPage}` ); + +/** 获取被检查人签字/申辩确认前的详情记录 */ +export const getInspectedItemGoShow = (params) => post("/app/safetyenvironmental/goShow", params); diff --git a/safetyEnvirSubPackages/pages/inspected/detail.vue b/safetyEnvirSubPackages/pages/inspected/detail.vue index 63a899c..ba41bb8 100644 --- a/safetyEnvirSubPackages/pages/inspected/detail.vue +++ b/safetyEnvirSubPackages/pages/inspected/detail.vue @@ -3,33 +3,871 @@ - 检查标题: - - {{form.INSPECTION_SUBJECT}}现场检查记录 + 检查标题: + + {{ form.INSPECTION_SUBJECT }}现场检查记录 - 被检查单位: - {{ form.INSPECTED_DEPARTMENT_NAMES }} + 被检查单位: + + {{ form.INSPECTED_DEPARTMENT_NAMES || '1' }} + + + + 被检查单位现场负责人: + + {{ form.INSPECTED_SITEUSER_NAME }} + + + + 检查场所: + + {{ form.INSPECTION_PLACE }} + + + + 检查类型: + + {{ form.INSPECTION_TYPE_NAME }} + + + + 检查开始时间: + + {{ form.INSPECTION_TIME_START }} + + + + 检查结束时间: + + {{ form.INSPECTION_TIME_END }} + + + + 记录填写时间: + + {{ form.CREATTIME }} + + + + 检查情况: + + + + + + + + + + + 检查人员: + + + + + {{ index + 1 }}.检查人员单位: + + {{ item.INSPECTION_DEPARTMENT_NAME }} + + + {{ index + 1 }}.检查人员: + + {{ item.INSPECTION_USER_NAME }} + + + + + + + + 发现问题: + + + + 序号 + 隐患部位 + 隐患描述 + 操作 + + + {{ index + 1 }} + {{ item.HIDDENPART_NAME ? item.HIDDENPART_NAME : item.HIDDENPART }} + {{ item.HIDDENDESCR }} + + + + + + + + + + 检查人员核实结果: + + + 检查人意见: + + + + 检查人签字: + + + + + + {{ item.INSPECTION_USER_SIGN_TIME }} + + + + + + + + 被检查单位现场负责人意见: + + + + + + + 申辩说明 + + + + 签字 + 手写签字 + + + + 签字照片 + + + + + + + + + + + + + + + + + + 提交 + + + 返回 + + + + + + + + + + 隐患照片 + + + {{ hiddenForm.hiddenImgs.length }}/4 + + + + + + + + + + + + + + + 隐患视频 + + + {{ hiddenForm.hiddenVideos.length }}/1 + + + + + + + + + + + + 隐患描述 + + + + + 隐患部位 + {{ hiddenForm.HIDDENPART_NAME ? hiddenForm.HIDDENPART_NAME : hiddenForm.HIDDENPART + }} + + + + 隐患位置描述 + + + + + 隐患级别 + {{ hiddenForm.HIDDENLEVEL_NAME }} + + + + 隐患类型 + {{ hiddenForm.HIDDENTYPE_NAME }} + + + + 是否相关方 + {{ hiddenForm.ISRELEVANT == '1' ? '是' : '否' }} + + + + 隐患发现时间 + {{ hiddenForm.DISCOVERYTIME }} + + + + 隐患上报位置 + + + + 经度 + {{ hiddenForm.LONGITUDE }} + + + 纬度 + {{ hiddenForm.LATITUDE }} + + + 隐患发现人 + + {{ hiddenForm.CREATOR_NAME }} + + + + + + + + + + + + + + 播放视频 + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/safetyEnvirSubPackages/pages/inspected/list.vue b/safetyEnvirSubPackages/pages/inspected/list.vue index 380c9b0..5f13643 100644 --- a/safetyEnvirSubPackages/pages/inspected/list.vue +++ b/safetyEnvirSubPackages/pages/inspected/list.vue @@ -13,7 +13,7 @@