Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/api/energyAnalysis/index.ts

@@ -0,0 +1,14 @@
+import { get, post, del, put } from '/@/utils/request';
+
+export default {
+  // loop: {
+  //   getList: (params: object) => get('/region/loop/list', params),
+  //   add: (data: object) => post('/region/loop/add', data),
+  //   edit: (data: object) => put('/region/loop/edit', data),
+  //   del: (id: number) => del('/region/loop/del', { id }),
+  //   detail: (id: number) => get('/region/loop/getInfoById', { id }),
+  // },
+  getStationInfoList: (params?: object) => get('/energy/station/info/list', params), // 换热站基础数据(分析报表数据)
+  getEnergyWaterLossList: (params?: object) => get('/energy/water/loss/list', params), // 换热站失水分析条形图列表
+  getEnergyWaterLossLineChart: (params?: object) => get('/energy/water/loss/line/chart', params), // 换热站失水分析折现图列表
+}

src/assets/ele.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1665456136412" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6979" width="40" height="40" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M271.973 508.68l-0.467 0.516c-15.161 17.134-6.178 44.443 16.396 49.075l162.817 33.411-147.137 354.746c-12.63 30.449 26.067 55.938 49.027 32.294l410.916-423.155 0.486-0.511c15.79-16.999 6.974-44.925-15.926-49.613l-152.962-31.315L718.788 109.69c10.37-30.56-28.32-53.605-50.226-29.915L271.972 508.68z m345.075-285.15l-89.404 263.48-0.215 0.657c-5.298 16.85 5.123 34.684 22.518 38.245l132.675 27.162L418.71 824.845l101.086-243.71 0.25-0.621c6.7-17.199-3.668-36.397-21.844-40.127l-146.367-30.033L617.048 223.53z" fill="#333333" p-id="6980"></path></svg>

src/assets/ele1.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1665456136412" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6979" width="40" height="40" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M271.973 508.68l-0.467 0.516c-15.161 17.134-6.178 44.443 16.396 49.075l162.817 33.411-147.137 354.746c-12.63 30.449 26.067 55.938 49.027 32.294l410.916-423.155 0.486-0.511c15.79-16.999 6.974-44.925-15.926-49.613l-152.962-31.315L718.788 109.69c10.37-30.56-28.32-53.605-50.226-29.915L271.972 508.68z m345.075-285.15l-89.404 263.48-0.215 0.657c-5.298 16.85 5.123 34.684 22.518 38.245l132.675 27.162L418.71 824.845l101.086-243.71 0.25-0.621c6.7-17.199-3.668-36.397-21.844-40.127l-146.367-30.033L617.048 223.53z" fill="#ffffff" p-id="6980"></path></svg>

src/assets/fire.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1665456227936" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7514" width="40" height="40" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M602.1 1008.1c-9.5 0-18.5-3.3-26.4-9.4-10.8-8.3-16.1-21.4-16.1-35.1 0-6.7 0.1-13.6 0.3-20.8 0.9-40.5 1.7-82.3-26-130.9-18.8-32.8-32.1-66-41.5-95.3C458 772 426 855.9 464.7 946.2c6.4 14.9 4.1 32.1-6 44.8-10.1 12.7-26.4 18.8-42.3 16-154-27.8-290.5-139.1-331.8-270.8-50.9-162-7.4-330.1 110.9-428.1 18.3-15.1 45.3-13.1 61.1 4.6l45.7 51.4c34.5-45.5 73.6-138.3-4.8-283.2-8.7-16.1-6.6-35.9 5.4-49.7 11.9-13.8 31.2-18.9 48.4-12.7 193.1 69.7 278.4 206.8 313.4 308.8 11.8-27.1 22.7-60.5 28.9-100.1 2.3-14.9 12.1-27.6 25.9-33.6 13.8-6 29.8-4.5 42.3 3.9 35.7 24.2 307.1 315.9 150.4 598.8-64.1 115.8-169.4 190.4-296.4 210l-2.9 0.5c-3.7 0.8-7.3 1.3-10.8 1.3z m-87-434.2c5.2 0 10.4 0.9 15.4 2.8 15.7 5.9 26.7 20.1 28.4 36.8 0.1 0.7 8.9 80.2 51.5 154.7 30.1 52.7 36.7 100.7 37.8 140.5 79.5-24 143.5-77 186.8-155.2 90.6-163.6-7.1-341.6-74.6-429.7-29.9 89.2-75.6 139.1-86.5 150.1-6.5 6.6-15 11.3-24.6 12.8-19.1 3.1-37.8-6.8-46.4-24.1-3.3-6.7-4.8-14.1-4.4-21.3-0.2-7-8.6-181.9-179-291.9 49.7 192.5-74.2 300.3-90.9 313.7-18.3 14.7-45 12.5-60.6-5l-46.5-52.3c-65.9 76.9-87.3 193.7-52.7 304 25.1 80.1 101.1 152.7 192.5 189.7-22.9-173.7 117-307.3 123.8-313.7 8.2-7.7 19-11.9 30-11.9z" p-id="7515" fill="#333333"></path></svg>

src/assets/fire1.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1665456227936" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7514" width="40" height="40" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M602.1 1008.1c-9.5 0-18.5-3.3-26.4-9.4-10.8-8.3-16.1-21.4-16.1-35.1 0-6.7 0.1-13.6 0.3-20.8 0.9-40.5 1.7-82.3-26-130.9-18.8-32.8-32.1-66-41.5-95.3C458 772 426 855.9 464.7 946.2c6.4 14.9 4.1 32.1-6 44.8-10.1 12.7-26.4 18.8-42.3 16-154-27.8-290.5-139.1-331.8-270.8-50.9-162-7.4-330.1 110.9-428.1 18.3-15.1 45.3-13.1 61.1 4.6l45.7 51.4c34.5-45.5 73.6-138.3-4.8-283.2-8.7-16.1-6.6-35.9 5.4-49.7 11.9-13.8 31.2-18.9 48.4-12.7 193.1 69.7 278.4 206.8 313.4 308.8 11.8-27.1 22.7-60.5 28.9-100.1 2.3-14.9 12.1-27.6 25.9-33.6 13.8-6 29.8-4.5 42.3 3.9 35.7 24.2 307.1 315.9 150.4 598.8-64.1 115.8-169.4 190.4-296.4 210l-2.9 0.5c-3.7 0.8-7.3 1.3-10.8 1.3z m-87-434.2c5.2 0 10.4 0.9 15.4 2.8 15.7 5.9 26.7 20.1 28.4 36.8 0.1 0.7 8.9 80.2 51.5 154.7 30.1 52.7 36.7 100.7 37.8 140.5 79.5-24 143.5-77 186.8-155.2 90.6-163.6-7.1-341.6-74.6-429.7-29.9 89.2-75.6 139.1-86.5 150.1-6.5 6.6-15 11.3-24.6 12.8-19.1 3.1-37.8-6.8-46.4-24.1-3.3-6.7-4.8-14.1-4.4-21.3-0.2-7-8.6-181.9-179-291.9 49.7 192.5-74.2 300.3-90.9 313.7-18.3 14.7-45 12.5-60.6-5l-46.5-52.3c-65.9 76.9-87.3 193.7-52.7 304 25.1 80.1 101.1 152.7 192.5 189.7-22.9-173.7 117-307.3 123.8-313.7 8.2-7.7 19-11.9 30-11.9z" p-id="7515" fill="#ffffff"></path></svg>

