From 639fa421538b51d24e87dd5bf42197d63b5e4517 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 7 Mar 2024 19:04:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/headNoise.ts | 4 + .../newProjectOverView/centerTop.vue | 27 ++++-- .../newProjectOverView/data-dialog.vue | 6 +- .../newProjectOverView/index.vue | 2 +- .../newProjectOverView/leftTop.vue | 6 +- .../newProjectOverView/member-more-list.vue | 32 +++++-- .../newProjectOverView/risk-tip-dialog.vue | 86 +++++++++++++++++++ .../safeRisk/riskManage/right.vue | 59 ++++++++----- 8 files changed, 186 insertions(+), 36 deletions(-) create mode 100644 src/views/sevenLargeScreen/newProjectOverView/risk-tip-dialog.vue diff --git a/src/api/modules/headNoise.ts b/src/api/modules/headNoise.ts index 7268b1b..b1ded46 100644 --- a/src/api/modules/headNoise.ts +++ b/src/api/modules/headNoise.ts @@ -70,4 +70,8 @@ export const getWorkTicketDetail = (params: {}) => { export const getRiskList = (params: {}) => { return http.get(BASEURL + `/xmgl/rtRiskInventoryType/tree/page`, params); }; +//风险清册编辑 +export const riskDataEdit = (params: {}) => { + return http.post(BASEURL + `/xmgl/rtRiskInventoryType/edit`, params); +}; diff --git a/src/views/sevenLargeScreen/newProjectOverView/centerTop.vue b/src/views/sevenLargeScreen/newProjectOverView/centerTop.vue index cd97e82..0123e74 100644 --- a/src/views/sevenLargeScreen/newProjectOverView/centerTop.vue +++ b/src/views/sevenLargeScreen/newProjectOverView/centerTop.vue @@ -10,7 +10,7 @@
-
+
{ // 为了解决视频播放器渲染，第二个总是会默认显示一半，我动态设置样式让视图刷新，只要设置百分百就有问题，所以只能使用此方法 setTimeout(() => { // 获取所有的 video 元素 - var videos = document.getElementsByTagName('video'); - + var videos = document.getElementsByTagName("video"); // 遍历所有的 video 元素 for (var i = 0; i < videos.length; i++) { // 修改视频元素的样式 - videos[i].style.width = '99.9%'; - videos[i].style.height = '99.9%'; + videos[i].style.width = "99.9%"; + videos[i].style.height = "99.9%"; } }, 1000); }; @@ -76,6 +75,24 @@ const changeActive = (activeIndex: any) => { // } // ); onMounted(() => { + + // 接收模型构件点击传递的数据 + // window.addEventListener("message", (event:any) => { + // console.log(event) + // },false); + window.addEventListener( + "message", + async event => { + console.log(event) + const { type, data } = event.data; + // 更新数据 + if (type === "modelClick") { + console.log(data); + emits("openDialog",{...data,title:'风险提示'}) + } + }, + false + ); getVideoList(); }); diff --git a/src/views/sevenLargeScreen/newProjectOverView/data-dialog.vue b/src/views/sevenLargeScreen/newProjectOverView/data-dialog.vue index 82fae46..81ad1c3 100644 --- a/src/views/sevenLargeScreen/newProjectOverView/data-dialog.vue +++ b/src/views/sevenLargeScreen/newProjectOverView/data-dialog.vue @@ -7,8 +7,11 @@ {{ postData.title || '' }}
-
+ +
+
@@ -20,6 +23,7 @@ + + diff --git a/src/views/sevenLargeScreen/safeRisk/riskManage/right.vue b/src/views/sevenLargeScreen/safeRisk/riskManage/right.vue index 60297c6..b06253e 100644 --- a/src/views/sevenLargeScreen/safeRisk/riskManage/right.vue +++ b/src/views/sevenLargeScreen/safeRisk/riskManage/right.vue @@ -5,19 +5,19 @@
-
序号
-
工序
-
风险可能导致的后果
-
风险等级
- +
序号
+
工序
+
风险可能导致的后果
+
风险等级
+
是否已销号
-
{{ index + 1 }}
-
{{item.processName}}
-
{{item.riskPossibleConsequence}}
-
{{item.riskLevel}}
- +
{{ index + 1 }}
+
{{ item.processName }}
+
{{ item.riskPossibleConsequence }}
+
{{ item.riskLevel }}
+
@@ -46,7 +46,8 @@ import Card from "@/components/card.vue"; import { ref, onMounted, computed } from "vue"; import { GlobalStore } from "@/stores"; -import { getRiskList } from "@/api/modules/headNoise"; +import { getRiskList, riskDataEdit } from "@/api/modules/headNoise"; +import { ElMessage } from "element-plus"; let pageNo = ref(1 as any); let moreScroll = ref(true as any); @@ -66,10 +67,25 @@ function handleClick(event: any) { //获取风险清册 let alarmList = ref([] as any); let detailData = ref({} as any); -const getAlarmListInfo = async (tip:any) => { - let data:any = { +// 销号数据编辑 +const stateEdit = async (obj:any) => { + let data: any = { + ...obj + }; + const res: any = await riskDataEdit(data); + if (res.success) { + ElMessage({ + showClose: true, + message: "操作成功", + type: "success" + }); + await getAlarmListInfo("search"); + } +} +const getAlarmListInfo = async (tip: any) => { + let data: any = { projectSn: store.sn, - pageNo: tip == 'search'?1:pageNo.value, + pageNo: tip == "search" ? 1 : pageNo.value, pageSize: 20 }; const res: any = await getRiskList(data); @@ -98,7 +114,7 @@ function closeDialog() { } onMounted(async () => { - await getAlarmListInfo('search'); + await getAlarmListInfo("search"); refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => { // console.log("滚动容器", e); const scrollTop = e.target.scrollTop; @@ -153,7 +169,7 @@ onMounted(async () => { justify-content: center; align-items: center; text-align: center; - width: 25%; + width: 20%; } } .list-box { @@ -185,7 +201,7 @@ onMounted(async () => { } div { text-align: center; - width: 25%; + width: 20%; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; @@ -271,9 +287,12 @@ onMounted(async () => { } } } -:deep(){ +:deep() { .h-card .content { - height: 87% !important; -} + height: 87% !important; + } + .el-checkbox__inner { + background-color: transparent; + } }