diff --git a/src/assets/images/education/new_cpfx.png b/src/assets/images/education/new_cpfx.png new file mode 100644 index 0000000..695b87f Binary files /dev/null and b/src/assets/images/education/new_cpfx.png differ diff --git a/src/assets/images/education/new_csr.png b/src/assets/images/education/new_csr.png new file mode 100644 index 0000000..100f382 Binary files /dev/null and b/src/assets/images/education/new_csr.png differ diff --git a/src/assets/images/education/new_xsqk.png b/src/assets/images/education/new_xsqk.png new file mode 100644 index 0000000..d95e006 Binary files /dev/null and b/src/assets/images/education/new_xsqk.png differ diff --git a/src/assets/images/education/new_xxgk.png b/src/assets/images/education/new_xxgk.png new file mode 100644 index 0000000..5420c08 Binary files /dev/null and b/src/assets/images/education/new_xxgk.png differ diff --git a/src/assets/images/hygiene/center_title_1.png b/src/assets/images/hygiene/center_title_1.png deleted file mode 100644 index 21bf2c1..0000000 Binary files a/src/assets/images/hygiene/center_title_1.png and /dev/null differ diff --git a/src/assets/images/hygiene/center_title_2.png b/src/assets/images/hygiene/center_title_2.png deleted file mode 100644 index d5ded56..0000000 Binary files a/src/assets/images/hygiene/center_title_2.png and /dev/null differ diff --git a/src/assets/images/hygiene/left_title_1.png b/src/assets/images/hygiene/left_title_1.png deleted file mode 100644 index 930dda6..0000000 Binary files a/src/assets/images/hygiene/left_title_1.png and /dev/null differ diff --git a/src/assets/images/hygiene/left_title_2.png b/src/assets/images/hygiene/left_title_2.png deleted file mode 100644 index 87a426b..0000000 Binary files a/src/assets/images/hygiene/left_title_2.png and /dev/null differ diff --git a/src/assets/images/hygiene/left_title_3.png b/src/assets/images/hygiene/left_title_3.png deleted file mode 100644 index a18219d..0000000 Binary files a/src/assets/images/hygiene/left_title_3.png and /dev/null differ diff --git a/src/assets/images/hygiene/new_center.png b/src/assets/images/hygiene/new_center.png deleted file mode 100644 index f9ed1eb..0000000 Binary files a/src/assets/images/hygiene/new_center.png and /dev/null differ diff --git a/src/assets/images/hygiene/new_fygl.png b/src/assets/images/hygiene/new_fygl.png new file mode 100644 index 0000000..298b703 Binary files /dev/null and b/src/assets/images/hygiene/new_fygl.png differ diff --git a/src/assets/images/hygiene/new_jkda.png b/src/assets/images/hygiene/new_jkda.png new file mode 100644 index 0000000..b833a92 Binary files /dev/null and b/src/assets/images/hygiene/new_jkda.png differ diff --git a/src/assets/images/hygiene/new_jkhd.png b/src/assets/images/hygiene/new_jkhd.png new file mode 100644 index 0000000..636e0c7 Binary files /dev/null and b/src/assets/images/hygiene/new_jkhd.png differ diff --git a/src/assets/images/hygiene/new_lmb.png b/src/assets/images/hygiene/new_lmb.png new file mode 100644 index 0000000..9d65a9c Binary files /dev/null and b/src/assets/images/hygiene/new_lmb.png differ diff --git a/src/assets/images/hygiene/new_mz.png b/src/assets/images/hygiene/new_mz.png new file mode 100644 index 0000000..0514b49 Binary files /dev/null and b/src/assets/images/hygiene/new_mz.png differ diff --git a/src/assets/images/hygiene/new_tjrs.png b/src/assets/images/hygiene/new_tjrs.png new file mode 100644 index 0000000..754d978 Binary files /dev/null and b/src/assets/images/hygiene/new_tjrs.png differ diff --git a/src/assets/images/hygiene/new_ylbx.png b/src/assets/images/hygiene/new_ylbx.png new file mode 100644 index 0000000..c6f2fae Binary files /dev/null and b/src/assets/images/hygiene/new_ylbx.png differ diff --git a/src/assets/images/hygiene/new_zcs.png b/src/assets/images/hygiene/new_zcs.png new file mode 100644 index 0000000..c3a3af5 Binary files /dev/null and b/src/assets/images/hygiene/new_zcs.png differ diff --git a/src/assets/images/hygiene/right_title_1.png b/src/assets/images/hygiene/right_title_1.png deleted file mode 100644 index df2b833..0000000 Binary files a/src/assets/images/hygiene/right_title_1.png and /dev/null differ diff --git a/src/assets/images/sy/left_1.png b/src/assets/images/sy/left_1.png deleted file mode 100644 index 8586158..0000000 Binary files a/src/assets/images/sy/left_1.png and /dev/null differ diff --git a/src/assets/images/sy/left_1_1.png b/src/assets/images/sy/left_1_1.png deleted file mode 100644 index 6b9b37c..0000000 Binary files a/src/assets/images/sy/left_1_1.png and /dev/null differ diff --git a/src/assets/images/sy/left_2.png b/src/assets/images/sy/left_2.png deleted file mode 100644 index ec8cdbe..0000000 Binary files a/src/assets/images/sy/left_2.png and /dev/null differ diff --git a/src/assets/images/sy/left_3.png b/src/assets/images/sy/left_3.png deleted file mode 100644 index 0f9c842..0000000 Binary files a/src/assets/images/sy/left_3.png and /dev/null differ diff --git a/src/assets/images/sy/new_jtsy.png b/src/assets/images/sy/new_jtsy.png new file mode 100644 index 0000000..9558b5d Binary files /dev/null and b/src/assets/images/sy/new_jtsy.png differ diff --git a/src/assets/images/sy/new_jyfw.png b/src/assets/images/sy/new_jyfw.png new file mode 100644 index 0000000..98e39dc Binary files /dev/null and b/src/assets/images/sy/new_jyfw.png differ diff --git a/src/assets/images/sy/new_jysy.png b/src/assets/images/sy/new_jysy.png new file mode 100644 index 0000000..ebf6dac Binary files /dev/null and b/src/assets/images/sy/new_jysy.png differ diff --git a/src/assets/images/sy/new_jzfw.png b/src/assets/images/sy/new_jzfw.png new file mode 100644 index 0000000..22f203f Binary files /dev/null and b/src/assets/images/sy/new_jzfw.png differ diff --git a/src/assets/images/sy/new_msfz.png b/src/assets/images/sy/new_msfz.png new file mode 100644 index 0000000..4eada28 Binary files /dev/null and b/src/assets/images/sy/new_msfz.png differ diff --git a/src/assets/images/sy/new_tysy.png b/src/assets/images/sy/new_tysy.png new file mode 100644 index 0000000..38117e0 Binary files /dev/null and b/src/assets/images/sy/new_tysy.png differ diff --git a/src/assets/images/sy/new_whsy.png b/src/assets/images/sy/new_whsy.png new file mode 100644 index 0000000..5d41141 Binary files /dev/null and b/src/assets/images/sy/new_whsy.png differ diff --git a/src/assets/images/sy/new_ylws.png b/src/assets/images/sy/new_ylws.png new file mode 100644 index 0000000..2fe8611 Binary files /dev/null and b/src/assets/images/sy/new_ylws.png differ diff --git a/src/assets/images/sy/right_1.png b/src/assets/images/sy/right_1.png deleted file mode 100644 index 7f18e12..0000000 Binary files a/src/assets/images/sy/right_1.png and /dev/null differ diff --git a/src/assets/images/sy/right_2.png b/src/assets/images/sy/right_2.png deleted file mode 100644 index 5af981f..0000000 Binary files a/src/assets/images/sy/right_2.png and /dev/null differ diff --git a/src/assets/images/sy/right_3.png b/src/assets/images/sy/right_3.png deleted file mode 100644 index ebab8cf..0000000 Binary files a/src/assets/images/sy/right_3.png and /dev/null differ diff --git a/src/assets/images/sy/right_4.png b/src/assets/images/sy/right_4.png deleted file mode 100644 index eec9704..0000000 Binary files a/src/assets/images/sy/right_4.png and /dev/null differ diff --git a/src/assets/images/work/center.png b/src/assets/images/work/center.png deleted file mode 100644 index 0d21b17..0000000 Binary files a/src/assets/images/work/center.png and /dev/null differ diff --git a/src/assets/images/work/center1.png b/src/assets/images/work/center1.png deleted file mode 100644 index 858b1d9..0000000 Binary files a/src/assets/images/work/center1.png and /dev/null differ diff --git a/src/assets/images/work/left_1.png b/src/assets/images/work/left_1.png deleted file mode 100644 index 7e0c9a5..0000000 Binary files a/src/assets/images/work/left_1.png and /dev/null differ diff --git a/src/assets/images/work/left_1_1.png b/src/assets/images/work/left_1_1.png deleted file mode 100644 index 1706843..0000000 Binary files a/src/assets/images/work/left_1_1.png and /dev/null differ diff --git a/src/assets/images/work/new_dyh.png b/src/assets/images/work/new_dyh.png new file mode 100644 index 0000000..6fb8ab7 Binary files /dev/null and b/src/assets/images/work/new_dyh.png differ diff --git a/src/assets/images/work/new_jzgk.png b/src/assets/images/work/new_jzgk.png new file mode 100644 index 0000000..079df4f Binary files /dev/null and b/src/assets/images/work/new_jzgk.png differ diff --git a/src/assets/images/work/new_qtjz.png b/src/assets/images/work/new_qtjz.png new file mode 100644 index 0000000..ac3d379 Binary files /dev/null and b/src/assets/images/work/new_qtjz.png differ diff --git a/src/assets/images/work/new_rsqt.png b/src/assets/images/work/new_rsqt.png new file mode 100644 index 0000000..c4e701a Binary files /dev/null and b/src/assets/images/work/new_rsqt.png differ diff --git a/src/assets/images/work/new_shljz.png b/src/assets/images/work/new_shljz.png new file mode 100644 index 0000000..3439f6a Binary files /dev/null and b/src/assets/images/work/new_shljz.png differ diff --git a/src/assets/images/work/new_zxjz.png b/src/assets/images/work/new_zxjz.png new file mode 100644 index 0000000..3c61711 Binary files /dev/null and b/src/assets/images/work/new_zxjz.png differ diff --git a/src/assets/images/work/right_1.png b/src/assets/images/work/right_1.png deleted file mode 100644 index b54beba..0000000 Binary files a/src/assets/images/work/right_1.png and /dev/null differ diff --git a/src/assets/images/work/right_2.png b/src/assets/images/work/right_2.png deleted file mode 100644 index e6d2f87..0000000 Binary files a/src/assets/images/work/right_2.png and /dev/null differ diff --git a/src/assets/images/yl/new_gllrbt.png b/src/assets/images/yl/new_gllrbt.png new file mode 100644 index 0000000..bd25318 Binary files /dev/null and b/src/assets/images/yl/new_gllrbt.png differ diff --git a/src/assets/images/yl/new_jhsy.png b/src/assets/images/yl/new_jhsy.png new file mode 100644 index 0000000..85ff598 Binary files /dev/null and b/src/assets/images/yl/new_jhsy.png differ diff --git a/src/assets/images/yl/new_lnrzb.png b/src/assets/images/yl/new_lnrzb.png new file mode 100644 index 0000000..ff8f610 Binary files /dev/null and b/src/assets/images/yl/new_lnrzb.png differ diff --git a/src/assets/images/yl/new_tklrjz.png b/src/assets/images/yl/new_tklrjz.png new file mode 100644 index 0000000..8404c61 Binary files /dev/null and b/src/assets/images/yl/new_tklrjz.png differ diff --git a/src/assets/images/yl/new_ylbx.png b/src/assets/images/yl/new_ylbx.png new file mode 100644 index 0000000..3582130 Binary files /dev/null and b/src/assets/images/yl/new_ylbx.png differ diff --git a/src/assets/images/yl/new_yljg.png b/src/assets/images/yl/new_yljg.png new file mode 100644 index 0000000..a385969 Binary files /dev/null and b/src/assets/images/yl/new_yljg.png differ diff --git a/src/assets/images/yl/new_zlfw.png b/src/assets/images/yl/new_zlfw.png new file mode 100644 index 0000000..38a9c38 Binary files /dev/null and b/src/assets/images/yl/new_zlfw.png differ diff --git a/src/view/education.vue b/src/view/education.vue index 47bf5fd..a6547d5 100644 --- a/src/view/education.vue +++ b/src/view/education.vue @@ -525,25 +525,25 @@ onBeforeMount(async () => { .left_1 { // background-image: url(@/assets/eduImg/title1.png); - background-image: url(@/assets/eduImg/title5.png); + background-image: url(@/assets/images/education/new_xsqk.png); background-repeat: no-repeat; background-size: 100% 100%; } .left_2 { - background-image: url(@/assets/eduImg/title2.png); + background-image: url(@/assets/images/education/new_cpfx.png); background-repeat: no-repeat; background-size: 100% 100%; } .center_1 { - background-image: url(@/assets/eduImg/title3.png); + background-image: url(@/assets/images/education/new_xxgk.png); background-repeat: no-repeat; background-size: 100% 100%; } .right_1 { - background-image: url(@/assets/eduImg/title4.png); + background-image: url(@/assets/images/education/new_csr.png); background-repeat: no-repeat; background-size: 100% 100%; } diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue index ff17bde..1d57f1d 100644 --- a/src/view/hygiene.vue +++ b/src/view/hygiene.vue @@ -102,7 +102,6 @@
- @@ -287,24 +286,24 @@ const getData = async () => { .familyPlanning { width: 96%; - background-image: url(@/assets/images/hygiene/center_title_2.png); + background-image: url(@/assets/images/hygiene/new_zcs.png); background-repeat: no-repeat; background-size: 100% 100%; } .mechanism { - background-image: url(@/assets/images/hygiene/xtgl.png); + background-image: url(@/assets/images/hygiene/new_fygl.png); background-repeat: no-repeat; background-size: 100% 100%; } .service { - background-image: url(@/assets/images/hygiene/right_title_2.png); + background-image: url(@/assets/images/hygiene/new_tjrs.png); background-repeat: no-repeat; background-size: 100% 100%; } .last { - background-image: url(@/assets/images/hygiene/right_title_3.png); + background-image: url(@/assets/images/hygiene/new_jkhd.png); background-repeat: no-repeat; background-size: 100% 100%; } @@ -371,7 +370,7 @@ const getData = async () => { } .left_1 { - background-image: url(@/assets/images/hygiene/left_title_1.png); + background-image: url(@/assets/images/hygiene/new_ylbx.png); background-repeat: no-repeat; background-size: 100% 100%; } @@ -383,20 +382,20 @@ const getData = async () => { } .left_3 { - background-image: url(@/assets/images/hygiene/right_title_1.png); + background-image: url(@/assets/images/hygiene/new_lmb.png); background-repeat: no-repeat; background-size: 100% 100%; } .center_1 { width: 96%; - background-image: url(@/assets/images/hygiene/center_title_1.png); + background-image: url(@/assets/images/hygiene/new_jkda.png); background-repeat: no-repeat; background-size: 100% 100%; } .center_2 { width: 96%; - background-image: url(@/assets/images/hygiene/new_center.png); + background-image: url(@/assets/images/hygiene/new_mz.png); background-repeat: no-repeat; background-size: 100% 100%; } diff --git a/src/view/sy.vue b/src/view/sy.vue index 48adef2..dbc14a1 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -134,7 +134,7 @@ >学校师生比
- {{ jysyList[0].teacher }}:{{ jysyList[0].student }} + {{ jysyList[0].teacher }}:{{ jysyList[0].student }}
@@ -875,23 +875,23 @@ onBeforeMount(async () => { } .mechanism { - background-image: url(@/assets/images/sy/right_1.png); + background-image: url(@/assets/images/sy/new_ylws.png); background-repeat: no-repeat; background-size: 100% 100%; } .service { - background-image: url(@/assets/images/sy/right_2.png); + background-image: url(@/assets/images/sy/new_whsy.png); background-repeat: no-repeat; background-size: 100% 100%; } .last { - background-image: url(@/assets/images/sy/right_3.png); + background-image: url(@/assets/images/sy/new_tysy.png); background-repeat: no-repeat; background-size: 100% 100%; } .last_1 { - background-image: url(@/assets/images/sy/right_4.png); + background-image: url(@/assets/images/sy/new_jtsy.png); background-repeat: no-repeat; background-size: 100% 100%; } @@ -958,19 +958,19 @@ onBeforeMount(async () => { } .left_1 { - background-image: url(@/assets/images/sy/left_1.png); + background-image: url(@/assets/images/sy/new_msfz.png); background-repeat: no-repeat; background-size: 100% 100%; } .left_2 { - background-image: url(@/assets/images/sy/left_2.png); + background-image: url(@/assets/images/sy/new_jysy.png); background-repeat: no-repeat; background-size: 100% 100%; } .left_3 { - background-image: url(@/assets/images/sy/left_3.png); + background-image: url(@/assets/images/sy/new_jyfw.png); background-repeat: no-repeat; background-size: 100% 100%; } @@ -1147,8 +1147,8 @@ onBeforeMount(async () => { } .left_1_1 { width: 551px; - height: 25px; - background-image: url(@/assets/images/sy/left_1_1.png); + height: 30px; + background-image: url(@/assets/images/sy/new_jzfw.png); background-repeat: no-repeat; background-size: 100% 100%; } @@ -1280,6 +1280,7 @@ onBeforeMount(async () => { &_item { box-sizing: border-box; padding: 20px; + padding-bottom: 10px; width: 267px; height: 74px; background: rgba(255, 255, 255, 0.1); @@ -1316,26 +1317,31 @@ onBeforeMount(async () => { &_xia { margin-top: 10px; width: 100%; - height: 1px; - border: 1px solid rgba(255, 255, 255, 0.77); + height: 8px; + // border: 1px solid rgba(255, 255, 255, 0.77); + background-color: #27628d; position: relative; + border-radius: 8px; .csbl { position: absolute; - top: -2px; left: 0; width: calc(var(--teacher) / var(--total) * 100%); - border-radius: 3px; - border: 3px solid #00f5ff; + height: 8px; + background-color: #00f5ff; + border-radius: 8px; } .ncbl { - position: absolute; - top: -2px; + position: absolute; left: 0; width: calc(var(--teacher) / var(--total) * 100%); - border-radius: 3px; - border: 3px solid #ffd863; + height: 8px; + background-color: #ffd863; + border-radius: 8px; } } + &_xia:nth-child(2){ + background-color: #475e73; + } } margin-bottom: 22px; } diff --git a/src/view/work.vue b/src/view/work.vue index 293af62..57309d1 100644 --- a/src/view/work.vue +++ b/src/view/work.vue @@ -370,12 +370,12 @@ onBeforeMount(() => { } .left_1 { - background-image: url(@/assets/images/work/left_1.png); + background-image: url(@/assets/images/work/new_zxjz.png); background-repeat: no-repeat; background-size: 100% 100%; } .left_1_1 { - background-image: url(@/assets/images/work/left_1_1.png); + background-image: url(@/assets/images/work/new_qtjz.png); background-repeat: no-repeat; background-size: 100% 100%; } @@ -387,25 +387,25 @@ onBeforeMount(() => { } .center_0 { - background-image: url(@/assets/images/work/center1.png); + background-image: url(@/assets/images/work/new_jzgk.png); background-repeat: no-repeat; background-size: 100% 100%; } .center_1 { - background-image: url(@/assets/images/work/center.png); + background-image: url(@/assets/images/work/new_shljz.png); background-repeat: no-repeat; background-size: 100% 100%; } .right_1 { - background-image: url(@/assets/images/work/right_1.png); + background-image: url(@/assets/images/work/new_rsqt.png); background-repeat: no-repeat; background-size: 100% 100%; } .right_2 { - background-image: url(@/assets/images/work/right_2.png); + background-image: url(@/assets/images/work/new_dyh.png); background-repeat: no-repeat; background-size: 100% 100%; } diff --git a/src/view/yl.vue b/src/view/yl.vue index aa9f1b0..2410499 100644 --- a/src/view/yl.vue +++ b/src/view/yl.vue @@ -385,19 +385,19 @@ const getData = async () => { } .familyPlanning { - background-image: url(@/assets/YLTitle/titleImg9.png); + background-image: url(@/assets/images/yl/new_jhsy.png); background-repeat: no-repeat; background-size: 100% 100%; } .mechanism { - background-image: url(@/assets/YLTitle/titleImg10.png); + background-image: url(@/assets/images/yl/new_yljg.png); background-repeat: no-repeat; background-size: 100% 100%; } .service { - background-image: url(@/assets/YLTitle/titleImg11.png); + background-image: url(@/assets/images/yl/new_zlfw.png); background-repeat: no-repeat; background-size: 100% 100%; } @@ -468,25 +468,25 @@ const getData = async () => { } .left_1 { - background-image: url(@/assets/images/ylbx.png); + background-image: url(@/assets/images/yl/new_ylbx.png); background-repeat: no-repeat; background-size: 100% 100%; } .left_2 { - background-image: url(@/assets/images/gllrbt.png); + background-image: url(@/assets/images/yl/new_gllrbt.png); background-repeat: no-repeat; background-size: 100% 100%; } .left_3 { - background-image: url(@/assets/images/tkjz.png); + background-image: url(@/assets/images/yl/new_tklrjz.png); background-repeat: no-repeat; background-size: 100% 100%; } .center_1 { - background-image: url(@/assets/YLTitle/titleImg8.png); + background-image: url(@/assets/images/yl/new_lnrzb.png); background-repeat: no-repeat; background-size: 100% 100%; }