diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index c9a0237..6ac8c83 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,6 +135,10 @@ padding: 20px; } +.publicContainer{ + padding: 20px; +} + .components-container { margin: 30px 50px; position: relative; diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index c9a0237..6ac8c83 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,6 +135,10 @@ padding: 20px; } +.publicContainer{ + padding: 20px; +} + .components-container { margin: 30px 50px; position: relative; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 162ee42..cccc0ab 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -22,7 +22,8 @@ .app-main { /* 50= navbar 50 */ // min-height: calc(100vh - 50px); - min-height: 100vh; + // min-height: 100vh; + height: 100vh; width: 100%; position: relative; overflow: hidden; @@ -35,7 +36,8 @@ .hasTagsView { .app-main { /* 84 = navbar + tags-view = 50 + 34 */ - min-height: calc(100vh - 84px); + // min-height: calc(100vh - 84px); + height: calc(100vh - 84px); } .fixed-header + .app-main { diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index c9a0237..6ac8c83 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,6 +135,10 @@ padding: 20px; } +.publicContainer{ + padding: 20px; +} + .components-container { margin: 30px 50px; position: relative; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 162ee42..cccc0ab 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -22,7 +22,8 @@ .app-main { /* 50= navbar 50 */ // min-height: calc(100vh - 50px); - min-height: 100vh; + // min-height: 100vh; + height: 100vh; width: 100%; position: relative; overflow: hidden; @@ -35,7 +36,8 @@ .hasTagsView { .app-main { /* 84 = navbar + tags-view = 50 + 34 */ - min-height: calc(100vh - 84px); + // min-height: calc(100vh - 84px); + height: calc(100vh - 84px); } .fixed-header + .app-main { diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index ec0a7b4..ec653de 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -33,7 +33,7 @@ generateRoutes(roles) { return new Promise((resolve) => { // 向后端请求路由数据 - getRouters("system,rcloud,fxzb,zhwh,voice").then((res) => { + getRouters("system,rcloud,fxzb,zhwh,voice,order").then((res) => { const sdata = JSON.parse(JSON.stringify(res.data)); const rdata = JSON.parse(JSON.stringify(res.data)); const defaultData = JSON.parse(JSON.stringify(res.data)); diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index c9a0237..6ac8c83 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,6 +135,10 @@ padding: 20px; } +.publicContainer{ + padding: 20px; +} + .components-container { margin: 30px 50px; position: relative; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 162ee42..cccc0ab 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -22,7 +22,8 @@ .app-main { /* 50= navbar 50 */ // min-height: calc(100vh - 50px); - min-height: 100vh; + // min-height: 100vh; + height: 100vh; width: 100%; position: relative; overflow: hidden; @@ -35,7 +36,8 @@ .hasTagsView { .app-main { /* 84 = navbar + tags-view = 50 + 34 */ - min-height: calc(100vh - 84px); + // min-height: calc(100vh - 84px); + height: calc(100vh - 84px); } .fixed-header + .app-main { diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index ec0a7b4..ec653de 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -33,7 +33,7 @@ generateRoutes(roles) { return new Promise((resolve) => { // 向后端请求路由数据 - getRouters("system,rcloud,fxzb,zhwh,voice").then((res) => { + getRouters("system,rcloud,fxzb,zhwh,voice,order").then((res) => { const sdata = JSON.parse(JSON.stringify(res.data)); const rdata = JSON.parse(JSON.stringify(res.data)); const defaultData = JSON.parse(JSON.stringify(res.data)); diff --git a/src/views/order/workOrderProcessing/index.vue b/src/views/order/workOrderProcessing/index.vue new file mode 100644 index 0000000..604c354 --- /dev/null +++ b/src/views/order/workOrderProcessing/index.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index c9a0237..6ac8c83 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -135,6 +135,10 @@ padding: 20px; } +.publicContainer{ + padding: 20px; +} + .components-container { margin: 30px 50px; position: relative; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 162ee42..cccc0ab 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -22,7 +22,8 @@ .app-main { /* 50= navbar 50 */ // min-height: calc(100vh - 50px); - min-height: 100vh; + // min-height: 100vh; + height: 100vh; width: 100%; position: relative; overflow: hidden; @@ -35,7 +36,8 @@ .hasTagsView { .app-main { /* 84 = navbar + tags-view = 50 + 34 */ - min-height: calc(100vh - 84px); + // min-height: calc(100vh - 84px); + height: calc(100vh - 84px); } .fixed-header + .app-main { diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index ec0a7b4..ec653de 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -33,7 +33,7 @@ generateRoutes(roles) { return new Promise((resolve) => { // 向后端请求路由数据 - getRouters("system,rcloud,fxzb,zhwh,voice").then((res) => { + getRouters("system,rcloud,fxzb,zhwh,voice,order").then((res) => { const sdata = JSON.parse(JSON.stringify(res.data)); const rdata = JSON.parse(JSON.stringify(res.data)); const defaultData = JSON.parse(JSON.stringify(res.data)); diff --git a/src/views/order/workOrderProcessing/index.vue b/src/views/order/workOrderProcessing/index.vue new file mode 100644 index 0000000..604c354 --- /dev/null +++ b/src/views/order/workOrderProcessing/index.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/order/workOrderQuery/index.vue b/src/views/order/workOrderQuery/index.vue new file mode 100644 index 0000000..5e84083 --- /dev/null +++ b/src/views/order/workOrderQuery/index.vue @@ -0,0 +1,10 @@ + + + + +