From 0b5a704e49545b4059b9eebe247adea8ec14911f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 05 六月 2025 11:45:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/indexstatistics/index.vue | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 10 deletions(-)
diff --git a/src/views/project/indexstatistics/index.vue b/src/views/project/indexstatistics/index.vue
index 5bc9909..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">
@@ -431,10 +450,10 @@
>鍚勫湴鍖哄尰闄㈡渚嬫暟鎹�</span
>
</el-col>
-
+
</el-row>
<el-row>
-
+
</el-row>
<dv-scroll-board
:config="config"
@@ -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";
@@ -626,12 +646,14 @@
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,
+ areaJson: "/project/dict/treeselect", // 鎻愬墠瀛樺偍鍦板潃鏁版嵁鎺ュ彛
+ CommonOrgan: null,
provinceData: [
- { label: "鍏ㄩ儴", value: "" },
+ { label: "鍏ㄩ儴鍦板競", value: "" },
{ label: "鏉窞甯�", value: "1" },
{ label: "瀹佹尝甯�", value: "2" },
{ label: "娓╁窞甯�", value: "3" },
@@ -668,73 +690,128 @@
key: "heart",
name: "蹇冭剰",
value: 0,
+ value1: 0,
code: "C38"
},
{
key: "fullLiver",
name: "鑲濊剰",
value: 0,
+ 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"
+ },
+
{
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"
}
// {
@@ -839,6 +916,7 @@
this.value = "鏉窞甯�";
this.GetOrgDonateNumNew();
this.GetOrgDonateNum();
+ this.getAddressData();
});
},
methods: {
@@ -860,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);
}
});
},
@@ -997,6 +1089,7 @@
if (this.reportervalue != "") {
param.reporterno = this.reportervalue;
}
+ console.log(param, "param");
getDonateorganSum(param).then(response => {
/*
let list = this.organData.map((item) => item);
@@ -1005,13 +1098,15 @@
}
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
);
if (ii > -1) {
this.organData[i].value = list[ii].count;
+ this.organData[i].value1 = list[ii].abandonCount;
}
}
});
@@ -1158,7 +1253,7 @@
listDonatebaseinfo({}).then(res => {
let list = res.rows;
let reportlist = [];
- reportlist.push({ reporterno: "", reportername: "鍏ㄩ儴" });
+ reportlist.push({ reporterno: "", reportername: "鍏ㄩ儴浜哄憳" });
list.forEach(element => {
reportlist.push({
reporterno: element.reporterno,
--
Gitblit v1.9.3