jagzwxm/ja_web.git

吉安感知网项目-前端

Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-23 9910480f5a2419c3ee9f5cdbb237ebb36a1004b3

refs
author	罗广辉 <guanghui.luo@foxmail.com>
	Friday, January 23, 2026 17:46 +0800
committer	罗广辉 <guanghui.luo@foxmail.com>
	Friday, January 23, 2026 17:46 +0800
commit	9910480f5a2419c3ee9f5cdbb237ebb36a1004b3
tree	ce32f2126da8bb49dccbcc891b9616eb0dd86f0d tree \| zip \| gz
parent	426ab4e0372764a5b7e37989893888f0c87f1eb3 view \| diff 233ca8def6816070c75fe5cee109c27f59879072 view \| diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue

24 files modified

1 files deleted

	applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/index.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue	6 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue	26 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue	10 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/api/work/index.js	92 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/api/work/index1.js	58 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/pages/login/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/pages/user/index.vue	8 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/pages/work/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/subPackages/userDetail/password/index.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-app/src/subPackages/workDetail/index.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/pages/equipmentManagement/index.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/pages/legalPolicy/index.vue	11 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/pages/page/index.vue	98 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/store/modules/app/index.js	52 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/deviceRegistration/add.vue	96 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/flightApplication/add.vue	109 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/flightApplication/details.vue	157 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/flightApplication/index.vue	87 ●●●●● diff \| view \| raw \| blame \| history
	uniapps/work-wx/src/subPackages/regulationsDetail/details.vue	165 ●●●●● diff \| view \| raw \| blame \| history