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

src/view/echarts_sy/zwfw1.vue

@@ -11,17 +11,17 @@ const chart = ref(); // 创建DOM引用
 const dataList = [
   {
     name: "2.0收件数",
-    value: 90,
+    value: 33044,
   },
   {
     name: "总收件数",
-    value: 100,
+    value: 33295,
   },
 ];
 //内圈数据
 var data = [
   {
-    value: 90,
+    value: dataList[0].value,
     name: "2.0收件数",
     itemStyle: {
       normal: {
@@ -45,7 +45,7 @@ var data = [
     },
   },
   {
-    value: 10,
+    value: dataList[1].value - dataList[0].value,
     name: "",
     itemStyle: {
       normal: {
@@ -63,7 +63,7 @@ var data = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "总收件数",
     itemStyle: {
       normal: {
@@ -75,7 +75,7 @@ var data = [
 //外圈数据
 const data1 = [
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -95,7 +95,7 @@ const data1 = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -106,14 +106,13 @@ const data1 = [
 ];
 
 const option = {
-  legend: 
+  legend: {
-    {
+    selectedMode: false,
-      selectedMode:false,
     itemWidth: 10,
     itemHeight: 10,
     itemGap: 10,
     icon: "circle",
-      data: ["2.0收件数","",'总收件数'],
+    data: ["2.0收件数", "", "总收件数"],
     bottom: "3%",
     width: 380,
     textStyle: {
@@ -132,8 +131,8 @@ const option = {
 
   title: [
     {
-      text: "90%",
+      text: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
-      right: "24%",
+      right: "18%",
       bottom: "40%",
       textStyle: {
         color: "#ffffff",

src/view/echarts_sy/zwfw2.vue

@@ -11,16 +11,16 @@ const chart = ref(); // 创建DOM引用
 const dataList = [
   {
     name: "超期受理数",
-    value: 90,
+    value: 9,
   },
   {
     name: "应受理数",
-    value: 100,
+    value: 32561,
   },
 ];
 var data = [
   {
-    value: 90,
+    value: dataList[0].value,
     name: "超期受理数",
     itemStyle: {
       normal: {
@@ -58,7 +58,7 @@ var data = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "应受理数",
     itemStyle: {
       normal: {
@@ -69,7 +69,7 @@ var data = [
 ];
 const data1 = [
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -89,7 +89,7 @@ const data1 = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -127,8 +127,9 @@ const option = {
   
   title: [
     {
-      text: "90%",
+      // text: "0.03%",
-      right: "24%",
+      text:`${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
+      right: "19%",
       bottom: "40%",
       textStyle: {
         color: "#ffffff",

src/view/echarts_sy/zwfw3.vue

@@ -11,16 +11,16 @@ const chart = ref(); // 创建DOM引用
 const dataList = [
   {
     name: "超期办理数",
-    value: 90,
+    value: 7,
   },
   {
     name: "应办理数",
-    value: 100,
+    value: 31615,
   },
 ];
 var data = [
   {
-    value: 90,
+    value: dataList[0].value,
     name: "超期办理数",
     itemStyle: {
       normal: {
@@ -58,7 +58,7 @@ var data = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "应办理数",
     itemStyle: {
       normal: {
@@ -69,7 +69,7 @@ var data = [
 ];
 const data1 = [
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -89,7 +89,7 @@ const data1 = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -126,8 +126,8 @@ const option = {
   
   title: [
     {
-      text: "90%",
+      text: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
-      right: "24%",
+      right: "19%",
       bottom: "40%",
       textStyle: {
         color: "#ffffff",

src/view/sy.vue

@@ -726,11 +726,11 @@ const pagination = reactive({
 });
 const handlePagination = (current) => {
   pagination.currentPage = current;
-  if (tableType.title == "医院卫生院") {
+  // if (tableType.title == "医院卫生院") {
-    getTable2(tableType.url, pagination.currentPage);
+  //   getTable2(tableType.url, pagination.currentPage);
-  } else {
+  // } else {
     getTable(tableType.url, pagination.currentPage);
-  }
+  // }
 };
 const showDialog = (title, url) => {
   tableType.title = title;
@@ -745,7 +745,7 @@ const close = () => {
   dialogShowEc.value = false;
   dialogShowTab.value = false;
   pagination.currentPage = 1;
-   pagination.total=100;
+  pagination.total = 100;
 };
 //医疗卫生
 const showDialog2 = (title, url) => {
@@ -753,7 +753,8 @@ const showDialog2 = (title, url) => {
     tableType.title = title;
     tableType.url = url;
     tableType.columns = ylws_columns.value;
-    getTable2(url, pagination.currentPage);
+     dialogShow.value = true;
+    // getTable(url, pagination.currentPage);
   }
 };
 
@@ -2340,6 +2341,7 @@ const showTab = (val) => {
     margin-bottom: 20px;
 
     .choose {
+      cursor: pointer;
       text-align: center;
       line-height: 40px;
       width: 170px;
@@ -2355,6 +2357,7 @@ const showTab = (val) => {
     }
 
     .noChoose {
+      cursor: pointer;
       text-align: center;
       line-height: 40px;
       width: 170px;
@@ -2778,6 +2781,7 @@ table {
     .jtsyBoxtop1 {
       position: relative;
       display: flex;
+      overflow: hidden;
       .turn {
         width: 146px;
         height: 104px;

src/view/yl.vue

@@ -183,7 +183,10 @@
           </div>
         </div>
         <div class="history">
-          <div class="history1" @click="showDialog('养老机构', '')">
+          <div
+            class="history1"
+            @click="showDialog('养老机构', '/api/ggfwyth/yljghmcList')"
+          >
             <div>
               <span>{{ data.yljgzlzx.yljg }}<span class="unit">个</span></span>
             </div>
@@ -198,7 +201,12 @@
             <img src="@/assets/YLimg/ylimg3.png" alt="" />
             <img class="historyimg" src="@/assets/YLimg/ylimg6.png" alt="" />
           </div> -->
-          <div class="history1" @click="showDialog('居家养老服务照料中心', '')">
+          <div
+            class="history1"
+            @click="
+              showDialog('居家养老服务照料中心', '/api/ggfwyth/yljgzlzxList')
+            "
+          >
             <div>
               <span>{{ data.yljgzlzx.zlzx }}<span class="unit">个</span></span>
             </div>
@@ -345,15 +353,15 @@ const xz_column = ref([
 const yl_column = ref([
   {
     label: "机构名称",
-    property: "name",
+    property: "mc",
   },
   {
     label: "机构地址",
-    property: "address",
+    property: "dz",
   },
   {
     label: "老人数量",
-    property: "oldMan",
+    property: "rzlrsl",
   },
 ]);
 // 表格分页
@@ -379,17 +387,15 @@ const showDialog = (title, url) => {
 };
 //获取表格数据
 const getTable = (url, currentPage) => {
+  http
+    .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
+    .then((res) => {
+      if (res.code == 200) {
+        tableType.data = res.data;
+        pagination.total = res.count;
         dialogShow.value = true;
-  tableType.data = [];
+      }
-  // http
+    });
-  //   .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
-  //   .then((res) => {
-  //     if (res.code == 200) {
-  //       tableType.data = res.data;
-  //       pagination.total = res.count;
-  //       dialogShow.value = true;
-  //     }
-  //   });
 };
 const close = () => {
   dialogShow.value = false;