Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0

Fork: 0

codedev / smartwell_front

Browse code Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0 dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit 7ba8e8923425ed218309f39fca167c51f4bd0105 2 parents 42e41e2 + 079bd5a StephanieGitHub authored on 17 May 2022

Patch

Unified Split

Showing 16 changed files

Ignore Space Show notes View mock/index.js

Ignore Space Show notes View mock/systemConfig/alarmContent.js 0 → 100644

Ignore Space Show notes View mock/systemConfig/deptPermission.js 0 → 100644

Ignore Space Show notes View mock/systemConfig/tenantConfig.js 0 → 100644

Ignore Space Show notes View src/api/systemConfig/alarmContent.js 0 → 100644

Ignore Space Show notes View src/api/systemConfig/alarmLevel.js

Ignore Space Show notes View src/api/systemConfig/deptPermission.js 0 → 100644

Ignore Space Show notes View src/api/systemConfig/tenantConfig.js 0 → 100644

Ignore Space Show notes View src/components/NormalTable/index.vue

Ignore Space Show notes View src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue 0 → 100644

Ignore Space Show notes View src/views/systemConfig/alarmContent/listContent.vue

Show notes View src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue 100644 → 0

Ignore Space Show notes View src/views/systemConfig/deptPermission/components/dialogListDept.vue 0 → 100644

Ignore Space Show notes View src/views/systemConfig/deptPermission/listDept.vue

Ignore Space Show notes View src/views/systemConfig/tenantConfig/components/dialogListTenant.vue 0 → 100644

Ignore Space Show notes View src/views/systemConfig/tenantConfig/listTenant.vue

Show line notes below