Merge branch 'feature-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/data-board-2025 into feature-v1.0.0

src/views/Main/DailyPatrolCard/index.vue

@@ -249,8 +249,8 @@ watch(
   }
 );
 onMounted(() => {
-  getChartData(props.timeRange);
+  // getChartData(props.timeRange);
-  getProgressData(props.timeRange);
+  // getProgressData(props.timeRange);
 
   window.addEventListener('resize', handleResize);
 });

src/views/Main/ProjectOperation/components/DataStatistics.vue

@@ -29,7 +29,7 @@
         <el-radio-button label="2">图表</el-radio-button>
       </el-radio-group>
     </div>
-    <div class="mt-24">
+    <div class="mt-24 statistics-main">
       <!-- 指标 -->
       <div v-if="showType === '1'">
         <div class="attributes-box" v-for="(item, index) in attributesList" :key="index">
@@ -316,6 +316,7 @@ onMounted(() => {
 </script>
 <style scoped lang="scss">
 .data-statistics {
+  height: 100%;
   :deep(.sy-cascader) .sy-input__wrapper,
   :deep(.sy-range-editor--small.sy-input__wrapper) {
     height: 32px !important;
@@ -431,6 +432,11 @@ onMounted(() => {
       }
     }
   }
+
+  .statistics-main {
+    height: calc(100% - 64px);
+    overflow: auto;
+  }
 }
 .text-center {
   padding-top: 30px;

src/views/Main/ProjectOperation/components/MonitorWarning.vue

@@ -174,6 +174,7 @@ function handleReset() {
 <style scoped lang="scss">
 .monitor-warning {
   width: 100%;
+  height: 100%;
   padding: 12px;
   .search-box {
     display: flex;

vite.config.ts

@@ -85,8 +85,8 @@ export default defineConfig(({ mode }) => {
           rewrite: (path) => path.replace(/^\/api\/iserver/, "/iserver"),
         },
         "/api/run": {
-          // target: "http://shuili.product.dev.com:30115/",
+          target: "http://shuili.product.dev.com:30115/",
-          target: "http://172.16.34.80:18082",
+          // target: "http://172.16.34.80:18082",
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/api/, "/tianhui-admin-web"),
         },