From ede43fa277e6fae696051fc2215ad81d914bde92 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 21 Feb 2020 11:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20=20=E5=88=97=E8=A1=A8=E5=92=8C=E6=80=BB=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/analysis/user/gridopening.vue     | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/analysis/user/gridopening.vue b/src/views/modules/analysis/user/gridopening.vue
index d00208d9..bd348ffb 100644
--- a/src/views/modules/analysis/user/gridopening.vue
+++ b/src/views/modules/analysis/user/gridopening.vue
@@ -60,7 +60,7 @@
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
         <el-table-column label="序号"
-                         width="70">
+                         width="70px">
           <template slot-scope="scope">
             {{scope.$index+1}}
           </template>
@@ -68,53 +68,75 @@
         <el-table-column prop="allDeptName"
                          label="网格名称"
                          header-align="center"
+                         width="325px"
                          align="center"></el-table-column>
         <el-table-column prop="gridLeader"
                          label="网格党建指导员姓名"
+                         width="323px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="registerCount"
                          label="注册用户"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="residentCount"
                          label="注册居民"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="partyCount"
                          label="注册党员数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="newsCount"
                          label="新闻发布数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="communityCount"
                          label="社群数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="communityMemberCount"
                          label="群成员数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="communityTopicCount"
                          label="群话题数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="eventCount"
-                         label="议题数"
+                         label="议题总数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="itemCount"
                          label="项目数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="itemCloseCount"
-                         label="项目关闭数"
+                         label="项目已解决数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="itemPendingCount"
+                         label="项目待解决数"
+                         width="70px"
+                         header-align="center"
+                         align="center">
+          <template slot-scope="scope">
+            {{scope.row.itemCount - scope.row.itemCloseCount}}
+          </template>
+        </el-table-column>
         <el-table-column prop="itemPraiseCount"
                          label="好评数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
       </el-table>
@@ -181,7 +203,7 @@
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="eventCount"
-                           label="议题数"
+                           label="议题总数"
                            width="70px"
                            header-align="center"
                            align="center"></el-table-column>
@@ -191,10 +213,19 @@
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="itemCloseCount"
-                           label="项目关闭数"
+                           label="项目已解决数"
                            width="70px"
                            header-align="center"
                            align="center"></el-table-column>
+          <el-table-column prop="itemPendingCount"
+                           label="项目待解决数"
+                           width="70px"
+                           header-align="center"
+                           align="center">
+            <template slot-scope="scope">
+              {{scope.row.itemCount - scope.row.itemCloseCount}}
+            </template>
+          </el-table-column>
           <el-table-column prop="itemPraiseCount"
                            label="好评数"
                            width="70px"