diff --git a/src/assets/style/_base.scss b/src/assets/style/_base.scss index a49fe3c06a67a916de8b8c84f2f1407190742ec0..cfbef46b261d75c9a2ce7bfbb1f555ae5d8d913d 100644 --- a/src/assets/style/_base.scss +++ b/src/assets/style/_base.scss @@ -530,3 +530,93 @@ textarea:-ms-input-placeholder { page-break-before: avoid; } } + +//间距 +$size-map: ( + -2: -2px, + 4: 4px, + 5: 5px, + 8: 8px, + 10: 10px, + 12: 12px, + 15: 15px, + 16: 16px, + 20: 20px, + 24: 24px, + 25: 25px, + 30: 30px, + 32: 32px, + 40: 40px, + 50: 50px, + 80: 80px, + 140: 140px +); + +@each $name in map-keys($size-map) { + $value: map-get($size-map, $name); + + .mt-#{$name} { + margin-top: $value; + } + + .mr-#{$name} { + margin-right: $value; + } + + .mb-#{$name} { + margin-bottom: $value; + } + + .ml-#{$name} { + margin-left: $value; + } + + .margin-#{$name} { + margin: $value; + } + + .pt-#{$name} { + padding-top: $value !important; + } + + .pr-#{$name} { + padding-right: $value; + } + + .pb-#{$name} { + padding-bottom: $value; + } + + .pl-#{$name} { + padding-left: $value; + } + + .pd-#{$name} { + padding: $value; + } +} + +//字号 +$font-map: ( + 10: 10px, + 11: 11px, + 14: 14px, + 15: 15px, + 18: 18px, + 20: 20px, + 24: 24px, + 25: 25px, + 30: 30px, + 36: 36px, + 40: 40px, + 50: 50px, + 80: 80px, + 140: 140px +); +@each $size in map-keys($font-map) { + $value: map-get($font-map, $size); + + .font-#{$size} { + font-size: $value; + } +} diff --git a/src/layouts/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue index 0c89b4441a83743b3e2fd7fec11a5595b5980721..1c2c9357dc8d5c525f5c72bfd40eff8ae89c3773 100644 --- a/src/layouts/components/NavBar/index.vue +++ b/src/layouts/components/NavBar/index.vue @@ -14,27 +14,21 @@ :class="['font', index == fontIndex ? 'active' : '']" @click="changeFont(index)" > -
- {{ item.label }} -
+
{{ item.label }}
-
- +
+ {{ screeningList[curSelectedIndex].title }}
- +
- + 消息
@@ -143,6 +137,7 @@ export default { display: flex; justify-content: space-between; color: #fff; + border-radius: 0px 0px 4px 4px; .left-panel { display: flex; align-items: center; diff --git a/src/layouts/index.vue b/src/layouts/index.vue index b62d94d1783d645e87e8688043f3f5457067e937..ed11802e72065943c1350bc1444b5da4a6cc8892 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -10,10 +10,7 @@ >
-
+
@@ -32,10 +29,7 @@ }" >
- +
@@ -55,37 +49,31 @@
请选择您的筛查填报场景
    -
  • +
  • {{ item.title }}
    - +
- 保存 + 保存
@@ -215,7 +203,7 @@ export default { } &.fixed.no-tags-bar { - padding-top: 56px; + // padding-top: 56px; } ::v-deep { @@ -277,7 +265,7 @@ export default { } &.fixed.no-tags-bar { - padding-top: 56px; + // padding-top: 56px; } .vab-main { @@ -323,6 +311,8 @@ export default { .side-bar-container { top: 90px; height: calc(100vh - 90px); + border-radius: 0px 4px 4px 0px; + box-shadow: none; } } ::v-deep .homeDialog .el-dialog__header { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 6d0e58d830533589222f67256ed826d2ecef918d..7bf05254c6b34879a07764edea0bbe785076c905 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -8,9 +8,9 @@ $base-color-default: #4e68ff; $base-z-index: 999; -$base-menu-background: #08203d; -$base-menu-children-background: #08203d; -$base-menu-background-active: #164884; +$base-menu-background: #252C49; +$base-menu-children-background: #252C49; +$base-menu-background-active: #546184; $base-menu-color: hsla(0, 0%, 100%, 0.95); $base-menu-color-active: hsla(0, 0%, 100%, 0.95); $base-title-color: #fff; @@ -30,7 +30,7 @@ $base-color-orange: #ff6700; $base-color-red: #ff4d4f; $base-color-gray: rgba(0, 0, 0, 0.65); $base-main-width: 1279px; -$base-border-radius: 2px; +$base-border-radius: 4px; $base-border-color: #dcdfe6; $base-form-width: 600px; $base-input-height: 32px; diff --git a/src/views/qualitycontrol-report/index.vue b/src/views/qualitycontrol-report/index.vue index 5042afa92b3865f70a541048b799939f5b0bab19..330551b19a6191841749fab4fce1b7ae3b1492e6 100644 --- a/src/views/qualitycontrol-report/index.vue +++ b/src/views/qualitycontrol-report/index.vue @@ -1,14 +1,206 @@ - + diff --git a/vue.config.js b/vue.config.js index 9f507840c721cc3a16a75002eefcccae2b70e80e..2cd195f19c321123319abe2014ce4e201fd73967 100644 --- a/vue.config.js +++ b/vue.config.js @@ -88,8 +88,8 @@ module.exports = { }, proxy: { "/api": { - target: "http://192.168.31.140:11021/", - // target: "https://ds.cixincloud.com/geca-api/", + // target: "http://192.168.31.140:11021/", + target: "https://ds.cixincloud.com/geca-api/", changeOrigin: true, pathRewrite: { "^/api": "",