diff --git a/src/assets/images/sjfx/enrol/title1.png b/src/assets/images/sjfx/enrol/title1.png
new file mode 100644
index 0000000..52ae30c
Binary files /dev/null and b/src/assets/images/sjfx/enrol/title1.png differ
diff --git a/src/assets/images/sjfx/enrol/title2.png b/src/assets/images/sjfx/enrol/title2.png
new file mode 100644
index 0000000..6146fd4
Binary files /dev/null and b/src/assets/images/sjfx/enrol/title2.png differ
diff --git a/src/assets/images/sjfx/enrol/title3.png b/src/assets/images/sjfx/enrol/title3.png
new file mode 100644
index 0000000..a59b607
Binary files /dev/null and b/src/assets/images/sjfx/enrol/title3.png differ
diff --git a/src/assets/images/sjfx/enrol/title4.png b/src/assets/images/sjfx/enrol/title4.png
new file mode 100644
index 0000000..33367bb
Binary files /dev/null and b/src/assets/images/sjfx/enrol/title4.png differ
diff --git a/src/assets/images/sjfx/enrol/title5.png b/src/assets/images/sjfx/enrol/title5.png
new file mode 100644
index 0000000..7d43a06
Binary files /dev/null and b/src/assets/images/sjfx/enrol/title5.png differ
diff --git a/src/assets/images/sjfx/enrol/title6.png b/src/assets/images/sjfx/enrol/title6.png
new file mode 100644
index 0000000..4deed8a
Binary files /dev/null and b/src/assets/images/sjfx/enrol/title6.png differ
diff --git a/src/assets/images/sjfx/enrol/title7.png b/src/assets/images/sjfx/enrol/title7.png
new file mode 100644
index 0000000..e3fb8b9
Binary files /dev/null and b/src/assets/images/sjfx/enrol/title7.png differ
diff --git a/src/assets/images/sjfx/rxfx.png b/src/assets/images/sjfx/rxfx.png
new file mode 100644
index 0000000..37dd929
Binary files /dev/null and b/src/assets/images/sjfx/rxfx.png differ
diff --git a/src/assets/images/sjfx/tab_xxts.png b/src/assets/images/sjfx/tab_xxts.png
new file mode 100644
index 0000000..d0280d6
Binary files /dev/null and b/src/assets/images/sjfx/tab_xxts.png differ
diff --git a/src/assets/images/sjfx/tab_ymt.png b/src/assets/images/sjfx/tab_ymt.png
new file mode 100644
index 0000000..9200c2d
Binary files /dev/null and b/src/assets/images/sjfx/tab_ymt.png differ
diff --git a/src/view/analyze.vue b/src/view/analyze.vue
index b410f01..f9c31d3 100644
--- a/src/view/analyze.vue
+++ b/src/view/analyze.vue
@@ -150,11 +150,6 @@
:year="data.list.year"
v-if="showEchart"
>
-
@@ -168,25 +163,48 @@
@@ -199,6 +217,7 @@ import {
onBeforeUnmount,
computed,
} from "vue";
+import DialogEnrol from "./dialog/dialogEnrol.vue";
import right2 from "./echart_analyze/right2.vue";
import right1 from "./echart_analyze/right1.vue";
import jypx from "./echart_analyze/jypx.vue";
@@ -209,6 +228,7 @@ import pie3dMt1 from "./echart_analyze/pie3dMt1.vue";
import edxs from "./echart_analyze/edXS.vue";
import eP2 from "./echart_analyze/eP2.vue";
import ylXZZC from "./echart_analyze/ylXZZC.vue";
+import rxfx from "./echart_analyze/rxfx.vue";
import FlipClock from "./echart_analyze/FlipClock.vue";
import ePie4 from "./echart_analyze/pie4.vue";
@@ -220,6 +240,128 @@ import jypx1 from "@/assets/images/sjfx/pxrc.png";
import jypx2 from "@/assets/images/sjfx/gygws.png";
import Map from "./echart_analyze/map.vue";
const showR = ref(false); //loading
+// 入学分析数据
+const dialogShowEnrol = ref(false);
+const dataTab = reactive({
+ url: "",
+ title: "",
+ list1: [],
+ list2: [],
+ year: [],
+ columns: [
+ {
+ label: "班次",
+ property: "cc",
+ },
+ {
+ label: "始发站-终点站",
+ property: "qqz",
+ },
+ {
+ label: "到达龙游站时间",
+ type: "slot",
+ property: "dd",
+ },
+ ],
+ data: [],
+});
+const dataEnrol = reactive({
+ title: "入学分析",
+ // 幼儿园名称
+ kidName: [
+ "第一幼儿园",
+ "第二幼儿园",
+ "第三幼儿园",
+ "第四幼儿园",
+ "第五幼儿园",
+ "第六幼儿园",
+ "第七幼儿园",
+ "第八幼儿园",
+ ],
+ // 托班
+ kidZs1: [100, 105, 369, 523, 651, 225, 664, 245],
+ kidBm1: [100, 105, 369, 523, 651, 225, 664, 245],
+ // 小班
+ kidZs2: [100, 105, 369, 523, 651, 225, 664, 245],
+ kidBm2: [100, 105, 369, 523, 651, 225, 664, 245],
+ // 中班
+ kidZs3: [100, 105, 369, 523, 651, 225, 664, 245],
+ kidBm3: [100, 105, 369, 523, 651, 225, 664, 245],
+ // 大班
+ kidZs4: [100, 105, 369, 523, 651, 225, 664, 245],
+ kidBm4: [100, 105, 369, 523, 651, 225, 664, 245],
+ // 小学
+ primaryName: [
+ "第一小学",
+ "第二小学",
+ "第三小学",
+ "第四小学",
+ "第五小学",
+ "第六小学",
+ ],
+ primaryZs: [231, 544, 343, 444, 335, 632],
+ primaryBm: [231, 544, 343, 444, 335, 632],
+ // 初中
+ middleName: ["第一初中", "第二初中", "第三初中", "第四初中"],
+ middleZs: [231, 544, 343, 444],
+ // 高中
+ highName: ["第一高中", "第二高中", "第三高中"],
+ highZs: [231, 335, 632],
+ // 学校历年匹配
+ schoolNmae: [
+ {
+ name: "第一小学",
+ id: 0,
+ },
+ {
+ name: "第一初中",
+ id: 1,
+ },
+ {
+ name: "第一高中",
+ id: 2,
+ },
+ ],
+ schoolYear: [2022, 2023, 2024],
+ schoolData: [
+ {
+ id: 0,
+ bm: [335, 654, 365],
+ zs: [335, 654, 521],
+ },
+ {
+ id: 1,
+ zs: [335, 654, 521],
+ },
+ {
+ id: 2,
+ zs: [355, 652, 721],
+ },
+ ],
+});
+
+const showEnrol = () => {
+ dialogShowEnrol.value = true;
+};
+const close = () => {
+ dialogShowEnrol.value = false;
+};
+
+//数据切换
+const tab_choose = ref([
+ {
+ choose: "信息推送",
+ },
+]);
+const tab_change = (index, name) => {
+ if (index == 0) {
+ if (tab_choose.value[index].choose == "信息推送") {
+ tab_choose.value[index].choose = "一码通";
+ } else {
+ tab_choose.value[index].choose = "信息推送";
+ }
+ }
+};
//就业培训
const jypxList = reactive([
{
@@ -604,12 +746,20 @@ onBeforeUnmount(() => {
}
.right_2 {
- background-image: url(@/assets/images/sjfx/xxts.png);
+ cursor: pointer;
+ background-image: url(@/assets/images/sjfx/tab_xxts.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+}
+.right_2_1 {
+ cursor: pointer;
+ background-image: url(@/assets/images/sjfx/tab_ymt.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.right_3 {
- background-image: url(@/assets/images/sjfx/jtzk.png);
+ cursor: pointer;
+ background-image: url(@/assets/images/sjfx/rxfx.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
@@ -1003,4 +1153,21 @@ onBeforeUnmount(() => {
}
}
}
+//入学分析
+.rxfx {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ .historyimg {
+ margin-top: 15px;
+ padding: 0 25px;
+ background-image: url(@/assets/images/hygiene/xtgl_1.png);
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ font-size: 18px;
+ color: #ffffff;
+ line-height: 21px;
+ letter-spacing: 2px;
+ }
+}
diff --git a/src/view/dialog/dialogEnrol.vue b/src/view/dialog/dialogEnrol.vue
new file mode 100644
index 0000000..61f27e3
--- /dev/null
+++ b/src/view/dialog/dialogEnrol.vue
@@ -0,0 +1,479 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ data.dataEnrol.title }}详情
+
+
+
+
+
+
+
+ 城区幼儿园招生情况
+
+
+ 城区义务教育
+
+
+ 学校历年匹配情况
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/view/dialog/echarts/echartPick1.vue b/src/view/dialog/echarts/echartPick1.vue
new file mode 100644
index 0000000..7d7f69f
--- /dev/null
+++ b/src/view/dialog/echarts/echartPick1.vue
@@ -0,0 +1,306 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/dialog/echarts/echartPick2.vue b/src/view/dialog/echarts/echartPick2.vue
new file mode 100644
index 0000000..8c7d6f7
--- /dev/null
+++ b/src/view/dialog/echarts/echartPick2.vue
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/dialog/echarts/echartZsbm.vue b/src/view/dialog/echarts/echartZsbm.vue
new file mode 100644
index 0000000..c205161
--- /dev/null
+++ b/src/view/dialog/echarts/echartZsbm.vue
@@ -0,0 +1,308 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/dialog/echarts/echartsZs.vue b/src/view/dialog/echarts/echartsZs.vue
new file mode 100644
index 0000000..af8ee8f
--- /dev/null
+++ b/src/view/dialog/echarts/echartsZs.vue
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/echart_analyze/right2.vue b/src/view/echart_analyze/right2.vue
index 4af4701..ba7cdfa 100644
--- a/src/view/echart_analyze/right2.vue
+++ b/src/view/echart_analyze/right2.vue
@@ -1,5 +1,5 @@
-
+
+
+
\ No newline at end of file
diff --git a/src/view/echart_analyze/ylXZZC.vue b/src/view/echart_analyze/ylXZZC.vue
index aee5d66..2cb3b0b 100644
--- a/src/view/echart_analyze/ylXZZC.vue
+++ b/src/view/echart_analyze/ylXZZC.vue
@@ -1,5 +1,5 @@
-
+