|
|
@@ -104,7 +104,7 @@
|
|
|
<el-table-column property="code" label="编号" /> -->
|
|
|
<el-table-column property="name" label="名称"/>
|
|
|
<el-table-column property="sectionType" label="截面类型" width="120" />
|
|
|
- <el-table-column property="roughCoe" label="阻力系数" width="120"/>
|
|
|
+ <el-table-column property="roughCoe" label="阻力系数(mm)" width="120"/>
|
|
|
<!-- <el-table-column property="sectionPara1" label="截面参数1" width="90" />
|
|
|
<el-table-column property="sectionPara2" label="截面参数2" width="90" />
|
|
|
<el-table-column property="sectionPara3" label="截面参数3" width="90" />
|
|
|
@@ -151,7 +151,7 @@
|
|
|
</el-tabs>
|
|
|
</div>
|
|
|
<!-- 添加弹窗 -->
|
|
|
- <el-dialog v-model="sdialog.adddialog" align-center :append-to-body="true" width="480" class="dialog_class bgcolor tianjia">
|
|
|
+ <el-dialog v-model="sdialog.adddialog" modal-class="summary-dlg" :fullscreen="false" :modal-append-to-body="false" draggable :modal="false" align-center :append-to-body="true" width="480" class="dialog_class bgcolor tianjia">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
|
@@ -194,7 +194,7 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 删除 -->
|
|
|
-<el-dialog v-model="sdialog.dialogsgdelect" align-center :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
|
|
|
+<el-dialog v-model="sdialog.dialogsgdelect" modal-class="summary-dlg" draggable :modal="false" align-center :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
|
@@ -216,7 +216,7 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 添加 -->
|
|
|
-<el-dialog v-model="sdialog.gdadddialog" align-center :modal="false" :close-on-click-modal="false"
|
|
|
+<el-dialog v-model="sdialog.gdadddialog" align-center :modal="false" modal-class="summary-dlg" :close-on-click-modal="false"
|
|
|
:append-to-body="true" draggable width="480" class="dialog_class bgcolor tianjia">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
@@ -374,7 +374,7 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 删除 -->
|
|
|
-<el-dialog v-model="sdialog.guddialogsgdelect" align-center :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
|
|
|
+<el-dialog v-model="sdialog.guddialogsgdelect" draggable :modal="false" modal-class="summary-dlg" align-center :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
|
@@ -396,7 +396,7 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 阻力系数弹窗 毛壁面-->
|
|
|
- <el-dialog v-model="sdialog.resistance" width="600" :append-to-body="true" :modal="false" :close-on-click-modal="false"
|
|
|
+ <el-dialog v-model="sdialog.resistance" width="600" :append-to-body="true" :modal="false" modal-class="summary-dlg" :close-on-click-modal="false"
|
|
|
draggable class="dialog_class bgcolor tablefocus shigutable">
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
|
@@ -856,6 +856,7 @@
|
|
|
import { timestampToTime } from '@/js/lindex.js';
|
|
|
import NodeSelect from "./NodeLine.vue";
|
|
|
import vueUploader from "./fileuploads.vue";
|
|
|
+ import { vtkmodel } from "@/control/vtkModel.js";
|
|
|
|
|
|
// import Menufile from "./MenuFile.vue"
|
|
|
// import upFile from "./upfile.vue";
|
|
|
@@ -1211,6 +1212,8 @@ let options2 = ref([
|
|
|
})
|
|
|
// tab选项事件
|
|
|
const handleClick = (Tab, val) => {
|
|
|
+ vtkmodel.clearJgAddMode();
|
|
|
+ vtkmodel.renderWindow.render();
|
|
|
switch (Tab.props.name) {
|
|
|
case 'first':
|
|
|
pipelinedata()
|
|
|
@@ -1226,10 +1229,15 @@ let options2 = ref([
|
|
|
}
|
|
|
// 节点分页查询
|
|
|
const handleCurrentChange = (val) => {
|
|
|
+ // 清除选中节点
|
|
|
+ vtkmodel.clearJgAddMode();
|
|
|
+ vtkmodel.renderWindow.render();
|
|
|
pipelinedata();
|
|
|
}
|
|
|
// 管道分页查询
|
|
|
const handleCurrentChange2 = (val) => {
|
|
|
+ vtkmodel.clearJgAddMode();
|
|
|
+ vtkmodel.renderWindow.render();
|
|
|
guandaodata();
|
|
|
}
|
|
|
//节点数据查询
|
|
|
@@ -1439,14 +1447,23 @@ const changejm=(val)=>{
|
|
|
const handleDelete = (val) => {
|
|
|
currentrow.value = true;
|
|
|
nodedata.value = val;
|
|
|
+ // console.log("选中的节点数据:", nodedata.value);
|
|
|
+
|
|
|
+ vtkmodel.clearJgAddMode();
|
|
|
+ //选中指定节点
|
|
|
+ vtkmodel.selectByNodeId(nodedata.value.id);
|
|
|
|
|
|
}
|
|
|
const handleDelete2 = (val) => {
|
|
|
currentrow1.value = true;
|
|
|
gddata.value = val;
|
|
|
gfname.value= gddata.value.gfname;
|
|
|
- bfname.value= gddata.value.bfname;
|
|
|
-
|
|
|
+ bfname.value= gddata.value.bfname;
|
|
|
+
|
|
|
+ // console.log("选中的管道数据:", gddata.value);
|
|
|
+ vtkmodel.clearJgAddMode();
|
|
|
+ //选中指定管道
|
|
|
+ vtkmodel.selectByPipeId(gddata.value.id);
|
|
|
}
|
|
|
//node删除
|
|
|
const nodedelete = () => {
|
|
|
@@ -1508,7 +1525,7 @@ const changejm=(val)=>{
|
|
|
};
|
|
|
|
|
|
});
|
|
|
- console.log("获取到的管道名称:", tableData3.value);
|
|
|
+
|
|
|
gd.value.total = res.total;
|
|
|
})
|
|
|
.catch((err) => {
|
tangjunhao