Merge remote-tracking branch 'origin/dev' into dev

src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue

@@ -0,0 +1,316 @@
+<template>
+  <div class="AppCooperationPropaganda">
+    <AiTopFixed>
+      <div class="search">
+        <div class="searchBox">
+          <u-search placeholder="请输入任务名称" v-model="taskTitle" @search="searchBtn" @clear="taskTitle='',current=1, list=[],getList()" :show-action="false"></u-search>
+        </div>
+        <div class="filterBtn" @click="filterShow = true"><img src="./images/shaixuan.png" alt="">筛选</div>
+      </div>
+    </AiTopFixed>
+    <div class="resident_list" v-if="list.length">
+      <div class="card" @click="toDetail(item)" v-for="(item,index) in list" :key="index">
+        <div class="card_title">
+          <div class="card_left">{{ item.taskTitle }}</div>
+          <div class="card_right"><span :class="item.status==0? 'status0': item.status==1? 'status1': item.status==2? 'status2':
+           item.status == 3? 'status3':item.status==4? 'status4': 'status5'"></span>{{ $dict.getLabel('mstStatus', item.status) }}</div>
+        </div>
+        <div>创建时间：<span>{{ item.createTime }}</span></div>
+        <div>共需<span class="num">{{ item.groupOwnerCount }}</span>名成员完成群发，目前已完成<span class="num">{{ item.completionRate || 0 }}%</span></div>
+        <div>创建部门：<span>{{ item.createUserDept }}</span></div>
+      </div>
+    </div>
+    <AiEmpty description="暂无数据" v-if="!list.length"/>
+    <u-popup v-model="filterShow" mode="bottom" border-radius="14">
+      <div class="popup">
+        <div class="tips"></div>
+        <div class="title">
+          <div
+            class="cancel"
+            @click.stop="(filterShow = false), (timeSelect = 0)"
+          >
+            取消
+          </div>
+          <p>筛选条件</p>
+          <div class="confirm" @click.stop="selectConfirm">确定</div>
+        </div>
+        <scroll-view class="select-content" scroll-y="true">
+          <div class="type-list">
+            <div class="type-title">创建人</div>
+            <AiPagePicker class="select" type="sysUser" :selected.sync="createUserId">选择人员</AiPagePicker>
+          </div>
+          <div class="type-list">
+            <div class="type-title">群发时间</div>
+            <div class="item">
+              <div>开始时间</div>
+              <div style="display: flex;">
+                <u-input v-model="startTime" disabled placeholder="请选择开始时间" @click="showStart = true" />
+                <u-icon name="arrow-right"></u-icon>
+              </div>
+            </div>
+            <div class="item">
+              <div>结束时间</div>
+              <div style="display: flex;">
+                <u-input v-model="endTime" disabled placeholder="请选择开始时间" @click="showEnd = true" />
+                <u-icon name="arrow-right"></u-icon>
+              </div>
+            </div>
+          </div>
+        </scroll-view>
+        <u-picker mode="time" v-model="showStart" @confirm="confirmStart"></u-picker>
+        <u-picker mode="time" v-model="showEnd" @confirm="confirmEnd"></u-picker>
+        <div class="popBtn">
+          <div @click="reset">重置</div>
+          <div @click="selectConfirm">确认</div>
+        </div>
+      </div>
+    </u-popup>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppCooperationPropaganda',
+  appName: '协同宣发',
+  data() {
+    return {
+      current: 1,
+      name: '',
+      list: [],
+      filterShow: false,
+      startTime: '',
+      endTime: '',
+      start: "",
+      end: "",
+      showStart: false,
+      showEnd: false,
+      taskTitle: '',
+      createUserId: [],
+    }
+  },
+  methods: {
+    toDetail(item) {
+      uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`})
+    },
+    searchBtn() {
+      this.current = 1
+      this.list = [],
+      this.getList()
+    },
+    getList() {
+      this.$http.post(`/app/appmasssendingtask/list`, null, {
+        params: {
+          current: this.current,
+          taskTitle: this.taskTitle,
+          createUserId: this.createUserId,
+          startTime: this.start,
+          endTime: this.end,
+        }
+      }).then(res=> {
+        if(res?.data) {
+          this.list = this.current == 1?  res.data.records : [...res.data.records, ...this.list]
+        }
+        // console.log(res);
+      })
+    },
+    
+    filterBtn() {},
+    reset() {
+      this.startTime = '',
+      this.endTime = ''
+    },
+    selectConfirm() {
+      this.start = this.startTime,
+      this.end = this.endTime
+      this.filterShow = false
+      this.getList()
+    },
+    confirmStart(val) {
+      this.startTime = val.year + '-' + val.month + '-' + val.day
+    },
+    confirmEnd(val) {
+      this.endTime = val.year + '-' + val.month + '-' + val.day
+    },
+  },
+  onShow() {
+    document.title = '群发居民群'
+    this.$dict.load('mstStatus').then(() => {
+      this.getList()
+    })
+    
+  },
+  onReachBottom() {
+    this.current ++
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppCooperationPropaganda {
+  .search {
+    display: flex;
+    height: 80px;
+    align-items: center;
+    justify-content: space-between;
+
+    .searchBox {
+      width: 562px;
+    }
+    .filterBtn {
+      img {
+        width: 28px;
+        height: 28px;
+      }
+    }
+  }
+  .resident_list {
+    padding: 24px 32px 20px 32px;
+    box-sizing: border-box;
+    .card {
+      background: #FFF;
+      border-radius: 16px;
+      padding: 30px;
+      margin-bottom: 24px;
+      & > div {
+        padding: 10px 0;
+      }
+      .num {
+        color: #3AA0FF;
+      }
+      .card_title {
+        display: flex;
+        justify-content: space-between;
+        .card_left {
+          font-size: 32px;
+          color: #000000;
+          font-weight: 600;
+        }
+        .card_right {
+          span {
+            display: inline-block;
+            width: 16px;
+            height: 16px;
+            // background: #3399FF;
+            border-radius: 50%;
+            margin-right: 10px;
+          }
+
+          .status0 {
+            background: #3399FF;
+          }
+          .status1 {
+            background: #FFA938;
+          }
+          .status2 {
+            background: #3399FF;
+          }
+          .status3 {
+            background: #1CCEB0;
+          }
+          .status4 {
+            background: #FF6758;
+          }
+          .status5 {
+            background: #FF6758;
+          }
+          .status6 {
+            background: #999999;
+          }
+        }
+      }
+    }
+  }
+  .popup {
+    box-sizing: border-box;
+    // height: 800px;
+    .tips {
+      width: 80px;
+      height: 6px;
+      background: #dddddd;
+      border-radius: 4px;
+      padding: 0 32px;
+      box-sizing: border-box;
+      margin: 32px auto 8px auto;
+    }
+    .title {
+      height: 48px;
+      line-height: 48px;
+      font-size: 34px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #222;
+      padding: 0 32px;
+      box-sizing: border-box;
+      padding-bottom: 32px;
+      .cancel {
+        display: inline-block;
+        width: 200px;
+        color: #aaa;
+      }
+      .confirm {
+        display: inline-block;
+        width: 200px;
+        text-align: right;
+        color: #333;
+      }
+      p {
+        display: inline-block;
+        width: calc(100% - 400px);
+        text-align: center;
+        font-size: 28px;
+      }
+    }
+    .select-content {
+      height: calc(100% - 100px);
+      overflow-y: scroll;
+    }
+    .type-list {
+      padding: 0 32px;
+      box-sizing: border-box;
+      margin-bottom: 32px;
+      .type-title {
+        line-height: 108px;
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+      }
+      .item {
+        display: flex;
+        justify-content: space-between;
+        & > div:last-child {
+          ::v-deep .uni-input-input,
+          ::v-deep .uni-input-placeholder {
+            text-align: right;
+          }
+        }
+      }
+      .active {
+        background: #1365dd;
+        color: #fff;
+      }
+    }
+    .popBtn {
+      display: flex;
+      height: 98px;
+      line-height: 98px;
+      div {
+        width: 50%;
+        border: 2px solid #3399ff;
+        text-align: center;
+      }
+      div:first-child {
+        color: #3399ff;
+      }
+      div:last-child {
+        color: #fff;
+        background: #3399ff;
+      }
+    }
+  }
+
+
+
+}
+</style>

src/project/saas/AppCooperationPropaganda/cooperationDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="groupSendDetail">
+  <div class="cooperationDetail">
     <AiTopFixed>
       <div class="tab-select">
         <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{ item }}<span></span>
@@ -12,24 +12,25 @@
       <div class="header">
         <div class="header_left">
           <div>防疫宣传群发通知</div>
-          <div>创建时间: 2022-07-12 14:54</div>
+          <div>创建时间: <span>{{ createTime }}</span></div>
         </div>
         <div class="header_right" @click="toDetail">查看详情</div>
       </div>
 
       <div class="pieEcharts">
         <div class="pie_info">
-          <div class="tips">数据更新于2022-07-06 09:18:56</div>
+          <div class="tips">数据更新于<span>{{ info.remindTime }}</span></div>
           <div class="pie_card">
-            <div id="pieEcharts"></div>
+            <div v-if="info.executedCount!=null" id="pieEcharts"></div>
+            <AiEmpty description="暂无数据" v-else />
             <div class="pie_right">
-              <div>计划送达居民群: <span>10</span></div>
+              <div>计划送达居民群: <span>{{ info.planCount || 0 }}</span></div>
-              <div>未送达居民群: <span>10</span></div>
+              <div>未送达居民群: <span>{{ info.unExecutedCount || 0 }}</span></div>
-              <div>已送达居民群: <span>10</span></div>
+              <div>已送达居民群: <span>{{ info.executedCount || 0 }}</span></div>
-              <div>无法送达居民群: <span>10</span></div>
+              <div>无法送达居民群: <span>{{ info.cannotExecuteCount || 0 }}</span></div>
             </div>
           </div>
-          <div class="btn">提醒成员发送</div>
+          <div class="btn" v-if="info.status == 4" @click="remindSend">提醒成员发送</div>
         </div>
       </div>
 
@@ -38,8 +39,8 @@
           <div class="tab">
             <u-subsection :list="subsection" :current="subIndex"></u-subsection>
           </div>
-          <AiTable :data="tableData0" :colConfigs="colConfigs0" v-if="tabIndex == 0"/>
+          <AiTable :data="tableData" :colConfigs="colConfigs0" v-if="tabIndex == 0"/>
-          <AiTable :data="tableData1" :colConfigs="colConfigs1" v-if="tabIndex == 1"/>
+          <AiTable :data="tableData" :colConfigs="colConfigs1" v-if="tabIndex == 1"/>
         </div>
       </div>
     </div>
@@ -60,41 +61,85 @@ export default {
         {name: '无法送达'}
       ],
       subIndex: 0,
-      tableData0: [],
+      tableData: [],
-      tableData1: [],
+      createTime: '',
+      id: '',
+      info: {},
+      current: 1,
     }
   },
   computed: {
     colConfigs0() {
       return [
-        { label: '成员', prop: '', width: '240rpx', dict: 'householdRelation' },
+        { label: '成员', prop: 'groupOwnerId', width: '240rpx', dict: 'householdRelation' },
-        { label: '预计未送达居民', prop: ''},
+        { label: '预计未送达居民', prop: 'groupCount'},
       ]
     },
     colConfigs1() {
       return [
-        { label: '居民群', prop: '', width: '240rpx', dict: 'householdRelation' },
+        { label: '居民群', prop: 'groupName', width: '240rpx', dict: 'householdRelation' },
-        { label: '群人数', prop: '', width: '200rpx' },
+        { label: '群人数', prop: 'memberCount', width: '200rpx' },
-        { label: '群主', prop: '', dict: 'sex' },
+        { label: '群主', prop: 'groupOwnerId', dict: 'sex' },
       ]
     },
   },
+  onLoad(o) {
+    this.id = o.id
+    this.createTime = o.time
+    this.getStatistics()
+  },
   methods: {
     tabClick(index) {
       this.tabIndex = index
     },
 
     toDetail() {
-      uni.navigateTo({url: `./detail`})
+      uni.navigateTo({url: `./detail?id=${this.id}`})
+    },
+    // 提醒发送
+    remindSend() {
+      var timer = null
+      var num = 60 * 60 * 1000
+      this.$http.post('/app/appmasssendingtask/remindSend',null,{
+        params: {
+          id: this.id
+        }
+      }).then(res => {
+        if(res?.code==0) {
+          this.$u.toast('已提醒成员发送')
+          timer = setInterval(()=>{
+            if(this.num == 0) {
+              clearInterval(timer)
+            }
+            num = num - 1 
+          }, 60 * 60 * 1000)
+        } else {
+          this.$u.toast(res.msg)
+        }
+      }).catch(() => {
+        this.$u.toast(`${num}s后可再次提醒发送`)
+      })
+    },
+
+    getStatistics() {
+      this.$http.post(`/app/appmasssendingtask/detailStatistics`, null, {
+        params: {
+          type: this.tabIndex,
+          sendStatus: this.subIndex,
+          taskId: this.id,
+          current: this.current
+        }
+      }).then(res => {
+        if(res?.data) {
+          this.tableData = res.data.executedList
+        }
+      })
     },
 
     // 带百分比饼图
     getPieEcharts() {
       this.pieEcharts = echarts.init(document.getElementById('pieEcharts'))
       this.pieEcharts.setOption( {
-        // legend: {
-        //   selectedMode:false
-        // },
         tooltip: {
             trigger: 'item',
             formatter: '{a} <br/>{b}: {c} ({d}%)'
@@ -119,7 +164,7 @@ export default {
               {value: 10, name: '群发送达率', label:{
                 normal:{ 
                   show:true,
-                  formatter: '{d}%\n群发送达率',
+                  formatter: `{d}%\n群发居民群`,
                   textStyle: {
                     fontSize: 16,
                   },
@@ -143,7 +188,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.groupSendDetail {
+.cooperationDetail {
   ::v-deep .AiTopFixed .content {
     padding: 0;
   }
@@ -224,12 +269,13 @@ export default {
         width: 100%;
         align-items: center;
         #pieEcharts {
-          // flex: 1;
           width: 60%;
           height: 400px;
         }
+        ::v-deep .emptyWrap {
+          width: 60%;
+        }
         .pie_right {
-          // flex: 1;
           width: 40%;
           div {
             margin-bottom: 10px;

src/project/saas/AppCooperationPropaganda/detail.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="detail">
+    <div class="task">
+      <div class="task_title">群发客户群</div>
+      <div class="task_content">
+        <div class="item">
+          <span>任务名称</span>
+          <span>{{ data.taskTitle }}</span>
+        </div>
+        <div class="item">
+          <span>创建人</span>
+          <span>{{ data.createUserId }}</span>
+        </div>
+        <div class="item">
+          <span>所在部门</span>
+          <span>{{ data.createUserDept }}</span>
+        </div>
+        <div class="item">
+          <span>群发时间</span>
+          <span>{{ data.choiceTime }}</span>
+        </div>
+      </div>
+    </div>
+    <div class="info">
+      <div class="scope">
+        <span>群发范围</span>
+        <span>按条件筛选的全部{{ data.receiveGroupCount || 0}}个客户群</span>
+      </div>
+      <div class="content">
+        <p>群发内容</p>
+        <div>
+          <div class="textarea" v-if="content.length">{{ content[0].content }}</div>
+          <div class="pictures">
+            <!-- <image v-for="(item, index) in picList" :key="index" :src="item."/> -->
+          </div>
+          <div></div>
+          <div></div>
+        </div>
+      </div>
+    </div>
+    <div class="btn" v-if="data.status==0 && data.haveExaminPower">
+      <div class="refuse" @click="refuseBtn">拒绝通过</div>
+      <div class="pass" @click="passBtn">审核通过</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      id: "",
+      data: {},
+      content: [],
+      picList: []
+    }
+  },
+  onLoad(o) {
+    this.id = o.id
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`).then(res=> {
+        if (res?.data) {
+          this.data = res.data
+          this.content = res.data.contents.map(v=> v.msgType == 0)
+          this.picList = res.data.contents.map(e=> e.msgType == 1)
+        }
+      })
+    },
+    // 拒绝
+    refuseBtn() {
+      this.pass = 0
+      this.$confirm('确定要审核拒绝该数据？').then(() => {
+        this.examine()
+      })
+    },
+    // 通过
+    passBtn() {
+      this.pass = 1
+      this.$confirm('确定审核通过该数据？').then(() => {
+        this.examine()
+      })
+    },
+    examine() {
+      this.$http.post(`/app/appmasssendingtask/examine`,null,{
+        params: {
+          pass: this.pass,
+          id: this.id,
+          options: this.options
+        }
+      }).then(res => {
+        if(res?.code == 0) {
+          this.$u.toast('审批成功')
+          this.getDetail()
+        }
+      }).catch(err=> {
+        console.log(err);
+      })
+    },
+  },
+  onShow() {
+    document.title = "群发审批"
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  padding: 32px 32px 120px 32px;
+  box-sizing: border-box;
+  .task {
+    margin-bottom: 24px;
+    background: #FFF;
+    border-radius: 8px;
+    box-shadow: inset 0px -1px 0px 0px #DDDDDD;
+    .task_title {
+      padding: 26px 32px;
+      box-sizing: border-box;
+      border-bottom: 2px solid #DDDDDD;
+    }
+    .task_content {
+      padding: 0 32px 26px 32px;
+      box-sizing: border-box;
+      .item {
+        display: flex;
+        padding-top: 26px;
+        box-sizing: border-box;
+        span:first-child {
+          width: 160px;
+          color: #999999;
+        }
+        span:last-child {
+          width: calc(100% - 160px);
+        }
+      }
+    }
+  }
+
+  .info {
+    background: #FFF;
+    border-radius: 8px;
+    padding: 26px 32px;
+    box-sizing: border-box;
+    .scope {
+      display: flex;
+      margin-bottom: 16px;
+      span:first-child {
+        width: 160px;
+        color: #999;
+      }
+      span:last-child {
+        width: calc(100% - 160px);
+      }
+    }
+    .content {
+      p {
+        color: #999;
+        margin-bottom: 26px;
+      }
+      .textarea {
+        background: #F9F9F9;
+        border-radius: 4px;
+        padding: 20px;
+        box-sizing: border-box;
+      }
+    }
+  }
+
+  .btn {
+    position: fixed;
+    display: flex;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    border: 1px solid #DDDDDD;
+    font-size: 32px;
+    .refuse {
+      width: 40%;
+      background: #FFF;
+      color: #FF4466;
+      text-align: center;
+    }
+    .pass {
+      width: 60%;
+      background: #3975C6;
+      color: #FFF;
+      text-align: center;
+    }
+  }
+}
+</style>

