Przeglądaj źródła

fix:空调模块的整体样式调整

chenzhen2 1 rok temu
rodzic
commit
715d17d874
33 zmienionych plików z 366 dodań i 341 usunięć
  1. 1 1
      dist/sgipad/static/css/app.f4c8d81e.css
  2. 1 1
      dist/sgipad/static/css/chunk-11b0dfc6.ecddd05c.css
  3. 1 1
      dist/sgipad/static/css/chunk-1da1883e.23b28e4c.css
  4. 1 1
      dist/sgipad/static/css/chunk-3709b7d9.6512740d.css
  5. 1 1
      dist/sgipad/static/css/chunk-389e18b8.4769a17d.css
  6. 1 1
      dist/sgipad/static/css/chunk-71c2738e.5d591bf9.css
  7. 1 1
      dist/sgipad/static/css/chunk-c761207a.d550c18c.css
  8. 1 1
      dist/sgipad/static/css/chunk-d71ea880.ce74a88f.css
  9. 21 21
      public/images/page-officehome/air_close.svg
  10. 2 2
      public/images/page-officehome/lightColorControl.svg
  11. 74 74
      public/images/page-officehome/openair.svg
  12. 1 1
      src/components/header/Index.vue
  13. 0 10
      src/styles/font.scss
  14. 9 9
      src/views/envmonitor/components/Air/ChildAirControl.vue
  15. 3 3
      src/views/envmonitor/components/Air/index.vue
  16. 83 83
      src/views/envmonitor/components/Air/manualIndex.vue
  17. 3 3
      src/views/envmonitor/components/Air/manualIndexOld.vue
  18. 1 1
      src/views/envmonitor/components/Contact/index.vue
  19. 3 2
      src/views/envmonitor/components/FloorHeating/index.vue
  20. 2 2
      src/views/envmonitor/components/ManualWork/WorkConfig.vue
  21. 1 1
      src/views/envmonitor/components/ManualWork/index.vue
  22. 2 2
      src/views/envmonitor/components/Map/MapBox.vue
  23. 19 1
      src/views/envmonitor/components/Socket/index.vue
  24. 2 2
      src/views/envmonitor/components/workOvertime/WorkConfig.vue
  25. 5 5
      src/views/envmonitor/index.vue
  26. 2 2
      src/views/envmonitor/index1.vue
  27. 2 2
      src/views/home/index.vue
  28. 2 2
      src/views/portrait/common/index.scss
  29. 1 1
      src/views/portrait/energyDetail.vue
  30. 2 2
      src/views/portrait/energyRank.vue
  31. 2 2
      src/views/portrait/energySavig.vue
  32. 115 99
      src/views/portrait/index.vue
  33. 1 1
      src/views/portrait/todayEnergyDetail.vue

Plik diff jest za duży
+ 1 - 1
dist/sgipad/static/css/app.f4c8d81e.css


Plik diff jest za duży
+ 1 - 1
dist/sgipad/static/css/chunk-11b0dfc6.ecddd05c.css


Plik diff jest za duży
+ 1 - 1
dist/sgipad/static/css/chunk-1da1883e.23b28e4c.css


Plik diff jest za duży
+ 1 - 1
dist/sgipad/static/css/chunk-3709b7d9.6512740d.css


Plik diff jest za duży
+ 1 - 1
dist/sgipad/static/css/chunk-389e18b8.4769a17d.css


Plik diff jest za duży
+ 1 - 1
dist/sgipad/static/css/chunk-71c2738e.5d591bf9.css


Plik diff jest za duży
+ 1 - 1
dist/sgipad/static/css/chunk-c761207a.d550c18c.css


Plik diff jest za duży
+ 1 - 1
dist/sgipad/static/css/chunk-d71ea880.ce74a88f.css


+ 21 - 21
public/images/page-officehome/air_close.svg

@@ -1,18 +1,18 @@
 <svg width="132" height="65" viewBox="0 0 132 65" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.2979 30.6653C9.97547 28.4084 11.7267 26.3892 14.0065 26.3892H117.549C119.899 26.3892 121.668 28.5279 121.229 30.8364L120.239 36.0329C119.566 39.5668 116.476 42.1236 112.879 42.1236H18.4331C14.7044 42.1236 11.5431 39.3818 11.0158 35.6906L10.2979 30.6653Z" fill="url(#paint0_linear_4206_13304)"/>
-<path d="M14.1826 33.6677C14.1826 32.5446 15.0931 31.6342 16.2161 31.6342H115.385C116.597 31.6342 117.58 32.617 117.58 33.8295C117.58 35.5732 117.061 37.2774 116.089 38.725L115.984 38.8813C115.567 39.503 114.867 39.876 114.118 39.876H17.7765C16.9564 39.876 16.2014 39.4294 15.8065 38.7106L15.1878 37.5845C14.5284 36.3843 14.1826 35.0371 14.1826 33.6677Z" fill="url(#paint1_linear_4206_13304)" stroke="#ECECEC" stroke-width="0.728579"/>
-<line x1="16.4302" y1="35.757" x2="114.395" y2="35.757" stroke="url(#paint2_radial_4206_13304)" stroke-opacity="0.7" stroke-width="0.472818"/>
-<line x1="16.4302" y1="36.7027" x2="114.395" y2="36.7027" stroke="url(#paint3_radial_4206_13304)" stroke-opacity="0.7" stroke-width="0.472818"/>
-<line x1="16.4302" y1="37.6484" x2="114.395" y2="37.6484" stroke="url(#paint4_radial_4206_13304)" stroke-opacity="0.7" stroke-width="0.472818"/>
-<line x1="16.4302" y1="38.5939" x2="114.395" y2="38.5939" stroke="url(#paint5_radial_4206_13304)" stroke-opacity="0.7" stroke-width="0.472818"/>
-<g filter="url(#filter0_i_4206_13304)">
-<path d="M9.68701 7.65803C9.68701 5.58901 11.3643 3.91174 13.4333 3.91174H118.329C120.399 3.91174 122.076 5.58902 122.076 7.65803V27.1387C122.076 31.2768 118.721 34.6313 114.583 34.6313H17.1796C13.0416 34.6313 9.68701 31.2768 9.68701 27.1387V7.65803Z" fill="url(#paint6_linear_4206_13304)"/>
+<path d="M10.9136 30.6653C10.5912 28.4084 12.3424 26.3892 14.6222 26.3892H118.164C120.514 26.3892 122.284 28.5279 121.844 30.8364L120.855 36.0329C120.181 39.5668 117.092 42.1236 113.494 42.1236H19.0488C15.3201 42.1236 12.1588 39.3818 11.6315 35.6906L10.9136 30.6653Z" fill="url(#paint0_linear_4429_24343)"/>
+<path d="M14.7983 33.6677C14.7983 32.5446 15.7088 31.6342 16.8319 31.6342H116.001C117.213 31.6342 118.196 32.617 118.196 33.8295C118.196 35.5732 117.677 37.2774 116.705 38.725L116.6 38.8813C116.182 39.503 115.483 39.876 114.734 39.876H18.3922C17.5721 39.876 16.8171 39.4294 16.4222 38.7106L15.8035 37.5845C15.1441 36.3843 14.7983 35.0371 14.7983 33.6677Z" fill="url(#paint1_linear_4429_24343)" stroke="#ECECEC" stroke-width="0.728579"/>
+<line x1="17.0459" y1="35.757" x2="115.011" y2="35.757" stroke="url(#paint2_radial_4429_24343)" stroke-opacity="0.7" stroke-width="0.472818"/>
+<line x1="17.0459" y1="36.7027" x2="115.011" y2="36.7027" stroke="url(#paint3_radial_4429_24343)" stroke-opacity="0.7" stroke-width="0.472818"/>
+<line x1="17.0459" y1="37.6484" x2="115.011" y2="37.6484" stroke="url(#paint4_radial_4429_24343)" stroke-opacity="0.7" stroke-width="0.472818"/>
+<line x1="17.0459" y1="38.5939" x2="115.011" y2="38.5939" stroke="url(#paint5_radial_4429_24343)" stroke-opacity="0.7" stroke-width="0.472818"/>
+<g filter="url(#filter0_i_4429_24343)">
+<path d="M10.3027 7.65803C10.3027 5.58901 11.98 3.91174 14.049 3.91174H118.945C121.014 3.91174 122.692 5.58902 122.692 7.65803V27.1387C122.692 31.2768 119.337 34.6313 115.199 34.6313H17.7953C13.6573 34.6313 10.3027 31.2768 10.3027 27.1387V7.65803Z" fill="url(#paint6_linear_4429_24343)"/>
 </g>
-<g filter="url(#filter1_i_4206_13304)">
-<rect x="56.8901" y="29.3867" width="20.9792" height="1.49852" fill="#A0A0A0"/>
+<g filter="url(#filter1_i_4429_24343)">
+<rect x="57.5059" y="29.3867" width="20.9792" height="1.49852" fill="#A0A0A0"/>
 </g>
 <defs>
-<filter id="filter0_i_4206_13304" x="9.68701" y="2.81174" width="112.389" height="31.8196" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_i_4429_24343" x="10.3027" y="2.81174" width="112.389" height="31.8196" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
@@ -20,42 +20,42 @@
 <feGaussianBlur stdDeviation="2.2"/>
 <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4206_13304"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4429_24343"/>
 </filter>
-<filter id="filter1_i_4206_13304" x="56.8901" y="29.3867" width="20.979" height="1.49854" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter1_i_4429_24343" x="57.5059" y="29.3867" width="20.979" height="1.49854" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset dy="-0.3"/>
 <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
 <feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4206_13304"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4429_24343"/>
 </filter>
-<linearGradient id="paint0_linear_4206_13304" x1="65.8814" y1="26.3892" x2="65.8814" y2="42.1236" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint0_linear_4429_24343" x1="66.4971" y1="26.3892" x2="66.4971" y2="42.1236" gradientUnits="userSpaceOnUse">
 <stop stop-color="#E9E9E9"/>
 <stop offset="0.916667" stop-color="#DCDCDC"/>
 </linearGradient>
-<linearGradient id="paint1_linear_4206_13304" x1="65.8815" y1="34" x2="65.8815" y2="39.876" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint1_linear_4429_24343" x1="66.4972" y1="34" x2="66.4972" y2="39.876" gradientUnits="userSpaceOnUse">
 <stop stop-color="#9A9A9A"/>
 <stop offset="1" stop-color="#CBCBCB"/>
 </linearGradient>
-<radialGradient id="paint2_radial_4206_13304" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.4125 38.4933) scale(48.9823 8712)">
+<radialGradient id="paint2_radial_4429_24343" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.0282 38.4933) scale(48.9823 8712)">
 <stop offset="0.479167" stop-color="white"/>
 <stop offset="1" stop-color="white" stop-opacity="0.03"/>
 </radialGradient>
