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

src/view/echarts_education/edXS1.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 270px; height: 210px"></div>
+  <div ref="chart" style="width:100%; height: 210px"></div>
 </template>
 
 <script setup >

src/view/echarts_education/edXS2.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 270px; height: 210px"></div>
+  <div ref="chart" style="width: 100%; height: 210px"></div>
 </template>
 
 <script setup >

src/view/echarts_education/edXS3.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 270px; height: 210px"></div>
+  <div ref="chart" style="width: 100%; height: 210px"></div>
 </template>
 
 <script setup >

src/view/education.vue

@@ -117,7 +117,9 @@
                 <span>{{ data.xxgk.yeyxxsl }}</span>
               </div>
               <div class="schoolbs">
-                <span class="spot" @click="showDialog('学校','')">特殊教育</span>
+                <span class="spot" @click="showDialog('学校', '')"
+                  >特殊教育</span
+                >
                 <span>{{ data.xxgk.tsjyxxsl }}</span>
               </div>
             </div>
@@ -238,21 +240,21 @@
             <div>
               <div class="czrBox">
                 <div class="situation situation1"></div>
-                <edxs :list="data.xs.gxyrs" :month="data.xs.month"></edxs>
+                <edxs :list="data.whistleblower.culeTotal.data" :month="data.whistleblower.culeTotal.time"></edxs>
               </div>
               <div class="czrBox">
                 <div class="situation situation2"></div>
-                <edxs1 :list="data.xs.gxyrs" :month="data.xs.month"></edxs1>
+                <edxs1 :list="data.whistleblower.gaCules.data" :month="data.whistleblower.gaCules.time"></edxs1>
               </div>
             </div>
             <div>
               <div class="czrBox">
                 <div class="situation situation3"></div>
-                <edxs2 :list="data.xs.gxyrs" :month="data.xs.month"></edxs2>
+                <edxs2 :list="data.whistleblower.newCules.data" :month="data.whistleblower.newCules.time"></edxs2>
               </div>
               <div class="czrBox">
                 <div class="situation situation4"></div>
-                <edxs3 :list="data.xs.gxyrs" :month="data.xs.month"></edxs3>
+                <edxs3 :list="data.whistleblower.jcgCules.data" :month="data.whistleblower.jcgCules.time"></edxs3>
               </div>
             </div>
           </div>
@@ -513,7 +515,6 @@ const data = reactive({
   xxgk: {},
   xzncjszcsl: [],
   xzncxxsl: [[], []],
-  whistleblower: {},
   zzxm: [],
   schoolData: [
     { name: "副高级", value: "" },
@@ -523,10 +524,29 @@ const data = reactive({
     { name: "中级", value: "" },
     { name: "助理级", value: "" },
   ],
-  xs: {
+  whistleblower: {
-    gxyrs: ["255", "165", "165", "165", "165"],
+    yljgsl: 10, //覆盖医疗机构数量
-    month: ["5.31", "6.1", "6.2", "6.3", "6.4"],
+    qyjssl: 3, //吹哨人启用角色
-  }, //线索
+    green: 316895, //绿色
+    yellow: 16676, //黄色
+    red: 6242, //红色
+    culeTotal: {
+      data: ["255", "165", "165", "165", "165"],
+      time: ["5.31", "6.1", "6.2", "6.3", "6.4"],
+    }, //预警线索总数量
+    newCules: {
+      data: ["255", "165", "165", "165", "165"],
+      time: ["5.31", "6.1", "6.2", "6.3", "6.4"],
+    }, //每日新增线索
+    gaCules: {
+      data: ["255", "165", "165", "165", "165"],
+      time: ["5.31", "6.1", "6.2", "6.3", "6.4"],
+    }, //公安协同处置线索
+    jcgCules: {
+      data: ["255", "165", "165", "165", "165"],
+      time: ["5.31", "6.1", "6.2", "6.3", "6.4"],
+    }, //检察官协同处置线索
+  },
 });
 const getData = async () => {
   await http.get("/api/ggfwyth/education").then((res) => {
@@ -559,6 +579,7 @@ const getData = async () => {
       data.zzxm = res.data.zzxm;
       // 吹哨人
       data.whistleblower = res.data.whistleblower;
+      // 预警线索
     }
   });
 };
@@ -1207,7 +1228,7 @@ onMounted(() => {
 .czr-bj {
   width: 529px;
   border-radius: 2px;
-  padding: 20px 0 0 14px;
+  padding-top: 20px;
   display: flex;
   justify-content: space-around;
 
@@ -1219,6 +1240,7 @@ onMounted(() => {
 
   .czrBox {
     // height: 104px;
+    width: 280px;
     min-height: 310px;
     display: flex;
     flex-direction: column;