Browse Source

样式调整

xiaohaizhao 7 months ago
parent
commit
083aa9d7a4

+ 7 - 6
src/system/IOT/controlPanel/model/YK01/index.vue

@@ -97,7 +97,7 @@
         </div>
         <div
           class="dataBlock-box"
-          style="top: 5%; left: 15%; transform: scale(1.4)"
+          style="top: 5%; left: 15%;"
         >
           <dataBlock
             v-if="detail.params.oilpressure"
@@ -125,10 +125,9 @@
 
         <div
           class="dataBlock-box"
-          style="top: 0%; right: 29.5%; transform: scale(1.2)"
+          style="top: 0%; right: 29.5%;"
         >
           <dataBlock
-            style="transform: scale(0.9)"
             v-if="detail.params.closepressure"
             :data="[
               {
@@ -162,7 +161,7 @@
 
         <div
           class="dataBlock-box"
-          style="bottom: 28%; left: 2.2%; transform: scale(1.2)"
+          style="bottom: 28%; left: 5%; "
         >
           <dataBlock
             v-if="detail.params.pipeflow"
@@ -180,9 +179,10 @@
             ]"
           ></dataBlock>
         </div>
+
         <div
           class="dataBlock-box"
-          style="bottom: 32%; right: 30%; transform: scale(1.5)"
+          style="bottom: 32%; right: 30%;"
         >
           <dataBlock
             v-if="detail.params.flowspeed"
@@ -377,7 +377,7 @@ onUnmounted(() => {
 .control {
   display: flex;
   height: calc(100vh - 60px);
-  width: calc(100vw - 256px);
+  width: calc(100vw - 255px);
   box-sizing: border-box;
   padding: 10px 0;
   background: linear-gradient(
@@ -477,5 +477,6 @@ onUnmounted(() => {
   height: 100%;
   background: rgb(0, 0, 0, 0.05);
   padding: 10px;
+  flex-shrink: 0;
 }
 </style>

+ 0 - 1
src/system/IOT/positionControl/index.vue

@@ -663,7 +663,6 @@ onMounted(async () => {
   initChart();
   listData();
   getCmdData();
-  getDeviceData();
   getHanleData();
   getwarningData();
   scrollUp();

+ 3 - 6
src/system/IOT/pressureControl/modules/devices.vue

@@ -343,15 +343,10 @@ onMounted(async () => {
   --color2: rgba(255, 164, 6);
 }
 .empty-box {
-  position: absolute;
-  width: 220rem;
-  height: 220rem;
   display: flex;
   justify-content: center;
   align-items: center;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
+  margin-top: 20px;
 }
 /* 地图 */
 .M-map {
@@ -412,11 +407,13 @@ onMounted(async () => {
   scrollbar-width: none; /* firefox */
   -ms-overflow-style: none; /* IE 10+ */
   margin-top: 10rem;
+  width: 100%;
 }
 .device-wrapper .device-list {
   display: flex;
   flex-wrap: wrap;
   padding-bottom: 50rem;
+  width: 100%;
 }
 
 .device-wrapper .device-list .content_box {

+ 0 - 1
src/system/IOT/waterhammerControl/index.vue

@@ -663,7 +663,6 @@ onMounted(async () => {
   initChart();
   listData();
   getCmdData();
-  getDeviceData();
   getHanleData();
   getwarningData();
   scrollUp();

+ 4 - 4
vite.config.js

@@ -12,15 +12,15 @@ export default defineConfig({
   },
   define: {
     'process.env': {
-      // 'BASE_API':"http://60.204.153.188"
-      'BASE_API':"http://61.164.207.46:8100/"
+      'BASE_API':"http://60.204.153.188"
+      // 'BASE_API':"http://61.164.207.46:8100/"
     }
   },
   server: {
     proxy: {
       "/api": {
-        // target: "http://60.204.153.188/",
-        target: "http://61.164.207.46:8100/",
+        target: "http://60.204.153.188/",
+        // target: "http://61.164.207.46:8100/",
         ws: true,
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ""),