初始化接口绑定完全完成

This commit is contained in:
Hcat
2023-12-22 18:04:05 +08:00
parent 6e8d651b52
commit 2eeba5ee7e
4 changed files with 44 additions and 51 deletions

View File

@@ -50,6 +50,7 @@ import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
import { onMounted, reactive, ref } from "vue"; import { onMounted, reactive, ref } from "vue";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import { useModelSceneStore } from "@/store/modelSceneStore"; import { useModelSceneStore } from "@/store/modelSceneStore";
import { toRaw } from "vue"
// 获取html标签跟随组件dom // 获取html标签跟随组件dom
const content = ref(null); const content = ref(null);
const info = ref(null); const info = ref(null);
@@ -63,7 +64,7 @@ let backColorSet = three.sRGBEncoding;
const params = defineProps(["isedit", "tunnelId"]); //接收参数看是不是编辑模式,如果是编辑模式,则需要做一些处理 const params = defineProps(["isedit", "tunnelId"]); //接收参数看是不是编辑模式,如果是编辑模式,则需要做一些处理
// alert(params.isedit)
let isedit = ref(params.isedit) let isedit = ref(params.isedit)
@@ -86,8 +87,12 @@ async function handleMounted() {
//加载HDR背景图片 //加载HDR背景图片
demo.loadBackground(hdrLoader, backColorSet); demo.loadBackground(hdrLoader, backColorSet);
console.log("xxxx", params.tunnelId); watch(
const text = await store.initData(params.tunnelId); () => params.tunnelId,
async () => {
const text = await store.initData(params.tunnelId);
}
);
// 初始化设备模型 // 初始化设备模型
try { try {
//在这加载隧道 //在这加载隧道
@@ -98,6 +103,7 @@ async function handleMounted() {
demo.initDevicesModel(map); demo.initDevicesModel(map);
const equipmentList = await store.getEquipmentList(); const equipmentList = await store.getEquipmentList();
demo.previewtunnelModeInit(equipmentList); demo.previewtunnelModeInit(equipmentList);
// previewEquInfProcess(equipmentList)
} catch (err) { } catch (err) {
console.log(err); console.log(err);
} }
@@ -165,7 +171,9 @@ function rClickCallback(demo) {
hasDevice = targetPoint.hasDevice; hasDevice = targetPoint.hasDevice;
targetP = targetPoint; targetP = targetPoint;
//点击之后马上调用这个函数变成回调然后进行处理处理在传给preview表单 //点击之后马上调用这个函数变成回调然后进行处理处理在传给preview表单
previewEquInfProcess() const equipmentList = store.getEquipmentList().then((result) => {
previewEquInfProcess(result, targetP)
});
pointNum.value = Number( pointNum.value = Number(
targetPoint.name.substring( targetPoint.name.substring(
targetPoint.name.indexOf("_") + 1, targetPoint.name.indexOf("_") + 1,
@@ -227,60 +235,40 @@ function handleCancel() {
demo._resetState(); demo._resetState();
demo.clearTagsObj(); demo.clearTagsObj();
} }
//我们的数据应该在哪个获取并将其传入进去呢?
//是在demo.js中还是我们这二个PreviewScene或者editDialog呢
//按目前我这写的逻辑,好像是获取了二次??,有没有办法可以把里面的导出到这呢?
// console.log(demo.isControlOrbit());
let equipmentType = ref(0) let equipmentType = ref(0)
let equipmentName = ref(0) let equipmentName = ref(0)
let equipmentValue = ref(0) let equipmentValue = ref(0)
function previewEquInfProcess() { function previewEquInfProcess(equipmentList, targetP) {
//3个信息都可以完全获取之后我们可以进行信息处理再传进去就可以了 for (const equipment of equipmentList) {
// console.log(demo); // console.log(equipment);
// console.log(targetP.name); if (equipment.position == targetP.name) {
// console.log(demo.ThreeConfig.data.tunnelThreeConfig);
let tunnelThreeConfig = demo.ThreeConfig.data.tunnelThreeConfig
for (const equipment of tunnelThreeConfig) {
if (equipment.pointName == targetP.name) {
equipmentType.value = equipment.equipmentType equipmentType.value = equipment.equipmentType
equipmentName.value = equipment.equipmentName //需要将获取到的设备列表进行序列化
equipmentValue.value = equipment.equipmentValue equipmentName.value = toRaw(equipment.chooseEquipment).label
console.log(equipmentType.value); equipmentValue.value = equipment.threshold
console.log(equipmentName.value); if (equipmentType.value == 'frequency') {
console.log(equipmentValue.value); equipmentType.value = '风机'
}
if (equipmentType.value == 'windPressure') {
equipmentType.value = '风压传感器'
}
if (equipmentType.value == 'sensor') {
equipmentType.value = '其他传感器'
}
// console.log(equipmentType.value);
// console.log(equipmentName.value);
// console.log(equipmentValue.value);
} }
} }
} }
// let equipmentType = reactive(previewEquInfProcess().equipmentType)
// let equipmentName = reactive(previewEquInfProcess().equipmentName)
// let equipmentValue = reactive(previewEquInfProcess().equipmentValue)
// console.log(equipmentType);
const ThreeConfig = {
code: 0,
data: {
tunnelThreeConfig: [{
equipmentId: 'fan_01',//传感器id
equipmentName: '01',//设备名称
pointName: 'point_005_tl',//附着点名称(定位)
equipmentType: 'fan',//设备类型(类型可根据后端
equipmentValue: 23, //设备存的值
}, {
equipmentId: 'sensors_01',//传感器id
equipmentName: '01',//设备名称
pointName: 'point_009_bl',//附着点名称(定位)
equipmentType: 'sensors',//设备类型(类型可根据后端
equipmentValue: 67, //设备存的值
}],
},
msg: "dda"
}
</script> </script>

View File

@@ -87,8 +87,12 @@ async function handleMounted() {
//加载HDR背景图片 //加载HDR背景图片
demo.loadBackground(hdrLoader, backColorSet); demo.loadBackground(hdrLoader, backColorSet);
console.log("xxxx", params.tunnelId); watch(
const text = await store.initData(params.tunnelId); () => params.tunnelId,
async () => {
const text = await store.initData(params.tunnelId);
}
);
// 初始化设备模型 // 初始化设备模型
try { try {
const map = new Map(); const map = new Map();

View File

@@ -1,7 +1,8 @@
<template> <template>
<div id="input-num"> <div id="input-num">
<p>{{ params.name }}</p> <p>{{ params.name }}</p>
<input type="text" :placeholder="params.placeholder" @input="handleChange" :disabled="params.disabled" /> <input type="text" :placeholder="params.placeholder" @input="handleChange" :disabled="params.disabled" readonly
unselectable="on" οnfοcus="this.blur();" />
</div> </div>
</template> </template>

View File

@@ -16,7 +16,7 @@
<div class="setting-item"> <div class="setting-item">
<p>设备选择</p> <p>设备选择</p>
<el-select v-model="equipmentSetting.chooseEquipment" :fit-input-width="true" filterable clearable <el-select v-model="equipmentSetting.chooseEquipment" :fit-input-width="true" filterable clearable
:placeholder="params.equipmentValue" disabled> :placeholder="params.equipmentName" disabled>
<el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</div> </div>
@@ -55,9 +55,9 @@ let p = ref(57);
// emit("EquInf"); // emit("EquInf");
// } // }
// console.log(params.equipmentType); console.log(params.equipmentType);
// console.log(params.equipmentName); console.log(params.equipmentName);
// console.log(params.equipmentValue); console.log(params.equipmentValue);