-<radialGradient id="paint3_radial_4206_13304" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.4125 39.439) scale(48.9823 8712)">
+<radialGradient id="paint3_radial_4429_24343" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.0282 39.439) scale(48.9823 8712)">
 <stop offset="0.479167" stop-color="white"/>
 <stop offset="1" stop-color="white" stop-opacity="0.03"/>
 </radialGradient>
-<radialGradient id="paint4_radial_4206_13304" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.4125 40.3847) scale(48.9823 8712)">
+<radialGradient id="paint4_radial_4429_24343" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.0282 40.3847) scale(48.9823 8712)">
 <stop offset="0.479167" stop-color="white"/>
 <stop offset="1" stop-color="white" stop-opacity="0.03"/>
 </radialGradient>
-<radialGradient id="paint5_radial_4206_13304" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.4125 41.3302) scale(48.9823 8712)">
+<radialGradient id="paint5_radial_4429_24343" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.0282 41.3302) scale(48.9823 8712)">
 <stop offset="0.479167" stop-color="white"/>
 <stop offset="1" stop-color="white" stop-opacity="0.03"/>
 </radialGradient>
-<linearGradient id="paint6_linear_4206_13304" x1="65.8814" y1="3.91174" x2="65.8815" y2="39.051" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint6_linear_4429_24343" x1="66.4971" y1="3.91174" x2="66.4972" y2="39.051" gradientUnits="userSpaceOnUse">
 <stop stop-color="#F5F5F5"/>
 <stop offset="0.448116" stop-color="#EBEBEB"/>
 <stop offset="1" stop-color="#D1D1D1"/>

Plik diff jest za duży
+ 2 - 2
public/images/page-officehome/lightColorControl.svg


+ 74 - 74
public/images/page-officehome/openair.svg

