diff --git a/.env.development b/.env.development
index 8e968ab..eb84861 100644
--- a/.env.development
+++ b/.env.development
@@ -8,7 +8,7 @@ ENV = 'development'
# VUE_APP_BASE_API = '/dev-api'
# 后台
# VUE_APP_BASE_API = 'http://192.168.1.222:8080'
-# 云端
+# 海湾酒店-云端
VUE_APP_BASE_API = 'http://106.55.173.225:8090'
# 路由懒加载
diff --git a/src/assets/styles/bigScreen.scss b/src/assets/styles/bigScreen.scss
index ccdf471..77336d0 100644
--- a/src/assets/styles/bigScreen.scss
+++ b/src/assets/styles/bigScreen.scss
@@ -311,11 +311,17 @@
.el-picker-panel__footer {
padding: 0.04rem !important;
}
+ .el-button {
+ padding: 0.08rem 0.15rem !important;
+ }
.el-button--mini {
- padding: 0.07rem 0.15rem !important;
+ // padding: 0.08rem 0.15rem !important;
font-size: 0.12rem !important;
border-radius: 0.03rem !important;
}
+ .el-button--text {
+ padding: 0 !important;
+ }
.el-input__suffix {
right: 0.05rem !important;
}
@@ -477,7 +483,7 @@
padding-right: 0.08rem !important;
}
.el-form-item--small .el-form-item__label {
- line-height: 0.4rem !important;
+ line-height: 0.32rem !important;
}
.el-form-item__label {
font-size: 0.14rem !important;
@@ -529,11 +535,37 @@
}
.el-checkbox {
font-size: 0.14rem !important;
+ margin-right: 0.08rem !important;
+ }
+ .el-checkbox__label {
+ padding-left: 0.1rem !important;
+ line-height: 0.19rem !important;
+ font-size: 0.14rem !important;
+ }
+ .el-input-number--medium .el-input-number__increase,
+ .el-input-number--medium .el-input-number__decrease {
+ width: 0.36rem !important;
+ height: 50% !important;
+ font-size: 0.14rem !important;
+ }
+ .el-table__expand-icon {
+ font-size: 0.12rem !important;
+ }
+ .el-table [class*="el-table__row--level"] .el-table__expand-icon {
+ width: 0.2rem !important;
+ line-height: 0.2rem !important;
+ height: 0.2rem !important;
margin-right: 0.03rem !important;
}
.el-cascader-node__label {
padding: 0 0.1rem !important;
}
+ .el-input--prefix .el-input__inner {
+ padding-left: 0.3rem !important;
+ }
+ .el-input__prefix {
+ left: 0.05rem !important ;
+ }
.el-checkbox__inner {
border-radius: 0.02rem !important;
width: 0.14rem !important;
@@ -576,7 +608,7 @@
padding-top: 0.1rem !important;
}
.el-form-item__content {
- line-height: 0.4rem !important;
+ line-height: 0.32rem !important;
font-size: 0.14rem !important;
}
.el-message-box__message p {
@@ -636,6 +668,22 @@
.el-form-item--medium .el-form-item__content {
width: 100%;
}
+ .el-popover {
+ // min-width: 1.5rem !important;
+ min-width: 4.6rem !important;
+ border-radius: 0.04rem !important;
+ border: 0.01rem solid #e6ebf5 !important;
+ padding: 0.12rem !important;
+ font-size: 0.14rem !important;
+ }
+ .el-card__header {
+ padding: 0.14rem 0.15rem 0.07rem !important;
+ min-height: 0.4rem !important;
+ }
+ .el-form-item__error {
+ font-size: 0.12rem !important;
+ padding-top: 0.04rem !important;
+}
}
@media (min-width: 2000px) {
// 页面公共样式
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 8dadc02..1f0c25b 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -73,6 +73,8 @@ export default {
display: flex;
.icon-item {
display: flex;
+ flex-wrap: row;
+ align-items: center;
max-width: 100%;
height: 100%;
padding: 0 5px;
@@ -101,4 +103,34 @@ export default {
}
}
}
+ // 媒体查询,适配大于2000px分辨率的大屏样式-element样式
+@media (min-width: 2000px) {
+ .icon-body {
+ padding: 0.1rem !important;
+ .icon-search {
+ margin-bottom: 0.05rem !important;
+ }
+ .icon-list {
+ height: 2rem !important;
+ .list-container {
+ .icon-item-wrapper {
+ height: 0.25rem !important;
+ line-height: 0.25rem !important;
+ .icon-item {
+ padding: 0 0.05rem !important;
+ &:hover {
+ border-radius: 0.05rem !important;
+ }
+ span {
+ padding-left: 0.02rem !important;
+ }
+ }
+ .icon-item.active {
+ border-radius: 0.05rem !important;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/views/bigScreen/components/useElect.vue b/src/views/bigScreen/components/useElect.vue
index 5c6fc9c..99b7ae8 100644
--- a/src/views/bigScreen/components/useElect.vue
+++ b/src/views/bigScreen/components/useElect.vue
@@ -180,6 +180,7 @@ export default {
systemTrend(data).then((res) => {
console.log("用电趋势返回", res);
if (res.code == 200) {
+ const titleFontSize = this.$refs.sys_charts.offsetWidth / 40;
let adapterOption = {};
// 添加折线的配置
adapterOption = {
@@ -209,6 +210,14 @@ export default {
},
xAxis: {
data: res.rows[0].timeStr,
+ axisLabel: {
+ fontSize: titleFontSize,
+ },
+ },
+ yAxis: {
+ axisLabel: {
+ fontSize: titleFontSize,
+ },
},
series: [
{
diff --git a/src/views/components/viewColdSys.vue b/src/views/components/viewColdSys.vue
index 9c36dd5..5a2069c 100644
--- a/src/views/components/viewColdSys.vue
+++ b/src/views/components/viewColdSys.vue
@@ -444,7 +444,7 @@ export default {
getChartsData() {
viewMainParams().then((res) => {
console.log("系统参数返回", res);
- console.log("冷源监控返回",res.rows[0]);
+ console.log("冷源监控返回", res.rows[0]);
if (res.code == 200) {
this.useForm.maxData = 10;
this.useForm.useData = res.rows[0].values[0].value;
@@ -454,6 +454,7 @@ export default {
this.useForm.useData,
this.useForm.maxData
);
+ const titleFontSize = this.$refs.sys_charts.offsetWidth / 30;
const adapterOption = {
series: [
{
@@ -484,7 +485,7 @@ export default {
label: {
show: true,
position: "center", // 文字显示在中心位置
- offset: [0, -5], // 向上偏移 10 个单位
+ offset: [0, -titleFontSize * 0.6], // 向上偏移 10 个单位
formatter: function () {
// 返回 HTML 标签,使用 rich 里定义的样式
return `{line|${that.useForm.useData}}`;
@@ -492,8 +493,8 @@ export default {
rich: {
line: {
color: "#fff", // 第二行文字颜色
- fontSize: 20, // 第二行文字大小
- lineHeight: 0, // 行高,实现间距
+ fontSize: titleFontSize, // 第二行文字大小
+ lineHeight: 5, // 行高,实现间距
},
},
},
@@ -575,4 +576,11 @@ export default {
margin-top: 25px;
}
}
+// 媒体查询,适配大于2000px分辨率的大屏样式
+@media (min-width: 2000px) {
+ .eer {
+ font-size: 0.18rem !important;
+ margin-top: 0.25rem !important;
+ }
+}
diff --git a/src/views/components/viewEnergy.vue b/src/views/components/viewEnergy.vue
index a2d1584..fbd43a5 100644
--- a/src/views/components/viewEnergy.vue
+++ b/src/views/components/viewEnergy.vue
@@ -81,11 +81,16 @@ export default {
);
console.log("当前要渲染的数据对象", chartsObj);
console.log("当前要渲染的颜色对象", colorObj);
+ const titleFontSize = this.$refs.chart_ref.offsetWidth / 100;
let adapterOption = {};
// 添加折线的配置
adapterOption = {
tooltip: {
trigger: "axis",
+ textStyle: {
+ // 设置提示框内文字的大小
+ fontSize: titleFontSize,
+ },
// 自定义 tooltip 内容
formatter: function (params) {
var res = params[0].name + "
";
@@ -106,7 +111,7 @@ export default {
value +
chartsObj.unit +
"
";
- } else {
+ } else {
res +=
marker +
seriesName +
@@ -121,17 +126,30 @@ export default {
},
xAxis: {
data: chartsObj.timeStr,
+ axisLabel: {
+ fontSize: titleFontSize,
+ },
},
yAxis: {
name: chartsObj.unit,
+ nameTextStyle: {
+ fontSize: titleFontSize,
+ },
+ axisLabel: {
+ fontSize: titleFontSize,
+ },
},
series: [
{
data: chartsObj.data,
name: event,
+ // 拐点大小
+ symbolSize: titleFontSize * 0.5,
//折线颜色
itemStyle: {
color: colorObj.color, //折线的颜色
+ // 设置折线的厚度
+ width: titleFontSize * 0.1,
},
lineStyle: {
color: colorObj.color, //折线点的颜色
@@ -292,16 +310,16 @@ export default {
}
// 媒体查询,适配大于2000px分辨率的大屏样式
@media (min-width: 2000px) {
- .right-table {
- padding: 0.27rem 0.15rem 0.25rem 0.15rem !important;
-}
-.mr20 {
- width: 0.92rem !important;
- padding: 0.02rem !important;
-}
-.charts {
- margin-top: 0.2rem !important;
- height: 3rem !important;
-}
+ .right-table {
+ padding: 0.27rem 0.15rem 0.25rem 0.15rem !important;
+ }
+ .mr20 {
+ width: 0.92rem !important;
+ padding: 0.02rem !important;
+ }
+ .charts {
+ margin-top: 0.2rem !important;
+ height: 3rem !important;
+ }
}
diff --git a/src/views/monitor/cache/list.vue b/src/views/monitor/cache/list.vue
index 29a7c74..960bb9b 100644
--- a/src/views/monitor/cache/list.vue
+++ b/src/views/monitor/cache/list.vue
@@ -3,7 +3,7 @@
-
+