drone/drone-web-manage.git

无人机管理后台前端（已迁走）

罗广辉

2025-06-06 1280f9f5ed43a40ac8148fad21a7acd1d66acb27

refs
author	罗广辉 <guanghui.luo@foxmail.com>
	Friday, June 6, 2025 15:43 +0800
committer	罗广辉 <guanghui.luo@foxmail.com>
	Friday, June 6, 2025 15:43 +0800
commit	1280f9f5ed43a40ac8148fad21a7acd1d66acb27
tree	e9ce3ae21fbd5508a51df3db60c971e65892040d tree \| zip \| gz
parent	b583ee014966380f55cd929bca5146a8ccdad536 view \| diff c16a877107360f8e3c5ed0ec10e8332a22a90645 view \| diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/system/userinfo.vue

7 files modified

2 files added

	src/api/device-setting/index.js	57 ●●●●● diff \| view \| raw \| blame \| history
	src/option/user/info.js	15 ●●●●● diff \| view \| raw \| blame \| history
	src/permission copy 2.js	71 ●●●●● diff \| view \| raw \| blame \| history
	src/permission copy.js	133 ●●●●● diff \| view \| raw \| blame \| history
	src/permission.js	62 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/user.js	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/device/components/DockControlPanel.vue	203 ●●●●● diff \| view \| raw \| blame \| history
	src/views/system/userinfo.vue	30 ●●●●● diff \| view \| raw \| blame \| history
	src/views/tickets/orderLog.vue	27 ●●●●● diff \| view \| raw \| blame \| history