@@ -1,49 +1,49 @@
-<svg width="132" height="76" viewBox="0 0 132 76" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.2979 30.6653C9.97547 28.4084 11.7267 26.3892 14.0065 26.3892H117.549C119.899 26.3892 121.668 28.5279 121.229 30.8364L120.239 36.0329C119.566 39.5668 116.476 42.1236 112.879 42.1236H18.4331C14.7044 42.1236 11.5431 39.3818 11.0158 35.6906L10.2979 30.6653Z" fill="url(#paint0_linear_4206_10722)"/>
-<path d="M14.1826 33.6677C14.1826 32.5446 15.0931 31.6342 16.2161 31.6342H115.385C116.597 31.6342 117.58 32.617 117.58 33.8295C117.58 35.5732 117.061 37.2774 116.089 38.725L115.984 38.8813C115.567 39.503 114.867 39.876 114.118 39.876H17.7765C16.9564 39.876 16.2014 39.4294 15.8065 38.7106L15.1878 37.5845C14.5284 36.3843 14.1826 35.0371 14.1826 33.6677Z" fill="url(#paint1_linear_4206_10722)" stroke="#ECECEC" stroke-width="0.728579"/>
-<line x1="16.4302" y1="35.757" x2="114.395" y2="35.757" stroke="url(#paint2_radial_4206_10722)" stroke-opacity="0.7" stroke-width="0.472818"/>
-<line x1="16.4302" y1="36.7027" x2="114.395" y2="36.7027" stroke="url(#paint3_radial_4206_10722)" stroke-opacity="0.7" stroke-width="0.472818"/>
-<line x1="16.4302" y1="37.6484" x2="114.395" y2="37.6484" stroke="url(#paint4_radial_4206_10722)" stroke-opacity="0.7" stroke-width="0.472818"/>
-<line x1="16.4302" y1="38.5939" x2="114.395" y2="38.5939" stroke="url(#paint5_radial_4206_10722)" stroke-opacity="0.7" stroke-width="0.472818"/>
-<g filter="url(#filter0_i_4206_10722)">
-<path d="M9.68701 7.65803C9.68701 5.58901 11.3643 3.91174 13.4333 3.91174H118.329C120.399 3.91174 122.076 5.58902 122.076 7.65803V27.1387C122.076 31.2768 118.721 34.6313 114.583 34.6313H17.1796C13.0416 34.6313 9.68701 31.2768 9.68701 27.1387V7.65803Z" fill="url(#paint6_linear_4206_10722)"/>
+<svg width="133" height="76" viewBox="0 0 133 76" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.9136 30.6653C10.5912 28.4084 12.3424 26.3892 14.6222 26.3892H118.164C120.514 26.3892 122.284 28.5279 121.844 30.8364L120.855 36.0329C120.181 39.5668 117.092 42.1236 113.494 42.1236H19.0488C15.3201 42.1236 12.1588 39.3818 11.6315 35.6906L10.9136 30.6653Z" fill="url(#paint0_linear_4429_4469)"/>
+<path d="M14.7983 33.6677C14.7983 32.5446 15.7088 31.6342 16.8319 31.6342H116.001C117.213 31.6342 118.196 32.617 118.196 33.8295C118.196 35.5732 117.677 37.2774 116.705 38.725L116.6 38.8813C116.182 39.503 115.483 39.876 114.734 39.876H18.3922C17.5721 39.876 16.8171 39.4294 16.4222 38.7106L15.8035 37.5845C15.1441 36.3843 14.7983 35.0371 14.7983 33.6677Z" fill="url(#paint1_linear_4429_4469)" stroke="#ECECEC" stroke-width="0.728579"/>
+<line x1="17.0459" y1="35.757" x2="115.011" y2="35.757" stroke="url(#paint2_radial_4429_4469)" stroke-opacity="0.7" stroke-width="0.472818"/>
+<line x1="17.0459" y1="36.7027" x2="115.011" y2="36.7027" stroke="url(#paint3_radial_4429_4469)" stroke-opacity="0.7" stroke-width="0.472818"/>
+<line x1="17.0459" y1="37.6484" x2="115.011" y2="37.6484" stroke="url(#paint4_radial_4429_4469)" stroke-opacity="0.7" stroke-width="0.472818"/>
+<line x1="17.0459" y1="38.5939" x2="115.011" y2="38.5939" stroke="url(#paint5_radial_4429_4469)" stroke-opacity="0.7" stroke-width="0.472818"/>
+<g filter="url(#filter0_i_4429_4469)">
+<path d="M10.3027 7.65803C10.3027 5.58901 11.98 3.91174 14.049 3.91174H118.945C121.014 3.91174 122.692 5.58902 122.692 7.65803V27.1387C122.692 31.2768 119.337 34.6313 115.199 34.6313H17.7953C13.6573 34.6313 10.3027 31.2768 10.3027 27.1387V7.65803Z" fill="url(#paint6_linear_4429_4469)"/>
 </g>
-<g filter="url(#filter1_i_4206_10722)">
-<rect x="56.8901" y="29.3867" width="20.9792" height="1.49852" fill="#A0A0A0"/>
+<g filter="url(#filter1_i_4429_4469)">
+<rect x="57.5059" y="29.3867" width="20.9792" height="1.49852" fill="#A0A0A0"/>
 </g>
-<path d="M25.4142 41.9677H106.135C106.135 41.9677 111.212 54.3285 131.519 62.2748H0.0302734C19.8297 54.1078 25.4142 41.9677 25.4142 41.9677Z" fill="url(#paint7_linear_4206_10722)" fill-opacity="0.08"/>
-<g filter="url(#filter2_f_4206_10722)">
-<path d="M33.0292 40.4447C30.8293 46.7907 21.048 59.3303 10.6914 59.7365" stroke="url(#paint8_linear_4206_10722)" stroke-width="1.01536"/>
+<path d="M26.0301 41.9677H106.751C106.751 41.9677 111.828 54.3285 132.135 62.2748H0.64624C20.4457 54.1078 26.0301 41.9677 26.0301 41.9677Z" fill="url(#paint7_linear_4429_4469)" fill-opacity="0.08"/>
+<g filter="url(#filter2_f_4429_4469)">
+<path d="M33.6455 40.4447C31.4455 46.7907 21.6642 59.3303 11.3076 59.7365" stroke="url(#paint8_linear_4429_4469)" stroke-width="1.01536"/>
 </g>
-<g filter="url(#filter3_f_4206_10722)">
-<path d="M100.55 40.4447C102.75 46.7907 112.532 59.3303 122.888 59.7365" stroke="url(#paint9_linear_4206_10722)" stroke-width="1.01536"/>
+<g filter="url(#filter3_f_4429_4469)">
+<path d="M101.167 40.4447C103.366 46.7907 113.148 59.3303 123.504 59.7365" stroke="url(#paint9_linear_4429_4469)" stroke-width="1.01536"/>
 </g>
-<g filter="url(#filter4_f_4206_10722)">
-<path d="M33.0292 40.4447C30.8293 46.7907 21.048 59.3303 10.6914 59.7365" stroke="url(#paint10_linear_4206_10722)" stroke-opacity="0.9" stroke-width="1.01536"/>
+<g filter="url(#filter4_f_4429_4469)">
+<path d="M33.6455 40.4447C31.4455 46.7907 21.6642 59.3303 11.3076 59.7365" stroke="url(#paint10_linear_4429_4469)" stroke-opacity="0.9" stroke-width="1.01536"/>
 </g>
-<g filter="url(#filter5_f_4206_10722)">
-<path d="M100.55 40.4447C102.75 46.7907 112.532 59.3303 122.888 59.7365" stroke="url(#paint11_linear_4206_10722)" stroke-opacity="0.9" stroke-width="1.01536"/>
+<g filter="url(#filter5_f_4429_4469)">
+<path d="M101.167 40.4447C103.366 46.7907 113.148 59.3303 123.504 59.7365" stroke="url(#paint11_linear_4429_4469)" stroke-opacity="0.9" stroke-width="1.01536"/>
 </g>
-<g filter="url(#filter6_f_4206_10722)">
-<path d="M43.183 40.4447C40.9831 46.7907 31.2018 59.3303 20.8452 59.7365" stroke="url(#paint12_linear_4206_10722)" stroke-opacity="0.6" stroke-width="1.01536"/>
+<g filter="url(#filter6_f_4429_4469)">
+<path d="M43.7993 40.4447C41.5993 46.7907 31.8181 59.3303 21.4614 59.7365" stroke="url(#paint12_linear_4429_4469)" stroke-opacity="0.6" stroke-width="1.01536"/>
 </g>
-<g filter="url(#filter7_f_4206_10722)">
-<path d="M90.397 40.4447C92.597 46.7907 102.378 59.3303 112.735 59.7365" stroke="url(#paint13_linear_4206_10722)" stroke-opacity="0.6" stroke-width="1.01536"/>
+<g filter="url(#filter7_f_4429_4469)">
+<path d="M91.013 40.4447C93.2129 46.7907 102.994 59.3303 113.351 59.7365" stroke="url(#paint13_linear_4429_4469)" stroke-opacity="0.6" stroke-width="1.01536"/>
 </g>
-<g filter="url(#filter8_f_4206_10722)">
-<path d="M63.4902 40.4447C61.2902 46.7907 51.509 59.3303 41.1523 59.7365" stroke="url(#paint14_linear_4206_10722)" stroke-width="1.01536"/>
+<g filter="url(#filter8_f_4429_4469)">
+<path d="M64.1059 40.4447C61.906 46.7907 52.1247 59.3303 41.7681 59.7365" stroke="url(#paint14_linear_4429_4469)" stroke-width="1.01536"/>
 </g>
-<g filter="url(#filter9_f_4206_10722)">
-<path d="M70.0899 40.4447C72.2898 46.7907 82.0711 59.3303 92.4277 59.7365" stroke="url(#paint15_linear_4206_10722)" stroke-width="1.01536"/>
+<g filter="url(#filter9_f_4429_4469)">
+<path d="M70.7059 40.4447C72.9058 46.7907 82.6871 59.3303 93.0437 59.7365" stroke="url(#paint15_linear_4429_4469)" stroke-width="1.01536"/>
 </g>
-<g filter="url(#filter10_f_4206_10722)">
-<path d="M63.4902 40.4447C61.2902 46.7907 51.509 59.3303 41.1523 59.7365" stroke="url(#paint16_linear_4206_10722)" stroke-width="1.01536"/>
+<g filter="url(#filter10_f_4429_4469)">
+<path d="M64.1059 40.4447C61.906 46.7907 52.1247 59.3303 41.7681 59.7365" stroke="url(#paint16_linear_4429_4469)" stroke-width="1.01536"/>
 </g>
-<g filter="url(#filter11_f_4206_10722)">
-<path d="M70.0899 40.4447C72.2898 46.7907 82.0711 59.3303 92.4277 59.7365" stroke="url(#paint17_linear_4206_10722)" stroke-width="1.01536"/>
+<g filter="url(#filter11_f_4429_4469)">
+<path d="M70.7059 40.4447C72.9058 46.7907 82.6871 59.3303 93.0437 59.7365" stroke="url(#paint17_linear_4429_4469)" stroke-width="1.01536"/>
 </g>
 <defs>
-<filter id="filter0_i_4206_10722" x="9.68701" y="2.81174" width="112.389" height="31.8196" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_i_4429_4469" x="10.3027" y="2.81174" width="112.389" height="31.8196" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
@@ -51,137 +51,137 @@
 <feGaussianBlur stdDeviation="2.2"/>
 <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4206_10722"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4429_4469"/>
 </filter>
-<filter id="filter1_i_4206_10722" x="56.8901" y="29.3867" width="20.979" height="1.49854" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter1_i_4429_4469" x="57.5059" y="29.3867" width="20.9792" height="1.49854" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
 <feOffset dy="-0.3"/>
 <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
 <feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4206_10722"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4429_4469"/>
 </filter>
-<filter id="filter2_f_4206_10722" x="2.54854" y="32.1556" width="39.0831" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter2_f_4429_4469" x="3.165" y="32.1556" width="39.0828" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<filter id="filter3_f_4206_10722" x="91.948" y="32.1556" width="39.0831" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter3_f_4429_4469" x="92.5642" y="32.1556" width="39.0828" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<filter id="filter4_f_4206_10722" x="2.54854" y="32.1556" width="39.0831" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter4_f_4429_4469" x="3.165" y="32.1556" width="39.0828" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<filter id="filter5_f_4206_10722" x="91.948" y="32.1556" width="39.0831" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter5_f_4429_4469" x="92.5642" y="32.1556" width="39.0828" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<filter id="filter6_f_4206_10722" x="12.7023" y="32.1556" width="39.0831" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter6_f_4429_4469" x="13.3188" y="32.1556" width="39.0828" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<filter id="filter7_f_4206_10722" x="81.7946" y="32.1556" width="39.0831" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter7_f_4429_4469" x="82.4104" y="32.1556" width="39.0831" height="36.211" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="4.06142" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<filter id="filter8_f_4206_10722" x="25.902" y="25.0481" width="53.2981" height="50.426" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter8_f_4429_4469" x="26.518" y="25.0481" width="53.2978" height="50.426" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="7.61517" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="7.61517" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<filter id="filter9_f_4206_10722" x="54.38" y="25.0481" width="53.2981" height="50.426" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter9_f_4429_4469" x="54.9957" y="25.0481" width="53.2981" height="50.426" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="7.61517" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="7.61517" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<filter id="filter10_f_4206_10722" x="25.902" y="25.0481" width="53.2981" height="50.426" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter10_f_4429_4469" x="26.518" y="25.0481" width="53.2978" height="50.426" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="7.61517" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="7.61517" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<filter id="filter11_f_4206_10722" x="54.38" y="25.0481" width="53.2981" height="50.426" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter11_f_4429_4469" x="54.9957" y="25.0481" width="53.2981" height="50.426" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="7.61517" result="effect1_foregroundBlur_4206_10722"/>
+<feGaussianBlur stdDeviation="7.61517" result="effect1_foregroundBlur_4429_4469"/>
 </filter>
-<linearGradient id="paint0_linear_4206_10722" x1="65.8814" y1="26.3892" x2="65.8814" y2="42.1236" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint0_linear_4429_4469" x1="66.4971" y1="26.3892" x2="66.4971" y2="42.1236" gradientUnits="userSpaceOnUse">
 <stop stop-color="#E9E9E9"/>
 <stop offset="0.916667" stop-color="#DCDCDC"/>
 </linearGradient>
-<linearGradient id="paint1_linear_4206_10722" x1="65.8815" y1="34" x2="65.8815" y2="39.876" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint1_linear_4429_4469" x1="66.4972" y1="34" x2="66.4972" y2="39.876" gradientUnits="userSpaceOnUse">
 <stop stop-color="#9A9A9A"/>
 <stop offset="1" stop-color="#CBCBCB"/>
 </linearGradient>
-<radialGradient id="paint2_radial_4206_10722" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.4125 38.4933) scale(48.9823 8712)">
+<radialGradient id="paint2_radial_4429_4469" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.0282 38.4933) scale(48.9823 8712)">
 <stop offset="0.479167" stop-color="white"/>
 <stop offset="1" stop-color="white" stop-opacity="0.03"/>
 </radialGradient>
