Commit 62f333a7 authored by 李苏's avatar 李苏 💬

1

parent a665e38f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Description: * @Description:
* @Author: lisu lisu@gavelinfo.com * @Author: lisu lisu@gavelinfo.com
* @LastEditors: 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 * @FilePath: /zghywpc-vue/src/views/yhlywsytst/yhlywsytst/index.vue
--> -->
<template> <template>
...@@ -290,13 +290,13 @@ ...@@ -290,13 +290,13 @@
<el-col :span="8" class="search-col"> <el-col :span="8" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">功能位置:</span> <span class="search-span">功能位置:</span>
<el-input v-model="sypcQueryParams.sbxxCode"></el-input> <el-input v-model="sypcQueryParams.gnwz"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="8" class="search-col"> <el-col :span="8" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">最大管径:</span> <span class="search-span">最大管径:</span>
<el-input v-model="sypcQueryParams.zdgj"></el-input> <el-input v-model="sypcQueryParams.gj"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="8" class="search-col flex-center"> <el-col :span="8" class="search-col flex-center">
...@@ -305,7 +305,8 @@ ...@@ -305,7 +305,8 @@
<RelSelect placeholder='' style="width: 100%;" :optionsData="[ <RelSelect placeholder='' style="width: 100%;" :optionsData="[
{id:'Y',name:'是'}, {id:'Y',name:'是'},
{id:'N',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> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -314,7 +315,7 @@ ...@@ -314,7 +315,7 @@
<div class="search-item"> <div class="search-item">
<span class="search-span">规格:</span> <span class="search-span">规格:</span>
<RelSelect placeholder='' style="width: 100%;" src='sbgl/usbxx/init/ggxh ' filterable clearable <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> </div>
</el-col> </el-col>
<el-col :span="8" class="search-col"> <el-col :span="8" class="search-col">
...@@ -345,7 +346,7 @@ ...@@ -345,7 +346,7 @@
:match="{value:'id',label:'name'}" v-model='queryParams.kshZt'></RelSelect> :match="{value:'id',label:'name'}" v-model='queryParams.kshZt'></RelSelect>
</div> --> </div> -->
<!-- <div class="search-item"> <!-- <div class="search-item">
<span class="search-span">异物:</span> <span class="search-span">异物:</span>
<el-input v-model="sypcQueryParams.ywName"></el-input> <el-input v-model="sypcQueryParams.ywName"></el-input>
</div> --> </div> -->
...@@ -541,11 +542,11 @@ ...@@ -541,11 +542,11 @@
kshZt: '' kshZt: ''
}, },
sypcQueryParams: { sypcQueryParams: {
sbxxCode: '', gnwz: '',
jqyr: '', isrRecentImport: false,
zdgj: '', gj: '',
ldtx: '', ldtx: '',
ggxh: '', gg: '',
cz: '', cz: '',
// ywName: '异物1RIS0218', // ywName: '异物1RIS0218',
// jzbm: '1', // jzbm: '1',
...@@ -621,7 +622,7 @@ ...@@ -621,7 +622,7 @@
}, },
/* 点击按钮弹出异物,然后选中*/ /* 点击按钮弹出异物,然后选中*/
sypc() { sypc() {
if (!this.sypcQueryParams.sbxxCode) { if (!this.sypcQueryParams.gnwz) {
this.$warning('请输入功能位置后进行查询!') this.$warning('请输入功能位置后进行查询!')
return return
} }
...@@ -644,7 +645,7 @@ ...@@ -644,7 +645,7 @@
this.$success(`已标记${sbxxList.length}个设备`) this.$success(`已标记${sbxxList.length}个设备`)
const sbxxCodeList = sbxxList.map(item => item.sbxxCode) const sbxxCodeList = sbxxList.map(item => item.sbxxCode)
/* 匹配设备信息length==0 */ /* 匹配设备信息length==0 */
if(sbxxCodeList.length==0){ if (sbxxCodeList.length == 0) {
return return
} }
/* 解决 先缓存选中色,后渲染黄色,默认选中时颜色不对 /* 解决 先缓存选中色,后渲染黄色,默认选中时颜色不对
...@@ -1037,43 +1038,43 @@ ...@@ -1037,43 +1038,43 @@
return item.children.some((child) => child.data.length >= 2); return item.children.some((child) => child.data.length >= 2);
}); });
/* 绘制全部信息*/ /* 绘制全部信息*/
// if (this.allFlowObject.length) { // if (this.allFlowObject.length) {
// this.allFlowObject.forEach((item) => { // this.allFlowObject.forEach((item) => {
// item.removeFromParent(); // item.removeFromParent();
// }); // });
// this.allFlowObject = []; // this.allFlowObject = [];
// } // }
// let flowPieDatas=this.allPieData // let flowPieDatas=this.allPieData
// flowPieDatas.forEach(flowPieData=>{ // flowPieDatas.forEach(flowPieData=>{
// const children = this.allPieData.find((item) => item.name === flowPieData.name)?.children; // const children = this.allPieData.find((item) => item.name === flowPieData.name)?.children;
// if (!children) { // if (!children) {
// return; // return;
// } // }
// children.forEach((item) => { // children.forEach((item) => {
// if (item.data.length >= 2) { // if (item.data.length >= 2) {
// const o = this.drawPipe( // const o = this.drawPipe(
// item.data.map((item) => [item.x, item.y, item.z]), // item.data.map((item) => [item.x, item.y, item.z]),
// item.radius, // item.radius,
// this.flowDirection, // this.flowDirection,
// ); // );
// o.traverse((node) => { // o.traverse((node) => {
// if (node.isMesh) { // if (node.isMesh) {
// node._thing_tag = "helper"; // node._thing_tag = "helper";
// } // }
// }); // });
// this.allFlowObject.push(o); // this.allFlowObject.push(o);
// const box = new THREE.Box3(); // const box = new THREE.Box3();
// o.points.forEach((item) => { // o.points.forEach((item) => {
// box.expandByPoint(new THREE.Vector3(...item)); // box.expandByPoint(new THREE.Vector3(...item));
// }); // });
// o.points.forEach((item) => { // o.points.forEach((item) => {
// box.expandByPoint(new THREE.Vector3(...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