From 84930b1639976ed0c1e5b88611d4fb76eca31e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Fri, 20 Jun 2025 17:28:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?6/20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 22 +- src/assets/css/main.css | 6 +- src/assets/css/main.scss | 6 +- src/components/setParams.vue | 61 ++-- src/components/setParamsControl.vue | 105 +++--- src/components/setParamsSoil.vue | 97 +++--- src/i18n/index.js | 1 - src/i18n/lang/en.js | 211 +++++++++++- src/i18n/lang/zh.js | 216 +++++++++++- src/main.js | 1 + src/utils/language.js | 1 + src/views/index.vue | 324 +++++++++--------- src/views/insectPest/imageList.vue | 2 +- src/views/manage/dataDevice.vue | 2 +- src/views/manage/deviceInfoManage.vue | 14 +- src/views/manage/deviceSet.vue | 2 +- src/views/manage/mobileControl.vue | 2 +- src/views/manage/userInfoControl.vue | 2 +- src/views/manage/weatherData.vue | 2 +- src/views/page/LED.vue | 2 +- src/views/page/PIDSet.vue | 2 +- src/views/page/alarmSettings.vue | 2 +- src/views/page/circulationCan.vue | 2 +- src/views/page/coercionMist.vue | 2 +- src/views/page/dataAnalysis.vue | 29 +- src/views/page/electromagneticControl.vue | 2 +- src/views/page/exitSettings.vue | 2 +- src/views/page/facadeInsulation.vue | 2 +- src/views/page/fan.vue | 2 +- src/views/page/forceOutput.vue | 2 +- src/views/page/formula.vue | 4 +- src/views/page/heatFan.vue | 2 +- src/views/page/historyData.vue | 75 +++-- src/views/page/imageData.vue | 24 +- src/views/page/insizeSunshade.vue | 2 +- src/views/page/internalInsulation.vue | 2 +- src/views/page/intrinsicParameter-soil.vue | 2 +- src/views/page/intrinsicParameter.vue | 2 +- src/views/page/irrigateSet.vue | 6 +- src/views/page/largeScreen.vue | 31 +- src/views/page/largeScreen1.vue | 2 +- src/views/page/outsizeSunshade.vue | 2 +- src/views/page/realTime.vue | 370 +++++++++++---------- src/views/page/sensorSet-con.vue | 2 +- src/views/page/sensorSet-soil.vue | 2 +- src/views/page/sensorSet.vue | 2 +- src/views/page/skylight.vue | 4 +- src/views/page/status-soil.vue | 2 +- src/views/page/sunroofControl.vue | 2 +- src/views/page/synthesis-con.vue | 2 +- src/views/page/systemSet-con.vue | 6 +- src/views/page/systemSet-soil.vue | 6 +- src/views/page/systemSet.vue | 6 +- src/views/page/targetCo2.vue | 2 +- src/views/page/targetHumidity.vue | 2 +- src/views/page/targetTemperature.vue | 2 +- src/views/page/upload-con.vue | 2 +- src/views/page/upload-soil.vue | 2 +- src/views/page/upload.vue | 2 +- src/views/page/videoMonitoring.vue | 42 ++- src/views/page/wetFan.vue | 2 +- 61 files changed, 1088 insertions(+), 652 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index d75a6bad..a2c06df9 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -262,7 +262,7 @@ geteqetdata(data) { }, // 数据采集器的实时数据 getdataRtdata(data) { - return sendGetRequest(`/getdata/rtdata?deviceId=` + data, ``) + return sendGetRequest(`/getdata/rtdata`, data) }, //测试施肥机读取设备状态信息 //读取数据 根据文档编号读取 所有数据展示都出自这个接口 postReg(data) { @@ -281,11 +281,11 @@ getdataRtdata(data) { }, //获取实时数据 postRtdata(data) { - return sendPostRequest(`/getFs/rtdata?equipmentId=` + data, ``); + return sendPostParamsRequest(`/getFs/rtdata`, data); }, //获取实时数据 postFsdata(data) { - return sendPostRequest(`/chart/fsdata?equipmentId=` + data, ``); + return sendPostParamsRequest(`/chart/fsdata`, data); }, //获取监控地址 getGethls(data) { @@ -299,12 +299,12 @@ getdataRtdata(data) { //控制器接口 //控制器实时数据 - getControlRtdata(data) { - return sendPostRequest(`/getcontrol/rtdata?equipmentId=` + data, ``); + getControlRtdata(params) { + return sendPostParamsRequest(`/getcontrol/rtdata` ,params); }, //控制器实时数据折线图 - getControlFsdata(data) { - return sendPostRequest(`/getcontrol/fsdata?equipmentId=` + data, ``); + getControlFsdata(params) { + return sendPostParamsRequest(`/getcontrol/fsdata`,params); }, //控制器数据上传数据获取 getControldataUpload(data) { @@ -336,7 +336,7 @@ getdataRtdata(data) { }, //控制器 气象站实时数据折线图 getControlChartdata(data) { - return sendPostRequest(`/equip/chartdata?equipmentId=` + data, ``) + return sendPostParamsRequest(`/equip/chartdata`,data) }, //首页历史数据/数据分析弹窗 selFsAvgdata(data) { @@ -384,9 +384,7 @@ getdataRtdata(data) { return sendGetRequest(`/readControl/getState?deviceId=${deviceId}`, data); }, - getcontrol_rtDatastation(equipmentId, data) { - return sendGetRequest(`/getcontrol/rtDatastation?equipmentId=${equipmentId}`, data) - }, + //控制器根据设备查看权限 getcontrol_cpermission(equipmentId, data) { return sendPostRequest(`/getcontrol/cpermission?deviceId=${equipmentId}`, data) @@ -745,7 +743,7 @@ getIccid(data){ }, //当天折线图 chart_fidata(data) { - return sendPostRequest(`/chart/fidata?equipmentId=${data}`,``) + return sendPostParamsRequest(`/chart/fidata`,data) }, //智能灌溉1 readFi_irrigate(url,data) { diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 6f8c7f82..a9499235 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -192,7 +192,7 @@ textarea { .collapse .no-list { width: 100%; height: 76px; - line-height: 76px; + line-height: 25px; padding-left: 25px; border-bottom: 1px solid rgba(168, 182, 200, 0.2); cursor: pointer; @@ -1329,7 +1329,7 @@ textarea { } .btn.btn-w66 { - width: 66px; + min-width: 66px; min-width: unset; } @@ -2424,7 +2424,6 @@ textarea { .realTime .page-content .realTime-bottom .left-view > div .video-control .video-btn > div > div { white-space: nowrap; - width: 40px; } .realTime .page-content .realTime-bottom .right { @@ -4025,6 +4024,7 @@ textarea { font-size: 20px; font-weight: bold; padding: 15px 0; + color: #fff; } .model-sel { diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index a70b6b84..0a7fd1da 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -203,7 +203,7 @@ textarea { .no-list { width: 100%; height: 76px; - line-height: 76px; + line-height: 25px; padding-left: 25px; border-bottom: 1px solid rgba(168, 182, 200, 0.2); cursor: pointer; @@ -1401,7 +1401,7 @@ textarea { } &.btn-w66 { - width: 66px; + min-width: 66px; min-width: unset; } @@ -2557,7 +2557,6 @@ textarea { >div { white-space: nowrap; - width: 40px; } } } @@ -4283,6 +4282,7 @@ textarea { font-size: 20px; font-weight: bold; padding: 15px 0; + color: #fff; } .model-sel { diff --git a/src/components/setParams.vue b/src/components/setParams.vue index 06039559..57ad0ff0 100644 --- a/src/components/setParams.vue +++ b/src/components/setParams.vue @@ -1,11 +1,11 @@