Commit 505b72a5 authored by daniel's avatar daniel

fix(tracker): 轨迹优化

parent 5e4c2459
...@@ -49,6 +49,10 @@ public class CommonController { ...@@ -49,6 +49,10 @@ public class CommonController {
ALLOWED_FILE_TYPES.put(".rar", new byte[]{(byte) 0x52, (byte) 0x61, (byte) 0x72, (byte) 0x21, (byte) 0x1A, (byte) 0x07, 0x00}); ALLOWED_FILE_TYPES.put(".rar", new byte[]{(byte) 0x52, (byte) 0x61, (byte) 0x72, (byte) 0x21, (byte) 0x1A, (byte) 0x07, 0x00});
ALLOWED_FILE_TYPES.put(".7z", new byte[]{0x37, 0x7A, (byte) 0xBC, (byte) 0xAF, 0x27, 0x1C}); ALLOWED_FILE_TYPES.put(".7z", new byte[]{0x37, 0x7A, (byte) 0xBC, (byte) 0xAF, 0x27, 0x1C});
// GPS轨迹类型
ALLOWED_FILE_TYPES.put(".gpx", new byte[]{0x3C, 0x3F, 0x78, 0x6D, 0x6C});
ALLOWED_FILE_TYPES.put(".kml", new byte[]{0x3C, 0x3F, 0x78, 0x6D, 0x6C});
// 音频类型 // 音频类型
ALLOWED_FILE_TYPES.put(".mp3", new byte[]{0x49, 0x44, 0x33}); ALLOWED_FILE_TYPES.put(".mp3", new byte[]{0x49, 0x44, 0x33});
ALLOWED_FILE_TYPES.put(".wav", new byte[]{0x52, 0x49, 0x46, 0x46}); ALLOWED_FILE_TYPES.put(".wav", new byte[]{0x52, 0x49, 0x46, 0x46});
......
...@@ -296,32 +296,29 @@ function uploadFile(obj) { ...@@ -296,32 +296,29 @@ function uploadFile(obj) {
} }
reads.readAsDataURL(logoFile); reads.readAsDataURL(logoFile);
reads.onload = function (e) { reads.onload = function (e) {
//将处理完的图片文件上传到阿里云服务器
//上传LOGO图片
var formData = new FormData(); var formData = new FormData();
formData.append("uploadImg", logoFile); formData.append("file", logoFile);
$.ajax({ $.ajax({
url: 'https://event.geexek.com/upload/file.do', /*接口域名地址*/ url: '/api-common/v1/upload?folder=gk/gps&cmptId=' + getCmptId(),
type: 'post', type: 'post',
data: formData, data: formData,
contentType: false, contentType: false,
processData: false, processData: false,
success: function (res) { success: function (res) {
console.log(res); console.log(res);
if (res.code == "1") { if (res.code == 200) {
layer.msg('上传成功', { icon: 1, time: 1500 }); layer.msg('上传成功', { icon: 1, time: 1500 });
$('.equip-item[data-id=' + dataId + ']').attr('data-file-name', logoFile.name); $('.equip-item[data-id=' + dataId + ']').attr('data-file-name', logoFile.name);
$('.equip-item[data-id=' + dataId + ']').attr('data-file-url', res.result); $('.equip-item[data-id=' + dataId + ']').attr('data-file-url', res.content);
$('.equip-item[data-id=' + dataId + ']').attr('data-file-size', logoFile.size / 1024); $('.equip-item[data-id=' + dataId + ']').attr('data-file-size', logoFile.size / 1024);
$('#gpsName').text(logoFile.name); $('#gpsName').text(logoFile.name);
saveRoad(dataId, pathId, pathName, logoFile.name, res.result, logoFile.size / 1024); saveRoad(dataId, pathId, pathName, logoFile.name, res.content, logoFile.size / 1024);
clearLayers() clearLayers()
loadGps(res.result); loadGps(res.content);
// $('.equip-item[data-id='+dataId+']').find('.edit-new').trigger('click');
$('#route-file').val(''); $('#route-file').val('');
window.location.reload(); window.location.reload();
} else { } else {
console.log(res); layer.msg(res.msg || '上传失败', { icon: 2 });
} }
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment