From 0a5053f05975a9c4e9de1d8b8c695ba0cf5871fc Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Sun, 3 Nov 2024 15:24:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B0=83=E8=AF=95=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 14 + pages/realName/index/index.vue | 2 +- pages/workPlan/index/components/calendar.vue | 5 +- .../index/components/home-notice-bar.vue | 5 +- pages/workPlan/workPlan-details/index.vue | 455 ++++++++++++++++++ pages/workPlan/workPlan/index.vue | 352 ++++++++++++++ store/modules/user.js | 3 + 7 files changed, 833 insertions(+), 3 deletions(-) create mode 100644 pages/workPlan/workPlan-details/index.vue create mode 100644 pages/workPlan/workPlan/index.vue diff --git a/pages.json b/pages.json index fd88ad0..747c7b9 100644 --- a/pages.json +++ b/pages.json @@ -754,6 +754,20 @@ "navigationStyle": "custom" } }, + /* 作业计划页面 */ + { + "path": "pages/workPlan/workPlan/index", + "style": { + "navigationStyle": "custom" + } + }, + /* 作业计划页面 - 详情 */ + { + "path": "pages/workPlan/workPlan-details/index", + "style": { + "navigationStyle": "custom" + } + }, /* 工作台 */ { "path": "pages/workPlan/workbench/index", diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue index e483c46..2a05630 100644 --- a/pages/realName/index/index.vue +++ b/pages/realName/index/index.vue @@ -549,7 +549,7 @@ export default { 'Content-Type': 'application/json' }, success: res => { - console.log('?? ~ gotoYy ~ res:', res) + console.log('?? ~ gotoYy ~ res------:', res) // console.log('?? ~ gotoYy ~ res:', res.data.token) if (res.data.code == 200) { // uni.setStorageSync('tjToken', res.data.token) diff --git a/pages/workPlan/index/components/calendar.vue b/pages/workPlan/index/components/calendar.vue index 2150b17..cd8ad5b 100644 --- a/pages/workPlan/index/components/calendar.vue +++ b/pages/workPlan/index/components/calendar.vue @@ -97,7 +97,7 @@ {{ currentDayInfo.rys }} - + 可接受:{{ currentDayInfo.kjsfx }} 低:{{ currentDayInfo.dfx }} 中:{{ currentDayInfo.zfx }} @@ -378,6 +378,9 @@ export default { const res = await getProFxByDayApi({ day: this.currentDay }) this.currentDayInfo = res.data[0] console.log('----------当日数据', res) + }, + onViewPersonDetails(id) { + uni.navigateTo({ url: `/pages/realName/index/pages/personDetail?idNumber=${id}` }) } } } diff --git a/pages/workPlan/index/components/home-notice-bar.vue b/pages/workPlan/index/components/home-notice-bar.vue index b97b151..0172825 100644 --- a/pages/workPlan/index/components/home-notice-bar.vue +++ b/pages/workPlan/index/components/home-notice-bar.vue @@ -3,7 +3,7 @@ 今日风险 - + + + + + + + + + {{ queryInfo.proName }} + + + + + {{ $moment().format('YYYY-MM-DD') }} + + + + + + + + + 现场负责人 + + {{ item.xcfzr }} + + + 作业人员 + {{ item.rys }} + + + 风险等级 + {{ item.fxdj }} + 执行情况 + {{ item.state }} + + + 作业内容 + {{ item.zynr }} + + + + + + + + + + {{ item.name }} + + + + + + + + + + {{ item.certificateName }}({{ item.certificateNum }}) + + + + + + + + + + + + + {{ item.crateTime }} + + + + + + + + + 持证信息 + + + + + + + + + 持证名称 + 持证人姓名 + 工种 + + + + + + {{ item.certificateName }} + {{ item.name }} + {{ item.gz }} + + + + + + + + + + + diff --git a/pages/workPlan/workPlan/index.vue b/pages/workPlan/workPlan/index.vue new file mode 100644 index 0000000..360e2c3 --- /dev/null +++ b/pages/workPlan/workPlan/index.vue @@ -0,0 +1,352 @@ + + + + + diff --git a/store/modules/user.js b/store/modules/user.js index 0bf15e1..ef9a654 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -59,6 +59,8 @@ const user = { commit('SET_PHONE', user.phone) uni.setStorageSync('userPhone', user.phone) commit('SET_IS_FIRST_LOGIN', user.isFirstLogin) + + uni.setStorageSync('tyToken', res.data.token) resolve(res) }) .catch(error => { @@ -81,6 +83,7 @@ const user = { commit('SET_PHONE', user.phone) uni.setStorageSync('userPhone', user.phone) commit('SET_IS_FIRST_LOGIN', user.isFirstLogin) + uni.setStorageSync('tyToken', res.data.token) resolve(res) }) .catch(error => {