From 0d5294dd341257ab6730b3f4d00f4cffdb560b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com> Date: Thu, 7 Dec 2023 16:32:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BB=A1=E6=84=8F?= =?UTF-8?q?=E5=BA=A6=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dissatisfieReason/index.vue | 10 ++-- .../dataBoard/satisfactionEval/index.vue | 54 +++++++++++++++++-- .../modules/SelfInspectionScore/index.vue | 25 +++++++++ 3 files changed, 80 insertions(+), 9 deletions(-) diff --git a/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue index 7e583b95e..6c912caf3 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfieReason/index.vue @@ -35,14 +35,14 @@ element-loading-spinner="el-icon-loading" element-loading-text="加载中..."> - - + + - + - +
- - <SelfInspectionScore/> + <Title text="不满意人数统计及自查得分" > + <el-date-picker + size="small" + popper-class="date-current-weiyi" + :append-to-body="false" + v-model="scoreMonth" type="month" + value-format="yyyy-MM-dd HH:mm:ss" + value="yyyy-MM" + placeholder="按月度" + style="width: 118px" + /> + +
@@ -78,7 +89,8 @@ export default { index: 0, type: 0, time: 0, - }; + scoreMonth: "" + } }, methods: { goToPage(url) { @@ -94,7 +106,7 @@ export default { diff --git a/src/views/dataBoard/satisfactionEval/modules/SelfInspectionScore/index.vue b/src/views/dataBoard/satisfactionEval/modules/SelfInspectionScore/index.vue index 3633660d4..3952a97b7 100644 --- a/src/views/dataBoard/satisfactionEval/modules/SelfInspectionScore/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/SelfInspectionScore/index.vue @@ -32,6 +32,30 @@ export default { return { data: [] } + }, + props: { + date: { + type: String, + default: '', + }, + }, + watch: { + "$store.state.chooseArea.chooseName"(val) { + if (val.orgId) { + this.getList(); + } + }, + date() { + this.getList(); + }, + }, + mounted() { + this.getList() + }, + methods: { + getList() { + console.log(this.date) + } } } @@ -41,4 +65,5 @@ export default { .table { padding: 10px; } + \ No newline at end of file From 7f068364ba1f6f88e211794b1135e59a9737b134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com> Date: Thu, 7 Dec 2023 17:12:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B912345=E6=8A=95=E8=AF=89?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E7=9C=8B=E5=92=8C=E5=A4=84=E7=90=86?= =?UTF-8?q?=20=E5=8F=8A=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/assets/scss/dataBoard/overview/index.scss | 2 +- .../components/MapDialog/CommunityList.vue | 2 ++ .../components/MapDialog/DisputeDispatch.vue | 2 ++ .../overview/components/MapDialog/List12345.vue | 2 ++ .../overview/components/MapDialog/Njjwtqk.vue | 2 ++ .../components/MapDialog/ResourceDispatch.vue | 2 ++ .../components/MapDialog/SatisfactionList.vue | 2 ++ .../overview/components/MapDialog/index.vue | 2 ++ .../overview/components/MapResourceInfo.vue | 2 +- .../overview/components/MapResourceInfoMore.vue | 2 ++ .../dataBoard/overview/components/map-top.vue | 2 ++ .../dataBoard/overview/components/wtqd.vue | 5 ++++- .../dissatisfiedProblemNumber/12345Hotline.vue | 17 +++++++---------- .../provinceSatisfaction.vue | 2 ++ .../dissatisfiedProblemNumber/selfInspect.vue | 2 ++ 16 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/App.vue b/src/App.vue index ebfaf85ee..4b94e1e4f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -241,7 +241,7 @@ export default { .selectPopClass { border: none !important; background: linear-gradient(180deg, #05326e 0%, #032a5d 100%) !important; - .el-autocomplete-suggestion li{ + &.el-autocomplete-suggestion li{ color: #fff!important; &:hover { background: rgba(#409eff, .5)!important; diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss index 6954bd99c..7ba10c566 100644 --- a/src/assets/scss/dataBoard/overview/index.scss +++ b/src/assets/scss/dataBoard/overview/index.scss @@ -84,7 +84,7 @@ .f-font34 { font-size: 34px !important; font-style: italic; - font-weight: 500; + font-weight: bold; font-family: DIN Alternate; } .f-yellow{ diff --git a/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue b/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue index 0733dacc7..2444a505a 100644 --- a/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue +++ b/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue @@ -121,11 +121,13 @@ export default { font-size: 14px; margin-left: 10px; color: #9A69EC; + cursor: pointer; } .view { font-size: 14px; margin-left: 10px; color: #007FF1; + cursor: pointer; } \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue b/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue index 7abb0554f..d65fabb5f 100644 --- a/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue +++ b/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue @@ -252,11 +252,13 @@ export default { font-size: 14px; margin-left: 10px; color: #9A69EC; + cursor: pointer; } .view { font-size: 14px; margin-left: 10px; color: #007FF1; + cursor: pointer; } \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/MapDialog/List12345.vue b/src/views/dataBoard/overview/components/MapDialog/List12345.vue index 44aabd98d..178938414 100644 --- a/src/views/dataBoard/overview/components/MapDialog/List12345.vue +++ b/src/views/dataBoard/overview/components/MapDialog/List12345.vue @@ -141,11 +141,13 @@ export default { font-size: 14px; margin-left: 10px; color: #9A69EC; + cursor: pointer; } .view { font-size: 14px; margin-left: 10px; color: #007FF1; + cursor: pointer; } \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue b/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue index 64adcd8f7..174c24aa6 100644 --- a/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue +++ b/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue @@ -129,11 +129,13 @@ export default { font-size: 14px; margin-left: 10px; color: #9A69EC; + cursor: pointer; } .view { font-size: 14px; margin-left: 10px; color: #007FF1; + cursor: pointer; } \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue b/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue index d231f309c..d1cf7bd48 100644 --- a/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue +++ b/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue @@ -251,11 +251,13 @@ export default { font-size: 14px; margin-left: 10px; color: #9A69EC; + cursor: pointer; } .view { font-size: 14px; margin-left: 10px; color: #007FF1; + cursor: pointer; } \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue b/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue index 2fb8943ed..0ef90066e 100644 --- a/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue +++ b/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue @@ -141,11 +141,13 @@ export default { font-size: 14px; margin-left: 10px; color: #9A69EC; + cursor: pointer; } .view { font-size: 14px; margin-left: 10px; color: #007FF1; + cursor: pointer; } \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/MapDialog/index.vue b/src/views/dataBoard/overview/components/MapDialog/index.vue index 4cb259d9a..040790c66 100644 --- a/src/views/dataBoard/overview/components/MapDialog/index.vue +++ b/src/views/dataBoard/overview/components/MapDialog/index.vue @@ -277,12 +277,14 @@ export default { font-size: 14px; margin-left: 10px; color: #9A69EC; + cursor: pointer; } .view { font-size: 14px; margin-left: 10px; color: #007FF1; + cursor: pointer; } .eventDetails { diff --git a/src/views/dataBoard/overview/components/MapResourceInfo.vue b/src/views/dataBoard/overview/components/MapResourceInfo.vue index 295ff62c7..9c0e76830 100644 --- a/src/views/dataBoard/overview/components/MapResourceInfo.vue +++ b/src/views/dataBoard/overview/components/MapResourceInfo.vue @@ -38,7 +38,7 @@
联系电话：
-
{{ detail.contactMobile }}
+
{{ $sensitive( detail.contactMobile, 3, 7) }}
diff --git a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue index 01d29f0ea..55181b64c 100644 --- a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue +++ b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue @@ -382,11 +382,13 @@ export default { font-size: 14px; margin-left: 10px; color: #9A69EC; + cursor: pointer; } .view { font-size: 14px; margin-left: 10px; color: #007FF1; + cursor: pointer; } \ No newline at end of file diff --git a/src/views/dataBoard/overview/components/map-top.vue b/src/views/dataBoard/overview/components/map-top.vue index 41493e6b3..fba8915ec 100644 --- a/src/views/dataBoard/overview/components/map-top.vue +++ b/src/views/dataBoard/overview/components/map-top.vue @@ -252,4 +252,6 @@ export default { .m-per { margin-right: 77px; } + + diff --git a/src/views/dataBoard/overview/components/wtqd.vue b/src/views/dataBoard/overview/components/wtqd.vue index 65fd920be..84d8a416e 100644 --- a/src/views/dataBoard/overview/components/wtqd.vue +++ b/src/views/dataBoard/overview/components/wtqd.vue @@ -316,7 +316,7 @@ export default { } .f-hflex { - width: 83px; + width: 100px; } .f-flex { @@ -325,6 +325,9 @@ export default { .f-darkGray { margin-top: 15px; + display: flex; + white-space: nowrap; + align-items: flex-end; } .no-data { diff --git a/src/views/dataBoard/overview/dissatisfiedProblemNumber/12345Hotline.vue b/src/views/dataBoard/overview/dissatisfiedProblemNumber/12345Hotline.vue index 70b90c943..9af3e528c 100644 --- a/src/views/dataBoard/overview/dissatisfiedProblemNumber/12345Hotline.vue +++ b/src/views/dataBoard/overview/dissatisfiedProblemNumber/12345Hotline.vue @@ -22,7 +22,7 @@ -