提交

.env.development

@@ -25,7 +25,7 @@ VITE_GLOB_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://106.12.170.138:7070"]]   http://182.139.38.101:20033
 # VITE_PROXY = [["/api","http://182.139.38.101:20033/api"],["/qiankun","http://182.139.38.101:20010"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:7070"],["/qiankun","http://182.139.38.101:20010"],["/tfmap","http://127.0.0.1:4001"]]//http://182.139.38.101:20010/wlw
-VITE_PROXY = [["/api","http://183.222.190.95:20033/api"],["/gisApi","http://106.12.170.138:7070"],["/debuggerApi","http://183.222.190.95:20034"], ["/qiankun","http://192.168.185.73:3100"],["/tfmap","http://127.0.0.1:4001"],["/wlw","http://183.222.190.95:20010/wlw"],["/zhjc","http://183.222.190.95:20010/zhjc"],["/cdy_api","http://183.222.190.95:20034/sw-api/cdy_api"],["/hydro_yb_api","http://183.222.190.95:20034/yb-api/hydro_yb_api"]]
+VITE_PROXY = [["/api","http://192.168.2.54:20034/api"],["/gisApi","http://106.12.170.138:7070"],["/debuggerApi","http://192.168.2.54:20034"], ["/qiankun","http://192.168.185.73:3100"],["/tfmap","http://127.0.0.1:4001"],["/wlw","http://183.222.190.95:20010/wlw"],["/zhjc","http://183.222.190.95:20010/zhjc"],["/cdy_api","http://192.168.2.54:20034/sw-api/cdy_api"],["/hydro_yb_api","http://192.168.2.54:20034/yb-api/hydro_yb_api"]]
 # VITE_PROXY = [["/api","http://182.139.38.101:20033/api"],["/gisApi","http://106.12.170.138:7070"],["/debuggerApi","http://182.139.38.101:20034"], ["/qiankun","http://192.168.185.73:3100"],["/tfmap","http://127.0.0.1:4001"],["/wlw","http://182.139.38.101:20010/wlw"],["/zhjc","http://182.139.38.101:20010/zhjc"]]
 # VITE_PROXY = [["/api","http://localhost:1111/api"],["/qiankun","http://192.168.185.73:3100"],["/tfmap","http://127.0.0.1:4001"],["/wlw","http://192.168.185.73:3100"]]
 # VITE_PROXY = [["/api","http://192.168.84.30:20033/api"],["/qiankun","http://192.168.185.73:3100"],["/tfmap","http://127.0.0.1:4001"],["/wlw","http://192.168.185.73:3100"]]
@@ -51,7 +51,7 @@ VITE_GLOB_IS_IDC="https://iam.yced.com.cn/idp/profile/OAUTH2/Redirect/GLO?redirc
 # Basic interface address SPA
 # VITE_GLOB_API_URL= /api
 # VITE_GLOB_API_URL= http://192.168.49.163:20043/api
-VITE_GLOB_API_URL= http://183.222.190.95:20034/api
+VITE_GLOB_API_URL= http://192.168.2.54:20034/api
 # gis
 VITE_GIS_API= /gisApi
 #调试

src/common.less

@@ -71,4 +71,7 @@
 // }
 // .vben-basic-table-form-container{
 //   padding: 0px !important;
-// }
+// }
+.vben-login{
+  height: 100vh;
+}

src/views/historyData/regimen/index.vue

@@ -507,7 +507,7 @@ onMounted(async () => {
       }
 
       &>div:nth-child(1) {
-        min-width: 180px;
+        min-width: 160px;
       }
 
       &>div:nth-child(2) {

src/views/sys/customLogin/CustomLogin.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <ScaleBox :width="1920" bgc="transparent" :height="911" :delay="100" :isFlat="true">
+    <!-- <ScaleBox :width="1920" bgc="transparent" :height="911" :delay="100" :isFlat="true"> -->
     <div style="background-size: 100% 100%" :class="prefixCls" class="relative w-full h-full px-4 loginBg">
       <!-- <img class="logo" src="/src/assets/images/systemLogo.png" :onerror="imgOnError" /> -->
       <div class="container relative h-full py-2 mx-auto sm:px-10">
@@ -32,7 +32,7 @@
         </div>
       </div>
     </div>
-  </ScaleBox>
+  <!-- </ScaleBox> -->
   </div>
 </template>
 <script lang="ts" setup>
@@ -48,7 +48,7 @@ import defaultShowLogoImg from '/@/assets/svg/login-bg.svg';
 import defaultShowLogoDarkImg from '/@/assets/svg/login-bg-dark.svg';
 import { useTitle } from '@vueuse/core';
 import { createLocalStorage } from '/@/utils/cache';
-import ScaleBox from "vue3-scale-box";
+// import ScaleBox from "vue3-scale-box";
 
 import url from '/src/assets/images/logo-demo.png';
 

src/views/waterRegimen/multistation/index.vue

@@ -262,8 +262,8 @@
       dataCenter.ys_options = res.data;
       dataCenter.unit = dataCenter.ys_options[0].unit;
       // dataCenter.formData.dchar = dataCenter.ys_options[0].value;
-      dataCenter.echartsTitle = dataCenter.ys_options[0].label;
-      dataCenter.echartsTitleCopy = dataCenter.ys_options[0].label;
+      // dataCenter.echartsTitle = dataCenter.ys_options[0].label;
+      // dataCenter.echartsTitleCopy = dataCenter.ys_options[0].label;
     });
     getHistoryWaterData();
   }

src/views/waterRegimen/single/index.vue

@@ -567,12 +567,15 @@ async function getDataAllElementsFn(ids) {
     });
     dataCenter.ys_options = res.data;
 
-    dataCenter.formData.dchar = [
-      dataCenter.ys_options[0].value,
-      dataCenter.ys_options[1].value,
-      dataCenter.ys_options[2].value,
-      dataCenter.ys_options[3].value
-    ];
+    dataCenter.formData.dchar = []
+    //   dataCenter.ys_options[0].value,
+    //   dataCenter.ys_options[1].value,
+    //   dataCenter.ys_options[2].value,
+    //   dataCenter.ys_options[3].value
+    // ];
+    dataCenter.ys_options.forEach(element => {
+      dataCenter.formData.dchar.push(element.value)
+    });
   });
   getHistoryWaterData();
 }