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

src/main.js

@@ -7,12 +7,6 @@ import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import './assets/css/common.css'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
-zhCn.el.pagination = {
-    goto: "跳转至",
-    pageClassifier: "",
-    pagesize: "",
-    total: "共 {total} 条",
-};
 createApp(App).use(router).use(ElementPlus,{
     locale: zhCn,
 }).mount('#app')

src/view/echarts_work/eP3.vue

@@ -246,7 +246,7 @@ const getOption = () => {
         yAxisIndex: 0,
         name: "特困救助人次",
         data: data.list1,
-        barWidth: 15,
+        barWidth: 10,
         type: "bar",
         // itemStyle: {
         //   color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -282,7 +282,7 @@ const getOption = () => {
         yAxisIndex: 0,
         name: "低保救助人次",
         data: data.list2,
-        barWidth: 15,
+        barWidth: 10,
         type: "bar",
         itemStyle: {
           color: {
@@ -318,7 +318,7 @@ const getOption = () => {
         yAxisIndex: 0,
         name: "低边救助人次",
         data: data.list3,
-        barWidth: 15,
+        barWidth: 10,
         type: "bar",
         itemStyle: {
           color: {
@@ -386,8 +386,8 @@ const getOption = () => {
         symbolPosition: "end",
         data: data.list1,
         symbol: "diamond",
-        symbolOffset: ["-45%", "-50%"],
+        symbolOffset: ["-20%", "-50%"],
-        symbolSize: [16, 8],
+        symbolSize: [14, 8],
         itemStyle: {
           borderColor: "#2fffa4",
           color: "rgba(142, 187, 255, 1)",
@@ -401,7 +401,7 @@ const getOption = () => {
         data: data.list2,
         symbol: "diamond",
         symbolOffset: ["0", "-50%"],
-        symbolSize: [16, 8],
+        symbolSize: [14, 8],
         itemStyle: {
           borderColor: "#2fffa4",
           color: "rgba(23, 136, 255, 1)",
@@ -414,8 +414,8 @@ const getOption = () => {
         symbolPosition: "end",
         data: data.list3,
         symbol: "diamond",
-        symbolOffset: [7.5, "-50%"],
+        symbolOffset: [5, "-50%"],
-        symbolSize: [16, 8],
+        symbolSize: [14, 8],
         itemStyle: {
           borderColor: "#32ffee",
           color: "rgba(23, 237, 255, 1)",

src/view/sy.vue

@@ -909,7 +909,7 @@ const data = reactive({
     {
       name: "总藏书",
       value: "1983",
-      dw: "万册",
+      dw: "册",
     },
     {
       name: "送戏下乡次数",
@@ -1173,20 +1173,18 @@ const getData = async () => {
       const jzfwKeys = ["jzrc", "jzje", "nf"];
       if (data.salvageServices) {
         jzfwKeys.forEach((key) => {
-          data.salvageServices[key] = addThousandSeparator(res.data.jzfw[key]);
+          data.salvageServices[key] = res.data.jzfw[key];
         });
       }
       // 教育事业&师生比例
       const jysyKeys = ["xxzs", "xszs", "jzgzs"];
       jysyKeys.forEach((key) => {
-        data.education[key] = addThousandSeparator(res.data.xxgk[key]);
+        data.education[key] = res.data.xxgk[key];
       });
       // 就业服务
       const jyfwKeys = ["jypx", "jyjxfw", "jyyz"];
       jyfwKeys.forEach((key) => {
-        data.employmentService[key] = addThousandSeparator(
+        data.employmentService[key] = res.data.jyfw[key].toString();
-          res.data.jyfw[key].toString()
-        );
       });
       // 年龄段分类&人口数据&年龄比例
       data.PopulationData = res.data.rksj;
@@ -1194,7 +1192,7 @@ const getData = async () => {
       if (data.PopulationData) {
         const rkjsKeys = ["rkzs", "man", "woman"];
         rkjsKeys.forEach((key) => {
-          data.PopulationData[key] = addThousandSeparator(res.data.rksj[key]);
+          data.PopulationData[key] = res.data.rksj[key];
         });
         // 人口年龄段分类数
         const ageGroupKeys = [
@@ -1240,17 +1238,17 @@ const getData = async () => {
         "cswsfwzs",
       ];
       ylwsKeys.forEach((key, index) => {
-        data.ylwsList[index].value = addThousandSeparator(res.data.ylws[key]);
+        data.ylwsList[index].value = res.data.ylws[key];
       });
       // 文化体育事业
       const whsyKeys = ["ggtsg", "zcs", "sxxxcs", "bwgcgcs", "tsjycs"];
       whsyKeys.forEach((key, index) => {
-        data.whsyList[index].value = addThousandSeparator(res.data.whtysy[key]);
+        data.whsyList[index].value =res.data.whtysy[key];
       });
       // 体育事业
       const tysyKeys = ["zqcs", "lqcs", "ppqcs", "ymqcs", "lsbdcd"];
       tysyKeys.forEach((key, index) => {
-        data.tysyList[index].value = addThousandSeparator(res.data.whtysy[key]);
+        data.tysyList[index].value =res.data.whtysy[key];
       });
       // 交通事业
     }