好差评数据源更换

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/GoodBadController.java

@@ -23,4 +23,9 @@ public class GoodBadController {
     public BaseResult getGoodOrBadByYearAndArea(Integer area) {
         return this.goodBadService.getGoodOrBadByYearAndArea(area);
     }
+
+    @GetMapping({"/getGoodOrBad"})
+    public BaseResult getGoodOrBad(Integer area) {
+        return this.goodBadService.getGoodOrBad(area);
+    }
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/GoodBadDao.java

@@ -1,6 +1,7 @@
 package com.example.nngkxxdp.dao;
 
 import com.example.nngkxxdp.entity.GoodBad;
+import com.example.nngkxxdp.entity.GoodBadNew;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -9,8 +10,10 @@ import org.springframework.stereotype.Repository;
  * @date 2022/7/12
  */
 @Repository
-public abstract interface GoodBadDao {
+public interface GoodBadDao {
 
-    public abstract GoodBad getGoodBadByYearInfo(@Param("area") Integer paramInteger);
+    public GoodBad getGoodBadByYearInfo(@Param("area") Integer paramInteger);
+
+    GoodBadNew getGoodOrBad(@Param("area") Integer area);
 }
 

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/GoodBadNew.java

@@ -0,0 +1,84 @@
+package com.example.nngkxxdp.entity;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author zhoupeng
+ * @date 2022/7/12
+ */
+public class GoodBadNew implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private int totalEvaluationNumber;
+    private int goodEvaluationNumber;
+    private String goodEvaluationRate;
+    private int poorEvaluationNumber;
+    private String poorEvaluationRate;
+    private int area;
+    private int create_time;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public int getTotalEvaluationNumber() {
+        return totalEvaluationNumber;
+    }
+
+    public void setTotalEvaluationNumber(int totalEvaluationNumber) {
+        this.totalEvaluationNumber = totalEvaluationNumber;
+    }
+
+    public String getGoodEvaluationRate() {
+        return goodEvaluationRate;
+    }
+
+    public void setGoodEvaluationRate(String goodEvaluationRate) {
+        this.goodEvaluationRate = goodEvaluationRate;
+    }
+
+    public int getGoodEvaluationNumber() {
+        return goodEvaluationNumber;
+    }
+
+    public void setGoodEvaluationNumber(int goodEvaluationNumber) {
+        this.goodEvaluationNumber = goodEvaluationNumber;
+    }
+
+    public int getPoorEvaluationNumber() {
+        return poorEvaluationNumber;
+    }
+
+    public void setPoorEvaluationNumber(int poorEvaluationNumber) {
+        this.poorEvaluationNumber = poorEvaluationNumber;
+    }
+
+    public String getPoorEvaluationRate() {
+        return poorEvaluationRate;
+    }
+
+    public void setPoorEvaluationRate(String poorEvaluationRate) {
+        this.poorEvaluationRate = poorEvaluationRate;
+    }
+
+    public int getArea() {
+        return area;
+    }
+
+    public void setArea(int area) {
+        this.area = area;
+    }
+
+    public int getCreate_time() {
+        return create_time;
+    }
+
+    public void setCreate_time(int create_time) {
+        this.create_time = create_time;
+    }
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/service/GoodBadService.java

@@ -8,4 +8,6 @@ import com.example.nngkxxdp.util.BaseResult;
  */
 public interface GoodBadService {
     BaseResult getGoodOrBadByYearAndArea(Integer area);
+
+    BaseResult getGoodOrBad(Integer area);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/GoodBadServiceImpl.java

@@ -1,7 +1,10 @@
 package com.example.nngkxxdp.service.impl;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import com.example.nngkxxdp.dao.GoodBadDao;
 import com.example.nngkxxdp.entity.GoodBad;
+import com.example.nngkxxdp.entity.GoodBadNew;
 import com.example.nngkxxdp.service.GoodBadService;
 import com.example.nngkxxdp.util.BaseResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,4 +27,17 @@ public class GoodBadServiceImpl implements GoodBadService {
 
         return BaseResult.ok(goodBad);
     }
+
+    @Override
+    public BaseResult getGoodOrBad(Integer area) {
+        GoodBadNew goodOrBad = goodBadDao.getGoodOrBad(area);
+        if (ObjectUtil.isEmpty(goodOrBad)) {
+            return BaseResult.notOk();
+        }
+        if (goodOrBad.getTotalEvaluationNumber() != 0) {
+//            goodOrBad.setPoorEvaluationRate(goodOrBad.getPoorEvaluationNumber() * 100 / goodOrBad.getTotalEvaluationNumber());
+            goodOrBad.setGoodEvaluationRate(Convert.toStr(goodOrBad.getGoodEvaluationNumber() * 100 / goodOrBad.getTotalEvaluationNumber()));
+        }
+        return BaseResult.ok(goodOrBad);
+    }
 }

nngkxxdp/src/main/resources/mapper/GoodBadDao.xml

@@ -7,4 +7,11 @@
         where area = #{area} and year = YEAR (NOW())
         order by id desc limit 0, 1
     </select>
+
+    <select id="getGoodOrBad" resultType="com.example.nngkxxdp.entity.GoodBadNew">
+        select *
+        from good_bad_new
+        where area = #{area}
+        order by create_time desc limit 0, 1
+    </select>
 </mapper>

nngkxxdp/src/main/resources/static/natj/enter_showLight.html

@@ -182,6 +182,7 @@
             top: 15px;
             right: 10px;
         }
+
         .TwoList {
             position: absolute;
             right: 5px;
@@ -513,11 +514,12 @@
         .link-list {
             border: 0.01rem solid #2a89ec;
             text-align: center;
-            height: 20px;
-            margin-bottom: 5px;
-            font-size: 12px;
-            line-height: 20px;
+            height: 30px;
+            margin-bottom: 10px;
+            font-size: 14px;
+            line-height: 30px;
             border-radius: 5px;
+            font-weight: bold;
 
         }
 
@@ -539,6 +541,29 @@
             color: #fff;
 
         }
+
+        .hcpbg {
+            margin: 0 auto;
+            width: 80px;
+            height: 27px;
+            background-image: url('img/hcpbk.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            font-size: 12px;
+            line-height: 27px;
+            text-align: center;
+        }
+
+        .hcptext {
+            width: 80px;
+            height: 80px;
+            margin: 0 auto;
+            line-height: 80px;
+            color: #2A89EC;
+            font-size: 18px;
+            font-weight: bold;
+            text-align: center;
+        }
     </style>
 </head>
 <body onload="southload()">
@@ -687,8 +712,38 @@
                 </div>
                 <div class="departmentDetail" id="good_or_bad">
                     <div class="title">好差评</div>
-                    <div style="width:100%;display:flex;justify-content: space-evenly;">
-                        <div class="link-box r" style="width:90px;margin:0 10px;">
+                    <div style="width: 60%;float: left;">
+                        <div>
+                            <div style="width: 50%; height: 120px;float: left;">
+                                <div class="hcpbg">评价数</div>
+                                <div class="hcptext" id="goods">
+                                    4820904
+                                </div>
+                            </div>
+                            <div style="width: 50%; height: 120px;float: left;">
+                                <div class="hcpbg">好评率</div>
+                                <div class="hcptext" id="goodrate">
+                                    99.999%
+                                </div>
+                            </div>
+                        </div>
+                        <div>
+                            <div style="width: 50%; height: 120px;float: left;">
+                                <div class="hcpbg">差评率</div>
+                                <div class="hcptext" id="bads">
+                                    99.999%
+                                </div>
+                            </div>
+                            <div style="width: 50%; height: 120px;float: left;">
+                                <div class="hcpbg">差评整改率</div>
+                                <div class="hcptext" id="badrate">
+                                    99.999%
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div style="width: 40%;float: left">
+                        <div class="link-box r" style="width:90%;margin:0 auto;">
                             <div class="link-list">
                                 <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-work/my-works"
                                    target="_blank">评价我的办件</a>
@@ -708,30 +763,52 @@
                                 <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-papers" target="_blank">评价电子证照</a>
                             </div>
                         </div>
-                        <div class="commentsList">
-                            <div>
-                                <img src="img/评价总量小元素.png"
-                                     style="margin-left: 10px;margin-top: 9px;width: 44px;">
-                                <div class="" style="margin-left:23px;">
-                                    <p class="num">本年评价总量</p>
-                                    <i class="linghtBlue"><span id="timer20">205165</span><span>条</span></i>
-                                </div>
-                            </div>
-                            </br>
-                            <div>
-                                <img src="img/满意度小元素.png"
-                                     style="margin-left: 10px;margin-top: 9px;width: 44px;">
-                                <div class="" style="margin-left: 23px;">
-                                    <p class="num">满意度</p>
-                                    <i class="linghtBlue"><span id="timer21">100</span>%<span></span></i>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="commentsBar" id="main" style="width: 100%;height:100px;">
-
                     </div>
+                    <!--                    <div style="width:100%;display:flex;justify-content: space-evenly;">-->
+                    <!--                        <div class="link-box r" style="width:90px;margin:0 10px;">-->
+                    <!--                            <div class="link-list">-->
+                    <!--                                <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-work/my-works"-->
+                    <!--                                   target="_blank">评价我的办件</a>-->
+                    <!--                            </div>-->
+                    <!--                            <div class="link-list">-->
+                    <!--                                <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-work/my-works"-->
+                    <!--                                   target="_blank">评价窗口人员</a>-->
+                    <!--                            </div>-->
+                    <!--                            <div class="link-list">-->
+                    <!--                                <a href="https://zwykb.cq.gov.cn/hcp/pj/" target="_blank">评价办事指南</a>-->
+                    <!--                            </div>-->
+                    <!--                            <div class="link-list">-->
+                    <!--                                <a href="https://zwykb.cq.gov.cn/hcp/?comment/commentWorkGuide"-->
+                    <!--                                   target="_blank">评价服务应用</a>-->
+                    <!--                            </div>-->
+                    <!--                            <div class="link-list">-->
+                    <!--                                <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-papers" target="_blank">评价电子证照</a>-->
+                    <!--                            </div>-->
+                    <!--                        </div>-->
+                    <!--                        <div class="commentsList">-->
+                    <!--                            <div>-->
+                    <!--                                <img src="img/评价总量小元素.png"-->
+                    <!--                                     style="margin-left: 10px;margin-top: 9px;width: 44px;">-->
+                    <!--                                <div class="" style="margin-left:23px;">-->
+                    <!--                                    <p class="num">本年评价总量</p>-->
+                    <!--                                    <i class="linghtBlue"><span id="timer20">205165</span><span>条</span></i>-->
+                    <!--                                </div>-->
+                    <!--                            </div>-->
+                    <!--                            </br>-->
+                    <!--                            <div>-->
+                    <!--                                <img src="img/满意度小元素.png"-->
+                    <!--                                     style="margin-left: 10px;margin-top: 9px;width: 44px;">-->
+                    <!--                                <div class="" style="margin-left: 23px;">-->
+                    <!--                                    <p class="num">满意度</p>-->
+                    <!--                                    <i class="linghtBlue"><span id="timer21">100</span>%<span></span></i>-->
+                    <!--                                </div>-->
+                    <!--                            </div>-->
+                    <!--                        </div>-->
+                    <!--                    </div>-->
+
+                    <!--                    <div class="commentsBar" id="main" style="width: 100%;height:100px;">-->
+
+                    <!--                    </div>-->
                 </div>
             </div>
             <div class="Bottomtwo">
@@ -941,7 +1018,8 @@
 
                 </div>
                 <div class="itemAll">
-                    <div class="title" style="font-size: 14px;font-weight: bold">南岸区依申请+公共服务办理类事项总数</div>
+                    <div class="title" style="font-size: 14px;font-weight: bold">南岸区依申请+公共服务办理类事项总数
+                    </div>
                     <div class="itemAllnum" id="totals">
                         <span>0</span>
                         <span>0</span>
@@ -953,36 +1031,36 @@
                         <span>项</span>
                     </div>
                 </div>
-<!--                <div class="line">-->
-<!--                    <div class="title">-->
-<!--                        一件事一次办-->
-<!--                    </div>-->
-<!--                    <div class="lineCon">-->
-<!--                        <img src="img/lightCir.png">-->
-<!--                        <div class="listCon">-->
-<!--                            <p style="color: #333;font-size: 18px;">套餐数量</p>-->
-<!--                            <p><span id="timer16" class="numChange"-->
-<!--                                     style="color: #333;font-size: 28px;">49</span><span-->
-<!--                                    style="color: #999;margin-left: 8px;font-size: 16px;">件</span></p>-->
-<!--                        </div>-->
-<!--                        <div class="OneList">-->
-<!--                            <span style="margin-right:-2px;color: #333;font-size: 13px;">减环节</span>-->
-<!--                            <span id="timer17" class="numChange"-->
-<!--                                  style="color: #333;font-size: 14px;">308</span>-->
-<!--                            <span style="color: #999;font-size: 12px;">件</span>-->
-<!--                        </div>-->
-<!--                        <div class="TwoList">-->
-<!--                            <span style="margin-right:7px;color: #333;font-size: 13px;">减跑动</span>-->
-<!--                            <span id="timer18" class="numChange" style="color: #333;font-size: 14px;">151</span>-->
-<!--                            <span style="color: #999;font-size: 12px;">件</span>-->
-<!--                        </div>-->
-<!--                        <div class="ThriList">-->
-<!--                            <span style="margin-right:7px;color: #333;font-size: 13px;">减材料</span>-->
-<!--                            <span id="timer19" class="numChange" style="color: #333;font-size: 14px;">89</span>-->
-<!--                            <span style="color: #999;font-size: 12px;">件</span>-->
-<!--                        </div>-->
-<!--                    </div>-->
-<!--                </div>-->
+                <!--                <div class="line">-->
+                <!--                    <div class="title">-->
+                <!--                        一件事一次办-->
+                <!--                    </div>-->
+                <!--                    <div class="lineCon">-->
+                <!--                        <img src="img/lightCir.png">-->
+                <!--                        <div class="listCon">-->
+                <!--                            <p style="color: #333;font-size: 18px;">套餐数量</p>-->
+                <!--                            <p><span id="timer16" class="numChange"-->
+                <!--                                     style="color: #333;font-size: 28px;">49</span><span-->
+                <!--                                    style="color: #999;margin-left: 8px;font-size: 16px;">件</span></p>-->
+                <!--                        </div>-->
+                <!--                        <div class="OneList">-->
+                <!--                            <span style="margin-right:-2px;color: #333;font-size: 13px;">减环节</span>-->
+                <!--                            <span id="timer17" class="numChange"-->
+                <!--                                  style="color: #333;font-size: 14px;">308</span>-->
+                <!--                            <span style="color: #999;font-size: 12px;">件</span>-->
+                <!--                        </div>-->
+                <!--                        <div class="TwoList">-->
+                <!--                            <span style="margin-right:7px;color: #333;font-size: 13px;">减跑动</span>-->
+                <!--                            <span id="timer18" class="numChange" style="color: #333;font-size: 14px;">151</span>-->
+                <!--                            <span style="color: #999;font-size: 12px;">件</span>-->
+                <!--                        </div>-->
+                <!--                        <div class="ThriList">-->
+                <!--                            <span style="margin-right:7px;color: #333;font-size: 13px;">减材料</span>-->
+                <!--                            <span id="timer19" class="numChange" style="color: #333;font-size: 14px;">89</span>-->
+                <!--                            <span style="color: #999;font-size: 12px;">件</span>-->
+                <!--                        </div>-->
+                <!--                    </div>-->
+                <!--                </div>-->
                 <div class="line" style="">
                     <div class="title" style="font-size: 14px;font-weight: bold">
                         南岸区依申请+公共服务办理类事项明细
@@ -993,7 +1071,7 @@
                                 <span style="font-size: 14px;">行政裁决</span>
                                 <span id="service" style="font-size: 18px;">13</span>
                             </div>
-                            <div class="oneList" >
+                            <div class="oneList">
                                 <span style="font-size: 14px;">行政许可</span>
                                 <span id="permit" style="font-size: 18px;">720</span>
                             </div>
@@ -1068,11 +1146,11 @@
 <script src="js/south.js"></script>
 <script id="_trs_ta_js" src="//ta.trs.cn/c/js/ta.js?mpid=3973" async="async" defer="defer"></script>
 <script>
-<!--    // PC端 移动端 跳转-->
-   var is_mobi = navigator.userAgent.toLowerCase().match(/(ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;
-   if (is_mobi) {
-       window.parent.location.href = "enter_showLightMobile.html";
-   }
+    <!--    // PC端 移动端 跳转-->
+    var is_mobi = navigator.userAgent.toLowerCase().match(/(ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;
+    if (is_mobi) {
+        window.parent.location.href = "enter_showLightMobile.html";
+    }
 </script>
 <script>
     var data = '';
@@ -1234,8 +1312,31 @@
 
     function initBar() {
         var json = ''
+        // $.ajax({
+        //     url: path + "/goodOrbad/getGoodOrBadByYearAndArea", //url地址
+        //     dataType: "json", //返回的数据类型
+        //     type: "get", //发起请求的方式
+        //     async: false,
+        //     data: {
+        //         "area": 1
+        //     },
+        //     success: function (data) {
+        //
+        //         json = data.data
+        //
+        //         $("#timer20").html(json.veryDissatisfied + json.notSatisfied + json.basicSatisfied + json
+        //             .satisfied + json.great)
+        //         var goods = (json.good / json.goodOrBad).toFixed(10) * 100;
+        //         $("#timer21").html(goods.toFixed(3).slice(0, -1))
+        //     },
+        //
+        //
+        //     error: function () {
+        //         alert('网络错误，请稍后再试！');
+        //     }
+        // });
         $.ajax({
-            url: path + "/goodOrbad/getGoodOrBadByYearAndArea", //url地址
+            url: path + "/goodOrbad/getGoodOrBad", //url地址
             dataType: "json", //返回的数据类型
             type: "get", //发起请求的方式
             async: false,
@@ -1246,13 +1347,15 @@
 
                 json = data.data
 
-                $("#timer20").html(json.veryDissatisfied + json.notSatisfied + json.basicSatisfied + json
-                    .satisfied + json.great)
-                var goods = (json.good / json.goodOrBad).toFixed(10) * 100;
-                $("#timer21").html(goods.toFixed(3).slice(0, -1))
+                // $("#timer20").html(json.veryDissatisfied + json.notSatisfied + json.basicSatisfied + json
+                //     .satisfied + json.great)
+                // var goods = (json.good / json.goodOrBad).toFixed(10) * 100;
+                // $("#timer21").html(goods.toFixed(3).slice(0, -1))
+                $("#goods").html(json.goodEvaluationNumber)
+                $("#goodrate").html(json.goodEvaluationRate+"%")
+                $("#bads").html(json.badEvaluationNumber)
+                $("#badrate").html(json.badEvaluationRate+"%")
             },
-
-
             error: function () {
                 alert('网络错误，请稍后再试！');
             }
@@ -1375,17 +1478,17 @@
     }
 
     var json = initBar();
-    var dailyBarOption = getBar(json);
-    var myChart1 = echarts.init(document.getElementById('main'));
-    myChart1.setOption(dailyBarOption);
+    // var dailyBarOption = getBar(json);
+    // var myChart1 = echarts.init(document.getElementById('main'));
+    // myChart1.setOption(dailyBarOption);
 
 
     setInterval(function () {
         var json1 = initBar();
-        myChart1.dispose();
-        $(".commentsBar").html("");
-        myChart1 = echarts.init(document.getElementById('main'));
-        myChart1.setOption(getBar(json1));
+        // myChart1.dispose();
+        // $(".commentsBar").html("");
+        // myChart1 = echarts.init(document.getElementById('main'));
+        // myChart1.setOption(getBar(json1));
     }, 8000);
     // 计时器
     // window.onload = function() {

nngkxxdp/src/main/resources/static/natj/enter_showLightMobile.html

@@ -398,10 +398,10 @@
         .link-list {
             border: 0.16px solid #2a89ec;
             text-align: center;
-            height: 27px;
-            margin-bottom: 5px;
-            font-size: 16px;
-            line-height: 20px;
+            height: 50px;
+            margin-bottom: 15px;
+            font-size: 27px;
+            line-height: 50px;
             border-radius: 5px;
 
         }
@@ -424,6 +424,28 @@
             color: #fff;
 
         }
+        .hcpbg {
+            margin: 0 auto;
+            width: 20vw;
+            height: 3vh;
+            background-image: url('img/hcpbk.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
+            font-size: 20px;
+            line-height: 3vh;
+            text-align: center;
+        }
+
+        .hcptext {
+            width: 80px;
+            height: 80px;
+            margin: 0 auto;
+            line-height: 80px;
+            color: #2A89EC;
+            font-size: 24px;
+            font-weight: bold;
+            text-align: center;
+        }
     </style>
 </head>
 
@@ -572,49 +594,102 @@
                     </div>
                     <div class="departmentDetail" id="good_or_bad">
                         <div class="title">好差评</div>
-                        <div style="width:100%;display:flex;justify-content: space-evenly;">
-                            <div class="link-box r" style="width:130px;margin:0 10px;">
+                        <div style="width: 60%;float: left;">
+                            <div>
+                                <div style="width: 50%; height: 10vh;float: left;">
+                                    <div class="hcpbg">评价数</div>
+                                    <div class="hcptext">
+                                        4820904
+                                    </div>
+                                </div>
+                                <div style="width: 50%; height: 10vh;float: left;">
+                                    <div class="hcpbg">好评率</div>
+                                    <div class="hcptext">
+                                        99.999%
+                                    </div>
+                                </div>
+                            </div>
+                            <div>
+                                <div style="width: 50%; height: 10vh;float: left;">
+                                    <div class="hcpbg">差评率</div>
+                                    <div class="hcptext">
+                                        99.999%
+                                    </div>
+                                </div>
+                                <div style="width: 50%; height: 10vh;float: left;">
+                                    <div class="hcpbg">差评整改率</div>
+                                    <div class="hcptext">
+                                        99.999%
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div style="width: 40%;float: left">
+                            <div class="link-box r" style="width:90%;margin:0 auto;">
                                 <div class="link-list">
                                     <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-work/my-works"
-                                        target="_blank">评价我的办件</a>
+                                       target="_blank">评价我的办件</a>
                                 </div>
                                 <div class="link-list">
                                     <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-work/my-works"
-                                        target="_blank">评价窗口人员</a>
+                                       target="_blank">评价窗口人员</a>
                                 </div>
                                 <div class="link-list">
                                     <a href="https://zwykb.cq.gov.cn/hcp/pj/" target="_blank">评价办事指南</a>
                                 </div>
                                 <div class="link-list">
                                     <a href="https://zwykb.cq.gov.cn/hcp/?comment/commentWorkGuide"
-                                        target="_blank">评价服务应用</a>
+                                       target="_blank">评价服务应用</a>
                                 </div>
                                 <div class="link-list">
                                     <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-papers" target="_blank">评价电子证照</a>
                                 </div>
                             </div>
-                            <div class="commentsList">
-                                <div>
-                                    <img src="img/评价总量小元素.png" style="margin-left: 10px;margin-top: 9px;width: 44px;">
-                                    <div class="" style="margin-left:23px;">
-                                        <p class="num">本年评价总量</p>
-                                        <i class="linghtBlue"><span id="timer20">205165</span><span>条</span></i>
-                                    </div>
-                                </div>
-                                </br>
-                                <div>
-                                    <img src="img/满意度小元素.png" style="margin-left: 10px;margin-top: 9px;width: 44px;">
-                                    <div class="" style="margin-left: 23px;">
-                                        <p class="num">满意度</p>
-                                        <i class="linghtBlue"><span id="timer21">100</span>%<span></span></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="commentsBar" id="main" style="width: 100%;height:200px;">
-
                         </div>
+<!--                        <div class="title">好差评</div>-->
+<!--                        <div style="width:100%;display:flex;justify-content: space-evenly;">-->
+<!--                            <div class="link-box r" style="width:130px;margin:0 10px;">-->
+<!--                                <div class="link-list">-->
+<!--                                    <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-work/my-works"-->
+<!--                                        target="_blank">评价我的办件</a>-->
+<!--                                </div>-->
+<!--                                <div class="link-list">-->
+<!--                                    <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-work/my-works"-->
+<!--                                        target="_blank">评价窗口人员</a>-->
+<!--                                </div>-->
+<!--                                <div class="link-list">-->
+<!--                                    <a href="https://zwykb.cq.gov.cn/hcp/pj/" target="_blank">评价办事指南</a>-->
+<!--                                </div>-->
+<!--                                <div class="link-list">-->
+<!--                                    <a href="https://zwykb.cq.gov.cn/hcp/?comment/commentWorkGuide"-->
+<!--                                        target="_blank">评价服务应用</a>-->
+<!--                                </div>-->
+<!--                                <div class="link-list">-->
+<!--                                    <a href="https://zwykb.cq.gov.cn/cbl/grzx/?my-papers" target="_blank">评价电子证照</a>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                            <div class="commentsList">-->
+<!--                                <div>-->
+<!--                                    <img src="img/评价总量小元素.png" style="margin-left: 10px;margin-top: 9px;width: 44px;">-->
+<!--                                    <div class="" style="margin-left:23px;">-->
+<!--                                        <p class="num">本年评价总量</p>-->
+<!--                                        <i class="linghtBlue"><span id="timer20">205165</span><span>条</span></i>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                                </br>-->
+<!--                                <div>-->
+<!--                                    <img src="img/满意度小元素.png" style="margin-left: 10px;margin-top: 9px;width: 44px;">-->
+<!--                                    <div class="" style="margin-left: 23px;">-->
+<!--                                        <p class="num">满意度</p>-->
+<!--                                        <i class="linghtBlue"><span id="timer21">100</span>%<span></span></i>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+
+<!--                        <div class="commentsBar" id="main" style="width: 100%;height:200px;">-->
+
+<!--                        </div>-->
                     </div>
                 </div>
                 <div class="Bottomtwo">
@@ -1038,8 +1113,31 @@
 
         function initBar() {
             var json = ''
+            // $.ajax({
+            //     url: path + "/goodOrbad/getGoodOrBadByYearAndArea", //url地址
+            //     dataType: "json", //返回的数据类型
+            //     type: "get", //发起请求的方式
+            //     async: false,
+            //     data: {
+            //         "area": 1
+            //     },
+            //     success: function (data) {
+            //
+            //         json = data.data
+            //
+            //         $("#timer20").html(json.veryDissatisfied + json.notSatisfied + json.basicSatisfied + json
+            //             .satisfied + json.great)
+            //         var goods = (json.good / json.goodOrBad).toFixed(10) * 100;
+            //         $("#timer21").html(goods.toFixed(3).slice(0, -1))
+            //     },
+            //
+            //
+            //     error: function () {
+            //         alert('网络错误，请稍后再试！');
+            //     }
+            // });
             $.ajax({
-                url: path + "/goodOrbad/getGoodOrBadByYearAndArea", //url地址
+                url: path + "/goodOrbad/getGoodOrBad", //url地址
                 dataType: "json", //返回的数据类型
                 type: "get", //发起请求的方式
                 async: false,
@@ -1050,13 +1148,15 @@
 
                     json = data.data
 
-                    $("#timer20").html(json.veryDissatisfied + json.notSatisfied + json.basicSatisfied + json
-                        .satisfied + json.great)
-                    var goods = (json.good / json.goodOrBad).toFixed(10) * 100;
-                    $("#timer21").html(goods.toFixed(3).slice(0, -1))
+                    // $("#timer20").html(json.veryDissatisfied + json.notSatisfied + json.basicSatisfied + json
+                    //     .satisfied + json.great)
+                    // var goods = (json.good / json.goodOrBad).toFixed(10) * 100;
+                    // $("#timer21").html(goods.toFixed(3).slice(0, -1))
+                    $("#goods").html(json.goodEvaluationNumber)
+                    $("#goodrate").html(json.goodEvaluationRate+"%")
+                    $("#bads").html(json.badEvaluationNumber)
+                    $("#badrate").html(json.badEvaluationRate+"%")
                 },
-
-
                 error: function () {
                     alert('网络错误，请稍后再试！');
                 }
@@ -1179,17 +1279,17 @@
         }
 
         var json = initBar();
-        var dailyBarOption = getBar(json);
-        var myChart1 = echarts.init(document.getElementById('main'));
-        myChart1.setOption(dailyBarOption);
+        // var dailyBarOption = getBar(json);
+        // var myChart1 = echarts.init(document.getElementById('main'));
+        // myChart1.setOption(dailyBarOption);
 
 
         setInterval(function () {
             var json1 = initBar();
-            myChart1.dispose();
-            $(".commentsBar").html("");
-            myChart1 = echarts.init(document.getElementById('main'));
-            myChart1.setOption(getBar(json1));
+            // myChart1.dispose();
+            // $(".commentsBar").html("");
+            // myChart1 = echarts.init(document.getElementById('main'));
+            // myChart1.setOption(getBar(json1));
         }, 8000);
         // 计时器
         // window.onload = function() {

nnzwminiapp/pages/dataCenter/dataCenter.wxml

@@ -1,271 +1,288 @@
 <!--pages/dataCenter/dataCenter.wxml-->
 <view class="content">
-  <!-- 国民经济统计数据 -->
-  <view style="background-color: #FFFFFF;">
-    <view style="border-bottom: 1px solid #C5C5C5;" >
-      <view class="title">
-        <image src="{{imgUrl}}statistics.png"></image>
-        <view class="title-text">国民经济统计数据</view>
-      <view class="getmore" bindtap="gotogmsjzx"><text class="moretext">查看更多</text></view>
-      </view>
-    </view>
-    <!-- 内容 -->
-    <view>
-      <scroll-view class="scroll-wrapper" scroll-x scroll-with-animation="true" scroll-into-view="item{{currentTab < 2 ? 0 : currentTab - 1}}">
-        <view class="navigate-item" id="item{{index}}" wx:for="{{statistics}}" wx:key="index" data-index="{{index}}" bindtap="tabNav">
-          <view class="names {{currentTab === index ? 'active' : ''}}">{{item.title}}</view>
-          <view class="currtline {{currentTab === index ? 'active' : ''}}" wx:if="{{currentTab === index}}"></view>
-        </view>
-      </scroll-view>
-      <swiper current="{{currentTab}}" style="padding: 0 10px;margin-top: 15rpx;height: 500rpx;width: 100%;" duration="1" bindchange="handleSwiper">
-        <swiper-item catchtouchmove="catchTouchMove" wx:for="{{statistics}}" wx:key="index">
-          <ec-canvas id="{{item.name}}" canvas-id="{{item.name}}" ec="{{ streetlinechartec }}" />
-        </swiper-item>
-      </swiper>
-      <view class="statistics-btn">
-        <!-- <button>详细数据</button> -->
-      </view>
-    </view>
-  </view>
-  <!-- 政务服务数据统计分析 -->
-  <view style="background-color: #FFFFFF;margin-top: 30rpx;" bindtap="gotoZWTJ">
-    <view style="border-bottom: 1px solid #C5C5C5;">
-      <view class="title">
-        <image src="{{imgUrl}}riseData.png"></image>
-        <view class="title-text">政务服务数据统计分析</view>
-      </view>
-    </view>
-    <!-- 内容 -->
-    <view>
-      <view>
-        <view class="type-title">
-          <view class="dots" />
-          <view class="type-text">
-            本年办件数
-          </view>
-        </view>
-        <!-- 办件数内容 -->
-        <view style="display:flex;justify-content: space-between;align-items:center;padding: 0 40rpx;">
-          <view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-work-number.png);background-size: 100% 100%;">
-            <!-- 受理数 -->
-            <view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
-              <view style="font-size:19rpx">受理数</view>
-              <view style="display:flex;flex-direction:row;align-items:center">
-                <scroll-view scroll-x style="width: 84rpx">
-                  <view style="font-size:28rpx;font-weight: bold;">{{officeNumber[0]}}</view>
-                </scroll-view>
-                <view style="font-size: 19rpx;padding-left:5rpx">件</view>
-              </view>
-            </view>
-          </view>
-          <view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-finish-number.png);background-size: 100% 100%;">
-            <!-- 受理数 -->
-            <view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
-              <view style="font-size:19rpx">办结数</view>
-              <view style="display:flex;flex-direction:row;align-items:center">
-                <scroll-view scroll-x style="width: 84rpx">
-                  <view style="font-size:28rpx;font-weight: bold;">{{officeNumber[1]}}</view>
-                </scroll-view>
-                <view style="font-size: 19rpx;padding-left:5rpx">件</view>
-              </view>
-            </view>
-          </view>
-          <view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-request-number.png);background-size: 100% 100%;">
-            <!-- 受理数 -->
-            <view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
-              <view style="font-size:19rpx">网络提交</view>
-              <view style="display:flex;flex-direction:row;align-items:center">
-                <scroll-view scroll-x style="width: 84rpx;">
-                  <view style="font-size:28rpx;font-weight: bold;">{{officeNumber[2]}}</view>
-                </scroll-view>
-                <view style="font-size: 19rpx;padding-left:5rpx">件</view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view>
-        <view class="type-title">
-          <view class="dots" />
-          <view class="type-text">
-            好差评
-          </view>
-        </view>
-        <view style="display: flex;flex-wrap: wrap;justify-content: space-between;padding: 0 40rpx">
-          <view class="evaluate">评价我的办件</view>
-          <view class="evaluate">评价窗口人员</view>
-          <view class="evaluate">评价办事指南</view>
-          <view class="evaluate" style="width: 316rpx;">评价服务应用</view>
-          <view class="evaluate" style="width: 316rpx;">评价电子证照</view>
-        </view>
-        <!-- 评价量 -->
-        <view style="display: flex;justify-content: space-between;padding: 0 40rpx;">
-          <!-- 评价总量 -->
-          <view style="height: 100rpx;width:310rpx;display: flex;background-color: #E5F4FE;border-radius: 10px;">
-            <!-- 图标 -->
-            <view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center;">
-              <image src="{{imgUrl}}index-evalution.png" style="height:64rpx;width:64rpx;"></image>
-            </view>
-            <!-- 数据 -->
-            <view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
-              <view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">本年评价总量</view>
-              <view style="display:flex;justify-content:left;align-items:center;color: #333333;">
-                <view style="font-size: 26rpx;font-weight: bold;">{{evalutionNum}}</view>
-                <view style="font-size:20rpx;padding-left:5rpx">条</view>
-              </view>
-            </view>
-          </view>
-          <!-- 满意度 -->
-          <view style="height: 100rpx;width:310rpx;display: flex;background-color: #E5F4FE;border-radius: 10px;">
-            <!-- 图标 -->
-            <view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center">
-              <image src="{{imgUrl}}index-good-blud.png" style="height:64rpx;width:70rpx;"></image>
-            </view>
-            <!-- 数据 -->
-            <view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
-              <view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">满意度</view>
-              <view style="display:flex;justify-content:left;align-items:center;color: #333333;">
-                <view style="font-size: 26rpx;font-weight: bold;">{{evalutionRate}}</view>
-                <view style="font-size:20rpx;padding-left:5rpx">%</view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view style="margin-top: 30rpx;width: 100%;height: 300rpx;">
+	<!-- 国民经济统计数据 -->
+	<view style="background-color: #FFFFFF;">
+		<view style="border-bottom: 1px solid #C5C5C5;">
+			<view class="title">
+				<image src="{{imgUrl}}statistics.png"></image>
+				<view class="title-text">国民经济统计数据</view>
+				<view class="getmore" bindtap="gotogmsjzx"><text class="moretext">查看更多</text></view>
+			</view>
+		</view>
+		<!-- 内容 -->
+		<view>
+			<scroll-view class="scroll-wrapper" scroll-x scroll-with-animation="true" scroll-into-view="item{{currentTab < 2 ? 0 : currentTab - 1}}">
+				<view class="navigate-item" id="item{{index}}" wx:for="{{statistics}}" wx:key="index" data-index="{{index}}" bindtap="tabNav">
+					<view class="names {{currentTab === index ? 'active' : ''}}">{{item.title}}</view>
+					<view class="currtline {{currentTab === index ? 'active' : ''}}" wx:if="{{currentTab === index}}"></view>
+				</view>
+			</scroll-view>
+			<swiper current="{{currentTab}}" style="padding: 0 10px;margin-top: 15rpx;height: 500rpx;width: 100%;" duration="1" bindchange="handleSwiper">
+				<swiper-item catchtouchmove="catchTouchMove" wx:for="{{statistics}}" wx:key="index">
+					<ec-canvas id="{{item.name}}" canvas-id="{{item.name}}" ec="{{ streetlinechartec }}" />
+				</swiper-item>
+			</swiper>
+			<view class="statistics-btn">
+				<!-- <button>详细数据</button> -->
+			</view>
+		</view>
+	</view>
+	<!-- 政务服务数据统计分析 -->
+	<view style="background-color: #FFFFFF;margin-top: 30rpx;" bindtap="gotoZWTJ">
+		<view style="border-bottom: 1px solid #C5C5C5;">
+			<view class="title">
+				<image src="{{imgUrl}}riseData.png"></image>
+				<view class="title-text">政务服务数据统计分析</view>
+			</view>
+		</view>
+		<!-- 内容 -->
+		<view>
+			<view>
+				<view class="type-title">
+					<view class="dots" />
+					<view class="type-text">
+						本年办件数
+					</view>
+				</view>
+				<!-- 办件数内容 -->
+				<view style="display:flex;justify-content: space-between;align-items:center;padding: 0 40rpx;">
+					<view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-work-number.png);background-size: 100% 100%;">
+						<!-- 受理数 -->
+						<view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
+							<view style="font-size:19rpx">受理数</view>
+							<view style="display:flex;flex-direction:row;align-items:center">
+								<scroll-view scroll-x style="width: 84rpx">
+									<view style="font-size:28rpx;font-weight: bold;">{{officeNumber[0]}}</view>
+								</scroll-view>
+								<view style="font-size: 19rpx;padding-left:5rpx">件</view>
+							</view>
+						</view>
+					</view>
+					<view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-finish-number.png);background-size: 100% 100%;">
+						<!-- 受理数 -->
+						<view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
+							<view style="font-size:19rpx">办结数</view>
+							<view style="display:flex;flex-direction:row;align-items:center">
+								<scroll-view scroll-x style="width: 84rpx">
+									<view style="font-size:28rpx;font-weight: bold;">{{officeNumber[1]}}</view>
+								</scroll-view>
+								<view style="font-size: 19rpx;padding-left:5rpx">件</view>
+							</view>
+						</view>
+					</view>
+					<view style="width: 210rpx;height: 120rpx;background-image: url({{imgUrl}}index-request-number.png);background-size: 100% 100%;">
+						<!-- 受理数 -->
+						<view style="display:flex;align-items:left;color:#FFFFFF;flex-direction:column;justify-content:center;height: 100%;padding-left:85rpx">
+							<view style="font-size:19rpx">网络提交</view>
+							<view style="display:flex;flex-direction:row;align-items:center">
+								<scroll-view scroll-x style="width: 84rpx;">
+									<view style="font-size:28rpx;font-weight: bold;">{{officeNumber[2]}}</view>
+								</scroll-view>
+								<view style="font-size: 19rpx;padding-left:5rpx">件</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view>
+				<view class="type-title">
+					<view class="dots" />
+					<view class="type-text">
+						好差评
+					</view>
+				</view>
+				<view style="display: flex;flex-wrap: wrap;justify-content: space-between;padding: 0 40rpx">
+					<view class="evaluate">评价我的办件</view>
+					<view class="evaluate">评价窗口人员</view>
+					<view class="evaluate">评价办事指南</view>
+					<view class="evaluate" style="width: 316rpx;">评价服务应用</view>
+					<view class="evaluate" style="width: 316rpx;">评价电子证照</view>
+				</view>
+				<!-- 评价量 -->
+
+				<view style="display: flex;justify-content: space-between;padding: 0 40rpx; height: 300rpx;">
+					<view style="display: flex;flex-wrap: wrap;justify-content: space-between;height: 130rpx;width: 100%">
+						<!-- 好评数 -->
+						<view style="margin-bottom: 30rpx; height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+							<!-- 数据 -->
+							<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+								<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">评价数</view>
+								<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+									<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+								</view>
+							</view>
+						</view>
+						<!-- 评价总量 -->
+						<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+							<!-- 数据 -->
+							<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+								<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">好评率</view>
+								<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+									<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+								</view>
+							</view>
+						</view>
+						<!-- 好评【 -->
+						<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+							<!-- 数据 -->
+							<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+								<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">差评数</view>
+								<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+									<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+								</view>
+							</view>
+						</view>
+						<!-- 评价总量 -->
+						<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+							<!-- 数据 -->
+							<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+								<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">差评率</view>
+								<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+									<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 评价总量 -->
+
+					<!-- 满意度 -->
+
+				</view>
+				<!-- <view style="margin-top: 30rpx;width: 100%;height: 300rpx;">
           <ec-canvas id="goodOrBad" canvas-id="goodOrBad" ec="{{ streetlinechartec }}" />
-        </view>
-      </view>
-      <view>
-        <view class="type-title">
-          <view class="dots" />
-          <view class="type-text">
-            南岸区依申请+公共服务办理类事项总数
-          </view>
-        </view>
-        <view style="display: flex;justify-content: space-between;padding: 0 30rpx;">
-          <view class="matters {{mattersZero > index ? 'default' : '' }}" wx:for="{{matters}}" wx:key="index">{{item}}</view>
-          <view style="width: 27rpx;height: 26rpx;font-size: 28rpx;font-weight: 500;color: #999999;margin-top: 80rpx;">项</view>
-        </view>
-      </view>
-      <view>
-        <view class="type-title">
-          <view class="dots" />
-          <view class="type-text">
-            一件事一次办
-          </view>
-        </view>
-        <view style="display: flex;justify-content: space-between;padding: 0 40rpx 40rpx 20rpx">
-          <view style="position: relative;">
-            <image src="{{imgUrl}}textBox4.png" style="width: 290rpx;height: 278rpx;" />
-            <view class="oneThing-left-top">套餐总数</view>
-            <view class="oneThing-left-bottom">
-              <view>258</view>
-              <view style="font-size: 25rpx;margin: 23rpx 0 0 10rpx;">件</view>
-            </view>
-          </view>
-          <view>
-            <view style="background-image: url('{{imgUrl}}textBox1.png');background-repeat: round;width: 314rpx;height: 93rpx;display: flex;justify-content: space-between;padding: 0 20rpx;">
-              <view class="triangles"></view>
-              <view style="width: 50rpx;height: 25rpx;"></view>
-              <view class="oneThing">减环节</view>
-              <view class="oneThing" style="display: flex;">
-                <view style="font-size: 34rpx;font-weight: 500;margin-right: 10rpx;">1622</view>
-                <view>件</view>
-              </view>
-            </view>
-            <view style="background-image: url('{{imgUrl}}textBox2.png');background-repeat: round;width: 314rpx;height: 93rpx;display: flex;justify-content: space-between;padding: 0 20rpx;">
-              <view class="triangles" style="border-left: 18rpx solid #156FA6;"></view>
-              <view style="width: 50rpx;height: 25rpx;"></view>
-              <view class="oneThing" style="color: #156FA6;">减跑动</view>
-              <view class="oneThing" style="display: flex;color: #156FA6;">
-                <view style="font-size: 34rpx;font-weight: 500;margin-right: 10rpx;">799</view>
-                <view>件</view>
-              </view>
-            </view>
-            <view style="background-image: url('{{imgUrl}}textBox3.png');background-repeat: round;width: 314rpx;height: 93rpx;display: flex;justify-content: space-between;padding: 0 20rpx;">
-              <view class="triangles" style="border-left: 18rpx solid #DF6866;"></view>
-              <view style="width: 50rpx;height: 25rpx;"></view>
-              <view class="oneThing" style="color: #DF6866;">减材料</view>
-              <view class="oneThing" style="display: flex;color: #DF6866;">
-                <view style="font-size: 34rpx;font-weight: 500;margin-right: 10rpx;">465</view>
-                <view>件</view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <!-- 本年度公开信箱办理情况 -->
-  <view style="background-color: #FFFFFF;margin-top: 30rpx;">
-    <view style="border-bottom: 1px solid #C5C5C5;">
-      <view class="title" bindtap="gotoXXTJ">
-        <image src="{{imgUrl}}processing.png"></image>
-        <view class="title-text">本年度公开信箱办理情况</view>
-      </view>
-    </view>
-    <!-- 内容 -->
-    <view>
-      <view style="display: flex;justify-content: space-between;padding: 30rpx 30rpx 20rpx 30rpx;" bindtap="gotoXXTJ">
-        <view class="processing">
-          <image src="{{imgUrl}}chat.png" style="width: 68rpx;height:68rpx;line-height: 110rpx;position: absolute;top: 50%;transform: translateY(-50%);left: 11rpx;"></image>
-          <view style="position: absolute;top: 50%;transform: translateY(-50%);left: 94rpx;">
-            <view style="font-size: 20rpx;font-weight: 400;color: #333333;">
-              近30天来信
-            </view>
-            <view style="display: flex;color: #333333;">
-              <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.handle}}</view>
-              <view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
-            </view>
-          </view>
-        </view>
-        <view class="processing" style="background: #E8F4FF;">
-          <image src="{{imgUrl}}message.png" style="width: 68rpx;height:68rpx;line-height: 110rpx;position: absolute;top: 50%;transform: translateY(-50%);left: 11rpx;"></image>
-          <view style="position: absolute;top: 50%;transform: translateY(-50%);left: 94rpx;">
-            <view style="font-size: 20rpx;font-weight: 400;color: #333333;">
-              近30天受理
-            </view>
-            <view style="display: flex;color: #333333;">
-              <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.accepting}}</view>
-              <view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
-            </view>
-          </view>
-        </view>
-        <view class="processing" style="background: #E2FFFD;">
-          <image src="{{imgUrl}}write.png" style="width: 68rpx;height:68rpx;line-height: 110rpx;position: absolute;top: 50%;transform: translateY(-50%);left: 11rpx;"></image>
-          <view style="position: absolute;top: 50%;transform: translateY(-50%);left: 94rpx;">
-            <view style="font-size: 20rpx;font-weight: 400;color: #333333;">
-              近30天办理
-            </view>
-            <view style="display: flex;color: #333333;">
-              <view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.finished}}</view>
-              <view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view>
-        <view class="type-title">
-          <view class="dots" />
-          <view class="type-text">
-            近90天办理类别统计
-          </view>
-        </view>
-        <view style="height: 500rpx;">
-          <ec-canvas id="processingCategory" canvas-id="processingCategory" ec="{{ streetlinechartec }}" />
-        </view>
-      </view>
-      <view>
-        <view class="type-title">
-          <view class="dots" />
-          <view class="type-text">
-            近90天公开信箱领域统计
-          </view>
-        </view>
-        <view style="height: 500rpx;">
-          <ec-canvas id="publicMailbox" canvas-id="publicMailbox" ec="{{ streetlinechartec }}" />
-        </view>
-      </view>
-    </view>
-  </view>
+        </view> -->
+			</view>
+			<view>
+				<view class="type-title">
+					<view class="dots" />
+					<view class="type-text">
+						南岸区依申请+公共服务办理类事项总数
+					</view>
+				</view>
+				<view style="display: flex;justify-content: space-between;padding: 0 30rpx;">
+					<view class="matters {{mattersZero > index ? 'default' : '' }}" wx:for="{{matters}}" wx:key="index">{{item}}</view>
+					<view style="width: 27rpx;height: 26rpx;font-size: 28rpx;font-weight: 500;color: #999999;margin-top: 80rpx;">项</view>
+				</view>
+			</view>
+			<view>
+				<view class="type-title">
+					<view class="dots" />
+					<view class="type-text">
+						一件事一次办
+					</view>
+				</view>
+				<view style="display: flex;justify-content: space-between;padding: 0 40rpx 40rpx 20rpx">
+					<view style="position: relative;">
+						<image src="{{imgUrl}}textBox4.png" style="width: 290rpx;height: 278rpx;" />
+						<view class="oneThing-left-top">套餐总数</view>
+						<view class="oneThing-left-bottom">
+							<view>258</view>
+							<view style="font-size: 25rpx;margin: 23rpx 0 0 10rpx;">件</view>
+						</view>
+					</view>
+					<view>
+						<view style="background-image: url('{{imgUrl}}textBox1.png');background-repeat: round;width: 314rpx;height: 93rpx;display: flex;justify-content: space-between;padding: 0 20rpx;">
+							<view class="triangles"></view>
+							<view style="width: 50rpx;height: 25rpx;"></view>
+							<view class="oneThing">减环节</view>
+							<view class="oneThing" style="display: flex;">
+								<view style="font-size: 34rpx;font-weight: 500;margin-right: 10rpx;">1622</view>
+								<view>件</view>
+							</view>
+						</view>
+						<view style="background-image: url('{{imgUrl}}textBox2.png');background-repeat: round;width: 314rpx;height: 93rpx;display: flex;justify-content: space-between;padding: 0 20rpx;">
+							<view class="triangles" style="border-left: 18rpx solid #156FA6;"></view>
+							<view style="width: 50rpx;height: 25rpx;"></view>
+							<view class="oneThing" style="color: #156FA6;">减跑动</view>
+							<view class="oneThing" style="display: flex;color: #156FA6;">
+								<view style="font-size: 34rpx;font-weight: 500;margin-right: 10rpx;">799</view>
+								<view>件</view>
+							</view>
+						</view>
+						<view style="background-image: url('{{imgUrl}}textBox3.png');background-repeat: round;width: 314rpx;height: 93rpx;display: flex;justify-content: space-between;padding: 0 20rpx;">
+							<view class="triangles" style="border-left: 18rpx solid #DF6866;"></view>
+							<view style="width: 50rpx;height: 25rpx;"></view>
+							<view class="oneThing" style="color: #DF6866;">减材料</view>
+							<view class="oneThing" style="display: flex;color: #DF6866;">
+								<view style="font-size: 34rpx;font-weight: 500;margin-right: 10rpx;">465</view>
+								<view>件</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<!-- 本年度公开信箱办理情况 -->
+	<view style="background-color: #FFFFFF;margin-top: 30rpx;">
+		<view style="border-bottom: 1px solid #C5C5C5;">
+			<view class="title" bindtap="gotoXXTJ">
+				<image src="{{imgUrl}}processing.png"></image>
+				<view class="title-text">本年度公开信箱办理情况</view>
+			</view>
+		</view>
+		<!-- 内容 -->
+		<view>
+			<view style="display: flex;justify-content: space-between;padding: 30rpx 30rpx 20rpx 30rpx;" bindtap="gotoXXTJ">
+				<view class="processing">
+					<image src="{{imgUrl}}chat.png" style="width: 68rpx;height:68rpx;line-height: 110rpx;position: absolute;top: 50%;transform: translateY(-50%);left: 11rpx;"></image>
+					<view style="position: absolute;top: 50%;transform: translateY(-50%);left: 94rpx;">
+						<view style="font-size: 20rpx;font-weight: 400;color: #333333;">
+							近30天来信
+						</view>
+						<view style="display: flex;color: #333333;">
+							<view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.handle}}</view>
+							<view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
+						</view>
+					</view>
+				</view>
+				<view class="processing" style="background: #E8F4FF;">
+					<image src="{{imgUrl}}message.png" style="width: 68rpx;height:68rpx;line-height: 110rpx;position: absolute;top: 50%;transform: translateY(-50%);left: 11rpx;"></image>
+					<view style="position: absolute;top: 50%;transform: translateY(-50%);left: 94rpx;">
+						<view style="font-size: 20rpx;font-weight: 400;color: #333333;">
+							近30天受理
+						</view>
+						<view style="display: flex;color: #333333;">
+							<view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.accepting}}</view>
+							<view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
+						</view>
+					</view>
+				</view>
+				<view class="processing" style="background: #E2FFFD;">
+					<image src="{{imgUrl}}write.png" style="width: 68rpx;height:68rpx;line-height: 110rpx;position: absolute;top: 50%;transform: translateY(-50%);left: 11rpx;"></image>
+					<view style="position: absolute;top: 50%;transform: translateY(-50%);left: 94rpx;">
+						<view style="font-size: 20rpx;font-weight: 400;color: #333333;">
+							近30天办理
+						</view>
+						<view style="display: flex;color: #333333;">
+							<view style="font-size: 32rpx;font-weight: bold;">{{leaveAMessage.finished}}</view>
+							<view style="margin: 10rpx 0 0 10rpx;font-size: 24rpx;">件</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view>
+				<view class="type-title">
+					<view class="dots" />
+					<view class="type-text">
+						近90天办理类别统计
+					</view>
+				</view>
+				<view style="height: 500rpx;">
+					<ec-canvas id="processingCategory" canvas-id="processingCategory" ec="{{ streetlinechartec }}" />
+				</view>
+			</view>
+			<view>
+				<view class="type-title">
+					<view class="dots" />
+					<view class="type-text">
+						近90天公开信箱领域统计
+					</view>
+				</view>
+				<view style="height: 500rpx;">
+					<ec-canvas id="publicMailbox" canvas-id="publicMailbox" ec="{{ streetlinechartec }}" />
+				</view>
+			</view>
+		</view>
+	</view>
 </view>

