guoyuepeng
/
qa-regulatory-gwj-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、bug修复：监管端路由缺失 

2、bug修复：相关方端样式调整后无法操作延迟监火
八项作业
liujun 2024-11-06 15:57:42 +08:00
parent 0170c0b143
commit bf3a2e525c
5 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
components/fab_button/up_index.vue Normal file
View File

@ -0,0 +1,39 @@
<template>
<view class="fab_button" @click="$emit('click')">
<block v-if="type === 'plus'">
<u-icon name="plus" color="#fff" size="28rpx"></u-icon>
</block>
<block v-if="type === 'search'">
<u-icon name="search" color="#fff" size="28rpx"></u-icon>
</block>
<block v-if="type === 'edit'">
<u-icon name="edit-pen" color="#fff" size="28rpx"></u-icon>
</block>
</view>
</template>
<script>
export default {
props: {
type: {
type: String,
default: "plus",
},
},
}
</script>
<style scoped lang="scss">
.fab_button {
position: fixed;
bottom: 200rpx;
right: 30rpx;
background-color: #3377ff;
border-radius: 50%;
width: 80rpx;
height: 80rpx;
display: flex;
align-items: center;
justify-content: center;
}
</style>

4
pages/eight_assignments/confined_space/apply.vue
View File

@ -119,8 +119,8 @@ export default {
WORK_CONTENT: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
WORK_LONGITUDE: '',
WORK_LATITUDE: '',
WORK_LONGITUDE: '1',
WORK_LATITUDE: '2',
WORK_USER: '',
SPECIAL_WORK: '',
RISK_IDENTIFICATION: '',

19
pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
View File

@ -26,13 +26,20 @@
</view>
<empty v-else></empty>
</view>
<app-fab-button v-if="isView !== '1'" type="plus" @click="fnScan" />
<app-fab-up-button v-if="isView !== '1'" type="edit" @click="fnUpScan" />
</view>
</template>
<script>
import { getHotWorkRecord, setTaskSign} from "../../../../api";
import AppFabButton from "@/components/fab_button/index.vue";
import AppFabUpButton from "@/components/fab_button/up_index.vue";
export default {
components: {
AppFabButton,AppFabUpButton
},
data() {
return {
list: [],
@ -104,6 +111,18 @@ export default {
})
}, 2000)
},
fnScan() {
uni.$u.route({
url: '/pages/eight_assignments/hot_work/delay_fire_monitoring/add',
params: {taskId: this.EW_RU_TASK_ID, EW_RU_JOB_ID:this.EW_RU_JOB_ID,TYPE:this.TYPE}
});
},
fnUpScan(){
uni.$u.route({
url: '/pages/eight_assignments/hot_work/delay_fire_monitoring/task_forward',
params: {taskId: this.EW_RU_TASK_ID, EW_RU_JOB_ID:this.EW_RU_JOB_ID,TYPE:this.TYPE}
});
}
}
}
</script>

2
utils/request.js
View File

@ -13,7 +13,7 @@ function post(url, data) {
data,
method: 'POST',
header: {
'Content-type': 'application/x-www-form-urlencoded'
'Content-type': data?.postMethod || 'application/x-www-form-urlencoded'
},
success: (res) => {
if (data && data.loading !== false) {

2
utils/submitHomeworkProcess.js
View File

@ -183,7 +183,7 @@ export const addFlowInfo = async ({form, list, taskId, EW_RU_JOB_ID, TYPE,CORP_I
export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TYPE = '', EW_RU_JOB_ID = '',vernier = ''}, isLastStep = true) => {
let stepNum = 0
if (isLastStep) {
const {info} = await getCurrentNextOperation({EW_RU_TASK_ID, EW_RU_JOB_ID, VERNIER: vernier})
const {info} = await getCurrentNextOperation({EW_RU_TASK_ID, EW_RU_JOB_ID, VERNIER: vernier, REQUEST_SOURCE: '1'})
// 选人
if (info.chooseNextFlag === '1') {
uni.navigateTo({