12.21修改bug

src/control/vtkModel.js

@@ -318,8 +318,10 @@ showSensor(){
   this.cgqActors.forEach((actor)=>{
     this.renderer.addActor(actor);
   });
+  console.log('看看谁先执行')
   this.renderWindow.render();
 }
+
 removeSensor(){
   this.cgqActors.forEach((actor)=>{
     this.renderer.removeActor(actor);

src/view/InfoDialoges.vue

@@ -454,7 +454,7 @@ const changeModel= ()=>  {
   vtkmodel.clearJgAddMode();
   vtkmodel.renderWindow.render();
 }
-let txt=ref('展开全部');
+let txt=ref('更多设置');
 let iskeynum=ref(false);
 let currentrow=ref(false);
 let placeholder=ref('某次某事件火灾事故');
@@ -664,7 +664,7 @@ const showMore= ()=>{
     // iskeynum.value=true;
     // txt.value="收起"
     iskeynum.value=!iskeynum.value;
-    txt.value=iskeynum.value?'收起':'展开全部'
+    txt.value=iskeynum.value?'收起':'更多设置'
  
 }
 const handleCurrentChange = ({ row, rowIndex }) => {
@@ -991,10 +991,27 @@ const  changeClass= (i)=>  {
     initial();
  }else if(i=='2'){
     calculate()
- }else{
-
+ }else if(i=='3'){
+    stopcompute()
  }
 }
+// 停止计算
+const stopcompute= ()=>{
+    console.log("停止计算")
+    const params = {
+        transCode: "D30004",
+        aid: aid.value
+    };
+ request(params)
+        .then((res) => {
+                ElMessage({
+                    message: "已停止计算",
+                    type: "error",
+                });
+        })
+        .catch((err) => { });
+
+}
 // 初始数据
 const initial = () => {
   

src/view/appmian.vue

@@ -122,8 +122,7 @@ import b from "@/assets/img/Group1317.png";
 import { timestampToTime,formatTime } from "@/js/lindex.js";
 import emitter from "@/utils/emitter";
 import { contains } from "@kitware/vtk.js/Common/DataModel/BoundingBox";
-
-// import { vtkmodel } from "@/control/vtkModel.js";
+// import { vtkmodel2 } from "@/control/vtkModel.js";
 let activeIndeximg=ref( null);
 let reheaderref=ref();
 let lliudialog = ref();
@@ -350,6 +349,7 @@ const imgonclock=()=>{
 
 const handleSelect = (key) => {
   emitter.emit('handleSelect',(key));
+
   // window.location.reload();
  //indexref.value.changeColor("0")
 //  indexref.value.changeColor(0);

src/view/components/Fengmen.vue

@@ -166,6 +166,9 @@
         </div>
       </template>
       <el-form >
+        <el-form-item label="编码" :label-width="formLabelWidth6">
+            <el-input v-model="fjobj.fancode"  maxlength="18" oninput ="value=value.replace(/[^a-zA-Z]/g, '');"  class="w-50 m-2" placeholder="请输入" />
+        </el-form-item>
       <el-form-item label="风机名称" :label-width="formLabelWidth6">
             <el-input v-model="fjobj.fanname"  maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
@@ -263,6 +266,9 @@
         </div>
       </template>
       <el-form >
+        <el-form-item label="编码" :label-width="formLabelWidth6">
+            <el-input v-model="fmobj.doorcode"  maxlength="18" oninput ="value=value.replace(/[^a-zA-Z]/g, '');"  class="w-50 m-2" placeholder="请输入" />
+        </el-form-item>
       <el-form-item label="风门名称" :label-width="formLabelWidth6">
             <el-input v-model="fmobj.doorname"  maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
@@ -423,6 +429,7 @@ let aid=ref()//事故id
   let fjobj=ref({
     fanid:null,
     fanname:"",
+    fancode:'',
     pa:null,
     onoff:0
 })
@@ -431,6 +438,7 @@ let fmobj=ref({
   doorid:null,
   doorname:"",
   dragcoe:null,
+  doorcode:'',
   onoff:0
 })
 let handobjfm=ref({});
@@ -500,6 +508,7 @@ const fjclick=()=>{
     tishi.value= zhtext.value;
     handobj.value={};
     fjobj.value.fanid='';
+    fjobj.value.fancode='';
     fjobj.value.fanname='';
     fjobj.value.onoff='';
     fjobj.value.pa='';
@@ -520,6 +529,7 @@ const xiugaiclick=()=>{
     sdialog.value.fjdialog = true;
     aid.value=handobj.value.aid;
     fjobj.value.fanid=handobj.value.fanid;
+    fjobj.value.fancode=handobj.value.fancode;
     fjobj.value.fanname=handobj.value.fanname;
     fjobj.value.onoff=handobj.value.onoff;
     fjobj.value.pa=handobj.value.pa;
@@ -625,6 +635,7 @@ const addrequest=()=>{
   const params = {
     transCode: "D20008",
     fanid:fjobj.value.fanid,
+    fancode:fjobj.value.fancode,
     pid:pid.value,
     fanname:fjobj.value.fanname,
     site:source.value.site,
@@ -674,6 +685,7 @@ const fmrequest=()=>{
     tishi.value= zhtext.value;
     handobj.value={};
     fmobj.value.doorid=null;
+    fmobj.value.doorcode='';
     fmobj.value.doorname='';
     fmobj.value.onoff=0;
     fmobj.value.dragcoe=null;
@@ -693,6 +705,7 @@ const fmrequest=()=>{
     sdialog.value.fmdialog = true;
     aid.value=handobjfm.value.aid;
     fmobj.value.doorid=handobjfm.value.doorid;
+    fmobj.value.doorcode=handobjfm.value.doorcode;
     fmobj.value.doorname=handobjfm.value.doorname;
     fmobj.value.onoff=handobjfm.value.onoff;
     fmobj.value.dragcoe=handobjfm.value.dragcoe;
@@ -725,6 +738,7 @@ const fmrequest=()=>{
   const params = {
     transCode:"D20011",
     doorid:fmobj.value.doorid,
+    doorcode:fmobj.value.doorcode,
     pid:pid.value,
     doorname:fmobj.value.doorname,
     site:source.value.site,

src/view/components/InfoDisaster.vue

@@ -1114,6 +1114,9 @@
         </div>
       </template>
       <el-form >
+        <el-form-item label="编码" :label-width="formLabelWidth6">
+            <el-input v-model="pumpobj.pumpcode"    maxlength="10" oninput ="value=value.replace(/[^a-zA-Z]/g, '');" class="w-50 m-2" placeholder="请输入" />
+        </el-form-item>
       <el-form-item label="水泵名称" :label-width="formLabelWidth6">
             <el-input v-model="pumpobj.pumpname"    maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
@@ -1683,6 +1686,7 @@ let  pumpobj=ref({
     openhig:'',
     closehig:'',
     onoff:'0',
+    pumpcode:'',
     xzobj:{},
 })
 // 水泵性能 参数
@@ -2649,6 +2653,7 @@ const addpumdfun=(e)=>{
   pumpobj.value.xzobj={};
   pumpobj.value.pumpid=null;
   pumpobj.value.pumpname='';
+  pumpobj.value.pumpcode='';
   pumpobj.value.openhig=null;
   pumpobj.value.closehig=null;
   pumpobj.value.onoff=0;
@@ -2675,6 +2680,7 @@ const pumpxiugai=(val)=>{
     pumpobj.value.pumpname=pumpobj.value.xzobj.pumpname;
     pumpobj.value.openhig=pumpobj.value.xzobj.openhig;
     pumpobj.value.closehig=pumpobj.value.xzobj.closehig;
+    pumpobj.value.pumpcode=pumpobj.value.xzobj.pumpcode;
     firepid.value=pumpobj.value.xzobj.pid;
     aid.value=pumpobj.value.xzobj.aid;
     source.site=pumpobj.value.xzobj.site;
@@ -2688,7 +2694,8 @@ const addrequest=()=>{
   }else{
   const params = {
     transCode: "D20002",
-     pumpid:pumpobj.value.pumpid,
+    pumpid:pumpobj.value.pumpid,
+    pumpcode:pumpobj.value.pumpcode,
     pumpname:pumpobj.value.pumpname,
     openhig:parseFloat(pumpobj.value.openhig),
     closehig:parseFloat(pumpobj.value.closehig),

src/view/components/MenuSensor.vue

@@ -181,7 +181,6 @@ const handleDelete = (val) => {
     tableobj.value = val;
     currentrow.value=true;
     console.log(val);
-    vtkmodel.sensordata(val);
    // console.log(tableobj.value)
 }
 // 删除
@@ -212,9 +211,26 @@ const fundeledata = () => {
         })
 }
 onMounted(() => {
-    getsensor();
+    getsensor1();
 });
 // 查询
+const getsensor1 = () => {
+
+const params = {
+    transCode: 'D10010',
+    type: 'Fire'
+}
+request(params)
+    .then((res) => {
+        tableData.value = res.rows;
+         tableobj.value={};
+       
+   
+    })
+    .catch((err) => {
+        ElMessage.error(err.returnMsg)
+    })
+}
 const getsensor = () => {
 
     const params = {
@@ -225,13 +241,14 @@ const getsensor = () => {
         .then((res) => {
             tableData.value = res.rows;
              tableobj.value={};
-            if(res.rows.length == 0){
-              
-            }else{
-                console.log( res.rows);
-              
-            }
-       
+             console.log(   res.rows)
+             res.rows.forEach(element => {
+                console.log(1111)
+                vtkmodel.addSensor(element.pid,element.site)
+            });
+                vtkmodel.showSensor();
+         
+          
         })
         .catch((err) => {
             ElMessage.error(err.returnMsg)
@@ -266,7 +283,7 @@ const addEied = () => {
                   message:'传感器信息'+tishi.value+'成功',
                   type: 'success',
               })
-            tableData.value = res.rows;
+            // tableData.value = res.rows;
             addVisible.value = false;
             getsensor();
         })

src/view/components/Menupath.vue

@@ -243,6 +243,7 @@
  import NodeSelect from "./NodeLine.vue";
  import { vtkmodel } from "@/control/vtkModel.js";;
  import { timestampToTime } from '@/js/lindex.js'
+ import emitter from "@/utils/emitter";
  let addVisiblenode=ref(false);
  let pipeline = ref();
  let dialogtrue = ref();
@@ -374,6 +375,7 @@ const faterdelete=()=>{
     pathshownode.value=true;
     childdata();
  }
+
  const childdata = () => {
     vtkmodel.safetypathremove();
      const params = {
@@ -401,6 +403,14 @@ const faterdelete=()=>{
        
          })
  }
+ emitter.on('handleSelect',(data)=>{
+    vtkmodel.safetypathremove();
+
+});
+onUnmounted(() =>{
+
+emitter.off('handleSelect')
+})
  onMounted(() => {
      getsensor();
  });

src/view/components/tool.vue

@@ -85,8 +85,10 @@
   const checkeclear=()=>{
     checked2.value=false;
     checked3.value=false;
+    checked4.value=false;
     vtkmodel.removeSoure();
     vtkmodel.removejc();
+    vtkmodel.removeSensor();
   }