LIJU 1 week geleden
bovenliggende
commit
7c616638da
2 gewijzigde bestanden met toevoegingen van 36 en 34 verwijderingen
  1. 35 33
      src/components/medical-advice/temperature/graphics.vue
  2. 1 1
      src/utils/request.js

+ 35 - 33
src/components/medical-advice/temperature/graphics.vue

@@ -1192,18 +1192,18 @@ export default {
            lineHeight: '14px'
          };
        }
-      //  // 例如:1366x768
-      //  else if (screenWidth === 1366 && screenHeight === 768) {
-      //    style = {
-      //      width: '12px',
-      //      height: '10px',
-      //      color: '#ff0000',
-      //      fontSize: '8px',
-      //      position: 'relative',
-      //      top: '-1px',
-      //      lineHeight: '14px'
-      //    };
-      //  }
+       // 例如:1366x768
+       else if (screenWidth === 1366 && screenHeight === 768) {
+         style = {
+           width: '12px',
+           height: '10px',
+           color: '#ff0000',
+           fontSize: '8px',
+           position: 'relative',
+           top: '-1px',
+           lineHeight: '14px'
+         };
+       }
        // 例如:1536x864
        else if (screenWidth === 1536 && screenHeight === 864) {
          style = {
@@ -1305,27 +1305,29 @@ export default {
           marginTop: '22px'
         };
       }
-      // // 例如:1366x768
-      // else if (screenWidth === 1366 && screenHeight === 768) {
-      //   pulseStyle = {
-      //     titleMarginTop: '0px',
-      //     firstRowMarginTop: '44px',
-      //     normalRowMarginTop: '61px',
-      //     lastRowMarginTop: '61px'
-      //   };
-      //   temperatureStyle = {
-      //     titleMarginTop: '0px',
-      //     firstRowMarginTop: '44px',
-      //     normalRowMarginTop: '61px',
-      //     lastRowMarginTop: '61px'
-      //   };
-      //   legendStyle = {
-      //     marginTop: '476px'
-      //   };
-      //   containerStyle = {
-      //     marginTop: '22px'
-      //   };
-      // }
+      // 例如:1366x768
+      else if (screenWidth === 1366 && screenHeight === 768) {
+        pulseStyle = {
+          titleMarginTop: '0px',
+          firstRowMarginTop: '32px',
+          normalRowMarginTop: '55px',
+          lastRowMarginTop: '56px'
+        };
+        temperatureStyle = {
+          titleMarginTop: '0px',
+          firstRowMarginTop: '32px',
+          normalRowMarginTop: '55px',
+          lastRowMarginTop: '56px'
+        };
+        legendStyle = {
+          marginTop: '476px'
+        };
+        containerStyle = {
+          marginTop:  (this.marginTop + 10) + 'px',
+        };
+        console.log("this.marginTop0000000000000000000000",this.marginTop)
+        console.log("marginTop.containerStyle",containerStyle.marginTop)
+      }
       // 例如:1536x864
       else if (screenWidth === 1536 && screenHeight === 864) {
         pulseStyle = {

+ 1 - 1
src/utils/request.js

@@ -9,7 +9,7 @@ import { stringify } from "qs";
 import env from "@/utils/setting";
 
 const service = axios.create({
-  baseURL: env.VITE_BASE_URL,
+  baseURL: "http://130.150.161.123:8706",
   withCredentials: true,
   timeout: 0,
   showLoading: true,