diff --git a/src/assets/images/sjfx/lnsjfx1.png b/src/assets/images/sjfx/lnsjfx1.png new file mode 100644 index 0000000..3e6599d Binary files /dev/null and b/src/assets/images/sjfx/lnsjfx1.png differ diff --git a/src/assets/images/sjfx/lnsjfx2.png b/src/assets/images/sjfx/lnsjfx2.png new file mode 100644 index 0000000..29facbe Binary files /dev/null and b/src/assets/images/sjfx/lnsjfx2.png differ diff --git a/src/view/analyze.vue b/src/view/analyze.vue index 2cd61df..ece079b 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -180,11 +180,7 @@ @close="close1" > - + @@ -437,8 +433,27 @@ const dataElderly = reactive({ schoolData: [ { id: 0, - bm: [335, 654, 365], - zs: [335, 654, 521], + nl: [ + 335, 654, 365, 365, 365, 365, 315, 366, 35, 165, 265, 345, 155, 385, + 365, + ], + xz: [ + "大街乡", + "社阳乡", + "沐尘畲族乡", + "庙下乡", + "溪口镇", + "罗家乡", + "模环乡", + "横山镇", + "石佛乡", + "詹家镇", + "塔石镇", + "小男孩镇", + "湖镇镇", + "东华街道", + "龙洲街道", + ], }, { id: 1, @@ -483,7 +498,7 @@ const tab_change = (index, name) => { const chooseXX = (name) => { console.log(name); if (name == "交通") { - mapTitle.value='交通'; + mapTitle.value = "交通"; dialogShowMap.value = true; } // tableType.title = village; diff --git a/src/view/dialog/diaLogElderlyData.vue b/src/view/dialog/diaLogElderlyData.vue index 0cc6ccf..9e9c963 100644 --- a/src/view/dialog/diaLogElderlyData.vue +++ b/src/view/dialog/diaLogElderlyData.vue @@ -39,81 +39,13 @@ /> - -
@@ -148,8 +80,25 @@
+ + +
+
+ +
+
-
- -
@@ -186,6 +126,7 @@ import zs from "./echarts/echartsZs.vue"; import zsbm from "./echarts/echartZsbm.vue"; import pick1 from "./echarts/echartPick1.vue"; import pick2 from "./echarts/echartPick2.vue"; +import eP5 from "./echarts/eP5.vue"; const props = defineProps({ dialogShowElderly: { type: Boolean, @@ -234,15 +175,17 @@ onMounted(() => { }); const selectChange1 = (e) => { - console.log(e,55555); - if (data.dataElderly.schoolData[e] && data.dataElderly.schoolData[e].bm) { - data.pickNum = 0; - data.selectList1 = data.dataElderly.schoolData[e].zs; - data.selectList2 = data.dataElderly.schoolData[e].bm; - } else { - data.pickNum = 1; - data.selectList1 = data.dataElderly.schoolData[e].zs; - } + data.selectList1 = data.dataElderly.schoolData[0]; + // data.selectList2 = data.dataElderly.schoolData[0].xz; + console.log(data.selectList1 , e,55555); + // if (data.dataElderly.schoolData[e] && data.dataElderly.schoolData[e].bm) { + // data.pickNum = 0; + // data.selectList1 = data.dataElderly.schoolData[e].zs; + // data.selectList2 = data.dataElderly.schoolData[e].bm; + // } else { + // data.pickNum = 1; + // data.selectList1 = data.dataElderly.schoolData[e].zs; + // } }; //关闭弹框 @@ -357,7 +300,17 @@ const closeDialog = () => { width: 100%; display: flex; } - +.yd_title { + box-sizing: border-box; + width: 98%; + // height: 40px; + position: relative; + overflow: hidden; + img { + width: 350px; + height: 28px; + } +} .title { margin: 10px auto; display: flex; @@ -460,7 +413,7 @@ const closeDialog = () => { .selectLint { width: 86%; display: flex; - margin: 30px 7% 10px; + margin: 16px 7%; //justify-content: space-between; flex-direction: row-reverse; diff --git a/src/view/dialog/echarts/eP5.vue b/src/view/dialog/echarts/eP5.vue new file mode 100644 index 0000000..2f08916 --- /dev/null +++ b/src/view/dialog/echarts/eP5.vue @@ -0,0 +1,235 @@ + + + + +