Merge remote-tracking branch 'origin/feature-no-sdk' into feature-no-sdk

src/views/Main/Dike/components/BaseInfo.vue

@@ -142,7 +142,7 @@
           </el-descriptions-item>
         </el-descriptions>
       </el-tab-pane>
-      <el-tab-pane label="堤防横断面特征值" name="2" v-model="activeName" @tab-click="handleChangeTab" class="sub-tabs">
+      <el-tab-pane label="堤防横断面特征值" name="2" class="sub-tabs">
         <el-table
             :data="hdmzData"
             style="color: black"
@@ -184,184 +184,14 @@
               prop="intrCh"
               min-width="200"
           />
-          <el-table-column
-              label="至起始断面距离"
-              align="center"
-              prop="tointrDs"
-              min-width="200"
-          />
-          <el-table-column
-              label="起测点位置"
-              align="center"
-              prop="jmsrpnPl"
-              min-width="200"
-          />
-          <el-table-column
-              label="起测点高程"
-              align="center"
-              prop="jmsrpneLev"
-              min-width="200"
-          />
-          <el-table-column
-              label="堤身土质"
-              align="center"
-              prop="bnbdSlch"
-              min-width="200"
-          />
-          <el-table-column
-              label="堤身防渗形式"
-              align="center"
-              prop="bnbdAntp"
-              min-width="200"
-          />
-          <el-table-column
-              label="堤基地质"
-              align="center"
-              prop="bnbsGl"
-              min-width="200"
-          />
-          <el-table-column
-              label="堤基防渗形式"
-              align="center"
-              prop="bnbsAntp"
-              min-width="200"
-          />
-          <el-table-column
-              label="堤身净高度"
-              align="center"
-              prop="bnbdHigh"
-              min-width="200"
-          />
-          <el-table-column
-              label="堤顶高程"
-              align="center"
-              prop="bntpeLev"
-              min-width="200"
-          />
-          <el-table-column
-              label="堤顶超高"
-              align="center"
-              prop="bntpFr"
-              min-width="200"
-          />
-          <el-table-column
-              label="堤顶宽度"
-              align="center"
-              prop="bntpWd"
-              min-width="200"
-          />
-          <el-table-column
-              label="迎河面堤脚高程"
-              align="center"
-              prop="upbnToel"
-              min-width="200"
-          />
-          <el-table-column
-              label="背河面堤脚高程"
-              align="center"
-              prop="dwbnToel"
-              min-width="200"
-          />
-          <el-table-column
-              label="迎河坡坡比"
-              align="center"
-              prop="upslSlrt"
-              min-width="200"
-          />
-          <el-table-column
-              label="背河坡坡比"
-              align="center"
-              prop="dwslSlrt"
-              min-width="200"
-          />
-          <el-table-column
-              label="迎河坡坡比"
-              align="center"
-              prop="upslSlrt"
-              min-width="200"
-          />
-          <el-table-column
-              label="迎河坡护坡情况"
-              align="center"
-              prop="uspsIn"
-              min-width="200"
-          />
-          <el-table-column
-              label="背河坡护坡情况"
-              align="center"
-              prop="dspsIn"
-              min-width="200"
-          />
-          <el-table-column
-              label="迎河面滩地宽度"
-              align="center"
-              prop="upbtWide"
-              min-width="200"
-          />
-          <el-table-column
-              label="迎河面滩地宽度"
-              align="center"
-              prop="upbtWide"
-              min-width="200"
-          />
-          <el-table-column
-              label="迎河面平台(前戗)顶高程"
-              align="center"
-              prop="ufrteLev"
-              min-width="200"
-          />
-          <el-table-column
-              label="迎河面平台(前戗)顶宽"
-              align="center"
-              prop="ufrtWide"
-              min-width="200"
-          />
-          <el-table-column
-              label="迎河面平台(前戗)坡度"
-              align="center"
-              prop="upflRfsl"
-              min-width="200"
-          />
-          <el-table-column
-              label="背河面平台(后戗)顶高程"
-              align="center"
-              prop="dfrtEl"
-              min-width="200"
-          />
-          <el-table-column
-              label="背河面平台(后戗)顶高程"
-              align="center"
-              prop="dfrtEl"
-              min-width="200"
-          />
-          <el-table-column
-              label="背河面平台(后戗)顶宽"
-              align="center"
-              prop="dfrtWide"
-              min-width="200"
-          />
-          <el-table-column
-              label="背河面平台(后戗)坡度"
-              align="center"
-              prop="dwflRfsl"
-              min-width="200"
-          />
-          <el-table-column
-              label="备注"
-              align="center"
-              prop="note"
-              min-width="200"
-          />
-
 
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="历史决溢记录" name="4"  v-model="activeName" @tab-click="handleChangeTab" class="sub-tabs">
+      <el-tab-pane label="历史决溢记录" name="4"  class="sub-tabs">
         <el-table
             :data="overflows"
             style="color: black"
         >