src/assets/img/ele.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1665713624838" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8604" width="200" height="200"><path d="M804.947084 418.503859l-115.563865-10.122809c-24.80966-2.164994-96.049663 3.803368-118.489533-13.01922-3.276748-17.290695 14.686851-46.576626 20.187106-60.970911 15.886374-41.661505 31.187615-82.854903 47.103246-125.043027L706.235064 27.634685c8.981799-23.697907-21.737709-37.009694-36.570844-19.689742l-468.106796 536.918495c-10.620173 12.346317 0.936214 31.977546 15.710835 33.264839l169.396146 14.803877c11.6149 1.023984 57.109029-2.428304 63.516241 9.274366 6.085388 9.596189-9.566933 36.395303-13.077733 46.19629-41.251911 106.962403-81.450583 214.012576-121.678511 321.062748-8.981799 23.66865 21.766966 36.980437 36.570844 19.689742l467.580176-536.947751c11.234563-12.872937 0.17554-32.416396-14.628338-33.70369z" p-id="8605" fill="#e98f36"></path></svg>

src/assets/img/ele1.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1665713624838" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8604" width="200" height="200"><path d="M804.947084 418.503859l-115.563865-10.122809c-24.80966-2.164994-96.049663 3.803368-118.489533-13.01922-3.276748-17.290695 14.686851-46.576626 20.187106-60.970911 15.886374-41.661505 31.187615-82.854903 47.103246-125.043027L706.235064 27.634685c8.981799-23.697907-21.737709-37.009694-36.570844-19.689742l-468.106796 536.918495c-10.620173 12.346317 0.936214 31.977546 15.710835 33.264839l169.396146 14.803877c11.6149 1.023984 57.109029-2.428304 63.516241 9.274366 6.085388 9.596189-9.566933 36.395303-13.077733 46.19629-41.251911 106.962403-81.450583 214.012576-121.678511 321.062748-8.981799 23.66865 21.766966 36.980437 36.570844 19.689742l467.580176-536.947751c11.234563-12.872937 0.17554-32.416396-14.628338-33.70369z" p-id="8605" fill="#efb336"></path></svg>

src/assets/img/fire.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1665713524786" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5770" width="200" height="200"><path d="M602.1 1008.1c-9.5 0-18.5-3.3-26.4-9.4-10.8-8.3-16.1-21.4-16.1-35.1 0-6.7 0.1-13.6 0.3-20.8 0.9-40.5 1.7-82.3-26-130.9-18.8-32.8-32.1-66-41.5-95.3C458 772 426 855.9 464.7 946.2c6.4 14.9 4.1 32.1-6 44.8-10.1 12.7-26.4 18.8-42.3 16-154-27.8-290.5-139.1-331.8-270.8-50.9-162-7.4-330.1 110.9-428.1 18.3-15.1 45.3-13.1 61.1 4.6l45.7 51.4c34.5-45.5 73.6-138.3-4.8-283.2-8.7-16.1-6.6-35.9 5.4-49.7 11.9-13.8 31.2-18.9 48.4-12.7 193.1 69.7 278.4 206.8 313.4 308.8 11.8-27.1 22.7-60.5 28.9-100.1 2.3-14.9 12.1-27.6 25.9-33.6 13.8-6 29.8-4.5 42.3 3.9 35.7 24.2 307.1 315.9 150.4 598.8-64.1 115.8-169.4 190.4-296.4 210l-2.9 0.5c-3.7 0.8-7.3 1.3-10.8 1.3z m-87-434.2c5.2 0 10.4 0.9 15.4 2.8 15.7 5.9 26.7 20.1 28.4 36.8 0.1 0.7 8.9 80.2 51.5 154.7 30.1 52.7 36.7 100.7 37.8 140.5 79.5-24 143.5-77 186.8-155.2 90.6-163.6-7.1-341.6-74.6-429.7-29.9 89.2-75.6 139.1-86.5 150.1-6.5 6.6-15 11.3-24.6 12.8-19.1 3.1-37.8-6.8-46.4-24.1-3.3-6.7-4.8-14.1-4.4-21.3-0.2-7-8.6-181.9-179-291.9 49.7 192.5-74.2 300.3-90.9 313.7-18.3 14.7-45 12.5-60.6-5l-46.5-52.3c-65.9 76.9-87.3 193.7-52.7 304 25.1 80.1 101.1 152.7 192.5 189.7-22.9-173.7 117-307.3 123.8-313.7 8.2-7.7 19-11.9 30-11.9z" p-id="5771" fill="#d81e06"></path></svg>

src/assets/img/fire1.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1665713524786" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5770" width="200" height="200"><path d="M602.1 1008.1c-9.5 0-18.5-3.3-26.4-9.4-10.8-8.3-16.1-21.4-16.1-35.1 0-6.7 0.1-13.6 0.3-20.8 0.9-40.5 1.7-82.3-26-130.9-18.8-32.8-32.1-66-41.5-95.3C458 772 426 855.9 464.7 946.2c6.4 14.9 4.1 32.1-6 44.8-10.1 12.7-26.4 18.8-42.3 16-154-27.8-290.5-139.1-331.8-270.8-50.9-162-7.4-330.1 110.9-428.1 18.3-15.1 45.3-13.1 61.1 4.6l45.7 51.4c34.5-45.5 73.6-138.3-4.8-283.2-8.7-16.1-6.6-35.9 5.4-49.7 11.9-13.8 31.2-18.9 48.4-12.7 193.1 69.7 278.4 206.8 313.4 308.8 11.8-27.1 22.7-60.5 28.9-100.1 2.3-14.9 12.1-27.6 25.9-33.6 13.8-6 29.8-4.5 42.3 3.9 35.7 24.2 307.1 315.9 150.4 598.8-64.1 115.8-169.4 190.4-296.4 210l-2.9 0.5c-3.7 0.8-7.3 1.3-10.8 1.3z m-87-434.2c5.2 0 10.4 0.9 15.4 2.8 15.7 5.9 26.7 20.1 28.4 36.8 0.1 0.7 8.9 80.2 51.5 154.7 30.1 52.7 36.7 100.7 37.8 140.5 79.5-24 143.5-77 186.8-155.2 90.6-163.6-7.1-341.6-74.6-429.7-29.9 89.2-75.6 139.1-86.5 150.1-6.5 6.6-15 11.3-24.6 12.8-19.1 3.1-37.8-6.8-46.4-24.1-3.3-6.7-4.8-14.1-4.4-21.3-0.2-7-8.6-181.9-179-291.9 49.7 192.5-74.2 300.3-90.9 313.7-18.3 14.7-45 12.5-60.6-5l-46.5-52.3c-65.9 76.9-87.3 193.7-52.7 304 25.1 80.1 101.1 152.7 192.5 189.7-22.9-173.7 117-307.3 123.8-313.7 8.2-7.7 19-11.9 30-11.9z" p-id="5771" fill="#d81e06"></path></svg>

