diff --git a/components.d.ts b/components.d.ts index c1f3f48..7a96923 100644 --- a/components.d.ts +++ b/components.d.ts @@ -28,7 +28,6 @@ declare module 'vue' { ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] 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 new file mode 100644 index 0000000..273e540 Binary files /dev/null and b/dist.zip differ diff --git a/src/views/pages/CapacityAdjustmentPage/index.vue b/src/views/pages/CapacityAdjustmentPage/index.vue index ee03cde..43dde37 100644 --- a/src/views/pages/CapacityAdjustmentPage/index.vue +++ b/src/views/pages/CapacityAdjustmentPage/index.vue @@ -68,7 +68,19 @@
-
可调资源
+
+ 可调资源 + +
@@ -82,7 +94,19 @@
-
可调资源
+
+ 可调资源 +
+ {{ item.name }} +
+
@@ -150,11 +174,21 @@
-
-
+
-
可调资源
+
可调资源 +
+ {{ item.name }} +
+
@@ -289,8 +323,6 @@
已下发指令
- -
{ // console.log(result, "负载率"); getAllSourceAjust(); //可调资源 }); + let allFlag = ref(true); //全部接口才触发 let allSource = ref([]); // 统计获取可调资源信息 参数只有orgID @@ -499,12 +532,13 @@ let treeNodeKey = ref(""); //点击设备树二级服务获取的台区id去获 // 设备树传来的设备树节点id treeNode是节点数据 const getTreeKey = (treeNode: any) => { treeNodeKey.value = treeNode.key; //线路的id + boxbtnFlag.value="1"//默认显示全量 allFlag.value = false; if (treeNode.level === 3) { console.log(treeNode.level, "3"); getAllSourceAjust_Line(treeNode.key); getRateDate(treeNode.key); //获取负载率 点击设备树二级服务获取的台区id去获取台区负载率 - } else { + } else if(treeNode.level === 4) { console.log(treeNode.level, "4"); //台区 getTreeSourceList(treeNode.key); //可调资源 先从设备树获取到id 再调用二级服务去获取可调资源列表 // treeAreaId = treeNode.key; //台区的id @@ -513,6 +547,31 @@ const getTreeKey = (treeNode: any) => { // console.log(treeAreaId,'treeAreaId----------------------'); }; +// 切换可调资源 切换全景和可调资源的信息 +let boxbtnFlag = ref("1"); +let box_btn = reactive([ + { + id: "1", + name: "全量", + }, + { + id: "2", + 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); //充电桩 @@ -1383,6 +1442,25 @@ const styleVar = computed(() => { margin-left: 7%; font-size: changeHeight(40); } + .btn_box { + margin-left: 2%; + font-size: changeHeight(40); + width: changeHeight(140); + height: changeHeight(60); + line-height: changeHeight(60); + cursor: pointer; + // border: 1px solid red; + } + .btns_ac { + background: url("@/assets/images/btnType/tabdate_active.png") + no-repeat; + background-size: 100% 100%; + } + .btns_de { + background: url("@/assets/images/btnType/tabdate_default.png") + no-repeat; + background-size: 100% 100%; + } } // 短线 .infotitle_box { diff --git a/src/views/pages/CapacityAdjustmentPage/rateLine.vue b/src/views/pages/CapacityAdjustmentPage/rateLine.vue index abd664e..bca50ba 100644 --- a/src/views/pages/CapacityAdjustmentPage/rateLine.vue +++ b/src/views/pages/CapacityAdjustmentPage/rateLine.vue @@ -23,7 +23,7 @@ const props = defineProps<{ keysv?: Number; }>(); onMounted(() => { - console.log(props.rateDate, props.keysv, "负载率曲线"); + // console.log(props.rateDate, props.keysv, "负载率曲线"); drawOneLine(props.rateDate); nextTick(()=>{ @@ -41,7 +41,7 @@ const { proxy }: any = getCurrentInstance(); const drawOneLine = (rateArr: RateDateInfo[]) => { let myChart = proxy.$echarts.init(OneLine.value); - console.log(rateArr, "echarts中的负载率数组"); + // console.log(rateArr, "echarts中的负载率数组"); myChart.clear(); const option = { diff --git a/src/views/pages/CapacityAdjustmentPage/rateLine_will.vue b/src/views/pages/CapacityAdjustmentPage/rateLine_will.vue index 075de94..0ebd6ab 100644 --- a/src/views/pages/CapacityAdjustmentPage/rateLine_will.vue +++ b/src/views/pages/CapacityAdjustmentPage/rateLine_will.vue @@ -23,7 +23,7 @@ const props = defineProps<{ keysv?: Number; }>(); onMounted(() => { - console.log(props.rateDate, props.keysv, "负载率曲线"); + // console.log(props.rateDate, props.keysv, "负载率曲线"); drawOneLine(props.rateDate); nextTick(()=>{ @@ -41,7 +41,7 @@ const { proxy }: any = getCurrentInstance(); const drawOneLine = (rateArr: RateDateInfo[]) => { let myChart = proxy.$echarts.init(OneLine.value); - console.log(rateArr, "echarts中的负载率数组"); + // console.log(rateArr, "echarts中的负载率数组"); myChart.clear(); const option = {