pet #3

guoyuepeng · 2024-12-13T09:00:48+08:00

guoyuepeng commented

2024-12-13 09:00:48 +08:00

There is no content yet.

guoyuepeng added 34 commits 2024-12-13 09:00:49 +08:00

d30c328e6b 监管端八项作业支持

a897ff8c11 八项作业新功能app端功能上线

1e840758cc 人员定位还原

0170c0b143 监管端人员合并

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

2、bug修复：相关方端样式调整后无法操作延迟监火

568cce01f0 1、分公司隐患考评的考评功能

50c0c246b3 1、bug修复：无法使用定位功能

387336b808 Merge remote-tracking branch 'origin/pet' into pet

559a861f79 动火下一步跳白屏bug修复

5a680bd0d4 bug修复，隐藏字段被展示

23d1b73e5d 1、动火作业气体分析未校验

2、已办事项按钮样式调整

edddf9fe6c 2563 动火作业流程图延时监火是部门显示部门所有端都要改

cbe2ac7d3a 1、app端无法显示气体分析

2、app打回后无法重新提交

8228b34f99 必填校验bug修复

dadfd333d2 动火等级调整

10ef76c1b6 1、安全检查项bug修复

cc9dd66f3b 图片能点击放大

235184e8c7 同步受限空间bug

11a117e39a 动火点击定位后。无法正常审批

bfa7fb4820 Merge remote-tracking branch 'origin/pet' into pet

7a52ade288 详情页样式调整

d5ac3d97fb 临时用电气体分析

998395fdba Merge remote-tracking branch 'origin/pet' into pet

c921c6590d 监管端未传部门id

87003da2d1 【bug】

1. 修改盲板申请单位签字后不生效的问题

6739da1733 监管端人员定位默认值清空

10542eabc4 【bug】

1. 关联其他作业票 不正确

35ffea7066 Merge remote-tracking branch 'origin/pet' into pet

af4f790449 [bug修改]

1、监管端、相关方端已办中无法查看其他信息
2、删除无效代码

04fdcb9a96 Merge remote-tracking branch 'origin/pet' into pet

beeb53f40e 1.查看安全环保检查视频

cc8ff0d52b 重点工程播放视频

332a6dbc9a 1.监管端重点工程显示视频

4dcbb45f02 Merge remote-tracking branch 'origin/pet' into pet

# Conflicts:
#	pages/key-project-management/positioning_management/videoView.vue

guoyuepeng added 1 commit 2024-12-13 11:24:54 +08:00

8a0ca55b43 1.缓存中存在附件地址信息错误

shanao added 2 commits 2024-12-17 15:36:42 +08:00

18c4066e6d 文件接口修改

f51bbd6c41 Merge remote-tracking branch 'origin/pet' into pet

shanao added 1 commit 2024-12-18 10:48:31 +08:00

f653988292 完成文件接口统一（除意见反馈附件新八项作业）

zhaohongyu added 2 commits 2024-12-26 16:31:47 +08:00

28108b65ae 20241205 适配隐患来源增加点检隐患

5a6185aa5d Merge remote-tracking branch 'origin/zhy_new_1203' into pet

shanao added 2 commits 2025-01-08 16:09:29 +08:00

94c4f55ecb 回退版本【{去除统一文件的修改}】

229942165d Merge remote-tracking branch 'origin/pet' into pet

shanao added 2 commits 2025-01-08 16:21:45 +08:00

ec55a2b248 Revert "1.缓存中存在附件地址信息错误"

This reverts commit 8a0ca55b43.

3f9a112d9f Merge remote-tracking branch 'origin/pet' into pet

shanao added 1 commit 2025-01-09 14:53:08 +08:00

b226670f10 回退版本【去除统一文件的修改】

huangyuxuan added 2 commits 2025-01-09 17:08:41 +08:00

16bf72187a [功能优化](pet):

解决企业风险四色图统计数字不对的情况，增加风险告知卡数统计，三人以上分布图数统计，人员聚集场所分布图数统计

f12c278111 Merge remote-tracking branch 'origin/pet' into pet

huangyuxuan added 1 commit 2025-01-09 17:42:30 +08:00

95ff51f2a4 [功能优化](pet):

解决滚动分页失效问题

shanao added 2 commits 2025-01-09 18:46:53 +08:00

c758656297 监管端安全环保检查检查人确认没有显示隐患数据

6db57dffb4 Merge remote-tracking branch 'origin/pet' into pet

shanao added 1 commit 2025-01-10 17:19:59 +08:00

3f0f4c89fa 安全环保检查发起页面问题

guoyuepeng added 1 commit 2025-01-10 17:46:24 +08:00

0109d54da2 1.解决样式问题

This pull request has changes conflicting with the target branch.

store/index.js

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b pet dev

git pull origin pet

Step 2:

Merge the changes and update on Gitea.

git checkout dev

git merge --no-ff pet

git push origin dev

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

4 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: guoyuepeng/qa-regulatory-gwj-app#3