Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev

Fork: 0

codedev / smart-metering-front

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev dev excel vue3-front v1.1.0.1 v1.1.0 V1.3.2 V1.3.1 V1.0.2 V1.0.1 V1.0.0
commit 22c09646e8398226c5ce6c38a4365b6b367be976 2 parents b9b1c36 + dcc621f dutingting authored on 26 Dec 2022

Patch

Unified Split

Showing 20 changed files

Ignore Space Show notes View src/assets/styles/globals.scss

Ignore Space Show notes View src/components/Echart/LineChart.vue

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

Ignore Space Show notes View src/layouts/components/SubSidebar/index.vue

Ignore Space Show notes View src/router/index.ts

Ignore Space Show notes View src/router/modules/measure.ts

Ignore Space Show notes View src/router/modules/system.ts

Ignore Space Show notes View src/settings.ts

Ignore Space Show notes View src/store/modules/menu.ts

Ignore Space Show notes View src/utils/structure.ts

Ignore Space Show notes View src/utils/validate.ts 0 → 100644

Ignore Space Show notes View src/views/example/chartExample.vue 0 → 100644

Ignore Space Show notes View src/views/measure/bench/bench.vue

Ignore Space Show notes View src/views/measure/price/list.vue

Ignore Space Show notes View src/views/measure/price/list_interface.ts

Ignore Space Show notes View src/views/measure/price/priceAdd.vue

Ignore Space Show notes View src/views/system/area/editArea.vue

Ignore Space Show notes View src/views/system/dept/listDept.vue

Ignore Space Show notes View src/views/system/role/listRole.vue

Ignore Space Show notes View src/views/system/user/userAdd.vue

Show line notes below