zhba/zhba_regulatory.git

保安监管系统

liuyg

2021-07-15 15fcf6a04e05480a57d2c416f2589487fee34241

refs
author	liuyg <376836862@qq.com>
	Thursday, July 15, 2021 17:48 +0800
committer	liuyg <376836862@qq.com>
	Thursday, July 15, 2021 17:48 +0800
commit	15fcf6a04e05480a57d2c416f2589487fee34241
tree	19496e5f58bde2d07cebe77a8d40d8e59846742f tree \| zip \| gz
parent	bec79d7b98d7aaf67e9c8f56083ff9f689f266c3 view \| diff 671c27950c33f52ed1d22af2e5b48b5d45b9885f view \| diff

冲突   样式小改

11 files modified

7 files added

	src/api/desk/notice.js	81 ●●●●● diff \| view \| raw \| blame \| history
	src/api/record/record.js	50 ●●●●● diff \| view \| raw \| blame \| history
	src/api/recordk/recordk.js	50 ●●●●● diff \| view \| raw \| blame \| history
	src/api/resource/attach.js	1 ●●●●● diff \| view \| raw \| blame \| history
	src/api/revoke/revoke.js	50 ●●●●● diff \| view \| raw \| blame \| history
	src/config/env.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/config/iconList.js	1 ●●●●● diff \| view \| raw \| blame \| history
	src/router/views/index.js	424 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/common.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/element-ui.scss	33 ●●●●● diff \| view \| raw \| blame \| history
	src/styles/theme/bule.scss	54 ●●●●● diff \| view \| raw \| blame \| history
	src/views/desk/notice.vue	582 ●●●●● diff \| view \| raw \| blame \| history
	src/views/permit/permit.vue	19 ●●●●● diff \| view \| raw \| blame \| history
	src/views/record/record.vue	505 ●●●●● diff \| view \| raw \| blame \| history
	src/views/recordk/recordk.vue	502 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/attach.vue	58 ●●●●● diff \| view \| raw \| blame \| history
	src/views/resource/uploadNotice.vue	345 ●●●●● diff \| view \| raw \| blame \| history
	src/views/revoke/revoke.vue	479 ●●●●● diff \| view \| raw \| blame \| history