隐患排查体系综合管控系统
parent: f9794a | patch | commitdiff
lyfO_o
2022-05-23 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653
refs
author lyfO_o <764716047@qq.com>
Monday, May 23, 2022 18:33 +0800
committer lyfO_o <764716047@qq.com>
Monday, May 23, 2022 18:33 +0800
commit08bf6da5e3164a1b3ee5c79bb5d666e6385b4653
tree abfc1dbd47e2aa973f80c57c7ed1529203ab57b5 tree | zip | gz
parent f9794a4fdf2a7586e292786055a71b297b086fa3 view | diff
5ea846950335afadd4cbe05d60871fb2da8213a3 view | diff 
Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
9 files modified
1 files added
1048 ■■■■■ changed files
src/api/riskLevelManage.js 11 ●●●●● diff | view | raw | blame | history
src/components/Tab/Marker.vue 542 ●●●●● diff | view | raw | blame | history
src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue 240 ●●●●● diff | view | raw | blame | history
src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue 61 ●●●●● diff | view | raw | blame | history
src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue 4 ●●●●● diff | view | raw | blame | history
src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue 89 ●●●●● diff | view | raw | blame | history
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue 57 ●●●●● diff | view | raw | blame | history
src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue 5 ●●●●● diff | view | raw | blame | history
src/views/specialWorkManage/specialWork/taskCreate/components/taskBasic/index.vue 36 ●●●●● diff | view | raw | blame | history
src/views/specialWorkManage/specialWork/taskCreate/components/taskCreate.vue 3 ●●●●● diff | view | raw | blame | history