diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 4ccd172..9b0d791 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -13,7 +13,7 @@ "type" : "uniCloud" }, { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/api/workPlan/dayPlan.js b/api/workPlan/dayPlan.js index d22c715..e472135 100644 --- a/api/workPlan/dayPlan.js +++ b/api/workPlan/dayPlan.js @@ -160,6 +160,22 @@ export function getPersonInfoApi(data) { data: data }) } +// 获取人员信息 +export function addContentJobTicketApi(data) { + return request_yn({ + url: '/ynPlanApp/infDay/addContentJobTicket', + method: 'post', + data: data + }) +} +// 修改人员信息 +export function addPlanUserApi(data) { + return request_yn({ + url: '/ynPlanApp/infDay/addPlanUser', + method: 'post', + data: data + }) +} /** * 生产月计划 diff --git a/api/workPlan/my.js b/api/workPlan/my.js new file mode 100644 index 0000000..0154f9c --- /dev/null +++ b/api/workPlan/my.js @@ -0,0 +1,18 @@ +import request_yn from '@/utils/request_new_yn' + +// 获取推送人员信息列表 +export function getPushPersonListApi(data) { + return request_yn({ + url: '/ynPlanApp/select/getSendMessageUser', + method: 'post', + data: data + }) +} +// 点击报告获取内容 +export function getReportMessageApi(data) { + return request_yn({ + url: '/ynPlanApp/infDay/getReportMessage', + method: 'post', + data: data + }) +} diff --git a/pages.json b/pages.json index 5087163..eb5924c 100644 --- a/pages.json +++ b/pages.json @@ -329,11 +329,12 @@ { //人员库-详情 "path": "pages/realName/workbench/peopleLibrary/detail", - "style": { + "style": { "navigationStyle": "custom" } - },{ - //人员库-身份证识别 + }, + { + //人员库-身份证识别 "path": "pages/realName/workbench/peopleLibrary/idCard", "style": { "navigationStyle": "custom" @@ -378,13 +379,13 @@ } }, //电子合同 - { - //电子合同-提醒 - "path": "pages/realName/workbench/electronicContract/contractTip", - "style": { - "navigationStyle": "custom" - } - }, + { + //电子合同-提醒 + "path": "pages/realName/workbench/electronicContract/contractTip", + "style": { + "navigationStyle": "custom" + } + }, { //电子合同-视频 "path": "pages/realName/workbench/electronicContract/contractVideo", @@ -516,7 +517,7 @@ "path": "pages/realName/workbench/exam/exam", "style": { "navigationStyle": "custom" - } + } }, { //安全教育培训-考试详情 @@ -1047,6 +1048,12 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/workPlan/messagePush/index", + "style": { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue index e358154..dc72bd7 100644 --- a/pages/gzt/index.vue +++ b/pages/gzt/index.vue @@ -380,6 +380,7 @@ export default { uni.setStorageSync('wkToken', res.data.user.token) uni.setStorageSync('wkName', res.data.user.username) uni.setStorageSync('wkRole', res.data.user.role) + uni.setStorageSync('wkPermissions', res.data.permissions) // uni.setStorageSync('realNameUser', res.data.data.loginUser.sysUser) // uni.setStorageSync('realNamePermissions', res.data.data.loginUser.permissions) // uni.removeStorageSync('hasChosenPro') diff --git a/pages/workPlan/dayPlan/inf-index.vue b/pages/workPlan/dayPlan/inf-index.vue index fcfb99b..1187c23 100644 --- a/pages/workPlan/dayPlan/inf-index.vue +++ b/pages/workPlan/dayPlan/inf-index.vue @@ -339,7 +339,14 @@ > - + + + + 报告 + + + + + + + + 发送 + + + + + + + + 请选择推送人 + + + + + + 搜索 + + + + + + + 取消 + 确定 + + + + + + + + + diff --git a/pages/workPlan/my/index.vue b/pages/workPlan/my/index.vue index 0cedf94..49aef68 100644 --- a/pages/workPlan/my/index.vue +++ b/pages/workPlan/my/index.vue @@ -15,7 +15,7 @@ {{ userPhone }} - + 短信推送 @@ -31,7 +31,8 @@ export default { return { tabbar: TabbarConfig, userName: '', - userPhone: '' + userPhone: '', + wkPermissions: [] } }, methods: { @@ -40,11 +41,33 @@ export default { uni.reLaunch({ url: '/pages/gzt/index' }) + }, + /* 短信推送按钮 */ + onMessagePush() { + console.log('推送') + + if (this.wkPermissions.length > 0) { + const isPush = this.wkPermissions.some(e => e.name == '短信推送') + + if (isPush) { + // console.log('具备权限') + uni.navigateTo({ url: '/pages/workPlan/messagePush/index' }) + } else { + uni.showToast({ + title: '当前无短信推送权限,请联系管理员!', + icon: 'none', + mask: true + }) + } + } + + console.log(this.wkPermissions, '权限') } }, onLoad() { this.userName = uni.getStorageSync('wkName') this.userPhone = uni.getStorageSync('userPhone') + this.wkPermissions = uni.getStorageSync('wkPermissions') } } diff --git a/static/images/workPlan/contacts.png b/static/images/workPlan/contacts.png new file mode 100644 index 0000000..f15a79f Binary files /dev/null and b/static/images/workPlan/contacts.png differ