diff --git a/src/assets/font/font.css b/src/assets/font/font.css index bc44302..8038f08 100644 --- a/src/assets/font/font.css +++ b/src/assets/font/font.css @@ -19,13 +19,6 @@ font-style: normal; } -@font-face { - font-family: 'DingTalk JinBuTi'; - src: url('~@assets/font/Alibaba-PuHuiTi-Regular.ttf'); - font-weight: normal; - font-style: normal; -} - @font-face { font-family: 'UnidreamLED'; src: url('~@assets/font/UnidreamLED.ttf'); diff --git a/src/assets/less/common.less b/src/assets/less/common.less index d3f9e61..0bf52dd 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -92,6 +92,7 @@ .ant-table.ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body, .ant-table .ant-table-tbody { background: #001125; + font-family: Rubik, Rubik, sans-serif; } .ant-table .ant-table-header, .ant-table .ant-table-thead, @@ -222,14 +223,19 @@ input.ant-input, textarea.ant-input { background-color: transparent; transition: all .3s; - - &:hover:not([disabled]) { - border-color: rgba(143,199,255,0.65); - box-shadow: 0 0 0 1px rgba(143,199,255,0.65) inset; - } - &:focus:not([disabled]) { - border-color: @primary-color; - box-shadow: 0 0 0 1px @primary-color inset; +} +// 没有提示必填的才会有样式 +.ant-form-item-control:not(.has-error) { + input.ant-input, + textarea.ant-input { + &:hover:not([disabled]) { + border-color: rgba(143,199,255,0.65); + box-shadow: 0 0 0 1px rgba(143,199,255,0.65) inset; + } + &:focus:not([disabled]) { + border-color: @primary-color; + box-shadow: 0 0 0 1px @primary-color inset; + } } } .ant-input-affix-wrapper:hover input.ant-input:not(.ant-input-disabled), @@ -278,21 +284,30 @@ textarea.ant-input { background-color: transparent; transition: all .3s; } - .ant-select-selection:hover { - border-color: rgba(143,199,255,0.65); - box-shadow: 0 0 0 1px rgba(143,199,255,0.65) inset; - } - .ant-select-focused .ant-select-selection, - .ant-select-selection:focus, - .ant-select-selection:active { - border-color: @primary-color; - box-shadow: 0 0 0 1px @primary-color inset; - } &.ant-select-open .ant-select-selection { border-color: @primary-color; box-shadow: 0 0 0 1px @primary-color inset; } } +// 没有提示必填的才会有样式 +.ant-form-item-control:not(.has-error) { + .ant-select { + .ant-select-selection:hover { + border-color: rgba(143,199,255,0.65); + box-shadow: 0 0 0 1px rgba(143,199,255,0.65) inset; + } + .ant-select-focused .ant-select-selection, + .ant-select-selection:focus, + .ant-select-selection:active { + border-color: @primary-color; + box-shadow: 0 0 0 1px @primary-color inset; + } + &.ant-select-open .ant-select-selection { + border-color: @primary-color; + box-shadow: 0 0 0 1px @primary-color inset; + } + } +} /* 下拉框end */ /* 表单禁用样式begin */ diff --git a/src/views/mobile/manage/Manage.vue b/src/views/mobile/manage/Manage.vue index 35060a6..9174837 100644 --- a/src/views/mobile/manage/Manage.vue +++ b/src/views/mobile/manage/Manage.vue @@ -74,7 +74,7 @@
- +
- +
- +
diff --git a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue index 3991be8..9072d86 100644 --- a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue +++ b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue @@ -93,7 +93,7 @@ - +
- +
- +
- +
- +