odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
邓洁
2024-01-17 15:18:50 +08:00
parent 797cf8371e 30b007ff9d
commit 9a8e70b425
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/content/tunnelScene/PreviewScene.vue
View File

@@ -89,7 +89,7 @@ watch(
() => params.tunnelLen,
(now) => {
params.tunnelLen = now;
console.log(params.tunnelLen);
// console.log(params.tunnelLen);
pointGap = params.tunnelLen.value / 20;
},
{ deep: true }

25
src/components/content/tunnelScene/preEquComp/preDialog.vue
View File

@@ -8,24 +8,27 @@
<div class="setting">
<div class="setting-item">
<p>传感器类型</p>
<el-select v-model="equipmentSetting.equipmentType" :fit-input-width="true" filterable clearable
<!-- <el-select v-model="equipmentSetting.equipmentType" :fit-input-width="true" filterable clearable
:placeholder="params.equipmentType" disabled>
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-select> -->
<p>{{ params.equipmentType }}</p>
</div>
<div class="setting-item">
<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.equipmentName" disabled>
<el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-select> -->
<p>{{ params.equipmentName }}</p>
</div>
<input-num name="阈值" :placeholder="params.equipmentValue" @inputValue="handelInput"
<!-- <input-num name="阈值" :placeholder="params.equipmentValue" @inputValue="handelInput"
:disabled="isDisabledInputNum" />
<p>{{ params.equipmentValue }}</p> -->
</div>
<div class="btn">
<button @click="removeEquipment" disabled>删除</button>
<button @click="addEquipment" disabled>添加</button>
<!-- <button @click="removeEquipment" disabled>删除</button> -->
<!-- <button @click="addEquipment" disabled>添加</button> -->
</div>
</div>
</template>
@@ -55,9 +58,9 @@ let p = ref(57);
// emit("EquInf");
// }
console.log(params.equipmentType);
console.log(params.equipmentName);
console.log(params.equipmentValue);
// console.log(params.equipmentType);
// console.log(params.equipmentName);
// console.log(params.equipmentValue);
@@ -212,7 +215,7 @@ const equipment = {
padding: 30px 30px 10px 30px;
p {
width: 130px;
width: 190px;
height: 35px;
font-size: 26px;
font-family: MicrosoftYaHei;