ztqt.git - Gitblit

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

lyfO_o

2022-06-09 44d7a737dc0d63ad1dd7c52d45fc2233d1950173

refs
author	lyfO_o <764716047@qq.com>
	Thursday, June 9, 2022 09:56 +0800
committer	lyfO_o <764716047@qq.com>
	Thursday, June 9, 2022 09:56 +0800
commit	44d7a737dc0d63ad1dd7c52d45fc2233d1950173
tree	9275741043ce8a172f11600202f4e0f2995bf1a0 tree \| zip \| gz
parent	f29d0382c54aff9448c9c1cfc77420e06b34022c view \| diff 8233d745e8ed66f553122d7f43739cc0db764564 view \| diff

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

# Conflicts:
#	src/permission.js
#	src/router/index.js

1 files deleted

30 files modified

25 files added

	package.json	2 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/Issuedbysuperiors.js	103 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/careabout.js	119 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/chartAnalysis.js	31 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/delayHiddenDangerRectification.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/fileUtils.js	17 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/hiddenDangerManagement.js	16 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/hiddenDangerRegistration.js	6 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/hiddenDangerTroubleshootingList.js	37 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/initSelect.js	16 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/majorHidden.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/oneFromanother.js	104 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/oneFromanotherN.js	119 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/recheckCancellationNumber.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/safetyHazardAccount.js	123 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/summaryPotentialSafetyHzards.js	34 ●●●●● diff \| view \| raw \| blame \| history
	src/api/sgyhpczl/troubleshooting.js	85 ●●●●● diff \| view \| raw \| blame \| history
	src/main.js	9 ●●●●● diff \| view \| raw \| blame \| history
	src/permission.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/router/index.js	542 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Issuedbysuperiors/index.vue	476 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Issuedbysuperiors/superiorsSend.vue	565 ●●●●● diff \| view \| raw \| blame \| history
	src/views/careabout/index.vue	577 ●●●●● diff \| view \| raw \| blame \| history
	src/views/careabout/managementConcerns.vue	240 ●●●●● diff \| view \| raw \| blame \| history
	src/views/chartAnalysis/index.vue	916 ●●●●● diff \| view \| raw \| blame \| history
	src/views/common/jdSelect.vue	394 ●●●●● diff \| view \| raw \| blame \| history
	src/views/dangerDetails/dnagerDetails.vue	142 ●●●●● diff \| view \| raw \| blame \| history
	src/views/delayHiddenDangerRectification/index.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue	60 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerManagement/fillRectificationAdd.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerManagement/index.vue	14 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerRectification/index.vue	91 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerRectification/sendHiddenDangerList.vue	45 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerRegistration/hiddenDangerAdd.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerReview/recheckCancellationNumber.vue	17 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerReview/recheckHiddenDangerList.vue	52 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerTroubleshootingList/index.vue	143 ●●●●● diff \| view \| raw \| blame \| history
	src/views/hiddenDangerTroubleshootingList/preview.vue	178 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanother/exist.vue	270 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanother/index.vue	350 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanotherN/addDanger.vue	359 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanotherN/existN.vue	1181 ●●●●● diff \| view \| raw \| blame \| history
	src/views/oneFromanotherN/index.vue	721 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/Dualbase.vue	760 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/DualbaseLost.vue	554 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/accountSend.vue	382 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/hazardSource.vue	276 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/index.vue	766 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/inferOtherThings.vue	108 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/safetyedit.vue	653 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/superiorsSend.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	src/views/safetyHazardAccount/supervision.vue	108 ●●●●● diff \| view \| raw \| blame \| history
	src/views/summaryPotentialSafetyHzards/index.vue	487 ●●●●● diff \| view \| raw \| blame \| history
	src/views/summaryPotentialSafetyHzards/summaryForm.vue	386 ●●●●● diff \| view \| raw \| blame \| history
	src/views/summaryPotentialSafetyHzards/summaryList.vue	377 ●●●●● diff \| view \| raw \| blame \| history
	src/views/troubleshooting/index.vue	655 ●●●●● diff \| view \| raw \| blame \| history