diff --git a/dist.zip b/dist.zip index 0668d3e..a4b0fe0 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/index.html b/index.html index 3471e6c..9dae0cd 100644 --- a/index.html +++ b/index.html @@ -12,8 +12,8 @@
- + \ No newline at end of file diff --git a/src/components/header.vue b/src/components/header.vue index 4208920..51a4d7d 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -145,10 +145,7 @@ const data = reactive({ name: "总体概览", url: "/home/index", }, - { - name: "评估模型", - url: "/home/index/table", - }, + // { // name: "养老", // url: "/home/yl", @@ -169,6 +166,10 @@ const data = reactive({ name: "要素一张图", url: "/home/index/map", }, + { + name: "评估模型", + url: "/home/index/table", + }, { name: "智能分析", url: "/home/analyze", diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue index f4728f3..c4b553b 100644 --- a/src/view/dialog/dialogRW.vue +++ b/src/view/dialog/dialogRW.vue @@ -51,7 +51,7 @@ 状态： - +
确定要上报吗?
@@ -61,31 +61,35 @@
-
- - - -
-
注：工作日早上8:30自动推送浙政钉
- + + + + + + +
注：工作日早上8:30自动推送浙政钉
+ @@ -142,7 +146,7 @@ import lamp8 from "../../assets/sy-table/lampRed3.png"; import lamp9 from "../../assets/sy-table/lampYellow3.png"; import { ElMessage } from "element-plus"; import http from "@/utils/request.js"; -import { reRendering } from "element-plus/es/components/watermark/src/utils.mjs"; + const router = useRouter(); const routers = useRoute(); const props = defineProps({ @@ -159,14 +163,14 @@ const props = defineProps({ }, }, typeId: { - type: String, + type: Array, default: () => { return []; }, }, tableData: { - type: Array, + type: Object, default: () => { return []; }, @@ -177,22 +181,12 @@ const props = defineProps({ return ""; }, }, - character: { - type: Object, - required: true, - }, }); -const emit = defineEmits(["close", "handle", "openMessage"]); +const emit = defineEmits(["close", "handle"]); const handleRowClick = (row, column, event) => { if (props.dj) { console.log(row, props.dj, "rwxq"); - // router.push({ - // path: `/home/index/person`, - // query: { identNo: row.identNo, type: "detail" }, - // }); - // row 是当前行的数据 - // emit("openMessage", { identNo: row.identNo }); } }; // 上报 @@ -284,8 +278,6 @@ watch( } // data.tableData.length = []; if (props.tableData.data.ysx.length > 0) { - // console.log(444); - props.tableData.data.ysx.forEach((item, index) => { let obj = { deng: 1, @@ -300,7 +292,6 @@ watch( index: index1 + 1, }; }); - // console.log(data.tableData, 56565); } // data.tableData = props.tableData; @@ -320,7 +311,6 @@ onMounted(() => { dialogShow.value = props.dialogShow; }); - const closeDialog = () => { dialogShow.value = false; clicked.value = false; @@ -348,7 +338,7 @@ const closeDialog = () => { // } .tabelPart { height: 600px; - padding: 16px 110px; + padding: 16px 110px 32px 110px; background: linear-gradient( 270deg, rgba(0, 77, 131, 0.69) 0%, @@ -393,7 +383,7 @@ const closeDialog = () => { display: flex; align-items: center; } - + .lampBox { width: 270px; height: 146px; @@ -442,21 +432,75 @@ const closeDialog = () => { } } } - } .lampMessage { - font-size: 16px; - font-weight: 600; - font-family: PingFangSC, PingFang SC; - letter-spacing: 1px; - color: #ff5959; - width: 100%; - display: flex; - justify-content: flex-end; + font-size: 16px; + font-weight: 600; + font-family: PingFangSC, PingFang SC; + letter-spacing: 1px; + color: #ff5959; + width: 100%; + display: flex; + justify-content: flex-end; margin-top: 17px; - z-index: 10; + z-index: 10; + } + .bo { + width: 100%; + display: flex; + .title { + margin: 10px auto; + display: flex; + flex-direction: column; + + &_top { + display: flex; + align-items: end; + justify-content: center; + + img { + height: 33px; + width: 33px; + } + + .name { + font-family: PangMenZhengDao, PangMenZhengDao; + font-weight: 600; + font-size: 33px; + color: #ffffff; + line-height: 38px; + text-align: center; + font-style: normal; + letter-spacing: 2px; + background: linear-gradient(180deg, #ffffff 0%, #51ffef 100%); + -webkit-background-clip: text; + /*将设置的背景颜色限制在文字中*/ + -webkit-text-fill-color: transparent; + /*给文字设置成透明*/ + } } + &_botton { + margin-top: 5px; + height: 19px; + } + } + } + .progressGreen { + width: 181px; + height: 15px; + margin: 0 auto; + border-radius: 6px; + background: linear-gradient(358deg, #21eda8 0%, #8bffcd 100%); + } + .progressYellow { + width: 181px; + height: 15px; + border: 2px solid #ffe1a5; + margin: 0 auto; + border-radius: 6px; + } + :deep(.el-table) { --el-table-bg-color: none; --el-table-tr-bg-color: none; @@ -466,90 +510,22 @@ const closeDialog = () => { --el-table-text-color: #fff; --el-table-header-text-color: #fff; --el-table-border-color: none !important; + font-size: 16px; + } + :deep( + .el-table--striped + .el-table__body + tr.el-table__row--striped + td.el-table__cell + ) { + background: #2f4b74; + } + :deep(.el-table .el-table__cell) { + padding: 18px 0; } // :deep(.el-table th) { // text-align: center; // } } - -.pagePart { - height: 40px; - display: flex; - align-items: center; - justify-content: center; - - // :deep(.el-pagination) { - // --el-pagination-button-disabled-bg-color: none; - // --el-pagination-bg-color: none; - // --el-pagination-button-bg-color: none; - // --el-pagination-button-color: #fff; - // color: #fff; - // } - - // :deep(.el-pagination button:disabled) { - // background-color: rgba(0, 116, 255, 0) !important; - // } - // :deep(.el-pagination > .is-last) { - // color: #ffffff; - // } -} - -.progressGreen { - width: 181px; - height: 15px; - margin: 0 auto; - border-radius: 6px; - background: linear-gradient(358deg, #21eda8 0%, #8bffcd 100%); -} -.progressYellow { - width: 181px; - height: 15px; - border: 2px solid #ffe1a5; - margin: 0 auto; - border-radius: 6px; -} - -.bo { - width: 100%; - display: flex; -} - -.title { - margin: 10px auto; - display: flex; - flex-direction: column; - - &_top { - display: flex; - align-items: end; - justify-content: center; - - img { - height: 33px; - width: 33px; - } - - .name { - font-family: PangMenZhengDao, PangMenZhengDao; - font-weight: 600; - font-size: 33px; - color: #ffffff; - line-height: 38px; - text-align: center; - font-style: normal; - letter-spacing: 2px; - background: linear-gradient(180deg, #ffffff 0%, #51ffef 100%); - -webkit-background-clip: text; - /*将设置的背景颜色限制在文字中*/ - -webkit-text-fill-color: transparent; - /*给文字设置成透明*/ - } - } - - &_botton { - margin-top: 5px; - height: 19px; - } -} diff --git a/src/view/sy.vue b/src/view/sy.vue index 4226016..d724cda 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -1831,8 +1831,8 @@ const autoScroll = () => { } }; onBeforeMount(async () => { - document.cookie='lytoken=6b0e380b4a8f46baae4923f83faf670d' - tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); + // document.cookie='lytoken=6b0e380b4a8f46baae4923f83faf670d' + // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); getData(); getfw(); setTimeout(() => {