郫都大屏

project/dv/apps/AppPdDv.vue

@@ -141,12 +141,9 @@
           <h2>网格动态</h2>
         </div>
         <div class="bottom-list">
-          <div class="item" v-for="(item, index) in 3" :key="index">
+          <div class="item" v-for="item in dynamicList" :key="item.id">
-            <i>07/19 09:45</i>
+            <i>{{ item.createTime }}</i>
-            <span>书院社区-张三 </span>
+            <em>{{ item.logDescription }}</em>
-            <em>添加居民"</em>
-            <span>蓝天白云</span>
-            <em>"为好友</em>
           </div>
         </div>
       </div>
@@ -261,7 +258,8 @@
         tagInfo: {},
         groupNumber: {},
         replyPercentage: {},
-        groupChatNumber: {}
+        groupChatNumber: {},
+        dynamicList: []
       }
     },
 
@@ -299,6 +297,11 @@
             this.replyPercentage = res.data
           }
         })
+        this.instance.post(`/app/appUserOperation/list?size=10000`).then(res => {
+          if (res.code === 0) {
+            this.dynamicList = res.data.records
+          }
+        })
         this.instance.post(`/app/wxgroupstatistic/getGroupNumber`).then(res => {
           if (res.code === 0) {
             this.groupNumber = res.data['居民群统计']

project/dv/apps/components/DonutChart.vue

@@ -2,7 +2,7 @@
   <div class="DonutChart" :id="id">
     <canvas :id="canvasId"></canvas>
     <div class="DonutChart-text">
-      <span>{{ ratio }}%</span>
+      <span>{{ ratio || 0 }}%</span>
       <i>{{ text }}</i>
     </div>
   </div>

project/sass/apps/Announce/AppAnnounce/AppAnnounce.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="AppAnnounce">
-    <keep-alive :include="['List']">
+    <!-- <keep-alive :include="['List']"> -->
       <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
-    </keep-alive>
+    <!-- </keep-alive> -->
   </div>
 </template>
 

project/sass/apps/Announce/AppAnnounce/components/Add.vue

@@ -23,24 +23,29 @@
                 <el-form-item label="选择群主" v-if="form.sendScope !== '0'" prop="wxGroupsName" style="width: 100%;" :rules="[{ required: true, message: '请选择选择群主', trigger: 'change' }]">
                   <div class="AppAnnounceDetail-select">
                     <el-input size="small" class="AppAnnounceDetail-select__input" placeholder="请选择..." disabled v-model="form.wxGroupsName"></el-input>
-                    <div class="select-left" v-if="form.filterCriteria.length">
+                    <div class="select-left" v-if="form.filterCriteria.length && form.sendScope !== '2'">
                       <span v-for="(item, index) in form.filterCriteria" :key="index">
                         <ai-open-data type="departmentName" :openid="item"></ai-open-data>
                       </span>
                     </div>
+                    <div class="select-left" v-if="form.filterCriteria.length && form.sendScope === '2'">
+                      <span v-for="(item, index) in girdNames" :key="index">{{ item }}</span>
+                    </div>
                     <i v-if="!form.filterCriteria.length">请选择</i>
                     <ai-picker
                       :instance="instance"
                       multiple
+                      :ops="{label: form.sendScope === '2' ? 'girdName' : 'name'}"
                       :action="form.sendScope === '1' ? '/app/wxcp/wxdepartment/departList' : '/app/appgirdinfo/girdList'"
                       v-model="form.filterCriteria"
+                      @pick="onPick"
                       @change="onSelcetChange">
                       <div class="select-right">选择</div>
                     </ai-picker>
                   </div>
                   <div class="tips">
                     <p>消息预计送达居民群数：</p>
-                    <span>{{ form.filterCriteria.length }}</span>
+                    <span>{{ groupLen }}</span>
                     <el-tooltip
                       placement="top"
                       content="任务开始后，3天内15分钟更新1次，3天后访问页面时触发更新，1时间最多刷新1次">
@@ -315,13 +320,23 @@
           taskTitle: '',
           examinesName: ''
         },
+        girdNames: '',
         id: '',
         tagsList: []
       }
     },
 
     computed: {
-      ...mapState(['user'])
+      ...mapState(['user']),
+
+      groupLen () {
+        let i = 0
+        this.form.wxGroups.forEach(v => {
+          i = i + v.groupIds.split(',').length
+        })
+
+        return i
+      }
     },
 
     created () {
@@ -346,6 +361,10 @@
               filterCriteria: res.data.filterCriteria.split(',')
             }
 
+            if (res.data.girdNames) {
+              this.girdNames = res.data.girdNames
+            }
+
             this.dateForm.choiceTime = res.data.choiceTime
 
             if (res.data.examines && res.data.examines.length) {
@@ -384,6 +403,10 @@
       },
 
       onScopeChange (e) {
+        this.form.filterCriteria = []
+        this.form.wxGroups = []
+        this.girdNames = ''
+
         if (e === '0') {
           this.getWxGroups()
         } else {
@@ -391,6 +414,12 @@
         }
       },
 
+      onPick (e) {
+        if (this.form.sendScope === '2' && e.length) {
+          this.girdNames = e.map(v => v.girdName)
+        }
+      },
+
       onSelcetChange (e) {
         if (e.length) {
           this.form.wxGroupsName = '1'
@@ -535,6 +564,10 @@
       confirm (sendType) {
         this.$refs.form.validate((valid) => {
           if (valid) {
+            if (!this.form.wxGroups.length) {
+              return this.$message.error('居民群数量不能为0')
+            }
+
             if (sendType === 1 && !this.dateForm.choiceTime) {
               this.isShowDate = true
               return false