From 36f4283374b3d2adbf2c9590cf4db341c2167a97 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 8 Sep 2022 13:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=AB=E9=83=BD=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Announce/AppAnnounce/components/Add.vue   |  10 +-
 project/dv/apps/AppPdDv.vue                   |   2 +-
 project/dv/apps/AppXyDv.vue                   |   6 +-
 project/dv/apps/components/XyGrid.vue         | 483 ++++++++++++++++++
 4 files changed, 489 insertions(+), 12 deletions(-)
 create mode 100644 project/dv/apps/components/XyGrid.vue

diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
index 0fbf0e5c..5d5d7572 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
@@ -455,14 +455,8 @@ export default {
     },
 
     getWxGroups() {
-      this.instance.post(`/app/appmasssendingtask/queryWxGroups?sendScope=${this.form.sendScope}`, null, {
-        data: {
-          filterCriteria: this.form.filterCriteria.join(',')
-        },
-        headers: {'Content-Type': 'application/json;charset=utf-8'},
-        transformRequest: [function (data) {
-          return data.filterCriteria
-        }]
+      this.instance.post(`/app/appmasssendingtask/queryWxGroups?sendScope=${this.form.sendScope}`, {
+        filterCriteria: this.form.filterCriteria.join(',')
       }).then(res => {
         if (res.code === 0) {
           this.form.wxGroups = res.data
diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue
index 3be64b75..3d58519f 100644
--- a/project/dv/apps/AppPdDv.vue
+++ b/project/dv/apps/AppPdDv.vue
@@ -322,7 +322,7 @@
             this.initLineChart('.chart2', {
               x: res.data['群成员数'].map(v => v.month),
               value: res.data['群成员数'].map(v => v.totalNumber),
-              name: '居民群'
+              name: '居民数'
             })
           }
         })
diff --git a/project/dv/apps/AppXyDv.vue b/project/dv/apps/AppXyDv.vue
index da542096..8890300f 100644
--- a/project/dv/apps/AppXyDv.vue
+++ b/project/dv/apps/AppXyDv.vue
@@ -111,7 +111,7 @@
     </div>
     <div class="middle">
       <div class="top">
-        <PdGrid :instance="instance" @nodeClick="onNodeClick"></PdGrid>
+        <XyGrid :instance="instance" @nodeClick="onNodeClick"></XyGrid>
       </div>
       <div class="bottom">
         <div class="bottom-title">
@@ -193,7 +193,7 @@
 
 <script>
   import DonutChart from './components/DonutChart'
-  import PdGrid from './components/PdGrid'
+  import XyGrid from './components/XyGrid'
   import * as echarts from 'echarts'
 
   export default {
@@ -207,7 +207,7 @@
 
     components: {
       DonutChart,
-      PdGrid
+      XyGrid
     },
 
     data () {
diff --git a/project/dv/apps/components/XyGrid.vue b/project/dv/apps/components/XyGrid.vue
new file mode 100644
index 00000000..cdc66d05
--- /dev/null
+++ b/project/dv/apps/components/XyGrid.vue
@@ -0,0 +1,483 @@
+<template>
+  <div class="pdgrid">
+    <div class="pdgrid-title">
+      <h2>{{ currGird }}</h2>
+    </div>
+    <!-- <div class="pdgrid-grid__title" @click="isShowGrid2 = true">
+      <h2 :title="girdName2">{{ girdName2 }}</h2>
+    </div> -->
+    <div class="pdgrid-body">
+      <div class="pdgrid-body__item" @click="isShowGrid3 = true">
+        <h2>{{ girdNum3 }}</h2>
+        <div class="bottom">
+          <i></i>
+          <p>{{ girdName3 }}</p>
+          <i class="right"></i>
+        </div>
+      </div>
+      <div class="pdgrid-body__item" @click.stop="isShowGrid4 = true">
+        <h2>{{ girdNum4 }}</h2>
+        <div class="bottom">
+          <i></i>
+          <p>{{ girdName4 }}</p>
+          <i class="right"></i>
+        </div>
+      </div>
+      <div class="pdgrid-body__item" @click="isShowGrid5 = true">
+        <h2>{{ girdNum5 }}</h2>
+        <div class="bottom">
+          <i></i>
+          <p>{{ girdName5 }}</p>
+          <i class="right"></i>
+        </div>
+      </div>
+    </div>
+    <transition name="fade">
+      <div class="grid-dialog" v-show="isShowGrid2">
+        <div class="mask" @click="isShowGrid2 = false"></div>
+        <div class="grid-container">
+          <h2 :title="girdName2">{{ girdName2 }}</h2>
+          <div class="grid-list">
+            <div
+              :class="[currIndex2 === index ? 'grid-active' : '']"
+              v-for="(item, index) in girdInfoList2"
+              :key="index"
+              :title="item.girdName"
+              @click.stop="onGrid2Click(item, index)">
+              {{ item.girdName }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </transition>
+    <transition name="fade">
+      <div class="grid-dialog" v-show="isShowGrid3">
+        <div class="mask" @click="isShowGrid3 = false"></div>
+        <div class="grid-container">
+          <h2 :title="girdName3">{{ girdName3 }}</h2>
+          <div class="grid-list">
+            <div
+              :class="[currIndex3 === index ? 'grid-active' : '']"
+              v-for="(item, index) in girdInfoList3"
+              :key="index"
+              :title="item.girdName"
+              @click.stop="onGrid3Click(item, index)">
+              {{ item.girdName }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </transition>
+    <transition name="fade">
+      <div class="grid-dialog" v-show="isShowGrid4">
+        <div class="mask" @click="isShowGrid4 = false"></div>
+        <div class="grid-container">
+          <h2 :title="girdName4">{{ girdName4 }}</h2>
+          <div class="grid-list">
+            <div
+              :class="[currIndex4 === index ? 'grid-active' : '']"
+              v-for="(item, index) in girdInfoList4"
+              :key="index"
+              :title="item.girdName"
+              @click.stop="onGrid4Click(item, index)">
+              {{ item.girdName }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </transition>
+    <transition name="fade">
+      <div class="grid-dialog" v-show="isShowGrid5">
+        <div class="mask" @click="isShowGrid5 = false"></div>
+        <div class="grid-container">
+          <h2 :title="girdName5">{{ girdName5 }}</h2>
+          <div class="grid-list">
+            <div
+              :class="[currIndex5 === index ? 'grid-active' : '']"
+              v-for="(item, index) in girdInfoList5"
+              :key="index"
+              :title="item.girdName"
+              @click.stop="onGrid5Click(item, index)">
+              {{ item.girdName }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'XyGrid',
+
+    props: ['instance'],
+
+    data () {
+      return {
+        isShowGrid2: false,
+        isShowGrid3: false,
+        isShowGrid4: false,
+        isShowGrid5: false,
+        currIndex2: 0,
+        currIndex3: 0,
+        currIndex4: 0,
+        currIndex5: 0,
+        girdInfoList2: [],
+        girdInfoList3: [],
+        girdInfoList4: [],
+        girdInfoList5: [],
+        girdName2: '',
+        girdName3: '',
+        girdName4: '',
+        girdName5: '',
+        girdNum3: 0,
+        girdNum4: 0,
+        girdNum5: 0,
+        currGird: ''
+      }
+    },
+
+    mounted () {
+      this.$nextTick(() => {
+        document.addEventListener('keydown', this.onKeyDown)
+      })
+      this.getInfo()
+    },
+
+    destroyed () {
+      document.removeEventListener('keydown', this.onKeyDown)
+    },
+
+    methods: {
+      onKeyDown (e) {
+        if (e.keyCode == 27) {
+          this.isShowGrid2 = false
+          this.isShowGrid3 = false
+          this.isShowGrid4 = false
+          this.isShowGrid5 = false
+        }
+      },
+
+      onGrid2Click (item, index) {
+        this.currIndex2 = index
+        this.girdName2 = item.girdName
+        this.currIndex3 = -1
+        this.currIndex4 = -1
+        this.currIndex5 = -1
+        this.isShowGrid2 = false
+        this.girdInfoList3 = []
+        this.girdInfoList4 = []
+        this.girdInfoList5 = []
+        this.$emit('nodeClick', item.id)
+
+        this.currGird = item.girdName
+        this.getInfo(item.id)
+      },
+
+      onGrid3Click (item, index) {
+        this.currIndex3 = index
+        this.girdName3 = item.girdName
+        this.currIndex4 = -1
+        this.currIndex5 = -1
+        this.girdNum3 = 1
+        this.isShowGrid3 = false
+        this.$emit('nodeClick', item.id)
+        this.girdInfoList4 = []
+        this.girdInfoList5 = []
+        this.currGird = item.girdName
+        this.getInfo(item.id)
+      },
+
+      onGrid4Click (item, index) {
+        this.currIndex4 = index
+        this.girdName4 = item.girdName
+        this.currIndex5 = -1
+        this.girdNum4 = 1
+        this.isShowGrid4 = false
+        this.$emit('nodeClick', item.id)
+        this.girdInfoList5 = []
+
+        this.currGird = item.girdName
+        this.getInfo(item.id)
+      },
+
+      onGrid5Click (item, index) {
+        this.currIndex5 = index
+        this.girdName5 = item.girdName
+        this.isShowGrid5 = false
+        this.girdNum5 = 1
+        this.$emit('nodeClick', item.id)
+
+        this.currGird = item.girdName
+        this.getInfo(item.id)
+      },
+
+      getInfo (id) {
+        this.instance.post(`/app/appgirdinfo/queryPdDetailByGirdId?id=${id || ''}`).then(res => {
+          if (res.code === 0) {
+            res.data.girdInfoList2 && (this.girdInfoList2 = res.data.girdInfoList2)
+            res.data.girdInfoList3 && (this.girdInfoList3 = res.data.girdInfoList3)
+            res.data.girdInfoList4 && (this.girdInfoList4 = res.data.girdInfoList4)
+            res.data.girdInfoList5 && (this.girdInfoList5 = res.data.girdInfoList5)
+
+            res.data.girdName2 && (this.girdName2 = res.data.girdName2)
+            res.data.girdName3 && (this.girdName3 = res.data.girdName3)
+            res.data.girdName4 && (this.girdName4 = res.data.girdName4)
+            res.data.girdName5 && (this.girdName5 = res.data.girdName5)
+
+            res.data.girdNum3 != null && (this.girdNum3 = res.data.girdNum3)
+            res.data.girdNum4 != null && (this.girdNum4 = res.data.girdNum4)
+            res.data.girdNum5 != null && (this.girdNum5 = res.data.girdNum5)
+
+            if (!id) {
+              this.currGird = res.data.girdName2
+              this.currIndex2 = res.data.girdInfoList2.findIndex(v => res.data.girdName2 === v.girdName)
+            }
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .pdgrid {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    box-sizing: border-box;
+    background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/middle-bg.png) no-repeat center;
+    background-size: contain;
+
+    .fade-enter-active, .fade-leave-active {
+      transition: opacity .3s ease-in-out;
+    }
+    .fade-enter, .fade-leave-to {
+      opacity: 0;
+    }
+
+    * {
+      box-sizing: border-box;
+    }
+
+    .pdgrid-grid__title {
+      position: absolute;
+      top: 40px;
+      left: 50%;
+      width: 271px;
+      height: 53px;
+      line-height: 53px;
+      text-align: center;
+      background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/grid-title-sbg.png) no-repeat center;
+      background-size: 100% 100%;
+      cursor: pointer;
+      transform: translateX(-50%);
+      transition: opacity ease 0.3s;
+
+      &:hover {
+        opacity: 0.8;
+      }
+
+      h2 {
+        width: 182px;
+        margin: 0 auto;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: #FFFFFF;
+        font-size: 21px;
+        text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
+        background: #fff;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+      }
+    }
+
+    .pdgrid-title {
+      position: absolute;
+      top: 200px;
+      left: 50%;
+      min-width: 640px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/middle-titlebg.png) no-repeat center;
+      background-size: 100% 100%;
+      transform: translateX(-50%);
+
+      h2 {
+        color: #FFFFFF;
+        font-size: 22px;
+        white-space: nowrap;
+        text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
+        background: #fff;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+      }
+    }
+
+    .pdgrid-body {
+      display: flex;
+      position: absolute;
+      justify-content: space-between;
+      bottom: 200px;
+      left: 0;
+      width: 100%;
+      padding: 0 112px;
+
+      .pdgrid-body__item {
+        display: flex;
+        flex-direction: column;
+        width: 200px;
+        height: 187px;
+        align-items: center;
+        padding-top: 71px;
+        cursor: pointer;
+        background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/item-bg.png) no-repeat center;
+        background-size: 100% 100%;
+        transition: opacity ease 0.3s;
+
+        &:hover {
+          opacity: 0.8;
+        }
+
+        &:nth-of-type(2) {
+          position: relative;
+          top: 67px;
+        }
+
+        h2 {
+          font-size: 36px;
+          color: #FFFFFF;
+          text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
+          background: #fff;
+          -webkit-background-clip: text;
+          -webkit-text-fill-color: transparent;
+        }
+
+        p {
+          max-width: 164px;
+          margin-top: 4px;
+          padding: 0 16px;
+          font-size: 16px;
+          color: #FFFFFF;
+          text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
+          background: #fff;
+          -webkit-background-clip: text;
+          font-weight: 600;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          -webkit-text-fill-color: transparent;
+        }
+
+        .bottom {
+          display: flex;
+          align-items: center;
+
+          i {
+            width: 0px;
+            height: 0px;
+            border: 6px solid transparent;
+            border-top-color: transparent;
+            border-bottom-color: transparent;
+            border-left-color: transparent;
+            border-right-color: #FFCB42;
+
+            &.right {
+              width: 0px;
+              height: 0px;
+              border: 6px solid transparent;
+              border-top-color: transparent;
+              border-bottom-color: transparent;
+              border-left-color: #FFCB42;
+              border-right-color: transparent;
+            }
+          }
+        }
+      }
+    }
+
+    .grid-dialog {
+      position: fixed;
+      top: 0;
+      left: 0;
+      z-index: 111;
+      width: 100%;
+      height: 100%;
+
+      & > .mask {
+        position: absolute;
+        left: 0;
+        top: 0;
+        z-index: 1;
+        width: 100%;
+        height: 100%;
+        background: rgba(0, 0, 0, 0.5);
+      }
+
+      .grid-container {
+        display: flex;
+        position: absolute;
+        flex-direction: column;
+        left: 50%;
+        top: 50%;
+        z-index: 2;
+        width: 640px;
+        height: 640px;
+        background: rgba(7,13,41,0.9);
+        border: 1px solid #144662;
+        transform: translate(-50%, -50%);
+
+        & > h2 {
+          width: 100%;
+          height: 67px;
+          line-height: 67px;
+          padding: 0 20px;
+          text-align: center;
+          color: #FFFFFF;
+          font-size: 24px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
+          background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/grid-title-bg.png) no-repeat center;
+          background-size: 100% 100%;
+        }
+
+        .grid-list {
+          flex: 1;
+          overflow-y: auto;
+
+          & > div {
+            height: 67px;
+            line-height: 67px;
+            padding: 0 20px;
+            text-align: center;
+            color: #FFFFFF;
+            font-size: 27px;
+            cursor: pointer;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            transition: all ease 0.5s;
+
+            &.grid-active {
+              background: linear-gradient(270deg, rgba(0,48,124,0) 0%, #00307C 16%, rgba(0,99,255,0.9100) 50%, rgba(0,48,124,0.8200) 87%, rgba(0,48,124,0) 100%);
+              box-shadow: inset 0px -1px 0px 0px rgba(16,34,54,1);
+              text-shadow: 0px 3px 5px rgba(0,0,0,0.5000);
+            }
+
+            &:hover {
+              background: linear-gradient(270deg, rgba(0,48,124,0) 0%, #00307C 16%, rgba(0,99,255,0.9100) 50%, rgba(0,48,124,0.8200) 87%, rgba(0,48,124,0) 100%);
+              box-shadow: inset 0px -1px 0px 0px rgba(16,34,54,1);
+              text-shadow: 0px 3px 5px rgba(0,0,0,0.5000);
+            }
+          }
+        }
+      }
+    }
+  }
+</style>