diff --git a/src/api/aircAndWindc/index.js b/src/api/aircAndWindc/index.js index c68fd65..324ff36 100644 --- a/src/api/aircAndWindc/index.js +++ b/src/api/aircAndWindc/index.js @@ -8,3 +8,20 @@ export function windList(query) { params: query, }); } + +//查询定时开关列表 +export function timeList(query) { + return request({ + url: "/device/ahu/monitor/timeList", + method: "get", + params: query, + }); +} +//修改定时开关 +export function undateTime(query) { + return request({ + url: "/device/ahu/monitor/time", + method: "put", + params: query, + }); +} diff --git a/src/api/centerairC/temHistory.js b/src/api/centerairC/temHistory.js new file mode 100644 index 0000000..8aaaa74 --- /dev/null +++ b/src/api/centerairC/temHistory.js @@ -0,0 +1,9 @@ +import request from "@/utils/request"; +// 历史天气查询 +export function weatherTempData(query) { + return request({ + url: "/device/cs/getWeatherTemp", + method: "get", + params: query, + }); +} diff --git a/src/api/hotWater/dataAnalysis.js b/src/api/hotWater/dataAnalysis.js new file mode 100644 index 0000000..462dd00 --- /dev/null +++ b/src/api/hotWater/dataAnalysis.js @@ -0,0 +1,18 @@ +import request from "@/utils/request"; + +// 数据分析-月 +export function queryMonthDatas(query) { + return request({ + url: "/hot_energy/analysis/queryMonth", + method: "get", + params: query, + }); +} +// 数据分析-年 +export function queryYearDatas(query) { + return request({ + url: "/hot_energy/analysis/queryYear", + method: "get", + params: query, + }); +} diff --git a/src/api/hotWater/energyAnalysis.js b/src/api/hotWater/energyAnalysis.js new file mode 100644 index 0000000..6420131 --- /dev/null +++ b/src/api/hotWater/energyAnalysis.js @@ -0,0 +1,34 @@ +import request from "@/utils/request"; + +// 楼层 +export function hotBuildList(query) { + return request({ + url: "/space/building/hot_list", + method: "get", + params: query, + }); +} +// 楼栋能耗环比 +export function hotEnergySum(query) { + return request({ + url: "/hot_energy/energySum", + method: "get", + params: query, + }); +} +// 温度变化表 +export function hotWaterTemp(query) { + return request({ + url: "/hot_energy/waterTemp", + method: "get", + params: query, + }); +} +// 温度变化表 +export function hotWaterLevel(query) { + return request({ + url: "/hot_energy/waterLevel", + method: "get", + params: query, + }); +} diff --git a/src/api/hotWater/energyQuery.js b/src/api/hotWater/energyQuery.js new file mode 100644 index 0000000..585a255 --- /dev/null +++ b/src/api/hotWater/energyQuery.js @@ -0,0 +1,10 @@ +import request from "@/utils/request"; + +// 水电表读数 +export function queryDeviceDatas(query) { + return request({ + url: "/hot_energy/queryDeviceDatas", + method: "get", + params: query, + }); +} \ No newline at end of file diff --git a/src/api/hotWater/overview.js b/src/api/hotWater/overview.js new file mode 100644 index 0000000..f909bd3 --- /dev/null +++ b/src/api/hotWater/overview.js @@ -0,0 +1,18 @@ +import request from "@/utils/request"; + +// 设备状态 +export function deviceState(query) { + return request({ + url: "/device/hotWater/deviceState", + method: "get", + params: query, + }); +} +// 楼栋能耗 +export function hotEnergyQuery(query) { + return request({ + url: "/hot_energy/query", + method: "get", + params: query, + }); +} diff --git a/src/assets/icons/svg/dataAnalysis.svg b/src/assets/icons/svg/dataAnalysis.svg new file mode 100644 index 0000000..29dfa1d --- /dev/null +++ b/src/assets/icons/svg/dataAnalysis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/energyQuery.svg b/src/assets/icons/svg/energyQuery.svg new file mode 100644 index 0000000..53f761a --- /dev/null +++ b/src/assets/icons/svg/energyQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/overview1.png b/src/assets/images/overview1.png new file mode 100644 index 0000000..656c74f Binary files /dev/null and b/src/assets/images/overview1.png differ diff --git a/src/assets/images/overview2.png b/src/assets/images/overview2.png new file mode 100644 index 0000000..04aa48e Binary files /dev/null and b/src/assets/images/overview2.png differ diff --git a/src/assets/images/overview3.png b/src/assets/images/overview3.png new file mode 100644 index 0000000..640e3d3 Binary files /dev/null and b/src/assets/images/overview3.png differ diff --git a/src/assets/images/overview4.png b/src/assets/images/overview4.png new file mode 100644 index 0000000..694e6a4 Binary files /dev/null and b/src/assets/images/overview4.png differ diff --git a/src/assets/images/use1.png b/src/assets/images/use1.png new file mode 100644 index 0000000..60ae7a9 Binary files /dev/null and b/src/assets/images/use1.png differ diff --git a/src/assets/images/use2.png b/src/assets/images/use2.png new file mode 100644 index 0000000..e4d4e2e Binary files /dev/null and b/src/assets/images/use2.png differ diff --git a/src/assets/images/use3.png b/src/assets/images/use3.png new file mode 100644 index 0000000..40a1a30 Binary files /dev/null and b/src/assets/images/use3.png differ diff --git a/src/assets/styles/bigScreen.scss b/src/assets/styles/bigScreen.scss index 06aec06..ccdf471 100644 --- a/src/assets/styles/bigScreen.scss +++ b/src/assets/styles/bigScreen.scss @@ -1,6 +1,5 @@ -// 媒体查询，适配大于2000px分辨率的大屏样式 +// 媒体查询，适配大于2000px分辨率的大屏样式-element样式 @media (min-width: 2000px) { - // element样式 .el-tabs--top .el-tabs__item.is-top:nth-child(2), .el-tabs--top .el-tabs__item.is-bottom:nth-child(2), .el-tabs--bottom .el-tabs__item.is-top:nth-child(2), @@ -144,6 +143,15 @@ .el-range-editor--medium .el-range__close-icon { line-height: 0.28rem !important; } + .el-range-editor--small.el-input__inner { + height: 0.32rem !important; + } + .el-range-editor--small .el-range-input { + font-size: 0.13rem !important; + } + .el-tag--mini .el-icon-close { + margin-left: -0.03rem !important; + } .el-date-editor .el-range__icon { font-size: 0.14rem !important; margin-left: -0.05rem !important; @@ -151,7 +159,7 @@ } .el-input__icon { width: 0.25rem !important; - line-height: 0.4rem !important; + line-height: 0.32rem !important; } .el-range-editor--medium .el-range-input { font-size: 0.14rem !important; @@ -183,7 +191,10 @@ } .el-picker-panel, .el-date-range-picker .el-picker-panel__body { - min-width: 5.13rem !important; + // min-width: 5.13rem !important; + } + .el-date-picker { + width: 3.22rem !important; } .el-date-range-picker__time-header { font-size: 0.12rem !important; @@ -192,6 +203,29 @@ .el-date-range-picker__time-picker-wrap { padding: 0 0.05rem !important; } + .el-date-range-picker .el-picker-panel__body { + min-width: 5.13rem !important; + } + .el-date-range-picker { + width: 6.46rem !important; + } + .el-date-editor--daterange.el-input, + .el-date-editor--daterange.el-input__inner, + .el-date-editor--timerange.el-input, + .el-date-editor--timerange.el-input__inner { + width: 3.5rem !important; + } + .el-date-editor--monthrange.el-input, + .el-date-editor--monthrange.el-input__inner { + width: 3rem !important; + } + .el-date-editor.el-input, + .el-date-editor.el-input__inner { + width: 2.2rem !important; + } + .el-year-table td { + padding: 0.2rem 0.03rem !important; + } .el-input--small { font-size: 0.13rem !important; } @@ -224,6 +258,31 @@ height: 0.24rem !important; line-height: 0.24rem !important; } + .el-year-table td .cell { + width: 0.48rem !important; + height: 0.32rem !important; + line-height: 0.32rem !important; + } + .el-year-table { + font-size: 0.12rem !important; + margin: -0.01rem !important; + } + .el-select-dropdown { + margin: 0.05rem 0 !important; + border-radius: 0.04rem !important; + } + .el-select-dropdown__wrap, + .el-scrollbar__wrap { + margin-bottom: -0.1rem !important; + margin-right: -0.1rem !important; + } + .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after { + right: 0.2rem !important; + font-size: 0.12rem !important; + } + .el-select-dropdown__wrap { + max-height: 2.74rem !important; + } .el-date-table td.start-date div { margin-left: 0.05rem !important; border-top-left-radius: 0.15rem !important; @@ -242,6 +301,13 @@ padding: 0.04rem 0 !important; position: relative; } + .el-pager li { + padding: 0 0.04rem !important; + font-size: 0.13rem !important; + min-width: 0.355rem !important; + height: 0.28rem !important; + line-height: 0.28rem !important; + } .el-picker-panel__footer { padding: 0.04rem !important; } @@ -273,7 +339,7 @@ line-height: 0.36rem !important; } .el-input--suffix .el-input__inner { - padding-right: 0.3rem !important; + padding: 0 0.3rem !important; } .el-input--medium { font-size: 0.14rem !important; @@ -293,6 +359,7 @@ width: 0.16rem !important; line-height: 0.16rem !important; right: 0rem !important; + top: -0.01rem !important; } .el-tag--small { height: 0.24rem !important; @@ -320,7 +387,7 @@ font-size: 0.14rem !important; } .el-table--medium .el-table__cell { - padding: 10px 0; + padding: 0.01rem 0 !important; } .el-table .cell { line-height: 0.23rem !important; @@ -358,6 +425,9 @@ height: 0.28rem !important; line-height: 0.28rem !important; } + .el-tree-node__label { + font-size: 0.14rem !important; + } .el-pagination.is-background .btn-prev, .el-pagination.is-background .btn-next, .el-pagination.is-background .el-pager li { @@ -365,6 +435,12 @@ min-width: 0.3rem !important; border-radius: 0.02rem !important; } + .pagination-container { + padding: 0.32rem 0.16rem !important; + height: 0.32rem !important; + margin-bottom: 0.1rem !important; + margin-top: 0.15rem !important; + } .el-pagination .btn-prev .el-icon, .el-pagination .btn-next .el-icon { font-size: 0.12rem !important; @@ -400,7 +476,168 @@ font-size: 0.14rem !important; padding-right: 0.08rem !important; } - + .el-form-item--small .el-form-item__label { + line-height: 0.4rem !important; + } + .el-form-item__label { + font-size: 0.14rem !important; + } + .el-date-picker__header-label { + font-size: 0.16rem !important; + padding: 0 0.05rem !important; + line-height: 0.22rem !important; + } + .el-month-table td .cell { + width: 0.6rem !important; + height: 0.36rem !important; + line-height: 0.36rem !important; + border-radius: 0.18rem !important; + } + .el-month-table { + font-size: 0.12rem !important; + } + .el-month-table td { + padding: 0.08rem 0px !important; + } + .mb8 { + margin-bottom: 0.08rem !important; + } + .el-month-table td div { + height: 0.48rem !important; + padding: 0.06rem 0 !important; + } + .el-date-picker .el-picker-panel__content { + width: 2.92rem !important; + } + .el-cascader-panel { + border-radius: 0.04rem !important; + font-size: 0.14rem !important; + } + .el-cascader-menu { + min-width: 1.8rem !important; + } + .el-cascader-menu__wrap { + height: 2.04rem !important; + } + .el-cascader-menu__list { + padding: 0.06rem 0 !important; + } + .el-cascader-node { + padding: 0 0.3rem 0 0.2rem !important; + height: 0.34rem !important; + line-height: 0.34rem !important; + } + .el-checkbox { + font-size: 0.14rem !important; + margin-right: 0.03rem !important; + } + .el-cascader-node__label { + padding: 0 0.1rem !important; + } + .el-checkbox__inner { + border-radius: 0.02rem !important; + width: 0.14rem !important; + height: 0.14rem !important; + } + .el-checkbox__inner::after { + height: 0.07rem !important; + left: 0.04rem !important; + top: 0.01rem !important; + } + .el-checkbox__inner::after { + height: 0.07rem !important; + left: 0.04rem !important; + top: 0.01rem !important; + width: 0.03rem !important; + } + .el-checkbox__input.is-indeterminate .el-checkbox__inner::before { + height: 0.02rem !important; + top: 0.05rem !important; + } + .el-dialog { + border-radius: 0.1rem !important; + border: 0.02rem solid #005fbf !important; + } + .el-dialog__body { + padding: 0.3rem 0.2rem !important; + font-size: 0.14rem !important; + } + .el-form-item { + margin-bottom: 0.22rem !important; + } + .el-dialog__title { + width: 2.84rem !important; + height: 0.45rem !important; + font-size: 0.2rem !important; + line-height: 0.25rem !important; + } + .el-dialog__footer { + padding: 0.2rem !important; + padding-top: 0.1rem !important; + } + .el-form-item__content { + line-height: 0.4rem !important; + font-size: 0.14rem !important; + } + .el-message-box__message p { + line-height: 0.24rem !important; + } + .el-dialog .el-row { + margin-bottom: 0.1rem !important; + } + .el-dialog__headerbtn { + top: 0.32rem !important; + right: 0.2rem !important; + font-size: 0.16rem !important; + } + .el-dialog__header { + padding: 0.2rem !important; + padding-bottom: 0.1rem !important; + } + .el-dialog__headerbtn .el-dialog__close { + font-size: 0.25rem !important; + } + .el-dropdown-menu--medium .el-dropdown-menu__item { + line-height: 0.3rem !important; + padding: 0 0.17rem !important; + font-size: 0.14rem !important; + } + .vue-treeselect--searchable .vue-treeselect__input-container { + padding-left: 0.05rem !important; + padding-right: 0.05rem !important; + } + .vue-treeselect__x-container, + .vue-treeselect__control-arrow-container { + width: 0.2rem !important; + } + .vue-treeselect__x { + width: 0.08rem !important; + height: 0.08rem !important; + } + .vue-treeselect__control-arrow, + .vue-treeselect__option-arrow { + width: 0.09rem !important; + height: 0.09rem !important; + } + .vue-treeselect__option-arrow-container, + .vue-treeselect__option-arrow-placeholder { + width: 0.2rem !important; + } + .vue-treeselect div, + .vue-treeselect span { + line-height: 0.36rem !important; + } + .el-dropdown-menu--mini .el-dropdown-menu__item { + line-height: 0.24rem !important; + padding: 0 0.1rem !important; + font-size: 0.12rem !important; + } + // 弹框input宽度对齐 + .el-form-item--medium .el-form-item__content { + width: 100%; + } +} +@media (min-width: 2000px) { // 页面公共样式 .analysis-table th { height: 0.5rem !important; @@ -428,4 +665,50 @@ font-size: 0.24rem !important; } } + .choice { + margin-left: 0.42rem !important; + .mr20 { + font-size: 0.16rem !important; + width: 0.48rem !important; + border-radius: 0.14rem !important; + margin-right: 0.1rem !important; + } + } + .timeStyle { + border-radius: 0.14rem !important; + } + .special-div { + .special-top { + padding: 0.04rem 0.26rem 0.04rem 0 !important; + min-height: 0.37rem !important; + } + .special-top::after { + height: 0.01rem !important; + top: -0.03rem !important; + } + .special-top::before { + height: 0.01rem !important; + bottom: -0.03rem !important; + } + .special-title { + padding-left: 0.36rem !important; + font-size: 0.2rem !important; + line-height: 0.23rem !important; + background-size: 1.4rem 0.35rem !important; + background-position: 0px -0.03rem !important; + } + .special-title::before { + width: 0.34rem !important; + height: 0.13rem !important; + } + } + // 首页 + .project-data { + margin: 0.16rem 0 !important; + } + .form-header { + font-size: 0.15rem !important; + margin: 0.08rem 0.1rem 0.25rem 0.1rem !important; + padding-bottom: 0.05rem !important; + } } diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 7da9626..c27719a 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -380,7 +380,7 @@ table { border-spacing: 0; } table tr { - height: 45px !important; + height: 45px; color: #ffffff; } table th { diff --git a/src/components/Crontab/index.vue b/src/components/Crontab/index.vue index 4fc5e69..48e5b85 100644 --- a/src/components/Crontab/index.vue +++ b/src/components/Crontab/index.vue @@ -70,33 +70,33 @@

