elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

去掉消息推送，navbar查看历史记录

chengyang
是小王呀\24601 9 months ago
parent
f4427f93c4
commit
ddeac8b292
12 changed files with 116 additions and 197 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/main-navbar.vue
  2. 4
      src/views/modules/communityParty/activity/initiateActivity.vue
  3. 4
      src/views/modules/communityParty/comPromotion/add.vue
  4. 4
      src/views/modules/communityParty/policeCivilianInteraction/add.vue
  5. 4
      src/views/modules/communityParty/threeAffairsDisclosure/add.vue
  6. 191
      src/views/modules/communityService/fuwuzhaoren/personList.vue
  7. 6
      src/views/modules/communityService/gangweizhaoren/personList.vue
  8. 6
      src/views/modules/communityService/jinengzhaoren/personList.vue
  9. 8
      src/views/modules/communityService/policy/personList.vue
  10. 4
      src/views/modules/communityService/wennuanzhaoren/personList.vue
  11. 74
      src/views/modules/home/index.vue
  12. 4
      src/views/modules/workPc/guidance/add.vue

4
src/views/main-navbar.vue
View File

@ -37,11 +37,11 @@
</el-menu> </el-menu>
<el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 180px"> <el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 180px">
<el-menu-item index="3" @click="toImportRecord"> <!-- <el-menu-item index="3" @click="toImportRecord">
<div class="img-nav"> <div class="img-nav">
<div class="img-wrap"><img src="~@/assets/images/main/time.png" /></div> <div class="img-wrap"><img src="~@/assets/images/main/time.png" /></div>
</div> </div>
</el-menu-item> </el-menu-item> -->
<el-menu-item index="2" @click="toNoticePage"> <el-menu-item index="2" @click="toNoticePage">
<div class="img-nav" :class="{ 'z-on': false }"> <div class="img-nav" :class="{ 'z-on': false }">

4
src/views/modules/communityParty/activity/initiateActivity.vue
View File

@ -140,12 +140,12 @@
<el-input-number v-model="formData.participants" @change="handleChange" :min="1" <el-input-number v-model="formData.participants" @change="handleChange" :min="1"
label="描述文字"></el-input-number> label="描述文字"></el-input-number>
</el-form-item> </el-form-item>
<!--
<el-form-item label="消息推送" label-width="140px"> <el-form-item label="消息推送" label-width="140px">
<el-checkbox-group v-model="formData.sendMessage"> <el-checkbox-group v-model="formData.sendMessage">
<el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox> <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item> -->
</div> </div>
</el-form> </el-form>
</div> </div>

4
src/views/modules/communityParty/comPromotion/add.vue
View File

@ -44,9 +44,9 @@
<el-form-item label="显示排序" style="display: block" prop="top" label-width="150px"> <el-form-item label="显示排序" style="display: block" prop="top" label-width="150px">
<el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number> <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="消息推送" label-width="150px" prop="sendMsg"> <!-- <el-form-item label="消息推送" label-width="150px" prop="sendMsg">
<el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox> <el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
</div> </div>

4
src/views/modules/communityParty/policeCivilianInteraction/add.vue
View File

@ -44,9 +44,9 @@
<el-form-item label="显示排序" style="display: block" prop="sort" label-width="150px"> <el-form-item label="显示排序" style="display: block" prop="sort" label-width="150px">
<el-input-number v-model="formData.sort" @change="handleChange" :min="1" :max="1000" label="描述文字"></el-input-number> <el-input-number v-model="formData.sort" @change="handleChange" :min="1" :max="1000" label="描述文字"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="消息推送" label-width="150px" prop="sendMsg"> <!-- <el-form-item label="消息推送" label-width="150px" prop="sendMsg">
<el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox> <el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
</div> </div>

4
src/views/modules/communityParty/threeAffairsDisclosure/add.vue
View File

@ -44,9 +44,9 @@
<el-form-item label="显示排序" style="display: block" prop="sort" label-width="150px"> <el-form-item label="显示排序" style="display: block" prop="sort" label-width="150px">
<el-input-number v-model="formData.sort" @change="handleChange" :min="1" :max="1000" label="描述文字"></el-input-number> <el-input-number v-model="formData.sort" @change="handleChange" :min="1" :max="1000" label="描述文字"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="消息推送" label-width="150px" prop="sendMsg"> <!-- <el-form-item label="消息推送" label-width="150px" prop="sendMsg">
<el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox> <el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
</div> </div>

