diff --git a/src/assets/images/icon/account.png b/src/assets/images/icon/account.png index 05bb620..5b701d2 100644 Binary files a/src/assets/images/icon/account.png and b/src/assets/images/icon/account.png differ diff --git a/src/assets/images/icon/password.png b/src/assets/images/icon/password.png index 351cc92..7ea4cc5 100644 Binary files a/src/assets/images/icon/password.png and b/src/assets/images/icon/password.png differ diff --git a/src/assets/images/text-bg.png b/src/assets/images/text-bg.png deleted file mode 100644 index 56614d6..0000000 Binary files a/src/assets/images/text-bg.png and /dev/null differ diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 05ff022..2d5c017 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -302,48 +302,46 @@ button.ant-btn { border: 1px solid #8FC7FF; } } + // 禁用 + &.ant-btn-primary-disabled, + &.ant-btn-primary.disabled, + &.ant-btn-primary[disabled], + &.ant-btn-primary-disabled:hover, + &.ant-btn-primary.disabled:hover, + &.ant-btn-primary[disabled]:hover, + &.ant-btn-primary-disabled:focus, + &.ant-btn-primary.disabled:focus, + &.ant-btn-primary[disabled]:focus, + &.ant-btn-primary-disabled:active, + &.ant-btn-primary.disabled:active, + &.ant-btn-primary[disabled]:active, + &.ant-btn-primary-disabled.active, + &.ant-btn-primary.disabled.active, + &.ant-btn-primary[disabled].active { + color: @text-color-secondary; + background-color: @background-color-base; + } } // 移动端rem .mobile-html { button.ant-btn { - font-family: Alibaba PuHuiTi, Alibaba PuHuiTi, sans-serif; - font-size: 14px; - line-height: 20px; - border-radius: 2px; + font-size: 0.14rem; + line-height: 0.2rem; + border-radius: 0.02rem; + height: 0.36rem; .btn-icon { - margin-right: 4px; - margin-bottom: 2px; - width: 14px; - height: 14px; + margin-right: 0.04rem; + margin-bottom: 0.02rem; + width: 0.14rem; + height: 0.14rem; } &.ant-btn-primary { - background: #8FC7FF; - color: @text-black; - - // 透明状态（ghost） &.ant-btn-background-ghost { - color: @primary-color; - background: transparent; - border: 1px solid #8FC7FF; + border-width: 0.01rem; } } } - .custom-btns-box { - button.ant-btn { - .btn-icon { - margin-right: 0.04rem; - margin-bottom: 0.02rem; - width: 0.14rem; - height: 0.14rem; - } - } - button.ant-btn.ant-btn-primary { - border-radius: 0.02rem; - font-size: 0.14rem; - line-height: 0.2rem; - } - } } /* 部分组件end */ @@ -483,8 +481,7 @@ button.ant-btn { font-size: 24px; line-height: 32px; margin-right: 8px; - background: linear-gradient(90deg, #FFFFFF 0%, #96D0F9 100%); - -webkit-background-clip: text; + color: @primary-color; } .mobile-html .big-number { font-size: 0.22rem; @@ -526,15 +523,14 @@ button.ant-btn { line-height: 0.16rem; &::before { - top: 0.04rem; + top: 0.06rem; + left: 0; + width: calc(100% + 4px); height: 0.15rem; - width: calc(100% + 0.08rem); - background: linear-gradient( 90deg, rgba(0,116,202,0.1) 0%, #0074CA 50%, rgba(0,116,202,0) 100%); } .title-background-text { - margin-left: 0.04rem; - position: relative; + padding-left: 0.04rem; height: 0.21rem; } } @@ -549,7 +545,7 @@ button.ant-btn { .operation-btns { .primary, .primary:hover { - color: @custom-cyan; + color: @primary-color; } .danger, .danger:hover { diff --git a/src/assets/less/modifyLessVars.less b/src/assets/less/modifyLessVars.less index 4df4d90..9f194c8 100644 --- a/src/assets/less/modifyLessVars.less +++ b/src/assets/less/modifyLessVars.less @@ -1,7 +1,7 @@ @primary-color: #8FC7FF; /* 背景色 */ -@component-background: #001B36; -@background-color-base: #001B36AA; +@component-background: #001125; +@background-color-base: #001125AA; @background-color-light: rgba(143,199,255,0.1); /* 边框色 */ diff --git a/src/assets/login-bg.png b/src/assets/login-bg.png new file mode 100644 index 0000000..a3bf784 Binary files /dev/null and b/src/assets/login-bg.png differ diff --git a/src/assets/mobile-login-bg.png b/src/assets/mobile-login-bg.png index 53ae0be..a907450 100644 Binary files a/src/assets/mobile-login-bg.png and b/src/assets/mobile-login-bg.png differ diff --git a/src/components/CommonCard.vue b/src/components/CommonCard.vue index 64e3041..3e9b0ef 100644 --- a/src/components/CommonCard.vue +++ b/src/components/CommonCard.vue @@ -56,6 +56,7 @@ export default { line-height: 36px; } /deep/ .ant-card-head-title::before { + vertical-align: middle; content: ''; display: inline-block; width: 12px; @@ -97,28 +98,13 @@ export default { // 如果是移动端设置为rem单位 .mobile-html { .common-card { - border: .01rem solid rgba(0,148,255,0.24); - border-bottom: .01rem @primary-color solid; - - // 左下右下高亮边框 - &::before, &::after { - min-width: 0.16rem; - height: 0.01rem; - bottom: -0.01rem; - } - &::before { - left: 0; - } - &::after { - right: 0; - } + border-width: 0.01rem; /deep/ .ant-card-head { - background-size: 0.01rem 100%, calc(100% - 0.02rem) 100%, 0.01rem 100%; - border: none; - min-height: 0.42rem; - height: 0.42rem; + min-height: 0.36rem; + height: 0.36rem; padding: 0 0.16rem; + border-bottom-width: 0.01rem; } /deep/ .ant-card-head-title { font-size: 0.14rem; @@ -129,9 +115,13 @@ export default { height: 0.12rem; } /deep/ .ant-card-body { - padding: 0.08rem 0.12rem 0.12rem !important; - height: calc(100% - 0.42rem); - min-height: 1.6rem; + padding: 0.12rem !important; + height: calc(100% - 0.36rem); + } + &.empty-card { + /deep/ .ant-card-body { + min-height: 1.6rem; + } } } .card-title { diff --git a/src/components/lazy_vant.js b/src/components/lazy_vant.js index 61f6603..dc073e9 100644 --- a/src/components/lazy_vant.js +++ b/src/components/lazy_vant.js @@ -8,9 +8,7 @@ import { Popup, Dialog } from 'vant' -import 'vant/lib/picker/index.less' -import 'vant/lib/popup/index.less' -import 'vant/lib/dialog/index.less' +import 'vant/lib/index.less' Vue.use(Picker) Vue.use(Popup) Vue.prototype.$vantDialog = Dialog diff --git a/src/components/menu/MobileMenu.vue b/src/components/menu/MobileMenu.vue index ab13eb0..00752bd 100644 --- a/src/components/menu/MobileMenu.vue +++ b/src/components/menu/MobileMenu.vue @@ -115,6 +115,7 @@ export default { diff --git a/src/views/mobile/manage/Manage.vue b/src/views/mobile/manage/Manage.vue index 78370cd..45260f6 100644 --- a/src/views/mobile/manage/Manage.vue +++ b/src/views/mobile/manage/Manage.vue @@ -53,25 +53,25 @@

{{ item.wellheadId_dictText }}

- {{ item.changeDeviceStatus_dictText }} - 删除
-
- {{deviceData.showAll ? '收起' : '展开'}}
+
+ {{deviceData.showAll ? '收起' : '展开'}}
- +
- - - - - - - - -
-
- +
+ 重置 重置 - + 添加 添加 @@ -124,7 +115,7 @@
- +
-
- +
+ 添加 添加 @@ -366,14 +357,16 @@ export default { }).catch(() => {}) }, // 切换展开折叠列表 - toggleDeviceList () { + toggleDeviceList (isOpen) { // 保留当前滚动高度 - const scrollTop = document.documentElement.scrollTop this.deviceData.showAll = !this.deviceData.showAll - // 数据更新后保持原来滚动高度 - this.$nextTick(() => { - document.documentElement.scrollTop = scrollTop - }) + // 展开的时候，保持原来滚动高度（展开会直接滚动到表格底部） + if (isOpen) { + const scrollTop = document.documentElement.scrollTop + this.$nextTick(() => { + document.documentElement.scrollTop = scrollTop + }) + } }, // 添加设备 handleAddDevice () { @@ -527,27 +520,23 @@ export default { // 按钮 &-btns { width: 1.46rem; + display: flex; position: absolute; right: 0; bottom: 0; font-family: PingFang SC, PingFang SC, sans-serif; - font-weight: 500; - font-size: 0.14rem; - color: #FFFFFF; - line-height: 0.16rem; /deep/.ant-btn { + flex: 1; + font-size: 0.14rem; + line-height: 0.16rem; width: 0.7rem; height: 0.32rem; - border: none; - } - /deep/.ant-btn-primary { - background: url("~@assets/images/componentImg/btn-blue-70.png"); - background-size: 100% 100%; - } - /deep/.ant-btn-danger { - background: url("~@assets/images/componentImg/btn-red-70.png"); - background-size: 100% 100%; + font-weight: 500; + + &.bold { + font-weight: 600; + } } } } @@ -559,38 +548,23 @@ export default { margin: 0.12rem auto 0; font-family: Rubik, Rubik, sans-serif; font-size: 0.12rem; - color: #EFEFEF; + color: @border-color-base; line-height: 0.14rem; .list-toggle-arrow { + color: @primary-color; display: inline-block; - width: 0.18rem; - height: 0.07rem; - background: url("~@assets/images/icon/list-arrow.png"); - background-size: 100% 100%; + font-size: 0.14rem; margin-left: 0.06rem; - - &-up { - transform: rotate(180deg); - } - &-down { - transform: rotate(0deg); - } } } -.custom-btns-box { - /deep/.ant-btn { - &.btn-blue.btn-blue-155 { - width: 1.55rem; - background-image: url("~@assets/images/componentImg/btn-blue-155.png"); - } - &.btn-cyan.btn-cyan-155 { - width: 1.55rem; - background-image: url("~@assets/images/componentImg/btn-cyan-155.png"); - } - &.btn-cyan.btn-cyan-327 { - width: 3.27rem; - background-image: url("~@assets/images/componentImg/btn-cyan-327.png"); + +// 表单边框 +.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 650a42e..d76032a 100644 --- a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue +++ b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue @@ -120,7 +120,7 @@ v-decorator="['deviceDesc', validatorRules.deviceDesc]" />
-
+
重置 重置 @@ -162,7 +162,7 @@ v-decorator.trim="['wellheadName', validatorRules.wellheadName]"/>
-
+
添加 添加 diff --git a/src/views/systemOverview/systemSettings/SystemSettings.vue b/src/views/systemOverview/systemSettings/SystemSettings.vue index aaba8e2..399958f 100644 --- a/src/views/systemOverview/systemSettings/SystemSettings.vue +++ b/src/views/systemOverview/systemSettings/SystemSettings.vue @@ -30,7 +30,7 @@
-
+
恢复默认设置 恢复默认设置 @@ -127,7 +127,7 @@ -
+
添加 添加 diff --git a/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue index 2368337..bf38f95 100644 --- a/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue +++ b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue @@ -16,7 +16,7 @@ {{ item.wellheadName }} - + 查询 查询 @@ -93,7 +93,7 @@
油井工作状态
-
+
远程启井 远程停井 频率控制 @@ -109,14 +109,14 @@ {{ oilWellRealTimeData['实时示功图']['时间'] }}
- 冲程 - {{ oilWellRealTimeData['实时示功图']['冲程'] }}m - + 冲程 + {{ oilWellRealTimeData['实时示功图']['冲程'] }}m +
- 冲次 - {{ oilWellRealTimeData['实时示功图']['冲次'] }}次/分 - + 冲次 + {{ oilWellRealTimeData['实时示功图']['冲次'] }}次/分 +
@@ -692,7 +692,7 @@ export default { const legendData = ['产油量(t/d)', '产液量(m³/d)'] const option = generateBaseOption() option.legend.data = legendData - option.xAxis[0].data = data['X轴'] + option.xAxis[0].data = data.xAxis option.yAxis[0].name = '产油量(t/d) / 产液量(m³/d)' option.yAxis[0].nameTextStyle.padding = [0, 0, 0, 105] option.series = [ diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 4f167de..f3258c7 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -118,7 +118,7 @@