src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue

@@ -1,47 +1,115 @@
 <template>
   <div class="AppPropagandaStatistics">
     <div class="calendar_header">
-      <u-section title="宣发日历" :show-line="false"  sub-title="查看更多" @click="readMore"></u-section>
+      <u-section
+        title="宣发日历"
+        :show-line="false"
+        sub-title="查看更多"
+        @click="readMore"
+      ></u-section>
     </div>
     <div class="threeDays">
       <div class="yesterday">
-        <div class="itemYesterday">昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span></div>
+        <div class="itemYesterday">
-        <!-- <div v-if="calendarList[nowDate - 1].taskList">晴风小区志愿者活动</div> -->
+          昨天<span>{{ nowMonth }}.{{ nowDate - 1 }}</span>
-        <!-- <div v-if="!calendarList[nowDate - 1].taskList">今日暂无宣发任务</div> -->
+        </div>
+        <div
+          v-if="
+            calendarList &&
+            calendarList[nowDate - 1] &&
+            calendarList[nowDate - 1].taskList.length > 0
+          "
+        >
+          晴风小区志愿者活动
+        </div>
+        <div
+          v-if="
+            !(
+              calendarList &&
+              calendarList[nowDate - 1] &&
+              calendarList[nowDate - 1].taskList.length > 0
+            )
+          "
+        >
+          今日暂无宣发任务
+        </div>
       </div>
       <div class="today">
