@@ -171,8 +177,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="ml-10 mt-10"
/>
@@ -186,12 +192,13 @@
![]()
|
@@ -202,20 +209,21 @@
:key="item.BUS_BLINDBOARD_MEASURES_ID"
>
{{ data.measuresList.length + 1 + index }} |
-
+ |
其他安全措施： {{ item.DESCR }}
|
-
+ |
![]()
|
@@ -236,8 +244,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="ml-10 mt-10"
/>
@@ -253,8 +261,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFESS?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}
@@ -277,8 +285,8 @@
data.signs.ACCEPT_CONFESS?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME[index] }}
@@ -298,8 +306,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFIRM?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFIRM?.[0].SIGN_TIME[index] }}
@@ -320,15 +328,37 @@
v-viewer
:src="VITE_FILE_URL + data.signs.LEADER?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.LEADER?.[0].SIGN_TIME[index] }}
-
+
+ |
+ 监护人停止作业原因：{{ data.signs.STOP_WORK?.[0].DESCR }}
+
+ 签字：
+ ![]()
+ {{ data.signs.STOP_WORK?.[0].SIGN_TIME[index] }}
+ |
+
|
完工验收：{{ data.signs.ACCEPT?.[0].DESCR }}
@@ -342,8 +372,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.ACCEPT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.info.ACCEPT_TIME }}
diff --git a/src/views/check/specheck/components/add.vue b/src/views/check/specheck/components/add.vue
new file mode 100644
index 0000000..4df33cf
--- /dev/null
+++ b/src/views/check/specheck/components/add.vue
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+ ![]()
+
+
+
+ 确认
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/check/specheck/components/checkRecord.vue b/src/views/check/specheck/components/checkRecord.vue
new file mode 100644
index 0000000..a71ce4a
--- /dev/null
+++ b/src/views/check/specheck/components/checkRecord.vue
@@ -0,0 +1,105 @@
+
+
+
+ 任务信息
+
+
+ {{ info.taskName }}
+
+ {{ info.taskTypeName }}
+
+ {{ info.checkDate }}
+
+ 企业自查
+ 市级及以下检查
+ 省级检查
+ 部级检查
+
+
+ {{
+ info.checkType === 1 ? info.departMentName : info.checkDeptMent
+ }}
+
+ {{
+ info.checkType === 1 ? info.userName : info.checkUserName
+ }}
+
+ 检查内容
+
+
+
+
+
+
+
+
+ 合格
+ 不合格
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/views/check/specheck/components/checking.vue b/src/views/check/specheck/components/checking.vue
new file mode 100644
index 0000000..28d0f3e
--- /dev/null
+++ b/src/views/check/specheck/components/checking.vue
@@ -0,0 +1,326 @@
+
+
+
+ 任务信息
+
+
+ {{ info.taskName }}
+
+ {{ info.taskTypeName }}
+
+ {{ info.RISKUNITNAME }}
+
+ 企业自查
+ 市级及以下检查
+ 省级检查
+ 部级检查
+
+
+ 检查内容
+
+
+
+
+
+
+
+
+
+
+ 合格
+
+
+ 不合格
+
+
+
+
+
+
+ 检查人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
diff --git a/src/views/check/specheck/components/hardSource.vue b/src/views/check/specheck/components/hardSource.vue
new file mode 100644
index 0000000..7689878
--- /dev/null
+++ b/src/views/check/specheck/components/hardSource.vue
@@ -0,0 +1,202 @@
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+ 上报中
+ 上报完成
+ 上报失败
+ 未上报
+
+
+
+
+ 编辑
+ 上报
+ 重新上报
+ 检查记录
+ 开始检查
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/check/specheck/components/hidden_danger_view.vue b/src/views/check/specheck/components/hidden_danger_view.vue
new file mode 100644
index 0000000..17f4a0f
--- /dev/null
+++ b/src/views/check/specheck/components/hidden_danger_view.vue
@@ -0,0 +1,36 @@
+
+
+
+
+ 返 回
+
+
+
+
+
+
+
diff --git a/src/views/check/specheck/components/un_qualified.vue b/src/views/check/specheck/components/un_qualified.vue
new file mode 100644
index 0000000..a2b9f18
--- /dev/null
+++ b/src/views/check/specheck/components/un_qualified.vue
@@ -0,0 +1,240 @@
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
diff --git a/src/views/check/specheck/index.vue b/src/views/check/specheck/index.vue
new file mode 100644
index 0000000..5db8ad4
--- /dev/null
+++ b/src/views/check/specheck/index.vue
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+ 企业自查
+ 市级及以下检查
+ 省级检查
+ 部级检查
+
+
+
+
+
+
+
+
+
+ {{ row.reportCount }}/{{ row.taskCount }}
+
+
+
+
+ 选择危险源
+
+
+
+
+ 获取省平台任务
+
+
+
+
+
+
+ {{ fnGetShowStepUser(item) }}
+ {{ item.ACT_TIME }}
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/confined_space/invalid/index.vue b/src/views/confined_space/invalid/index.vue
new file mode 100644
index 0000000..25c009f
--- /dev/null
+++ b/src/views/confined_space/invalid/index.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+ {{ row.STEP_NAME }}时作废本作业票
+ 验收归档后作废本作业票
+
+
+
+
+
+
+ 流程图
+
+
+ 审批表详情
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/confined_space/job_data/index.vue b/src/views/confined_space/job_data/index.vue
index 07146de..f531559 100644
--- a/src/views/confined_space/job_data/index.vue
+++ b/src/views/confined_space/job_data/index.vue
@@ -87,6 +87,7 @@
暂存
气体检测打回
+ 监护人已停止作业
{{ row.NEXT_STEP_NAME }}
{{ row.STEP_NAME }}打回
@@ -94,6 +95,7 @@
审批表详情
+
+ 作废
+
@@ -202,10 +217,13 @@ import useListData from "@/assets/js/useListData.js";
import { reactive, ref } from "vue";
import CheckList from "@/components/safety_briefing_checklist/index.vue";
import FlowChart from "./components/flow_chart.vue";
+import { useUserStore } from "@/pinia/user.js";
+import { ElMessage, ElMessageBox } from "element-plus";
import {
getConfinedSpaceFlow,
getTaskSetps,
getConfinedSpaceList,
+ setEightWorkInvalid,
} from "@/request/eight_work.js";
import LayoutVideo from "@/components/video/index.vue";
import LayoutDepartment from "@/components/department/index.vue";
@@ -221,12 +239,8 @@ const props = defineProps({
const stepList = ref([]);
const getStepList = async () => {
- const { list } = await getTaskSetps({ TASK_ID: 1 });
- stepList.value = [
- { STEP_NAME: "请选择", STEP_ID: "" },
- ...list,
- { STEP_NAME: "验收归档", STEP_ID: "99" },
- ];
+ const { list } = await getTaskSetps({ TASK_ID: 4 });
+ stepList.value = [{ STEP_NAME: "请选择", STEP_ID: "" }, ...list];
};
getStepList();
const fnShowPoints = (id) => {
@@ -237,11 +251,29 @@ const fnPreviewVideo = (VIDEO_PATH) => {
data.videoDialog.visible = true;
data.videoDialog.src = VIDEO_PATH;
};
-
+const userStore = useUserStore();
+const fnRemoveWork = async (row) => {
+ await ElMessageBox.prompt("请确认是否作废作业票", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ inputPlaceholder: "请输入作废原因",
+ inputPattern: /^.{1,254}$/,
+ inputErrorMessage: "作废原因不可为空",
+ }).then(async ({ value }) => {
+ await setEightWorkInvalid({
+ WORK_ID: row.CONFINEDSPACE_ID,
+ WORK_TYPE: "confined_space",
+ STEP_REASON: value,
+ });
+ ElMessage.success("作废成功");
+ await fnResetPaginationTransfer();
+ });
+};
const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getConfinedSpaceList, {
- otherParams: props.entrance === "archive" ? { STEP_ID: "99" } : {},
+ otherParams:
+ props.entrance === "archive" ? { STEP_ID: "99" } : { WORK_STATE: "0" },
});
const data = reactive({
flowChartDialog: {
diff --git a/src/views/confined_space/job_data/view.vue b/src/views/confined_space/job_data/view.vue
index d13f39a..103ac41 100644
--- a/src/views/confined_space/job_data/view.vue
+++ b/src/views/confined_space/job_data/view.vue
@@ -20,7 +20,7 @@
|
| 受限空间名称 |
- {{ data.info.LIMITSPACE_NAME }} |
+ {{ data.info.LIMITSPACE_NAME_NUMBER }} |
受限空间内原有介质名称 |
{{ data.info.MEDIUM_NAME }} |
@@ -39,8 +39,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -54,8 +54,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -67,8 +67,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -139,8 +139,8 @@
v-viewer
:src="VITE_FILE_URL + item.SIGN_PATH"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -148,7 +148,16 @@
| 作业实施时间 |
- {{ data.info.WORK_START_DATE }}至{{ data.info.WORK_END_DATE }}止
+ {{ data.info.WORK_START_DATE
+ }}{{ data.info.WORK_START_DATE ? "至" : ""
+ }}{{ data.info.WORK_END_DATE
+ }}{{ data.info.WORK_END_DATE ? "止" : "" }}
+ |
+
+
+ | 作废原因 |
+
+ {{ data.info.STEP_REASON }}
|
@@ -173,8 +182,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -188,12 +197,13 @@
![]()
|
@@ -204,20 +214,21 @@
:key="item.BUS_CONFINEDSPACE_MEASURES_ID"
>
{{ data.measuresList.length + 1 + index }} |
-
+ |
其他安全措施： {{ item.DESCR }}
|
-
+ |
![]()
|
@@ -239,8 +250,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -256,8 +267,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFESS?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}
@@ -280,8 +291,8 @@
data.signs.ACCEPT_CONFESS?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME[index] }}
@@ -302,8 +313,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFIRM?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFIRM?.[0].SIGN_TIME[index] }}
@@ -324,15 +335,37 @@
v-viewer
:src="VITE_FILE_URL + data.signs.LEADER?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.LEADER?.[0].SIGN_TIME[index] }}
-
+
+ |
+ 监护人停止作业原因：{{ data.signs.STOP_WORK?.[0].DESCR }}
+
+ 签字：
+ ![]()
+ {{ data.signs.STOP_WORK?.[0].SIGN_TIME[index] }}
+ |
+
|
完工验收：{{ data.signs.ACCEPT?.[0].DESCR }}
@@ -346,8 +379,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.ACCEPT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.info.ACCEPT_TIME }}
diff --git a/src/views/confined_space/ledger/components/add.vue b/src/views/confined_space/ledger/components/add.vue
index 7890a0b..cd2ccd1 100644
--- a/src/views/confined_space/ledger/components/add.vue
+++ b/src/views/confined_space/ledger/components/add.vue
@@ -28,6 +28,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -56,11 +80,14 @@
-
-
- 有
- 无
-
+
+
@@ -129,6 +156,7 @@ import { debounce } from "throttle-debounce";
import useFormValidate from "@/assets/js/useFormValidate.js";
import { setLedgerAdd, setLedgerEdit } from "@/request/confined_space.js";
import { ElMessage } from "element-plus";
+import LayoutUpload from "@/components/upload/index.vue";
const props = defineProps({
visible: {
@@ -151,6 +179,15 @@ const emits = defineEmits(["update:visible", "update:form", "get-data"]);
const { visible, form } = useVModels(props, emits);
const rules = {
NUMBER: [{ required: true, message: "请输入受限空间编号", trigger: "blur" }],
+ DEVICENAME: [
+ { required: true, message: "请输入设备名称/编号", trigger: "blur" },
+ ],
+ ACCIDENTTYPE: [
+ { required: true, message: "请输入主要事故类型", trigger: "blur" },
+ ],
+ FREQUENCYNUM: [
+ { required: true, message: "请输入作业频次", trigger: "blur" },
+ ],
NAME: [{ required: true, message: "请输入受限空间名称", trigger: "blur" }],
LIMITSPACETYPE: [
{ required: true, message: "请选择受限空间类型", trigger: "blur" },
@@ -165,8 +202,11 @@ const rules = {
MAXPERSON: [
{ required: true, message: "请输入最多作业人数", trigger: "blur" },
],
- HASINSTRUCTOR: [
- { required: true, message: "请输入应急指导书", trigger: "blur" },
+ HASINSTRUCTOR_PATH: [
+ { required: true, message: "请上传应急指导书", trigger: "blur" },
+ ],
+ WARNINGSIGNS_PATH: [
+ { required: true, message: "请上传警示标志附件", trigger: "blur" },
],
INFORMANT: [{ required: true, message: "请选择填报人", trigger: "blur" }],
PRINCIPAL: [{ required: true, message: "请选择主要负责人", trigger: "blur" }],
@@ -184,8 +224,36 @@ const fnSubmit = debounce(
1000,
async () => {
await useFormValidate(formRef);
- if (props.type === "add") await setLedgerAdd({ ...form.value });
- if (props.type === "edit") await setLedgerEdit({ ...form.value });
+ const formData = new FormData();
+ if (form.value.HASINSTRUCTOR_PATH) {
+ for (let i = 0; i < form.value.HASINSTRUCTOR_PATH.length; i++) {
+ if (form.value.HASINSTRUCTOR_PATH[i].raw) {
+ formData.append(
+ "HASINSTRUCTOR_PATH2",
+ form.value.HASINSTRUCTOR_PATH[i].raw
+ );
+ }
+ }
+ }
+ if (form.value.WARNINGSIGNS_PATH) {
+ for (let i = 0; i < form.value.WARNINGSIGNS_PATH.length; i++) {
+ if (form.value.WARNINGSIGNS_PATH[i].raw) {
+ formData.append(
+ "WARNINGSIGNS_PATH2",
+ form.value.WARNINGSIGNS_PATH[i].raw
+ );
+ }
+ }
+ }
+ Object.keys(form.value).forEach((key) => {
+ formData.append(key, form.value[key]);
+ });
+ formData.delete("WARNINGSIGNS_PATH");
+ formData.delete("WARNINGSIGNS_NAME");
+ formData.delete("HASINSTRUCTOR_PATH");
+ formData.delete("HASINSTRUCTOR_NAME");
+ if (props.type === "add") await setLedgerAdd(formData);
+ if (props.type === "edit") await setLedgerEdit(formData);
fnClose();
ElMessage.success("保存成功");
emits("get-data");
diff --git a/src/views/confined_space/ledger/index.vue b/src/views/confined_space/ledger/index.vue
index 8dc8f4b..e11c29b 100644
--- a/src/views/confined_space/ledger/index.vue
+++ b/src/views/confined_space/ledger/index.vue
@@ -30,19 +30,41 @@
+
{{ serialNumber(pagination, $index) }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -76,6 +98,7 @@
>
新增
+ 批量删除
@@ -95,9 +118,10 @@
diff --git a/src/views/emergency_resource_management/emergency_drill_management/index.vue b/src/views/emergency_resource_management/emergency_drill_management/index.vue
index 0902d79..3819c2e 100644
--- a/src/views/emergency_resource_management/emergency_drill_management/index.vue
+++ b/src/views/emergency_resource_management/emergency_drill_management/index.vue
@@ -4,7 +4,7 @@
@@ -124,6 +124,7 @@
>
批量删除
+
@@ -142,6 +143,7 @@ import {
import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
import useListData from "@/assets/js/useListData.js";
import { useRouter } from "vue-router";
+// import { setRiskPointBatchReport } from "@/request/risk_control.js";
const router = useRouter();
const { list, searchForm, pagination, fnGetData, fnResetPagination, tableRef } =
@@ -152,7 +154,9 @@ const fnGetDataTransfer = () => {
ENDTIME: searchForm.value.dates?.[1],
});
};
+
const fnResetPaginationTransfer = () => {
+ searchForm.value.dates = [];
fnResetPagination({
STARTTIME: searchForm.value.dates?.[0],
ENDTIME: searchForm.value.dates?.[1],
@@ -169,6 +173,18 @@ const fnDelete = debounce(
},
{ atBegin: true }
);
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// await setRiskPointBatchReport({
+// type: "emergencyDrill",
+// model: "应急演练管理",
+// });
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
const fnDeleteAll = debounce(
1000,
async () => {
diff --git a/src/views/emergency_resource_management/emergency_equipment_management/index.vue b/src/views/emergency_resource_management/emergency_equipment_management/index.vue
index e5fe02b..6126452 100644
--- a/src/views/emergency_resource_management/emergency_equipment_management/index.vue
+++ b/src/views/emergency_resource_management/emergency_equipment_management/index.vue
@@ -124,6 +124,7 @@
>
批量删除
+
@@ -144,12 +145,25 @@ import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
import { layoutFnGetEquipmentCategory } from "@/assets/js/data_dictionary.js";
import useListData from "@/assets/js/useListData.js";
import { useRouter } from "vue-router";
+// import { setRiskPointBatchReport } from "@/request/risk_control.js";
const router = useRouter();
const { list, searchForm, pagination, fnResetPagination, fnGetData, tableRef } =
useListData(getEmergencyEquipmentManagementList);
const buttonJurisdiction = await useButtonJurisdiction("emergencyequipment");
const equipmentCategoryList = await layoutFnGetEquipmentCategory();
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// await setRiskPointBatchReport({
+// type: "emergencyEquipment",
+// model: "应急设备",
+// });
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
const fnDelete = debounce(
1000,
async (EMERGENCYEQUIPMENT_ID) => {
diff --git a/src/views/emergency_resource_management/emergency_plan_management/index.vue b/src/views/emergency_resource_management/emergency_plan_management/index.vue
index 5c4f0bb..3ac97cd 100644
--- a/src/views/emergency_resource_management/emergency_plan_management/index.vue
+++ b/src/views/emergency_resource_management/emergency_plan_management/index.vue
@@ -121,6 +121,7 @@
>
批量删除
+
@@ -140,6 +141,7 @@ import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
import useListData from "@/assets/js/useListData.js";
import LayoutMultipleAttachmentPreviews from "@/components/multiple_attachment_previews/index.vue";
import { useRouter } from "vue-router";
+// import { setRiskPointBatchReport } from "@/request/risk_control.js";
const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
@@ -155,6 +157,18 @@ const fnDelete = debounce(
},
{ atBegin: true }
);
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// await setRiskPointBatchReport({
+// type: "emergencyPlan",
+// model: "应急预案",
+// });
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
const fnDeleteAll = debounce(
1000,
async () => {
diff --git a/src/views/emergency_resource_management/emergency_rescue_team_management/add.vue b/src/views/emergency_resource_management/emergency_rescue_team_management/add.vue
index 1bc4103..6eba054 100644
--- a/src/views/emergency_resource_management/emergency_rescue_team_management/add.vue
+++ b/src/views/emergency_resource_management/emergency_rescue_team_management/add.vue
@@ -4,7 +4,7 @@
-
+
@@ -67,27 +67,43 @@
-
+
-
+
-
+
-
+
-
+
@@ -104,22 +120,38 @@
-
+
-
+
-
+
-
+
@@ -128,6 +160,8 @@
v-model="form.TEAM_MEMBER_INFO"
type="textarea"
:autosize="{ minRows: 3 }"
+ maxlength="254"
+ show-word-limit
/>
@@ -137,6 +171,8 @@
v-model="form.SPECIAL_DESC"
type="textarea"
:autosize="{ minRows: 3 }"
+ maxlength="254"
+ show-word-limit
/>
@@ -146,6 +182,8 @@
v-model="form.TEAM_DESC"
type="textarea"
:autosize="{ minRows: 3 }"
+ maxlength="254"
+ show-word-limit
/>
diff --git a/src/views/emergency_resource_management/emergency_team_management/add.vue b/src/views/emergency_resource_management/emergency_team_management/add.vue
new file mode 100644
index 0000000..425a684
--- /dev/null
+++ b/src/views/emergency_resource_management/emergency_team_management/add.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergency_resource_management/emergency_team_management/component/commander.vue b/src/views/emergency_resource_management/emergency_team_management/component/commander.vue
new file mode 100644
index 0000000..4369b5a
--- /dev/null
+++ b/src/views/emergency_resource_management/emergency_team_management/component/commander.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 保存并下一步
+
+
+
+
+
+
diff --git a/src/views/emergency_resource_management/emergency_team_management/component/emergencyLeaderTeam.vue b/src/views/emergency_resource_management/emergency_team_management/component/emergencyLeaderTeam.vue
new file mode 100644
index 0000000..233a853
--- /dev/null
+++ b/src/views/emergency_resource_management/emergency_team_management/component/emergencyLeaderTeam.vue
@@ -0,0 +1,290 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+ 新增
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+ 确定
+
+
+
+
+
+
+
+ 上一步
+
+
+ 下一步
+
+
+
+
+
+
+
diff --git a/src/views/emergency_resource_management/emergency_team_management/component/emergencyTeam.vue b/src/views/emergency_resource_management/emergency_team_management/component/emergencyTeam.vue
new file mode 100644
index 0000000..218f533
--- /dev/null
+++ b/src/views/emergency_resource_management/emergency_team_management/component/emergencyTeam.vue
@@ -0,0 +1,295 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+ 新增
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+ 确定
+
+
+
+
+
+
+
+ 上一步
+
+ 保存
+
+
+
+
+
+
diff --git a/src/views/emergency_resource_management/emergency_team_management/index.vue b/src/views/emergency_resource_management/emergency_team_management/index.vue
new file mode 100644
index 0000000..e8ad7f9
--- /dev/null
+++ b/src/views/emergency_resource_management/emergency_team_management/index.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+ 新增
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergency_resource_management/emergency_team_management/view.vue b/src/views/emergency_resource_management/emergency_team_management/view.vue
new file mode 100644
index 0000000..2bf6790
--- /dev/null
+++ b/src/views/emergency_resource_management/emergency_team_management/view.vue
@@ -0,0 +1,54 @@
+
+
+ 应急救援小组总指挥
+
+
+
+
+
+
+
+ 应急救援领导小组
+
+
+
+
+
+
+
+ 应急救援小组
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/enterprise_management/department/components/add.vue b/src/views/enterprise_management/department/components/add.vue
index ffb7450..cf92ed5 100644
--- a/src/views/enterprise_management/department/components/add.vue
+++ b/src/views/enterprise_management/department/components/add.vue
@@ -87,11 +87,12 @@
diff --git a/src/views/enterprise_management/information/components/map.vue b/src/views/enterprise_management/information/components/map.vue
index a87842a..9b6c6f0 100644
--- a/src/views/enterprise_management/information/components/map.vue
+++ b/src/views/enterprise_management/information/components/map.vue
@@ -1,6 +1,18 @@
-
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
@@ -59,6 +71,7 @@ const { visible, longitude, latitude } = useVModels(props, emits);
const loading = ref(false);
const currentLongitude = ref("");
const currentLatitude = ref("");
+const localSearch = ref("");
const fnMapInit = async () => {
loading.value = true;
await nextTick();
@@ -90,6 +103,14 @@ const fnMapInit = async () => {
const fnClose = () => {
visible.value = false;
};
+const fnLocalSearch = () => {
+ if (localSearch.value) {
+ const local = new window.BMapGL.LocalSearch(mapInstance, {
+ renderOptions: { map: mapInstance },
+ });
+ local.search(localSearch.value);
+ }
+};
const fnConfirm = () => {
latitude.value = currentLatitude.value;
longitude.value = currentLongitude.value;
diff --git a/src/views/enterprise_management/typework/components/add.vue b/src/views/enterprise_management/typework/components/add.vue
index dd4b9ad..c727bc1 100644
--- a/src/views/enterprise_management/typework/components/add.vue
+++ b/src/views/enterprise_management/typework/components/add.vue
@@ -87,14 +87,14 @@
diff --git a/src/views/file_management/personnel/task_details.vue b/src/views/file_management/personnel/task_details.vue
index 7172e8f..6b53047 100644
--- a/src/views/file_management/personnel/task_details.vue
+++ b/src/views/file_management/personnel/task_details.vue
@@ -71,7 +71,7 @@
-
+
未参加
diff --git a/src/views/file_management/stage/components/report.vue b/src/views/file_management/stage/components/report.vue
index a042cbb..3ce87c3 100644
--- a/src/views/file_management/stage/components/report.vue
+++ b/src/views/file_management/stage/components/report.vue
@@ -41,7 +41,7 @@
| 本次培训考评结论 |
- 本次通过笔试的方式进行了培训效果考核,考核人数为{{
+ 本次通过线上学习，完成线上考试或线下考试的方式进行了培训效果考核,考核人数为{{
data.students.length
}}人,考核合格人数为{{ data.passStudents.length }}人, 合格率为{{
(
@@ -124,9 +124,13 @@ const fnGetData = async () => {
.join("、");
data.students = examinationResultsResData.varList;
data.students.forEach((item) => {
- if (item.STAGEEXAMSCORE >= studyTaskViewResData.pd.PASSSCORE)
+ if (
+ Number(item.STAGEEXAMSCORE) >= Number(studyTaskViewResData.pd.PASSSCORE)
+ )
data.passStudents.push(item);
- else data.unpassStudents.push(item);
+ else {
+ data.unpassStudents.push(item);
+ }
if (item.COMPLETE_COURSEWARE > 0) data.joinStudents.push(item);
});
data.info = studyTaskViewResData.pd;
diff --git a/src/views/file_management/stage/components/results.vue b/src/views/file_management/stage/components/results.vue
index 50486b7..688c7d0 100644
--- a/src/views/file_management/stage/components/results.vue
+++ b/src/views/file_management/stage/components/results.vue
@@ -63,7 +63,7 @@
| {{ item.USER_NAME }} |
{{ item.USER_ID_CARD }} |
{{ item.PHONE }} |
- {{ item.SEX_NAME }} |
+ {{ item.SEX === "0" ? "女" : "男" }} |
{{ item.COMPLETE_CLASSHOUR }} |
{{
@@ -94,7 +94,7 @@
| {{ item.USER_NAME }} |
{{ item.USER_ID_CARD }} |
{{ item.PHONE }} |
- {{ item.SEX_NAME }} |
+ {{ item.SEX === "0" ? "女" : "男" }} |
{{ item.COMPLETE_CLASSHOUR }} |
{{
@@ -162,7 +162,9 @@ const fnGetData = async () => {
CORPINFO_ID: studyTaskViewResData.pd.CORPINFO_ID,
});
examinationResultsResData.varList.forEach((item) => {
- if (item.STAGEEXAMSCORE >= studyTaskViewResData.pd.PASSSCORE) {
+ if (
+ Number(item.STAGEEXAMSCORE) >= Number(studyTaskViewResData.pd.PASSSCORE)
+ ) {
data.passStudents.push(item);
} else {
data.unpassStudents.push(item);
diff --git a/src/views/gatemachine/machine/components/add.vue b/src/views/gatemachine/machine/components/add.vue
new file mode 100644
index 0000000..ce1b350
--- /dev/null
+++ b/src/views/gatemachine/machine/components/add.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
diff --git a/src/views/gatemachine/machine/components/add_machine.vue b/src/views/gatemachine/machine/components/add_machine.vue
new file mode 100644
index 0000000..e8cc5b2
--- /dev/null
+++ b/src/views/gatemachine/machine/components/add_machine.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
diff --git a/src/views/gatemachine/machine/components/selecting_points.vue b/src/views/gatemachine/machine/components/selecting_points.vue
new file mode 100644
index 0000000..72a31a2
--- /dev/null
+++ b/src/views/gatemachine/machine/components/selecting_points.vue
@@ -0,0 +1,75 @@
+
+
+
+
+ 关闭
+ 保存
+
+
+
+
+
+
+
diff --git a/src/views/gatemachine/machine/components/sidebar.vue b/src/views/gatemachine/machine/components/sidebar.vue
new file mode 100644
index 0000000..ea07d94
--- /dev/null
+++ b/src/views/gatemachine/machine/components/sidebar.vue
@@ -0,0 +1,240 @@
+
+
+
+
+ {{ title }}
+
+ 闸机管理
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+ 人行闸机
+
+ 车辆闸机
+
+
+
+
+
+
+
+
+ 是
+
+ 否
+
+
+
+
+
+
+
+ 编辑
+
+
+ {{ row.GATE_POSITION === 0 ? "修改定位" : "定位" }}
+
+
+ 删除
+
+
+
+
+
+
+ 初始化闸机
+
+
+
+ 新增闸机
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gatemachine/machine/index.vue b/src/views/gatemachine/machine/index.vue
new file mode 100644
index 0000000..925c780
--- /dev/null
+++ b/src/views/gatemachine/machine/index.vue
@@ -0,0 +1,200 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+ 人行
+ 车行
+ 综合
+
+
+
+
+ 停用
+ 正常
+ 暂时关闭
+
+
+
+
+ {{ row.GATE_COUNT }}
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+ 新增
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gatemachine/machine_log/index.vue b/src/views/gatemachine/machine_log/index.vue
new file mode 100644
index 0000000..cad3d17
--- /dev/null
+++ b/src/views/gatemachine/machine_log/index.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/gatemachine/machine_log/people_entry_exit.vue b/src/views/gatemachine/machine_log/people_entry_exit.vue
new file mode 100644
index 0000000..b5c407e
--- /dev/null
+++ b/src/views/gatemachine/machine_log/people_entry_exit.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+ 进
+ 出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/groundbreaking/invalid/components/flow_chart.vue b/src/views/groundbreaking/invalid/components/flow_chart.vue
new file mode 100644
index 0000000..59c56b2
--- /dev/null
+++ b/src/views/groundbreaking/invalid/components/flow_chart.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+ {{ fnGetShowStepUser(item) }}
+ {{ item.ACT_TIME }}
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/groundbreaking/invalid/index.vue b/src/views/groundbreaking/invalid/index.vue
new file mode 100644
index 0000000..06744cb
--- /dev/null
+++ b/src/views/groundbreaking/invalid/index.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.STEP_NAME }}时作废本作业票
+ 验收归档后作废本作业票
+
+
+
+
+
+
+ 流程图
+
+
+ 审批表详情
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/groundbreaking/job_data/index.vue b/src/views/groundbreaking/job_data/index.vue
index a8cec9e..789b827 100644
--- a/src/views/groundbreaking/job_data/index.vue
+++ b/src/views/groundbreaking/job_data/index.vue
@@ -111,6 +111,7 @@
暂存
气体检测打回
+ 监护人已停止作业
{{ row.NEXT_STEP_NAME }}
{{ row.STEP_NAME }}打回
@@ -118,6 +119,7 @@
审批表详情
+
+ 作废
+
@@ -230,11 +245,14 @@ import {
getGroundbreakingList,
getTaskSetps,
getGroundbreakingFlow,
+ setEightWorkInvalid,
} from "@/request/eight_work.js";
import CheckList from "@/components/safety_briefing_checklist/index.vue";
import LayoutDepartment from "@/components/department/index.vue";
import ShowPoints from "@/views/map_settings/assignment_ticket_area_settings/components/show_points.vue";
+import { useUserStore } from "@/pinia/user.js";
+import { ElMessage, ElMessageBox } from "element-plus";
const props = defineProps({
entrance: {
type: String,
@@ -245,12 +263,8 @@ const props = defineProps({
const stepList = ref([]);
const getStepList = async () => {
- const { list } = await getTaskSetps({ TASK_ID: 1 });
- stepList.value = [
- { STEP_NAME: "请选择", STEP_ID: "" },
- ...list,
- { STEP_NAME: "验收归档", STEP_ID: "99" },
- ];
+ const { list } = await getTaskSetps({ TASK_ID: 9 });
+ stepList.value = [{ STEP_NAME: "请选择", STEP_ID: "" }, ...list];
};
getStepList();
const fnShowPoints = (id) => {
@@ -261,11 +275,29 @@ const fnPreviewVideo = (VIDEO_PATH) => {
data.videoDialog.visible = true;
data.videoDialog.src = VIDEO_PATH;
};
-
+const userStore = useUserStore();
+const fnRemoveWork = async (row) => {
+ await ElMessageBox.prompt("请确认是否作废作业票", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ inputPlaceholder: "请输入作废原因",
+ inputPattern: /^.{1,254}$/,
+ inputErrorMessage: "作废原因不可为空",
+ }).then(async ({ value }) => {
+ await setEightWorkInvalid({
+ WORK_ID: row.BREAKGROUND_ID,
+ WORK_TYPE: "groundbreaking",
+ STEP_REASON: value,
+ });
+ ElMessage.success("作废成功");
+ await fnResetPaginationTransfer();
+ });
+};
const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getGroundbreakingList, {
- otherParams: props.entrance === "archive" ? { STEP_ID: "99" } : {},
+ otherParams:
+ props.entrance === "archive" ? { STEP_ID: "99" } : { WORK_STATE: "0" },
});
const data = reactive({
flowChartDialog: {
diff --git a/src/views/groundbreaking/job_data/view.vue b/src/views/groundbreaking/job_data/view.vue
index 3b53b7c..59eb634 100644
--- a/src/views/groundbreaking/job_data/view.vue
+++ b/src/views/groundbreaking/job_data/view.vue
@@ -33,8 +33,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
|
@@ -46,8 +46,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -75,8 +75,8 @@
v-viewer
:src="VITE_FILE_URL + data.info.CONTENT_IMG_PATH?.[0]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -87,8 +87,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}
@@ -105,7 +105,16 @@
| 作业实施时间 |
- {{ data.info.WORK_START_DATE }}至{{ data.info.WORK_END_DATE }}止
+ {{ data.info.WORK_START_DATE
+ }}{{ data.info.WORK_START_DATE ? "至" : ""
+ }}{{ data.info.WORK_END_DATE
+ }}{{ data.info.WORK_END_DATE ? "止" : "" }}
+ |
+
+
+ | 作废原因 |
+
+ {{ data.info.STEP_REASON }}
|
@@ -130,8 +139,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -145,12 +154,13 @@
![]()
|
@@ -161,19 +171,23 @@
:key="item.BUS_BREAKGROUND_MEASURES_ID"
>
{{ data.measuresList.length + 1 + index }} |
-
+ |
其他安全措施： {{ item.DESCR }}
|
-
+ |
+
+
![]()
|
@@ -194,8 +208,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -211,8 +225,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFESS?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}
@@ -235,8 +249,8 @@
data.signs.ACCEPT_CONFESS?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME[index] }}
@@ -256,8 +270,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFIRM?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFIRM?.[0].SIGN_TIME[index] }}
@@ -277,8 +291,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.LEADER?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.LEADER?.[0].SIGN_TIME[index] }}
@@ -303,8 +317,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.SAFETY?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.SAFETY?.[0].SIGN_TIME[index] }}
@@ -328,8 +342,8 @@
VITE_FILE_URL + data.signs.APPROVE?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.APPROVE?.[0].SIGN_TIME[index] }}
@@ -337,6 +351,29 @@
+
+ |
+ 监护人停止作业原因：{{ data.signs.STOP_WORK?.[0].DESCR }}
+
+ 签字：
+ ![]()
+ {{ data.signs.STOP_WORK?.[0].SIGN_TIME[index] }}
+ |
+
|
完工验收：{{ data.signs.ACCEPT?.[0].DESCR }}
@@ -350,8 +387,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.ACCEPT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.info.ACCEPT_TIME }}
diff --git a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
index 509d56c..a6a2e67 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue
@@ -75,7 +75,7 @@
-
+
diff --git a/src/views/hazard_investigation/checklist_inspection_status/index.vue b/src/views/hazard_investigation/checklist_inspection_status/index.vue
index 7e5f189..5ad8208 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/index.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/index.vue
@@ -4,7 +4,7 @@
@@ -259,6 +259,12 @@ const fnGetDataTransfer = () => {
});
};
const fnResetPaginationTransfer = () => {
+ searchForm.value.DEPTIDS = [];
+ fnResetPagination({
+ DEPTIDS: searchForm.value.DEPTIDS?.join(","),
+ });
+};
+const fnSubmit = () => {
fnResetPagination({
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 4d7283f..9a5fe46 100644
--- a/src/views/hazard_investigation/delete_inventory_management/components/list.vue
+++ b/src/views/hazard_investigation/delete_inventory_management/components/list.vue
@@ -199,10 +199,10 @@ import {
import {
getDeleteCustomList,
getDeleteInventoryManagementList,
- setCustomBatchDelete,
+ setCustomBatchDeleteThorough,
setDeleteCustomRecovery,
setDeleteInventoryManagementRecovery,
- setInventoryManagementBatchDelete,
+ setInventoryManagementBatchDeleteThorough,
} from "@/request/hazard_investigation.js";
import { useRouter } from "vue-router";
import { reactive } from "vue";
@@ -274,10 +274,10 @@ const fnBatchDelete = debounce(
const DATA_IDS = selectionData
.map((item) => item.LISTMANAGER_ID)
.join(",");
- await setInventoryManagementBatchDelete({ DATA_IDS });
+ await setInventoryManagementBatchDeleteThorough({ DATA_IDS });
} else {
const DATA_IDS = selectionData.map((item) => item.CUSTOM_ID).join(",");
- await setCustomBatchDelete({ DATA_IDS });
+ await setCustomBatchDeleteThorough({ DATA_IDS });
}
ElMessage.success("删除成功");
fnResetPaginationTransfer();
diff --git a/src/views/hazard_investigation/inspection_record/index.vue b/src/views/hazard_investigation/inspection_record/index.vue
index f7035f9..df25492 100644
--- a/src/views/hazard_investigation/inspection_record/index.vue
+++ b/src/views/hazard_investigation/inspection_record/index.vue
@@ -41,6 +41,7 @@
重置
+
@@ -162,7 +163,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
import useListData from "@/assets/js/useListData.js";
import { useUserStore } from "@/pinia/user.js";
-
+// import { setRiskPointBatchReport } from "@/request/risk_control.js";
const router = useRouter();
const userStore = useUserStore();
const info = ref({});
@@ -215,6 +216,41 @@ const fnBatchPrinting = () => {
},
});
};
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+//
+// // 隐患排查检查记录和检查内容
+// await setRiskPointBatchReport({
+// type: "inspectionRecord",
+// model: "隐患排查检查记录",
+// });
+// await setRiskPointBatchReport({
+// type: "inspectionRecordContent",
+// model: "隐患排查记录内容",
+// });
+// await setRiskPointBatchReport({
+// type: "recordHidden",
+// model: "隐患排查隐患",
+// });
+// // 风险管控检查记录和检查内容 hidden包含安全检查和隐患排查的隐患
+// await setRiskPointBatchReport({
+// type: "newInspectionRecord",
+// model: "风险管控检查记录",
+// });
+// await setRiskPointBatchReport({
+// type: "newInspectionRecordContent",
+// model: "风险管控记录内容",
+// });
+// await setRiskPointBatchReport({
+// type: "hidden",
+// model: "风险管控隐患",
+// });
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
diff --git a/src/views/hazard_investigation/inventory_management/add.vue b/src/views/hazard_investigation/inventory_management/add.vue
index a3c9ec6..5f77086 100644
--- a/src/views/hazard_investigation/inventory_management/add.vue
+++ b/src/views/hazard_investigation/inventory_management/add.vue
@@ -13,18 +13,14 @@
-
-
-
+
+
+
-
+
-
+
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+ {{ row.BAO_BAO_NUM_NAME ? "修改" : "选择" }}
+
+ 有危险源编码才可选择包保任务对应项
+
+
保存
@@ -228,6 +261,12 @@
v-model:list="data.inspectionRouteDialog.list"
@submit="fnInspectionRouteSubmit"
/>
+
@@ -247,48 +286,26 @@ import {
getInventoryManagementView,
setInventoryManagementAdd,
setInventoryManagementEdit,
+ getDictionaries,
+ setInventoryManagementInsuranceCoverageList,
} from "@/request/hazard_investigation.js";
import { debounce } from "throttle-debounce";
import useFormValidate from "@/assets/js/useFormValidate.js";
import { ElMessage } from "element-plus";
import AddRisk from "@/views/risk_control/ledger/components/add.vue";
import SelectRisk from "./components/select_risk.vue";
+import InsuranceCoverageSelect from "./components/insurance_coverage_select.vue";
import AddInspectionRoute from "./components/add_inspection_route.vue";
const route = useRoute();
const router = useRouter();
-const { LISTMANAGER_ID, WHETHER_HAZARDS } = route.query;
-const rules = {
- NAME: [{ required: true, message: "清单名称不能为空", trigger: "blur" }],
- BAO_BAO_TYPE: [
- {
- required: true,
- message: "是否包保责任人任务不能为空",
- trigger: "change",
- },
- ],
- TASK_TYPE: [
- { required: true, message: "任务类型不能为空", trigger: "change" },
- ],
- DEPARTMENT_ID: [
- { required: true, message: "部门不能为空", trigger: "change" },
- ],
- POST_ID: [{ required: true, message: "岗位不能为空", trigger: "change" }],
- USER_IDS: [{ required: true, message: "负责人不能为空", trigger: "change" }],
- USER_ID: [{ required: true, message: "负责人不能为空", trigger: "change" }],
- SCREENTYPE: [
- { required: true, message: "排查类型不能为空", trigger: "change" },
- ],
- PERIOD: [{ required: true, message: "排查周期不能为空", trigger: "change" }],
- TYPE: [{ required: true, message: "清单类型不能为空", trigger: "change" }],
- dates: [{ required: true, message: "排查日期不能为空", trigger: "change" }],
-};
-const formRef = ref(null);
-const tableRef = ref(null);
+const { LISTMANAGER_ID, WHETHER_HAZARDS, IS_MAIN_TECHNOLO, INHERITANCE } =
+ route.query;
const data = reactive({
form: {
NAME: "",
BAO_BAO_TYPE: "",
+ ATTRIBUTE: 1,
TASK_TYPE: "",
DEPARTMENT_ID: "",
POST_ID: "",
@@ -327,7 +344,56 @@ const data = reactive({
visible: false,
list: [],
},
+ selectDialog: {
+ visible: false,
+ info: {
+ TASK_TYPE_NUM: "",
+ },
+ index: 111,
+ optionList: [],
+ },
+ TASK_TYPE_NUM: "",
+ notOptionList: [],
+ optionList: [],
+ newOptionList: [],
});
+
+const rules = {
+ NAME: [{ required: true, message: "清单名称不能为空", trigger: "blur" }],
+ ATTRIBUTE: [
+ {
+ required: true,
+ message: "属性不能为空",
+ trigger: "change",
+ },
+ ],
+ TASK_TYPE: [
+ { required: true, message: "任务类型不能为空", trigger: "change" },
+ ],
+ DEPARTMENT_ID: [
+ { required: true, message: "部门不能为空", trigger: "change" },
+ ],
+ POST_ID: [{ required: true, message: "岗位不能为空", trigger: "change" }],
+ USER_ID: [{ required: true, message: "负责人不能为空", trigger: "change" }],
+ SCREENTYPE: [
+ { required: true, message: "排查类型不能为空", trigger: "change" },
+ ],
+ PERIOD: [{ required: true, message: "排查周期不能为空", trigger: "change" }],
+ TYPE: [{ required: true, message: "清单类型不能为空", trigger: "change" }],
+ dates: [{ required: true, message: "排查日期不能为空", trigger: "change" }],
+ USER_IDS: [{ required: true, message: "负责人不能为空", trigger: "change" }],
+};
+const formRef = ref(null);
+const tableRef = ref(null);
+
+const getAttributeList = () => {
+ const attributeList = [{ BIANMA: 1, NAME: "普通清单" }];
+ if (WHETHER_HAZARDS === "1")
+ attributeList.push({ BIANMA: 2, NAME: "包保责任人清单" });
+ if (IS_MAIN_TECHNOLO === "1")
+ attributeList.push({ BIANMA: 3, NAME: "高危工艺清单" });
+ return attributeList;
+};
const taskTypeList = await layoutFnGetTaskType();
const troubleshootingTypeList = await layoutFnGetTroubleshootingType();
const troubleshootingCycleList = await layoutFnGetTroubleshootingCycle();
@@ -339,6 +405,15 @@ const fnGetData = async () => {
data.form.dates = [resData.pd.START_DATE, resData.pd.END_DATE];
data.list = resData.varList;
data.listAll = [...resData.varList];
+ if (data.form.ATTRIBUTE === 2) {
+ const taskType = await getDictionaries({
+ DICTIONARIES_ID: data.form.TASK_TYPE,
+ });
+ const workList = await setInventoryManagementInsuranceCoverageList({
+ WORK_TYPE: taskType.pd.BZ,
+ });
+ data.optionList = workList.varList;
+ }
};
fnGetData();
const fnGetInspectionItems = async () => {
@@ -363,12 +438,38 @@ const fnPostChange = () => {
data.form.USER_ID = "";
fnGetInspectionItems();
};
+const fnTaskChange = () => {
+ data.form.TASK_TYPE = "";
+};
+const fnTaskTypeChange = async (row) => {
+ if (data.form.ATTRIBUTE === 2) {
+ const resData = await getDictionaries({ DICTIONARIES_ID: row });
+
+ data.TASK_TYPE_NUM = resData.pd.BZ;
+
+ const resData1 = await setInventoryManagementInsuranceCoverageList({
+ WORK_TYPE: data.TASK_TYPE_NUM,
+ });
+ data.optionList = resData1.varList;
+ }
+};
+
+const fnPeriodChange = (e) => {
+ if (e === "checkPeriod0008" && data.userList.length === 0) {
+ ElMessage.warning("未选择岗位或者岗位下无可选负责人");
+ data.form.PERIOD = "";
+ return;
+ }
+ if (e === "checkPeriod0008") {
+ data.form.USER_IDS = data.userList.map((item) => item.USER_ID);
+ }
+};
const fnGetPost = async (DEPARTMENT_ID) => {
const resData = await getPostListAll({ DEPARTMENT_ID });
data.postList = resData.postList;
};
-const fnGetUser = async (POST_ID) => {
- const resData = await getUserListAll({ POST_ID });
+const fnGetUser = async (POST_ID, ATTRIBUTE) => {
+ const resData = await getUserListAll({ POST_ID, ATTRIBUTE });
data.userList = resData.userList;
};
const fnDisabledDate = (time) => {
@@ -405,8 +506,42 @@ const fnSelectRiskSubmit = (listData) => {
data.listAll.push(...listData);
fnTableSelection();
};
+const fnSelect = (row, index) => {
+ if (data.form.TASK_TYPE === "") {
+ ElMessage.error("请选择任务类型！");
+ return;
+ }
+ data.newOptionList = data.optionList;
+ data.notOptionList.forEach((itemB) => {
+ data.newOptionList = data.newOptionList.filter(
+ (item) => item.TERM_LIBRARY_ID !== itemB.TERM_LIBRARY_ID
+ );
+ });
+ row.TASK_TYPE_NUM = data.TASK_TYPE_NUM;
+ data.selectDialog.visible = true;
+ data.selectDialog.info = row;
+ data.selectDialog.index = index;
+ data.selectDialog.optionList = data.newOptionList;
+};
+const fnCheck = (row) => {
+ data.list[data.selectDialog.index].BAO_BAO_NUM_NAME = row.TERM_DESCRIBE;
+ data.list[data.selectDialog.index].BAO_BAO_NUM = row.TASK_NUM;
+ if (data.list[data.selectDialog.index].WORK_DATA !== undefined) {
+ data.notOptionList = data.notOptionList.filter(
+ (item) => item !== data.list[data.selectDialog.index].WORK_DATA
+ );
+ }
+ data.notOptionList.push(row);
+ data.list[data.selectDialog.index].WORK_DATA = row;
+};
const fnSubmit = async () => {
await useFormValidate(formRef);
+ if (data.form.ATTRIBUTE === 2) {
+ if (data.optionList.length !== data.notOptionList.length) {
+ ElMessage.error("包保任务对应项必须全选！");
+ return;
+ }
+ }
const selectionData = tableRef.value.getSelectionRows();
if (selectionData.length === 0) {
ElMessage.error("请选择检查内容");
@@ -433,16 +568,21 @@ const fnInspectionRouteSubmit = debounce(
const selectionData = tableRef.value.getSelectionRows();
const params = {
...data.form,
- USER_IDS: data.form.USER_IDS?.join(","),
+ USER_IDS: !INHERITANCE
+ ? data.form.USER_IDS?.join(",")
+ : data.form.USER_ID,
LISTITEM: JSON.stringify(selectionData),
ROUTE: JSON.stringify(data.inspectionRouteDialog.list),
BAO_BAO_DEPARTMENT_ID: data.form.DEPARTMENT_ID,
BAO_BAO_USER_ID: data.form.USER_ID,
START_DATE: data.form.dates[0],
END_DATE: data.form.dates[1],
- BAO_BAO_TYPE: data.form.BAO_BAO_TYPE || "0",
+ // BAO_BAO_TYPE: data.form.BAO_BAO_TYPE || "0",
+ ATTRIBUTE: data.form.ATTRIBUTE || "1",
};
!LISTMANAGER_ID
+ ? await setInventoryManagementAdd(params)
+ : INHERITANCE
? await setInventoryManagementAdd(params)
: await setInventoryManagementEdit(params);
ElMessage.success("保存成功");
@@ -452,7 +592,7 @@ const fnInspectionRouteSubmit = debounce(
);
watchEffect(() => {
if (data.form.DEPARTMENT_ID) fnGetPost(data.form.DEPARTMENT_ID);
- if (data.form.POST_ID) fnGetUser(data.form.POST_ID);
+ if (data.form.POST_ID) fnGetUser(data.form.POST_ID, data.form.ATTRIBUTE);
});
diff --git a/src/views/hazard_investigation/inventory_management/add_custom.vue b/src/views/hazard_investigation/inventory_management/add_custom.vue
index 0889a76..c8cc995 100644
--- a/src/views/hazard_investigation/inventory_management/add_custom.vue
+++ b/src/views/hazard_investigation/inventory_management/add_custom.vue
@@ -13,37 +13,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -36,9 +36,9 @@
diff --git a/src/views/hazard_investigation/inventory_management/insurance_coverage.vue b/src/views/hazard_investigation/inventory_management/insurance_coverage.vue
index f654a7a..44e0ef7 100644
--- a/src/views/hazard_investigation/inventory_management/insurance_coverage.vue
+++ b/src/views/hazard_investigation/inventory_management/insurance_coverage.vue
@@ -37,17 +37,17 @@
-
+
-
+
import {
getInventoryManagementView,
- setInventoryManagementInsuranceCoverageSave,
+ // setInventoryManagementInsuranceCoverageSave,
} from "@/request/hazard_investigation.js";
-import { useRoute, useRouter } from "vue-router";
+import { useRoute } from "vue-router";
import { reactive, ref } from "vue";
-import { debounce } from "throttle-debounce";
-import { ElMessage } from "element-plus";
+// import { debounce } from "throttle-debounce";
+// import { ElMessage } from "element-plus";
import InsuranceCoverageSelect from "./components/insurance_coverage_select.vue";
import useListData from "@/assets/js/useListData.js";
const route = useRoute();
-const router = useRouter();
+// const router = useRouter();
const { LISTMANAGER_ID } = route.query;
const info = ref({});
const data = reactive({
@@ -86,26 +86,26 @@ const { list } = useListData(getInventoryManagementView, {
info.value = resData.pd;
},
});
-const fnSelect = (row, index) => {
- data.selectDialog.visible = true;
- data.selectDialog.info = row;
- data.selectDialog.index = index;
-};
+// const fnSelect = (row, index) => {
+// data.selectDialog.visible = true;
+// data.selectDialog.info = row;
+// data.selectDialog.index = index;
+// };
const fnCheck = (row) => {
- list.value[data.selectDialog.index].BAO_BAO_NUM_NAME = row.DESCRIBE;
+ list.value[data.selectDialog.index].BAO_BAO_NUM_NAME = row.TERM_DESCRIBE;
list.value[data.selectDialog.index].BAO_BAO_NUM = row.TASK_NUM;
};
-const fnSubmit = debounce(
- 1000,
- async () => {
- await setInventoryManagementInsuranceCoverageSave({
- list: JSON.stringify(list.value),
- });
- ElMessage.success("保存成功");
- router.back();
- },
- { atBegin: true }
-);
+// const fnSubmit = debounce(
+// 1000,
+// async () => {
+// await setInventoryManagementInsuranceCoverageSave({
+// list: JSON.stringify(list.value),
+// });
+// ElMessage.success("保存成功");
+// router.back();
+// },
+// { atBegin: true }
+// );
diff --git a/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue b/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue
index 8f5382a..7688f3d 100644
--- a/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue
+++ b/src/views/hazard_investigation/inventory_management/insurance_coverage_custom.vue
@@ -48,22 +48,18 @@
填写
-
-
+
+
-
+
import {
getCheckStandardManagementView,
- setCustomInsuranceCoverageSave,
+ // setCustomInsuranceCoverageSave,
} from "@/request/hazard_investigation.js";
-import { useRoute, useRouter } from "vue-router";
+import { useRoute } from "vue-router";
import { reactive, ref } from "vue";
-import { debounce } from "throttle-debounce";
-import { ElMessage } from "element-plus";
+// import { debounce } from "throttle-debounce";
+// import { ElMessage } from "element-plus";
import InsuranceCoverageSelectCustom from "./components/insurance_coverage_select_custom.vue";
import useListData from "@/assets/js/useListData.js";
const route = useRoute();
-const router = useRouter();
+// const router = useRouter();
const { ID } = route.query;
const info = ref({});
const data = reactive({
@@ -102,26 +98,26 @@ const { list } = useListData(getCheckStandardManagementView, {
info.value = resData.pd;
},
});
-const fnSelect = (row, index) => {
- data.selectDialog.visible = true;
- data.selectDialog.info = row;
- data.selectDialog.index = index;
-};
+// const fnSelect = (row, index) => {
+// data.selectDialog.visible = true;
+// data.selectDialog.info = row;
+// data.selectDialog.index = index;
+// };
const fnCheck = (row) => {
list.value[data.selectDialog.index].BAO_BAO_NUM_NAME = row.TERM_DESCRIBE;
list.value[data.selectDialog.index].BAO_BAO_NUM = row.TASK_NUM;
};
-const fnSubmit = debounce(
- 1000,
- async () => {
- await setCustomInsuranceCoverageSave({
- list: JSON.stringify(list.value),
- });
- ElMessage.success("保存成功");
- router.back();
- },
- { atBegin: true }
-);
+// const fnSubmit = debounce(
+// 1000,
+// async () => {
+// await setCustomInsuranceCoverageSave({
+// list: JSON.stringify(list.value),
+// });
+// ElMessage.success("保存成功");
+// router.back();
+// },
+// { atBegin: true }
+// );
diff --git a/src/views/hazard_investigation/inventory_troubleshooting/index.vue b/src/views/hazard_investigation/inventory_troubleshooting/index.vue
index cb2a160..50264ba 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/index.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/index.vue
@@ -177,7 +177,8 @@ const fnGetDataTransfer = () => {
});
};
const fnResetPaginationTransfer = () => {
- searchForm.value = {};
+ searchForm.value.DEPTIDS = [];
+ searchForm.value.LIST_TYPE = "";
fnResetPagination({
DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue
index 85c4d3b..41b1a56 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue
@@ -244,7 +244,7 @@
v-model:form="data.unQualifiedDialog.form"
:type="data.unQualifiedDialog.type"
:hidden-type="data.unQualifiedDialog.hiddenType"
- :list-manager-id="LIST_ID"
+ :list-manager-id="ID"
:info="{ ...data.unQualifiedDialog.info, ...info.value }"
:longitude="data.longitude"
:latitude="data.latitude"
@@ -283,7 +283,7 @@ import { WarningFilled } from "@element-plus/icons-vue";
const route = useRoute();
const router = useRouter();
-const { ID, CHECKRECORD_ID, DATEEND, DATESTART } = route.query;
+const { ID, CHECKRECORD_ID } = route.query;
// entrance: supplementaryRecording是补录，空值是正常录入
const props = defineProps({
entrance: {
@@ -373,12 +373,15 @@ onMounted(() => {
});
});
const fnDisabledDate = (time) => {
- if (DATEEND && DATESTART)
- return (
- time.getTime() > new Date(DATEEND).getTime() ||
- time.getTime() < new Date(DATESTART).getTime()
- );
- else return false;
+ const start = new Date(
+ new Date(new Date().toLocaleDateString()).getTime() +
+ 24 * 60 * 60 * 1000 -
+ 1
+ );
+ return (
+ time.getTime() < new Date().getTime() - 1 * 24 * 60 * 60 * 1000 ||
+ time.getTime() > new Date().getTime() + (start - new Date().getTime())
+ );
};
const fnQualified = async (index, row) => {
if (row.HASHIDDEN > 0) return;
diff --git a/src/views/hazard_investigation/troubleshooting_plan/index.vue b/src/views/hazard_investigation/troubleshooting_plan/index.vue
index d91c494..5d0fb12 100644
--- a/src/views/hazard_investigation/troubleshooting_plan/index.vue
+++ b/src/views/hazard_investigation/troubleshooting_plan/index.vue
@@ -41,7 +41,7 @@
{{ dictionary[row.type_name].require }}
-
+
@@ -102,11 +102,7 @@ const { list, searchForm, fnGetData } = useListData(
key: "planList",
callbackFn: (list) => {
for (let i = 0; i < list.length; i++) {
- if (
- list[i].check_count === 0 ||
- list[i].list_count === 0 ||
- list[i].dept_count === 0
- ) {
+ if (list[i].display_count === 0) {
list.splice(i, 1);
i--;
}
diff --git a/src/views/hidden_danger_government/ledger/index.vue b/src/views/hidden_danger_government/ledger/index.vue
index e723ee4..34f5ae7 100644
--- a/src/views/hidden_danger_government/ledger/index.vue
+++ b/src/views/hidden_danger_government/ledger/index.vue
@@ -4,7 +4,7 @@
@@ -57,6 +57,7 @@
重置
+
@@ -82,6 +83,15 @@
{{ serialNumber(pagination, $index) }}
+
+
+ 隐患快报
+ 风险管控清单检查
+ 隐患排查清单检查
+ 专项检查
+ 安全检查
+
+
{
});
};
const fnResetPaginationTransfer = () => {
+ searchForm.value.DEPTIDS = [];
+ fnResetPagination({
+ STARTTIME: searchForm.value.dates?.[0],
+ ENDTIME: searchForm.value.dates?.[1],
+ DEPTIDS: searchForm.value.DEPTIDS?.join(","),
+ });
+};
+const fnSubmit = () => {
fnResetPagination({
STARTTIME: searchForm.value.dates?.[0],
ENDTIME: searchForm.value.dates?.[1],
@@ -252,6 +273,22 @@ const fnExport = () => {
data.exportExcelDialog.ids = selectionData.map((item) => item.HIDDEN_ID);
data.exportExcelDialog.visible = true;
};
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// await setRiskPointBatchReport({
+// type: "recordHidden",
+// model: "隐患台账",
+// });
+// await setRiskPointBatchReport({
+// type: "hidden",
+// model: "记录隐患",
+// });
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
diff --git a/src/views/hidden_danger_government/major/index.vue b/src/views/hidden_danger_government/major/index.vue
index 208bc59..ed1fb09 100644
--- a/src/views/hidden_danger_government/major/index.vue
+++ b/src/views/hidden_danger_government/major/index.vue
@@ -50,7 +50,7 @@
隐患快报
隐患排查
隐患排查
- 安全检查
+ 专项检查
安全检查
diff --git a/src/views/hidden_danger_government/rectification/index.vue b/src/views/hidden_danger_government/rectification/index.vue
index 94d52d3..63cb06b 100644
--- a/src/views/hidden_danger_government/rectification/index.vue
+++ b/src/views/hidden_danger_government/rectification/index.vue
@@ -50,7 +50,7 @@
隐患快报
隐患排查
隐患排查
- 安全检查
+ 专项检查
安全检查
diff --git a/src/views/high/invalid/components/flow_chart.vue b/src/views/high/invalid/components/flow_chart.vue
new file mode 100644
index 0000000..59c56b2
--- /dev/null
+++ b/src/views/high/invalid/components/flow_chart.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+ {{ fnGetShowStepUser(item) }}
+ {{ item.ACT_TIME }}
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/high/invalid/index.vue b/src/views/high/invalid/index.vue
new file mode 100644
index 0000000..8104e56
--- /dev/null
+++ b/src/views/high/invalid/index.vue
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+ {{ row.LEADER_USER_NAME || " 已跳过" }}
+
+
+
+
+ {{ row.AUDIT_USER_NAME || " 已跳过" }}
+
+
+
+
+ {{ row.APPROVE_USER_NAME || " 已跳过" }}
+
+
+
+
+
+ {{ row.STEP_NAME }}时作废本作业票
+ 验收归档后作废本作业票
+
+
+
+
+
+
+ 流程图
+
+
+ 审批表详情
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/high/job_data/index.vue b/src/views/high/job_data/index.vue
index ee2918d..6e55ba9 100644
--- a/src/views/high/job_data/index.vue
+++ b/src/views/high/job_data/index.vue
@@ -103,6 +103,8 @@
暂存
+ 气体检测打回
+ 监护人已停止作业
{{ row.NEXT_STEP_NAME }}
{{ row.STEP_NAME }}打回
@@ -110,6 +112,7 @@
审批表详情
+
+ 作废
+
@@ -223,11 +239,13 @@ import {
getHighWorkFlow,
getHighWorkList,
getTaskSetps,
+ setEightWorkInvalid,
} from "@/request/eight_work.js";
import LayoutVideo from "@/components/video/index.vue";
import LayoutDepartment from "@/components/department/index.vue";
import ShowPoints from "@/views/map_settings/assignment_ticket_area_settings/components/show_points.vue";
-
+import { useUserStore } from "@/pinia/user.js";
+import { ElMessage, ElMessageBox } from "element-plus";
const props = defineProps({
entrance: {
type: String,
@@ -240,12 +258,26 @@ const fnSafetyBriefingChecklist = (row) => {
data.checkListDialog.FOREIGN_KEY = row.HIGHWORK_ID;
};
const getStepList = async () => {
- const { list } = await getTaskSetps({ TASK_ID: 1 });
- stepList.value = [
- { STEP_NAME: "请选择", STEP_ID: "" },
- ...list,
- { STEP_NAME: "验收归档", STEP_ID: "99" },
- ];
+ const { list } = await getTaskSetps({ TASK_ID: 5 });
+ stepList.value = [{ STEP_NAME: "请选择", STEP_ID: "" }, ...list];
+};
+const userStore = useUserStore();
+const fnRemoveWork = async (row) => {
+ await ElMessageBox.prompt("请确认是否作废作业票", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ inputPlaceholder: "请输入作废原因",
+ inputPattern: /^.{1,254}$/,
+ inputErrorMessage: "作废原因不可为空",
+ }).then(async ({ value }) => {
+ await setEightWorkInvalid({
+ WORK_ID: row.HIGHWORK_ID,
+ WORK_TYPE: "HIGH",
+ STEP_REASON: value,
+ });
+ ElMessage.success("作废成功");
+ await fnResetPaginationTransfer();
+ });
};
const fnPreviewVideo = (VIDEO_PATH) => {
data.videoDialog.visible = true;
@@ -260,7 +292,8 @@ const fnShowPoints = (id) => {
const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getHighWorkList, {
- otherParams: props.entrance === "archive" ? { STEP_ID: "99" } : {},
+ otherParams:
+ props.entrance === "archive" ? { STEP_ID: "99" } : { WORK_STATE: "0" },
});
const data = reactive({
flowChartDialog: {
diff --git a/src/views/high/job_data/view.vue b/src/views/high/job_data/view.vue
index fed3571..091eb7a 100644
--- a/src/views/high/job_data/view.vue
+++ b/src/views/high/job_data/view.vue
@@ -44,8 +44,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
|
@@ -60,8 +60,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -73,8 +73,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -91,7 +91,16 @@
| 作业实施时间 |
- {{ data.info.WORK_START_DATE }}至{{ data.info.WORK_END_DATE }}止
+ {{ data.info.WORK_START_DATE
+ }}{{ data.info.WORK_START_DATE ? "至" : ""
+ }}{{ data.info.WORK_END_DATE
+ }}{{ data.info.WORK_END_DATE ? "止" : "" }}
+ |
+
+
+ | 作废原因 |
+
+ {{ data.info.STEP_REASON }}
|
@@ -116,8 +125,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -131,12 +140,13 @@
![]()
|
@@ -147,20 +157,21 @@
:key="item.BUS_HIGHWORK_MEASURES_ID"
>
{{ data.measuresList.length + 1 + index }} |
-
+ |
其他安全措施： {{ item.DESCR }}
|
-
+ |
![]()
|
@@ -172,20 +183,15 @@
安全交底人：
-
-
- ![]()
-
+
+ ![]()
- {{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}
+ {{ item }}
|
|
@@ -222,8 +228,8 @@
data.signs.ACCEPT_CONFESS?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME[index] }}
@@ -244,8 +250,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFIRM?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFIRM?.[0].SIGN_TIME[index] }}
@@ -266,8 +272,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.LEADER?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.LEADER?.[0].SIGN_TIME[index] }}
@@ -287,8 +293,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.AUDIT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.AUDIT?.[0].SIGN_TIME[index] }}
@@ -309,15 +315,37 @@
v-viewer
:src="VITE_FILE_URL + data.signs.APPROVE?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.APPROVE?.[0].SIGN_TIME[index] }}
-
+
+ |
+ 监护人停止作业原因：{{ data.signs.STOP_WORK?.[0].DESCR }}
+
+ 签字：
+ ![]()
+ {{ data.signs.STOP_WORK?.[0].SIGN_TIME[index] }}
+ |
+
|
完工验收：{{ data.signs.ACCEPT?.[0].DESCR }}
@@ -331,8 +359,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.ACCEPT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.info.ACCEPT_TIME }}
diff --git a/src/views/hoisting/invalid/components/flow_chart.vue b/src/views/hoisting/invalid/components/flow_chart.vue
new file mode 100644
index 0000000..59c56b2
--- /dev/null
+++ b/src/views/hoisting/invalid/components/flow_chart.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+ {{ fnGetShowStepUser(item) }}
+ {{ item.ACT_TIME }}
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/hoisting/invalid/index.vue b/src/views/hoisting/invalid/index.vue
new file mode 100644
index 0000000..a2bd577
--- /dev/null
+++ b/src/views/hoisting/invalid/index.vue
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+ {{ row.AUDIT_USER_NAME || " 已跳过" }}
+
+
+
+
+ {{ row.APPROVE_USER_NAME || " 已跳过" }}
+
+
+
+
+
+ {{ row.STEP_NAME }}时作废本作业票
+ 验收归档后作废本作业票
+
+
+
+
+
+
+ 流程图
+
+
+ 审批表详情
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/hoisting/job_data/index.vue b/src/views/hoisting/job_data/index.vue
index 81cd873..7e7b4f5 100644
--- a/src/views/hoisting/job_data/index.vue
+++ b/src/views/hoisting/job_data/index.vue
@@ -99,6 +99,7 @@
暂存
气体检测打回
+ 监护人已停止作业
{{ row.NEXT_STEP_NAME }}
{{ row.STEP_NAME }}打回
@@ -106,6 +107,7 @@
审批表详情
+
+ 作废
+
@@ -218,11 +233,14 @@ import {
getHoistingList,
getTaskSetps,
getHoistingFlow,
+ setEightWorkInvalid,
} from "@/request/eight_work.js";
import CheckList from "@/components/safety_briefing_checklist/index.vue";
import LayoutDepartment from "@/components/department/index.vue";
import ShowPoints from "@/views/map_settings/assignment_ticket_area_settings/components/show_points.vue";
+import { useUserStore } from "@/pinia/user.js";
+import { ElMessage, ElMessageBox } from "element-plus";
const props = defineProps({
entrance: {
type: String,
@@ -233,12 +251,8 @@ const props = defineProps({
const stepList = ref([]);
const getStepList = async () => {
- const { list } = await getTaskSetps({ TASK_ID: 1 });
- stepList.value = [
- { STEP_NAME: "请选择", STEP_ID: "" },
- ...list,
- { STEP_NAME: "验收归档", STEP_ID: "99" },
- ];
+ const { list } = await getTaskSetps({ TASK_ID: 10 });
+ stepList.value = [{ STEP_NAME: "请选择", STEP_ID: "" }, ...list];
};
getStepList();
const fnShowPoints = (id) => {
@@ -249,11 +263,29 @@ const fnPreviewVideo = (VIDEO_PATH) => {
data.videoDialog.visible = true;
data.videoDialog.src = VIDEO_PATH;
};
-
+const userStore = useUserStore();
+const fnRemoveWork = async (row) => {
+ await ElMessageBox.prompt("请确认是否作废作业票", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ inputPlaceholder: "请输入作废原因",
+ inputPattern: /^.{1,254}$/,
+ inputErrorMessage: "作废原因不可为空",
+ }).then(async ({ value }) => {
+ await setEightWorkInvalid({
+ WORK_ID: row.HOISTING_ID,
+ WORK_TYPE: "hoisting",
+ STEP_REASON: value,
+ });
+ ElMessage.success("作废成功");
+ await fnResetPaginationTransfer();
+ });
+};
const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getHoistingList, {
- otherParams: props.entrance === "archive" ? { STEP_ID: "99" } : {},
+ otherParams:
+ props.entrance === "archive" ? { STEP_ID: "99" } : { WORK_STATE: "0" },
});
const data = reactive({
flowChartDialog: {
diff --git a/src/views/hoisting/job_data/view.vue b/src/views/hoisting/job_data/view.vue
index 4826869..75753c3 100644
--- a/src/views/hoisting/job_data/view.vue
+++ b/src/views/hoisting/job_data/view.vue
@@ -35,8 +35,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
|
@@ -48,8 +48,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -61,8 +61,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -76,8 +76,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -103,7 +103,16 @@
| 作业实施时间 |
- {{ data.info.WORK_START_DATE }}至{{ data.info.WORK_END_DATE }}止
+ {{ data.info.WORK_START_DATE
+ }}{{ data.info.WORK_START_DATE ? "至" : ""
+ }}{{ data.info.WORK_END_DATE
+ }}{{ data.info.WORK_END_DATE ? "止" : "" }}
+ |
+
+
+ | 作废原因 |
+
+ {{ data.info.STEP_REASON }}
|
@@ -128,8 +137,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -143,12 +152,13 @@
![]()
|
@@ -159,20 +169,21 @@
:key="item.BUS_HOISTING_MEASURES_ID"
>
{{ data.measuresList.length + 1 + index }} |
-
+ |
其他安全措施： {{ item.DESCR }}
|
-
+ |
![]()
|
@@ -193,8 +204,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -210,8 +221,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFESS?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}
@@ -234,8 +245,8 @@
data.signs.ACCEPT_CONFESS?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME[index] }}
@@ -255,8 +266,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFIRM?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFIRM?.[0].SIGN_TIME[index] }}
@@ -281,8 +292,8 @@
data.signs.PROJECT_MANAGER?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{
@@ -304,8 +315,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.LEADER?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.LEADER?.[0].SIGN_TIME[index] }}
@@ -325,15 +336,14 @@
v-viewer
:src="VITE_FILE_URL + data.signs.AUDIT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.AUDIT?.[0].SIGN_TIME[index] }}
-
|
审批部门意见：{{ data.signs.APPROVE?.[0].DESCR }}
@@ -347,14 +357,37 @@
v-viewer
:src="VITE_FILE_URL + data.signs.APPROVE?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.APPROVE?.[0].SIGN_TIME[index] }}
|
+
+ |
+ 监护人停止作业原因：{{ data.signs.STOP_WORK?.[0].DESCR }}
+
+ 签字：
+ ![]()
+ {{ data.signs.STOP_WORK?.[0].SIGN_TIME[index] }}
+ |
+
|
完工验收：{{ data.signs.ACCEPT?.[0].DESCR }}
@@ -368,8 +401,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.ACCEPT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.info.ACCEPT_TIME }}
diff --git a/src/views/hot_work/invalid/components/flow_chart.vue b/src/views/hot_work/invalid/components/flow_chart.vue
new file mode 100644
index 0000000..59c56b2
--- /dev/null
+++ b/src/views/hot_work/invalid/components/flow_chart.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+ {{ fnGetShowStepUser(item) }}
+ {{ item.ACT_TIME }}
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/hot_work/invalid/index.vue b/src/views/hot_work/invalid/index.vue
new file mode 100644
index 0000000..d52a5b5
--- /dev/null
+++ b/src/views/hot_work/invalid/index.vue
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+ {{ row.AUDIT_USER_NAME || " 已跳过" }}
+
+
+
+
+ {{ row.APPROVE_USER_NAME || " 已跳过" }}
+
+
+
+
+
+
+ {{ row.STEP_NAME }}时作废本作业票
+ 验收归档后作废本作业票
+
+
+
+
+
+
+ 流程图
+
+
+ 审批表详情
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/hot_work/job_data/index.vue b/src/views/hot_work/job_data/index.vue
index 954301d..a83e63c 100644
--- a/src/views/hot_work/job_data/index.vue
+++ b/src/views/hot_work/job_data/index.vue
@@ -103,6 +103,7 @@
暂存
气体检测打回
+ 监护人已停止作业
{{ row.NEXT_STEP_NAME }}
{{ row.STEP_NAME }}打回
@@ -110,6 +111,7 @@
审批表详情
+
+ 作废
+
@@ -220,10 +235,12 @@ import {
getHotWorkList,
getTaskSetps,
getHotWorkFlow,
+ setEightWorkInvalid,
} from "@/request/eight_work.js";
import LayoutDepartment from "@/components/department/index.vue";
import ShowPoints from "@/views/map_settings/assignment_ticket_area_settings/components/show_points.vue";
-
+import { useUserStore } from "@/pinia/user.js";
+import { ElMessage, ElMessageBox } from "element-plus";
const props = defineProps({
entrance: {
type: String,
@@ -235,13 +252,27 @@ const stepList = ref([]);
const getStepList = async () => {
const { list } = await getTaskSetps({ TASK_ID: 1 });
- stepList.value = [
- { STEP_NAME: "请选择", STEP_ID: "" },
- ...list,
- { STEP_NAME: "验收归档", STEP_ID: "99" },
- ];
+ stepList.value = [{ STEP_NAME: "请选择", STEP_ID: "" }, ...list];
};
getStepList();
+const userStore = useUserStore();
+const fnRemoveWork = async (row) => {
+ await ElMessageBox.prompt("请确认是否作废作业票", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ inputPlaceholder: "请输入作废原因",
+ inputPattern: /^.{1,254}$/,
+ inputErrorMessage: "作废原因不可为空",
+ }).then(async ({ value }) => {
+ await setEightWorkInvalid({
+ WORK_ID: row.HOTWORK_ID,
+ WORK_TYPE: "HOTWORK",
+ STEP_REASON: value,
+ });
+ ElMessage.success("操作成功");
+ await fnResetPaginationTransfer();
+ });
+};
const fnShowPoints = (id) => {
data.showPointsDialog.id = id;
data.showPointsDialog.visible = true;
@@ -254,11 +285,11 @@ const fnPreviewVideo = (VIDEO_PATH) => {
data.videoDialog.visible = true;
data.videoDialog.src = VIDEO_PATH;
};
-
const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getHotWorkList, {
- otherParams: props.entrance === "archive" ? { STEP_ID: "99" } : {},
+ otherParams:
+ props.entrance === "archive" ? { STEP_ID: "99" } : { WORK_STATE: "0" },
});
const data = reactive({
flowChartDialog: {
diff --git a/src/views/hot_work/job_data/view.vue b/src/views/hot_work/job_data/view.vue
index 674de3f..b006bb4 100644
--- a/src/views/hot_work/job_data/view.vue
+++ b/src/views/hot_work/job_data/view.vue
@@ -43,8 +43,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="ml-10 mt-10"
/>
|
@@ -62,11 +62,13 @@
分析人 |
![]()
|
@@ -87,10 +89,19 @@
| 动火作业实施时间 |
- {{ data.info.WORK_START_DATE }}至{{ data.info.WORK_END_DATE }}止
+ {{ data.info.WORK_START_DATE
+ }}{{ data.info.WORK_START_DATE ? "至" : ""
+ }}{{ data.info.WORK_END_DATE
+ }}{{ data.info.WORK_END_DATE ? "止" : "" }}
|
-
+
+ | 作废原因 |
+
+ {{ data.info.STEP_REASON }}
+ |
+
+
@@ -112,8 +123,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -127,12 +138,13 @@
![]()
|
@@ -143,20 +155,21 @@
:key="item.BUS_HOTWORK_MEASURES_ID"
>
{{ data.measuresList.length + 1 + index }} |
-
+ |
其他安全措施： {{ item.DESCR }}
|
-
+ |
![]()
|
@@ -178,8 +191,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -195,8 +208,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFESS?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}
@@ -220,8 +233,8 @@
data.signs.ACCEPT_CONFESS?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME[index] }}
@@ -241,8 +254,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.GUARDIAN?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.GUARDIAN?.[0].SIGN_TIME[index] }}
@@ -263,8 +276,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFIRM?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFIRM?.[0].SIGN_TIME[index] }}
@@ -285,8 +298,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.LEADER?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.LEADER?.[0].SIGN_TIME[index] }}
@@ -307,8 +320,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.AUDIT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.AUDIT?.[0].SIGN_TIME[index] }}
@@ -329,8 +342,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.APPROVE?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.APPROVE?.[0].SIGN_TIME[index] }}
@@ -351,14 +364,37 @@
v-viewer
:src="VITE_FILE_URL + data.signs.MONITOR?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.MONITOR?.[0].SIGN_TIME[index] }}
+
+ |
+ 监护人停止作业原因：{{ data.signs.STOP_WORK?.[0].DESCR }}
+
+ 签字：
+ ![]()
+ {{ data.signs.STOP_WORK?.[0].SIGN_TIME[index] }}
+ |
+
|
@@ -373,8 +409,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.ACCEPT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.info.ACCEPT_TIME }}
diff --git a/src/views/index/components/announcement.vue b/src/views/index/components/announcement.vue
index b22e387..533c433 100644
--- a/src/views/index/components/announcement.vue
+++ b/src/views/index/components/announcement.vue
@@ -6,6 +6,7 @@
hover
class="scroll"
:step="0.5"
+ :limit-scroll-num="15"
:single-wait-time="1000"
:single-height="24"
:model-value="!data.viewDialog.visible && active === 'first'"
@@ -26,6 +27,7 @@
hover
class="scroll"
:step="0.5"
+ :limit-scroll-num="10"
:single-wait-time="1000"
:single-height="24"
:model-value="!data.viewDialog.visible && active === 'second'"
@@ -88,12 +90,13 @@ const fnCorporateAnnouncementView = async (NOTICECORP_ID) => {
diff --git a/src/views/index/components/checklist_check.vue b/src/views/index/components/checklist_check.vue
deleted file mode 100644
index e02390c..0000000
--- a/src/views/index/components/checklist_check.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
- 搜索
-
-
-
-
-
-
-
-
-
diff --git a/src/views/index/components/count.vue b/src/views/index/components/count.vue
index 3163d35..0c169d1 100644
--- a/src/views/index/components/count.vue
+++ b/src/views/index/components/count.vue
@@ -1,80 +1,149 @@
-
+
- 
+ 
-
- 已验收
-
+
+ 存在风险
+
-
- 已超期
-
-
-
-
-
-
- 
-
-
- 存在风险
-
-
-
- 辨识部位
-
-
-
- 风险点(单元)
-
-
-
+
+ 
+
+
+ 清单总数
+
+
+
+ 检查总次数
+
+
+
+
+ 
+
+
+ 作业总数
+
+
+
+ 验收总数
+
+
+
- 
+ 
- 已使用存储
+ 安全检查总数
+
+ 涉及隐患总数
+
+
+
+
+
+
+
+
+
+ 
+
+
@@ -82,35 +151,65 @@
@@ -127,14 +226,18 @@ img {
align-items: center;
text-align: center;
- div:not(:first-child) {
- cursor: pointer;
+ //div:not(:first-child) {
+ // cursor: pointer;
+ //}
+
+ span {
+ font-size: 14px;
}
.countup-wrap {
padding-top: 10px;
font-weight: bold;
- font-size: 20px;
+ font-size: 18px;
}
}
diff --git a/src/views/index/components/emergency_plan.vue b/src/views/index/components/emergency_plan.vue
new file mode 100644
index 0000000..cfe40c9
--- /dev/null
+++ b/src/views/index/components/emergency_plan.vue
@@ -0,0 +1,78 @@
+
+
+ 应急预案
+
+
+ {{ emergency.emergencyplan }}
+ 应急预案
+
+
+ {{ emergency.emergencydrillcontent }}
+ 应急演练
+
+
+ {{ emergency.emergencyequipment }}
+ 应急物资
+
+
+ {{ emergency.emergencyteam }}
+ 应急队伍
+
+
+
+
+
+
+
diff --git a/src/views/index/components/list_check_investigation.vue b/src/views/index/components/list_check_investigation.vue
new file mode 100644
index 0000000..c6d6f83
--- /dev/null
+++ b/src/views/index/components/list_check_investigation.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index/components/list_check_type.vue b/src/views/index/components/list_check_situation.vue
similarity index 54%
rename from src/views/index/components/list_check_type.vue
rename to src/views/index/components/list_check_situation.vue
index 31afbc0..9a663cc 100644
--- a/src/views/index/components/list_check_type.vue
+++ b/src/views/index/components/list_check_situation.vue
@@ -1,24 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/cls_dia.vue b/src/views/index/education_index/components/cls_dia.vue
new file mode 100644
index 0000000..fbf9449
--- /dev/null
+++ b/src/views/index/education_index/components/cls_dia.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+ {{ fnCompareDate(row) }}
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/count.vue b/src/views/index/education_index/components/count.vue
new file mode 100644
index 0000000..4babc15
--- /dev/null
+++ b/src/views/index/education_index/components/count.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+ 任务数：{{ studyData.TASK_NUM }}
+
+ 
+
+
+ 培训人次
+
+ {{ studyData.USER_COUNT }}
+ 人
+
+
+
+ 所学课时
+
+ {{ studyData.SUM_CLASSHOUR }}
+ 课时
+
+
+
+ 考试通过率
+
+
+ {{
+ studyData.USER_COUNT === 0
+ ? 0.0
+ : parseInt(
+ (studyData.HG / studyData.USER_COUNT).toFixed(2) * 100
+ )
+ }}
+
+ %
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/file_management.vue b/src/views/index/education_index/components/file_management.vue
new file mode 100644
index 0000000..192db8c
--- /dev/null
+++ b/src/views/index/education_index/components/file_management.vue
@@ -0,0 +1,98 @@
+
+
+
+ 企业培训档案
+
+
+
+ 
+
+ 一企一档
+
+
+
+
+ 
+
+ 一期一档
+
+
+
+
+ 
+
+ 一人一档
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/job_training_types.vue b/src/views/index/education_index/components/job_training_types.vue
new file mode 100644
index 0000000..532c57d
--- /dev/null
+++ b/src/views/index/education_index/components/job_training_types.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/peo_dia.vue b/src/views/index/education_index/components/peo_dia.vue
new file mode 100644
index 0000000..159579a
--- /dev/null
+++ b/src/views/index/education_index/components/peo_dia.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/premium_courses.vue b/src/views/index/education_index/components/premium_courses.vue
new file mode 100644
index 0000000..97c1d9d
--- /dev/null
+++ b/src/views/index/education_index/components/premium_courses.vue
@@ -0,0 +1,239 @@
+
+
+
+
+
+
+
+ ![]()
+ 
+
+
+ 课件名称：{{ item.COURSEWARENAME }}
+
+ 课件学时：{{ item.CLASSHOUR }}分钟
+
+
+ 课件类型：{{ item.TYPE === "1" ? "视频课件" : "资料课件" }}
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/qy_dia.vue b/src/views/index/education_index/components/qy_dia.vue
new file mode 100644
index 0000000..e7ae9eb
--- /dev/null
+++ b/src/views/index/education_index/components/qy_dia.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+ {{
+ userStore.getUserInfo.CORP_NAME
+ }}
+ {{
+ userStore.getUserInfo.CORP_CODE
+ }}
+
+
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/star_of_learning.vue b/src/views/index/education_index/components/star_of_learning.vue
new file mode 100644
index 0000000..76be5e0
--- /dev/null
+++ b/src/views/index/education_index/components/star_of_learning.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+ 
+ {{ list[1]?.NAME }}
+
+
+ 
+ {{ list[0]?.NAME }}
+
+
+ 
+ {{ list[2]?.NAME }}
+
+
+
+ 排名
+ {{ active === "1" ? "名称" : "姓名" }}
+ 完成进度
+ 完成学时
+
+
+
+
+
+ {{ index + 1 }}
+
+ {{ item.NAME }}
+
+ {{
+ item.SUM_CLASSHOUR === 0
+ ? "0.00%"
+ : (
+ (item.COMPLETE_CLASSHOUR / item.SUM_CLASSHOUR) *
+ 100
+ ).toFixed("2") > 100
+ ? "100.00%"
+ : (
+ (item.COMPLETE_CLASSHOUR / item.SUM_CLASSHOUR) *
+ 100
+ ).toFixed("2") + "%"
+ }}
+
+ {{ item.COMPLETE_CLASSHOUR }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/task_progress.vue b/src/views/index/education_index/components/task_progress.vue
new file mode 100644
index 0000000..3166fca
--- /dev/null
+++ b/src/views/index/education_index/components/task_progress.vue
@@ -0,0 +1,259 @@
+
+
+
+ 任务培训进度
+
+
+
+
+
+
+
+
+
+
+ 学习任务名称
+ 开始时间
+ 结束时间
+ 状态
+
+
+
+
+
+ {{ item.STUDY_NAME }}
+ {{ item.PEIXUE_START_TIME }}
+ {{ item.PEIXUE_END_TIME }}
+
+
+ 进行中
+
+
+ 已结束
+
+
+ 未开始
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.STUDY_NAME }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/components/training_plan.vue b/src/views/index/education_index/components/training_plan.vue
new file mode 100644
index 0000000..24c81ca
--- /dev/null
+++ b/src/views/index/education_index/components/training_plan.vue
@@ -0,0 +1,150 @@
+
+
+
+ 培训计划
+
+
+ 计划总数：
+ {{
+ studyData.TASK_NUM
+ }}
+
+
+ 未完成数：
+ {{
+ studyData.TASK_NUM - studyData.START_TASK_COUNT
+ }}
+
+
+ 已完成数：
+ {{
+ studyData.START_TASK_COUNT
+ }}
+
+
+
+
+ 计划名称
+ 培训地点
+ 计划开始时间
+ 计划结束时间
+ 培训内容
+
+
+
+
+ {{ item.PLANNAME }}
+ {{ item.ADDRESS }}
+ {{ item.STARTTIME }}
+ {{ item.ENDTIME }}
+
+ {{ subContent(item.CONTENT) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index/education_index/index.vue b/src/views/index/education_index/index.vue
new file mode 100644
index 0000000..bccb1cf
--- /dev/null
+++ b/src/views/index/education_index/index.vue
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index 7e93c5f..6240948 100644
--- a/src/views/index/index.vue
+++ b/src/views/index/index.vue
@@ -1,25 +1,30 @@
-
+
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
+
+
@@ -29,11 +34,13 @@
diff --git a/src/views/index/location_index/components/ai_video.vue b/src/views/index/location_index/components/ai_video.vue
new file mode 100644
index 0000000..c0a8c6f
--- /dev/null
+++ b/src/views/index/location_index/components/ai_video.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+ 监控名称：{{ video.VIDEONAME }}
+ 报警类型：{{ video.TYPE }}
+ 报警时间：{{ video.CREATTIME }}
+
+
+
+ 
+ 暂无Ai报警数据
+
+
+
+
+ 
+
+
+
+ {{ pendingAlarm }}
+
+ 待处理告警数
+
+
+
+
+ 
+
+
+
+ {{ alarmCountNum }}
+
+ 告警记录总数
+
+
+ {{ gatherCountNum }}
+ 聚集告警总数
+
+
+
+
+ 
+
+
+ {{ dangerCarCount.MAJORDANGERSOURCE_COUNT }}
+ 重大危险源总数
+
+
+
+ {{ dangerCarCount.MAJORDANGERSOURCE_DISPOSAL }}
+
+ 重大危险源发生数
+
+
+
+
+ 
+
+
+ {{ peoCarCount.people_total_entries }}
+ 人员进厂总数
+
+
+ {{ peoCarCount.vehicle_total_entries }}
+ 车辆进厂总数
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -78,6 +88,7 @@ import { addingPrefixToFile } from "@/assets/js/utils";
import { getKeyprojectcheckFindHidden } from "@/request/keyprojects";
import { reactive } from "vue";
import { useRoute } from "vue-router";
+import LayoutVideo from "@/components/video/index.vue";
const route = useRoute();
const data = reactive({
@@ -85,7 +96,12 @@ const data = reactive({
hiddenImgs: [],
ysImgs: [],
zgImgs: [],
+ videoDialog: {
+ src: "",
+ visible: false,
+ },
});
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
const fnGetData = async () => {
const resData = await getKeyprojectcheckFindHidden({
@@ -97,6 +113,10 @@ const fnGetData = async () => {
data.zgImgs = addingPrefixToFile(resData.pd.zgImgs);
};
fnGetData();
+const fnPreviewVideo = (row) => {
+ data.videoDialog.src = VITE_FILE_URL + row.FILEPATH;
+ data.videoDialog.visible = true;
+};
diff --git a/src/views/keyprojects/inspection/hidden_view.vue b/src/views/keyprojects/inspection/hidden_view.vue
index d04efb5..6fc00c5 100644
--- a/src/views/keyprojects/inspection/hidden_view.vue
+++ b/src/views/keyprojects/inspection/hidden_view.vue
@@ -16,6 +16,11 @@
class="ml-10"
/>
+
+
+ 隐患视频
+
+
{{ data.info.HIDDENDESCR }}
@@ -41,13 +46,29 @@
{{ data.info.RECTIFICATIONTIME }}
- {{ data.info.RECTIFICATIONTIME }}
+ ![]()
{{ data.info.CHECKTIME }}
- {{ data.info.CHECKTIME }}
+ ![]()
{{ data.info.ISPUNISH === "1" ? "是" : "否" }}
@@ -55,6 +76,10 @@
+
@@ -62,12 +87,21 @@
import { getKeyprojectcheckFindHidden } from "@/request/keyprojects";
import { reactive } from "vue";
import { useRoute } from "vue-router";
+import LayoutVideo from "@/components/video/index.vue";
+import { addingPrefixToFile } from "@/assets/js/utils.js";
+
const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
const route = useRoute();
const data = reactive({
info: {},
+ ysImgs: [],
+ zgImgs: [],
hiddenImgs: [],
+ videoDialog: {
+ src: "",
+ visible: false,
+ },
});
const fnGetData = async () => {
@@ -75,9 +109,15 @@ const fnGetData = async () => {
HIDDEN_ID: route.query.HIDDEN_ID,
});
data.info = resData.pd;
- data.hiddenImgs = resData.pd.hiddenImgs;
+ data.hiddenImgs = addingPrefixToFile(resData.pd.hiddenImgs);
+ data.ysImgs = addingPrefixToFile(resData.pd.ysImgs);
+ data.zgImgs = addingPrefixToFile(resData.pd.zgImgs);
};
fnGetData();
+const fnPreviewVideo = (row) => {
+ data.videoDialog.src = VITE_FILE_URL + row.FILEPATH;
+ data.videoDialog.visible = true;
+};
diff --git a/src/views/keyprojects/outsourced/view.vue b/src/views/keyprojects/outsourced/view.vue
index 390e6e6..04c2f6a 100644
--- a/src/views/keyprojects/outsourced/view.vue
+++ b/src/views/keyprojects/outsourced/view.vue
@@ -27,10 +27,10 @@
{{ data.info.JURISDICTION_UNIT_NAME }}
-
- {{ data.info.Q_COMPETENT_DEPT_NAME }}
+
+ {{ data.info.Q_DEPARTMENT_NAME }}
- {{ data.info.MANAGER_DEPARTMENT_NAME }}
+ {{ data.info.Q_DEPARTMENT_NAME }}
{{ data.info.INVOLVING_CORPS_DEPART_NAME }}
diff --git a/src/views/keyprojects/personnelmanagement/index.vue b/src/views/keyprojects/personnelmanagement/index.vue
index abd98a6..1672000 100644
--- a/src/views/keyprojects/personnelmanagement/index.vue
+++ b/src/views/keyprojects/personnelmanagement/index.vue
@@ -148,7 +148,7 @@ const data = reactive({
});
const resetPwd = async (PERSONNELMANAGEMENT_ID, NAME) => {
- await ElMessageBox.confirm("是否将[" + NAME + "]的密码重置为 666666 吗?", {
+ await ElMessageBox.confirm("是否将[" + NAME + "]的密码重置为 Aa@123456 吗?", {
type: "warning",
});
await setPersonnelmanagementResetPwd({ PERSONNELMANAGEMENT_ID });
diff --git a/src/views/large_screen_data_display/components/assignment_type.vue b/src/views/large_screen_data_display/components/assignment_type.vue
index ccbf867..d80ce56 100644
--- a/src/views/large_screen_data_display/components/assignment_type.vue
+++ b/src/views/large_screen_data_display/components/assignment_type.vue
@@ -62,7 +62,7 @@ const fnInitEcharts = (data) => {
show: true,
position: "inside",
formatter: (params) => {
- return `${params.percent}%`;
+ return `${params.data.value}`;
},
},
labelLine: {
diff --git a/src/views/large_screen_data_display/components/task_processing.vue b/src/views/large_screen_data_display/components/task_processing.vue
index 0d1d55d..c899675 100644
--- a/src/views/large_screen_data_display/components/task_processing.vue
+++ b/src/views/large_screen_data_display/components/task_processing.vue
@@ -218,10 +218,12 @@ const fnGetDataCheck = async () => {
};
for (const keyKey in key) {
const resData = await getTaskProcessingCheck({ COUNTTYPE: key[keyKey] });
- dailyInspectionList.value[keyKey].dayUncheck =
- resData.all.denominator - resData.all.molecule;
- dailyInspectionList.value[keyKey].dayChecked = resData.all.molecule;
- dailyInspectionList.value[keyKey].proportion = resData.all.percentage;
+ dailyInspectionList.value[keyKey].dayUncheck = resData.uncheck;
+ dailyInspectionList.value[keyKey].dayChecked = resData.checked;
+ dailyInspectionList.value[keyKey].proportion =
+ resData.total === 0
+ ? 0
+ : ((resData.checked / resData.total) * 100).toFixed(2);
}
};
fnGetDataCheck();
diff --git a/src/views/learning_garden/enterprise_video/index.vue b/src/views/learning_garden/enterprise_video/index.vue
index e9d7857..af5f824 100644
--- a/src/views/learning_garden/enterprise_video/index.vue
+++ b/src/views/learning_garden/enterprise_video/index.vue
@@ -48,6 +48,15 @@
+
+ 预览
+
+
@@ -94,8 +107,9 @@ import {
setEnterpriseVideoDelete,
setEnterpriseVideoRelease,
} from "@/request/learning_garden.js";
-import { ref } from "vue";
+import { reactive, ref } from "vue";
import Add from "./components/add.vue";
+import LayoutVideo from "@/components/video/index.vue";
const addDialogVisible = ref(false);
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
@@ -111,6 +125,18 @@ const fnDelete = debounce(
},
{ atBegin: true }
);
+const data = reactive({
+ videoDialog: {
+ src: "",
+ visible: false,
+ },
+});
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
+
+const fnPreviewVideo = (row) => {
+ data.videoDialog.src = VITE_FILE_URL + row.FILEPATH;
+ data.videoDialog.visible = true;
+};
const fnRelease = debounce(
1000,
async (VIDEO_ID) => {
diff --git a/src/views/learning_garden/learning_garden/task_list.vue b/src/views/learning_garden/learning_garden/task_list.vue
index 8da6519..88a8e0c 100644
--- a/src/views/learning_garden/learning_garden/task_list.vue
+++ b/src/views/learning_garden/learning_garden/task_list.vue
@@ -4,7 +4,7 @@
@@ -30,7 +30,7 @@
搜索
-
+
重置
@@ -172,7 +172,7 @@ const fnDelete = debounce(
await ElMessageBox.confirm("确定要删除吗？", { type: "warning" });
await setLearningGardenTaskDelete({ TEMPSTUDY_ID });
ElMessage.success("删除成功");
- fnResetPagination();
+ fnSubmit();
},
{ atBegin: true }
);
@@ -188,7 +188,7 @@ const fnBatchDelete = debounce(
const DATA_IDS = selectionData.map((item) => item.TEMPSTUDY_ID).join(",");
await setLearningGardenTaskBatchDelete({ DATA_IDS });
ElMessage.success("删除成功");
- fnResetPagination();
+ fnSubmit();
},
{ atBegin: true }
);
@@ -199,7 +199,7 @@ const fnDisableOrEnable = debounce(
await ElMessageBox.confirm(`确定要${message}吗？`, { type: "warning" });
await setLearningGardenTaskDisableOrEnable({ TEMPSTUDY_ID, STATUS });
ElMessage.success(`${message}成功`);
- fnResetPagination();
+ fnSubmit();
},
{ atBegin: true }
);
@@ -207,6 +207,18 @@ const fnLearningSituation = (TEMPSTUDY_ID) => {
data.learningSituationDialog.TEMPSTUDY_ID = TEMPSTUDY_ID;
data.learningSituationDialog.visible = true;
};
+const fnResetPaginationTransfer = () => {
+ searchForm.value.STATUS = "";
+ fnResetPagination({
+ STATUS: searchForm.value.STATUS,
+ });
+};
+
+const fnSubmit = () => {
+ fnResetPagination({
+ STATUS: searchForm.value.STATUS,
+ });
+};
diff --git a/src/views/login/custom.vue b/src/views/login/custom.vue
new file mode 100644
index 0000000..4e1871f
--- /dev/null
+++ b/src/views/login/custom.vue
@@ -0,0 +1,252 @@
+
+
+
+ 
+ 与您一起守护企业生产安全
+
+
+ 秦安安全一体化数字安管云平台
+
+ 以安全生产风险分级管控和隐患排查治理为基础，以落实企业主体责任为核心，建立线上线下相融合的“双重预防机制”信息化平台，实现从风险辨识到隐患排查治理的闭环管理。
+
+
+
+ 助力企业实现 “ 工业互联网+安全生产 ”
-
+
与您一起守护企业生产安全
-
+
+ 
+ 与您一起守护企业生产安全
+
- |
@@ -40,8 +40,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -71,8 +71,8 @@
v-viewer
:src="VITE_FILE_URL + data.info.CONTENT_IMG_PATH?.[0]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -84,8 +84,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{
@@ -102,7 +102,16 @@
| 作业实施时间 |
- {{ data.info.WORK_START_DATE }}至{{ data.info.WORK_END_DATE }}止
+ {{ data.info.WORK_START_DATE
+ }}{{ data.info.WORK_START_DATE ? "至" : ""
+ }}{{ data.info.WORK_END_DATE
+ }}{{ data.info.WORK_END_DATE ? "止" : "" }}
+ |
+
+
+ | 作废原因 |
+
+ {{ data.info.STEP_REASON }}
|
@@ -127,8 +136,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -142,12 +151,13 @@
![]()
|
@@ -158,20 +168,21 @@
:key="item.BUS_CUTROAD_MEASURES_ID"
>
{{ data.measuresList.length + 1 + index }} |
-
+ |
其他安全措施： {{ item.DESCR }}
|
-
+ |
![]()
|
@@ -192,8 +203,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -209,8 +220,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFESS?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}
@@ -233,8 +244,8 @@
data.signs.ACCEPT_CONFESS?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME[index] }}
@@ -254,8 +265,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFIRM?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFIRM?.[0].SIGN_TIME[index] }}
@@ -275,8 +286,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.LEADER?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.LEADER?.[0].SIGN_TIME[index] }}
@@ -296,15 +307,14 @@
v-viewer
:src="VITE_FILE_URL + data.signs.AUDIT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.AUDIT?.[0].SIGN_TIME[index] }}
-
|
审批部门意见：{{ data.signs.APPROVE?.[0].DESCR }}
@@ -318,14 +328,37 @@
v-viewer
:src="VITE_FILE_URL + data.signs.APPROVE?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.APPROVE?.[0].SIGN_TIME[index] }}
|
+
+ |
+ 监护人停止作业原因：{{ data.signs.STOP_WORK?.[0].DESCR }}
+
+ 签字：
+ ![]()
+ {{ data.signs.STOP_WORK?.[0].SIGN_TIME[index] }}
+ |
+
|
完工验收：{{ data.signs.ACCEPT?.[0].DESCR }}
@@ -339,8 +372,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.ACCEPT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.info.ACCEPT_TIME }}
diff --git a/src/views/performance_appraisal/departmental/components/list.vue b/src/views/performance_appraisal/departmental/components/list.vue
index 657d6ff..8abf522 100644
--- a/src/views/performance_appraisal/departmental/components/list.vue
+++ b/src/views/performance_appraisal/departmental/components/list.vue
@@ -1,9 +1,5 @@
-
+
@@ -202,10 +198,17 @@ const fnGetDataTransfer = () => {
});
};
const fnResetPaginationTransfer = () => {
+ searchForm.value.DEPTIDS = [];
fnResetPagination({
DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
};
+const fnSubmit = () => {
+ fnResetPagination({
+ DEPTIDS: searchForm.value.DEPTIDS?.join(","),
+ });
+};
+
const fnComputeLevel = (total) => {
if (total >= 75) return "一级";
else if (total >= 50) return "二级";
diff --git a/src/views/platform_resource_library/courseware/video/index.vue b/src/views/platform_resource_library/courseware/video/index.vue
index 22695bc..75c800e 100644
--- a/src/views/platform_resource_library/courseware/video/index.vue
+++ b/src/views/platform_resource_library/courseware/video/index.vue
@@ -8,8 +8,8 @@
>
-
-
+
+
@@ -105,7 +105,7 @@
:disabled="row.recordID !== '--'"
@click="fnAdd(row.VIDEOCOURSEWARE_ID)"
>
- 添加
+ {{ row.recordID !== "--" ? "已添加" : "添加" }}
-
-
+
+
diff --git a/src/views/risk_control/identifying_parts/components/add.vue b/src/views/risk_control/identifying_parts/components/add.vue
index b9f5fc6..d393c15 100644
--- a/src/views/risk_control/identifying_parts/components/add.vue
+++ b/src/views/risk_control/identifying_parts/components/add.vue
@@ -27,7 +27,11 @@
:limit="99"
/>
-
+
批量删除
+
@@ -142,6 +143,7 @@ import {
setIdentifyingPartsBatchDelete,
setIdentifyingPartsDelete,
setIdentifyingPartsImport,
+ // setRiskPointBatchReport,
} from "@/request/risk_control.js";
import { debounce } from "throttle-debounce";
import { ElMessage, ElMessageBox } from "element-plus";
@@ -231,6 +233,18 @@ const fnBatchDelete = debounce(
},
{ atBegin: true }
);
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// await setRiskPointBatchReport({
+// type: "identify",
+// model: "辨识部位",
+// });
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
const fnAddOrEdit = async (IDENTIFICATIONPARTS_ID, type) => {
data.addOrEditDialog.visible = true;
await nextTick();
diff --git a/src/views/risk_control/ledger/components/add.vue b/src/views/risk_control/ledger/components/add.vue
index 7239644..244dbed 100644
--- a/src/views/risk_control/ledger/components/add.vue
+++ b/src/views/risk_control/ledger/components/add.vue
@@ -62,7 +62,7 @@ const fnSubmit = debounce(
const params = {
...form.value,
CHECK_CONTENT: form.value.MEASURES,
- ACCIDENTS: form.value.ACCIDENTS.join(","),
+ ACCIDENTS: form.value.ACCIDENTS?.join(","),
ACCIDENTS_NAME: riskAddRef.value.accidentsName(),
};
let resData = {};
diff --git a/src/views/risk_control/ledger/index.vue b/src/views/risk_control/ledger/index.vue
index 25f5484..71d0394 100644
--- a/src/views/risk_control/ledger/index.vue
+++ b/src/views/risk_control/ledger/index.vue
@@ -4,7 +4,7 @@
@@ -161,6 +161,7 @@
>
批量删除
+
@@ -189,6 +190,7 @@ import {
setRiskControlLedgerBatchDelete,
setRiskControlLedgerDelete,
setRiskControlLedgerImport,
+ // setRiskPointBatchReport
} from "@/request/risk_control.js";
import { debounce } from "throttle-debounce";
import { ElMessage, ElMessageBox } from "element-plus";
@@ -239,6 +241,7 @@ const fnGetDataTransfer = () => {
});
};
const fnResetPaginationTransfer = () => {
+ searchForm.value.DEPTIDS = [];
fnResetPagination({
DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
@@ -300,6 +303,18 @@ const fnBatchDelete = debounce(
},
{ atBegin: true }
);
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// await setRiskPointBatchReport({
+// type: "ledger",
+// model: "风险管控台账"
+// });
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
const fnAddOrEdit = async (RISKPOINT_ID, type) => {
data.addOrEditDialog.visible = true;
await nextTick();
diff --git a/src/views/risk_control/risk_point/components/add.vue b/src/views/risk_control/risk_point/components/add.vue
index e7c6570..46983d2 100644
--- a/src/views/risk_control/risk_point/components/add.vue
+++ b/src/views/risk_control/risk_point/components/add.vue
@@ -11,6 +11,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
取消
@@ -25,8 +68,12 @@ import { useVModels } from "@vueuse/core";
import LayoutDepartment from "@/components/department/index.vue";
import { debounce } from "throttle-debounce";
import useFormValidate from "@/assets/js/useFormValidate.js";
-import { ElMessage } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
import { setRiskPointAdd, setRiskPointEdit } from "@/request/risk_control.js";
+import { Lock, Unlock } from "@element-plus/icons-vue";
+import { useUserStore } from "@/pinia/user.js";
+const userStore = useUserStore();
+const ISMAIN = userStore.getUserInfo.ISMAIN;
const props = defineProps({
visible: {
@@ -37,13 +84,30 @@ const props = defineProps({
form: {
type: Object,
required: true,
- default: () => ({}),
+ default: () => ({
+ isDisabledprocess: {
+ type: Boolean,
+ required: false,
+ },
+ isDisabledsource: {
+ type: Boolean,
+ required: false,
+ },
+ }),
},
type: {
type: String,
required: true,
default: "",
},
+ keyProcesses: {
+ type: String,
+ required: true,
+ },
+ responsiblePerson: {
+ type: String,
+ required: true,
+ },
});
const emits = defineEmits(["update:visible", "update:form", "get-data"]);
const { visible, form } = useVModels(props, emits);
@@ -55,6 +119,25 @@ const rules = {
{ required: true, message: "管控部门不能为空", trigger: "change" },
],
};
+const fnIsDisabledSource = async () => {
+ if (form.value.isDisabledsource) {
+ await ElMessageBox.confirm(
+ "请确认是否要编辑危险源编码，变更将会影响危险源数据推送！",
+ { type: "warning" }
+ );
+ }
+ form.value.isDisabledsource = !form.value.isDisabledsource;
+};
+const fnIsDisabledProcess = async () => {
+ if (form.value.isDisabledprocess) {
+ await ElMessageBox.confirm(
+ "确认需要修改高危工艺编码？变更将会影响高危工艺数据推送！",
+ { type: "warning" }
+ );
+ }
+ form.value.isDisabledprocess = !form.value.isDisabledprocess;
+};
+
const formRef = ref(null);
const fnClose = () => {
formRef.value.resetFields();
diff --git a/src/views/risk_control/risk_point/components/qr_code.vue b/src/views/risk_control/risk_point/components/qr_code.vue
index de7d853..bb3de3b 100644
--- a/src/views/risk_control/risk_point/components/qr_code.vue
+++ b/src/views/risk_control/risk_point/components/qr_code.vue
@@ -1,7 +1,11 @@
-
+
风险点（单元）信息
diff --git a/src/views/risk_control/risk_point/index.vue b/src/views/risk_control/risk_point/index.vue
index 61d9e64..1c22786 100644
--- a/src/views/risk_control/risk_point/index.vue
+++ b/src/views/risk_control/risk_point/index.vue
@@ -4,7 +4,7 @@
@@ -95,15 +95,21 @@
>
编辑
-
- 删除
-
+
+ 删除
+
+
@@ -121,6 +127,7 @@
>
批量删除
+
@@ -133,6 +140,8 @@
v-model:visible="data.addOrEditDialog.visible"
v-model:form="data.addOrEditDialog.form"
:type="data.addOrEditDialog.type"
+ :key-processes="keyProcesses"
+ :responsible-person="responsiblePerson"
@get-data="fnResetPaginationTransfer"
/>
{
+ keyProcesses.value = resData.mpd.IS_MAIN_TECHNOLO;
+ responsiblePerson.value = resData.mpd.IS_MAJOR_HAZARD;
+ },
+ });
const data = reactive({
importDialogVisible: false,
addOrEditDialog: {
@@ -173,6 +190,10 @@ const data = reactive({
form: {
DEPARTMENT_ID: "",
RISKUNITNAME: "",
+ SOURCE_ID: "",
+ HIGH_RISK_PROCESS_ID: "",
+ isDisabledprocess: true,
+ isDisabledsource: true,
},
},
qrCodeDialog: {
@@ -187,6 +208,8 @@ const fnGetDataTransfer = () => {
});
};
const fnResetPaginationTransfer = () => {
+ searchForm.value.DEPTIDS = [];
+
fnResetPagination({
DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
@@ -248,13 +271,37 @@ const fnBatchDelete = debounce(
},
{ atBegin: true }
);
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// // const DATA_IDS = selectionData.map((item) => item.RISKUNIT_ID).join(",");
+// await setRiskPointBatchReport({
+// type: "riskPoint",
+// model: "风险点单元"
+// });
+// ElMessage.success("删除成功");
+// fnResetPaginationTransfer();
+// },
+// { atBegin: true }
+// );
const fnAddOrEdit = async (RISKUNIT_ID, type) => {
data.addOrEditDialog.visible = true;
await nextTick();
data.addOrEditDialog.type = type;
+ data.addOrEditDialog.form = {
+ DEPARTMENT_ID: "",
+ RISKUNITNAME: "",
+ SOURCE_ID: "",
+ HIGH_RISK_PROCESS_ID: "",
+ isDisabledprocess: true,
+ isDisabledsource: true,
+ };
if (type === "edit") {
const resData = await getRiskPointView({ RISKUNIT_ID });
data.addOrEditDialog.form = resData.pd;
+ data.addOrEditDialog.form.isDisabledprocess = true;
+ data.addOrEditDialog.form.isDisabledsource = true;
}
};
const fnQrCode = (row) => {
diff --git a/src/views/risk_statement/job_notification_card/index.vue b/src/views/risk_statement/job_notification_card/index.vue
index 663184a..70b5e55 100644
--- a/src/views/risk_statement/job_notification_card/index.vue
+++ b/src/views/risk_statement/job_notification_card/index.vue
@@ -40,6 +40,9 @@
+
+
+
@@ -55,6 +58,9 @@ import LayoutDepartmentTree from "@/components/department_tree/index.vue";
import { useUserStore } from "@/pinia/user.js";
import { onBeforeRouteUpdate, useRoute, useRouter } from "vue-router";
import LayoutTooltipImg from "@/components/tooltip_img/index.vue";
+// import {debounce} from "throttle-debounce";
+// import {ElMessage, ElMessageBox} from "element-plus";
+// import {setRiskPointBatchReport} from "@/request/risk_control.js";
const userStore = useUserStore();
const router = useRouter();
@@ -67,6 +73,20 @@ const { list, pagination, fnGetData, fnResetPagination } = useListData(
otherParams: { DEPARTMENT_ID: DEPARTMENT_ID.value },
}
);
+
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// await setRiskPointBatchReport({
+// type: "jobnotificationmap",
+// model: "岗位告知卡"
+// });
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
+
const fnGetDataTransfer = () => {
fnGetData({
DEPARTMENT_ID: DEPARTMENT_ID.value,
diff --git a/src/views/risk_statement/risk_four_color_chart/index.vue b/src/views/risk_statement/risk_four_color_chart/index.vue
index 830c095..4de5d23 100644
--- a/src/views/risk_statement/risk_four_color_chart/index.vue
+++ b/src/views/risk_statement/risk_four_color_chart/index.vue
@@ -88,6 +88,7 @@
>
批量删除
+
@@ -116,6 +117,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
import { debounce } from "throttle-debounce";
import { nextTick, reactive } from "vue";
import Add from "./components/add.vue";
+// import {setRiskPointBatchReport} from "@/request/risk_control.js";
const props = defineProps({
listType: {
@@ -157,6 +159,32 @@ const fnDownload = async (RISKWARNING_ID) => {
"&TYPE=" +
props.listType[1];
};
+
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// if (props.listType[0] === "1"){
+// await setRiskPointBatchReport({
+// type: "riskmap",
+// model: "风险四色图"
+// });
+// }else if (props.listType[0] === "4"){
+// await setRiskPointBatchReport({
+// type: "securitycommitmentmap",
+// model: "安全生产承诺卡",
+// });
+// }else if(props.listType[0] === "3"){
+// await setRiskPointBatchReport({
+// type: "emergencytreatmentmap",
+// model: "应急处理卡",
+// });
+// }
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true },
+// );
+
const fnDelete = debounce(
1000,
async (RISKWARNING_ID) => {
diff --git a/src/views/risk_statement/risk_notification_card/index.vue b/src/views/risk_statement/risk_notification_card/index.vue
index 3d1759d..d3e8ca6 100644
--- a/src/views/risk_statement/risk_notification_card/index.vue
+++ b/src/views/risk_statement/risk_notification_card/index.vue
@@ -45,6 +45,9 @@
+
+
+
@@ -54,9 +57,25 @@ import { serialNumber } from "@/assets/js/utils";
import useListData from "@/assets/js/useListData.js";
import LayoutTooltipImg from "@/components/tooltip_img/index.vue";
import { getRiskNotificationCardList } from "@/request/risk_statement.js";
+// import { debounce } from "throttle-debounce";
+// import { ElMessage, ElMessageBox } from "element-plus";
+// import { setRiskPointBatchReport } from "@/request/risk_control.js";
const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
useListData(getRiskNotificationCardList);
+
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+// await setRiskPointBatchReport({
+// type: "risknotificationmap",
+// model: "风险告知卡",
+// });
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
diff --git a/src/views/safe_production/double_prevention/components/add.vue b/src/views/safe_production/double_prevention/components/add.vue
new file mode 100644
index 0000000..f646166
--- /dev/null
+++ b/src/views/safe_production/double_prevention/components/add.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/double_prevention/components/view.vue b/src/views/safe_production/double_prevention/components/view.vue
new file mode 100644
index 0000000..0531ac4
--- /dev/null
+++ b/src/views/safe_production/double_prevention/components/view.vue
@@ -0,0 +1,70 @@
+
+
+
+
+ {{ info.COMMITMENTNAME }}
+
+
+ {{ info.CREATORNAME }}
+
+
+ {{ info.CREATETIME }}
+
+
+
+ {{ getFileName(info.ATTACHMENT_ROUTE) }}
+ 预览
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/double_prevention/index.vue b/src/views/safe_production/double_prevention/index.vue
new file mode 100644
index 0000000..bf339b6
--- /dev/null
+++ b/src/views/safe_production/double_prevention/index.vue
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+ 预览附件
+
+
+ 删除
+
+
+ 编辑
+
+
+
+
+
+ 新增
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/evaluation_report/components/add.vue b/src/views/safe_production/evaluation_report/components/add.vue
new file mode 100644
index 0000000..faef39b
--- /dev/null
+++ b/src/views/safe_production/evaluation_report/components/add.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/evaluation_report/components/view.vue b/src/views/safe_production/evaluation_report/components/view.vue
new file mode 100644
index 0000000..0531ac4
--- /dev/null
+++ b/src/views/safe_production/evaluation_report/components/view.vue
@@ -0,0 +1,70 @@
+
+
+
+
+ {{ info.COMMITMENTNAME }}
+
+
+ {{ info.CREATORNAME }}
+
+
+ {{ info.CREATETIME }}
+
+
+
+ {{ getFileName(info.ATTACHMENT_ROUTE) }}
+ 预览
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/evaluation_report/index.vue b/src/views/safe_production/evaluation_report/index.vue
new file mode 100644
index 0000000..ce08641
--- /dev/null
+++ b/src/views/safe_production/evaluation_report/index.vue
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+ 预览附件
+
+
+ 删除
+
+
+ 编辑
+
+
+
+
+
+ 新增
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/production_standardization/add.vue b/src/views/safe_production/production_standardization/add.vue
new file mode 100644
index 0000000..d8c5457
--- /dev/null
+++ b/src/views/safe_production/production_standardization/add.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 返回
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/production_standardization/index.vue b/src/views/safe_production/production_standardization/index.vue
new file mode 100644
index 0000000..1d403e6
--- /dev/null
+++ b/src/views/safe_production/production_standardization/index.vue
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+ {{ serialNumber(data.pagination, $index) }}
+
+
+
+
+ {{ getStandardizationLevel(row.STANDARDIZATION_LEVEL) }}
+
+
+
+
+ {{ row.CERTIFICATE_NUMBER }}
+
+
+
+
+ {{ row.ISSUING_DATE }}
+
+
+
+
+ {{ row.EXPIRY_DATE }}
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/production_standardization/view.vue b/src/views/safe_production/production_standardization/view.vue
new file mode 100644
index 0000000..ac2334b
--- /dev/null
+++ b/src/views/safe_production/production_standardization/view.vue
@@ -0,0 +1,56 @@
+
+
+
+
+ {{ getStandardizationLevel(info.STANDARDIZATION_LEVEL) }}
+
+
+ {{ info.CERTIFICATE_NUMBER }}
+
+
+ {{ info.ISSUING_DATE }}
+
+
+ {{ info.EXPIRY_DATE }}
+
+
+
+ 返回
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/risk_evaluate/components/add.vue b/src/views/safe_production/risk_evaluate/components/add.vue
new file mode 100644
index 0000000..ed6db85
--- /dev/null
+++ b/src/views/safe_production/risk_evaluate/components/add.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/risk_evaluate/components/view.vue b/src/views/safe_production/risk_evaluate/components/view.vue
new file mode 100644
index 0000000..0531ac4
--- /dev/null
+++ b/src/views/safe_production/risk_evaluate/components/view.vue
@@ -0,0 +1,70 @@
+
+
+
+
+ {{ info.COMMITMENTNAME }}
+
+
+ {{ info.CREATORNAME }}
+
+
+ {{ info.CREATETIME }}
+
+
+
+ {{ getFileName(info.ATTACHMENT_ROUTE) }}
+ 预览
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/risk_evaluate/index.vue b/src/views/safe_production/risk_evaluate/index.vue
new file mode 100644
index 0000000..e585b85
--- /dev/null
+++ b/src/views/safe_production/risk_evaluate/index.vue
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+ 预览附件
+
+
+ 删除
+
+
+ 编辑
+
+
+
+
+
+ 新增
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/security_commitment/components/add.vue b/src/views/safe_production/security_commitment/components/add.vue
new file mode 100644
index 0000000..95bb356
--- /dev/null
+++ b/src/views/safe_production/security_commitment/components/add.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/security_commitment/components/view.vue b/src/views/safe_production/security_commitment/components/view.vue
new file mode 100644
index 0000000..0531ac4
--- /dev/null
+++ b/src/views/safe_production/security_commitment/components/view.vue
@@ -0,0 +1,70 @@
+
+
+
+
+ {{ info.COMMITMENTNAME }}
+
+
+ {{ info.CREATORNAME }}
+
+
+ {{ info.CREATETIME }}
+
+
+
+ {{ getFileName(info.ATTACHMENT_ROUTE) }}
+ 预览
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_production/security_commitment/index.vue b/src/views/safe_production/security_commitment/index.vue
new file mode 100644
index 0000000..e3f9fbc
--- /dev/null
+++ b/src/views/safe_production/security_commitment/index.vue
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+ 预览附件
+
+
+ 删除
+
+
+ 编辑
+
+
+
+
+
+ 新增
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/safety_environmental_management/safety_environmental/add.vue b/src/views/safety_environmental_management/safety_environmental/add.vue
index b39d8e9..6acd0e7 100644
--- a/src/views/safety_environmental_management/safety_environmental/add.vue
+++ b/src/views/safety_environmental_management/safety_environmental/add.vue
@@ -107,6 +107,7 @@
>
-
+
{
fnGetInspectionSitUserList(value, index);
};
const fnGetInspectionSitUserList = async (DEPARTMENT_ID, index) => {
- const { userList } = await getUserListAll({ DEPARTMENT_ID, NOMAIN: "1" });
+ const { userList } = await getUserListAll({ DEPARTMENT_ID });
data.form.inspectorList[index].inspectionUserList = userList;
};
watchEffect(() => {
+ if (data.form.inspectorList[0].INSPECTION_DEPARTMENT_ID)
+ fnGetInspectionSitUserList(DEPARTMENT_ID, 0);
if (data.form.INSPECTED_DEPARTMENT_ID)
fnGetInspectedSitUserList(data.form.INSPECTED_DEPARTMENT_ID);
});
diff --git a/src/views/safety_environmental_management/safety_environmental/index.vue b/src/views/safety_environmental_management/safety_environmental/index.vue
index 1c2183a..d9203c9 100644
--- a/src/views/safety_environmental_management/safety_environmental/index.vue
+++ b/src/views/safety_environmental_management/safety_environmental/index.vue
@@ -209,6 +209,7 @@
>
新建检查
+
@@ -242,7 +243,7 @@ import { useUserStore } from "@/pinia/user.js";
import { reactive, ref } from "vue";
import FlowChart from "./components/flow_chart.vue";
import Defense from "./components/defense.vue";
-
+// import { setRiskPointBatchReport } from "@/request/risk_control.js";
const stateList = [
{ ID: "0", NAME: "待检查人核实" },
{ ID: "1", NAME: "检查人核实中" },
@@ -340,6 +341,20 @@ const fnDefense = ({
INSPECTED_EXPLAIN_FILEPATH;
data.defenseDialog.info.INSPECTION_ID = INSPECTION_ID;
};
+// const fnReport = debounce(
+// 1000,
+// async () => {
+// await ElMessageBox.confirm("确定要上报数据吗？", { type: "warning" });
+//
+// await setRiskPointBatchReport({
+// type: "securityCheck",
+// model: "安全检查清单",
+// });
+//
+// ElMessage.success("上报成功");
+// },
+// { atBegin: true }
+// );
diff --git a/src/views/safety_environmental_management/safety_environmental/view.vue b/src/views/safety_environmental_management/safety_environmental/view.vue
index a4914ba..4295122 100644
--- a/src/views/safety_environmental_management/safety_environmental/view.vue
+++ b/src/views/safety_environmental_management/safety_environmental/view.vue
@@ -73,7 +73,7 @@
|
-
+
检查人员核实情况
diff --git a/src/views/security_commitment_pro/administration/index.vue b/src/views/security_commitment_pro/administration/index.vue
index e6ce2d3..418ea2a 100644
--- a/src/views/security_commitment_pro/administration/index.vue
+++ b/src/views/security_commitment_pro/administration/index.vue
@@ -4,7 +4,7 @@
@@ -170,6 +170,12 @@ const fnGetDataTransfer = () => {
});
};
const fnResetPaginationTransfer = () => {
+ searchForm.value.DEPTIDS = [];
+ fnResetPagination({
+ DEPTIDS: searchForm.value.DEPTIDS?.join(","),
+ });
+};
+const fnSubmit = () => {
fnResetPagination({
DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
@@ -184,7 +190,7 @@ const fnEnableOrDisable = debounce(
});
await setAdministrationEnableOrDisable({ PROMISE_ID, STATE });
ElMessage.success(`${message}成功`);
- fnResetPaginationTransfer();
+ fnSubmit();
},
{ atBegin: true }
);
diff --git a/src/views/security_investment/plan/components/add.vue b/src/views/security_investment/plan/components/add.vue
index ebacb08..0d79492 100644
--- a/src/views/security_investment/plan/components/add.vue
+++ b/src/views/security_investment/plan/components/add.vue
@@ -9,7 +9,11 @@
-
+
@@ -66,7 +70,7 @@
trigger: 'blur',
}"
>
-
+
@@ -88,6 +92,8 @@
>
元
diff --git a/src/views/signature_information_management/index.vue b/src/views/signature_information_management/index.vue
index a1f6ae0..9eb85ed 100644
--- a/src/views/signature_information_management/index.vue
+++ b/src/views/signature_information_management/index.vue
@@ -143,10 +143,17 @@ onBeforeRouteUpdate((to) => {
});
const fnSwitch = debounce(
1000,
- async (USER_ID, type, state, event) => {
- await ElMessageBox.confirm(`确定设置为${event.target.innerText}吗？`, {
- type: "warning",
- });
+ async (USER_ID, type, state) => {
+ await ElMessageBox.confirm(
+ `确定` +
+ (state === "0" ? `取消` : `设置`) +
+ `其` +
+ (type === "IS_RECORDER" ? "记录人员" : "安全生产机构负责人") +
+ `吗？`,
+ {
+ type: "warning",
+ }
+ );
await setSwitchUserStatus({ USER_ID, type, state });
ElMessage.success("设置成功");
fnResetPaginationTransfer();
diff --git a/src/views/special_operations/licensed_personnel/components/add.vue b/src/views/special_operations/licensed_personnel/components/add.vue
new file mode 100644
index 0000000..5690622
--- /dev/null
+++ b/src/views/special_operations/licensed_personnel/components/add.vue
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
diff --git a/src/views/special_operations/licensed_personnel/index.vue b/src/views/special_operations/licensed_personnel/index.vue
new file mode 100644
index 0000000..e9adadd
--- /dev/null
+++ b/src/views/special_operations/licensed_personnel/index.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+ 新增
+
+ 批量删除
+
+
+
+
+
+ {
+ fnResetPagination({
+ DEPTIDS: searchForm.value.DEPTIDS?.join(","),
+ });
+};
+
const fnIsItAWeekend = (column) => {
const day = dayjs(`${currentMonth.value}-${column.label}`).day();
return day === 0 || day === 6;
diff --git a/src/views/statistical_analysis/usage_situation/index.vue b/src/views/statistical_analysis/usage_situation/index.vue
index a80c4a4..419e88d 100644
--- a/src/views/statistical_analysis/usage_situation/index.vue
+++ b/src/views/statistical_analysis/usage_situation/index.vue
@@ -4,7 +4,7 @@
@@ -129,6 +129,14 @@ const { list, searchForm, pagination, fnGetData } = useListData(
}
);
const fnGetDataTransfer = () => {
+ searchForm.value.DEPTIDS = [];
+ searchForm.value.STATE = "";
+ fnGetData({
+ DEPTIDS: searchForm.value.DEPTIDS?.join(","),
+ STATE: searchForm.value.STATE,
+ });
+};
+const fnSubmit = () => {
fnGetData({
DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
diff --git a/src/views/temporary_electricity_usage/invalid/components/flow_chart.vue b/src/views/temporary_electricity_usage/invalid/components/flow_chart.vue
new file mode 100644
index 0000000..59c56b2
--- /dev/null
+++ b/src/views/temporary_electricity_usage/invalid/components/flow_chart.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+ {{ fnGetShowStepUser(item) }}
+ {{ item.ACT_TIME }}
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
diff --git a/src/views/temporary_electricity_usage/invalid/index.vue b/src/views/temporary_electricity_usage/invalid/index.vue
new file mode 100644
index 0000000..254027f
--- /dev/null
+++ b/src/views/temporary_electricity_usage/invalid/index.vue
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+ {{ row.ANALYZE_USER_NAME || " 已跳过" }}
+
+
+
+
+
+
+
+
+ {{ row.STEP_NAME }}时作废本作业票
+ 验收归档后作废本作业票
+
+
+
+
+
+
+ 流程图
+
+
+ 审批表详情
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/temporary_electricity_usage/job_data/index.vue b/src/views/temporary_electricity_usage/job_data/index.vue
index 602577c..92abe17 100644
--- a/src/views/temporary_electricity_usage/job_data/index.vue
+++ b/src/views/temporary_electricity_usage/job_data/index.vue
@@ -92,6 +92,7 @@
暂存
气体检测打回
+ 监护人已停止作业
{{ row.NEXT_STEP_NAME }}
{{ row.STEP_NAME }}打回
@@ -99,6 +100,7 @@
审批表详情
+
+ 作废
+
@@ -209,12 +220,14 @@ import {
getTemporaryElectricityUsageFlow,
getTaskSetps,
getTemporaryElectricityUsageList,
+ setEightWorkInvalid,
} from "@/request/eight_work.js";
import LayoutVideo from "@/components/video/index.vue";
import CheckList from "@/components/safety_briefing_checklist/index.vue";
import LayoutDepartment from "@/components/department/index.vue";
import ShowPoints from "@/views/map_settings/assignment_ticket_area_settings/components/show_points.vue";
-
+import { useUserStore } from "@/pinia/user.js";
+import { ElMessage, ElMessageBox } from "element-plus";
const props = defineProps({
entrance: {
type: String,
@@ -225,12 +238,8 @@ const props = defineProps({
const stepList = ref([]);
const getStepList = async () => {
- const { list } = await getTaskSetps({ TASK_ID: 1 });
- stepList.value = [
- { STEP_NAME: "请选择", STEP_ID: "" },
- ...list,
- { STEP_NAME: "验收归档", STEP_ID: "99" },
- ];
+ const { list } = await getTaskSetps({ TASK_ID: 8 });
+ stepList.value = [{ STEP_NAME: "请选择", STEP_ID: "" }, ...list];
};
getStepList();
const fnShowPoints = (id) => {
@@ -242,10 +251,30 @@ const fnPreviewVideo = (VIDEO_PATH) => {
data.videoDialog.src = VIDEO_PATH;
};
+const userStore = useUserStore();
+const fnRemoveWork = async (row) => {
+ await ElMessageBox.prompt("请确认是否作废作业票", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ inputPlaceholder: "请输入作废原因",
+ inputPattern: /^.{1,254}$/,
+ inputErrorMessage: "作废原因不可为空",
+ }).then(async ({ value }) => {
+ await setEightWorkInvalid({
+ WORK_ID: row.ELECTRICITY_ID,
+ WORK_TYPE: "electricity",
+ STEP_REASON: value,
+ });
+ ElMessage.success("作废成功");
+ await fnResetPaginationTransfer();
+ });
+};
+
const router = useRouter();
const { list, pagination, searchForm, fnGetData, fnResetPagination } =
useListData(getTemporaryElectricityUsageList, {
- otherParams: props.entrance === "archive" ? { STEP_ID: "99" } : {},
+ otherParams:
+ props.entrance === "archive" ? { STEP_ID: "99" } : { WORK_STATE: "0" },
});
const data = reactive({
flowChartDialog: {
diff --git a/src/views/temporary_electricity_usage/job_data/view.vue b/src/views/temporary_electricity_usage/job_data/view.vue
index caeb9f9..26d841d 100644
--- a/src/views/temporary_electricity_usage/job_data/view.vue
+++ b/src/views/temporary_electricity_usage/job_data/view.vue
@@ -40,8 +40,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -53,8 +53,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -68,8 +68,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -85,8 +85,8 @@
v-viewer
:src="VITE_FILE_URL + item"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -119,11 +119,13 @@
分析人 |
![]()
|
@@ -132,7 +134,16 @@
| 作业实施时间 |
- {{ data.info.WORK_START_DATE }}至{{ data.info.WORK_END_DATE }}止
+ {{ data.info.WORK_START_DATE
+ }}{{ data.info.WORK_START_DATE ? "至" : ""
+ }}{{ data.info.WORK_END_DATE
+ }}{{ data.info.WORK_END_DATE ? "止" : "" }}
+ |
+
+
+ | 作废原因 |
+
+ {{ data.info.STEP_REASON }}
|
@@ -157,8 +168,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -172,12 +183,13 @@
![]()
|
@@ -188,20 +200,21 @@
:key="item.BUS_ELECTRICITY_MEASURES_ID"
>
{{ data.measuresList.length + 1 + index }} |
-
+ |
其他安全措施： {{ item.DESCR }}
|
-
+ |
![]()
|
@@ -222,8 +235,8 @@
v-viewer
:src="VITE_FILE_URL + img"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
@@ -239,8 +252,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFESS?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFESS?.[0].SIGN_TIME[index] }}
@@ -263,8 +276,8 @@
data.signs.ACCEPT_CONFESS?.[0].SIGN_PATH[index]
"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.ACCEPT_CONFESS?.[0].SIGN_TIME[index] }}
@@ -284,8 +297,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.CONFIRM?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.CONFIRM?.[0].SIGN_TIME[index] }}
@@ -305,8 +318,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.AUDIT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.AUDIT?.[0].SIGN_TIME[index] }}
@@ -326,15 +339,37 @@
v-viewer
:src="VITE_FILE_URL + data.signs.APPROVE?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.signs.APPROVE?.[0].SIGN_TIME[index] }}
-
+
+ |
+ 监护人停止作业原因：{{ data.signs.STOP_WORK?.[0].DESCR }}
+
+ 签字：
+ ![]()
+ {{ data.signs.STOP_WORK?.[0].SIGN_TIME[index] }}
+ |
+
|
完工验收：{{ data.signs.ACCEPT?.[0].DESCR }}
@@ -348,8 +383,8 @@
v-viewer
:src="VITE_FILE_URL + data.signs.ACCEPT?.[0].SIGN_PATH[index]"
alt=""
- width="20"
- height="20"
+ width="25"
+ height="30"
class="mr-10 mt-10"
/>
{{ data.info.ACCEPT_TIME }}
diff --git a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue
index f430c75..00d5aa4 100644
--- a/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue
+++ b/src/views/three_institutional_libraries/safety_production_responsibility_system/components/list.vue
@@ -3,7 +3,7 @@
@@ -59,7 +59,7 @@
/>
-
+
搜索
@@ -220,8 +220,8 @@ import {
} from "@/request/three_institutional_libraries.js";
import LayoutThreeInstitutionalLibraries from "@/components/three_institutional_libraries/index.vue";
import { nextTick, reactive, ref } from "vue";
-import { getEnterpriseList } from "@/request/enterprise_management.js";
-import { debounce, throttle } from "throttle-debounce";
+// import { getEnterpriseList } from "@/request/enterprise_management.js";
+import { debounce } from "throttle-debounce";
import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
import { ElMessage, ElMessageBox } from "element-plus";
import useDownloadFile from "@/assets/js/useDownloadFile.js";
@@ -302,18 +302,19 @@ const fnGetDataTransfer = async () => {
fnGetData({ ...(await fnGetCheckedNodes()) });
};
const fnResetPaginationTransfer = async () => {
+ searchForm.value.labels = [];
fnResetPagination({ ...(await fnGetCheckedNodes()) });
};
-const selectLoading = ref(false);
-const enterpriseList = ref([]);
-const fnRemoteMethod = throttle(500, async (query) => {
- if (query) {
- selectLoading.value = true;
- const resData = await getEnterpriseList({ KEYWORDS: query });
- enterpriseList.value = resData.varList;
- selectLoading.value = false;
- }
-});
+// const selectLoading = ref(false);
+// const enterpriseList = ref([]);
+// const fnRemoteMethod = throttle(500, async (query) => {
+// if (query) {
+// selectLoading.value = true;
+// const resData = await getEnterpriseList({ KEYWORDS: query });
+// enterpriseList.value = resData.varList;
+// selectLoading.value = false;
+// }
+// });
const fnDelete = debounce(
1000,
async (BUS_TEXT_LIBRARY_ID) => {
diff --git a/src/views/three_institutional_libraries/safety_production_responsibility_system/index.vue b/src/views/three_institutional_libraries/safety_production_responsibility_system/index.vue
index 17e08ab..915c3c1 100644
--- a/src/views/three_institutional_libraries/safety_production_responsibility_system/index.vue
+++ b/src/views/three_institutional_libraries/safety_production_responsibility_system/index.vue
@@ -1,7 +1,11 @@
-
+
diff --git a/src/views/training_record_management/training_summary/add.vue b/src/views/training_record_management/training_summary/add.vue
new file mode 100644
index 0000000..f4516d3
--- /dev/null
+++ b/src/views/training_record_management/training_summary/add.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 返回
+
+
+
+
+
+
+
diff --git a/src/views/training_record_management/training_summary/index.vue b/src/views/training_record_management/training_summary/index.vue
new file mode 100644
index 0000000..4ea6f35
--- /dev/null
+++ b/src/views/training_record_management/training_summary/index.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(data.pagination, $index) }}
+
+
+
+
+ {{ row.TRAINING_TIME }}
+
+
+
+
+ {{ row.IS_DOCKING !== 0 ? "已上报" : "未上报" }}
+
+
+
+
+ {{ row.ISTRAINING !== "0" ? "已训练" : "未训练" }}
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+ 新增
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/training_record_management/training_summary/view.vue b/src/views/training_record_management/training_summary/view.vue
new file mode 100644
index 0000000..083260c
--- /dev/null
+++ b/src/views/training_record_management/training_summary/view.vue
@@ -0,0 +1,79 @@
+
+
+
+
+ {{ info.MOUTH_REPORT }}
+
+
+ {{ info.ISTRAINING === "1" ? "是" : "否" }}
+
+
+ {{ info.NOTRAININGNOTE }}
+
+
+ {{ info.TRAINING_TIME }}
+
+
+ {{ info.TRAINING_TARGET }}
+
+
+ {{ info.TRAINING_TYPE }}
+
+
+ {{ info.TRAINING_CONTENT }}
+
+
+ {{ info.PARTICIPANT_NUMBER }}
+
+
+ {{ info.HOURS }}
+
+
+ {{ info.ADDRESS }}
+
+
+ {{ info.TRAINER }}
+
+
+ {{ info.ASSESS_MENTMETHOD }}
+
+
+ {{ info.SUMMARYASSESSMENT }}
+
+
+
+
+
+
+
+
diff --git a/src/views/troubleshooting_statistics/day_inspection/index.vue b/src/views/troubleshooting_statistics/day_inspection/index.vue
index 1026f7f..ea50e27 100644
--- a/src/views/troubleshooting_statistics/day_inspection/index.vue
+++ b/src/views/troubleshooting_statistics/day_inspection/index.vue
@@ -4,7 +4,7 @@
@@ -116,12 +116,7 @@
-
+
启用
@@ -164,8 +159,6 @@ import {
layoutFnGetInventoryType,
layoutFnGetTroubleshootingType,
} from "@/assets/js/data_dictionary.js";
-import { SPECIAL_ENTERPRISES } from "@/assets/js/constant.js";
-import { useUserStore } from "@/pinia/user.js";
import { getChecklistInspectionRecordList } from "@/request/troubleshooting_statistics.js";
const props = defineProps({
@@ -175,8 +168,6 @@ const props = defineProps({
},
});
const router = useRouter();
-const userStore = useUserStore();
-const CORPINFO_ID = userStore.getUserInfo.CORPINFO_ID;
const PERIOD = {
day: "checkPeriod0001",
week: "checkPeriod0002",
@@ -192,6 +183,18 @@ const fnGetDataTransfer = () => {
});
};
const fnResetPaginationTransfer = () => {
+ searchForm.value.DEPTIDS = [];
+ searchForm.value.TYPE = "";
+ searchForm.value.RISKCHECKLISTTYPE = "";
+ searchForm.value.LISTINGLEVEL = "";
+ fnResetPagination({
+ DEPTIDS: searchForm.value.DEPTIDS?.join(","),
+ TYPE: searchForm.value.TYPE,
+ RISKCHECKLISTTYPE: searchForm.value.RISKCHECKLISTTYPE,
+ LISTINGLEVEL: searchForm.value.LISTINGLEVEL,
+ });
+};
+const fnSubmit = () => {
fnResetPagination({
DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
diff --git a/src/views/video_manager/video_manager/index.vue b/src/views/video_manager/video_manager/index.vue
index db4ecda..4f5e2b2 100644
--- a/src/views/video_manager/video_manager/index.vue
+++ b/src/views/video_manager/video_manager/index.vue
@@ -59,10 +59,11 @@
修改
定位
@@ -82,6 +83,13 @@
新增
+
+ 设置播放二级密码
+
@@ -107,10 +115,12 @@
import { serialNumber } from "@/assets/js/utils.js";
import useListData from "@/assets/js/useListData.js";
import {
+ getVerifyVideoPassWord,
getVideoManagerList,
getVideoManagerView,
setUpToBi,
setVideoManagerDelete,
+ setVideoPassWordEdit,
} from "@/request/video_manager.js";
import Add from "./components/add.vue";
import { nextTick, reactive } from "vue";
@@ -118,7 +128,8 @@ import { ElMessage, ElMessageBox } from "element-plus";
import VideoView from "./components/video.vue";
import { setVideoManagerList } from "@/request/eightwork_videomanager.js";
import SelectingPoints from "./components/selecting_points.vue";
-
+import { useUserStore } from "@/pinia/user.js";
+const userStore = useUserStore();
const data = reactive({
addDialog: {
Visible: false,
@@ -158,6 +169,21 @@ const fnDeleteVideo = async (row) => {
fnResetPagination();
}
};
+// 设置摄像头点播密码
+const fnSetVideoPassWord = async () => {
+ await ElMessageBox.prompt("请输入密码", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ inputPlaceholder: "请输入二级密码",
+ inputPattern: /^.{1,254}$/,
+ inputErrorMessage: "二级密码不可为空",
+ }).then(async ({ value }) => {
+ await setVideoPassWordEdit({ SOURCE: value });
+ ElMessage.success("设置成功");
+ userStore.setVideoPlayVerify(false);
+ });
+};
+
const fnAddOrEdit = async (VIDEOMANAGER_ID, type) => {
data.addDialog.Visible = true;
await nextTick();
@@ -167,8 +193,11 @@ const fnAddOrEdit = async (VIDEOMANAGER_ID, type) => {
data.addDialog.form = resData.pd;
}
};
-const fnSetPositioning = async (id) => {
- data.selectingPointsDialog.id = id;
+const fnSetPositioning = async (row) => {
+ data.selectingPointsDialog.id =
+ userStore.getUserInfo.PERSONNEL_TYPE === "1"
+ ? row.VIDEOMANAGER_ID
+ : row.PLS_ID;
data.selectingPointsDialog.visible = true;
};
const fnUpToBi = async (VIDEOMANAGER_ID) => {
@@ -184,9 +213,22 @@ const fnUpToBi = async (VIDEOMANAGER_ID) => {
});
fnResetPagination();
};
-const fnPreviewVideo = (VIDEOURL) => {
- data.videoDialog.visible = true;
+const fnPreviewVideo = async (VIDEOURL) => {
+ if (!userStore.getVideoPlayVerify) {
+ await ElMessageBox.prompt("请输入密码", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ inputPlaceholder: "请输入二级密码",
+ inputPattern: /^.{1,254}$/,
+ inputErrorMessage: "二级密码不可为空",
+ }).then(async ({ value }) => {
+ await getVerifyVideoPassWord({ SOURCE: value });
+ ElMessage.success("校验成功");
+ userStore.setVideoPlayVerify(true);
+ });
+ }
data.videoDialog.src = VIDEOURL;
+ data.videoDialog.visible = userStore.getVideoPlayVerify;
};
| | |
+ 
+ 
+ 
+ 
+