Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/view/echarts_education/edCSR.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%;height: calc(100% - 70px)"></div>
+  <div ref="chart" style="width: 100%;height: calc(100% - 70px);min-height: 205px"></div>
 </template>
 
 <script setup>

src/view/echarts_education/edXX.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 50%; height: 50%; min-height: 205px"></div>
+  <div ref="chart" style="width: 100%; height: 50%; min-height: 205px"></div>
 </template>
 
 <script setup>
@@ -11,7 +11,7 @@ const chart = ref(); // 创建DOM引用
 
 const datas = {
   value: 18,
-  text: "留 守 儿 童",
+//   text: "留 守 儿 童",
 };
 
 let option = {
@@ -27,7 +27,7 @@ let option = {
     // 外圈背景
     {
       type: "pie",
-      center: ["60%", "55%"],
+      center: ["50%", "50%"],
       radius: ["50%", "82%"],
       hoverAnimation: false,
       clockWise: false,
@@ -67,7 +67,7 @@ let option = {
       },
       radius: ["50%", "70%"],
       hoverAnimation: false,
-      center: ["60%", "55%"],
+      center: ["50%", "50%"],
       data: [
         // {
         //   value: datas.value,

src/view/echarts_education/pie.vue

@@ -1,5 +1,8 @@
 <template>
-  <div ref="chart" style="width: 50%; height: calc(100% - 46px);min-height:205px;"></div>
+  <div
+    ref="chart"
+    style="width: 50%; height: calc(100% - 46px); min-height: 205px"
+  ></div>
 </template>
 
 <script setup>
@@ -12,7 +15,7 @@ const chart = ref(); // 创建DOM引用
 let option = {
   tooltip: {
     trigger: "axis",
-    formatter: "{b0}<br />{a0}:{c0} <br />{a1}:{c1} ",
+    formatter: "{b0}<br />{a0}:{c0} <br />{a1}:{c1}<br />{a2}:{c2} ",
   },
   legend: {
     top: "8%",
@@ -38,12 +41,15 @@ let option = {
           color: "#ccc",
         },
       },
-      data: ["小学", "初中", "高中",],
+      axisTick: {
+        show: false, // 设置轴刻度不显示
+      },
+      data: ["小学", "初中", "高中"],
     },
     {
       axisTick: false,
       type: "category",
-      data: ["小学", "初中", "高中", ],
+      data: ["小学", "初中", "高中"],
       axisLabel: {
         show: false,
       },
@@ -97,7 +103,7 @@ let option = {
     {
       name: "城市",
       type: "bar",
-      data: [2.0, 4.9, 7.0,],
+      data: [2.0, 4.9, 7.0],
       barWidth: "18%",
       itemStyle: {
         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -115,7 +121,7 @@ let option = {
     {
       name: "县镇",
       type: "bar",
-      data: [2.6, 5.9, 9.0,],
+      data: [2.6, 5.9, 9.0],
       barWidth: "18%",
       itemStyle: {
         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -133,7 +139,7 @@ let option = {
     {
       name: "农村",
       type: "bar",
-      data: [2.6, 5.9, 9.0,],
+      data: [2.6, 5.9, 9.0],
       barWidth: "18%",
       itemStyle: {
         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -155,7 +161,7 @@ let option = {
       itemStyle: {
         color: "rgba(221, 242, 255, 0.1)",
       },
-      data: ["2019", "2020", "2021",].map(() => 100),
+      data: ["2019", "2020", "2021"].map(() => 100),
       barWidth: 50,
     },
   ],
@@ -179,5 +185,4 @@ onMounted(() => {
 });
 </script>
 
-<style scoped>
+<style scoped></style>
-</style>

src/view/education.vue

@@ -61,12 +61,16 @@
           <div class="schoolaBox">
             <div class="schoola">
               <span>1,211</span>
-              <span>学校总数</span>
+              <span class="schoola1">学校总数</span>
             </div>
-            <div class="schoola"><span>46,718</span> <span>学生总数</span></div>
-            <div class="schoola"><span>883</span> <span>班级总数</span></div>
             <div class="schoola">
-              <span>4,381</span> <span>教职工总数</span>
+              <span>46,718</span> <span class="schoola1">学生总数</span>
+            </div>
+            <div class="schoola">
+              <span>883</span> <span class="schoola1">班级总数</span>
+            </div>
+            <div class="schoola">
+              <span>4,381</span> <span class="schoola1">教职工总数</span>
             </div>
           </div>
           <div class="schoolb">
@@ -87,7 +91,7 @@
               </div>
             </div>
             <div class="grade grade1">
-              <div class="schoolbs schoolbs1">
+              <div class="schoolbs">
                 <span class="spot">幼儿园</span> <span>7</span>
               </div>
               <div class="schoolbs">
@@ -107,7 +111,20 @@
           "
         >
           <edie></edie>
+          <div class="rating">
             <edXX></edXX>
+            <div class="ratingBtn">
+              <div class="onImg" id="img1">
+                <span>城市</span>
+              </div>
+              <div class="onImg">
+                <span>县镇</span>
+              </div>
+              <div class="onImg">
+                <span>农村</span>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
       <div class="flex1">
@@ -185,7 +202,9 @@
             <div class="czrBox">
               <div class="situation situation1"></div>
               <div class="column">
-                <div v-for="item in 20">测试信息</div>
+                <div v-for="item in 3">
+                  作为侦探在做推理的时候，心里也有很多地方隐藏著不安，担心可能会疏忽某些地方，而导致还存在另一种可能性……所以说当自己的推理正中靶心的时候，这种成就感就无与伦比！
+                </div>
               </div>
             </div>
             <div class="czrBox">
@@ -324,9 +343,6 @@ onBeforeMount(() => {
 </script>
 
 <style lang="scss" scoped>
-::-webkit-scrollbar {
-  display: none; /* Chrome Safari */
-}
 .displayFlex {
   box-sizing: border-box;
   height: 100%;
@@ -822,13 +838,14 @@ onBeforeMount(() => {
   // box-sizing: border-box;
 
   .czrBox {
-    height: 8vh;
+    height: 7vh;
     .column {
       height: calc(100% - 26px);
       overflow-y: auto;
       font-size: 14px;
       color: #ffffff;
       padding-left: 18px;
+      padding-right: 18px;
     }
   }
 
@@ -863,7 +880,7 @@ onBeforeMount(() => {
     width: 124px;
     height: 79px;
     margin-top: 20px;
-    padding: 10px 0 14px 0;
+    padding: 2px 0 14px 0;
     box-sizing: border-box;
     background-image: url(@/assets/eduImg/jyImg3.png);
     background-repeat: no-repeat;
@@ -874,12 +891,33 @@ onBeforeMount(() => {
     flex-direction: column;
     justify-content: space-between;
     span {
-      font-weight: 500;
+      // font-weight: 500;
-      font-size: 14px;
+      // font-size: 14px;
+      // color: #ffffff;
+      // letter-spacing: 4px;
+      // font-style: normal;
+      // font-family: PingFangSC, PingFang SC;
+
+      font-family: DINAlternate, DINAlternate;
+      // font-weight: bold;
+      font-size: 23px;
       color: #ffffff;
-      letter-spacing: 4px;
+      line-height: 30px;
+      letter-spacing: 1px;
+      text-shadow: 0px 0px 23px rgba(0, 52, 52, 0.5);
+      text-align: center;
       font-style: normal;
+    }
+    .schoola1 {
       font-family: PingFangSC, PingFang SC;
+      font-weight: 500;
+      font-size: 16px;
+      color: #ffffff;
+      line-height: 22px;
+      letter-spacing: 3px;
+      text-shadow: 0px 0px 4px rgba(60, 145, 249, 0.65);
+      text-align: center;
+      font-style: normal;
     }
   }
   .schoolb {
@@ -907,9 +945,9 @@ onBeforeMount(() => {
       justify-content: space-between;
       padding: 36px 0 0px 18px;
       .schoolbs {
-        width: 128px;
+        // width: 128px;
         height: 41px;
-        padding: 6px 0 30px 0 0;
+        padding: 0px 20px 0 30px;
         background-image: url(@/assets/eduImg/jyImg1.png);
         background-repeat: no-repeat;
         background-size: 100% 100%;
@@ -929,18 +967,17 @@ onBeforeMount(() => {
         top: 50%;
         left: -16px; /* 调整圆点的位置 */
         transform: translateY(-50%);
-        width: 8px;
+        width: 6px;
-        height: 8px;
+        height: 6px;
         background-color: rgba(0, 230, 255, 1);
         border-radius: 50%;
+        box-shadow: 0px 0px 7px 0px #00ffd3;
+        filter: blur(0px);
       }
     }
     .grade1 {
-      padding: 18px 130px 0 150px;
+      padding: 12px 110px 0 138px;
       box-sizing: border-box;
-      .schoolbs1 {
-        margin-right: 50px;
-      }
     }
   }
 }
@@ -988,6 +1025,7 @@ onBeforeMount(() => {
       margin-top: 10px;
       width: 92%;
       height: 34px;
+      padding: 6px 0;
       box-sizing: border-box;
       background-image: url(@/assets/eduImg/jyImg16.png);
 
@@ -1003,6 +1041,49 @@ onBeforeMount(() => {
     }
   }
 }
+.rating {
+  width: 50%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  .ratingBtn {
+    display: flex;
+    // align-items: center;
+    .ratingImg {
+      width: 62px;
+      height: 29px;
+      background-image: url(@/assets/eduImg/jyImg18.png);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+    }
+    .onImg {
+      width: 62px;
+      height: 29px;
+      background-image: url(@/assets/eduImg/jyImg19.png);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      cursor: pointer; /* 添加指针样式以指示可点击 */
+    }
+    .onImg.active {
+      width: 62px;
+      height: 29px;
+      background-image: url(@/assets/eduImg/jyImg18.png);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+    }
+    span {
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: 400;
+      font-size: 14px;
+      color: #ffffff;
+      letter-spacing: 1px;
+      font-family: PingFangSC, PingFang SC;
+    }
+  }
+}
 
 .selectLint {
   width: 94%;
@@ -1017,6 +1098,28 @@ onBeforeMount(() => {
     background-size: 100% 100%;
   }
 }
+
+.column::-webkit-scrollbar {
+  display: none; /* Chrome Safari */
+}
+/* 滚动条整体部分 */
+.rolling::-webkit-scrollbar {
+  width: 5px;
+  // height: 10px;
+}
+/* 滚动槽 */
+.rolling::-webkit-scrollbar-track {
+  border-radius: 1px;
+  background: rgba(0, 128, 231, 0.56);
+  -webkit-box-shadow: inset 0 0 6px rgba(139, 139, 139, 0.3);
+}
+/* 滚动条滑块样式 */
+.rolling::-webkit-scrollbar-thumb {
+  background-clip: content-box;
+  border-radius: 6px;
+  background: rgba(0, 162, 231, 1);
+  -webkit-box-shadow: inset 0 0 6px rgba(20, 20, 20, 0.3);
+}
 </style>
 <style lang="scss">
 .selectBox {