Merge remote-tracking branch 'origin/main' into main

web/src/views/testdata/datamanagement/index.vue

@@ -1665,11 +1665,11 @@ const pngobj: any = ref({
     textcontent: []
 })
 function pngsure() {
-    if (!(pngradio.value && txtradio.value && configradio.value)) {
+    // configradio.value
+    if (!(pngradio.value && txtradio.value)) {
         ElMessage.warning('请选择底图或地理信息文件')
         return
     }
-
     // 创建新的响应式对象
     const newPngobj = {
         pngurl: '',
@@ -1750,7 +1750,7 @@ const qvehuan: any = ref(false)
 const qvehuan1: any = ref(false)
 function frequency(row: any) {
     startSimpleNavi({
-        samTimes: maptime.value, id: fredid.value, token: userStore.userId, taskId: projectId.value, configId: configradio.value
+        samTimes: maptime.value, id: fredid.value, token: userStore.userId, taskId: projectId.value, configId: ''
     }).then((res: any) => {
         if (res.code == '0' && row) {
             ElMessage.success("切换成功")
@@ -2286,10 +2286,10 @@ function isConversion(fileName: string) {
             top="30px" draggable destroy-on-close>
             <div v-loading="pngloading">
                 <div class="map_select" style="margin-top: 0px;">
-                    <div style="width: 220px;margin-top: 5px;">请选择配置文件(trj_config*.txt)：</div>
-                    <el-radio-group v-model="configradio">
+                    <!-- <div style="width: 220px;margin-top: 5px;">请选择配置文件(trj_config*.txt)：</div> -->
+                    <!-- <el-radio-group v-model="configradio">
                         <el-radio v-for="(item, index) in conarr" :value="item.id">{{ item.fileName }}</el-radio>
-                    </el-radio-group>
+                    </el-radio-group> -->
                 </div>
                 <div style="margin:0px 0px  15px 0px ;">
                     <span>设定采样频率：</span>