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

src/view/analyze.vue

@@ -9,7 +9,7 @@
           </div>
         </div>
         <div class="hypertension">
-          <pie3dMt1 :list="data.gxy"></pie3dMt1>
+          <pie3dMt1 :list="data.analysis.lnr"></pie3dMt1>
           <edxs
             :list="data.whistleblower.culeTotal.data"
             :month="data.whistleblower.culeTotal.time"
@@ -122,7 +122,7 @@
           </div>
         </div>
         <!-- <img src="@/assets/images/sjfx/right3D.png" alt="" class="right3d" /> -->
-        <right2></right2>
+        <right2 :list="data.analysis.push"></right2>
       </div>
       <div class="flex1">
         <div class="yd_title right_3">
@@ -261,12 +261,35 @@ const data = reactive({
     },
   ], //数据查看
   leftCenterYear: ["2019", "2020", "2021", "2022", "2023"], //年份
-  // leftCenter1: ["100", "120", "199", "133", "210"], //医保支出万元以上
-  // leftCenter3: ["100", "80", "199", "133", "210"], //大病住院
-  // leftCenter4: ["100", "120", "199", "133", "210"], //糖尿病
-
   zccs1: ["图书馆", "交通出行", "景区"], //一码通
   zccs2: ["100", "130", "220"], //一码通
