diff --git a/src/assets/images/index/down.png b/src/assets/images/index/down.png new file mode 100644 index 000000000..7f20d2ad4 Binary files /dev/null and b/src/assets/images/index/down.png differ diff --git a/src/assets/images/index/logo.png b/src/assets/images/index/logo.png new file mode 100644 index 000000000..30e99d112 Binary files /dev/null and b/src/assets/images/index/logo.png differ diff --git a/src/assets/images/index/up.png b/src/assets/images/index/up.png new file mode 100644 index 000000000..0488effae Binary files /dev/null and b/src/assets/images/index/up.png differ diff --git a/src/assets/scss/pages/login.scss b/src/assets/scss/pages/login.scss index d9d98b575..aa2d2478b 100644 --- a/src/assets/scss/pages/login.scss +++ b/src/assets/scss/pages/login.scss @@ -58,8 +58,8 @@ } .title { - margin: 0 0 64px 80px; - text-align: left; + // margin: 0 0 64px 80px; + text-align: center; line-height: 80px; font-size: 24px; font-family: PingFangSC-Medium, PingFang SC; @@ -131,6 +131,13 @@ // background-image: url(~@/assets/imgs/login/card-bg.png); background-color: #fff; background-size: cover; + .i-logo{ + margin: 0 auto; + position: relative; + right: 4px; + top: 10px; + } + .fm-item { box-sizing: border-box; margin: 0 auto; diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index d15dc4692..dc6a4764f 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -5,7 +5,7 @@ t.loading = '加载中...' t.brand = {} t.brand.lg = '数字社区综合服务平台' t.brand.mini = '数字' -t.brand.work = '数字社区综合服务平台' +t.brand.work = 'e联社区数智平台' t.brand.workMini = '工作端' t.add = '新增' diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue index 69d75c44d..ec64e1511 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/index.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue @@ -33,6 +33,14 @@
{{ synthesisScore }}
综合得分
+
+
+ + + {{synthesisScoreBtLastMonth}} +
+
较上月
+
@@ -42,6 +50,14 @@
{{ item.score }}
{{ item.satisfactionCategoryName }}
+
+
+ + + {{item.scoreDiffBtLastMonth}} +
+
较上月
+
@@ -214,7 +230,10 @@ export default { inspResultId:"", - btnFlag:true + btnFlag:true, + + synthesisState:false, + synthesisScoreBtLastMonth:null, }; }, computed: { @@ -319,41 +338,59 @@ export default { handleSearch(val) { this.getTableData(); }, - - // 获取列表 async getTableData() { - - try{ - const url = "/governance/satisfaction/communitySelfInsp/stats/synthesis"; - const { formData } = this; - const { data, msg } = await requestGet(url, { ...formData }); - this.total = data.total || 0; - this.score = [] - this.option.series[0].data = [] - this.option.series[1].data = [] - this.option.series[2].data = [] - this.option.xAxis.data = [] - this.tableData = data.categoryDatas || []; - this.satisfactionCategory = [] - this.inspRecordId = data.inspRecordId; - this.synthesisScore = data.synthesisScore; - this.personQty = data.personQty - const allowedCategories = this.dicts.satisfaction_category.map(item => item.value) - this.tableData.forEach(item => { - if (allowedCategories.includes(item.satisfactionCategory)) { - this.option.series[0].data.push(item.veryGoodQty) - this.option.series[1].data.push(item.goodQty) - this.option.series[2].data.push(item.badQty) - this.option.xAxis.data.push(item.satisfactionCategoryName) - this.satisfactionCategory.push(item.satisfactionCategory) - this.score.push({ score: item.score, satisfactionCategoryName: item.satisfactionCategoryName, imgUrl: require(`@/assets/img/satisfaction/${item.satisfactionCategory}.png`) }); - } + try { + // const url = "/governance/satisfaction/communitySelfInsp/stats/synthesis/superior"; + // const { formData } = this; + // let agencyId = this.$store.state.user.agencyId; + // const { data, msg } = await requestGet(url, { ...formData,agencyId }); + const url = "/governance/satisfaction/communitySelfInsp/stats/synthesis"; + const { formData } = this; + const { data, msg } = await requestGet(url, { ...formData }); + + // 清空数组和属性值 + this.total = data.total || 0; + this.score = []; + this.option.series.forEach(series => series.data = []); + this.option.xAxis.data = []; + this.tableData = data.categoryDatas || []; + this.satisfactionCategory = []; + this.inspRecordId = data.inspRecordId; + this.synthesisScore = data.synthesisScore; + this.synthesisScoreBtLastMonth = data.synthesisScoreBtLastMonth; + this.synthesisState = this.synthesisScoreBtLastMonth >= 0; + if (this.synthesisScoreBtLastMonth < 0) { + this.synthesisScoreBtLastMonth = Math.abs(this.synthesisScoreBtLastMonth); + } + this.personQty = data.personQty; + + const allowedCategories = this.dicts.satisfaction_category.map(item => item.value); + for (const item of this.tableData) { + if (allowedCategories.includes(item.satisfactionCategory)) { + this.option.series[0].data.push(item.veryGoodQty); + this.option.series[1].data.push(item.goodQty); + this.option.series[2].data.push(item.badQty); + this.option.xAxis.data.push(item.satisfactionCategoryName); + this.satisfactionCategory.push(item.satisfactionCategory); + this.score.push({ + score: item.score, + satisfactionCategoryName: item.satisfactionCategoryName, + imgUrl: require(`@/assets/img/satisfaction/${item.satisfactionCategory}.png`), + scoreDiffBtLastMonth: item.scoreDiffBtLastMonth, + state: item.scoreDiffBtLastMonth >= 0 }); - this.myChart.setOption(this.option); - }catch(error){ - console.log(error); + if (item.scoreDiffBtLastMonth < 0) { + item.scoreDiffBtLastMonth = Math.abs(item.scoreDiffBtLastMonth); + } } - }, + } + + this.myChart.setOption(this.option); + } catch (error) { + console.log(error); + } + }, + // 重置 resetSearch() { @@ -392,7 +429,8 @@ export default { align-items: center; justify-content: center; border-radius: 5px; - + padding: 10px; + box-sizing: border-box; img { margin-right: 8px; } @@ -408,7 +446,7 @@ export default { .right_right { display: flex; flex-direction: column; - + flex: 1; :nth-child(1) { font-size: 18px; font-family: PingFang SC; @@ -419,11 +457,24 @@ export default { :nth-child(2) { font-size: 14px; font-family: PingFang SC; - color: #333333; - opacity: 0.6; + color: #666666; } } + .right_box{ + img{ + margin: 0; + width:10px; + height:14px; + + } + .down{ + color:#FF7135 ; + } + .up{ + color:#00BB72 ; + } + } .right { flex: 1; display: grid; diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 6f4d58eb0..f81d7aaf0 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -6,6 +6,7 @@
+

{{ $t("brand.work") }}