diff --git a/src/apps/AppGridManagement/Statistics.vue b/src/apps/AppGridManagement/Statistics.vue index 3dbcac65..52e1c8c2 100644 --- a/src/apps/AppGridManagement/Statistics.vue +++ b/src/apps/AppGridManagement/Statistics.vue @@ -171,12 +171,17 @@ uni-page-body { font-family: PingFang-SC-Heavy, PingFang-SC; font-weight: 800; color: #333333; + display: inline-block; + width: 140px; + vertical-align: top; } .boxesRight { margin-left: 40px; font-size: 28px; font-family: PingFangSC-Regular, PingFang SC; color: #666666; + display: inline-block; + width: calc(100% - 200px); } } } diff --git a/src/saas/AppBackUserList/Add.vue b/src/saas/AppBackUserList/Add.vue index 86d37a49..a75bb4f5 100644 --- a/src/saas/AppBackUserList/Add.vue +++ b/src/saas/AppBackUserList/Add.vue @@ -550,12 +550,13 @@ export default { this.flag = false; if (res.code == 0) { uni.$emit("update"); - this.$u.toast("提交成功"); setTimeout(() => { - uni.navigateBack(); + uni.navigateTo({url: './Success?status=1'}) }, 400); } - }); + }).catch(() => { + uni.navigateTo({url: './Success?status=0'}) + }) }, }, }; diff --git a/src/saas/AppBackUserList/Success.vue b/src/saas/AppBackUserList/Success.vue new file mode 100644 index 00000000..d5104ff6 --- /dev/null +++ b/src/saas/AppBackUserList/Success.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/saas/AppBackUserList/UserInfo.vue b/src/saas/AppBackUserList/UserInfo.vue index 47205017..dc4f6f52 100644 --- a/src/saas/AppBackUserList/UserInfo.vue +++ b/src/saas/AppBackUserList/UserInfo.vue @@ -281,7 +281,7 @@ export default { color: #f46; } .color-2{ - color: #1365DD; + color: #f46; } } .img-list{ diff --git a/src/saas/AppBackUserList/components/img/fail.png b/src/saas/AppBackUserList/components/img/fail.png new file mode 100644 index 00000000..f6eff0cd Binary files /dev/null and b/src/saas/AppBackUserList/components/img/fail.png differ diff --git a/src/saas/AppBackUserList/components/img/success.png b/src/saas/AppBackUserList/components/img/success.png new file mode 100644 index 00000000..4966d215 Binary files /dev/null and b/src/saas/AppBackUserList/components/img/success.png differ diff --git a/src/saas/AppBuilding/AppBuilding.vue b/src/saas/AppBuilding/AppBuilding.vue index 4205fa78..ce5dae33 100644 --- a/src/saas/AppBuilding/AppBuilding.vue +++ b/src/saas/AppBuilding/AppBuilding.vue @@ -3,7 +3,7 @@
-

没有网格员/网格长权限
无法查看楼栋信息哦~

+

没有网格员权限
无法查看楼栋信息哦~

@@ -35,7 +35,7 @@ export default { this.isAdmin = false this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => { if (res.code == 0) { - if (res.data.checkType == '2') { + if (res.data.checkType != '0') { this.isAdmin = true } } diff --git a/src/saas/AppBuilding/components/searchMap.vue b/src/saas/AppBuilding/components/searchMap.vue index 01749e7a..d4346c59 100644 --- a/src/saas/AppBuilding/components/searchMap.vue +++ b/src/saas/AppBuilding/components/searchMap.vue @@ -47,13 +47,13 @@
所属网格 - {{ detailInfo.gird.girdName || '' }} + {{ detailInfo.build.appGirdInfo.girdName || '' }}
网格管理员 - - - , + + + ,
@@ -337,12 +337,15 @@ export default { getBuildingInfo(item) { this.$http.post(`/app/appcommunityhouseinfo/queryDetailByIdWithBuilding?buildId=${item.buildingId}&houseId=${item.id}`).then(res => { if (res?.data) { + + this.detailInfo = {...res.data} + + console.log(this.detailInfo) + if(this.detailInfo.build.appGirdInfo.girdMemberNames && this.detailInfo.build.appGirdInfo.girdMemberNames) { + this.detailInfo.build.appGirdInfo.girdMemberNames = this.detailInfo.build.appGirdInfo.girdMemberNames.split(',') + } this.show = false this.showPop = true - this.detailInfo = {...res.data} - if(this.detailInfo.gird && this.detailInfo.gird.girdMemberNames) { - this.detailInfo.gird.girdMemberNames = this.detailInfo.gird.girdMemberNames.split(',') - } } }) }, diff --git a/src/saas/AppConflictMediation/List.vue b/src/saas/AppConflictMediation/List.vue index e0a877cb..cf6a74ca 100644 --- a/src/saas/AppConflictMediation/List.vue +++ b/src/saas/AppConflictMediation/List.vue @@ -13,7 +13,7 @@
事件列表
-
{{ status? status: '全部类型' }}
+
{{ status ? status : '全部类型' }}
- +
@@ -80,22 +79,22 @@ export default { staticName: [ { label: '待处理', - value: 0 + value: 0, }, { label: '上报数', - value: 0 + value: 0, }, { label: '已办数', - value: 0 + value: 0, }, { label: '今日办结', - value: 0 - } + value: 0, + }, ], - statisticsList: [] + statisticsList: [], } }, computed: { @@ -109,15 +108,14 @@ export default { this.current = 1 this.girdList() this.getList() - uni.$on('nextList', ()=>{ - this.current ++ + uni.$on('nextList', () => { + this.current++ this.getList() }) - uni.$on('getListInit', ()=>{ + uni.$on('getListInit', () => { this.current = 1 this.getList() }) - }, onShow() { document.title = '矛盾调解' @@ -141,7 +139,8 @@ export default { current: this.current, searchType: this.currentTabs == 1 ? '1' : '0', eventStatus: this.eventStatus, - girdId: this.girdId + girdId: this.girdId, + openId: this.eventStatus == 4 ? this.user.openId : '', }, }) .then((res) => { @@ -154,8 +153,8 @@ export default { }, getStaticList() { this.$http.post('/app/appclapeventinfo/clapEventStatisticByGirdMember').then((res) => { - if (res.code == 0){ - Object.keys(res.data).forEach(( ) => { + if (res.code == 0) { + Object.keys(res.data).forEach(() => { // var info = { // label: key, // value: res.data[key] @@ -171,33 +170,39 @@ export default { }, // 切换类型 changeType(e) { + // if (e[0].value != 1) { this.status = e[0].label - this.datas = [] this.eventStatus = e[0].value + // } else { + // this.eventStatus = 4 + // } + this.current = 1 + this.datas = [] this.getList() }, // 新增事件 addEvent() { - uni.navigateTo({url: './add'}) + uni.navigateTo({ url: './add' }) }, girdList() { - this.$http.post(`/app/appgirdmemberinfo/queryMyGirdListWithOut01`, null, { - params: { - size: 9999, - }, - }) - .then((res) => { - if (res.code == 0) { - this.myGirdList = res.data - var all = { - id: '', - girdName: '全部' + this.$http + .post(`/app/appgirdmemberinfo/queryMyGirdListWithOut01`, null, { + params: { + size: 9999, + }, + }) + .then((res) => { + if (res.code == 0) { + this.myGirdList = res.data + var all = { + id: '', + girdName: '全部', + } + this.myGirdList.unshift(all) } - this.myGirdList.unshift(all) - } - }) + }) }, confirm(e) { @@ -226,9 +231,9 @@ export default { this.girdNameText = '所属网格' this.eventStatusText = '办件状态' this.currentTabs = index - if(index == 0) { + if (index == 0) { this.listType = this.listTypeAll - }else { + } else { this.listType = this.listTypeHistory } this.getList() @@ -254,7 +259,7 @@ uni-page-body { .content-list { display: flex; - background: #FFFFFF; + background: #ffffff; border-radius: 16px; margin-bottom: 20px; width: 100%; @@ -269,7 +274,7 @@ uni-page-body { h3 { font-size: 64px; - color: #1E88E8; + color: #1e88e8; } p { @@ -277,7 +282,7 @@ uni-page-body { color: #999999; } } - } + } } .title { @@ -291,7 +296,7 @@ uni-page-body { color: #333333; font-weight: 800; } - + .title-type { font-size: 26px; color: #666666; @@ -334,6 +339,9 @@ uni-page-body { margin-left: 32px; color: #333333; } + .label1 { + margin-right: 12px; + } } } @@ -378,7 +386,19 @@ uni-page-body { } } } - + + .gird { + display: flex; + .label { + width: 120px; + vertical-align: top; + } + + .gards-right { + width: calc(100% - 120px); + } + } + .addbtn { position: fixed; left: 0; @@ -387,9 +407,9 @@ uni-page-body { height: 120px; line-height: 120px; text-align: center; - background-color: #3975C6; + background-color: #3975c6; font-size: 32px; - color: #FFFFFF; + color: #ffffff; } .pad-b120 { diff --git a/src/saas/AppConflictMediation/SelectUser.vue b/src/saas/AppConflictMediation/SelectUser.vue index 38d14710..28a541c8 100644 --- a/src/saas/AppConflictMediation/SelectUser.vue +++ b/src/saas/AppConflictMediation/SelectUser.vue @@ -1,10 +1,9 @@ diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue index 97aa5e1e..1c597090 100644 --- a/src/saas/AppConflictMediation/detail.vue +++ b/src/saas/AppConflictMediation/detail.vue @@ -4,7 +4,8 @@
{{ data.name.substring(data.name.length, data.name.length - 2) }}
-
{{ data.name }}的上报
+ +
的上报
{{ data.createTime }}
@@ -41,10 +42,10 @@
- 照片 + 照片
- +
@@ -70,7 +71,8 @@
- {{ item.systemExplain }} + +
{{ $dict.getLabel('clapDoStatus', item.doStatus) }}
@@ -86,7 +88,7 @@
{{ item.doExplain }}
- +
@@ -108,6 +110,8 @@ + + diff --git a/src/saas/AppGridManagement/Statistics.vue b/src/saas/AppGridManagement/Statistics.vue index 8db1cb6d..2522d996 100644 --- a/src/saas/AppGridManagement/Statistics.vue +++ b/src/saas/AppGridManagement/Statistics.vue @@ -174,12 +174,17 @@ uni-page-body { font-family: PingFang-SC-Heavy, PingFang-SC; font-weight: 800; color: #333333; + display: inline-block; + width: 140px; + vertical-align: top; } .boxesRight { margin-left: 40px; font-size: 28px; font-family: PingFangSC-Regular, PingFang SC; color: #666666; + display: inline-block; + width: calc(100% - 200px); } } } diff --git a/src/saas/AppHealthUp/AppHealthUp.vue b/src/saas/AppHealthUp/AppHealthUp.vue index 79c59640..7546e907 100644 --- a/src/saas/AppHealthUp/AppHealthUp.vue +++ b/src/saas/AppHealthUp/AppHealthUp.vue @@ -207,11 +207,13 @@ export default { health: this.form.health.join(',') }).then((res) => { if (res.code == 0) { - this.$u.toast("上报成功"); this.getCheckTodayReport() this.getStatis() + uni.navigateTo({url: './Success?status=1'}) } - }); + }).catch(() => { + uni.navigateTo({url: './Success?status=0'}) + }) }, getCheckTodayReport() { this.$http.post(`/app/appepidemichealthreport/checkTodayReport`).then((res) => { @@ -631,7 +633,7 @@ uni-page-body { color: #f46; } .color-2{ - color: #1365DD; + color: #f46; } } diff --git a/src/saas/AppHealthUp/OtherStatistics.vue b/src/saas/AppHealthUp/OtherStatistics.vue index a9683c81..25803e69 100644 --- a/src/saas/AppHealthUp/OtherStatistics.vue +++ b/src/saas/AppHealthUp/OtherStatistics.vue @@ -113,7 +113,11 @@ export default { }, getStatis() { this.dayList = [] - this.$http.post(`/app/appepidemichealthreport/statistic?userId=${this.userId}`).then((res) => { + this.$http.post(`/app/appepidemichealthreport/statistic`, this.userId, { + headers: { + 'Content-Type': 'text/plain' + } + }).then((res) => { if (res.code == 0) { Object.keys(res.data).forEach((key) => { var info = { diff --git a/src/saas/AppHealthUp/Success.vue b/src/saas/AppHealthUp/Success.vue new file mode 100644 index 00000000..ef5d4a65 --- /dev/null +++ b/src/saas/AppHealthUp/Success.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/saas/AppHealthUp/components/img/fail.png b/src/saas/AppHealthUp/components/img/fail.png new file mode 100644 index 00000000..f6eff0cd Binary files /dev/null and b/src/saas/AppHealthUp/components/img/fail.png differ diff --git a/src/saas/AppHealthUp/components/img/success.png b/src/saas/AppHealthUp/components/img/success.png new file mode 100644 index 00000000..4966d215 Binary files /dev/null and b/src/saas/AppHealthUp/components/img/success.png differ diff --git a/src/saas/AppSpecialPeople/add.vue b/src/saas/AppSpecialPeople/add.vue index 8b86f92d..e2525f46 100644 --- a/src/saas/AppSpecialPeople/add.vue +++ b/src/saas/AppSpecialPeople/add.vue @@ -52,7 +52,7 @@ *所属区域
- {{ form.areaName }} + {{ form.areaName }} 请选择 @@ -62,7 +62,7 @@ 详细地址
+ placeholder-style="color:#999;font-size:16px;" :maxlength="20" auto-height style="font-size: 16px"/>
@@ -95,6 +95,14 @@
+
+ {{ item.label }} +
+ +
+
+
{{ item.label }}
@@ -197,7 +205,7 @@ export default { list: [ // 精神病人 { label: '家庭年收入', - type: 'number', + type: 'money', formDbName: 'income', maxlength: 9 }, @@ -442,6 +450,13 @@ export default { } }, + changeMoney() { + let moneyReg = /^([0-9]{1,5})(\.[0-9]{1,3}){0,1}$/ + if (!moneyReg.test(this.form.income)) { + return this.$u.toast('输入的数字不能超过10万') + } + }, + confirmGirdSelect(e) { this.form.girdId = e[0].value this.form.girdName = e[0].label @@ -536,6 +551,7 @@ export default {