zhaoqiang
/
v3tianjin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhaoqiang:08bf900d6b91dcc32b58fbeedae759d3817e00f7
Branches Tags
zhaoqiang:master
...
compare: zhaoqiang:8143fc29fc807ec7dc64eb526e02141ef658e13f
Branches Tags
zhaoqiang:master

2 Commits
08bf900d6b ... 8143fc29fc

Author SHA1 Message Date
“yu” 8143fc29fc Merge branch 'master' of http://58.87.70.254/zhaoqiang/v3tianjin 2024-07-17 20:57:11 +08:00
“yu” d081ab1486 aa 2024-07-17 20:57:09 +08:00
5 changed files with 90 additions and 13 deletions
Show Stats Expand all files Collapse all files

1
components.d.ts vendored
View File

@ -23,7 +23,6 @@ declare module 'vue' {
ElSelect: typeof import('element-plus/es')['ElSelect']
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']

BIN
dist.zip Normal file
View File

Binary file not shown.

94
src/views/pages/CapacityAdjustmentPage/index.vue
View File

@ -68,7 +68,19 @@
</div>
</div>
<div class="capAjust_box content_bg" v-if="allFlag">
<div class="infotitle"><span>可调资源</span></div>
<div class="infotitle">
<span>可调资源</span>
<!-- <div
:class="[
boxbtnFlag === item.id ? 'btns_ac' : 'btns_de',
'btn_box',
]"
v-for="item in box_btn"
@click="changeSourceInfo(item.id)"
>
{{ item.name }}
</div> -->
</div>
<div class="info1">
<div class="source_type">
<div class="box source_active" v-for="item in sourceLArr">
@ -82,7 +94,19 @@
</div>
</div>
<div class="capAjust_box content_bg" v-else>
<div class="infotitle"><span>可调资源</span></div>
<div class="infotitle">
<span>可调资源</span>
<div
:class="[
boxbtnFlag === item.id ? 'btns_ac' : 'btns_de',
'btn_box',
]"
v-for="item in box_btn"
@click="changeSourceInfo(item.id)"
>
{{ item.name }}
</div>
</div>
<div class="info1">
<div class="source_type">
<div class="box source_active" v-for="item in sourceLArr">
@ -150,11 +174,21 @@
</div>
</div>
</div>
<div class="info3">
</div>
<div class="info3"></div>
</div>
<div class="capAjust_box content_bg" v-else>
<div class="infotitle"><span>可调资源</span></div>
<div class="infotitle"><span>可调资源</span>
<div
:class="[
boxbtnFlag === item.id ? 'btns_ac' : 'btns_de',
'btn_box',
]"
v-for="item in box_btn"
@click="changeSourceInfo(item.id)"
>
{{ item.name }}
</div>
</div>
<div class="info1">
<div class="source_type">
<div class="box source_active" v-for="item in sourceLArr">
@ -289,8 +323,6 @@
</div>
</div>
<div class="infotitle"><span>已下发指令</span></div>
<!-- <div ><span>已下发指令</span></div> -->
<div class="progress_info2">
<el-carousel trigger="click" arrow="never">
<el-carousel-item
@ -462,6 +494,7 @@ onMounted(() => {
// 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 {

4
src/views/pages/CapacityAdjustmentPage/rateLine.vue
View File

@ -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 = {

4
src/views/pages/CapacityAdjustmentPage/rateLine_will.vue
View File

@ -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 = {