diff --git a/src/assets/images/gailan/yuan_bg.png b/src/assets/images/gailan/yuan_bg.png index 9ffe2d329..55918c084 100644 Binary files a/src/assets/images/gailan/yuan_bg.png and b/src/assets/images/gailan/yuan_bg.png differ diff --git a/src/assets/images/gailan/zq_bg.png b/src/assets/images/gailan/zq_bg.png index 1a310e6ab..4de7260d8 100644 Binary files a/src/assets/images/gailan/zq_bg.png and b/src/assets/images/gailan/zq_bg.png differ diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index 1c8f54e0d..a95a64baa 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -394,11 +394,11 @@ border: 1px solid rgba(0, 0, 0, 0.15); font-size: 12px; font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; color: rgba(0, 0, 0, 0.88); line-height: 20px; font-style: normal; text-align: center; + font-weight: 600; } } diff --git a/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue b/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue index 3858f601c..aec28a7dc 100644 --- a/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue +++ b/src/views/dataBoard/cpts/family/modules/businessTables/economize.vue @@ -16,6 +16,7 @@
暂无数据
+ diff --git a/src/views/dataBoard/cpts/personnel/modules/businessTables/economize.vue b/src/views/dataBoard/cpts/personnel/modules/businessTables/economize.vue index c2238e8ac..7866f51e4 100644 --- a/src/views/dataBoard/cpts/personnel/modules/businessTables/economize.vue +++ b/src/views/dataBoard/cpts/personnel/modules/businessTables/economize.vue @@ -1,6 +1,11 @@ -
- +
+
暂无数据
- +
@@ -1054,49 +1047,47 @@ export default { @import "~@/assets/scss/c/function.scss"; .u-categorys { - display: flex; - flex-wrap: wrap; - - + display: flex; + flex-wrap: wrap; } .u-categorys span { - display: block; - width: 90px; - } + display: block; + width: 90px; +} .m-tabs { - margin-top: 30px; - display: flex; - align-items: center; - padding-left: 20px; + margin-top: 30px; + display: flex; + align-items: center; + padding-left: 20px; - .tab-btn { - width: 30px; - text-align: center; - cursor: pointer; - } + .tab-btn { + width: 30px; + text-align: center; + cursor: pointer; + } - .tab { - @include toe; - margin: 0 5px; - min-width: 72px; - padding: 0 8px; - height: 24px; - box-shadow: inset 0px 0px 12px 0px rgba(26, 149, 255, 0.45); - border-radius: 2px; - border: 1px solid #1a95ff; - border-radius: 2px; - text-align: center; - font-size: 14px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - line-height: 23px; - cursor: pointer; - transition: all ease 0.5s; - &.z-on { - background: linear-gradient(90deg, #1a5afd, #009cff); - box-shadow: none; - } - } + .tab { + @include toe; + margin: 0 5px; + min-width: 72px; + padding: 0 8px; + height: 24px; + box-shadow: inset 0px 0px 12px 0px rgba(26, 149, 255, 0.45); + border-radius: 2px; + border: 1px solid #1a95ff; + border-radius: 2px; + text-align: center; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 23px; + cursor: pointer; + transition: all ease 0.5s; + &.z-on { + background: linear-gradient(90deg, #1a5afd, #009cff); + box-shadow: none; + } + } } diff --git a/src/views/dataBoard/overview/components/EventAndFollowUp.vue b/src/views/dataBoard/overview/components/EventAndFollowUp.vue index 54c09dac0..fb464eef5 100644 --- a/src/views/dataBoard/overview/components/EventAndFollowUp.vue +++ b/src/views/dataBoard/overview/components/EventAndFollowUp.vue @@ -36,7 +36,7 @@ import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue"; export default { name: "EventAndFollowUp", - components: {Tabs}, + components: { Tabs }, props: { date: { type: String, @@ -86,27 +86,25 @@ export default { methods: { getData(item) { this.$http - .get( - "/actual/base/streetOverview/eventAndFollowGroup?month=" + - this.date + - "&level=" + - item.orgLevel + - "&orgId=" + - item.orgId + - "&queryType=" + - this.type - ) - .then(({data: {data}}) => { - if (data) { - - this.sumNum = data.sumNum; - this.lastSumNum = data.lastSumNum; - this.processNum = data.processNum; - this.closedNum = data.closedNum; - this.closedRatio = data.closedRatio; - } - - }); + .get( + "/actual/base/streetOverview/eventAndFollowGroup?month=" + + this.date + + "&level=" + + item.orgLevel + + "&orgId=" + + item.orgId + + "&queryType=" + + this.type + ) + .then(({ data: { data } }) => { + if (data) { + this.sumNum = data.sumNum; + this.lastSumNum = data.lastSumNum; + this.processNum = data.processNum; + this.closedNum = data.closedNum; + this.closedRatio = data.closedRatio; + } + }); }, typeChange(val) { this.type = val; @@ -127,10 +125,10 @@ export default { .content { background: linear-gradient( - 90deg, - rgba(1, 94, 234, 0.1) 0%, - rgba(16, 50, 103, 0) 50%, - rgba(1, 94, 234, 0.1) 100% + 90deg, + rgba(1, 94, 234, 0.1) 0%, + rgba(16, 50, 103, 0) 50%, + rgba(1, 94, 234, 0.1) 100% ); padding: 20px 19px; display: flex; @@ -180,12 +178,29 @@ export default { } } +@keyframes roate { + 0% { + transform: rotateZ(0); + -ms-transform: rotateZ(0); + -moz-transform: rotateZ(0); + -webkit-transform: rotateZ(0); + -o-transform: rotateZ(0); + } + 100% { + transform: rotateZ(360deg); + -ms-transform: rotateZ(360deg); + -moz-transform: rotateZ(360deg); + -webkit-transform: rotateZ(360deg); + -o-transform: rotateZ(360deg); + } +} .processing { .bg { background: url("@/assets/images/gailan/yuan_bg.png") no-repeat center; flex: 0 0 150px; width: 150px; height: 150px; + background-size: 150px 150px; display: flex; align-items: center; justify-content: center; @@ -193,11 +208,13 @@ export default { .bg-1 { background: url("@/assets/images/gailan/zq_bg.png") no-repeat center; - width: 146px; - height: 136px; + width: 158px; + height: 158px; + background-size: 158px 158px; position: absolute; - left: 9px; - top: 9px; + left: -3px; + top: -3px; + animation: roate 5s infinite linear; //这是重点,给它一个旋转的属性 } .num { diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue index 14c1e1440..10f28bc7e 100644 --- a/src/views/dataBoard/renfang/cpts/fwgl.vue +++ b/src/views/dataBoard/renfang/cpts/fwgl.vue @@ -261,7 +261,6 @@ export default { // 获取pieChart配置 this.pieOption = pieOption(); const {pandectData} = this - console.log(pandectData); // 设置三个配置值 this.pieOption.title.text = (pandectData.homeCount != 0 diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue index a498e359d..ebea4003f 100644 --- a/src/views/dataBoard/renfang/cpts/jmgl.vue +++ b/src/views/dataBoard/renfang/cpts/jmgl.vue @@ -7,6 +7,7 @@ class="" @myChartMethod="pieInitOk" ref="pieChart" + v-if="pandectData.totalResidents" >
@@ -31,7 +32,7 @@
居民总数
-
{{ info.resident_count }}
+
{{ pandectData.totalResidents }}
@@ -50,7 +51,7 @@
- {{ info.inhabitant_count }} + {{ pandectData.permanentResiCount }}
@@ -70,7 +71,7 @@
流动人口
-
{{ info.floating_count }}
+
{{ pandectData.floatingResiCount }}
@@ -145,6 +146,7 @@ export default { inhabitant_count: 0, floating_count: 0, }, + pandectData:{} }; }, watch: { @@ -153,7 +155,9 @@ export default { }, }, mounted() { - this.getData(); + this.$nextTick(()=>{ + this.getData(); + }) }, methods: { toListPage(type = "", type_name = "") { @@ -233,21 +237,19 @@ export default { async iniPieChart() { this.$refs.pieChart.clear(); // this.$refs.pieChart.showLoading() - // 获取pieChart配置 this.pieOption = pieOption(); - - const { info } = this; + const { pandectData } = this; // 设置三个配置值 this.pieOption.title.text = - (info.resident_count != 0 + (pandectData.totalResidents != 0 ? parseInt( - (100 * info.inhabitant_count) / info.resident_count + (100 * pandectData.permanentResiCount) / pandectData.totalResidents ) : "--") + "%"; this.pieData = [ - { value: info.inhabitant_count, name: "常住人口" }, - { value: info.floating_count, name: "流动人口" }, + { value: pandectData.permanentResiCount, name: "常住人口" }, + { value: pandectData.floatingResiCount, name: "流动人口" }, ]; this.pieOption.series[0].data = this.pieData; this.$refs.pieChart.setOption(this.pieOption); @@ -260,14 +262,14 @@ export default { fromActionPayload: { dataIndexInside }, } = params; this.pieOption.title.text = - (info.resident_count != 0 + (pandectData.totalResidents != 0 ? parseInt( (100 * [ - info.inhabitant_count, - info.floating_count, + pandectData.permanentResiCount, + pandectData.floatingResiCount, ][dataIndexInside]) / - info.resident_count + pandectData.totalResidents ) : "--") + "%"; this.$refs.pieChart.myChart.setOption(this.pieOption); diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 43ddcdf17..0664e1ee3 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -17,7 +17,7 @@
- +
@@ -31,7 +31,7 @@
- +
@@ -553,6 +553,7 @@ export default { if (data) { this.$nextTick(()=>{ this.$refs['fwgl'].pandectData = data + this.$refs['jmgl'].pandectData = data } ) } diff --git a/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue index fcd2f8c99..b1bef450f 100644 --- a/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue @@ -26,7 +26,12 @@ 事件未解决
上报人数 -
{{ unSolvedNum ? unSolvedNum : 0 }}
+
+ {{ + unSolvedNum ? unSolvedNum : 0 + }}人 +
人数
-
{{ unFinishNum ? unFinishNum : 0 }}
+
+ {{ + unFinishNum ? unFinishNum : 0 + }}人 +
服务人数
-
{{ noServiceNum ? noServiceNum : 0 }}
+
+ {{ + noServiceNum ? noServiceNum : 0 + }}人 +
@@ -174,7 +189,8 @@ export default { .imgIcon { width: 30px; height: 30px; - margin-top: -100px; + position: relative; + top: -58px; } .imgBg { display: block; diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index c564b76a8..86f3d2579 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -225,7 +225,8 @@ + height="350" + > @@ -245,10 +246,19 @@ class-name="small-padding fixed-width">