diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss index c4537482c..b9978fd06 100644 --- a/src/assets/scss/dataBoard/overview/index.scss +++ b/src/assets/scss/dataBoard/overview/index.scss @@ -44,19 +44,19 @@ overflow-y: hidden; } -.animation { - animation: move 10s linear infinite; -} - -@keyframes move { - 0% { - transform: translateY(0px); - } - - 100% { - transform: translateY(-320px); - } -} +// .animation { +// animation: move 10s linear infinite; +// } + +// @keyframes move { +// 0% { +// transform: translateY(0px); +// } + +// 100% { +// transform: translateY(-320px); +// } +// } .m-jdjs { height: 318px; diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index bcf4c4bb1..1c8f54e0d 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -299,7 +299,7 @@ } .item-per { - width: 90px; + min-width: 70px; } .item-progress { diff --git a/src/utils/desensitization.js b/src/utils/desensitization.js index fcb4cbde2..acc5b952d 100644 --- a/src/utils/desensitization.js +++ b/src/utils/desensitization.js @@ -1,4 +1,10 @@ export default function desensitizeSubstring(inputString, start, end) { + if (!inputString) { + return '' + } + if (end >= inputString.length) { + end = inputString.length - 1 + } // 保留部分非敏感信息,将敏感信息部分截取掉 let desensitizedString = inputString.substring(0, start) + "*".repeat(end - start) + inputString.substring(end); return desensitizedString; diff --git a/src/views/dataBoard/cpts/map/index.vue b/src/views/dataBoard/cpts/map/index.vue index 0aa25c1a6..4fd3d1fe6 100644 --- a/src/views/dataBoard/cpts/map/index.vue +++ b/src/views/dataBoard/cpts/map/index.vue @@ -1040,12 +1040,12 @@ export default { display: none; } - /deep/ .jw-popup-bg { +/* /deep/ .jw-popup-bg { background: url('@/assets/images/overview/map-pop-img.png') no-repeat; width: 80px; height: 80px; margin-right: 10px; - } + }*/ /deep/ .jw-popup-container { display: flex; diff --git a/src/views/dataBoard/overview/components/GridUpdateRanking.vue b/src/views/dataBoard/overview/components/GridUpdateRanking.vue index 9440e31df..ae8c83b24 100644 --- a/src/views/dataBoard/overview/components/GridUpdateRanking.vue +++ b/src/views/dataBoard/overview/components/GridUpdateRanking.vue @@ -58,7 +58,7 @@ export default { getList(item) { this.$http .get( - "/actual/base/streetOverview/residentHouseUpdateGroup?level=" + + "/actual/base/streetOverview/residentHouseUpdateGroupByGrid?level=" + item.orgLevel + "&orgId=" + item.orgId diff --git a/src/views/dataBoard/overview/components/sq12345.vue b/src/views/dataBoard/overview/components/sq12345.vue index a70babc86..449391f4b 100644 --- a/src/views/dataBoard/overview/components/sq12345.vue +++ b/src/views/dataBoard/overview/components/sq12345.vue @@ -9,7 +9,7 @@
{{unsatisfiedMattersModel.reason}} -
+ a'+params[0].name+'
' + params[0].name + '
' + params[i].seriesName + ':' + params[i].data + '
' } } return res; @@ -173,14 +181,14 @@ export default { }, boundaryGap: true, data: xData, - },{ + }, { type: 'category', data: xData, - axisLine: {show:false}, + axisLine: {show: false}, axisLabel: { show: false, }, - boundaryGap:true, + boundaryGap: true, } ], @@ -217,12 +225,12 @@ export default { } ], series: [ - ...seriesArray, + ...seriesArray, { name: '', type: 'bar', - barWidth:100, + barWidth: 100, barGap: '-60%', data: barArray, itemStyle: { @@ -237,6 +245,7 @@ export default { }; this.myChart.setOption(option); window.addEventListener("resize", () => this.myChart.resize()); + this.loading = false }, } } diff --git a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue index eb4dac218..3b35eb787 100644 --- a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue @@ -1,6 +1,10 @@ -