nnzwminiapp/pages/dataCenterZWTJ/dataCenterZWTJ.wxml

@@ -101,9 +101,12 @@
 			</view>
 		</view>
 		<view class="unitName">
-			<view class="namebox nametwo">{{departmentSort.firstName}}</view>
+			<!-- <view class="namebox nametwo">{{departmentSort.firstName}}</view>
 			<view class="namebox nameone">{{departmentSort.secondName}}</view>
-			<view class="namebox namethree">{{departmentSort.thirdName}}</view>
+			<view class="namebox namethree">{{departmentSort.thirdName}}</view> -->
+			<view class="namebox nametwo">重庆市南岸区城市管理局</view>
+			<view class="namebox nameone">重庆市南岸区交通局</view>
+			<view class="namebox namethree">重庆市南岸区卫生健康委员会</view>
 		</view>
 	</view>
 	<view>
@@ -119,9 +122,12 @@
 			</view>
 		</view>
 		<view class="unitName">
-			<view class="namebox nametwo">{{matterSort.firstName}}</view>
+			<!-- <view class="namebox nametwo">{{matterSort.firstName}}</view>
 			<view class="namebox nameone">{{matterSort.secondName}}</view>
-			<view class="namebox namethree">{{matterSort.thirdName}}</view>
+			<view class="namebox namethree">{{matterSort.thirdName}}</view> -->
+			<view class="namebox nametwo">户外招牌设置备案</view>
+			<view class="namebox nameone">出租汽车驾驶员从业资格注册</view>
+			<view class="namebox namethree">执业医师注册</view>
 		</view>
 	</view>
 </view>
