From 393eab02486ff5f650ed8bd62be6d0f70e12a532 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Sat, 11 May 2024 16:09:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dangerWeakProject/inspectTasks/taskDetails.vue | 14 +++++++-------
 .../maintenance/maintenanceRecords/index.vue       |  2 +-
 .../supervisionInspetion/tasksManage/index.vue     |  6 +-----
 .../tasksManage/tasksDetails.vue                   |  4 ++--
 .../waterRainReport/smartAnalyse/index.vue         |  2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/views/sluice/runManage/dangerWeakProject/inspectTasks/taskDetails.vue b/src/views/sluice/runManage/dangerWeakProject/inspectTasks/taskDetails.vue
index d5cc854..98fff70 100644
--- a/src/views/sluice/runManage/dangerWeakProject/inspectTasks/taskDetails.vue
+++ b/src/views/sluice/runManage/dangerWeakProject/inspectTasks/taskDetails.vue
@@ -19,7 +19,7 @@ export default {
       paramsData: {
         name: "",
         type: null,
-        dikeName: "",
+        wagaName: "",
         selectLevel: "",
         selectType: "",
       },
@@ -358,8 +358,8 @@ export default {
           this.$refs.ruleForm.validate((valid) => {
             if (valid) {
               if (
-                !this.ruleForm.dikeList ||
-                this.ruleForm.dikeList.length < 1
+                !this.ruleForm.wagaList ||
+                this.ruleForm.wagaList.length < 1
               ) {
                 this.$message.error("请至少添加一个堤防");
                 return;
@@ -367,11 +367,11 @@ export default {
 
               let formData = {
                 ...this.ruleForm,
-                dikeCode: this.ruleForm.dikeList
-                  .map((item) => item.dikeCode)
+                wagaCode: this.ruleForm.wagaList
+                  .map((item) => item.wagaCode)
                   .join(","),
-                dikeName: this.ruleForm.dikeList
-                  .map((item) => item.dikeName)
+                wagaName: this.ruleForm.wagaList
+                  .map((item) => item.wagaName)
                   .join(","),
               };
               if (this.$route.query.id) {
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
index 9471e29..894342a 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
@@ -363,7 +363,7 @@ export default {
 <template>
   <div class="slider-right">
     <div class="top-title">
-      {{ $router.currentRoute.meta.title }} - {{ $route.query.dikeName }}
+      {{ $router.currentRoute.meta.title }} - {{ $route.query.wagaName }}
     </div>
     <div class="table-box">
       <div class="top-search">
diff --git a/src/views/sluice/runManage/supervisionInspetion/tasksManage/index.vue b/src/views/sluice/runManage/supervisionInspetion/tasksManage/index.vue
index b19e9cb..7579d5e 100644
--- a/src/views/sluice/runManage/supervisionInspetion/tasksManage/index.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/tasksManage/index.vue
@@ -101,11 +101,7 @@ export default {
         .catch(() => {});
     },
   },
-  created() {
-    this.getDicts("embankment_type").then((response) => {
-      this.dikeTypeList = response.data;
-    });
-  },
+  created() {},
   mounted() {
     // 获取列表数据
     this.getTableData();
diff --git a/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue b/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
index 20f86c8..d2bfc98 100644
--- a/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
@@ -18,7 +18,7 @@ export default {
       paramsData: {
         name: "",
         type: null,
-        dikeName: "",
+        wagaName: "",
         selectLevel: "",
         selectType: "",
       },
@@ -164,7 +164,7 @@ export default {
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
         wagaCode: [],
-        dikeName: "",
+        wagaName: "",
         name: "",
         type: "",
         instruction: "",
diff --git a/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue b/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue
index 4a7030c..1d7b14e 100644
--- a/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue
+++ b/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue
@@ -113,7 +113,7 @@ import {
   getRainfallAndGateFlowApi,
   getWaterLevelInfoApi,
 } from "@/api/sluice/index.js";
-import { getYearRainfallData } from "@/api/dike/analysis";
+import { getYearRainfallData } from "@/api/sluice/analysis";
 
 import dayjs from "dayjs";
 

From 17af035fd8a51c233380919c35aeff4e237deb68 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Fri, 24 May 2024 09:48:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=AC=A2=E8=BF=8E?=
 =?UTF-8?q?=E9=A1=B5=E8=AF=9D=E6=9C=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/welcome/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue
index 0827d16..fa5db23 100644
--- a/src/views/welcome/index.vue
+++ b/src/views/welcome/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="welcome-page">欢迎来到广东水工程运行管理系统~</div>
+  <div class="welcome-page">欢迎来到智慧水利工程应用~</div>
 </template>
 <style scoped lang="scss">
 .welcome-page{

From eef765202c50b5b591baa4115c65cc8df304b067 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Mon, 27 May 2024 16:15:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=BB=B6=E6=97=B6=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=BC=95=E6=93=8Esdk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/public/index.html b/public/index.html
index 778bf66..0aed559 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,15 +7,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <script src="./config.js"></script>
-    
+
     <!-- <link href="./lib/Cesium/Widgets/widgets.css" rel="stylesheet" /> -->
     <link href="./lib/sycim/sycim.min.css" rel="stylesheet" />
-    <script src="./lib/sycim/sycim.min.js"></script>
-    <script>
-      window.Cesium = sycim.Cesium;
-      sycim.config.baseUrl = "./lib/sycim/resources/";
-    </script>
-    <script src="./lib/SuperMap3D/SuperMap3D.js"></script>
+
     <title><%= webpackConfig.name %></title>
 
 	  <style>
@@ -214,5 +209,23 @@
 		    <div class="load_title">正在加载系统资源，请耐心等待</div>
         </div>
 	</div>
+  <script>
+    function downloadJs(url){
+      var script = document.createElement('script');
+      script.type = 'text/javascript'
+      script.src = url;
+      document.body.appendChild(script);
+    }
+    window.onload = function(){
+      console.log('window.onload')
+      downloadJs('./lib/sycim/sycim.min.js');
+      setTimeout(() => {
+
+        window.Cesium = sycim.Cesium;
+        sycim.config.baseUrl = "./lib/sycim/resources/";
+        downloadJs('./lib/SuperMap3D/SuperMap3D.js');
+      }, 500);
+    }
+  </script>
   </body>
 </html>