diff --git a/app.js b/app.js index c2bf99b..b461ee2 100644 --- a/app.js +++ b/app.js @@ -52,8 +52,8 @@ App({ userInfo: {}, // headerUrl: "http://42.193.40.239:8017/" //线上 // headerUrl: "http://192.168.110.10:8017/" //线下 - headerUrl: "http://192.168.110.186:8017/" - // headerUrl: "https://city.sczysoft.com/df/" + // headerUrl: "http://192.168.110.186:8017/" + headerUrl: "https://city.sczysoft.com/df/" }, // https://city.sczysoft.com/df/doc.html //接口 // https://city.sczysoft.com/dffile //查看拼接 @@ -72,13 +72,14 @@ App({ resumptionAcs: "WorkFile", // 履职附件 msgAcs: "MsgAcs", // 消息附件 eventAcs: "eventAcs", //突发/应急事件上报 - + demandsEscalation :"demandsEscalation",//群众诉求上报 userSign: "UserSign", //用户签名 EmergencyImg: "Content", // 应急预案---一图一表 EmergencyFile: "EmergencyFile", // 应急预案---文件 EmergencyPlanFile: "EmergencyPlanFile", // 应急演练---文件 + workManagement : 'workManagement',//工作管理 }, // 请求函数封装 diff --git a/images/bg.png b/images/bg.png deleted file mode 100644 index 0675041..0000000 Binary files a/images/bg.png and /dev/null differ diff --git a/images/logo.png b/images/logo.png deleted file mode 100644 index feeeeb2..0000000 Binary files a/images/logo.png and /dev/null differ diff --git a/pages/login/index.js b/pages/login/index.js index b9aec9c..958779c 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -8,10 +8,10 @@ Page({ * 页面的初始数据 */ data: { - username: 'admin', - password: 'Daofu202406', - // username: '', - // password: '', + // username: 'admin', + // password: 'Daofu202406', + username: '', + password: '', showLogin: true, newname:'', newphone:'', diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 35c906f..295fc29 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -1,5 +1,5 @@ - + 您好！ 欢迎来到鲜水镇“智慧鲜水”数字化平台 diff --git a/pages/party-member/index/index.js b/pages/party-member/index/index.js index 41481a1..fe25ee1 100644 --- a/pages/party-member/index/index.js +++ b/pages/party-member/index/index.js @@ -224,9 +224,17 @@ Page({ */ toMsgDetail: function (params) { const item = params.currentTarget.dataset.item; - wx.navigateTo({ - url: `/pages/the-masses/web/index?id=${item.publicContentId}`, - }) + console.log(params,'params===>'); + if (params.currentTarget.dataset.type == 'partyMember') { + wx.navigateTo({ + url: `/pages/the-masses/web/index?id=${item.learnContentId}&type=partyMember`, + }) + }else{ + wx.navigateTo({ + url: `/pages/the-masses/web/index?id=${item.publicContentId}&type=publicContent`, + }) + } + }, /** diff --git a/pages/party-member/index/index.wxml b/pages/party-member/index/index.wxml index 63eaaa7..e72602b 100644 --- a/pages/party-member/index/index.wxml +++ b/pages/party-member/index/index.wxml @@ -45,11 +45,11 @@ - + {{item.title}} - + @@ -62,12 +62,12 @@ - + {{item.title}} - + diff --git a/pages/party-member/internalIndex/index.js b/pages/party-member/internalIndex/index.js index 42ac1fe..cf5b65c 100644 --- a/pages/party-member/internalIndex/index.js +++ b/pages/party-member/internalIndex/index.js @@ -242,10 +242,21 @@ Page({ * 通知详情 */ toMsgDetail: function (params) { + // const item = params.currentTarget.dataset.item; + // wx.navigateTo({ + // url: `/pages/the-masses/web/index?id=${item.publicContentId}`, + // }) const item = params.currentTarget.dataset.item; - wx.navigateTo({ - url: `/pages/the-masses/web/index?id=${item.publicContentId}`, - }) + console.log(params,'params===>'); + if (params.currentTarget.dataset.type == 'partyMember') { + wx.navigateTo({ + url: `/pages/the-masses/web/index?id=${item.learnContentId}&type=partyMember`, + }) + }else{ + wx.navigateTo({ + url: `/pages/the-masses/web/index?id=${item.publicContentId}&type=publicContent`, + }) + } }, onLoad(option) { diff --git a/pages/party-member/internalIndex/index.wxml b/pages/party-member/internalIndex/index.wxml index 76e410b..d5880e2 100644 --- a/pages/party-member/internalIndex/index.wxml +++ b/pages/party-member/internalIndex/index.wxml @@ -61,11 +61,11 @@ - + {{item.title}} - + @@ -78,12 +78,12 @@ - + {{item.title}} - + diff --git a/pages/the-masses/escalation/index.js b/pages/the-masses/escalation/index.js index c9698a2..c11a769 100644 --- a/pages/the-masses/escalation/index.js +++ b/pages/the-masses/escalation/index.js @@ -148,7 +148,7 @@ Page({ wx.showLoading({ title: '文件上传中...', }) - app.uploadFile(this.data.uuid, app.FileType.resumptionAcs, filePath).then(res => { + app.uploadFile(this.data.uuid, app.FileType.demandsEscalation, filePath).then(res => { wx.hideLoading(); this.getFiles(); }) @@ -160,7 +160,7 @@ Page({ getFiles: function () { app.axios("GET", "common", "/upload/getFile", { otcid: this.data.postData.difficultyId || this.data.uuid, - otctype: app.FileType.resumptionAcs + otctype: app.FileType.demandsEscalation }).then(res => { if (res.code == 1) { this.data.files = res.data; diff --git a/pages/work/f-b-g-z/index/index.js b/pages/work/f-b-g-z/index/index.js index f2d8320..464647c 100644 --- a/pages/work/f-b-g-z/index/index.js +++ b/pages/work/f-b-g-z/index/index.js @@ -69,8 +69,7 @@ Page({ startTime: this.data.startTime || '', endTime: this.data.endTime || '', condition: this.data.condition || '', - // state: parseInt(this.data.curTab) + 1, - // userId: app.globalData.userInfo.userId + userId: app.globalData.userInfo.userId }, false).then(res => { console.log(res,'res====>'); this.data.freshIng = false; @@ -92,9 +91,10 @@ Page({ * 跳转详情 */ toDetail: function (params) { - const item = params.currentTarget.dataset.item; + const item = params.currentTarget.dataset.item.workId; + console.log(item,'item==>'); wx.navigateTo({ - url: '/pages/g-z-t/d-b-s-x/detail/index', + url: `/pages/work/f-b-g-z/serve/index?workId=${item}&detail=1`, }) }, diff --git a/pages/work/f-b-g-z/index/index.wxml b/pages/work/f-b-g-z/index/index.wxml index 800b43a..b50a416 100644 --- a/pages/work/f-b-g-z/index/index.wxml +++ b/pages/work/f-b-g-z/index/index.wxml @@ -24,17 +24,17 @@ - + - 常规工作 + {{item.typeName}} - 查看详情 + 查看详情 - - 任务周期：2024-05-01 至 2024-06-20 - 接收时间：2024-05-01 + {{item.title}} + 任务周期：{{item.startTime}}至 {{item.endTime}} + 接收时间：{{item.modifyTime}} diff --git a/pages/work/f-b-g-z/serve/index.js b/pages/work/f-b-g-z/serve/index.js index f79210e..ee2b205 100644 --- a/pages/work/f-b-g-z/serve/index.js +++ b/pages/work/f-b-g-z/serve/index.js @@ -10,11 +10,23 @@ Page({ data: { topBarH: app.globalData.CustomBar, baseUrl: app.FILE_SERVER_URL, - + userInfo:{}, dateFilter: Utils.formatTime(new Date(), '-'), showTaskPop: false, - - postData: {} + showTypePop: false, + showWorkType: false, + postData: {}, + //筛选树结构 + areaCode:'', + areaPathName:'', + unitTreepros: { + key: 'performclassname', + val: 'listperformid' + }, + listperformid:'', + unitTreelist: [], + TypeList:[], + detail:true, }, /** @@ -66,7 +78,8 @@ Page({ wx.showLoading({ title: '文件上传中...', }) - app.uploadFile(this.data.uuid, app.FileType.resumptionAcs, filePath).then(res => { + + app.uploadFile(this.data.uuid, app.FileType.workManagement, filePath).then(res => { wx.hideLoading(); this.getFiles(); }) @@ -75,10 +88,11 @@ Page({ /** * 获取图片 */ + getFiles: function () { app.axios("GET", "common", "/upload/getFile", { - otcid: this.data.postData.dynamicsId || this.data.uuid, - otctype: app.FileType.resumptionAcs + otcid: this.data.postData.workId || this.data.uuid, + otctype: app.FileType.workManagement }).then(res => { if (res.code == 1) { this.data.files = res.data; @@ -109,13 +123,85 @@ Page({ } }) }, + /** + * 显示/关闭弹窗筛选 + */ + popModal: function (params) { + console.log(params); + const type = params.currentTarget.dataset.type; + this.data[type] = !this.data[type]; + this.setData(this.data) + }, + + handleselectunit(e) { + // e.detail 选中的id数组 + this.data.page = 1; + this.data.list = []; + let postData = this.data.postData; // 获取当前的 postData 对象 + console.log(postData,'postData==>'); + postData.listperformid = e.detail.item.listperformid; + postData.performclassname = e.detail.item.performclassname; + this.setData({ + postData: postData, + showTypePop:false + }); // 设置更新后的 postData 对象 + // this.getType(); + }, + /** + * 地址 + */ + typeChange: function (params) { + this.data.page = 1; + this.data.list = []; + this.setData(this.data); + const index = params.currentTarget.dataset.index; + this.data.postData.type = index + 1; + this.data.postData.orgcode = this.data.TypeData[index].orgcode; + this.data.showTypePop = false; + this.setData(this.data); + }, + /** + * 获取地区 + */ + getAreaTree: function () { + app.axios("GET", "app", "/Sys/getListperformTree", ).then(res => { + if (res.code == 1) { + console.log(res,'res===>'); + this.data.TypeData = res.data[0].children; + this.data.unitTreelist = res.data; + this.setData(this.data) + } + }) + }, /** * 发布 */ push: function () { + // "endTime": "",- + // "listperformid": "", + // "startTime": "",- + // "title": "", + // "typeId": "", + // "userId": "",- + // "workId": ""- + this.data.postData.userId = app.globalData.userInfo.userId; - this.data.postData.emerEventId = this.data.uuid; + this.data.postData.workId = this.data.uuid; + if (!this.data.postData.listperformid) { + wx.showToast({ + title: '请选择所属组织', + icon: 'none' + }) + return + } + if (!this.data.postData.worktypeId) { + wx.showToast({ + title: '请选择类型', + icon: 'none' + }) + return + } if (!this.data.postData.title) { wx.showToast({ title: '请输入内容', @@ -130,26 +216,29 @@ Page({ }) return } + let data = { ...this.data.postData, + userId:this.data.userInfo.userId, + typeId:this.data.postData.worktypeId, } console.log(data,'data===>'); - // app.axios("POST", "app", "/work/workAdd", data).then(res => { - // if (res.code == 1) { - // wx.showToast({ - // title: '发布成功', - // icon: 'none' - // }) - // setTimeout(() => { - // wx.navigateBack() - // }, 1500); - // } else { - // wx.showToast({ - // title: res.message, - // icon: 'none' - // }) - // } - // }) + app.axios("POST", "app", "/work/workAdd", data).then(res => { + if (res.code == 1) { + wx.showToast({ + title: '发布成功', + icon: 'none' + }) + setTimeout(() => { + wx.navigateBack() + }, 1500); + } else { + wx.showToast({ + title: res.message, + icon: 'none' + }) + } + }) }, /** @@ -168,24 +257,51 @@ Page({ }, //查询详情 getDetail: function (id) { - app.axios("GET", "app", `/work/wkDynamicsDetail/${id}`).then(res => { + app.axios("GET", "app", `/work/workDetail/${id}`).then(res => { console.log(res,'res===>'); - this.data.postData = res.data + this.data.postData = res.data; this.setData(this.data); this.getFiles() }) }, - + /** + * 事件类型 + */ + typeChange: function (params) { + const index = params.currentTarget.dataset.index; + console.log(params,'params===>'); + this.data.postData.worktypeId = params.currentTarget.dataset.item.typeId; + this.data.postData.worktype = index + 1; + this.data.shoWworkType = false; + this.setData(this.data); + }, + /** + * 查询所有应急上报事件类型 + */ + getWkTypes: function () { + app.axios("GET", "app", "/work/wkTypes",{ + classify:1 + }).then(res => { + if (res.code == 1) { + console.log(res); + this.data.TypeList = res.data; + this.setData(this.data); + } + }) + }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - this.data.isUserDetail = options.user; + this.data.userInfo = app.globalData.userInfo; this.data.uuid = Utils.uuid(); this.setData(this.data); - if (options.dynamicsId) { - this.getDetail(options.dynamicsId); + console.log(options,'options===>'); + if (options.workId) { + this.getDetail(options.workId); } + this.getAreaTree(); + this.getWkTypes(); }, /** diff --git a/pages/work/f-b-g-z/serve/index.wxml b/pages/work/f-b-g-z/serve/index.wxml index fabab70..cba11d2 100644 --- a/pages/work/f-b-g-z/serve/index.wxml +++ b/pages/work/f-b-g-z/serve/index.wxml @@ -6,19 +6,18 @@ 所属组织 - - - {{ postData.areaPathName }}请选择所属组织 - - + + + - 工作类型 - - - - {{ postData.areaPathName }}请选择工作类型 + 事件类型 + + @@ -57,7 +56,7 @@ - + 发布 @@ -83,4 +82,24 @@ + + + + + + 选择工作类型 + + + + + + + + + + + + \ No newline at end of file