i

components.d.ts

@@ -7,12 +7,23 @@ 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']
+    ElCol: typeof import('element-plus/es')['ElCol']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElForm: typeof import('element-plus/es')['ElForm']
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElInput: typeof import('element-plus/es')['ElInput']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     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']
   }

src/views/commonPage/3DPie.vue

@@ -161,7 +161,7 @@ let handelColumnEcharts = () => {
           itemGap: props.threeDPieData.legend.itemGap,
         show: false, //工具栏不展示
         tooltip: {
-          show: true,
+          show: false,
         },
         icon: "rect",
         itemHeight: 10,

src/views/pages/CapacityAdjustmentPage/index.vue

@@ -530,10 +530,12 @@ const getAllSourceAjust_Line = (mrid: string) => {
 };
 
 let treeNodeKey = ref(""); //点击设备树二级服务获取的台区id去获取台区负载率
+let treeNodes = ref("");
 // 设备树传来的设备树节点id treeNode是节点数据
 const getTreeKey = (treeNode: any) => {
-  rateDate_willFlag.value=false
+  rateDate_willFlag.value = false;
   treeNodeKey.value = treeNode.key; //线路的id
+  treeNodes.value = treeNode;
   boxbtnFlag.value = "1"; //默认显示全量
   allFlag.value = false;
   if (treeNode.level === 3) {
@@ -708,54 +710,62 @@ let send_Status = ref(false); //发送中。。的状态
 let btn_sendFlag = ref(false); //发送按钮的状态
 
 const haneleprogress = () => {
- 
   send_Status.value = true; //显示 div 为发送中
   if (btn_sendFlag.value === false) return; //根据flag变为禁用点击功能
 
   btn_sendFlag.value = false; //按钮重新进入禁用状态
   // -------离线
-  let res = Ajust_strategy as any;
+  // let res = Ajust_strategy as any;
-  console.log(res, "iiiii");
+  // console.log(res, "iiiii");
-  setTimeout(() => {
+  // setTimeout(() => {
-    ElMessage({
-      showClose: true,
-      message: "指令下发成功",
-      type: "success",
-    });
-  }, 3000);
-
-  // -------离线
-  // --------在线
-  // newAjustTableData.forEach((item) => {
-  //   //循环发完配置中的可调资源
-  //   let inputdata = {
-  //     type:
-  //       item.type === "充电桩" ? "ZLSQ" : item.type === "储能" ? "CN" : "V2G",
-  //     mrId: item.mrid,
-  //     name: item.name,
-  //     startTime: YMD.value + " " + item.start_date,
-  //     endTime: YMD.value + " " + item.end_date,
-  //     regulatedValue: item.number,
-  //   };
-
-  //   strategyApi(inputdata)
-  //     .then((res) => {
-  //       console.log(res, res?.msg, "邮箱");
-
-  //       ElMessage({
-  //         message: res?.msg,
-  //         type: "success",
-  //         plain: true,
-  //       });
-  //     })
-  //     .catch((error) => {
   //   ElMessage({
   //     showClose: true,
   //     message: "指令下发成功",
   //     type: "success",
   //   });
+  // }, 3000);
+
+  // -------离线
+  // --------在线
+  newAjustTableData.forEach((item) => {
+    // let wei_id=item.mrid
+
+    //循环发完配置中的可调资源
+    let inputdata = {
+      type:
+        item.type === "充电桩"
+          ? "ZLSQ"
+          : item.type === "储能"
+          ? "CN"
+          : item.type === "光伏"
+          ? "GF"
+          : "V2G",
+      mrId: item.mrid.replace("@", ""),
+      name: item.name,
+      startTime: YMD.value + " " + item.start_date,
+      endTime: YMD.value + " " + item.end_date,
+      regulatedValue: item.number,
+    };
+
+    strategyApi(inputdata)
+      .then((res) => {
+        console.log(res, res?.msg, "邮箱");
+        setTimeout(() => {
+          ElMessage({
+            message: res?.msg,
+            type: "success",
+            plain: true,
+          });
+        }, 3000);
+      })
+      .catch((error) => {
+        // ElMessage({
+        //   showClose: true,
+        //   message: "指令下发成功",
+        //   type: "success",
         // });
-  // });
+      });
+  });
   // --------在线
 
   setTimeout(() => {
@@ -786,9 +796,13 @@ const changeSourceInfo = (val: string) => {
 
   if (val === "1") {
     // 全景的资源信息
-    getTreeSourceList(treeNodeKey.value);
+    console.log(treeNodes.value.level, "1-------------");
 
-    // tablepvData=
+    if (treeNodes.value.level === 3) {
+      getAllSourceAjust_Line(treeNodeKey.value);
+    } else if (treeNodes.value.level === 4) {
+      getTreeSourceList(treeNodeKey.value);
+    }
   } else {
     // 可调资源的信息
     // console.log(tableInfo.tablepvData, "222222");
@@ -1004,10 +1018,16 @@ const handleCellEnter = (row: any, column: any, cell: any, event: any) => {
 // 点击保存时修改成功并将结果传出去
 const handleSaveDate = () => {
   btn_sendFlag.value = true;
-  adjustFlag.value = false;
+  adjustFlag.value = true;
 
   adjustTableData.forEach((ite: any) => {
     ite.isEdit = false; //所有的编辑状态全部为假
+    if (ite.number === 0) {
+      ElMessage.error("请输入调能数量");
+      adjustFlag.value = true;
+    } else {
+      adjustFlag.value = false;
+    }
   });
   console.log(adjustTableData, "adjustTableData");
   refreshkey.value += 1;

src/views/pages/homePage/Treepie.vue

@@ -161,7 +161,7 @@ let handelColumnEcharts = () => {
                 // top: props.threeDPieData.legend.top,
                 //图例文字每项之间的间隔
                 itemGap: props.threeDPieData.legend.itemGap,
-                show: true,
+                show: false,
                 icon: "rect",
                 itemHeight: 10,
                 itemWidth: 10,

src/views/pages/homePage/index.vue

@@ -1096,6 +1096,15 @@ let leftData = reactive<leftDataInfo>({
   // 3d饼图数据
   threeDPieData: {
     pieData: [
+      {
+        name: "0.4kV",
+        value: 393,
+        itemStyle: {
+          // color: "#F1BA50",
+          color: "#00B4F4",
+
+        },
+      },
       {
         name: "35kV", //名称
         value: 3, //值
@@ -1112,14 +1121,6 @@ let leftData = reactive<leftDataInfo>({
           color: "#F1BA50",
         },
       },
-      {
-        name: "0.4kV",
-        value: 393,
-        itemStyle: {
-          // color: "#F1BA50",
-          color: "#2E53F5",
-        },
-      },
     ],
     total: 108,
     center: 0.85, // 是否圆环
@@ -1146,7 +1147,7 @@ let leftData = reactive<leftDataInfo>({
         name: "居民充电桩", //名称
         value: 10, //值
         itemStyle: {
-          color: "#EE5944", //半透明 232 158 205
+          color: "#00B4F4", //半透明 232 158 205
           // color: "rgba(250,189,101,.8)",//半透明 232 158 205
         },
       },
@@ -1154,14 +1155,14 @@ let leftData = reactive<leftDataInfo>({
         name: "商业充电桩",
         value: 20,
         itemStyle: {
-          color: "#2E53F5",
+          color: "#70F0B6",
         },
       },
       {
         name: "V2G充电桩",
         value: 40,
         itemStyle: {
-          color: "#F1BA50",
+          color: "#FBC670",
         },
       },
     ],