diff --git a/src/assets/styles/bigScreen.scss b/src/assets/styles/bigScreen.scss index ccdf471..db29366 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,18 @@ .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; +} } @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/centerairC/temHistoryQuery/index.vue b/src/views/centerairC/temHistoryQuery/index.vue index 36b036b..211da8f 100644 --- a/src/views/centerairC/temHistoryQuery/index.vue +++ b/src/views/centerairC/temHistoryQuery/index.vue @@ -261,13 +261,22 @@ export default { //初始化chartInstance对象 initChart() { this.chartInstance = echarts.init(this.$refs.chart_ref); + const titleFontSize = this.$refs.chart_ref.offsetWidth / 100; this.option = { tooltip: { // 设置触发方式为 axis,鼠标移动到 x 轴对应位置时触发 trigger: "axis", + textStyle: { + // 设置提示框内文字的大小 + fontSize: titleFontSize, + }, }, legend: { show: false, + // textStyle: { + // // 设置图例文字的大小 + // fontSize: 14 + // } }, grid: { top: "10%", @@ -285,6 +294,7 @@ export default { // interval: 0, //强制显示所有x轴数据 // rotate: 30, //x轴坐标字体倾斜30度 color: "rgba(255, 255, 255, 1)", + fontSize: titleFontSize, //x轴文字大小 }, axisTick: { show: false, // 不显示坐标轴刻度线 @@ -305,19 +315,18 @@ export default { yAxis: { min: 0, // max:20, - // // // min:'dataMin', - // // // max:'dataMax', // name: "kwh", // 第一个 y 轴的单位描述 // 设置 name 的样式 nameTextStyle: { color: "rgba(255, 255, 255, 1)", - fontSize: 12, + fontSize: 12, //y轴单位文字大小 }, miniInterval: 5, type: "value", // 修饰刻度标签的颜色即y坐标数据 axisLabel: { color: "rgba(255, 255, 255, 1)", + fontSize: titleFontSize, //x轴文字大小 }, // 显示y坐标轴 axisLine: { @@ -340,14 +349,22 @@ export default { { type: "line", // 拐点大小 - symbolSize: 8, + symbolSize: titleFontSize * 0.5, + lineStyle: { + // 设置折线的厚度 + width: titleFontSize * 0.1, + }, symbol: "circle", name: "最高气温", }, { type: "line", // 拐点大小 - symbolSize: 8, + symbolSize: titleFontSize * 0.5, + lineStyle: { + // 设置折线的厚度 + width: titleFontSize * 0.1, + }, symbol: "circle", name: "最低气温", }, diff --git a/src/views/components/viewEnergy.vue b/src/views/components/viewEnergy.vue index a2d1584..bd959b7 100644 --- a/src/views/components/viewEnergy.vue +++ b/src/views/components/viewEnergy.vue @@ -81,6 +81,7 @@ export default { ); console.log("当前要渲染的数据对象", chartsObj); console.log("当前要渲染的颜色对象", colorObj); + const titleFontSize = this.$refs.chart_ref.offsetWidth / 50; let adapterOption = {}; // 添加折线的配置 adapterOption = { @@ -106,7 +107,7 @@ export default { value + chartsObj.unit + "
"; - } else { + } else { res += marker + seriesName + @@ -121,9 +122,18 @@ export default { }, xAxis: { data: chartsObj.timeStr, + axisLabel: { + fontSize: titleFontSize, + }, }, yAxis: { name: chartsObj.unit, + nameTextStyle: { + fontSize: titleFontSize, + }, + axisLabel: { + fontSize: titleFontSize, + }, }, series: [ { @@ -292,16 +302,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 @@ -
+
缓存列表 - + @@ -61,7 +56,7 @@ -
+
键名列表 - + @@ -111,7 +101,7 @@ -
+
缓存内容 + diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue index 78a6829..58faaf4 100644 --- a/src/views/monitor/job/index.vue +++ b/src/views/monitor/job/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > - + - - + + @@ -285,7 +279,7 @@ @@ -350,13 +344,8 @@ - - + + {{ form.jobId }} @@ -667,3 +656,37 @@ export default { }, }; + diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue index 0e9bb54..8632a62 100644 --- a/src/views/monitor/job/log.vue +++ b/src/views/monitor/job/log.vue @@ -7,14 +7,12 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > @@ -23,7 +21,6 @@ v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable - style="width: 240px" > - + - + @@ -221,13 +206,8 @@ /> - - + + {{ form.jobLogId }} @@ -396,3 +376,37 @@ export default { }, }; + diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue index 2182624..9cfdfff 100644 --- a/src/views/monitor/logininfor/index.vue +++ b/src/views/monitor/logininfor/index.vue @@ -7,14 +7,12 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > @@ -23,7 +21,6 @@ v-model="queryParams.userName" placeholder="请输入用户名称" clearable - style="width: 240px" @keyup.enter.native="handleQuery" /> @@ -32,7 +29,6 @@ v-model="queryParams.status" placeholder="登录状态" clearable - style="width: 240px" >