tangning 2 hónapja
szülő
commit
30a52f5fdd

+ 2 - 2
src/store/case.ts

@@ -308,7 +308,7 @@ export const getTipsList = (key) =>
   });
 
   export const getGaoDeGaoDeList = (key) =>{
-    let url = `https://restapi.amap.com/v3/geocode/geo?address=${key}&output=JSON&key=3609daa52e8ae4493393292213e2fb98`
+    let url = `https://restapi.amap.com/v3/place/text?keywords=${key}&page=1&offset=5&output=JSON&key=3609daa52e8ae4493393292213e2fb98`
     return axios.post('/fusion/notAuth/forwardReq',  { 
           "method":"get",
           url,
@@ -368,7 +368,7 @@ export const getUrlSrc = (item, caseId) => {
   param.swssUrl = `${params.swssUrl}?lang=${langKey}&serve_link=${param.laserRoot}&basePath=${param.laserRoot}&m=${item.num}`;
   param.swssmxUrl = `${params.swssUrl}?lang=${langKey}&serve_link=${param.laserRoot}&basePath=${param.laserRoot}&m=${item.num}`;
   param.swkkUrl = `${params.swkkUrl}?lang=${langKey}&app_server=${params.ip}:${params.swkkPort}&m=${item.num}&app_resource=${param.root}/${item.mapping}`;
-  param.fuse = `${params.fuse}?caseId=${caseId}&ip=${params.ip}&ga=${params.ga}swkkPort=${params.swkkPort}&swssUrl=${params.swssUrl }&swkkUrl=${params.swkkUrl && params.swkkUrl.replace('epg','spg')}&laserServicePort=${params.laserServicePort}&servicePort=${params.servicePort}&lang=${langKey}&app_server=${ip}${params.swkkPort}&testMap=1&static=${params.static||''}&`;
+  param.fuse = `${params.fuse}?caseId=${caseId}&ip=${params.ip}&ga=${params.ga}&swkkPort=${params.swkkPort}&swssUrl=${params.swssUrl }&swkkUrl=${params.swkkUrl && params.swkkUrl.replace('epg','spg')}&laserServicePort=${params.laserServicePort}&servicePort=${params.servicePort}&lang=${langKey}&app_server=${ip}${params.swkkPort}&testMap=1&static=${params.static||''}&`;
   let SceneType = {
     0: param.swkkUrl,//`/spg.html?m=${item.num}`,
     1: param.swkkUrl,//`/spg.html?m=${item.num}`,

+ 1 - 0
src/view/case/draw/index.vue

@@ -98,6 +98,7 @@ const { board, state } = useBoard(props);
 getList()
 const backPageHandler = () => {
   board.value && board.value.clear();
+  board.value && board.value.reSet();
   router.replace({ name: RouteName.material, params: { caseId: props.caseId } });
   // router.back();
 };

+ 5 - 5
src/view/case/draw/selectMapleaftImages.vue

@@ -7,9 +7,9 @@
       clearable
       @change="onSearch"
     >
-      <!-- <template #append>
-        <el-button :icon="Search" />
-      </template> -->
+      <template #append>
+        <el-button @click="onSearch(keyword)" :icon="Search" />
+      </template>
     </el-input>
     <div class="rrr">
       <div class="search-result" v-show="keyword">
@@ -101,7 +101,7 @@ const caseId = computed(() => {
 });
 onMounted(async () => {
   caseInfoData.value = await getCaseInfo(caseId.value);
-  let center = [22.61, 113.05];
+  let center = [22.363947, 113.598948];
   if (caseInfoData.value?.latAndLong) {
     center = caseInfoData.value.latAndLong.split(",");
   }
@@ -177,7 +177,7 @@ const getMapInfo = (): MapInfo => {
 const onSearch = (val) => {
   getGaoDeGaoDeList(val).then((res) => {
     let data = res.data && JSON.parse(res.data);
-    keywordList.value = data.geocodes;
+    keywordList.value = data.pois;
     keyword.value = val;
     console.log("getTipsList",data, keywordList.value, keyword.value);
     // if(data && data.geocodes && data.geocodes.length > 0) {

+ 1 - 1
src/view/mediaLibrary/TableComponent.vue

@@ -500,7 +500,7 @@ const handleuploadAdd = async () => {
       console.log("上传进度", completeProgress);
       // props.progress = completeProgress; //上传过程
       loadingText.value = completeProgress + "%";
-      loading.setText(loadingText.value)
+      loading.setText(ui18n.t("mediaLibrary.tips.uplooad") + loadingText.value)
     }).then((res) => {
       loading.close();
       console.log("上传进度", res);