From 0f484a4a687c8fd26f983a95f4e35b14d6c790b7 Mon Sep 17 00:00:00 2001 From: lixiaoyuan Date: Wed, 27 May 2026 16:35:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=B2=E6=96=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=88=A0=E9=99=A4=E5=85=89?= =?UTF-8?q?=E4=BC=8F=E7=AD=89=E6=97=A0=E6=95=B0=E6=8D=AE=E7=9A=84=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=A8=A1=E5=9D=97=E3=80=81=E5=82=A8=E8=83=BD=E5=85=85?= =?UTF-8?q?=E6=94=BE=E7=94=B5/=E6=94=B6=E7=9B=8A=E6=8C=89=E6=9C=88+?= =?UTF-8?q?=E5=AD=A3=E5=BA=A6+=E5=91=A8+=E5=B9=B4=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/database/Dao.cpp | 12 +- src/database/Dao.h | 4 +- src/protocol/HttpEntity.cpp | 125 +++++++++- src/protocol/HttpEntity.h | 3 + web/src/components/Home/Charge.vue | 2 +- web/src/components/Home/Modal.vue | 2 +- web/src/components/Home/Modal/PrefabCabin.vue | 13 +- .../components/Home/Modal/StationPower.vue | 4 +- .../components/Home/Modal/StationVoltage.vue | 4 +- web/src/components/Home/MyChartBar.vue | 10 +- web/src/components/Home/MyChartLine.vue | 178 ++++++++++++++ web/src/components/Home/TotalStation.vue | 12 +- web/src/components/Home/onLine.vue | 8 +- web/src/components/SearchBox.vue | 140 ++++++++++- web/src/components/monitor/videos.vue | 10 +- web/src/components/system/policyForm.vue | 16 +- web/src/utils/config.js | 2 +- web/src/views/monitor.vue | 20 +- web/src/views/statisticalAnalysis.vue | 217 ++++++++++++++---- web/src/views/sub/Home.vue | 98 +++----- web/src/views/system/alarmLog.vue | 51 +++- web/src/views/system/log.vue | 50 +++- 22 files changed, 788 insertions(+), 193 deletions(-) create mode 100644 web/src/components/Home/MyChartLine.vue diff --git a/src/database/Dao.cpp b/src/database/Dao.cpp index ae202e5..8591b46 100644 --- a/src/database/Dao.cpp +++ b/src/database/Dao.cpp @@ -492,10 +492,11 @@ Errcode DAO::deletePolicyById(std::string policyId) } // 系统日志管理 -Errcode DAO::querySystemLogList(PageInfo& pageInfo, vector& result) +Errcode DAO::querySystemLogList(const std::string& stationId, PageInfo& pageInfo, vector& result) { std::string sqlFrom = "FROM " + DMLogSystem::TABLENAME; - return QueryPagination("*", sqlFrom, pageInfo, result, " order by create_time desc "); + if (!stationId.empty()) sqlFrom += (" WHERE station_id='" + stationId + "'"); + return QueryPagination("*", sqlFrom, pageInfo, result, " ORDER BY create_time desc "); } Errcode DAO::insertSystemLog(Fields& params) { @@ -537,10 +538,11 @@ Errcode DAO::insertSystemLogDevice(int stationId, int deviceId, std::string cont return DAO::insertSystemLog(fields); } -Errcode DAO::queryAlertLogList(PageInfo& pageInfo, vector& result) +Errcode DAO::queryAlertLogList(const std::string& stationId, PageInfo& pageInfo, vector& result) { - std::string sqlFrom = "from log_alert la left join device d on d.device_id =la.device_id left join station s on s.station_id = d.station_id"; - return QueryPagination("d.station_id, s.name station_name, d.name device_name, la.*", sqlFrom, pageInfo, result, " order by create_time desc "); + std::string sqlFrom = "FROM log_alert la left join device d on d.device_id =la.device_id left join station s on s.station_id = d.station_id"; + if (!stationId.empty()) sqlFrom += (" WHERE s.station_id='" + stationId + "'"); + return QueryPagination("d.station_id, s.name station_name, d.name device_name, la.*", sqlFrom, pageInfo, result, " ORDER BY create_time desc "); } Errcode DAO::insertAlertLog(Fields& params) { diff --git a/src/database/Dao.h b/src/database/Dao.h index 749e304..9e5a4ca 100644 --- a/src/database/Dao.h +++ b/src/database/Dao.h @@ -99,7 +99,7 @@ public: /////////////////////////////////////////////////////////////////////////////////////////////// // === 系统日志管理 === // 分页查询系统日志列表 - static Errcode querySystemLogList(PageInfo& pageInfo, vector& result); + static Errcode querySystemLogList(const std::string& stationId, PageInfo& pageInfo, vector& result); static Errcode insertSystemLog(Fields& params); static Errcode updateSystemLogById(Fields& params); @@ -107,7 +107,7 @@ public: static Errcode insertSystemLogUser(std::string token, std::string content, int status); static Errcode insertSystemLogDevice(int stationId, int deviceId, std::string content, int status); - static Errcode queryAlertLogList(PageInfo& pageInfo, vector& result); + static Errcode queryAlertLogList(const std::string& stationId, PageInfo& pageInfo, vector& result); static Errcode insertAlertLog(Fields& params); static Errcode updateAlertLogById(Fields& params); diff --git a/src/protocol/HttpEntity.cpp b/src/protocol/HttpEntity.cpp index 587f4d8..13a042d 100644 --- a/src/protocol/HttpEntity.cpp +++ b/src/protocol/HttpEntity.cpp @@ -188,6 +188,8 @@ static std::map g_mapHttpHandlerGet = {"/queryStatDetailList", HandlerOptions(&HttpEntity::queryStatDetailList, {})}, {"/queryStatCharts", HandlerOptions(&HttpEntity::queryStatCharts, {})}, {"/exportStatReport", HandlerOptions(&HttpEntity::exportStatReport, {})}, + {"/queryStatStationMode", HandlerOptions(&HttpEntity::queryStatStationMode, {})}, + {"/queryEnvironment", HandlerOptions(&HttpEntity::queryEnvironment, { "station_id"})}, @@ -1225,12 +1227,16 @@ Errcode HttpEntity::queryPolicyByType(const httplib::Request& req, njson& json, Errcode HttpEntity::querySystemLogList(const httplib::Request& req, njson& json, std::string& errmsg) { + Fields params; + GetRequestParams(req, {"station_id"}, params); + PageInfo pageinfo; pageinfo.index = Utils::toInt(req.get_param_value("page")); pageinfo.size = Utils::toInt(req.get_param_value("page_size")); + std::string stationId = params.value("station_id"); std::vector result; - auto err = DAO::querySystemLogList(pageinfo, result); + auto err = DAO::querySystemLogList(stationId, pageinfo, result); HttpHelper::setPagination(pageinfo, result, json); return err; } @@ -1245,12 +1251,16 @@ Errcode HttpEntity::updateSystemLog(const httplib::Request& req, njson& json, st Errcode HttpEntity::queryAlertLogList(const httplib::Request& req, njson& json, std::string& errmsg) { + Fields params; + GetRequestParams(req, {"station_id"}, params); + PageInfo pageinfo; pageinfo.index = Utils::toInt(req.get_param_value("page")); pageinfo.size = Utils::toInt(req.get_param_value("page_size")); + std::string stationId = params.value("station_id"); std::vector result; - auto err = DAO::queryAlertLogList(pageinfo, result); + auto err = DAO::queryAlertLogList(stationId, pageinfo, result); HttpHelper::setPagination(pageinfo, result, json); return err; } @@ -1571,12 +1581,10 @@ Errcode HttpEntity::queryStatDayList(const httplib::Request& req, njson& json, s int64_t t0 = Utils::time(startDate + " 00:00:00"); int64_t t1 = Utils::time(endDate + " 00:00:00"); - int i = 0; njson jsondata = njson::array(); for (int64_t t = t0; t<=t1; t += 86400) { - i++; njson jsonrow; std::string dt = Utils::dateStr(t); Fields* fields = NULL; @@ -1709,6 +1717,115 @@ Errcode HttpEntity::queryStatCharts(const httplib::Request& req, njson& json, st return Errcode::OK; } +Errcode HttpEntity::queryStatStationMode(const httplib::Request& req, njson& json, std::string& errmsg) +{ + Fields params; + GetRequestParams(req, {"station_id", "start_date", "end_date", "mode"}, params); + + std::string stationId = params.value("station_id"); + std::string startDate = params.value("start_date"); + std::string endDate = params.value("end_date"); + std::string mode = params.value("mode"); + + std::string sqlC = std::format(" WHERE dt>='{}' AND dt<='{}'", startDate, endDate); + if (!stationId.empty()) sqlC += std::format(" AND station_id='{}'", stationId); + + std::string sql = " SUM(E_in) E_in, SUM(E_out) E_out, SUM(fee_in) fee_in, SUM(fee_out) fee_out, SUM(income) income FROM stat_total_day"; + std::string sqlGroupBy; + if (mode == "year") { + sql = "SELECT YEAR(dt) AS year, " + sql + sqlC + " GROUP BY YEAR(dt);"; + } else if (mode == "quarter") { + sql = "SELECT YEAR(dt) AS year, QUARTER(dt) quarter, " + sql + sqlC+ " GROUP BY YEAR(dt), QUARTER(dt);"; + } else if (mode == "month") { + sql = "SELECT YEAR(dt) AS year, MONTH(dt) month, " + sql + sqlC + "GROUP BY YEAR(dt), MONTH(dt);"; + } else if (mode == "week") { + sql = "SELECT YEAR(dt) AS year, WEEK(dt) week, " + sql + sqlC + " GROUP BY YEAR(dt), WEEK(dt);"; + } else { + mode = "date"; + sql = "SELECT dt, E_in, E_out, fee_in, fee_out, income FROM stat_total_day " + sqlC + " LIMIT 1000;"; + } + + std::vector result; + Errcode err = DAO::exec(NULL, sql, result); + + njson jsondata = njson::array(); + if (mode == "date") + { + std::map mapTemp; + for (auto& item: result) + { + auto& dt = item.value("dt"); + mapTemp[dt] = &item; + } + + int64_t t0 = Utils::time(startDate + " 00:00:00"); + int64_t t1 = Utils::time(endDate + " 00:00:00"); + + for (int64_t t = t0; t<=t1; t += 86400) + { + njson jsonrow; + std::string dt = Utils::dateStr(t); + Fields* item = NULL; + auto iter = mapTemp.find(dt); + if (iter != mapTemp.end()) { item = iter->second; } + + jsonrow["dt"] = dt; + jsonrow["E_in"] = item ? item->value("E_in") : "0"; + jsonrow["E_out"] = item ? item->value("E_out") : "0"; + jsonrow["fee_in"] = item ? item->value("fee_in") : "0"; + jsonrow["fee_out"] = item ? item->value("fee_out") : "0"; + jsonrow["income"] = item ? item->value("income") : "0"; + int rate = 0; + if (item) { + int E_in = item->get("E_in"); + int E_out = item->get("E_out"); + if (E_in != 0) { + rate = (float(E_out)/float(E_in)) * 100; + } + } + jsonrow["E_rate"] = rate; + jsondata.push_back(jsonrow); + } + } + else + { + for (auto& item: result) + { + njson jsonrow; + if (mode == "year") { + jsonrow["dt"] = item.value("year") + "年"; + } + else if (mode == "quarter") { + jsonrow["dt"] = item.value("year") + "年" + item.value("quarter") + "季度"; + } + else if (mode == "month") { + jsonrow["dt"] = item.value("year") + "年" + item.value("month") + "月"; + } + else if (mode == "week") { + jsonrow["dt"] = item.value("year") + "年" + item.value("week") + "周"; + } + else { + jsonrow["dt"] = item.value("dt"); + } + jsonrow["E_in"] = item.value("E_in"); + jsonrow["E_out"] = item.value("E_out"); + int rate = 0; + int E_in = item.get("E_in"); + int E_out = item.get("E_out"); + if (E_in != 0) { + rate = (float(E_out)/float(E_in)) * 100; + } + jsonrow["E_rate"] = rate; + jsonrow["fee_in"] = item.value("fee_in"); + jsonrow["fee_out"] = item.value("fee_out"); + jsonrow["income"] = item.value("income"); + jsondata.push_back(jsonrow); + } + } + + json["data"] = jsondata; + return Errcode::OK; +} Errcode HttpEntity::exportStatReport(const httplib::Request& req, njson& json, std::string& errmsg) { diff --git a/src/protocol/HttpEntity.h b/src/protocol/HttpEntity.h index f98c279..d9b2b61 100644 --- a/src/protocol/HttpEntity.h +++ b/src/protocol/HttpEntity.h @@ -118,6 +118,9 @@ public: // 场站按类某一天的历史曲线数据 Errcode queryStatCharts(const httplib::Request& req, njson& json, std::string& errmsg); + // 场站按周、月、季度、年统计: 充电量、放电量、 使用率=放电量/充电量、充电费、放电费、收益=放电费-充电费 + Errcode queryStatStationMode(const httplib::Request& req, njson& json, std::string& errmsg); + Errcode exportStatReport(const httplib::Request& req, njson& json, std::string& errmsg); Errcode queryEnvironment(const httplib::Request& req, njson& json, std::string& errmsg); diff --git a/web/src/components/Home/Charge.vue b/web/src/components/Home/Charge.vue index 8975c67..4556a38 100644 --- a/web/src/components/Home/Charge.vue +++ b/web/src/components/Home/Charge.vue @@ -143,7 +143,7 @@ export default { // areaStyle: { // global: false, // color: { - // type: 'linear', x: 0, y: 0,　x2: 0,　y2: 1, + // type: 'linear', x: 0, y: 0, x2: 0, y2: 1, // colorStops: [ // { offset: 0, color: JSON.parse(JSON.stringify(item)).colorStart }, // 顶部颜色 // { offset: 1, color: JSON.parse(JSON.stringify(item)).colorEnd } // 底部颜色 diff --git a/web/src/components/Home/Modal.vue b/web/src/components/Home/Modal.vue index 06c697c..293bfba 100644 --- a/web/src/components/Home/Modal.vue +++ b/web/src/components/Home/Modal.vue @@ -69,7 +69,7 @@ export default { { title: '场站信息', class: '', componentId: markRaw( PrefabCabin), infoKey: 'prefab' }, { title: '储能运行信息', class: 'operation-status', componentId: markRaw(OperationalInfo), infoKey: 'storage' }, { title: '充电运行信息', class: 'operation-status', componentId: markRaw(OperationalInfo), infoKey: 'charge' }, - { title: '光伏运行信息', class: 'operation-status', componentId: markRaw(OperationalInfo), infoKey: 'pv' }, + // { title: '光伏运行信息', class: 'operation-status', componentId: markRaw(OperationalInfo), infoKey: 'pv' }, { title: '电网侧运行信息', class: 'operation-status', componentId: markRaw(OperationalInfo), infoKey: 'grid' }, { title: '环境信息', class: 'envInfo', componentId:markRaw( EnvInfo), infoKey: 'envTotal' } ], diff --git a/web/src/components/Home/Modal/PrefabCabin.vue b/web/src/components/Home/Modal/PrefabCabin.vue index ab50655..2fc97ea 100644 --- a/web/src/components/Home/Modal/PrefabCabin.vue +++ b/web/src/components/Home/Modal/PrefabCabin.vue @@ -64,14 +64,15 @@ export default { ], myItemsStats: [ { key: 'storage_device_num', value: '', label: '储能设备数量', d: '个' }, - { key: 'solar_device_num', value: '', label: '光伏设备数量', d: '个' }, - { key: 'charge_device_num', value: '', label: '充电设备数量', d: '个' }, - { key: 'solar_elect_grid', value: '', label: '上网总电量', d: 'kWh' }, + // { key: 'solar_device_num', value: '', label: '光伏设备数量', d: '个' }, + { key: 'storage_elect_in', value: '', label: '储能充电总电量', d: 'kWh' }, - { key: 'solar_elect_gen', value: '', label: '光伏发电总电量', d: 'kWh' }, - { key: 'charge_elect', value: '', label: '充电桩充电总电量', d: 'kWh' }, - { key: 'income_elect', value: '', label: '收益总金额', d: '元' }, { key: 'storage_elect_out', value: '', label: '储能放电总电量', d: 'kWh' }, + // { key: 'solar_elect_gen', value: '', label: '光伏发电总电量', d: 'kWh' }, + { key: 'charge_device_num', value: '', label: '充电设备数量', d: '个' }, + { key: 'charge_elect', value: '', label: '充电桩充电总电量', d: 'kWh' }, + // { key: 'solar_elect_grid', value: '', label: '上网总电量', d: 'kWh' }, + { key: 'income_elect', value: '', label: '收益总金额', d: '元' }, ], list: [ { diff --git a/web/src/components/Home/Modal/StationPower.vue b/web/src/components/Home/Modal/StationPower.vue index fa16a68..f86c5af 100644 --- a/web/src/components/Home/Modal/StationPower.vue +++ b/web/src/components/Home/Modal/StationPower.vue @@ -136,8 +136,8 @@ export default { smooth: true, type: 'line', barWidth: 10, - itemStyle: { borderRadius: 10, color: item.lineColor　}, - emphasis: {　focus: 'series'　}, + itemStyle: {borderRadius: 10, color: item.lineColor}, + emphasis: {focus: 'series'}, global: false, showSymbol: false, data: [] diff --git a/web/src/components/Home/Modal/StationVoltage.vue b/web/src/components/Home/Modal/StationVoltage.vue index ce4ed09..d2d1499 100644 --- a/web/src/components/Home/Modal/StationVoltage.vue +++ b/web/src/components/Home/Modal/StationVoltage.vue @@ -123,8 +123,8 @@ export default { smooth: true, type: 'line', barWidth: 10, - itemStyle: { borderRadius: 10, color: item.lineColor　}, - emphasis: {　focus: 'series'　}, + itemStyle: {borderRadius: 10, color: item.lineColor}, + emphasis: {focus: 'series'}, global: false, showSymbol: false, data: [] diff --git a/web/src/components/Home/MyChartBar.vue b/web/src/components/Home/MyChartBar.vue index 73df136..6061d6c 100644 --- a/web/src/components/Home/MyChartBar.vue +++ b/web/src/components/Home/MyChartBar.vue @@ -1,5 +1,5 @@ + + + + diff --git a/web/src/components/Home/TotalStation.vue b/web/src/components/Home/TotalStation.vue index da1ba0c..1af1f96 100644 --- a/web/src/components/Home/TotalStation.vue +++ b/web/src/components/Home/TotalStation.vue @@ -2,8 +2,8 @@
- {{ item.label }} -
+ {{ item.label }} +
{{ item.value ? item.value : (item.d ? 0 : '--') }} {{ item.d }}
@@ -53,18 +53,10 @@ export default { return { myItems: [ { color:'#a0f0a0', key: 'runDays', value: 0, label:'场站运行天数', d:'天'}, - // { color:'#a0f0a0', key: 'storage_device_num', value: 0, label:'储能设备数量', d:'个'}, - // { color:'#a0f0a0', key: 'charge_device_num', value: 0, label:'充电设备数量', d:'个'}, - // { color:'#a0f0a0', key: 'solar_device_num', value: 0, label:'光伏设备数量', d:'个'}, - // { color:'#a0f0a0', key: 'solar_elect_grid', value: 0, label:'上网总电量', d:'kWh'}, { color:'#a0f0a0', key: 'storage_elect_in', value: 0, label:'累计储能总电量', d:'kWh'}, - // { color:'#a0f0a0', key: 'charge_elect_out', value: 0, label:'充电桩充电总电量', d:'kWh'}, - // { color:'#a0f0a0', key: 'solar_elect_gen', value: 0, label:'光伏发电总电量', d:'kWh'}, { color:'#a0f0a0', key: 'income_elect', value: 0, label:'累计收益总金额', d:'元'}, - // { color:'#a0f0a0', key: 'storage_elect_out', value: 0, label:'储能放电总电量', d:'kWh'}, { color:'#a0f0a0', key: 'storage_status', value: '空闲', label:'储能状态'}, { color:'#a0f0a0', key: 'charge_status', value: '空闲', label:'充电状态'}, - { color:'#a0f0a0', key: 'pv_status', value: '离线', label:'光伏状态'}, ], } }, diff --git a/web/src/components/Home/onLine.vue b/web/src/components/Home/onLine.vue index fa9c89e..85f6731 100644 --- a/web/src/components/Home/onLine.vue +++ b/web/src/components/Home/onLine.vue @@ -2,7 +2,7 @@
- {{ item.label }} + {{ item.label }}
{{ item.value ? item.value : 0 }} {{ item.d }} @@ -55,11 +55,11 @@ export default { { key: 'runDays', value: 0, label:'系统运行天数', d:'天'}, { key: 'storage_device_num', value: 0, label:'储能设备数量', d:'个'}, { key: 'charge_device_num', value: 0, label:'充电设备数量', d:'个'}, - { key: 'solar_device_num', value: 0, label:'光伏设备数量', d:'个'}, + // { key: 'solar_device_num', value: 0, label:'光伏设备数量', d:'个'}, { key: 'solar_elect_grid', value: 0, label:'上网总电量', d:'kWh'}, { key: 'storage_elect_in', value: 0, label:'储能充电总电量', d:'kWh'}, { key: 'charge_elect_out', value: 0, label:'充电桩充电总电量', d:'kWh'}, - { key: 'solar_elect_gen', value: 0, label:'光伏发电总电量', d:'kWh'}, + // { key: 'solar_elect_gen', value: 0, label:'光伏发电总电量', d:'kWh'}, { key: 'income_elect', value: 0, label:'累计收益总金额', d:'元'}, { key: 'storage_elect_out', value: 0, label:'储能放电总电量', d:'kWh'}, ], @@ -182,7 +182,7 @@ export default { justify-content: flex-start; height: 100%; .item { - width: calc(25% - 6px); + width: calc(33% - 6px); margin-left: 3px; margin-right: 3px; margin-top: 8px; diff --git a/web/src/components/SearchBox.vue b/web/src/components/SearchBox.vue index a94fa3e..af05518 100644 --- a/web/src/components/SearchBox.vue +++ b/web/src/components/SearchBox.vue @@ -35,8 +35,12 @@
- - +
@@ -91,10 +95,21 @@ @@ -191,6 +272,7 @@ input:-internal-autofill-selected { :deep(.anticon) { color: var(--theme-text-default) !important; } + .search { // height:70px; color: #fff; @@ -259,7 +341,11 @@ input:-internal-autofill-selected { } .label { - width: 80px; + // width: 65px; + flex: 1; /* 占满剩余空间 */ + text-align: right; /* 文字右对齐 */ + white-space: nowrap; /* 防止换行 */ + margin-right: 10px; /* 右侧间隔10px */ color: var(--theme-text-default); } .top-right, @@ -338,4 +424,44 @@ input:-internal-autofill-selected { } } } + + + +// :deep(.ant-picker-cell-inner) { +// width: 75px !important; +// } + +// /* 深度穿透修改季度/月份/日期面板里面的宽度 */ +// :deep(.ant-picker-dropdown .ant-picker-cell-inner) { +// width: 100px !important; /* 你想要的宽度 */ +// } +/* 方法1：匹配任意hash类名 */ +// :deep(.ant-picker-dropdown .ant-picker-quarter-panel .ant-picker-cell-inner) { +// width: 100px !important; +// min-width: 100px !important; +// } + +// /* 方法2：如果上面不生效,提高特异性 */ +// :deep(.ant-picker-dropdown div.ant-picker-quarter-panel .ant-picker-cell-inner) { +// width: 100px !important; +// min-width: 100px !important; +// } + +// /* 方法3：双重类名提高权重 */ +// :deep(.ant-picker-dropdown .ant-picker-quarter-panel .ant-picker-cell.ant-picker-cell-inner) { +// width: 100px !important; +// min-width: 100px !important; +// } +// /* 放到全局样式文件(如 global.css 或 App.vue 中不加 scoped) */ +// .ant-picker-dropdown .ant-picker-quarter-panel .ant-picker-cell-inner { +// width: 100px !important; +// min-width: 100px !important; +// } + +/* 或者使用 :global 逃逸 scoped */ +:global(.ant-picker-dropdown .ant-picker-quarter-panel .ant-picker-cell-inner) { + width: 50px !important; + min-width: 50px !important; +} + diff --git a/web/src/components/monitor/videos.vue b/web/src/components/monitor/videos.vue index 7e03502..9cec27f 100644 --- a/web/src/components/monitor/videos.vue +++ b/web/src/components/monitor/videos.vue @@ -152,10 +152,10 @@ export default { key: 'fire40', name: '消防信息' }, - { - key: 'airc', - name: '空调信息' - }, + // { + // key: 'airc', + // name: '空调信息' + // }, ], tableDatas: {}, @@ -270,7 +270,7 @@ export default { height: 100%; display: flex; .env-item { - width: 24%; + width: 30%; .tab { &>span { diff --git a/web/src/components/system/policyForm.vue b/web/src/components/system/policyForm.vue index ea253a2..4129ac1 100644 --- a/web/src/components/system/policyForm.vue +++ b/web/src/components/system/policyForm.vue @@ -460,14 +460,14 @@ export default { } newForm.value = JSON.stringify(data) delete newForm.period5 - } else if (type == 7) { // 功率平衡 + } else if (type == 7) { // 功率平衡 const data = { charge: charge.toFixed(2), discharge: discharge.toFixed(2) } newForm.value = JSON.stringify(data) delete newForm.period5 - } else if (type == 8) { // 光伏优先消纳 + } else if (type == 8) { // 光伏优先消纳 const data = { charge: charge.toFixed(0), discharge: discharge.toFixed(0), @@ -476,12 +476,12 @@ export default { newForm.value = JSON.stringify(data) delete newForm.period5 } else if (type == 9) { // 离网运行 - const data = { - charge: charge.toFixed(0), - discharge: discharge.toFixed(0) - } - newForm.value = JSON.stringify(data) - delete newForm.period5 + const data = { + charge: charge.toFixed(0), + discharge: discharge.toFixed(0) + } + newForm.value = JSON.stringify(data) + delete newForm.period5 } delete newForm.price this.validateform(newForm) diff --git a/web/src/utils/config.js b/web/src/utils/config.js index 79ecbbc..684957d 100644 --- a/web/src/utils/config.js +++ b/web/src/utils/config.js @@ -6,7 +6,7 @@ export const policyTypes = [ { value: '5', - label: '自定时段' + label: '运营支撑' } // { // value: '2', diff --git a/web/src/views/monitor.vue b/web/src/views/monitor.vue index b3f56e4..df0fadf 100644 --- a/web/src/views/monitor.vue +++ b/web/src/views/monitor.vue @@ -154,16 +154,16 @@ export default { // { v: '数量', key: 'num' } ] }, - { - name: '光伏设备', - power: 60, - num: 62, - systemType: 3, - titles: [ - //{ v: '总功率', key: 'power', sufix: 'kW' }, - // { v: '数量', key: 'num' } - ] - }, + // { + // name: '光伏设备', + // power: 60, + // num: 62, + // systemType: 3, + // titles: [ + // //{ v: '总功率', key: 'power', sufix: 'kW' }, + // // { v: '数量', key: 'num' } + // ] + // }, { name: '辅助设备', power: 60, diff --git a/web/src/views/statisticalAnalysis.vue b/web/src/views/statisticalAnalysis.vue index f2fbc66..22a06d7 100644 --- a/web/src/views/statisticalAnalysis.vue +++ b/web/src/views/statisticalAnalysis.vue @@ -12,9 +12,21 @@ {{ item.name }}
+ +
+ + 天 + 周 + 月 + 季度 + 年 + +
+
+
+ + + + + + + +
+