-<radialGradient id="paint3_radial_4206_10722" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.4125 39.439) scale(48.9823 8712)">
+<radialGradient id="paint3_radial_4429_4469" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.0282 39.439) scale(48.9823 8712)">
 <stop offset="0.479167" stop-color="white"/>
 <stop offset="1" stop-color="white" stop-opacity="0.03"/>
 </radialGradient>
-<radialGradient id="paint4_radial_4206_10722" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.4125 40.3847) scale(48.9823 8712)">
+<radialGradient id="paint4_radial_4429_4469" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.0282 40.3847) scale(48.9823 8712)">
 <stop offset="0.479167" stop-color="white"/>
 <stop offset="1" stop-color="white" stop-opacity="0.03"/>
 </radialGradient>
-<radialGradient id="paint5_radial_4206_10722" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(65.4125 41.3302) scale(48.9823 8712)">
+<radialGradient id="paint5_radial_4429_4469" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.0282 41.3302) scale(48.9823 8712)">
 <stop offset="0.479167" stop-color="white"/>
 <stop offset="1" stop-color="white" stop-opacity="0.03"/>
 </radialGradient>
-<linearGradient id="paint6_linear_4206_10722" x1="65.8814" y1="3.91174" x2="65.8815" y2="39.051" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint6_linear_4429_4469" x1="66.4971" y1="3.91174" x2="66.4972" y2="39.051" gradientUnits="userSpaceOnUse">
 <stop stop-color="#F5F5F5"/>
 <stop offset="0.448116" stop-color="#EBEBEB"/>
 <stop offset="1" stop-color="#D1D1D1"/>
 </linearGradient>
-<linearGradient id="paint7_linear_4206_10722" x1="63.2361" y1="41.9677" x2="63.2361" y2="62.2747" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint7_linear_4429_4469" x1="63.852" y1="41.9677" x2="63.852" y2="62.2747" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint8_linear_4206_10722" x1="21.8603" y1="40.4447" x2="21.8603" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint8_linear_4429_4469" x1="22.4765" y1="40.4447" x2="22.4765" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint9_linear_4206_10722" x1="111.719" y1="40.4447" x2="111.719" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint9_linear_4429_4469" x1="112.335" y1="40.4447" x2="112.335" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint10_linear_4206_10722" x1="21.8603" y1="40.4447" x2="21.8603" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint10_linear_4429_4469" x1="22.4765" y1="40.4447" x2="22.4765" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint11_linear_4206_10722" x1="111.719" y1="40.4447" x2="111.719" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint11_linear_4429_4469" x1="112.335" y1="40.4447" x2="112.335" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint12_linear_4206_10722" x1="32.0141" y1="40.4447" x2="32.0141" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint12_linear_4429_4469" x1="32.6303" y1="40.4447" x2="32.6303" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint13_linear_4206_10722" x1="101.566" y1="40.4447" x2="101.566" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint13_linear_4429_4469" x1="102.182" y1="40.4447" x2="102.182" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint14_linear_4206_10722" x1="52.3213" y1="40.4447" x2="52.3213" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint14_linear_4429_4469" x1="52.937" y1="40.4447" x2="52.937" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint15_linear_4206_10722" x1="81.2588" y1="40.4447" x2="81.2588" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint15_linear_4429_4469" x1="81.8748" y1="40.4447" x2="81.8748" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint16_linear_4206_10722" x1="52.3213" y1="40.4447" x2="52.3213" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint16_linear_4429_4469" x1="52.937" y1="40.4447" x2="52.937" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>
-<linearGradient id="paint17_linear_4206_10722" x1="81.2588" y1="40.4447" x2="81.2588" y2="59.7365" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint17_linear_4429_4469" x1="81.8748" y1="40.4447" x2="81.8748" y2="59.7365" gradientUnits="userSpaceOnUse">
 <stop stop-color="#0091FF"/>
 <stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
 </linearGradient>

