1
0

2 Коммитууд aecaba0156 ... 2cce011fc4

Эзэн SHA1 Мессеж Огноо
  liuqiao 2cce011fc4 Merge branch 'master' of http://192.168.0.130:13000/huangxingxing/disaster_web3 7 сар өмнө
  liuqiao ea6c93265f 2.11 7 сар өмнө

+ 51 - 32
src/view/components/MenuMine.vue

@@ -1507,8 +1507,9 @@ const changejm=(val)=>{
                         ...item,
                         sectionType: statusMap[item.sectionType] || '未知' // 如果状态不存在,默认设置为'未知'
                     };
+                   
                     });
-         
+                 
               gd.value.total = res.total;
           })
           .catch((err) => {
@@ -1651,6 +1652,8 @@ const changejm=(val)=>{
           tishi.value=zhtext.value;
           let sectionType=gddata.value.sectionType;
           sdialog.value.gdadddialog = true;
+          console.log(gddata.value);
+          console.log(111111);
           guandaoobj.value.code = gddata.value.code;
           guandaoobj.value.pid = gddata.value.id;
           guandaoobj.value.name = gddata.value.name;
@@ -1664,52 +1667,68 @@ const changejm=(val)=>{
           guandaoobj.value.sectionPara2 = gddata.value.sectionPara2;
           guandaoobj.value.sectionPara3 = gddata.value.sectionPara3;
           guandaoobj.value.sectionPara4 = gddata.value.sectionPara4;
-          guandaoobj.value.sectionPara5 = gddata.value.sectionPara5;;
+          guandaoobj.value.sectionPara5 = gddata.value.sectionPara5;
+
           switch (sectionType) {
-          case '圆形':
-          guandaoobj.value.sectionType='CIRCULAR'
+          case '1-1断面':
+          guandaoobj.value.sectionType='halfarch_1'
               break;
-          case "矩形":
-          guandaoobj.value.sectionType='RECTANGLE'
+          case "2-2断面":
+          guandaoobj.value.sectionType='halfarch_2'
               break;
-          case '半椭圆形':
-          guandaoobj.value.sectionType='SEMICIRCULAR'
+          case '3-3断面':
+          guandaoobj.value.sectionType='halfarch_3'
               break;
-          case '半圆形':
-          guandaoobj.value.sectionType='SEMIELLIPTICAL'
+          case '4-4断面':
+          guandaoobj.value.sectionType='halfarch_4'
               break;
-              case '蛋形':
-        guandaoobj.value.sectionType='EGG'
+              case '5-5断面':
+        guandaoobj.value.sectionType='halfarch_5'
               break;
-          case "哥特形":
-          guandaoobj.value.sectionType='GOTHIC'
+          case "6-6断面":
+          guandaoobj.value.sectionType='halfarch_6'
               break;
-          case '更正蓝形':
-          guandaoobj.value.sectionType='MODBASKETHANDLE'
+          case '7-7断面':
+          guandaoobj.value.sectionType='halfarch_7'
               break;
-          case '拱形':
-          guandaoobj.value.sectionType='ARCH'
+          case '8-8断面':
+          guandaoobj.value.sectionType='halfarch_8'
           break;
-          case "弧底矩形":
-          guandaoobj.value.sectionType='RECT_ROUND'
+          case "9-9断面":
+          guandaoobj.value.sectionType='section9'
               break;
-          case '蓝形':
-          guandaoobj.value.sectionType='BASKETHANDLE'
+          case '10-10断面':
+          guandaoobj.value.sectionType='section10'
               break;
-          case '马蹄形':
-          guandaoobj.value.sectionType='HORSESHOE'
+          case '11-11断面':
+          guandaoobj.value.sectionType='halfarch_11'
           break;
-          case "三角底矩形":
-          guandaoobj.value.sectionType='RECT_TRIANGULAR'
+          case "12-12断面":
+          guandaoobj.value.sectionType='halfarch_12'
               break;
-          case '竖向椭圆':
-          guandaoobj.value.sectionType='VERT_ELLIPSE'
+          case '13-13断面':
+          guandaoobj.value.sectionType='halfarch_13'
+              break;
+          case '14-14断面':
+          guandaoobj.value.sectionType='halfarch_14'
+          break;
+          case '15-15断面':
+          guandaoobj.value.sectionType='halfarch_15'
+          break;
+          case '16-16断面':
+          guandaoobj.value.sectionType='halfarch_16'
+              break;
+          case '17-17断面':
+          guandaoobj.value.sectionType='halfarch_17'
+          break;
+          case "18-18断面":
+          guandaoobj.value.sectionType='halfarch_18'
               break;
-          case '水平椭圆':
-          guandaoobj.value.sectionType='HORZI_ELLIPSE'
+          case '19-19断面':
+          guandaoobj.value.sectionType='halfarch_19'
           break;
-          case '悬链式':
-          guandaoobj.value.sectionType='CATENARY'
+          case '20-20断面':
+          guandaoobj.value.sectionType='halfarch_20'
           break;
 
       }

+ 15 - 1
src/view/components/MenuSensor.vue

@@ -142,7 +142,7 @@ import icon from "@/assets/img/icon.png";
 import pipelines from "./PipeIine.vue"
 import { vtkmodel } from "@/control/vtkModel.js";
 import { timestampToTime } from '@/js/lindex.js'
-
+import emitter from "@/utils/emitter";
 let pipeline = ref();
 let currentrow=ref(true);
 let sendialogVisible = ref(false);
@@ -267,8 +267,17 @@ const addsg = () => {
     senobj.value.site = 0.0;
     source.value.selectstr = '';
     tableobj.value={};
+   // vtkmodel.showSensor();
+   emitter.emit('myaddsg',(true));
+   //console.log(4455667788899)
+//    emitter.on('changecheckbox4',(data)=>{
+//     console.log(22222)
+//    // changecheckbox4();
+
+//   });
    
 }
+
 // 添加修改的接口
 const addEied = () => {
     const params = {
@@ -309,6 +318,7 @@ const amend = () => {
         senobj.value.type = tableobj.value.type
         source.value.selectstr = tableobj.value.pname
         addVisible.value = true;
+        emitter.emit('myaddsg',(true));
     }
 }
 // 巷道方法
@@ -325,5 +335,9 @@ const pipelineapi = (row) => {
     source.value.selectstr = row.name;
     tableobj.value.pid = row.id;
 }
+// onUnmounted(() =>{
+
+// emitter.off('changecheckbox4')
+// })
 defineExpose({ sendialogVisible, });
 </script>

+ 8 - 2
src/view/components/tool.vue

@@ -118,17 +118,23 @@
     }
   }
   const changecheckbox4=(val)=>{
+    console.log(val+'1111');
+    checked4.value=val;
     vtkmodel.delpump();//清除风机风门
-     console.log(checked4.value);
     if(checked4.value){
       vtkmodel.showSensor();
     }else{
       vtkmodel.removeSensor();
     }
   }
+  emitter.on('myaddsg',(data)=>{
+    changecheckbox4(data);
+  })
+
   onUnmounted(() =>{
 
-emitter.off('handleSelect')
+emitter.off('handleSelect');
+//emitter.off('myaddsg');
 })
   </script>
   <style scoped>