diff --git a/dist.7z b/dist.7z deleted file mode 100644 index 58c9eb4..0000000 Binary files a/dist.7z and /dev/null differ diff --git a/package.json b/package.json index 8ab3351..56e2997 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "author": "若依", "license": "MIT", "scripts": { - "dev": "vite", + "dev": "vite --host=0.0.0.0", "build:prod": "vite build", "build:stage": "vite build --mode staging", "preview": "vite preview" diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 087481f..53599e4 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -124,11 +124,13 @@ aside { //main-container全局样式 .app-container { // height: 80px; - + } + .mr10 { margin-right: 10px; } + .components-container { margin: 30px 50px; position: relative; @@ -185,9 +187,67 @@ aside { margin-bottom: 10px; } } -.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content { - background-color: #033b73 !important; -} -.el-tree-node__content:hover { - background-color: #033b73 !important; + +.bim-dialog { + background: #00174b !important; + + .el-dialog__title { + color: #fff !important; + } + + .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content { + background-color: #082859 !important; + } + .el-tree-node__content { + background-color: #00174b !important; + color: #fff !important; + } + + .el-tree-node__content:hover { + background-color: #082859 !important; + } + + .el-input__wrapper { + background: transparent !important; + border: 1px solid #2E6099 !important; + box-shadow: none !important; + + &:hover { + outline: none !important; + border: 1px solid #2E6099 !important; + } + } + + .el-select__icon { + color: #2E6099 !important; + } + + .el-tabs__item, + .el-range-input, + .el-input__inner { + color: #fff !important; + } + + .el-tabs__header .el-tabs__item.is-active { + color: #3cbfdf !important; + } + + .el-table__cell, + .el-tabs__header, + .el-tabs__header .el-tabs__item, + .el-tabs--card>.el-tabs__header .el-tabs__nav { + border-color:#2E6099 !important; + } + .el-table, + tr, + .el-table__border-left-patch, + .el-table--border::after, + .el-table__header-wrapper th, + .el-table--enable-row-hover .el-table__body tr>td.el-table__cell, + .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell, + .el-table__inner-wrapper::after, + .el-table__inner-wrapper::before { + background-color: #00174b !important; + color: #fff !important + } } \ No newline at end of file diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue index 99641d4..4c2e7e9 100644 --- a/src/components/SizeSelect/index.vue +++ b/src/components/SizeSelect/index.vue @@ -41,6 +41,5 @@ function handleSetSize(size) { font-size: 18px; line-height: 50px; padding-right: 7px; - color: #fff; } \ No newline at end of file diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 7af1ba0..65a6452 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,6 +1,7 @@ \ No newline at end of file diff --git a/src/views/components/xtBar.vue b/src/views/components/xtBar.vue index 31ed557..c07c322 100644 --- a/src/views/components/xtBar.vue +++ b/src/views/components/xtBar.vue @@ -59,7 +59,11 @@ const getCharts = () => { }, splitLine: { // 网格线 - show: false, + lineStyle: { + type: "dotted", //设置网格线类型 dotted:虚线 solid:实线 + color: "#29507E", + }, + show: true, }, show: true, maxInterval: 50000 //值坐标最大的数值间隔 最小同样min @@ -68,7 +72,7 @@ const getCharts = () => { yAxis: [ { type: 'category', - data: ['0-40', '41-50', '51-60', '61-70', '71-80', '81-90', '91-100', '101-110', '111-120','120以上'], + data: ['0-40', '41-50', '51-60', '61-70', '71-80', '81-90', '91-100', '101-110', '111-120', '120以上'], axisLine: { show: true, lineStyle: { @@ -89,14 +93,30 @@ const getCharts = () => { name: '系统数据分析', type: 'bar', barWidth: 16, + color: new echarts.graphic.LinearGradient( // 右下左上 + 0, + 0, + 1, + 1, + [{ + offset: 0, + color: "#146fdd" // 左边的颜色 + }, + { + offset: 1, + color: "#42bffc" // 右边的颜色 + } + ], + false + ), // xAxisIndex:1, - data: [182, 234, 290, 104, 131, 100], + data: [182, 234, 280, 104, 131, 100, 50, 200, 100, 60], itemStyle: { normal: { label: { show: true, textStyle: { - color: "#5470c6", + color: "#42bffc", }, position: "right", }, @@ -113,6 +133,6 @@ const getCharts = () => { \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index 72bca72..df441c9 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -54,7 +54,7 @@ const gotoPage = (item) => { display: flex; align-items: center; // background: #3d5d9a; - background: #030e23; + background: #08376f; color: #fff; > div { width: 260px; @@ -65,6 +65,7 @@ const gotoPage = (item) => { border-right: 1px solid #020c45; justify-content: center; font-size: 20px; + // background: #3d5d9a; } } .home-page { @@ -84,22 +85,25 @@ const gotoPage = (item) => { top: 10px; left: 10px; padding: 15px; + background-image: linear-gradient(to right,rgba(30,45,123,.7),rgba(174,179,249,.1)); } .bar-div { position: absolute; width: 400px; - height: 98%; + height: 818px; top: 10px; right: 10px; padding: 15px; + background-image: linear-gradient(to left,rgba(30,45,123,.7),rgba(174,179,249,.1)); } .xt-bar-div { position: absolute; width: 400px; height: 460px; - top: 370px; + bottom: 5px; left: 10px; padding: 15px; + background-image: linear-gradient(to right,rgba(30,45,123,.7),rgba(174,179,249,.1)); } .device-div { position: absolute; @@ -108,16 +112,17 @@ const gotoPage = (item) => { width: calc(100% - 840px); height: 200px; padding: 15px; - // background: #b2cae0; + background-image: linear-gradient(to bottom,rgba(30,45,123,.7),rgba(174,179,249,.1)); } .line-div { position: absolute; - bottom: 10px; + bottom: 5px; left: 420px; width: calc(100% - 840px); height: 200px; padding: 15px; // background: #b2cae0; + background-image: linear-gradient(to top,rgba(30,45,123,.7),rgba(174,179,249,.1)); } } }