Bläddra i källkod

710图标修改,显示修改

tangjunhao 2 månader sedan
förälder
incheckning
f9377d158e

BIN
public/static/3d/cgq.ply


BIN
public/static/3d/fire.ply


BIN
public/static/3d/jiancd.ply


+ 2 - 2
src/control/vtkModel.js

@@ -358,7 +358,7 @@ addSensor(val){
     actor.setPosition(pipsite_point[0],pipsite_point[1],pipsite_point[2]);
     actor.getProperty().setColor(SOURECOLOR);
     actor.setMapper(mapper);
-    actor.setScale(0.1,0.1,0.1);//放大
+    actor.setScale(0.05,0.05,0.05);//放大
       // 旋转actor
     // actor.rotateY(90);// 绕y轴旋转
     //  存储传感器信息(结构化存储)
@@ -565,7 +565,7 @@ addpipsensor(pid,site){
       const pipsensorMapper = vtkMapper.newInstance();
       pipsensorMapper.setInputConnection(this.cgqreader.getOutputPort());
       actorpipsensor.setMapper(pipsensorMapper);
-      actorpipsensor.setScale(0.1,0.1,0.1);//放大
+      actorpipsensor.setScale(0.05,0.05,0.05);//放大
       actorpipsensor.getProperty().setColor(SOURECOLOR);
       this.actorpipsensors.push(actorpipsensor);
     }

+ 3 - 3
src/view/components/InfoDisaster.vue

@@ -224,7 +224,7 @@
                       <template v-slot:empty>
                         <p>暂无数据</p>
                         </template>
-                        <el-table-column prop="timeline" label="时间/s" />
+                        <el-table-column prop="timeline" label="时间/s" />
                         <el-table-column prop="val1" label="突水量(m³/s)" />
                       </el-table>
                       <div class="asdis_btn">
@@ -1419,7 +1419,7 @@
       </template>
       <div>
         <el-form>
-          <el-form-item label="时间/s"  :label-width="formLabelWidth6">
+          <el-form-item label="时间(/s)"  :label-width="formLabelWidth6">
             <el-input
               v-model.Number="Disastersource.timeline"
               class="w-50 m-2"
@@ -1497,7 +1497,7 @@
       </template>
       <div>
         <el-form class="demo-form-inline inputnuber">
-          <el-form-item label="时间/s" :label-width="formLabelWidth6">
+          <el-form-item label="时间(/s)" :label-width="formLabelWidth6">
             <el-input
             :min="0"
               v-model.number="Disastersource.timeline"

+ 7 - 0
src/view/components/MenuCheck.vue

@@ -377,6 +377,8 @@ const addsg = () => {
     firepid.value='';
     cid.value='';
     tableobj.value={};
+
+    vtkmodel.delAll();
 }
 // 添加修改的接口
 const addEditaip=()=>{
@@ -423,6 +425,11 @@ const amend = () => {
         source.value.site = tableobj.value.site;
         source.value.selectstr=tableobj.value.pname;
         firepid.value=tableobj.value.pid;
+
+        vtkmodel.clearJgAddMode();
+        //选中指定管道
+        vtkmodel.selectByPipeId(tableobj.value.pid);
+        vtkmodel.addpipjc(tableobj.value.pid, tableobj.value.site);
     }
 }
 // 选择巷道

+ 10 - 10
src/view/components/MenuSensor.vue

@@ -272,15 +272,8 @@ 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();
-
-//   });
    
+   vtkmodel.delAll();
 }
 
 // 添加修改的接口
@@ -315,13 +308,20 @@ const amend = () => {
     if (JSON.stringify(tableobj.value) == '{}') {
         message.error("你还没有选中修改的项目")
     } else {
+        // console.log("xiugai",tableobj.value)
         senobj.value.seid = tableobj.value.seid
         senobj.value.pid = tableobj.value.pid
         senobj.value.site = tableobj.value.site
         senobj.value.type = tableobj.value.type
         source.value.selectstr = tableobj.value.pname
         addVisible.value = true;
-        emitter.emit('myaddsg',(true));
+        // emitter.emit('myaddsg',(true));
+
+        vtkmodel.clearJgAddMode();
+        //选中指定管道
+        vtkmodel.selectByPipeId(tableobj.value.pid);
+        vtkmodel.addpipsensor(tableobj.value.pid, tableobj.value.site);
+
     }
 }
 // 巷道方法