-          <el-table-column type="selection" width="55" align="center" fixed />
           <el-table-column
               label="序号"
               type="index"
@@ -374,7 +204,9 @@
               align="center"
               prop="dikeName"
               min-width="200"
-          />
+          >
+            {{ form.dikeName }}
+          </el-table-column>
           <el-table-column
               label="记录更新时间"
               align="center"
@@ -419,7 +251,6 @@ import { getDictLabel } from "@/utils/dictUtils";
 const props = defineProps({
   resCode: {
     type: String,
-    default: "HP0174401000000148",
   },
   pattOptions: {
     type: Array<{ dictLabel: string; dictValue: string }>,
@@ -446,7 +277,6 @@ const hdmzData: any=ref([]);
 const overflows: any=ref([])
 const form: any = ref({});
 const emits = defineEmits(["getResInfo"]);
-
 function initBaseInfo() {
   getJbxx(props.resCode).then((res) => {
     if (res) {
@@ -509,6 +339,8 @@ function initBaseAndRsppInfo() {
 function initData() {
   activeName.value = "1";
   initBaseAndRsppInfo();
+  initHdmtzz();
+  initJyjl()
 }
 
 function handleChangeTab() {

src/views/Main/Dike/components/safetyAppraisal.vue

@@ -9,11 +9,11 @@
             format="YYYY-MM-DD"
             value-format="YYYY-MM-DD"
             placeholder="选择日期"
-            @change="initSafe"
             style="color: black"
         />
       </div>
       <div class="right-options">
+        <el-button   type="primary" class="search-btn !ml-12" @click="handleSearch">查询</el-button>
         <el-button  @click="resetFilter">重置</el-button>
       </div>
     </div>
@@ -139,7 +139,9 @@ const currentRow = reactive({
   unitQualification: '',
   mainIssues: ''
 });
-
+const handleSearch = () => {
+  initSafe();
+};
 // Dialog visibility
 const dialogVisible = ref(false);
 

src/views/Main/Sluice/components/BaseInfo.vue

@@ -428,7 +428,6 @@ import { getDictLabel } from "@/utils/dictUtils";
 const props = defineProps({
   resCode: {
     type: String,
-    default: "HP0074405150000010",
   },
   projTypeOptions: {
     type: Array<{ dictLabel: string; dictValue: string }>,

src/views/Main/Sluice/components/safetyAppraisal.vue

@@ -9,11 +9,11 @@
             format="YYYY-MM-DD"
             value-format="YYYY-MM-DD"
             placeholder="选择日期"
-            @change="initSafe"
             style="color: black"
         />
       </div>
       <div class="right-options">
+        <el-button   type="primary" class="search-btn !ml-12" @click="handleSearch">查询</el-button>
         <el-button  @click="resetFilter">重置</el-button>
       </div>
     </div>
@@ -126,6 +126,12 @@ const currentRow = reactive({
   unitQualification: '',
   mainIssues: ''
 });
+const handleSearch = () => {
+  initSafe();
+};
+const handleOverlayClick = (e: MouseEvent) => {
+  dialogVisible.value = false;
+};
 
 // View function
 const handleView = (row: any) => {

src/views/Main/index.vue

@@ -60,9 +60,9 @@ const showBottomPanel = ref(true);
 const showLayerTree = ref(false);
 const showReservoir = ref(false); // 水库详情弹窗
 const reservoirData = ref({});
-const showSluice = ref(true); // 水闸详情弹窗
+const showSluice = ref(false); // 水闸详情弹窗
 const sluiceData = ref({});
-const showDike = ref(false); // 堤防详情弹窗
+const showDike = ref(true); // 堤防详情弹窗
 const dikeData = ref({});
 function layerTreeChange(val: boolean) {
   showLayerTree.value = val;