diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 2b21263..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/api/carPage/index.ts b/src/api/carPage/index.ts index f18e4f8..e694372 100644 --- a/src/api/carPage/index.ts +++ b/src/api/carPage/index.ts @@ -29,5 +29,14 @@ export function running_api(data: any) { } +// 车网的能量调节指令接口 +export function ajustInfo_api(data: any) { + return request({ + url: "/api_car/wwpm/ev-data/v1/ctrl/command", + method: "POST", + data, + }); +} + diff --git a/src/views/pages/carPage/index.vue b/src/views/pages/carPage/index.vue index b3c3b72..7eb9a12 100644 --- a/src/views/pages/carPage/index.vue +++ b/src/views/pages/carPage/index.vue @@ -112,7 +112,12 @@
充电桩运行状态 -
能量调节
+
+ 能量调节 +
@@ -326,13 +331,13 @@ >
-
+ - +
- 能量调节 -
+ 能量调节 +
@@ -361,7 +367,7 @@ - + @@ -384,11 +390,20 @@ - - + --> + @@ -406,22 +421,23 @@ - - - - + 下发指令 + @@ -452,10 +468,12 @@ import load_c_echart from "./load_c_echart.vue"; import load_info_echart from "./load_info_echart.vue"; import cdz_echart from "./cdz_echart.vue"; import carTree from "@/views/commonPage/carTree.vue"; + import { powerCurve_api, transformerOverloadCount_api, running_api, + ajustInfo_api, } from "@/api/carPage/index"; import { handleEchartsData, @@ -496,6 +514,7 @@ const send3D = () => { console.log("SelectChargingstation,显示全部的变电站"); }); }; + // 设备树传的数据 let currentData = reactive({}); let currentLevel = ref({}); @@ -517,6 +536,12 @@ const getTreeKey = (treeKey: any) => { // 获取充电桩列表 getRunning_api(); } + // 控制调节按钮的可用不可用 + if (currentData.type === "station") { + btndownFlag.value = true; + } else { + btndownFlag.value = false; + } }; // 车网互动专题切换栏 @@ -643,6 +668,7 @@ let getPowerCurve_api = () => { // 空的 请求全部 } else if (currentData.type === "station") { // 站 + setData.stationId = currentData.id; } else if (currentData.type === "dewellerpipe" && currentLevel.value === 6) { // 桩用户充电桩 @@ -660,7 +686,7 @@ let getPowerCurve_api = () => { item.measValue = item.p; }); - let result = handleEchartsData(res.data, 60); + let result = handleEchartsData(res.data, 15); carRightData.echartsData = result; }); } else { @@ -670,7 +696,7 @@ let getPowerCurve_api = () => { item.datetime = item.dateTime; }); - let result = handleEchartsData(res.data, 60); + let result = handleEchartsData(res.data, 15); carRightData.echartsData = result; }); @@ -721,13 +747,49 @@ let formData = ref({ end_date: "", end_time: "", }); +// let newcarAjustDate = reactive([]); +// newcarAjustDate.push(formData); +const handledata_time = (data_s: any, time_s: any) => { + const date = new Date(data_s); + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, "0"); + const day = String(date.getDate()).padStart(2, "0"); + const formattedDate = `${year}-${month}-${day}`; + return `${formattedDate} ${time_s}`; +}; const submitForm = () => { console.log(formData, "1--------------formData"); + // let dataNew + let datat_start = handledata_time( + formData.value.start_date, + formData.value.start_time + ); + let datat_end = handledata_time( + formData.value.end_date, + formData.value.end_time + ); + // console.log(datat_start,datat_end,"3---------"); + let datainput = { + chargingStationID: currentData.id, + type: parseInt(formData.value.type), + isForce: parseInt(formData.value.whether), + targetValue: parseInt(formData.value.number), + startTime: datat_start, + endTime: datat_end, + }; + + ajustInfo_api(datainput).then((res: any) => { + console.log(res, "1-------car"); + }); }; + //进入调节 -let ajustCarPageFlag = ref(true); +let ajustCarPageFlag = ref(false); +let btndownFlag = ref(false); const ajustCarPage = () => { - ajustCarPageFlag.value = true; + if (currentData.type === "station") { + ajustCarPageFlag.value = true; + } }; // 根据不同的屏幕宽度换算字体大小 @@ -871,6 +933,10 @@ const styleVar = computed(() => { background: url("@/assets/images/btnType/send_btn.png") no-repeat; background-size: 100% 100%; } + .no_click { + color: #ccc; + cursor: not-allowed; + } } .infotitle_short { width: 100%; @@ -1910,7 +1976,7 @@ const styleVar = computed(() => { align-items: center; img { - height: changeHeight(45); + height: changeHeight(55); margin-right: changeHeight(14); } @@ -1942,9 +2008,7 @@ const styleVar = computed(() => { margin-top: 3%; width: 95%; height: 100%; - border: 1px solid pink; :deep(.el-form) { - border: 1px solid red; height: 100%; // label标签 .el-form-item__label { @@ -1963,20 +2027,54 @@ const styleVar = computed(() => { width: changeHeight(300) !important; height: changeHeight(80) !important; } + .el-select__wrapper { + width: changeHeight(350) !important; + height: changeHeight(80) !important; + padding-top: 1%; + background: transparent !important; + } + // .el-select, .el-input__inner { color: #fff !important; + height: changeHeight(50) !important; + line-height: changeHeight(50) !important; + } .el-select__placeholder { color: #fff !important; + height: changeHeight(50) !important; + line-height: changeHeight(50) !important; + font-size: changeHeight(35) !important; + } + .el-radio__label { color: #fff !important; + font-size: changeHeight(35) !important; } + .el-select__popper { + width: changeHeight(500) !important; + height: changeHeight(200) !important; + line-height: changeHeight(200) !important; + + font-size: changeHeight(35) !important; + + } + .el-select-dropdown__list { + width: changeHeight(500) !important; + height: changeHeight(200) !important; + } + // .el-select__selected-item .el-select__placeholder,.el-select__selected-item .el-select__placeholder.is-transparent{ + // height: changeHeight(80) !important; + + // } // 按钮 .el-button { width: changeHeight(250); height: changeHeight(80); + font-size: changeHeight(35) !important; + background-color: transparent !important; } .el-button:nth-child(1) { background-color: transparent !important; @@ -1984,12 +2082,16 @@ const styleVar = computed(() => { } .el-button:nth-child(2) { margin-top: 2%; - margin-left: changeHeight(180); + margin-left: 34%; + width: changeHeight(250); + height: changeHeight(80); + background: url("@/assets/images/btnType/send_btn.png") no-repeat; + background-size: 100% 100%; } // 没一行 .el-form-item { height: changeHeight(80) !important; - margin-bottom: changeHeight(50) !important; + margin-bottom: changeHeight(30) !important; } } } diff --git a/vite.config.ts b/vite.config.ts index 27b7985..d525c42 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -101,7 +101,7 @@ export default defineConfig({ // only https secure: false, }, - "/api/api-svg": { + "/api-svg": { // target: "http://192.168.18.106:8080", target: "http://127.0.0.1:19081", // 天津地址 @@ -112,6 +112,17 @@ export default defineConfig({ // only https secure: false, }, + "/api_car": { + // target: "http://192.168.18.106:8080", + target: "http://127.0.0.1:16091", + // 天津地址 + // target:"http://192.168.5.102:18801", + changeOrigin: true, + ws: true, + rewrite: (path: string) => path.replace(new RegExp(`^/api-svg`), ""), + // only https + secure: false, + }, // "/ba-api": { // // target: "http://localhost:8080", // // 桐乡地址