增加上传图片功能修复已知问题

.env.development

@@ -17,7 +17,7 @@ VITE_API_URL = /api
 
 # 开发环境接口地址
 # 开发环境跨域代理，支持配置多个 http://192.168.8.198:8888
-# VITE_PROXY = [["/api","http://192.168.8.172:8888"]]
+# VITE_PROXY = [["/api","http://192.168.8.131:8888"]]
 # VITE_PROXY = [["/api","http://zlink.bjdexn.cn:8888"]]
 
 VITE_PROXY = [["/api","https://esos-iot.bjdexn.cn"]]

.vscode/settings.json

@@ -63,8 +63,10 @@
     "Gitee",
     "hexs",
     "iconfont",
+    "imonth",
     "incomeforms",
     "informationtype",
+    "insertschedule",
     "juejin",
     "liquidfill",
     "longpress",
@@ -83,6 +85,7 @@
     "reportforms",
     "reportpowerday",
     "screenfull",
+    "selectaccount",
     "Singlevalue",
     "sortablejs",
     "sousuo",
@@ -122,5 +125,6 @@
     "src\\views\\monitor\\index.vue": ["末次数据时间：{{ pcslist.ts }}"],
     "src\\views\\department\\addition.vue": ["女"]
   },
-  "i18n-ally.extract.ignored": ["设备状态"]
+  "i18n-ally.extract.ignored": ["设备状态"],
+  "vue3snippets.enable-compile-vue-file-on-did-save-code": false
 }

CHANGELOG.md

