diff --git a/src/view/echarts_hygiene/eP4.vue b/src/view/echarts_hygiene/eP4.vue index 37897c8..0252efd 100644 --- a/src/view/echarts_hygiene/eP4.vue +++ b/src/view/echarts_hygiene/eP4.vue @@ -18,8 +18,8 @@ let option = { // 外圈背景 { type: "pie", - center: ["60%", "55%"], - radius: ["50%", "82%"], + center: ["55%", "55%"], + radius: ["70%", "90%"], hoverAnimation: false, clockWise: false, itemStyle: { @@ -58,7 +58,7 @@ let option = { }, radius: ['50%', '70%'], hoverAnimation: false, - center: ['60%', '55%'], + center: ['55%', '55%'], data: [ { value: datas.value, diff --git a/src/view/echarts_hygiene/eP4_1.vue b/src/view/echarts_hygiene/eP4_1.vue new file mode 100644 index 0000000..f5c6753 --- /dev/null +++ b/src/view/echarts_hygiene/eP4_1.vue @@ -0,0 +1,144 @@ + + + + + \ No newline at end of file diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue index 57ad169..e535637 100644 --- a/src/view/hygiene.vue +++ b/src/view/hygiene.vue @@ -79,14 +79,14 @@
建档率
-
92.96%
+
92.96%
-
+
-
家庭医生
-
2000
+
家庭医生签约率
+
62.16%
@@ -141,6 +141,7 @@ import eP7 from "./echarts_hygiene/eP7.vue"; import eP6 from "./echarts_hygiene/eP6.vue"; import eP5 from "./echarts_hygiene/eP5.vue"; import eP4 from "./echarts_hygiene/eP4.vue"; +import eP4_1 from "./echarts_hygiene/eP4_1.vue"; import tnb from "./echarts_hygiene/tnb.vue"; import gxy from "./echarts_hygiene/gxy.vue"; import { ref, onMounted, onBeforeMount } from "vue"; @@ -209,6 +210,7 @@ const change = (name, index) => { } .familyPlanning { + width: 96%; background-image: url(@/assets/images/hygiene/center_title_2.png); background-repeat: no-repeat; background-size: 100% 100%; @@ -311,11 +313,13 @@ const change = (name, index) => { } .center_1 { + width: 96%; background-image: url(@/assets/images/hygiene/center_title_1.png); background-repeat: no-repeat; background-size: 100% 100%; } .center_2 { + width: 96%; background-image: url(@/assets/images/hygiene/new_center.png); background-repeat: no-repeat; background-size: 100% 100%; @@ -545,48 +549,7 @@ const change = (name, index) => { border-bottom: 13px solid rgba(57, 59, 109, 1); } } -.history2 { - font-size: 26px; - color: #ffffff; - line-height: 30px; - letter-spacing: 1px; - text-align: center; - font-style: normal; - font-family: PangMenZhengDao; - display: flex; - flex-direction: column; - align-items: center; - .va { - margin-top: 27px; - margin-bottom: 20px; - font-family: DINAlternate, DINAlternate; - - font-size: 26px; - color: #ffffff; - line-height: 30px; - letter-spacing: 1px; - text-shadow: 0px 2px 4px rgba(255, 255, 255, 0.5); - text-align: right; - font-style: normal; - } - img { - width: 113px; - height: 121px; - } - - .historyimg { - margin-top: 10px; - padding: 0 25px; - background-image: url(@/assets/images/hygiene/xtgl_1.png); - background-size: 100% 100%; - background-repeat: no-repeat; - font-size: 15px; - color: #ffffff; - line-height: 21px; - letter-spacing: 2px; - } -} .concernLabel { display: flex; align-items: center; @@ -705,11 +668,54 @@ const change = (name, index) => { height: 250px; display: flex; align-items: center; - justify-content: space-around; +} +.history2 { + font-size: 26px; + color: #ffffff; + line-height: 30px; + letter-spacing: 1px; + text-align: center; + font-style: normal; + font-family: PangMenZhengDao; + + display: flex; + flex-direction: column; + align-items: center; + .va { + margin-top: 27px; + margin-bottom: 20px; + + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 20px; + color: #ffffff; + line-height: 24px; + letter-spacing: 1px; + text-shadow: 0px 0px 23px rgba(0, 252, 255, 0.5); + text-align: center; + font-style: normal; + } + img { + width: 113px; + height: 121px; + } + + .historyimg { + margin-top: 10px; + padding: 0 25px; + background-image: url(@/assets/images/hygiene/xtgl_1.png); + background-size: 100% 100%; + background-repeat: no-repeat; + font-size: 15px; + color: #ffffff; + line-height: 21px; + letter-spacing: 2px; + } } .minTopPart2 { - width: 368px; - height: 145px; + margin-left: 5px; + width: 420px; + height: 136px; background-image: url(@/assets/images/hygiene/xia_1.png); background-repeat: no-repeat; background-size: 100% 100%; @@ -717,50 +723,69 @@ const change = (name, index) => { position: relative; display: flex; margin-top: 35px; + padding: 0 5px; + box-sizing: border-box; .left { display: flex; align-items: center; justify-content: center; - margin-left: 10px; - margin-top: -10px; + margin-left: 13px; .leftImg { - width: 100px; - height: 100px; + width: 90px; + height: 90px; } .left_me { margin-left: 10px; display: flex; flex-direction: column; - + font-family: PingFangSC, PingFang SC; font-weight: 500; - font-size: 16px; + font-size: 14px; color: #ffffff; - line-height: 22px; + line-height: 20px; letter-spacing: 2px; + text-shadow: 0px 0px 4px rgba(255, 255, 255, 0.65); + + .bo { + margin-top: 5px; + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 18px; + color: #00fffc; + line-height: 21px; + text-shadow: 0px 0px 13px rgba(0, 252, 255, 0.5); + } } } .right { display: flex; align-items: center; // justify-content: center; - margin-left: 10px; + .rightImg { - width: 78px; - height: 78px; - background-image: url(@/assets/images/hygiene/xia_right.png); - background-repeat: no-repeat; - background-size: 100% 100%; + width: 90px; + height: 90px; } .right_me { margin-left: 10px; display: flex; flex-direction: column; - + font-family: PingFangSC, PingFang SC; font-weight: 500; - font-size: 16px; + font-size: 14px; color: #ffffff; - line-height: 22px; + line-height: 20px; letter-spacing: 2px; + text-shadow: 0px 0px 4px rgba(255, 255, 255, 0.65); + .bo { + margin-top: 5px; + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 18px; + color: #ffe92c; + line-height: 21px; + text-shadow: 0px 0px 13px rgba(0, 252, 255, 0.5); + } } } }