191
src/views/modules/communityService/fuwuzhaoren/personList.vue
View File

@ -1,95 +1,55 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<el-form <el-form :inline="true" :model="searchFormData" ref="ref_searchform" :label-width="'110px'">
:inline="true"
:model="searchFormData"
ref="ref_searchform"
:label-width="'110px'">
<el-form-item label="所属组织" prop="orgId"> <el-form-item label="所属组织" prop="orgId">
<el-cascader <el-cascader @change="handleOrgChange" :options="orgTree" :props="orgOptionProps" clearable
@change="handleOrgChange" placeholder="请选择组织"></el-cascader>
:options="orgTree"
:props="orgOptionProps"
clearable
placeholder="请选择组织"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="人员姓名" prop="title"> <el-form-item label="人员姓名" prop="title">
<el-input <el-input v-model.trim="searchFormData.name" class="u-item-width-normal" size="small" clearable
v-model.trim="searchFormData.name" placeholder="请输入">
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="title"> <el-form-item label="手机号" prop="title">
<el-input <el-input v-model.trim="searchFormData.mobile" class="u-item-width-normal" size="small" clearable
v-model.trim="searchFormData.mobile" placeholder="请输入">
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="title"> <el-form-item label="身份证号" prop="title">
<el-input <el-input v-model.trim="searchFormData.idCard" class="u-item-width-normal" size="small" clearable
v-model.trim="searchFormData.idCard" placeholder="请输入">
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="享受服务次数" prop="title"> <el-form-item label="享受服务次数" prop="title">
<el-input <el-input v-model.trim="searchFormData.serveTimes" class="u-item-width-normal" size="small" clearable
v-model.trim="searchFormData.serveTimes" placeholder="请输入">
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="家庭住址" prop="title"> <el-form-item label="家庭住址" prop="title">
<el-select v-model.trim="searchFormData.villageId" placeholder="请选择小区" <el-select v-model.trim="searchFormData.villageId" placeholder="请选择小区" @change="handleQuarterSelectorsChange"
@change="handleQuarterSelectorsChange" clearable> clearable>
<el-option <el-option v-for="item in quartersSelectItems" :key="item.value" :label="item.label" :value="item.value">
v-for="item in quartersSelectItems"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model.trim="searchFormData.buildId" placeholder="请选择楼栋" <el-select v-model.trim="searchFormData.buildId" placeholder="请选择楼栋" @change="handleBuildSelectorsChange"
@change="handleBuildSelectorsChange" clearable> clearable>
<el-option <el-option v-for="item in buildingSelectItems" :key="item.value" :label="item.label" :value="item.value">
v-for="item in buildingSelectItems"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model.trim="searchFormData.unitId" placeholder="请选择单元" <el-select v-model.trim="searchFormData.unitId" placeholder="请选择单元" @change="handleUnitSelectorsChange"
@change="handleUnitSelectorsChange" clearable> clearable>
<el-option <el-option v-for="item in unitSelectItems" :key="item.value" :label="item.label" :value="item.value">
v-for="item in unitSelectItems"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model.trim="searchFormData.homeId" placeholder="请选择房屋" <el-select v-model.trim="searchFormData.homeId" placeholder="请选择房屋" @change="handleUnitSelectorsChange"
@change="handleUnitSelectorsChange" clearable> clearable>
<el-option <el-option v-for="item in homeSelectItems" :key="item.value" :label="item.label" :value="item.value">
v-for="item in homeSelectItems"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -98,89 +58,52 @@
<div class="div_btn"> <div class="div_btn">
<el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button> <!-- <el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button> -->
<el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button> <el-button type="primary" size="small" class="diy-button--blue"
@click="handleIncrementServeTimes">标记享受服务人员</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
</div> </div>
<div class="m-table"> <div class="m-table">
<!--表格--> <!--表格-->
<el-table <el-table :data="personList" height="250" border @select-all="handleSelectAll"
:data="personList" @selection-change="handleTableRowsSelected" style="width: 100%">
height="250"
border <el-table-column type="selection" width="55">
@select-all="handleSelectAll"
@selection-change="handleTableRowsSelected"
style="width: 100%">
<el-table-column
type="selection"
width="55">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="agencyName" label="所属组织" width="180">
prop="agencyName"
label="所属组织"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="gridName" label="所属网格" width="180">
prop="gridName"
label="所属网格"
width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="name" label="姓名">
prop="name"
label="姓名">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="genderDisplay" label="性别">
prop="genderDisplay"
label="性别">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="birthday" width="170" label="出生日期">
prop="birthday"
width="170"
label="出生日期">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="age" label="年龄">
prop="age"
label="年龄">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="mobile" width="120" label="手机号">
prop="mobile"
width="120"
label="手机号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="idCard" width="180" label="身份证号">
prop="idCard"
width="180"
label="身份证号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="address" width="250" label="家庭住址">
prop="address"
width="250"
label="家庭住址">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="serveTimes" label="享受服务次数">
prop="serveTimes"
label="享受服务次数">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column prop="" label="公众号消息推送">已推送
prop="" </el-table-column> -->
label="公众号消息推送">已推送 <el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<!-- <el-button @click="handelCLickShowCheckPassword(scope.row)" type="text" size="small">编辑</el-button> -->
<el-button type="text" @click="deleteBatch(scope.row)" size="small">删除</el-button>
</template>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
label="操作"
width="100">
<template slot-scope="scope">
<!-- <el-button @click="handelCLickShowCheckPassword(scope.row)" type="text" size="small">编辑</el-button> -->
<el-button type="text" @click="deleteBatch(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog width="800px" :center="true" title="密码验证" :visible.sync="showCheckPassword" :modal-append-to-body="false" :close-on-click-modal="true" <el-dialog width="800px" :center="true" title="密码验证" :visible.sync="showCheckPassword" :modal-append-to-body="false"
:close-on-press-escape="true"> :close-on-click-modal="true" :close-on-press-escape="true">
<el-form :model="checkPasswordFrom" :rules="checkPasswordRulse" ref="checkPasswordFrom"> <el-form :model="checkPasswordFrom" :rules="checkPasswordRulse" ref="checkPasswordFrom">
<el-form-item label="密码" prop="password"> <el-form-item label="密码" prop="password">
<el-input v-model.trim="checkPasswordFrom.password" autocomplete="off" type="password" placeholder="请输入当前账号密码" <el-input v-model.trim="checkPasswordFrom.password" autocomplete="off" type="password" placeholder="请输入当前账号密码"
@ -194,15 +117,9 @@
</el-dialog> </el-dialog>
<!--分页条--> <!--分页条-->
<el-pagination <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
@size-change="handleSizeChange" :current-page.sync="searchFormData.pageNo" :page-sizes="pageSizes" :page-size="searchFormData.pageSize"
@current-change="handleCurrentChange" layout="sizes, prev, pager, next, total" background :total="total">
:current-page.sync="searchFormData.pageNo"
:page-sizes="pageSizes"
:page-size="searchFormData.pageSize"
layout="sizes, prev, pager, next, total"
background
:total="total">
</el-pagination> </el-pagination>
</div> </div>
</template> </template>