src/assets/img/map.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1665713857125" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9925" width="200" height="200"><path d="M800 894.1H224c-16.9 0-30.5-13.7-30.5-30.5v-47.2h-41.6c-16.9 0-30.5-13.7-30.5-30.5V229.7c0-16.9 13.7-30.5 30.5-30.5h41.6V129c0-16.9 13.7-30.5 30.5-30.5h576c16.9 0 30.5 13.7 30.5 30.5v70.2h55.9c16.9 0 30.5 13.7 30.5 30.5v556.1c0 16.9-13.7 30.5-30.5 30.5h-55.9v47.2c0.1 16.9-13.6 30.6-30.5 30.6z m-545.5-61h515v-47.2c0-16.9 13.7-30.5 30.5-30.5h55.9V260.3H800c-16.9 0-30.5-13.7-30.5-30.5v-70.2h-515v70.2c0 16.9-13.7 30.5-30.5 30.5h-41.6v495.1H224c16.9 0 30.5 13.7 30.5 30.5v47.2z" fill="#7dc5eb" p-id="9926"></path><path d="M224 822c-7.8 0-15.6-3-21.6-8.9-11.9-11.9-11.9-31.2 0-43.2l576.1-576.1c11.9-11.9 31.2-11.9 43.2 0 11.9 11.9 11.9 31.2 0 43.2L245.6 813.1c-6 5.9-13.8 8.9-21.6 8.9z" fill="#7dc5eb" p-id="9927"></path><path d="M224 967.6H72.7c-16.9 0-30.5-13.7-30.5-30.5V785.8c0-16.9 13.7-30.5 30.5-30.5H224c16.9 0 30.5 13.7 30.5 30.5V937c0 17-13.7 30.6-30.5 30.6z m-120.7-61h90.2v-90.2h-90.2v90.2zM447.2 893.2c-7.8 0-15.6-3-21.6-8.9-11.9-11.9-11.9-31.2 0-43.2L853 413.8c11.9-11.9 31.2-11.9 43.2 0 11.9 11.9 11.9 31.2 0 43.2L468.8 884.3c-6 5.9-13.8 8.9-21.6 8.9zM155.1 566.2c-7.8 0-15.6-3-21.6-8.9-11.9-11.9-11.9-31.2 0-43.2l383.7-383.7c11.9-11.9 31.2-11.9 43.2 0 11.9 11.9 11.9 31.2 0 43.2L176.6 557.2c-5.9 6-13.7 9-21.5 9zM224 260.3H72.7c-16.9 0-30.5-13.7-30.5-30.5V78.5C42.2 61.6 55.9 48 72.7 48H224c16.9 0 30.5 13.7 30.5 30.5v151.2c0 16.9-13.7 30.6-30.5 30.6z m-120.7-61.1h90.2V109h-90.2v90.2zM951.3 260.3H800c-16.9 0-30.5-13.7-30.5-30.5V78.5c0-16.9 13.7-30.5 30.5-30.5h151.2c16.9 0 30.5 13.7 30.5 30.5v151.2c0.1 16.9-13.6 30.6-30.4 30.6z m-120.7-61.1h90.2V109h-90.2v90.2zM951.3 967.6H800c-16.9 0-30.5-13.7-30.5-30.5V785.8c0-16.9 13.7-30.5 30.5-30.5h151.2c16.9 0 30.5 13.7 30.5 30.5V937c0.1 17-13.6 30.6-30.4 30.6z m-120.7-61h90.2v-90.2h-90.2v90.2z" fill="#7dc5eb" p-id="9928"></path></svg>

src/assets/img/map1.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1665713857125" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9925" width="200" height="200"><path d="M800 894.1H224c-16.9 0-30.5-13.7-30.5-30.5v-47.2h-41.6c-16.9 0-30.5-13.7-30.5-30.5V229.7c0-16.9 13.7-30.5 30.5-30.5h41.6V129c0-16.9 13.7-30.5 30.5-30.5h576c16.9 0 30.5 13.7 30.5 30.5v70.2h55.9c16.9 0 30.5 13.7 30.5 30.5v556.1c0 16.9-13.7 30.5-30.5 30.5h-55.9v47.2c0.1 16.9-13.6 30.6-30.5 30.6z m-545.5-61h515v-47.2c0-16.9 13.7-30.5 30.5-30.5h55.9V260.3H800c-16.9 0-30.5-13.7-30.5-30.5v-70.2h-515v70.2c0 16.9-13.7 30.5-30.5 30.5h-41.6v495.1H224c16.9 0 30.5 13.7 30.5 30.5v47.2z" fill="#7dc5eb" p-id="9926"></path><path d="M224 822c-7.8 0-15.6-3-21.6-8.9-11.9-11.9-11.9-31.2 0-43.2l576.1-576.1c11.9-11.9 31.2-11.9 43.2 0 11.9 11.9 11.9 31.2 0 43.2L245.6 813.1c-6 5.9-13.8 8.9-21.6 8.9z" fill="#7dc5eb" p-id="9927"></path><path d="M224 967.6H72.7c-16.9 0-30.5-13.7-30.5-30.5V785.8c0-16.9 13.7-30.5 30.5-30.5H224c16.9 0 30.5 13.7 30.5 30.5V937c0 17-13.7 30.6-30.5 30.6z m-120.7-61h90.2v-90.2h-90.2v90.2zM447.2 893.2c-7.8 0-15.6-3-21.6-8.9-11.9-11.9-11.9-31.2 0-43.2L853 413.8c11.9-11.9 31.2-11.9 43.2 0 11.9 11.9 11.9 31.2 0 43.2L468.8 884.3c-6 5.9-13.8 8.9-21.6 8.9zM155.1 566.2c-7.8 0-15.6-3-21.6-8.9-11.9-11.9-11.9-31.2 0-43.2l383.7-383.7c11.9-11.9 31.2-11.9 43.2 0 11.9 11.9 11.9 31.2 0 43.2L176.6 557.2c-5.9 6-13.7 9-21.5 9zM224 260.3H72.7c-16.9 0-30.5-13.7-30.5-30.5V78.5C42.2 61.6 55.9 48 72.7 48H224c16.9 0 30.5 13.7 30.5 30.5v151.2c0 16.9-13.7 30.6-30.5 30.6z m-120.7-61.1h90.2V109h-90.2v90.2zM951.3 260.3H800c-16.9 0-30.5-13.7-30.5-30.5V78.5c0-16.9 13.7-30.5 30.5-30.5h151.2c16.9 0 30.5 13.7 30.5 30.5v151.2c0.1 16.9-13.6 30.6-30.4 30.6z m-120.7-61.1h90.2V109h-90.2v90.2zM951.3 967.6H800c-16.9 0-30.5-13.7-30.5-30.5V785.8c0-16.9 13.7-30.5 30.5-30.5h151.2c16.9 0 30.5 13.7 30.5 30.5V937c0.1 17-13.6 30.6-30.4 30.6z m-120.7-61h90.2v-90.2h-90.2v90.2z" fill="#7dc5eb" p-id="9928"></path></svg>