+ 1 - 1
src/components/header/Index.vue

@@ -136,7 +136,7 @@ export default defineComponent({
     padding-left: 10px;
     display: inline-block;
     vertical-align: middle;
-    font-family: Montserrat;
+    font-family: Persagy;
     font-style: normal;
     font-weight: 500;
     color: #fff;

+ 0 - 10
src/styles/font.scss

@@ -1,14 +1,4 @@
 @font-face {
-  font-family: "Montserrat";
-  src: url('../assets/font/Montserrat/Montserrat-Regular.ttf'); // 找到你自己的字体文件地址
-}
-
-@font-face {
-  font-family: "Montserrat-Medium";
-  src: url('../assets/font/Montserrat/Montserrat-Medium.ttf'); // 找到你自己的字体文件地址
-}
-
-@font-face {
   font-family: "Persagy";
   src: url('../assets/font/Persagy/Persagy-Regular.ttf'); // 找到你自己的字体文件地址
 }

+ 9 - 9
src/views/envmonitor/components/Air/ChildAirControl.vue

@@ -93,13 +93,13 @@
             >
               <img
                 :src="
-                  airData.workMode === 2
-                    ? parseImgUrl('ipdImages', 'aircoldblue.svg')
-                    : parseImgUrl('ipdImages', 'aircoldblack.svg')
+                  airData.workMode === 1
+                    ? parseImgUrl('ipdImages', 'airsunred.svg')
+                    : parseImgUrl('ipdImages', 'airsunblack.svg')
                 "
               />
             </div>
-            <span>制</span>
+            <span>制</span>
           </div>
           <div class="icon-box">
             <div
@@ -109,13 +109,13 @@
             >
               <img
                 :src="
-                  airData.workMode === 1
-                    ? parseImgUrl('ipdImages', 'airsunred.svg')
-                    : parseImgUrl('ipdImages', 'airsunblack.svg')
+                  airData.workMode === 2
+                    ? parseImgUrl('ipdImages', 'aircoldblue.svg')
+                    : parseImgUrl('ipdImages', 'aircoldblack.svg')
                 "
               />
             </div>
-            <span>制</span>
+            <span>制</span>
           </div>
           <div class="icon-box">
             <div
@@ -463,7 +463,7 @@ export default defineComponent({
         proxyData.endBoxSwiper();
         // debugger
         proxyData.setBarNowPerstion();
-      }
+      },
     });
     onBeforeUnmount(() => {});
     onMounted(() => {

+ 3 - 3
src/views/envmonitor/components/Air/index.vue

@@ -651,7 +651,7 @@ export default defineComponent({
 
 .air-temperature {
   display: inline-block;
-  font-family: "Montserrat";
+  font-family: "Persagy";
   font-style: normal;
   font-weight: normal;
   font-size: 32px;
@@ -673,7 +673,7 @@ export default defineComponent({
 .air-model {
   padding-left: 5px;
   display: inline-block;
-  font-family: "Montserrat";
+  font-family: "Persagy";
   font-style: normal;
   font-weight: 400;
   font-size: 15px;
@@ -806,7 +806,7 @@ export default defineComponent({
   text-align: center;
 
   .air-temp-num {
-    font-family: Montserrat;
+    font-family: Persagy;
     display: inline-block;
     font-size: 24px;
     font-weight: 400;

+ 83 - 83
src/views/envmonitor/components/Air/manualIndex.vue

@@ -49,20 +49,19 @@
       />
     </div>
     <div class="line"></div>
-    <div class="child-box" v-if="navType == 'all' && airData.isOpen">
+    <!--温度调节的box-->
+    <div class="main-temp" v-if="navType == 'all' && airData.isOpen">
       <div class="air-control air-control-padding">
-        <div class="control-box">
-          <div class="temp-slider" id="sliderId">
-            <div class="slider-bar" id="barId">
-              <div class="bar-temp">{{ realTemp }}℃</div>
-              <div class="bar-circle" id="handId"></div>
-            </div>
-            <div class="temp-left" id="tempLeftId">
-              {{ airData.minTempSet }}
-            </div>
-            <div class="temp-right">
-              {{ airData.maxTempSet }}
-            </div>
+        <div class="temp-slider" id="sliderId">
+          <div class="slider-bar" id="barId">
+            <div class="bar-temp">{{ realTemp }}℃</div>
+            <div class="bar-circle" id="handId"></div>
+          </div>
+          <div class="temp-left" id="tempLeftId">
+            {{ airData.minTempSet }}
+          </div>
+          <div class="temp-right">
+            {{ airData.maxTempSet }}
           </div>
         </div>
       </div>
@@ -1029,56 +1028,53 @@ export default defineComponent({
     // line-height: 50px;
   }
   .air-top {
-    padding-left: 20px;
-    padding-right: 20px;
-    padding-bottom: 12px;
-    padding-top: 24px;
+    padding: 0 20px;
+    padding-bottom: 10px;
+    padding-top: 18px;
     display: flex;
     justify-content: space-between;
     .air-desc {
       position: relative;
-      font-family: PingFang SC;
+      font-family: "PingFang SC";
       font-size: 16px;
-      line-height: 19px;
-      color: #4d5262;
-      flex: none;
-      flex-grow: 0;
-      margin: 5px 0px;
-      // min-height: 100px;
+      font-weight: 600;
+      line-height: 22px;
+      letter-spacing: 0em;
+      padding-top: 8px;
+      text-align: left;
+      color: rgba(77, 82, 98, 1);
       .air-title {
-        font-family: PingFang SC;
-        padding-left: 5px;
+        font-family: "PingFang SC";
         font-size: 16px;
-        line-height: 20px;
-        color: #4d5262;
-        padding-bottom: 10px;
-        i {
-          display: inline-block;
-          font-size: 12px;
-          transform: scale(0.9);
-          font-style: normal;
-          padding-left: 5px;
-          color: #c4c4c4;
-        }
+        font-weight: 600;
+        line-height: 22px;
+        padding-bottom: 4px;
+        letter-spacing: 0;
+        text-align: left;
+        color: rgba(77, 82, 98, 1);
       }
       .air-temperature {
+        position: relative;
         display: inline-block;
-        font-family: "Montserrat";
-        font-style: normal;
-        font-weight: normal;
+        font-family: "Persagy";
         font-size: 32px;
-        line-height: 32px;
-        flex: none;
-        order: 0;
-        flex-grow: 0;
-        margin: 0px 4px;
+        font-weight: 400;
+        line-height: 39px;
+        letter-spacing: 0px;
+        text-align: right;
+        color: rgba(27, 33, 41, 1);
 
         sup {
-          font-family: Mulish;
-          font-style: normal;
-          font-weight: 800;
+          position: absolute;
+          font-family: "Persagy";
+          top: -2px;
+          right: -12px;
           font-size: 12px;
+          font-weight: 400;
           line-height: 15px;
+          letter-spacing: 0em;
+          text-align: left;
+          color: rgba(196, 196, 196, 1);
         }
       }
       .show-all {
@@ -1101,7 +1097,7 @@ export default defineComponent({
     }
     .air-right {
       position: relative;
-      width: 157px;
+      width: 130px;
       text-align: center;
 
       img {
@@ -1109,19 +1105,19 @@ export default defineComponent({
         height: 64px;
       }
 
-      .switch-btn {
-        position: absolute;
-        z-index: 111;
-        bottom: -5px;
-        right: 25px;
-      }
+      // .switch-btn {
+      //   position: absolute;
+      //   z-index: 111;
+      //   bottom: -5px;
+      //   right: 25px;
+      // }
     }
   }
   .top-switch {
     display: flex;
     justify-content: space-between;
-    padding: 0 20px;
-    padding-bottom: 24px;
+    padding: 8px 20px;
+    margin-bottom: 8px;
     .top-nav {
       height: 28px;
       line-height: 28px;
@@ -1239,11 +1235,15 @@ export default defineComponent({
         display: flex;
         justify-content: space-between;
         .control-title {
-          font-weight: 500;
           font-family: "PingFang SC";
           font-size: 16px;
-          line-height: 20px;
-          color: #4d5262;
+          font-weight: 600;
+          line-height: 22px;
+          padding-right: 8px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          color: rgba(77, 82, 98, 1);
         }
         img {
           width: 20px;
@@ -1254,7 +1254,7 @@ export default defineComponent({
     }
   }
 
-  .child-box {
+  .main-temp {
     padding-bottom: 16px;
   }
   .air-control {
@@ -1333,7 +1333,6 @@ export default defineComponent({
       position: relative;
       display: flex;
       height: 22px;
-      flex: 1;
       border-radius: 16px;
       background: linear-gradient(
         270deg,
@@ -1345,51 +1344,51 @@ export default defineComponent({
 
       .slider-bar {
         position: absolute;
-        width: 25px;
         left: 0;
-        bottom: -3px;
+        bottom: -5px;
+        width: 32px;
         z-index: 333;
+        text-align: center;
+        color: rgba(98, 108, 120, 1);
+
         .bar-temp {
-          padding-bottom: 10px;
+          display: inline-block;
           font-family: "Persagy";
           font-size: 12px;
           font-weight: 400;
           line-height: 14px;
           letter-spacing: 0px;
+          padding-bottom: 4px;
           text-align: left;
           color: rgba(98, 108, 120, 1);
         }
         .bar-circle {
-          width: 32px;
-          height: 32px;
-          background: #fff;
+          width: 30px;
+          height: 30px;
+          background: rgba(246, 249, 254, 1);
+          border: 2px solid rgba(255, 255, 255, 1);
           border-radius: 50%;
-          box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.1),
-            0px 4px 10px rgba(0, 0, 0, 0.07);
-          border-radius: 21px;
-          z-index: 444;
+          box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
         }
       }
       .temp-left,
       .temp-right {
         position: absolute;
+        display: inline-block;
+        font-family: "Persagy";
         top: 50%;
         transform: translateY(-50%);
-        font-family: "Persagy";
-        font-style: normal;
-        font-weight: 400;
         font-size: 12px;
-        text-align: right;
-        color: #626c78;
+        padding-top: 1px;
+        font-weight: 400;
+        letter-spacing: 0px;
+        color: rgba(98, 108, 120, 1);
       }
       .temp-left {
-        left: 0px;
-        padding-left: 8px;
+        left: 8px;
       }
       .temp-right {
-        right: 0px;
-        padding-right: 8px;
-        text-align: left;
+        right: 8px;
       }
     }
     .control-text {
@@ -1403,7 +1402,8 @@ export default defineComponent({
   }
 
   .air-control-padding {
-    padding-top: 45px;
+    padding-top: 23px;
+    margin-top: 8px;
   }
 }
 </style>

+ 3 - 3
src/views/envmonitor/components/Air/manualIndexOld.vue

@@ -1225,7 +1225,7 @@ export default defineComponent({
     }
     .air-temperature {
       display: inline-block;
-      font-family: "Montserrat";
+      font-family: "Persagy";
       font-style: normal;
       font-weight: normal;
       font-size: 32px;
@@ -1305,7 +1305,7 @@ export default defineComponent({
         padding-right: 5px;
       }
       .number-active {
-        font-family: "Montserrat";
+        font-family: "Persagy";
         font-style: normal;
         font-weight: 500;
         font-size: 22px;
@@ -1351,7 +1351,7 @@ export default defineComponent({
   .temp-text {
     height: 20px;
     line-height: 20px;
-    font-family: "Montserrat";
+    font-family: "Persagy";
     font-style: normal;
     font-weight: 500;
     font-size: 11px;

+ 1 - 1
src/views/envmonitor/components/Contact/index.vue

@@ -164,7 +164,7 @@ export default defineComponent({
       flex: 1;
       text-align: center;
       .title {
-        font-family: "Montserrat";
+        font-family: "Persagy";
         font-style: normal;
         font-weight: 500;
         font-size: 24px;

+ 3 - 2
src/views/envmonitor/components/FloorHeating/index.vue

@@ -616,7 +616,7 @@ export default defineComponent({
         padding-right: 5px;
       }
       .number-active {
-        font-family: "Montserrat";
+        font-family: "Persagy";
         font-style: normal;
         font-weight: 500;
         font-size: 22px;
@@ -939,7 +939,8 @@ export default defineComponent({
     display: flex;
     justify-content: space-between;
     .control-title {
-      font-family: PingFang SC;
+      font-family: "PingFang SC";
+      padding-right: 8px;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;

+ 2 - 2
src/views/envmonitor/components/ManualWork/WorkConfig.vue

@@ -618,7 +618,7 @@ export default defineComponent({
       span {
         display: block;
         &:nth-child(1) {
-          font-family: "Montserrat";
+          font-family: "Persagy";
           font-style: normal;
           font-weight: 500;
           font-size: 12px;
@@ -626,7 +626,7 @@ export default defineComponent({
           color: #4d5262;
         }
         &:nth-child(2) {
-          font-family: "Montserrat";
+          font-family: "Persagy";
           padding-top: 5px;
           font-style: normal;
           font-weight: 500;

+ 1 - 1
src/views/envmonitor/components/ManualWork/index.vue

@@ -1738,7 +1738,7 @@ export default defineComponent({
     overflow-y: hidden;
     .approval-status {
       position: absolute;
-      font-family: "Montserrat";
+      font-family: "Persagy";
       top: 64px;
       z-index: 444;
       height: 30px;

+ 2 - 2
src/views/envmonitor/components/Map/MapBox.vue

@@ -1470,7 +1470,7 @@ export default defineComponent({
   }
 
   .text-hidden {
-    //font-family: Montserrat;
+    //font-family: Persagy;
     display: block;
     font-style: normal;
     width: 44px;
@@ -1486,7 +1486,7 @@ export default defineComponent({
 }
 
 .buiding-item {
-  //font-family: 'Montserrat';
+  //font-family: 'Persagy';
   width: 100%;
   padding: 10px;
   font-style: normal;

+ 19 - 1
src/views/envmonitor/components/Socket/index.vue

@@ -225,6 +225,22 @@ export default defineComponent({
             }
           });
       },
+      // 更新父亲设备的状态
+      updateParentSwitch() {
+        let flag: any = false;
+        proxyData.socketData.equipList.map((item: any) => {
+          if (item.isOpen) {
+            flag = true;
+          }
+        });
+        proxyData.socketData.isOpen = flag;
+      },
+      // 更新子设备的状态
+      updateChildSwitch() {
+        proxyData.socketData.equipList.map((item: any) => {
+          item.isOpen = proxyData.socketData.isOpen;
+        });
+      },
       // 插座控制
       socketControl(type: any, item: any = null) {
         // 下发指令的时候先关闭定时器
@@ -237,6 +253,7 @@ export default defineComponent({
             proxyData.socketData.equipList &&
             proxyData.socketData.equipList.length
           ) {
+            proxyData.updateChildSwitch();
             proxyData.socketData.equipList.map((item: any) => {
               let obj: any = {
                 id: item.id, //类型:String  必有字段  备注:设备id
@@ -252,9 +269,10 @@ export default defineComponent({
           let obj: any = {
             id: item.id, //类型:String  必有字段  备注:设备id
             code: item.switchCode, //类型:String  必有字段  备注:编码 EquipSwtichSet
-            value: proxyData.socketData.isOpen ? 1 : 0, //类型:String  必有字段  备注:值 0
+            value: item.isOpen ? 1 : 0, //类型:String  必有字段  备注:值 0
           };
           arr.push(obj);
+          proxyData.updateParentSwitch();
         }
         // 下发开/关的指令
         proxyData.setSpaceCondtioners(arr);

+ 2 - 2
src/views/envmonitor/components/workOvertime/WorkConfig.vue

@@ -576,7 +576,7 @@ export default defineComponent({
       span {
         display: block;
         &:nth-child(1) {
-          font-family: "Montserrat";
+          font-family: "Persagy";
           font-style: normal;
           font-weight: 500;
           font-size: 12px;
@@ -584,7 +584,7 @@ export default defineComponent({
           color: #4d5262;
         }
         &:nth-child(2) {
-          font-family: "Montserrat";
+          font-family: "Persagy";
           padding-top: 5px;
           font-style: normal;
           font-weight: 500;

+ 5 - 5
src/views/envmonitor/index.vue

@@ -2189,7 +2189,7 @@ export default defineComponent({
       }
       .left-time {
         span {
-          font-family: "Montserrat";
+          font-family: "Persagy";
           font-style: normal;
           font-weight: 400;
           font-size: 16px;
@@ -2208,7 +2208,7 @@ export default defineComponent({
       div {
         vertical-align: middle;
         display: inline-block;
-        font-family: "Montserrat";
+        font-family: "Persagy";
         font-style: normal;
         font-weight: 400;
         font-size: 16px;
@@ -2237,7 +2237,7 @@ export default defineComponent({
         span {
           display: inline-block;
           vertical-align: middle;
-          font-family: "Montserrat";
+          font-family: "Persagy";
           font-style: normal;
           font-weight: 400;
           font-size: 16px;
@@ -2340,7 +2340,7 @@ export default defineComponent({
         .temp-num {
           position: relative;
           padding-left: 24px;
-          font-family: "Montserrat";
+          font-family: "Persagy";
           font-style: normal;
           font-weight: 400;
           font-size: 60px;
@@ -2409,7 +2409,7 @@ export default defineComponent({
           }
           &:nth-child(2) {
             padding-top: 10px;
-            font-family: "Montserrat";
+            font-family: "Persagy";
             font-style: normal;
             font-weight: 400;
             font-size: 32px;

+ 2 - 2
src/views/envmonitor/index1.vue

@@ -1747,7 +1747,7 @@ export default defineComponent({
     //flex: 1;
     width: 25%;
     text-align: center;
-    font-family: Montserrat;
+    font-family: Persagy;
     font-style: normal;
     font-weight: 600;
     font-size: 12px;
@@ -1759,7 +1759,7 @@ export default defineComponent({
       display: block;
 
       &:nth-child(2) {
-        font-family: Montserrat;
+        font-family: Persagy;
         font-style: normal;
         font-weight: normal;
         font-size: 24px;

+ 2 - 2
src/views/home/index.vue

@@ -310,7 +310,7 @@ export default defineComponent({
     line-height: 46px;
     background: #ffffff;
     border: 1px solid #e2d0a0;
-    font-family: "Montserrat";
+    font-family: "Persagy";
     font-style: normal;
     font-weight: 500;
     font-size: 16px;
@@ -420,7 +420,7 @@ export default defineComponent({
     left: 0;
     width: 100%;
     bottom: 80px;
-    font-family: "Montserrat";
+    font-family: "Persagy";
     font-style: normal;
     font-weight: 500;
     font-size: 24px;

+ 2 - 2
src/views/portrait/common/index.scss

@@ -19,7 +19,7 @@
     color: #4D5262;
 
     &:nth-child(2) {
-      font-family: Montserrat;
+      font-family: Persagy;
       font-style: normal;
       font-weight: normal;
       font-size: 47px;
@@ -43,7 +43,7 @@
       display: inline-block;
       vertical-align: middle;
       padding-right: 10px;
-      font-family: Montserrat;
+      font-family: Persagy;
       font-style: normal;
       font-weight: normal;
       font-size: 23px;

+ 1 - 1
src/views/portrait/energyDetail.vue

@@ -232,7 +232,7 @@ export default defineComponent({
     }
 
     .num {
-      font-family: 'Montserrat';
+      font-family: 'Persagy';
       font-style: normal;
       font-weight: 500;
       font-size: 16px;

+ 2 - 2
src/views/portrait/energyRank.vue

@@ -275,7 +275,7 @@ export default defineComponent({
       span {
         display: block;
         padding-top: 12px;
-        font-family: 'Montserrat';
+        font-family: 'Persagy';
         vertical-align: middle;
         font-weight: 500;
         font-size: 17px;
@@ -306,7 +306,7 @@ export default defineComponent({
     }
 
     .num {
-      font-family: 'Montserrat';
+      font-family: 'Persagy';
       font-style: normal;
       font-weight: 400;
       font-size: 17px;

+ 2 - 2
src/views/portrait/energySavig.vue

@@ -922,7 +922,7 @@ export default defineComponent({
       }
 
       &:nth-child(2) {
-        font-family: Montserrat;
+        font-family: Persagy;
         font-style: normal;
         font-weight: normal;
         font-size: 14px;
@@ -1027,7 +1027,7 @@ export default defineComponent({
   }
 
   .tip-num {
-    font-family: Montserrat;
+    font-family: Persagy;
     font-style: normal;
     font-weight: 500;
     color: #FFFFFF;

+ 115 - 99
src/views/portrait/index.vue

@@ -3,7 +3,13 @@
     <div class="portrait-title">节能评分</div>
     <div class="portrait-count" @click="goEnergyDetail('energy')">
       <span>我的节能</span>
-      <span> {{ energyData.totalPoints || energyData.totalPoints == 0 ? energyData.totalPoints : '--' }}</span>
+      <span>
+        {{
+          energyData.totalPoints || energyData.totalPoints == 0
+            ? energyData.totalPoints
+            : "--"
+        }}</span
+      >
       <!--      <van-icon class="arrow" name="arrow" />-->
     </div>
   </div>
@@ -12,65 +18,65 @@
     <div class="box" @click="goEnergyDetail('air')" v-if="energyArr[0].isshow">
       <span>空调调节</span>
       <span>{{ energyArr[0].num }}</span>
-      <img
-        :src="parseImgUrl('page-portrait','portrait_air.svg')" alt=""
-      >
+      <img :src="parseImgUrl('page-portrait', 'portrait_air.svg')" alt="" />
     </div>
     <div class="box" @click="goEnergyDetail('lamp')" v-if="energyArr[1].isshow">
       <span>开关照明</span>
       <span>{{ energyArr[1].num }}</span>
       <img
         class="temp-img"
-        :src="parseImgUrl('page-portrait','portrait_lamp.svg')" alt=""
-      >
+        :src="parseImgUrl('page-portrait', 'portrait_lamp.svg')"
+        alt=""
+      />
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
-import { store } from '@/store'
+import { defineComponent, reactive, toRefs, onMounted } from "vue";
+import { useRouter } from "vue-router";
+import { store } from "@/store";
 import {
   queryTotalIntegral,
   queryPortraitTempUserTotal,
-  queryTotalPortraitLight, queryPortraitModule
-} from '@/apis/portrait'
-import { formatDate, getPreMonth, setQueryConfig, setSession } from '@/utils'
-import { PortaitMutationTypes } from '@/store/modules/portait/mutation-types'
-import { parseImgUrl } from '@/utils'
+  queryTotalPortraitLight,
+  queryPortraitModule,
+} from "@/apis/portrait";
+import { formatDate, getPreMonth, setQueryConfig, setSession } from "@/utils";
+import { PortaitMutationTypes } from "@/store/modules/portait/mutation-types";
+import { parseImgUrl } from "@/utils";
 
 export default defineComponent({
   components: {},
   setup() {
-    let router = useRouter()
+    let router = useRouter();
     let energyData: {
-      intergral: any
-      level: any
-      totalPoints: number
+      intergral: any;
+      level: any;
+      totalPoints: number;
     } = {
       intergral: 0,
       level: 0,
-      totalPoints: 0
-    }
+      totalPoints: 0,
+    };
     let arr: any = [
       {
-        id: 'airConditioner',
-        name: '空调调节',
+        id: "airConditioner",
+        name: "空调调节",
         isShow: true,
-        num: '--',
-        unit: '',
-        img: parseImgUrl('page-portrait', 'portrait_air.svg'),
+        num: "--",
+        unit: "",
+        img: parseImgUrl("page-portrait", "portrait_air.svg"),
       },
       {
-        id: 'light',
-        name: '开关照明',
+        id: "light",
+        name: "开关照明",
         isShow: true,
-        num: '--',
-        unit: '',
-        img: parseImgUrl('page-portrait', 'portrait_lamp.svg'),
-      }
-    ]
+        num: "--",
+        unit: "",
+        img: parseImgUrl("page-portrait", "portrait_lamp.svg"),
+      },
+    ];
     const proxyData = reactive({
       parseImgUrl: parseImgUrl,
       user: store.state.user,
@@ -79,118 +85,128 @@ export default defineComponent({
       goEnergyDetail(type: any) {
         router.push({
           path: `/energy-savig`,
-          query: { type: type }
-        })
+          query: { type: type },
+        });
       },
       dealNumToPoint(num: any, arrIndex: any) {
         if (!isNaN(num)) {
           if (num && num >= 10000) {
-            num = Math.floor(num / 10000 * 10) / 10
-            proxyData.energyArr[arrIndex].unit = '万'
+            num = Math.floor((num / 10000) * 10) / 10;
+            proxyData.energyArr[arrIndex].unit = "万";
           } else {
-            proxyData.energyArr[arrIndex].unit = ''
-            return num
+            proxyData.energyArr[arrIndex].unit = "";
+            return num;
           }
-          return num ? num : '--'
+          return num ? num : "--";
         } else {
-          return '--'
+          return "--";
         }
       },
       /**
        * 节能分数
        */
       queryTotalIntegral() {
-        let today = formatDate('')
-        let lastMonth = getPreMonth()
+        let today = formatDate("");
+        let lastMonth = getPreMonth();
         let params: any = {
           date: today,
-          month: lastMonth
-        }
-        let query: string = setQueryConfig(params)
-        queryTotalIntegral(query).then(function(res) {
-          const resData: any = res
-          if (res.result === 'success') {
-            proxyData.energyData = resData
+          month: lastMonth,
+        };
+        let query: string = setQueryConfig(params);
+        queryTotalIntegral(query).then(function (res) {
+          const resData: any = res;
+          if (res.result === "success") {
+            proxyData.energyData = resData;
           }
-        })
+        });
       },
       /**
        * 空调使用统计
        */
       queryPortraitTempUserTotal() {
-        queryPortraitTempUserTotal().then(res => {
-          const resData: any = res
-          if (resData.result === 'success') {
-            const data: any = resData?.data ?? null
-            proxyData.energyArr[0].num = data ? proxyData.dealNumToPoint(data.adjustDownNum + data.adjustUpNum, 0) : '--'
+        queryPortraitTempUserTotal().then((res) => {
+          const resData: any = res;
+          if (resData.result === "success") {
+            const data: any = resData?.data ?? null;
+            proxyData.energyArr[0].num = data
+              ? proxyData.dealNumToPoint(
+                  data.adjustDownNum + data.adjustUpNum,
+                  0
+                )
+              : "--";
           } else {
-            proxyData.energyArr[0].num = '--'
+            proxyData.energyArr[0].num = "--";
           }
-        })
+        });
       },
       /**
        * 照明使用统计
        */
       queryTotalPortraitLight() {
-        queryTotalPortraitLight().then(res => {
-          const resData: any = res
-          if (resData.result === 'success') {
-            const data: any = resData?.data ?? null
-            proxyData.energyArr[1].num = data ? proxyData.dealNumToPoint(data.totalNum, 1) : '--'
+        queryTotalPortraitLight().then((res) => {
+          const resData: any = res;
+          if (resData.result === "success") {
+            const data: any = resData?.data ?? null;
+            proxyData.energyArr[1].num = data
+              ? proxyData.dealNumToPoint(data.totalNum, 1)
+              : "--";
           } else {
-            proxyData.energyArr[1].num = '--'
+            proxyData.energyArr[1].num = "--";
           }
-        })
+        });
       },
       /**
        * 判断设备统计数据的显示和隐藏
        */
       queryPortraitModule() {
-        queryPortraitModule().then(res => {
-          let resData: any = res
-          let data = resData?.data ?? []
+        queryPortraitModule().then((res) => {
+          let resData: any = res;
+          let data = resData?.data ?? [];
           // 判断模块的显示和隐藏
-          proxyData.energyArr.forEach(function(item: any) {
+          proxyData.energyArr.forEach(function (item: any) {
             if (data.indexOf(item.id) > -1) {
-              item.isshow = true
+              item.isshow = true;
             } else {
-              item.isshow = false
+              item.isshow = false;
             }
-          })
+          });
           /**
            * 缓层数据供后面子页面模块判断使用
            */
           let portraitModule: any = {
             airConditioner: false,
-            light: false
-          }
-          if (data.indexOf('airConditioner') > -1) {
-            portraitModule.airConditioner = true
+            light: false,
+          };
+          if (data.indexOf("airConditioner") > -1) {
+            portraitModule.airConditioner = true;
           } else {
-            portraitModule.airConditioner = false
+            portraitModule.airConditioner = false;
           }
-          if (data.indexOf('light') > -1) {
-            portraitModule.light = true
+          if (data.indexOf("light") > -1) {
+            portraitModule.light = true;
           } else {
-            portraitModule.light = false
+            portraitModule.light = false;
           }
-          setSession('portraitModule', portraitModule)
-          store.commit(PortaitMutationTypes.SET_AIR, portraitModule.airConditioner)
-          store.commit(PortaitMutationTypes.SET_LIGHT, portraitModule.light)
-        })
-      }
-    })
+          setSession("portraitModule", portraitModule);
+          store.commit(
+            PortaitMutationTypes.SET_AIR,
+            portraitModule.airConditioner
+          );
+          store.commit(PortaitMutationTypes.SET_LIGHT, portraitModule.light);
+        });
+      },
+    });
     onMounted(() => {
-      proxyData.queryPortraitModule()
-      proxyData.queryTotalIntegral()
-      proxyData.queryPortraitTempUserTotal()
-      proxyData.queryTotalPortraitLight()
-    })
+      proxyData.queryPortraitModule();
+      proxyData.queryTotalIntegral();
+      proxyData.queryPortraitTempUserTotal();
+      proxyData.queryTotalPortraitLight();
+    });
     return {
-      ...toRefs(proxyData)
-    }
-  }
-})
+      ...toRefs(proxyData),
+    };
+  },
+});
 </script>
 <style lang="scss" scoped>
 /**
@@ -201,7 +217,7 @@ export default defineComponent({
   justify-content: space-between;
   padding: 20px;
   padding-bottom: 40px;
-  background: #FFE823;
+  background: #ffe823;
 }
 
 .portrait-title {
@@ -214,7 +230,7 @@ export default defineComponent({
 .portrait-count {
   span {
     display: block;
-    font-family: PingFang SC;
+    font-family: "PingFang SC";
     font-style: normal;
     font-weight: normal;
     font-size: 15px;
@@ -222,7 +238,7 @@ export default defineComponent({
     color: #000000;
 
     &:nth-child(2) {
-      font-family: Montserrat;
+      font-family: "Persagy";
       font-style: normal;
       font-weight: 500;
       font-size: 32px;
@@ -245,7 +261,7 @@ export default defineComponent({
     padding: 20px 0 20px 20px;
     width: 48.5%;
     height: 140px;
-    background: #FFFFFF;
+    background: #ffffff;
     box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.08);
     border-radius: 15px;
 
@@ -259,7 +275,7 @@ export default defineComponent({
       color: #000000;
 
       &:nth-child(2) {
-        font-family: Montserrat;
+        font-family: Persagy;
         font-style: normal;
         font-weight: 500;
         font-size: 32px;

+ 1 - 1
src/views/portrait/todayEnergyDetail.vue

@@ -259,7 +259,7 @@ export default defineComponent({
     }
 
     .num {
-      font-family: 'Montserrat';
+      font-family: 'Persagy';
       font-style: normal;
       font-weight: 500;
       font-size: 16px;