社区自查上半部分,登录页面加logo

src/assets/scss/pages/login.scss

@@ -58,8 +58,8 @@
   }
 
   .title {
-    margin: 0 0 64px 80px;
+    // margin: 0 0 64px 80px;
-    text-align: left;
+    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;

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 = '新增'

src/views/modules/satisfaction/communitySelfInsp/index.vue

@@ -33,6 +33,14 @@
                                 <div>{{ synthesisScore }}</div>
                                 <div>综合得分</div>
                             </div>
+                            <div class="right_box">
+                                        <div :class="synthesisState?'up':'down'">
+                                            <img src="@/assets/images/index/up.png" alt="" v-if="synthesisState && synthesisScoreBtLastMonth!=0" >
+                                            <img src="@/assets/images/index/down.png" alt="" v-if="!synthesisState && synthesisScoreBtLastMonth!=0" >
+                                            <span >{{synthesisScoreBtLastMonth}}</span>
+                                        </div>
+                                        <div style="color: #999;">较上月</div>
+                                    </div>
                         </div>
                         <div class="right">
                             <div class="box" v-for="(item, index) in score" :key="index">
@@ -42,6 +50,14 @@
                                         <div>{{ item.score }}</div>
                                         <div>{{ item.satisfactionCategoryName }}</div>
                                     </div>
+                                    <div class="right_box">
+                                        <div>
+                                            <img src="@/assets/images/index/up.png" alt="" v-if="item.state && item.scoreDiffBtLastMonth!=0" >
+                                            <img src="@/assets/images/index/down.png" alt="" v-if="!item.state && item.scoreDiffBtLastMonth!=0" >
+                                            <span :class="item.state?'up':'down'">{{item.scoreDiffBtLastMonth}}</span>
+                                        </div>
+                                        <div style="color: #999;">较上月</div>
+                                    </div>
                                 </div>
                             </div>
 
@@ -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 {
-            try{
+        // const url = "/governance/satisfaction/communitySelfInsp/stats/synthesis/superior";
-            const url = "/governance/satisfaction/communitySelfInsp/stats/synthesis";
+        // const { formData } = this;
-            const { formData } = this;
+        // let agencyId = this.$store.state.user.agencyId;
-            const { data, msg } = await requestGet(url, { ...formData });
+        // const { data, msg } = await requestGet(url, { ...formData,agencyId });
-                this.total = data.total || 0;
+        const url = "/governance/satisfaction/communitySelfInsp/stats/synthesis";
-                this.score = []
+        const { formData } = this;
-                this.option.series[0].data = []
+        const { data, msg } = await requestGet(url, { ...formData });
-                this.option.series[1].data = []
+
-                this.option.series[2].data = []
+        // 清空数组和属性值
-                this.option.xAxis.data = []
+        this.total = data.total || 0;
-                this.tableData = data.categoryDatas || [];
+        this.score = [];
-                this.satisfactionCategory = []
+        this.option.series.forEach(series => series.data = []);
-                this.inspRecordId = data.inspRecordId;
+        this.option.xAxis.data = [];
-                this.synthesisScore = data.synthesisScore;
+        this.tableData = data.categoryDatas || [];
-                this.personQty = data.personQty
+        this.satisfactionCategory = [];
-                const allowedCategories = this.dicts.satisfaction_category.map(item => item.value)
+        this.inspRecordId = data.inspRecordId;
-                this.tableData.forEach(item => {
+        this.synthesisScore = data.synthesisScore;
-                    if (allowedCategories.includes(item.satisfactionCategory)) {
+        this.synthesisScoreBtLastMonth = data.synthesisScoreBtLastMonth;
-                        this.option.series[0].data.push(item.veryGoodQty)
+        this.synthesisState = this.synthesisScoreBtLastMonth >= 0;
-                        this.option.series[1].data.push(item.goodQty)
+        if (this.synthesisScoreBtLastMonth < 0) {
-                        this.option.series[2].data.push(item.badQty)
+            this.synthesisScoreBtLastMonth = Math.abs(this.synthesisScoreBtLastMonth);
-                        this.option.xAxis.data.push(item.satisfactionCategoryName)
+        }
-                        this.satisfactionCategory.push(item.satisfactionCategory)
+        this.personQty = data.personQty;
-                        this.score.push({ score: item.score, satisfactionCategoryName: item.satisfactionCategoryName, imgUrl: require(`@/assets/img/satisfaction/${item.satisfactionCategory}.png`) });
+
-                    }
+        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);
+                if (item.scoreDiffBtLastMonth < 0) {
-            }catch(error){
+                    item.scoreDiffBtLastMonth = Math.abs(item.scoreDiffBtLastMonth);
-                console.log(error);
+                }
             }
-        },
+        }
+
+            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;
+            color: #666666;
-            opacity: 0.6;
         }
     }
+    .right_box{
+        img{
+            margin: 0;
+            width:10px;
+             height:14px;
+
+        }
+        .down{
+            color:#FF7135  ;
+        }
+        .up{
+            color:#00BB72   ;
 
+        }
+    }
     .right {
         flex: 1;
         display: grid;

src/views/pages/login.vue

@@ -6,6 +6,7 @@
         <img src="@/assets/img/login/loginLeft.png" width="720px" height="586px" class="i-left">
       </div>
         <div class="fm">
+          <img src="@/assets/images/index/logo.png" width="50px" height="50px" class="i-logo">
           <h2 class="title">{{ $t("brand.work") }}</h2>
           <el-form
             :model="dataForm"