Merge branch 'feature/active_user'

src/views/modules/analysis/active/activeusercount-add-or-update.vue

@@ -0,0 +1,173 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="统计月份" prop="statisticalMonth">
+          <el-input v-model="dataForm.statisticalMonth" placeholder="统计月份"></el-input>
+      </el-form-item>
+          <el-form-item label="活跃用户数" prop="activeUserNum">
+          <el-input v-model="dataForm.activeUserNum" placeholder="活跃用户数"></el-input>
+      </el-form-item>
+          <el-form-item label="活跃居民数" prop="activeResidentNum">
+          <el-input v-model="dataForm.activeResidentNum" placeholder="活跃居民数"></el-input>
+      </el-form-item>
+          <el-form-item label="活跃党员数" prop="activePartyNum">
+          <el-input v-model="dataForm.activePartyNum" placeholder="活跃党员数"></el-input>
+      </el-form-item>
+          <el-form-item label="所属部门ID" prop="deptId">
+          <el-input v-model="dataForm.deptId" placeholder="所属部门ID"></el-input>
+      </el-form-item>
+          <el-form-item label="所属部门名称" prop="deptName">
+          <el-input v-model="dataForm.deptName" placeholder="所属部门名称"></el-input>
+      </el-form-item>
+          <el-form-item label="所有部门ID" prop="allDeptIds">
+          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>
+      </el-form-item>
+          <el-form-item label="所有部门名称" prop="allDeptNames">
+          <el-input v-model="dataForm.allDeptNames" placeholder="所有部门名称"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记 0：未删除，1：已删除 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        statisticalMonth: '',
+        activeUserNum: '',
+        activeResidentNum: '',
+        activePartyNum: '',
+        deptId: '',
+        deptName: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        statisticalMonth: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        activeUserNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        activeResidentNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        activePartyNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptNames: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/analysis/activeusercount/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/analysis/activeusercount/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>

src/views/modules/analysis/active/activeusercount.vue

@@ -0,0 +1,183 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-analysis__activeusercount}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="ids"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          >
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="统计月份" prop="statisticalMonth">
+           <el-date-picker
+            :clearable="false"
+            v-model="dataForm.statisticalMonth"
+            type="month"
+            value-format="yyyy-MM"
+            format="yyyy-MM"
+            placeholder="选择月份">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门类型" prop="deptType">
+          <el-select v-model="dataForm.deptType" placeholder="部门类型" clearable>
+            <el-option v-for="item in deptTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('analysis:activeusercount:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('analysis:activeusercount:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
+        <!-- <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column> -->
+        <!-- <el-table-column prop="deptId" label="所属部门ID" header-align="center" align="center"></el-table-column> -->
+        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="statisticalMonth" label="统计月份" header-align="center" align="center" width="150"></el-table-column>
+        <el-table-column prop="activeUserNum" label="活跃用户数" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <span v-if="scope.row.activeUserNum === 0">{{ scope.row.activeUserNum }}</span>
+            <el-button v-else type="text" @click="openDetailHandle(scope.row,'')">{{ scope.row.activeUserNum }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="activeResidentNum" label="活跃居民数" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <span v-if="scope.row.activeResidentNum === 0">{{ scope.row.activeResidentNum }}</span>
+            <el-button v-else type="text" @click="openDetailHandle(scope.row,'0')">{{ scope.row.activeResidentNum }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="activePartyNum" label="活跃党员数" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <span v-if="scope.row.activePartyNum === 0">{{ scope.row.activePartyNum }}</span>
+            <el-button v-else type="text" @click="openDetailHandle(scope.row,'1')">{{ scope.row.activePartyNum }}</el-button>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column> -->
+        <!-- <el-table-column prop="allDeptNames" label="所有部门名称" header-align="center" align="center" min-width="250" show-overflow-tooltip></el-table-column> -->
+        <!-- <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标记 0：未删除，1：已删除 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column> -->
+        <!-- <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" width="180"></el-table-column> -->
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150" v-if="false">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('analysis:activeusercount:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('analysis:activeusercount:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './activeusercount-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/cloudAnalysis/activeusercount/page',
+        getDataListIsPage: true,
+        deleteURL: '/cloudAnalysis/activeusercount',
+        deleteIsBatch: true,
+        exportURL: '/cloudAnalysis/activeusercount/export'
+      },
+      dataForm: {
+        id: '',
+        deptType: '',
+        statisticalMonth: '',
+        deptId: ''
+      },
+      deptTypeArr: [],
+      options: [],
+      ids: []
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.deptId = ''
+      } else {
+        this.dataForm.deptId = this.ids[val.length - 1]
+      }
+    }
+  },
+  created () {
+    // 默认显示当前月份
+    var year = new Date().getFullYear()
+    var month = new Date().getMonth() + 1
+    if (month < 10) {
+      month = '0' + month
+    }
+    this.dataForm.statisticalMonth = year + '-' + month
+    // 查询部门类型
+    this.getParamListInfo('dept_type')
+    // 查询所属部门
+    this.getOptions()
+    // 调用列表查询
+    this.getDataList()
+  },
+  methods: {
+    openDetailHandle (row, partyFlag) {
+      this.$parent.selectComponent = 'Activeuserinfo'
+      this.$router.push({ path: '/analysis-active-activeuserroute', query: { partyFlag: partyFlag, deptIds: row.deptId, statisticalMonth: row.statisticalMonth } })
+    },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    // 获取部门类型下拉信息
+    getParamListInfo (dictType) {
+      this.$http.get(`/sys/dict/listSimple/` + dictType).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        if (dictType === 'dept_type') {
+          this.deptTypeArr = res.data
+        }
+      }).catch(() => {})
+    }
+  }
+}
+</script>

