|
@@ -15,7 +15,7 @@
|
|
<el-option label="地址" value="1"></el-option>
|
|
<el-option label="地址" value="1"></el-option>
|
|
<el-option label="经纬度" value="2"></el-option>
|
|
<el-option label="经纬度" value="2"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
- <input class="search-input-latlng" v-if="selectedSearchAdress === '2'" @input="handleSearch" autocomplete="off" @keydown="handleKeyDown" placeholder="输入经纬度" />
|
|
|
|
|
|
+ <input class="search-input-latlng" v-if="selectedSearchAdress === '2'" @input="handleSearch" autocomplete="off" @keydown="handleKeyDown" placeholder="39.908739,116.397513" />
|
|
<input class="search-input-address" v-else id="searchInput" @input="handleSearch" autocomplete="off" placeholder="输入地址" />
|
|
<input class="search-input-address" v-else id="searchInput" @input="handleSearch" autocomplete="off" placeholder="输入地址" />
|
|
<!-- <input id="searchInput" @input="handleSearch" autocomplete="off" @keydown="handleKeyDown" :placeholder="selectedSearchAdress === '1' ? '输入地址' : '输入经纬度'" /> -->
|
|
<!-- <input id="searchInput" @input="handleSearch" autocomplete="off" @keydown="handleKeyDown" :placeholder="selectedSearchAdress === '1' ? '输入地址' : '输入经纬度'" /> -->
|
|
</div>
|
|
</div>
|
|
@@ -96,7 +96,9 @@ let poiPicker: any = null
|
|
const AMAP_KEY = '2ae5a7713612a8d5a65cfd54c989c969'
|
|
const AMAP_KEY = '2ae5a7713612a8d5a65cfd54c989c969'
|
|
const selectedSearchAdress = ref('1')
|
|
const selectedSearchAdress = ref('1')
|
|
const searchInputValue = ref('')
|
|
const searchInputValue = ref('')
|
|
-
|
|
|
|
|
|
+// 根基app打开不同地址
|
|
|
|
+const appId = import.meta.env.VITE_APP_APP || 'fire'
|
|
|
|
+const url = 'http://test-mix3d.4dkankan.com'
|
|
// 防抖定时器
|
|
// 防抖定时器
|
|
let searchDebounceTimer: number | null = null
|
|
let searchDebounceTimer: number | null = null
|
|
// 监听visible变化
|
|
// 监听visible变化
|
|
@@ -267,9 +269,9 @@ const locateByCoordinates = (lat: number, lng: number) => {
|
|
const searchResults = document.getElementById('searchResults')
|
|
const searchResults = document.getElementById('searchResults')
|
|
if (searchResults) {
|
|
if (searchResults) {
|
|
searchResults.innerHTML = `
|
|
searchResults.innerHTML = `
|
|
- <div style="padding: 16px; text-align: center; color: #606266;">
|
|
|
|
- <div style="font-weight: 500; margin-bottom: 8px;">经纬度定位成功</div>
|
|
|
|
- <div style="font-size: 12px;">
|
|
|
|
|
|
+ <div style="padding: 16px; text-align: center; color: #606266;width:345px;height: 106px;border: 1px solid #D9D9D9;">
|
|
|
|
+ <div style="font-weight: 500; margin-bottom: 8px;color:#67C23A;">经纬度定位成功</div>
|
|
|
|
+ <div style="font-size: 14px;color: #A7A7A7;">
|
|
纬度: ${lat}<br/>
|
|
纬度: ${lat}<br/>
|
|
经度: ${lng}
|
|
经度: ${lng}
|
|
</div>
|
|
</div>
|
|
@@ -318,9 +320,9 @@ const debouncedSearch = (inputValue: string, searchType: string) => {
|
|
const searchResults = document.getElementById('searchResults')
|
|
const searchResults = document.getElementById('searchResults')
|
|
if (searchResults) {
|
|
if (searchResults) {
|
|
searchResults.innerHTML = `
|
|
searchResults.innerHTML = `
|
|
- <div style="padding: 16px; text-align: center; color: #f56c6c;">
|
|
|
|
- <div style="font-weight: 500; margin-bottom: 8px;">经纬度格式错误</div>
|
|
|
|
- <div style="font-size: 12px; line-height: 1.5;">
|
|
|
|
|
|
+ <div style="padding: 16px; text-align: center; width:345px;height: 106px;border: 1px solid #D9D9D9;">
|
|
|
|
+ <div style="font-weight: 600; margin-bottom: 8px;color: #B3261E;">经纬度格式错误</div>
|
|
|
|
+ <div style="font-size: 12px; line-height: 1.5;color:#A7A7A7;">
|
|
请输入正确的经纬度格式:<br/>
|
|
请输入正确的经纬度格式:<br/>
|
|
纬度,经度(例如:23.11766,113.28122)<br/>
|
|
纬度,经度(例如:23.11766,113.28122)<br/>
|
|
纬度范围:-90 到 90<br/>
|
|
纬度范围:-90 到 90<br/>
|
|
@@ -532,16 +534,20 @@ const handleConfirm = async () => {
|
|
caseId: props.caseId,
|
|
caseId: props.caseId,
|
|
width: mapSizeInfo.width,
|
|
width: mapSizeInfo.width,
|
|
high: mapSizeInfo.height,
|
|
high: mapSizeInfo.height,
|
|
- listCover: uploadResult.url, // 封面图
|
|
|
|
|
|
+ listCover: '', // 封面图不传,等那边确定才会有
|
|
mapUrl: uploadResult.url, // 地图URL
|
|
mapUrl: uploadResult.url, // 地图URL
|
|
title: '方位图'
|
|
title: '方位图'
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
|
|
- ElMessage.success('方位图保存成功!')
|
|
|
|
console.log('方位图保存成功:', response)
|
|
console.log('方位图保存成功:', response)
|
|
- console.log(`http://test-mix3d.4dkankan.com/draw/index.html#/tabulation?caseId=${props.caseId}&tabulationId=${response.data.id}&token=${user.value.token}`)
|
|
|
|
- window.open(`http://test-mix3d.4dkankan.com/draw/index.html#/tabulation?caseId=${props.caseId}&tabulationId=${response.data.id}&token=${user.value.token}`, '_blank')
|
|
|
|
|
|
+ if(appId === 'fire'){
|
|
|
|
+ window.open(`${url}/draw/fire/index.html#/tabulation?caseId=${props.caseId}&tabulationId=${response.data.id}&token=${user.value.token}`, '_blank')
|
|
|
|
+ }else{
|
|
|
|
+ window.open(`${url}/draw/criminal/index.html#/tabulation?caseId=${props.caseId}&tabulationId=${response.data.id}&token=${user.value.token}`, '_blank')
|
|
|
|
+ }
|
|
|
|
+ // console.log(`http://test-mix3d.4dkankan.com/draw/index.html#/tabulation?caseId=${props.caseId}&tabulationId=${response.data.id}&token=${user.value.token}`)
|
|
|
|
+
|
|
handleClose()
|
|
handleClose()
|
|
} catch (error) {
|
|
} catch (error) {
|
|
console.error('保存方位图失败:', error)
|
|
console.error('保存方位图失败:', error)
|