diff --git a/src/assets/font/Alibaba-PuHuiTi-Regular.ttf b/src/assets/font/Alibaba-PuHuiTi-Regular.ttf new file mode 100644 index 0000000..4261e49 Binary files /dev/null and b/src/assets/font/Alibaba-PuHuiTi-Regular.ttf differ diff --git a/src/assets/font/DingTalkJinBuTi-Regular.ttf b/src/assets/font/DingTalkJinBuTi-Regular.ttf new file mode 100644 index 0000000..c4efa55 Binary files /dev/null and b/src/assets/font/DingTalkJinBuTi-Regular.ttf differ diff --git a/src/assets/font/Rubik-Regular.ttf b/src/assets/font/Rubik-Regular.ttf new file mode 100644 index 0000000..fb52c8e Binary files /dev/null and b/src/assets/font/Rubik-Regular.ttf differ diff --git a/src/assets/font/font.css b/src/assets/font/font.css new file mode 100644 index 0000000..4346981 --- /dev/null +++ b/src/assets/font/font.css @@ -0,0 +1,41 @@ +@font-face { + font-family: 'Alimama ShuHeiTi'; + src: url('~@assets/font/AlimamaShuHeiTi-Bold.ttf'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Audiowide'; + src: url('~@assets/font/Audiowide-Regular.ttf'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'DingTalk JinBuTi'; + src: url('~@assets/font/DingTalkJinBuTi-Regular.ttf'); + font-weight: normal; + 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'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Rubik'; + src: url('~@assets/font/Rubik-Regular.ttf'); + font-weight: normal; + font-style: normal; +} diff --git a/src/assets/icon/iconfont.css b/src/assets/icon/iconfont.css new file mode 100644 index 0000000..37a4647 --- /dev/null +++ b/src/assets/icon/iconfont.css @@ -0,0 +1,27 @@ +@font-face { + font-family: "action-kh-device"; /* Project id 4514971 */ + src: url('iconfont.woff2?t=1713496030195') format('woff2'), + url('iconfont.woff?t=1713496030195') format('woff'), + url('iconfont.ttf?t=1713496030195') format('truetype'); +} + +.action-kh-device { + font-family: "action-kh-device" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.actionsousuo:before { + content: "\e622"; +} + +.actionreload:before { + content: "\e788"; +} + +.actionbaocun2:before { + content: "\e6f3"; +} + diff --git a/src/assets/icon/iconfont.js b/src/assets/icon/iconfont.js new file mode 100644 index 0000000..4044867 --- /dev/null +++ b/src/assets/icon/iconfont.js @@ -0,0 +1 @@ +window._iconfont_svg_string_4514971='',function(n){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var o,c,i,s,a,d=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}o=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4514971,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?d(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(o,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),o()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(i=o,s=n.document,a=!1,r(),s.onreadystatechange=function(){"complete"==s.readyState&&(s.onreadystatechange=null,l())})}function l(){a||(a=!0,i())}function r(){try{s.documentElement.doScroll("left")}catch(t){return void setTimeout(r,50)}l()}}(window); \ No newline at end of file diff --git a/src/assets/icon/iconfont.json b/src/assets/icon/iconfont.json new file mode 100644 index 0000000..db19057 --- /dev/null +++ b/src/assets/icon/iconfont.json @@ -0,0 +1,30 @@ +{ + "id": "4514971", + "name": "kh-device-client", + "font_family": "action-kh-device", + "css_prefix_text": "action", + "description": "", + "glyphs": [ + { + "icon_id": "1304890", + "name": "搜索", + "font_class": "sousuo", + "unicode": "e622", + "unicode_decimal": 58914 + }, + { + "icon_id": "4765852", + "name": "reload", + "font_class": "reload", + "unicode": "e788", + "unicode_decimal": 59272 + }, + { + "icon_id": "37118160", + "name": "保存2", + "font_class": "baocun2", + "unicode": "e6f3", + "unicode_decimal": 59123 + } + ] +} diff --git a/src/assets/icon/iconfont.less b/src/assets/icon/iconfont.less new file mode 100644 index 0000000..b6b31bb --- /dev/null +++ b/src/assets/icon/iconfont.less @@ -0,0 +1,13 @@ +@import "./iconfont.css"; + +:global(.anticon) { + &:before { + font-family: "action", "action-kh-device", serif !important; + } +} +// 折叠时隐藏文字 +.ant-menu-inline-collapsed .iconfont + span { + display: inline-block; + max-width: 0; + opacity: 0; +} \ No newline at end of file diff --git a/src/assets/icon/iconfont.ttf b/src/assets/icon/iconfont.ttf new file mode 100644 index 0000000..9cfdb80 Binary files /dev/null and b/src/assets/icon/iconfont.ttf differ diff --git a/src/assets/icon/iconfont.woff b/src/assets/icon/iconfont.woff new file mode 100644 index 0000000..9d10424 Binary files /dev/null and b/src/assets/icon/iconfont.woff differ diff --git a/src/assets/icon/iconfont.woff2 b/src/assets/icon/iconfont.woff2 new file mode 100644 index 0000000..f0c4a76 Binary files /dev/null and b/src/assets/icon/iconfont.woff2 differ diff --git a/src/assets/less/common.less b/src/assets/less/common.less index d255b4e..51be421 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -1,14 +1,5 @@ @import "./modifyLessVars.less"; -// 阿里妈妈数黑体 -@font-face { - font-family: 'Alimama ShuHeiTi'; - src: url('~@assets/font/AlimamaShuHeiTi-Bold.ttf'); -} -// 阿里妈妈数黑体 -@font-face { - font-family: 'Audiowide'; - src: url('~@assets/font/Audiowide-Regular.ttf'); -} + /*列表上方操作按钮区域*/ .ant-card-body .table-operator { //margin-bottom: 8px; @@ -223,6 +214,20 @@ div.ant-table table, input.ant-input, textarea.ant-input { background-color: transparent; + transition: all .3s; + + &:hover { + border-color: rgba(143,199,255,0.65); + box-shadow: 0 0 0 1px rgba(143,199,255,0.65) inset; + } + &:focus { + 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), +.ant-input-affix-wrapper:hover textarea.ant-input:not(.ant-input-disabled) { + border-color: rgba(143,199,255,0.65); } .mobile-html textarea.ant-input { resize:none; @@ -251,9 +256,26 @@ textarea.ant-input { color: @primary-color; font-size: 14px; } -.ant-select .ant-select-selection { - border-radius: 2px; - background-color: transparent; +.ant-select { + .ant-select-selection { + border-radius: 2px; + 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; + } } /* 下拉框end */ @@ -295,9 +317,9 @@ button.ant-btn { .btn-icon { margin-right: 4px; - margin-bottom: 2px; width: 14px; height: 14px; + font-size: 14px; } &.ant-btn-primary { background: #8FC7FF; @@ -309,6 +331,12 @@ button.ant-btn { background: transparent; border: 1px solid #8FC7FF; } + + &:not([disabled]):active { + background-color: @border-color-base !important; + border-color: @border-color-base !important; + color: @text-color !important; + } } // 禁用 &.ant-btn-primary-disabled, @@ -340,9 +368,9 @@ button.ant-btn { .btn-icon { margin-right: 0.04rem; - margin-bottom: 0.02rem; width: 0.14rem; height: 0.14rem; + font-size: 0.14rem; } &.ant-btn-primary { &.ant-btn-background-ghost { @@ -431,7 +459,6 @@ button.ant-btn { font-weight: 400; font-size: 14px; color: @text-color; - line-height: 16px; } .over-text { overflow: hidden; diff --git a/src/components/menu/FirstLevelMenu.vue b/src/components/menu/FirstLevelMenu.vue index f0494b3..affdf37 100644 --- a/src/components/menu/FirstLevelMenu.vue +++ b/src/components/menu/FirstLevelMenu.vue @@ -74,13 +74,13 @@ export default { // 选择菜单 selectMenu (menu) { console.log(menu) - if (menu.path !== '/systemOverview') { - this.$warning({ - title: '系统建设中', - onOk: () => {} - }) - return - } + // if (menu.path !== '/systemOverview') { + // this.$warning({ + // title: '系统建设中', + // onOk: () => {} + // }) + // return + // } this.selectPath = menu.path if (menu.children && menu.children.length > 0) { this.$router.push({ path: menu.children[0].path }) @@ -198,7 +198,6 @@ export default { font-size: 16px; color: rgba(255,255,255,0.96); line-height: 19px; - text-shadow: 0 4px 4px rgba(0,0,0,0.25); } // 选中的样式 @@ -220,7 +219,6 @@ export default { font-size: 16px; color: @primary-color; line-height: 19px; - text-shadow: 0 4px 4px rgba(0,0,0,0.25); } } } diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue index feb22f7..7e0c3d0 100644 --- a/src/components/page/GlobalHeader.vue +++ b/src/components/page/GlobalHeader.vue @@ -199,10 +199,6 @@ export default { /* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/ @height: 48px; - @font-face { - font-family: 'UnidreamLED'; - src: url('~@assets/font/UnidreamLED.ttf'); - } .system-title { user-select: none; position: absolute; diff --git a/src/main.js b/src/main.js index 6b63df7..f102ea1 100644 --- a/src/main.js +++ b/src/main.js @@ -50,6 +50,10 @@ import '@/components/JVxeCells/install' import { rules } from '@/utils/rules' // 导入vant import '@/components/lazy_vant' +// 引入字体 +import '@/assets/font/font.css' +// 引入自定义icon +import '@/assets/icon/iconfont.less' require('@/components/onlineForm/onlineForm') require('@/components/onlineForm/OnlineForm.css') diff --git a/src/views/mobile/manage/Manage.vue b/src/views/mobile/manage/Manage.vue index 405c3cd..1c953ff 100644 --- a/src/views/mobile/manage/Manage.vue +++ b/src/views/mobile/manage/Manage.vue @@ -104,12 +104,10 @@
- - 重置 + 重置 - - 添加 + 添加
@@ -154,8 +152,7 @@
- - 添加 + 添加
@@ -583,14 +580,4 @@ export default { margin-left: 0.06rem; } } - -// 表单边框 -.manage-page-form { - /deep/.ant-form-item-control:not(.has-error) { - .ant-input, - .ant-select-selection { - border-color: @primary-color; - } - } -} diff --git a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue index 73c2684..4c35035 100644 --- a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue +++ b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue @@ -125,11 +125,10 @@
- 重置 + 重置 - - 添加 + 添加
@@ -166,8 +165,7 @@
- - 添加 + 添加
diff --git a/src/views/systemOverview/systemSettings/SystemSettings.vue b/src/views/systemOverview/systemSettings/SystemSettings.vue index 777c69c..184f952 100644 --- a/src/views/systemOverview/systemSettings/SystemSettings.vue +++ b/src/views/systemOverview/systemSettings/SystemSettings.vue @@ -32,11 +32,11 @@
- 恢复默认设置 + 恢复默认设置 - 保存设置 + 保存设置
@@ -129,8 +129,7 @@
- - 添加 + 添加
diff --git a/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue index 36a0036..d72bd12 100644 --- a/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue +++ b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue @@ -18,8 +18,8 @@ - 查询 - 查询 + + 查询 @@ -94,9 +94,9 @@ 油井工作状态
- 远程启井 - 远程停井 - 频率控制 + 远程启井 + 远程停井 + 频率控制
@@ -188,7 +188,7 @@ :dataSource="this.dataSource.length ? [{}]: []" :pagination="false">
- 全
部
报
警 + 全
部
报
警
@@ -363,6 +363,7 @@ export default { working: require('@assets/images/systemOverview/wellheadDataMonitoring/working.gif'), // 是否工作中 workingStatus: require('@/assets/images/systemOverview/wellheadDataMonitoring/working.gif'), + workingStatusCode: 1, // 1远程启井 2远程停井 3频率控制 isWorking: true, loading: false, queryParam: {}, @@ -764,8 +765,9 @@ export default { this.$refs.loadDistribution && this.$refs.loadDistribution.updateMyChartOption(option) }, // 油井工作状态 - handleChangeWorkingCondition (status) { + handleChangeWorkingCondition (status, statusCode) { this.isWorking = status + this.workingStatusCode = statusCode if (status === true) { this.workingStatus = this.working } else if (status === false) {