From 826570f76831a500bb06faa5c22d118776f073c4 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 24 七月 2024 17:20:55 +0800
Subject: [PATCH] 11

---
 src/views/project/indexstatistics/components/organnumchart/index.vue |   78 ++++++++++++++++++++++++--------------
 src/views/project/indexstatistics/index.vue                          |   27 +++++++++++++
 2 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/src/views/project/indexstatistics/components/organnumchart/index.vue b/src/views/project/indexstatistics/components/organnumchart/index.vue
index 20762fa..627840e 100644
--- a/src/views/project/indexstatistics/components/organnumchart/index.vue
+++ b/src/views/project/indexstatistics/components/organnumchart/index.vue
@@ -16,29 +16,29 @@
 export default {
   name: "organnumchart",
   components: {
-    Echart,
+    Echart
   },
   props: {
     id: {
       type: String,
-      default: "organnumcgart",
+      default: "organnumcgart"
     },
     width: {
       type: String,
-      default: "100%",
+      default: "100%"
     },
     height: {
       type: String,
-      default: "600px",
+      default: "600px"
     },
     cdata: {
       type: Array,
-      default: () => [],
-    },
+      default: () => []
+    }
   },
   data() {
     return {
-      options: {},
+      options: {}
     };
   },
   created() {},
@@ -47,49 +47,51 @@
     resetOption(newData) {
       let organNameArr = [];
       let organeNumArr = [];
+      let organeNumArrabandonCount = [];
       for (let i = 0; i < newData.length; i++) {
         organNameArr.push(newData[i].name);
         organeNumArr.push(newData[i].value);
+        organeNumArrabandonCount.push(newData[i].value1);
       }
       this.options = {
         title: {
-          text: "鑾峰彇鍣ㄥ畼鍜岀粍缁囩殑鏁伴噺",
+          text: "鑾峰彇鍣ㄥ畼鍜岀粍缁囩殑鏁伴噺"
         },
         tooltip: {
           trigger: "axis",
           axisPointer: {
-            type: "shadow",
-          },
+            type: "shadow"
+          }
         },
         grid: {
           top: "12%",
           left: "0",
           right: "0",
           bottom: "5%",
-          containLabel: true,
+          containLabel: true
         },
         xAxis: {
           type: "category",
           data: organNameArr,
           axisLine: {
-            show: false,
+            show: false
           },
           axisLabel: {
             textStyle: {
               color: "#566f94", //鏇存敼鍧愭爣杞存枃瀛楅鑹�
-              fontSize: 12, //鏇存敼鍧愭爣杞存枃瀛楀ぇ灏�
+              fontSize: 12 //鏇存敼鍧愭爣杞存枃瀛楀ぇ灏�
             },
-            interval: 0,
-          },
+            interval: 0
+          }
         },
         yAxis: {
           type: "value",
           // boundaryGap: [0, 0.01],
-          show: false,
+          show: false
         },
         series: [
           {
-            name: "鍣ㄥ畼鏁伴噺",
+            name: "鑾峰彇鏁伴噺",
             type: "bar",
             //barWidth: 20, //鏌卞浘瀹藉害
             itemStyle: {
@@ -100,16 +102,35 @@
                   textStyle: {
                     //鏁板�兼牱寮�
                     color: "#566f94",
-                    fontSize: 14,
-                  },
-                },
-              },
+                    fontSize: 14
+                  }
+                }
+              }
             },
-            data: organeNumArr,
+            data: organeNumArr
           },
-        ],
+          {
+            name: "寮冪敤鏁伴噺",
+            type: "bar",
+            //barWidth: 20, //鏌卞浘瀹藉害
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //寮�鍚樉绀�
+                  position: "top", //鍦ㄤ笂鏂规樉绀�
+                  textStyle: {
+                    //鏁板�兼牱寮�
+                    color: "#566f94",
+                    fontSize: 14
+                  }
+                }
+              }
+            },
+            data: organeNumArrabandonCount
+          }
+        ]
       };
-    },
+    }
   },
   computed: {},
   watch: {
@@ -118,11 +139,10 @@
         this.resetOption(newData);
       },
       immediate: true,
-      deep: true,
-    },
-  },
+      deep: true
+    }
+  }
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/project/indexstatistics/index.vue b/src/views/project/indexstatistics/index.vue
index 62a739b..cfdefc0 100644
--- a/src/views/project/indexstatistics/index.vue
+++ b/src/views/project/indexstatistics/index.vue
@@ -626,7 +626,7 @@
     return {
       city: "",
       reportno: "",
-      selecttime: [ new Date(new Date().getFullYear(), 0),new Date()],
+      selecttime: [new Date(new Date().getFullYear(), 0), new Date()],
       year: "閫夋嫨骞翠唤",
       isloading: false,
       maxHeight: 0,
@@ -668,12 +668,15 @@
           key: "heart",
           name: "蹇冭剰",
           value: 0,
+          value1: 0,
           code: "C38"
         },
         {
           key: "fullLiver",
           name: "鑲濊剰",
           value: 0,
+          value1: 0,
+
           code: "C22"
         },
 
@@ -681,60 +684,80 @@
           key: "leftRenal",
           name: "宸﹁偩",
           value: 0,
+          value1: 0,
+
           code: "C64L"
         },
         {
           key: "rightRenal",
           name: "鍙宠偩",
           value: 0,
+          value1: 0,
+
           code: "C64R"
         },
         {
           key: "fullLung",
           name: "鍏ㄨ偤",
           value: 0,
+          value1: 0,
+
           code: "C34"
         },
         {
           key: "leftLung",
           name: "宸﹁偤",
           value: 0,
+          value1: 0,
+
           code: "C34L"
         },
         {
           key: "rightLung",
           name: "鍙宠偤",
           value: 0,
+          value1: 0,
+
           code: "C34R"
         },
         {
           key: "",
           name: "灏忚偁",
           value: 0,
+          value1: 0,
+
           code: "C17"
         },
         {
           key: "",
           name: "鑳拌吅",
           value: 0,
+          value1: 0,
+
           code: "C25"
         },
         {
           key: "leftEye",
           name: "宸︾溂鑶�",
           value: 0,
+          value1: 0,
+
           code: "C69L"
         },
         {
           key: "rightEye",
           name: "鍙崇溂鑶�",
           value: 0,
+          value1: 0,
+
           code: "C69R"
         },
         {
           key: "",
           name: "鍏跺畠",
           value: 0,
+          value1: 0,
+
           code: "C01"
         }
         // {
@@ -997,6 +1020,7 @@
       if (this.reportervalue != "") {
         param.reporterno = this.reportervalue;
       }
+      console.log(param, "param");
       getDonateorganSum(param).then(response => {
         /*
         let list = this.organData.map((item) => item);
@@ -1012,6 +1036,7 @@
           );
           if (ii > -1) {
             this.organData[i].value = list[ii].count;
+            this.organData[i].value1 = list[ii].abandonCount;
           }
         }
       });

--
Gitblit v1.9.3