From 8022f7036945b75f82f2dfc43055623f81ed98f6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 五月 2025 22:42:56 +0800
Subject: [PATCH] yxh

---
 src/views/project/indexstatistics/index.vue |   78 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/src/views/project/indexstatistics/index.vue b/src/views/project/indexstatistics/index.vue
index cfdefc0..fc284ba 100644
--- a/src/views/project/indexstatistics/index.vue
+++ b/src/views/project/indexstatistics/index.vue
@@ -232,7 +232,7 @@
                 params: {
                   starttime: starttime,
                   endtime: endtime,
-                  tempRecordState: 99,
+                  terminationcase: 1,
                   reporterno: reportervalue,
                   shen: searchAddress.shen,
                   shi: searchAddress.shi,
@@ -258,8 +258,27 @@
             >
               <el-row style="margin-bottom: 20px">
                 <span style="font-size: 18px; color: #566f94; font-weight: bold"
-                  >鏈勾搴︽寚鏍囨暟鎹垎鏋�</span
+                  >鎸囨爣鏁版嵁鍒嗘瀽</span
                 >
+                <span style="margin-left: 30px;">
+                  <router-link
+                    :to="{
+                      name: 'DonationProcess',
+                      params: {
+                        starttime: starttime,
+                        endtime: endtime,
+                        terminationcase: 1,
+                        reporterno: reportervalue,
+                        shen: searchAddress.shen,
+                        shi: searchAddress.shi,
+                        qu: searchAddress.qu,
+                        city: city
+                      }
+                    }"
+                  >
+                    <el-button type="primary" round>鎹愮尞杩涚▼</el-button>
+                  </router-link>
+                </span>
               </el-row>
               <el-row :gutter="3">
                 <el-col :span="8" style="text-align: center">
@@ -421,7 +440,7 @@
           </el-col>
           <el-col :span="12">
             <el-card shadow="always" style="height: 640px" ref="organChartCard">
-              <OrganNumChart :cdata="organData" />
+              <OrganNumChart :cdata="organData" :CommonOrgan="CommonOrgan" />
             </el-card>
             <!-- <el-col :span="7">
         <el-card shadow="always" style="height: 640px" ref="orgNumberCard">
@@ -583,6 +602,7 @@
 import { listOrganallocation } from "@/api/project/organallocation";
 
 import RankChart from "./components/rankbarchart";
+import request from '@/utils/request'
 import OrganNumChart from "./components/organnumchart";
 import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
 import dayjs from "dayjs";
@@ -630,6 +650,8 @@
       year: "閫夋嫨骞翠唤",
       isloading: false,
       maxHeight: 0,
+      areaJson: "/project/dict/treeselect", // 鎻愬墠瀛樺偍鍦板潃鏁版嵁鎺ュ彛
+      CommonOrgan: null,
       provinceData: [
         { label: "鍏ㄩ儴鍦板競", value: "" },
         { label: "鏉窞甯�", value: "1" },
@@ -678,6 +700,38 @@
           value1: 0,
 
           code: "C22"
+        },
+        {
+          key: "Lefthalfliver",
+          name: "宸﹀崐鑲�",
+          value: 0,
+          value1: 0,
+
+          code: "C22L"
+        },
+        {
+          key: "Leftouterlobe",
+          name: "宸﹀鍙�",
+          value: 0,
+          value1: 0,
+
+          code: "C22L0"
+        },
+        {
+          key: "Righthalfliver",
+          name: "鍙冲崐鑲�",
+          value: 0,
+          value1: 0,
+
+          code: "C22R"
+        },
+        {
+          key: "RML",
+          name: "鍙充笁鍙�",
+          value: 0,
+          value1: 0,
+
+          code: "C22R0"
         },
 
         {
@@ -862,6 +916,7 @@
       this.value = "鏉窞甯�";
       this.GetOrgDonateNumNew();
       this.GetOrgDonateNum();
+      this.getAddressData();
     });
   },
   methods: {
@@ -883,6 +938,20 @@
           this.tableData = res.rows;
           this.loading = false;
           this.total = res.total;
+        }
+      });
+    },
+    // 鎻愬墠缂撳瓨鏁版嵁
+    getAddressData() {
+      var that = this;
+      request({
+        url: that.areaJson,
+        method: "get",
+      }).then(function (response) {
+        if (response.code === 200) {
+          //鑾峰彇鍦板潃
+          let addressArray = response.data;
+          this.$store.commit('updateMyData', addressArray);
         }
       });
     },
@@ -1029,7 +1098,8 @@
         }
         this.organData = list;
       */
-        let list = response.data;
+        let list = response.data.organInfoVOList;
+        this.CommonOrgan = response.data;
         for (let i = 0; i < this.organData.length; i++) {
           let ii = list.findIndex(
             item => item.organNo == this.organData[i].code

--
Gitblit v1.9.3