-        <div class="itemToday">今天<span>{{ nowMonth }}.{{ nowDate }}</span></div>
+        <div class="itemToday">
-        <!-- <div v-if="calendarList[nowDate].taskList">晴风小区志愿者活动</div> -->
+          今天<span>{{ nowMonth }}.{{ nowDate }}</span>
-        <!-- <div v-if="!calendarList[nowDate].taskList">今日暂无宣发任务</div> -->
+        </div>
+        <div
+          v-if="
+            calendarList &&
+            calendarList[nowDate - 1] &&
+            calendarList[nowDate - 1].taskList.length > 0
+          "
+        >
+          晴风小区志愿者活动
+        </div>
+        <div
+          v-if="
+            !(
+              calendarList &&
+              calendarList[nowDate - 1] &&
+              calendarList[nowDate - 1].taskList.length > 0
+            )
+          "
+        >
+          今日暂无宣发任务
+        </div>
       </div>
       <div class="tomorrow">
-        <div class="itemTomorrow">明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span></div>
+        <div class="itemTomorrow">
-        <!-- <div v-if="calendarList[nowDate + 1].taskList">晴风小区志愿者活动</div> -->
+          明天<span>{{ nowMonth }}.{{ nowDate + 1 }}</span>
-        <!-- <div v-if="!calendarList[nowDate + 1].taskList">今日暂无宣发任务</div> -->
+        </div>
-        <div class="isShow" @click="showMore()">{{ isShow ? '收起' : '展开' }}</div>
+        <div
+          v-if="
+            calendarList &&
+            calendarList[nowDate - 1] &&
+            calendarList[nowDate - 1].taskList.length > 0
+          "
+        >
+          晴风小区志愿者活动
+        </div>
+        <div
+          v-if="
+            !(
+              calendarList &&
+              calendarList[nowDate - 1] &&
+              calendarList[nowDate - 1].taskList.length > 0
+            )
+          "
+        >
+          今日暂无宣发任务
+        </div>
+        <div class="isShow" @click="showMore()">
+          {{ isShow ? "收起" : "展开" }}
+        </div>
         <span></span>
       </div>
     </div>
 