6
src/views/modules/communityService/gangweizhaoren/personList.vue
View File

@ -98,7 +98,7 @@
<div class="div_btn"> <div class="div_btn">
<el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button> <!-- <el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button> -->
<el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
</div> </div>
@ -164,10 +164,10 @@
prop="serveTimes" prop="serveTimes"
label="享受服务次数"> label="享受服务次数">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
prop="" prop=""
label="公众号消息推送">已推送 label="公众号消息推送">已推送
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
fixed="right" fixed="right"
label="操作" label="操作"

6
src/views/modules/communityService/jinengzhaoren/personList.vue
View File

@ -98,7 +98,7 @@
<div class="div_btn"> <div class="div_btn">
<el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button> <!-- <el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button> -->
<el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
<el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
</div> </div>
@ -164,10 +164,10 @@
prop="serveTimes" prop="serveTimes"
label="享受服务次数"> label="享受服务次数">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
prop="" prop=""
label="公众号消息推送">已推送 label="公众号消息推送">已推送
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
fixed="right" fixed="right"
label="操作" label="操作"

8
src/views/modules/communityService/policy/personList.vue
View File

@ -124,12 +124,12 @@
<div class="div_btn"> <div class="div_btn">
<el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button> <el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button>
<el-button <!-- <el-button
type="primary" type="primary"
size="small" size="small"
class="diy-button--red" class="diy-button--red"
@click="sendFindPeopleMsg" @click="sendFindPeopleMsg"
>公众号消息推送</el-button >公众号消息推送</el-button -->
> >
<el-button <el-button
type="primary" type="primary"
@ -176,8 +176,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="serveTimes" label="享受服务次数"> <el-table-column prop="serveTimes" label="享受服务次数">
</el-table-column> </el-table-column>
<el-table-column prop="" width="100" label="公众号消息推送" >已推送 <!-- <el-table-column prop="" width="100" label="公众号消息推送" >已推送
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
fixed="right" fixed="right"
label="操作" label="操作"

