From e7516b492fcc1dc7630d710a44317efd0657c424 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 14 Dec 2021 16:42:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD?=
 =?UTF-8?q?=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/components/screen-table/index.vue  |   3 +
 src/views/modules/visual/measure/service.vue  | 144 +++++++++---------
 .../modules/visual/measure/volunteer.vue      |   6 +-
 3 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/src/views/modules/visual/components/screen-table/index.vue b/src/views/modules/visual/components/screen-table/index.vue
index 9d1861ac..bfc00da9 100644
--- a/src/views/modules/visual/components/screen-table/index.vue
+++ b/src/views/modules/visual/components/screen-table/index.vue
@@ -251,6 +251,9 @@ export default {
           text-align: center;
           width: calc(100% / 5);
           cursor: pointer;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
           .more {
             font-size: 18px;
             font-weight: 400;
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index cf0a52a3..24b5f820 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -9,7 +9,8 @@
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
-            clearable @change="handleCascader">
+            clearable 
+            @change="handleCascader">
           </el-cascader>
         </div>
         <div class="title-time">
@@ -178,6 +179,7 @@ export default {
         { title: "服务方", coulmn: 'serviceName' },
         { title: "服务时间", coulmn: 'wantServiceTime' },
       ],
+      categoryList: {},
       timeRange: '',
       tableData: [
         // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
@@ -193,6 +195,13 @@ export default {
       detailInfo: {}
     };
   },
+  watch: {
+    timeRange(val) {
+      console.log('val-www', val)
+      if (!val) return false
+      this.handleCascader(this.selectAgency)
+    }
+  },
   async mounted() {
     this.initTime()
     await nextTick(100);
@@ -214,6 +223,38 @@ export default {
           axisPointer: {
             // Use axis to trigger tooltip
             type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
+          },
+          backgroundColor: 'transprant',
+          borderColor: 'transprant',
+          textStyle: {
+            color: '#fff'
+          },
+          formatter: params => {
+              let res;
+              let arr = []
+              let total = 0
+              const xName = params[0].axisValue
+              this.categoryList.forEach(item => {
+                if (item.categoryName === xName) {
+                  arr = item.detail
+                  total = item.total
+                }
+              })
+              let title = `<div style='margin-bottom: 10px;'><span>${xName}分类需求</span>${total}个</div>`
+              let desc = ''
+              let unit = '个'
+              arr.forEach(item => {
+                if (item.legendCode == 'volunteer') unit = '名'
+                else unit = '个'
+                if (item.legendCode == 'unfinished') {
+                  desc += `<div><span>尚有 ${item.serviceDemandTotal} 个需求未完成</span></div>`
+                }else {
+                  desc += `<div><span>共 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个</span></div>`
+                }
+                
+              })
+              res= title + desc
+              return res
           }
         },
         legend: {
@@ -232,7 +273,11 @@ export default {
         xAxis: {
           type: 'category',
           axisLabel: {
-            color: '#fff'
+            color: '#fff',
+            interval: 0
+          },
+          axisTick: {
+            interval: 0
           },
           data: xData
         },
@@ -247,76 +292,13 @@ export default {
           // axisLine: false
         },
         series: yData
-        // [
-        //   {
-        //     name: '区域化党建单位',
-        //     type: 'bar',
-        //     stack: 'total',
-        //     // barWidth: 20,
-        //     label: {
-        //       show: true
-        //     },
-        //     emphasis: {
-        //       focus: 'series'
-        //     },
-        //     data: [320, 302, 301, 334, 390, 330, 320]
-        //   },
-        //   {
-        //     name: '社会组织',
-        //     type: 'bar',
-        //     stack: 'total',
-        //     // barWidth: 20,
-        //     label: {
-        //       show: true
-        //     },
-        //     emphasis: {
-        //       focus: 'series'
-        //     },
-        //     data: [120, 132, 101, 134, 90, 230, 210]
-        //   },
-        //   {
-        //     name: '社区自组织',
-        //     type: 'bar',
-        //     stack: 'total',
-        //     // barWidth: 20,
-        //     label: {
-        //       show: true
-        //     },
-        //     emphasis: {
-        //       focus: 'series'
-        //     },
-        //     data: [220, 182, 191, 234, 290, 330, 310]
-        //   },
-        //   {
-        //     name: '志愿者',
-        //     type: 'bar',
-        //     stack: 'total',
-        //     // barWidth: 20,
-        //     label: {
-        //       show: true
-        //     },
-        //     emphasis: {
-        //       focus: 'series'
-        //     },
-        //     data: [150, 212, 201, 154, 190, 330, 410]
-        //   },
-        //   {
-        //     name: '未完成',
-        //     type: 'bar',
-        //     stack: 'total',
-        //     // barWidth: 20,
-        //     label: {
-        //       show: true
-        //     },
-        //     emphasis: {
-        //       focus: 'series'
-        //     },
-        //     data: [820, 832, 901, 934, 1290, 1330, 1320]
-        //   }
-        // ]
+        
       };
 
       option && _charts.setOption(option);
+      _charts.on('click', params => {
+        this.clickBar(params)
+      })
 
     },
     async getServicePie(orgId, orgType) {
@@ -331,6 +313,7 @@ export default {
       if (code === 0) {
         console.log('pie-data', data)
         const { categoryList, legend } = data
+        this.categoryList = categoryList
         let xData = categoryList.map(item => item.categoryName)
         let yData = []
         yData = legend.map(item => {
@@ -475,6 +458,18 @@ export default {
 
       return y + '-' + m + '-' + d
     },
+    clickBar(params) {
+      console.log('params---p', params)
+      let code = ''
+      this.categoryList.forEach(item => {
+        if (item.categoryName == params.name) code = item.categoryCode
+      })
+      if (code) {
+        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        this.getServiceList(_arr[0], orgType, code)
+      }
+    },
     async handleLook(val) {
       
       // this.detailId = val.id
@@ -484,16 +479,21 @@ export default {
     },
     handleCascader(val) {
       console.log('val-vvv', val)
-      const _arr = val[val.length - 1].split('-')
-      const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
-      this.getServiceList(_arr[0], orgType)
+      if (val.length > 0) {
+        const _arr = val[val.length - 1].split('-')
+        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        this.getServicePie(_arr[0], orgType)
+      }
+      
     },
     pageSizeChangeHandleNew(val) {
       this.pageNo = 1;
       this.pageSize = val;
+      this.handleCascader(this.selectAgency)
     },
     pageCurrentChangeHandleNew(val) {
       this.pageNo = val;
+      this.handleCascader(this.selectAgency)
     },
   },
 };
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index c4447dce..603a82da 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -596,14 +596,14 @@ export default {
 }
 
 .card-wr-map {
-  height: calc(100vh - 140px);
+  height: calc(100vh - 150px);
   text-align: center;
 
   .card-map {
     margin-top: 10px;
     width: 100%;
-    height: calc(100vh - 285px);
-    // height: calc(100vh - 295px);
+    // height: calc(100vh - 285px);
+    height: calc(100vh - 315px);
 
     .map {
       width: 100%;

From 9dc942c2cee2c9dc2389b5ac474b96a5ae2e8ef6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 14 Dec 2021 16:58:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=83=AD=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/distributionAnalyze.scss   |   6 +-
 .../scss/modules/visual/incident-info.scss    | 642 +++++++++---------
 .../communityGovern/cpt/project-info.vue      | 629 +++++++++++++++++
 .../communityGovern/distributionAnalyze.vue   |   6 +-
 .../communityGovern/distributionLineOption.js |  18 +-
 .../visual/communityGovern/processAnalyze.vue |   1 -
 .../visual/communityGovern/resibuzz.vue       |   5 +-
 .../visual/communityGovern/typeAnalyze.vue    |  38 +-
 8 files changed, 1004 insertions(+), 341 deletions(-)
 create mode 100644 src/views/modules/visual/communityGovern/cpt/project-info.vue

diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss
index 874dfbed..438c0e30 100644
--- a/src/assets/scss/modules/visual/distributionAnalyze.scss
+++ b/src/assets/scss/modules/visual/distributionAnalyze.scss
@@ -116,12 +116,12 @@
   display: flex;
   flex-direction: row;
   // flex-wrap: wrap;
-  // justify-content: center;
+  justify-content: space-between;
   height: calc(100vh - 230px);
 
   .g-l {
     width: 40%;
-    height: calc(100vh - 290px);
+    height: calc(100vh - 240px);
 
     .echart-line {
       margin-left: 30px;
@@ -139,7 +139,7 @@
   }
 
   .g-r {
-    width: 60%;
+    width: 55%;
     height: calc(100vh - 250px);
 
     .r-map {
diff --git a/src/assets/scss/modules/visual/incident-info.scss b/src/assets/scss/modules/visual/incident-info.scss
index 989b7d56..9fe6638c 100644
--- a/src/assets/scss/modules/visual/incident-info.scss
+++ b/src/assets/scss/modules/visual/incident-info.scss
@@ -1,375 +1,379 @@
-@import "../../c/config";
-@import "../../c/function";
-@import "./c/common";
+@import '../../c/config';
+@import '../../c/function';
+@import './c/common';
 
 .m-pop {
-    @include shield;
-    background-color: rgba(#000, 0.9);
-    overflow-y: auto;
+  @include shield;
+  background-color: rgba(#000, 0.9);
+  overflow-y: auto;
 
-    .wrap {
-        position: relative;
-        margin: 120px auto;
-        width: 1020px;
-
-        .title {
-            padding: 10px;
-            font-size: 22px;
-            font-family: PingFang SC;
-            font-weight: 800;
-            color: #ffffff;
-            display: flex;
-            align-items: center;
-
-            img {
-                display: block;
-                margin-right: 5px;
-            }
-            span {
-                display: block;
-            }
-        }
+  .wrap {
+    position: relative;
+    margin: 120px auto;
+    width: 1020px;
+
+    .title {
+      padding: 10px;
+      font-size: 22px;
+      font-family: PingFang SC;
+      font-weight: 800;
+      color: #ffffff;
+      display: flex;
+      align-items: center;
+
+      img {
+        display: block;
+        margin-right: 5px;
+      }
+      span {
+        display: block;
+      }
+    }
 
-        .btn-close {
-            position: absolute;
-            top: -15px;
-            right: -15px;
-            cursor: pointer;
-        }
+    .btn-close {
+      position: absolute;
+      top: -15px;
+      right: -15px;
+      cursor: pointer;
+    }
 
-        .line {
-            margin: 20px auto;
-            width: 900px;
-            height: 1px;
-            border: 1px dashed #1257c9;
-        }
+    .line {
+      margin: 20px auto;
+      width: 900px;
+      height: 1px;
+      border: 1px dashed #1257c9;
+    }
 
-        .tabs {
-            margin-top: 30px;
-            display: flex;
-            align-items: center;
-            padding-left: 20px;
-            padding-left: 58px;
-
-            .tab-btn {
-                width: 30px;
-                text-align: center;
-                cursor: pointer;
-            }
-
-            .tab {
-                margin: 0 5px;
-                min-width: 76px;
-                padding: 0 5px;
-                height: 30px;
-                background: rgba(255, 255, 255, 0);
-                border: 1px solid #1257c9;
-                box-shadow: 0 0 10px 0 inset #1257c9;
-                border-radius: 2px;
-                text-align: center;
-                font-size: 14px;
-                font-family: PingFang SC;
-                font-weight: 400;
-                color: #ffffff;
-                line-height: 30px;
-                cursor: pointer;
-                transition: all ease 0.5s;
-                &.z-on {
-                    background: linear-gradient(90deg, #1a5afd, #009cff);
-                    box-shadow: none;
-                }
-            }
+    .tabs {
+      margin-top: 30px;
+      display: flex;
+      align-items: center;
+      padding-left: 20px;
+      padding-left: 58px;
+
+      .tab-btn {
+        width: 30px;
+        text-align: center;
+        cursor: pointer;
+      }
+
+      .tab {
+        margin: 0 5px;
+        min-width: 76px;
+        padding: 0 5px;
+        height: 30px;
+        background: rgba(255, 255, 255, 0);
+        border: 1px solid #1257c9;
+        box-shadow: 0 0 10px 0 inset #1257c9;
+        border-radius: 2px;
+        text-align: center;
+        font-size: 14px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 30px;
+        cursor: pointer;
+        transition: all ease 0.5s;
+        &.z-on {
+          background: linear-gradient(90deg, #1a5afd, #009cff);
+          box-shadow: none;
         }
+      }
     }
+  }
 }
 
 .m-info {
-    padding-left: 62px;
-    font-size: 16px;
+  padding-left: 62px;
+  font-size: 16px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 24px;
+  width: 500px;
+
+  .info-title {
+    margin-top: 30px;
+    font-size: 20px;
     font-family: PingFang SC;
-    font-weight: 400;
+    font-weight: bold;
     color: #ffffff;
-    line-height: 24px;
-    width: 500px;
-
-    .info-title {
-        margin-top: 30px;
-        font-size: 20px;
-        font-family: PingFang SC;
-        font-weight: bold;
-        color: #ffffff;
-        line-height: 30px;
-    }
-    .info-content {
-        margin: 20px 0;
-    }
-    .info-pics {
-        display: flex;
-        margin: 20px 0;
-        img {
-            display: block;
-            width: 32%;
-            height: 90px;
-            margin-right: 9px;
-            object-fit: cover;
-        }
+    line-height: 30px;
+  }
+  .info-content {
+    margin: 20px 0;
+  }
+  .info-pics {
+    display: flex;
+    margin: 20px 0;
+    img {
+      display: block;
+      width: 32%;
+      height: 90px;
+      margin-right: 9px;
+      object-fit: cover;
     }
+  }
 
-    .info-prop {
-        position: relative;
-        margin: 10px 0;
-        display: flex;
-        padding-left: 15px;
+  .info-prop {
+    position: relative;
+    margin: 10px 0;
+    display: flex;
+    padding-left: 15px;
 
-        > span,
-        > div {
-            display: block;
-            max-width: 300px;
-        }
+    > span,
+    > div {
+      display: block;
+      max-width: 300px;
+    }
 
-        &::before {
-            content: "";
-            display: block;
-            position: absolute;
-            top: 9px;
-            left: 0;
-            width: 7px;
-            height: 7px;
-            background: #0c81fe;
-            border-radius: 3px;
-            margin-right: 10px;
-        }
+    &::before {
+      content: '';
+      display: block;
+      position: absolute;
+      top: 9px;
+      left: 0;
+      width: 7px;
+      height: 7px;
+      background: #0c81fe;
+      border-radius: 3px;
+      margin-right: 10px;
     }
+  }
 }
 
 .m-case {
-    @include scrollBar;
-    height: 600px;
-    padding: 20px 0 20px 0;
-    overflow-y: auto;
+  @include scrollBar;
+  height: 600px;
+  padding: 20px 0 20px 0;
+  overflow-y: auto;
 }
 
 .m-row {
-    display: flex;
-    justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
 }
 
 .m-yanpan {
-    padding-left: 62px;
-    padding-right: 0;
-    min-height: 300px;
+  padding-left: 62px;
+  padding-right: 0;
+  min-height: 300px;
 }
 
 .m-hint {
-    position: relative;
-    height: 300px;
-
-    // 暂无数据
-    img {
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        margin: auto;
-    }
+  position: relative;
+  height: 300px;
+
+  // 暂无数据
+  img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+  }
 }
 
 .m-line {
-    min-width: 400px;
+  min-width: 400px;
 
-    .stat {
-        margin: 20px 0 10px;
-        display: flex;
-        .stat-item {
-            width: 33%;
-            text-align: center;
-
-            div {
-                font-size: 17px;
-                font-family: Source Han Serif SC;
-                font-weight: 500;
-                color: rgba(#fff, 0.5);
-                line-height: 24px;
-                &.z-weak {
-                    font-size: 12px;
-                    font-family: Source Han Serif SC;
-                    font-weight: 500;
-                    color: rgba(#fff, 0.5);
-                    line-height: 24px;
-                }
-            }
+  .stat {
+    margin: 20px 0 10px;
+    display: flex;
+    .stat-item {
+      width: 33%;
+      text-align: center;
+
+      div {
+        font-size: 17px;
+        font-family: Source Han Serif SC;
+        font-weight: 500;
+        color: rgba(#fff, 0.5);
+        line-height: 24px;
+        &.z-weak {
+          font-size: 12px;
+          font-family: Source Han Serif SC;
+          font-weight: 500;
+          color: rgba(#fff, 0.5);
+          line-height: 24px;
         }
+      }
     }
+  }
 }
 
 .m-tb {
-    padding-left: 62px;
-    padding-right: 40px;
+  padding-left: 62px;
+  padding-right: 40px;
 }
 
 .m-pagination {
-    box-sizing: border-box;
-    margin-top: 20px;
-    width: 100%;
-    height: 40px;
-    display: flex;
-    justify-content: flex-end;
+  box-sizing: border-box;
+  margin-top: 20px;
+  width: 100%;
+  height: 40px;
+  display: flex;
+  justify-content: flex-end;
+
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background: #0266d1;
+    color: #000d3f;
+  }
+
+  /deep/ .el-pagination .el-pager li {
+    background: #002e74;
+  }
+
+  /deep/ .el-pagination .btn-prev {
+    background: #002e74;
+  }
+
+  /deep/ .el-pagination .btn-next {
+    background: #002e74;
+  }
+}
 
-    /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
-        background: #0266d1;
-        color: #000d3f;
-    }
+.m-process {
+  width: 400px;
 
-    /deep/ .el-pagination .el-pager li {
-        background: #002e74;
-    }
+  .process-title {
+    margin-bottom: 25px;
+    margin-left: -5px;
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #ffffff;
+    line-height: 18px;
+  }
 
-    /deep/ .el-pagination .btn-prev {
-        background: #002e74;
+  .list {
+    position: relative;
+    box-sizing: border-box;
+    margin-top: 30px/2;
+    margin-left: 50px/2;
+    padding: 0 0 0 30px/2;
+    width: 680px/2;
+    border-left: 3px solid #0c81fe;
+    padding-right: 10px;
+
+    &::before {
+      content: '';
+      position: absolute;
+      z-index: 1;
+      display: block;
+      top: -2px/2;
+      left: -2px/2;
+      width: 5px/2;
+      height: 20px/2;
+      background-color: #ffffff;
     }
 
-    /deep/ .el-pagination .btn-next {
-        background: #002e74;
-    }
-}
+    .item {
+      position: relative;
+      z-index: 2;
+      margin-bottom: 8px;
+      padding-bottom: 8px;
+      font-size: 16px;
+      font-family: PingFang SC;
+      font-weight: 400;
+      color: #fefefe;
+      line-height: 24px;
+      padding-left: 20px;
+      padding-top: 1px;
+
+      &::before {
+        content: '';
+        display: block;
+        position: absolute;
+        top: -5px;
+        left: -11px;
+        width: 18px;
+        height: 18px;
+        background: #0c81fe;
+        border: 4px solid lighten(#0c81fe, 15);
+        border-radius: 100%;
+      }
+
+      &.z-on {
+        &::before {
+          background: #e08400;
+          border-color: lighten(#e08400, 15);
+        }
+      }
 
-.m-process {
-    width: 400px;
+      &:last-child {
+        margin-bottom: 0;
+        padding-bottom: 0;
+        border-bottom: none;
+      }
 
-    .process-title {
-        margin-bottom: 25px;
-        margin-left: -5px;
-        font-size: 16px;
-        font-family: PingFang SC;
-        font-weight: bold;
-        color: #ffffff;
-        line-height: 18px;
-    }
+      .item-row {
+        margin-top: -10px;
+        margin-bottom: 10px;
+        display: flex;
+      }
 
-    .list {
+      .name {
         position: relative;
-        box-sizing: border-box;
-        margin-top: 30px/2;
-        margin-left: 50px/2;
-        padding: 0 0 0 30px/2;
-        width: 680px/2;
-        border-left: 3px solid #0c81fe;
-        padding-right: 10px;
+        padding: 0 10px;
+        font-size: 12px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #fefefe;
+        line-height: 22px;
+        height: 22px;
+        border-radius: 10px 0 10px 0;
+        background-color: #0c81fe;
+        // background-color: #e08400;
+      }
+
+      .date {
+        margin-left: 10px;
+        font-size: 12px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #7ca1d2;
+        line-height: 25px;
+      }
 
-        &::before {
-            content: "";
-            position: absolute;
-            z-index: 1;
-            display: block;
-            top: -2px/2;
-            left: -2px/2;
-            width: 5px/2;
-            height: 20px/2;
-            background-color: #ffffff;
-        }
+      .detail {
+        @include cs;
+        font-size: 16px;
+        line-height: 20px;
+        margin-bottom: 5px;
+        display: flex;
 
-        .item {
-            position: relative;
-            z-index: 2;
-            margin-bottom: 8px;
-            padding-bottom: 8px;
-            font-size: 16px;
-            font-family: PingFang SC;
-            font-weight: 400;
-            color: #fefefe;
-            line-height: 24px;
-            padding-left: 20px;
-            padding-top: 1px;
-
-            &::before {
-                content: "";
-                display: block;
-                position: absolute;
-                top: -5px;
-                left: -11px;
-                width: 18px;
-                height: 18px;
-                background: #0c81fe;
-                border: 4px solid lighten(#0c81fe, 15);
-                border-radius: 100%;
-            }
-
-            &.z-on {
-                &::before {
-                    background: #e08400;
-                    border-color: lighten(#e08400, 15);
-                }
-            }
-
-            &:last-child {
-                margin-bottom: 0;
-                padding-bottom: 0;
-                border-bottom: none;
-            }
-
-            .item-row {
-                margin-top: -10px;
-                margin-bottom: 10px;
-                display: flex;
-            }
-
-            .name {
-                position: relative;
-                padding: 0 10px;
-                font-size: 12px;
-                font-family: PingFang SC;
-                font-weight: 500;
-                color: #fefefe;
-                line-height: 22px;
-                height: 22px;
-                border-radius: 10px 0 10px 0;
-                background-color: #0c81fe;
-                // background-color: #e08400;
-            }
-
-            .date {
-                margin-left: 10px;
-                font-size: 12px;
-                font-family: PingFang SC;
-                font-weight: 500;
-                color: #7ca1d2;
-                line-height: 25px;
-            }
-
-            .detail {
-                @include cs;
-                font-size: 16px;
-                line-height: 20px;
-                margin-bottom: 5px;
-                display: flex;
-
-                .detail-field {
-                    width: 22%;
-                    text-align: justify;
-                    text-align-last: justify;
-                }
-                .detail-value {
-                    width: 78%;
-                    .detail-link {
-                        display: inline;
-                    }
-                }
-            }
-
-            .attachement-list {
-                padding-left: 80px;
-                a {
-                    display: block;
-                    cursor: pointer;
-                    color: #4df0ff;
-                    font-size: 14px;
-
-                    i {
-                        color: #fff;
-                    }
-                }
-            }
+        .detail-field {
+          width: 22%;
+          text-align: justify;
+          text-align-last: justify;
         }
+        .detail-value {
+          width: 78%;
+          .detail-link {
+            display: inline;
+          }
+        }
+      }
+
+      .attachement-list {
+        padding-left: 80px;
+        a {
+          display: block;
+          cursor: pointer;
+          color: #4df0ff;
+          font-size: 14px;
+
+          i {
+            color: #fff;
+          }
+        }
+      }
     }
+  }
+}
+
+.m-top {
+  display: flex;
 }
diff --git a/src/views/modules/visual/communityGovern/cpt/project-info.vue b/src/views/modules/visual/communityGovern/cpt/project-info.vue
new file mode 100644
index 00000000..ac6d82f2
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/cpt/project-info.vue
@@ -0,0 +1,629 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>项目详情</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+        <div class="m-top">
+          <div class="m-info">
+            <div class="info-prop">
+              <span>项目标题：</span>
+              <span>{{ projectInfo.projectTitle }}</span>
+            </div>
+            <div class="info-prop">
+              <span>项目背景：</span>
+              <span>{{ projectInfo.backGround }}</span>
+            </div>
+            <div class="info-prop">
+              <span>项目方案：</span>
+              <span>{{ projectInfo.projectTitle }}</span>
+            </div>
+            <div class="info-prop">
+              <span>内部备注：</span>
+              <span>{{ projectInfo.internalRemark || "--" }}</span>
+            </div>
+            <div class="info-prop">
+              <span>当前处理部门：</span>
+              <span>{{ projectInfo.departmentNameList.join("、") }}</span>
+            </div>
+            <div class="info-prop"
+                 v-if="projectCate.length > 0">
+              <span>分类：</span>
+              <fold-text :row="3">
+                <div :key="item.name"
+                     v-for="item in projectCate">
+                  {{ item.name }}
+                </div>
+              </fold-text>
+            </div>
+            <div class="info-prop"
+                 v-if="projectTag.length > 0">
+              <span>标签：</span>
+              <fold-text :row="3">
+                <div :key="item.name"
+                     v-for="item in projectTag">
+                  {{ item.name }}
+                </div>
+              </fold-text>
+            </div>
+          </div>
+
+          <div class="m-process"
+               v-if="projectProcess.length > 0">
+            <div class="process-title">处理进展</div>
+            <div class="list">
+              <div class="item"
+                   :class="index === 0 ? 'z-on' : ''"
+                   :key="item.processId"
+                   v-for="(item, index) in projectProcess">
+                <div class="item-row">
+                  <div class="name">{{ item.processName }}</div>
+                  <div class="date">
+                    {{ item.processTime }}
+                  </div>
+                </div>
+
+                <div class="detail">
+                  <div class="detail-field">处理部门：</div>
+                  <div class="detail-value">{{ item.departmentName }}</div>
+                </div>
+
+                <div class="detail"
+                     v-if="item.processName != '转项目' && item.publicReply">
+                  <div class="detail-field">说 明：</div>
+                  <div class="detail-value">
+                    <fold-text :row="3">{{ item.publicReply }}</fold-text>
+                  </div>
+                </div>
+
+                <div class="detail"
+                     v-if="item.processName != '转项目' && item.internalRemark">
+                  <div class="detail-field">内部备注：</div>
+                  <div class="detail-value">
+                    <fold-text :row="3">{{
+                          item.internalRemark
+                        }}</fold-text>
+                  </div>
+                </div>
+                <div class="detail">
+                  <div class="attachement-list">
+                    <a :href="att.url"
+                       target="_blank"
+                       :key="att.url"
+                       v-for="att in item.internalFile">
+                      <i class="el-icon-folder-opened"></i>
+                      {{ att.name }}
+                    </a>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-if="projectInfo.origin!=='agency'"
+             class="tabs">
+          <div class="tab-btn"
+               @click="subStartGroupIndex"
+               v-if="groupList.length > 9">
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+               class="tab"
+               :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+               :key="'tab' + index"
+               @click="groupIndex = index"
+               v-for="(item, index) in groupList">
+            {{ item.label }}
+          </div>
+          <div class="tab-btn"
+               @click="addStartGroupIndex"
+               v-if="groupList.length > 9">
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
+        </div>
+
+        <div class="m-case"
+             v-if="projectInfo.origin!=='agency'">
+          <div class="m-yanpan"
+               v-if="groupIndex == 0">
+            <div v-if="projectId">
+              <analyse v-if="!yanPan.loading"
+                       singleTitle="楼院小组"
+                       :userList="yanPan.homeUserList"
+                       :userName="yanPan.icUserName"
+                       :singleList="yanPan.categoryList"
+                       @user="toUserInfo"
+                       @project="toProjectInfo" />
+              <screen-loading v-else>加载中</screen-loading>
+            </div>
+            <div v-else
+                 class="m-hint">
+              <img src="@/assets/img/modules/visual/noData.png"
+                   class="no-data-img" />
+            </div>
+          </div>
+
+          <div v-if="groupIndex == 1">
+            <div class="m-row"
+                 v-if="projectInfo.originId">
+              <div v-if="projectInfo.origin==='issue'"
+                   class="m-info">
+                <div class="info-prop">
+                  <span>议题标题：</span>
+                  <span>{{ issueInfo.issueTitle }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>议题建议：</span>
+                  <span>{{ issueInfo.issueSuggestion }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>所属网格：</span>
+                  <span>{{ issueInfo.belongsGridName || "--" }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>议题发起人：</span>
+                  <span>{{ issueInfo.issueInitiator }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>议题来源：</span>
+                  <span>{{ issueInfo.topicInfo.groupName }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>转议题时间：</span>
+                  <span>{{ issueInfo.shiftIssueTime }}</span>
+                </div>
+              </div>
+              <div v-if="projectInfo.origin==='resi_event'"
+                   class="m-info">
+                <div class="info-title">事件内容</div>
+                <div class="info-content">{{ info.eventContent }}</div>
+                <div class="info-pics">
+                  <img :src="src"
+                       :key="src"
+                       v-for="src in info.eventImgs"
+                       @click="watchImg(src)" />
+                </div>
+                <div class="info-prop">
+                  <span>提交时间：</span>
+                  <span>{{ info.eventTime }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>报事人：</span>
+                  <span>{{ info.eventPeopleName }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>所属网格：</span>
+                  <span>{{ info.gridName }}</span>
+                </div>
+                <div class="info-prop">
+                  <span>提报给：</span>
+                  <span>{{ info.eventPerson.join("、") || "--" }}</span>
+                </div>
+              </div>
+
+              <div v-if="projectInfo.origin==='issue'"
+                   class="m-line">
+                <div class="stat">
+                  <div class="stat-item">
+                    <div>
+                      {{ issueTrend.realityVoteCount }}/{{
+                        issueTrend.shouldVoteCount
+                      }}
+                    </div>
+                    <div class="z-weak">已表决/应表决</div>
+                  </div>
+                  <div class="stat-item">
+                    <div>{{ issueTrend.supportAmount }}</div>
+                    <div class="z-weak">支持</div>
+                  </div>
+                  <div class="stat-item">
+                    <div>{{ issueTrend.oppositionAmount }}</div>
+                    <div class="z-weak">反对</div>
+                  </div>
+                </div>
+
+                <line-chart v-if="issueChartData.length > 0"
+                            :list="issueChartData" />
+              </div>
+            </div>
+            <div v-else
+                 class="m-hint">
+              <img src="@/assets/img/modules/visual/noData.png"
+                   class="no-data-img" />
+            </div>
+          </div>
+
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import screenLoading from "@/views/modules/visual/cpts/loading";
+import { requestPost } from "@/js/dai/request";
+import cptTb from "@/views/modules/visual/cpts/tb";
+import lineChart from "@/views/modules/visual/cpts/line-chart";
+import analyse from "@/views/modules/visual/cpts/analyse";
+import foldText from "@/views/components/foldText";
+import dateFormat from "dai-js/tools/dateFormat";
+
+function iniData () {
+  return {
+
+    groupList: [
+      { label: "研判分析" },
+      { label: "项目来源" },
+    ],
+    groupIndex: 0,
+    startGroupIndex: 0,
+
+
+    projectProcess: [],
+
+    projectInfo: {
+      backGround: "",
+      departmentList: [
+        //   { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] },
+      ],
+      departmentNameList: [],
+      internalRemark: "",
+      isSend: false,
+      locateAddress: "",
+      locateDimension: "",
+      locateLongitude: "",
+      origin: "",
+      originId: "",
+      platformIds: [],
+      processable: false,
+      projectId: "",
+      projectStatus: "pending",
+      projectTitle: "",
+      publicReply: "",
+      returnable: false,
+    },
+
+    issueInfo: {
+      attitude: "",
+      belongsGridName: "",
+      issueIdea: "",
+      issueInitiator: "",
+      issueStatus: "",
+      issueSuggestion: "",
+      issueTitle: "",
+      joinVote: true,
+      projectId: "",
+      projectStatus: false,
+      publishIdeaFlag: false,
+    },
+
+    issueTrend: {},
+    issueChartData: [],
+
+    eventInfo: {
+      eventTime: "",
+      eventContent: "",
+      eventAddress: "",
+      gridName: "",
+      isClosed: true,
+      isResolve: true,
+      isRollback: true,
+      eventImgs: [],
+      eventPerson: [],
+      eventOrg: [],
+      eventPeopleName: "",
+      projectInfo: {
+        projectId: "",
+        operationName: "",
+        operationTime: "",
+        projectDeclare: "",
+      },
+    },
+
+    projectCate: [],
+    projectTag: [],
+
+    yanPan: {
+      loading: false,
+
+      icResiUserId: "",
+      houseId: "",
+      icUserName: "",
+
+      homeUserList: [
+        // {
+        //   homeId: '',
+        //   icUserId: '',
+        //   icUserName: '',
+        // }
+      ],
+      categoryList: [],
+      projectData: [
+        // {
+        //   firstCategoryCode: '',
+        //   firstCategoryName: '',
+        //   projectList: [],
+        // }
+      ],
+    },
+  };
+}
+
+export default {
+  name: "demandInfo",
+  props: {
+    projectId: {
+      type: String,
+      default: "",
+    },
+    userId: {
+      type: String,
+      default: "",
+    },
+    categoryCodes: {
+      type: Array,
+      default: [],
+    },
+
+  },
+
+  components: {
+    cptCard,
+    cptTb,
+    analyse,
+    screenLoading,
+    lineChart,
+    foldText,
+  },
+
+  data: iniData,
+
+  computed: {},
+
+  watch: {
+    projectId () {
+      let data = iniData();
+      Object.keys(data).forEach((k) => {
+        this[k] = data[k];
+      });
+      this.getApiData();
+    },
+  },
+
+  mounted () {
+    this.getApiData();
+  },
+
+  methods: {
+    watchImg (src) {
+      window.open(src);
+    },
+
+    addStartGroupIndex () {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex < groupList.length - 9) {
+        this.startGroupIndex = startGroupIndex + 1;
+      } else {
+        this.startGroupIndex = groupList.length - 9;
+      }
+    },
+    subStartGroupIndex () {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex > 0) {
+        this.startGroupIndex = startGroupIndex - 1;
+      } else {
+        this.startGroupIndex = 0;
+      }
+    },
+    handleClose () {
+      this.$emit("close");
+    },
+
+    async getApiData () {
+
+      await this.getProjectInfo()
+      this.getProjectCate();
+      this.getProjectProcess();
+      if (this.projectInfo.origin === 'issue') {
+        this.getIssueInfo();
+        this.getIssueTrend();
+      } else if (this.projectInfo.origin === 'resi_event') {
+        this.getEventInfo()
+      }
+      if (this.projectInfo.origin !== 'agency') {
+        await this.getYanPan();
+
+      }
+    },
+
+    //加载组织数据
+    async getProjectInfo () {
+
+      const url = "/gov/project/trace/projectdetail";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: this.projectId,
+      });
+
+      if (code === 0) {
+        this.projectInfo = data;
+
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getIssueInfo () {
+
+      const url = "/resi/hall/issue/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.projectInfo.originId,
+      });
+
+      if (code === 0) {
+        this.issueInfo = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getIssueTrend () {
+
+      const url = "/resi/hall/issue/votingtrend";
+
+      const { data, code, msg } = await requestPost(url, {
+        issueId: this.projectInfo.originId,
+      });
+
+      if (code === 0) {
+        this.issueTrend = data;
+        let chartData = [];
+        data.polyLine.forEach((item) => {
+          let date = dateFormat(new Date(item.voteDate * 1000), "yyyy-MM-dd");
+          console.log("date:" + date);
+          chartData.push(
+            {
+              date,
+              value: item.supportIncrement,
+              type: "支持",
+            },
+            {
+              date,
+              value: item.oppositionIncrement,
+              type: "反对",
+            }
+          );
+        });
+        this.issueChartData = chartData;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getEventInfo () {
+      const url = "/gov/project/resievent/eventdetail-icdata";
+
+      const { data, code, msg } = await requestPost(url, {
+        resiEventId: this.projectInfo.originId,
+      });
+
+      if (code === 0) {
+        this.info = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getProjectProcess () {
+
+      const url = "/gov/project/trace/processlist-v2";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: this.projectId,
+      });
+
+      if (code === 0) {
+        this.projectProcess = data.map((item) => {
+          item.processTime = dateFormat(
+            new Date(item.processTime * 1000),
+            "yyyy-MM-dd hh:mm"
+          );
+          return item;
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getProjectCate () {
+
+      const url = "/gov/project/projectcategory/categorytaglist";
+
+      const { data, code, msg } = await requestPost(url, {
+        projectId: this.projectId,
+      });
+
+      if (code === 0) {
+        this.projectCate = data.categoryList;
+        this.projectTag = data.tagList;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getYanPan () {
+      const url = "/data/aggregator/project/projectanalysis";
+
+      const { data, code, msg } = await requestPost(url, {
+        categoryCodeList: this.categoryCodes,
+        userId: this.userId,
+
+      });
+
+      if (code === 0) {
+        let array = []
+        if (this.projectInfo.origin === 'issue') {
+          array = [...data.groupProjectList]
+        } else if (this.projectInfo.origin === 'resi_event') {
+          array = [...data.eventProjectList]
+        }
+
+
+        data.categoryList = array.map((item) => {
+          return {
+            categoryCode: item.firstCategoryCode,
+            categoryName: item.firstCategoryName,
+            showItem: true,
+            projectList: item.projectList.map((subItem) => {
+              return {
+                title: subItem.projectTitle,
+                status: subItem.projectStatus,
+                statusName:
+                  subItem.projectStatus == "pending" ? "待处理" : "结案",
+                projectId: subItem.projectId,
+                projectId: subItem.projectId,
+              };
+            }),
+          };
+        });
+        this.yanPan = { ...this.yanPan, ...data };
+        this.yanPan.loading = false;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    toUserInfo (item) {
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
+      });
+    },
+
+    toProjectInfo (item) {
+      console.log(item);
+      this.projectId = item.projectId;
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/incident-info.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 097df0a0..5f5e4c79 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -503,11 +503,12 @@ export default {
       let dataArray = new Array(num)
       //遍历每个分类
       this.lineList[0].categoryList.forEach((categoryItem, index) => {
-        this.legend.push(categoryItem.name)
+        this.legend.push(categoryItem.categoryName)
         dataArray[index] = []
 
       });
 
+
       //遍历每个时间
       this.lineList.forEach(item => {
         this.xaxis.push(item.time)
@@ -523,8 +524,9 @@ export default {
       this.lineList[0].categoryList.forEach((categoryItem, index) => {
 
         let object = {
-          name: categoryItem.name,
+          name: categoryItem.categoryName,
           type: 'line',
+          smooth: true,
           barWidth: 15,
           areaStyle: {},
           itemStyle: {
diff --git a/src/views/modules/visual/communityGovern/distributionLineOption.js b/src/views/modules/visual/communityGovern/distributionLineOption.js
index ac897026..05df510d 100644
--- a/src/views/modules/visual/communityGovern/distributionLineOption.js
+++ b/src/views/modules/visual/communityGovern/distributionLineOption.js
@@ -2,6 +2,21 @@ import * as echarts from 'echarts'
 export function lineOption () {
 
   return {
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'cross',
+        label: {
+          backgroundColor: '#6a7985'
+        }
+      }
+    },
+    grid: {
+      left: 70,
+      top: 40,
+      right: 50,
+      bottom: 150
+    },
     legend: {
       textStyle: {
         color: '#D2E7FF',
@@ -10,7 +25,7 @@ export function lineOption () {
       },
       itemWidth: 20,
       itemHeight: 10,
-      // top: 350,
+      //  top: 650,
       bottom: 0,
       data: []
     },
@@ -62,6 +77,7 @@ export function lineOption () {
       }
     },
     series: [
+      
       // {
       //   name: '项目数',
       //   type: 'line',
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index ec2ca8c8..c20b4ece 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -528,7 +528,6 @@ export default {
       }
       this.$refs.pieChart.handleClick(fun)
 
-
     },
 
     clickPie (seriesIndex) {
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 84e9e9c0..73918a26 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -192,8 +192,8 @@ export default {
         pageNo: 1,
         total: 0,
       },
-      showIssue: true,
-      issueId: 'cf48b7dc70ef4c319fd9c71890d9dbbb',
+      showIssue: false,
+      issueId: '',
 
       casOptions: [],
       agencyIdArray: [],
@@ -243,7 +243,6 @@ export default {
         this.orgId = this.agencyInfo.agencyId
         this.orgType = this.agencyInfo.level === 'grid' ? 'grid' : 'agency'
 
-
         if (!this.agencyInfo.latitude) {
           this.agencyInfo.latitude = 36.072227
         }
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index d6a9d629..a78d2c24 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -43,7 +43,8 @@
             <cpt-tb :col-list="demand.colList"
                     :loading="demand.loading"
                     :header="demand.header"
-                    :list="demand.list"></cpt-tb>
+                    :list="demand.list"
+                    @operate="toProjectInfo"></cpt-tb>
 
           </div>
 
@@ -61,6 +62,11 @@
 
       </div>
     </div>
+    <project-info v-if="showProject"
+                  :projectId="projectId"
+                  :userId="userId"
+                  :categoryCodes="categoryCodes"
+                  @close="showProject = false" />
   </cpt-card>
 </template>
 
@@ -70,6 +76,7 @@ import { requestPost } from "@/js/dai/request";
 import cptCard from "@/views/modules/visual/cpts/card";
 import cptTb from "@/views/modules/visual/cpts/tb";
 import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
+import projectInfo from "./cpt/project-info";
 
 import { pieOption } from './typePieOption.js'
 import nextTick from 'dai-js/tools/nextTick'
@@ -150,8 +157,13 @@ export default {
         pageSize: 10,
         pageNo: 1,
         total: 0,
-
       },
+      tableList: [],
+      showProject: false,
+      userId: '',//话题事件创始人
+      categoryCodes: [],//一级分类Id	
+      projectId: '',
+
 
       casOptions: [],
       agencyIdArray: [],
@@ -175,7 +187,7 @@ export default {
   },
 
   async mounted () {
-    this.userId = this.uid;
+
     this.initData()
     await this.getAgencylist()//获取组织级别
     await nextTick(500)
@@ -382,6 +394,7 @@ export default {
 
       if (code === 0) {
         this.demand.total = data.total;
+        this.tableList = data.list
         this.demand.list = data.list.map((item) => {
           //楼院小组:issue； 项目立项:agency 事件上报:resi_event【也可控制点击查看时里边三个按钮的显示】	
           item.originShow = item.origin === 'issue' ? '楼院小组' : item.origin === 'agency' ? '项目立项' : '事件上报'
@@ -408,8 +421,14 @@ export default {
       this.demand.pageNo = val;
       this.getTable();
     },
-    toUserInfo (uid) {
-      this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
+    async toProjectInfo (index) {
+      const { tableList } = this;
+      this.projectId = tableList[index].projectId
+      this.userId = tableList[index].userId
+      this.categoryCodes = tableList[index].categoryCodes
+
+      this.showProject = true
+
     },
   },
   props: {
@@ -426,6 +445,7 @@ export default {
     cptCard,
     cptTb,
     screenEchartsFrame,
+    projectInfo,
   },
 
   watch: {
@@ -433,13 +453,7 @@ export default {
       let dataArray = this.dateIdShow.split('-')
       this.dateId = dataArray.join('')
     },
-    uid (id) {
-      this.userId = id;
-    },
-    userId () {
-      this.getPie()
-      window.scrollTo(0, 0);
-    },
+
   },
 };
 </script>

From af129d5b826eebf016c99534e19d4cb3a935bc18 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 14 Dec 2021 17:09:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=A0=94=E5=88=A4=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityGovern/cpt/project-info.vue      |   7 +-
 src/views/modules/visual/cpts/analyse.vue     | 167 +++++++++++-------
 2 files changed, 106 insertions(+), 68 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/cpt/project-info.vue b/src/views/modules/visual/communityGovern/cpt/project-info.vue
index ac6d82f2..952c3df4 100644
--- a/src/views/modules/visual/communityGovern/cpt/project-info.vue
+++ b/src/views/modules/visual/communityGovern/cpt/project-info.vue
@@ -586,8 +586,8 @@ export default {
 
         data.categoryList = array.map((item) => {
           return {
-            categoryCode: item.firstCategoryCode,
-            categoryName: item.firstCategoryName,
+            categoryCode: item.categoryCode,
+            categoryName: item.categoryName,
             showItem: true,
             projectList: item.projectList.map((subItem) => {
               return {
@@ -596,12 +596,13 @@ export default {
                 statusName:
                   subItem.projectStatus == "pending" ? "待处理" : "结案",
                 projectId: subItem.projectId,
-                projectId: subItem.projectId,
               };
             }),
           };
         });
+
         this.yanPan = { ...this.yanPan, ...data };
+
         this.yanPan.loading = false;
       } else {
         this.$message.error(msg);
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index 462db2f8..acc1bbab 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -5,7 +5,10 @@
       <div class="analys-col">
         <div class="analys-family">
           <div class="family-title">(家属)</div>
-          <div v-for="(item, index) in userList" :key="index" class="family-item" @click="handleUser(item)">{{item.icUserName}}</div>
+          <div v-for="(item, index) in userList"
+               :key="index"
+               class="family-item"
+               @click="handleUser(item)">{{item.icUserName}}</div>
           <!-- <div class="family-item">王亚男哈</div>
           <div class="family-item">王亚男</div>
           <div class="family-item">王亚男哈</div>
@@ -14,7 +17,8 @@
       </div>
 
       <div class="analys-col">
-        <img class="analys-arrow" src="../../../../assets/img/shuju/measure/zuo@2x.png" />
+        <img class="analys-arrow"
+             src="../../../../assets/img/shuju/measure/zuo@2x.png" />
       </div>
 
       <div class="analys-col">
@@ -24,18 +28,20 @@
         </div>
       </div>
 
-      
       <template v-if="hasEvent">
         <div class="analys-col analys-col-posi">
-          <img class="analys-up" src="../../../../assets/img/shuju/measure/up-right.png" />
-          <img class="analys-up analys-down" src="../../../../assets/img/shuju/measure/down-right.png" />
+          <img class="analys-up"
+               src="../../../../assets/img/shuju/measure/up-right.png" />
+          <img class="analys-up analys-down"
+               src="../../../../assets/img/shuju/measure/down-right.png" />
         </div>
         <div class="analys-col">
           <div class="cate-list cate-list-more">
             <div class="cate-row">
 
               <div class="analys-col">
-                <div class="analys-cate" @click="handleTabs('group')">
+                <div class="analys-cate"
+                     @click="handleTabs('group')">
                   <div class="label">{{ singleTitle }}</div>
                   <div class="tips">(反应渠道)</div>
                   <div class="icon">
@@ -44,8 +50,10 @@
                 </div>
               </div>
 
-              <div v-if="sourceTab === 'group'" class="analys-col">
-                <img class="analys-arrow" src="../../../../assets/img/shuju/measure/you@2x.png" />
+              <div v-if="sourceTab === 'group'"
+                   class="analys-col">
+                <img class="analys-arrow"
+                     src="../../../../assets/img/shuju/measure/you@2x.png" />
               </div>
 
             </div>
@@ -53,7 +61,8 @@
             <div class="cate-row">
 
               <div class="analys-col">
-                <div class="analys-cate" @click="handleTabs('event')">
+                <div class="analys-cate"
+                     @click="handleTabs('event')">
                   <div class="label">{{ moreTitle }}</div>
                   <div class="tips">(反应渠道)</div>
                   <div class="icon">
@@ -62,45 +71,57 @@
                 </div>
               </div>
 
-              <div v-if="sourceTab === 'event'" class="analys-col">
-                <img class="analys-arrow" src="../../../../assets/img/shuju/measure/you@2x.png" />
+              <div v-if="sourceTab === 'event'"
+                   class="analys-col">
+                <img class="analys-arrow"
+                     src="../../../../assets/img/shuju/measure/you@2x.png" />
               </div>
 
             </div>
           </div>
         </div>
 
-
-        <div class="analys-col analys-col-wr analys-col-more list-wr" id="scroll-wr">
+        <div class="analys-col analys-col-wr analys-col-more list-wr"
+             id="scroll-wr">
           <div class="cate-list cate-list-child">
-            <div v-for="(item, index) in tempList" :key="index" class="cate-row">
+            <div v-for="(item, index) in tempList"
+                 :key="index"
+                 class="cate-row">
 
               <div class="cate-col">
                 <div class="analys-cate">
                   <div class="label">{{item.categoryName}}</div>
                   <div class="tips">(同类案件)</div>
-                  <div class="icon" @click="handleShow(item)">
+                  <div class="icon"
+                       @click="handleShow(item)">
                     <img src="../../../../assets/img/shuju/measure/gantanhao.png" />
                   </div>
                 </div>
               </div>
 
-               <div class="cate-col cate-col-arrow">
-                <img v-show="item.showItem" class="analys-arrow" src="../../../../assets/img/shuju/measure/you@2x.png" />
+              <div class="cate-col cate-col-arrow">
+                <img v-show="item.showItem"
+                     class="analys-arrow"
+                     src="../../../../assets/img/shuju/measure/you@2x.png" />
               </div>
 
               <div class="cate-col cate-col-w100">
-                <div class="cate-list-w0" :class="item.showItem && 'cate-list-w100'">
+                <div class="cate-list-w0"
+                     :class="item.showItem && 'cate-list-w100'">
                   <div class="list list-wr">
-                    <div v-for="(n, i) in item.projectList" :key="i" class="item" @click="handleProject(n)">
-                      <div class="item-status" :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
+                    <div v-for="(n, i) in item.projectList"
+                         :key="i"
+                         class="item"
+                         @click="handleProject(n)">
+                      <div class="item-status"
+                           :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
                       <div class="item-content">{{n.title}}</div>
                     </div>
                     <!-- <div class="item">
                       <div class="item-status">已结案</div>
                       <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
                     </div> -->
-                    
+
                   </div>
                 </div>
               </div>
@@ -112,11 +133,10 @@
       </template>
       <template v-else>
         <div class="analys-col">
-          <img class="analys-arrow" src="../../../../assets/img/shuju/measure/you@2x.png" />
+          <img class="analys-arrow"
+               src="../../../../assets/img/shuju/measure/you@2x.png" />
         </div>
 
-        
-
         <div class="analys-col">
           <div class="analys-cate">
             <div class="label">{{ singleTitle }}</div>
@@ -128,35 +148,51 @@
         </div>
 
         <div class="analys-col">
-          <img v-if="tempList.length > 1" class="analys-up" src="../../../../assets/img/shuju/measure/up-right.png" />
-          <img v-if="tempList.length != 2" class="analys-arrow" src="../../../../assets/img/shuju/measure/you@2x.png" />
-          <img v-if="tempList.length > 1" 
-          class="analys-up analys-down" src="../../../../assets/img/shuju/measure/down-right.png" />
+          <img v-if="tempList.length > 1"
+               class="analys-up"
+               src="../../../../assets/img/shuju/measure/up-right.png" />
+          <img v-if="tempList.length != 2"
+               class="analys-arrow"
+               src="../../../../assets/img/shuju/measure/you@2x.png" />
+          <img v-if="tempList.length > 1"
+               class="analys-up analys-down"
+               src="../../../../assets/img/shuju/measure/down-right.png" />
         </div>
 
-        <div class="analys-col list-wr" :class="tempList.length > 2 && 'analys-col-wr' || 'analys-single'"
-          :style="'padding-top:' + (tempList.length - 3) * 190 + 'px;'">
+        <div class="analys-col list-wr"
+             :class="tempList.length > 2 && 'analys-col-wr' || 'analys-single'"
+             :style="'padding-top:' + (tempList.length - 3) * 190 + 'px;'">
           <div class="cate-list">
-            <div v-for="(item, index) in tempList" :key="index" class="cate-row">
+            <div v-for="(item, index) in tempList"
+                 :key="index"
+                 class="cate-row">
 
               <div class="cate-col">
                 <div class="analys-cate">
                   <div class="label">{{item.categoryName}}</div>
                   <div class="tips">(同类案件)</div>
-                  <div class="icon" @click="handleShow(item)">
+                  <div class="icon"
+                       @click="handleShow(item)">
                     <img src="../../../../assets/img/shuju/measure/gantanhao.png" />
                   </div>
                 </div>
               </div>
               <div class="cate-col cate-col-arrow">
-                <img v-show="item.showItem" class="analys-arrow" src="../../../../assets/img/shuju/measure/you@2x.png" />
+                <img v-show="item.showItem"
+                     class="analys-arrow"
+                     src="../../../../assets/img/shuju/measure/you@2x.png" />
               </div>
 
               <div class="cate-col cate-col-w100">
-                <div class="cate-list-w0" :class="item.showItem && 'cate-list-w100'">
+                <div class="cate-list-w0"
+                     :class="item.showItem && 'cate-list-w100'">
                   <div class="list list-wr">
-                    <div v-for="(n, i) in item.projectList" :key="i" class="item" @click="handleProject(n)">
-                      <div class="item-status" :class="'item-status-'+n.status">
+                    <div v-for="(n, i) in item.projectList"
+                         :key="i"
+                         class="item"
+                         @click="handleProject(n)">
+                      <div class="item-status"
+                           :class="'item-status-'+n.status">
                         {{ n.statusName || filterStatus(n.status)}}
                       </div>
                       <div class="item-content">{{n.title}}</div>
@@ -165,10 +201,10 @@
                       <div class="item-status">已结案</div>
                       <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
                     </div> -->
-                    
+
                   </div>
                 </div>
-                
+
               </div>
 
             </div>
@@ -213,7 +249,7 @@ export default {
     userList: Array, // 默认，必传
     userName: String, // 默认，必传
     singleList: Array, // 默认，必传
-    
+
   },
   data () {
     return {
@@ -221,31 +257,32 @@ export default {
       tempList: []
     }
   },
-  created() {
+  created () {
     this.tempList = [...this.singleList]
+
   },
   methods: {
-    filterStatus(status) {
-      const statusObj =  {
+    filterStatus (status) {
+      const statusObj = {
         pending: '待处理',
         closed: '已结案'
       }
       return statusObj[status]
     },
-    handleTabs(type) {
-      if (type === 'group') this.tempList = [ ...this.singleList ]
-      else if (type === 'event') this.tempList = [ ...this.moreList ]
+    handleTabs (type) {
+      if (type === 'group') this.tempList = [...this.singleList]
+      else if (type === 'event') this.tempList = [...this.moreList]
       this.sourceTab = type
       const _dom = document.getElementById('scroll-wr')
       _dom.scrollTop = 0
     },
-    handleProject(item) {
+    handleProject (item) {
       this.$emit('project', item)
     },
-    handleUser(item) {
+    handleUser (item) {
       this.$emit('user', item)
     },
-    handleShow(item) {
+    handleShow (item) {
       item.showItem = !item.showItem
     }
   }
@@ -279,7 +316,7 @@ export default {
           color: #fff;
           text-align: center;
           background: rgba(255, 255, 255, 0);
-          border: 1px solid #1257C9;
+          border: 1px solid #1257c9;
           border-radius: 2px;
           box-shadow: 0 0 5px 2px rgba(18, 87, 201, 1) inset;
         }
@@ -310,7 +347,8 @@ export default {
         padding-top: 60px;
         color: #fff;
         text-align: center;
-        background: url('../../../../assets/img/shuju/measure/zhuhu@2x.png') no-repeat center;
+        background: url("../../../../assets/img/shuju/measure/zhuhu@2x.png")
+          no-repeat center;
         background-size: cover;
         .personal-name {
           font-size: 18px;
@@ -336,7 +374,7 @@ export default {
         color: #fff;
         cursor: pointer;
         background: rgba(255, 255, 255, 0);
-        border: 1px solid #1257C9;
+        border: 1px solid #1257c9;
         border-radius: 4px;
         box-shadow: 1px 1px 10px 5px rgba(18, 87, 201, 1) inset;
         .label {
@@ -388,7 +426,7 @@ export default {
             width: 230px;
             .cate-list-w0 {
               width: 0;
-              transition: width .2s;
+              transition: width 0.2s;
               overflow: hidden;
               // border: 0;
               // padding: 0;
@@ -399,7 +437,7 @@ export default {
               // // background: rgba(255, 255, 255, 0);
               // border: 1px solid #1257C9;
               // overflow: auto;
-              transition: width .2s;
+              transition: width 0.2s;
             }
           }
         }
@@ -424,7 +462,7 @@ export default {
         box-sizing: border-box;
         padding: 4px 14px 10px;
         background: rgba(255, 255, 255, 0);
-        border: 1px solid #1257C9;
+        border: 1px solid #1257c9;
         overflow: auto;
         border-radius: 4px;
         box-shadow: 1px 1px 10px 5px rgba(18, 87, 201, 1) inset;
@@ -445,15 +483,16 @@ export default {
             font-size: 10px;
             text-align: center;
             // line-height: 15px;
-            background: #0C5CFE;
+            background: #0c5cfe;
             border-radius: 2px;
-            &-pending, &-canceled {
+            &-pending,
+            &-canceled {
               background: rgba(224, 84, 0, 1);
             }
-            &-assigned, &-have_order {
+            &-assigned,
+            &-have_order {
               background: rgba(9, 163, 125, 1);
             }
-
           }
           .item-content {
             font-size: 14px;
@@ -463,8 +502,6 @@ export default {
           }
         }
       }
-      
-
     }
     .analys-col-wr {
       height: 100%;
@@ -502,7 +539,6 @@ export default {
         // left: -30px;
       }
     }
-
   }
 }
 .pad10 {
@@ -516,20 +552,21 @@ export default {
 .list-wr::-webkit-scrollbar-corner,
   /* 滚动条角落 */
 .list-wr::-webkit-scrollbar-thumb,
-.list-wr::-webkit-scrollbar-track {      /*滚动条的轨道*/
+.list-wr::-webkit-scrollbar-track {
+  /*滚动条的轨道*/
   border-radius: 4px;
 }
 
 .list-wr::-webkit-scrollbar-corner,
 .list-wr::-webkit-scrollbar-track {
   /* 滚动条轨道 */
-  
-  background: rgba(12, 129, 254, .24);
+
+  background: rgba(12, 129, 254, 0.24);
   // box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
 }
 
 .list-wr::-webkit-scrollbar-thumb {
   /* 滚动条手柄 */
-  background: linear-gradient(270deg, #0063FE, #0095FF);
+  background: linear-gradient(270deg, #0063fe, #0095ff);
 }
 </style>