From 1627c2c304cf90185c412d36346a0815ebbeeb98 Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Sat, 14 Sep 2024 17:29:15 +0800 Subject: [PATCH] gx --- src/view/dialog/dialogRW.vue | 15 +++++++++------ src/view/sy_details.vue | 10 ++++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue index 765b302..99bda94 100644 --- a/src/view/dialog/dialogRW.vue +++ b/src/view/dialog/dialogRW.vue @@ -189,7 +189,7 @@ const handleRowClick = (row, column, event) => { const clicked = ref(false); const lampBox = ref(null); const escalation = () => { - if (data.character.deng !== 0) { + if (data.xq.deng !== 0) { clicked.value = true; } console.log(clicked.value); @@ -198,8 +198,8 @@ const escalation = () => { const confirmEvent = () => { console.log("confirm!", data.character); let ReportedDto = { - sfzhm: data.tableData.xq.sfzhm, - type: data.tableType.typeId, + sfzhm: data.sfzhm, + type: data.typeId, }; http.post(`/api/ggfwyth/pg/reported`, ReportedDto).then((res) => { if (res.code == 200) { @@ -226,11 +226,14 @@ const data = reactive({ columns: [], tableData: [], xq:{}, + typeId:'', + sfzhm:'' // pagination: {}, }); // 使用对象存储所有图片路径 const lampImages = { - 1: lamp1, + 0:lamp1, + 1: lamp3, 2: lamp2, 3: lamp3, 4: lamp4, @@ -246,12 +249,12 @@ const gridData = []; watch( () => props.dialogShow, (newVal, oldVal) => { - console.log(11111111); dialogShow.value = newVal; if(props.dialogShow==true){ - console.log(333); console.log(props.tableData); data.xq=props.tableData.data.xq; + data.typeId=props.tableData.typeId; + data.sfzhm=props.tableData.data.xq.sfzhm; // data.tableData=props.tableData.data; data.title=props.tableData.title; data.columns=props.tableData.columns; diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index ab6991a..c160c02 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -169,7 +169,7 @@ style="width: 30px; height: 30px" v-if="scope.row.deng == 0" :src="lampImages[1]" - + @click="statusDetails(scope.row)" /> { }); } else { getTable1(tableType); - } }; // 状态弹框关闭 @@ -519,8 +517,12 @@ const getTable1 = (pagination) => { http.get(`${pagination.url}?sfzhm=${data.identNo}`).then((res) => { if (res.code == 200) { tableType.data = res.data; - tableType.typeId = routers.query.id; + tableType.typeId = routers.query.id; dialogShow.value = true; + }else{ + ElMessage.warning({ + message: res.message, + }); } }); };