唐润平:test
This commit is contained in:
@@ -125,7 +125,6 @@ async function handleMounted() {
|
|||||||
demo.initDevicesModel(map);
|
demo.initDevicesModel(map);
|
||||||
// 初始化
|
// 初始化
|
||||||
modelList.value = await initData(params.tunnelId, params.form);
|
modelList.value = await initData(params.tunnelId, params.form);
|
||||||
console.log("init", params.tunnelId);
|
|
||||||
demo.editTunnelInit(modelList.value);
|
demo.editTunnelInit(modelList.value);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
ElMessage({
|
ElMessage({
|
||||||
|
|||||||
@@ -70,17 +70,7 @@ const pointDistance_str = computed(
|
|||||||
() =>
|
() =>
|
||||||
`${params.pointGap}米*${params.pointNum}=${(
|
`${params.pointGap}米*${params.pointNum}=${(
|
||||||
params.pointGap * params.pointNum
|
params.pointGap * params.pointNum
|
||||||
).toFixed(2)}米`
|
).toFixed(1)}米`
|
||||||
);
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => params.form,
|
|
||||||
() => {
|
|
||||||
initData(params.tunnelId, params.form);
|
|
||||||
},
|
|
||||||
{
|
|
||||||
deep: true,
|
|
||||||
}
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// 请求数据模型
|
// 请求数据模型
|
||||||
@@ -106,11 +96,13 @@ function resetEquipmentSetting() {
|
|||||||
// 绑定选择的设备类型
|
// 绑定选择的设备类型
|
||||||
function handleTypeChange(optionItem) {
|
function handleTypeChange(optionItem) {
|
||||||
equipmentSetting.equipmentType = optionItem.value;
|
equipmentSetting.equipmentType = optionItem.value;
|
||||||
|
console.log("option", optionItem);
|
||||||
}
|
}
|
||||||
function handleEquipmentChange(equipmentItem) {
|
function handleEquipmentChange(equipmentItem) {
|
||||||
equipmentSetting.equipmentName = equipmentItem.label;
|
equipmentSetting.equipmentName = equipmentItem.label;
|
||||||
equipmentSetting.equipmentId = equipmentItem.equipmentId;
|
equipmentSetting.equipmentId = equipmentItem.equipmentId;
|
||||||
equipmentSetting.typeKey = equipmentItem.value;
|
equipmentSetting.typeKey = equipmentItem.value;
|
||||||
|
console.log("option", equipmentItem);
|
||||||
}
|
}
|
||||||
// 设备类型选项参数
|
// 设备类型选项参数
|
||||||
let options = reactive([{ label: "暂无数据", value: "" }]);
|
let options = reactive([{ label: "暂无数据", value: "" }]);
|
||||||
@@ -180,6 +172,7 @@ function addEquipment() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
equipmentSetting.position = params.position;
|
equipmentSetting.position = params.position;
|
||||||
|
console.log("add", equipmentSetting);
|
||||||
// 合法请求
|
// 合法请求
|
||||||
saveEquipment(equipmentSetting, params.pointGap)
|
saveEquipment(equipmentSetting, params.pointGap)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ export const initData = (tunnelId, otherInfo) => {
|
|||||||
.then((res) => {
|
.then((res) => {
|
||||||
originData = toRaw(otherInfo);
|
originData = toRaw(otherInfo);
|
||||||
if (res.data.tunnelThreeConfig) {
|
if (res.data.tunnelThreeConfig) {
|
||||||
console.log("data", res.data);
|
|
||||||
modelEquipmentList = JSON.parse(res.data.tunnelThreeConfig);
|
modelEquipmentList = JSON.parse(res.data.tunnelThreeConfig);
|
||||||
}
|
}
|
||||||
console.log("test", modelEquipmentList, originData);
|
console.log("test", modelEquipmentList, originData);
|
||||||
@@ -107,7 +106,7 @@ export const deleteEquipment = (equipmentId, pointGap) => {
|
|||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res?.code === 1000) {
|
if (res?.code === 1000) {
|
||||||
modelEquipmentList = modelEquipmentList.filter(
|
modelEquipmentList = modelEquipmentList.filter(
|
||||||
(item) => item.equipmentId === equipmentId
|
(item) => item.equipmentId != equipmentId
|
||||||
);
|
);
|
||||||
resolve();
|
resolve();
|
||||||
}
|
}
|
||||||
@@ -141,5 +140,6 @@ function hasEquipment(equipmentId) {
|
|||||||
modelEquipmentList.forEach((item) => {
|
modelEquipmentList.forEach((item) => {
|
||||||
if (item.equipmentId === equipmentId) result = true;
|
if (item.equipmentId === equipmentId) result = true;
|
||||||
});
|
});
|
||||||
|
console.log("add", modelEquipmentList);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user