src/views/modules/analysis/active/activeuserinfo-add-or-update.vue

@@ -0,0 +1,194 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="居民ID" prop="userId">
+          <el-input v-model="dataForm.userId" placeholder="居民ID"></el-input>
+      </el-form-item>
+          <el-form-item label="居民名称" prop="userName">
+          <el-input v-model="dataForm.userName" placeholder="居民名称"></el-input>
+      </el-form-item>
+          <el-form-item label="所属部门ID" prop="deptId">
+          <el-input v-model="dataForm.deptId" placeholder="所属部门ID"></el-input>
+      </el-form-item>
+          <el-form-item label="所属部门名称" prop="deptName">
+          <el-input v-model="dataForm.deptName" placeholder="所属部门名称"></el-input>
+      </el-form-item>
+          <el-form-item label="联系方式" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系方式"></el-input>
+      </el-form-item>
+          <el-form-item label="党员标识 0:居民；1:党员" prop="partyFlag">
+          <el-input v-model="dataForm.partyFlag" placeholder="党员标识 0:居民；1:党员"></el-input>
+      </el-form-item>
+          <el-form-item label="统计月份" prop="statisticalMonth">
+          <el-input v-model="dataForm.statisticalMonth" placeholder="统计月份"></el-input>
+      </el-form-item>
+          <el-form-item label="达成活跃用户时间" prop="reachActiveTime">
+          <el-input v-model="dataForm.reachActiveTime" placeholder="达成活跃用户时间"></el-input>
+      </el-form-item>
+          <el-form-item label="有效时间" prop="validTime">
+          <el-input v-model="dataForm.validTime" placeholder="有效时间"></el-input>
+      </el-form-item>
+          <el-form-item label="所有部门ID" prop="allDeptIds">
+          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>
+      </el-form-item>
+          <el-form-item label="所有部门名称" prop="allDeptNames">
+          <el-input v-model="dataForm.allDeptNames" placeholder="所有部门名称"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记 0：未删除，1：已删除 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        userName: '',
+        deptId: '',
+        deptName: '',
+        mobile: '',
+        partyFlag: '',
+        statisticalMonth: '',
+        reachActiveTime: '',
+        validTime: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        partyFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        statisticalMonth: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reachActiveTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        validTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptNames: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/analysis/activeuserinfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/analysis/activeuserinfo/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>

src/views/modules/analysis/active/activeuserinfo.vue

@@ -0,0 +1,154 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-analysis__activeuserinfo}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item>
+          <el-button type="primary" @click="backToUserCountList">{{"返回"}}</el-button>
+        </el-form-item>
+        <br>
+        <el-form-item label="所属部门" v-if="false">
+          <el-cascader
+            v-model="ids"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          >
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="居民名称" prop="userName">
+          <el-input v-model="dataForm.userName" placeholder="居民名称" clearable maxlength="20" @keyup.native="btKeyUpUserName"></el-input>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系方式" clearable maxlength="20" @keyup.native="btKeyUpMobile"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('analysis:activeuserinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('analysis:activeuserinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
+        <!-- <el-table-column prop="userId" label="居民ID" header-align="center" align="center"></el-table-column> -->
+        <el-table-column prop="userName" label="居民名称" header-align="center" align="center" width="150"></el-table-column>
+        <!-- <el-table-column prop="deptId" label="所属部门ID" header-align="center" align="center"></el-table-column> -->
+        <el-table-column prop="deptName" label="所属部门" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="mobile" label="联系方式" header-align="center" align="center" width="150"></el-table-column>
+        <!-- <el-table-column prop="partyFlag" label="党员标识 0:居民；1:党员" header-align="center" align="center"></el-table-column> -->
+        <el-table-column prop="statisticalMonth" label="统计月份" header-align="center" align="center" width="150"></el-table-column>
+        <el-table-column prop="reachActiveTime" label="达成活跃用户时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="validTime" label="有效时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所有部门" header-align="center" align="center" min-width="250" show-overflow-tooltip></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150" v-if="false">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('analysis:activeuserinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('analysis:activeuserinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './activeuserinfo-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/cloudAnalysis/activeuserinfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/cloudAnalysis/activeuserinfo',
+        deleteIsBatch: true,
+        exportURL: '/cloudAnalysis/activeuserinfo/export'
+      },
+      dataForm: {
+        id: '',
+        statisticalMonth: '',
+        deptId: '',
+        deptIds: '',
+        partyFlag: '',
+        mobile: '',
+        userName: ''
+      },
+      ids: [],
+      options: []
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.deptId = ''
+      } else {
+        this.dataForm.deptId = this.ids[val.length - 1]
+      }
+    }
+  },
+  created () {
+    // 查询所属部门
+    this.getOptions()
+  },
+  mounted () {
+    this.dataForm.statisticalMonth = this.$route.query.statisticalMonth
+    this.dataForm.deptIds = this.$route.query.deptIds
+    this.dataForm.partyFlag = this.$route.query.partyFlag
+    // 调用列表查询
+    this.getDataList()
+  },
+  methods: {
+    // 返回按钮点击事件
+    backToUserCountList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'Activeusercount'
+      this.$router.push({ path: '/analysis-active-activeuserroute' })
+    },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    btKeyUpUserName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.userName = e.target.value
+    },
+    btKeyUpMobile (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    }
+  }
+}
+</script>

