InteSecurePlatform.git

Your Name

2022-10-13 902a537974ce0374d68d9e717febab7157a69286

refs
author	Your Name <123456>
	Thursday, October 13, 2022 09:43 +0800
committer	Your Name <123456>
	Thursday, October 13, 2022 09:43 +0800
commit	902a537974ce0374d68d9e717febab7157a69286
tree	62e81ccea0427fbbcf122ba8c6792b0ff423a113 tree \| zip \| gz
parent	5806da03842c4841321062701ec6db3adca5df73 view \| diff 8c84adf2d3cd83d0c5f8ee77d3fb615ae9a02ba7 view \| diff

冲突

13 files deleted

17 files renamed

17 files modified

5 files added

	src/api/specialWorkSystem/workApply/index.ts	9 ●●●●● diff \| view \| raw \| blame \| history
	src/router/route.ts	24 ●●●●● diff \| view \| raw \| blame \| history
	src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/newHome/index.vue	31 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/alarm/alerts/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/flow/basicApprove/components/approveBasicDialog.vue	diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/flow/basicApprove/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/flow/ruleofApp/components/approveItemDialog.vue	diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/flow/ruleofApp/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/foundationSet/material/index.vue	26 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/foundationSet/safetyAction/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/plan/appoint/index.vue	diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/plan/reservation/index.vue	diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/plan/sumReserve/index.vue	diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/process/analysis/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/process/components/dialogPermitNo.vue	diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/process/gasCheck/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/allApplys/components/brokenLog.vue	116 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/allApplys/components/fireLog.vue	107 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/allApplys/components/groundLog.vue	116 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/allApplys/components/heightLog.vue	110 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/allApplys/components/hoistLog.vue	110 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/allApplys/components/plateLog.vue	134 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/allApplys/components/powerLog.vue	113 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/allApplys/components/spaceLog.vue	113 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/allApplys/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/apply/components/broken.vue	184 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/apply/components/fire.vue	502 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/apply/components/ground.vue	181 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/apply/components/height.vue	547 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/apply/components/hoist.vue	445 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/apply/components/plate.vue	186 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/apply/components/power.vue	443 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/apply/components/space.vue	513 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/apply/index.vue	18 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myApproval/index.vue	13 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myJobApply/components/brokenLog.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myJobApply/components/fireLog.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myJobApply/components/hoistLog.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myJobApply/components/plateLog.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myJobApply/components/powerLog.vue	12 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue	14 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/myJobApply/index.vue	22 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/workApply/components/fire.vue	309 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/workApply/components/height.vue	367 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue	262 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/workApply/components/power.vue	264 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workTicket/workApply/components/space.vue	330 ●●●●● diff \| view \| raw \| blame \| history