-
     <!-- 折线图 -->
     <div class="brokenEcharts">
       <div class="broken_title">
         <div class="broken_left">宣发效果</div>
-        <div class="broken_right" @click="filterShow = true"><img src="./images/shaixuan.png" alt="">筛选</div>
+        <div class="broken_right" @click="filterShow = true">
+          <img src="./images/shaixuan.png" alt="" />筛选
+        </div>
       </div>
       <div class="broken_statistics">
         <div class="broken_item">
           <div>创建宣发任务数</div>
-          <div>200</div>
+          <div>{{ peopleNum }}</div>
         </div>
         <div class="broken_item">
           <div>执行宣发次数</div>
-          <div>200</div>
+          <div>{{ sendNum }}</div>
         </div>
         <div class="broken_item">
           <div>触达人次</div>
-          <div>200</div>
+          <div>{{ predictNum }}</div>
         </div>
       </div>
       <div class="title">触达人次</div>
@@ -55,9 +123,21 @@
       <div class="broken_title">
         <div class="broken_left">宣发明细</div>
         <div class="broken_right">
-          <span :class="detailType ==0? 'active': ''" @click="detailType = 0, getColData()">近七天</span>
+          <span
-          <span :class="detailType ==1? 'active': ''" @click="detailType = 1, getColData()">近30天</span>
+            :class="detailType == 0 ? 'active' : ''"
-          <span :class="detailType ==2? 'active': ''" @click="detailType = 2, getColData()">近1年</span>
+            @click="(detailType = 0), getColData()"
+            >近七天</span
+          >
+          <span
+            :class="detailType == 1 ? 'active' : ''"
+            @click="(detailType = 1), getColData()"
+            >近30天</span
+          >
+          <span
+            :class="detailType == 2 ? 'active' : ''"
+            @click="(detailType = 2), getColData()"
+            >近1年</span
+          >
         </div>
       </div>
       <div id="columnarEcharts"></div>
@@ -67,21 +147,45 @@
       <div class="popup">
         <div class="tips"></div>
         <div class="title">
-          <div class="cancel" @click.stop="filterShow=false,timeSelect=0">取消</div>
+          <div
+            class="cancel"
+            @click.stop="(filterShow = false), (timeSelect = 0)"
+          >
+            取消
+          </div>
           <p>筛选条件</p>
           <div class="confirm" @click.stop="selectConfirm">确定</div>
         </div>
         <scroll-view class="select-content" scroll-y="true">
           <div class="type-list">
             <div class="type-title">宣发时间</div>
-            <div class="item" v-for="(item, index) in timeList" :key="index" :class="index == timeSelect ? 'active' : ''" @click.stop="checkTime(index)">{{item}}</div>
+            <div
+              class="item"
+              v-for="(item, index) in timeList"
+              :key="index"
+              :class="index == timeSelect ? 'active' : ''"
+              @click.stop="checkTime(index)"
+            >
+              {{ item }}
+            </div>
           </div>
           <div class="type-list">
             <div class="type-title">宣发部门</div>
-            <AiPagePicker type="custom" :selected.sync="deptList" nodeKey="id" :ops="{url:`./selectDeptUser`,label:'name'}" valueObj>
+            <AiPagePicker
+              type="custom"
+              :selected.sync="deptList"
+              nodeKey="id"
+              :ops="{ url: `./selectDeptUser`, label: 'name' }"
+              valueObj
+            >
               <span class="label" v-if="deptList.length">已选择</span>
-              <span v-else style="color:#999;">请选择</span>
+              <span v-else style="color: #999">请选择</span>
-              <u-icon name="arrow-right" color="#999" size="24" style="margin-left:8px;"/>
+              <u-icon
+                name="arrow-right"
+                color="#999"
+                size="24"
+                style="margin-left: 8px"
+              />
             </AiPagePicker>
           </div>
         </scroll-view>
@@ -94,16 +198,20 @@
         <div class="customPop">
           <div class="startTime">
             <div>开始时间：</div>
-            <div>
+            <div style="display: flex; justify-content: space-between;">
-              <u-input v-model="start" placeholder="请输入格式为2022-00-00的开始时间" type="text" clearable/>
+              <u-input v-model="startTime" placeholder="请选择开始时间" disabled @click="showStart = true"/>
+              <u-icon name="arrow-right"></u-icon>
             </div>
           </div>
           <div class="endTime">
             <div>结束时间：</div>