src/views/modules/analysis/active/activeuserroute.vue

@@ -0,0 +1,29 @@
+<template>
+    <keep-alive include="activeusercount">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Activeusercount from './activeusercount'
+import Activeuserinfo from './activeuserinfo'
+export default {
+  data () {
+    return {
+      selectComponent: Activeusercount
+    }
+  },
+  components: {
+    Activeusercount,
+    Activeuserinfo
+  },
+  methods: {
+    init () {
+      this.selectComponent = Activeusercount
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/modules/analysis/export/operation.vue

@@ -28,7 +28,7 @@
         </el-form-item>
         <el-row>
           <el-form-item prop="newsReleaseStartTime"
-                        v-if="this.timeFlag==1"
+                        v-if="this.timeFlag=='1'"
                         label="有效时间">
             <el-date-picker @change='setRegistTime'
                             v-model="time"
@@ -42,7 +42,7 @@
         </el-row>
         <el-row>
           <el-form-item prop="endTime"
-                        v-if="this.timeFlag==0"
+                        v-if="this.timeFlag=='0'"
                         label="截止时间">
             <el-date-picker v-model="dataForm.endTime"
                             type="date"
@@ -55,7 +55,8 @@
         居民数(待认证居民+认证失败+认证通过+初次扫码进入网格但未认证)&nbsp;&nbsp;
         党员数(已认证党员数)&nbsp;&nbsp;
         新闻发布数 议题数 项目数 项目结案数
-        社群数 社群成员数 社群话题数
+        社群数 社群成员数 社群话题数&nbsp;
+        用户活跃率
         <br>
         <br>
         <el-row>
@@ -164,7 +165,7 @@ export default {
   mixins: [mixinViewModule],
   watch: {
     'timeFlag': function (val) {
-      if (val === 0) {
+      if (val === '0') {
         this.dataForm.operationStartTime = ''
         this.dataForm.operationEndTime = ''
         this.time = []

src/views/modules/heart/actinfo-add-or-update.vue

@@ -57,6 +57,7 @@
                         prop="signupEndTime">
             <el-date-picker v-model="dataForm.signupEndTime"
                             type="datetime"
+                            popper-class="date_picker"
                             value-format="yyyy-MM-dd HH:mm"
                             format="yyyy-MM-dd HH:mm"
                             :picker-options="isSignupEndTime"
@@ -359,7 +360,8 @@ export default {
       },
       isSignupEndTime: {
         disabledDate (time) {
-          return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
+          // return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
+          return time < Date.now()
         }
       },
       isImgRequired: true,
@@ -413,6 +415,26 @@ export default {
     }
   },
   created () {
+    // 初始化报名截止时间
+    var signupEndTimeDate = new Date(new Date().getTime() + 24 * 60 * 60 * 1000)
+    var year = signupEndTimeDate.getFullYear().toString()
+    var month = (signupEndTimeDate.getMonth() + 1).toString()
+    if (month < 10) {
+      month = '0' + month
+    }
+    var day = signupEndTimeDate.getDate().toString()
+    if (day < 10) {
+      day = '0' + day
+    }
+    var hours = signupEndTimeDate.getHours().toString()
+    if (hours < 10) {
+      hours = '0' + hours
+    }
+    var minutes = signupEndTimeDate.getMinutes().toString()
+    if (minutes < 10) {
+      minutes = '0' + minutes
+    }
+    this.dataForm.signupEndTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes
     this.$http
       .get(`/sys/user/deptOptions/getByLoginUser`)
       .then(({ data: res }) => {
@@ -905,3 +927,8 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+  .date_picker .el-button--text span {
+    display: none;
+  }
+</style>