Merge pull request 'fix : 修改审批记录回退节点icon' (#677) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/677
This commit is contained in:
2024-08-06 10:45:44 +00:00
3 changed files with 9 additions and 5 deletions

View File

@@ -35,7 +35,7 @@ steps:
- name: build-docker-prod # 制作docker镜像 - name: build-docker-prod # 制作docker镜像
image: 10.7.127.190:3800/docker/docker # 使用官方docker镜像 image: 10.7.127.190:38080/docker/docker # 使用官方docker镜像
volumes: # 将容器内目录挂载到宿主机 volumes: # 将容器内目录挂载到宿主机
- name: docker - name: docker
path: /var/run/docker.sock # 挂载宿主机的docker path: /var/run/docker.sock # 挂载宿主机的docker

View File

@@ -80,8 +80,10 @@ const initUser = (user) => {
user["color"] = "#c0c4cc" user["color"] = "#c0c4cc"
} }
if (state === 'ROLLBACK') { if (state === 'ROLLBACK') {
user["icon"] = 'RefreshLeft' // user["icon"] = 'RefreshLeft'
user["color"] = "#f78f5f" // user["color"] = "#f78f5f"
user["icon"] = 'CircleCloseFilled'
user["color"] = "#f56c6c"
} }
return user; return user;
} }

View File

@@ -229,8 +229,10 @@ const initOperationFun = (operation) => {
} }
//回退 //回退
if (state === 'ROLLBACK') { if (state === 'ROLLBACK') {
operation["icon"] = "RefreshLeft" // operation["icon"] = "RefreshLeft"
operation["color"] = "#f78f5f" // operation["color"] = "#f78f5f"
operation["icon"] = "CircleCloseFilled"
operation["color"] = "#f56c6c"
operation["remark"] = " 回退成功" operation["remark"] = " 回退成功"
} }
//拒绝操作 //拒绝操作