+  analysis: {
+    lnr: {
+      fgxy: { rs: "1610", zb: "51.77" },
+      gxy: { rs: "1500", zb: "48.23" },
+      rksj: {
+        man: "196576",
+        nl17: "48.23", // 17岁以下人口总数
+        nl60: "0", // 60以上人口总数
+        nl100: "0", // 100岁以上人口总数,
+        nl110: "0", // 1-10岁人口总数
+        nl1120: "0", // 11-20岁人口总数
+        nl1834: "0", // 18-34人口总数
+        nl2130: "0", // 21-30岁人口总数
+        nl3140: "0", // 31-40岁人口总数
+        nl3569: "0", // 35-69人口总数
+        nl4150: "0", // 41-50岁人口总数
+        nl5160: "0", // 51-60岁人口总数
+        nl6170: "0", // 61-70岁人口总数
+        nl7180: "0", // 71-80岁人口总数
+        nl8190: "0", // 81-90岁人口总数
+        nl91100: "0", // 91-100岁人口总数
+        rkzs: "390754",
+        woman: "194178",
+      },
+    },
+    push: [{ name: "小奔通", num: 4196 }],
+  },
 });
 const minData = reactive({
   minTop: 49162,
@@ -320,11 +343,26 @@ const toggleShow = () => {
 const startAutoSwitching = () => {
   interval = setInterval(toggleShow, 6000); // 每6秒切换一次
 };
+const getData = async () => {
+  await http.get("/api/ggfwyth/analysis").then((res) => {
+    if (res.code == 200) {
+      // console.log(res.data, "信息推送");
+      data.analysis = res.data;
+      const ageBt = ["nl6170", "nl7180", "nl8190", "nl91100", "nl100"];
+      ageBt.forEach((key, index) => {
+        data.whistleblower.culeTotal.data[index] = res.data.lnr.rksj[key];
+      });
+    }
+  });
+};
+
 onMounted(() => {
   startAutoSwitching();
 });
 
-onBeforeMount(() => {});
+onBeforeMount(() => {
+  getData();
+});
 
 onBeforeUnmount(() => {
   clearInterval(interval); //清除定时器

src/view/echart_analyze/eP2.vue

@@ -67,6 +67,7 @@ const updateSeries = () => {
   ];
 
   if (data.list.length > 0) {
+  // if (!data.list) {
     data.list.forEach((item, index) => {
       const color = data.bgColor[index % data.bgColor.length];
       data.series.push({

src/view/echart_analyze/edXS.vue

@@ -35,8 +35,8 @@ const getOption = () => {
     },
     grid: {
       top: "20%",
-      left: "1%",
+      left: "0%",
-      right: "5%",
+      right: "3%",
       bottom: "0%",
       containLabel: true,
     },
@@ -186,12 +186,12 @@ const setChart = () => {
   var myChart = echarts.init(chart.value);
   myChart.setOption(data.option);
 };
+
 // 使用生命钩子
 onBeforeMount(() => {
   setTimeout(() => {
     data.list = props.list;
     data.month = props.month;
-    // console.log(data.list, props.month, "教育");
     getOption();
     setChart();
   }, 600);

src/view/echart_analyze/pie3dMt1.vue

@@ -1,8 +1,5 @@
 <template>
-  <div
+  <div ref="chart" style="width: 50%; height: 230px"></div>
-    ref="chart"
-    style="width: 50%; height: 230px"
-  ></div>
 </template>
 
 <script setup>
@@ -261,6 +258,7 @@ function getPie3D(pieData, internalDiameterRatio) {
         }
       },
     },
+
     //移动上去提示的文本内容
     tooltip: {
       backgroundColor: "rgba(18, 55, 85, 0.8);",
@@ -287,6 +285,23 @@ function getPie3D(pieData, internalDiameterRatio) {
         }
       },
     },
+    label: {
+      show: true,
+      //   position: "outside",
+      // padding: [30, -180],
+      formatter: function (pieData) {
+        console.log("optionsData", pieData);
+        return (
+          "{name|" +
+          pieData.name +
+          "}" +
+          "{vlaueA|" +
+          pieData.value +
+          "亿元" +
+          "}"
+        );
+      },
+    },
     xAxis3D: {},
     yAxis3D: {},
     zAxis3D: {},
@@ -550,13 +565,13 @@ const setChart = () => {
 // 使用生命钩子
 onBeforeMount(() => {
   setTimeout(() => {
-    // data.list = props.list;
+    data.list = props.list;
-    data.list = {
+    // data.list = {
-      gxy:"1500",
+    //   gxy: "1500",
-      notGxy:"1610",
+    //   notGxy: "1610",
-    }
+    // };
-    pieData[0].value = data.list.gxy;
+    pieData[0].value = data.list.fgxy.rs;
-    pieData[1].value = data.list.notGxy;
+    pieData[1].value = data.list.gxy.rs;
 
     getOption();
     setChart();

src/view/echart_analyze/right2.vue

@@ -7,6 +7,15 @@ import { onMounted, onBeforeMount, reactive, ref } from "vue";
 // 局部引入echarts核心模块
 import * as echarts from "echarts";
 
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+});
+
 const chart = ref(); // 创建DOM引用
 
 const colors = [
@@ -33,10 +42,21 @@ const colors = [
   },
 ];
 const maxList = ref([]);
-const valueList = [20, 53, 47, 65, 29, 11, 10];
+// const valueList = [20, 53, 47, 65, 29, 11, 10];
 const data = reactive({
+  list: [],
   option: {},
-  Max: 100,
+  Max: 200,
+  valueList: [20, 53, 47, 65, 29, 11, 10],
+  xxname: [
+    "小奔通",
+    "两慢病",
+    "水费",
+    "就业招工",
+    "零工市厂匹配",
+    "医保",
+    "交通出行",
+  ],
 });
 // 注册5个面图形:左侧、前面、右面、上面、下面
 //c0:左下角，c1：右下角,c2:右上角，c3：左上角
@@ -156,21 +176,13 @@ const getOption = () => {
       left: 10,
       right: 0,
       bottom: 20,
-      top: 20,
+      top: 30,
       containLabel: true,
     },
     xAxis: [
       {
         type: "category",
-        data: [
+        data: data.xxname,
-          "小奔通",
-          "两慢病",
-          "水费",
-          "就业招工",
-          "零工市厂匹配",
-          "医保",
-          "交通出行",
-        ],
         axisLine: {
           show: false,
         },
@@ -190,15 +202,7 @@ const getOption = () => {
       },
       {
         type: "category",
-        data: [
+        data: data.xxname,
-          "小奔通",
-          "两慢病",
-          "水费",
-          "就业招工",
-          "零工市厂匹配",
-          "医保",
-          "交通出行",
-        ],
         axisLine: {
           show: false,
         },
@@ -216,9 +220,8 @@ const getOption = () => {
     ],
     yAxis: {
       min: 0,
-      // max: 200,
       max: data.Max,
-      interval: 20,
+      // interval: 100,
       type: "value",
       axisLine: {
         show: true,
@@ -247,7 +250,7 @@ const getOption = () => {
       {
         type: "custom",
         renderItem: function (params, api) {
-          console.log(api);
+          // console.log(api);
           const location = api.coord([api.value(0), api.value(1)]);
           return {
             type: "group",
@@ -399,7 +402,7 @@ const getOption = () => {
           };
         },
 
-        data: valueList,
+        data: data.valueList,
       },
       //顶部字体
       {
@@ -418,7 +421,7 @@ const getOption = () => {
           color: "rgba(221, 242, 255, 0)",
         },
 
-        data: valueList.map((item) => item + 5),
+        data: data.valueList.map((item) => parseInt(item)  + 5),
         barWidth: 20,
       },
     ],
@@ -429,21 +432,30 @@ const setChart = () => {
   myChart.setOption(data.option);
 };
 const getMaxCeilingValue = (arr) => {
-  let max = Math.max(...arr);
+  let max = Math.max(...arr);// 找到数组中的最大值
-  return Math.ceil(max / 100) * 100;
+  return Math.ceil(max / 100) * 100;// 将最大值向上取整到最近的100的倍数
+};
+const setChart1 = () => {
+  data.valueList = [];
+  data.xxname = [];
+  if (data.list.length !== 0) {
+    data.list.forEach((item) => {
+      data.xxname.push(item.name); //信息名
+      data.valueList.push(item.num); //信息数
+    });
+  }
 };
 
 onBeforeMount(() => {
   setTimeout(() => {
-    data.Max = getMaxCeilingValue(valueList);
+    data.list = props.list;
-    maxList.value = valueList.map((item) => data.Max * 0.9);
+    setChart1();
+    data.Max = getMaxCeilingValue(data.valueList);
+    maxList.value = data.valueList.map((item) => parseInt(data.Max)   * 0.9);// 生成新的数组，将每个值都替换为 data.Max 的90%
     getOption();
     setChart();
-  }, 600);
+  }, 800);
 });
-
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-</style>
-

src/view/echarts_sy/pie.vue

@@ -138,6 +138,8 @@ const resultData = [
     value: 100,
   },
 ];
+  var max = 0;
+  var number = 0;
 const getOption1 = () => {
   // data.list[0].value = data.list.nl17;
   // data.list[1].value = data.list.nl1834;
@@ -157,11 +159,20 @@ const getOption1 = () => {
   data.list[10].value = parseInt(data.list1.nl100);
 
   let sum = 0;
+
   data.list.forEach((item) => {
+    if (item.value > max) {
+      max = item.value;
+    }
     sum += item.value;
   });
+  //放大
+ number = Math.round(max * 0.2);
   data.list.forEach((item) => {
-    optionData.push({ value: item.value, name: item.name });
+    optionData.push({
+      value: item.value + number,
+      name: item.name,
+    });
     optionData.push({
       name: "",
       value: sum / 100,
@@ -224,7 +235,7 @@ const getOption = () => {
         let res = "";
         const { marker, name, value } = params;
         if (name !== "") {
-          res += `${marker}${name}:${value}`;
+          res += `${marker}${name}:${value-number}`;
         }
         return res;
       },

src/view/echarts_yl/ylSMFW.vue

@@ -326,7 +326,7 @@ onBeforeMount(() => {
   setTimeout(() => {
     data.list = props.list;
     data.day = props.list.day;
-    console.log(data.list, "助老服务");
+    // console.log(data.list, "助老服务");
     setChart1();
     getOption();
     setChart();

src/view/education.vue

@@ -92,32 +92,32 @@
           <div class="schoolb">
             <img src="../assets/eduImg/xxgkTop.png" class="gkTop" alt="" />
             <div class="grade">
-              <div class="schoolbs" @click="showDialog('学校', '')">
+              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
                 <span class="spot">初中</span>
                 <span>{{ data.xxgk.czxxsl }}</span>
               </div>
-              <div class="schoolbs" @click="showDialog('学校', '')">
+              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
                 <span class="spot">高中</span>
                 <span>{{ data.xxgk.gzxxsl }}</span>
               </div>
             </div>
             <div class="grade">
-              <div class="schoolbs" @click="showDialog('学校', '')">
+              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
                 <span class="spot">小学</span>
                 <span>{{ data.xxgk.xxxxsl }}</span>
               </div>
-              <div class="schoolbs" @click="showDialog('学校', '')">
+              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
                 <span class="spot">中职</span>
                 <span>{{ data.xxgk.zzxxsl }}</span>
               </div>
             </div>
             <div class="grade grade1">
-              <div class="schoolbs" @click="showDialog('学校', '')">
+              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
                 <span class="spot">幼儿园</span>
                 <span>{{ data.xxgk.yeyxxsl }}</span>
               </div>
               <div class="schoolbs">
-                <span class="spot" @click="showDialog('学校', '')"
+                <span class="spot" @click="showDialog('学校', '/api/ggfwyth/schoolList')"
                   >特殊教育</span
                 >
                 <span>{{ data.xxgk.tsjyxxsl }}</span>
@@ -426,21 +426,50 @@ const tableType = reactive({
   url: "",
   title: "",
   columns: [
+    // {
+    //   label: "学校",
+    //   property: "school",
+    // },
+    // {
+    //   label: "教师数",
+    //   property: "teacher",
+    // },
+    // {
+    //   label: "学生数",
+    //   property: "student",
+    // },
+    // {
+    //   label: "班级数",
+    //   property: "banji",
+    // },
+
     {
-      label: "学校",
+      label: "班级数",
-      property: "school",
+      property: "bjs",
     },
     {
-      label: "教师数",
+      label: "	教师数",
-      property: "teacher",
+      property: "jss",
+    },
+    {
+      label: "区域",
+      property: "qq",
+    },
+    {
+      label: "学段",
+      property: "xd",
     },
     {
       label: "学生数",
-      property: "student",
+      property: "xss",
     },
     {
-      label: "班级数",
+      label: "	学校名称",
-      property: "banji",
+      property: "xxmc",
+    },
+    {
+      label: "性质",
+      property: "xz",
     },
   ],
   data: [],
@@ -460,20 +489,20 @@ const showDialog = (title, url) => {
   tableType.url = url;
   pagination.currentPage = 1;
   dialogShow.value = true;
-  // getTable(url, pagination.currentPage);
+  getTable(url, pagination.currentPage);
 };
 //获取表格数据
 const getTable = (url, currentPage) => {
   dialogShow.value = true;
-  // http
+  http
-  //   .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
+    .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
-  //   .then((res) => {
+    .then((res) => {
-  //     if (res.code == 200) {
+      if (res.code == 200) {
-  //       tableType.data = res.data;
+        tableType.data = res.data;
-  //       pagination.total = res.count;
+        pagination.total = res.count;
-  //       dialogShow.value = true;
+        dialogShow.value = true;
-  //     }
+      }
-  //   });
+    });
 };
 const close = () => {
   dialogShow.value = false;
@@ -1789,6 +1818,34 @@ onMounted(() => {
     }
   }
 }
+
+:deep(.el-table) {
+  background: rgba(32, 64, 115, 1);
+
+  --el-table-border-color: none;
+  border: 1px solid #7aceff;
+}
+.table {
+  :deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) {
+    border: none !important;
+    padding-left: 10px !important;
+  }
+
+  :deep(.el-table td.el-table__cell) {
+    padding-left: 10px;
+  }
+}
+:deep(.el-table--enable-row-hover .el-table__body tr:hover > td) {
+  background-color: #2f4b74;
+}
+
+:deep(.el-table__empty-block) {
+  background-color: #122560;
+}
+
+:deep(.el-table .el-table__row) {
+  border-bottom: none;
+}
 </style>
 <style lang="scss">
 .selectBox {

src/view/hygiene.vue

@@ -271,7 +271,10 @@ onBeforeMount(async () => {
   getData();
 });
 onMounted(() => {
-  startAutoScroll();
+  setTimeout(()=>{
+ startAutoScroll();
+  },600)
+ 
   // console.log(
   //   mainRef.value.scrollTop,
   //   mainRef.value.scrollHeight,

src/view/sy.vue

@@ -397,7 +397,7 @@
             class="ylws_item"
             v-for="(item, index) in data.ylwsList"
             :key="index"
-            @click="showDialog2(item.name, '')"
+            @click="showDialog2(item.name, '/api/ggfwyth/yywsyList')"
           >
             <div class="name">{{ item.name }}</div>
             <div class="value">{{ item.value }}</div>
@@ -745,15 +745,15 @@ const columnss = reactive({
 const ylws_columns = ref([
   {
     label: "医院名称",
-    property: "name",
+    property: "yymc",
   },
   {
     label: "医生数",
-    property: "ys",
+    property: "zyyss",
   },
   {
     label: "护士数",
-    property: "hs",
+    property: "zchss",
   },
   {
     label: "家庭医生签约数",
@@ -761,7 +761,7 @@ const ylws_columns = ref([
   },
   {
     label: "床位数",
-    property: "cws",
+    property: "hdcws",
   },
 ]);
 const tableType = reactive({
@@ -808,7 +808,7 @@ const showDialog2 = (title, url) => {
     tableType.url = url;
     tableType.columns = ylws_columns.value;
     dialogShow.value = true;
-    // getTable(url, pagination.currentPage);
+    getTable(url, pagination.currentPage);
   }
 };
 
@@ -1278,6 +1278,7 @@ const getTable = (url, currentPage) => {
     .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
     .then((res) => {
       if (res.code == 200) {
+        console.log(res,'表格数据');
         tableType.data = res.data;
         pagination.total = res.count;
         dialogShow.value = true;

src/view/work.vue

@@ -454,7 +454,9 @@ const startAutoSwitching = () => {
   interval = setInterval(toggleShow, 6000); // 每6秒切换一次
 };
 onMounted(() => {
-  startAutoScroll();
+   setTimeout(()=>{
+ startAutoScroll();
+  },600)
   startAutoSwitching();
 });
 

src/view/yl.vue

@@ -1207,6 +1207,7 @@ const getData = () => {
     color: #ffffff;
   }
 }
+
 :deep(.el-table) {
   background: rgba(32, 64, 115, 1);
 

vite.config.js

@@ -15,7 +15,8 @@ export default defineConfig({
       // 第一个代理
       "/api": {
         // 匹配到啥来进行方向代理
-        target: "http://192.168.2.42:8095/", //本地
+        // target: "http://192.168.2.42:8095/", //本地
+        target: "http://192.168.2.17:8095/", //刘进
         // target: "http://220.191.238.50:996/", //线上
         changeOrigin: true, //是否支持跨域
         //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个
@@ -38,7 +39,7 @@ export default defineConfig({
 
   build: {
     chunkSizeWarningLimit: 1500,
-    assetsDir: 'assets', // 指定生成静态文件目录
+    assetsDir: "assets", // 指定生成静态文件目录
   },
-  base: './'
+  base: "./",
 });