@@ -341,7 +341,7 @@ const pipelineapi = (row) => {
     vtkmodel.clearJgAddMode();
     //选中指定管道
     vtkmodel.selectByPipeId(row.id);
-    vtkmodel.addpipsensor(row.id, 0.0);
+    vtkmodel.addpipsensor(row.id, senobj.value.site);
 }
 
 const inputnumberChange = (val) => {

+ 1 - 1
src/view/components/tool.vue

@@ -8,7 +8,7 @@
       <el-checkbox v-model="checked1" label="巷道名称" size="large" @change="changecheckbox($event)" />
       <el-checkbox v-model="checked2" label="灾源点" size="large" @change="changecheckbox2($event)" />
       <el-checkbox v-model="checked3" label="监测点" size="large" @change="changecheckbox3($event)" />
-      <el-checkbox v-model="checked4" label="传感器" size="large" @change="changecheckbox4($event)" />
+      <!-- <el-checkbox v-model="checked4" label="传感器" size="large" @change="changecheckbox4($event)" /> -->
     </div>
     <!-- 监测点信息 -->
     <setJC ref="dialogtrue1"  @close="close1"></setJC>

+ 3 - 3
src/view/configurator.vue

@@ -2,7 +2,7 @@
   <div class="appmian">
     <div class="lfetflex">
       <MenuMine ref="menumine" />
-      <MenuSensor ref="menusen" />
+      <!-- <MenuSensor ref="menusen" /> -->
       <Menumap ref="Menumapref" />
       <Menuventfan ref="Menuventfanpref" />
       <Menuventdoor ref="Menuventdoorpref" />
@@ -65,7 +65,7 @@ let Menudisasterref = ref()
 const clickreture = () => {}
 const showmenum = () => {
   menumine.value.dialogVisible = true
-  menusen.value.sendialogVisible = true
+  // menusen.value.sendialogVisible = true
   Menudisasterref.value.dialogVisible = true
   menucheck.value.sendialogVisible = true
   menuphysics.value.sendialogVisible = true
@@ -77,7 +77,7 @@ const showmenum = () => {
 }
 const menumfalse = () => {
   menumine.value.dialogVisible = false
-  menusen.value.sendialogVisible = false
+  // menusen.value.sendialogVisible = false
   Menudisasterref.value.dialogVisible = false
   menucheck.value.sendialogVisible = false
   menuphysics.value.sendialogVisible = false

+ 9 - 9
src/view/index/explode.vue

@@ -102,25 +102,25 @@ const strResultFormatlist = ref([])
 const formInline = ref({
   user: "11",
   region: "Pressure",
-  name: "压力",
+  name: "压力(Pa)",
   date: ""
 })
 
 const titleName = ref("一维瓦斯爆炸演化")
 
 const nameMap = {
-  Pressure: '压力',
-  Temperatura: '温度',
-  Velocity: '速度',
-  O2: '氧气质量分数',
-  CO2: '二氧化碳质量分数',
-  H2O: '水蒸气质量分数',
+  Pressure: '压力(Pa)',
+  Temperatura: '温度(℃)',
+  Velocity: '速度(m/s)',
+  O2: '氧气质量分数(%)',
+  CO2: '二氧化碳质量分数(%)',
+  H2O: '水蒸气质量分数(%)',
   // HC: '碳氢化合物',
   // Soot: '烟尘',
   // NOx: '氮氧化物',
   // CO: '一氧化碳',
-  CH4: '甲烷质量分数',
-  N2: '氮气质量分数'
+  CH4: '甲烷质量分数(%)',
+  N2: '氮气质量分数(%)'
 };
 
 let newMap = new Map([