隐患排查体系综合管控系统
parent: 993f37 | patch | commitdiff
lyfO_o
2022-07-12 c562fa2e66f4972ae23fa57ef7412da6e18991ed
refs
author lyfO_o <764716047@qq.com>
Tuesday, July 12, 2022 14:31 +0800
committer lyfO_o <764716047@qq.com>
Tuesday, July 12, 2022 14:31 +0800
commitc562fa2e66f4972ae23fa57ef7412da6e18991ed
tree 6005b885a3572f101a44f9a2e78ba6a6e485ab0e tree | zip | gz
parent 993f37f8def16855b7a6e26f6d598c3cde368bb7 view | diff
ba77c7440e508489dbe5d6d54293c4fdedb0a5aa view | diff 
Merge remote-tracking branch 'remotes/origin/shf' into master

# Conflicts:
#	src/api/sgyhpczl/auth.js
#	src/router/index.js
17 files modified
1832 ■■■■■ changed files
src/api/login.js 17 ●●●●● diff | view | raw | blame | history
src/api/sgyhpczl/auth.js 8 ●●●●● diff | view | raw | blame | history
src/api/sgyhpczl/careabout.js 2 ●●●●● diff | view | raw | blame | history
src/api/sgyhpczl/hiddenDangerRegistration.js 40 ●●●●● diff | view | raw | blame | history
src/api/sgyhpczl/majorHidden.js 15 ●●●●● diff | view | raw | blame | history
src/router/index.js 701 ●●●●● diff | view | raw | blame | history
src/views/accidentHidden/fillProgress.vue 9 ●●●●● diff | view | raw | blame | history
src/views/accidentHidden/majorHidden.vue 75 ●●●●● diff | view | raw | blame | history
src/views/careabout/index.vue 16 ●●●●● diff | view | raw | blame | history
src/views/chartAnalysis/index.vue 1 ●●●●● diff | view | raw | blame | history
src/views/contingencyplan/index.vue 694 ●●●●● diff | view | raw | blame | history
src/views/contingencyplan/uploadFile.vue 11 ●●●●● diff | view | raw | blame | history
src/views/hiddenDangerRegistration/hiddenDangerAdd.vue 24 ●●●●● diff | view | raw | blame | history
src/views/hiddenDangerRegistration/index.vue 194 ●●●●● diff | view | raw | blame | history
src/views/login/index.vue 22 ●●●●● diff | view | raw | blame | history
src/views/safetyproduction/checklistself.vue 2 ●●●●● diff | view | raw | blame | history
src/views/safetyproduction/new.vue 1 ●●●●● diff | view | raw | blame | history