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 @@
已办结
-
+
{{ index - 0 + 1 }} @@ -20,14 +20,16 @@
{{ item.closedNum }}
-
-
- {{ index - 0 + 1 }} +
+
+
+ {{ index - 0 + 1 }} +
+
{{ item.orgName }}
+
{{ item.sumNum }}
+
{{ item.processNum }}
+
{{ item.closedNum }}
-
{{ item.orgName }}
-
{{ item.sumNum }}
-
{{ item.processNum }}
-
{{ item.closedNum }}
@@ -72,6 +74,23 @@ export default { getList(item) { this.$http.get("/actual/base/streetOverview/eventAgencyGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => { this.pmList = data; + if (this.pmList.length > 7) { + this.$nextTick(() => { + const aniHeight = this.$refs.animation.querySelector(".tr").offsetHeight * this.pmList.length; + console.log(aniHeight); + this.$refs.animation.style.animation = "move 10s linear infinite"; + document.styleSheets[0].insertRule( + `@keyframes move{0% { + transform: translateY(0px); + } + + 100% { + transform: translateY(-${aniHeight}px); + }`, + 0 + ); + }); + } }); }, }, diff --git a/src/views/dataBoard/overview/components/sqrfph.vue b/src/views/dataBoard/overview/components/sqrfph.vue index 18b4478b2..569e9cb5f 100644 --- a/src/views/dataBoard/overview/components/sqrfph.vue +++ b/src/views/dataBoard/overview/components/sqrfph.vue @@ -9,7 +9,7 @@
人房更新总数
-
+
{{ index - 0 + 1 }} @@ -20,14 +20,16 @@
{{ item.sumNum }}
-
-
- {{ index - 0 + 1 }} +
+
+
+ {{ index - 0 + 1 }} +
+
{{ item.orgName }}
+
{{ item.houseNum }}
+
{{ item.residentNum }}
+
{{ item.sumNum }}
-
{{ item.orgName }}
-
{{ item.houseNum }}
-
{{ item.residentNum }}
-
{{ item.sumNum }}
@@ -72,6 +74,22 @@ export default { getList(item) { this.$http.get("/actual/base/streetOverview/residentHouseUpdateGroup?month=" + this.date + "&level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => { this.pmList = data; + if (this.pmList.length > 7) { + this.$nextTick(() => { + const aniHeight = this.$refs.animation.querySelector(".tr").offsetHeight * this.pmList.length; + this.$refs.animation.style.animation = "move 10s linear infinite"; + document.styleSheets[0].insertRule( + `@keyframes move{0% { + transform: translateY(0px); + } + + 100% { + transform: translateY(-${aniHeight}px); + }`, + 0 + ); + }); + } }); }, }, diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue index 56e83fc80..9e7acf232 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue @@ -16,9 +16,9 @@

{{unsatisfiedMattersModel.reason}} -

+

a
    -
  • 事项来源:{{unsatisfiedMattersModel.satisfactionSource}}
  • +
  • 事项来源:{{satisfactionSourceOptions[unsatisfiedMattersModel.satisfactionSource]}}
  • 事项类型:{{unsatisfiedMattersModel.satisfactionCategoryName}}
  • 所属月份:{{unsatisfiedMattersModel.satisfactionCategoryName}}
  • 所属社区:{{unsatisfiedMattersModel.organizationName}}
  • @@ -79,19 +79,11 @@ export default { unsatisfiedMattersModel: '', unsatisfiedHisCount: '', followUpRecordDetails: '', - satisfactionSourceOptions: [{ - value: 'satisfaction_12345', - label: '12345投诉', - color: '#FFB73C', - }, { - value: 'satisfaction_province', - label: '省满意度调查', - color: '#64C1FF' - }, { - value: 'satisfaction_community', - label: '社区满意度自查', - color: '#08EBAE' - }] + satisfactionSourceOptions: { + satisfaction_12345: '12345投诉', + satisfaction_province: '省满意度调查', + satisfaction_community: '社区满意度自查', + } }; }, methods: { diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue index 079208b21..c3b789ab3 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue @@ -58,7 +58,12 @@
- + { this.total = data.total this.list = data.list + this.loading = false }) }, getOrg() { diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue index 4fa50bdce..296fd10e2 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue @@ -1,16 +1,21 @@