src/assets/img/sunset.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="20px" viewBox="0 0 22 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>日出-亮/暗</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理系统-亮--风力+日出-效果" transform="translate(-972.000000, -211.000000)" fill-rule="nonzero">
+            <g id="形状" transform="translate(972.000000, 211.000000)">
+                <path d="M21.0489583,18.0898438 L0.916666667,18.0898438 C0.4125,18.0898438 0,18.546875 0,19.0273438 C0,19.578125 0.4125,20 0.916666667,20 L21.0489583,20 C21.5875,20 22,19.578125 22,19.0273438 C22,18.546875 21.5875,18.0898438 21.0489583,18.0898438 Z M8.67395833,4.7265625 L9.77777778,3.85078125 L9.77777778,7.5 C9.77777778,8.19101563 10.3251042,8.75 11,8.75 C11.6748958,8.75 12.2222222,8.19101563 12.2222222,7.5 L12.2222222,3.85078125 L13.2916667,4.7265625 C13.8176042,5.15742188 14.5872222,5.06835938 15.0092708,4.53125 C15.4313194,3.99179688 15.3458403,3.20546875 14.8182986,2.7734375 L11.7627431,0.2734375 C11.7070174,0.228046875 11.6418194,0.205234375 11.5809375,0.171054688 C11.5325833,0.143664063 11.4898438,0.11109375 11.4377847,0.0905078125 C11.2979167,0.0346367188 11.1489583,0 11,0 C10.8510417,0 10.7020833,0.0346367188 10.5607639,0.09046875 C10.5111111,0.11109375 10.4652778,0.143671875 10.4194444,0.171054688 C10.3583333,0.205234375 10.2934028,0.228046875 10.2361111,0.2734375 L7.18055556,2.7734375 C6.65347222,3.20546875 6.53506944,3.9921875 6.98958333,4.53125 C7.40972222,5.0703125 8.18125,5.15625 8.67395833,4.7265625 Z" fill="#2C79FF"></path>
+                <path d="M10.9159722,15 C9.56274306,15 8.39628472,15.7582031 7.76416667,16.8753906 L14.06625,16.8753906 C13.4368056,15.7578125 12.271875,15 10.9159722,15 Z M20.2163194,14.2695313 L16.053125,13.5 L15.3006944,9.23828125 C15.2252604,8.81132813 14.7434375,8.60703125 14.3947222,8.85445313 L10.9186458,11.3216406 L7.44256944,8.85445313 C7.09270833,8.609375 6.61145833,8.8125 6.53506944,9.23828125 L5.78263889,13.4960938 L1.6190625,14.2695313 C1.20159722,14.3467578 1.00184028,14.8398438 1.24376389,15.1960938 L2.38386806,16.8765625 L6.41338194,16.8765625 C7.13869444,15.0488281 8.86890278,13.7511719 10.9165069,13.7511719 C12.9641111,13.7511719 14.6939375,15.0492188 15.4196319,16.8765625 L19.4491458,16.8765625 L20.58925,15.1960938 C20.83125,14.8398438 20.6326389,14.3476563 20.2163194,14.2695313 Z" fill="#F46C6C" opacity="0.999977766"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/img/water.svg

@@ -0,0 +1,3 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1665713375353" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5363" width="200" height="200"><path d="M512 921.6c-150.826667 0-273.066667-128.384-273.066667-286.72 0-105.557333 91.008-283.050667 273.066667-532.48 182.058667 249.429333 273.066667 426.922667 273.066667 532.48 0 158.336-122.24 286.72-273.066667 286.72z m-214.570667-286.72c0 124.416 96.085333 225.28 214.570667 225.28a20.010667 20.010667 0 0 0 19.498667-20.48 20.010667 20.010667 0 0 0-19.498667-20.48c-96.938667 0-175.530667-82.517333-175.530667-184.32a20.693333 20.693333 0 0 0-9.770666-17.749333 18.688 18.688 0 0 0-19.498667 0 20.693333 20.693333 0 0 0-9.770667 17.749333z" fill="#0095FF" p-id="5364"></path></svg>

src/assets/img/water1.svg

@@ -0,0 +1,3 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1665713375353" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5363" width="200" height="200"><path d="M512 921.6c-150.826667 0-273.066667-128.384-273.066667-286.72 0-105.557333 91.008-283.050667 273.066667-532.48 182.058667 249.429333 273.066667 426.922667 273.066667 532.48 0 158.336-122.24 286.72-273.066667 286.72z m-214.570667-286.72c0 124.416 96.085333 225.28 214.570667 225.28a20.010667 20.010667 0 0 0 19.498667-20.48 20.010667 20.010667 0 0 0-19.498667-20.48c-96.938667 0-175.530667-82.517333-175.530667-184.32a20.693333 20.693333 0 0 0-9.770666-17.749333 18.688 18.688 0 0 0-19.498667 0 20.693333 20.693333 0 0 0-9.770667 17.749333z" fill="#0095FF" p-id="5364"></path></svg>

