Compare commits
No commits in common. "627f7fde609f1e74a9284b8c07db344e74e5cf69" and "09dc7a61193dfb5c817301c20aced7d497473368" have entirely different histories.
627f7fde60
...
09dc7a6119
@ -1,24 +1,14 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport"
|
||||
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, viewport-fit=cover" />
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
||||
<title>H5移动端</title>
|
||||
<script>
|
||||
window._AMapSecurityConfig = {
|
||||
securityJsCode: "08c037da44c78afd7338203268c2d2a5"
|
||||
};
|
||||
</script>
|
||||
<script src="https://webapi.amap.com/loader.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/src/main.js"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, viewport-fit=cover" />
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
||||
<title>H5移动端</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/src/main.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -211,7 +211,6 @@ import { ref, onMounted, reactive, toRaw, watch } from "vue";
|
||||
import { useRouter, useRoute } from "vue-router";
|
||||
import { showToast, showLoadingToast } from "vant";
|
||||
import { request } from "../../../../shared/utils/request";
|
||||
import { loadAMap } from "../../../../shared/utils/amap";
|
||||
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
@ -219,7 +218,7 @@ const searchValue = ref(""); // 搜索框输入值
|
||||
const showPopup = ref(false); // 控制弹出层显示隐藏
|
||||
const yhzDetail = ref({}); // 养护站详情数据
|
||||
const materialList = ref([]); // 物资列表数据
|
||||
const getInitForm = () => ({
|
||||
const INIT_FORM = {
|
||||
material: {
|
||||
jd: "", // 物资经度
|
||||
wd: "", // 物资纬度
|
||||
@ -239,8 +238,8 @@ const getInitForm = () => ({
|
||||
remark: "", // 备注
|
||||
},
|
||||
photos: [],
|
||||
});
|
||||
const form = reactive(getInitForm());
|
||||
};
|
||||
const form = reactive({ ...INIT_FORM }); // 表单
|
||||
|
||||
// 根据养护站rid获取物资列表
|
||||
const getMaterialList = async (wzmc) => {
|
||||
@ -282,6 +281,15 @@ onMounted(() => {
|
||||
|
||||
// 购置日期相关
|
||||
const showTimePicker = ref(false);
|
||||
const currentDate = ref([
|
||||
new Date().getFullYear(),
|
||||
new Date().getMonth() + 1,
|
||||
new Date().getDate(),
|
||||
]);
|
||||
const onDateConfirm = ({ selectedValues }) => {
|
||||
form.rkrq = selectedValues.join("-");
|
||||
showTimePicker.value = false;
|
||||
};
|
||||
|
||||
// 选择单位相关
|
||||
const dwField = ref(null);
|
||||
@ -330,6 +338,7 @@ const handleSubmit = async () => {
|
||||
message: "新增成功",
|
||||
});
|
||||
onPopupClose();
|
||||
Object.assign(form, { ...INIT_FORM });
|
||||
getMaterialList(searchValue.value);
|
||||
} else {
|
||||
throw new Error(res.message);
|
||||
@ -414,38 +423,37 @@ const afterRead = async (file) => {
|
||||
};
|
||||
|
||||
// 获取经纬度
|
||||
const handleGetLocation = async () => {
|
||||
// 确保AMap完成加载
|
||||
if (!window.AMap) {
|
||||
await loadAMap();
|
||||
const handleGetLocation = () => {
|
||||
if (!navigator.geolocation) {
|
||||
showToast("您的浏览器不支持地理位置获取");
|
||||
return;
|
||||
}
|
||||
const loadingToast = showLoadingToast({
|
||||
message: "正在获取位置",
|
||||
|
||||
showLoadingToast({
|
||||
message: "定位中...",
|
||||
forbidClick: true,
|
||||
duration: 0, // 设置为0表示不会自动关闭
|
||||
zIndex: 9999,
|
||||
});
|
||||
|
||||
AMap.plugin("AMap.Geolocation", () => {
|
||||
const geolocation = new AMap.Geolocation({
|
||||
enableHighAccuracy: true,
|
||||
timeout: 5000,
|
||||
showMarker: false,
|
||||
zoomToAccuracy: true,
|
||||
});
|
||||
|
||||
geolocation.getCurrentPosition((status, result) => {
|
||||
if (status === "complete") {
|
||||
form.material.jd = result.position.lng.toFixed(6);
|
||||
form.material.wd = result.position.lat.toFixed(6);
|
||||
loadingToast.close();
|
||||
} else {
|
||||
loadingToast.close();
|
||||
showToast("定位失败 请检查网络情况后重试");
|
||||
console.log("result", result);
|
||||
}
|
||||
});
|
||||
});
|
||||
navigator.geolocation.getCurrentPosition(
|
||||
(position) => {
|
||||
form.material.jd = position.coords.longitude.toFixed(6);
|
||||
form.material.wd = position.coords.latitude.toFixed(6);
|
||||
},
|
||||
(error) => {
|
||||
const errorMessage =
|
||||
{
|
||||
1: "位置服务被拒绝",
|
||||
2: "暂时无法获取位置",
|
||||
3: "定位超时",
|
||||
}[error.code] || "定位失败";
|
||||
showToast(errorMessage);
|
||||
},
|
||||
{
|
||||
enableHighAccuracy: true, // 高精度模式
|
||||
timeout: 5000, // 超时时间
|
||||
maximumAge: 0, // 不缓存位置
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
watch(
|
||||
@ -497,9 +505,6 @@ const handleAdd = async () => {
|
||||
};
|
||||
|
||||
const onPopupClose = () => {
|
||||
Object.assign(form, getInitForm());
|
||||
fileList.value = [];
|
||||
[showDwPicker, showFzrPicker].forEach((v) => (v.value = false));
|
||||
showPopup.value = false;
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
export function loadAMap() {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (window.AMap) return resolve();
|
||||
|
||||
// 确保AMapLoader存在
|
||||
if (!window.AMapLoader) {
|
||||
return reject(new Error("AMapLoader未正确加载"));
|
||||
}
|
||||
|
||||
window.AMapLoader.load({
|
||||
key: "848ab05db2a57a7782c153119f50dcef",
|
||||
version: "2.0",
|
||||
})
|
||||
.then((AMap) => {
|
||||
window.AMap = AMap;
|
||||
console.log("AMap初始化完成", AMap);
|
||||
resolve();
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error("AMap加载失败:", err);
|
||||
reject(new Error("地图加载失败，请检查网络连接"));
|
||||
});
|
||||
});
|
||||
};
|
||||
Loading…
x
Reference in New Issue
Block a user