浏览代码

fix:地暖模块

chenzhen2 1 年之前
父节点
当前提交
7820e58e59

二进制
src/assets/font/Persagy/Persagy-Bold.ttf


二进制
src/assets/font/Persagy/Persagy-Medium.ttf


二进制
src/assets/font/Persagy/Persagy-Regular.ttf


+ 5 - 0
src/styles/font.scss

@@ -6,4 +6,9 @@
 @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'); // 找到你自己的字体文件地址
 }

+ 17 - 6
src/views/envmonitor/components/FloorHeating/index.vue

@@ -10,7 +10,7 @@
         <div class="top-right">
           <img
             :src="
-              floorHeatingData.runStatus
+              isOpen
                 ? parseImgUrl('page-officehome', 'heating-active.svg')
                 : parseImgUrl('page-officehome', 'heating.svg')
             "
@@ -53,7 +53,7 @@
       <div class="control-box">
         <div class="temp-slider" id="slideFloorId">
           <div class="slider-bar" id="barFloorId">
-            <div class="bar-temp">{{ realTemp }}</div>
+            <div class="bar-temp">{{ realTemp ? realTemp + "℃" : "--" }}</div>
             <div class="bar-circle" id="handFloorId"></div>
           </div>
           <div class="temp-left" style="width: 22px">
@@ -461,6 +461,11 @@ export default defineComponent({
             const resData: any = res;
             const data: any = res?.data ?? {};
             proxyData.floorHeatingData = data;
+            if (proxyData.floorHeatingData.runStatus) {
+              proxyData.isOpen = true;
+            } else {
+              proxyData.isOpen = false;
+            }
             if (data.equipList && data.equipList.length) {
               proxyData.floorHeatingList = data.equipList;
             }
@@ -766,11 +771,14 @@ export default defineComponent({
 
     .slider-bar {
       position: absolute;
-      width: 25px;
+      width: 32px;
       left: 0;
       bottom: -2px;
       z-index: 333;
       .bar-temp {
+        display: block;
+        text-align: center;
+        // width: 50px;
         padding-bottom: 6px;
         font-family: "Persagy";
         font-style: normal;
@@ -780,8 +788,8 @@ export default defineComponent({
         color: #626c78;
       }
       .bar-circle {
-        width: 25px;
-        height: 25px;
+        width: 32px;
+        height: 32px;
         background: #fff;
         border-radius: 50%;
         box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.1),
@@ -1002,8 +1010,11 @@ export default defineComponent({
     display: flex;
     justify-content: space-between;
     .control-title {
-      font-weight: 500;
       font-family: PingFang SC;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      font-weight: 500;
       font-size: 16px;
       line-height: 20px;
       color: #4d5262;

+ 1 - 1
vue.config.js

@@ -116,7 +116,7 @@ module.exports = {
       },
       '/sgipad/test/': {
         // target: 'https://duoduoenv.sagacloud.cn',
-        target: 'http://192.168.88.9:52009',    // 永琪
+        target: 'http://192.168.88.4:52009',    // 永琪
         // target: 'http://192.168.4.54:52009', // 小静
         // target: 'http://192.168.16.168:52015',
         changeOrigin: true,