-            <div>
+            <div style="display: flex; justify-content: space-between;">
-              <u-input v-model="end" placeholder="请输入格式为2022-00-00的结束时间" type="text" clearable/>
+              <u-input v-model="endTime" placeholder="请选择结束时间" disabled @click="showEnd = true" />
+              <u-icon name="arrow-right"></u-icon>
             </div>
           </div>
+          <u-picker mode="time" v-model="showStart" @confirm="confirmStart"></u-picker>
+          <u-picker mode="time" v-model="showEnd" @confirm="confirmEnd"></u-picker>
           <div class="timeBtn" @click="handleTime">确定</div>
         </div>
       </u-popup>
@@ -112,10 +220,10 @@
 </template>
 
 <script>
-import echarts from 'echarts';
+import echarts from "echarts";
 export default {
-  name: 'AppPropagandaStatistics',
+  name: "AppPropagandaStatistics",
-  appName: '宣发统计',
+  appName: "宣发统计",
   data() {
     return {
       isShow: false,
@@ -125,143 +233,180 @@ export default {
       columnarEcharts: null,
       filterShow: false,
       customShow: false,
-      timeList: ['近7天', '近30天', '近1年','自定义'],
+      timeList: ["近7天", "近30天", "近1年", "自定义"],
       timeSelect: 0,
-      start: '',
+      start: "",
-      end: '',
+      end: "",
       deptList: [],
-      nowMonth: '',
+      nowMonth: "",
-      nowDate: '',
+      nowDate: "",
       calendarList: [],
       colData: {},
       detailType: 0,
-      timeType: '',
+      timeType: "",
-      departId: '',
+      departId: "",
-      startTime: '',
+      startTime: "",
-      endTime: '',
+      endTime: "",
-      x: [],
+      start: "",
-    }
+      end: "",
+      showStart: false,
+      showEnd: false,
+      resX: [],
+      resY: [],
+      res2Y: [],
+      res3Y: [],
+      peopleNum: "",
+      sendNum: "",
+      predictNum: "",
+    };
   },
 
   onShow() {
-    document.title = '宣发统计'
+    document.title = "宣发统计";
-    this.getData()
+  },
-    this.getColData()
+  created() {
-    this.getNowDate()
+    this.getBrokenDate();
-    this.getBrokenDate()
+    this.getData();
+    this.getColData();
+    this.getNowDate();
   },
   mounted() {
-    this.getBrokenEcharts1()
+    // this.getBrokenDate();
-    this.getBrokenEcharts2()
+    this.getBrokenEcharts1();
-    this.getBrokenEcharts3()
+    this.getBrokenEcharts2();
-    this.getColumnarEcharts()
+    this.getBrokenEcharts3();
+    this.getColumnarEcharts();
   },
   methods: {
     showMore() {},
 
     checkTime(index) {
-      if(index == 3) {
+      if (index == 3) {
-        this.timeSelect = index
+        this.timeSelect = index;
-        this.customShow = true
+        this.customShow = true;  
+        
+        this.showStart = false;
+        this.showEnd = false;
       } else {
-        this.timeSelect = index
+        this.timeSelect = index;
       }
     },
 
     readMore() {
-      uni.navigateTo({url: `./calendarInfo`})
+      uni.navigateTo({ url: `./calendarInfo` });
     },
     // 重置
     reset() {
-      this.timeType = 0
+      this.timeType = 0;
-      this.startTime = ''
+      this.startTime = "";
-      this.endTime = ''
+      this.endTime = "";
-      this.departId = ''
+      this.departId = "";
     },
 
     selectConfirm() {
-      if(this.timeSelect == 3) {
+      if (this.timeSelect == 3) {
-        this.timeType = this.timeSelect
+        this.timeType = this.timeSelect;
-        this.startTime = this.start
+        this.start = this.startTime;
-        this.endTime = this.end
+        this.end = this.endTime;
-        this.getBrokenDate()
+        this.getBrokenDate();
       } else {
-        this.timeType = this.timeSelect
+        this.timeType = this.timeSelect;
-        this.getBrokenDate()
+        this.getBrokenDate();
       }
-      this.filterShow = false
+      this.filterShow = false;
+    },
 
+    confirmStart(val) {
+      this.startTime = val.year + '-' + val.month + '-' + val.day
+    },
+    confirmEnd(val) {
+      this.endTime = val.year + '-' + val.month + '-' + val.day
     },
 
     handleTime() {
-      this.startTime = this.start
+      this.start = this.startTime
-      this.endTime = this.end
+      this.end = this.endTime
-      this.customShow = false
+      this.customShow = false;
     },
 
     getNowDate() {
-      let date = new Date()
+      let date = new Date();
-      this.nowDate = date.getDate()
+      this.nowDate = date.getDate();
-      this.nowMonth = date.getMonth() + 1
+      this.nowMonth = date.getMonth() + 1;
     },
     // 宣发日历
     getData() {
-      this.$http.post(`/app/appmasssendingtask/statisticsCalendar`, null, {
+      this.$http
-        params: {}
+        .post(`/app/appmasssendingtask/statisticsCalendar`, null, {
-      }).then((res)=> {{
+          params: {},
-        if(res?.data) {
+        })
-          this.calendarList = res.data
+        .then((res) => {
+          {
+            if (res?.data) {
+              this.calendarList = res.data;
             }
-      }})
+          }
+        });
     },
 
-
     // 宣发效果
     getBrokenDate() {
-      this.$http.post(`/app/appmasssendingtask/statisticsEffect`, null, {
+      this.$http
+        .post(`/app/appmasssendingtask/statisticsEffect`, null, {
           params: {
             type: this.timeSelect,
-          startTime: this.startTime,
+            startTime: this.start,
-          endTime: this.endTime,
+            endTime: this.end,
             // departId: this.departId
-        }
+          },
-      }).then(res=>{
-        if(res?.data) {
-          if(this.timeType == 0) {
-            this.x = res.data.trend.map(e=> e.ymd.substring(5,7) + '月' + e.ymd.substring(8,10) + '日')
-          } else if (this.timeType == 1) {
-            this.x = res.data.trend.map(e=> e.ymd.substring(5,7) + '月' + e.ymd.substring(8,10) + '日')
-          } else if (this.timeType == 2) {
-            this.x = res.data.trend.map(e=> e.ymd.substring(0,4) + '年' + e.ymd.substring(5,7) + '月')
-          }
-
-          
-        }
         })
+        .then((res) => {
+          if (res?.data) {
+            if (this.timeType == 0) {
+              this.resX = res.data.trend.map((e) =>e.ymd.substring(5, 7) + "月" + e.ymd.substring(8, 10) + "日");
+            } else if (this.timeType == 1) {
+              this.resX = res.data.trend.map((e) =>e.ymd.substring(5, 7) + "月" + e.ymd.substring(8, 10) + "日");
+            } else if (this.timeType == 2) {
+              this.resX = res.data.trend.map((e) =>e.ymd.substring(0, 4) + "年" + e.ymd.substring(5, 7) + "月");
+            }
+            this.resY = res.data.trend.map((e) => e.receiveCount);
+            this.peopleNum = this.resY.reduce((accumulator, currentValue)=>{ return accumulator + currentValue})
+            this.res2Y = res.data.trend.map((e) => e.executeCount);
+            this.sendNum = this.res2Y.reduce((accumulator, currentValue)=>{ return accumulator + currentValue})
+            this.res3Y = res.data.trend.map((e) => e.createCount);
+            this.predictNum = this.res3Y.reduce((accumulator, currentValue)=>{ return accumulator + currentValue})
+          }
+        });
     },
     // 触发人数
     getBrokenEcharts1() {
-      this.brokenEcharts1 = echarts.init(document.getElementById('brokenEcharts1'))
+      let dataX = this.resX;
-      this.brokenEcharts1.setOption({
+      let dataY1 = this.resY;
+      console.log(dataX);
+      console.log(dataY1);
+      this.brokenEcharts1 = echarts.init(
+        document.getElementById("brokenEcharts1")
+      );
+      const option = {
         tooltip: {
-          trigger: 'axis'
+          trigger: "axis",
         },
         grid: {
-          left: '2%',
+          left: "2%",
-          right: '5%',
+          right: "5%",
-          bottom: '2%',
+          bottom: "2%",
-          containLabel: true
+          containLabel: true,
         },
         dataZoom: [
           {
-            id: 'dataZoomX',
+            id: "dataZoomX",
-            type: 'slider',
+            type: "slider",
             xAxisIndex: [0],
-            filterMode: 'filter'
+            filterMode: "filter",
           },
         ],
         xAxis: {
-          type: 'category',
+          type: "category",
           boundaryGap: false,
           axisTick: {
             show: false,
@@ -269,54 +414,58 @@ export default {
           axisLine: {
             show: false,
           },
-          data: this.x
+          data: dataX,
         },
         yAxis: {
-          type: 'value',
+          type: "value",
           axisTick: {
             show: false,
           },
           axisLine: {
             show: false,
-          }
+          },
         },
         series: [
           {
-            type: 'line',
+            type: "line",
-            data: [120, 132, 101, 134, 90, 230],
+            data: dataY1,
             lineStyle: {
-              color: '#4B87FE',
+              color: "#4B87FE",
             },
             itemStyle: {
-              color: '#4E8EEE'
+              color: "#4E8EEE",
-            }
             },
-        ]
+          },
-      })
+        ],
+      };
+      option && this.brokenEcharts1.setOption(option);
     },
     // 宣发次数
     getBrokenEcharts2() {
-      this.brokenEcharts2 = echarts.init(document.getElementById('brokenEcharts2'))
+      this.brokenEcharts2 = echarts.init(
+        document.getElementById("brokenEcharts2")
+      );
       this.brokenEcharts2.setOption({
         tooltip: {
-          trigger: 'axis'
+          trigger: "axis",
         },
         grid: {
-          left: '2%',
+          left: "2%",
-          right: '5%',
+          right: "5%",
-          bottom: '2%',
+          bottom: "2%",
-          containLabel: true
+          containLabel: true,
         },
         dataZoom: [
           {
-            id: 'dataZoomX',
+            id: "dataZoomX",
-            type: 'slider',
+            type: "slider",
             xAxisIndex: [0],
-            filterMode: 'filter'
+            filterMode: "filter",
           },
         ],
+        calculable: true,
         xAxis: {
-          type: 'category',
+          type: "category",
           boundaryGap: false,
           axisTick: {
             show: false,
@@ -324,54 +473,56 @@ export default {
           axisLine: {
             show: false,
           },
-          data: ['2月', '3月', '4月', '5月', '6月', '7月']
+          data: this.resX,
         },
         yAxis: {
-          type: 'value',
+          type: "value",
           axisTick: {
             show: false,
           },
           axisLine: {
             show: false,
-          }
+          },
         },
         series: [
           {
-            type: 'line',
+            type: "line",
-            data: [220, 182, 191, 234, 290, 330],
+            data: this.res2Y,
             lineStyle: {
-              color: '#32C5FF',
+              color: "#32C5FF",
             },
             itemStyle: {
-              color: '#31C1FA'
+              color: "#31C1FA",
-            }
             },
-        ]
+          },
-      })
+        ],
+      });
     },
     // 宣发任务数
     getBrokenEcharts3() {
-      this.brokenEcharts3 = echarts.init(document.getElementById('brokenEcharts3'))
+      this.brokenEcharts3 = echarts.init(
+        document.getElementById("brokenEcharts3")
+      );
       this.brokenEcharts3.setOption({
         tooltip: {
-          trigger: 'axis'
+          trigger: "axis",
         },
         grid: {
-          left: '2%',
+          left: "2%",
-          right: '5%',
+          right: "5%",
-          bottom: '2%',
+          bottom: "2%",
-          containLabel: true
+          containLabel: true,
         },
         dataZoom: [
           {
-            id: 'dataZoomX',
+            id: "dataZoomX",
-            type: 'slider',
+            type: "slider",
             xAxisIndex: [0],
-            filterMode: 'filter'
+            filterMode: "filter",
           },
         ],
         xAxis: {
-          type: 'category',
+          type: "category",
           boundaryGap: false,
           axisTick: {
             show: false,
@@ -379,60 +530,63 @@ export default {
           axisLine: {
             show: false,
           },
-          data: ['2月', '3月', '4月', '5月', '6月', '7月']
+          data: this.resX,
         },
         yAxis: {
-          type: 'value',
+          type: "value",
           axisTick: {
             show: false,
           },
           axisLine: {
             show: false,
-          }
+          },
         },
         series: [
           {
-            type: 'line',
+            type: "line",
-            data: [1000, 232, 201, 154, 190, 330],
+            data: this.res3Y,
             lineStyle: {
-              color: '#FFAA44',
+              color: "#FFAA44",
             },
             itemStyle: {
-              color: '#FFAA44'
+              color: "#FFAA44",
-            }
             },
-        ]
+          },
-      })
+        ],
+      });
     },
     // 宣发明细
     getColData() {
-      this.$http.post(`/app/appmasssendingtask/statisticsDepart`, null, {
+      this.$http
+        .post(`/app/appmasssendingtask/statisticsDepart`, null, {
           params: {
-          type: this.detailType
+            type: this.detailType,
-        }
+          },
-      }).then(res=> {
-        // console.log(res);
-        if(res?.data) {
-          console.log(res);
-          this.colData = res.data
-        }
         })
+        .then((res) => {
+          if (res?.data) {
+            console.log(res);
+            this.colData = res.data;
+          }
+        });
     },
     getColumnarEcharts() {
-      this.columnarEcharts = echarts.init(document.getElementById('columnarEcharts'))
+      this.columnarEcharts = echarts.init(
+        document.getElementById("columnarEcharts")
+      );
       this.columnarEcharts.setOption({
         xAxis: {
-          type: 'category',
+          type: "category",
           axisTick: {
             show: false,
           },
           axisLine: {
             show: false,
           },
-          data: ['卫健委', '法院', '团委', '扶贫办', '警察局']
+          data: ["卫健委", "法院", "团委", "扶贫办", "警察局"],
         },
         yAxis: {
-          type: 'value',
+          type: "value",
           axisTick: {
             show: false,
           },
@@ -443,47 +597,43 @@ export default {
         series: [
           {
             data: [120, 200, 150, 80, 70, 110, 130],
-            itemStyle:{
+            itemStyle: {
-              normal:{
+              normal: {
-                  color:'#5087ec'
+                color: "#5087ec",
-              }
               },
-            type: 'bar'
-          }
-        ]
-      })
             },
-
+            type: "bar",
-
+          },
-    
+        ],
-  }
+      });
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .AppPropagandaStatistics {
-
   .calendar_header {
     padding: 26px 32px;
     box-sizing: border-box;
-    background: #FFF;
+    background: #fff;
     ::v-deep .u-section__title__text {
       font-size: 32px;
     }
   }
   .threeDays {
-    background: #FFF;
+    background: #fff;
     padding: 8px 32px 12px 32px;
     box-sizing: border-box;
     .yesterday,
     .today,
     .tomorrow {
-      background: #F7F8FA;
+      background: #f7f8fa;
       margin-bottom: 32px;
       padding: 30px 0 30px 40px;
       box-sizing: border-box;
       .isShow {
-        color: #3AA0FF;
+        color: #3aa0ff;
       }
       .itemYesterday,
       .itemToday,
@@ -492,21 +642,19 @@ export default {
         span {
           margin-left: 20px;
         }
-        
       }
     }
     .yesterday {
-      border-left: 6px solid #FBD444;
+      border-left: 6px solid #fbd444;
     }
     .today {
-      border-left: 6px solid #50CB74;
+      border-left: 6px solid #50cb74;
     }
     .tomorrow {
-      border-left: 6px solid #3AA0FF;
+      border-left: 6px solid #3aa0ff;
     }
   }
 
-  
   .brokenEcharts,
   .columnarEcharts {
     margin: 24px 0 24px 0;
@@ -537,12 +685,12 @@ export default {
           margin-right: 12px;
           padding: 8px 10px;
           display: inline-block;
-          border: 1px solid #DDD;
+          border: 1px solid #ddd;
           border-radius: 8px;
         }
         .active {
-          background: #3399FF;
+          background: #3399ff;
-          color: #FFF;
+          color: #fff;
         }
       }
     }