@@ -1,254 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-## [1.2.0](https://github.com/HalseySpicy/Geeker-Admin/compare/v1.1.0...v1.2.0) (2023-09-15)
-
-
-### Features
-
-* 🚀 update and optimize project content ([17bc017](https://github.com/HalseySpicy/Geeker-Admin/commit/17bc017c5abbd2c87813d6c6f9d587ddf9d57da7))
-* 🚀 upgrade plugins and add tab functionality ([f21a41d](https://github.com/HalseySpicy/Geeker-Admin/commit/f21a41d8df44efe5216dec39bf4abf0ea86a7781))
-
-## [1.1.0](https://github.com/HalseySpicy/Geeker-Admin/compare/v1.0.0...v1.1.0) (2023-07-09)
-
-### Features
-
-- 🚀 add proTable instance type ([8262f04](https://github.com/HalseySpicy/Geeker-Admin/commit/8262f045734d055148720738a80fee0e0c779ceb))
-- 🚀 optimize code and add VitePWA ([523f676](https://github.com/HalseySpicy/Geeker-Admin/commit/523f676feee5105eae15d05b57063227be26d3df))
-- 🚀 optimize code and update plugins ([5cff3c7](https://github.com/HalseySpicy/Geeker-Admin/commit/5cff3c7e50331ede07d57613cc49658904e7cf1a))
-- 🚀 optimize irregular code ([d406ef2](https://github.com/HalseySpicy/Geeker-Admin/commit/d406ef2bb5e0d0522f5e0ce38c3b9d0aa47c7cd2))
-- 🚀 proTable radio selection example ([f58291f](https://github.com/HalseySpicy/Geeker-Admin/commit/f58291f96468b816607c31df87326ebd7d0a5c5a))
-- 🚀 proTable search component custom rendering ([#189](https://github.com/HalseySpicy/Geeker-Admin/issues/189)) ([89f03db](https://github.com/HalseySpicy/Geeker-Admin/commit/89f03db2db41160b9ac5398d64712fabff399c4c))
-- 🚀 proTable supports static table data ([9a3e85d](https://github.com/HalseySpicy/Geeker-Admin/commit/9a3e85d21d6c8872bbc915c42d48eb8658a1db63))
-- 🚀 update Gitee address ([0608be9](https://github.com/HalseySpicy/Geeker-Admin/commit/0608be9ba6a9f01f73ed67671d340cf0c1d99261))
-- 🚀 update stylelint configuration ([d62aae8](https://github.com/HalseySpicy/Geeker-Admin/commit/d62aae868e7d6aad87f0ba8706ab9744d5da04dd))
-- 🚀 update theme, modify bugs ([7a3a7a3](https://github.com/HalseySpicy/Geeker-Admin/commit/7a3a7a3d665c0356c0272947292de750dd0be8d8))
-
-### Bug Fixes
-
-- 🧩 fix eslint error ([a980a1a](https://github.com/HalseySpicy/Geeker-Admin/commit/a980a1aa7808895af46c85e0e26a53f66d1119fa))
-
-## [1.0.0](https://github.com/HalseySpicy/Geeker-Admin/compare/v0.0.7...v1.0.0) (2023-04-15)
-
-### Features
-
-- 🚀 升级依赖插件 && 新增树型 ProTbale 示例(更多查看详情) ([ed0ea75](https://github.com/HalseySpicy/Geeker-Admin/commit/ed0ea757555f047f6890632e598ee3293d3598cd))
-- 🚀 升级依赖插件 && 修复 bug(查看详情) ([4febadc](https://github.com/HalseySpicy/Geeker-Admin/commit/4febadc10dd794ec8ea1c7864a3771b1b477f743))
-- 🚀 新增路由白名单访问控制 ([97dc264](https://github.com/HalseySpicy/Geeker-Admin/commit/97dc26484c6eead2ae4c8c79d50b550f24f19a02))
-- 🚀 优化 ProTable && 面包屑导航 ([905d7f1](https://github.com/HalseySpicy/Geeker-Admin/commit/905d7f1fd2b18d9650e6ba7d439dfdcf50363d11))
-- 🚀 优化代码 ([cd333df](https://github.com/HalseySpicy/Geeker-Admin/commit/cd333dfe5de2aa7fa415326e6a06b83d3bd260d5))
-- 🚀 优化代码和样式细节 ([5b4b926](https://github.com/HalseySpicy/Geeker-Admin/commit/5b4b9266de4f420f32fca70dadb76242d129e604))
-- 🚀 优化代码和样式细节 ([756094c](https://github.com/HalseySpicy/Geeker-Admin/commit/756094c402e14841c07cd6062b701929f7f31737))
-- 🚀 优化代码逻辑 && 更新微信群二维码 ([629e824](https://github.com/HalseySpicy/Geeker-Admin/commit/629e8243466fda5da9f0ec781aa0b584e49f4501))
-- 🚀 优化代码细节问题 ([a6a6ced](https://github.com/HalseySpicy/Geeker-Admin/commit/a6a6cedeb40f2f7901f0dcd0ec7f1c283a491c61))
-- 🚀 优化样式、代码细节 ([1b02f45](https://github.com/HalseySpicy/Geeker-Admin/commit/1b02f457162267b090ad946e0bad91e5d0dd14b1))
-- 🚀 allow nested tree enum data ([c2fa2be](https://github.com/HalseySpicy/Geeker-Admin/commit/c2fa2be54a6af0309ba45bd4ca68170c66edc357))
-- 🚀 refactoring project configuration ([7ede988](https://github.com/HalseySpicy/Geeker-Admin/commit/7ede988bae3ad0b33d9e5ac1ea6145c4d7aa89e6))
-- **ProTable:** 🚀 插槽引入 ElTable 的 scope，可获取$index 等 ([4cb7dba](https://github.com/HalseySpicy/Geeker-Admin/commit/4cb7dba40c10e693e324b7c647aa65917aeb0b02))
-
-### Bug Fixes
-
-- 🧩 修复 ImportExcel 组件 bug ([ab7e9dd](https://github.com/HalseySpicy/Geeker-Admin/commit/ab7e9dde400aa80ec2e9fa58d9f2168fc3d14f18))
-- 🧩 修复 ImportExcel 组件 bug ([803ba58](https://github.com/HalseySpicy/Geeker-Admin/commit/803ba58a2c3fae7f6d8783ca534e2b41c987f027))
-- 🧩 修复 ProTable 组件打印功能 bug ([a88b7df](https://github.com/HalseySpicy/Geeker-Admin/commit/a88b7df4623e30459ef3c92196b720efcb200f2f))
-- 🧩 修复 TreeFilter 组件默认值 bug ([8e515f0](https://github.com/HalseySpicy/Geeker-Admin/commit/8e515f0d4058f573cbd53281ef68aec38b8dacb9))
-- 🧩 修复 TreeFilter 组件默认值 bug ([f23a94d](https://github.com/HalseySpicy/Geeker-Admin/commit/f23a94d6edf442babdc4cd5a52ea63ebbbcac44f))
-- 🧩 修复 useDebounceFn 错误使用 ([99d4278](https://github.com/HalseySpicy/Geeker-Admin/commit/99d4278a29b7fa970caba55f43134cebd1d3bec6))
-- 🧩 修复多图片上传预览初始化异常 ([d1a917f](https://github.com/HalseySpicy/Geeker-Admin/commit/d1a917f10326b7742b4445c495de12603df658c1))
-- 🧩 修复分栏布局路径匹配 bug ([b06bd12](https://github.com/HalseySpicy/Geeker-Admin/commit/b06bd123fa6af0dcb7d5cc9bc9215f13b91ace5f))
-- 🧩 修复横向布局下最大化失效 ([e416ddb](https://github.com/HalseySpicy/Geeker-Admin/commit/e416ddb732ae336ca4e7e43ebdeb89b24085d1b1))
-- 🧩 修复路由重置 bug ([52b7e66](https://github.com/HalseySpicy/Geeker-Admin/commit/52b7e66febf1db9cd3325eb0e1e45213ff1528c2))
-- 🧩 修复弱类型检查错误 ([b32310e](https://github.com/HalseySpicy/Geeker-Admin/commit/b32310ed2f546e3efa918d5f7eee2c3868a98cb7))
-
-### 0.0.7 (2022-12-28)
-
-### Features
-
-- 🚀 二次封装 wangEditor 富文本编辑器(50%) ([4f8e266](https://gitee.com/HalseySpicy/Geeker-Admin/commit/4f8e266b7dd25a7df18d302e88e14454bfa3816b))
-- 🚀 更新插件、优化代码(请查看详情) ([dac6dec](https://gitee.com/HalseySpicy/Geeker-Admin/commit/dac6dec75466c19731ad7cf083f8c39940342140))
-- 🚀 更新微信群二维码 ([7e890d0](https://gitee.com/HalseySpicy/Geeker-Admin/commit/7e890d0afe0a11170d73e3c2c4ef04d37a582e94))
-- 🚀 请求全局 loading 更改为可配置 ([a75d62f](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a75d62f627195ac420cf24ad7f51245b2e5bf04e))
-- 🚀 升级 element-plus 到 2.25 ([e98c035](https://gitee.com/HalseySpicy/Geeker-Admin/commit/e98c035caa6d1ab04319673e0db65837c6887126))
-- 🚀 升级 vite、vue 版本 && 优化分栏布局样式 ([b2b1b59](https://gitee.com/HalseySpicy/Geeker-Admin/commit/b2b1b599bc1fa0f1c64c5c58fb31d3719f415301))
-- 🚀 使用属性透传重构 ProTable 组件 ([a428e89](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a428e89a3784c826eceaaee548b97975afbe1d45))
-- 🚀 添加 wangEditor 组件 ([d6d2fa7](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d6d2fa7d27887bb4a9e40e9d7037d4621812e16a))
-- 🚀 完成 wangEditor 富文本二次封装 ([7362bfb](https://gitee.com/HalseySpicy/Geeker-Admin/commit/7362bfbff19224045e3bb20fa939a78c556cc805))
-- 🚀 完善按钮、菜单权限示例 ([6793f0c](https://gitee.com/HalseySpicy/Geeker-Admin/commit/6793f0cd7372b8a080f6d2649b05cdd0c62bd853))
-- 🚀 新增 主题色、灰色模式、色弱模式 配置 ([7821157](https://gitee.com/HalseySpicy/Geeker-Admin/commit/7821157059ed9c21d2844f75049f8fa999b19944))
-- 🚀 新增 pro-form ([3ab5a5b](https://gitee.com/HalseySpicy/Geeker-Admin/commit/3ab5a5b4f63fca227944ab6cc7928f6bf1f88ed4))
-- 🚀 新增 protable 打印、列对齐方式功能 ([c22879e](https://gitee.com/HalseySpicy/Geeker-Admin/commit/c22879e7e80ff9ef662c39daa25b11f5f17d17ca))
-- 🚀 新增 protbale 功能, 请查看详情 ([17f2bcd](https://gitee.com/HalseySpicy/Geeker-Admin/commit/17f2bcd67362365579ed8a572a3a9d17368ac64e))
-- 🚀 新增 SVG Icons ([977602c](https://gitee.com/HalseySpicy/Geeker-Admin/commit/977602c30b8997cb51426fe9498392edc249561d))
-- 🚀 新增 treeFilter 组件标题属性 ([20c755f](https://gitee.com/HalseySpicy/Geeker-Admin/commit/20c755f59f3ae2b0380e6549bb56bb22317d750e))
-- 🚀 新增 treeFilter data 参数 ([4280766](https://gitee.com/HalseySpicy/Geeker-Admin/commit/428076635d7a0e9f80109274d9523cf91aa5a10c))
-- 🚀 新增暗黑模式 ([215e499](https://gitee.com/HalseySpicy/Geeker-Admin/commit/215e499634b516234e653eac27a611d5f51ea6da))
-- 🚀 新增菜单搜索功能 ([4aa0eef](https://gitee.com/HalseySpicy/Geeker-Admin/commit/4aa0eefaf427a2aa1aebd2b78dc049ffa776e838))
-- 🚀 新增动态路由 ([551fefc](https://gitee.com/HalseySpicy/Geeker-Admin/commit/551fefc2e66b067d9e64d3b0cfbf47dfa1057d98))
-- 🚀 新增分栏布局 ([de37143](https://gitee.com/HalseySpicy/Geeker-Admin/commit/de37143e93c0cc5be2ff52466dce344ab9270f0d))
-- 🚀 新增功能 && 修复 bug(查看详情) ([1ab183f](https://gitee.com/HalseySpicy/Geeker-Admin/commit/1ab183f1551cb8beb77243c2953b0119409dd6a5))
-- 🚀 新增功能 && 修复 bug(查看详情) ([4c0bc5f](https://gitee.com/HalseySpicy/Geeker-Admin/commit/4c0bc5fd3c111e1cac636cad104c83ffb1168679))
-- 🚀 新增功能(查看详情) ([cbd8dc2](https://gitee.com/HalseySpicy/Geeker-Admin/commit/cbd8dc2387576f525c0e49f81d540fbad3cb5e81))
-- 🚀 新增横向、纵向、经典布局切换 ([1046de4](https://gitee.com/HalseySpicy/Geeker-Admin/commit/1046de4c7d5f805b10c5cea5325b063e3d6dd84f))
-- 🚀 新增界面配置功能 ([39ffc5e](https://gitee.com/HalseySpicy/Geeker-Admin/commit/39ffc5e9a77da3294055f23f8c87a4a44f3622f7))
-- 🚀 新增路由相关功能 ([9679eed](https://gitee.com/HalseySpicy/Geeker-Admin/commit/9679eed1edd0c1f08c17465f590d4ca0365985ee)), closes [#71](https://gitee.com/HalseySpicy/Geeker-Admin/issues/71) [#72](https://gitee.com/HalseySpicy/Geeker-Admin/issues/72) [#49](https://gitee.com/HalseySpicy/Geeker-Admin/issues/49)
-- 🚀 新增请求示例，参见 loginApi ([d49b227](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d49b227762ae48c3ca08f0dec02a3667daac8532))
-- 🚀 新增图标选择组件 ([ce5e165](https://gitee.com/HalseySpicy/Geeker-Admin/commit/ce5e165aed842074a9f7ac66ea97290710b541ee))
-- 🚀 新增图片上传组件 ([c50c421](https://gitee.com/HalseySpicy/Geeker-Admin/commit/c50c421bc3c5f7af68184cda88262c6fb1bd07e0))
-- 🚀 新增图片上传组件属性 ([d7670ed](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d7670ed94608c5410f3102d7b9427d8d856204b1))
-- 🚀 新增系统管理模块 ([23748e1](https://gitee.com/HalseySpicy/Geeker-Admin/commit/23748e185e80e3b774b42114427934228a57d3aa))
-- 🚀 新增消息通知 ([66836b6](https://gitee.com/HalseySpicy/Geeker-Admin/commit/66836b69781ccc55402a3887d091149885864442))
-- 🚀 新增页面刷新功能 ([5223a41](https://gitee.com/HalseySpicy/Geeker-Admin/commit/5223a416d17568d5b2cae7b16b637e0f39134223))
-- 🚀 新增引导页 ([4fb6fb3](https://gitee.com/HalseySpicy/Geeker-Admin/commit/4fb6fb3a3eb34f82576e2378c311ff580f65226d))
-- 🚀 新增组件参数配置文档 ([0e11fc5](https://gitee.com/HalseySpicy/Geeker-Admin/commit/0e11fc59175d5d74730c3cb1fa2579effcca6e48))
-- 🚀 修改 keepAlive 逻辑 ([168ca13](https://gitee.com/HalseySpicy/Geeker-Admin/commit/168ca13e796c8cc366caa3d6e05090acdaefef75))
-- 🚀 修改 pinia 持久化插件 ([a7691ae](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a7691aea614a035c4d381838149e08ad8477e49f))
-- 🚀 优化代码注释 && 升级 element 到 2.2.6 ([b84512b](https://gitee.com/HalseySpicy/Geeker-Admin/commit/b84512b3b102b00faa2f9241a32f5fbe27da4307))
-- 🚀 优化注释 && 代码细节问题 ([9d0ffa5](https://gitee.com/HalseySpicy/Geeker-Admin/commit/9d0ffa5ddecc4c73bec51208b05a6d44b1523b1f))
-- 🚀 预定义主题颜色 ([8219178](https://gitee.com/HalseySpicy/Geeker-Admin/commit/82191789bcf6d21c623aa61c5a64e502cea44c2c))
-- 🚀 增加 SearchForm 属性透传 ([eadb89b](https://gitee.com/HalseySpicy/Geeker-Admin/commit/eadb89b687596980a82401f44c53430081078d04))
-- 🚀 增加表格 treeFilter、更新整体布局样式 ([719b78f](https://gitee.com/HalseySpicy/Geeker-Admin/commit/719b78f317589b983bc4b852b3bfd63a60d42a46))
-- 🚀 增加布局方式切换，样式已完成 ([5745b93](https://gitee.com/HalseySpicy/Geeker-Admin/commit/5745b93a6cc00519c1a02977b8c0437502d867e6))
-- 🚀 增加分类筛选器 ([c95a1c0](https://gitee.com/HalseySpicy/Geeker-Admin/commit/c95a1c054ee9eacae470bcaae7574d5c989b86a2))
-- 🚀 增加全局错误拦截 && 修改细节问题 请查看详情 ([0496184](https://gitee.com/HalseySpicy/Geeker-Admin/commit/04961847eb7df004d1e9f562e78ea3d5f851ea49))
-
-### Bug Fixes
-
-- 🧩 菜单搜索过滤掉 isHide 为 true 的菜单 ([c6bab35](https://gitee.com/HalseySpicy/Geeker-Admin/commit/c6bab356f0cde7e3dc6f69dfac115239c2453776))
-- 🧩 解决 useTable 查询参数 bug ([a86e408](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a86e4089b6da8ab6a55bc84e069d665c06471676))
-- 🧩 去除登陆页默认账号 ([3dda3fe](https://gitee.com/HalseySpicy/Geeker-Admin/commit/3dda3fee3fef38fdafcfdf3b1bf16e73033c6fe0))
-- 🧩 删除 protable 组件 image 配置属性 ([d699fe7](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d699fe7bd55eaaccfad9b94105c1b43ae64d1c34))
-- 🧩 修复 国际化 产生的 bug ([ec4f74a](https://gitee.com/HalseySpicy/Geeker-Admin/commit/ec4f74ae654e7287fc08bb31fa3ee3d2c76164eb))
-- 🧩 修复 axios 请求超时未拦截错误 ([856468e](https://gitee.com/HalseySpicy/Geeker-Admin/commit/856468e84f8356d35c25097f3115dfe3d496914c))
-- 🧩 修复 bug ([3714abd](https://gitee.com/HalseySpicy/Geeker-Admin/commit/3714abdc4826034791ccb3fc8249d946ec3a4e16))
-- 🧩 修复 Pro-Tabel 列设置 bug ([a3b86a0](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a3b86a06a6d9cd4b6f7ac6e108727a0b4852e9a0))
-- 🧩 修复 pro-table 格式报错问题 ([2ef11fd](https://gitee.com/HalseySpicy/Geeker-Admin/commit/2ef11fda6d373c3214df801ae789cafc1a033dcb))
-- 🧩 修复布局样式 bug ([2f1cd64](https://gitee.com/HalseySpicy/Geeker-Admin/commit/2f1cd6442f359909301e3d95b0ed4dc9d2dbe7c6))
-- 🧩 修复打包错误 ([243ebfc](https://gitee.com/HalseySpicy/Geeker-Admin/commit/243ebfc5280ddc013056c6708b44df35fe18f613))
-- 🧩 修复打包失败 ([31698fe](https://gitee.com/HalseySpicy/Geeker-Admin/commit/31698fea6478d60343a9ad49ae0fc6db7a42c184))
-- 🧩 修复打包失败问题 ([1778651](https://gitee.com/HalseySpicy/Geeker-Admin/commit/1778651781a1bb8bfe4ea61dafb9b48773fef5d7))
-- 🧩 修复分栏布局 bug ([113274a](https://gitee.com/HalseySpicy/Geeker-Admin/commit/113274a87e2dacf694648f3a304c7ac37e2262d0))
-- 🧩 修复经典布局展示 bug ([b95e237](https://gitee.com/HalseySpicy/Geeker-Admin/commit/b95e2376d06c6a6a35f72743e3fe8c1569fda008))
-- 🧩 修复路由跳转两次不能携带参数问题 ([8b583f3](https://gitee.com/HalseySpicy/Geeker-Admin/commit/8b583f3d5f05b77ec2a35082557bae431441a586))
-- 🧩 修复请求 header 参数丢失 bug ([3598dbc](https://gitee.com/HalseySpicy/Geeker-Admin/commit/3598dbc2a83aaacf9dada4e2c38a3ca27cbe4cfd))
-- 🧩 修复上传组件细节问题 ([8528358](https://gitee.com/HalseySpicy/Geeker-Admin/commit/8528358925ea809cf52f55015355345e87607351))
-- 🧩 修复 BUG ([4bf2988](https://gitee.com/HalseySpicy/Geeker-Admin/commit/4bf29881dd41fad256f1beb5affcd5ba6599e17d))
-- 🧩 修复 BUG ([c93aaf7](https://gitee.com/HalseySpicy/Geeker-Admin/commit/c93aaf700112decd158e9a5a9c1f83eff1773e91))
-- 🧩 修复 loading 请求 bug ([a3270ec](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a3270ecfa2e7c2484729ae6fd599febcc4f7be6b))
-- 🧩 修复 vercel 打包失败 ([e63dee1](https://gitee.com/HalseySpicy/Geeker-Admin/commit/e63dee1f9653f4f95d0330275c5f5e8b530564c9))
-- 🧩 修改 Pro-Table 表头渲染方式 ([aa57294](https://gitee.com/HalseySpicy/Geeker-Admin/commit/aa5729489942eaa6dca9928b70153af2de753a9c))
-- 🧩 修改 useTable 存在的 bug ([5bb55b3](https://gitee.com/HalseySpicy/Geeker-Admin/commit/5bb55b32c0b46bbf55fa0d49efe3a15d0b1673a4))
-- 🧩 修改 useTable 钩子中的 bug ([675aed8](https://gitee.com/HalseySpicy/Geeker-Admin/commit/675aed806e62c236b40bc933402c86085289df4e))
-- 🧩 修改 useTable 携带默认查询参数 bug ([ee585b2](https://gitee.com/HalseySpicy/Geeker-Admin/commit/ee585b29f3129b7143a10947fdd3184b197ad883))
-- 🧩 修改代码细节 && 优化注释 ([d86cb1f](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d86cb1feb32e11a29e1c2bee54ea788c6c828d75))
-- 🧩 修改当菜单设置 isHide=true 时面包屑报错 ([66885c5](https://gitee.com/HalseySpicy/Geeker-Admin/commit/66885c5cc15c10ccadcd49a7bee27a821663e8a7))
-- 🧩 修改文件导出失败 bug ([208e720](https://gitee.com/HalseySpicy/Geeker-Admin/commit/208e720688969d2bc0fa0a6cc2bae3e3b991c806))
-- 🧩 修改 BUG ([540048a](https://gitee.com/HalseySpicy/Geeker-Admin/commit/540048a09be9b0df5443e275f38f43c80dcde51f))
-- 🧩 fix use pinia bug ([609aa69](https://gitee.com/HalseySpicy/Geeker-Admin/commit/609aa69aa9b3e0bb4e667ee7f76ab44051c2d2e8))
-- 修复登录后白屏 ([f986c5c](https://gitee.com/HalseySpicy/Geeker-Admin/commit/f986c5c44fc1df8d5c6a90e90239c06928e2f4a1))
-- **el-table:** 🧩 修复 el-table 在 safari 浏览器错乱 ([b776a48](https://gitee.com/HalseySpicy/Geeker-Admin/commit/b776a483636547c7cee723846ec33b2842550d13))
-
-### 0.0.6 (2022-08-22)
-
-### Features
-
-- 🚀 二次封装 wangEditor 富文本编辑器(50%) ([4f8e266](https://gitee.com/HalseySpicy/Geeker-Admin/commit/4f8e266b7dd25a7df18d302e88e14454bfa3816b))
-- 🚀 请求全局 loading 更改为可配置 ([a75d62f](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a75d62f627195ac420cf24ad7f51245b2e5bf04e))
-- 🚀 升级 element-plus 到 2.25 ([e98c035](https://gitee.com/HalseySpicy/Geeker-Admin/commit/e98c035caa6d1ab04319673e0db65837c6887126))
-- 🚀 添加 wangEditor 组件 ([d6d2fa7](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d6d2fa7d27887bb4a9e40e9d7037d4621812e16a))
-- 🚀 完成 wangEditor 富文本二次封装 ([7362bfb](https://gitee.com/HalseySpicy/Geeker-Admin/commit/7362bfbff19224045e3bb20fa939a78c556cc805))
-- 🚀 新增 主题色、灰色模式、色弱模式 配置 ([7821157](https://gitee.com/HalseySpicy/Geeker-Admin/commit/7821157059ed9c21d2844f75049f8fa999b19944))
-- 🚀 新增 pro-form ([3ab5a5b](https://gitee.com/HalseySpicy/Geeker-Admin/commit/3ab5a5b4f63fca227944ab6cc7928f6bf1f88ed4))
-- 🚀 新增 protbale 功能, 请查看详情 ([17f2bcd](https://gitee.com/HalseySpicy/Geeker-Admin/commit/17f2bcd67362365579ed8a572a3a9d17368ac64e))
-- 🚀 新增 SVG Icons ([977602c](https://gitee.com/HalseySpicy/Geeker-Admin/commit/977602c30b8997cb51426fe9498392edc249561d))
-- 🚀 新增 treeFilter data 参数 ([4280766](https://gitee.com/HalseySpicy/Geeker-Admin/commit/428076635d7a0e9f80109274d9523cf91aa5a10c))
-- 🚀 新增暗黑模式 ([215e499](https://gitee.com/HalseySpicy/Geeker-Admin/commit/215e499634b516234e653eac27a611d5f51ea6da))
-- 🚀 新增菜单搜索功能 ([4aa0eef](https://gitee.com/HalseySpicy/Geeker-Admin/commit/4aa0eefaf427a2aa1aebd2b78dc049ffa776e838))
-- 🚀 新增界面配置功能 ([39ffc5e](https://gitee.com/HalseySpicy/Geeker-Admin/commit/39ffc5e9a77da3294055f23f8c87a4a44f3622f7))
-- 🚀 新增请求示例，参见 loginApi ([d49b227](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d49b227762ae48c3ca08f0dec02a3667daac8532))
-- 🚀 新增图标选择组件 ([ce5e165](https://gitee.com/HalseySpicy/Geeker-Admin/commit/ce5e165aed842074a9f7ac66ea97290710b541ee))
-- 🚀 新增图片上传组件 ([c50c421](https://gitee.com/HalseySpicy/Geeker-Admin/commit/c50c421bc3c5f7af68184cda88262c6fb1bd07e0))
-- 🚀 新增图片上传组件属性 ([d7670ed](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d7670ed94608c5410f3102d7b9427d8d856204b1))
-- 🚀 新增引导页 ([4fb6fb3](https://gitee.com/HalseySpicy/Geeker-Admin/commit/4fb6fb3a3eb34f82576e2378c311ff580f65226d))
-- 🚀 新增组件参数配置文档 ([0e11fc5](https://gitee.com/HalseySpicy/Geeker-Admin/commit/0e11fc59175d5d74730c3cb1fa2579effcca6e48))
-- 🚀 修改 pinia 持久化插件 ([a7691ae](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a7691aea614a035c4d381838149e08ad8477e49f))
-- 🚀 优化代码注释 && 升级 element 到 2.2.6 ([b84512b](https://gitee.com/HalseySpicy/Geeker-Admin/commit/b84512b3b102b00faa2f9241a32f5fbe27da4307))
-- 🚀 优化注释 && 代码细节问题 ([9d0ffa5](https://gitee.com/HalseySpicy/Geeker-Admin/commit/9d0ffa5ddecc4c73bec51208b05a6d44b1523b1f))
-- 🚀 预定义主题颜色 ([8219178](https://gitee.com/HalseySpicy/Geeker-Admin/commit/82191789bcf6d21c623aa61c5a64e502cea44c2c))
-- 🚀 增加 SearchForm 属性透传 ([eadb89b](https://gitee.com/HalseySpicy/Geeker-Admin/commit/eadb89b687596980a82401f44c53430081078d04))
-- 🚀 增加表格 treeFilter、更新整体布局样式 ([719b78f](https://gitee.com/HalseySpicy/Geeker-Admin/commit/719b78f317589b983bc4b852b3bfd63a60d42a46))
-
-### Bug Fixes
-
-- 🧩 解决 useTable 查询参数 bug ([a86e408](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a86e4089b6da8ab6a55bc84e069d665c06471676))
-- 🧩 去除登陆页默认账号 ([3dda3fe](https://gitee.com/HalseySpicy/Geeker-Admin/commit/3dda3fee3fef38fdafcfdf3b1bf16e73033c6fe0))
-- 🧩 删除 protable 组件 image 配置属性 ([d699fe7](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d699fe7bd55eaaccfad9b94105c1b43ae64d1c34))
-- 🧩 修复 国际化 产生的 bug ([ec4f74a](https://gitee.com/HalseySpicy/Geeker-Admin/commit/ec4f74ae654e7287fc08bb31fa3ee3d2c76164eb))
-- 🧩 修复 axios 请求超时未拦截错误 ([856468e](https://gitee.com/HalseySpicy/Geeker-Admin/commit/856468e84f8356d35c25097f3115dfe3d496914c))
-- 🧩 修复 Pro-Tabel 列设置 bug ([a3b86a0](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a3b86a06a6d9cd4b6f7ac6e108727a0b4852e9a0))
-- 🧩 修复 pro-table 格式报错问题 ([2ef11fd](https://gitee.com/HalseySpicy/Geeker-Admin/commit/2ef11fda6d373c3214df801ae789cafc1a033dcb))
-- 🧩 修复打包失败问题 ([1778651](https://gitee.com/HalseySpicy/Geeker-Admin/commit/1778651781a1bb8bfe4ea61dafb9b48773fef5d7))
-- 🧩 修复路由跳转两次不能携带参数问题 ([8b583f3](https://gitee.com/HalseySpicy/Geeker-Admin/commit/8b583f3d5f05b77ec2a35082557bae431441a586))
-- 🧩 修复请求 header 参数丢失 bug ([3598dbc](https://gitee.com/HalseySpicy/Geeker-Admin/commit/3598dbc2a83aaacf9dada4e2c38a3ca27cbe4cfd))
-- 🧩 修复上传组件细节问题 ([8528358](https://gitee.com/HalseySpicy/Geeker-Admin/commit/8528358925ea809cf52f55015355345e87607351))
-- 🧩 修复 loading 请求 bug ([a3270ec](https://gitee.com/HalseySpicy/Geeker-Admin/commit/a3270ecfa2e7c2484729ae6fd599febcc4f7be6b))
-- 🧩 修改 Pro-Table 表头渲染方式 ([aa57294](https://gitee.com/HalseySpicy/Geeker-Admin/commit/aa5729489942eaa6dca9928b70153af2de753a9c))
-- 🧩 修改 useTable 存在的 bug ([5bb55b3](https://gitee.com/HalseySpicy/Geeker-Admin/commit/5bb55b32c0b46bbf55fa0d49efe3a15d0b1673a4))
-- 🧩 修改 useTable 钩子中的 bug ([675aed8](https://gitee.com/HalseySpicy/Geeker-Admin/commit/675aed806e62c236b40bc933402c86085289df4e))
-- 🧩 修改 useTable 携带默认查询参数 bug ([ee585b2](https://gitee.com/HalseySpicy/Geeker-Admin/commit/ee585b29f3129b7143a10947fdd3184b197ad883))
-- 🧩 修改代码细节 && 优化注释 ([d86cb1f](https://gitee.com/HalseySpicy/Geeker-Admin/commit/d86cb1feb32e11a29e1c2bee54ea788c6c828d75))
-- 🧩 修改文件导出失败 bug ([208e720](https://gitee.com/HalseySpicy/Geeker-Admin/commit/208e720688969d2bc0fa0a6cc2bae3e3b991c806))
-- 🧩 fix use pinia bug ([609aa69](https://gitee.com/HalseySpicy/Geeker-Admin/commit/609aa69aa9b3e0bb4e667ee7f76ab44051c2d2e8))
-- 修复登录后白屏 ([f986c5c](https://gitee.com/HalseySpicy/Geeker-Admin/commit/f986c5c44fc1df8d5c6a90e90239c06928e2f4a1))
-
-### [0.0.5](https://github.com/HalseySpicy/Geeker-Admin/compare/v0.0.4...v0.0.5) (2022-07-21)
-
-### Features
-
-- 🚀 新增请求示例，参见 loginApi ([d49b227](https://github.com/HalseySpicy/Geeker-Admin/commit/d49b227762ae48c3ca08f0dec02a3667daac8532))
-
-### Bug Fixes
-
-- 🧩 解决 useTable 查询参数 bug ([a86e408](https://github.com/HalseySpicy/Geeker-Admin/commit/a86e4089b6da8ab6a55bc84e069d665c06471676))
-- 🧩 修复 axios 请求超时未拦截错误 ([856468e](https://github.com/HalseySpicy/Geeker-Admin/commit/856468e84f8356d35c25097f3115dfe3d496914c))
-- 🧩 修复请求 header 参数丢失 bug ([3598dbc](https://github.com/HalseySpicy/Geeker-Admin/commit/3598dbc2a83aaacf9dada4e2c38a3ca27cbe4cfd))
-
-### [0.0.4](https://github.com/HalseySpicy/Geeker-Admin/compare/v0.0.3...v0.0.4) (2022-07-12)
-
-### Features
-
-- 🚀 新增 主题色、灰色模式、色弱模式 配置 ([7821157](https://github.com/HalseySpicy/Geeker-Admin/commit/7821157059ed9c21d2844f75049f8fa999b19944))
-- 🚀 新增 pro-form ([3ab5a5b](https://github.com/HalseySpicy/Geeker-Admin/commit/3ab5a5b4f63fca227944ab6cc7928f6bf1f88ed4))
-- 🚀 新增菜单搜索功能 ([4aa0eef](https://github.com/HalseySpicy/Geeker-Admin/commit/4aa0eefaf427a2aa1aebd2b78dc049ffa776e838))
-- 🚀 新增界面配置功能 ([39ffc5e](https://github.com/HalseySpicy/Geeker-Admin/commit/39ffc5e9a77da3294055f23f8c87a4a44f3622f7))
-- 🚀 预定义主题颜色 ([8219178](https://github.com/HalseySpicy/Geeker-Admin/commit/82191789bcf6d21c623aa61c5a64e502cea44c2c))
-- 🚀 增加 SearchForm 属性透传 ([eadb89b](https://github.com/HalseySpicy/Geeker-Admin/commit/eadb89b687596980a82401f44c53430081078d04))
-
-### Bug Fixes
-
-- 🧩 修复 pro-table 格式报错问题 ([2ef11fd](https://github.com/HalseySpicy/Geeker-Admin/commit/2ef11fda6d373c3214df801ae789cafc1a033dcb))
-- 🧩 修改文件导出失败 bug ([208e720](https://github.com/HalseySpicy/Geeker-Admin/commit/208e720688969d2bc0fa0a6cc2bae3e3b991c806))
-- 🧩 fix use pinia bug ([609aa69](https://github.com/HalseySpicy/Geeker-Admin/commit/609aa69aa9b3e0bb4e667ee7f76ab44051c2d2e8))
-
-### [0.0.2](https://github.com/HalseySpicy/Geeker-Admin/compare/v0.0.3...v0.0.2) (2022-06-29)
-
-### 0.0.2 (2022-06-20)
-
-### Features
-
-- 🚀 请求全局 loading 更改为可配置 ([a75d62f](https://github.com/HalseySpicy/Geeker-Admin/commit/a75d62f627195ac420cf24ad7f51245b2e5bf04e))
-- 🚀 升级 element-plus 到 2.2.5 ([e98c035](https://github.com/HalseySpicy/Geeker-Admin/commit/e98c035caa6d1ab04319673e0db65837c6887126))
-- 🚀 新增暗黑模式 ([215e499](https://github.com/HalseySpicy/Geeker-Admin/commit/215e499634b516234e653eac27a611d5f51ea6da))
-- 🚀 新增图标选择组件 ([ce5e165](https://github.com/HalseySpicy/Geeker-Admin/commit/ce5e165aed842074a9f7ac66ea97290710b541ee))
-- 🚀 修改 pinia 持久化插件 ([a7691ae](https://github.com/HalseySpicy/Geeker-Admin/commit/a7691aea614a035c4d381838149e08ad8477e49f))
-- 🚀 优化代码注释 && 升级 element 到 2.2.6 ([b84512b](https://github.com/HalseySpicy/Geeker-Admin/commit/b84512b3b102b00faa2f9241a32f5fbe27da4307))
-
-### Bug Fixes
-
-- 🧩 去除登陆页默认账号 ([3dda3fe](https://github.com/HalseySpicy/Geeker-Admin/commit/3dda3fee3fef38fdafcfdf3b1bf16e73033c6fe0))
-- 🧩 修复 Pro-Table 列设置 bug ([a3b86a0](https://github.com/HalseySpicy/Geeker-Admin/commit/a3b86a06a6d9cd4b6f7ac6e108727a0b4852e9a0))
-- 🧩 修复 loading 请求 bug ([a3270ec](https://github.com/HalseySpicy/Geeker-Admin/commit/a3270ecfa2e7c2484729ae6fd599febcc4f7be6b))
-- 🧩 修改 Pro-Table 表头渲染方式 ([aa57294](https://github.com/HalseySpicy/Geeker-Admin/commit/aa5729489942eaa6dca9928b70153af2de753a9c))
-- 🧩 修改 useTable 存在的 bug ([5bb55b3](https://github.com/HalseySpicy/Geeker-Admin/commit/5bb55b32c0b46bbf55fa0d49efe3a15d0b1673a4))
-- 🧩 修改 useTable 钩子中的 bug ([675aed8](https://github.com/HalseySpicy/Geeker-Admin/commit/675aed806e62c236b40bc933402c86085289df4e))
-- 🧩 修改 useTable 携带默认查询参数 bug ([ee585b2](https://github.com/HalseySpicy/Geeker-Admin/commit/ee585b29f3129b7143a10947fdd3184b197ad883))

src/api/home/Multisite.ts

@@ -1,5 +1,5 @@
 import http from "@/api";
-import { Alarm, Station, other } from "../interface";
+import { Alarm, Resultjob, Station, other } from "../interface";
 import qs from "qs";
 // export const changeUserStatus = (params: { id: string; status: number }) => {
 //   return http.post(`/upload`,qs.stringify(params));
@@ -12,6 +12,10 @@ export const getuser = () => {
 export const gethomesite = () => {
   return http.post(`/muitiStation/overview`);
 };
+// 单站概览站点数据--------
+export const getmuitiStation = (id: any) => {
+  return http.post(`/muitiStation/${id}/overw`);
+};
 // 收益统计------------日份
 export const multiStationday = (params: {}) => {
   return http.post<Station.between[]>(`/stats/multStation/profit/between/day`, qs.stringify(params));
@@ -36,7 +40,6 @@ export const multiStationtopday = (params: {}) => {
 export const multiStationtopyearMonth = (params: {}) => {
   return http.post<Station.profitday[]>(`/stats/multStation/profit/top/between/yearMonth`, qs.stringify(params));
 };
-
 // 故障告警-------------
 export const alarmMultiStation = (params: {}) => {
   return http.post<Station.multiStation[]>(`/alarm/multiStation`, qs.stringify(params));
@@ -85,7 +88,6 @@ export const singlestationday = (params: {}, id: any) => {
 export const singlestationyearMonth = (params: {}, id: any) => {
   return http.post<Station.profitbetween>(`/stats/singleStation/${id}/profit/between/yearMonth`, qs.stringify(params));
 };
-
 // 单站橄榄放电统计---------日
 export const postsexportKwh = (params: {}, id: any) => {
   return http.post<Station.power[]>(`/stats/singleStation/${id}/singleStation/between/day`, qs.stringify(params));
@@ -172,20 +174,27 @@ export const BMSbatteryStackInfo = (params: {}, id: string, ids: string) => {
 };
 // 设备监控 空调标签数据
 export const getairConditionerInfo = (params: {}, id: string, ids: string) => {
-  return http.post(`device/station/${id}/${ids}/airConditionerInfo`, qs.stringify(params));
+  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 insertschedule = (params: {}, name: string) => {
+  return http.post(`/electricity/insertschedule?name=${name}`, params);
+};
 // 模板管理
-export const electricitytmplpage = (params: {}, id: string) => {
-  return http.post<Station.Tmpl>(`/electricity/${id}/tmpl/page`, qs.stringify(params));
+export const electricitytmplpage = (params: {}) => {
+  return http.post<Station.Tmpl>(`/electricity/tmpl/page`, qs.stringify(params));
+};
+// 模板管理-模版详情
+export const electricitytmplpagedetails = (params: {}, ids: string) => {
+  return http.post<Station.Tmpl>(`/electricity/tmpl/${ids}/detail`, qs.stringify(params));
 };
-// 模板管理详情
-export const electricitytmplpagedetails = (params: {}, id: any, ids: string) => {
-  return http.post<Station.Tmpl>(`/electricity/${id}/tmpl/${ids}/detail`, qs.stringify(params));
+// 电价配置-模版查看
+export const electricitytmptariff = (params: {}, ids: string) => {
+  return http.post<Station.Tmpl>(`/electricity/tariff/${ids}/detail`, qs.stringify(params));
 };
 // 电量报表按日
 export const reportpowerday = (params: {}) => {
@@ -272,7 +281,6 @@ export const singleincomeyearMonth = (params: {}, id: any) => {
 export const singleincomeyear = (params: {}, id: any) => {
   return http.post<Station.summary>(`/profit/report/singleStation/${id}/between/year`, qs.stringify(params));
 };
-
 // 导出电量报表汇总-按日
 export const Summaryexportday = (params: {}) => {
   return http.post<other.Data>(`/report/power/exportday`, qs.stringify(params));
@@ -289,21 +297,21 @@ export const Summaryexportyear = (params: {}) => {
 export const betweenbiaoExcel = (params: {}, id: any) => {
   return http.post<other.Data>(`/report/power/singleStation/${id}/betweenbiaoExcel`, qs.stringify(params));
 };
-// 导出电量报表单站-按日
+// 导出电量报表单站-按月
 export const betweenyearMonthExcel = (params: {}, id: any) => {
   return http.post<other.Data>(`/report/power/singleStation/${id}/betweenyearMonthExcel`, qs.stringify(params));
 };
-// 导出电量报表单站-按日
+// 导出电量报表单站-按年
 export const betweenyearExcel = (params: {}, id: any) => {
   return http.post<other.Data>(`/report/power/singleStation/${id}/betweenyearExcel`, qs.stringify(params));
 };
 // 导出收益报表汇总-按日
 export const reportsummarymonthEXcel = (params: {}) => {
-  return http.post<other.Data>(`/profit/report/reportsummarymonthEXcel`, qs.stringify(params));
+  return http.post<other.Data>(`/profit/report/reportsummarydayEXcel`, qs.stringify(params));
 };
 // 导出收益报表报表汇总-按月
 export const summaryearmonthEXcel = (params: {}) => {
-  return http.post<other.Data>(`/report/power/summaryearmonthEXcel`, qs.stringify(params));
+  return http.post<other.Data>(`/profit/report/reportsummarymonthEXcel`, qs.stringify(params));
 };
 // 导出收益报表报表汇总-按年
 export const reportsummaryyearEXcel = (params: {}) => {
@@ -463,7 +471,77 @@ export const updateMysqlTDengineURL = (params: {}) => {
 export const selectemssytemALLURL = (params: {}) => {
   return http.post(`/station/manage/selectemssytemALL`, qs.stringify(params));
 };
-// 新增保存-电站信息-设备信息
+// 新增-电站信息-设备信息
 export const insertpowerURL = (params: {}) => {
   return http.post(`/station/manage/insertpower`, qs.stringify(params));
 };
+// 编辑-电站信息-设备信息
+export const updatesingleeditURL = (params: {}) => {
+  return http.post(`/station/manage/updatesingle`, qs.stringify(params));
+};
+// 系统设置-设备管理-列表
+export const selectemssytemNameURL = (params: {}) => {
+  return http.post(`/emsSystem/singleStation/selectemssytemName`, qs.stringify(params));
+};
+// 系统设置-设备管理-编辑保存
+export const updateemssytemNameURL = (params: {}) => {
+  return http.post(`/emsSystem/singleStation/updateemssytemName`, qs.stringify(params));
+};
+// 系统设置-电价-添加电站和模版的中间表
+export const selectelectURL = (params: {}) => {
+  return http.post(`/electricity/selectelect`, qs.stringify(params));
+};
+
+// 系统设置-电价-查询全部的模版名称
+export const insertscheduletariffURL = (params: {}) => {
+  return http.post(`/electricity/insertscheduletariff`, qs.stringify(params));
+};
+// 系统设置-电价-查询全部的模版名称
+export const selectpoweroverviewURL = (params: {}) => {
+  return http.post<other.Select>(`/electricity/selectpoweroverview`, qs.stringify(params));
+};
+// 系统设置-上传图片
+export const uploadURL = (params: {}) => {
+  return http.post(`/station/manage/upload/webPost`, params);
+};
+// 修改用户信息
+export const updateURL = (params: {}) => {
+  return http.post(`/platform/user/profile/update`, qs.stringify(params));
+};
+// 查询全部的定时任务
+export const joblistURL = (params: {}) => {
+  return http.post<Resultjob>(`/platform/monitor/job/list`, qs.stringify(params));
+};
+// 查询全部的定时任务
+export const checkCronExpressionIsValid = (params: {}) => {
+  return http.post<Resultjob>(`/platform/monitor/job/checkCronExpressionIsValid`, qs.stringify(params));
+};
+// 新增保存调度
+export const monitorjobadd = (params: {}) => {
+  return http.post<Resultjob>(`/platform/monitor/job/add`, qs.stringify(params));
+};
+// 修改保存调度
+export const monitorjobedit = (params: {}) => {
+  return http.post<Resultjob>(`/platform/monitor/job/edit`, qs.stringify(params));
+};
+// 修改任务调度修改回显
+export const jobeditupdate = (id: any) => {
+  return http.get(`/platform/monitor/job/editupdate/${id}`);
+};
+// 定时任务删除
+export const jobremove = (params: {}) => {
+  return http.post(`/platform/monitor/job/remove`, qs.stringify(params));
+};
+// 定时任务状态修改
+export const jobchangeStatus = (params: {}) => {
+  return http.post(`/platform/monitor/job/changeStatus`, qs.stringify(params));
+};
+// 编辑电站信息
+
+export const editpowerURL = (id: any, params: {}) => {
+  return http.post(`/station/manage/editpower/${id}`, qs.stringify(params));
+};
+// 设备管理-编辑回显
+export const selectemsNameURL = (id: any, params: {}) => {
+  return http.post(`/emsSystem/singleStation/selectemsName/${id}`, qs.stringify(params));
+};

src/api/index.ts

@@ -104,6 +104,7 @@ class RequestHttp {
           return Promise.reject(data);
         }
         // 全局错误信息拦截（防止下载文件的时候返回数据流，没有 code 直接报错）
+
         if (data.code && data.code !== ResultEnum.SUCCESS) {
           ElMessage.error(data.msg);
 

src/api/interface/index.ts

@@ -3,9 +3,16 @@ export interface Result {
   code: string;
   msg: string;
 }
-
+// 请求响应参数（不包含rows）
+export interface Resultjob {
+  code: string;
+  msg: string;
+  rows: [];
+  total: number;
+}
 // 请求响应参数（包含data）
 export interface ResultData<T = any> extends Result {
+  total: number;
   data: T;
 }
 
@@ -102,6 +109,7 @@ export namespace Station {
   }
   // 电价配置
   export interface electricity {
+    start: number;
     currencyUnit: null;
     dataSource: number;
     imonth: number;
@@ -113,6 +121,7 @@ export namespace Station {
     stationTmplId: string;
     tmplId: null;
     tmplName: string;
+    tariffId: string;
   }
   // 模板管理表格数据
   export interface Tmpl {
@@ -418,4 +427,16 @@ export namespace other {
     url: string;
     visible: string;
   }
+  // 电价管理
+  export interface Scheduling {
+    imonth: number;
+    iyear: string;
+    startTime: string;
+    endTime: string;
+    periodType: string;
+  }
+
+  export interface Select {
+    [key: number]: Scheduling[];
+  }
 }

src/api/modules/upload.ts

@@ -7,7 +7,7 @@ import http from "@/api";
  */
 // 图片上传
 export const uploadImg = (params: FormData) => {
-  return http.post<Upload.ResFileUrl>(PORT1 + `/file/upload/img`, params, { cancel: false });
+  return http.post<Upload.ResFileUrl>(`/platform/shu/upload/webPost`, params, { cancel: false });
 };
 
 // 视频上传

src/components/Upload/Img.vue

@@ -25,10 +25,10 @@
             <el-icon><ZoomIn /></el-icon>
             <span>查看</span>
           </div>
-          <div v-if="!self_disabled" class="handle-icon" @click="deleteImg">
+          <!-- <div v-if="!self_disabled" class="handle-icon" @click="deleteImg">
             <el-icon><Delete /></el-icon>
             <span>删除</span>
-          </div>
+          </div> -->
         </div>
       </template>
       <template v-else>
@@ -105,7 +105,7 @@ const handleHttpUpload = async (options: UploadRequestOptions) => {
   try {
     const api = props.api ?? uploadImg;
     const { data } = await api(formData);
-    emit("update:imageUrl", data.fileUrl);
+    emit("update:imageUrl", data.url);
     // 调用 el-form 内部的校验方法（可自动校验）
     formItemContext?.prop && formContext?.validateField([formItemContext.prop as string]);
   } catch (error) {
@@ -116,9 +116,9 @@ const handleHttpUpload = async (options: UploadRequestOptions) => {
 /**
  * @description 删除图片
  * */
-const deleteImg = () => {
-  emit("update:imageUrl", "");
-};
+// const deleteImg = () => {
+//   emit("update:imageUrl", "");
+// };
 
 /**
  * @description 编辑图片

src/components/Upload/Imgs.vue

@@ -67,7 +67,7 @@ const props = withDefaults(defineProps<UploadFileProps>(), {
   fileList: () => [],
   drag: true,
   disabled: false,
-  limit: 5,
+  limit: 9,
   fileSize: 5,
   fileType: () => ["image/jpg", "image/jpeg", "image/png", "image/gif"],
   height: "150px",
@@ -142,9 +142,11 @@ const handleHttpUpload = async (options: UploadRequestOptions) => {
 const emit = defineEmits<{
   "update:fileList": [value: UploadUserFile[]];
 }>();
-const uploadSuccess = (response: { fileUrl: string } | undefined, uploadFile: UploadFile) => {
+const uploadSuccess = (response: { url: string } | undefined, uploadFile: UploadFile) => {
+  console.log(response);
+
   if (!response) return;
-  uploadFile.url = response.fileUrl;
+  uploadFile.url = response.url;
   emit("update:fileList", _fileList.value);
   // 调用 el-form 内部的校验方法（可自动校验）
   formItemContext?.prop && formContext?.validateField([formItemContext.prop as string]);

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

@@ -1,13 +1,11 @@
 <template>
   <el-dropdown trigger="click">
-    <div class="avatar">
-      <img src="@/assets/images/avatar.gif" alt="avatar" />
-    </div>
+    <div class="avatar"><img :src="avatar" alt="avatar" /></div>
     <template #dropdown>
       <el-dropdown-menu>
-        <!-- <el-dropdown-item @click="openDialog('infoRef')">
+        <el-dropdown-item @click="openDialog('infoRef')">
           <el-icon><User /></el-icon>{{ $t("header.personalData") }}
-        </el-dropdown-item> -->
+        </el-dropdown-item>
         <!-- 个人信息 -->
         <el-dropdown-item @click="openDialog('passwordRef')">
           <el-icon><Edit /></el-icon>{{ $t("header.changePassword") }}
@@ -19,21 +17,26 @@
     </template>
   </el-dropdown>
   <!-- infoDialog -->
-  <InfoDialog ref="infoRef"></InfoDialog>
+  <!-- <InfoDialog ref="infoRef"></InfoDialog> -->
   <!-- passwordDialog -->
   <PasswordDialog ref="passwordRef"></PasswordDialog>
 </template>
 <!--文件-->
 <script setup lang="ts">
 import { ref } from "vue";
+import { computed } from "vue";
+
 import { LOGIN_URL } from "@/config";
 import { useRouter } from "vue-router";
 // import { logoutApi } from "@/api/modules/login";
-// import { useUserStore } from "@/stores/modules/user";
 import { ElMessageBox, ElMessage } from "element-plus";
-import InfoDialog from "./InfoDialog.vue";
+// import InfoDialog from "./InfoDialog.vue";
 import PasswordDialog from "./PasswordDialog.vue";
 // import { useCookies } from "@vueuse/integrations/useCookies";
+import { useUserStore } from "@/stores/modules/user";
+
+const userStore = useUserStore();
+const avatar = computed(() => userStore.avatar);
 
 const router = useRouter();
 // const userStore = useUserStore();
@@ -64,10 +67,10 @@ const logout = () => {
 };
 
 // 打开修改密码和个人信息弹窗
-const infoRef = ref<InstanceType<typeof InfoDialog> | null>(null);
+// const infoRef = ref<InstanceType<typeof InfoDialog> | null>(null);
 const passwordRef = ref<InstanceType<typeof PasswordDialog> | null>(null);
 const openDialog = (ref: string) => {
-  if (ref == "infoRef") infoRef.value?.openDialog();
+  if (ref == "infoRef") router.push("/userinformation");
   if (ref == "passwordRef") passwordRef.value?.openDialog();
 };
 </script>

src/layouts/components/Header/components/Message.vue

@@ -62,7 +62,7 @@
     </el-popover>
   </div>
 </template>
-
+<!--    -->
 <script setup lang="ts">
 import { ref } from "vue";
 const activeName = ref("first");

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

@@ -112,6 +112,7 @@ const getselectaccountNumber = async () => {
   userdata.value = data;
   loginForm.username = userdata.value.user.userName;
   userStore.setUserInfo({ name: loginForm.username });
+  userStore.setUseravatar(userdata.value.user.avatar);
 };
 // dialogVisible = false
 

src/stores/interface/index.ts

@@ -29,6 +29,7 @@ export interface GlobalState {
 export interface UserState {
   token: string;
   userInfo: { name: string };
+  avatar: string;
 }
 
 /* tabsMenuProps */

src/stores/modules/user.ts

@@ -6,7 +6,8 @@ export const useUserStore = defineStore({
   id: "geeker-user",
   state: (): UserState => ({
     token: "",
-    userInfo: { name: "" }
+    userInfo: { name: "" },
+    avatar: ""
   }),
   getters: {},
   actions: {
@@ -17,6 +18,9 @@ export const useUserStore = defineStore({
     // Set setUserInfo
     setUserInfo(userInfo: UserState["userInfo"]) {
       this.userInfo = userInfo;
+    },
+    setUseravatar(avatar: string) {
+      this.avatar = avatar;
     }
   },
   persist: piniaPersistConfig("geeker-user")

src/styles/element.scss

@@ -260,3 +260,9 @@
 .el-pagination.is-background .el-pager li.is-active {
   background-color: #0052d9;
 }
+.Space_content {
+  display: inline-block;
+  width: auto;
+  min-width: 160px;
+  color: #000000;
+}

src/views/Administration/addition copy.vue

@@ -1,183 +0,0 @@
-<template>
-  <div>
-    <div class="card content-box">
-      <div class="name">{{ supertype }}</div>
-      <el-divider />
-      <div class="user_box">
-        <div class="user_left">
-          <el-form ref="formRef" :model="numberValidateForm" label-width="auto" class="demo-ruleForm">
-            <div class="elform">
-              <el-form-item label="模板名称：" prop="postName" :rules="[{ required: true, message: '请输入模板名称' }]">
-                <el-input
-                  v-model.number="numberValidateForm.postName"
-                  style="width: 300px"
-                  size="large"
-                  type="text"
-                  placeholder="请输入模板名称"
-                  autocomplete="off"
-                />
-              </el-form-item>
-              <el-form-item label="电站名称：">
-                <el-input
-                  v-model.number="numberValidateForm.postCode"
-                  style="width: 300px"
-                  size="large"
-                  type="text"
-                  placeholder="请输入电站名称"
-                  autocomplete="off"
-                />
-              </el-form-item>
-            </div>
-            <div class="elform">
-              <el-form-item label="模板状态：">
-                <el-radio-group v-model="numberValidateForm.status">
-                  <el-radio value="0">正常</el-radio>
-                  <el-radio value="1">停用</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </div>
-
-            <div class="elform1">
-              <!-- <el-form-item label="标签：">
-                <el-input
-                  v-model.number="numberValidateForm.remark"
-                  style="width: 300px"
-                  size="large"
-                  type="text"
-                  placeholder="请输入标签"
-                  autocomplete="off"
-                />
-              </el-form-item> -->
-              <el-button type="primary" @click="addNewRow">新增行</el-button>
-              <el-table :data="tableData" style="width: 100%" v-loading="loading" border @row-click="handleRowClick">
-                <el-table-column prop="name" label="姓名"></el-table-column>
-                <el-table-column prop="age" label="年龄"></el-table-column>
-                <el-table-column prop="email" label="邮箱"></el-table-column>
-                <el-table-column label="操作">
-                  <template #default="{ row }">
-                    <el-button type="text" @click="editRow(row)">编辑</el-button>
-                    <el-button type="text" @click="deleteRow(row)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-            <el-divider />
-            <el-form-item class="bottom">
-              <el-button type="primary" @click="submitForm(formRef)">保存</el-button>
-              <el-button @click="resetForm(formRef)">关闭</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { platformpostadd, platformpostedit, platformshupostedit } from "@/api/home/Multisite";
-import { FormInstance } from "element-plus";
-import { onMounted, reactive, ref } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { nextTick } from "vue";
-
-const router = useRouter();
-const route = useRoute();
-
-const formRef = ref<FormInstance>();
-const supertype = ref(route.query.type);
-
-const numberValidateForm = reactive({
-  id: route.query.id,
-  parentId: "",
-  postName: "",
-  postCode: "",
-  postSort: "",
-  remark: "",
-  status: "0"
-});
-
-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 resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
-  formEl.resetFields();
-  router.push("/post/index");
-};
-const yonghueditdata = ref();
-const getghuedit = async () => {
-  const { data } = await platformshupostedit(route.query.id);
-  yonghueditdata.value = data;
-  console.log(yonghueditdata.value);
-  numberValidateForm.postName = yonghueditdata.value.post.postName;
-  numberValidateForm.postCode = yonghueditdata.value.post.postCode;
-  numberValidateForm.postSort = yonghueditdata.value.post.postSort;
-  numberValidateForm.remark = yonghueditdata.value.post.remark;
-  numberValidateForm.status = yonghueditdata.value.post.status;
-};
-interface TableDataItem {
-  name: string;
-  age: number;
-  email: string;
-}
-const loading = ref(false);
-const addNewRow = () => {
-  const newRow = ref<TableDataItem>({
-    name: "",
-    age: 0,
-    email: ""
-  });
-  tableData.push(newRow.value);
-
-  nextTick(() => {
-    const tableBody = document.querySelector(".el-table__body-wrapper");
-    if (tableBody) {
-      tableBody.scrollTop = tableBody.scrollHeight;
-    }
-  });
-};
-const tableData = reactive<TableDataItem[]>([
-  { name: "张三", age: 30, email: "zhangsan@example.com" },
-  { name: "李四", age: 25, email: "lisi@example.com" },
-  { name: "王五", age: 28, email: "wangwu@example.com" }
-  // ...其他数据
-]);
-
-const editRow = (row: TableDataItem) => {
-  console.log(row);
-
-  // 编辑行的逻辑，可以根据实际情况进行实现
-};
-const deleteRow = (row: TableDataItem) => {
-  console.log(row);
-  // 删除行的逻辑，可以根据实际情况进行实现
-};
-const handleRowClick = (row: TableDataItem) => {
-  console.log(row);
-  // 点击行的处理逻辑，可以根据实际情况进行实现
-};
-onMounted(() => {
-  if (route.query.type == "岗位编辑") {
-    getghuedit();
-  }
-});
-</script>
-<style scoped lang="scss">
-@import "./addition.scss";
-</style>

src/views/Administration/addition.scss

@@ -16,7 +16,6 @@
   display: flex;
   justify-content: space-between;
   width: 100%;
-  padding: 0 200px;
   margin-bottom: 10px;
 }
 .elformleft {

src/views/Administration/addition.vue

@@ -6,37 +6,6 @@
       <div class="user_box">
         <div class="user_left">
           <el-form ref="formRef" :model="numberValidateForm" label-width="auto" class="demo-ruleForm">
-            <div class="elform">
-              <el-form-item label="模板名称：" prop="postName" :rules="[{ required: true, message: '请输入模板名称' }]">
-                <el-input
-                  v-model.number="numberValidateForm.postName"
-                  style="width: 300px"
-                  size="large"
-                  type="text"
-                  placeholder="请输入模板名称"
-                  autocomplete="off"
-                />
-              </el-form-item>
-              <el-form-item label="电站名称：">
-                <el-input
-                  v-model.number="numberValidateForm.postCode"
-                  style="width: 300px"
-                  size="large"
-                  type="text"
-                  placeholder="请输入电站名称"
-                  autocomplete="off"
-                />
-              </el-form-item>
-            </div>
-            <div class="elform">
-              <el-form-item label="模板状态：">
-                <el-radio-group v-model="numberValidateForm.status">
-                  <el-radio value="0">正常</el-radio>
-                  <el-radio value="1">停用</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </div>
-
             <div class="elform1">
               <!-- <el-form-item label="标签：">
                 <el-input
@@ -48,22 +17,73 @@
                   autocomplete="off"
                 />
               </el-form-item> -->
-              <el-button type="primary" @click="addNewRow">新增行</el-button>
+              <div class="elform">
+                <el-form-item label="模板名称：" prop="postName" :rules="[{ required: true, message: '请输入模板名称' }]">
+                  <el-input
+                    v-model.number="numberValidateForm.postName"
+                    style="width: 300px"
+                    size="large"
+                    type="text"
+                    placeholder="请输入模板名称"
+                    autocomplete="off"
+                  />
+                </el-form-item>
+                <el-button type="primary" @click="addNewRow">新增行</el-button>
+              </div>
               <div class="elform"></div>
-              <el-table :data="tableData" border style="width: 100%" @row-click="handleRowClick">
-                <el-table-column prop="date" label="日期" width="180">
+              <el-table :data="tableData" border style="width: 100%">
+                <el-table-column prop="startTime" label="开始时段">
+                  <template #default="scope">
+                    <!-- <el-input v-model="scope.row.startTime" @change="handleEdit(scope.$index, scope.row)"></el-input> -->
+                    <el-time-select
+                      v-model="scope.row.startTime"
+                      start="00:00"
+                      step="00:30"
+                      end="24:00"
+                      placeholder="选择开始时段"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="endTime" label="结束时段">
                   <template #default="scope">
-                    <el-input v-model="scope.row.date" @change="handleEdit(scope.$index, scope.row)"></el-input>
+                    <!-- <el-input v-model="scope.row.endTime" @change="handleEdit(scope.$index, scope.row)"></el-input> -->
+                    <el-time-select
+                      v-model="scope.row.endTime"
+                      start="00:00"
+                      step="00:30"
+                      end="24:00"
+                      placeholder="选择结束时段"
+                    />
                   </template>
                 </el-table-column>
-                <el-table-column prop="name" label="姓名" width="180">
+                <el-table-column prop="periodType" label="峰值">
                   <template #default="scope">
-                    <el-input v-model="scope.row.name" @change="handleEdit(scope.$index, scope.row)"></el-input>
+                    <!-- <el-input v-model="scope.row.periodType" @change="handleEdit(scope.$index, scope.row)"></el-input> -->
+                    <el-select
+                      v-model="scope.row.periodType"
+                      collapse-tags
+                      placeholder="选择尖峰平谷"
+                      popper-class="custom-header"
+                      :max-collapse-tags="1"
+                      size="large"
+                    >
+                      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column prop="address" label="地址">
+                <el-table-column prop="buyPrice" label="买入电价(元/kWh)">
                   <template #default="scope">
-                    <el-input v-model="scope.row.address" @change="handleEdit(scope.$index, scope.row)"></el-input>
+                    <el-input v-model="scope.row.buyPrice" type="number"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="salePrice" label="卖出电价(元/kWh)">
+                  <template #default="scope">
+                    <el-input v-model="scope.row.salePrice" type="number"></el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="80">
+                  <template #default="scope">
+                    <div @click="handleEdit(scope.$index)">删除</div>
                   </template>
                 </el-table-column>
               </el-table>
@@ -81,82 +101,99 @@
 </template>
 
 <script setup lang="ts">
-import { platformpostadd, platformpostedit, platformshupostedit } from "@/api/home/Multisite";
+import { insertschedule } from "@/api/home/Multisite";
 import { FormInstance } from "element-plus";
-import { onMounted, reactive, ref } from "vue";
+import { reactive, ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { nextTick } from "vue";
+import { ElMessage } from "element-plus";
 
 const router = useRouter();
 const route = useRoute();
 
 const formRef = ref<FormInstance>();
 const supertype = ref(route.query.type);
-
+const options = ref([
+  {
+    value: 1,
+    label: "尖"
+  },
+  {
+    value: 2,
+    label: "峰"
+  },
+  {
+    value: 3,
+    label: "平"
+  },
+  {
+    value: 4,
+    label: "谷"
+  }
+]);
 const numberValidateForm = reactive({
-  id: route.query.id,
-  parentId: "",
-  postName: "",
-  postCode: "",
-  postSort: "",
-  remark: "",
-  status: "0"
+  postName: ""
 });
 
 const submitForm = (formEl: FormInstance | undefined) => {
+  console.log(tableData);
   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();
+      if (!validateData()) return;
+      const { data } = await insertschedule(tableData, numberValidateForm.postName);
+      console.log(data);
+      router.push({ path: "/Administration/index", query: { id: "模板管理" } });
     } else {
       console.log("error submit!");
       return false;
     }
   });
 };
+const validateData = () => {
+  if (tableData.length == 0) {
+    ElMessage({ type: "error", message: `请填写电价模板表格` });
+    return false;
+  }
+  for (const row of tableData) {
+    if (
+      row.startTime === undefined ||
+      row.endTime === undefined ||
+      row.periodType == "" ||
+      row.buyPrice == "" ||
+      row.salePrice == ""
+    ) {
+      // message.error("所有字段都必须填写");
+      ElMessage({ type: "error", message: `所有字段都必须填写` });
 
+      return false;
+    }
+  }
+  return true;
+};
 const resetForm = (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   formEl.resetFields();
-  router.push("/Administration/index");
-};
-const yonghueditdata = ref();
-const getghuedit = async () => {
-  const { data } = await platformshupostedit(route.query.id);
-  yonghueditdata.value = data;
-  console.log(yonghueditdata.value);
-  numberValidateForm.postName = yonghueditdata.value.post.postName;
-  numberValidateForm.postCode = yonghueditdata.value.post.postCode;
-  numberValidateForm.postSort = yonghueditdata.value.post.postSort;
-  numberValidateForm.remark = yonghueditdata.value.post.remark;
-  numberValidateForm.status = yonghueditdata.value.post.status;
+  router.push({ path: "/Administration/index", query: { id: "模板管理" } });
 };
+
 interface TableData {
-  date: string;
-  name: string;
-  address: string;
+  startTime: string;
+  endTime: string;
+  periodType: string;
+  buyPrice: string;
+  salePrice: string;
 }
-const tableData = reactive<TableData[]>([
-  {
-    date: "2016-05-02",
-    name: "王小虎",
-    address: "上海市普陀区金沙江路 1518 弄"
-  }
-  // ...其他数据
-]);
+const tableData = reactive<TableData[]>([]);
 // 新增行
 const addNewRow = () => {
   const newRow = ref<TableData>({
-    date: "",
-    name: "",
-    address: ""
+    startTime: "",
+    endTime: "",
+    periodType: "",
+    buyPrice: "",
+    salePrice: ""
   });
   tableData.push(newRow.value);
 
@@ -167,19 +204,10 @@ const addNewRow = () => {
     }
   });
 };
-const handleEdit = (index: number, row: TableData) => {
+const handleEdit = (index: number) => {
   // 处理编辑逻辑，例如更新数据源或发送请求
-  console.log(index, row);
-};
-const handleRowClick = (row: TableData) => {
-  console.log(row);
-  // 点击行的处理逻辑，可以根据实际情况进行实现
+  tableData.splice(index, 1);
 };
-onMounted(() => {
-  if (route.query.type == "岗位编辑") {
-    getghuedit();
-  }
-});
 </script>
 <style scoped lang="scss">
 @import "./addition.scss";

src/views/Administration/index.scss

@@ -2,9 +2,56 @@
 * {
   font-size: 14px;
 }
+.Space_content {
+  .select {
+    min-width: 100px;
+    .el-input__inner {
+      padding-right: 20px;
+      padding-left: 15px;
+      font-weight: 600;
+      background-color: transparent;
+      border: none;
+    }
+    &:hover {
+      cursor: pointer;
+      background-color: rgb(46 46 56 / 8%);
+      border-radius: 5px;
+    }
+    .el-icon-arrow-up::before {
+      color: #000000;
+      content: "\e78f";
+    }
+    .el-input__suffix {
+      top: -2px;
+      right: 0;
+    }
+    .el-input__prefix {
+      position: relative;
+      left: 0;
+      box-sizing: border-box;
+      height: 32px;
+      padding: 0 30px;
+      line-height: 35px;
+      visibility: hidden;
+    }
+    input {
+      position: absolute;
+    }
+  }
+  .el-input {
+    width: auto !important;
+  }
+}
 .title {
   display: flex;
   :deep(.el-select__wrapper) {
+    .el-select__prefix {
+      color: #000000 !important;
+    }
+    .el-select__selected-item {
+      font-size: 22px;
+    }
+
     background-color: rgb(0 0 0 / 0%);
     box-shadow: 0 0 0 0 !important;
 
@@ -24,7 +71,7 @@
   // 自定义el-select的下拉箭头
   :deep(.el-select__caret) {
     /* 为下拉小箭头留出一点位置，避免被文字覆盖 */
-    padding-right: 14px;
+    padding-right: 10px;
 
     /* 很关键：将默认的select选择框样式清除 */
     appearance: none;
@@ -108,9 +155,20 @@
   color: #0052d9;
   cursor: pointer;
 }
+.bodycheckbox {
+  margin-top: 16px;
+  margin-right: 12px;
+}
 .eltable {
   margin-top: 30px;
 }
+.eltable1 {
+  box-sizing: border-box;
+  margin-top: 30px;
+}
+.eltabledialog {
+  margin-top: 30px;
+}
 .eltable_right {
   display: flex;
   align-items: center;
@@ -127,6 +185,7 @@
 }
 .dialog_title {
   display: flex;
+  width: 100%;
   margin-top: 20px;
 }
 .more_name {
@@ -134,6 +193,7 @@
   color: #777777;
 }
 .more_theme {
+  width: 100%;
   color: #000000;
 }
 .dialog_name {
@@ -150,10 +210,148 @@
   margin-bottom: 10px;
 }
 .dialog_footer {
-  margin-top: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .pagination {
   display: flex;
   justify-content: space-between;
   margin-top: 20px;
 }
+.templatebox {
+  width: 100%;
+}
+.overview_title {
+  display: flex;
+  width: 100%;
+  margin-top: 40px;
+}
+.overview_title1 {
+  display: flex;
+}
+.dialog {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  margin-top: 40px;
+}
+.dialog_box {
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  width: 834px;
+  border-bottom: solid #222222 0.1px;
+  border-left: solid #222222 0.1px;
+}
+.overview_tiem {
+  display: flex;
+  flex-direction: column;
+  width: 100px;
+  margin-top: 40px;
+}
+.dialog_box1 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100px;
+  height: 60px;
+  border-top: solid #222222 0.1px;
+  border-right: solid #222222 0.1px;
+}
+.overview_dox1 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  border-top: solid #222222 0.1px;
+  border-right: solid #222222 0.1px;
+}
+.dialog_box11 {
+  display: flex;
+  border-top: solid #222222 0.1px;
+
+  // border-bottom: solid #222222 0.1px;
+}
+.dialog_box111 {
+  box-sizing: border-box;
+  display: flex;
+}
+.dialog_box12 {
+  display: flex;
+  flex-direction: column;
+}
+.dialog_box121 {
+  display: flex;
+}
+.overview_dox {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  background-color: #000000;
+}
+.overview_1dox {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  color: #000000;
+  background-color: #efb786;
+
+  // border-top: solid #222222 0.1px;
+  border-right: solid #222222 0.1px;
+}
+.overview_2dox {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  color: #000000;
+  background-color: #c35e0e;
+
+  // border-top: solid #222222 0.1px;
+  border-right: solid #222222 0.1px;
+}
+.overview_3dox {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  color: #000000;
+  background-color: #fde696;
+
+  // border-top: solid #222222 0.1px;
+
+  border-right: solid #222222 0.1px;
+}
+.overview_4dox {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  color: #000000;
+  background-color: #b6c6e8;
+
+  // border-top: solid #222222 0.1px;
+  border-right: solid #222222 0.1px;
+}
+.overview_5dox {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  color: #000000;
+  background-color: #cccccc;
+
+  // border-top: solid #222222 0.1px;
+  border-right: solid #222222 0.1px;
+}

src/views/Administration/index.vue

@@ -2,15 +2,20 @@
   <div>
     <div class="title">
       <el-select
+        v-if="activeName == '电价配置'"
         v-model="Singlevalue"
         collapse-tags
         placeholder="选择电站"
         popper-class="custom-header"
         :max-collapse-tags="1"
-        style="width: 300px"
         size="large"
+        class="Space_content"
         @change="postersDevice"
       >
+        <template #prefix>
+          {{ (cities.find(s => s.id === Singlevalue) || {}).stationName }}
+        </template>
+
         <el-option v-for="(item, index) in cities" :key="index" :label="item.stationName" :value="item.id" />
       </el-select>
     </div>
@@ -21,38 +26,48 @@
             <el-card>
               <div class="price_allocation">
                 <el-icon><WarningFilled /></el-icon>&ensp;
-                为对应月份选择模板后，请点击“绑定”按钮以完成应用。更换模板前请先点击”解绑”按钮，才可重新选择。
+                请点击“绑定”按钮为对应月份选择模板以完成应用。更换模板前请点击”解绑”按钮，才可重新“绑定”。
               </div>
             </el-card>
 
             <div class="datepicker">
-              年份：
-              <el-date-picker
-                v-model="pickervalue"
-                type="year"
-                placeholder="选择时间"
-                size="large"
-                clearable
-                :disabled-date="pickerOptions"
-                @change="pickerincome"
-              />
+              <div>
+                年份：
+                <el-date-picker
+                  v-model="pickervalue"
+                  type="year"
+                  placeholder="选择时间"
+                  size="large"
+                  clearable
+                  :disabled-date="pickerOptions"
+                  @change="pickerincome"
+                />
+              </div>
+              <el-button type="primary" @click="onoverview()" size="large">总览</el-button>
             </div>
             <div class="all_ocation">
               <div class="allocation_1" v-for="(item, index) in tricitylist" :key="index">
                 <div class="header" :style="index % 4 == 0 ? 'border-left: 1px solid #ebeef5;' : ''">{{ item.imonth }}月</div>
                 <div class="body" :style="index % 4 == 0 ? 'border-left: 1px solid #ebeef5;' : ''">
                   <div class="body_content">{{ item.tmplName }}</div>
-                  <div class="bodycheck" @click="oncheck(item.stationTmplId)">查看</div>
+                  <div>
+                    <div>
+                      <el-button v-if="item.start == 1" type="primary" plain @click="configuration(item.tariffId)" size="small">
+                        查看
+                      </el-button>
+                    </div>
+                    <div class="bodycheckbox">
+                      <el-button type="primary" v-if="item.start == 1" plain @click="onUnbind(item)" size="small">
+                        解绑
+                      </el-button>
+                      <el-button type="primary" v-else plain @click="ondetermine(item)" size="small">绑定</el-button>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
           </el-tab-pane>
           <el-tab-pane label="模板管理" name="模板管理">
-            <el-card>
-              <div class="price_allocation">
-                <el-icon><WarningFilled /></el-icon>&ensp; 点击“引用模板”按钮，可将“公共模板”中的电价模板直接引用至当前页面下！
-              </div>
-            </el-card>
             <div class="datepicker">
               <div>
                 <el-button type="primary" size="large" color="#0052d9" @click="newaddition">新增</el-button>
@@ -69,7 +84,7 @@
               </div>
             </div>
 
-            <div class="eltable">
+            <div class="eltable templatebox">
               <el-table :data="tmplpagedata.records" border style="width: 100%" :show-overflow-tooltip="true">
                 <el-table-column prop="name" label="模板名称" />
                 <el-table-column prop="isUsing" label="状态" align="center" width="140">
@@ -81,21 +96,13 @@
                 <el-table-column prop="tags" label="标签" />
                 <el-table-column prop="createUserName" label="创建人" width="140" />
                 <el-table-column prop="createTime" label="创建时间" />
-                <el-table-column prop="stationTmplId" label="操作" width="140">
+                <el-table-column prop="tariffId" label="操作" width="140">
                   <template #default="scope">
                     <el-button class="bodycheck" @click="oncheck(scope.row.id)">查看</el-button>
                   </template>
                 </el-table-column>
               </el-table>
             </div>
-            <!-- <div class="eltable_right">
-              共&ensp;{{ tmplpagedata.records.length }}&ensp;
-              <el-pagination
-                layout="prev, pager, next"
-                :total="tmplpagedata.records.length"
-                @change="changemultiStationpagebase"
-              />
-            </div> -->
             <div class="pagination">
               <div></div>
               <slot name="pagination">
@@ -112,8 +119,8 @@
     </div>
     <el-dialog v-model="dialogVisible" title="模板详情" width="1000" :before-close="handleClose" border>
       <div class="dialog_title">
-        <div class="more_name">电站名称：</div>
-        <div class="more_theme">{{ tytmplpagedetails.name }}</div>
+        <div class="more_name">模板名称：</div>
+        <div class="more_theme">{{ tytmplpagedetails.data[0].name }}</div>
       </div>
       <div class="dialog_title">
         <div class="more_name">模板状态：</div>
@@ -133,11 +140,12 @@
         <div class="more_name">模板标签：</div>
         <div class="more_theme">-</div>
       </div>
-      <div class="eltable">
-        <el-table :data="tytmplpagedetails.scheduleVOS" border style="width: 1000px">
+      <div class="eltable1">
+        <el-table :data="tytmplpagedetails.scheduleVOS" border style="height: 300px">
           <el-table-column label="开始时间——结束时间" width="180" align="center">
             <template #default="scope">
-              <span>{{ scope.row.startTime }}</span> - <span>{{ scope.row.endTime }}</span>
+              <span>{{ scope.row.startTime }}</span> -
+              <span>{{ scope.row.endTime }}</span>
             </template>
           </el-table-column>
 
@@ -159,17 +167,119 @@
         </div>
       </template>
     </el-dialog>
+    <el-dialog v-model="dialogtmptariff" title="模板详情" width="1000" :before-close="handleClose" border>
+      <div class="dialog_title">
+        <div class="more_name">模板名称：</div>
+        <div class="more_theme">{{ tytmpltariff.data[0].name }}</div>
+      </div>
+      <div class="dialog_title">
+        <div class="more_name">模板状态：</div>
+        <div class="more_theme">使用中</div>
+      </div>
+      <div class="dialog_title">
+        <div class="more_name">使用情况：</div>
+        <div class="more_theme">
+          <div class="dialog_11">
+            <div class="dialog_1" v-for="(item, index) in tytmpltariff.stationUsing" :key="index">
+              <span class="dialog_name">{{ item.tmplName }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="dialog_title">
+        <div class="more_name">模板标签：</div>
+        <div class="more_theme">-</div>
+      </div>
+      <div class="eltable1">
+        <el-table :data="tytmpltariff.scheduleVOS" border style="height: 300px">
+          <el-table-column label="开始时间——结束时间" width="180" align="center">
+            <template #default="scope">
+              <span>{{ scope.row.startTime }}</span> -
+              <span>{{ scope.row.endTime }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="periodType" label="时段" width="180" align="center">
+            <template #default="scope">
+              <div v-if="scope.row.periodType == 2">峰</div>
+              <div v-if="scope.row.periodType == 1">尖</div>
+              <div v-if="scope.row.periodType == 4">谷</div>
+              <div v-if="scope.row.periodType == 3">平</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="buyPrice" label="买入电价(元/kWh)" align="center" />
+          <el-table-column prop="salePrice" label="卖出电价(元/kWh)" align="center" />
+        </el-table>
+      </div>
+      <template #footer>
+        <div class="dialog_footer">
+          <el-button type="primary" @click="dialogtmptariff = false" color="#0052d9"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="overview" title="电价时段总览" top="5vh" :before-close="handoverview" border>
+      <div class="dialog">
+        <div class="dialog_box">
+          <div class="dialog_box111">
+            <div class="dialog_box1">时段</div>
+            <div class="overview_dox1" v-for="(itme, index) in headers" :key="index">{{ itme }}</div>
+          </div>
+          <div class="overview_title1" v-for="(item, index) in poweroverdata" :key="index">
+            <div class="dialog_box1">{{ item.time }}- {{ getNextTime(index) }}</div>
+            <div class="overview_title1">
+              <div class="dialog_box11" v-for="(items, a) in 12" :key="a">
+                <div class="overview_1dox" v-if="poweroverdata[index][items] == 1">高峰</div>
+                <div class="overview_2dox" v-if="poweroverdata[index][items] == 2">尖峰</div>
+                <div class="overview_3dox" v-if="poweroverdata[index][items] == 3">平段</div>
+                <div class="overview_4dox" v-if="poweroverdata[index][items] == 4">低谷</div>
+                <div class="overview_5dox" v-if="poweroverdata[index][items] == ''"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <template #footer>
+        <div class="dialog_footer">
+          <el-button type="primary" @click="overview = false" color="#0052d9"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!--    -->
+    <el-dialog v-model="binding" title="绑定" :before-close="handbinding" width="600" border>
+      <div class="overview_title">
+        <div>模板名称：</div>
+        <el-select v-model="onbindingvalue" filterable placeholder="请绑定模板名称" style="width: 300px" size="large">
+          <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </div>
+
+      <template #footer>
+        <div class="dialog_footer">
+          <el-button type="primary" @click="onbinding" color="#0052d9"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
-<!---  --->
+<!--    -->
 <script setup lang="ts">
 import { onMounted, Ref, ref } from "vue";
-import { stationstationName, electricitylist, electricitytmplpage, electricitytmplpagedetails } from "@/api/home/Multisite";
-import { Station } from "@/api/interface";
+import {
+  stationstationName,
+  electricitylist,
+  electricitytmplpage,
+  electricitytmplpagedetails,
+  insertscheduletariffURL,
+  selectelectURL,
+  selectpoweroverviewURL,
+  electricitytmptariff
+} from "@/api/home/Multisite";
+import { other, Station } from "@/api/interface";
 import Pagination from "@/components/ProTable/components/Pagination.vue";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 const router = useRouter();
-
+const route = useRoute();
 const currentDate = ref();
 const Singlevalue = ref("");
 const cities: Ref<Station.todo[]> = ref([]);
@@ -198,15 +308,19 @@ const handleClick = async (val: any) => {
   }
 };
 // 电价配置
-const activeName = ref("电价配置");
+const activeName: Ref<any> = ref("");
+const currentYear = new Date().getFullYear();
+console.log(currentYear);
+
 const pickervalue = ref();
+pickervalue.value = currentYear + "";
 const pickerOptions = (time: { getTime: (arg0: Date) => number }) => {
   return time.getTime(new Date()) > Date.now();
 };
 // 选择日期
 const pickerincome = async (val: any) => {
   if (val == null) {
-    pickervalue.value = "";
+    pickervalue.value = currentYear;
   } else {
     pickervalue.value = formatDate(val);
   }
@@ -233,23 +347,54 @@ const tricitylist: Ref<Station.electricity[]> = ref([]);
 const getelectricitylist = async () => {
   const { data } = await electricitylist({}, Singlevalue.value);
   tricitylist.value = data;
+  getselectpoweroverview();
 };
-// 电价配置详情
+// 模板管理查看
+const dialogVisible = ref();
+const oncheck = (tariffId: any) => {
+  getelectricitytmplpagedetails(tariffId);
+  dialogVisible.value = true;
+};
+// 模板配置详情
 const tytmplpagedetails = ref();
-const getelectricitytmplpagedetails = async (stationTmplId?: any) => {
-  const { data } = await electricitytmplpagedetails({}, Singlevalue.value, stationTmplId);
+const getelectricitytmplpagedetails = async (tariffId?: any) => {
+  const { data } = await electricitytmplpagedetails({}, tariffId);
   tytmplpagedetails.value = data;
 };
+// 电价配置查看
+const dialogtmptariff = ref();
+const configuration = (tariffId: any) => {
+  onelectricitytmptariff(tariffId);
+  dialogtmptariff.value = true;
+};
+const tytmpltariff = ref();
+const onelectricitytmptariff = async (tariffId?: any) => {
+  const { data } = await electricitytmptariff({}, tariffId);
+  tytmpltariff.value = data;
+};
 
-const dialogVisible = ref();
-const oncheck = (stationTmplId: any) => {
-  getelectricitytmplpagedetails(stationTmplId);
-  dialogVisible.value = true;
+// 解绑弹窗
+const gettariffid = ref();
+const onUnbind = (itme: any) => {
+  gettariffid.value = itme.tariffId;
+  startvalue.value = 1;
+  onbindingvalue.value = itme.tmplId;
+  onbinding();
+};
+// 绑定弹窗
+const ondetermine = (itme: any) => {
+  gettariffid.value = itme.tariffId;
+  onbindingvalue.value = itme.tmplId;
+  startvalue.value = 0;
+
+  binding.value = true;
 };
 const handleClose = () => {
   dialogVisible.value = false;
+  dialogtmptariff.value = false;
 };
 // 模板管理表格数据
+//
 const tmplpagedata = ref();
 const keyword = ref("");
 const gettmplpage = async () => {
@@ -258,7 +403,7 @@ const gettmplpage = async () => {
     pn: pageable.value.pn,
     ps: pageable.value.ps
   };
-  const { data } = await electricitytmplpage(obj, Singlevalue.value);
+  const { data } = await electricitytmplpage(obj);
 
   tmplpagedata.value = data;
   pageable.value.total = tmplpagedata.value.total;
@@ -295,15 +440,169 @@ const newaddition = () => {
     }
   });
 };
+// 年份总览
+const overview = ref(false);
+const onoverview = () => {
+  overview.value = true;
+};
+const handoverview = () => {
+  overview.value = false;
+};
+// 绑定
+const binding = ref(false);
+const handbinding = () => {
+  binding.value = false;
+};
+// const value = ref("");
+const options = ref();
+// 绑定列表
+const onbindingvalue = ref("");
+
+const getselectelect = async () => {
+  let obj = {
+    name: ""
+  };
+  const { data } = await selectelectURL(obj);
+  options.value = data;
+};
+// 绑定确认弹窗
+const startvalue = ref();
+const onbinding = async () => {
+  let obj = {
+    tmplId: onbindingvalue.value,
+    start: startvalue.value,
+    tariffId: gettariffid.value
+  };
+  await insertscheduletariffURL(obj);
+  binding.value = false;
+  getelectricitylist();
+};
+// 电价总览
+let poweroverdata = ref();
+const headers = ref(["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"]); // 表头数据
+
+const getselectpoweroverview = async () => {
+  let obj = {
+    powerId: Singlevalue.value,
+    year: pickervalue.value
+  };
+  const { data } = await selectpoweroverviewURL(obj);
+  // poweroverdata.value = data.data;
+
+  const dato: other.Select = data;
+
+  const getdata = [
+    ...dato[1],
+    ...dato[2],
+    ...dato[3],
+    ...dato[4],
+    ...dato[5],
+    ...dato[6],
+    ...dato[7],
+    ...dato[8],
+    ...dato[9],
+    ...dato[10],
+    ...dato[11],
+    ...dato[12]
+  ];
+  interface TableRow {
+    time: string;
+    [key: number]: string; // 列以月份为键
+  }
+  // 处理数据
+  const timeSlots = [
+    "00:00",
+    "00:30",
+    "01:00",
+    "01:30",
+    "02:00",
+    "02:30",
+    "03:00",
+    "03:30",
+    "04:00",
+    "04:30",
+    "05:30",
+    "05:30",
+    "06:00",
+    "06:30",
+    "07:00",
+    "07:30",
+    "08:00",
+    "08:30",
+    "09:00",
+    "09:30",
+    "10:00",
+    "10:30",
+    "11:00",
+    "11:30",
+    "12:00",
+    "12:30",
+    "13:00",
+    "13:30",
+    "14:00",
+    "14:30",
+    "15:00",
+    "15:30",
+    "16:00",
+    "16:30",
+    "17:00",
+    "17:30",
+    "18:00",
+    "18:30",
+    "19:00",
+    "19:30",
+    "20:00",
+    "20:30",
+    "21:00",
+    "21:30",
+    "22:00",
+    "22:30",
+    "23:00",
+    "23:30"
+  ];
+  const months = Array.from({ length: 12 }, (_, i) => i + 1);
+  // 初始化表格
+  const table: TableRow[] = timeSlots.map(time => ({
+    time,
+    ...months.reduce((acc, month) => ({ ...acc, [month]: "" }), {})
+  }));
+
+  // 填充表格
+  getdata.forEach(item => {
+    const rowIndex = timeSlots.indexOf(item.startTime);
+    if (rowIndex !== -1) {
+      table[rowIndex][item.imonth] = item.periodType;
+    }
+  });
+  console.log(table);
+  poweroverdata.value = table;
+  // 输出结果
+};
+// 计算下一个时间的函数
+const getNextTime = (index: number) => {
+  const nextIndex = index + 1;
+  if (nextIndex < poweroverdata.value.length) {
+    return poweroverdata.value[nextIndex].time;
+  } else {
+    return "24:00";
+  }
+};
 onMounted(() => {
   const current = localStorage.getItem("currentDate");
   if (current) {
     currentDate.value = current;
   }
   poststationstationName();
+  if (route.query.id) {
+    activeName.value = route.query.id;
+    gettmplpage();
+  } else {
+    activeName.value = "电价配置";
+  }
+  getselectelect();
 });
 </script>
 <style scoped lang="scss">
 @import "./index.scss";
 </style>
-<!-- -->
+<!-- 电量配置 -- 模板查看 -->

src/views/Alarm/index.scss

@@ -6,6 +6,13 @@
 .title {
   display: flex;
   :deep(.el-select__wrapper) {
+    .el-select__prefix {
+      color: #000000 !important;
+    }
+    .el-select__selected-item {
+      font-size: 22px;
+    }
+
     background-color: rgb(0 0 0 / 0%);
     box-shadow: 0 0 0 0 !important;
 

src/views/Alarm/index.vue

@@ -7,24 +7,30 @@
         placeholder="选择电站"
         popper-class="custom-header"
         :max-collapse-tags="1"
-        style="width: 300px"
+        class="Space_content"
         size="large"
         @change="postemsDevice"
       >
-        <el-option v-for="item in cities" :key="item.id" :label="item.stationName" :value="item.id" />
+        <el-option v-for="(item, index) in cities" :key="index" :label="item.stationName" :value="item.id" />
+        <template #prefix>
+          {{ (cities.find(s => s.id === Singlevalue) || {}).stationName }}
+        </template>
       </el-select>
       <div class="title_"></div>
       <el-select
         v-model="emsDeviceId"
         collapse-tags
-        placeholder="选择设备编号"
+        placeholder="选择编号"
         popper-class="custom-header"
         :max-collapse-tags="1"
-        style="width: 240px"
+        class="Space_content"
         size="large"
         @change="getstationrealtime"
       >
-        <el-option v-for="(item, index) in emsDevice" :key="index" :label="item.emsDeviceId" :value="item.id" />
+        <template #prefix>
+          {{ (emsDevice.find(s => s.id === emsDeviceId) || {}).id }}
+        </template>
+        <el-option v-for="item in emsDevice" :key="item.id" :label="item.emsDeviceId" :value="item.id" />
       </el-select>
     </div>
     <div class="faultalarm">

src/views/department/index.vue

@@ -7,7 +7,7 @@
     <div class="card">
       <div class="screen">
         <div>
-          部门名称&ensp;&ensp;<el-input v-model="deptName" style="width: 375px" size="large" placeholder="输入角色名称" />
+          部门名称&ensp;&ensp;<el-input v-model="deptName" style="width: 375px" size="large" placeholder="输入部门名称" />
         </div>
 
         <div>

src/views/equipment/index.scss

@@ -0,0 +1,73 @@
+.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;
+}
+.btn-group {
+  display: flex;
+  gap: 10px; /* 按钮之间的间隔 */
+  align-items: center; /* 垂直居中按钮 */
+  justify-content: center; /* 水平居中按钮 */
+}
+.dialog_box {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  padding: 20px 60px;
+  margin-top: 40px;
+}
+.dialog_box1 {
+  display: flex;
+  width: 100%;
+  padding: 20px 60px;
+  margin-top: 10px;
+}
+.dialog_box2 {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  padding: 20px 60px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+.dialog_name {
+  display: flex;
+  margin-right: 20px;
+}
+.dialog_footer {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.elimageurl {
+  display: flex;
+  overflow: hidden;
+  overflow: auto auto;
+}
+.Required {
+  width: 10px;
+  color: red;
+}

src/views/equipment/index.vue

@@ -0,0 +1,282 @@
+<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="Singlevalue" placeholder="选择电站" size="large" style="width: 240px">
+            <el-option v-for="item in cities" :key="item.id" :label="item.stationName" :value="item.id" />
+          </el-select>
+        </div>
+        &ensp;&ensp; &ensp;&ensp;
+        <div>
+          设备名称&ensp;&ensp;<el-input v-model="emsdevicename" style="width: 300px" size="large" placeholder="输入设备名称" />
+        </div>
+        <!-- <div>
+          &ensp;&ensp;&ensp;&ensp;
+          岗位名称&ensp;&ensp;<el-input
+            v-model="postName"
+            style="width: 300px"
+            size="large"
+            placeholder="输入岗位名称"
+          />
+        </div> -->
+        &ensp;&ensp; &ensp;&ensp;
+        <div>
+          <el-button type="primary" size="large" color="#0052d9" @click="query(0)">查询</el-button>
+          <el-button size="large" @click="query(1)">重置</el-button>&ensp;&ensp;
+        </div>
+      </div>
+      <div class="screen1"></div>
+    </div>
+    <div class="card cardbottom">
+      <!-- <el-button type="primary" size="large" color="#0052d9" @click="newaddition">新增</el-button> -->
+
+      <div>&ensp;</div>
+      <el-table :data="tableData.records" style="width: 100%" border>
+        <el-table-column prop="eid" label="设备编号" />
+        <el-table-column prop="emsDeviceId" label="设备名称" />
+        <el-table-column prop="powerName" label="归属电站" />
+        <el-table-column prop="onlineStatus" label="绑定状态" align="center">
+          <template #default="scope">
+            <!-- <div v-if="scope.row.onlineStatus == 1">绑定</div>
+            <div v-else>未绑定</div> -->
+            <el-switch
+              v-model="scope.row.onlineStatus"
+              :active-value="1"
+              :inactive-value="0"
+              disabled
+              @change="changeswitch"
+              size="large"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" />
+        <el-table-column prop="updateTime" label="修改时间" />
+        <!-- <el-table-column prop="updateTime" label="创建时间" /> -->
+        <el-table-column prop="onlineStatus" label="设备图片" align="center" width="200">
+          <template #default="scope">
+            <div class="elimageurl">
+              <div v-for="(item, index) in scope.row.url" :key="index">
+                <el-image
+                  style="width: 60px; height: 60px; margin-right: 10px"
+                  :src="item"
+                  :zoom-rate="1.2"
+                  :max-scale="7"
+                  :min-scale="0.2"
+                  :preview-teleported="true"
+                  :preview-src-list="scope.row.url"
+                  :initial-index="index"
+                  fit="cover"
+                />
+              </div>
+            </div>
+
+            <!-- <img v-for="(item, index) in scope.row.url" :key="index" :src="item" alt="" style="height: 60px" /> -->
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <el-button color="#0052d9" type="primary" @click="newition(scope.row)"> 编辑 </el-button>
+            <el-button v-if="BUTTONS.equipmentedit" color="#0052d9" type="primary" @click="newition(scope.row)"> 编辑 </el-button>
+            <!-- <el-button @click="onremove(scope.row)">删除</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="修改" width="1000" :before-close="handleClose" border>
+      <div class="dialog_box">
+        <div class="dialog_name"><span class="Required">*</span> 设备名称</div>
+        <el-input v-model="emsdeviceidname" style="width: 300px" size="large" placeholder="输入设备名称" />
+      </div>
+      <div class="dialog_box1">
+        <div class="dialog_name">上传图片</div>
+        <div>
+          <UploadImgs v-model:file-list="absoluteStationPicUr1" width="300px" :limit="9">
+            <template #empty>
+              <el-icon><Picture /></el-icon>
+              <span>请上传电站图片</span>
+            </template>
+            <template #tip>图片类型 __ jpg jpeg png</template>
+          </UploadImgs>
+        </div>
+      </div>
+      <div class="dialog_box2">
+        <div class="dialog_name">绑定状态</div>
+        <el-switch v-model="powerswitch" :active-value="1" :inactive-value="0" @change="changeswitch" size="large" />
+      </div>
+      <div class="dialog_box2">
+        <div class="dialog_name">
+          <span v-if="powerswitch == 1" class="Required">*</span>
+          <div v-if="powerswitch != 1" class="Required"></div>
+          绑定设备
+        </div>
+        <el-select v-model="powersvalue" placeholder="选择电站" size="large" style="width: 300px">
+          <el-option v-for="item in powerstation" :key="item.id" :label="item.stationName" :value="item.id" />
+        </el-select>
+      </div>
+      <template #footer>
+        <div class="dialog_footer">
+          <el-button type="primary" @click="determine" size="large" color="#0052d9"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<!--    -->
+<script setup lang="ts">
+import { selectemssytemNameURL, stationstationName, updateemssytemNameURL, selectemsNameURL } from "@/api/home/Multisite";
+import Pagination from "@/components/ProTable/components/Pagination.vue";
+import { onMounted, ref, Ref } from "vue";
+import { Station } from "@/api/interface";
+import UploadImgs from "@/components/Upload/Imgs.vue";
+import { useAuthButtons } from "@/hooks/useAuthButtons";
+import { ElNotification } from "element-plus";
+
+const { BUTTONS } = useAuthButtons();
+// 绑定设备
+const Singlevalue = ref("");
+const cities: Ref<Station.todo[]> = ref([]);
+// 编辑绑定设备
+const powersvalue = ref("");
+const powerswitch = ref();
+const powerstation: Ref<Station.todo[]> = ref([]);
+const absoluteStationPicUr1 = ref();
+
+const poststationstationName = async () => {
+  const { data } = await stationstationName({});
+  const res = await stationstationName({});
+  powerstation.value = res.data;
+  cities.value = data;
+  cities.value.unshift({
+    id: "",
+    stationName: "全部",
+    energyMgrMode: 0,
+    priceCfgMode: 0,
+    sortNo: 0,
+    timezone: ""
+  });
+  Singlevalue.value = data[0].id;
+};
+const query = (val: any) => {
+  if (val == 0) {
+    getplatformuserlist();
+  } else {
+    (emsdevicename.value = ""), (Singlevalue.value = "");
+    getplatformuserlist();
+  }
+};
+// 编辑
+const emsdeviceidname = ref();
+const emsId = ref();
+const dialogVisible = ref();
+const selectems = ref();
+const newition = async (row: { url: never[]; emsDeviceId: any; eid: any }) => {
+  console.log(row.eid);
+  const { data } = await selectemsNameURL(row.eid, {});
+  console.log(data);
+  selectems.value = data;
+  let elementurl = [];
+  for (let index = 0; index < selectems.value.emsurl.length; index++) {
+    let element = {
+      url: selectems.value.emsurl[index]
+    };
+    elementurl.push(element);
+  }
+  console.log(elementurl);
+
+  absoluteStationPicUr1.value = elementurl; // 设备图片
+  emsdeviceidname.value = selectems.value.emsDeviceId; //设备名称
+  emsId.value = selectems.value.eid; // 设备id
+  powersvalue.value = selectems.value.pid; // 绑定电站
+  powerswitch.value = selectems.value.onlineStatus; // 绑定状态
+  dialogVisible.value = true;
+};
+
+const changeswitch = async (e: any) => {
+  if (e == 0) {
+    powersvalue.value = "";
+  }
+  console.log(e);
+};
+// 确定
+const determine = async () => {
+  if (powerswitch.value == 1) {
+    if (powersvalue.value == "") {
+      ElNotification({
+        title: "温馨提示",
+        message: "请选择电站并绑定！",
+        type: "warning"
+      });
+      return;
+    }
+  }
+  let obj = {
+    emsName: emsdeviceidname.value,
+    emsId: emsId.value,
+    imageurl: absoluteStationPicUr1.value.map((item: { url: any }) => item.url).join(","),
+    binding: powerswitch.value,
+    powerId: powersvalue.value
+  };
+  const { data } = await updateemssytemNameURL(obj);
+  console.log(data);
+  getplatformuserlist();
+  dialogVisible.value = false;
+};
+// 弹出取消
+const handleClose = () => {
+  dialogVisible.value = false;
+};
+const tableData = ref();
+const emsdevicename = ref("");
+const pageable = ref({
+  pn: 1,
+  ps: 10,
+  total: 0
+});
+const getplatformuserlist = async () => {
+  let obj = {
+    powerId: Singlevalue.value, //查询电站id
+    emsdeviceId: emsdevicename.value, // 设备名称
+    pn: pageable.value.pn,
+    ps: pageable.value.ps
+  };
+  const { data } = await selectemssytemNameURL(obj);
+  tableData.value = data;
+  pageable.value.total = tableData.value.total;
+};
+// 表格操作 Hooks
+const handleSizeChange = async (e: any) => {
+  pageable.value.ps = e;
+  getplatformuserlist();
+};
+const handleCurrentChange = async (e: any) => {
+  pageable.value.pn = e;
+
+  getplatformuserlist();
+};
+
+const currentDate = ref();
+onMounted(() => {
+  const current = localStorage.getItem("currentDate");
+  if (current) {
+    currentDate.value = current;
+  }
+  getplatformuserlist();
+  poststationstationName();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
+<!-- -->

src/views/home/index.vue

@@ -18,12 +18,12 @@
               </div>
             </div>
             <div class="overview_line">
-              在线{{ multiStation.stationTotalCount }}个 \ 离线{{ multiStation.stationOfflineCount }}个
+              在线 {{ multiStation.stationOnlineCount }} 个 \ 离线 {{ multiStation.stationOfflineCount }} 个
             </div>
             <el-divider />
             <div class="overview_line">
-              装机功率: {{ (multiStation.installedPower * 1).toFixed(2) }}MWh | 装机容量:
-              {{ (multiStation.installedPower * 1).toFixed(2) }} MWh
+              装机功率: {{ formatAmountkwh(multiStation.installedPower) }} {{ formatCompany(multiStation.installedPower) }} |
+              装机容量: {{ formatAmountkwh(multiStation.installedCap) }} {{ formatCompany(multiStation.installedCap) }}
             </div>
           </div>
         </el-card>
@@ -35,15 +35,23 @@
               <div class="overview_title_name">今日充电量</div>
             </div>
             <div class="overview_title">
-              <div class="overview_titlename">{{ multiStation.dayImportKwh }} <span class="overview_unit"> MWh</span></div>
+              <div class="overview_titlename">
+                {{ formatAmountkwh(multiStation.dayImportKwh) }}
+                <span class="overview_unit"> {{ formatCompany(multiStation.dayImportKwh) }}</span>
+              </div>
               <div class="overview_img1">
                 <img src="../../assets/images/charging.png" alt="站点" />
               </div>
             </div>
-            <div class="overview_line">较昨日下降: {{ multiStation.importKwhDiffYDay }} MWh</div>
+            <div class="overview_line">
+              较昨日下降: {{ formatAmountkwh_(multiStation.importKwhDiffYDay) }}
+              {{ formatCompany_(multiStation.importKwhDiffYDay) }}
+            </div>
             <el-divider />
             <div class="overview_line">
-              月充电: {{ multiStation.monthImportKwh }}MWh | 累计充电: {{ multiStation.accumulativeImportKwh }} MWh
+              本月充电: {{ formatAmountkwh(multiStation.monthImportKwh) }} {{ formatCompany(multiStation.monthImportKwh) }} |
+              累计充电: {{ formatAmountkwh(multiStation.accumulativeImportKwh) }}
+              {{ formatCompany(multiStation.accumulativeImportKwh) }}
             </div>
           </div>
         </el-card>
@@ -55,15 +63,23 @@
               <div class="overview_title_name">今日放电量</div>
             </div>
             <div class="overview_title">
-              <div class="overview_titlename">{{ multiStation.dayExportKwh }}<span class="overview_unit"> MWh</span></div>
+              <div class="overview_titlename">
+                {{ formatAmountkwh(multiStation.dayExportKwh) }}
+                <span class="overview_unit"> {{ formatCompany(multiStation.dayExportKwh) }}</span>
+              </div>
               <div class="overview_img2">
                 <img src="../../assets/images/discharge.png" alt="站点" />
               </div>
             </div>
-            <div class="overview_line">较昨日下降: {{ multiStation.exportKwhDiffYDay }} MWh</div>
+            <div class="overview_line">
+              较昨日下降: {{ formatAmountkwh_(multiStation.exportKwhDiffYDay) }}
+              {{ formatCompany_(multiStation.exportKwhDiffYDay) }}
+            </div>
             <el-divider />
             <div class="overview_line">
-              月充电: {{ multiStation.monthExportKwh }} MWh | 累计充电: {{ multiStation.accumulativeExportKwh }} MWh
+              本月充电: {{ formatAmountkwh(multiStation.monthExportKwh) }} {{ formatCompany(multiStation.monthExportKwh) }} |
+              累计充电: {{ formatAmountkwh(multiStation.accumulativeExportKwh) }}
+              {{ formatCompany(multiStation.accumulativeExportKwh) }}
             </div>
           </div>
         </el-card>
@@ -75,15 +91,21 @@
               <div class="overview_title_name">今日收益</div>
             </div>
             <div class="overview_title">
-              <div class="overview_titlename">{{ multiStation.todayProfit }} <span class="overview_unit">元</span></div>
+              <div class="overview_titlename">
+                {{ formatAmount(multiStation.todayProfit) }}
+                <span class="overview_unit"> {{ formatAmounts(multiStation.todayProfit) }}</span>
+              </div>
               <div class="overview_img3">
                 <img src="../../assets/images/qian.png" alt="站点" />
               </div>
             </div>
-            <div class="overview_line">较昨日下降: {{ multiStation.profitDiffYDay }} 万元</div>
+            <div class="overview_line">
+              较昨日下降: {{ formatAmount1(multiStation.profitDiffYDay) }} {{ formatAmounts2(multiStation.profitDiffYDay) }}
+            </div>
             <el-divider />
             <div class="overview_line">
-              本月收益: {{ multiStation.monthProfit }}万元 | 总收益: {{ multiStation.totalProfit }}万元
+              本月收益: {{ formatAmount(multiStation.monthProfit) }} {{ formatAmounts(multiStation.monthProfit) }} | 总收益:
+              {{ formatAmount(multiStation.totalProfit) }} {{ formatAmounts(multiStation.totalProfit) }}
             </div>
           </div>
         </el-card>
@@ -113,6 +135,7 @@
                 end-placeholder="结束时间"
                 :default-value="value2"
                 :disabled-date="pickerOptions"
+                @change="pickerincome"
               />
             </div>
           </div>
@@ -133,7 +156,7 @@
     <el-card>
       <template #header>
         <div class="card-header">
-          <span>系统列表</span>
+          <span>设备列表</span>
         </div>
       </template>
       <div class="cardtable">
@@ -167,7 +190,7 @@
         </el-table-column>
 
         <el-table-column prop="overallEfficiency" label="综合效率(%)" />
-        <el-table-column prop="dischargeCompletionRate" label="放电达成率(%)" />
+        <!-- <el-table-column prop="dischargeCompletionRate" label="放电达成率(%)" /> -->
         <el-table-column prop="yesterdayProfit" label="昨日收益(元)" />
         <el-table-column prop="totalProfit" label="总收益(万元)" />
       </el-table>
@@ -178,12 +201,12 @@
     </el-card>
   </div>
 </template>
+<!--    -->
 <script setup lang="ts">
 import { onMounted, ref } from "vue";
 import type { TabsPaneContext } from "element-plus";
 import * as echarts from "echarts";
 import Pagination from "@/components/ProTable/components/Pagination.vue";
-
 import {
   gethomesite,
   multiStationday,
@@ -219,6 +242,118 @@ const options = ref([
     label: "离线"
   }
 ]);
+const formatAmountkwh = (amount: number) => {
+  if (amount == undefined) {
+    return "1000";
+  }
+  if (amount < 1000) {
+    return amount.toFixed(2);
+  } else {
+    return (amount / 1000).toFixed(2);
+  }
+};
+const formatCompany = (amount: number) => {
+  if (amount == undefined) {
+    return "kWh";
+  }
+  if (amount < 1000) {
+    return "kWh";
+  } else {
+    return "MWh";
+  }
+};
+const formatAmountkwh_ = (amount: number) => {
+  if (amount == undefined) {
+    return "1000";
+  }
+  if (amount > -1000) {
+    return amount.toFixed(2);
+  } else {
+    return (amount / 1000).toFixed(2);
+  }
+};
+const formatCompany_ = (amount: number) => {
+  if (amount == undefined) {
+    return "kWh";
+  }
+  if (amount > -1000) {
+    return "kWh";
+  } else {
+    return "MWh";
+  }
+};
+const formatAmount = (amount: number) => {
+  if (amount == undefined) {
+    return "0";
+  }
+  if (amount < 10000) {
+    return amount.toFixed(2);
+  } else {
+    return (amount / 10000).toFixed(2);
+  }
+};
+const formatAmounts = (amount: number) => {
+  if (amount == undefined) {
+    return "元";
+  }
+  if (amount < 10000) {
+    return "元";
+  } else {
+    return "万元";
+  }
+};
+const formatAmount1 = (amount: number) => {
+  console.log(amount > -10000);
+
+  if (amount == undefined) {
+    return "0";
+  }
+  if (amount > -10000) {
+    return amount.toFixed(2);
+  } else {
+    return (amount / 10000).toFixed(2);
+  }
+};
+const formatAmounts2 = (amount: number) => {
+  console.log(amount);
+
+  if (amount == undefined) {
+    return "元";
+  }
+  if (amount > -10000) {
+    return "元";
+  } else {
+    return "万元";
+  }
+};
+const pickerincome = (value: any) => {
+  value2.value = [formatDate(value[0]), formatDate(value[1])];
+  if (tabpropslabel.value == "收益统计") {
+    getmultiStation(); // 收益统计图
+    getmultiStationtopday(); // 收益排名图
+
+    getmultiStationMonth(); // 收益统计图
+    getmultiStationtopMonth(); // 收益排名图
+  } else {
+    getmultiStatiopower(); // 充放电统计图
+    getmultiStatiopowerMonth();
+  }
+};
+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 handleClick = (tab: TabsPaneContext) => {
   // if (baroption.value) {
   //   baroption.value.dispose(); //地图图表
@@ -232,7 +367,7 @@ const handleClick = (tab: TabsPaneContext) => {
     getmultiStatiopower();
   }
 };
-// 查询最近数据
+//
 const recently = (val: any) => {
   // 获取当前日期
   recentlytype.value = val;
@@ -414,7 +549,7 @@ const baroptionchart = (dates: string[][], profits: { type: string }[]) => {
 
   baroptionvalue.setOption(option, true);
 };
-// 收益排名日
+// 收益排名
 const getmultiStationtopday = async () => {
   const { data } = await multiStationtopday({ startDate: value2.value[0], endDate: value2.value[1] });
   let profitlist = [];

src/views/incomeforms/index.scss

@@ -153,3 +153,18 @@
   width: 100%;
   min-height: 550px;
 }
+.tabpanesite {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.dropdown {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  margin: 20px 0;
+}
+.exportright {
+  margin-top: 40px;
+}

src/views/incomeforms/index.vue

@@ -14,48 +14,84 @@
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
         <el-tab-pane label="站点汇总" name="站点汇总">
           <div class="tabdiv">
-            <div class="tabpane">
-              <div>时间范围：</div>
-              <div class="tabpane1">
-                <el-date-picker
-                  v-if="timetype != 'year'"
-                  v-model="timepicker"
-                  :type="timetype"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  :default-value="timepicker"
-                  :disabled-date="pickerOptions"
-                  @change="datepicker"
-                  size="large"
-                />
-                <YearPicker
-                  v-if="timetype == 'year'"
-                  style="width: 300px"
-                  ref="statisticPicker"
-                  :label-width="50"
-                  :init-year="dateValue"
-                  :start-year1="timepicker[0]"
-                  :end-year2="timepicker[1]"
-                  @update-time-range="updateStatisticYear"
-                />
-                <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 class="tabpanesite">
+              <div class="tabpane">
+                <div>时间范围：</div>
+                <div class="tabpane1">
+                  <el-date-picker
+                    v-if="timetype != 'year'"
+                    v-model="timepicker"
+                    :type="timetype"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    :default-value="timepicker"
+                    :disabled-date="pickerOptions"
+                    @change="datepicker"
+                    size="large"
+                  />
+                  <YearPicker
+                    v-if="timetype == 'year'"
+                    style="width: 300px"
+                    ref="statisticPicker"
+                    :label-width="50"
+                    :init-year="dateValue"
+                    :start-year1="timepicker[0]"
+                    :end-year2="timepicker[1]"
+                    @update-time-range="updateStatisticYear"
+                  />
+                  <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>
+                &ensp;&ensp;
+                <el-button type="primary" size="large" color="#0052d9" @click="gatSummary">查询</el-button>
+                <el-button size="large" @click="onreset">重置</el-button>
+                <!-- <el-button v-if="BUTTONS.export" size="large" @click="onexport" type="primary" plain>导出</el-button> -->
+              </div>
+
+              <div v-if="BUTTONS.export" class="exportright">
+                <el-dropdown trigger="click" :hide-on-click="false" @visible-change="onclose">
+                  <el-button size="large" type="primary" plain>导出</el-button>
+                  <template #dropdown>
+                    <el-dropdown-menu v-for="(item, index) in columnList" :key="index">
+                      <el-dropdown-item>
+                        <el-checkbox @change="oncheck" v-model="item.ifcolumn" :label="item.label" size="large" />
+                        <template v-if="item.children">
+                          <template v-for="(items, i) in item.children" :key="i">
+                            <el-checkbox @change="onchildren" v-model="items.ifcolumn" :label="items.label" size="large" />
+                          </template>
+                        </template>
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                    <div class="dropdown">
+                      <el-button @click="onexport" type="primary" plain>确定导出</el-button>
+                    </div>
+                  </template>
+                </el-dropdown>
               </div>
-              &ensp;&ensp;
-              <el-button type="primary" size="large" color="#0052d9" @click="gatSummary">查询</el-button>
-              <el-button size="large" @click="onreset">重置</el-button>
-              <el-button v-if="BUTTONS.export" size="large" @click="onexport" type="primary" plain>导出</el-button>
             </div>
             &ensp;&ensp;
 
             <el-table :data="tableData.list" style="width: 100%" align="center" :show-overflow-tooltip="true">
+              <!-- <el-table-column type="selection" width="55" /> -->
+              <template v-for="(item, index) in columnList" :key="index">
+                <el-table-column v-if="item.ifcolumn" :label="item.label" :prop="item.prop" align="center">
+                  <template v-if="item.children">
+                    <template v-for="(items, i) in item.children" :key="i">
+                      <el-table-column v-if="items.ifcolumn" :label="items.label" :prop="items.prop" align="center">
+                      </el-table-column>
+                    </template>
+                  </template>
+                </el-table-column>
+              </template>
+              <!-- 
+            <el-table :data="tableData.list" style="width: 100%" align="center" :show-overflow-tooltip="true">
               <el-table-column prop="stationName" label="站点名称" width="150" align="center" />
 
               <el-table-column label="充电量(kWh)" align="center">
@@ -73,6 +109,7 @@
                 <el-table-column prop="dischargeTotal" label="总" align="center" />
               </el-table-column>
               <el-table-column prop="overallEfficiency" label="综合效率(%)" width="150" align="center" />
+            </el-table> -->
             </el-table>
           </div>
         </el-tab-pane>
@@ -84,48 +121,80 @@
               <div :class="reportformsindex == 3 ? 'tabpane_2' : 'tabpane_1'" @click="onreportforms(3)">月报表</div>
               <div :class="reportformsindex == 4 ? 'tabpane_2' : 'tabpane_1'" @click="onreportforms(4)">年报表</div>
             </div>
-            <div class="selectsite">
-              <div class="tabpane_1">选择站点：</div>
-              <el-select v-model="Singlevalue" placeholder="Select" 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>
-              &ensp;&ensp;&ensp;&ensp; &ensp;&ensp;
-              <div class="tabpane_1">选择日期：</div>
-              <div>
-                <el-date-picker
-                  v-if="pickertype != 'year'"
-                  v-model="starttime"
-                  :type="pickertype"
-                  placeholder="选择时间"
-                  size="large"
-                  clearable
-                  :disabled-date="pickerOptions"
-                  @change="yearstarttime"
-                />
-                <YearPicker
-                  v-if="pickertype == 'year'"
-                  style="width: 300px"
-                  ref="statisticPicker"
-                  :label-width="50"
-                  :init-year="dateValue"
-                  :start-year1="starttime[0]"
-                  :end-year2="starttime[1]"
-                  @update-time-range="updateStatisticYear1"
-                />
+            <div class="tabpanesite">
+              <div class="selectsite">
+                <div class="tabpane_1">选择站点：</div>
+                <el-select v-model="Singlevalue" 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>
+                &ensp;&ensp;&ensp;&ensp; &ensp;&ensp;
+                <div class="tabpane_1">选择日期：</div>
+                <div>
+                  <el-date-picker
+                    v-if="pickertype != 'year'"
+                    v-model="starttime"
+                    :type="pickertype"
+                    placeholder="选择时间"
+                    size="large"
+                    clearable
+                    :disabled-date="pickerOptions"
+                    @change="yearstarttime"
+                  />
+                  <YearPicker
+                    v-if="pickertype == 'year'"
+                    style="width: 300px"
+                    ref="statisticPicker"
+                    :label-width="50"
+                    :init-year="dateValue"
+                    :start-year1="starttime[0]"
+                    :end-year2="starttime[1]"
+                    @update-time-range="updateStatisticYear1"
+                  />
+                </div>
+                &ensp;&ensp;
+
+                <el-button type="primary" size="large" color="#0052d9" @click="onselectsite">查询</el-button>
+                <el-button size="large" @click="onselectreset">重置</el-button>
               </div>
-              &ensp;&ensp;
 
-              <el-button type="primary" size="large" color="#0052d9" @click="onselectsite">查询</el-button>
-              <el-button size="large" @click="onselectreset">重置</el-button>
-              <div style="margin-left: 14px" v-if="BUTTONS.export">
+              <!-- <div style="margin-left: 14px" v-if="BUTTONS.export">
                 <el-button size="large" @click="singleexport" type="primary" plain v-if="reportformsindex != 1">导出</el-button>
+              </div> -->
+              <div class="exportright" v-if="BUTTONS.export && reportformsindex != 1">
+                <el-dropdown trigger="click" :hide-on-click="false" @visible-change="onsingleclose">
+                  <el-button size="large" type="primary" plain>导出</el-button>
+                  <template #dropdown>
+                    <el-dropdown-menu v-for="(item, index) in singlecolumnList" :key="index">
+                      <el-dropdown-item>
+                        <el-checkbox @change="onsingle" v-model="item.ifcolumn" :label="item.label" size="large" />
+                        <template v-if="item.children">
+                          <template v-for="(items, i) in item.children" :key="i">
+                            <el-checkbox @change="onsinglechildren" v-model="items.ifcolumn" :label="items.label" size="large" />
+                          </template>
+                        </template>
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                    <div class="dropdown">
+                      <el-button @click="singleexport" type="primary" plain>确定导出</el-button>
+                    </div>
+                  </template>
+                </el-dropdown>
               </div>
             </div>
 
             <div class="dailyreport">
               <el-table :data="betweenyear.list" style="width: 100%" align="center" :show-overflow-tooltip="true">
-                <!-- <el-table-column prop="year" label="日期" width="150" align="center" /> -->
-                <el-table-column label="日期" width="150" align="center">
+                <template v-for="(item, index) in singlecolumnList" :key="index">
+                  <el-table-column v-if="item.ifcolumn" :label="item.label" :prop="item.prop" align="center">
+                    <template v-if="item.children">
+                      <template v-for="(items, i) in item.children" :key="i">
+                        <el-table-column v-if="items.ifcolumn" :label="items.label" :prop="items.prop" align="center">
+                        </el-table-column>
+                      </template>
+                    </template>
+                  </el-table-column>
+                </template>
+                <!-- <el-table-column label="日期" width="150" align="center">
                   <template #default="scope">
                     <div v-if="scope.row.ymd">{{ scope.row.ymd }}</div>
                     <div v-if="scope.row.ym">{{ scope.row.ym }}</div>
@@ -146,7 +215,7 @@
                   <el-table-column prop="dischargeValley" label="谷" align="center" />
                   <el-table-column prop="dischargeTotal" label="总" align="center" />
                 </el-table-column>
-                <el-table-column prop="overallEfficiency" label="综合效率(%)" width="150" align="center" />
+                <el-table-column prop="overallEfficiency" label="综合效率(%)" width="150" align="center" /> -->
               </el-table>
             </div>
           </div>
@@ -179,7 +248,164 @@ import { other, Station } from "@/api/interface";
 import { useAuthButtons } from "@/hooks/useAuthButtons";
 const { BUTTONS } = useAuthButtons();
 console.log(BUTTONS);
-
+// 表头
+const columnList = ref([
+  {
+    prop: "stationName",
+    label: "日期",
+    ifcolumn: true,
+    children: null
+  },
+  {
+    prop: "",
+    label: "充电量(kWh)",
+    ifcolumn: true,
+    children: [
+      {
+        prop: "chargeSharp",
+        label: "尖",
+        ifcolumn: true
+      },
+      {
+        prop: "chargePeak",
+        label: "峰",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeShoulder",
+        label: "平",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeValley",
+        label: "谷",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeTotal",
+        label: "总",
+        ifcolumn: true
+      }
+    ]
+  },
+  {
+    prop: "",
+    label: "放电量(kWh)",
+    ifcolumn: true,
+    children: [
+      {
+        prop: "dischargeSharp",
+        label: "尖",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargePeak",
+        label: "峰",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeShoulder",
+        label: "平",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeValley",
+        label: "谷",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeTotal",
+        label: "总",
+        ifcolumn: true
+      }
+    ]
+  },
+  {
+    prop: "overallEfficiency",
+    label: "综合效率(%)",
+    ifcolumn: true,
+    children: null
+  }
+]);
+// 单站报表表头
+const singlecolumnList = ref([
+  {
+    prop: "year",
+    label: "日期",
+    ifcolumn: true,
+    children: null
+  },
+  {
+    prop: "",
+    label: "充电量(kWh)",
+    ifcolumn: true,
+    children: [
+      {
+        prop: "chargeSharp",
+        label: "尖",
+        ifcolumn: true
+      },
+      {
+        prop: "chargePeak",
+        label: "峰",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeShoulder",
+        label: "平",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeValley",
+        label: "谷",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeTotal",
+        label: "总",
+        ifcolumn: true
+      }
+    ]
+  },
+  {
+    prop: "",
+    label: "放电量(kWh)",
+    ifcolumn: true,
+    children: [
+      {
+        prop: "dischargeSharp",
+        label: "尖",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargePeak",
+        label: "峰",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeShoulder",
+        label: "平",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeValley",
+        label: "谷",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeTotal",
+        label: "总",
+        ifcolumn: true
+      }
+    ]
+  },
+  {
+    prop: "overallEfficiency",
+    label: "综合效率(%)",
+    ifcolumn: true,
+    children: null
+  }
+]);
 const currentDate = ref();
 const activeName = ref("站点汇总");
 const handleClick = (val: any) => {
@@ -269,10 +495,151 @@ const gatSummary = () => {
 const onreset = () => {
   getdaymonthyear(1);
 };
+const onclose = (val: boolean) => {
+  console.log(val);
+  setTimeout(() => {
+    if (!val) {
+      for (const column of columnList.value) {
+        column.ifcolumn = true;
+
+        if (column.children) {
+          for (const child of column.children) {
+            child.ifcolumn = true;
+          }
+        }
+      }
+    }
+  }, 500); // 延迟 0.5毫秒
+};
+const onsingleclose = (val: boolean) => {
+  console.log(val);
+  setTimeout(() => {
+    if (!val) {
+      for (const column of singlecolumnList.value) {
+        column.ifcolumn = true;
+
+        if (column.children) {
+          for (const child of column.children) {
+            child.ifcolumn = true;
+          }
+        }
+      }
+    }
+  }, 500); // 延迟 0.5毫秒
+};
+// 点击父元素
+const oncheck = () => {
+  if (columnList.value) {
+    for (let index = 0; index < columnList.value.length; index++) {
+      const column = columnList.value[index];
+      if (column.children && column.prop == "") {
+        for (let i = 0; i < column.children.length; i++) {
+          const child = column.children[i];
+
+          if (child && !column.ifcolumn) {
+            child.ifcolumn = false;
+          } else {
+            child.ifcolumn = true;
+          }
+          if (child && child.ifcolumn) {
+            column.ifcolumn = true;
+          }
+        }
+      }
+    }
+  }
+};
+// 点击子元素
+const onchildren = () => {
+  if (columnList.value) {
+    for (let index = 0; index < columnList.value.length; index++) {
+      const column = columnList.value[index];
+      if (column.children && column.prop == "") {
+        for (let i = 0; i < column.children.length; i++) {
+          const child = column.children[i];
+          console.log(child);
+
+          if (child && !child.ifcolumn) {
+            column.ifcolumn = false;
+          } else {
+            column.ifcolumn = true;
+            return;
+          }
+        }
+      }
+    }
+  }
+};
+// 点击单站父元素多选
+const onsingle = () => {
+  if (singlecolumnList.value) {
+    for (let index = 0; index < singlecolumnList.value.length; index++) {
+      const column = singlecolumnList.value[index];
+      if (column && !column.ifcolumn) {
+        if (column.children && column.prop == "") {
+          for (let i = 0; i < column.children.length; i++) {
+            const child = column.children[i];
+            child.ifcolumn = false;
+          }
+        }
+      } else {
+        if (column.children && column.prop == "") {
+          for (let i = 0; i < column.children.length; i++) {
+            const child = column.children[i];
+            child.ifcolumn = true;
+          }
+        }
+      }
+    }
+  }
+};
+// 点击单站子元素
+const onsinglechildren = () => {
+  if (singlecolumnList.value) {
+    for (let index = 0; index < singlecolumnList.value.length; index++) {
+      const column = singlecolumnList.value[index];
+      if (column.children && column.prop == "") {
+        for (let i = 0; i < column.children.length; i++) {
+          const child = column.children[i];
+          console.log(child);
+
+          if (child && !child.ifcolumn) {
+            column.ifcolumn = false;
+          } else {
+            column.ifcolumn = true;
+            return;
+          }
+        }
+      }
+    }
+  }
+};
 // 导出
 const onexport = async () => {
+  let obj: string[] = []; // 假设 prop 是 string 类型，如果不是，请根据实际类型修改
+
+  if (columnList.value) {
+    for (const column of columnList.value) {
+      if (column?.ifcolumn) {
+        if (column.prop) {
+          obj.push(column.prop);
+        }
+        if (column.children) {
+          for (const child of column.children) {
+            if (child?.ifcolumn && child.prop) {
+              obj.push(child.prop);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  const jsonString = obj.join(",");
   if (daymonthyearvalue.value == 1) {
     let obj = {
+      excel: jsonString,
+
       startDate: timepicker.value[0],
       endDate: timepicker.value[1]
     };
@@ -280,6 +647,8 @@ const onexport = async () => {
     downloadxlsx(timepicker.value[0], data);
   } else if (daymonthyearvalue.value == 2) {
     let obj = {
+      excel: jsonString,
+
       startYearMonth: timepicker.value[0],
       endYearMonth: timepicker.value[1]
     };
@@ -287,6 +656,8 @@ const onexport = async () => {
     downloadxlsx(timepicker.value[0], data);
   } else if (daymonthyearvalue.value == 3) {
     let obj = {
+      excel: jsonString,
+
       startYear: timepicker.value[0],
       endYear: timepicker.value[1]
     };
@@ -450,9 +821,29 @@ const onselectreset = async () => {
 };
 // 导出
 const singleexport = async () => {
-  console.log("导出");
+  let obj: string[] = []; // 假设 prop 是 string 类型，如果不是，请根据实际类型修改
+
+  if (singlecolumnList.value) {
+    for (const column of singlecolumnList.value) {
+      if (column?.ifcolumn) {
+        if (column.prop) {
+          obj.push(column.prop);
+        }
+        if (column.children) {
+          for (const child of column.children) {
+            if (child?.ifcolumn && child.prop) {
+              obj.push(child.prop);
+            }
+          }
+        }
+      }
+    }
+  }
+  const jsonString = obj.join(",");
   if (reportformsindex.value == 2) {
     let obj = {
+      excel: jsonString,
+
       startTime: starttime.value[0],
       endTime: starttime.value[1]
     };
@@ -460,6 +851,8 @@ const singleexport = async () => {
     downloadxlsx(starttime.value[0], data);
   } else if (reportformsindex.value == 3) {
     let obj = {
+      excel: jsonString,
+
       startYearMonth: starttime.value[0],
       endYearMonth: starttime.value[1]
     };
@@ -467,6 +860,8 @@ const singleexport = async () => {
     downloadxlsx(starttime.value[0], data);
   } else if (reportformsindex.value == 4) {
     let obj = {
+      excel: jsonString,
+
       startYear: starttime.value[0],
       endYear: starttime.value[1]
     };

src/views/monitor/add.scss

@@ -0,0 +1,31 @@
+.name {
+  width: 100%;
+}
+.user_box {
+  width: 100%;
+}
+.demo-ruleForm {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+}
+.elform {
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  padding: 0 200px;
+  margin-bottom: 10px;
+}
+.elformleft {
+  display: flex;
+  width: 100%;
+  margin-bottom: 20px;
+}
+.elform_tree {
+  width: 500px;
+  height: 300px;
+  border: 1px solid #e7e7e7;
+}

src/views/monitor/add.vue

@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <div class="card content-box">
+      <div class="name">{{ supertype }}</div>
+      <el-divider />
+      <div class="user_box">
+        <div class="user_left">
+          <el-form ref="formRef" :model="numberValidateForm" label-width="auto" class="demo-ruleForm">
+            <div class="elform">
+              <el-form-item label="任务名称：" prop="jobName" :rules="[{ required: true, message: '请输入任务名称：' }]">
+                <el-input
+                  v-model.number="numberValidateForm.jobName"
+                  style="width: 300px"
+                  size="large"
+                  type="text"
+                  placeholder="请输入任务名称："
+                  autocomplete="off"
+                />
+              </el-form-item>
+              <el-form-item label="任务分组：">
+                <el-select v-model="numberValidateForm.jobGroup" placeholder="请选择分组" size="large" style="width: 300px">
+                  <el-option v-for="item in groupingdata" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </div>
+            <div class="elform">
+              <el-form-item
+                label="调用目标字符串："
+                prop="invokeTarget"
+                :rules="[{ required: true, message: '请输入调用目标字符串' }]"
+              >
+                <el-input
+                  v-model="numberValidateForm.invokeTarget"
+                  style="width: 300px"
+                  size="large"
+                  type="text"
+                  placeholder="请输入调用目标字符串"
+                  autocomplete="off"
+                />
+              </el-form-item>
+              <el-form-item label="cron表达式：" prop="cronExpression" :rules="[{ required: true, message: '请输入cron表达式' }]">
+                <el-input
+                  v-model="numberValidateForm.cronExpression"
+                  style="width: 300px"
+                  size="large"
+                  type="text"
+                  placeholder="请输入cron表达式"
+                  autocomplete="off"
+                  @blur="onron"
+                />
+              </el-form-item>
+            </div>
+
+            <div class="elform">
+              <el-form-item label="执行策略：">
+                <el-radio-group v-model="numberValidateForm.misfirePolicy">
+                  <el-radio value="0">立即执行</el-radio>
+                  <el-radio value="1">执行一次</el-radio>
+                  <el-radio value="3">放弃执行</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+            <div class="elform">
+              <el-form-item label="并发执行：">
+                <el-radio-group v-model="numberValidateForm.concurrent">
+                  <el-radio value="0">允许</el-radio>
+                  <el-radio value="1">禁止</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+            <div class="elform">
+              <el-form-item label="状态：">
+                <el-radio-group v-model="numberValidateForm.status">
+                  <el-radio value="0">正常</el-radio>
+                  <el-radio value="1">暂停</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+            <div class="elform">
+              <el-form-item label="备注：">
+                <el-input
+                  v-model.number="numberValidateForm.remark"
+                  style="width: 600px"
+                  size="large"
+                  type="text"
+                  placeholder="请输入备注"
+                  autocomplete="off"
+                />
+              </el-form-item>
+            </div>
+
+            <el-divider />
+            <el-form-item class="bottom">
+              <el-button type="primary" @click="submitForm(formRef)">保存</el-button>
+              <el-button @click="resetForm(formRef)">关闭</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { monitorjobadd, monitorjobedit, jobeditupdate, checkCronExpressionIsValid } from "@/api/home/Multisite";
+import { ElMessage, FormInstance } from "element-plus";
+import { onMounted, reactive, ref } from "vue";
+import { useRouter, useRoute } from "vue-router";
+const router = useRouter();
+const route = useRoute();
+
+const formRef = ref<FormInstance>();
+const supertype = ref(route.query.type);
+
+const numberValidateForm = reactive({
+  id: route.query.id,
+  jobName: "",
+  jobGroup: "",
+  invokeTarget: "",
+  cronExpression: "",
+  concurrent: "0",
+  misfirePolicy: "0",
+  status: "0",
+  remark: ""
+});
+const groupingdata = ref([
+  {
+    value: "",
+    label: "全部"
+  },
+  {
+    value: "DEFAULT",
+    label: "默认"
+  },
+  {
+    value: "SYSTEM",
+    label: "系统"
+  }
+]);
+const submitForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  formEl.validate(async valid => {
+    if (valid) {
+      if (!ExpressionIsValid.value) {
+        ElMessage.error("表达式不正确");
+        return false;
+      }
+      if (route.query.type == "任务新增") {
+        const { data } = await monitorjobadd(numberValidateForm);
+        console.log(data);
+      } else {
+        const { data } = await monitorjobedit(numberValidateForm);
+        console.log(data);
+      }
+      router.back();
+    } else {
+      console.log("error submit!");
+      return false;
+    }
+  });
+};
+const ExpressionIsValid = ref();
+
+const onron = async () => {
+  let obj = {
+    cronExpression: numberValidateForm.cronExpression
+  };
+  const data = await checkCronExpressionIsValid(obj);
+  // 这里可以使用正则表达式或其他逻辑验证cron表达式
+  ExpressionIsValid.value = data;
+  if (!data) {
+    ElMessage.error("表达式不正确");
+    return;
+  }
+};
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  formEl.resetFields();
+  router.push("/monitor/job");
+};
+const yonghueditdata = ref();
+const getghuedit = async () => {
+  const { data } = await jobeditupdate(route.query.id);
+  yonghueditdata.value = data;
+  console.log(yonghueditdata.value);
+  numberValidateForm.jobName = yonghueditdata.value.job.jobName;
+  numberValidateForm.jobGroup = yonghueditdata.value.job.jobGroup;
+  numberValidateForm.invokeTarget = yonghueditdata.value.job.invokeTarget;
+  numberValidateForm.cronExpression = yonghueditdata.value.job.cronExpression;
+  numberValidateForm.status = yonghueditdata.value.job.status;
+  numberValidateForm.misfirePolicy = yonghueditdata.value.job.misfirePolicy;
+  numberValidateForm.concurrent = yonghueditdata.value.job.concurrent;
+  numberValidateForm.remark = yonghueditdata.value.job.remark;
+  onron();
+};
+onMounted(() => {
+  if (route.query.type == "任务编辑") {
+    getghuedit();
+  }
+});
+</script>
+<style scoped lang="scss">
+@import "./add.scss";
+</style>

src/views/monitor/index.scss

@@ -2,6 +2,13 @@
 .title {
   display: flex;
   :deep(.el-select__wrapper) {
+    .el-select__prefix {
+      color: #000000 !important;
+    }
+    .el-select__selected-item {
+      font-size: 22px;
+    }
+
     background-color: rgb(0 0 0 / 0%);
     box-shadow: 0 0 0 0 !important;
 
@@ -224,6 +231,15 @@
   background: rgb(0 9 91 / 2%);
   border: 1px solid #e7e7e7;
 }
+.equipmentdata_divobx {
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 24%;
+  height: 58px;
+  padding: 0 20px;
+}
 .equipmentdata_div4 {
   box-sizing: border-box;
   display: flex;
@@ -277,3 +293,11 @@
 :deep(.el-table__header) {
   background: rgb(241 242 245) !important;
 }
+.message-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 260px;
+  line-height: 45px;
+}

src/views/monitor/index.vue

@@ -7,11 +7,14 @@
         placeholder="选择电站"
         popper-class="custom-header"
         :max-collapse-tags="1"
-        style="width: 300px"
+        class="Space_content"
         size="large"
         @change="postemsDevice"
       >
-        <el-option v-for="item in cities" :key="item.id" :label="item.stationName" :value="item.id" />
+        <el-option v-for="(item, index) in cities" :key="index" :label="item.stationName" :value="item.id" />
+        <template #prefix>
+          {{ (cities.find(s => s.id === Singlevalue) || {}).stationName }}
+        </template>
       </el-select>
       <div class="title_"></div>
       <el-select
@@ -20,16 +23,21 @@
         placeholder="选择编号"
         popper-class="custom-header"
         :max-collapse-tags="1"
-        style="width: 240px"
+        class="Space_content"
         size="large"
         @change="getstationrealtime"
       >
+        <template #prefix>
+          {{ (emsDevice.find(s => s.id === emsDeviceId) || {}).id }}
+        </template>
         <el-option v-for="item in emsDevice" :key="item.id" :label="item.emsDeviceId" :value="item.id" />
       </el-select>
     </div>
-    <!-- <div>
-    
-  </div> -->
+
+    <div class="message-empty" v-if="!deviceList[activeName].devices">
+      <img style="width: 300px; margin-top: 400px" src="@/assets/images/notData.png" alt="notData" />
+      <div>暂无消息</div>
+    </div>
     <div class="equipment">
       <el-card>
         <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handletabs">
@@ -178,21 +186,16 @@
             </div>
           </div>
           <!-- 2 -->
-          <div class="equipmentdata_equipment">
-            <!-- <div class="equipmentdata_div">
+          <!-- <div class="equipmentdata_equipment">
+            <div class="equipmentdata_div">
               <div class="equipment_title">总交流无功功率</div>
               <div>{{ pcslist.totalAcReactivePower ?? "-" }} kW</div>
             </div>
             <div class="equipmentdata_div">
               <div class="equipment_title">总交流视在功率</div>
               <div>{{ pcslist.totalAcApparentPower ?? "-" }} kW</div>
-            </div> -->
-            <div class="equipmentdata_div">
-              <!-- <div class="equipment_title">总交流功率因数</div> -->
-              <div class="equipment_title">交流电流</div>
-              <!-- <div>{{ pcslist.aphaseActivePower ?? "-" }}A</div> -->
-              <div>{{ (pcslist.acAbCurrent * 1).toFixed(2) ?? "-" }}A</div>
             </div>
+
             <div class="equipmentdata_div4">
               <div class="equipment_title">A相有功功率</div>
               <div>{{ pcslist.aphaseActivePower ?? "-" }} kW</div>
@@ -205,9 +208,9 @@
               <div class="equipment_title">C相有功功率</div>
               <div>{{ pcslist.cphaseActivePower ?? "-" }} kW</div>
             </div>
-          </div>
+          </div> -->
           <!-- 3  -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">A相无功功率</div>
               <div>{{ pcslist.aphaseReactivePower ?? "-" }} kW</div>
@@ -224,9 +227,9 @@
               <div class="equipment_title">A相视在功率</div>
               <div>{{ pcslist.aphaseApparentPower ?? "-" }} kVA</div>
             </div>
-          </div>
+          </div> -->
           <!-- 4  -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">B相视在功率</div>
               <div>{{ pcslist.bphaseApparentPower ?? "-" }} kVA</div>
@@ -238,16 +241,14 @@
             <div class="equipmentdata_div">
               <div class="equipment_title">AB电压</div>
               <div>{{ (pcslist.acAbVolt * 1).toFixed(2) ?? "-" }} V</div>
-              <!-- <div class="equipment_title">AB离网电压</div> -->
-              <!-- <div>{{ (pcslist.abOffGridVolt * 1).toFixed(2) ?? "-" }} V</div> -->
             </div>
             <div class="equipmentdata_div">
               <div class="equipment_title">BC电压</div>
               <div>{{ (pcslist.acBcVolt * 1).toFixed(2) ?? "-" }} V</div>
             </div>
-          </div>
+          </div> -->
           <!-- 5  -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">CA电压</div>
               <div>{{ (pcslist.acCaVolt * 1).toFixed(2) ?? "-" }} V</div>
@@ -264,10 +265,16 @@
               <div class="equipment_title">CA电流</div>
               <div>{{ (pcslist.acCaCurrent * 1).toFixed(2) ?? "-" }} A</div>
             </div>
-          </div>
+          </div> -->
           <!-- 6 -->
           <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
+              <!-- <div class="equipment_title">总交流功率因数</div> -->
+              <div class="equipment_title">交流电流</div>
+              <!-- <div>{{ pcslist.aphaseActivePower ?? "-" }}A</div> -->
+              <div>{{ (pcslist.acAbCurrent * 1).toFixed(2) ?? "-" }}A</div>
+            </div>
+            <div class="equipmentdata_div">
               <div class="equipment_title">A相电压</div>
               <div>{{ (pcslist.acAphaseVolt * 1).toFixed(2) ?? "-" }} V</div>
             </div>
@@ -279,14 +286,13 @@
               <div class="equipment_title">C相电压</div>
               <div>{{ (pcslist.acCphaseVolt * 1).toFixed(2) ?? "-" }} V</div>
             </div>
-            <div class="equipmentdata_div">
+            <!-- <div class="equipmentdata_div">
               <div class="equipment_title">A相电流</div>
               <div>{{ (pcslist.acAphaseCurrent * 1).toFixed(2) ?? "-" }} A</div>
-              <!-- <div>{{ (pcslist.acAbCurrent * 1).toFixed(2) ?? "-" }} A</div> -->
-            </div>
+            </div> -->
           </div>
           <!-- 7 -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">B相电流</div>
               <div>{{ (pcslist.acBphaseCurrent * 1).toFixed(2) ?? "-" }} A</div>
@@ -303,9 +309,9 @@
               <div class="equipment_title">PCS环境温度</div>
               <div>{{ pcslist.envTempr ?? "-" }} ℃</div>
             </div>
-          </div>
+          </div> -->
           <!-- 8 -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">PCS散热器温度</div>
               <div>{{ pcslist.radiatorTemp ?? "-" }} ℃</div>
@@ -322,9 +328,9 @@
               <div class="equipment_title">C1模块温度</div>
               <div>{{ pcslist.cphaseIgbtMaxTempr ?? "-" }} ℃</div>
             </div>
-          </div>
+          </div> -->
           <!-- 9 -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">A2模块温度</div>
               <div>{{ pcslist.aphaseIgbtMinTempr ?? "-" }} ℃</div>
@@ -341,15 +347,15 @@
               <div class="equipment_title">进风口温度</div>
               <div>{{ pcslist.airInletTemp ?? "-" }} ℃</div>
             </div>
-          </div>
+          </div> -->
           <!-- 10 -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">出风口温度</div>
               <div>{{ pcslist.airOutletTemp ?? "-" }} ℃</div>
             </div>
             <div class="equipmentdata_div1"></div>
-          </div>
+          </div> -->
           <div class="equipmentdata">设备故障字</div>
           <!-- faultStatusWordList -->
           <div class="equipmentdata_data">
@@ -460,17 +466,18 @@
               <div class="equipment_title">C相有功功率</div>
               <div>{{ datalist.cphaseActivePower ?? "-" }} kW</div>
             </div>
-            <div class="equipmentdata_div4">
+            <div class="equipmentdata_divobx"></div>
+            <!-- <div class="equipmentdata_div4">
               <div class="equipment_title">电流互感器变比</div>
               <div>-</div>
-            </div>
+            </div> -->
           </div>
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">电压互感器变比</div>
               <div>-</div>
             </div>
-          </div>
+          </div> -->
           <div class="equipmentdata">电量数据</div>
           <div class="eltable">
             <el-table :data="Electricitymeterlist" style="width: 100%" border>
@@ -590,17 +597,7 @@
               <div class="equipment_title">放电限制功率</div>
               <div>{{ BMSlist.dischargeablePower ?? "-" }} kW</div>
             </div>
-            <div class="equipmentdata_div">
-              <div class="equipment_title">可充电量</div>
-              <div>{{ BMSlist.rechargeableKwh ?? "-" }} kWh</div>
-            </div>
-            <div class="equipmentdata_div4">
-              <div class="equipment_title">可放电量</div>
-              <div>{{ BMSlist.dischargeableKwh ?? "-" }} kWh</div>
-            </div>
-          </div>
-          <!-- 3 -->
-          <div class="equipmentdata_equipment">
+
             <div class="equipmentdata_div">
               <div class="equipment_title">平均单体温度</div>
               <div>{{ BMSlist.avgCellTempr ?? "-" }} ℃</div>
@@ -609,6 +606,9 @@
               <div class="equipment_title">平均单体电压</div>
               <div>{{ BMSlist.avgCellVoltage ?? "-" }} V</div>
             </div>
+          </div>
+          <!-- 3 -->
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">绝缘值</div>
               <div>{{ BMSlist.insulationResistance ?? "-" }} kΩ</div>
@@ -617,13 +617,21 @@
               <div class="equipment_title">正极绝缘值</div>
               <div>{{ BMSlist.posInsulationResistance ?? "-" }} kΩ</div>
             </div>
-          </div>
+          </div> -->
           <!-- 4 -->
           <div class="equipmentdata_equipment">
-            <div class="equipmentdata_div">
+            <!-- <div class="equipmentdata_div">
+              <div class="equipment_title">可充电量</div>
+              <div>{{ BMSlist.rechargeableKwh ?? "-" }} kWh</div>
+            </div>
+            <div class="equipmentdata_div4">
+              <div class="equipment_title">可放电量</div>
+              <div>{{ BMSlist.dischargeableKwh ?? "-" }} kWh</div>
+            </div> -->
+            <!-- <div class="equipmentdata_div">
               <div class="equipment_title">负极绝缘值</div>
               <div>{{ BMSlist.negInsulationResistance ?? "-" }} kΩ</div>
-            </div>
+            </div> -->
             <div class="equipmentdata_div">
               <div class="equipment_title">最高单体温度</div>
               <div>{{ BMSlist.maxCellTempr ?? "-" }} ℃</div>
@@ -636,15 +644,14 @@
               <div class="equipment_title">最高单体电压</div>
               <div>{{ BMSlist.maxCellVoltage ?? "-" }} V</div>
             </div>
-          </div>
-          <!-- 4 -->
-          <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">最低单体电压</div>
               <div>{{ BMSlist.minCellVoltage ?? "-" }} V</div>
             </div>
           </div>
           <!--  -->
+          <div class="equipmentdata_equipment"></div>
+          <!--  -->
         </div>
         <div class="equipmentdiv" v-if="deviceType == 4">
           <div class="equipmenttime">末次数据时间：{{ Conditionerdata.ts }}</div>
@@ -785,7 +792,7 @@
 
           <div class="equipmentdata">设备数据</div>
           <!-- class="" -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">电流</div>
               <div>{{ Conditionerdata.acVolt ?? "-" }} A</div>
@@ -802,9 +809,9 @@
               <div class="equipment_title">盘管温度</div>
               <div>{{ Conditionerdata.coilTempr ?? "-" }} ℃</div>
             </div>
-          </div>
+          </div> -->
           <!-- 2 -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">柜外温度</div>
               <div>{{ Conditionerdata.outdoorTempr ?? "-" }} ℃</div>
@@ -821,28 +828,28 @@
               <div class="equipment_title">融霜温度</div>
               <div>{{ Conditionerdata.defrostTempr ?? "-" }} ℃</div>
             </div>
-          </div>
-          <!-- 3 -->
+          </div> -->
+          <!--  -->
           <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
-              <div class="equipment_title">排气温度</div>
-              <div>{{ Conditionerdata.exhaustTempr ?? "-" }} ℃</div>
+              <div class="equipment_title">出水温度</div>
+              <div>{{ Conditionerdata.condensingTempr ?? "-" }} ℃</div>
             </div>
             <div class="equipmentdata_div">
-              <div class="equipment_title">出风温度</div>
-              <div>{{ Conditionerdata.airOutTempr ?? "-" }} ℃</div>
+              <div class="equipment_title">回水温度</div>
+              <div>{{ Conditionerdata.defrostTempr ?? "-" }} ℃</div>
             </div>
             <div class="equipmentdata_div">
-              <div class="equipment_title">回风温度</div>
-              <div>{{ Conditionerdata.airInTempr ?? "-" }} ℃</div>
+              <div class="equipment_title">出水压力</div>
+              <div>{{ Conditionerdata.outdoorTempr ?? "-" }} Bar</div>
             </div>
             <div class="equipmentdata_div4">
-              <div class="equipment_title">柜内湿度</div>
-              <div>{{ Conditionerdata.humidity ?? "-" }} %</div>
+              <div class="equipment_title">回水压力</div>
+              <div>{{ Conditionerdata.cabinetTempr ?? "-" }} Bar</div>
             </div>
           </div>
-          <!-- 4 -->
-          <div class="equipmentdata_equipment">
+          <!--  -->
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">制热开启温度</div>
               <div>{{ Conditionerdata.heatingStartTempr ?? "-" }} ℃</div>
@@ -859,9 +866,9 @@
               <div class="equipment_title">制冷关闭温度</div>
               <div>{{ Conditionerdata.refrigerationStopTempr ?? "-" }} ℃</div>
             </div>
-          </div>
+          </div> -->
           <!-- 5-->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">高温告警温度</div>
               <div>{{ Conditionerdata.highTemprThreshold ?? "-" }} ℃</div>
@@ -878,9 +885,9 @@
               <div class="equipment_title">除湿开启温度</div>
               <div>{{ Conditionerdata.dehumStartTemp ?? "-" }} ℃</div>
             </div>
-          </div>
+          </div> -->
           <!-- 6 -->
-          <div class="equipmentdata_equipment">
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">除湿关闭温度</div>
               <div>{{ Conditionerdata.dehumStartHum ?? "-" }} ℃</div>
@@ -897,20 +904,21 @@
               <div class="equipment_title">内风机转速</div>
               <div>{{ Conditionerdata.innerFanSpeed ?? "-" }} rpm</div>
             </div>
-          </div>
-          <!-- 4 -->
-          <div class="equipmentdata_equipment">
+          </div> -->
+          <!-- 7 -->
+          <!-- <div class="equipmentdata_equipment">
             <div class="equipmentdata_div">
               <div class="equipment_title">外风机转速</div>
               <div>{{ Conditionerdata.exhaustTempr ?? "-" }} rpm</div>
             </div>
-          </div>
-          <!--  -->
+          </div> -->
+          <!-- 8 -->
         </div>
       </el-card>
     </div>
   </div>
 </template>
+<!--    -->
 <script setup lang="ts">
 import { onMounted, onUnmounted, Ref, ref } from "vue";
 import {
@@ -932,7 +940,12 @@ const emsDeviceId = ref("");
 const intervalID = ref();
 const poststationstationName = async () => {
   const { data } = await stationstationName({});
-  Singlevalue.value = data[0].id;
+  if (data.length == 0) {
+    Singlevalue.value = "";
+    return;
+  } else {
+    Singlevalue.value = data[0].id;
+  }
   cities.value = data;
   postemsDevice(Singlevalue.value);
 };
@@ -947,11 +960,6 @@ const postemsDevice = async (value: any) => {
   } else {
     emsDeviceId.value = data[0].id;
   }
-  for (let index = 0; index < data.length; index++) {
-    if (data[index].emsDeviceId.length > 20) {
-      data[index].emsDeviceId = data[index].emsDeviceId.substring(7);
-    }
-  }
 
   emsDevice.value = data;
   getstationrealtime();
@@ -962,6 +970,7 @@ const deviceType = ref(1);
 const getstationrealtime = async () => {
   const { data } = await poststationdeviceList({ emsId: emsDeviceId.value }, Singlevalue.value);
   if (data.length == 0) return;
+
   deviceList.value = data;
   deviceType.value = data[0].deviceType;
   handleClick();
@@ -995,7 +1004,7 @@ const handleClick = async () => {
     getgetairConditionerInfo();
   }
 };
-//
+
 const devicesClickindex = ref(0);
 const devicesClickid = ref("1");
 const devicesClick = async (val: number, id: string) => {
@@ -1013,7 +1022,8 @@ const getpcsdata = async () => {
   const { data } = await postpcsInfo({ emsId: emsDeviceId.value }, Singlevalue.value, emsDeviceId.value);
   pcslist.value = data;
 };
-// 电表
+
+//
 const Electricitymeterlist = ref();
 const datalist = ref();
 const Electricitymeter = async () => {
@@ -1092,4 +1102,4 @@ onMounted(() => {
 <style scoped lang="scss">
 @import "./index.scss";
 </style>
-<!-- -->
+<!---->

src/views/monitor/job.scss

@@ -0,0 +1,44 @@
+.screen {
+  display: flex;
+  width: 100%;
+  margin-bottom: 20px;
+}
+.screen1 {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+}
+.screen_view {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+.screen_view1 {
+  display: flex;
+  align-items: center;
+  width: 30%;
+}
+.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;
+}
+.btn-group {
+  display: flex;
+  gap: 10px; /* 按钮之间的间隔 */
+  align-items: center; /* 垂直居中按钮 */
+  justify-content: center; /* 水平居中按钮 */
+}

src/views/monitor/job.vue

@@ -0,0 +1,201 @@
+<template>
+  <div>
+    <!-- <div class="card content-box">
+    </div> -->
+    <div class="title">
+      用户管理
+      <div class="title_time">{{ currentDate }}</div>
+    </div>
+    <div class="card">
+      <div class="screen">
+        <div class="screen_view">
+          任务名称&ensp;<el-input v-model="jobName" style="width: 300px" size="large" placeholder="输入任务名称" />
+        </div>
+        <div class="screen_view">
+          任务分组&ensp;<el-select v-model="grouping" placeholder="请选择任务分组" size="large" style="width: 300px">
+            <el-option v-for="item in groupingdata" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <div class="screen_view">
+          任务状态&ensp;<el-select v-model="status" placeholder="请选择任务状态" size="large" style="width: 300px">
+            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <div class="screen1">
+          <div>
+            <el-button type="primary" size="large" color="#0052d9" @click="query(0)">查询</el-button>
+            <el-button size="large" @click="query(1)">重置</el-button>&ensp;&ensp;
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="card cardbottom">
+      <!-- <el-button v-if="BUTTONS.useradd" type="primary" size="large" color="#0052d9" @click="newaddition">新增</el-button> -->
+      <el-button v-if="BUTTONS.jobadd" type="primary" size="large" color="#0052d9" @click="newaddition">新增</el-button>
+
+      <div>&ensp;</div>
+      <el-table :data="tableData.rows" style="width: 100%" border>
+        <el-table-column prop="misfirePolicy" label="任务编码" show-overflow-tooltip />
+        <el-table-column prop="jobName" label="任务名称" />
+        <el-table-column prop="jobGroup" label="任务分组" />
+        <el-table-column prop="invokeTarget" label="调用目标字符串" />
+        <el-table-column prop="cronExpression" label="执行表达式" />
+        <el-table-column prop="status" label="任务状态" align="center" width="140">
+          <template #default="scope">
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="onswitch(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" />
+        <el-table-column label="操作" align="center" width="260">
+          <template #default="scope">
+            <el-button v-if="BUTTONS.jobedit" color="#0052d9" type="primary" @click="newition(scope.row)">编辑</el-button>
+            <!-- <el-button @click="Newpassword(scope.row)">重置密码</el-button> -->
+            <el-button v-if="BUTTONS.jobdelete" @click="onremove(scope.row)">删除</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>
+  </div>
+</template>
+<!--    -->
+<script setup lang="ts">
+import { useHandleData } from "@/hooks/useHandleData.js";
+import { ref, onMounted } from "vue";
+import { useRouter } from "vue-router";
+import { joblistURL, jobremove, jobchangeStatus } from "../../api/home/Multisite.js";
+import Pagination from "@/components/ProTable/components/Pagination.vue";
+import { useAuthButtons } from "@/hooks/useAuthButtons";
+const { BUTTONS } = useAuthButtons();
+
+const router = useRouter();
+
+const groupingdata = ref([
+  {
+    value: "",
+    label: "全部"
+  },
+  {
+    value: "DEFAULT",
+    label: "默认"
+  },
+  {
+    value: "SYSTEM",
+    label: "系统"
+  }
+]);
+const options = ref([
+  {
+    value: "",
+    label: "全部"
+  },
+  {
+    value: "0",
+    label: "正常"
+  },
+  {
+    value: "1",
+    label: "暂停"
+  }
+]);
+const query = (val: any) => {
+  if (val == 0) {
+  } else {
+    (createTime.value = []), (status.value = ""), (phonenumber.value = "");
+    getplatformuserlist();
+  }
+};
+const newaddition = () => {
+  router.push({
+    path: "/monitor/add",
+    query: {
+      type: "任务新增", // 传递的参数
+      id: ""
+    }
+  });
+};
+const newition = (row: any) => {
+  router.push({
+    path: "/monitor/add",
+    query: {
+      type: "任务编辑", // 传递的参数
+      id: row.id
+    }
+  });
+};
+// 查询
+
+const tableData = ref();
+const jobName = ref("");
+const grouping = ref("");
+const status = ref("");
+const phonenumber = ref();
+const createTime = ref();
+createTime.value = [];
+
+const pageable = ref({
+  pn: 1,
+  ps: 10,
+  total: 0
+});
+const getplatformuserlist = async () => {
+  let obj = {
+    jobName: jobName.value,
+    jobGroup: grouping.value,
+    status: status.value,
+    orderByColumn: "createTime",
+    isAsc: "desc",
+    pageNum: pageable.value.pn,
+    pageSize: pageable.value.ps
+  };
+  const data = await joblistURL(obj);
+  console.log(data);
+  tableData.value = data;
+  pageable.value.total = data.total;
+};
+// 表格操作 Hooks
+const handleSizeChange = async (e: any) => {
+  pageable.value.ps = e;
+  getplatformuserlist();
+};
+const handleCurrentChange = async (e: any) => {
+  pageable.value.pn = e;
+
+  getplatformuserlist();
+};
+
+// 删除
+const onremove = async (row: any) => {
+  await useHandleData(jobremove, { ids: row.id }, "删除");
+  await getplatformuserlist();
+};
+
+const currentDate = ref();
+// 按钮
+const onswitch = async (row: any) => {
+  let obj = {
+    id: row.id,
+    jobGroup: row.jobGroup,
+    status: row.status
+  };
+  await jobchangeStatus(obj);
+  await getplatformuserlist();
+};
+onMounted(() => {
+  const current = localStorage.getItem("currentDate");
+  if (current) {
+    currentDate.value = current;
+  }
+  getplatformuserlist();
+});
+</script>
+<style scoped lang="scss">
+@import "./job.scss";
+</style>
+<!--  -->

src/views/overview/index.scss

@@ -2,6 +2,13 @@
 .title {
   margin-bottom: 20px;
   :deep(.el-select__wrapper) {
+    .el-select__prefix {
+      color: #000000 !important;
+    }
+    .el-select__selected-item {
+      font-size: 22px;
+    }
+
     background-color: rgb(0 0 0 / 0%);
     box-shadow: 0 0 0 0 !important;
 

src/views/overview/index.vue

@@ -7,13 +7,19 @@
         placeholder="选择电站"
         popper-class="custom-header"
         :max-collapse-tags="1"
-        style="width: 300px"
+        class="Space_content"
         size="large"
       >
-        <!-- <template #header>
-          <el-checkbox> All </el-checkbox>
-        </template> -->
-        <el-option v-for="item in cities" :key="item.id" :label="item.stationName" :value="item.id" @click="onselect(item)" />
+        <el-option
+          v-for="(item, index) in cities"
+          :key="index"
+          :label="item.stationName"
+          :value="item.id"
+          @click="onselect(item)"
+        />
+        <template #prefix>
+          {{ (cities.find(s => s.id === Singlevalue) || {}).stationName }}
+        </template>
       </el-select>
     </div>
     <el-row :gutter="20">
@@ -24,15 +30,24 @@
               <div class="overview_title_name">今日充电量</div>
             </div>
             <div class="overview_title">
-              <div class="overview_titlename">{{ multiStation.dayImportKwh }} <span class="overview_unit"> MWh</span></div>
+              <div class="overview_titlename">
+                {{ formatAmountkwh(multiStation.dayImportKwh) }}
+                <span class="overview_unit"> {{ formatCompany(multiStation.dayImportKwh) }}</span>
+              </div>
               <div class="overview_img1">
                 <img src="../../assets/images/charging.png" alt="站点" />
               </div>
             </div>
-            <div class="overview_line">较昨日下降: {{ multiStation.importKwhDiffYDay }} MWh</div>
+            <div class="overview_line">
+              较昨日下降: {{ formatAmountkwh_(multiStation.importKwhDiffYDay) }}
+              {{ formatCompany_(multiStation.importKwhDiffYDay) }}
+            </div>
             <el-divider />
             <div class="overview_line">
-              月充电:{{ multiStation.monthImportKwh }} MWh | 累计充电:{{ multiStation.accumulativeImportKwh }} MWh
+              本月充电: {{ formatAmountkwh(multiStation.monthImportKwh) }} {{ formatCompany(multiStation.monthImportKwh) }} |
+              累计充电:
+              {{ formatAmountkwh(multiStation.accumulativeImportKwh) }}
+              {{ formatCompany(multiStation.accumulativeImportKwh) }}
             </div>
           </div>
         </el-card>
@@ -44,15 +59,24 @@
               <div class="overview_title_name">今日放电量</div>
             </div>
             <div class="overview_title">
-              <div class="overview_titlename">{{ multiStation.dayExportKwh }}<span class="overview_unit"> MWh</span></div>
+              <div class="overview_titlename">
+                {{ formatAmountkwh(multiStation.dayExportKwh) }}
+                <span class="overview_unit"> {{ formatCompany(multiStation.dayExportKwh) }}</span>
+              </div>
               <div class="overview_img2">
                 <img src="../../assets/images/discharge.png" alt="站点" />
               </div>
             </div>
-            <div class="overview_line">较昨日下降: {{ multiStation.exportKwhDiffYDay }} MWh</div>
+            <div class="overview_line">
+              较昨日下降: {{ formatAmountkwh_(multiStation.exportKwhDiffYDay) }}
+              {{ formatCompany_(multiStation.exportKwhDiffYDay) }}
+            </div>
             <el-divider />
             <div class="overview_line">
-              月充电:{{ multiStation.monthExportKwh }} MWh | 累计充电:{{ multiStation.accumulativeExportKwh }} MWh
+              本月充电: {{ formatAmountkwh(multiStation.monthExportKwh) }} {{ formatCompany(multiStation.monthExportKwh) }} |
+              累计充电:
+              {{ formatAmountkwh(multiStation.accumulativeExportKwh) }}
+              {{ formatCompany(multiStation.accumulativeExportKwh) }}
             </div>
           </div>
         </el-card>
@@ -64,15 +88,23 @@
               <div class="overview_title_name">今日收益</div>
             </div>
             <div class="overview_title">
-              <div class="overview_titlename">{{ multiStation.todayProfit }} <span class="overview_unit">元</span></div>
+              <div class="overview_titlename">
+                {{ formatAmount(multiStation.todayProfit) }}
+                <span class="overview_unit">{{ formatAmounts(multiStation.todayProfit) }}</span>
+              </div>
               <div class="overview_img3">
                 <img src="../../assets/images/qian.png" alt="站点" />
               </div>
             </div>
-            <div class="overview_line">较昨日下降: {{ multiStation.profitDiffYDay }} 万元</div>
+            <div class="overview_line">
+              较昨日下降: {{ formatAmount1(multiStation.profitDiffYDay) }}
+              {{ formatAmounts2(multiStation.profitDiffYDay) }}
+            </div>
             <el-divider />
             <div class="overview_line">
-              本月收益:{{ multiStation.monthProfit }}万元 | 总收益:{{ multiStation.totalProfit }}万元
+              本月收益: {{ formatAmount(multiStation.monthProfit) }} {{ formatAmounts(multiStation.monthProfit) }} | 总收益:
+              {{ formatAmount(multiStation.totalProfit) }}
+              {{ formatAmounts(multiStation.totalProfit) }}
             </div>
           </div>
         </el-card>
@@ -81,20 +113,23 @@
         <el-card>
           <div class="grid-content ep-bg-purple">
             <div class="overview_title1">
-              <div class="overview_title_name">站点总数</div>
+              <div class="overview_title_name">设备总数</div>
             </div>
             <div class="overview_title">
-              <div class="overview_titlename">{{ multiStation.stationTotalCount }}<span class="overview_unit">个</span></div>
+              <div class="overview_titlename">{{ multiStation.stationTotalCount }} <span class="overview_unit">个</span></div>
               <div class="overview_img">
                 <img src="../../assets/images/gu1.png" alt="站点" />
               </div>
             </div>
             <div class="overview_line">
-              在线{{ multiStation.stationTotalCount }}个 \ 离线{{ multiStation.stationOfflineCount }}个
+              在线 {{ multiStation.stationOnlineCount }} 个 \ 离线 {{ multiStation.stationOfflineCount }} 个
             </div>
             <el-divider />
             <div class="overview_line">
-              装机功率:{{ multiStation.installedPower }} MWh | 装机容量:{{ multiStation.installedPower }} MWh
+              装机功率: {{ formatAmountkwh(multiStation.installedPower) }} {{ formatCompany(multiStation.installedPower) }} |
+              装机容量:
+              {{ formatAmountkwh(multiStation.installedCap) }}
+              {{ formatCompany(multiStation.installedCap) }}
             </div>
           </div>
         </el-card>
@@ -122,6 +157,7 @@
                 end-placeholder="结束时间"
                 :default-value="value2"
                 :disabled-date="pickerOptions"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 @change="onhandleClick"
               />
             </div>
@@ -141,7 +177,7 @@
 
             <div class="gridpiechartdiv">
               <div class="gridpiechartnameright">装机总容量</div>
-              <div class="gridpiechartnameleft">{{ stationinfodata.installedCap }} MWh</div>
+              <div class="gridpiechartnameleft">{{ stationinfodata.installedCap }} kWh</div>
             </div>
 
             <div class="gridpiechartdiv">
@@ -163,7 +199,7 @@
       </el-col>
     </el-row>
     <div class="middle">
-      <el-card style="width: 49%">
+      <el-card style="width: 100%">
         <div class="middleleft">
           <div class="middlelefttop">
             <div>综合功率</div>
@@ -179,6 +215,7 @@
                 end-placeholder="结束时间"
                 :default-value="timedayslist"
                 :disabled-date="pickerOptions"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 @change="onpowerblur"
               />
             </div>
@@ -186,36 +223,11 @@
           <div class="middleleftchart" ref="comprehensive"></div>
         </div>
       </el-card>
-      <el-card style="width: 49%">
-        <div class="middleright" ref="achievement">
-          <div class="middlelefttop">
-            <div>放电达成率</div>
-
-            <div class="middle_divright">
-              <div :class="dischargedays == 7 ? 'middle_divright_1' : 'middle_divright_2'" @click="ondischarge(7)">近7日</div>
-              <div :class="dischargedays == 31 ? 'middle_divright_1' : 'middle_divright_2'" @click="ondischarge(31)">近31日</div>
-              <div :class="dischargedays == 360 ? 'middle_divright_1' : 'middle_divright_2'" @click="ondischarge(360)">
-                近12月
-              </div>
-              <el-date-picker
-                v-model="dischargetimedayslist"
-                type="daterange"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                :default-value="dischargetimedayslist"
-                :disabled-date="pickerOptions"
-                @change="onblur"
-              />
-            </div>
-          </div>
-          <div class="middleleftchart" ref="discharge"></div>
-        </div>
-      </el-card>
     </div>
     <el-card>
       <template #header>
         <div class="card-header">
-          <span>系统列表</span>
+          <span>设备列表</span>
         </div>
       </template>
       <div class="cardtable">
@@ -225,15 +237,15 @@
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         &emsp;
-        <el-input v-model="modelinput" style="width: 240px" placeholder="请输入内容" size="large" />
+        <el-input v-model="modelinput" style="width: 240px" placeholder="设备编号" size="large" />
         &emsp;
         <el-button type="primary" size="large" color="#0052d9" @click="query(0)">查询</el-button>
         <el-button size="large" @click="query(1)">重置</el-button>
       </div>
       <el-table :data="tableData.records" style="width: 100%" border :scrollbar-always-on="true">
         <el-table-column type="index" label="序号" width="60" />
-        <el-table-column prop="emsDeviceId" label="系统编号" width="160" />
-        <el-table-column prop="name" label="系统名称" width="160" />
+        <el-table-column prop="emsDeviceId" label="设备编号" width="160" />
+        <el-table-column prop="name" label="设备名称" width="160" />
         <el-table-column prop="onlineStatus" label="在线状态" width="160">
           <template #default="scope">
             {{ scope.row.onlineStatus == 0 ? "离线" : "在线" }}
@@ -279,7 +291,7 @@
         </div>
         <div class="dialog_title">
           <div class="more_name">装机容量：</div>
-          <div class="more_theme">{{ stationinfodata.installedCap }}MWh</div>
+          <div class="more_theme">{{ stationinfodata.installedCap }}kWh</div>
         </div>
         <div class="dialog_title">
           <div class="more_name">电站地址：</div>
@@ -334,14 +346,13 @@ import * as echarts from "echarts";
 import Pagination from "@/components/ProTable/components/Pagination.vue";
 
 import {
-  gethomesite,
+  getmuitiStation,
   emsSystempage,
   stationstationName,
   postsexportKwh,
   singlestationday,
   singlestationyearMonth,
   singlestationchargingMonth,
-  postexportKwh,
   overallEfficiencyday,
   overallEfficiencyyearMonth,
   Stationinfo
@@ -368,7 +379,7 @@ const onselect = (val: any) => {
   gatsinglestationday();
   postmultiStationpagebaseInfo();
   oncomprehen(7);
-  ondischarge(7);
+  getsite();
 };
 const cities: Ref<Station.todo[]> = ref([]);
 
@@ -394,15 +405,16 @@ const poststationstationName = async () => {
   const { data } = await stationstationName({});
   Singlevalue.value = data[0].id;
   cities.value = data;
+  getsite();
   getStationinfo();
   gatsinglestationday();
   postmultiStationpagebaseInfo();
   oncomprehen(7);
-  ondischarge(7);
 };
 // 选择站点
 const getsite = async () => {
-  const { data } = await gethomesite();
+  console.log(Singlevalue.value);
+  const { data } = await getmuitiStation(Singlevalue.value);
   multiStation.value = data;
 };
 // 站点信息 查看详细
@@ -528,7 +540,7 @@ const getsinglestationchargingMonth = async () => {
 
   baroptionchart(dates, profits);
 };
-// 收益统计237 255 230
+// 收益统计
 const baroptionchart = (dates: string[][], profits: { type: string }[]) => {
   const baroptionvalue = echarts.init(baroption.value);
   window.addEventListener(
@@ -553,9 +565,7 @@ const baroptionchart = (dates: string[][], profits: { type: string }[]) => {
     },
     xAxis: {
       type: "category",
-      axisLabel: {
-        interval: 0 // 显示所有刻度
-      }
+      axisLabel: {}
     },
     yAxis: {
       type: "value"
@@ -624,11 +634,10 @@ const handleClose = () => {
 const comprehensive = ref();
 const timedays = ref(7);
 const timedayslist = ref();
-const onpowerblur = (val: any) => {
-  if (!val) {
-    getcomprehensiveefficiency();
-  }
+const onpowerblur = () => {
+  getcomprehensiveefficiency();
 };
+
 const oncomprehen = (val: number) => {
   // 获取当前日期
   timedays.value = val;
@@ -666,6 +675,7 @@ const getcomprehensiveefficiency = async () => {
     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()]);
   }
@@ -727,100 +737,88 @@ const getiveefficiency = (num: any, dates: string[][], profits: { type: string }
   comprehensivevalue.setOption(option, true);
 };
 // 综合效率---------------------------------------------------------------
-// 放电达成率---------------------------------------------------------------
-const discharge = ref();
-const dischargedays = ref(7);
-const dischargetimedayslist = ref();
-// 选择时间
-const onblur = async (val: any) => {
-  if (!val) {
-    gethttpdischarge();
+
+// 充电量进位
+const formatAmountkwh = (amount: number) => {
+  if (amount == undefined) {
+    return "1000";
+  }
+  if (amount < 1000) {
+    return amount.toFixed(2);
+  } else {
+    return (amount / 1000).toFixed(2);
   }
 };
-const ondischarge = (val: number) => {
-  // 获取当前日期
-  dischargedays.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 (val == 7) {
-    dischargetimedayslist.value = [sevenDaysAgo, currentDate];
-  } else if (val == 31) {
-    dischargetimedayslist.value = [thirtyOneDaysAgo, currentDate];
+const formatCompany = (amount: number) => {
+  if (amount == undefined) {
+    return "kWh";
+  }
+  if (amount < 1000) {
+    return "kWh";
   } else {
-    dischargetimedayslist.value = [lastYearSameMonth, currentDate];
+    return "MWh";
   }
-  gethttpdischarge();
 };
-const gethttpdischarge = async () => {
-  const { data } = await postexportKwh(
-    {
-      startDate: dischargetimedayslist.value[0],
-      endDate: dischargetimedayslist.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].dischargeCompletionRate.toString()]);
+const formatAmountkwh_ = (amount: number) => {
+  if (amount == undefined) {
+    return "1000";
+  }
+  if (amount > -1000) {
+    return amount.toFixed(2);
+  } else {
+    return (amount / 1000).toFixed(2);
   }
-  const profits = [{ type: "line" }];
-  // console.log(dates, profits);
-
-  gethttpchart(data.avgDischargeCompleteRate, dates, profits);
 };
-const gethttpchart = (num: any, dates: string[][], profits: { type: string }[]) => {
-  const dischargevalue = echarts.init(discharge.value);
-  window.addEventListener(
-    "resize",
-    () => {
-      dischargevalue.resize();
-    },
-    false
-  );
-  let option = {
-    title: {
-      text: `放电达成率${num.toFixed(2)}%`,
-      subtext: "效率/%"
-    },
-    legend: {
-      right: 30
-    },
-    grid: {
-      left: "2%",
-      right: "4%",
-      bottom: "6%",
-      containLabel: true
-    },
-    xAxis: {
-      type: "category"
-    },
-    yAxis: {
-      type: "value"
-    },
-    dataset: {
-      source: dates
-    },
-    series: profits
-  };
-
-  dischargevalue.setOption(option, true);
+const formatCompany_ = (amount: number) => {
+  if (amount == undefined) {
+    return "kWh";
+  }
+  if (amount > -1000) {
+    return "kWh";
+  } else {
+    return "MWh";
+  }
+};
+const formatAmount = (amount: number) => {
+  if (amount == undefined) {
+    return "1000";
+  }
+  if (amount < 10000) {
+    return amount.toFixed(2);
+  } else {
+    return (amount / 10000).toFixed(2);
+  }
+};
+const formatAmounts = (amount: number) => {
+  if (amount == undefined) {
+    return "元";
+  }
+  if (amount < 10000) {
+    return "元";
+  } else {
+    return "万元";
+  }
+};
+const formatAmount1 = (amount: number) => {
+  if (amount == undefined) {
+    return "1000";
+  }
+  if (amount > -10000) {
+    return amount.toFixed(2);
+  } else {
+    return (amount / 10000).toFixed(2);
+  }
+};
+const formatAmounts2 = (amount: number) => {
+  if (amount == undefined) {
+    return "元";
+  }
+  if (amount > -10000) {
+    return "元";
+  } else {
+    return "万元";
+  }
 };
-// 放电达成率---------------------------------------------------------------
 onMounted(() => {
   const current = localStorage.getItem("currentDate");
   if (current) {
@@ -834,8 +832,6 @@ onMounted(() => {
   value2.value = [sevenDaysAgo, currentDate.value];
   timedayslist.value = [sevenDaysAgo, currentDate.value];
 
-  getsite();
-
   poststationstationName();
 });
 </script>

src/views/post/index.vue

@@ -7,7 +7,7 @@
     <div class="card">
       <div class="screen">
         <div>
-          岗位编码&ensp;&ensp;<el-input v-model="postCode" style="width: 300px" size="large" placeholder="输入角色名称" />
+          岗位编码&ensp;&ensp;<el-input v-model="postCode" style="width: 300px" size="large" placeholder="输入岗位编码" />
         </div>
         <div>
           &ensp;&ensp;&ensp;&ensp;岗位名称&ensp;&ensp;<el-input
@@ -55,7 +55,7 @@
         <el-table-column label="操作" align="center">
           <template #default="scope">
             <el-button color="#0052d9" v-if="BUTTONS.postedit" type="primary" @click="newition(scope.row)">编辑</el-button>
-            <el-button v-if="BUTTONS.postedit" @click="onremove(scope.row)">删除</el-button>
+            <el-button v-if="BUTTONS.postdelete" @click="onremove(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/powerStation/addition.vue

@@ -7,16 +7,19 @@
         <div class="user_left">
           <el-form ref="formRef" :model="numberValidateForm" label-width="auto" class="demo-ruleForm">
             <div class="elform">
-              <el-form-item label="电站名称" prop="powerName" :rules="[{ required: true, message: '请输入电站名称' }]">
-                <el-input
-                  v-model.number="numberValidateForm.powerName"
-                  style="width: 300px"
-                  size="large"
-                  type="text"
-                  placeholder="请输入电站名称"
-                  autocomplete="off"
-                />
-              </el-form-item>
+              <div style="display: flex; align-items: center">
+                <el-form-item label="电站名称" prop="powerName" :rules="[{ required: true, message: '请输入电站名称' }]">
+                  <el-input
+                    v-model="numberValidateForm.powerName"
+                    style="width: 300px"
+                    size="large"
+                    type="text"
+                    placeholder="请输入电站名称"
+                    autocomplete="off"
+                  />
+                </el-form-item>
+              </div>
+
               <el-form-item label="绑定设备" prop="emsId" :rules="[{ required: true, message: '请选择绑定设备' }]">
                 <el-select
                   multiple
@@ -149,35 +152,32 @@
                 </el-form-item>
               </div> -->
 
-              <!-- <div class="elform1">
+              <div class="elform1">
                 <el-form-item label="电站图片">
-                  <UploadImgs v-model="numberValidateForm.absoluteStationPicUr1" width="300px">
+                  <UploadImgs v-model:file-list="absoluteStationPicUr1" width="300px" :limit="9">
                     <template #empty>
                       <el-icon><Picture /></el-icon>
                       <span>请上传电站图片</span>
                     </template>
-                    <template #tip>图片类型 __ jpg丶jpeg丶png丶gif</template>
+                    <template #tip>图片类型 __ jpg jpeg png</template>
                   </UploadImgs>
                 </el-form-item>
-              </div> -->
+              </div>
             </div>
-            <!-- <div class="elform">
+            <div class="elform">
               <div class="elform1">
-                <el-form-item
-                  label="电站图片"
-                  prop="absoluteStationPicUr1"
-                  :rules="[{ required: true, message: '请选择电站图片' }]"
-                >
-                  <UploadImgs v-model="numberValidateForm.absoluteStationPicUr1" width="300px">
+                <el-form-item label="电站布局图">
+                  <UploadImgs v-model:file-list="layoutPicUr1" width="300px" :limit="9">
                     <template #empty>
                       <el-icon><Picture /></el-icon>
                       <span>请上传电站图片</span>
                     </template>
-                    <template #tip>图片类型 __ jpg丶jpeg丶png丶gif</template>
+                    <template #tip>图片类型 __ jpg jpeg png</template>
                   </UploadImgs>
                 </el-form-item>
               </div>
-            </div> -->
+            </div>
+
             <el-divider />
             <el-form-item class="bottom">
               <el-button type="primary" @click="submitForm(formRef)">保存</el-button>
@@ -192,8 +192,8 @@
 <!--    -->
 <script setup lang="ts">
 import {
-  platformpostedit,
-  platformshupostedit,
+  updatesingleeditURL,
+  editpowerURL,
   selectemssytemALLURL,
   insertpowerURL,
   getlistcountry,
@@ -204,18 +204,20 @@ import {
 import { CascaderOption, CascaderProps, FormInstance } from "element-plus";
 import { onMounted, reactive, ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
-// import UploadImgs from "@/components/Upload/Imgs.vue";
+import UploadImgs from "@/components/Upload/Imgs.vue";
 const router = useRouter();
 const route = useRoute();
 
 const formRef = ref<FormInstance>();
 const supertype = ref(route.query.type);
 const selectedValue = ref([44]);
-
+const absoluteStationPicUr1 = ref();
+const layoutPicUr1 = ref();
 const numberValidateForm = reactive({
-  id: route.query.id,
+  id: "",
   powerName: "", // 电站名称
-  absoluteStationPicUr1: "", // 图片
+  url: [], // 图片
+  arrangementplan: [],
   // stationtelephone: "", // 电话
   emsId: "", //设备id
   address: "", // 地址
@@ -245,10 +247,15 @@ const submitForm = (formEl: FormInstance | undefined) => {
     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 {
-        const { data } = await platformpostedit(numberValidateForm);
+        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();
@@ -258,7 +265,7 @@ const submitForm = (formEl: FormInstance | undefined) => {
     }
   });
 };
-const selectemsId = ref([]);
+const selectemsId = ref();
 const onselect = () => {
   numberValidateForm.emsId = selectemsId.value.join();
 };
@@ -269,16 +276,50 @@ const resetForm = (formEl: FormInstance | undefined) => {
 };
 const yonghueditdata = ref();
 const getghuedit = async () => {
-  const { data } = await platformshupostedit(route.query.id);
+  const { data } = await editpowerURL(route.query.id, {});
   yonghueditdata.value = data;
-  console.log(yonghueditdata.value);
+
+  numberValidateForm.id = yonghueditdata.value[0].powerId;
+  numberValidateForm.powerName = yonghueditdata.value[0].stationName;
+  numberValidateForm.installerName = yonghueditdata.value[0].installerName;
+  numberValidateForm.url = yonghueditdata.value[0].url;
+  numberValidateForm.arrangementplan = yonghueditdata.value[0].arrangementurl;
+  selectemsId.value = [];
+  for (let index = 0; index < yonghueditdata.value[0].emsid.length; index++) {
+    let a = yonghueditdata.value[0].emsid[index].eid;
+    selectemsId.value.push(a);
+  }
+  numberValidateForm.emsId = yonghueditdata.value[0].emsid;
+  // numberValidateForm.address = yonghueditdata.value[0].address;
+  numberValidateForm.contactPhone = yonghueditdata.value[0].contactPhone;
+  numberValidateForm.installedPower = yonghueditdata.value[0].installedPower;
+  numberValidateForm.installedCap = yonghueditdata.value[0].installedCap;
+  numberValidateForm.operationDate = yonghueditdata.value[0].operationDate;
+  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]
+    });
+  }
+  grtselectemssytem();
 };
 // 选择设备编码
 const equipmentdata = ref();
 const grtselectemssytem = async () => {
   const { data } = await selectemssytemALLURL({});
-  equipmentdata.value = data;
-  console.log(data);
+  let arr = data;
+  console.log(arr);
+  const emsidArray = yonghueditdata.value[0].emsid as any[];
+  const arrArray = arr as any[];
+
+  equipmentdata.value = [...emsidArray, ...arrArray];
+  console.log(equipmentdata.value);
 };
 // 地区
 const countrydata = ref();
@@ -393,11 +434,11 @@ const oncascader = async (selectedValues: any) => {
   selectedValue.value = selectedValues;
 };
 onMounted(() => {
-  if (route.query.type == "岗位编辑") {
-    return;
+  if (route.query.type == "电站编辑") {
     getghuedit();
+  } else {
+    grtselectemssytem();
   }
-  grtselectemssytem();
 });
 </script>
 <!-- 电站 -->

src/views/powerStation/index.scss

@@ -94,3 +94,8 @@
 .dialog_name {
   border-right: 1px solid rgb(0 0 0 / 5%);
 }
+.elimageurl {
+  display: flex;
+  overflow: hidden;
+  overflow: auto auto;
+}

src/views/powerStation/index.vue

@@ -12,7 +12,7 @@
         </el-button>
         <div class="selectsite_right">
           <div class="tabpane_1">电站状态：</div>
-          <el-select v-model="Singlevalue" placeholder="Select" size="large" style="width: 240px" @change="postemsDevice">
+          <el-select v-model="Singlevalue" placeholder="电站状态" size="large" style="width: 240px" @change="postemsDevice">
             <el-option v-for="item in cities" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           &ensp;&ensp;&ensp;
@@ -25,23 +25,63 @@
       </div>
       <el-table :data="tableData.records" style="width: 100%" border>
         <el-table-column type="index" prop="date" label="序号" width="60" />
-        <el-table-column prop="stationName" label="电站名称" width="180" />
-        <el-table-column prop="installerName" label="安装人" />
+        <el-table-column prop="powerName" label="电站名称" width="180" />
+        <el-table-column prop="stationName" label="安装人" />
         <el-table-column prop="contactPhone" label="安装人电话">
           <!-- <template #default="scope">
             {{ scope.row.pcsStatus == "" ? "-" : scope.row.pcsStatus }}
           </template> -->
         </el-table-column>
         <el-table-column prop="installedPower" label="装机功率(MW)" />
-        <el-table-column prop="installedCap" label="装机容量(MWh)" />
+        <el-table-column prop="installedCap" label="装机容量(kWh)" />
         <el-table-column prop="country" label="电站地址">
           <template #default="scope"> {{ scope.row.country }} {{ scope.row.province }} {{ scope.row.city }} </template>
         </el-table-column>
         <el-table-column prop="operationDate" label="投运时间" />
-        <el-table-column label="操作">
+        <el-table-column prop="url" label="电站图片" width="200">
+          <template #default="scope">
+            <div class="elimageurl">
+              <div v-for="(item, index) in scope.row.url" :key="index">
+                <el-image
+                  style="width: 60px; height: 60px; margin-right: 10px"
+                  :src="item"
+                  :zoom-rate="1.2"
+                  :max-scale="7"
+                  :min-scale="0.2"
+                  :preview-teleported="true"
+                  :preview-src-list="scope.row.url"
+                  :initial-index="index"
+                  fit="cover"
+                />
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="arrangementurl" label="设备布局图" width="200">
+          <template #default="scope">
+            <div class="elimageurl">
+              <div v-for="(item, index) in scope.row.arrangementurl" :key="index">
+                <el-image
+                  style="width: 60px; height: 60px; margin-right: 10px"
+                  :src="item"
+                  :zoom-rate="1.2"
+                  :max-scale="7"
+                  :min-scale="0.2"
+                  :preview-teleported="true"
+                  :preview-src-list="scope.row.url"
+                  :initial-index="index"
+                  fit="cover"
+                />
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="180">
           <template #default="scope">
             <el-button @click="details(scope.row)">查看</el-button>
-            <!-- <el-button type="primary" color="#0052d9" @click="newition(scope.row)">编辑</el-button> -->
+            <el-button v-if="BUTTONS.powerStationedit" type="primary" color="#0052d9" @click="newition(scope.row)">
+              编辑
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -62,11 +102,27 @@
       <div v-if="informationtype == 1">
         <div class="more_img">
           <div class="more_name">电站图片：</div>
-          <img class="dialogimg" :src="carditem.absoluteStationPicUrl" alt="" />
+          <!-- <img class="dialogimg" :src="carditem.absoluteStationPicUrl" alt="" /> -->
+          <div class="elimageurl">
+            <div v-for="(item, index) in carditem.url" :key="index">
+              <el-image
+                style="width: 120px; height: 120px; margin-right: 10px"
+                :src="item"
+                :zoom-rate="1.2"
+                :max-scale="7"
+                :min-scale="0.2"
+                :preview-teleported="true"
+                :preview-src-list="carditem.url"
+                :initial-index="index"
+                fit="cover"
+              />
+            </div>
+          </div>
         </div>
+
         <div class="dialog_title">
           <div class="more_name">电站名称：</div>
-          <div class="more_theme">{{ carditem.stationName }}</div>
+          <div class="more_theme">{{ carditem.powerName }}</div>
         </div>
         <div class="dialog_title">
           <div class="more_name">装机功率：</div>
@@ -74,7 +130,7 @@
         </div>
         <div class="dialog_title">
           <div class="more_name">装机容量：</div>
-          <div class="more_theme">{{ carditem.installedCap }}MWh</div>
+          <div class="more_theme">{{ carditem.installedCap }}kWh</div>
         </div>
         <div class="dialog_title">
           <div class="more_name">电站地址：</div>
@@ -91,8 +147,22 @@
       </div>
       <div v-if="informationtype == 2">
         <div class="dialog_title">
-          <div class="more_name">安装图片：</div>
-          <div class="more_theme">-</div>
+          <div class="more_name">安装布局图片：</div>
+          <div class="elimageurl">
+            <div v-for="(item, index) in carditem.arrangementurl" :key="index">
+              <el-image
+                style="width: 120px; height: 120px; margin-right: 10px"
+                :src="item"
+                :zoom-rate="1.2"
+                :max-scale="7"
+                :min-scale="0.2"
+                :preview-teleported="true"
+                :preview-src-list="carditem.arrangementurl"
+                :initial-index="index"
+                fit="cover"
+              />
+            </div>
+          </div>
         </div>
         <div class="dialog_title">
           <div class="more_name">并网点信息：</div>
@@ -128,7 +198,6 @@ import Pagination from "@/components/ProTable/components/Pagination.vue";
 import { useRouter } from "vue-router";
 import { useAuthButtons } from "@/hooks/useAuthButtons";
 const { BUTTONS } = useAuthButtons();
-console.log(BUTTONS);
 
 const router = useRouter();
 
@@ -215,20 +284,20 @@ const newaddition = () => {
     path: "/powerStation/addition",
     query: {
       type: "电站新增", // 传递的参数
-      id: ""
+      id: null
     }
   });
 };
 // 编辑
-// const newition = (row: any) => {
-//   router.push({
-//     path: "/powerStation/addition",
-//     query: {
-//       type: "电站编辑", // 传递的参数
-//       id: row.id
-//     }
-//   });
-// };
+const newition = (row: any) => {
+  router.push({
+    path: "/powerStation/addition",
+    query: {
+      type: "电站编辑", // 传递的参数
+      id: row.powerId
+    }
+  });
+};
 onMounted(() => {
   const current = localStorage.getItem("currentDate");
   if (current) {

src/views/reportforms/index.scss

@@ -20,6 +20,11 @@
   align-items: center;
   width: 100%;
 }
+.tabpanesite {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
 .tabpane {
   display: flex;
   align-items: center;
@@ -159,3 +164,13 @@
   width: 100%;
   min-height: 550px;
 }
+.exportright {
+  margin-top: 40px;
+}
+.dropdown {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  margin: 20px 0;
+}

src/views/reportforms/index.vue

@@ -14,50 +14,81 @@
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
         <el-tab-pane label="站点汇总" name="站点汇总">
           <div class="tabdiv">
-            <div class="tabpane">
-              <div>时间范围：</div>
-              <div class="tabpane1">
-                <!-- year -->
-                <el-date-picker
-                  v-if="timetype != 'year'"
-                  v-model="timepicker"
-                  :type="timetype"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  :disabled-date="pickerOptions"
-                  @change="datepicker"
-                  size="large"
-                />
-                <YearPicker
-                  v-if="timetype == 'year'"
-                  style="width: 300px"
-                  ref="statisticPicker"
-                  :label-width="50"
-                  :init-year="dateValue"
-                  :start-year1="timepicker[0]"
-                  :end-year2="timepicker[1]"
-                  @update-time-range="updateStatisticYear"
-                />
-                <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 class="tabpanesite">
+              <div class="tabpane">
+                <div>时间范围：</div>
+                <div class="tabpane1">
+                  <!-- year -->
+                  <el-date-picker
+                    v-if="timetype != 'year'"
+                    v-model="timepicker"
+                    :type="timetype"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    :disabled-date="pickerOptions"
+                    @change="datepicker"
+                    size="large"
+                  />
+                  <YearPicker
+                    v-if="timetype == 'year'"
+                    style="width: 300px"
+                    ref="statisticPicker"
+                    :label-width="50"
+                    :init-year="dateValue"
+                    :start-year1="timepicker[0]"
+                    :end-year2="timepicker[1]"
+                    @update-time-range="updateStatisticYear"
+                  />
+                  <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>
+                &ensp;&ensp;
+                <el-button type="primary" size="large" color="#0052d9" @click="gatSummary">查询</el-button>
+                <el-button size="large" @click="onreset">重置</el-button>
+              </div>
+
+              <div class="exportright" v-if="BUTTONS.export">
+                <el-dropdown trigger="click" :hide-on-click="false" @visible-change="onclose">
+                  <el-button size="large" type="primary" plain>导出</el-button>
+                  <template #dropdown>
+                    <el-dropdown-menu v-for="(item, index) in columnList" :key="index">
+                      <el-dropdown-item>
+                        <el-checkbox @change="oncheck" v-model="item.ifcolumn" :label="item.label" size="large" />
+                        <template v-if="item.children">
+                          <template v-for="(items, i) in item.children" :key="i">
+                            <el-checkbox @change="onchildren" v-model="items.ifcolumn" :label="items.label" size="large" />
+                          </template>
+                        </template>
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                    <div class="dropdown">
+                      <el-button @click="onexport" type="primary" plain>确定导出</el-button>
+                    </div>
+                  </template>
+                </el-dropdown>
               </div>
-              &ensp;&ensp;
-              <el-button type="primary" size="large" color="#0052d9" @click="gatSummary">查询</el-button>
-              <el-button size="large" @click="onreset">重置</el-button>
-              <el-button v-if="BUTTONS.export" size="large" @click="onexport" type="primary" plain>导出</el-button>
             </div>
             &ensp;&ensp;
-
             <el-table :data="tableData.list" style="width: 100%" align="center" :show-overflow-tooltip="true">
-              <el-table-column prop="stationName" label="站点名称" width="150" align="center" />
-
+              <!-- <el-table-column type="selection" width="55" /> -->
+              <template v-for="(item, index) in columnList" :key="index">
+                <el-table-column v-if="item.ifcolumn" :label="item.label" :prop="item.prop" align="center">
+                  <template v-if="item.children">
+                    <template v-for="(items, i) in item.children" :key="i">
+                      <el-table-column v-if="items.ifcolumn" :label="items.label" :prop="items.prop" align="center">
+                      </el-table-column>
+                    </template>
+                  </template>
+                </el-table-column>
+              </template>
+              <!-- <el-table-column prop="stationName" label="站点名称" width="150" align="center" />
               <el-table-column label="充电量(kWh)" align="center">
                 <el-table-column prop="chargeSharp" label="尖" align="center" />
                 <el-table-column prop="chargePeak" label="峰" align="center" />
@@ -72,7 +103,7 @@
                 <el-table-column prop="dischargeValley" label="谷" align="center" />
                 <el-table-column prop="dischargeTotal" label="总" align="center" />
               </el-table-column>
-              <el-table-column prop="overallEfficiency" label="综合效率(%)" width="150" align="center" />
+              <el-table-column prop="overallEfficiency" label="综合效率(%)" width="150" align="center" /> -->
             </el-table>
           </div>
         </el-tab-pane>
@@ -84,41 +115,65 @@
             <div :class="reportformsindex == 3 ? 'tabpane_2' : 'tabpane_1'" @click="onreportforms(3)">月报表</div>
             <div :class="reportformsindex == 4 ? 'tabpane_2' : 'tabpane_1'" @click="onreportforms(4)">年报表</div>
           </div>
-          <div class="selectsite">
-            <div class="tabpane_1">选择站点：</div>
-            <el-select v-model="Singlevalue" placeholder="Select" 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>
-            &ensp;&ensp;&ensp;&ensp; &ensp;&ensp;
-            <div class="tabpane_1">选择日期：</div>
-            <div>
-              <el-date-picker
-                v-if="pickertype != 'year'"
-                v-model="starttime"
-                :type="pickertype"
-                placeholder="选择时间"
-                size="large"
-                clearable
-                :disabled-date="pickerOptions"
-                @change="yearstarttime"
-              />
-              <YearPicker
-                v-if="pickertype == 'year'"
-                style="width: 300px"
-                ref="statisticPicker"
-                :label-width="50"
-                :init-year="dateValue"
-                :start-year1="starttime[0]"
-                :end-year2="starttime[1]"
-                @update-time-range="updateStatisticYear1"
-              />
+          <div class="tabpanesite">
+            <div class="selectsite">
+              <div class="tabpane_1">选择站点：</div>
+              <el-select v-model="Singlevalue" 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>
+              &ensp;&ensp;&ensp;&ensp; &ensp;&ensp;
+              <div class="tabpane_1">选择日期：</div>
+              <div>
+                <el-date-picker
+                  v-if="pickertype != 'year'"
+                  v-model="starttime"
+                  :type="pickertype"
+                  placeholder="选择时间"
+                  size="large"
+                  clearable
+                  :disabled-date="pickerOptions"
+                  @change="yearstarttime"
+                />
+                <YearPicker
+                  v-if="pickertype == 'year'"
+                  style="width: 300px"
+                  ref="statisticPicker"
+                  :label-width="50"
+                  :init-year="dateValue"
+                  :start-year1="starttime[0]"
+                  :end-year2="starttime[1]"
+                  @update-time-range="updateStatisticYear1"
+                />
+              </div>
+              &ensp;&ensp;
+
+              <el-button type="primary" size="large" color="#0052d9" @click="onselectsite">查询</el-button>
+              <el-button size="large" @click="onselectreset">重置</el-button>
+              &ensp;&ensp;
             </div>
-            &ensp;&ensp;
 
-            <el-button type="primary" size="large" color="#0052d9" @click="onselectsite">查询</el-button>
-            <el-button size="large" @click="onselectreset">重置</el-button>
-            <div style="margin-left: 14px" v-if="BUTTONS.export">
+            <!-- <div style="margin-left: 14px" v-if="BUTTONS.export">
               <el-button size="large" @click="singleexport" type="primary" plain v-if="reportformsindex != 1">导出</el-button>
+            </div> -->
+            <div class="exportright" v-if="BUTTONS.export && reportformsindex != 1">
+              <el-dropdown trigger="click" :hide-on-click="false" @visible-change="onsingleclose">
+                <el-button size="large" type="primary" plain>导出</el-button>
+                <template #dropdown>
+                  <el-dropdown-menu v-for="(item, index) in singlecolumnList" :key="index">
+                    <el-dropdown-item>
+                      <el-checkbox @change="onsingle" v-model="item.ifcolumn" :label="item.label" size="large" />
+                      <template v-if="item.children">
+                        <template v-for="(items, i) in item.children" :key="i">
+                          <el-checkbox @change="onsinglechildren" v-model="items.ifcolumn" :label="items.label" size="large" />
+                        </template>
+                      </template>
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                  <div class="dropdown">
+                    <el-button @click="singleexport" type="primary" plain>确定导出</el-button>
+                  </div>
+                </template>
+              </el-dropdown>
             </div>
           </div>
           <div v-if="reportformsindex == 1">
@@ -164,7 +219,7 @@
               <div class="trendchartchart" ref="columnchart"></div>
             </div>
             <div class="Line_chart" v-if="chartindex == 3">
-              <div class="columntable">
+              <div class="columntable" v-if="tablelist.list">
                 <el-table :data="tablelist.list" style="width: 100%" align="center" :show-overflow-tooltip="true">
                   <el-table-column prop="ymdHour" label="时间" width="150" align="center">
                     <template #default="scope">
@@ -210,8 +265,18 @@
           </div>
           <div class="dailyreport" v-else>
             <el-table :data="betweenyear.list" style="width: 100%" align="center" :show-overflow-tooltip="true">
-              <!-- <el-table-column prop="year" label="日期" width="150" align="center" /> -->
-              <el-table-column label="日期" width="150" align="center">
+              <template v-for="(item, index) in singlecolumnList" :key="index">
+                <el-table-column v-if="item.ifcolumn" :label="item.label" :prop="item.prop" align="center">
+                  <template v-if="item.children">
+                    <template v-for="(items, i) in item.children" :key="i">
+                      <el-table-column v-if="items.ifcolumn" :label="items.label" :prop="items.prop" align="center">
+                      </el-table-column>
+                    </template>
+                  </template>
+                </el-table-column>
+              </template>
+
+              <!-- <el-table-column label="日期" width="150" align="center">
                 <template #default="scope">
                   <div v-if="scope.row.ymd">{{ scope.row.ymd }}</div>
                   <div v-if="scope.row.ym">{{ scope.row.ym }}</div>
@@ -232,7 +297,7 @@
                 <el-table-column prop="dischargeValley" label="谷" align="center" />
                 <el-table-column prop="dischargeTotal" label="总" align="center" />
               </el-table-column>
-              <el-table-column prop="overallEfficiency" label="综合效率(%)" width="150" align="center" />
+              <el-table-column prop="overallEfficiency" label="综合效率(%)" width="150" align="center" /> -->
             </el-table>
           </div>
         </el-tab-pane>
@@ -240,6 +305,7 @@
     </el-card>
   </div>
 </template>
+<!--    -->
 <script setup lang="ts">
 import { onMounted, Ref, ref } from "vue";
 import {
@@ -263,10 +329,167 @@ import {
 } from "@/api/home/Multisite";
 import { useAuthButtons } from "@/hooks/useAuthButtons";
 const { BUTTONS } = useAuthButtons();
-
 import YearPicker from "@/components/year/index.vue";
 import * as echarts from "echarts";
 import { other, Station } from "@/api/interface";
+// 汇总表头
+const columnList = ref([
+  {
+    prop: "stationName",
+    label: "日期",
+    ifcolumn: true,
+    children: null
+  },
+  {
+    prop: "",
+    label: "充电量(kWh)",
+    ifcolumn: true,
+    children: [
+      {
+        prop: "chargeSharp",
+        label: "尖",
+        ifcolumn: true
+      },
+      {
+        prop: "chargePeak",
+        label: "峰",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeShoulder",
+        label: "平",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeValley",
+        label: "谷",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeTotal",
+        label: "总",
+        ifcolumn: true
+      }
+    ]
+  },
+  {
+    prop: "",
+    label: "放电量(kWh)",
+    ifcolumn: true,
+    children: [
+      {
+        prop: "dischargeSharp",
+        label: "尖",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargePeak",
+        label: "峰",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeShoulder",
+        label: "平",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeValley",
+        label: "谷",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeTotal",
+        label: "总",
+        ifcolumn: true
+      }
+    ]
+  },
+  {
+    prop: "overallEfficiency",
+    label: "综合效率(%)",
+    ifcolumn: true,
+    children: null
+  }
+]);
+// 单站报表表头
+const singlecolumnList = ref([
+  {
+    prop: "andTime",
+    label: "日期",
+    ifcolumn: true,
+    children: null
+  },
+  {
+    prop: "",
+    label: "充电量(kWh)",
+    ifcolumn: true,
+    children: [
+      {
+        prop: "chargeSharp",
+        label: "尖",
+        ifcolumn: true
+      },
+      {
+        prop: "chargePeak",
+        label: "峰",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeShoulder",
+        label: "平",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeValley",
+        label: "谷",
+        ifcolumn: true
+      },
+      {
+        prop: "chargeTotal",
+        label: "总",
+        ifcolumn: true
+      }
+    ]
+  },
+  {
+    prop: "",
+    label: "放电量(kWh)",
+    ifcolumn: true,
+    children: [
+      {
+        prop: "dischargeSharp",
+        label: "尖",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargePeak",
+        label: "峰",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeShoulder",
+        label: "平",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeValley",
+        label: "谷",
+        ifcolumn: true
+      },
+      {
+        prop: "dischargeTotal",
+        label: "总",
+        ifcolumn: true
+      }
+    ]
+  },
+  {
+    prop: "overallEfficiency",
+    label: "综合效率(%)",
+    ifcolumn: true,
+    children: null
+  }
+]);
 const currentDate = ref();
 const activeName = ref("站点汇总");
 const timepicker: Ref<any> = ref([]);
@@ -279,6 +502,7 @@ const handleClick = (val: any) => {
     timepicker.value = [currentDate, currentDate];
     getreportpowerday();
   } else {
+    chartindex.value = 1;
     poststationstationName();
   }
 };
@@ -358,10 +582,151 @@ const gatSummary = () => {
 const onreset = () => {
   getdaymonthyear(1);
 };
+const onclose = (val: boolean) => {
+  console.log(val);
+  setTimeout(() => {
+    if (!val) {
+      for (const column of columnList.value) {
+        column.ifcolumn = true;
+
+        if (column.children) {
+          for (const child of column.children) {
+            child.ifcolumn = true;
+          }
+        }
+      }
+    }
+  }, 500); // 延迟 0.5毫秒
+};
+const onsingleclose = (val: boolean) => {
+  console.log(val);
+  setTimeout(() => {
+    if (!val) {
+      for (const column of singlecolumnList.value) {
+        column.ifcolumn = true;
+
+        if (column.children) {
+          for (const child of column.children) {
+            child.ifcolumn = true;
+          }
+        }
+      }
+    }
+  }, 500); // 延迟 0.5毫秒
+};
+// 点击汇总父元素多选
+const oncheck = () => {
+  if (columnList.value) {
+    for (let index = 0; index < columnList.value.length; index++) {
+      const column = columnList.value[index];
+      if (column && !column.ifcolumn) {
+        if (column.children && column.prop == "") {
+          for (let i = 0; i < column.children.length; i++) {
+            const child = column.children[i];
+            child.ifcolumn = false;
+          }
+        }
+      } else {
+        if (column.children && column.prop == "") {
+          for (let i = 0; i < column.children.length; i++) {
+            const child = column.children[i];
+            child.ifcolumn = true;
+          }
+        }
+      }
+    }
+  }
+};
+// 点击汇总子元素
+const onchildren = () => {
+  if (columnList.value) {
+    for (let index = 0; index < columnList.value.length; index++) {
+      const column = columnList.value[index];
+      if (column.children && column.prop == "") {
+        for (let i = 0; i < column.children.length; i++) {
+          const child = column.children[i];
+          console.log(child);
+
+          if (child && !child.ifcolumn) {
+            column.ifcolumn = false;
+          } else {
+            column.ifcolumn = true;
+            return;
+          }
+        }
+      }
+    }
+  }
+};
+// 点击单站父元素多选
+const onsingle = () => {
+  if (singlecolumnList.value) {
+    for (let index = 0; index < singlecolumnList.value.length; index++) {
+      const column = singlecolumnList.value[index];
+      if (column && !column.ifcolumn) {
+        if (column.children && column.prop == "") {
+          for (let i = 0; i < column.children.length; i++) {
+            const child = column.children[i];
+            child.ifcolumn = false;
+          }
+        }
+      } else {
+        if (column.children && column.prop == "") {
+          for (let i = 0; i < column.children.length; i++) {
+            const child = column.children[i];
+            child.ifcolumn = true;
+          }
+        }
+      }
+    }
+  }
+};
+// 点击单站子元素
+const onsinglechildren = () => {
+  if (singlecolumnList.value) {
+    for (let index = 0; index < singlecolumnList.value.length; index++) {
+      const column = singlecolumnList.value[index];
+      if (column.children && column.prop == "") {
+        for (let i = 0; i < column.children.length; i++) {
+          const child = column.children[i];
+          console.log(child);
+
+          if (child && !child.ifcolumn) {
+            column.ifcolumn = false;
+          } else {
+            column.ifcolumn = true;
+            return;
+          }
+        }
+      }
+    }
+  }
+};
 // 导出
 const onexport = async () => {
+  let obj: string[] = []; // 假设 prop 是 string 类型，如果不是，请根据实际类型修改
+
+  if (columnList.value) {
+    for (const column of columnList.value) {
+      if (column?.ifcolumn) {
+        if (column.prop) {
+          obj.push(column.prop);
+        }
+        if (column.children) {
+          for (const child of column.children) {
+            if (child?.ifcolumn && child.prop) {
+              obj.push(child.prop);
+            }
+          }
+        }
+      }
+    }
+  }
+  const jsonString = obj.join(",");
+
   if (daymonthyearvalue.value == 1) {
     let obj = {
+      excel: jsonString,
       startDate: timepicker.value[0],
       endDate: timepicker.value[1]
     };
@@ -369,6 +734,8 @@ const onexport = async () => {
     downloadxlsx(timepicker.value[0], data);
   } else if (daymonthyearvalue.value == 2) {
     let obj = {
+      excel: jsonString,
+
       startYearMonth: timepicker.value[0],
       endYearMonth: timepicker.value[1]
     };
@@ -376,6 +743,7 @@ const onexport = async () => {
     downloadxlsx(timepicker.value[0], data);
   } else if (daymonthyearvalue.value == 3) {
     let obj = {
+      excel: jsonString,
       startYear: timepicker.value[0],
       endYear: timepicker.value[1]
     };
@@ -563,10 +931,31 @@ const onselectsite = async () => {
 const onselectreset = async () => {
   onreportforms(1);
 };
-// 导出
+
 const singleexport = async () => {
+  let obj: string[] = []; // 假设 prop 是 string 类型，如果不是，请根据实际类型修改
+
+  if (singlecolumnList.value) {
+    for (const column of singlecolumnList.value) {
+      if (column?.ifcolumn) {
+        if (column.prop) {
+          obj.push(column.prop);
+        }
+        if (column.children) {
+          for (const child of column.children) {
+            if (child?.ifcolumn && child.prop) {
+              obj.push(child.prop);
+            }
+          }
+        }
+      }
+    }
+  }
+  const jsonString = obj.join(",");
   if (reportformsindex.value == 2) {
     let obj = {
+      excel: jsonString,
+
       startTime: starttime.value[0],
       endTime: starttime.value[1]
     };
@@ -574,6 +963,8 @@ const singleexport = async () => {
     downloadxlsx(starttime.value[0], data);
   } else if (reportformsindex.value == 3) {
     let obj = {
+      excel: jsonString,
+
       startYearMonth: starttime.value[0],
       endYearMonth: starttime.value[1]
     };
@@ -581,6 +972,7 @@ const singleexport = async () => {
     downloadxlsx(starttime.value[0], data);
   } else if (reportformsindex.value == 4) {
     let obj = {
+      excel: jsonString,
       startYear: starttime.value[0],
       endYear: starttime.value[1]
     };
@@ -718,9 +1110,14 @@ const getemsSystemsingleStation = async () => {
 };
 const getreportsingleStationoriginal = async () => {
   const { data } = await reportsingleStationoriginal({ dateType: rawdataid.value }, Singlevalue.value, singleid.value);
-  ondatachart(data);
+  if (data) {
+    ondatachart(data);
+  }
 };
 const ondatachart = (data: any) => {
+  if (data.length == 0) {
+    return;
+  }
   const valueList = data.map(function (item: any) {
     return item.accumulativeExportKwh;
   }); // 充电
@@ -929,9 +1326,12 @@ const getsingleStationtable = async () => {
     date: starttime.value
   };
   const { data } = await singleStationtable(obj, Singlevalue.value);
-  data.total.ymdHour = "合计";
-  data.list.push(data.total);
-  tablelist.value = data;
+  if (data.list.length > 0) {
+    data.total.ymdHour = "合计";
+    data.list.push(data.total);
+    tablelist.value = data;
+  }
+
   // tablelist.value = data;
 };
 // 电量报表-单站_日月年报表
@@ -946,6 +1346,13 @@ const getsingleStationyear = async () => {
   betweenyear.value = data;
   data.total.ymd = "合计";
   betweenyear.value.list.push(data.total);
+  betweenyear.value.list = betweenyear.value.list.map((item: { ymd: any }) => {
+    return {
+      ...item,
+      andTime: item.ymd,
+      ymd: undefined // 如果需要完全删除 ymd 键，可以设置为 undefined
+    };
+  });
 };
 const getelectricitylevelyearMonth = async () => {
   let obj = {
@@ -957,6 +1364,13 @@ const getelectricitylevelyearMonth = async () => {
   betweenyear.value = data;
   data.total.ym = "合计";
   betweenyear.value.list.push(data.total);
+  betweenyear.value.list = betweenyear.value.list.map((item: { ym: any }) => {
+    return {
+      ...item,
+      andTime: item.ym,
+      ym: undefined // 如果需要完全删除 ymd 键，可以设置为 undefined
+    };
+  });
 };
 const getelectricitylevelyear = async () => {
   let obj = {
@@ -968,6 +1382,13 @@ const getelectricitylevelyear = async () => {
   betweenyear.value = data;
   data.total.year = "合计";
   betweenyear.value.list.push(data.total);
+  betweenyear.value.list = betweenyear.value.list.map((item: { year: any }) => {
+    return {
+      ...item,
+      andTime: item.year,
+      year: undefined // 如果需要完全删除 ymd 键，可以设置为 undefined
+    };
+  });
 };
 onMounted(() => {
   const current = localStorage.getItem("currentDate");

src/views/role/index.vue

@@ -62,6 +62,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="创建时间" />
+        <el-table-column prop="remark" label="备注" />
+
         <el-table-column label="操作" align="center">
           <template #default="scope">
             <el-button v-if="BUTTONS.roleedit" color="#0052d9" type="primary" @click="newition(scope.row)">编辑</el-button>

src/views/station/index.vue

@@ -89,9 +89,13 @@
               <el-card>
                 <div class="el_card">
                   <div>
-                    <div class="el_cardname">{{ item.installedCap }} <span class="el_cardunit">MWh</span></div>
+                    <div class="el_cardname">{{ item.installedCap }} <span class="el_cardunit">kWh</span></div>
                     <div class="topcard_title">装机容量</div>
                   </div>
+                  <!-- <div>
+                    <div class="el_cardname">{{ item.installedCap }} <span class="el_cardunit">台/套</span></div>
+                    <div class="topcard_title">装机设备</div>
+                  </div> -->
                   <div>
                     <div class="el_cardname">{{ item.installedPower }} <span class="el_cardunit">MW</span></div>
                     <div class="topcard_title">装机功率</div>
@@ -144,7 +148,7 @@
           </div>
           <div class="dialog_title">
             <div class="more_name">装机容量：</div>
-            <div class="more_theme">{{ carditem.installedCap }}MWh</div>
+            <div class="more_theme">{{ carditem.installedCap }}kWh</div>
           </div>
           <div class="dialog_title">
             <div class="more_name">电站地址：</div>
@@ -465,5 +469,5 @@ onMounted(() => {
 @import "./index.scss";
 </style>
 <!--
- 
+
 -->

src/views/system/index.scss

@@ -2,6 +2,13 @@
 .title {
   display: flex;
   :deep(.el-select__wrapper) {
+    .el-select__prefix {
+      color: #000000 !important;
+    }
+    .el-select__selected-item {
+      font-size: 22px;
+    }
+
     background-color: rgb(0 0 0 / 0%);
     box-shadow: 0 0 0 0 !important;
 
@@ -186,6 +193,7 @@
 .Boxdiv {
   width: 100%;
   height: 674px;
+  overflow: auto;
   border: 1px solid #e7e7e7;
 }
 .Boxdiv_ {
@@ -335,6 +343,7 @@
   border: 1px solid #e7e7e7;
 }
 .income_title {
+  box-sizing: border-box;
   display: flex;
 }
 .income_title1 {
@@ -412,6 +421,7 @@
   justify-content: center;
   width: 120px;
   height: 48px;
+  border-right: 1px solid #e7e7e7;
   border-bottom: 1px solid #e7e7e7;
 }
 .income_ul_right {

src/views/system/index.vue

@@ -7,23 +7,29 @@
         placeholder="选择电站"
         popper-class="custom-header"
         :max-collapse-tags="1"
-        style="width: 300px"
+        class="Space_content"
         size="large"
         @change="postemsDevice"
       >
-        <el-option v-for="item in cities" :key="item.id" :label="item.stationName" :value="item.id" />
+        <el-option v-for="(item, index) in cities" :key="index" :label="item.stationName" :value="item.id" />
+        <template #prefix>
+          {{ (cities.find(s => s.id === Singlevalue) || {}).stationName }}
+        </template>
       </el-select>
       <div class="title_"></div>
       <el-select
         v-model="emsDeviceId"
         collapse-tags
-        placeholder="选择设备编号"
+        placeholder="选择编号"
         popper-class="custom-header"
         :max-collapse-tags="1"
-        style="width: 240px"
+        class="Space_content"
         size="large"
         @change="getstationrealtime"
       >
+        <template #prefix>
+          {{ (emsDevice.find(s => s.id === emsDeviceId) || {}).id }}
+        </template>
         <el-option v-for="item in emsDevice" :key="item.id" :label="item.emsDeviceId" :value="item.id" />
       </el-select>
     </div>
@@ -40,25 +46,25 @@
               <div class="real_timediv">
                 <el-card>
                   <div class="real_timename">今日充电量</div>
-                  <div class="real_timeunit">{{ realtime.dayImportKwh }}<span class="real_timeunitcss">kwh</span></div>
+                  <div class="real_timeunit">{{ realtime.dayImportKwh }}<span class="real_timeunitcss">kWh</span></div>
                 </el-card>
               </div>
               <div class="real_timediv">
                 <el-card>
                   <div class="real_timename">今日放电量</div>
-                  <div class="real_timeunit">{{ realtime.dayExportKwh }} <span class="real_timeunitcss">kwh</span></div>
+                  <div class="real_timeunit">{{ realtime.dayExportKwh }} <span class="real_timeunitcss">kWh</span></div>
                 </el-card>
               </div>
               <div class="real_timediv">
                 <el-card>
                   <div class="real_timename">累计充电量</div>
-                  <div class="real_timeunit">{{ realtime.accumulativeImportKwh }} <span class="real_timeunitcss">MWh</span></div>
+                  <div class="real_timeunit">{{ realtime.accumulativeImportKwh }} <span class="real_timeunitcss">kWh</span></div>
                 </el-card>
               </div>
               <div class="real_timediv">
                 <el-card>
                   <div class="real_timename">累计放电量</div>
-                  <div class="real_timeunit">{{ realtime.accumulativeExportKwh }} <span class="real_timeunitcss">MWh</span></div>
+                  <div class="real_timeunit">{{ realtime.accumulativeExportKwh }} <span class="real_timeunitcss">kWh</span></div>
                 </el-card>
               </div>
               <div class="real_timediv">
@@ -350,8 +356,13 @@ const poststationstationName = async () => {
 const postemsDevice = async () => {
   emsDevice.value = [];
   const { data } = await postemsSystemsingleStation({}, Singlevalue.value);
+  if (data.length == 0) {
+    emsDeviceId.value = "";
+    return;
+  } else {
+    emsDeviceId.value = data[0].id;
+  }
 
-  emsDeviceId.value = data[0].id ?? "";
   emsDevice.value = data;
   getstationrealtime();
 };
@@ -367,6 +378,8 @@ const realtime: Ref<Station.realtimeinfo> = ref({
 const getstationrealtime = async () => {
   const { data } = await poststationrealtime({}, Singlevalue.value, emsDeviceId.value);
   realtime.value = data;
+  console.log(data);
+
   await getpoststationdevice();
   await getstationsystem();
   await getstationdevice();
@@ -788,11 +801,10 @@ const gatrevenue = async () => {
   };
   const { data } = await postelectricityrevenue(obj, Singlevalue.value, emsDeviceId.value);
   console.log(data);
-  data.list.forEach(item => {
-    item["ymdHour"] = item["ymdHour"].substring(11, item["ymdHour"].length);
-  });
+
   incomedata.value = data;
 };
+
 onMounted(() => {
   const current = localStorage.getItem("currentDate");
   if (current) {

src/views/user/index.vue

@@ -9,7 +9,7 @@
     <div class="card">
       <div class="screen">
         <div class="screen_view">
-          账号&ensp;&ensp;<el-input v-model="loginName" style="width: 70%" size="large" placeholder="输入登录名称" />
+          登录账号&ensp;&ensp;<el-input v-model="loginName" style="width: 70%" size="large" placeholder="输入登录账号" />
         </div>
         <div class="screen_view">
           用户状态&ensp;&ensp;<el-select v-model="status" placeholder="请选择用户状态" size="large" style="width: 70%">

src/views/userinformation/index.scss

@@ -0,0 +1,46 @@
+.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;
+  }
+}
+.user {
+  display: flex;
+  align-items: center;
+  margin-top: 40px;
+}
+.user_to {
+  width: 60px;
+  height: 60px;
+  margin-left: 20px;
+  border-radius: 100%;
+}
+.user_div {
+  margin-left: 20px;
+}
+.bottom {
+  position: fixed;
+  bottom: 80px;
+  left: 80px;
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  margin-top: 40px;
+}

src/views/userinformation/index.vue

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <div class="title">
+      角色管理
+      <div class="title_time">{{ currentDate }}</div>
+    </div>
+    <div class="card">
+      <div class="user">
+        头像:
+        <div class="user_div">
+          <UploadImg v-model:image-url="absoluteStationPicUr1" :drag="false" border-radius="50%"> </UploadImg>
+        </div>
+      </div>
+      <div class="user">
+        昵称：<span class="user_div">{{ userdata.user.userName }}</span>
+      </div>
+      <div class="user">
+        部门：<span class="user_div">{{ userdata.user.dept.deptName }}</span>
+      </div>
+      <div class="user">
+        角色：<span class="user_div">{{ userdata.user.roles[0].roleName }}</span>
+      </div>
+      <div class="user">
+        账号：<span class="user_div">{{ userdata.user.loginName }}</span>
+      </div>
+      <div class="user">
+        性别：<span class="user_div">{{ userdata.user.userName == 0 ? "男" : "女" }}</span>
+      </div>
+      <div class="user">
+        电话：<span class="user_div">{{ userdata.user.phonenumber }}</span>
+      </div>
+      <div class="user">
+        邮箱：<span class="user_div">{{ userdata.user.email }}</span>
+      </div>
+      <div class="user">
+        创建时间：<span class="user_div">{{ userdata.user.createTime }}</span>
+      </div>
+      <div class="user">
+        备注：<span class="user_div">{{ userdata.user.remark }}</span>
+      </div>
+    </div>
+    <div class="bottom">
+      <el-button @click="resetForm()" type="primary" size="large">返回</el-button>
+    </div>
+  </div>
+</template>
+<!--    -->
+<script setup lang="ts">
+import { selectaccountNumber, updateURL } from "@/api/home/Multisite";
+import { onMounted, ref, watch } from "vue";
+import UploadImg from "@/components/Upload/Img.vue";
+
+import { useRouter } from "vue-router";
+const router = useRouter();
+const userdata = ref();
+
+const absoluteStationPicUr1 = ref("");
+watch(absoluteStationPicUr1, (newVal, oldVal) => {
+  console.log("absoluteStationPicUr1 has changed:", newVal);
+  console.log(oldVal);
+
+  // 你可以在这里处理变化后的逻辑
+  getupdate();
+});
+// 修改个人信息
+const getupdate = async () => {
+  console.log(absoluteStationPicUr1.value);
+  let obj = {
+    avatar: absoluteStationPicUr1.value
+  };
+  const { data } = await updateURL(obj);
+  console.log(data);
+  getplatformuserlist();
+};
+const getplatformuserlist = async () => {
+  const { data } = await selectaccountNumber({});
+  userdata.value = data;
+  absoluteStationPicUr1.value = userdata.value.user.avatar;
+};
+const currentDate = ref();
+const resetForm = async () => {
+  router.back();
+};
+onMounted(() => {
+  const current = localStorage.getItem("currentDate");
+  if (current) {
+    currentDate.value = current;
+  }
+  getplatformuserlist();
+});
+</script>
+<style scoped lang="scss">
+@import "./index.scss";
+</style>
+<!-- -->