hywen
/
YNUtdPlatform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sy-10-10'

This commit is contained in:
BianLzhaoMin 2024-11-22 13:20:59 +08:00
parent 133e28f941 a1b6f24f73
commit 4c278a2e90
18 changed files with 164 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/phaseTwo/homePage.js
View File

@ -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

4
api/workPlan/dayPlan.js
View File

@ -217,7 +217,7 @@ export function getMonthPlanDataProApi(data) {
// 月计划-查看数据 --生产
export function getViewDataListProApi(data) {
return request_yn({
url: '/ynPlanApp/infDay/getViewData',
url: '/ynPlanApp/proDay/getViewData',
method: 'post',
data: data
})
@ -297,7 +297,7 @@ export function getIsPlanApi(data) {
// 月计划-查看当前工程 当前月计划是否上传 - 生产
export function getIsPlanProApi(data) {
return request_yn({
url: '/ynPlanApp/infDay/isPlan',
url: '/ynPlanApp/proDay/isPlan',
method: 'post',
data: data
})

2
api/workPlan/weekPlan.js
View File

@ -147,7 +147,7 @@ export function getWorkPlanContentApi(data) {
// 月计划-导入计划 --基建
export function getWorkPlanContentProApi(data) {
return request_yn({
url: '/ynPlanApp/ProWeek/isPlan',
url: '/ynPlanApp/proWeek/isPlan',
method: 'post',
data: data
})

5
pages/realName/workPlan-details/index.vue
View File

@ -92,7 +92,7 @@
<view @tap="onPreviewImage(index)" v-for="(item, index) in standGuardList" :key="index">
<image
class="image-content"
:src="`${config.loginBaseUrl}ynPlan${item.imgPath}`"
:src="`http://192.168.0.14:19191/ynPlanApp${item.imgPath}`"
mode="scaleToFill"
lazy-load="true"
></image>
@ -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}`
})
},
/* 点击作业计划时查询作业人员 */

13
pages/workPlan/dayPlan/inf-index.vue
View File

@ -552,6 +552,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>
@ -2061,14 +2068,14 @@ export default {
// 设置新的定时器，延迟执行函数
timer = setTimeout(() => {
fn.apply( ...args) // 使用 `apply` 确保 `this` 指向 Vue 实例
fn.apply(...args) // 使用 `apply` 确保 `this` 指向 Vue 实例
}, delay)
}
},
}
},
created() {
// 将防抖应用到 `onSendMessage` 方法上
this.onSaveSubmit = this.debounce(this.onSaveSubmit, 1000);
this.onSaveSubmit = this.debounce(this.onSaveSubmit, 1000)
},
onReady() {},

7
pages/workPlan/dayPlan/pro-index.vue
View File

@ -492,6 +492,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>

7
pages/workPlan/monthPlan/inf-index.vue
View File

@ -456,6 +456,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>

84
pages/workPlan/monthPlan/pro-index.vue
View File

@ -465,6 +465,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>
@ -548,7 +555,9 @@
</view>
<view class="view-project-list">
<scroll-view :scroll-y="true" class="view-project-item">
<view v-for="item in workWaitProjectList" :key="item.id">{{ item.proName }}</view>
<view v-for="item in workWaitProjectList" :key="item.id" @tap="onViewAuditingDetails(item)">
{{ item.proName }}
</view>
</scroll-view>
</view>
</view>
@ -1361,7 +1370,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 +2146,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;
}

1
pages/workPlan/monthPlanAuditingDetails/pro-index.vue
View File

@ -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

7
pages/workPlan/networkPlan/inf-index.vue
View File

@ -453,6 +453,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>

7
pages/workPlan/networkPlan/pro-index.vue
View File

@ -454,6 +454,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>

7
pages/workPlan/tempPlan/inf-index.vue
View File

@ -505,6 +505,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>

7
pages/workPlan/tempPlan/pro-index.vue
View File

@ -509,6 +509,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>

7
pages/workPlan/weekPlan/inf-index.vue
View File

@ -518,6 +518,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>

9
pages/workPlan/weekPlan/pro-index.vue
View File

@ -536,6 +536,13 @@
v-for="item in projectListSel"
:key="item.value"
@tap="onChangeProjectInPopup(item)"
style="
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
"
>
{{ item.text }}
</view>
@ -888,7 +895,7 @@ export default {
{ form_label: '投入车辆(辆)', items_type: 'ipt', required: true, name: 'cls', isType: 'number' },
{ form_label: '开始时间', items_type: 'date', required: true, name: 'kssj' },
{ form_label: '结束时间', items_type: 'date', required: true, name: 'jssj' },
{ form_label: '典型中高风险分部分项公工程', items_type: 'ipt', required: false, name: 'fxgc' },
{ form_label: '典型中高风险分部分项工程', items_type: 'ipt', required: false, name: 'fxgc' },
{ form_label: '开始时间', items_type: 'date', required: false, name: 'fxkssj' },
{ form_label: '结束时间', items_type: 'date', required: false, name: 'fxjssj' },
{ form_label: '作业地点', items_type: 'ipt', required: false, name: 'fxgzdd' }

2
pages/workPlan/weekPlanAuditingDetails/pro-index.vue
View File

@ -376,7 +376,7 @@ export default {
{ form_label: '投入车辆(辆)', items_type: 'ipt', required: true, name: 'cls', isType: 'number' },
{ form_label: '开始时间', items_type: 'date', required: true, name: 'kssj' },
{ form_label: '结束时间', items_type: 'date', required: true, name: 'jssj' },
{ form_label: '典型中高风险分部分项公工程', items_type: 'ipt', required: false, name: 'fxgc' },
{ form_label: '典型中高风险分部分项工程', items_type: 'ipt', required: false, name: 'fxgc' },
{ form_label: '开始时间', items_type: 'date', required: false, name: 'fxkssj' },
{ form_label: '结束时间', items_type: 'date', required: false, name: 'fxjssj' },
{ form_label: '作业地点', items_type: 'ipt', required: false, name: 'fxgzdd' }

2
pages/workPlan/weekPlanDetails/pro-index.vue
View File

@ -374,7 +374,7 @@ export default {
{ form_label: '投入车辆(辆)', items_type: 'ipt', required: true, name: 'cls', isType: 'number' },
{ form_label: '开始时间', items_type: 'date', required: true, name: 'kssj' },
{ form_label: '结束时间', items_type: 'date', required: true, name: 'jssj' },
{ form_label: '典型中高风险分部分项公工程', items_type: 'ipt', required: false, name: 'fxgc' },
{ form_label: '典型中高风险分部分项工程', items_type: 'ipt', required: false, name: 'fxgc' },
{ form_label: '开始时间', items_type: 'date', required: false, name: 'fxkssj' },
{ form_label: '结束时间', items_type: 'date', required: false, name: 'fxjssj' },
{ form_label: '作业地点', items_type: 'ipt', required: false, name: 'fxgzdd' }

2
pages/workPlan/workPlan-details/index.vue
View File

@ -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}`
})
},
/* 点击作业计划时查询作业人员 */