diff --git a/components.d.ts b/components.d.ts
index 598e7c7..c3392c9 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,8 +7,16 @@ export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
+ ElButton: typeof import('element-plus/es')['ElButton']
+ ElCarousel: typeof import('element-plus/es')['ElCarousel']
+ ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+ ElForm: typeof import('element-plus/es')['ElForm']
+ ElFormItem: typeof import('element-plus/es')['ElFormItem']
+ ElInput: typeof import('element-plus/es')['ElInput']
ElPopover: typeof import('element-plus/es')['ElPopover']
+ ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+ ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
}
diff --git a/dist.zip b/dist.zip
index 273e540..6259e07 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/views/pages/CapacityAdjustmentPage/index.vue b/src/views/pages/CapacityAdjustmentPage/index.vue
index 43dde37..fb741f4 100644
--- a/src/views/pages/CapacityAdjustmentPage/index.vue
+++ b/src/views/pages/CapacityAdjustmentPage/index.vue
@@ -95,7 +95,7 @@
-
可调资源
+
-
+
{{
scope.row.name
@@ -177,7 +177,8 @@
-
可调资源
+
+
{
let treeNodeKey = ref(""); //点击设备树二级服务获取的台区id去获取台区负载率
// 设备树传来的设备树节点id treeNode是节点数据
const getTreeKey = (treeNode: any) => {
+ rateDate_willFlag.value=false
treeNodeKey.value = treeNode.key; //线路的id
- boxbtnFlag.value="1"//默认显示全量
+ boxbtnFlag.value = "1"; //默认显示全量
allFlag.value = false;
if (treeNode.level === 3) {
console.log(treeNode.level, "3");
getAllSourceAjust_Line(treeNode.key);
getRateDate(treeNode.key); //获取负载率 点击设备树二级服务获取的台区id去获取台区负载率
- } else if(treeNode.level === 4) {
+ } else if (treeNode.level === 4) {
console.log(treeNode.level, "4"); //台区
getTreeSourceList(treeNode.key); //可调资源 先从设备树获取到id 再调用二级服务去获取可调资源列表
// treeAreaId = treeNode.key; //台区的id
@@ -552,26 +554,14 @@ let boxbtnFlag = ref("1");
let box_btn = reactive([
{
id: "1",
- name: "全量",
+ name: "全量资源",
},
{
id: "2",
- name: "可调",
+ name: "可调资源",
},
]);
-const changeSourceInfo = (val: string) => {
- boxbtnFlag.value = val;
- if (val === "1") {
- // 全景的资源信息
- console.log(tablepvData,'11111');
-
- // tablepvData=
- } else {
- // 可调资源的信息
- console.log(tablepvData,'222222');
- }
-};
// 可调资源数量以及是否可调 功能---
let pht = ref(0); //光伏
let cdz = ref(0); //充电桩
@@ -603,11 +593,11 @@ const handelSourceTable = (sourceAjustObj: any) => {
// 将获取的数据赋值给表格 tablepvData总的表格数据
console.log(sourceAjustObj, "sourceAjustObj");
- tablepvData.value = [];
+ tableInfo.tablepvData = [];
for (let i in sourceAjustObj) {
for (let j in sourceAjustObj[i]) {
sourceAjustObj[i][j].type = i;
- tablepvData.value.push(sourceAjustObj[i][j]);
+ tableInfo.tablepvData.push(sourceAjustObj[i][j]);
}
}
};
@@ -622,9 +612,9 @@ let sourceLArr = reactive([
const handelSource = (type: string) => {
// 根据type类型获取表格数据
- tablepvData.value = [];
+ tableInfo.tablepvData = [];
for (let i in sourceAjustObj[type]) {
- tablepvData.value.push(sourceAjustObj[type][i]);
+ tableInfo.tablepvData.push(sourceAjustObj[type][i]);
}
};
// 可调资源数量以及是否可调 功能---
@@ -718,6 +708,7 @@ let send_Status = ref(false); //发送中。。的状态
let btn_sendFlag = ref(false); //发送按钮的状态
const haneleprogress = () => {
+
send_Status.value = true; //显示 div 为发送中
if (btn_sendFlag.value === false) return; //根据flag变为禁用点击功能
@@ -776,28 +767,60 @@ interface TablepvDate {
index?: number;
name: string;
}
-let tablepvData = ref([
- // {
- // index: 1,
- // name: "**光伏",
- // },
- // {
- // index: 2,
- // name: "**储能",
- // },
- // {
- // index: 3,
- // name: "**充电桩",
- // },
- // {
- // index: 4,
- // name: "**储能",
- // },
- // {
- // index: 5,
- // name: "**充电桩",
- // },
-]);
+interface TableInfo {
+ tablepvData: TablepvDate[];
+ newTable_pvDate: TablepvDate[];
+}
+let tableInfo = reactive({
+ tablepvData: [],
+ newTable_pvDate: [],
+});
+let arrchang_all = []; //保存全部的
+arrchang_all = newAjustTableData;
+// let arrchang = []; //保存筛选的
+// arrchang = tableInfo.tablepvData;
+// arrchang_all = tableInfo.tablepvData;
+
+const changeSourceInfo = (val: string) => {
+ boxbtnFlag.value = val;
+
+ if (val === "1") {
+ // 全景的资源信息
+ getTreeSourceList(treeNodeKey.value);
+
+ // tablepvData=
+ } else {
+ // 可调资源的信息
+ // console.log(tableInfo.tablepvData, "222222");
+ // arrchang =
+ // let newArr = []
+ tableInfo.tablepvData = tableInfo.tablepvData.filter(
+ (item) => item?.regulable === "true"
+ );
+ }
+};
+// let tablepvData = reactive([
+// // {
+// // index: 1,
+// // name: "**光伏",
+// // },
+// // {
+// // index: 2,
+// // name: "**储能",
+// // },
+// // {
+// // index: 3,
+// // name: "**充电桩",
+// // },
+// // {
+// // index: 4,
+// // name: "**储能",
+// // },
+// // {
+// // index: 5,
+// // name: "**充电桩",
+// // },
+// ]);
// 右 -能量调节
let progressContentFlag = ref(false);
@@ -943,9 +966,9 @@ let adjustTableData = reactive([
// 点击策略配置
let handleClickPC = () => {
adjustFlag.value = true;
- console.log(tablepvData.value, "tablepvData");
+ console.log(tableInfo.tablepvData, "tablepvData");
adjustTableData = [];
- tablepvData.value.forEach((item: any) => {
+ tableInfo.tablepvData.forEach((item: any) => {
let typeStr = "";
if (item.type === "photoVoltaicUnit") {
typeStr = "光伏";
@@ -1445,7 +1468,7 @@ const styleVar = computed(() => {
.btn_box {
margin-left: 2%;
font-size: changeHeight(40);
- width: changeHeight(140);
+ width: changeHeight(220);
height: changeHeight(60);
line-height: changeHeight(60);
cursor: pointer;