时间表达式

- +
{{item}}{{ item }} Cron 表达式
- {{crontabValueObj.second}} + {{ crontabValueObj.second }} - {{crontabValueObj.min}} + {{ crontabValueObj.min }} - {{crontabValueObj.hour}} + {{ crontabValueObj.hour }} - {{crontabValueObj.day}} + {{ crontabValueObj.day }} - {{crontabValueObj.month}} + {{ crontabValueObj.month }} - {{crontabValueObj.week}} + {{ crontabValueObj.week }} - {{crontabValueObj.year}} + {{ crontabValueObj.year }} - {{crontabValueString}} + {{ crontabValueString }}
@@ -329,7 +329,7 @@ export default { }, }, computed: { - crontabValueString: function() { + crontabValueString: function () { let obj = this.crontabValueObj; let str = obj.second + @@ -363,7 +363,7 @@ export default { // 隐藏部分组件 }, }, - mounted: function() { + mounted: function () { this.resolveExp(); }, }; diff --git a/src/views/aircAndWindc/awSysMonitor/index.vue b/src/views/aircAndWindc/awSysMonitor/index.vue index 0eca0d0..e677c8e 100644 --- a/src/views/aircAndWindc/awSysMonitor/index.vue +++ b/src/views/aircAndWindc/awSysMonitor/index.vue @@ -984,8 +984,8 @@ export default { } ) .then(() => { - console.log("打印id",id) - // this.handleSwitchOperationConrol(id, value); + // console.log("打印id",id) + this.handleSwitchOperationConrol(id, value); }) .catch(() => { // 用户取消操作，需要更新原来的频率 diff --git a/src/views/alarm/alarmCode/index.vue b/src/views/alarm/alarmCode/index.vue index 3ee0494..fd54f14 100644 --- a/src/views/alarm/alarmCode/index.vue +++ b/src/views/alarm/alarmCode/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > - - + + @@ -494,3 +493,35 @@ export default { }, }; + + diff --git a/src/views/alarm/alarmRecord/index.vue b/src/views/alarm/alarmRecord/index.vue index 8a2dbe2..68959e4 100644 --- a/src/views/alarm/alarmRecord/index.vue +++ b/src/views/alarm/alarmRecord/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > - - + + @@ -481,3 +480,34 @@ export default { color: rgb(7, 214, 110); } + diff --git a/src/views/alarm/alarmRule/index.vue b/src/views/alarm/alarmRule/index.vue index e8cc8b2..df02a8d 100644 --- a/src/views/alarm/alarmRule/index.vue +++ b/src/views/alarm/alarmRule/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > - - + + @@ -670,7 +669,7 @@ export default { this.getCpmIdList(this.form.ledgerId); } //清除采集位点 - this.form.cpmId = "" + this.form.cpmId = ""; }, //采集参数列表 getCpmIdList(id) { @@ -819,3 +818,34 @@ export default { color: red; } + diff --git a/src/views/bigScreen/bigScreen.vue b/src/views/bigScreen/bigScreen.vue index 31b7c6c..8f23ef0 100644 --- a/src/views/bigScreen/bigScreen.vue +++ b/src/views/bigScreen/bigScreen.vue @@ -395,7 +395,7 @@ export default { -webkit-background-clip: text; color: transparent; } - .day{ + .day { position: absolute; top: 0.43rem; left: 5rem; @@ -581,4 +581,58 @@ export default { } } } +// 媒体查询，适配大于2000px分辨率的大屏样式-element样式 +@media (min-width: 2000px) { + .loginD { + padding-bottom: 0.2rem !important; + .title-left { + width: calc(100% - 0.3rem) !important; + } + .special-div { + margin-bottom: 0.17rem !important; + } + .screen-page { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: stretch; + width: calc(100% - 1.22rem) !important; + margin-top: 0.86rem !important; + .screen-left { + width: 30% !important; + .left-Indicator { + position: absolute; + right: -0.9rem !important; + width: 0.6rem !important; + height: 0.4rem !important; + } + } + .screen-right { + width: 30% !important; + .message { + margin-top: 0.29rem !important; + font-size: 0.16rem !important; + .message-li { + width: calc(33.33% - 0.32rem) !important; + margin: 0 0.16rem !important; + .message-data { + font-size: 0.2rem !important; + margin-bottom: 0.3rem !important; + } + .message-img { + width: 1rem !important; + height: 0.99rem !important; + } + } + } + .right-Indicator { + position: absolute; + left: -0.9rem !important; + width: 0.6rem !important; + height: 0.4rem !important; + } + } + } + } +} diff --git a/src/views/bigScreen/components/allEnergy.vue b/src/views/bigScreen/components/allEnergy.vue index d2f5e12..d80e311 100644 --- a/src/views/bigScreen/components/allEnergy.vue +++ b/src/views/bigScreen/components/allEnergy.vue @@ -17,7 +17,7 @@ export default { return { chartInstance: null, option: {}, - energyMes:{} + energyMes: {}, }; }, watch: { @@ -29,7 +29,7 @@ export default { this.energyMes = newVal; this.$nextTick(() => { this.echartsData(); - }) + }); } }, }, @@ -426,4 +426,12 @@ export default { height: 200px; margin-top: 20px; } +// 媒体查询，适配大于2000px分辨率的大屏样式 +@media (min-width: 2000px) { + .charts { + margin-top: 0.3rem !important; + height: 2.4rem !important; + margin-top: 0.2rem !important; + } +} diff --git a/src/views/bigScreen/components/coldSysEnergy.vue b/src/views/bigScreen/components/coldSysEnergy.vue index ea9b5df..1c6f1cd 100644 --- a/src/views/bigScreen/components/coldSysEnergy.vue +++ b/src/views/bigScreen/components/coldSysEnergy.vue @@ -478,6 +478,7 @@ export default { this.useForm.useData, this.useForm.maxData ); + const titleFontSize = this.$refs.sys_charts.offsetWidth / 25; const adapterOption = { series: [ { @@ -508,7 +509,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}}`; @@ -516,7 +517,7 @@ export default { rich: { line: { color: "#fff", // 第二行文字颜色 - fontSize: 20, // 第二行文字大小 + fontSize: titleFontSize, // 第二行文字大小 lineHeight: 0, // 行高，实现间距 }, }, @@ -589,10 +590,11 @@ export default { justify-content: center; width: 100% !important; height: 100%; + padding: 10px 0; .sys_charts { width: 100%; - height: 1.6rem; + height: 160px; } .eer { width: 80%; @@ -605,4 +607,17 @@ export default { margin: 10px 0; } } +// 媒体查询，适配大于2000px分辨率的大屏样式 +@media (min-width: 2000px) { + .energy_content { + padding: 0.1rem 0 !important; + .sys_charts { + height: 1.6rem !important; + } + .eer { + font-size: 0.18rem !important; + margin: 0.2rem 0 !important; + } + } +} diff --git a/src/views/bigScreen/components/useElect.vue b/src/views/bigScreen/components/useElect.vue index 9784c3e..5c6fc9c 100644 --- a/src/views/bigScreen/components/useElect.vue +++ b/src/views/bigScreen/components/useElect.vue @@ -255,11 +255,23 @@ export default { .sys_charts { width: 100%; - height: 2rem; + height: 230px; } .eer { font-size: 18px; margin-top: 25px; } } +// 媒体查询，适配大于2000px分辨率的大屏样式 +@media (min-width: 2000px) { + .energy_content { + .sys_charts { + height: 2.4rem !important; + } + .eer { + font-size: 0.18rem !important; + margin-top: 0.25rem !important; + } + } +} diff --git a/src/views/bigScreen/components/waterSysEnergy.vue b/src/views/bigScreen/components/waterSysEnergy.vue index face20c..8be1963 100644 --- a/src/views/bigScreen/components/waterSysEnergy.vue +++ b/src/views/bigScreen/components/waterSysEnergy.vue @@ -460,7 +460,7 @@ export default { console.log("两个系统参数返回", res); if (res.code == 200) { this.energyMes = res.rows[0]; - this.useForm.maxData = 50; //最大值 + this.useForm.maxData = 50; //最大值 const { totalEle, totalWater } = res.rows[0]; if (totalEle === 0 || totalWater === 0) { this.useForm.useData = 0; @@ -479,6 +479,7 @@ export default { this.useForm.useData, this.useForm.maxData ); + const titleFontSize = this.$refs.sys_charts.offsetWidth / 25; const adapterOption = { series: [ { @@ -509,7 +510,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}}`; @@ -517,7 +518,7 @@ export default { rich: { line: { color: "#fff", // 第二行文字颜色 - fontSize: 20, // 第二行文字大小 + fontSize: titleFontSize, // 第二行文字大小 lineHeight: 0, // 行高，实现间距 }, }, @@ -590,10 +591,10 @@ export default { justify-content: center; width: 100% !important; height: 100%; - + padding: 10px 0; .sys_charts { width: 100%; - height: 1.6rem; + height: 160px; } .eer { width: 80%; @@ -606,4 +607,17 @@ export default { margin: 10px 0; } } +// 媒体查询，适配大于2000px分辨率的大屏样式 +@media (min-width: 2000px) { + .energy_content { + padding: 0.1rem 0 !important; + .sys_charts { + height: 1.6rem !important; + } + .eer { + font-size: 0.18rem !important; + margin: 0.2rem 0 !important; + } + } +} diff --git a/src/views/centerairC/deviceStrategy/index.vue b/src/views/centerairC/deviceStrategy/index.vue index 6b2718d..032141c 100644 --- a/src/views/centerairC/deviceStrategy/index.vue +++ b/src/views/centerairC/deviceStrategy/index.vue @@ -370,7 +370,7 @@ export default { position: relative; width: calc(33.33% - 40px); margin: 0 20px; - min-height: 300px; + min-height: 350px; background-image: url(../../../assets/images/strategy-border.png); background-size: 100% 100%; border-bottom: 1px solid #1587cc; diff --git a/src/views/centerairC/enSourceAnalysis/components/deviceEnergy.vue b/src/views/centerairC/enSourceAnalysis/components/deviceEnergy.vue index be32ebb..4cc965c 100644 --- a/src/views/centerairC/enSourceAnalysis/components/deviceEnergy.vue +++ b/src/views/centerairC/enSourceAnalysis/components/deviceEnergy.vue @@ -60,7 +60,6 @@ v-model="startYear" type="year" placeholder="选择开始年份" - style="width: 180px" value-format="yyyy" > @@ -69,7 +68,6 @@ v-model="endYear" type="year" placeholder="选择结束年份" - style="width: 180px" value-format="yyyy" > diff --git a/src/views/centerairC/enSourceAnalysis/components/equipment.vue b/src/views/centerairC/enSourceAnalysis/components/equipment.vue index b90c7a0..3dfbd76 100644 --- a/src/views/centerairC/enSourceAnalysis/components/equipment.vue +++ b/src/views/centerairC/enSourceAnalysis/components/equipment.vue @@ -59,7 +59,6 @@ v-model="startYear" type="year" placeholder="选择开始年份" - style="width: 180px" value-format="yyyy" > @@ -68,7 +67,6 @@ v-model="endYear" type="year" placeholder="选择结束年份" - style="width: 180px" value-format="yyyy" > diff --git a/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue b/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue index 37574ce..5ed95ff 100644 --- a/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue +++ b/src/views/centerairC/enSourceAnalysis/components/machineRoom.vue @@ -53,7 +53,6 @@ v-model="startYear" type="year" placeholder="选择开始年份" - style="width: 180px" value-format="yyyy" > @@ -62,7 +61,6 @@ v-model="endYear" type="year" placeholder="选择结束年份" - style="width: 180px" value-format="yyyy" > diff --git a/src/views/centerairC/timeSwitch/index.vue b/src/views/centerairC/timeSwitch/index.vue index 4bb37b5..9d75cd8 100644 --- a/src/views/centerairC/timeSwitch/index.vue +++ b/src/views/centerairC/timeSwitch/index.vue @@ -102,28 +102,28 @@ export default { // console.log("child.pointName", child.pointName); if (child.pointName) { // 定时开机-小时 - if (child.pointName == `定时${index + 1}开_时`) { + if (child.pointName.includes(`开_时`)) { // console.log("定时开机-时·························"); delayItem.delayOpenHour = child.curValue; delayItem.delayOpenHourId = child.cpmId; } // 定时开机-分钟 else if ( - child.pointName.includes(`定时${index + 1}开_分`) + child.pointName.includes(`开_分`) ) { delayItem.delayOpenMinute = child.curValue; delayItem.delayOpenMinuteId = child.cpmId; } // 定时关机-小时 else if ( - child.pointName.includes(`定时${index + 1}关_时`) + child.pointName.includes(`关_时`) ) { delayItem.delayCloseHour = child.curValue; delayItem.delayCloseHourId = child.cpmId; } // 定时关机-分钟 else if ( - child.pointName.includes(`定时${index + 1}关_分`) + child.pointName.includes(`关_分`) ) { delayItem.delayCloseMinute = child.curValue; delayItem.delayCloseMinuteId = child.cpmId; @@ -419,13 +419,7 @@ export default { border-radius: 10px; font-size: 14px; .device-li { - width: 100%; - display: flex; - flex-direction: row; - align-items: center; - padding: 12px 0; - color: #abcdfc; - border-bottom: 1px dashed #0349ac; + flex: none !important; .device-name { flex: 1; white-space: nowrap; @@ -441,9 +435,6 @@ export default { } } } - .device-li:nth-child(1) { - color: #9ca3af; - } } // 媒体查询，适配大于2000px分辨率的大屏样式 @media (min-width: 2000px) { diff --git a/src/views/components/aircAndWindcMeter.vue b/src/views/components/aircAndWindcMeter.vue new file mode 100644 index 0000000..ed7c932 --- /dev/null +++ b/src/views/components/aircAndWindcMeter.vue @@ -0,0 +1,460 @@ + + + + + diff --git a/src/views/components/hotWater.vue b/src/views/components/hotWater.vue new file mode 100644 index 0000000..e00c49f --- /dev/null +++ b/src/views/components/hotWater.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/views/components/temMeter.vue b/src/views/components/temMeter.vue new file mode 100644 index 0000000..96d0fe0 --- /dev/null +++ b/src/views/components/temMeter.vue @@ -0,0 +1,460 @@ + + + + + diff --git a/src/views/components/viewEnergy.vue b/src/views/components/viewEnergy.vue index 999bb40..a2d1584 100644 --- a/src/views/components/viewEnergy.vue +++ b/src/views/components/viewEnergy.vue @@ -290,4 +290,18 @@ export default { width: 100%; height: 300px; } +// 媒体查询，适配大于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; +} +} diff --git a/src/views/components/waterTank.vue b/src/views/components/waterTank.vue index cbe8ebe..35a59bc 100644 --- a/src/views/components/waterTank.vue +++ b/src/views/components/waterTank.vue @@ -46,9 +46,9 @@ export default { } .water { position: absolute; - bottom: 0; - left: 0; - width: 100%; + bottom: 0.05rem; + left: 0.03rem; + width: 1.13rem; /* 修改颜色表示，添加透明度 */ background-color: rgba(23, 106, 201); overflow: hidden; @@ -64,7 +64,7 @@ export default { height: 120px !important; } .water { - width: 110px !important; + width: 105px !important; } } @@ -78,11 +78,11 @@ export default { height: 100px !important; } .water { - width: 90px !important; + width: 85px !important; } } -@media (min-width: 720px) and (max-width: 1240px){ +@media (min-width: 720px) and (max-width: 1240px) { .monitor-container { width: 100px !important; height: 100px !important; @@ -92,7 +92,7 @@ export default { height: 110px !important; } .water { - width: 100px !important; + width: 96px !important; } } @@ -106,7 +106,13 @@ export default { height: 90px !important; } .water { - width: 80px !important; + width: 76px !important; + } +} +// 媒体查询，适配大于2000px分辨率的大屏样式-element样式 +@media (min-width: 2000px) { + .water { + bottom: 0rem !important; } } diff --git a/src/views/device/comm/index.vue b/src/views/device/comm/index.vue index 2a9a9a1..11fe7f8 100644 --- a/src/views/device/comm/index.vue +++ b/src/views/device/comm/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > - - + + @@ -446,3 +445,35 @@ export default { }, }; + + diff --git a/src/views/device/gateway/index.vue b/src/views/device/gateway/index.vue index f6560c5..adb682b 100644 --- a/src/views/device/gateway/index.vue +++ b/src/views/device/gateway/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > - - + + @@ -500,3 +499,35 @@ export default { }, }; + + diff --git a/src/views/device/gather/index.vue b/src/views/device/gather/index.vue index 187ffdf..7cf5779 100644 --- a/src/views/device/gather/index.vue +++ b/src/views/device/gather/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="90px" > - - + + @@ -916,3 +915,35 @@ export default { }, }; + + diff --git a/src/views/device/ledger/index.vue b/src/views/device/ledger/index.vue index 0fa78b5..bafbf7c 100644 --- a/src/views/device/ledger/index.vue +++ b/src/views/device/ledger/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > - - + + @@ -421,7 +420,7 @@ export default { isCollection: [ { required: true, message: "请选择是否", trigger: "blur" }, ], - modelSpecs:[ + modelSpecs: [ { required: true, message: "规格型号不能为空", trigger: "blur" }, ], isCalcEnergy: [ @@ -596,3 +595,34 @@ export default { }, }; + diff --git a/src/views/device/maintenance/index.vue b/src/views/device/maintenance/index.vue index d522de3..560c993 100644 --- a/src/views/device/maintenance/index.vue +++ b/src/views/device/maintenance/index.vue @@ -81,7 +81,6 @@ ref="queryForm" size="small" :inline="true" - label-width="68px" > - - + + @@ -833,3 +832,34 @@ export default { } } + diff --git a/src/views/device/qrCode/index.vue b/src/views/device/qrCode/index.vue index a57937e..0906c37 100644 --- a/src/views/device/qrCode/index.vue +++ b/src/views/device/qrCode/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="90px" > - - + + @@ -259,7 +258,6 @@
@@ -270,14 +268,12 @@ @@ -554,3 +550,34 @@ export default { color: red; } + diff --git a/src/views/device/spare/index.vue b/src/views/device/spare/index.vue index 69db42c..f765f7e 100644 --- a/src/views/device/spare/index.vue +++ b/src/views/device/spare/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="90px" > - - + + @@ -460,3 +459,34 @@ export default { }, }; + diff --git a/src/views/device/spareInOut/index.vue b/src/views/device/spareInOut/index.vue index e8e9c0a..677ad28 100644 --- a/src/views/device/spareInOut/index.vue +++ b/src/views/device/spareInOut/index.vue @@ -7,7 +7,6 @@ ref="queryForm" size="small" :inline="true" - label-width="90px" > - - + + - + - + - + - +