Skip to content

Z
zghywpc-vue
Commit 62f333a7 authored by 李苏's avatar 李苏 💬
Browse files
Options

1

parent a665e38f
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 49 deletions
src/views/yhlywsytst/yhlywsytst/index.vue
View file @ 62f333a7
......@@ -2,7 +2,7 @@
* @Description:
* @Author: lisu lisu@gavelinfo.com
* @LastEditors: lisu lisu@gavelinfo.com
* @LastEditTime: 2024-09-18 09:42:40
* @LastEditTime: 2024-09-19 14:40:49
* @FilePath: /zghywpc-vue/src/views/yhlywsytst/yhlywsytst/index.vue
-->
<template>
......@@ -290,13 +290,13 @@
<el-col :span="8" class="search-col">
<div class="search-item">
<span class="search-span">功能位置:</span>
<el-input v-model="sypcQueryParams.sbxxCode"></el-input>
<el-input v-model="sypcQueryParams.gnwz"></el-input>
</div>
</el-col>
<el-col :span="8" class="search-col">
<div class="search-item">
<span class="search-span">最大管径:</span>
<el-input v-model="sypcQueryParams.zdgj"></el-input>
<el-input v-model="sypcQueryParams.gj"></el-input>
</div>
</el-col>
<el-col :span="8" class="search-col flex-center">
......@@ -305,7 +305,8 @@
<RelSelect placeholder='' style="width: 100%;" :optionsData="[
{id:'Y',name:'是'},
{id:'N',name:'否'}
]" filterable clearable :match="{value:'id',label:'name'}" v-model='sypcQueryParams.jqyr'></RelSelect>
]" filterable clearable :match="{value:'id',label:'name'}" v-model='sypcQueryParams.isrRecentImport'>
</RelSelect>
</div>
</el-col>
</el-row>
......@@ -314,7 +315,7 @@
<div class="search-item">
<span class="search-span">规格:</span>
<RelSelect placeholder='' style="width: 100%;" src='sbgl/usbxx/init/ggxh ' filterable clearable
:match="{value:'id',label:'name'}" v-model='sypcQueryParams.ggxh'></RelSelect>
:match="{value:'id',label:'name'}" v-model='sypcQueryParams.gg'></RelSelect>
</div>
</el-col>
<el-col :span="8" class="search-col">
......@@ -345,7 +346,7 @@
:match="{value:'id',label:'name'}" v-model='queryParams.kshZt'></RelSelect>
</div> -->
<!-- <div class="search-item">
<!-- <div class="search-item">
<span class="search-span">异物:</span>
<el-input v-model="sypcQueryParams.ywName"></el-input>
</div> -->
......@@ -541,11 +542,11 @@
kshZt: ''
},
sypcQueryParams: {
sbxxCode: '',
jqyr: '',
zdgj: '',
gnwz: '',
isrRecentImport: false,
gj: '',
ldtx: '',
ggxh: '',
gg: '',
cz: '',
// ywName: '异物1RIS0218',
// jzbm: '1',
......@@ -621,7 +622,7 @@
},
/* 点击按钮弹出异物，然后选中*/
sypc() {
if (!this.sypcQueryParams.sbxxCode) {
if (!this.sypcQueryParams.gnwz) {
this.$warning('请输入功能位置后进行查询!')
return
}
......@@ -644,7 +645,7 @@
this.$success(`已标记${sbxxList.length}个设备`)
const sbxxCodeList = sbxxList.map(item => item.sbxxCode)
/* 匹配设备信息length==0 */
if(sbxxCodeList.length==0){
if (sbxxCodeList.length == 0) {
return
}
/* 解决 先缓存选中色，后渲染黄色，默认选中时颜色不对
......@@ -1037,43 +1038,43 @@
return item.children.some((child) => child.data.length >= 2);
});
/* 绘制全部信息*/
// if (this.allFlowObject.length) {
// this.allFlowObject.forEach((item) => {
// item.removeFromParent();
// });
// this.allFlowObject = [];
// }
// let flowPieDatas=this.allPieData
// flowPieDatas.forEach(flowPieData=>{
// const children = this.allPieData.find((item) => item.name === flowPieData.name)?.children;
// if (!children) {
// return;
// }
// children.forEach((item) => {
// if (item.data.length >= 2) {
// const o = this.drawPipe(
// item.data.map((item) => [item.x, item.y, item.z]),
// item.radius,
// this.flowDirection,
// );
// o.traverse((node) => {
// if (node.isMesh) {
// node._thing_tag = "helper";
// }
// });
// this.allFlowObject.push(o);
// const box = new THREE.Box3();
// o.points.forEach((item) => {
// box.expandByPoint(new THREE.Vector3(...item));
// });
// o.points.forEach((item) => {
// box.expandByPoint(new THREE.Vector3(...item));
// });
// }
// });
// })
// if (this.allFlowObject.length) {
// this.allFlowObject.forEach((item) => {
// item.removeFromParent();
// });
// this.allFlowObject = [];
// }
// let flowPieDatas=this.allPieData
// flowPieDatas.forEach(flowPieData=>{
// const children = this.allPieData.find((item) => item.name === flowPieData.name)?.children;
// if (!children) {
// return;
// }
// children.forEach((item) => {
// if (item.data.length >= 2) {
// const o = this.drawPipe(
// item.data.map((item) => [item.x, item.y, item.z]),
// item.radius,
// this.flowDirection,
// );
// o.traverse((node) => {
// if (node.isMesh) {
// node._thing_tag = "helper";
// }
// });
// this.allFlowObject.push(o);
// const box = new THREE.Box3();
// o.points.forEach((item) => {
// box.expandByPoint(new THREE.Vector3(...item));
// });
// o.points.forEach((item) => {
// box.expandByPoint(new THREE.Vector3(...item));
// });
// }
// });
// })
/* 绘制全部流向操作结束 */
}
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment