From be2c78d469df14e02cea821b71d961e3edc1b815 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 16:31:37 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/phaseTwo/homePage.js | 9 ++-
pages/realName/workPlan-details/index.vue | 5 +-
pages/workPlan/monthPlan/pro-index.vue | 78 ++++++++++++++++++-
.../monthPlanAuditingDetails/pro-index.vue | 1 +
pages/workPlan/workPlan-details/index.vue | 2 +-
5 files changed, 86 insertions(+), 9 deletions(-)
diff --git a/api/phaseTwo/homePage.js b/api/phaseTwo/homePage.js
index 05d28d1..de3bc80 100644
--- a/api/phaseTwo/homePage.js
+++ b/api/phaseTwo/homePage.js
@@ -1,5 +1,6 @@
import request from '@/utils/request_new'
import request_yn from '@/utils/request_new_yn'
+import request_yn_new from '@/utils/request_new_yn_home' // 测试环境 1918
// 获取首页数据
export function getHomePageListApi(data) {
@@ -19,7 +20,7 @@ export function getHomePageSelectApi() {
}
// 首页二级页面--作业计划详情-作业计划列表
export function getWorkPlanDetailsApi(data) {
- return request_yn({
+ return request_yn_new({
url: '/ynPlan/home/getjhxxq',
method: 'post',
data
@@ -27,7 +28,7 @@ export function getWorkPlanDetailsApi(data) {
}
// 首页二级页面--作业计划详情-作业人员及持证信息
export function getWorkPersonnelApi(data) {
- return request_yn({
+ return request_yn_new({
url: '/ynPlan/home/getDayUser',
method: 'post',
data
@@ -35,7 +36,7 @@ export function getWorkPersonnelApi(data) {
}
// 首页二级页面--作业计划详情-作业票、站班会照片
export function getStandGuardImgApi(data) {
- return request_yn({
+ return request_yn_new({
url: '/ynPlan/home/getZbhPhotos',
method: 'post',
data
@@ -43,7 +44,7 @@ export function getStandGuardImgApi(data) {
}
// 首页二级页面--作业计划详情-持证信息详情
export function getHoldCardInfoApi(data) {
- return request_yn({
+ return request_yn_new({
url: '/ynPlan/home/getDayUserCZ',
method: 'post',
data
diff --git a/pages/realName/workPlan-details/index.vue b/pages/realName/workPlan-details/index.vue
index 084b680..e8b1240 100644
--- a/pages/realName/workPlan-details/index.vue
+++ b/pages/realName/workPlan-details/index.vue
@@ -92,7 +92,7 @@
@@ -226,11 +226,12 @@ export default {
this.workPersonList = res.data
console.log('人员信息---', res)
+ console.log('站班会照片', response)
this.holdCardList = res.datac
this.standGuardList = response.data
this.imgList = this.standGuardList.map(e => {
- return `${config.loginBaseUrl}ynPlan${e.imgPath}`
+ return `http://192.168.0.14:19191/ynPlanApp${e.imgPath}`
})
},
/* 点击作业计划时查询作业人员 */
diff --git a/pages/workPlan/monthPlan/pro-index.vue b/pages/workPlan/monthPlan/pro-index.vue
index 8c87931..3eb3519 100644
--- a/pages/workPlan/monthPlan/pro-index.vue
+++ b/pages/workPlan/monthPlan/pro-index.vue
@@ -465,6 +465,7 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
+ style="overflow: hidden"
>
{{ item.text }}
@@ -548,7 +549,9 @@
- {{ item.proName }}
+
+ {{ item.proName }}
+
@@ -1361,7 +1364,7 @@ export default {
},
/* 获取审核人接口 */
async getAUditingUserInfoData() {
- const res = await getAUditingUserInfoApi({ name: '' })
+ const res = await getAUditingUserInfoApi({ name: this.searchUserName })
this.auditingUserList = res.map(e => {
this.$set(e, 'isChecked', false)
return e
@@ -2137,6 +2140,77 @@ export default {
border-bottom: 1px solid #ccc;
}
}
+
+.popup-view {
+ height: 60vh;
+ width: 95vw;
+ display: flex;
+ flex-direction: column;
+ background-color: #ccc;
+
+ .popup-view-title {
+ width: 94%;
+ margin: 0 auto;
+ padding: 30rpx 0;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ text {
+ color: #333;
+ font-size: 38rpx;
+ font-weight: bold;
+ }
+ }
+
+ .search-container {
+ width: 100%;
+ padding: 28rpx 0;
+ background-color: #fff;
+ .search-box {
+ width: 94%;
+ margin: 0 auto;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .view-search-ipt {
+ width: 65%;
+ }
+
+ .view-search-btn {
+ width: 27%;
+ height: 68rpx;
+ text-align: center;
+ line-height: 68rpx;
+ color: #fff;
+ background-color: #00337a;
+ border-radius: 12rpx;
+ }
+ }
+ }
+
+ .view-project-list {
+ flex: 1;
+ overflow: hidden;
+
+ .view-project-item {
+ width: 96%;
+ height: 96%;
+ margin: 2% auto;
+ background-color: #fff;
+
+ view {
+ width: 100%;
+ padding-top: 13rpx;
+ padding-bottom: 6rpx;
+ text-align: center;
+ border-bottom: 1px solid #ccc;
+ box-sizing: border-box;
+ }
+ }
+ }
+}
.style_text_1 {
color: #0bd51c;
}
diff --git a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue
index a20fd5f..0226ca1 100644
--- a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue
+++ b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue
@@ -616,6 +616,7 @@ export default {
async getAUditingUserInfoData() {
const res = await getAUditingUserInfoApi({ name: this.searchUserName })
+ console.log(res, '搜索结果')
this.auditingUserList = res.map(e => {
this.$set(e, 'isChecked', false)
return e
diff --git a/pages/workPlan/workPlan-details/index.vue b/pages/workPlan/workPlan-details/index.vue
index e6e90cb..8d2d1b9 100644
--- a/pages/workPlan/workPlan-details/index.vue
+++ b/pages/workPlan/workPlan-details/index.vue
@@ -285,7 +285,7 @@ export default {
this.standGuardList = response.data
this.imgList = this.standGuardList.map(e => {
- return `${config.loginBaseUrl}ynPlan${e.imgPath}`
+ return `http://192.168.0.14:19191/ynPlanApp${e.imgPath}`
})
},
/* 点击作业计划时查询作业人员 */