src/assets/img/windPowerIcon.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="17px" height="22px" viewBox="0 0 17 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>风力-亮/暗</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理系统-亮--风力+日出-效果" transform="translate(-802.000000, -209.000000)" fill-rule="nonzero">
+            <g id="编组" transform="translate(802.000000, 209.000000)">
+                <path d="M16.952323,18.2968774 L13.1958104,10.4636051 C12.9437605,9.87922497 12.9325781,9.25617259 13.1647506,8.62495608 L16.2805089,0.929184978 C16.417291,0.580662368 16.24862,0.186248728 15.9037521,0.047888131 C15.617815,-0.0667535066 15.2914852,0.0295918756 15.1112066,0.281769103 L10.2599055,7.01318403 C9.89033439,7.52967297 9.33215105,7.87600415 8.70925451,7.97569253 L0.566529766,9.27765716 C0.234927707,9.33351702 -0.00684119003,9.62570711 0.000147709428,9.96516323 C0.00794250478,10.3059084 0.264512104,10.5963797 0.599813275,10.6329035 L8.66557947,11.5150597 C9.29272787,11.5835525 9.86715328,11.8631097 10.2613001,12.3993644 L15.8014653,18.9951258 C16.0124848,19.2610617 16.38567,19.3277928 16.6743708,19.1510608 C16.9268119,18.9757897 17.0841305,18.6062552 16.952323,18.2968774 Z M10.8466613,10.6569662 C10.2828655,10.6569662 9.82621644,10.1954778 9.82621644,9.66437932 C9.82621644,9.09460866 10.2828655,8.67179243 10.8466613,8.67179243 C11.4100319,8.67179243 11.8288395,9.13328088 11.8288395,9.66437932 C11.8671061,10.1971965 11.4504245,10.6569662 10.8466613,10.6569662 Z" id="形状" fill="#2C79FF"></path>
+                <path d="M16.2932857,21.5023745 C16.31696,21.5500273 16.329265,21.6027074 16.329265,21.6561181 C16.3294307,21.8459557 16.1771336,22 15.9892441,22 L5.74443702,22 C5.69235182,21.9996648 5.6406918,21.9871522 5.59409148,21.9636567 C5.42605823,21.8786208 5.35802857,21.6721971 5.44217275,21.502598 C5.70799864,20.9654838 6.2508753,20.6260277 6.84528443,20.6251683 L8.90020525,20.6251683 L9.43934028,11.7649338 C9.77519419,11.9202586 10.0473128,12.1308074 10.2641574,12.4015129 L12.4934042,15.055716 L12.8326596,20.6245152 L14.8875804,20.6245152 C15.4811817,20.5871321 16.0254189,20.9652604 16.2932857,21.5023745 Z" id="路径" fill="#999999"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/water.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1665456354407" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9524" width="40" height="40" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M505.856 918.016c-177.664 0-322.56-144.896-322.56-322.56 0-220.16 225.28-423.936 293.888-480.768 16.384-13.824 40.448-13.824 56.832 0 69.12 57.344 293.888 260.608 293.888 480.768 0.512 178.176-143.872 322.56-322.048 322.56z m0-755.712c-57.344 48.64-267.776 240.128-267.776 433.664 0 147.968 120.32 267.776 267.776 267.776s267.776-120.32 267.776-267.776c0.512-194.048-210.432-385.536-267.776-433.664z" fill="#000000" p-id="9525"></path><path d="M453.632 800.768c-2.56 0-5.632-0.512-8.192-1.024-79.872-25.6-139.776-92.16-156.672-174.08-3.072-14.848 6.656-29.184 20.992-32.256 14.848-3.072 29.184 6.656 32.256 20.992 12.8 62.464 58.88 113.664 119.808 132.608 14.336 4.608 22.528 19.968 17.92 34.304-4.096 11.776-14.848 19.456-26.112 19.456z" fill="#000000" p-id="9526"></path></svg>

src/assets/water1.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1665456354407" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9524" width="40" height="40" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M505.856 918.016c-177.664 0-322.56-144.896-322.56-322.56 0-220.16 225.28-423.936 293.888-480.768 16.384-13.824 40.448-13.824 56.832 0 69.12 57.344 293.888 260.608 293.888 480.768 0.512 178.176-143.872 322.56-322.048 322.56z m0-755.712c-57.344 48.64-267.776 240.128-267.776 433.664 0 147.968 120.32 267.776 267.776 267.776s267.776-120.32 267.776-267.776c0.512-194.048-210.432-385.536-267.776-433.664z" fill="#ffffff" p-id="9525"></path><path d="M453.632 800.768c-2.56 0-5.632-0.512-8.192-1.024-79.872-25.6-139.776-92.16-156.672-174.08-3.072-14.848 6.656-29.184 20.992-32.256 14.848-3.072 29.184 6.656 32.256 20.992 12.8 62.464 58.88 113.664 119.808 132.608 14.336 4.608 22.528 19.968 17.92 34.304-4.096 11.776-14.848 19.456-26.112 19.456z" fill="#ffffff" p-id="9526"></path></svg>

src/i18n/lang/zh-cn.ts

