From 8a7882ed786a8176768b353993ef249155eaa877 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Sun, 27 Oct 2024 22:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/workPlan/monthPlan.js | 146 +- pages.json | 21 +- pages/gzt/index.vue | 2 +- pages/workPlan/monthPlan/index.vue | 68 +- pages/workPlan/monthPlan/inf-index.vue | 1610 ++++++++++++++++ pages/workPlan/monthPlan/pro-index.vue | 1677 +++++++++++++++++ pages/workPlan/monthPlanDetails/index.vue | 4 +- pages/workPlan/monthPlanDetails/inf-index.vue | 867 +++++++++ pages/workPlan/monthPlanDetails/pro-index.vue | 651 +++++++ .../components/infrastructure-model.vue | 20 +- .../workbench/components/production-model.vue | 18 +- pages/workPlan/workbench/index.vue | 4 +- static/images/workPlan/fgs_dd.png | Bin 0 -> 3476 bytes static/images/workPlan/fgs_dsh.png | Bin 0 -> 3445 bytes static/images/workPlan/fgs_tg.png | Bin 0 -> 3604 bytes static/images/workPlan/fgs_ycx.png | Bin 0 -> 3477 bytes static/images/workPlan/xmb_dd.png | Bin 0 -> 3277 bytes static/images/workPlan/xmb_dsh.png | Bin 0 -> 3248 bytes static/images/workPlan/xmb_tg.png | Bin 0 -> 3404 bytes static/images/workPlan/xmb_wtg.png | Bin 0 -> 3421 bytes static/images/workPlan/xmb_ycx.png | Bin 0 -> 3290 bytes static/images/workPlan/zgs_dd.png | Bin 0 -> 3486 bytes static/images/workPlan/zgs_tg.png | Bin 0 -> 3676 bytes static/images/workPlan/zgs_wtg.png | Bin 0 -> 3696 bytes static/images/workPlan/zgs_ycx.png | Bin 0 -> 3565 bytes utils/request_new_yn.js | 2 +- 26 files changed, 5044 insertions(+), 46 deletions(-) create mode 100644 pages/workPlan/monthPlan/inf-index.vue create mode 100644 pages/workPlan/monthPlan/pro-index.vue create mode 100644 pages/workPlan/monthPlanDetails/inf-index.vue create mode 100644 pages/workPlan/monthPlanDetails/pro-index.vue create mode 100644 static/images/workPlan/fgs_dd.png create mode 100644 static/images/workPlan/fgs_dsh.png create mode 100644 static/images/workPlan/fgs_tg.png create mode 100644 static/images/workPlan/fgs_ycx.png create mode 100644 static/images/workPlan/xmb_dd.png create mode 100644 static/images/workPlan/xmb_dsh.png create mode 100644 static/images/workPlan/xmb_tg.png create mode 100644 static/images/workPlan/xmb_wtg.png create mode 100644 static/images/workPlan/xmb_ycx.png create mode 100644 static/images/workPlan/zgs_dd.png create mode 100644 static/images/workPlan/zgs_tg.png create mode 100644 static/images/workPlan/zgs_wtg.png create mode 100644 static/images/workPlan/zgs_ycx.png diff --git a/api/workPlan/monthPlan.js b/api/workPlan/monthPlan.js index 19bd1f2..741b4ca 100644 --- a/api/workPlan/monthPlan.js +++ b/api/workPlan/monthPlan.js @@ -1,13 +1,21 @@ import request_yn from '@/utils/request_new_yn' -// 获取工程列表 -export function getProjectListApi(data) { +// 获取工程列表 (其一) +export function getProjectList_1Api(data) { return request_yn({ url: '/ynPlanApp/select/getProsByState', method: 'post', data: data }) } +// 获取工程列表 (其二) +export function getProjectList_2Api(data) { + return request_yn({ + url: '/ynPlanApp/select/getProsForPro', + method: 'get', + params: data + }) +} // 获取风险等级 export function getRiskLevelListApi(data) { return request_yn({ @@ -24,7 +32,7 @@ export function getControlLevelListApi(data) { params: data }) } -// 月计划填报提交 +// 月计划填报提交 --基建 export function setMonthPlanApi(data) { return request_yn({ url: '/ynPlanApp/infMonth/addInfPlan', @@ -32,7 +40,7 @@ export function setMonthPlanApi(data) { data: data }) } -// 月计划-查看报表 +// 月计划-查看报表 --基建 export function getMonthPlanDataApi(data) { return request_yn({ url: '/ynPlanApp/infMonth/getPlanDetail', @@ -40,7 +48,7 @@ export function getMonthPlanDataApi(data) { data: data }) } -// 月计划-查看数据 +// 月计划-查看数据 --基建 export function getViewDataListApi(data) { return request_yn({ url: '/ynPlanApp/infMonth/getViewData', @@ -48,7 +56,7 @@ export function getViewDataListApi(data) { data: data }) } -// 月计划-查看数据-详情 +// 月计划-查看数据-详情 --基建 export function getPlanDetailApi(data) { return request_yn({ url: '/ynPlanApp/infMonth/getPlanDetail', @@ -56,7 +64,7 @@ export function getPlanDetailApi(data) { data: data }) } -// 月计划-查看数据-详情-计划撤回 +// 月计划-查看数据-详情-计划撤回 --基建 export function revokePlanApi(data) { return request_yn({ url: '/ynPlanApp/infMonth/backPlan', @@ -64,7 +72,7 @@ export function revokePlanApi(data) { data: data }) } -// 月计划-查看数据-详情-计划删除 +// 月计划-查看数据-详情-计划删除 --基建 export function deletePlanApi(data) { return request_yn({ url: '/ynPlanApp/infMonth/deletePlan', @@ -72,7 +80,7 @@ export function deletePlanApi(data) { data: data }) } -// 月计划-查看数据-详情-计划修改 +// 月计划-查看数据-详情-计划修改 --基建 export function updateInfPlanContentApi(data) { return request_yn({ url: '/ynPlanApp/infMonth/updateInfPlanContent', @@ -80,7 +88,7 @@ export function updateInfPlanContentApi(data) { data: data }) } -// 月计划-查看数据-详情-计划提交 +// 月计划-查看数据-详情-计划提交 --基建 export function submitPlanApi(data) { return request_yn({ url: '/ynPlanApp/infMonth/submitPlan', @@ -88,3 +96,121 @@ export function submitPlanApi(data) { data: data }) } + +/** + * 生产月计划 + */ + +// 获取作业类型 +export function getWorkTypeProApi(data) { + return request_yn({ + url: '/ynPlanApp/select/getGZLX', + method: 'get', + params: data + }) +} +// 获取管控方式 +export function getControlModeProApi(data) { + return request_yn({ + url: '/ynPlanApp/select/getGKFS', + method: 'get', + params: data + }) +} + +// 月计划填报提交 --生产 +export function setMonthPlanProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/addInfPlan', + method: 'post', + data: data + }) +} +// 月计划-查看报表 --生产 +export function getMonthPlanDataProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/getPlanDetail', + method: 'post', + data: data + }) +} +// 月计划-查看数据 --生产 +export function getViewDataListProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/getViewData', + method: 'post', + data: data + }) +} +// 月计划-查看数据-详情 --生产 +export function getPlanDetailProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/getPlanDetail', + method: 'post', + data: data + }) +} +// 月计划-查看数据-详情-计划撤回 --生产 +export function revokePlanProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/backPlan', + method: 'post', + data: data + }) +} +// 月计划-查看数据-详情-计划删除 --生产 +export function deletePlanProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/deletePlan', + method: 'post', + data: data + }) +} +// 月计划-查看数据-详情-计划修改 --生产 +export function updateInfPlanContentProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/updateInfPlanContent', + method: 'post', + data: data + }) +} +// 月计划-查看数据-详情-计划提交 --生产 +export function submitPlanProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/submitPlan', + method: 'post', + data: data + }) +} +// 月计划-查看数据-审核流程 +export function getAUditingProcessApi(data) { + return request_yn({ + url: '/ynPlanApp/infMonth/getCheckDetail', + method: 'post', + data: data + }) +} +// 月计划-上报人-获取审核人信息 +export function getAUditingUserInfoApi(data) { + return request_yn({ + url: '/ynPlanApp/select/getSelectUser', + method: 'post', + data: data + }) +} +// 月计划-查看当前工程 当前月计划是否上传 - 基建 +export function getIsPlanApi(data) { + return request_yn({ + url: '/ynPlanApp/infMonth/isPlan', + method: 'post', + data: data + }) +} +// 月计划-查看当前工程 当前月计划是否上传 - 生产 +export function getIsPlanProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/isPlan', + method: 'post', + data: data + }) +} diff --git a/pages.json b/pages.json index 0e51571..483a4f3 100644 --- a/pages.json +++ b/pages.json @@ -779,14 +779,31 @@ "navigationStyle": "custom" } }, + + /* 基建月计划 */ { - "path": "pages/workPlan/monthPlan/index", + "path": "pages/workPlan/monthPlan/inf-index", "style": { "navigationStyle": "custom" } }, + /* 生产月计划 */ { - "path": "pages/workPlan/monthPlanDetails/index", + "path": "pages/workPlan/monthPlan/pro-index", + "style": { + "navigationStyle": "custom" + } + }, + /* 月计划详情 --基建 */ + { + "path": "pages/workPlan/monthPlanDetails/inf-index", + "style": { + "navigationStyle": "custom" + } + }, + /* 月计划详情--生产 */ + { + "path": "pages/workPlan/monthPlanDetails/pro-index", "style": { "navigationStyle": "custom" } diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue index 09a84ce..e358154 100644 --- a/pages/gzt/index.vue +++ b/pages/gzt/index.vue @@ -25,7 +25,7 @@ 我的应用 - + diff --git a/pages/workPlan/monthPlan/index.vue b/pages/workPlan/monthPlan/index.vue index dc0118e..f874c14 100644 --- a/pages/workPlan/monthPlan/index.vue +++ b/pages/workPlan/monthPlan/index.vue @@ -95,10 +95,16 @@ --> - - - - + + + + 返回本月 - + - + - + 可接受风险:{{ item.kjsfx }} @@ -662,7 +673,10 @@ export default { dfxAmount: 0, zfxAmount: 0, gfxAmount: 0, - tfxAmount: 0 + tfxAmount: 0, + scrollHeight_1: 0, + scrollHeight_2: 0, + scrollHeight_3: 0 } }, mounted() { @@ -923,6 +937,12 @@ export default { this.tfxAmount = this.tfxAmount + e.tgfx * 1 }) } + + if (this.scrollHeight_2 === 0) { + this.calcScrollHeight('.scroll-content-2', null).then(res => { + this.scrollHeight_2 = res + }) + } }, /* 查看报表页面工程选择事件 */ onChangeProjectSel(value) { @@ -955,6 +975,11 @@ export default { const res = await getViewDataListApi(this.queryDataParamsNew) console.log('res查看数据中的数据', res) this.viewMonthPlanList = res.obj + if (this.scrollHeight_3 === 0) { + this.calcScrollHeight('.scroll-content-3', null).then(res => { + this.scrollHeight_3 = res + }) + } }, /* 处理枚举状态 */ onTypeChange(type) { @@ -1034,24 +1059,22 @@ export default { let that = this let scrollHeight = 0 - new Promise((resolve, reject) => { + // 使用 Promise 包裹 uni.getSystemInfo 的异步调用 + const result = await new Promise((resolve, reject) => { uni.getSystemInfo({ - //调用uni-app接口获取屏幕高度 success(res) { - //成功回调函数 that._data.pH = res.windowHeight let titleH = uni.createSelectorQuery().select(dom) if (bottom) { let bottomDom = uni.createSelectorQuery().select(bottom) bottomDom - .boundingClientRect(res => { - const bottomHeight = res.height + .boundingClientRect(bottomRes => { + const bottomHeight = bottomRes.height titleH .boundingClientRect(data => { - let pH = that._data.pH - scrollHeight = pH - data.top - bottomHeight + scrollHeight = that._data.pH - data.top - bottomHeight resolve(scrollHeight) }) .exec() @@ -1060,17 +1083,19 @@ export default { } else { titleH .boundingClientRect(data => { - let pH = that._data.pH - scrollHeight = pH - data.top + scrollHeight = that._data.pH - data.top resolve(scrollHeight) }) .exec() } + }, + fail(err) { + reject(err) // 处理获取系统信息失败的情况 } }) }) - // return scrollHeight + return result // 返回计算的高度 } }, onLoad(options) { @@ -1082,9 +1107,10 @@ export default { }, onReady() { this.calcScrollHeight('.scroll-content-1', '.bottom-btn').then(res => { - console.log('res---', res) + // console.log('res---', res) + + this.scrollHeight_1 = res }) - // console.log('content_1content_1', content_1) } } diff --git a/pages/workPlan/monthPlan/inf-index.vue b/pages/workPlan/monthPlan/inf-index.vue new file mode 100644 index 0000000..6fa2a23 --- /dev/null +++ b/pages/workPlan/monthPlan/inf-index.vue @@ -0,0 +1,1610 @@ + + + + + diff --git a/pages/workPlan/monthPlan/pro-index.vue b/pages/workPlan/monthPlan/pro-index.vue new file mode 100644 index 0000000..9d6ff16 --- /dev/null +++ b/pages/workPlan/monthPlan/pro-index.vue @@ -0,0 +1,1677 @@ + + + + + diff --git a/pages/workPlan/monthPlanDetails/index.vue b/pages/workPlan/monthPlanDetails/index.vue index 957e4ad..533a508 100644 --- a/pages/workPlan/monthPlanDetails/index.vue +++ b/pages/workPlan/monthPlanDetails/index.vue @@ -410,7 +410,7 @@ export default { titleH .boundingClientRect(data => { let pH = that._data.pH - that._data.navHeight = pH - data.top - bottomHeight + that._data.navHeight = pH - data.top - bottomHeight - 48 }) .exec() }) @@ -436,7 +436,7 @@ export default { .revoke { width: 100%; - padding: 30rpx 0; + padding: 12px 0; position: fixed; bottom: 0; left: 0; diff --git a/pages/workPlan/monthPlanDetails/inf-index.vue b/pages/workPlan/monthPlanDetails/inf-index.vue new file mode 100644 index 0000000..14cbdb5 --- /dev/null +++ b/pages/workPlan/monthPlanDetails/inf-index.vue @@ -0,0 +1,867 @@ + + + + + diff --git a/pages/workPlan/monthPlanDetails/pro-index.vue b/pages/workPlan/monthPlanDetails/pro-index.vue new file mode 100644 index 0000000..5a6b3cc --- /dev/null +++ b/pages/workPlan/monthPlanDetails/pro-index.vue @@ -0,0 +1,651 @@ + + + + + diff --git a/pages/workPlan/workbench/components/infrastructure-model.vue b/pages/workPlan/workbench/components/infrastructure-model.vue index 71a7e53..75740f9 100644 --- a/pages/workPlan/workbench/components/infrastructure-model.vue +++ b/pages/workPlan/workbench/components/infrastructure-model.vue @@ -1,7 +1,7 @@