@@ -188,39 +194,52 @@
 	</view>
 	<view style=" margin-top: 20rpx; display: flex;justify-content: space-between;padding: 0 40rpx;">
 		<!-- 评价总量 -->
-		<view style="height: 100rpx;width:310rpx;display: flex;background-color: #E5F4FE;border-radius: 10px;">
-			<!-- 图标 -->
-			<view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center;">
-				<image src="{{imgUrl}}index-evalution.png" style="height:64rpx;width:64rpx;"></image>
-			</view>
-			<!-- 数据 -->
-			<view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
-				<view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">本年评价总量</view>
-				<view style="display:flex;justify-content:left;align-items:center;color: #333333;">
-					<view style="font-size: 26rpx;font-weight: bold;">{{evalutionNum}}</view>
-					<view style="font-size:20rpx;padding-left:5rpx">条</view>
-				</view>
-			</view>
-		</view>
+		
 		<!-- 满意度 -->
-		<view style="height: 100rpx;width:310rpx;display: flex;background-color: #E5F4FE;border-radius: 10px;">
-			<!-- 图标 -->
-			<view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center">
-				<image src="{{imgUrl}}index-good-blud.png" style="height:64rpx;width:70rpx;"></image>
-			</view>
-			<!-- 数据 -->
-			<view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
-				<view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">满意度</view>
-				<view style="display:flex;justify-content:left;align-items:center;color: #333333;">
-					<view style="font-size: 26rpx;font-weight: bold;">{{evalutionRate}}</view>
-					<view style="font-size:20rpx;padding-left:5rpx">%</view>
-				</view>
-			</view>
-		</view>
-	</view>
-	<view style="width: 100%;height: 300rpx; margin-bottom: 30rpx;margin-bottom: 10rpx;">
-		<ec-canvas id="goodOrBad" canvas-id="goodOrBad" ec="{{ streetlinechartec }}" />
+		<view style="display: flex;flex-wrap: wrap;justify-content: space-between;height: 280rpx;width: 100%">
+						<!-- 好评数 -->
+						<view style="margin-bottom: 30rpx; height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+							<!-- 数据 -->
+							<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+								<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">评价数</view>
+								<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+									<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+								</view>
+							</view>
+						</view>
+						<!-- 评价总量 -->
+						<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+							<!-- 数据 -->
+							<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+								<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">好评率</view>
+								<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+									<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+								</view>
+							</view>
+						</view>
+						<!-- 好评【 -->
+						<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+							<!-- 数据 -->
+							<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+								<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">差评数</view>
+								<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+									<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+								</view>
+							</view>
+						</view>
+						<!-- 评价总量 -->
+						<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+							<!-- 数据 -->
+							<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+								<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">差评整改率</view>
+								<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+									<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
 	</view>
