12.24

src/style/style.css

@@ -1978,6 +1978,9 @@ background-image: linear-gradient(to right, #ACD6FF , #105CF0 );
 display: flex;
 justify-content: space-between;
 }
+.htmlclass_content{
+  color: #fff;
+}
 .je_right{
   width: 0.9167rem;
   position: relative;

src/view/InfoDialoges.vue

@@ -450,6 +450,7 @@ import icon1 from "@/assets/img/Group27.png";
 import closeimg from "@/assets/img/colse.png";
 import { timestampToTime } from '@/js/lindex.js'
 import { vtkmodel } from "@/control/vtkModel.js";
+import emitter from "@/utils/emitter";
 const changeModel= ()=>  {
   vtkmodel.clearJgAddMode();
   vtkmodel.renderWindow.render();
@@ -708,7 +709,8 @@ const accident = () => {
             .then((res) => {
                 if(res.state=='1'){
                     emit("leftsimulation",res,sgdata.value);
-                  
+                    let step= Number(res.totaltime)/Number(res.reportstep);
+                    emitter.emit('step',step);
                 }
                 else if(res.state=='-1'){
                     ElMessage({

src/view/components/Fengmen.vue

@@ -663,7 +663,9 @@ const addrequest=()=>{
       fun3D();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      const regex = /字段\d*/g;
+        let Msg=err.returnMsg.replace(regex, '');
+         ElMessage.error(Msg)
     });
   }
 
@@ -766,7 +768,9 @@ const fmrequest=()=>{
       fun3D();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      const regex = /字段\d*/g;
+        let Msg=err.returnMsg.replace(regex, '');
+         ElMessage.error(Msg)
     });
   }
 

src/view/components/InfoBoundary.vue

@@ -725,7 +725,9 @@ const accidentboun = () => {
       addboundary(aid.value);
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      const regex = /字段\d*/g;
+        let Msg=err.returnMsg.replace(regex, '');
+         ElMessage.error(Msg)
     });
 };
 // 边界数据的查询

src/view/components/InfoDisaster.vue

@@ -2713,7 +2713,9 @@ const addrequest=()=>{
       fun3D();
     })
     .catch((err) => {
-      ElMessage.error(err.returnMsg);
+      const regex = /字段\d*/g;
+        let Msg=err.returnMsg.replace(regex, '');
+         ElMessage.error(Msg)
     });
   }
 }

src/view/components/MenuCheck.vue

@@ -94,8 +94,9 @@
               class="w-50 m-2"
               placeholder="请输入"  />
           </el-form-item>
-          <el-form-item label="监测点名称:" :label-width="formLabelWidth5">
+          <el-form-item label="监测点名称:"  :label-width="formLabelWidth5">
           <el-input  v-model="source.chname"
+          maxlength="10" 
               class="w-50 m-2"
               placeholder="请输入"  />
           </el-form-item>
@@ -369,7 +370,10 @@ const addEditaip=()=>{
             getsensor();
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            const regex = /字段\d*/g;
+        let Msg=err.returnMsg.replace(regex, '');
+         ElMessage.error(Msg)
+
         })
 
 }

src/view/components/MenuMine.vue

@@ -1438,8 +1438,11 @@ console.log(val);
 
           })
           .catch((err) => {
+            const regex = /字段\d*/g;
+        let Msg=err.returnMsg.replace(regex, '');
+         ElMessage.error(Msg)
            // sdialog.value.gdadddialog = true;
-              ElMessage.error(err.returnMsg)
+            //  ElMessage.error(err.returnMsg)
           })
       } else{
        // sdialog.value.gdadddialog = true;

src/view/components/MenuPhysics.vue

@@ -275,7 +275,9 @@ const addEied = () => {
             addVisible.value = false 
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            const regex = /字段\d*/g;
+        let Msg=err.returnMsg.replace(regex, '');
+         ElMessage.error(Msg)
         })
 }
 //修改

src/view/components/MenuSensor.vue

@@ -288,9 +288,13 @@ const addEied = () => {
             getsensor();
         })
         .catch((err) => {
-            ElMessage.error(err.returnMsg)
+            const regex = /字段\d*/g;
+            let Msg=err.returnMsg.replace(regex, '');
+            ElMessage.error(Msg)
         })
 }
