ztqt.git - Gitblit

众泰前端

Merge remote-tracking branch 'origin/shf' into shf

panzy

2022-05-19 0f5e1534e83fa99cac09f9a3430539d115ed0b59

refs
author	panzy <225@qq.com>
	Thursday, May 19, 2022 20:25 +0800
committer	panzy <225@qq.com>
	Thursday, May 19, 2022 20:25 +0800
commit	0f5e1534e83fa99cac09f9a3430539d115ed0b59
tree	e1679e9d2e63b13b22fff7837e88c8ac6bb8acb3 tree \| zip \| gz
parent	53b78230a94642a3e2f910e72c469d324cd22731 view \| diff 4f77b7a712833d073f4006f3043468e0cbd9d7ca view \| diff

Merge remote-tracking branch 'origin/shf' into shf

# Conflicts:
#	src/api/sgyhpczl/safetyHazardAccount.js
#	src/views/safetyHazardAccount/index.vue

15 files modified

8 files added

	src/api/sgyhpczl/Issuedbysuperiors.js	88 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/hiddenDangerRegistration.js	4 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/oneFromanother.js	66 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/oneFromanotherN.js	119 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/safetyHazardAccount.js	30 ●●●●● diff \| view \| raw \| blame \| history
	src/permission.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/router/index.js	45 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Issuedbysuperiors/index.vue	59 ●●●●● diff \| view \| raw \| blame \| history
	src/views/careabout/index.vue	467 ●●●●● diff \| view \| raw \| blame \| history
	src/views/chartAnalysis/index.vue	170 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerRegistration/hiddenDangerAdd.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanother/exist.vue	244 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanother/index.vue	217 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanotherN/existN.vue	265 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanotherN/index.vue	598 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/Dualbase.vue	14 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/DualbaseLost.vue	554 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/accountSend.vue	540 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/index.vue	509 ●●●●● diff \| view \| raw \| blame \| history
	src/views/summaryPotentialSafetyHzards/index.vue	242 ●●●●● diff \| view \| raw \| blame \| history
	src/views/summaryPotentialSafetyHzards/summaryForm.vue	386 ●●●●● diff \| view \| raw \| blame \| history
	src/views/summaryPotentialSafetyHzards/summaryList.vue	354 ●●●●● diff \| view \| raw \| blame \| history
	src/views/troubleshooting/index.vue	508 ●●●●● diff \| view \| raw \| blame \| history