年后第一次提交

.env.development

@@ -29,6 +29,26 @@ VITE_PROXY = [["/api","https://esos-iot.bjdexn.cn"]]
 # 
 # 209        363
 # 
+#                                             
 # 
 # 
+#                                                                                                          
 # 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

.vscode/settings.json

@@ -68,6 +68,7 @@
     "informationtype",
     "insertschedule",
     "juejin",
+    "keywordcategory",
     "liquidfill",
     "longpress",
     "mockjs",

package-lock.json

@@ -14,12 +14,13 @@
         "@vueuse/integrations": "^10.9.0",
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^5.1.12",
-        "axios": "^1.6.2",
+        "axios": "^1.7.9",
         "dayjs": "^1.11.10",
         "driver.js": "^1.3.1",
         "echarts": "^5.4.3",
         "echarts-liquidfill": "^3.1.0",
-        "element-plus": "^2.4.3",
+        "element-plus": "^2.9.1",
+        "file-saver": "^2.0.5",
         "js-cookie": "^3.0.5",
         "md5": "^2.3.0",
         "mitt": "^3.0.1",
@@ -40,6 +41,7 @@
       "devDependencies": {
         "@commitlint/cli": "^18.4.3",
         "@commitlint/config-conventional": "^18.4.3",
+        "@types/file-saver": "^2.0.7",
         "@types/js-cookie": "^3.0.6",
         "@types/md5": "^2.3.5",
         "@types/nprogress": "^0.2.3",
@@ -3361,6 +3363,12 @@
       "resolved": "https://registry.npmjs.org/@types/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha512-zx2/Gg0Eg7gwEiOIIh5w9TrhKKTeQh7CPCOPNc0el4pLSwzebA8SmnHwZs2dWlLONvyulykSwGSQxQHLhjGLvQ=="
     },
+    "node_modules/@types/file-saver": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.7.tgz",
+      "integrity": "sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==",
+      "dev": true
+    },
     "node_modules/@types/js-cookie": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-3.0.6.tgz",
@@ -4570,11 +4578,11 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
-      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
       "dependencies": {
-        "follow-redirects": "^1.15.4",
+        "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -6487,9 +6495,9 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.10",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
-      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
     },
     "node_modules/de-indent": {
       "version": "1.0.2",
@@ -6901,9 +6909,9 @@
       "dev": true
     },
     "node_modules/element-plus": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.6.0.tgz",
