From 88db1e91397484ccd7a1ac718e232a9aabe11e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Wed, 3 Sep 2025 09:56:23 +0800 Subject: [PATCH 1/2] 09/03 --- src/views/index.vue | 2 +- src/views/page/heatFan.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/index.vue b/src/views/index.vue index 6b811615..9f64c286 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -260,7 +260,7 @@ export default { initLeftList() { this.leftList = [ { name: this.$t('index.home'), img: require('../assets/image/index-icon.png'), list: [], router: 'realTime', isRouter: true, }, - { name: this.$t('index.greenhouse'), routerList: ['realTime', 'dataAnalysis', 'historyData','air-conditioning', 'exitSettings', 'videoMonitoring','imageData', 'skylight', 'control', 'systemSet-con', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img0.png'), list: [] }, + { name: this.$t('index.greenhouse'), routerList: ['realTime', 'dataAnalysis', 'historyData','air-conditioning', 'exitSettings','heatFan', 'videoMonitoring','imageData', 'skylight', 'control', 'systemSet-con', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img0.png'), list: [] }, // { name: '二号温室', img: require('../assets/image/left-img1.png'), list: [] }, { name: this.$t('index.fertigation'), routerList: ['status-soil','formula', 'dataAnalysis', 'historyData', 'irrigateSet', 'videoMonitoring','imageData', 'PIDSet', 'systemSet', 'upload', 'sensorSet', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/left-img2.png'), list: [] }, { name:this.$t('index.smartIrrigation') , routerList: ['realTime', 'dataAnalysis', 'historyData','irrigateSet-soil', 'videoMonitoring','imageData','PIDSet-soil', 'systemSet-soil', 'upload-soil', 'sensorSet-soil', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/irrigateSet-icon1-act.png'), list: [] }, diff --git a/src/views/page/heatFan.vue b/src/views/page/heatFan.vue index 55abaa70..29bfe0b8 100644 --- a/src/views/page/heatFan.vue +++ b/src/views/page/heatFan.vue @@ -200,6 +200,7 @@ export default { return { inputData: [], typeList1: [ + // { label:this.$t('heatFan.gear2',{index:0}), value: 0 }, { label:this.$t('heatFan.gear2',{index:1}), value: 1 }, { label:this.$t('heatFan.gear2',{index:2}), value: 2 }, { label:this.$t('heatFan.gear2',{index:3}), value: 3 }, -- 2.47.2 From 9db40ecd646aab2bec1282bc10faa6de69ed7655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Mon, 8 Sep 2025 10:37:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/main.css | 42 +++++++++++++++++++++++---- src/assets/css/main.scss | 37 +++++++++++++++++++---- src/views/manage/deviceInfoManage.vue | 19 ++++++++++-- src/views/manage/deviceSet.vue | 14 +++++++-- src/views/manage/deviceStatusSet.vue | 15 ++++++++-- src/views/manage/weatherData.vue | 20 ++++++++++--- 6 files changed, 126 insertions(+), 21 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 0a94bd91..118ec505 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -31,6 +31,42 @@ /*滚动条边角*/ } +.flex-title { + padding-top: 0; + justify-content: space-between; + border-bottom: 1px solid transparent; +} + +.flex-title > div { + display: flex; + align-items: center; + font-size: 28px; + font-family: Microsoft YaHei; + font-weight: bold; + color: #FFFFFF; +} + +.flex-title > div > img { + width: 60px; + height: 60px; + margin-right: 15px; +} + +.flex-title .table-title-btn { + font-size: 16px; +} + +.flex-title .table-title-btn > img { + width: 14px; + height: 14px; + margin-right: 9px; +} + +.flex-title .table-right { + font-size: 20px; + font-weight: boldflex-title; +} + .amap-marker .p_title { height: 44px; background: rgba(1, 12, 28, 0.7); @@ -4524,12 +4560,6 @@ textarea { margin-top: 0; } -.videoManage .flex-title { - padding-top: 0; - justify-content: space-between; - border-bottom: 1px solid transparent; -} - .el-table .el-table__body-wrapper::-webkit-scrollbar { /*滚动条整体*/ width: 17px; diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 68a1bb03..a541f5e7 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -32,6 +32,38 @@ /*滚动条边角*/ } +} +.flex-title { + padding-top: 0; + justify-content: space-between; + border-bottom: 1px solid transparent; + >div{ + display: flex; + align-items: center; + font-size: 28px; + font-family: Microsoft YaHei; + font-weight: bold; + color: #FFFFFF; + >img{ + width: 60px; + height: 60px; + margin-right: 15px; + } + } + + .table-title-btn{ + font-size: 16px; + >img{ + width: 14px; + height: 14px; + margin-right: 9px; + } + } + + .table-right{ + font-size: 20px; + font-weight: boldflex-title; + } } .amap-marker{ .p_title { @@ -4798,11 +4830,6 @@ textarea { margin-top: 0; } - .flex-title { - padding-top: 0; - justify-content: space-between; - border-bottom: 1px solid transparent; - } // >.flex-view { // justify-content: space-between; diff --git a/src/views/manage/deviceInfoManage.vue b/src/views/manage/deviceInfoManage.vue index 52398771..9c174524 100644 --- a/src/views/manage/deviceInfoManage.vue +++ b/src/views/manage/deviceInfoManage.vue @@ -1,7 +1,22 @@