diff --git a/public/index.html b/public/index.html index dc076e1..fbfb925 100644 --- a/public/index.html +++ b/public/index.html @@ -237,7 +237,7 @@ background: linear-gradient(180deg, #0094FF 0%, #2EE4FD 100%); } ::-webkit-scrollbar-corner { - background: pink; + background: transparent; } /* 滚动条优化 end */ diff --git a/src/assets/images/componentImg/arrow.png b/src/assets/images/componentImg/arrow.png new file mode 100644 index 0000000..3ae0476 Binary files /dev/null and b/src/assets/images/componentImg/arrow.png differ diff --git a/src/assets/images/componentImg/btn.png b/src/assets/images/componentImg/btn.png new file mode 100644 index 0000000..e54070f Binary files /dev/null and b/src/assets/images/componentImg/btn.png differ diff --git a/src/assets/images/componentImg/header-bg-center.png b/src/assets/images/componentImg/header-bg-center.png new file mode 100644 index 0000000..7c21980 Binary files /dev/null and b/src/assets/images/componentImg/header-bg-center.png differ diff --git a/src/assets/images/componentImg/header-bg-side.png b/src/assets/images/componentImg/header-bg-side.png new file mode 100644 index 0000000..c2259aa Binary files /dev/null and b/src/assets/images/componentImg/header-bg-side.png differ diff --git a/src/assets/images/componentImg/header-dot.png b/src/assets/images/componentImg/header-dot.png new file mode 100644 index 0000000..f9ad579 Binary files /dev/null and b/src/assets/images/componentImg/header-dot.png differ diff --git a/src/assets/images/componentImg/input.png b/src/assets/images/componentImg/input.png new file mode 100644 index 0000000..7fac1ce Binary files /dev/null and b/src/assets/images/componentImg/input.png differ diff --git a/src/assets/images/icon/help.png b/src/assets/images/icon/help.png new file mode 100644 index 0000000..e6855d4 Binary files /dev/null and b/src/assets/images/icon/help.png differ diff --git a/src/assets/images/icon/search-primary.png b/src/assets/images/icon/search-primary.png new file mode 100644 index 0000000..34e5b04 Binary files /dev/null and b/src/assets/images/icon/search-primary.png differ diff --git a/src/assets/images/icon/search.png b/src/assets/images/icon/search.png new file mode 100644 index 0000000..eec4799 Binary files /dev/null and b/src/assets/images/icon/search.png differ diff --git a/src/assets/images/icon/user.png b/src/assets/images/icon/user.png new file mode 100644 index 0000000..fce36ba Binary files /dev/null and b/src/assets/images/icon/user.png differ diff --git a/src/assets/images/systemOverview/wellheadDataMonitoring/all-alarms-btn.png b/src/assets/images/systemOverview/wellheadDataMonitoring/all-alarms-btn.png new file mode 100644 index 0000000..53c8288 Binary files /dev/null and b/src/assets/images/systemOverview/wellheadDataMonitoring/all-alarms-btn.png differ diff --git a/src/assets/images/systemOverview/wellheadDataMonitoring/oil-well-working-status.png b/src/assets/images/systemOverview/wellheadDataMonitoring/oil-well-working-status.png new file mode 100644 index 0000000..07765b4 Binary files /dev/null and b/src/assets/images/systemOverview/wellheadDataMonitoring/oil-well-working-status.png differ diff --git a/src/assets/images/systemOverview/wellheadDataMonitoring/pump-type-bg.png b/src/assets/images/systemOverview/wellheadDataMonitoring/pump-type-bg.png new file mode 100644 index 0000000..49f039d Binary files /dev/null and b/src/assets/images/systemOverview/wellheadDataMonitoring/pump-type-bg.png differ diff --git a/src/assets/images/systemOverview/wellheadDataMonitoring/suspend.gif b/src/assets/images/systemOverview/wellheadDataMonitoring/suspend.gif new file mode 100644 index 0000000..a5dfea0 Binary files /dev/null and b/src/assets/images/systemOverview/wellheadDataMonitoring/suspend.gif differ diff --git a/src/assets/images/systemOverview/wellheadDataMonitoring/working.gif b/src/assets/images/systemOverview/wellheadDataMonitoring/working.gif new file mode 100644 index 0000000..71a6c50 Binary files /dev/null and b/src/assets/images/systemOverview/wellheadDataMonitoring/working.gif differ diff --git a/src/assets/images/text-bg.png b/src/assets/images/text-bg.png new file mode 100644 index 0000000..56614d6 Binary files /dev/null and b/src/assets/images/text-bg.png differ diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 8212ad2..0c90140 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -84,10 +84,29 @@ } /* 表格样式begin */ -.ant-table-thead > tr > th { - background: linear-gradient( 180deg, rgba(0,148,255,0.1) 0%, rgba(0,148,255,0.2) 100%) !important; +.ant-table .ant-table-header, +.ant-table .ant-table-thead { + background: @component-background linear-gradient(180deg, rgba(0, 148, 255, 0.1) 0%, rgba(0, 148, 255, 0.2) 100%) no-repeat; + background-size: 100% 40px; } -/* 表格样式nd */ +.ant-table.ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body, +.ant-table .ant-table-tbody { + background: @component-background linear-gradient(180deg, #001B36 0%, rgba(0,148,255,0.2) 100%); +} +.ant-table .ant-table-thead > tr > th, +.ant-table .ant-table-fixed-left table, +.ant-table .ant-table-fixed-right table, +.ant-table .ant-table-fixed .ant-table-thead { + background: transparent; +} +.ant-table .ant-table-placeholder { + background: transparent; +} +.ant-table .ant-table-header table { + border-radius: 0; +} +.ant-table td { white-space: nowrap; } +/* 表格样式end */ /* 复选框begin */ .ant-checkbox-inner, @@ -96,6 +115,16 @@ } /* 复选框end */ +/* 搜索框begin */ +.input-search-suffix { + font-size: 0; + cursor: pointer; +} +.input-search-suffix > img { + width: 14px; +} +/* 输入框end */ + /* 下拉框begin */ .ant-select-selection--multiple .ant-select-selection__choice { color: @text-color; @@ -115,6 +144,27 @@ background-color: @primary-2; color: @text-color; } +// 箭头 +.ant-select-arrow { + display: none; + position: relative; +} +.ant-select-arrow::after { + top: 0; + left: 0; + width: 12px; + height: 12px; + content: ''; + display: block; + position: absolute; + background: url("~@/assets/images/componentImg/arrow.png") no-repeat center center; + background-size: 100%; + transform: rotate(0deg); + transition: transform .3s; +} +.ant-select-open .ant-select-arrow::after { + transform: rotate(180deg); +} /* 下拉框end */ /* 表单禁用样式begin */ @@ -133,13 +183,141 @@ /* 表单禁用样式end */ /* 部分组件begin */ -// 弹出抽屉底部自定义 +// 弹框底部自定义 .drawer-bootom-button { background-color: @component-background !important; border-top-color: @border-color-split !important; } .ant-modal-close:focus, .ant-modal-close:hover, .ant-drawer-close:focus, .ant-drawer-close:hover{ - color: #fff; + color: @text-color; } -/* 部分组件end */ \ No newline at end of file +.ant-empty-normal { + color: @text-color !important; +} + +// 组件背景 +.ant-input, +.ant-select-selection +{ + background: url("~@assets/images/componentImg/input.png") no-repeat center center !important; + background-size: 110% calc(@btn-height-base + 2px) !important; +} +// 搜索按钮 +.search-btn { + border: none !important; + width: 88px !important; + background: url("~@assets/images/componentImg/btn.png") no-repeat center center !important; + background-size: 100% @btn-height-base !important; + font-size: 0; +} +.search-btn-icon { + margin-right: 3px; + margin-bottom: 3px; + width: 14px; +} +.search-btn-text { + font-family: PingFang SC, PingFang SC, sans-serif; + font-weight: 500; + font-size: 14px; + color: #FFFFFF; + line-height: 16px; +} +/* 部分组件end */ + +.ml-8 { + margin-left: 8px; +} +.mb-20 { + margin-bottom: 20px; +} +.mr-12 { + margin-right: 12px; +} +.mr-10 { + margin-right: 10px; +} +// 分割线 +.divider-vertical { + width: 1px; + margin: 0 20px; + background-color: rgba(108, 128, 151, 0.3); +} + +// 一行的内容 +.info-row { + display: flex; +} +.info-row.info-row-inline { + display: inline-flex; +} +.info-row:not(:last-child):not(.info-row-inline) { + margin-bottom: 15px; +} +.info-row .info-label { + flex: auto; + font-family: PingFang SC, PingFang SC, sans-serif; + font-weight: 400; + font-size: 14px; + color: @text-color-secondary; + line-height: 16px; +} +.info-row .info-label::after { + content: ':' +} +.info-row .info-value { + text-align: right; + flex: auto; + font-family: Rubik, Rubik, sans-serif; + font-weight: 400; + font-size: 14px; + color: @text-color; + line-height: 16px; +} +.over-text { + overflow: hidden; + text-overflow: ellipsis; + word-break: break-all; + white-space: nowrap; +} +// 运行 +.working::before { + content: ''; + display: inline-block; + width: 8px; + height: 8px; + margin-right: 4px; + border-radius: 50%; + background-color: #2BFF82; +} +// 停止 +.cease::before { + content: ''; + display: inline-block; + width: 8px; + height: 8px; + margin-right: 4px; + border-radius: 50%; + background-color: #FF5353; +} + +.ant-btn.primary-btn, +.ant-btn.primary-btn:hover, +.ant-btn.primary-btn:focus { + width: 88px; + height: 32px; + background: linear-gradient( 180deg, rgba(0,148,255,0) 0%, rgba(0,148,255,0.6) 100%); + border-radius: 2px 2px 2px 2px; + border: 1px solid #0094FF; + color: @text-color; +} +.ant-btn.danger-btn, +.ant-btn.danger-btn:hover, +.ant-btn.danger-btn:focus { + width: 88px; + height: 32px; + background: linear-gradient( 0deg, rgba(255,83,83,0.6) 00%, rgba(255,83,83,0) 100%); + border-radius: 2px 2px 2px 2px; + border: 1px solid #FF5353; + color: @text-color; +} \ No newline at end of file diff --git a/src/assets/less/modifyLessVars.js b/src/assets/less/modifyLessVars.js index f4a7ec6..54af57f 100644 --- a/src/assets/less/modifyLessVars.js +++ b/src/assets/less/modifyLessVars.js @@ -20,4 +20,8 @@ module.exports = { // 表格相关 'table-selected-row-bg': 'rgba(0, 148, 255, 0.30)', // 勾选行背景色 'table-expanded-row-bg': 'rgba(0, 148, 255, 0.10)', // 扩展行背景色 + + // 高度调整 + 'btn-height-base': '36px', + 'input-height-base': '36px' } diff --git a/src/assets/less/modifyLessVars.less b/src/assets/less/modifyLessVars.less index f5633eb..a4ca526 100644 --- a/src/assets/less/modifyLessVars.less +++ b/src/assets/less/modifyLessVars.less @@ -1,3 +1,4 @@ +@primary-color: #0094FF; /* 背景色 */ @component-background: #001B36; @background-color-base: #001B36AA; @@ -18,4 +19,8 @@ /* 表格相关 */ @table-selected-row-bg: rgba(0, 148, 255, 0.30); -@table-expanded-row-bg: rgba(0, 148, 255, 0.10); \ No newline at end of file +@table-expanded-row-bg: rgba(0, 148, 255, 0.10); + +/* 按钮 */ +@btn-height-base: 36px; +@input-height-base: 36px; \ No newline at end of file diff --git a/src/components/CommonCard.vue b/src/components/CommonCard.vue new file mode 100644 index 0000000..6a8f624 --- /dev/null +++ b/src/components/CommonCard.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/components/CommonCardInfo.vue b/src/components/CommonCardInfo.vue new file mode 100644 index 0000000..9d5815c --- /dev/null +++ b/src/components/CommonCardInfo.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/components/ResponsiveChart.vue b/src/components/ResponsiveChart.vue new file mode 100644 index 0000000..aea0924 --- /dev/null +++ b/src/components/ResponsiveChart.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue index 48425fe..6f68479 100644 --- a/src/components/tools/UserMenu.vue +++ b/src/components/tools/UserMenu.vue @@ -2,7 +2,10 @@
- 帮助 +
+ help + 帮助 +
@@ -18,7 +21,10 @@ - {{ nickname() }} +
+ user + {{ nickname() }} +
@@ -255,6 +261,7 @@ export default { /* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */ .user-wrapper { + height: 48px; color: @primary-color; } .user-wrapper .search-input { @@ -287,4 +294,30 @@ export default { color: inherit; text-decoration: none; } + .operate { + display: flex; + align-items: center; + font-size: 0; + height: 48px; + + .operate-img { + width: 20px; + } + .operate-text { + font-family: Alimama ShuHeiTi, Alimama ShuHeiTi, sans-serif; + font-weight: bold; + font-size: 16px; + color: @primary-color; + line-height: 20px; + text-align: center; + font-style: normal; + text-transform: none; + margin-left: 8px; + max-width: 100px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + word-break: break-all; + } + } diff --git a/src/main.js b/src/main.js index 765298d..769e70e 100644 --- a/src/main.js +++ b/src/main.js @@ -71,7 +71,9 @@ Viewer.setDefaults({ title: false, toolbar: false }) - +Vue.prototype.global = { + emptyLine: '—' +} SSO.init(() => { main() }) diff --git a/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue index 7488854..659b46f 100644 --- a/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue +++ b/src/views/systemOverview/wellheadDataMonitoring/WellheadDataMonitoring.vue @@ -1,13 +1,864 @@ -