+
 	<view style=" display: flex;flex-wrap: wrap;justify-content: space-between;padding: 0 40rpx">
 		<view class="evaluate">评价我的办件</view>
 		<view class="evaluate">评价窗口人员</view>

nnzwminiapp/pages/index/index.js

@@ -211,6 +211,12 @@ Page({
 		officeNumber: [],
 		//  评价总量
 		evalutionNum: 0,
+		//  评价总量
+		goodevalutionRate: 0,
+		//  评价总量
+		badevalutionNum: 0,
+		//  评价总量
+		badevalutionRate: 0,
 		// 满意度
 		evalutionRate: '',
 		// 图表
@@ -608,7 +614,7 @@ Page({
 		// 获取媒体矩阵今日头条数据
 		this.getMediaHeadlineList();
 		// 获取好差评图表
-		this.barComponent3 = this.selectComponent('#streetlinechart3');
+		// this.barComponent3 = this.selectComponent('#streetlinechart3');
 		this.init_bar3();
 		// 获取本年办件数
 		this.getOfficeNumberByAreaInfo();
@@ -657,50 +663,27 @@ Page({
 
 	// 加载评价图表
 	init_bar3() {
-		let that = this;
-		this.barComponent3.init((canvas, width, height, dpr) => {
-			// 初始化图表
-			const barChart = echarts.init(canvas, null, {
-				width: width,
-				height: height,
-				devicePixelRatio: dpr
-			});
+		wx.request({
+			url: 'https://www.cqna.gov.cn/data//goodOrbad/getGoodOrBadByYearAndArea?area=1',
+			method: 'GET',
+			success: res => {
+				res = res.data;
+				if (res.result === 'ok') {
+
+					this.setData({
+						//  评价总量
+						evalutionNum: res.data.totalEvaluationNumber,
+						//  评价总量
+						goodevalutionRate: res.data.goodEvaluationRate,
+						//  评价总量
+						badevalutionNum: res.data.poorEvaluationNumber,
+						//  评价总量
+						badevalutionRate: res.data.poorEvaluationRate
+					})
 
-			wx.request({
-				url: 'https://www.cqna.gov.cn/data//goodOrbad/getGoodOrBadByYearAndArea?area=1',
-				method: 'GET',
-				success: res => {
-					res = res.data;
-					if (res.result === 'ok') {
-						let temp = [];
-						temp.push(res.data.veryDissatisfied);
-						temp.push(res.data.notSatisfied);
-						temp.push(res.data.basicSatisfied);
-						temp.push(res.data.satisfied);
-						temp.push(res.data.great);
-						// 计算最大值，以及分割值
-						var maxValue = Math.max(...temp)
-						maxValue = parseInt(maxValue / 10000 + 1) * 10000
-						var interval = maxValue / 4
-						barChart.setOption(this.getScaOption2(maxValue, interval));
-						this.setData({
-							evalutionNum: res.data.goodOrBad,
-							evalutionRate: Math.floor(res.data.good / res.data.goodOrBad * 100 * 100) / 100
-						})
-						barChart.setOption({
-							series: [{
-								data: temp
-							}]
-						})
-					}
 				}
-			})
-			barChart.on("finished", function () {
-				that.canvasToTempImage();
-			});
-			// 注意这里一定要返回 chart 实例，否则会影响事件处理等
-			return barChart;
-		});
+			}
+		})
 	},
 	getScaOption2(maxValue, interval) {
 		//请求数据 

nnzwminiapp/pages/index/index.wxml

@@ -478,9 +478,8 @@
 										</view>
 									</view>
 								</swiper-item>
-								<swiper-item>
+								<!-- <swiper-item>
 									<view style="display: flex;justify-content: flex-start;flex-wrap: wrap">
-										<!-- 选项 -->
 										<view wx:for="{{mediaSelectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="{{index % 2 === 0?'media-icon-1':'media-icon-2'}}">
 											<view bindtap="showLogoDialog" data-name="{{item.name}}" data-ewm="{{item.ewm}}" data-url = "{{item.url}}" style="display: flex;align-items:center;justify-content:center;margin-right: 4rpx">
 												<image src="{{item.img}}" style="height:44rpx;width:44rpx;"></image>
@@ -488,7 +487,7 @@
 											<view bindtap="showLogoDialog" data-name="{{item.name}}" data-ewm="{{item.ewm}}" data-url = "{{item.url}}" style="display: flex;align-items:center;justify-content:center">{{item.name}}</view>
 										</view>
 									</view>
-								</swiper-item>
+								</swiper-item> -->
 								<!-- <swiper-item>
                   <view wx:for="{{mediaHeadlineList}}" wx:key="index" class="news-item" bindtap="gotoHeadlineDetail" data-url="{{item.url}}">
                     <view class="jigou">
@@ -683,12 +682,15 @@
 					<!-- 本年办件数 -->
 					<!-- 好差评 -->
 					<view bindtap="gotoZWTJ" style="margin-top:15rpx;height:300rpx;width:100%;">
-						<!-- 标题 -->
 						<view style="padding-left:8rpx;display:flex;align-items:center;justify-content:margin-left">
 							<view class="yellow-point"></view>
 							<view class="work-title-font">好差评</view>
 						</view>
 						<!-- 内容 -->
+						<view>
+							<view></view>
+							<view></view>
+						</view>
 						<view style="display: flex;flex-wrap: wrap;justify-content: space-between;margin-top:20rpx">
 							<view class="evaluate">评价我的办件</view>
 							<view class="evaluate">评价窗口人员</view>
@@ -696,44 +698,54 @@
 							<view class="evaluate" style="width: 316rpx;">评价服务应用</view>
 							<view class="evaluate" style="width: 316rpx;">评价电子证照</view>
 						</view>
-						<!-- 评价量 -->
+						<!-- 评价数 -->
 						<view style="display: flex;flex-wrap: wrap;justify-content: space-between;height: 130rpx;width: 100%">
+							<!-- 好评数 -->
+							<view style="margin-bottom: 30rpx; height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
+								<!-- 数据 -->
+								<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+									<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">评价数</view>
+									<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+										<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+									</view>
+								</view>
+							</view>
 							<!-- 评价总量 -->
 							<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
-								<!-- 图标 -->
-								<view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center">
-									<image src="{{imgUrl}}index-evalution.png" style="height:64rpx;width:64rpx;"></image>
-								</view>
 								<!-- 数据 -->
-								<view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
-									<view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">本年评价总量</view>
-									<view style="display:flex;justify-content:left;align-items:center;color: #333333;">
-										<view style="font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
-										<view style="font-size:20rpx;padding-left:5rpx">条</view>
+								<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+									<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">好评率</view>
+									<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+										<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
 									</view>
 								</view>
 							</view>
-							<!-- 满意度 -->
+							<!-- 好评【 -->
 							<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
-								<!-- 图标 -->
-								<view style="width: 100rpx;height: 100%;display: flex;align-items:center;justify-content:center">
-									<image src="{{imgUrl}}index-good-blud.png" style="height:64rpx;width:70rpx;"></image>
+								<!-- 数据 -->
+								<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+									<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">差评数</view>
+									<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+										<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
+									</view>
 								</view>
+							</view>
+							<!-- 评价总量 -->
+							<view style="height: 100rpx;width:310rpx;display: flex;background-color:#E5F4FE;border-radius: 10px;">
 								<!-- 数据 -->
-								<view style="width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
-									<view style="font-size: 19rpx;color: #999999;padding-bottom:8rpx">满意度</view>
-									<view style="display:flex;justify-content:left;align-items:center;color: #333333;">
-										<view style="font-size: 28rpx;font-weight: bold;">{{evalutionRate}}</view>
-										<view style="font-size:20rpx;padding-left:5rpx">%</view>
+								<view style="margin: 0 auto; width: 210rpx;height: 100%;display:flex;flex-direction: column;justify-content:center">
+									<view style="text-align: center;width: 100%; font-size: 19rpx;color: #999999;padding-bottom:8rpx">差评整改率</view>
+									<view style="width: 100%;display:flex;justify-content:left;align-items:center;color: #333333;">
+										<view style="width: 100%; text-align: center; font-size: 28rpx;font-weight: bold;">{{evalutionNum}}</view>
 									</view>
 								</view>
 							</view>
 						</view>
 						<!-- 图表 -->
-						<view hidden="{{canvasImg}}" style="width: 100%;height: 300rpx;">
+						<!-- <view hidden="{{canvasImg}}" style="width: 100%;height: 300rpx;">
 							<ec-canvas id="streetlinechart3" canvas-id="streetlinechart3" ec="{{ streetlinechartec }}" />
 						</view>
-						<image hidden="{{!canvasImg}}" src="{{canvasImg}}" style="width: 100%; height: 300rpx" />
+						<image hidden="{{!canvasImg}}" src="{{canvasImg}}" style="width: 100%; height: 300rpx" /> -->
 					</view>
 					<!-- 好差评 -->
 				</view>

nnzwminiapp/pages/index/index.wxss

@@ -297,7 +297,7 @@ scroll-view ::-webkit-scrollbar {
 	background-color: #ffffff;
 	padding: 25rpx 30rpx;
 	width: 651rpx;
-	height: 100%;
+	height: 87%;
 }
 
 /* 数据中心title */