From e8980c2e67d3dfd8806b1fb35b9a23da55921a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 8 Dec 2023 17:42:31 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=20?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9C=80=E6=B1=82=E6=9C=AA=E5=AE=8C=E6=88=90?=
=?UTF-8?q?=E6=83=85=E5=86=B5=E9=9C=80=E6=B1=82=E5=88=9D=E5=A7=8B=E5=8A=A0?=
=?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dataBoard/overview/components/MapDialog/DemandList.vue | 2 +-
src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/dataBoard/overview/components/MapDialog/DemandList.vue b/src/views/dataBoard/overview/components/MapDialog/DemandList.vue
index 68b5c7afa..42d2cce19 100644
--- a/src/views/dataBoard/overview/components/MapDialog/DemandList.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/DemandList.vue
@@ -104,7 +104,7 @@ export default {
}
},
mounted() {
-
+ this.typeChange(this.type)
},
watch: {
categoryCode() {
diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue b/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue
index 5d50ea460..06492d80a 100644
--- a/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue
+++ b/src/views/dataBoard/satisfactionEval/Problem/tyry/list.vue
@@ -24,7 +24,7 @@
-
+
{{ $sensitive(scope.row.mobile, 3, 7) }}
From 875cec86525036187fbda14813cccd6dbf1af587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 8 Dec 2023 17:47:08 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8D=A1=E7=82=B9=E5=87=BB=E6=B4=BE=E5=8D=95?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoard/overview/components/ResourceInfo.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/dataBoard/overview/components/ResourceInfo.vue b/src/views/dataBoard/overview/components/ResourceInfo.vue
index 1f0027726..727c51616 100644
--- a/src/views/dataBoard/overview/components/ResourceInfo.vue
+++ b/src/views/dataBoard/overview/components/ResourceInfo.vue
@@ -175,6 +175,7 @@ export default {
this.rowData = rowData
},
handleSure() {
+ this.handleClose()
this.$emit('ok',this.rowData)
},
getData(type) {
From 7d906db7b58d9ece9532dd49e41608de10f9e295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 8 Dec 2023 17:53:01 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=BE=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E9=97=AE=E9=A2=98=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=82=B9?=
=?UTF-8?q?=E5=87=BB=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoard/overview/components/MapDialog/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/dataBoard/overview/components/MapDialog/index.vue b/src/views/dataBoard/overview/components/MapDialog/index.vue
index 84dda9061..61d29193e 100644
--- a/src/views/dataBoard/overview/components/MapDialog/index.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/index.vue
@@ -134,7 +134,7 @@ export default {
children: 'children',
label: 'label'
},
- catVal: '',
+ catVal: 1,
catValSub: '',
catLabel: '',
totalCount: [],
From c94a9fc45d4417d6771cb1c61e06be35b1967f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 8 Dec 2023 17:58:36 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=BE=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=E9=97=AE=E9=A2=98=E7=82=B9=E5=87=BB=E8=B5=84=E6=BA=90?=
=?UTF-8?q?=E8=B0=83=E5=BA=A6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoard/overview/components/MapDialog/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/dataBoard/overview/components/MapDialog/index.vue b/src/views/dataBoard/overview/components/MapDialog/index.vue
index 61d29193e..81ca35c4d 100644
--- a/src/views/dataBoard/overview/components/MapDialog/index.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/index.vue
@@ -58,7 +58,7 @@
-
+
From 01d7aa202ea4ac6f4a55a7ca501c2413df8668ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 8 Dec 2023 18:04:54 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=BE=E4=BA=BA?=
=?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoard/overview/components/MapResourceInfoMore.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
index 55181b64c..7944eaa3c 100644
--- a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
+++ b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
@@ -268,7 +268,7 @@ export default {
this.education = data.education;
this.hobby = data.hobby;
this.dialogVisible = true
- this.queryParams.serviceType =
+ this.queryParams.serviceOrgType =
data.type === 1 ? 'ic_user_volunteer' :
data.type === 2 ? 'party_unit' :
data.type === 3 ? 'community_org' :
From 3862218b3d90666e121ad461e9578d9cc50143f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 8 Dec 2023 18:12:45 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E7=BB=84?=
=?UTF-8?q?=E7=BB=87=E4=BC=A0=E5=8F=82=20=E6=96=B0=E5=A2=9E=E8=B0=83?=
=?UTF-8?q?=E5=BA=A6=E5=88=97=E8=A1=A8=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../overview/components/MapDialog/DisputeDispatch.vue | 2 +-
.../dataBoard/overview/components/ResourceScheduling.vue | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue b/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
index e26e21998..4fa7295ea 100644
--- a/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
@@ -225,7 +225,7 @@ export default {
this.type === '4' ? 3 :
this.type === 'staffGrid' ? 4 :
this.type === 'publicWelfareNum' ? 5 : ''
- this.$refs.MapResourceInfo.open(type === 3 ? data.agencyId : data.id, type)
+ this.$refs.MapResourceInfo.open(type === 3 ? data.orgId : data.id, type)
},
typeChange(val) {
this.type = val
diff --git a/src/views/dataBoard/overview/components/ResourceScheduling.vue b/src/views/dataBoard/overview/components/ResourceScheduling.vue
index 45e8c95fc..454905884 100644
--- a/src/views/dataBoard/overview/components/ResourceScheduling.vue
+++ b/src/views/dataBoard/overview/components/ResourceScheduling.vue
@@ -175,9 +175,10 @@ export default {
getList() {
this.loading = true;
console.log(this.currentLevelData, 'this.currentLevelData')
+ const {level,orgId} = this.$store.state.chooseArea.chooseName
this.$http.get("/actual/base/streetOverview/queryPersonnelGroup" +
- "?level=" + this.currentLevelData.orgLevel +
- "&orgId=" + this.currentLevelData.orgId +
+ "?level=" + (this.currentLevelData.orgLevel || level) +
+ "&orgId=" + (this.currentLevelData.orgId || orgId) +
"&personnelType=" + this.peopleType)
.then(({data: {data}}) => {
this.loading = false;
From 3430498bfb98a4f042c99911acb0a4103ac71de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 8 Dec 2023 18:21:02 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91?=
=?UTF-8?q?=E6=A6=82=E8=A7=88=E4=B8=AD=E9=97=B4=E6=98=BE=E7=A4=BA=E6=80=BB?=
=?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dataBoard/renfang/cpts/jmPieOption.js | 33 +++++++++----------
src/views/dataBoard/renfang/cpts/jmgl.vue | 5 +--
2 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/views/dataBoard/renfang/cpts/jmPieOption.js b/src/views/dataBoard/renfang/cpts/jmPieOption.js
index c88b39cc0..de99d80fc 100644
--- a/src/views/dataBoard/renfang/cpts/jmPieOption.js
+++ b/src/views/dataBoard/renfang/cpts/jmPieOption.js
@@ -4,24 +4,21 @@ export function pieOption() {
const center = ["50%", "170px"];
return {
color: ["#1A95FF", "#FFAA00", "#04C790"],
- /* title: {
- text: "0",
- top: 45,
- left: "center",
+ title: {
+ text: "",
+ subtext: '总数',
+ left: '45%',
+ top: '35%',
+ textAlign :'center',
textStyle: {
- width: "100%",
- fontSize: 24,
- color: "#FFFFFF",
- fontWeight: 400,
+ color: '#7FCEFF',
+ fontSize: 18,
},
- itemGap: 5,
- // subtext: "总数",
- // subtextStyle: {
- // fontSize: 20,
- // color: "#fff",
- // fontWeight: 400,
- // },
- },*/
+ subtextStyle: {
+ fontSize: 12,
+ color: '#A3B9DA'
+ },
+ },
tooltip: {
show: false,
},
@@ -47,7 +44,7 @@ export function pieOption() {
show: false
},
data: [],
- label: {
+ /* label: {
show: false,
position: 'center',
formatter: data => {
@@ -75,7 +72,7 @@ export function pieOption() {
fontSize: '14',
fontWeight: 'normal'
}
- },
+ },*/
/* label: {
show: false,
position: 'center'
diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue
index 2965c7c78..59ed1afeb 100644
--- a/src/views/dataBoard/renfang/cpts/jmgl.vue
+++ b/src/views/dataBoard/renfang/cpts/jmgl.vue
@@ -180,6 +180,7 @@ export default {
this.pieOption = pieOption();
const {pandectData} = this;
console.log(pandectData)
+ this.pieOption.title.text = pandectData.totalResidents;
this.pieData = [
{value: pandectData.permanentResiCount, name: "常住人口"},
{value: pandectData.floatingResiCount, name: "流动人口"},
@@ -187,7 +188,7 @@ export default {
this.pieOption.series[0].data = this.pieData;
this.$refs.pieChart.setOption(this.pieOption);
this.$refs.pieChart.myChart.setOption(this.pieOption);
- this.$refs.pieChart.myChart.on('mouseover', (params) => {
+ /*this.$refs.pieChart.myChart.on('mouseover', (params) => {
var oldIndex = currentIndex;
var currentIndex = params.dataIndex;
this.highlightPie(currentIndex, oldIndex);
@@ -195,7 +196,7 @@ export default {
setTimeout(() => {
this.highlightPie(0, 1);
- }, 50)
+ }, 50)*/
},
highlightPie(currentIndex, oldIndex) {
this.$refs.pieChart.myChart.dispatchAction({
From 7c7674e6b68998fb7072346afc50cff94a3f6667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 8 Dec 2023 18:35:43 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=20?=
=?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E5=8E=9F=E5=9B=A0=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataBoard/overview/components/jdjs.vue | 6 +++---
.../satisfactionEval/modules/DissatisfiedReason/index.vue | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/dataBoard/overview/components/jdjs.vue b/src/views/dataBoard/overview/components/jdjs.vue
index 4fbfcecba..9d348d2f9 100644
--- a/src/views/dataBoard/overview/components/jdjs.vue
+++ b/src/views/dataBoard/overview/components/jdjs.vue
@@ -16,7 +16,7 @@
element-loading-text="加载中..."
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0,0,0,0.5)"
- style="height: 130px"
+ style="height: 135px;margin-top: 10px"
/>
@@ -277,7 +277,7 @@ export default {
fontSize: 12
},
align: 'right',
- padding: [6, 5, 5, 5],
+ padding: [0, 5, -5, 5],
},
axisLabel: {
show: true,
@@ -405,6 +405,6 @@ export default {
margin-top: 20px;
}
.f-darkGray{
- margin-top: 15px;
+ margin-top: 5px;
}
diff --git a/src/views/dataBoard/satisfactionEval/modules/DissatisfiedReason/index.vue b/src/views/dataBoard/satisfactionEval/modules/DissatisfiedReason/index.vue
index 1779db72a..441a013f1 100644
--- a/src/views/dataBoard/satisfactionEval/modules/DissatisfiedReason/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/DissatisfiedReason/index.vue
@@ -33,6 +33,7 @@ export default {
this.myChart = echarts.init(div);
var getname = data.map(item => item.dissatisfactionReasonName); // 课程名
var getNum = data.map(item => item.qty);
+ var total = eval(getNum.join('+'))
var data = [];
for (var i = 0; i < getname.length; i++) {
@@ -90,10 +91,10 @@ export default {
avoidLabelOverlap: false,
label: {
- show: false,
+ show: true,
position: "center",
color: "rgba(13, 17, 29,0)",
- formatter: `{primary|{d}%}\n{point|占比}}`,
+ formatter: `{primary|${total}}\n{point|总数}}`,
rich: {
primary: {
fontSize: 24,