diff --git a/package.json b/package.json index a2a1f17..12e52a2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408211613", + "version": "1.0.202408270918", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/assets/styles/font.css b/src/assets/styles/font.css index 43f6371..a2b2521 100644 --- a/src/assets/styles/font.css +++ b/src/assets/styles/font.css @@ -2,18 +2,6 @@ font-family: "PingFang-SC-Heavy"; src: url("./font/PingFang_Heavy.ttf"); } -/* @font-face { - font-family: "PingFang-SC"; - src: url("./font/PingFang_Regular.ttf"); -} */ -/* @font-face { - font-family: "PingFang-SC"; - src: url("./font/PingFang_Light.ttf"); -} */ -/* @font-face { - font-family: "PingFang-SC"; - src: url("./font/PingFang_ExtraLight.ttf"); -} */ @font-face { font-family: "PingFang-SC-Medium"; src: url("./font/PingFang_Medium.ttf"); diff --git a/src/assets/styles/font/PingFang_ExtraLight.ttf b/src/assets/styles/font/PingFang_ExtraLight.ttf deleted file mode 100644 index d9b574b..0000000 Binary files a/src/assets/styles/font/PingFang_ExtraLight.ttf and /dev/null differ diff --git a/src/assets/styles/font/PingFang_Light.ttf b/src/assets/styles/font/PingFang_Light.ttf deleted file mode 100644 index a513705..0000000 Binary files a/src/assets/styles/font/PingFang_Light.ttf and /dev/null differ diff --git a/src/assets/styles/font/PingFang_Regular.ttf b/src/assets/styles/font/PingFang_Regular.ttf deleted file mode 100644 index 8790adb..0000000 Binary files a/src/assets/styles/font/PingFang_Regular.ttf and /dev/null differ diff --git a/src/assets/styles/fonts/Alibaba-PuHuiTi-Bold.woff2 b/src/assets/styles/fonts/Alibaba-PuHuiTi-Bold.woff2 new file mode 100644 index 0000000..27f1a6a Binary files /dev/null and b/src/assets/styles/fonts/Alibaba-PuHuiTi-Bold.woff2 differ diff --git a/src/assets/styles/fonts/Alibaba-PuHuiTi-Medium.woff2 b/src/assets/styles/fonts/Alibaba-PuHuiTi-Medium.woff2 new file mode 100644 index 0000000..997d87a Binary files /dev/null and b/src/assets/styles/fonts/Alibaba-PuHuiTi-Medium.woff2 differ diff --git a/src/assets/styles/fonts/Alibaba-PuHuiTi-Regular.woff2 b/src/assets/styles/fonts/Alibaba-PuHuiTi-Regular.woff2 new file mode 100644 index 0000000..02003a2 Binary files /dev/null and b/src/assets/styles/fonts/Alibaba-PuHuiTi-Regular.woff2 differ diff --git a/src/assets/styles/fonts/Arial-BoldMT.otf b/src/assets/styles/fonts/Arial-BoldMT.otf new file mode 100644 index 0000000..265000f Binary files /dev/null and b/src/assets/styles/fonts/Arial-BoldMT.otf differ diff --git a/src/assets/styles/fonts/ArialMT.otf b/src/assets/styles/fonts/ArialMT.otf new file mode 100644 index 0000000..343e2b3 Binary files /dev/null and b/src/assets/styles/fonts/ArialMT.otf differ diff --git a/src/assets/styles/fonts/PingFang_Bold.woff2 b/src/assets/styles/fonts/PingFang_Bold.woff2 new file mode 100644 index 0000000..436439c Binary files /dev/null and b/src/assets/styles/fonts/PingFang_Bold.woff2 differ diff --git a/src/assets/styles/fonts/PingFang_Heavy.woff2 b/src/assets/styles/fonts/PingFang_Heavy.woff2 new file mode 100644 index 0000000..c500068 Binary files /dev/null and b/src/assets/styles/fonts/PingFang_Heavy.woff2 differ diff --git a/src/assets/styles/fonts/PingFang_Medium.woff2 b/src/assets/styles/fonts/PingFang_Medium.woff2 new file mode 100644 index 0000000..b94815b Binary files /dev/null and b/src/assets/styles/fonts/PingFang_Medium.woff2 differ diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 66cbc5e..08d8497 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -1595,7 +1595,7 @@ font-weight: 500; font-size: 14px; color: #1890FF; - text-decoration: underline; + // text-decoration: underline; cursor: pointer; } @@ -1696,9 +1696,9 @@ font-weight: 500; font-size: 14px; color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; } th { @@ -1814,9 +1814,9 @@ font-weight: 500; font-size: 14px; color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; } th { @@ -1887,9 +1887,9 @@ font-family: AlibabaPuHuiTiM; font-size: 16px; color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; } } @@ -1977,9 +1977,9 @@ font-family: AlibabaPuHuiTiM; font-size: 16px; color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; } } @@ -2217,10 +2217,10 @@ font-weight: 500; font-size: 12px; color: #0086FF; - font-style: normal; + // font-style: normal; cursor: pointer; - text-decoration-line: underline; - text-transform: none; + // text-decoration-line: underline; + // text-transform: none; } } } @@ -2292,9 +2292,9 @@ font-family: AlibabaPuHuiTiM; font-size: 16px; color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; } } @@ -2425,9 +2425,9 @@ font-family: AlibabaPuHuiTiM; font-size: 16px; color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; } .project-type,.declare-time,.appropriate { @@ -2486,41 +2486,45 @@ // display: flex; // align-items: center; // justify-content: space-between; - display: grid; - grid-template-columns: 1fr 1.5fr 1fr; - padding: 10px 20px; + // display: grid; + // grid-template-columns: 1fr 1.5fr 1fr; + padding: 14px; margin-bottom: 10px; background-color: #fff; - .two-left { - font-family: AlibabaPuHuiTiM; - // flex: 1; - font-size: 16px; - color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; - cursor: pointer; + + .promoteProject-top { + .span-one { + font-family: AlibabaPuHuiTiM; + font-size: 16px; + color: #1890FF; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; + cursor: pointer; + display: flex; + } } - .two-right { - // flex: 1; + .promoteProject-bottom { + margin-top: 16px; display: flex; - align-items: center; - font-size: 14px; - color: #666666; - .right-left { + justify-content: space-between; + width: 85%; + .promoteProject-bottom-left { font-family: AlibabaPuHuiTiR; + font-size: 14px; + color: #666666; + display: flex; + .span-two { + font-family: AlibabaPuHuiTiM; + } } - .right-span { - font-family: AlibabaPuHuiTiM; - } - } - .promoteProject-bottom-right { - font-family: AlibabaPuHuiTiR; - // flex: 1; - font-size: 14px; - color: #666666; - .span-three { - font-family: ArialB; + .promoteProject-bottom-right { + font-family: AlibabaPuHuiTiR; + font-size: 14px; + color: #666666; + .span-three { + font-family: ArialB; + } } } } @@ -2554,9 +2558,9 @@ font-family: AlibabaPuHuiTiR; font-size: 14px; color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; } } @@ -2600,9 +2604,9 @@ font-family: AlibabaPuHuiTiM; font-size: 16px; color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; display: flex; } @@ -2853,7 +2857,7 @@ font-weight: 500; font-size: 14px; color: #1890FF; - text-decoration: underline; + // text-decoration: underline; cursor: pointer; } .tab-red { @@ -2982,9 +2986,9 @@ font-size: 12px; color: #0086FF; cursor: pointer; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; } } @@ -3432,9 +3436,9 @@ font-size: 12px; color: #0086FF; cursor: pointer; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; } } @@ -3550,10 +3554,10 @@ font-weight: 500; font-size: 12px; color: #0086FF; - font-style: normal; + // font-style: normal; cursor: pointer; - text-decoration-line: underline; - text-transform: none; + // text-decoration-line: underline; + // text-transform: none; } } @@ -3721,9 +3725,9 @@ font-weight: 500; font-size: 14px; color: #134EE6; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; } @@ -3832,10 +3836,18 @@ font-weight: 500; font-size: 14px; color: #134EE6; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; + cursor: pointer; + } + .project-trace-table-numberTwo { + font-family: PingFang-SC-Medium; + font-weight: 500; + font-size: 14px; + color: #134EE6; cursor: pointer; + margin-right: 5px; } .project-trace-table-type { font-weight: 500; @@ -4225,9 +4237,9 @@ font-weight: 500; font-size: 14px; color: #134EE6; - font-style: normal; - text-decoration-line: underline; - text-transform: none; + // font-style: normal; + // text-decoration-line: underline; + // text-transform: none; cursor: pointer; } .project-trace-table-type { diff --git a/src/views/dataCloudMap/components/collectDialog.vue b/src/views/dataCloudMap/components/collectDialog.vue index 2436ad8..2e5e09b 100644 --- a/src/views/dataCloudMap/components/collectDialog.vue +++ b/src/views/dataCloudMap/components/collectDialog.vue @@ -1,11 +1,3 @@ -