4
src/views/modules/communityService/wennuanzhaoren/personList.vue
View File

@ -169,10 +169,10 @@
prop="serveTimes" prop="serveTimes"
label="享受服务次数"> label="享受服务次数">
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
prop="" prop=""
label="公众号消息推送">已推送 label="公众号消息推送">已推送
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
fixed="right" fixed="right"
label="操作" label="操作"

74
src/views/modules/home/index.vue
View File

@ -1533,18 +1533,18 @@ this.getStatistics()
} }
], ],
// 在中心添加显示总数的文本 // 在中心添加显示总数的文本
graphic: { // graphic: {
type: 'text', // type: 'text',
left: 'center', // left: 'center',
top: '45%', // top: '45%',
style: { // style: {
text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数 // text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数
textAlign: 'center', // textAlign: 'center',
fill: '#333', // fill: '#333',
fontSize: 24, // fontSize: 24,
fontWeight: 'bold' // fontWeight: 'bold'
} // }
} // }
}; };
myChart.setOption(option); myChart.setOption(option);
@ -1619,18 +1619,18 @@ this.getStatistics()
} }
], ],
// 在中心添加显示总数的文本 // 在中心添加显示总数的文本
graphic: { // graphic: {
type: 'text', // type: 'text',
left: 'center', // left: 'center',
top: '45%', // top: '45%',
style: { // style: {
text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数 // text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数
textAlign: 'center', // textAlign: 'center',
fill: '#333', // fill: '#333',
fontSize: 24, // fontSize: 24,
fontWeight: 'bold' // fontWeight: 'bold'
} // }
} // }
}; };
myChart.setOption(option); myChart.setOption(option);
@ -1703,18 +1703,18 @@ this.getStatistics()
} }
], ],
// 在中心添加显示总数的文本 // 在中心添加显示总数的文本
graphic: { // graphic: {
type: 'text', // type: 'text',
left: 'center', // left: 'center',
top: '45%', // top: '45%',
style: { // style: {
text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数 // text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数
textAlign: 'center', // textAlign: 'center',
fill: '#333', // fill: '#333',
fontSize: 24, // fontSize: 24,
fontWeight: 'bold' // fontWeight: 'bold'
} // }
} // }
}; };
myChart.setOption(option); myChart.setOption(option);
@ -1973,6 +1973,8 @@ this.getStatistics()
}, },
async getStatistics() { async getStatistics() {
const url = "/epmetuser/user/getRegionalStatistics"; const url = "/epmetuser/user/getRegionalStatistics";
const params = { const params = {

4
src/views/modules/workPc/guidance/add.vue
View File

@ -55,12 +55,12 @@
label="描述文字"></el-input-number> label="描述文字"></el-input-number>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label="消息推送" prop="sendMsg"> <el-form-item label="消息推送" prop="sendMsg">
<el-checkbox v-model="formData.sendMsg" @change="checkbox1" <el-checkbox v-model="formData.sendMsg" @change="checkbox1"
label="是否通过公众号推送给社区居民"></el-checkbox> label="是否通过公众号推送给社区居民"></el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> </el-col> <el-col :span="12"> </el-col>
<el-col :span="12"> </el-col> <el-col :span="12"> </el-col>
</el-row> </el-row>

Write Preview
Loading…
Cancel
Save