This commit is contained in:
shijingjing
2023-03-01 14:15:58 +08:00
parent 72900b596b
commit 31881327de
6 changed files with 12 additions and 46 deletions

View File

@@ -115,7 +115,7 @@
} }
}, },
"/hzl": { "/hzl": {
"target": "http://192.168.1.87:39000/", "target": "http://192.168.1.87:39010/",
"changeOrigin": true, "changeOrigin": true,
"pathRewrite": { "pathRewrite": {
"^/hzl": "/" "^/hzl": "/"

View File

@@ -154,7 +154,7 @@ export default {
}, },
toDetail(item) { toDetail(item) {
if(this.tabIndex == 0) { if(this.tabIndex == 0) {
uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`}) uni.navigateTo({url: `./cooperationDetail?id=${item.id}&type=${this.sendType}`})
} else { } else {
uni.navigateTo({url: `./circleDetail??id=${item.id}&type=${this.sendType}`}) uni.navigateTo({url: `./circleDetail??id=${item.id}&type=${this.sendType}`})
} }

View File

@@ -154,40 +154,10 @@ export default {
choiceTime: '', // 定时发送时间 choiceTime: '', // 定时发送时间
sendScope: '', // 0全部居民群、1按部门选择、2按网格选择 sendScope: '', // 0全部居民群、1按部门选择、2按网格选择
sendType: '0', // 0立即发送、1定时发送 sendType: '0', // 0立即发送、1定时发送
wxGroups: [ // 发送范围 wxGroups: [], // 送达居民群
// {
// corpId: "ww596787bb70f08288",
// errorCode: null,
// errorMsg: null,
// groupCount: 1,
// groupIds: "wrytYEDgAAA5MGVJ3Ttb6ycbmxJ2Zv-Q",
// groupNames: "111",
// groupOwnerId: "d41d8cd98f00b204e9800998ecf8427e",
// groupOwnerName: "张硕",
// id: null,
// msgId: null,
// sendStatus: null,
// sendTime: null,
// taskId: null,
// },
// {
// corpId: "ww596787bb70f08288",
// errorCode: null,
// errorMsg: null,
// groupCount: 4,
// groupIds: "wrytYEDgAA-Llt9H1jr40WT1_RfOstWQ,wrytYEDgAADava7QSJGicwZg09nG_GXg,wrytYEDgAAKG6qd39fHWFkrTiT9vsSQQ,wrytYEDgAAPxVpqyzf4kwzwvtdE0nqbQ",
// groupNames: "慧政务需求沟通,临汾市政法委企微项目沟通,淄博企微项目沟通群,未命名群聊",
// groupOwnerId: "XieJin",
// groupOwnerName: "谢晋",
// id: null,
// msgId: null,
// sendStatus: null,
// sendTime: null,
// taskId: null,
// }
], // 送达居民群
filterCriteria: '', filterCriteria: '',
taskEndTime: '', // 任务结束时间 taskEndTime: '', // 任务结束时间
sendChannel: 0,
}, },
forms: { forms: {
taskTitle: '', taskTitle: '',

View File

@@ -70,8 +70,6 @@ import echarts from "echarts";
export default { export default {
data() { data() {
return { return {
tabs: ["成员统计", "居民群统计"],
tabIndex: 0,
pieEcharts: null, pieEcharts: null,
subIndex: 0, subIndex: 0,
tableData: [], tableData: [],
@@ -129,7 +127,7 @@ export default {
}); });
this.currentClickTime = +new Date(); this.currentClickTime = +new Date();
let time = this.currentClickTime - this.firstClickTime; let time = this.currentClickTime - this.firstClickTime;
if (time >= 3600000) { if (time >= 3600000) {
this.$http.post("/app/whchatmomentstask/remindSend", null, { this.$http.post("/app/whchatmomentstask/remindSend", null, {
params: { params: {
id: this.id, id: this.id,

View File

@@ -20,7 +20,7 @@
<div>{{ detail.taskTitle }} <span :class="detail.status==0? 'status0': detail.status==1? 'status1': detail.status==2? 'status2': <div>{{ detail.taskTitle }} <span :class="detail.status==0? 'status0': detail.status==1? 'status1': detail.status==2? 'status2':
detail.status == 3? 'status3':detail.status==4? 'status4': 'status5'">{{ $dict.getLabel('mstStatus', detail.status) }}</span></div> detail.status == 3? 'status3':detail.status==4? 'status4': 'status5'">{{ $dict.getLabel('mstStatus', detail.status) }}</span></div>
<div> <div>
创建时间: <span>{{ createTime }}</span> 创建时间: <span>{{ info.createTime }}</span>
</div> </div>
</div> </div>
<div class="header_right" @click="toDetail">查看详情</div> <div class="header_right" @click="toDetail">查看详情</div>
@@ -108,7 +108,6 @@ export default {
subIndex0: 0, subIndex0: 0,
subIndex1: 0, subIndex1: 0,
tableData: [], tableData: [],
createTime: "",
id: "", id: "",
info: {}, info: {},
current: 1, current: 1,
@@ -128,6 +127,7 @@ export default {
], ],
update0: true, update0: true,
update1: false, update1: false,
type: '',
}; };
}, },
computed: { computed: {
@@ -147,7 +147,7 @@ export default {
}, },
onLoad(o) { onLoad(o) {
this.id = o.id; this.id = o.id;
this.createTime = o.time; this.type = o.type
}, },
methods: { methods: {
tabClick(index) { tabClick(index) {
@@ -185,7 +185,7 @@ export default {
}, },
toDetail() { toDetail() {
uni.navigateTo({ url: `./detail?id=${this.id}` }); uni.navigateTo({ url: `./detail?id=${this.id}&type=${this.type}` });
}, },
// 提醒发送 // 提醒发送
remindSend() { remindSend() {

View File

@@ -59,7 +59,7 @@ export default {
this.$http.post('/app/appgirdinfo/listByInfo').then((res) => { this.$http.post('/app/appgirdinfo/listByInfo').then((res) => {
if (res?.data) { if (res?.data) {
let parents = res.data.map(e => e.parentGirdId) let parents = res.data.map(e => e.parentGirdId)
this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id)})) this.allData = res.data.map(e => ({...e, isChecked: this.selected.find(i=> i.id == e.id), hasChildren: parents.includes(e.id)}))
this.gridInit() this.gridInit()
} }
}).then(()=> { }).then(()=> {
@@ -78,9 +78,7 @@ export default {
}, },
getGridsAndUsersByParent(id) { getGridsAndUsersByParent(id) {
this.treeList = this.allData.filter(e => (e.parentGirdId == id)).map(v=> ({...v,isChecked:this.selected.find(i=>i.id == v.id)})) this.treeList = this.allData.filter(e => (e.parentGirdId == id)).map(v=> ({...v, isChecked: this.selected.find(i=>i.id == v.id)}))
this.treeList
this.$forceUpdate()
}, },
girdNameClick(row, index) { girdNameClick(row, index) {
this.userList = [] this.userList = []
@@ -97,7 +95,7 @@ export default {
if(row.isChecked) { if(row.isChecked) {
this.selected.push(row) this.selected.push(row)
} else { } else {
let index=this.selected.findIndex(item=>row.id===item.id) let index=this.selected.findIndex(item=>row.id == item.id)
index >= 0 && this.selected.splice(index, 1) index >= 0 && this.selected.splice(index, 1)
} }
uni.setStorageSync('girdSelect', this.selected) uni.setStorageSync('girdSelect', this.selected)