InteSecurePlatform.git

InteSecurePlatform

Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt

Your Name

2022-08-02 ac7d9e20978e710a54164b2e74ea464027754b7e

refs
author	Your Name <123456>
	Tuesday, August 2, 2022 09:09 +0800
committer	Your Name <123456>
	Tuesday, August 2, 2022 09:09 +0800
commit	ac7d9e20978e710a54164b2e74ea464027754b7e
tree	c501c014123dfc76836004b722784bf714a30bce tree \| zip \| gz
parent	33802d74d2720e86c406f5ca9531ac9435b9ddd2 view \| diff d592747d5eaa2cfbe698f8ac61222eb3aa75d1fc view \| diff

Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt

1 files deleted

20 files modified

14 files added

	src/api/basicDateManage/personShiftManage/workingHours/index.ts	58 ●●●●● diff \| view \| raw \| blame \| history
	src/api/basicDateManage/personShiftManage/workingHoursSet/index.ts	14 ●●●●● diff \| view \| raw \| blame \| history
	src/assets/loginPage/equipment.JPG	diff \| view \| raw \| blame \| history
	src/assets/loginPage/map-bg.jpg	diff \| view \| raw \| blame \| history
	src/assets/loginPage/map-bg.png	diff \| view \| raw \| blame \| history
	src/assets/loginPage/watersys.JPG	diff \| view \| raw \| blame \| history
	src/assets/loginPage/wind.JPG	diff \| view \| raw \| blame \| history
	src/assets/loginPage/xj-bg.png	diff \| view \| raw \| blame \| history
	src/assets/loginPage/xj-icon.png	diff \| view \| raw \| blame \| history
	src/assets/menu/bg_home.jpg	diff \| view \| raw \| blame \| history
	src/views/IntelligentXjSys/inspectionTaskManage/index.vue	1028 ●●●●● diff \| view \| raw \| blame \| history
	src/views/IntelligentXjSys/inspectionTaskManagement/index.vue	459 ●●●●● diff \| view \| raw \| blame \| history
	src/views/IntelligentXjSys/intelligentMap/index.vue	716 ●●●●● diff \| view \| raw \| blame \| history
	src/views/basicRightsManagement/personnelShiftManagement/holidayManagement/index.vue	361 ●●●●● diff \| view \| raw \| blame \| history
	src/views/basicRightsManagement/personnelShiftManagement/holidayTime/index.vue	625 ●●●●● diff \| view \| raw \| blame \| history
	src/views/basicRightsManagement/personnelShiftManagement/holidayTimeSet/index.vue	567 ●●●●● diff \| view \| raw \| blame \| history
	src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue	324 ●●●●● diff \| view \| raw \| blame \| history
	src/views/basicRightsManagement/personnelShiftManagement/shiftManagement/index.vue	458 ●●●●● diff \| view \| raw \| blame \| history
	src/views/basicRightsManagement/personnelShiftManagement/teamManagement/index.vue	408 ●●●●● diff \| view \| raw \| blame \| history
	src/views/basicRightsManagement/personnelShiftManagement/workingHours/index.vue	638 ●●●●● diff \| view \| raw \| blame \| history
	src/views/basicRightsManagement/personnelShiftManagement/workingHoursSet/index.vue	573 ●●●●● diff \| view \| raw \| blame \| history
	src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue	954 ●●●●● diff \| view \| raw \| blame \| history
	src/views/riskWarningSys/accidentLevel/index.vue	102 ●●●●● diff \| view \| raw \| blame \| history
	src/views/riskWarningSys/educationAndTraining/index.vue	102 ●●●●● diff \| view \| raw \| blame \| history
	src/views/riskWarningSys/emergencyDrills/index.vue	102 ●●●●● diff \| view \| raw \| blame \| history
	src/views/riskWarningSys/riskLevel/index.vue	96 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/afterWorkManagement/workTicketCheck/index.vue	97 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/afterWorkManagement/workTicketRecord/index.vue	97 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveLinkSetting/index.vue	103 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/approveTypeSetting/index.vue	97 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/approveProcessManagement/approveLinkSettings/reportTypeSetting/index.vue	124 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/approveProcessManagement/approveProcessList/index.vue	99 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workApplyManagement/myApply/index.vue	416 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workBasicManagementSetting/certificateFilterSetting/index.vue	297 ●●●●● diff \| view \| raw \| blame \| history
	src/views/specialWorkSystem/workBasicManagementSetting/personalProtectDevices/index.vue	97 ●●●●● diff \| view \| raw \| blame \| history