@@ -579,7 +727,7 @@ export default {
 
   .brokenEcharts,
   .columnarEcharts {
-    background: #FFF;
+    background: #fff;
 
     #brokenEcharts1,
     #brokenEcharts2,
@@ -587,24 +735,24 @@ export default {
     #columnarEcharts {
       width: 100%;
       height: 400px;
-      background: #F9F9F9;
+      background: #f9f9f9;
       border-radius: 8px;
     }
   }
 
-  .popup{
+  .popup {
     box-sizing: border-box;
     // height: 800px;
-    .tips{
+    .tips {
       width: 80px;
       height: 6px;
-      background: #DDDDDD;
+      background: #dddddd;
       border-radius: 4px;
       padding: 0 32px;
       box-sizing: border-box;
       margin: 32px auto 8px auto;
     }
-    .title{
+    .title {
       height: 48px;
       line-height: 48px;
       font-size: 34px;
@@ -614,56 +762,55 @@ export default {
       padding: 0 32px;
       box-sizing: border-box;
       padding-bottom: 32px;
-      .cancel{
+      .cancel {
         display: inline-block;
         width: 200px;
         color: #aaa;
       }
-      .confirm{
+      .confirm {
         display: inline-block;
         width: 200px;
         text-align: right;
         color: #333;
       }
-      p{
+      p {
         display: inline-block;
         width: calc(100% - 400px);
         text-align: center;
         font-size: 28px;
       }
     }
-    .select-content{
+    .select-content {
       height: calc(100% - 100px);
       overflow-y: scroll;
     }
-    .type-list{
+    .type-list {
       padding: 0 32px;
       box-sizing: border-box;
       margin-bottom: 32px;
-      .type-title{
+      .type-title {
         line-height: 108px;
         font-size: 32px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: #333;
       }
-      .item{
+      .item {
         display: inline-block;
         width: 210px;
         text-align: center;
         line-height: 64px;
-        background: #F3F4F7;
+        background: #f3f4f7;
         border-radius: 4px;
         margin: 0 16px 16px 0;
         font-size: 28px;
         font-family: PingFangSC-Regular, PingFang SC;
         color: #333;
       }
-      .active{
+      .active {
-        background: #1365DD;
+        background: #1365dd;
         color: #fff;
       }
-      
     }
     .popBtn {
       display: flex;
@@ -671,15 +818,15 @@ export default {
       line-height: 98px;
       div {
         width: 50%;
-        border: 2px solid #3399FF;
+        border: 2px solid #3399ff;
         text-align: center;
       }
       div:first-child {
-        color: #3399FF;
+        color: #3399ff;
       }
       div:last-child {
-        color: #FFF;
+        color: #fff;
-        background: #3399FF;
+        background: #3399ff;
       }
     }
   }
@@ -687,23 +834,24 @@ export default {
   .customPop {
     padding: 80px 32px 20px 32px;
     box-sizing: border-box;
+    height: 600px;
 
     .startTime,
     .endTime {
-      border-bottom: 1px solid #DDD;
+      border-bottom: 1px solid #ddd;
       margin-bottom: 20px;
     }
 
     .timeBtn {
       width: 100%;
-      background: #3399FF;
+      background: #3399ff;
       height: 80px;
       line-height: 80px;
       text-align: center;
       border-radius: 16px;
-      color: #FFF;
+      color: #fff;
+      margin-top: 164px;
     }
   }
 }
-
 </style>

src/project/saas/AppPropagandaStatistics/calendarInfo.vue

@@ -29,23 +29,60 @@ export default {
   data() {
     return {
       date: '',
-      selected: [{date: '2022-07-12'}],
+      selected: [],
       list: [{
         time: '11:00',
         info: '晴风小区志愿者活动'
-      }]
+      }],
+      calendarList: {},
+      year: '',
+      month: '',
+      day: '',
     }
   },
   components: {
     uniCalendar
   },
+  created() {
+    this.getNowDay()
+    this.getData()
+    
+  },
   methods: {
     change(val) {
       this.date = `${val.year} + '-' + ${val.month} + '-' + ${val.day}`
     },
+    getNowDay() {
+      const date = new Date()
+      this.year = date.getFullYear()
+      this.month = date.getMonth() + 1
+    },
     toGroup() {
       uni.navigateTo({url: './groupSendResident'})
+    },
+    getData() {
+      this.$http.post(`/app/appmasssendingtask/statisticsCalendar`, null, {
+        params: {},
+      })
+      .then((res) => {
+        if (res?.data) {
+          this.calendarList = res.data;
+          var arr = Object.keys(res.data).map(key => (res.data[key]))
+          var calList = arr.filter(item=> (item.taskList && item.taskList.length > 0))
+          this.selected = calList.map(item=> {
+            if(item.day>=1 && item.day<=9) {
+              if(this.month>=1 && this.month <=9) {
+                return this.year + '-' + '0' + this.month + '-' + '0' + item.day
               } 
+            } else if(item.day> 9) {
+              if(this.month > 9) {
+                return this.year + '-' + this.month + '-' + item.day
+              } 
+            }
+          })
+        }
+      });
+    },
   },
   onShow() {
     document.title = '宣发日历'

src/project/saas/AppPropagandaStatistics/detail.vue

@@ -1,106 +0,0 @@
-<template>
-  <div class="detail">
-    <div class="task">
-      <div class="task_title">群发客户群</div>
-      <div class="task_content">
-        <div class="item">
-          <span>任务名称</span>
-          <span>居民社保最新政策</span>
-        </div>
-        <div class="item">
-          <span>创建人</span>
-          <span>居民社保最新政策</span>
-        </div>
-        <div class="item">
-          <span>所在部门</span>
-          <span>居民社保最新政策</span>
-        </div>
-        <div class="item">
-          <span>群发时间</span>
-          <span>居民社保最新政策</span>
-        </div>
-      </div>
-    </div>
-    <div class="info">
-      <div class="scope">
-        <span>群发范围</span>
-        <span>按条件筛选的全部X个客户群</span>
-      </div>
-      <div class="content">
-        <p>群发内容</p>
-        <div></div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-
-    }
-  },
-  methods: {},
-  onShow() {
-    document.title = "群发审批"
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.detail {
-  padding: 32px;
-  box-sizing: border-box;
-  .task {
-    margin-bottom: 24px;
-    background: #FFF;
-    border-radius: 8px;
-    box-shadow: inset 0px -1px 0px 0px #DDDDDD;
-    .task_title {
-      padding: 26px 32px;
-      box-sizing: border-box;
-      border-bottom: 2px solid #DDDDDD;
-    }
-    .task_content {
-      padding: 0 32px 26px 32px;
-      box-sizing: border-box;
-      .item {
-        display: flex;
-        padding-top: 26px;
-        box-sizing: border-box;
-        span:first-child {
-          width: 160px;
-          color: #999999;
-        }
-        span:last-child {
-          width: calc(100% - 160px);
-        }
-      }
-    }
-  }
-
-  .info {
-    background: #FFF;
-    border-radius: 8px;
-    padding: 26px 32px;
-    box-sizing: border-box;
-    .scope {
-      display: flex;
-      margin-bottom: 16px;
-      span:first-child {
-        width: 160px;
-        color: #999;
-      }
-      span:last-child {
-        width: calc(100% - 160px);
-      }
-    }
-    .content {
-      p {
-        color: #999;
-      }
-    }
-  }
-}
-</style>

src/project/saas/AppPropagandaStatistics/groupSendResident.vue

@@ -1,116 +0,0 @@
-<template>
-  <div class="groupSendResident">
-    <AiTopFixed>
-      <div class="search">
-        <div class="searchBox">
-          <u-search placeholder="请输入任务名称" v-model="name" :show-action="false"></u-search>
-        </div>
-        <div class="filterBtn"><img src="./images/shaixuan.png" alt="">筛选</div>
-      </div>
-    </AiTopFixed>
-    <div class="resident_list">
-      <div class="card" @click="toDetail" v-for="(item,index) in list" :key="index">
-        <div class="card_title">
-          <div class="card_left">{{ item.content }}</div>
-          <div class="card_right"><span></span>进行中</div>
-        </div>
-        <div>创建时间：<span>{{ item.createTime }}</span></div>
-        <div>共需<span class="num">56</span>名成员完成群发，目前已完成<span class="num">65%</span></div>
-        <div>创建部门：<span>{{ item.createUserDept }}</span></div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      current: 1,
-      name: '',
-      list: [],
-    }
-  },
-  methods: {
-    toDetail() {
-      uni.navigateTo({url: `./groupSendDetail`})
-    },
-    getList() {
-      this.$http.post(`/app/appmasssendingtask/list`, null, {
-        params: {
-          current: this.current,
-
-        }
-      }).then(res=> {
-        if(res?.data) {
-          this.list = this.current == 1?  res.data.records : [...res.data.records, ...this.list]
-        }
-        console.log(res);
-      })
-    }
-  },
-  onShow() {
-    document.title = '群发居民群'
-    this.getList()
-  },
-  onReachBottom() {
-    this.current ++
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.groupSendResident {
-  .search {
-    display: flex;
-    height: 80px;
-    align-items: center;
-    justify-content: space-between;
-
-    .searchBox {
-      width: 562px;
-    }
-    .filterBtn {
-      img {
-        width: 28px;
-        height: 28px;
-      }
-    }
-  }
-  .resident_list {
-    padding: 24px 32px 20px 32px;
-    box-sizing: border-box;
-    .card {
-      background: #FFF;
-      border-radius: 16px;
-      padding: 30px;
-      margin-bottom: 24px;
-      & > div {
-        padding: 10px 0;
-      }
-      .num {
-        color: #3AA0FF;
-      }
-      .card_title {
-        display: flex;
-        justify-content: space-between;
-        .card_left {
-          font-size: 32px;
-          color: #000000;
-          font-weight: 600;
-        }
-        .card_right {
-          span {
-            display: inline-block;
-            width: 16px;
-            height: 16px;
-            background: #3399FF;
-            border-radius: 50%;
-            margin-right: 10px;
-          }
-        }
-      }
-    }
-  }
-}
-</style>