+
+
 //修改
 const amend = () => {
     add.value = "修改";

src/view/components/Menupath.vue

@@ -461,7 +461,10 @@ emitter.off('handleSelect')
             })
          })
          .catch((err) => {
-             ElMessage.error(err.returnMsg)
+            const regex = /字段\d*/g;
+        let Msg=err.returnMsg.replace(regex, '');
+         ElMessage.error(Msg)
+             //ElMessage.error(err.returnMsg)
          })
  }
  

src/view/components/tool.vue

@@ -93,6 +93,7 @@
 
 
   const changecheckbox=(val)=>{
+    vtkmodel.delpump();//清除风机风门
     if(checked1.value){
       vtkmodel.showPname();
     }else{
@@ -100,6 +101,8 @@
     }
   }
   const changecheckbox2=(val)=>{
+    vtkmodel.delpump();//清除风机风门
+    vtkmodel.delpump();
     if(checked2.value){
       vtkmodel.showSoure();
     }else{
@@ -107,6 +110,7 @@
     }
   }
   const changecheckbox3=(val)=>{
+    vtkmodel.delpump();//清除风机风门
     if(checked3.value){
       vtkmodel.showjc();
     }else{
@@ -114,6 +118,7 @@
     }
   }
   const changecheckbox4=(val)=>{
+    vtkmodel.delpump();//清除风机风门
      console.log(checked4.value);
     if(checked4.value){
       vtkmodel.showSensor();

src/view/index/first-left.vue

@@ -142,7 +142,7 @@
               <div class="animation_s">
               <el-slider
                 :max="endtime"
-                :min="0"
+                :min="1"
                 v-model="count"
                 @change="sliderchange"
               >
@@ -285,7 +285,7 @@ let jgSelectPointId=ref(0);
 let selobj=ref([]);
 let isshow=ref(false);
 let maxindex=ref();
-
+let wuliname=ref([]);
 const dynamicHeaders = ref([
 
 ]);
@@ -398,6 +398,7 @@ function regionchange(val) {
             ["SO2", "(ppm)"],
             ["Flow", "(Pa)"],
             ["Height", "(m)"],
+            ["CH4", "(ppm)"],
   ]);
   newMap.forEach((value, key) => {
     // console.log(key, value);
@@ -467,12 +468,35 @@ await request(params)
     //     h("div", {}, column.label.split(",")[1]),
     //   ]);
      }
+//查询物理属性
+const wuliget = () => {
 
+const params = {
+    transCode: 'D10013',
+}
+request(params)
+    .then((res) => {
+      console.log(res.rows)
+      wuliname.value=[];
+      res.rows.forEach((value, key) => {
+        let obj={
+          name:value.name,
+          code:value.code,
+        }
+        wuliname.value.push(obj);
+      })
+    
+    })
+    .catch((err) => {
+        ElMessage.error(err.returnMsg)
+    })
+}
 async  function getMonitor() {
   let cocode;
   let name;
   let v=1;
   newtime();
+ // wuliget();
   const params = {
     transCode: "D10018",
     aid: aid.value,
@@ -500,8 +524,41 @@ async  function getMonitor() {
             ["SO2", "(ppm)"],
             ["Flow", "(m³/s)"],
             ["Height", "(m)"],
+            ["CH4", "(ppm)"],
           ]);
-          
+        //   console.log(cocode);
+        //   if(cocode.code=='Temperature'){
+        //   let obj={
+        //   name:'温度',
+        //   code:'Temperature',
+        // }
+        // wuliname.value.push(obj);
+        //   }else if(cocode.code=='Pressure'){
+        //     let obj={
+        //   name:'压强',
+        //   code:'Pressure',
+        // }
+        //   wuliname.value.push(obj);
+        //   }else if(cocode.code=='Flow'){
+        //     let obj={
+        //   name:'流量',
+        //   code:'Flow',
+        // }
+        //   wuliname.value.push(obj);
+        //   }else if(cocode.code=='Height'){
+        //     let obj={
+        //   name:'水位',
+        //   code:'Height',
+        // }
+        // wuliname.value.push(obj);
+        //   }
+        // let arr=[... wuliname.value];
+        // console.log(arr);
+        // arr.forEach((value, key) => {
+        //    if(value.code  == res.codes[i].code ){
+        //     name = value.name;
+        //    }
+        //   })
           newMap.forEach((value, key) => {
             if ( key  == res.codes[i].code ) {
               if(key=='Temperature'){
@@ -522,7 +579,10 @@ async  function getMonitor() {
                 key= '硫化氢'
               }else if(key=='Height'){
                 key= '水位'
-              }else if(key=='Flow'){
+              }else if(key=='CH4'){
+                key= '甲烷'
+              }
+              else if(key=='Flow'){
                 key= '流量'
               }else{
 
@@ -689,6 +749,7 @@ function downloadImg(url, fileName) {
   const x = new window.XMLHttpRequest();
   x.open('GET', url, true);
   x.responseType = 'blob';
+  ElMessage.success('正在下载报告');
   x.onload = () => {
     const url = window.URL.createObjectURL(x.response);
     const a = document.createElement('a');
@@ -697,7 +758,7 @@ function downloadImg(url, fileName) {
     a.download = fileName;
     a.click();
   };
-  x.send();dev
+  x.send();
 }
 }
 //获取最大值的下标
@@ -1010,8 +1071,8 @@ console.log("告警"+fcon.gjScalar);
   mapper.setInputData(fcon.polydata);
   getMinMax(scalarArray);
   mapper.setScalarRange(
-    parseFloat(min.value.toFixed(3)),
-    parseFloat(max.value.toFixed(3))
+    parseFloat(min.value.toFixed(2)),
+    parseFloat(max.value.toFixed(2))
   ); //设置范围
   scalarBarActor.setAxisLabel("告警");
   mapper.clearColorArrays(); //强制重建颜色

src/view/result.vue

@@ -140,14 +140,14 @@ import mn from "@/assets/img/Group204.png";
 import t5 from "@/assets/img/Group207.png";
 import t6 from "@/assets/img/Frame.png";
 import bg from "@/assets/img/303.png";
-
+import emitter from "@/utils/emitter";
 let emit = defineEmits(["titleclick"]);
 const props = defineProps({
   classradio: {
     type: String,
   },
 });
-let newcount = ref(5);
+let newcount = ref(60);
 let activeNames=ref(['1'])
 let wdisasterref = ref();
 let wdisasterref2 = ref();
@@ -245,6 +245,7 @@ function Prev() {
   newcount.value = formInline.value.count;
   newtime();
 }
+
 //播放
 const play =(time)=>{
   showfalse.value=!showfalse.value;
@@ -319,7 +320,6 @@ const hazardtype = (val) => {
 };
 
 const initAid = (leftAid, rightAid) => {
-  console.log(1112344555)
   isdonghua.value=false;
   getMonitor(leftAid, rightAid);
   //  wdisasterref.value.getinit(leftAid);
@@ -328,21 +328,23 @@ const initAid = (leftAid, rightAid) => {
 
 };
 const wdiclick=(id,selid)=>{
+  console.log(selid);
   if(selid=='1'){//判断选择的那一个
-    wdisasterref.value.getinit(id);
+    wdisasterref.value.getinit(id,selid);
   }else if(selid=='2'){
-    wdisasterref2.value.getinit(id);
+    wdisasterref2.value.getinit(id,selid);
 }else{
 
 }
 }
 //监测点数据获取
 async function getMonitor(leftAid, rightAid) {
+
   let name;
   const params = {
     transCode: "D10018",
     aid: leftAid,
-    step: 1,
+    step: newcount.value,
   };
   await request(params)
     .then((res) => {
@@ -362,6 +364,7 @@ async function getMonitor(leftAid, rightAid) {
             ["SO2", "(ppm)"],
             ["Flow", "(Pa)"],
             ["Height", "(m)"],
+            ["CH4", "(ppm)"],
           ]);
           newMap.forEach((value, key) => {
             if ( key  == res.codes[i].code ) {
@@ -381,7 +384,10 @@ async function getMonitor(leftAid, rightAid) {
                 key= '二氧化硫'
               }else if(key=='H2S'){
                 key= '硫化氢'
-              }else if(key=='Height'){
+              }else if(key=='CH4'){
+                key= '甲烷'
+              }
+              else if(key=='Height'){
                 key= '水位'
               }else if(key=='Flow'){
                 key= '流量'
@@ -421,8 +427,16 @@ async function getMonitor(leftAid, rightAid) {
     .catch((err) => { });
 }
 onMounted(() => {
+  emitter.on('step',(value)=>{
+  newcount.value =value;
+})
   // leftcontentref.value.accident2('1','Water')
 });
+onUnmounted(() =>{
+
+emitter.off('step')
+})
+
 watch(
   newcount,
   (newVal, oldVal) => {

src/view/result/Wdisaster.vue

@@ -93,6 +93,7 @@ let series = ref([]);
 let jcname=ref("监测点");
 let href=ref();
 let steps=ref();
+let selid=ref();
 const dynamicHeaders = ref([
 
 ]);
@@ -107,6 +108,7 @@ function downloadImg(url, fileName) {
   const x = new window.XMLHttpRequest();
   x.open('GET', url, true);
   x.responseType = 'blob';
+  ElMessage.success('正在下载报告');
   x.onload = () => {
     const url = window.URL.createObjectURL(x.response);
     const a = document.createElement('a');
@@ -193,11 +195,10 @@ const handleDelete=(event)=>{
 onMounted(() => {
 })
  //父组件调用的init方法
- function getinit(id,radio) {
+ function getinit(id,sid) {
+  selid.value=sid;
   aid.value=id;
-  console.log(id)
-  console.log(1111551)
-  classradio.value=radio;
+ // classradio.value=radio;
   getdata(props.count);
   lineChart();
 
@@ -211,7 +212,7 @@ const params = {
   aid: aid.value,
   step:step,
 };
-console.log( aid.value)
+console.log("我的aid还在吗"+aid.value)
 request(params)
   .then((res) => {
     console.log(res)
@@ -230,6 +231,8 @@ request(params)
             ["SO2", "(ppm)"],
             ["Flow", "(m³/s)"],
             ["Height", "(m)"],
+            ["CH4", "(ppm)"],
+           
         ]);
         newMap.forEach((value, key) => {
           if ( key  == res.codes[i].code ) {
@@ -249,6 +252,8 @@ request(params)
                 key= '二氧化硫'
               }else if(key=='H2S'){
                 key= '硫化氢'
+              }else if(key=='CH4'){
+                key= '甲烷'
               }else if(key=='Height'){
                 key= '水位'
               }else if(key=='Flow'){
@@ -368,7 +373,10 @@ watch(
   () => [props.count],
   (newVal, oldVal) => {
     console.log("监听到了",newVal)
-    getdata(newVal[0]);
+    if( selid.value=='1'){
+      getdata(newVal[0]);
+    }
+ 
   },
   { deep: true }
 ); //深度监视

src/view/result/Wdisaster2.vue

@@ -91,6 +91,7 @@ let warnin2=ref(0);
 let steptimes = ref([]);
 let series = ref([]);
 let steps=ref();
+let selid=ref();
 let jcname=ref("监测点");
 const dynamicHeaders = ref([
 
@@ -106,6 +107,7 @@ function downloadImg(url, fileName) {
   const x = new window.XMLHttpRequest();
   x.open('GET', url, true);
   x.responseType = 'blob';
+  ElMessage.success('正在下载报告');
   x.onload = () => {
     const url = window.URL.createObjectURL(x.response);
     const a = document.createElement('a');
@@ -188,12 +190,12 @@ const handleDelete=(event)=>{
 onMounted(() => {
 })
  //父组件调用的init方法
- function getinit(id,radio) {
+ function getinit(id,sid) {
+  selid.value=sid;
   aid.value=id;
-  classradio.value=radio;
+ // classradio.value=radio;
   getdata(props.count);
   lineChart();
-  console.log(series.value)
 
  }
  const fcon = createFireControl();
@@ -205,6 +207,7 @@ const params = {
   aid: aid.value,
   step: val,
 };
+console.log('我是right',aid.value)
 request(params)
   .then((res) => {
     console.log()
@@ -223,6 +226,7 @@ request(params)
             ["SO2", "(ppm)"],
             ["Flow", "(m³/s)"],
             ["Height", "(m)"],
+            ["CH4", "(ppm)"],
         ]);
         newMap.forEach((value, key) => {
           if ( key  == res.codes[i].code ) {
@@ -242,7 +246,10 @@ request(params)
                 key= '二氧化硫'
               }else if(key=='H2S'){
                 key= '硫化氢'
-              }else if(key=='Height'){
+              }else if(key=='CH4'){
+                key= '甲烷'
+              }
+              else if(key=='Height'){
                 key= '水位'
               }else if(key=='Flow'){
                 key= '流量'
@@ -357,7 +364,9 @@ option && myChart.setOption(option,true)
 watch(
   () => [props.count],
   (newVal, oldVal) => {
-    getdata(newVal[0]);
+    if( selid.value=='2'){
+      getdata(newVal[0]);
+    }
   },
   { deep: true }
 ); //深度监视