-      "integrity": "sha512-MP+N48P+diyndR+GjY+0VOrUmFnajD4U0CkrXIMzmeRmq4+dwi0bdzVo587v4wDo9Hs+ggviyacqm3NS8JYVqw==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.9.1.tgz",
+      "integrity": "sha512-9Agqf/jt4Ugk7EZ6C5LME71sgkvauPCsnvJN12Xid2XVobjufxMGpRE4L7pS4luJMOmFAH3J0NgYEGZT5r+NDg==",
       "dependencies": {
         "@ctrl/tinycolor": "^3.4.1",
         "@element-plus/icons-vue": "^2.3.1",
@@ -6913,7 +6921,7 @@
         "@types/lodash-es": "^4.17.6",
         "@vueuse/core": "^9.1.0",
         "async-validator": "^4.2.5",
-        "dayjs": "^1.11.3",
+        "dayjs": "^1.11.13",
         "escape-html": "^1.0.3",
         "lodash": "^4.17.21",
         "lodash-es": "^4.17.21",
@@ -7799,6 +7807,11 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/file-saver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -7869,9 +7882,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "funding": [
         {
           "type": "individual",

package.json

@@ -40,12 +40,13 @@
     "@vueuse/integrations": "^10.9.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
-    "axios": "^1.6.2",
+    "axios": "^1.7.9",
     "dayjs": "^1.11.10",
     "driver.js": "^1.3.1",
     "echarts": "^5.4.3",
     "echarts-liquidfill": "^3.1.0",
-    "element-plus": "^2.4.3",
+    "element-plus": "^2.9.1",
+    "file-saver": "^2.0.5",
     "js-cookie": "^3.0.5",
     "md5": "^2.3.0",
     "mitt": "^3.0.1",
@@ -66,6 +67,7 @@
   "devDependencies": {
     "@commitlint/cli": "^18.4.3",
     "@commitlint/config-conventional": "^18.4.3",
+    "@types/file-saver": "^2.0.7",
     "@types/js-cookie": "^3.0.6",
     "@types/md5": "^2.3.5",
     "@types/nprogress": "^0.2.3",

src/api/home/Multisite.ts

@@ -21,6 +21,10 @@ export const multiStationday = (params: {}) => {
   return http.post<Station.between[]>(`/stats/multStation/profit/between/day`, qs.stringify(params));
 };
 // 收益统计------------月份
+export const multiStationMonthMonth = (params: {}) => {
+  return http.post<Station.between[]>(`/stats/multStation/profit/between/Month`, qs.stringify(params));
+};
+// 收益统计------------年份
 export const multiStationdayMonth = (params: {}) => {
   return http.post<Station.between[]>(`/stats/multStation/profit/between/yearMonth`, qs.stringify(params));
 };
@@ -29,6 +33,10 @@ export const multiStatiopower = (params: {}) => {
   return http.post<Station.power[]>(`/stats/multStation/power/between/day`, qs.stringify(params));
 };
 // 充放电统计-----------月份
+export const multiStatiopowerMonth = (params: {}) => {
+  return http.post<Station.power[]>(`/stats/multStation/power/between/Month`, qs.stringify(params));
+};
+// 充放电统计-----------年份
 export const multiStatyearMonth = (params: {}) => {
   return http.post<Station.power[]>(`/stats/multStation/power/between/yearMonth`, qs.stringify(params));
 };
@@ -37,6 +45,10 @@ export const multiStationtopday = (params: {}) => {
   return http.post<Station.profitday[]>(`/stats/multStation/profit/top/between/day`, qs.stringify(params));
 };
 // 收益排名--------------月份
+export const multiStationtopdayMonth = (params: {}) => {
+  return http.post<Station.profitday[]>(`/stats/multStation/profit/top/between/Month`, qs.stringify(params));
+};
+// 收益排名--------------年份
 export const multiStationtopyearMonth = (params: {}) => {
   return http.post<Station.profitday[]>(`/stats/multStation/profit/top/between/yearMonth`, qs.stringify(params));
 };
@@ -85,6 +97,10 @@ export const singlestationday = (params: {}, id: any) => {
   return http.post<Station.profitbetween>(`/stats/singleStation/${id}/profit/between/day`, qs.stringify(params));
 };
 // 单站橄榄收益统计------------月份
+export const singlestationdayMonth = (params: {}, id: any) => {
+  return http.post<Station.profitbetween>(`/stats/singleStation/${id}/profit/between/Month`, qs.stringify(params));
+};
+// 单站橄榄收益统计------------年份
 export const singlestationyearMonth = (params: {}, id: any) => {
   return http.post<Station.profitbetween>(`/stats/singleStation/${id}/profit/between/yearMonth`, qs.stringify(params));
 };
@@ -92,7 +108,11 @@ export const singlestationyearMonth = (params: {}, id: any) => {
 export const postsexportKwh = (params: {}, id: any) => {
   return http.post<Station.power[]>(`/stats/singleStation/${id}/singleStation/between/day`, qs.stringify(params));
 };
-// 单站橄榄放电统计----------月份
+// 单站橄榄放电统计---------月
+export const postsexportKwhMonth = (params: {}, id: any) => {
+  return http.post<Station.power[]>(`/stats/singleStation/${id}/singleStation/between/Month`, qs.stringify(params));
+};
+// 单站橄榄放电统计----------年份
 export const singlestationchargingMonth = (params: {}, id: any) => {
   return http.post<Station.power[]>(`/stats/singleStation/${id}/between/yuerMonth`, qs.stringify(params));
 };
@@ -177,8 +197,8 @@ export const getairConditionerInfo = (params: {}, id: string, ids: string) => {
   return http.post(`device/station/${id}/${ids}/airConditionerInfo`, qs.stringify(params), { loading: false });
 };
 // 电价管理
-export const electricitylist = (params: {}, id: string) => {
-  return http.post<Station.electricity[]>(`/electricity/${id}/tariff/2024/list`, qs.stringify(params));
+export const electricitylist = (params: {}, time: any, id: string) => {
+  return http.post<Station.electricity[]>(`/electricity/${id}/tariff/${time}/list`, qs.stringify(params));
 };
 // 电价新增
 export const insertschedule = (params: {}, name: string) => {
@@ -569,8 +589,32 @@ export const tdengineyuanshilURL = (params: {}) => {
 export const listexcellURL = (params: {}) => {
   return http.post(`/tdengineyuanshi/listexcel`, qs.stringify(params));
 };
-// 原始数据导出
+
+// 点位名称查询
+export const selectpeekURL = (params: {}) => {
+  return http.post(`/tdengineyuanshi/selectpeek`, qs.stringify(params));
+};
+// 点位名称修改
+export const updatepeekURL = (params: {}) => {
+  return http.post(`/tdengineyuanshi/updatepeek`, qs.stringify(params));
+};
+// 一键同步所有列
+export const insertpeekURL = (params: {}) => {
+  return http.post(`/tdengineyuanshi/insertpeek`, qs.stringify(params));
+};
+// 原始数据
 export const powerlistURL = (params: {}) => {
   return http.post(`/tdengineyuanshi/powerlist`, qs.stringify(params));
 };
-//
+// 原始数据导出状态并下载
+export const listexcelURL = () => {
+  return http.get(`/tdengineyuanshi/progress`, {}, { loading: false });
+};
+// 本地原始数据列表
+export const directorylURL = () => {
+  return http.get(`/tdengineyuanshi/directory`, {}, { loading: false });
+};
+// 本地原始数据列表
+export const directorylURL1 = () => {
+  return http.get(`/Thisitem_20241029.tar.gz`, {}, { loading: false });
+};

src/api/index.ts

@@ -71,6 +71,8 @@ class RequestHttp {
           //   "SECKEY_ABVK=yzv+fRRRekBvVNrnVlQZv0los5i9tWT7/GYgPAgu884%3D; BMAP_SECKEY=yzv-fRRRekBvVNrnVlQZv2Guui2pW9C79nYaUUFkI6HcEGOO1i70kkCS7E4MlMHKL_cRl3cFeNBvx5NWIX7dDXYkhI77iZtdc5SYW-OwC5dUHv-nMCrN1CjB_61m-b-ZQhKFDokV8rhJZR9Pxhea7EahAHKq5bXPwLaKaPVAkkSluICvD9iloe2h7po2dYwnzuDCbfgG42YScxs_6kx_Jg"
           // );
         }
+        console.log(config);
+
         return config;
       },
       (error: AxiosError) => {

src/components/SelectIcon/index.vue

@@ -27,7 +27,7 @@
     </el-dialog>
   </div>
 </template>
-
+<!--    -->
 <script setup lang="ts" name="SelectIcon">
 import { ref, computed } from "vue";
 import * as Icons from "@element-plus/icons-vue";

src/layouts/components/Header/components/Avatar.vue

@@ -59,7 +59,7 @@ const logout = () => {
     // cookies.remove("rememberMe");
     // console.log(cookies.get("rememberMe"));
 
-    document.cookie = "rememberMe=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/user/;";
+    // document.cookie = "rememberMe=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/user/;";
     // 3.重定向到登陆页
     router.replace(LOGIN_URL);
     ElMessage.success("退出登录成功！");
@@ -88,3 +88,4 @@ const openDialog = (ref: string) => {
   }
 }
 </style>
+<!-- http://localhost:8848/user/#/home/index -->

src/layouts/components/Header/components/PasswordDialog.vue

@@ -94,7 +94,7 @@ const determine = (formEl: FormInstance | undefined) => {
         type: "success",
         duration: 3000
       });
-      document.cookie = "rememberMe=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/user/;";
+      // document.cookie = "rememberMe=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/user/;";
       // 3.重定向到登陆页
       router.replace(LOGIN_URL);
     } finally {

src/routers/index.ts

@@ -11,7 +11,7 @@ const routerMode = {
   hash: () => createWebHashHistory(),
   history: () => createWebHistory()
 };
-import { useCookies } from "@vueuse/integrations/useCookies";
+// import { useCookies } from "@vueuse/integrations/useCookies";
 
 /**
  * @description 📚 路由参数配置简介
@@ -55,10 +55,10 @@ router.beforeEach(async (to, from, next) => {
   // 3.判断是访问登陆页，有 Token 就在当前页面，没有 Token 重置路由到登陆页
   // 读取cookie
 
-  const cookies = useCookies();
+  // const cookies = useCookies();
 
   if (to.path.toLocaleLowerCase() === LOGIN_URL) {
-    if (cookies.get("rememberMe")) return next(from.fullPath);
+    // if (cookies.get("rememberMe")) return next(from.fullPath);
     resetRouter();
     return next();
   }
@@ -67,7 +67,7 @@ router.beforeEach(async (to, from, next) => {
   if (ROUTER_WHITE_LIST.includes(to.path)) return next();
 
   // 5.判断是否有 Token，没有重定向到 login 页面
-  if (!cookies.get("rememberMe")) return next({ path: LOGIN_URL, replace: true });
+  // if (!cookies.get("rememberMe")) return next({ path: LOGIN_URL, replace: true });
 
   // 6.如果没有菜单列表，就重新请求菜单列表并添加动态路由
   if (!authStore.authMenuListGet.length) {

src/views/Administration/addition.vue

@@ -138,21 +138,46 @@ const numberValidateForm = reactive({
 const submitForm = (formEl: FormInstance | undefined) => {
   console.log(tableData);
   if (!formEl) return;
+  // formEl.validate(async valid => {
+  //   if (valid) {
+  //     if (!validateData()) return;
+  //     if (route.query.type == "模板新增") {
+  //       const { data } = await insertschedule(tableData, numberValidateForm.postName);
+  //       console.log(data);
+  //       router.push({ path: "/Administration/index", query: { id: "模板管理" } });
+  //     } else {
+  //       const { data } = await electricityupdateURL(numberValidateForm.postName, scheduleVOS.value.data[0].id, tableData);
+  //       console.log(data);
+  //       router.push({ path: "/Administration/index", query: { id: "模板管理" } });
+  //     }
+  //   } else {
+  //     console.log("error submit!");
+  //     return false;
+  //   }
+  // });
   formEl.validate(async valid => {
     if (valid) {
       if (!validateData()) return;
-      if (route.query.type == "模板新增") {
-        const { data } = await insertschedule(tableData, numberValidateForm.postName);
-        console.log(data);
-        router.push({ path: "/Administration/index", query: { id: "模板管理" } });
-      } else {
-        const { data } = await electricityupdateURL(numberValidateForm.postName, scheduleVOS.value.data[0].id, tableData);
-        console.log(data);
-        router.push({ path: "/Administration/index", query: { id: "模板管理" } });
+
+      try {
+        let responseData;
+
+        if (route.query.type === "模板新增") {
+          responseData = await insertschedule(tableData, numberValidateForm.postName);
+        } else {
+          responseData = await electricityupdateURL(numberValidateForm.postName, scheduleVOS.value.data[0].id, tableData);
+        }
+
+        console.log(responseData.data);
+        ElMessage.success("操作成功"); // User feedback for success
+        router.push({ path: "/Administration/index", query: { id: "模板管理" } }); // Consolidated navigation
+      } catch (error) {
+        console.error("Submission error:", error);
+        ElMessage.error("提交失败，请重试！"); // Inform the user about submission failure
       }
     } else {
-      console.log("error submit!");
-      return false;
+      console.log("Validation failed!");
+      ElMessage.warning("请检查表单填写是否正确！"); // Inform the user about validation failure
     }
   });
 };

src/views/Administration/index.vue

@@ -39,7 +39,8 @@
                   placeholder="选择时间"
                   size="large"
                   clearable
-                  :disabled-date="pickerOptions"
+                  format="YYYY"
+                  value-format="YYYY"
                   @change="pickerincome"
                 />
               </div>
@@ -265,7 +266,9 @@
     </el-dialog>
   </div>
 </template>
-<!--    -->
+<!--   
+      
+-->
 <script setup lang="ts">
 import { onMounted, Ref, ref } from "vue";
 import {
@@ -321,39 +324,19 @@ console.log(currentYear);
 
 const pickervalue = ref();
 pickervalue.value = currentYear + "";
-const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
-  return time.getTime(new Date()) > Date.now();
-};
+// const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
+//   return time.getTime(new Date()) > Date.now();
+// };
 // 选择日期
-const pickerincome = async (val: any) => {
-  if (val == null) {
-    pickervalue.value = currentYear;
-  } else {
-    pickervalue.value = formatDate(val);
-  }
+const pickerincome = async () => {
   getelectricitylist();
 };
-const formatDate = (dateString: string | number | Date) => {
-  const date = new Date(dateString);
-
-  // 提取年、月、日、时、分信息
 
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, "0"); // 月份从0开始，需要加1，并确保是两位数
-  const day = String(date.getDate()).padStart(2, "0"); // 确保是两位数
-  const hours = String(date.getHours()).padStart(2, "0"); // 确保是两位数
-  const minutes = String(date.getMinutes()).padStart(2, "0"); // 确保是两位数
-
-  // 拼接成 "YYYY-MM-DD HH:MM" 格式
-  const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}`;
-
-  return formattedDate;
-};
 // 电价配置
 const tricitylist: Ref<Station.electricity[]> = ref([]);
 
 const getelectricitylist = async () => {
-  const { data } = await electricitylist({}, Singlevalue.value);
+  const { data } = await electricitylist({}, pickervalue.value, Singlevalue.value);
   tricitylist.value = data;
   getselectpoweroverview();
 };
@@ -641,4 +624,6 @@ onMounted(() => {
 <style scoped lang="scss">
 @import "./index.scss";
 </style>
-<!-- -->
+<!--
+    
+ -->

src/views/Alarm/index.vue

@@ -86,11 +86,12 @@
                 size="large"
                 v-model="timevalue"
                 type="daterange"
+                :shortcuts="shortcuts"
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
                 :default-value="timevalue"
-                :disabled-date="pickerOptions"
                 value-format="YYYY-MM-DD hh:mm:ss"
+                :disabled-date="pickerOptions"
               />
             </div>
             <div class="screen_1">
@@ -128,7 +129,7 @@
     </div>
   </div>
 </template>
-<!--  == 发生 ，1&没有发生时间== 复位 |告警，事件，故障 -->
+<!--    -->
 <!--    -->
 <script setup lang="ts">
 import { onMounted, Ref, ref } from "vue";
@@ -468,7 +469,35 @@ const alarm = ref("");
 // const proposal = ref("");
 const alarmstatus = ref("");
 const timevalue: Ref<any> = ref([]);
-
+const shortcuts = ref([
+  {
+    text: "过去7天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setDate(start.getDate() - 7);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去1个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 1);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去3个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 3);
+      return [start, end];
+    }
+  }
+]);
 // 处理建议
 
 const getposthandlingSugg = async () => {

src/views/department/addition.vue

@@ -126,35 +126,33 @@ const numberValidateForm = reactive({
   status: "0"
 });
 
-const submitForm = (formEl: FormInstance | undefined) => {
-  if (numberValidateForm.parentId == "") {
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+
+  if (numberValidateForm.parentId === "") {
     numberValidateForm.parentId = tableData.value[0].id;
   }
-  if (!formEl) return;
-  formEl.validate(async valid => {
+
+  try {
+    const valid = await formEl.validate();
+
     if (valid) {
-      if (route.query.type == "部门新增") {
-        // let obj = {
-        //   parentId: numberValidateForm.parentId,
-        //   deptName: numberValidateForm.deptName,
-        //   orderNum: numberValidateForm.orderNum,
-        //   leader: numberValidateForm.leader,
-        //   phone: numberValidateForm.phone,
-        //   email: numberValidateForm.email,
-        //   status: numberValidateForm.status ? 0 : 1
-        // };
-        const { data } = await platformdeptadd(numberValidateForm);
-        console.log(data);
+      let responseData;
+
+      if (route.query.type === "部门新增") {
+        responseData = await platformdeptadd(numberValidateForm);
       } else {
-        const { data } = await platformdeptedit(numberValidateForm);
-        console.log(data);
+        responseData = await platformdeptedit(numberValidateForm);
       }
-      router.back();
+
+      console.log(responseData.data);
+      router.back(); // Navigate back after success
     } else {
-      console.log("error submit!");
-      return false;
+      console.error("Validation failed!");
     }
-  });
+  } catch (error) {
+    console.error("Submission error:", error);
+  }
 };
 
 const resetForm = (formEl: FormInstance | undefined) => {

src/views/department/index.vue

@@ -13,7 +13,7 @@
         <div>
           &ensp;&ensp;&ensp;&ensp;&ensp;&ensp;部门状态&ensp;&ensp;<el-select
             v-model="status"
-            placeholder="Select"
+            placeholder="请选择"
             size="large"
             style="width: 240px"
           >

src/views/home/index.scss

@@ -26,12 +26,11 @@
 }
 .grid_divright {
   position: absolute;
-  right: 20px;
+  top: -10px;
+  right: 0;
   display: flex;
   align-items: center;
   height: 38px;
-
-  // padding-top: 10px;
   border-bottom: 2px solid #e4e7ed;
 }
 #baroption {

src/views/home/index.vue

@@ -137,18 +137,32 @@
               </div>
             </el-tabs>
             <div class="grid_divright">
-              <div :class="recentlytype == 7 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(7)">近7日</div>
-              <div :class="recentlytype == 31 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(31)">近31日</div>
-              <div :class="recentlytype == 360 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(360)">近12月</div>
+              <!-- <div :class="recentlytype == 7 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(7)">日</div>
+              <div :class="recentlytype == 31 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(31)">月</div>
+              <div :class="recentlytype == 360 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(360)">年</div> -->
               <el-date-picker
                 v-model="value2"
-                type="daterange"
+                :type="timetype"
+                :shortcuts="shortcuts"
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
                 :default-value="value2"
+                :format="format"
+                :value-format="format"
+                unlink-panels
+                size="large"
                 :disabled-date="pickerOptions"
                 @change="pickerincome"
               />
+              <el-select
+                v-model="daymonthyearvalue"
+                placeholder="选择日期"
+                size="large"
+                style="width: 80px"
+                @change="getdaymonthyear"
+              >
+                <el-option v-for="item in daymonthyear" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </div>
           </div>
         </el-card>
@@ -174,7 +188,7 @@
       <div class="cardtable">
         <div>通讯状态:</div>
         &emsp;
-        <el-select v-model="onlineStatus" placeholder="Select" size="large" style="width: 240px">
+        <el-select v-model="onlineStatus" placeholder="请选择" size="large" style="width: 240px">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         &emsp;
@@ -223,9 +237,9 @@
     </el-card>
   </div>
 </template>
-<!--     -->
+<!--  ECharte  -->
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { onMounted, Ref, ref } from "vue";
 import type { TabsPaneContext } from "element-plus";
 import * as echarts from "echarts";
 import Pagination from "@/components/ProTable/components/Pagination.vue";
@@ -238,7 +252,10 @@ import {
   multiStationpagebaseInfo,
   multiStationdayMonth,
   multiStationtopyearMonth,
-  multiStatyearMonth
+  multiStatyearMonth,
+  multiStatiopowerMonth,
+  multiStationtopdayMonth,
+  multiStationMonthMonth
 } from "@/api/home/Multisite";
 const multiStation = ref();
 const activeName = ref("first");
@@ -249,7 +266,7 @@ const baroption = ref();
 const onlineStatus = ref("");
 const modelinput = ref();
 const tabpropslabel = ref("收益统计");
-const recentlytype = ref(7);
+// const recentlytype = ref(7);
 const options = ref([
   {
     value: "",
@@ -370,96 +387,293 @@ const formatAmounts2 = (amount: number) => {
   //   return "万元";
   // }
 };
-const pickerincome = (value: any) => {
-  value2.value = [formatDate(value[0]), formatDate(value[1])];
-  if (tabpropslabel.value == "收益统计") {
-    getmultiStation(); // 收益统计图
-    getmultiStationtopday(); // 收益排名图
+const pickerincome = () => {
+  // value2.value = [formatDate(value[0]), formatDate(value[1])];
 
-    getmultiStationMonth(); // 收益统计图
-    getmultiStationtopMonth(); // 收益排名图
+  if (tabpropslabel.value == "收益统计") {
+    if (daymonthyearvalue.value == 1) {
+      getmultiStation(); // 收益统计图
+      getmultiStationtopday(); // 收益排名图
+    } else if (daymonthyearvalue.value == 2) {
+      // getmultiStation(); // 收益统计图
+      // getmultiStationtopday(); // 收益排名图
+      getmultiStationMonthMonth();
+      getmultiStationtopdayMonth();
+    } else {
+      getmultiStationMonth(); // 收益统计图
+      getmultiStationtopMonth(); // 收益排名图
+    }
   } else {
-    getmultiStatiopower(); // 充放电统计图
-    getmultiStatiopowerMonth();
+    if (daymonthyearvalue.value == 1) {
+      getmultiStatiopower(); // 充放电统计图
+    } else if (daymonthyearvalue.value == 2) {
+      // getmultiStatiopower(); // 充放电统计图
+      getmultisMonth();
+    } else {
+      getmultiStatiopowerMonth();
+    }
   }
 };
-const formatDate = (dateString: string | number | Date) => {
-  const date = new Date(dateString);
+// const formatDate = (dateString: string | number | Date) => {
+//   const date = new Date(dateString);
 
-  // 提取年、月、日、时、分信息
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, "0"); // 月份从0开始，需要加1，并确保是两位数
-  const day = String(date.getDate()).padStart(2, "0"); // 确保是两位数
-  const hours = String(date.getHours()).padStart(2, "0"); // 确保是两位数
-  const minutes = String(date.getMinutes()).padStart(2, "0"); // 确保是两位数
+//   // 提取年、月、日、时、分信息
+//   const year = date.getFullYear();
+//   const month = String(date.getMonth() + 1).padStart(2, "0"); // 月份从0开始，需要加1，并确保是两位数
+//   const day = String(date.getDate()).padStart(2, "0"); // 确保是两位数
+//   const hours = String(date.getHours()).padStart(2, "0"); // 确保是两位数
+//   const minutes = String(date.getMinutes()).padStart(2, "0"); // 确保是两位数
 
-  // 拼接成 "YYYY-MM-DD HH:MM" 格式
-  const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}`;
+//   // 拼接成 "YYYY-MM-DD HH:MM" 格式
+//   const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}`;
 
-  return formattedDate;
-};
+//   return formattedDate;
+// };
 const handleClick = (tab: TabsPaneContext) => {
   // if (baroption.value) {
   //   baroption.value.dispose(); //地图图表
   // }
-
   tabpropslabel.value = tab.props.label;
-  if (tab.props.label == "收益统计") {
-    getmultiStationtopday(); // 收益排名图
-    getmultiStation();
-  } else {
-    getmultiStatiopower();
-  }
+  pickerincome();
+  // if (tab.props.label == "收益统计") {
+  //   getmultiStationtopday(); // 收益排名图
+  //   getmultiStation();
+  // } else {
+  //   getmultiStatiopower();
+  // }
 };
 //
-const recently = (val: any) => {
-  // 获取当前日期
-  recentlytype.value = val;
-  const today = new Date();
-  const currentDate = today.toLocaleDateString();
+const daymonthyearvalue = ref(1);
 
-  // 获取过去 7 天的日期
-  const sevenDaysAgoDate = new Date(today);
-  sevenDaysAgoDate.setDate(today.getDate() - 7);
-  const sevenDaysAgo = sevenDaysAgoDate.toLocaleDateString();
+const daymonthyear = ref([
+  {
+    value: 1,
+    label: "日"
+  },
+  {
+    value: 2,
+    label: "月"
+  },
+  {
+    value: 3,
+    label: "年"
+  }
+]);
+const shortcuts = ref([
+  {
+    text: "过去7天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setDate(start.getDate() - 7);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去1个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 1);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去3个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 3);
+      return [start, end];
+    }
+  }
+]);
+const timetype: Ref<any> = ref("daterange");
+const format = ref("YYYY-MM-DD");
+
+const getdaymonthyear = async (value: any) => {
+  daymonthyearvalue.value = value;
+  if (value == 1) {
+    timetype.value = "daterange";
+    format.value = "YYYY-MM-DD";
+    shortcuts.value = [
+      {
+        text: "过去7天",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setDate(start.getDate() - 7);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去1个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 1);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去3个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 3);
+          return [start, end];
+        }
+      }
+    ];
+    const today = new Date();
+    const currentDate = today.toISOString().split("T")[0];
+    const sevenDaysAgoDate = new Date(today);
+    sevenDaysAgoDate.setDate(today.getDate() - 6);
+    const sevenDaysAgo = sevenDaysAgoDate.toLocaleDateString();
+    value2.value = [sevenDaysAgo, currentDate];
+    // getreportpowerday();
+  } else if (value == 2) {
+    const today = new Date();
+    const currentDate = today.toISOString().split("T")[0];
+    const currentYearMonth = currentDate.slice(0, 7);
 
-  // 获取过去 31 天的日期
-  const thirtyOneDaysAgoDate = new Date(today);
-  thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
-  const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
+    value2.value = [currentYearMonth, currentYearMonth];
+    // getreportpoweryearMonth();
+    timetype.value = "monthrange";
+    format.value = "YYYY-MM";
 
-  // 获取去年同月的日期
-  const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
-  const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
+    shortcuts.value = [
+      {
+        text: "本月",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去6个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 6);
+          return [start, end];
+        }
+      },
+      {
+        text: "今年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().getFullYear(), 0);
+          return [start, end];
+        }
+      }
+    ];
+  } else {
+    const today = new Date();
+    const currentDate = today.toISOString().split("T")[0];
+    // 获取去年同月的日期
+    value2.value = [currentDate.substring(0, 4), currentDate.substring(0, 4)];
+    console.log(value2.value);
+    timetype.value = "yearrange";
+    format.value = "YYYY";
 
+    shortcuts.value = [
+      {
+        text: "今年",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去1年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().setFullYear(new Date().getFullYear() - 1));
+          return [start, end];
+        }
+      },
+      {
+        text: "过去2年",
+        value: () => {
+          const start = new Date();
+          const end = new Date(new Date().setFullYear(new Date().getFullYear() - 2));
+          return [start, end];
+        }
+      }
+    ];
+    // getreportpoweryear();
+  }
   if (tabpropslabel.value == "收益统计") {
-    if (val == 7) {
-      value2.value = [sevenDaysAgo, currentDate];
-      getmultiStation(); // 收益统计图
-      getmultiStationtopday(); // 收益排名图
-    } else if (val == 31) {
-      value2.value = [thirtyOneDaysAgo, currentDate];
+    if (daymonthyearvalue.value == 1) {
       getmultiStation(); // 收益统计图
       getmultiStationtopday(); // 收益排名图
+    } else if (daymonthyearvalue.value == 2) {
+      // getmultiStation(); // 收益统计图
+      // getmultiStationtopday(); // 收益排名图
+      getmultiStationMonthMonth();
+      getmultiStationtopdayMonth();
     } else {
-      value2.value = [lastYearSameMonth, currentDate];
-
       getmultiStationMonth(); // 收益统计图
       getmultiStationtopMonth(); // 收益排名图
     }
   } else {
-    if (val == 7) {
-      value2.value = [sevenDaysAgo, currentDate];
-      getmultiStatiopower(); // 充放电统计图
-    } else if (val == 31) {
-      value2.value = [thirtyOneDaysAgo, currentDate];
+    if (daymonthyearvalue.value == 1) {
       getmultiStatiopower(); // 充放电统计图
+    } else if (daymonthyearvalue.value == 2) {
+      // getmultiStatiopower(); // 充放电统计图
+      getmultisMonth();
     } else {
-      value2.value = [lastYearSameMonth, currentDate];
       getmultiStatiopowerMonth();
     }
   }
 };
+// const recently = (val: any) => {
+//   // 获取当前日期
+//   recentlytype.value = val;
+//   const today = new Date();
+//   const currentDate = today.toLocaleDateString();
+
+//   // 获取过去 7 天的日期
+//   const sevenDaysAgoDate = new Date(today);
+//   sevenDaysAgoDate.setDate(today.getDate() - 7);
+//   const sevenDaysAgo = sevenDaysAgoDate.toLocaleDateString();
+
+//   // 获取过去 31 天的日期
+//   const thirtyOneDaysAgoDate = new Date(today);
+//   thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
+//   const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
+
+//   // 获取去年同月的日期
+//   const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
+//   const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
+
+//   if (tabpropslabel.value == "收益统计") {
+//     if (val == 7) {
+//       value2.value = [sevenDaysAgo, currentDate];
+//       getmultiStation(); // 收益统计图
+//       getmultiStationtopday(); // 收益排名图
+//     } else if (val == 31) {
+//       value2.value = [thirtyOneDaysAgo, currentDate];
+//       getmultiStation(); // 收益统计图
+//       getmultiStationtopday(); // 收益排名图
+//     } else {
+//       value2.value = [lastYearSameMonth, currentDate];
+
+//       getmultiStationMonth(); // 收益统计图
+//       getmultiStationtopMonth(); // 收益排名图
+//     }
+//   } else {
+//     if (val == 7) {
+//       value2.value = [sevenDaysAgo, currentDate];
+//       getmultiStatiopower(); // 充放电统计图
+//     } else if (val == 31) {
+//       value2.value = [thirtyOneDaysAgo, currentDate];
+//       getmultiStatiopower(); // 充放电统计图
+//     } else {
+//       value2.value = [lastYearSameMonth, currentDate];
+//       getmultiStatiopowerMonth();
+//     }
+//   }
+// };
 
 const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
   return time.getTime(new Date()) > Date.now();
@@ -503,6 +717,25 @@ const getmultiStation = async () => {
   baroptionchart(dates, profits, "收益/元");
 };
 // 收益统计图
+const getmultiStationMonthMonth = async () => {
+  const { data } = await multiStationMonthMonth({ startDate: value2.value[0], endDate: value2.value[1] });
+  // const profits = data.map(item => item.profit);
+  // const dates = data.map(item => item.ymd);
+  const dates = [["product", "收益"]];
+  // console.log(data.length);
+
+  if (data.length != 0) {
+    for (let index = 0; index < data.length; index++) {
+      dates.push([data[index].ymd, data[index].profit]);
+    }
+  } else {
+    dates.push([value2.value[0], "50"], [value2.value[1], "120"]);
+  }
+  const profits = [{ type: "bar" }];
+
+  baroptionchart(dates, profits, "收益/元");
+};
+// 收益统计图
 const getmultiStationMonth = async () => {
   const { data } = await multiStationdayMonth({ startDate: value2.value[0], endDate: value2.value[1] });
   // const profits = data.map(item => item.profit);
@@ -537,6 +770,22 @@ const getmultiStatiopower = async () => {
 
   baroptionchart(dates, profits, "kWh");
 };
+// 充放电统计图
+const getmultisMonth = async () => {
+  const { data } = await multiStatiopowerMonth({ startDate: value2.value[0], endDate: value2.value[1] });
+  const dates = [["product", "充电", "放电"]];
+  if (data.length != 0) {
+    for (let index = 0; index < data.length; index++) {
+      dates.push([data[index].ymd, data[index].chargeTotal.toString(), data[index].dischargeTotal.toString()]);
+    }
+  } else {
+    dates.push([value2.value[1], "0", "0"]);
+  }
+
+  const profits = [{ type: "bar" }, { type: "bar" }];
+
+  baroptionchart(dates, profits, "kWh");
+};
 // 充放电统计月份
 const getmultiStatiopowerMonth = async () => {
   const { data } = await multiStatyearMonth({ startYearMonth: value2.value[0], endYearMonth: value2.value[1] });
@@ -621,6 +870,28 @@ const getmultiStationtopday = async () => {
 
   baroptionincome(profitlist, stationNames);
 };
+// 收益排名
+const getmultiStationtopdayMonth = async () => {
+  const { data } = await multiStationtopdayMonth({ startDate: value2.value[0], endDate: value2.value[1] });
+  let profitlist = [];
+  let stationNames = [];
+  if (data.length != 0) {
+    const sortedData = data
+      .map(item => ({
+        profit: parseFloat(item.profit + "").toFixed(2), // 保留小数点后两位
+        stationName: item.stationName
+      }))
+      .sort((a, b) => parseFloat(a.profit) - parseFloat(b.profit)); // 确保排序时比较为数字
+
+    profitlist = sortedData.map(item => parseFloat(item.profit)); // 转回为数字
+    stationNames = sortedData.map(item => item.stationName);
+  } else {
+    profitlist = [60, 40, 70, 20, 80, 100, 120];
+    stationNames = ["演示电站一", "演示电站二", "演示电站三", "演示电站四", "演示电站五", "演示电站六", "演示电站七"];
+  }
+
+  baroptionincome(profitlist, stationNames);
+};
 // 收益排名月份
 const getmultiStationtopMonth = async () => {
   const { data } = await multiStationtopyearMonth({ startDate: value2.value[0], endDate: value2.value[1] });
@@ -641,7 +912,7 @@ const baroptionincome = (profitlist: number[], stationNames: string[]) => {
   );
   let option = {
     title: {
-      subtext: "收益排名/元"
+      subtext: `收益排名/元`
     },
     tooltip: {
       trigger: "axis",

src/views/incomeforms/index.vue

@@ -22,14 +22,27 @@
                     v-if="timetype != 'year'"
                     v-model="timepicker"
                     :type="timetype"
+                    :shortcuts="shortcuts"
+                    :format="format"
+                    :value-format="format"
                     start-placeholder="开始时间"
                     end-placeholder="结束时间"
-                    :default-value="timepicker"
+                    size="large"
                     :disabled-date="pickerOptions"
-                    @change="datepicker"
+                  />
+                  <el-date-picker
+                    v-if="timetype == 'year'"
+                    v-model="timepicker"
+                    type="yearrange"
+                    :format="format"
+                    :value-format="format"
+                    :shortcuts="shortcuts"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
                     size="large"
+                    :disabled-date="pickerOptions"
                   />
-                  <YearPicker
+                  <!-- <YearPicker
                     v-if="timetype == 'year'"
                     style="width: 300px"
                     ref="statisticPicker"
@@ -38,7 +51,7 @@
                     :start-year1="timepicker[0]"
                     :end-year2="timepicker[1]"
                     @update-time-range="updateStatisticYear"
-                  />
+                  /> -->
                   <el-select
                     v-model="daymonthyearvalue"
                     placeholder="选择日期"
@@ -134,13 +147,28 @@
                     v-if="pickertype != 'year'"
                     v-model="starttime"
                     :type="pickertype"
-                    placeholder="选择时间"
+                    :shortcuts="shortcuts"
+                    :format="format"
+                    :value-format="format"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
                     size="large"
                     clearable
                     :disabled-date="pickerOptions"
-                    @change="yearstarttime"
                   />
-                  <YearPicker
+                  <el-date-picker
+                    v-if="pickertype == 'year'"
+                    v-model="starttime"
+                    type="yearrange"
+                    :format="format"
+                    :value-format="format"
+                    :shortcuts="shortcuts"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    size="large"
+                    :disabled-date="pickerOptions"
+                  />
+                  <!-- <YearPicker
                     v-if="pickertype == 'year'"
                     style="width: 300px"
                     ref="statisticPicker"
@@ -149,7 +177,7 @@
                     :start-year1="starttime[0]"
                     :end-year2="starttime[1]"
                     @update-time-range="updateStatisticYear1"
-                  />
+                  /> -->
                 </div>
                 &ensp;&ensp;
 
@@ -242,8 +270,6 @@ import {
   singlemonthExcel,
   singleyeaeExcel
 } from "@/api/home/Multisite";
-import YearPicker from "@/components/year/index.vue";
-// import { YearPicker } from "../../components/year/index.vue";
 import { other, Station } from "@/api/interface";
 import { useAuthButtons } from "@/hooks/useAuthButtons";
 const { BUTTONS } = useAuthButtons();
@@ -322,7 +348,7 @@ const columnList = ref([
   },
   {
     prop: "overallEfficiency",
-    label: "总(元)",
+    label: "应收益(元)",
     ifcolumn: true,
     children: null
   }
@@ -398,7 +424,7 @@ const singlecolumnList = ref([
         ifcolumn: true
       }
     ]
-  }
+  },
   // ,
   // {
   //   prop: "overallEfficiency",
@@ -406,42 +432,69 @@ const singlecolumnList = ref([
   //   ifcolumn: true,
   //   children: null
   // }
+  {
+    prop: "overallEfficiency",
+    label: "应收益(元)",
+    ifcolumn: true,
+    children: null
+  }
 ]);
+//
 const currentDate = ref();
 const activeName = ref("站点汇总");
+
 const handleClick = async (val: any) => {
-  // activeName.value
   activeName.value = val.props.name;
   if (val.props.name == "站点汇总") {
+    getdaymonthyear(1);
+    gatSummary();
   } else {
-    reportformsindex.value = 2;
     await poststationstationName();
-    await onreportforms(reportformsindex.value);
+    await onreportforms(2);
   }
 };
 const timepicker: Ref<any> = ref([]);
-//可选择区间，initYear传参，不传则所有年份有效，小于0判断一下？
-const dateValue = ref<any>({ startYear: 2000, endYear: new Date().getFullYear() });
-//选完/输入完成的回调
-const updateStatisticYear: any = (startYear: number, endYear: number) => {
-  timepicker.value = [startYear + "", endYear + ""];
-  getreportpoweryear();
-};
-//选完/输入完成的回调
-const updateStatisticYear1: any = (startYear: number, endYear: number) => {
-  starttime.value = [startYear + "", endYear + ""];
-  getsingleincomeyear();
-};
-// 格式化时间
+
+// 禁用日期
 const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
   return time.getTime(new Date()) > Date.now();
 };
 // 选择时间
-const datepicker = (val: any) => {
-  timepicker.value = [formatDate(val[0]), formatDate(val[1])];
-};
+// const datepicker = (val: any) => {
+//   timepicker.value = [formatDate(val[0]), formatDate(val[1])];
+// };
 // 选择日期
 const daymonthyearvalue = ref(1);
+
+const shortcuts = ref([
+  {
+    text: "过去7天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setDate(start.getDate() - 7);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去1个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 1);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去3个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 3);
+      return [start, end];
+    }
+  }
+]);
 const daymonthyear = ref([
   {
     value: 1,
@@ -457,42 +510,127 @@ const daymonthyear = ref([
   }
 ]);
 const timetype: Ref<any> = ref("daterange");
+const format = ref("YYYY-MM-DD");
 
 const getdaymonthyear = async (value: any) => {
   daymonthyearvalue.value = value;
   if (value == 1) {
     timetype.value = "daterange";
-
+    format.value = "YYYY-MM-DD";
+    shortcuts.value = [
+      {
+        text: "过去7天",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setDate(start.getDate() - 7);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去1个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 1);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去3个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 3);
+          return [start, end];
+        }
+      }
+    ];
     const today = new Date();
-    const currentDate = today.toLocaleDateString();
+    const currentDate = today.toISOString().split("T")[0];
     timepicker.value = [currentDate, currentDate];
-    getreportpowerday();
+    // getreportpowerday();
   } else if (value == 2) {
+    const today = new Date();
+    const currentDate = today.toISOString().split("T")[0];
+    const currentYearMonth = currentDate.slice(0, 7);
+
+    timepicker.value = [currentYearMonth, currentYearMonth];
+    // getreportpoweryearMonth();
     timetype.value = "monthrange";
+    format.value = "YYYY-MM";
 
-    const today = new Date();
-    const currentDate = today.toLocaleDateString();
-    // 获取过去 31 天的日期
-    const thirtyOneDaysAgoDate = new Date(today);
-    thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
-    const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
-    timepicker.value = [thirtyOneDaysAgo, currentDate];
-    getreportpoweryearMonth();
+    shortcuts.value = [
+      {
+        text: "本月",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去6个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 6);
+          return [start, end];
+        }
+      },
+      {
+        text: "今年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().getFullYear(), 0);
+          return [start, end];
+        }
+      }
+    ];
   } else {
-    timetype.value = "year";
-
     const today = new Date();
-    const currentDate = today.toLocaleDateString();
+    const currentDate = today.toISOString().split("T")[0];
     // 获取去年同月的日期
-    const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
-    const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
-    timepicker.value = [lastYearSameMonth.substring(0, 4), currentDate.substring(0, 4)];
-    getreportpoweryear();
+    timepicker.value = [currentDate.substring(0, 4), currentDate.substring(0, 4)];
+    console.log(timepicker.value);
+    timetype.value = "yearrange";
+    format.value = "YYYY";
+
+    shortcuts.value = [
+      {
+        text: "今年",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去1年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().setFullYear(new Date().getFullYear() - 1));
+          return [start, end];
+        }
+      },
+      {
+        text: "过去2年",
+        value: () => {
+          const start = new Date();
+          const end = new Date(new Date().setFullYear(new Date().getFullYear() - 2));
+          return [start, end];
+        }
+      }
+    ];
+    // getreportpoweryear();
   }
 };
+
 // 查询
 const gatSummary = () => {
-  getdaymonthyear(daymonthyearvalue.value);
+  if (daymonthyearvalue.value == 1) {
+    getreportpowerday();
+  } else if (daymonthyearvalue.value == 2) {
+    getreportpoweryearMonth();
+  } else if (daymonthyearvalue.value == 3) {
+    getreportpoweryear();
+  }
 };
 // 重置
 const onreset = () => {
@@ -701,21 +839,21 @@ const downloadxlsx = (item: string, data: other.Data) => {
 const formatTime = (time: number) => {
   return time < 10 ? `0${time}` : time; // 如果时间小于 10，在前面加上 0
 };
-const formatDate = (dateString: string | number | Date) => {
-  const date = new Date(dateString);
+// const formatDate = (dateString: string | number | Date) => {
+//   const date = new Date(dateString);
 
-  // 提取年、月、日、时、分信息
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, "0"); // 月份从0开始，需要加1，并确保是两位数
-  const day = String(date.getDate()).padStart(2, "0"); // 确保是两位数
-  const hours = String(date.getHours()).padStart(2, "0"); // 确保是两位数
-  const minutes = String(date.getMinutes()).padStart(2, "0"); // 确保是两位数
+//   // 提取年、月、日、时、分信息
+//   const year = date.getFullYear();
+//   const month = String(date.getMonth() + 1).padStart(2, "0"); // 月份从0开始，需要加1，并确保是两位数
+//   const day = String(date.getDate()).padStart(2, "0"); // 确保是两位数
+//   const hours = String(date.getHours()).padStart(2, "0"); // 确保是两位数
+//   const minutes = String(date.getMinutes()).padStart(2, "0"); // 确保是两位数
 
-  // 拼接成 "YYYY-MM-DD HH:MM" 格式
-  const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}`;
+//   // 拼接成 "YYYY-MM-DD HH:MM" 格式
+//   const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}`;
 
-  return formattedDate;
-};
+//   return formattedDate;
+// };
 const tableData = ref();
 
 // 日
@@ -755,35 +893,114 @@ const getreportpoweryear = async () => {
 
 const reportformsindex = ref(2);
 const pickertype: Ref<any> = ref("daterange");
-
 const onreportforms = (val: any) => {
   reportformsindex.value = val;
-  if (val == 2) {
+
+  if (val == 1) {
+    pickertype.value = "date";
+    starttime.value = currentDate.value;
+  } else if (val == 2) {
+    shortcuts.value = [
+      {
+        text: "过去7天",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setDate(start.getDate() - 7);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去1个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 1);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去3个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 3);
+          return [start, end];
+        }
+      }
+    ];
     pickertype.value = "daterange";
+    format.value = "YYYY-MM-DD";
     const today = new Date();
-    const currentDate = today.toLocaleDateString();
+    const currentDate = today.toISOString().split("T")[0];
     starttime.value = [currentDate, currentDate];
-    getsingleincomeday();
   } else if (val == 3) {
-    pickertype.value = "monthrange";
     const today = new Date();
-    const currentDate = today.toLocaleDateString();
-    // 获取过去 31 天的日期
-    const thirtyOneDaysAgoDate = new Date(today);
-    thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
-    const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
-    starttime.value = [thirtyOneDaysAgo, currentDate];
-    getsingleincomeyearMonth();
+    const currentDate = today.toISOString().split("T")[0];
+    const currentYearMonth = currentDate.slice(0, 7);
+    starttime.value = [currentYearMonth, currentYearMonth];
+    format.value = "YYYY-MM";
+    pickertype.value = "monthrange";
+
+    shortcuts.value = [
+      {
+        text: "本月",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去6个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 6);
+          return [start, end];
+        }
+      },
+      {
+        text: "今年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().getFullYear(), 0);
+          return [start, end];
+        }
+      }
+    ];
   } else if (val == 4) {
-    pickertype.value = "year";
     const today = new Date();
-    const currentDate = today.toLocaleDateString();
+    const currentDate = today.toISOString().split("T")[0];
     // 获取去年同月的日期
-    const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
-    const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
-    starttime.value = [lastYearSameMonth.substring(0, 4), currentDate.substring(0, 4)];
-    getsingleincomeyear();
+    starttime.value = [currentDate.substring(0, 4), currentDate.substring(0, 4)];
+    pickertype.value = "yearrange";
+    format.value = "YYYY";
+
+    shortcuts.value = [
+      {
+        text: "今年",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去1年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().setFullYear(new Date().getFullYear() - 1));
+          return [start, end];
+        }
+      },
+      {
+        text: "过去2年",
+        value: () => {
+          const start = new Date();
+          const end = new Date(new Date().setFullYear(new Date().getFullYear() - 2));
+          return [start, end];
+        }
+      }
+    ];
   }
+  onselectsite();
 };
 
 // 选择站点
@@ -802,19 +1019,19 @@ const postemsDevice = async (value: any) => {
 // 选择日期
 const starttime: Ref<any> = ref("");
 // 开始时间
-const yearstarttime = async (val: any) => {
-  if (reportformsindex.value == 1) {
-  } else if (reportformsindex.value == 2) {
-    starttime.value = [formatDate(val[0]), formatDate(val[1])];
-  } else if (reportformsindex.value == 3) {
-    starttime.value = [formatDate(val[0]), formatDate(val[1])];
-  } else if (reportformsindex.value == 4) {
-    for (let index = 0; index < val.length; index++) {
-      val[index] = formatDate(val[index]);
-    }
-    starttime.value = val;
-  }
-};
+// const yearstarttime = async (val: any) => {
+//   if (reportformsindex.value == 1) {
+//   } else if (reportformsindex.value == 2) {
+//     starttime.value = [formatDate(val[0]), formatDate(val[1])];
+//   } else if (reportformsindex.value == 3) {
+//     starttime.value = [formatDate(val[0]), formatDate(val[1])];
+//   } else if (reportformsindex.value == 4) {
+//     for (let index = 0; index < val.length; index++) {
+//       val[index] = formatDate(val[index]);
+//     }
+//     starttime.value = val;
+//   }
+// };
 
 // 查询
 const onselectsite = async () => {
@@ -929,4 +1146,6 @@ onMounted(() => {
 <style scoped lang="scss">
 @import "./index.scss";
 </style>
-<!-- -->
+<!--
+
+-->

src/views/localdata/index.scss

@@ -0,0 +1,32 @@
+.screen {
+  display: flex;
+  width: 100%;
+  margin-bottom: 20px;
+}
+.screen1 {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+}
+.cardbottom {
+  margin-top: 20px;
+}
+.title {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  font-size: 18px;
+  .title_time {
+    margin-left: 10px;
+    font-size: 16px;
+  }
+}
+.pagination {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20px;
+}
+.lexce {
+  margin-top: 20px;
+  font-size: 16px;
+}

src/views/localdata/index.vue

@@ -0,0 +1,300 @@
+<template>
+  <div>
+    <div class="title">
+      本地数据
+      <div class="title_time">{{ currentDate }}</div>
+    </div>
+    <!-- <div class="card">
+      <div class="screen">
+        <div>
+          电站&ensp;&ensp;
+          <el-select v-model="status" placeholder="选择电站" size="large" style="width: 240px" @change="postemsDevice">
+            <el-option v-for="item in cities" :key="item.id" :label="item.stationName" :value="item.id" />
+          </el-select>
+        </div>
+        <div>
+          &ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;所属设备&ensp;&ensp;
+          <el-select
+            v-model="emsDeviceId"
+            placeholder="请先选择电站在选择所属设备"
+            size="large"
+            style="width: 240px"
+            clearable
+            @change="getpostdeviceClass"
+          >
+            <el-option v-for="item in emsDevice" :key="item.id" :label="item.emsDeviceId" :value="item.id" />
+          </el-select>
+        </div>
+        <div>
+          &ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;设备类型&ensp;&ensp;
+          <el-select v-model="quipment" placeholder="请选择设备类型" size="large" style="width: 240px" clearable>
+            <el-option v-for="item in quipmentlist" :key="item.peek" :label="item.peek" :value="item.peek" />
+          </el-select>
+        </div>
+        <div>
+          &ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;标题翻译&ensp;&ensp;
+          <el-select
+            v-model="translate.user.peekType"
+            placeholder="请选择设备类型"
+            size="large"
+            style="width: 240px"
+            clearable
+            @change="ontranslate"
+          >
+            <el-option v-for="item in translatelist" :key="item.id" :label="item.value" :value="item.id" />
+          </el-select>
+        </div>
+      </div>
+      <div class="screen1">
+        <div>
+          时间范围&ensp;&ensp;
+          <el-date-picker
+            size="large"
+            v-model="timevalue"
+            :shortcuts="shortcuts"
+            type="daterange"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :default-value="timevalue"
+            :disabled-date="pickerOptions"
+            value-format="YYYY-MM-DD"
+            format="YYYY-MM-DD"
+          />
+        </div>
+        &ensp;&ensp; &ensp;&ensp;
+        <div>
+          <el-button type="primary" size="large" color="#0052d9" @click="query(0)">查询</el-button>
+          <el-button type="primary" size="large" color="#0052d9" @click="newaddition">导出</el-button>
+          <el-button size="large" @click="query(1)">重置</el-button>&ensp;&ensp;
+        </div>
+      </div>
+    </div> -->
+    <div class="card cardbottom">
+      <div>&ensp;</div>
+      <el-table
+        :data="tableData.children"
+        row-key="name"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        style="width: 100%"
+        border
+        @row-click="handleRowClick"
+      >
+        <!-- <el-table-column/> -->
+        <!-- <el-table-column width="250" :show-overflow-tooltip="true" v-for="item in head" :key="item" :prop="item" :label="item" /> -->
+        <!-- <el-table-column type="selection" width="55" :selectable="selectable" /> -->
+        <el-table-column prop="name" label="文件名称" />
+        <el-table-column prop="size" label="文件大小" />
+        <el-table-column prop="type" label="文件类型" />
+        <el-table-column label="操作" align="center" width="180">
+          <template #default="scope">
+            <el-button v-if="scope.row.type == 'file'" @click="downloadxlsx(row.name)">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 组件 -->
+      <!-- <div class="pagination">
+        <div></div>
+        <slot name="pagination">
+          <Pagination :pageable="pageable" :handle-size-change="handleSizeChange" :handle-current-change="handleCurrentChange" />
+        </slot>
+      </div> -->
+    </div>
+    <el-dialog v-model="dialogVisible" title="导出中" top="300px" width="40%" @close="handleClose">
+      <div class="lexce">{{ message }}</div>
+      <template #footer>
+        <div class="dialog-footer" v-if="excelexport">
+          <el-button v-if="excelexport.progress == 0" @click="handleClose">取消导出</el-button>
+          <el-button v-if="excelexport.progress == 3" type="primary" @click="handleClose"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<!--    -->
+<script setup lang="ts">
+import { directorylURL, stationstationName, selectaccountNumber } from "@/api/home/Multisite";
+import { onMounted, Ref, ref } from "vue";
+// import { useAuthButtons } from "@/hooks/useAuthButtons";
+// const { BUTTONS } = useAuthButtons();
+import { Station } from "@/api/interface";
+// import Pagination from "@/components/ProTable/components/Pagination.vue";
+import { TreeNode } from "element-plus";
+// import { saveAs } from "file-saver";
+// import axios from "axios";
+
+// import { useRouter } from "vue-router";
+// const router = useRouter();
+const translate = ref();
+
+const cities: Ref<Station.todo[]> = ref([]);
+
+const timevalue: Ref<any> = ref([]);
+
+const poststationstationName = async () => {
+  const { data } = await stationstationName({});
+  cities.value = data;
+};
+
+const dialogVisible = ref(false);
+const message = ref("");
+
+const timerId = ref();
+
+const excelexport = ref();
+const handleClose = async () => {
+  if (timerId.value) {
+    clearTimeout(timerId.value);
+    timerId.value = ""; // 清除引用
+    dialogVisible.value = false;
+  }
+};
+
+const tableData = ref();
+
+const head = ref();
+const pageable = ref({
+  pn: 1,
+  ps: 10,
+  total: 0
+});
+// 表格操作 Hooks
+// const handleSizeChange = async (e: any) => {
+//   pageable.value.ps = e;
+//   getplatformuserlist();
+// };
+// const handleCurrentChange = async (e: any) => {
+//   pageable.value.pn = e;
+
+//   getplatformuserlist();
+// };
+// 文件 编辑 选择
+// interface User {
+//   size: number;
+//   name: string;
+//   type: string;
+//   children?: User[];
+// }
+// const treeProps = reactive({
+//   checkStrictly: false
+// });
+// const selectable = (row: any) => {
+//   console.log(row);
+// };
+const currentPath = ref();
+const handleRowClick = (node: TreeNode) => {
+  // 获取当前点击行的所有父级名称
+  const parentNames = getParentNames(tableData.value, node, []);
+  console.log("点击的节点: ", node); // 输出当前点击节点
+  // 拼接成字符串
+  currentPath.value = parentNames?.join("/"); // 不反转顺序，确保路径是从根节点到目标节点的顺序
+  console.log("父级路径: ", currentPath.value); // 输出拼接后的父级路径
+};
+
+// 明确指定参数类型和返回类型
+const getParentNames = (currentNode: any, targetNode: any, parentNames: string[]): string[] | null => {
+  // 如果找到了目标节点
+  if (currentNode.name === targetNode.name) {
+    parentNames.push(currentNode.name); // 添加当前节点的名称到父级路径
+    return parentNames;
+  }
+
+  // 如果当前节点有子节点，递归查找
+  if (currentNode.children && currentNode.children.length) {
+    const newParentNames = [...parentNames, currentNode.name]; // 创建新的父级名称数组
+    for (let child of currentNode.children) {
+      const result = getParentNames(child, targetNode, newParentNames);
+      if (result) return result;
+    }
+  }
+
+  // 如果没有找到，返回 null
+  return null;
+};
+
+// const downloadFile = async () => {
+// setTimeout(async () => {
+//   try {
+//     const fileUrl = `https://esos-iot.bjdexn.cn/Thisitem_20241029.tar.gz`;
+//     const response = await axios.get(fileUrl, { responseType: "blob" });
+//     const fileName = "Thisitem_20241029.tar.gz".split("/").pop();
+//     saveAs(response.data, fileName);
+//   } catch (error) {
+//     console.error("下载失败:", error);
+//   }
+// }, 2000);
+// };
+// https://esos-iot.bjdexn.cn/myDeviceData/Thisitem_20241029.tar.gz
+const downloadxlsx = (name: any) => {
+  let fileUrl = `myDeviceData/${name}`;
+  let fileName = name;
+  fetch(fileUrl)
+    .then(response => response.blob())
+    .then(blob => {
+      // 创建一个临时的URL对象
+      const url = URL.createObjectURL(blob);
+      // 创建一个隐藏的<a>标签，并设置其href属性为临时URL
+      const a = document.createElement("a");
+      a.href = url;
+      a.download = fileName; // 设置下载的文件名
+      a.style.display = "none";
+      // 将<a>标签添加到文档中，并模拟点击下载
+      document.body.appendChild(a);
+      a.click();
+      // 下载完成后，移除<a>标签和临时URL对象
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
+    })
+    .catch(error => {
+      console.error("下载文件时出错:", error);
+    });
+};
+
+const getplatformuserlist = async () => {
+  // let obj = {
+  //   powerId: status.value,
+  //   eId: emsDeviceId.value,
+  //   startTime: timevalue.value[0],
+  //   endTime: timevalue.value[1],
+  //   peek: quipment.value,
+  //   pageNum: pageable.value.pn,
+  //   pageSize: pageable.value.ps
+  // };
+  const { data } = await directorylURL();
+
+  tableData.value = data;
+
+  head.value = Object.keys(tableData.value.list[0]);
+  pageable.value.total = tableData.value.page.totald;
+};
+const currentDate = ref();
+
+const selectaccountNumberlist = async () => {
+  const { data } = await selectaccountNumber({});
+  console.log(data);
+  translate.value = data;
+};
+
+onMounted(() => {
+  const current = localStorage.getItem("currentDate");
+  if (current) {
+    currentDate.value = current;
+  }
+  const today = new Date();
+  const sevenDaysAgo = new Date(today);
+  sevenDaysAgo.setDate(today.getDate() - 7);
+  const sevenDaysAgoDate = sevenDaysAgo.toISOString().split("T")[0];
+
+  timevalue.value = [currentDate.value, sevenDaysAgoDate];
+  console.log(timevalue.value);
+
+  getplatformuserlist();
+  poststationstationName();
+  selectaccountNumberlist();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
+<!--
+
+-->

src/views/login/components/LoginForm.vue

@@ -105,7 +105,7 @@ const login = (formEl: FormInstance | undefined) => {
         // 用户
         const { data } = await loginApi({
           ...loginForm,
-          rememberMe: true
+          rememberMe: false
         });
         console.log(data);
 

src/views/menu/index.vue

@@ -13,7 +13,7 @@
         <div>
           &ensp;&ensp;&ensp;&ensp;&ensp;&ensp;菜单状态&ensp;&ensp;<el-select
             v-model="visible"
-            placeholder="Select"
+            placeholder="请选择"
             size="large"
             style="width: 240px"
           >

src/views/monitor/add.vue

@@ -137,27 +137,36 @@ const groupingdata = ref([
     label: "系统"
   }
 ]);
-const submitForm = (formEl: FormInstance | undefined) => {
+const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
-  formEl.validate(async valid => {
+
+  try {
+    const valid = await formEl.validate();
+
     if (valid) {
       if (!ExpressionIsValid.value) {
         ElMessage.error("表达式不正确");
         return false;
       }
-      if (route.query.type == "任务新增") {
-        const { data } = await monitorjobadd(numberValidateForm);
-        console.log(data);
+
+      let responseData;
+
+      if (route.query.type === "任务新增") {
+        responseData = await monitorjobadd(numberValidateForm);
       } else {
-        const { data } = await monitorjobedit(numberValidateForm);
-        console.log(data);
+        responseData = await monitorjobedit(numberValidateForm);
       }
-      router.back();
+
+      console.log(responseData.data);
+      ElMessage.success("操作成功"); // Provide success feedback
+      router.back(); // Navigate back after success
     } else {
-      console.log("error submit!");
-      return false;
+      console.log("Validation failed!");
     }
-  });
+  } catch (error) {
+    console.error("Submission error:", error);
+    ElMessage.error("提交失败，请重试！"); // Optional error feedback
+  }
 };
 const ExpressionIsValid = ref();
 

src/views/overview/index.scss

@@ -1,4 +1,4 @@
-/* 去除边框 */
+// /*  */
 .title {
   margin-bottom: 20px;
   :deep(.el-select__wrapper) {
@@ -79,6 +79,7 @@
 }
 .grid_divright {
   position: absolute;
+  top: 0;
   right: 20px;
   display: flex;
   align-items: center;
@@ -311,7 +312,7 @@
   justify-content: space-between;
   width: 100%;
   height: 65px;
-  padding: 0 20px;
+  padding: 0;
   border-bottom: 1px solid #e8e8e8;
 }
 .middleleftchart {
@@ -389,3 +390,5 @@
 .dialog_name {
   border-right: 1px solid rgb(0 0 0 / 5%);
 }
+
+// 日期 尖 峰 平 股

src/views/overview/index.vue

@@ -159,20 +159,32 @@
               </div>
             </el-tabs>
             <div class="grid_divright">
-              <div :class="recentlytype == 7 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(7)">近7日</div>
+              <!-- <div :class="recentlytype == 7 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(7)">近7日</div>
               <div :class="recentlytype == 31 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(31)">近31日</div>
-              <div :class="recentlytype == 360 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(360)">近12月</div>
+              <div :class="recentlytype == 360 ? 'grid_divright_1' : 'grid_divright_2'" @click="recently(360)">近12月</div> -->
               <el-date-picker
                 v-model="value2"
-                type="daterange"
+                :type="timetype1"
+                :shortcuts="shortcuts1"
+                :format="format1"
+                :value-format="format1"
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
                 :default-value="value2"
                 :disabled-date="pickerOptions"
-                value-format="YYYY-MM-DD hh:mm:ss"
+                size="large"
                 @change="onhandleClick"
                 :default-time="defaultTime2"
               />
+              <el-select
+                v-model="daymonthyearvalue1"
+                placeholder="选择日期"
+                size="large"
+                style="width: 80px"
+                @change="getdaymonthyear1"
+              >
+                <el-option v-for="item in daymonthyear1" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </div>
           </div>
         </el-card>
@@ -220,19 +232,32 @@
             <div>综合功率</div>
 
             <div class="middle_divright">
-              <div :class="timedays == 7 ? 'middle_divright_1' : 'middle_divright_2'" @click="oncomprehen(7)">近7日</div>
+              <!-- <div :class="timedays == 7 ? 'middle_divright_1' : 'middle_divright_2'" @click="oncomprehen(7)">近7日</div>
               <div :class="timedays == 31 ? 'middle_divright_1' : 'middle_divright_2'" @click="oncomprehen(31)">近31日</div>
-              <div :class="timedays == 360 ? 'middle_divright_1' : 'middle_divright_2'" @click="oncomprehen(360)">近12月</div>
+              <div :class="timedays == 360 ? 'middle_divright_1' : 'middle_divright_2'" @click="oncomprehen(360)">近12月</div> -->
               <el-date-picker
                 v-model="timedayslist"
-                type="daterange"
+                :type="pickertype"
+                :shortcuts="shortcuts"
+                :format="format"
+                :value-format="format"
+                unlink-panels
+                size="large"
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
                 :default-value="timedayslist"
                 :disabled-date="pickerOptions"
-                value-format="YYYY-MM-DD hh:mm:ss"
                 @change="onpowerblur"
               />
+              <!-- <el-select
+                v-model="daymonthyearvalue"
+                placeholder="选择日期"
+                size="large"
+                style="width: 80px"
+                @change="getdaymonthyear"
+              >
+                <el-option v-for="item in daymonthyear" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select> -->
             </div>
           </div>
           <div class="middleleftchart" ref="comprehensive"></div>
@@ -248,7 +273,7 @@
       <div class="cardtable">
         <div>通讯状态:</div>
         &emsp;
-        <el-select v-model="onlineStatus" placeholder="Select" size="large" style="width: 240px">
+        <el-select v-model="onlineStatus" placeholder="请选择" size="large" style="width: 240px">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         &emsp;
@@ -369,8 +394,10 @@ import {
   singlestationyearMonth,
   singlestationchargingMonth,
   overallEfficiencyday,
-  overallEfficiencyyearMonth,
-  Stationinfo
+  // overallEfficiencyyearMonth,
+  Stationinfo,
+  singlestationdayMonth,
+  postsexportKwhMonth
 } from "@/api/home/Multisite";
 import { Station } from "@/api/interface";
 const multiStation = ref();
@@ -392,15 +419,16 @@ const onselect = (val: any) => {
   activeName.value = "first";
   Singledata.value = val.id;
   getStationinfo();
-  gatsinglestationday();
+  // gatsinglestationday();
   postmultiStationpagebaseInfo();
-  oncomprehen(7);
+  onhandleClick();
   getsite();
 };
+
 const cities: Ref<Station.todo[]> = ref([]);
 
 const onlineStatus = ref("");
-const recentlytype = ref(7);
+// const recentlytype = ref(7);
 const tabpropslabel = ref("收益统计");
 
 const options = ref([
@@ -417,6 +445,7 @@ const options = ref([
     label: "离线"
   }
 ]);
+
 const poststationstationName = async () => {
   const { data } = await stationstationName({});
   Singlevalue.value = data[0].id;
@@ -425,7 +454,9 @@ const poststationstationName = async () => {
   getStationinfo();
   gatsinglestationday();
   postmultiStationpagebaseInfo();
-  oncomprehen(7);
+  onpowerblur();
+
+  // oncomprehen(7);
 };
 // 选择站点
 const getsite = async () => {
@@ -444,67 +475,223 @@ const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
 };
 const defaultTime2: [Date, Date] = [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 56, 56)]; // '00:00:00', '23:56:56'
 // 查询最近数据
-const recently = (val: any) => {
-  // 获取当前日期
-  recentlytype.value = val;
 
-  const today = new Date();
-  const currentDate = today.toLocaleDateString();
+const getdaymonthyear1 = async (value: any) => {
+  daymonthyearvalue.value = value;
+  if (value == 1) {
+    timetype1.value = "daterange";
+    format1.value = "YYYY-MM-DD";
+    shortcuts1.value = [
+      {
+        text: "过去7天",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setDate(start.getDate() - 7);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去1个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 1);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去3个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 3);
+          return [start, end];
+        }
+      }
+    ];
 
-  // 获取过去 7 天的日期
-  const sevenDaysAgoDate = new Date(today);
-  sevenDaysAgoDate.setDate(today.getDate() - 7);
-  const sevenDaysAgo = sevenDaysAgoDate.toLocaleDateString();
+    const today = new Date();
+    const currentDate = today.toISOString().split("T")[0];
+    const sevenDaysAgoDate = new Date(today);
+    sevenDaysAgoDate.setDate(today.getDate() - 7);
+    const sevenDaysAgo = sevenDaysAgoDate.toLocaleDateString();
+    value2.value = [sevenDaysAgo, currentDate];
+
+    // getreportpowerday();
+  } else if (value == 2) {
+    const today = new Date();
+    const currentDate = today.toISOString().split("T")[0];
+    const currentYearMonth = currentDate.slice(0, 7);
 
-  // 获取过去 31 天的日期
-  const thirtyOneDaysAgoDate = new Date(today);
-  thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
-  const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
+    value2.value = [currentYearMonth, currentYearMonth];
+    // getreportpoweryearMonth();
 
-  // 获取去年同月的日期
-  const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
-  const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
+    timetype1.value = "monthrange";
+    format1.value = "YYYY-MM";
 
+    shortcuts1.value = [
+      {
+        text: "本月",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去6个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 6);
+          return [start, end];
+        }
+      },
+      {
+        text: "今年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().getFullYear(), 0);
+          return [start, end];
+        }
+      }
+    ];
+  } else {
+    const today = new Date();
+    const currentDate = today.toISOString().split("T")[0];
+    // 获取去年同月的日期
+    value2.value = [currentDate.substring(0, 4), currentDate.substring(0, 4)];
+    console.log(value2.value);
+    timetype1.value = "yearrange";
+    format1.value = "YYYY";
+
+    shortcuts1.value = [
+      {
+        text: "今年",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去1年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().setFullYear(new Date().getFullYear() - 1));
+          return [start, end];
+        }
+      },
+      {
+        text: "过去2年",
+        value: () => {
+          const start = new Date();
+          const end = new Date(new Date().setFullYear(new Date().getFullYear() - 2));
+          return [start, end];
+        }
+      }
+    ];
+  }
   if (tabpropslabel.value == "收益统计") {
-    if (val == 7) {
-      value2.value = [sevenDaysAgo, currentDate];
-      gatsinglestationday();
-    } else if (val == 31) {
-      value2.value = [thirtyOneDaysAgo, currentDate];
+    if (daymonthyearvalue.value == 1) {
       gatsinglestationday();
+    } else if (daymonthyearvalue.value == 2) {
+      getsinglestationdayMonth();
     } else {
-      value2.value = [lastYearSameMonth, currentDate];
       gatsinglestationyearMonth();
     }
   } else {
-    if (val == 7) {
-      value2.value = [sevenDaysAgo, currentDate];
-      getmultiStatiopower();
-    } else if (val == 31) {
-      value2.value = [thirtyOneDaysAgo, currentDate];
+    if (daymonthyearvalue.value == 1) {
       getmultiStatiopower();
+    } else if (daymonthyearvalue.value == 2) {
+      getpostsexportKwhMonth();
     } else {
-      value2.value = [lastYearSameMonth, currentDate];
       getsinglestationchargingMonth();
     }
   }
 };
+// const recently = (val: any) => {
+//   // 获取当前日期
+//   recentlytype.value = val;
+
+//   const today = new Date();
+//   const currentDate = today.toLocaleDateString();
+
+//   // 获取过去 7 天的日期
+//   const sevenDaysAgoDate = new Date(today);
+//   sevenDaysAgoDate.setDate(today.getDate() - 7);
+//   const sevenDaysAgo = sevenDaysAgoDate.toLocaleDateString();
+
+//   // 获取过去 31 天的日期
+//   const thirtyOneDaysAgoDate = new Date(today);
+//   thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
+//   const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
+
+//   // 获取去年同月的日期
+//   const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
+//   const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
+
+//   if (tabpropslabel.value == "收益统计") {
+//     if (val == 7) {
+//       value2.value = [sevenDaysAgo, currentDate];
+//       gatsinglestationday();
+//     } else if (val == 31) {
+//       value2.value = [thirtyOneDaysAgo, currentDate];
+//       gatsinglestationday();
+//     } else {
+//       value2.value = [lastYearSameMonth, currentDate];
+//       gatsinglestationyearMonth();
+//     }
+//   } else {
+//     if (val == 7) {
+//       value2.value = [sevenDaysAgo, currentDate];
+//       getmultiStatiopower();
+//     } else if (val == 31) {
+//       value2.value = [thirtyOneDaysAgo, currentDate];
+//       getmultiStatiopower();
+//     } else {
+//       value2.value = [lastYearSameMonth, currentDate];
+//       getsinglestationchargingMonth();
+//     }
+//   }
+// };
 
 // 切换收益统计与充放电统计
 const handleClick = (tab: TabsPaneContext) => {
   tabpropslabel.value = tab.props.label;
 
-  if (tab.props.label == "收益统计") {
-    gatsinglestationday();
+  if (tabpropslabel.value == "收益统计") {
+    if (daymonthyearvalue.value == 1) {
+      gatsinglestationday();
+    } else if (daymonthyearvalue.value == 2) {
+      getsinglestationdayMonth();
+    } else {
+      gatsinglestationyearMonth();
+    }
   } else {
-    getmultiStatiopower();
+    if (daymonthyearvalue.value == 1) {
+      getmultiStatiopower();
+    } else if (daymonthyearvalue.value == 2) {
+      getpostsexportKwhMonth();
+    } else {
+      getsinglestationchargingMonth();
+    }
   }
 };
 const onhandleClick = () => {
   if (tabpropslabel.value == "收益统计") {
-    gatsinglestationday();
+    if (daymonthyearvalue.value == 1) {
+      gatsinglestationday();
+    } else if (daymonthyearvalue.value == 2) {
+      getsinglestationdayMonth();
+    } else {
+      gatsinglestationyearMonth();
+    }
   } else {
-    getmultiStatiopower();
+    if (daymonthyearvalue.value == 1) {
+      getmultiStatiopower();
+    } else if (daymonthyearvalue.value == 2) {
+      getpostsexportKwhMonth();
+    } else {
+      getsinglestationchargingMonth();
+    }
   }
 };
 // 收益统计----日
@@ -519,7 +706,19 @@ const gatsinglestationday = async () => {
 
   baroptionchart(dates, profits, "收益/元");
 };
-// 收益统计------月份
+// 收益统计----月
+const getsinglestationdayMonth = async () => {
+  const { data } = await singlestationdayMonth({ startDate: value2.value[0], endDate: value2.value[1] }, Singlevalue.value);
+  const dates = [["product", "收益"]];
+  for (let index = 0; index < data.list.length; index++) {
+    dates.push([data.list[index].ymd, data.list[index].profit.toFixed()]);
+  }
+
+  const profits = [{ type: "bar" }];
+
+  baroptionchart(dates, profits, "收益/元");
+};
+// 收益统计------年份
 const gatsinglestationyearMonth = async () => {
   const { data } = await singlestationyearMonth(
     { startYearMonth: value2.value[0], endYearMonth: value2.value[1] },
@@ -547,6 +746,18 @@ const getmultiStatiopower = async () => {
   baroptionchart(dates, profits, "kWh");
 };
 // 充放电统计图
+const getpostsexportKwhMonth = async () => {
+  const { data } = await postsexportKwhMonth({ startDate: value2.value[0], endDate: value2.value[1] }, Singlevalue.value);
+  const dates = [["product", "充电", "放电"]];
+
+  for (let index = 0; index < data.length; index++) {
+    dates.push([data[index].ymd, data[index].chargeTotal.toString(), data[index].dischargeTotal.toString()]);
+  }
+  const profits = [{ type: "bar" }, { type: "bar" }];
+
+  baroptionchart(dates, profits, "kWh");
+};
+// 充放电统计图
 const getsinglestationchargingMonth = async () => {
   const { data } = await singlestationchargingMonth({ startDate: value2.value[0], endDate: value2.value[1] }, Singlevalue.value);
   const dates = [["product", "充电", "放电"]];
@@ -655,43 +866,132 @@ const handleClose = () => {
 };
 // 综合效率---------------------------------------------------------------
 const comprehensive = ref();
-const timedays = ref(7);
+// const timedays = ref(7);
 const timedayslist = ref();
+const pickertype: Ref<any> = ref("daterange");
+const daymonthyearvalue = ref(1);
+const daymonthyearvalue1 = ref(1);
+const timetype1: Ref<any> = ref("daterange");
+const format = ref("YYYY-MM-DD");
+const format1 = ref("YYYY-MM-DD");
+
+const daymonthyear1 = ref([
+  {
+    value: 1,
+    label: "按日"
+  },
+  {
+    value: 2,
+    label: "按月"
+  },
+  {
+    value: 3,
+    label: "按年"
+  }
+]);
+const shortcuts = ref([
+  {
+    text: "过去7天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setDate(start.getDate() - 7);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去1个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 1);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去3个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 3);
+      return [start, end];
+    }
+  }
+]);
+const shortcuts1 = ref([
+  {
+    text: "过去7天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setDate(start.getDate() - 7);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去1个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 1);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去3个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 3);
+      return [start, end];
+    }
+  }
+]);
 const onpowerblur = () => {
+  getdaymonthyear();
+};
+const getdaymonthyear = async () => {
+  // daymonthyearvalue.value = value;
   getcomprehensiveefficiency();
+
+  // if (daymonthyearvalue.value == 1) {
+  //   getcomprehensiveefficiency();
+  // } else if (daymonthyearvalue.value == 2) {
+  // } else {
+  //   getoverallEfficiencyyearMonth();
+  // }
 };
+// const oncomprehen = (val: number) => {
+//   // 获取当前日期
+//   timedays.value = val;
 
-const oncomprehen = (val: number) => {
-  // 获取当前日期
-  timedays.value = val;
+//   const today = new Date();
+//   const currentDate = today.toLocaleDateString();
 
-  const today = new Date();
-  const currentDate = today.toLocaleDateString();
+//   // 获取过去 7 天的日期
+//   const sevenDaysAgoDate = new Date(today);
+//   sevenDaysAgoDate.setDate(today.getDate() - 7);
+//   const sevenDaysAgo = sevenDaysAgoDate.toLocaleDateString();
 
-  // 获取过去 7 天的日期
-  const sevenDaysAgoDate = new Date(today);
-  sevenDaysAgoDate.setDate(today.getDate() - 7);
-  const sevenDaysAgo = sevenDaysAgoDate.toLocaleDateString();
+//   // 获取过去 31 天的日期
+//   const thirtyOneDaysAgoDate = new Date(today);
+//   thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
+//   const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
 
-  // 获取过去 31 天的日期
-  const thirtyOneDaysAgoDate = new Date(today);
-  thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
-  const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
-
-  // 获取去年同月的日期
-  const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
-  const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
-  if (val == 7) {
-    timedayslist.value = [sevenDaysAgo, currentDate];
-    getcomprehensiveefficiency();
-  } else if (val == 31) {
-    timedayslist.value = [thirtyOneDaysAgo, currentDate];
-    getcomprehensiveefficiency();
-  } else {
-    timedayslist.value = [lastYearSameMonth, currentDate];
-    getoverallEfficiencyyearMonth();
-  }
-};
+//   // 获取去年同月的日期
+//   const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
+//   const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
+//   if (val == 7) {
+//     timedayslist.value = [sevenDaysAgo, currentDate];
+//     getcomprehensiveefficiency();
+//   } else if (val == 31) {
+//     timedayslist.value = [thirtyOneDaysAgo, currentDate];
+//     getcomprehensiveefficiency();
+//   } else {
+//     timedayslist.value = [lastYearSameMonth, currentDate];
+//     getoverallEfficiencyyearMonth();
+//   }
+// };
 const getcomprehensiveefficiency = async () => {
   const { data } = await overallEfficiencyday(
     { startDate: timedayslist.value[0], endDate: timedayslist.value[1] },
@@ -711,27 +1011,27 @@ const getcomprehensiveefficiency = async () => {
 
   getiveefficiency(data.avgEfficiency, dates, profits);
 };
-const getoverallEfficiencyyearMonth = async () => {
-  const { data } = await overallEfficiencyyearMonth(
-    {
-      startYearMonth: timedayslist.value[0],
-      endYearMonth: timedayslist.value[1]
-    },
-    Singlevalue.value
-  );
-  const dates = [["profit", "综合效率"]];
-  for (let index = 0; index < data.list.length; index++) {
-    dates.push([data.list[index].ymd, data.list[index].overallEfficiency.toString()]);
-  }
-  const profits = [
-    {
-      type: "line",
-      showSymbol: false
-    }
-  ];
+// const getoverallEfficiencyyearMonth = async () => {
+//   const { data } = await overallEfficiencyyearMonth(
+//     {
+//       startYearMonth: timedayslist.value[0],
+//       endYearMonth: timedayslist.value[1]
+//     },
+//     Singlevalue.value
+//   );
+//   const dates = [["profit", "综合效率"]];
+//   for (let index = 0; index < data.list.length; index++) {
+//     dates.push([data.list[index].ymd, data.list[index].overallEfficiency.toString()]);
+//   }
+//   const profits = [
+//     {
+//       type: "line",
+//       showSymbol: false
+//     }
+//   ];
 
-  getiveefficiency(data.avgEfficiency, dates, profits);
-};
+//   getiveefficiency(data.avgEfficiency, dates, profits);
+// };
 const getiveefficiency = (num: any, dates: string[][], profits: { type: string }[]) => {
   const comprehensivevalue = echarts.init(comprehensive.value);
   window.addEventListener(

src/views/post/addition.vue

@@ -92,23 +92,48 @@ const numberValidateForm = reactive({
   status: "0"
 });
 
-const submitForm = (formEl: FormInstance | undefined) => {
+// const submitForm = (formEl: FormInstance | undefined) => {
+//   if (!formEl) return;
+//   formEl.validate(async valid => {
+//     if (valid) {
+//       if (route.query.type == "岗位新增") {
+//         const { data } = await platformpostadd(numberValidateForm);
+//         console.log(data);
+//       } else {
+//         const { data } = await platformpostedit(numberValidateForm);
+//         console.log(data);
+//       }
+//       router.back();
+//     } else {
+//       console.log("error submit!");
+//       return false;
+//     }
+//   });
+// };
+
+const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
-  formEl.validate(async valid => {
+
+  try {
+    const valid = await formEl.validate();
+
     if (valid) {
-      if (route.query.type == "岗位新增") {
-        const { data } = await platformpostadd(numberValidateForm);
-        console.log(data);
+      let responseData;
+
+      if (route.query.type === "岗位新增") {
+        responseData = await platformpostadd(numberValidateForm);
       } else {
-        const { data } = await platformpostedit(numberValidateForm);
-        console.log(data);
+        responseData = await platformpostedit(numberValidateForm);
       }
-      router.back();
+
+      console.log(responseData.data);
+      router.back(); // Navigate back after success
     } else {
-      console.log("error submit!");
-      return false;
+      console.log("Validation failed!");
     }
-  });
+  } catch (error) {
+    console.error("Submission error:", error);
+  }
 };
 
 const resetForm = (formEl: FormInstance | undefined) => {

src/views/post/index.vue

@@ -20,7 +20,7 @@
         <div>
           &ensp;&ensp;&ensp;&ensp;岗位状态&ensp;&ensp;<el-select
             v-model="status"
-            placeholder="Select"
+            placeholder="请选择"
             size="large"
             style="width: 240px"
           >

src/views/powerStation/addition.vue

@@ -72,8 +72,9 @@
                   v-model="selectedValue"
                   clearable
                   size="large"
-                  placeholder="请选择服务地区"
+                  :placeholder="selectedValuename"
                   @change="oncascader"
+                  @visible-change="handleVisibleChange"
                   style="width: 300px; margin-right: 20px"
                 />
               </el-form-item>
@@ -93,11 +94,10 @@
                 </el-form-item>
               </div>
             </div>
-
             <div class="elform">
-              <el-form-item label="装机功率" prop="installedPower" :rules="[{ required: true, message: '请输入装机功率' }]">
+              <el-form-item label="详细地址" prop="detailedaddress" :rules="[{ required: true, message: '请输入装机功率' }]">
                 <el-input
-                  v-model="numberValidateForm.installedPower"
+                  v-model="numberValidateForm.detailedaddress"
                   style="width: 300px"
                   size="large"
                   type="text"
@@ -116,6 +116,41 @@
                 />
               </el-form-item>
             </div>
+            <div class="elform">
+              <el-form-item label="经度" prop="longitude" :rules="[{ required: true, message: '请输入装机功率' }]">
+                <el-input
+                  v-model="numberValidateForm.longitude"
+                  style="width: 300px"
+                  size="large"
+                  type="text"
+                  placeholder="请输入装机功率"
+                  autocomplete="off"
+                />
+              </el-form-item>
+
+              <el-form-item label="经度" prop="latitude" :rules="[{ required: true, message: '请输入装机功率' }]">
+                <el-input
+                  v-model="numberValidateForm.latitude"
+                  style="width: 300px"
+                  size="large"
+                  type="text"
+                  placeholder="请输入装机容量"
+                  autocomplete="off"
+                />
+              </el-form-item>
+            </div>
+            <div class="elform">
+              <el-form-item label="装机功率" prop="installedPower" :rules="[{ required: true, message: '请输入装机功率' }]">
+                <el-input
+                  v-model="numberValidateForm.installedPower"
+                  style="width: 300px"
+                  size="large"
+                  type="text"
+                  placeholder="请输入装机功率"
+                  autocomplete="off"
+                />
+              </el-form-item>
+            </div>
             <!-- <div class="elform">
               <el-form-item label="并网点信息">
                 <el-input
@@ -211,6 +246,7 @@ const route = useRoute();
 const formRef = ref<FormInstance>();
 const supertype = ref(route.query.type);
 const selectedValue = ref([44]);
+const selectedValuename = ref("请选择地区");
 const absoluteStationPicUr1 = ref();
 const layoutPicUr1 = ref();
 const numberValidateForm = reactive({
@@ -229,10 +265,13 @@ const numberValidateForm = reactive({
   // transformer: "",
   // transformercapacity: "",
   operationDate: "", // 投运时间
-  keywordcategory: 0, // 国家id
+  Category: 0, // 国家id
   provinceCode: 0, // 省id
   cityCode: 0, // 市id
-  countyCode: 0 //区id
+  countyCode: 0, //区id
+  longitude: 0, // 经度
+  latitude: 0, //维度
+  detailedaddress: "" //详细地址
 });
 const timedate = ref();
 const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
@@ -240,32 +279,60 @@ const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
 };
 
 const submitForm = (formEl: FormInstance | undefined) => {
-  numberValidateForm.keywordcategory = selectedValue.value[0] ?? 0;
+  numberValidateForm.Category = selectedValue.value[0] ?? 0;
   numberValidateForm.provinceCode = selectedValue.value[1] ?? 0;
   numberValidateForm.cityCode = selectedValue.value[2] ?? 0;
   numberValidateForm.countyCode = selectedValue.value[3] ?? 0;
-  console.log(numberValidateForm);
 
   if (!formEl) return;
+  // formEl.validate(async valid => {
+  //   if (valid) {
+  //     if (route.query.type == "电站新增") {
+  //       // numberValidateForm.emsId;
+
+  //       numberValidateForm.url = absoluteStationPicUr1.value.map((item: { url: any }) => item.url).join(", ");
+  //       numberValidateForm.arrangementplan = layoutPicUr1.value.map((item: { url: any }) => item.url).join(", ");
+  //       const { data } = await insertpowerURL(numberValidateForm);
+  //       console.log(data);
+  //     } else {
+  //       numberValidateForm.url = absoluteStationPicUr1.value.map((item: { url: any }) => item.url).join(", ");
+  //       numberValidateForm.arrangementplan = layoutPicUr1.value.map((item: { url: any }) => item.url).join(", ");
+  //       const { data } = await updatesingleeditURL(numberValidateForm);
+  //       console.log(data);
+  //     }
+  //     router.back();
+  //   } else {
+  //     console.log("error submit!");
+  //     return false;
+  //   }
+  // });
   formEl.validate(async valid => {
     if (valid) {
-      if (route.query.type == "电站新增") {
-        // numberValidateForm.emsId;
+      // Prepare URL fields only once
+      const urls = absoluteStationPicUr1.value.map((item: { url: any }) => item.url).join(", ");
+      const arrangements = layoutPicUr1.value.map((item: { url: any }) => item.url).join(", ");
 
-        numberValidateForm.url = absoluteStationPicUr1.value.map((item: { url: any }) => item.url).join(", ");
-        numberValidateForm.arrangementplan = layoutPicUr1.value.map((item: { url: any }) => item.url).join(", ");
-        const { data } = await insertpowerURL(numberValidateForm);
-        console.log(data);
-      } else {
-        numberValidateForm.url = absoluteStationPicUr1.value.map((item: { url: any }) => item.url).join(", ");
-        numberValidateForm.arrangementplan = layoutPicUr1.value.map((item: { url: any }) => item.url).join(", ");
-        const { data } = await updatesingleeditURL(numberValidateForm);
-        console.log(data);
+      numberValidateForm.url = urls;
+      numberValidateForm.arrangementplan = arrangements;
+
+      try {
+        let responseData;
+
+        if (route.query.type === "电站新增") {
+          // Add a new power station
+          responseData = await insertpowerURL(numberValidateForm);
+        } else {
+          // Update an existing power station
+          responseData = await updatesingleeditURL(numberValidateForm);
+        }
+
+        console.log(responseData.data);
+        router.back(); // Navigate back after success
+      } catch (error) {
+        console.error("Submission error:", error);
       }
-      router.back();
     } else {
-      console.log("error submit!");
-      return false;
+      console.log("Validation failed!");
     }
   });
 };
@@ -301,18 +368,38 @@ const getghuedit = async () => {
   numberValidateForm.installedPower = yonghueditdata.value[0].installedPower;
   numberValidateForm.installedCap = yonghueditdata.value[0].installedCap;
   numberValidateForm.operationDate = yonghueditdata.value[0].operationDate;
+  numberValidateForm.longitude = yonghueditdata.value[0].longitude;
+  numberValidateForm.latitude = yonghueditdata.value[0].latitude;
+  numberValidateForm.detailedaddress = yonghueditdata.value[0].detailedaddress;
   absoluteStationPicUr1.value = [];
   for (let index = 0; index < yonghueditdata.value[0].url.length; index++) {
     absoluteStationPicUr1.value.push({
       url: yonghueditdata.value[0].url[index]
     });
   }
+
   layoutPicUr1.value = [];
   for (let index = 0; index < yonghueditdata.value[0].arrangementurl.length; index++) {
     layoutPicUr1.value.push({
       url: yonghueditdata.value[0].arrangementurl[index]
     });
   }
+
+  selectedValue.value = [];
+  if (yonghueditdata.value[0].citiesname) {
+    selectedValuename.value =
+      yonghueditdata.value[0].countriesname +
+      "/" +
+      yonghueditdata.value[0].statesname +
+      "/" +
+      yonghueditdata.value[0].citiesname +
+      "/" +
+      yonghueditdata.value[0].regionsname;
+  } else {
+    selectedValuename.value = "请选择地址";
+  }
+
+  // console.log(selectedValue.value);
   grtselectemssytem();
 };
 // 选择设备编码 ----
@@ -341,8 +428,9 @@ const countydata = ref();
 const props: CascaderProps = {
   lazy: true,
   checkStrictly: true,
-
   async lazyLoad(node, resolve) {
+    console.log(node);
+    console.log(selectedValue.value);
     if (node.level == 0) {
       // node为当前点击的节点，resolve为数据加载完成的回调(必须调用)
       let nodes: CascaderOption[] | undefined = [];
@@ -445,6 +533,31 @@ const oncascader = async (selectedValues: any) => {
   selectedValue.value = selectedValues;
   console.log(selectedValue.value);
 };
+const handleVisibleChange = async (visible: any) => {
+  if (route.query.type == "电站编辑") {
+    if (visible) {
+      selectedValue.value = [44];
+    } else {
+      if (selectedValue.value.length > 2) {
+      } else {
+        selectedValue.value = [];
+        if (yonghueditdata.value[0].citiesname) {
+          selectedValuename.value =
+            yonghueditdata.value[0].countriesname +
+            "/" +
+            yonghueditdata.value[0].statesname +
+            "/" +
+            yonghueditdata.value[0].citiesname +
+            "/" +
+            yonghueditdata.value[0].regionsname;
+        } else {
+          selectedValuename.value = "请选择地址";
+        }
+      }
+    }
+  }
+};
+
 onMounted(() => {
   if (route.query.type == "电站编辑") {
     getghuedit();
@@ -457,4 +570,6 @@ onMounted(() => {
 <style scoped lang="scss">
 @import "./addition.scss";
 </style>
-<!-- -->
+<!--
+    
+ -->

src/views/rawdata/index.scss

@@ -26,3 +26,7 @@
   justify-content: space-between;
   margin-top: 20px;
 }
+.lexce {
+  margin-top: 20px;
+  font-size: 16px;
+}

src/views/rawdata/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="title">
-      原始数据
+      云端数据
       <div class="title_time">{{ currentDate }}</div>
     </div>
     <div class="card">
@@ -31,6 +31,19 @@
             <el-option v-for="item in quipmentlist" :key="item.peek" :label="item.peek" :value="item.peek" />
           </el-select>
         </div>
+        <div>
+          &ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;&ensp;标题翻译&ensp;&ensp;
+          <el-select
+            v-model="translate.user.peekType"
+            placeholder="请选择设备类型"
+            size="large"
+            style="width: 240px"
+            clearable
+            @change="ontranslate"
+          >
+            <el-option v-for="item in translatelist" :key="item.id" :label="item.value" :value="item.id" />
+          </el-select>
+        </div>
       </div>
       <div class="screen1">
         <div>
@@ -38,12 +51,14 @@
           <el-date-picker
             size="large"
             v-model="timevalue"
+            :shortcuts="shortcuts"
             type="daterange"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             :default-value="timevalue"
             :disabled-date="pickerOptions"
             value-format="YYYY-MM-DD"
+            format="YYYY-MM-DD"
           />
         </div>
         &ensp;&ensp; &ensp;&ensp;
@@ -59,7 +74,7 @@
       <el-table :data="tableData.list" style="width: 100%" border>
         <el-table-column width="250" :show-overflow-tooltip="true" v-for="item in head" :key="item" :prop="item" :label="item" />
       </el-table>
-      <!-- 分页组件 -->
+      <!-- 分页 组件 -->
       <div class="pagination">
         <div></div>
         <slot name="pagination">
@@ -67,36 +82,57 @@
         </slot>
       </div>
     </div>
+    <el-dialog v-model="dialogVisible" title="导出中" top="300px" width="40%" @close="handleClose">
+      <div class="lexce">{{ message }}</div>
+      <template #footer>
+        <div class="dialog-footer" v-if="excelexport">
+          <el-button v-if="excelexport.progress == 0" @click="handleClose">取消导出</el-button>
+          <el-button v-if="excelexport.progress == 3" type="primary" @click="handleClose"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
-
-<!-- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-                                                                                                                                                                                                                          
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -->
-
+<!--    -->
 <script setup lang="ts">
 import {
   tdengineyuanshilURL,
   stationstationName,
   postemsSystemsingleStation,
   listexcellURL,
-  powerlistURL
+  powerlistURL,
+  listexcelURL,
+  updateURL,
+  selectaccountNumber
 } from "@/api/home/Multisite";
 import { onMounted, Ref, ref } from "vue";
 // import { useAuthButtons } from "@/hooks/useAuthButtons";
 // const { BUTTONS } = useAuthButtons();
 import { Station } from "@/api/interface";
 import Pagination from "@/components/ProTable/components/Pagination.vue";
+import { ElMessage } from "element-plus";
 
 // import { useRouter } from "vue-router";
 // const router = useRouter();
 const emsDeviceId = ref("");
 const quipment = ref("");
 const quipmentlist = ref();
+const translate = ref();
+const translatelist = ref([
+  {
+    value: "中文",
+    id: "2"
+  },
+  {
+    value: "英文",
+    id: "1"
+  }
+]);
 
 const emsDevice: Ref<any[]> = ref([]);
 
 const cities: Ref<Station.todo[]> = ref([]);
+
 const timevalue: Ref<any> = ref([]);
 
 const poststationstationName = async () => {
@@ -129,9 +165,19 @@ const query = (val: any) => {
     (emsDeviceId.value = ""), getplatformuserlist();
   }
 };
+const dialogVisible = ref(false);
+const message = ref("");
 
 const newaddition = async () => {
-  console.log(1);
+  if (timevalue.value.length == 0) {
+    console.log(timevalue.value.length == 0);
+
+    ElMessage.error("请选择时间范围！");
+    return;
+  }
+  message.value = "正在导出...";
+  dialogVisible.value = true;
+
   let obj = {
     powerId: status.value,
     eId: emsDeviceId.value,
@@ -140,11 +186,37 @@ const newaddition = async () => {
     endTime: timevalue.value[1]
   };
   const { data } = await listexcellURL(obj);
+  console.log(data);
+
+  gitlistexcelURL();
+};
+const timerId = ref();
 
-  downloadxlsx(data);
+const excelexport = ref();
+const handleClose = async () => {
+  if (timerId.value) {
+    clearTimeout(timerId.value);
+    timerId.value = ""; // 清除引用
+    dialogVisible.value = false;
+  }
 };
+const gitlistexcelURL = async () => {
+  const { data } = await listexcelURL();
+  console.log(data);
+  excelexport.value = data;
+  message.value = excelexport.value.message;
+  if (excelexport.value.progress == 0) {
+    timerId.value = setTimeout(() => {
+      gitlistexcelURL();
+    }, 2000);
+  } else if (excelexport.value.progress == 3) {
+    handleClose();
+    downloadxlsx(data);
+  }
+};
+
 const downloadxlsx = (data: any) => {
-  let fileUrl = `download/${data.msg}`;
+  let fileUrl = `download/${data.excelFileName}`;
   const date = new Date();
   const hours = formatTime(date.getHours());
   const minutes = formatTime(date.getMinutes());
@@ -193,6 +265,7 @@ const handleCurrentChange = async (e: any) => {
 
   getplatformuserlist();
 };
+// 文件 编辑 选择
 const getplatformuserlist = async () => {
   let obj = {
     powerId: status.value,
@@ -210,13 +283,64 @@ const getplatformuserlist = async () => {
   pageable.value.total = tableData.value.page.totald;
 };
 const currentDate = ref();
+const ontranslate = async (e: any) => {
+  console.log(e);
+  let obj = {
+    peekType: e
+  };
+  await updateURL(obj);
+  await getplatformuserlist();
+};
+const selectaccountNumberlist = async () => {
+  const { data } = await selectaccountNumber({});
+  console.log(data);
+  translate.value = data;
+};
+const shortcuts = [
+  {
+    text: "过去7天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setDate(start.getDate() - 7);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去1个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 1);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去3个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 3);
+      return [start, end];
+    }
+  }
+];
 onMounted(() => {
   const current = localStorage.getItem("currentDate");
   if (current) {
     currentDate.value = current;
   }
+  const today = new Date();
+  const sevenDaysAgo = new Date(today);
+  sevenDaysAgo.setDate(today.getDate() - 7);
+  const sevenDaysAgoDate = sevenDaysAgo.toISOString().split("T")[0];
+
+  timevalue.value = [currentDate.value, sevenDaysAgoDate];
+  console.log(timevalue.value);
+
   getplatformuserlist();
   poststationstationName();
+  selectaccountNumberlist();
 });
 </script>
 <style scoped lang="scss">

src/views/reportforms/index.vue

@@ -23,22 +23,37 @@
                     v-if="timetype != 'year'"
                     v-model="timepicker"
                     :type="timetype"
+                    :shortcuts="shortcuts"
+                    :format="format"
+                    :value-format="format"
                     start-placeholder="开始时间"
                     end-placeholder="结束时间"
+                    size="large"
                     :disabled-date="pickerOptions"
-                    @change="datepicker"
+                  />
+                  <el-date-picker
+                    v-if="timetype == 'year'"
+                    v-model="timepicker"
+                    type="yearrange"
+                    :format="format"
+                    :value-format="format"
+                    :shortcuts="shortcuts"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
                     size="large"
+                    :disabled-date="pickerOptions"
                   />
-                  <YearPicker
+                  <!-- <YearPicker
                     v-if="timetype == 'year'"
                     style="width: 300px"
                     ref="statisticPicker"
                     :label-width="50"
+                    :shortcuts="shortcuts"
                     :init-year="dateValue"
                     :start-year1="timepicker[0]"
                     :end-year2="timepicker[1]"
                     @update-time-range="updateStatisticYear"
-                  />
+                  /> -->
                   <el-select
                     v-model="daymonthyearvalue"
                     placeholder="选择日期"
@@ -128,13 +143,28 @@
                   v-if="pickertype != 'year'"
                   v-model="starttime"
                   :type="pickertype"
-                  placeholder="选择时间"
+                  :shortcuts="shortcuts"
+                  :format="format"
+                  :value-format="format"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
                   size="large"
                   clearable
                   :disabled-date="pickerOptions"
-                  @change="yearstarttime"
                 />
-                <YearPicker
+                <el-date-picker
+                  v-if="pickertype == 'year'"
+                  v-model="starttime"
+                  type="yearrange"
+                  :format="format"
+                  :value-format="format"
+                  :shortcuts="shortcuts"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  size="large"
+                  :disabled-date="pickerOptions"
+                />
+                <!-- <YearPicker
                   v-if="pickertype == 'year'"
                   style="width: 300px"
                   ref="statisticPicker"
@@ -143,7 +173,7 @@
                   :start-year1="starttime[0]"
                   :end-year2="starttime[1]"
                   @update-time-range="updateStatisticYear1"
-                />
+                /> -->
               </div>
               &ensp;&ensp;
 
@@ -309,7 +339,7 @@
 </template>
 <!--    
   
--->
+ -->
 <script setup lang="ts">
 import { onMounted, Ref, ref } from "vue";
 import {
@@ -333,7 +363,7 @@ import {
 } from "@/api/home/Multisite";
 import { useAuthButtons } from "@/hooks/useAuthButtons";
 const { BUTTONS } = useAuthButtons();
-import YearPicker from "@/components/year/index.vue";
+// import YearPicker from "@/components/year/index.vue";
 import * as echarts from "echarts";
 import { other, Station } from "@/api/interface";
 // 汇总表头
@@ -503,36 +533,24 @@ const timepicker: Ref<any> = ref([]);
 const timetype: Ref<any> = ref("daterange");
 const handleClick = async (val: any) => {
   if (val.props.name == "站点汇总") {
-    const today = new Date();
-    const currentDate = today.toISOString().split("T")[0];
-    timepicker.value = [currentDate, currentDate];
-    getreportpowerday();
+    getdaymonthyear(1);
+    gatSummary();
   } else {
-    chartindex.value = 1;
     await poststationstationName();
     await onreportforms(2);
   }
 };
-//可选择区间，initYear传参，不传则所有年份有效，小于0判断一下？
-const dateValue = ref<any>({ startYear: 2000, endYear: new Date().getFullYear() });
-//选完/输入完成的回调
-const updateStatisticYear: any = (startYear: number, endYear: number) => {
-  timepicker.value = [startYear + "", endYear + ""];
-  getreportpoweryear();
-};
-const updateStatisticYear1: any = (startYear: number, endYear: number) => {
-  starttime.value = [startYear + "", endYear + ""];
-  getelectricitylevelyear();
-};
 
 // 格式化时间
 const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
   return time.getTime(new Date()) > Date.now();
 };
 // 选择时间
-const datepicker = (val: any) => {
-  timepicker.value = [formatDate(val[0]), formatDate(val[1])];
-};
+// const datepicker = (val: any) => {
+//   console.log(timepicker.value);
+
+//   timepicker.value = [formatDate(val[0]), formatDate(val[1])];
+// };
 // 选择日期
 
 const daymonthyearvalue = ref(1);
@@ -550,40 +568,155 @@ const daymonthyear = ref([
     label: "按年"
   }
 ]);
+const shortcuts = ref([
+  {
+    text: "过去7天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setDate(start.getDate() - 7);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去1个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 1);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去3个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 3);
+      return [start, end];
+    }
+  }
+]);
+const format = ref("YYYY-MM-DD");
 const getdaymonthyear = async (value: any) => {
   daymonthyearvalue.value = value;
   if (value == 1) {
     timetype.value = "daterange";
+    format.value = "YYYY-MM-DD";
+    shortcuts.value = [
+      {
+        text: "过去7天",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setDate(start.getDate() - 7);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去1个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 1);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去3个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 3);
+          return [start, end];
+        }
+      }
+    ];
     const today = new Date();
     const currentDate = today.toISOString().split("T")[0];
     timepicker.value = [currentDate, currentDate];
-    getreportpowerday();
+    // getreportpowerday();
   } else if (value == 2) {
-    timetype.value = "monthrange";
-
     const today = new Date();
     const currentDate = today.toISOString().split("T")[0];
-    // 获取过去 31 天的日期
-    const thirtyOneDaysAgoDate = new Date(today);
-    thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
-    const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
-    timepicker.value = [thirtyOneDaysAgo, currentDate];
-    getreportpoweryearMonth();
+    const currentYearMonth = currentDate.slice(0, 7);
+
+    timepicker.value = [currentYearMonth, currentYearMonth];
+    // getreportpoweryearMonth();
+    timetype.value = "monthrange";
+    format.value = "YYYY-MM";
+
+    shortcuts.value = [
+      {
+        text: "本月",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去6个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 6);
+          return [start, end];
+        }
+      },
+      {
+        text: "今年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().getFullYear(), 0);
+          return [start, end];
+        }
+      }
+    ];
   } else {
     const today = new Date();
     const currentDate = today.toISOString().split("T")[0];
     // 获取去年同月的日期
-    const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
-    const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
-    timepicker.value = [lastYearSameMonth.substring(0, 4), currentDate.substring(0, 4)];
+    timepicker.value = [currentDate.substring(0, 4), currentDate.substring(0, 4)];
+    console.log(timepicker.value);
+    timetype.value = "yearrange";
+    format.value = "YYYY";
 
-    timetype.value = "year";
-    getreportpoweryear();
+    shortcuts.value = [
+      {
+        text: "今年",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去1年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().setFullYear(new Date().getFullYear() - 1));
+          return [start, end];
+        }
+      },
+      {
+        text: "过去2年",
+        value: () => {
+          const start = new Date();
+          const end = new Date(new Date().setFullYear(new Date().getFullYear() - 2));
+          return [start, end];
+        }
+      }
+    ];
+    // getreportpoweryear();
   }
 };
 // 查询
 const gatSummary = () => {
-  getdaymonthyear(daymonthyearvalue.value);
+  // getdaymonthyear(daymonthyearvalue.value);
+  if (daymonthyearvalue.value == 1) {
+    getreportpowerday();
+  } else if (daymonthyearvalue.value == 2) {
+    getreportpoweryearMonth();
+  } else if (daymonthyearvalue.value == 3) {
+    getreportpoweryear();
+  }
 };
 // 重置
 const onreset = () => {
@@ -789,21 +922,19 @@ const downloadxlsx = (item: string, data: other.Data) => {
 const formatTime = (time: number) => {
   return time < 10 ? `0${time}` : time; // 如果时间小于 10，在前面加上 0
 };
-const formatDate = (dateString: string | number | Date) => {
-  const date = new Date(dateString);
+// const formatDate = (dateString: string | number | Date) => {
+//   const date = new Date(dateString);
 
-  // 提取年、月、日、时、分信息
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, "0"); // 月份从0开始，需要加1，并确保是两位数
-  const day = String(date.getDate()).padStart(2, "0"); // 确保是两位数
-  const hours = String(date.getHours()).padStart(2, "0"); // 确保是两位数
-  const minutes = String(date.getMinutes()).padStart(2, "0"); // 确保是两位数
+//   // 提取年、月、日、时、分信息
+//   const year = date.getFullYear();
+//   const month = String(date.getMonth() + 1).padStart(2, "0"); // 月份从0开始，需要加1，并确保是两位数
+//   const day = String(date.getDate()).padStart(2, "0"); // 确保是两位数
 
-  // 拼接成 "YYYY-MM-DD HH:MM" 格式
-  const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}`;
+//   // 拼接成 "YYYY-MM-DD HH:MM" 格式
+//   const formattedDate = `${year}-${month}-${day}`;
 
-  return formattedDate;
-};
+//   return formattedDate;
+// };
 const tableData = ref();
 // 日
 const getreportpowerday = async () => {
@@ -855,26 +986,106 @@ const onreportforms = (val: any) => {
     pickertype.value = "date";
     starttime.value = currentDate.value;
   } else if (val == 2) {
+    shortcuts.value = [
+      {
+        text: "过去7天",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setDate(start.getDate() - 7);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去1个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 1);
+          return [start, end];
+        }
+      },
+      {
+        text: "过去3个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 3);
+          return [start, end];
+        }
+      }
+    ];
     pickertype.value = "daterange";
+    format.value = "YYYY-MM-DD";
     const today = new Date();
     const currentDate = today.toISOString().split("T")[0];
     starttime.value = [currentDate, currentDate];
   } else if (val == 3) {
-    pickertype.value = "monthrange";
     const today = new Date();
     const currentDate = today.toISOString().split("T")[0];
-    const thirtyOneDaysAgoDate = new Date(today);
-    thirtyOneDaysAgoDate.setDate(today.getDate() - 31);
-    const thirtyOneDaysAgo = thirtyOneDaysAgoDate.toLocaleDateString();
-    starttime.value = [thirtyOneDaysAgo, currentDate];
+    const currentYearMonth = currentDate.slice(0, 7);
+    starttime.value = [currentYearMonth, currentYearMonth];
+    format.value = "YYYY-MM";
+    pickertype.value = "monthrange";
+
+    shortcuts.value = [
+      {
+        text: "本月",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去6个月",
+        value: () => {
+          const end = new Date();
+          const start = new Date();
+          start.setMonth(start.getMonth() - 6);
+          return [start, end];
+        }
+      },
+      {
+        text: "今年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().getFullYear(), 0);
+          return [start, end];
+        }
+      }
+    ];
   } else if (val == 4) {
-    pickertype.value = "year";
     const today = new Date();
     const currentDate = today.toISOString().split("T")[0];
     // 获取去年同月的日期
-    const lastYearSameMonthDate = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
-    const lastYearSameMonth = lastYearSameMonthDate.toLocaleDateString();
-    starttime.value = [lastYearSameMonth.substring(0, 4), currentDate.substring(0, 4)];
+    starttime.value = [currentDate.substring(0, 4), currentDate.substring(0, 4)];
+    pickertype.value = "yearrange";
+    format.value = "YYYY";
+
+    shortcuts.value = [
+      {
+        text: "今年",
+        value: () => {
+          return [new Date(), new Date()];
+        }
+      },
+      {
+        text: "过去1年",
+        value: () => {
+          const end = new Date();
+          const start = new Date(new Date().setFullYear(new Date().getFullYear() - 1));
+          return [start, end];
+        }
+      },
+      {
+        text: "过去2年",
+        value: () => {
+          const start = new Date();
+          const end = new Date(new Date().setFullYear(new Date().getFullYear() - 2));
+          return [start, end];
+        }
+      }
+    ];
+
     getelectricitylevelyear();
   }
   reportformsindex.value = val;
@@ -923,29 +1134,30 @@ const postemsDevice = async (value: any) => {
 // 选择日期starttime
 const starttime: Ref<any> = ref("");
 // 开始时间
-const yearstarttime = async (val: any) => {
-  console.log(val);
+// const yearstarttime = async (val: any) => {
+//   console.log(val);
 
-  if (reportformsindex.value == 1) {
-    starttime.value = formatDate(val);
-  } else if (reportformsindex.value == 2) {
-    starttime.value = [formatDate(val[0]), formatDate(val[1])];
-  } else if (reportformsindex.value == 3) {
-    starttime.value = [formatDate(val[0]), formatDate(val[1])];
-  } else if (reportformsindex.value == 4) {
-    for (let index = 0; index < val.length; index++) {
-      val[index] = formatDate(val[index]);
-    }
-    starttime.value = val;
-  }
-};
+//   if (reportformsindex.value == 1) {
+//     starttime.value = formatDate(val);
+//   } else if (reportformsindex.value == 2) {
+//     starttime.value = [formatDate(val[0]), formatDate(val[1])];
+//   } else if (reportformsindex.value == 3) {
+//     starttime.value = [formatDate(val[0]), formatDate(val[1])];
+//   } else if (reportformsindex.value == 4) {
+//     for (let index = 0; index < val.length; index++) {
+//       val[index] = formatDate(val[index]);
+//     }
+//     starttime.value = val;
+//   }
+// };
 // 查询-文件夹
 const onselectsite = async () => {
   onreportformsid(reportformsindex.value);
 };
 // 重置
 const onselectreset = async () => {
-  onreportformsid(1);
+  // onreportformsid(1);
+  await onreportforms(2);
 };
 
 const singleexport = async () => {
@@ -1406,6 +1618,7 @@ const getelectricitylevelyear = async () => {
     };
   });
 };
+
 onMounted(() => {
   const current = localStorage.getItem("currentDate");
   if (current) {

src/views/role/addition.vue

@@ -163,35 +163,66 @@ const numberValidateForm: FormState = reactive({
 
 const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) return;
+  // formEl.validate(async valid => {
+  //   if (valid) {
+  //     if (route.query.type == "角色新增") {
+  //       let obj = {
+  //         roleName: numberValidateForm.roleName,
+  //         roleKey: numberValidateForm.roleKey,
+  //         roleSort: numberValidateForm.roleSort,
+  //         status: numberValidateForm.status ? 0 : 1,
+  //         remark: numberValidateForm.remark,
+  //         menuIds: numberValidateForm.departmentId.toString()
+  //       };
+  //       const { data } = await platformroleadd(obj);
+  //       console.log(data);
+  //     } else {
+  //       let obj = {
+  //         roleName: numberValidateForm.roleName,
+  //         roleKey: numberValidateForm.roleKey,
+  //         roleSort: numberValidateForm.roleSort,
+  //         status: numberValidateForm.status ? 0 : 1,
+  //         remark: numberValidateForm.remark,
+  //         menuIds: numberValidateForm.departmentId.toString(),
+  //         id: route.query.id
+  //       };
+  //       const { data } = await platformroleedit(obj);
+  //       console.log(data);
+  //     }
+  //     router.back();
+  //   } else {
+  //     return false;
+  //   }
+  // });
   formEl.validate(async valid => {
     if (valid) {
-      if (route.query.type == "角色新增") {
-        let obj = {
-          roleName: numberValidateForm.roleName,
-          roleKey: numberValidateForm.roleKey,
-          roleSort: numberValidateForm.roleSort,
-          status: numberValidateForm.status ? 0 : 1,
-          remark: numberValidateForm.remark,
-          menuIds: numberValidateForm.departmentId.toString()
-        };
-        const { data } = await platformroleadd(obj);
-        console.log(data);
-      } else {
-        let obj = {
-          roleName: numberValidateForm.roleName,
-          roleKey: numberValidateForm.roleKey,
-          roleSort: numberValidateForm.roleSort,
-          status: numberValidateForm.status ? 0 : 1,
-          remark: numberValidateForm.remark,
-          menuIds: numberValidateForm.departmentId.toString(),
-          id: route.query.id
-        };
-        const { data } = await platformroleedit(obj);
-        console.log(data);
+      // Common object structure
+      const obj = {
+        roleName: numberValidateForm.roleName,
+        roleKey: numberValidateForm.roleKey,
+        roleSort: numberValidateForm.roleSort,
+        status: numberValidateForm.status ? 0 : 1,
+        remark: numberValidateForm.remark,
+        menuIds: numberValidateForm.departmentId.toString(),
+        ...(route.query.type === "角色编辑" && { id: route.query.id }) // Conditionally add ID for editing
+      };
+
+      try {
+        let responseData;
+
+        if (route.query.type === "角色新增") {
+          responseData = await platformroleadd(obj);
+        } else {
+          responseData = await platformroleedit(obj);
+        }
+
+        console.log(responseData.data);
+        router.back(); // Navigate back after success
+      } catch (error) {
+        console.error("Submission error:", error);
       }
-      router.back();
     } else {
-      return false;
+      console.log("Validation failed!");
     }
   });
 };

src/views/role/index.vue

@@ -20,7 +20,7 @@
         <div>
           &ensp;&ensp;&ensp;&ensp;&ensp;&ensp;角色状态&ensp;&ensp;<el-select
             v-model="status"
-            placeholder="Select"
+            placeholder="请选择"
             size="large"
             style="width: 240px"
           >
@@ -33,7 +33,10 @@
           创建时间&ensp;&ensp;<el-date-picker
             v-model="createTime"
             type="daterange"
+            :shortcuts="shortcuts"
             size="large"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             :default-value="timedate"
@@ -74,7 +77,9 @@
     </div>
   </div>
 </template>
+<!--  
 
+-->
 <script setup lang="ts">
 import { platformrolelist, platformroleremove } from "@/api/home/Multisite";
 import { useHandleData } from "@/hooks/useHandleData";
@@ -83,6 +88,35 @@ import { useRouter } from "vue-router";
 import { useAuthButtons } from "@/hooks/useAuthButtons";
 const { BUTTONS } = useAuthButtons();
 const router = useRouter();
+const shortcuts = ref([
+  {
+    text: "过去7天",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setDate(start.getDate() - 7);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去1个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 1);
+      return [start, end];
+    }
+  },
+  {
+    text: "过去3个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setMonth(start.getMonth() - 3);
+      return [start, end];
+    }
+  }
+]);
 const options = ref([
   {
     value: "",

src/views/toconfigurevalue/index.vue

@@ -1,32 +1,25 @@
 <template>
   <div>
     <div class="title">
-      通信管理
+      采集点管理
       <div class="title_time">{{ currentDate }}</div>
     </div>
     <div class="card content-box">
       <div class="elform1">
         <div class="elformadd">
-          <el-button type="primary" color="#0052d9" @click="addNewRow">新增行</el-button>
+          <el-button type="primary" color="#0052d9" @click="addNewRow">一键同步</el-button>
         </div>
 
         <el-table :data="tableData" border style="width: 100%" @row-click="handleRowClick">
-          <el-table-column prop="mysqlName" label="mysqlName" width="240">
+          <el-table-column prop="peekEnglish" label="peekEnglish/英文" width="340">
             <template #default="scope">
-              <el-input
-                v-model="scope.row.mysqlName"
-                :disabled="getdisabled(scope.row.mysqlName)"
-                @blur="handleadd(scope.$index, scope.row)"
-              ></el-input>
+              <el-input v-model="scope.row.peekEnglish" disabled></el-input>
             </template>
           </el-table-column>
-          <el-table-column prop="tdengineName" label="tdengineName" width="240">
+          <el-table-column prop="peekChinese" label="peekChinese/中文" width="340">
             <template #default="scope">
-              <el-input
-                v-model="scope.row.tdengineName"
-                :disabled="getdisabled(scope.row.mysqlName)"
-                @blur="handleadds(scope.$index, scope.row)"
-              ></el-input>
+              <el-input v-model="scope.row.peekChinese" @blur="handleadds(scope.$index, scope.row)"></el-input>
+              <!-- :disabled="getdisabled(scope.row.peekChinese)" -->
             </template>
           </el-table-column>
           <!-- <el-table-column label="操作" align="center" width="240">
@@ -40,65 +33,46 @@
     </div>
   </div>
 </template>
-<!--    -->
+<!--
+ -->
+
 <script setup lang="ts">
 import { onMounted, ref } from "vue";
-import { nextTick } from "vue";
-import { selectAllURL, updateMysqlTDengineURL } from "@/api/home/Multisite";
+// import { nextTick } from "vue";
+import { selectpeekURL, updatepeekURL, insertpeekURL } from "@/api/home/Multisite";
 import { ElMessage } from "element-plus";
 
 interface TableData {
-  mysqlName: string;
-  tdengineName: string;
+  peekEnglish: string;
+  peekChinese: string;
 }
 const tableData = ref();
 // 新增行
-const addNewRow = () => {
-  const newRow = ref<TableData>({
-    mysqlName: "",
-    tdengineName: ""
-  });
-  tableData.value.push(newRow.value);
+const addNewRow = async () => {
+  // const newRow = ref<TableData>({
+  //   peekEnglish: "",
+  //   peekChinese: ""
+  // });
+  // tableData.value.push(newRow.value);
 
-  nextTick(() => {
-    const tableBody = document.querySelector(".el-table__body-wrapper");
-    if (tableBody) {
-      tableBody.scrollTop = tableBody.scrollHeight;
-    }
-  });
-};
-const handleadd = async (
-  index: number,
-  row: {
-    mysqlName: any;
-    id: any;
-  }
-) => {
-  // 处理编辑逻辑，例如更新数据源或发送请求
-  let obj = {
-    id: row.id,
-    TDengienName: "",
-    MysqlName: row.mysqlName
-  };
-  const { data } = await updateMysqlTDengineURL(obj);
-  if (data) {
-    ElMessage({
-      message: "保存成功",
-      type: "success"
-    });
-  } else {
-    ElMessage.error("保存失败");
-  }
+  // nextTick(() => {
+  //   const tableBody = document.querySelector(".el-table__body-wrapper");
+  //   if (tableBody) {
+  //     tableBody.scrollTop = tableBody.scrollHeight;
+  //   }
+  // });
+  await insertpeekURL({});
+  await getdata();
 };
-const handleadds = async (index: number, row: { id: any; tdengineName: any }) => {
+
+const handleadds = async (index: number, row: { peekChinese: any; peekEnglish: any }) => {
   // 处理编辑逻辑，例如更新数据源或发送请求
   console.log(index, row);
   let obj = {
-    id: row.id,
-    TDengienName: row.tdengineName,
-    MysqlName: ""
+    peekChinese: row.peekChinese,
+    peekEnglish: row.peekEnglish
   };
-  const { data } = await updateMysqlTDengineURL(obj);
+  const { data } = await updatepeekURL(obj);
   if (data) {
     ElMessage({
       message: "保存成功",
@@ -108,21 +82,21 @@ const handleadds = async (index: number, row: { id: any; tdengineName: any }) =>
     ElMessage.error("保存失败");
   }
 };
-const getdisabled = (val: any) => {
-  if (val == "ts") {
-    return true;
-  } else {
-    return false;
-  }
-  console.log(val);
-};
+// const getdisabled = (val: any) => {
+//   if (val == "ts") {
+//     return true;
+//   } else {
+//     return false;
+//   }
+//   console.log(val);
+// };
 const handleRowClick = (row: TableData) => {
   console.log(row);
 
   // 点击行的处理逻辑，可以根据实际情况进行实现
 };
 const getdata = async () => {
-  const { data } = await selectAllURL({});
+  const { data } = await selectpeekURL({});
   console.log(data);
 
   tableData.value = data;
@@ -134,10 +108,10 @@ const getdata = async () => {
 
 //   let obj = {
 //     id: row.row.id,
-//     TDengienName: row.row.tdengineName,
-//     MysqlName: row.row.mysqlName
+//     peekChinese: row.row.peekChinese,
+//     peekEnglish: row.row.peekEnglish
 //   };
-//   const { data } = await updateMysqlTDengineURL(obj);
+//   const { data } = await updatepeekURL(obj);
 //   if (data) {
 //     ElMessage({
 //       message: "保存成功",
@@ -166,4 +140,6 @@ onMounted(() => {
 <style scoped lang="scss">
 @import "./index.scss";
 </style>
-<!-- -->
+<!--
+
+-->

src/views/user/addition.vue

@@ -273,61 +273,99 @@ const numberValidateForm = reactive<FormData>({
 const submitForm = (formEl: FormInstance | undefined) => {
   console.log(formEl);
   if (!formEl) return;
+  // formEl.validate(async valid => {
+  //   if (valid) {
+  //     if (route.query.type == "用户新增") {
+  //       const obj = {
+  //         userName: numberValidateForm.userName,
+  //         deptId: numberValidateForm.deptId,
+  //         phonenumber: numberValidateForm.phonenumber,
+  //         email: numberValidateForm.email,
+  //         loginName: numberValidateForm.loginName,
+  //         password: numberValidateForm.password,
+  //         sex: numberValidateForm.sex,
+  //         status: numberValidateForm.status ? 0 : 1,
+  //         postIds: numberValidateForm.postIds.toString(),
+  //         roleIds: numberValidateForm.roleIds.toString(),
+  //         remark: numberValidateForm.remark,
+  //         powerId: numberValidateForm.departmentId.toString(),
+  //         sendTime: numberValidateForm.emailTypetime,
+  //         emailType: numberValidateForm.emailType
+  //       };
+
+  //       const { data } = await platformadd(obj);
+  //       // let objobj = {
+  //       //   powerId: numberValidateForm.departmentId.toString()
+  //       // };
+  //       // const { data: res } = await savetenantpower(route.query.id, objobj);
+  //       // console.log(res);
+
+  //       console.log(data);
+  //     } else {
+  //       const obj = {
+  //         userName: numberValidateForm.userName,
+  //         deptId: numberValidateForm.deptId,
+  //         phonenumber: numberValidateForm.phonenumber,
+  //         email: numberValidateForm.email,
+  //         loginName: numberValidateForm.loginName,
+  //         // password: "",
+  //         sex: numberValidateForm.sex,
+  //         status: numberValidateForm.status ? 0 : 1,
+  //         postIds: numberValidateForm.postIds.toString(),
+  //         roleIds: numberValidateForm.roleIds.toString(),
+  //         remark: numberValidateForm.remark,
+  //         id: route.query.id,
+  //         powerId: numberValidateForm.departmentId.toString(),
+  //         sendTime: numberValidateForm.emailTypetime,
+  //         emailType: numberValidateForm.emailType
+  //       };
+
+  //       const { data } = await platformedit(obj);
+  //       console.log(data);
+  //     }
+
+  //     router.back();
+  //   } else {
+  //     console.log("error submit!");
+  //     return false;
+  //   }
+  // });
   formEl.validate(async valid => {
     if (valid) {
-      if (route.query.type == "用户新增") {
-        const obj = {
-          userName: numberValidateForm.userName,
-          deptId: numberValidateForm.deptId,
-          phonenumber: numberValidateForm.phonenumber,
-          email: numberValidateForm.email,
-          loginName: numberValidateForm.loginName,
-          password: numberValidateForm.password,
-          sex: numberValidateForm.sex,
-          status: numberValidateForm.status ? 0 : 1,
-          postIds: numberValidateForm.postIds.toString(),
-          roleIds: numberValidateForm.roleIds.toString(),
-          remark: numberValidateForm.remark,
-          powerId: numberValidateForm.departmentId.toString(),
-          sendTime: numberValidateForm.emailTypetime,
-          emailType: numberValidateForm.emailType
-        };
+      // Common object structure
+      const obj = {
+        userName: numberValidateForm.userName,
+        deptId: numberValidateForm.deptId,
+        phonenumber: numberValidateForm.phonenumber,
+        email: numberValidateForm.email,
+        loginName: numberValidateForm.loginName,
+        sex: numberValidateForm.sex,
+        status: numberValidateForm.status ? 0 : 1,
+        postIds: numberValidateForm.postIds.toString(),
+        roleIds: numberValidateForm.roleIds.toString(),
+        remark: numberValidateForm.remark,
+        powerId: numberValidateForm.departmentId.toString(),
+        sendTime: numberValidateForm.emailTypetime,
+        emailType: numberValidateForm.emailType,
+        ...(route.query.type === "用户编辑" && { id: route.query.id }) // Conditionally add ID for editing
+      };
 
-        const { data } = await platformadd(obj);
-        // let objobj = {
-        //   powerId: numberValidateForm.departmentId.toString()
-        // };
-        // const { data: res } = await savetenantpower(route.query.id, objobj);
-        // console.log(res);
+      try {
+        let responseData;
 
-        console.log(data);
-      } else {
-        const obj = {
-          userName: numberValidateForm.userName,
-          deptId: numberValidateForm.deptId,
-          phonenumber: numberValidateForm.phonenumber,
-          email: numberValidateForm.email,
-          loginName: numberValidateForm.loginName,
-          // password: "",
-          sex: numberValidateForm.sex,
-          status: numberValidateForm.status ? 0 : 1,
-          postIds: numberValidateForm.postIds.toString(),
-          roleIds: numberValidateForm.roleIds.toString(),
-          remark: numberValidateForm.remark,
-          id: route.query.id,
-          powerId: numberValidateForm.departmentId.toString(),
-          sendTime: numberValidateForm.emailTypetime,
-          emailType: numberValidateForm.emailType
-        };
+        if (route.query.type === "用户新增") {
+          responseData = await platformadd(obj);
+        } else {
+          responseData = await platformedit(obj);
+        }
 
-        const { data } = await platformedit(obj);
-        console.log(data);
+        console.log(responseData.data);
+        router.back(); // Navigate back after success
+      } catch (error) {
+        console.error("Submission error:", error);
       }
-
-      router.back();
     } else {
-      console.log("error submit!");
-      return false;
+      console.log("Validation failed!");
     }
   });
 };

src/views/user/index.vue

@@ -124,7 +124,8 @@
     </el-dialog>
   </div>
 </template>
-<!--    -->
+<!--  
+-->
 <script setup lang="ts">
 import { useHandleData } from "@/hooks/useHandleData.js";
 import { ref, onMounted, reactive } from "vue";

src/views/userinformation/index.vue

@@ -33,7 +33,7 @@
         推送类型：<span class="user_div">
           <div v-if="userdata.user.emailType == 0">暂不发送</div>
           <div v-if="userdata.user.emailType == 1">详细邮件</div>
-          <div v-if="userdata.user.emailType == 2">简约邮件</div>
+          <div v-if="userdata.user.emailType == 2">简易邮件</div>
         </span>
         &nbsp; &nbsp; &nbsp; &nbsp;
         <el-button :icon="Share" @click="dialogemailType = true">修改</el-button>
@@ -121,7 +121,7 @@ const getplatformuserlist = async () => {
         label: "暂不发送邮件"
       },
       {
-        value: "1",
+        value: "2",
         label: "发送邮件"
       }
     ];
@@ -133,11 +133,11 @@ const getplatformuserlist = async () => {
       },
       {
         value: "1",
-        label: "简易邮件"
+        label: "详细邮件"
       },
       {
         value: "2",
-        label: "详细邮件"
+        label: "简易邮件"
       }
     ];
   }
@@ -202,6 +202,7 @@ const postersmailType = async () => {
     getplatformuserlist();
   });
 };
+
 //
 onMounted(() => {
   const current = localStorage.getItem("currentDate");