diff --git a/src/view/analyze.vue b/src/view/analyze.vue index 6781359..2bfac5e 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -1023,6 +1023,7 @@ const getData = async () => { } }); + //调用借助页面的接口 await http.get("/api/ggfwyth/succour").then((res) => { if (res.code == 200) { data.dataAnalysis.forEach((item,index)=>{ @@ -1055,7 +1056,6 @@ const getData = async () => { data.dataAnalysis[5].data.push(item.jzrs); }); } - jz.value = '1'; data.list = data.dataAnalysis[0]; }); showEchart.value = true; diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue index f5c7be6..77888f3 100644 --- a/src/view/dialog/dialogRW.vue +++ b/src/view/dialog/dialogRW.vue @@ -48,16 +48,23 @@
状态: +
@@ -197,10 +204,14 @@ const handleRowClick = (row, column, event) => { } }; // 上报 +const clicked = ref(false) +const onCancel = () =>{ + clicked.value = true +} const confirmEvent = () => { console.log("confirm!"); }; -const cancelEvent = () => { +const cancel = () => { console.log("cancel!"); }; @@ -331,6 +342,7 @@ const handle = (current) => { border: none; --el-table-text-color: #fff; --el-table-header-text-color: #fff; + --el-table-border-color: none !important; } // :deep(.el-table th) { @@ -402,30 +414,4 @@ const handle = (current) => { height: 19px; } } -.el-popper.is-light .el-popper__arrow:before { - right: -60px; -} -:deep(.el-popover.el-popper) { - transform: translate(1034px, 291px) !important; -} -.table-els { - :deep(.el-table) { - background: rgba(32, 64, 115, 1); - - --el-table-border-color: none; - border: 1px solid #7aceff; - } - - :deep(.el-table--enable-row-hover .el-table__body tr:hover > td) { - background-color: #2f4b74; - } - - :deep(.el-table__empty-block) { - background-color: #122560; - } - - :deep(.el-table .el-table__row) { - border-bottom: none; - } -} diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index f0a6bcb..0a822c9 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -2956,23 +2956,23 @@ onMounted(() => {