@@ -1,7 +1,7 @@
 // 定义内容
 export default {
 	router: {
-		home: '数据概览',
+		home: '首页',
 		system: '系统设置',
 		systemMenu: '菜单管理',
 		systemRole: '角色管理',

src/views/developTool/codeGeneration/index.vue

@@ -29,11 +29,11 @@
       <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="ID" align="center" prop="tableId" width="60" />
-	    	<el-table-column label="表名称" prop="tableName" :show-overflow-tooltip="true" />
-	    	<el-table-column label="表描述" prop="tableComment" :show-overflow-tooltip="true" />
-	    	<el-table-column label="模型名称" prop="className" :show-overflow-tooltip="true" />
-	    	<el-table-column label="创建时间" prop="createTime" min-width="100"/>
-	    	<el-table-column label="更新时间" prop="updateTime" min-width="100"/>
+	    	<el-table-column label="表名称" prop="tableName" min-width="120" :show-overflow-tooltip="true" />
+	    	<el-table-column label="表描述" prop="tableComment" min-width="120" :show-overflow-tooltip="true" />
+	    	<el-table-column label="模型名称" prop="className" min-width="120" :show-overflow-tooltip="true" />
+	    	<el-table-column label="创建时间" prop="createTime" width="180"/>
+	    	<el-table-column label="更新时间" prop="updateTime" width="180"/>
 				<el-table-column label="操作" width="280" align="center" fixed="right">
           <template #default="scope">
 			 			<el-button size="small" text type="primary" @click="operate('preview', scope.row)">预览</el-button>

src/views/energyAnalysis/analysisReport/index.vue

@@ -23,7 +23,9 @@ import { ref, reactive, watch, nextTick, onMounted } from 'vue';
 import * as echarts from 'echarts';
 import { useStore } from '/@/store/index';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
-import api from '/@/api/heatingDistrict';
+import api from '/@/api/energyAnalysis';
+import heatApi from '/@/api/heatStation';
+import datahubApi from '/@/api/datahub';
 
 let global: any = {
 	lineChart: null,
@@ -38,10 +40,59 @@ const state = reactive({
 		bgColor: '',
 		color: '#303133',
 	},
+	heatList: []
 })
 const lineChartRef = ref()
 const checkList = ref([])
 
+
+// 获取供热监测数据
+const getStatisticsChartData = () => {
+	api.statistics.getStatisticsChartData({tableNo:17}).then((res:any) => {
+		console.log(res)
+		const data = res.Info
+		// "huanLuNo": "D00140-4", //换热站编号
+		// "huanLuName": "8#楼高区", //换热站名称
+		// "inPressure1": 0, //一网供水压力
+		// "inPressure2": 0, //二网供水压力
+		// "inTemperature1": 0, //一网供水温度
+		// "inTemperature2": 0, //二网供水温度
+		// "outPressure1": 0, //一网回水压力
+		// "outPressure2": 0, //二网回水压力
+		// "outTemperature1": 0, //一网回水温度
+		// "outTemperature2": 0 //二网回水温度
+
+		// <el-checkbox label="一网供水温度" />
+		// <el-checkbox label="一网回水温度" />
+		// <el-checkbox label="二网供回水温差" />
+		// <el-checkbox label="二网供回水压差" />
+		// <el-checkbox label="压力值" />
+		// state.statisticsChartXAxisData = [];
+		// state.inTemperature1 = [];
+		// state.outTemperature1 = [];
+		// data.forEach((i:object) => {
+		// 	state.statisticsChartXAxisData.push(i.huanLuName);
+		// 	state.inTemperature1.push(i.inTemperature1);
+		// 	state.outTemperature1.push(i.outTemperature1);
+		// });
+
+		// nextTick(() => {
+		// 	initBarChart();
+		// });
+
+	});
+};
+const queryTree = () => {
+	heatApi.heatStation.getList({
+		name: '',
+		code: '',
+		status: -1
+	})
+	.then((res: any) => {
+		state.heatList = res || [];
+	});
+};
+
 // 初始化图标
 const initLineChart = () => {
 	if (!global.dispose.some((b: any) => b === global.lineChart)) global.lineChart.dispose();
@@ -104,6 +155,8 @@ const initEchartsResize = () => {
 };
 // 页面加载时
 onMounted(() => {
+	queryTree()
+	getStatisticsChartData()
 	initEchartsResize();
 });
 

src/views/energyAnalysis/heatStationWaterAnalysis/index.vue

@@ -2,8 +2,8 @@
   <div class="system-dic-container">
     <el-card shadow="hover">
       <div class="system-user-search mb15">
-        <el-form :model="searchParams" ref="queryRef" :inline="true" label-width="120px">
-          <el-form-item label="环路名称" prop="plotId">
+        <el-form :model="state.param" ref="queryRef" :inline="true" label-width="120px">
+          <!-- <el-form-item label="环路名称" prop="plotId">
             <el-select v-model="searchParams.plotId" placeholder="选择环路名称" filterable clearable size="default">
 							<el-option
 								v-for="item in []"
@@ -12,10 +12,10 @@
 								:value="item.id">
 							</el-option>
 						</el-select>
-          </el-form-item>
-					<el-form-item label="所属换热站" prop="heatStaId">
+          </el-form-item> -->
+					<el-form-item label="所属换热站" prop="stationId">
 						<el-tree-select
-							v-model="searchParams.heatStaId"
+							v-model="state.param.stationId"
 							:data="state.heatList"
 							:props="{
 								label: 'name',
@@ -30,8 +30,8 @@
 							:render-after-expand="true"
 						/>
 					</el-form-item>
-          <el-form-item label="负责人" prop="plotId">
-            <el-select v-model="searchParams.plotId" placeholder="选择负责人" filterable clearable size="default">
+          <el-form-item label="负责人" prop="principal">
+            <el-select v-model="state.param.principal" placeholder="选择负责人" filterable clearable size="default">
 							<el-option
 								v-for="item in []"
 								:key="item.id"
@@ -40,31 +40,25 @@
 							</el-option>
 						</el-select>
           </el-form-item>
-          <el-form-item label="时间间隔(秒)" prop="plotId">
-            <el-input-number v-model="searchParams.xx"></el-input-number>
+          <el-form-item label="时间间隔(秒)" prop="interval">
+            <el-input-number v-model="state.param.interval"></el-input-number>
           </el-form-item>
-          <el-form-item label="流量限值" prop="plotId">
-            <el-input-number v-model="searchParams.xx"></el-input-number>
+          <el-form-item label="流量限值" prop="flow">
+            <el-input-number v-model="state.param.flow"></el-input-number>
           </el-form-item>
           <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="queryList">
+            <el-button size="default" type="primary" class="ml10" @click="initPage">
               <el-icon>
                 <ele-Search />
               </el-icon>
               查询
             </el-button>
-            <el-button size="default" @click="resetQuery(queryRef)">
+            <!-- <el-button size="default" @click="resetQuery(queryRef)">
               <el-icon>
                 <ele-Refresh />
               </el-icon>
               重置
-            </el-button>
-            <el-button size="default" type="success" class="ml10" @click="onOpenDialog()">
-              <el-icon>
-                <ele-FolderAdd />
-              </el-icon>
-              导入
-            </el-button>
+            </el-button> -->
           </el-form-item>
         </el-form>
       </div>
@@ -80,7 +74,7 @@ import { toRefs, reactive, onMounted, ref, watch, nextTick } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import * as echarts from 'echarts';
 import { useStore } from '/@/store/index';
-import api from '/@/api/heatingDistrict';
+import api from '/@/api/energyAnalysis';
 import heatApi from '/@/api/heatStation';
 
 let global: any = {
@@ -92,9 +86,6 @@ let global: any = {
 const queryRef = ref();
 const barChartRef = ref();
 const lineChartRef = ref();
-const searchParams = ref({
-
-})
 const store = useStore();
 const state = reactive({
 	myCharts: [],
@@ -103,23 +94,40 @@ const state = reactive({
 		bgColor: '',
 		color: '#303133',
 	},
-	
+	param: {
+		stationId: '',
+		principal: '',
+		interval: '',
+		flow: ''
+	},
 	heatList: []
 });
 
 const queryTree = () => {
 	heatApi.heatStation.getList({
-			name: '',
-			code: '',
-			status: -1
-		})
-		.then((res: any) => {
-			state.heatList = res || [];
-		});
+		name: '',
+		code: '',
+		status: -1
+	})
+	.then((res: any) => {
+		state.heatList = res || [];
+	});
+};
+
+const queryLineChart = () => {
+	api.getEnergyWaterLossLineChart(state.param).then((res: any) => {
+		console.log(res);
+	});
+};
+const queryChart = () => {
+	api.getEnergyWaterLossList(state.param).then((res: any) => {
+		console.log(res);
+	});
 };
 // 页面加载时
 onMounted(() => {
 	queryTree()
+	// queryLineChart()
 });
 /** 重置按钮操作 */
 const resetQuery = (formEl: FormInstance | undefined) => {
@@ -127,6 +135,14 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	formEl.resetFields();
 	// queryList();
 };
+const initPage = () => {
+	if (!state.param.stationId) {
+		ElMessage.warning('请选择换热站')
+		return
+	}
+	queryChart()
+	// queryLineChart()
+}
 
 
 // 初始化图表
@@ -254,10 +270,10 @@ watch(
 			state.charts.theme = isIsDark ? 'transparent' : '';
 			state.charts.bgColor = isIsDark ? 'transparent' : '';
 			state.charts.color = isIsDark ? '#dadada' : '#303133';
-			setTimeout(() => {
-				initBarChart();
-				initLineChart();
-			}, 500)
+			// setTimeout(() => {
+				// initBarChart();
+				// initLineChart();
+			// }, 500)
 		});
 	},
 	{

src/views/heatStation/heatStation/component/edit.vue

@@ -38,7 +38,7 @@
 					<el-radio v-model="ruleForm.status" :label="1">在线</el-radio>
 					<el-radio v-model="ruleForm.status" :label="0">不在线</el-radio>
 				</el-form-item>
-				<el-form-item label="数据模型" prop="dataTemplateIds">
+				<!-- <el-form-item label="数据模型" prop="dataTemplateIds">
 					<el-select v-model="ruleForm.dataTemplateIds" multiple clearable style="width: 100%;" placeholder="请选择">
 						<el-option
 							v-for="item in dataHubList"
@@ -47,7 +47,7 @@
 							:value="item.id">
 						</el-option>
 					</el-select>
-				</el-form-item>
+				</el-form-item> -->
         <el-form-item label="地图展示" prop="decade">
 					<div>
 						<span>经度：{{ ruleForm.lnt ? `${ruleForm.lnt}，` : '' }}</span>
@@ -122,7 +122,7 @@ export default defineComponent({
 		// 打开弹窗
 		const openDialog = (row: any, tree: any) => {
 			resetForm()
-			queryDataHubList()
+			// queryDataHubList()
 			queryUserList()
 			state.treeData = tree
 
@@ -136,12 +136,12 @@ export default defineComponent({
 			state.dialogVisible = true
 		}
 		
-		const queryDataHubList = () => {
-			datahubApi.template.allList({})
-				.then((res: any) => {
-					state.dataHubList = res.list || [];
-				});
-		};
+		// const queryDataHubList = () => {
+		// 	datahubApi.template.allList({})
+		// 		.then((res: any) => {
+		// 			state.dataHubList = res.list || [];
+		// 		});
+		// };
 		const queryUserList = () => {
 			userApi.user.getAllList({})
 				.then((res: any) => {

src/views/heatStation/loop/component/edit.vue

@@ -71,7 +71,7 @@
 					<el-radio v-model="ruleForm.status" :label="1">在线</el-radio>
 					<el-radio v-model="ruleForm.status" :label="0">不在线</el-radio>
 				</el-form-item>
-				<el-form-item label="数据模型" prop="dataTemplateIds">
+				<!-- <el-form-item label="数据模型" prop="dataTemplateIds">
 					<el-select v-model="ruleForm.dataTemplateIds" multiple clearable style="width: 100%;" placeholder="请选择">
 						<el-option
 							v-for="item in dataHubList"
@@ -80,7 +80,7 @@
 							:value="item.id">
 						</el-option>
 					</el-select>
-				</el-form-item>
+				</el-form-item> -->
         <el-form-item label="编辑路线信息" prop="">
 					<div class="mb10">
 						<el-button type="primary" @click="onAddPoint">添加途经点</el-button>
@@ -180,7 +180,7 @@ export default defineComponent({
 		const openDialog = (row: RuleFormState | null) => {
 			resetForm()
 			queryTree()
-			queryDataHubList()
+			// queryDataHubList()
 			nextTick(() => {
 				initMap()
 			})
@@ -227,12 +227,12 @@ export default defineComponent({
 					state.treeData = res || [];
 				});
 		};
-		const queryDataHubList = () => {
-			datahubApi.template.allList({})
-				.then((res: any) => {
-					state.dataHubList = res.list || [];
-				});
-		};
+		// const queryDataHubList = () => {
+		// 	datahubApi.template.allList({})
+		// 		.then((res: any) => {
+		// 			state.dataHubList = res.list || [];
+		// 		});
+		// };
 		const getDetail = () => {
 			api.loop.detail(state.ruleForm.id)
 				.then((res: any) => {

src/views/home/index.vue

@@ -29,13 +29,6 @@
 				</div>
 			</el-col>
 		</el-row>
-		<el-row :gutter="15" class="home-card-two mb15">
-			<el-col >
-				<div class="home-card-item">
-					<div style="height: 100%" ref="homeBarRef"></div>
-				</div>
-			</el-col>
-		</el-row>
 		<el-row :gutter="15" class="home-card-three">
 			<el-col :xs="24" :sm="10" :md="14" :lg="16" :xl="16">
 				<div class="home-card-item">
@@ -56,19 +49,6 @@
 						<div @click="changeLineType('water', '总失水量')" :class="lineType == 'water' ? 'active' : ''">总失水量</div>
 					</div>
 					<div style="height: 100%" ref="homeLineRef"></div>
-					<!-- <div class="home-monitor">
-						<div class="flex-warp">
-							<div class="flex-warp-item" v-for="(v, k) in homeThree" :key="k">
-								<div class="flex-warp-item-box" :class="`home-animation${k}`">
-									<div class="flex-margin">
-										<i :class="v.icon" :style="{ color: v.iconColor }"></i>
-										<span class="pl5">{{ v.label }}</span>
-										<div class="mt10">{{ v.value }}</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div> -->
 				</div>
 			</el-col>
 			<el-col :xs="24" :sm="10" :md="10" :lg="8" :xl="8" class="home-media">
@@ -89,7 +69,14 @@
 				</div>
 			</el-col> -->
 		</el-row>
-	</div>
+    <el-row :gutter="15" class="home-card-two mb15">
+      <el-col >
+        <div class="home-card-item">
+          <div style="height: 100%" ref="homeBarRef"></div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script lang="ts">
@@ -97,17 +84,17 @@ import { toRefs, reactive, defineComponent, onMounted, ref, watch, nextTick, onA
 import * as echarts from 'echarts';
 import { useStore } from '/@/store/index';
 
-import ele from '/@/assets/ele.svg';
-import ele1 from '/@/assets/ele1.svg';
+import ele from '/@/assets/img/ele.svg';
+import ele1 from '/@/assets/img/ele1.svg';
 
-import fire from '/@/assets/fire.svg';
-import fire1 from '/@/assets/fire1.svg';
+import fire from '/@/assets/img/fire.svg';
+import fire1 from '/@/assets/img/fire1.svg';
 
-import map from '/@/assets/map.svg';
-import map1 from '/@/assets/map1.svg';
+import map from '/@/assets/img/map.svg';
+import map1 from '/@/assets/img/map1.svg';
 
-import water from '/@/assets/water.svg';
-import water1 from '/@/assets/water1.svg';
+import water from '/@/assets/img/water.svg';
+import water1 from '/@/assets/img/water1.svg';
 
 
 import api from '/@/api/datahub';
@@ -176,63 +163,7 @@ export default defineComponent({
 					contentTitle2: '总单耗',
 					val2: '',
 					unit2: 'T/㎡',
-					
-				},
-			],
-			homeThree: [
-				{
-					icon: 'iconfont icon-yangan',
-					label: '产品管理',
-					value: '2.1%OBS/M',
-					iconColor: '#F72B3F',
-				},
-				{
-					icon: 'iconfont icon-wendu',
-					label: '设备接入',
-					value: '30℃',
-					iconColor: '#91BFF8',
-				},
-				{
-					icon: 'iconfont icon-shidu',
-					label: '日志查看',
-					value: '57%RH',
-					iconColor: '#88D565',
-				},
-				{
-					icon: 'iconfont icon-shidu',
-					label: '用户管理',
-					value: '107w',
-					iconColor: '#88D565',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '预警管理',
-					value: '57DB',
-					iconColor: '#FBD4A0',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '预警历史',
-					value: '57PV',
-					iconColor: '#FBD4A0',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '预警分析',
-					value: '517Cpd',
-					iconColor: '#FBD4A0',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '转发设置',
-					value: '12kg',
-					iconColor: '#FBD4A0',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '模拟设备',
-					value: '64fm',
-					iconColor: '#FBD4A0',
+
 				},
 			],
 			myCharts: [],
@@ -285,7 +216,7 @@ export default defineComponent({
 
 			});
 		};
-		
+
 		// 获取供热监测数据
 		const getStatisticsChartData = () => {
 			api.statistics.getStatisticsChartData({tableNo:17}).then((res:any) => {
@@ -390,7 +321,7 @@ export default defineComponent({
 						}
 					},
 
-					
+
 				]
 			};
 			(<any>global.homeChartOne).setOption(option);
@@ -450,7 +381,7 @@ export default defineComponent({
 				// 	x: 'left',
 				// 	textStyle: { fontSize: '15', color: state.charts.color },
 				// },
-				//  '{b0}: {c0}<br />{b1}: {c1}', 
+				//  '{b0}: {c0}<br />{b1}: {c1}',
 				grid: { top: 80, bottom: 10 },
 				tooltip: { trigger: 'item', formatter: '{b} <br/> {d}% <br/>' },
 				// graphic: {
@@ -730,9 +661,9 @@ export default defineComponent({
 						initLineChart();
 						initPieChart();
 						initBarChart();
-						
+
 					}, 1000);
-					
+
 				});
 			},
 			{
@@ -936,7 +867,7 @@ $homeNavLengh: 8;
 		width: 33%;
 		text-align: center;
 		padding: 6px 0;
-		
+
 		color: rgba(22, 132, 252, 1);
 	}
 	div:nth-child(2) {

src/views/iotmanager/dashboard.vue

@@ -149,7 +149,7 @@ export default defineComponent({
 					num1: '653,33',
 					num2: '+42.32',
 					num3: '今日设备消息量',
-					num4: 'icon-ditu',
+					num4: 'icon-shidu',
 					color1: '#6690F9',
 					color2: '--el-color-success-lighter',
 					color3: '--el-color-success',
@@ -163,71 +163,6 @@ export default defineComponent({
 					color2: '--el-color-warning-lighter',
 					color3: '--el-color-warning',
 				},
-				// {
-				// 	num1: '520,43',
-				// 	num2: '-10.01',
-				// 	num3: '访问统计信息',
-				// 	num4: 'icon-skin',
-				// 	color1: '#FF6462',
-				// 	color2: '--el-color-danger-lighter',
-				// 	color3: '--el-color-danger',
-				// },
-			],
-			homeThree: [
-				{
-					icon: 'iconfont icon-yangan',
-					label: '产品管理',
-					value: '2.1%OBS/M',
-					iconColor: '#F72B3F',
-				},
-				{
-					icon: 'iconfont icon-wendu',
-					label: '设备接入',
-					value: '30℃',
-					iconColor: '#91BFF8',
-				},
-				{
-					icon: 'iconfont icon-shidu',
-					label: '日志查看',
-					value: '57%RH',
-					iconColor: '#88D565',
-				},
-				{
-					icon: 'iconfont icon-shidu',
-					label: '用户管理',
-					value: '107w',
-					iconColor: '#88D565',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '预警管理',
-					value: '57DB',
-					iconColor: '#FBD4A0',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '预警历史',
-					value: '57PV',
-					iconColor: '#FBD4A0',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '预警分析',
-					value: '517Cpd',
-					iconColor: '#FBD4A0',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '转发设置',
-					value: '12kg',
-					iconColor: '#FBD4A0',
-				},
-				{
-					icon: 'iconfont icon-zaosheng',
-					label: '模拟设备',
-					value: '64fm',
-					iconColor: '#FBD4A0',
-				},
 			],
 			myCharts: [],
 			charts: {

src/views/monitor/weather.vue

@@ -24,13 +24,13 @@
 							<img :src="weatherObj[oneCityInfo.weather]" alt="">
 							<span class="weather">{{oneCityInfo.weather}}</span>
 							<span>{{oneCityInfo.reporttime}}更新</span>
-							
+
 						</section>
 						<section>
 							<span style="margin-right: 20px;">地点：{{currentcityName}}</span>
-							<img src="../../assets/windPowerIcon.png" alt="">
+							<img src="../../assets/img/windPowerIcon.svg" alt="">
 							<span>风力: {{oneCityInfo.winddirection+oneCityInfo.windpower}}</span>
-							<img class="sunset-sunrise" src="../../assets/sunset.png" alt="">
+							<img class="sunset-sunrise" src="../../assets/img/sunset.svg" alt="">
 							<span class="sunset">日出时间: {{oneCityInfo.sunrise}}</span>
 							<span>日落时间: {{oneCityInfo.sunset}}</span>
 						</section>
@@ -301,7 +301,7 @@ export default defineComponent({
 		const initTemLineChart = () => {
 			if (!global.dispose.some((b: any) => b === global.homeChartOne)) global.homeChartOne.dispose();
 			global.homeChartOne = <any>echarts.init(homeTemLineRef.value, state.charts.theme);
-			
+
 			const option = {
 				backgroundColor: state.charts.bgColor,
 				grid: { top: 70, right: 40, bottom: 30, left: 40 },
@@ -555,7 +555,7 @@ $homeNavLengh: 8;
 			}
 			section {
 				padding: 20px 0;
-				
+
 				span {
 					display: inline-block;
 					width: 33%;