liuqiao 8 месяцев назад
Родитель
Сommit
93aa1895a7

+ 5 - 17
src/view/InfoDialoges.vue

@@ -668,7 +668,6 @@ const showMore= ()=>{
  
 }
 const handleCurrentChange = ({ row, rowIndex }) => {
-    // console.log(row);
 }
 // aid获取
 const classclick1 = (val) => {
@@ -685,7 +684,6 @@ const classclick = (val) => {
     classradio.value= val;
     stype.value=val;
     console.log(classradio.value);
-    console.log(111111)
     scoperadio.value="";
     dialog.value.dialogVisible_fire = true;
     props.addselect();
@@ -914,7 +912,7 @@ const pollute = () => {
         .then((res) => {
             options.value = res.rows;
            value.value.push(res.rows[0]);
-           console.log( value.value);
+    
      
 
         })
@@ -925,7 +923,6 @@ const pollute = () => {
 //任务求解任务信息
 //state 完成1  失败是-1
 const rewu=()=>{
-  console.log(999999)
      arrvalue.value=[];
     const params = {
         transCode: 'D10017',
@@ -936,15 +933,15 @@ const rewu=()=>{
             state.value=res.state;
             emit('resulysucss',res.state);
             if(state.value=="1"){
-                emit('websockfrist');
+                //emit('websockfrist');
                 if(res.hasOwnProperty("cocodes")){
                     arrvalue.value=res.cocodes.split(',');
                 }
+                emit('websockfrist');
                 sessionStorage.setItem("acctime",res.acctime);
                 }else{
                     if(res.hasOwnProperty("cocodes")){
                     arrvalue.value=res.cocodes.split(',');
-                    console.log( arrvalue.value);
                 }
                 }
             
@@ -985,7 +982,6 @@ const inititimeDefaultal = () => {
 
 let isActive=ref(0)
 const  changeClass= (i)=>  {
-    console.log(i);
  isActive.value = i;
  if( i=='1'){
     initial();
@@ -997,7 +993,6 @@ const  changeClass= (i)=>  {
 }
 // 停止计算
 const stopcompute= ()=>{
-    console.log("停止计算")
     const params = {
         transCode: "D30004",
         aid: aid.value
@@ -1039,7 +1034,6 @@ const addinitial=()=>{
         tuiyanobj5.value.acctime = inititimeDefaultal();
         tuiyanobj5.value.cocodes = options.value[0].code;
         tuiyanobj5.value.coids=options.value[0].coid;
-        console.log(  tuiyanobj5.value);
         tuiyanobj.value ={ ...tuiyanobj5.value }
    
     }
@@ -1060,11 +1054,9 @@ const timeclick = () => {
 }
 //  下拉多选
 const selectchange = (val) => {
-    console.log(val);
     let arr1 = [];
     let arr2 = [];
     for (let i = 0; i <= val.length - 1; i++) {
-        console.log(val[i])
         arr1.push(val[i].coid);
         arr2.push(val[i].code);
     }
@@ -1139,7 +1131,6 @@ async function fetchFileContent() {
 function initWebSocket() {
     //初始化weosocket
     // const wsuri = "ws://192.168.0.43:8087//websocket?projectId="+this.pid; ws://192.168.0.131/diswebsocket?projectId=5
-    
     if(websock!=null){
         websock.close();
         websock=null;
@@ -1160,11 +1151,9 @@ const websocketonopen = (res) => {
 };
 // Websoket接收消息事件
 const websocketonmessage = (res) => {
- //   console.log("数据", res);
-    //  console.log(res.data);
     getthislog(res.data);
-    // console.log(res.data);
-    if(res.data=="求解——————————————————成功"){    
+    if(res.data=="求解——————————————————成功"){  
+       // rewu()
      emit('websockfrist');
     }
  reset();
@@ -1233,7 +1222,6 @@ onMounted(() => {
    // dialogVisible.value=true;
 });
 const change2=(val)=>{
-    console.log(val)
     formull.value.name.forceUpdate();
 }
 defineExpose({ monitor, accident2, leftcoll, classradio, aid, dialogVisible ,changeModel,classclick,state,dialog});

+ 0 - 1
src/view/appmian.vue

@@ -349,7 +349,6 @@ const imgonclock=()=>{
 
 const handleSelect = (key) => {
   emitter.emit('handleSelect',(key));
-
   // window.location.reload();
  //indexref.value.changeColor("0")
 //  indexref.value.changeColor(0);

+ 0 - 1
src/view/components/InfoDisaster.vue

@@ -1859,7 +1859,6 @@ const handledisaster = (aidval) => {
     .then((res) => {
       res.rows.forEach((item,index)=>{
         vtkmodel.addSoures(item.pid,item.site)
-        console.log(item.pid+'是添加我了吗'+item.site)
       })
       if (props.classradio == "Fire") {
         tableDatay.value = res.rows;

+ 15 - 19
src/view/index/first-left.vue

@@ -374,7 +374,6 @@ const fcon = createFireControl();
 const indexinit= (id,radio)=>{
   aid.value=id;
 //  classradio.value=radio;
-  //console.log(classradio.value);
   // fcon.step=count.value;
   // getMonitor();
   // vtkmodel.clearModeAddJg();
@@ -431,18 +430,17 @@ await request(params)
       firstshow.value=true;
       endtime.value= Number(res.totaltime)/Number(res.reportstep);
       oldtime.value=acctime;
-      console.log(3333333);
       console.log( oldtime.value)
     }else if(res.state=='-1'){
       firstshow.value=false;
-      ElMessage({
-        message: " 求解失败",
-        type: 'error',
-      });
+      // ElMessage({
+      //   message: " 求解失败",
+      //   type: 'error',
+      // });
     }else if(res.state=='0'){
       firstshow.value=false;
-      ElMessage({ message: "求解未完成",  type: 'error',
-      });
+      // ElMessage({ message: "求解未完成",  type: 'error',
+      // });
     }
     } else {
       ElMessage({
@@ -454,7 +452,6 @@ await request(params)
   .catch((err) => {
     if(err.returnMsg=="任务不存在!"){
       monitor.value=false;
-      console.log(1111)
       ElMessage({
         message: "未求解",
         type: 'error',
@@ -617,10 +614,8 @@ const newtime = () => {
   timeshow.value=true;
   time.value = null;
   oldtime.value= sessionStorage.getItem('acctime');
-console.log(222222444444)
   console.log(oldtime.value);
   time.value = (new Date(oldtime.value).getTime()) / 1000;
-  console.log( time.value);
   if ( count.value == 2) {
     let time2 = (count.value - 1) * 60 + time.value;
     timeline.value = timescount(time2);
@@ -641,7 +636,6 @@ function increment() {
   count.value++;
   newcount.value = count.value;
   fcon.step = count.value;
-  console.log( newcount.value );
   newtime();
 }
 // 播放暂停
@@ -667,7 +661,7 @@ const play =(time)=>{
       }
     }
   };
-  console.log(count.value)
+
   timer(time); 
   }else{
     isstop.value = false;//暂停
@@ -681,7 +675,6 @@ function sliderchange(val) {
   isstop.value = false;
   newcount.value = count.value;
   fcon.step = count.value;
-  console.log(count.value);
 
 }
 const tableRowClassName=()=>{
@@ -795,13 +788,11 @@ const handleDelete=(event)=>{
           data:arr,//res.rows[i].data
           })
           console.log( arr);
-          console.log(22222);
        }
         firstOccurrenceOfMax(series.value[0].data)
         const max = Math.max(...series.value[0].data);
         maxtime.value= res.steptimes[ maxindex.value];
         console.log(maxtime.value);
-        console.log(1111)
         heightnum.value=max;
       }
       lineChart();
@@ -810,6 +801,10 @@ const handleDelete=(event)=>{
     });
 
 }
+emitter.on('handleSelect',(data)=>{
+  firstshow.value=false;
+ 
+  });
 const funidshow=(val)=>{
   isshow.value=val;
 }
@@ -1057,18 +1052,19 @@ function vtkScalarRead() {
      
     })
     .catch((err) => {
-     // console.log(err);
     });
 }
+
+onUnmounted(() =>{
+emitter.off('handleSelect')
+})
 watch(
   //  props.classradio,
   // (newVal, oldVal) => {
-  //   console.log("我的值变了"+newVal);
   
   // },
   newcount,
   (newVal, oldVal) => {
-    console.log("值改变了", newVal, oldVal);
     fcon.step = newVal;
     getMonitor();
     vtkScalarRead();

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

@@ -51,7 +51,6 @@ let listArray = ref([
 let currentIndex=ref(0);
 let btnlistshow=ref(false);
 const changeColor=(index)=>{
-  console.log('是不是点击我了');
     btnindex.value=index;
      emit("vtkshowfuc", index);
     currentIndex.value = btnindex.value;
@@ -89,12 +88,17 @@ const firstshowfuc=()=>{
   firstleftref.value.isshow=false;
 }
 const indexchange=(key)=>{
+ // let state=sessionStorage.getItem("state")
+  //console.log('当前我的状态'+props.state);
   if(key==0){
     towrightref.value.towshow=false;
-    if(props.state=='1'){
-      firstleftref.value.firstshow=true;
-      console.log( firstleftref.value.firstshow);
-    firstleftref.value.indexinit(props.aid);
+   console.log('当前我的状态'+props.state);
+   console.log('当前我的状态'+sessionStorage.getItem("state"));
+    if(sessionStorage.getItem("state")=='1'){
+      //  firstleftref.value.firstshow=true;
+
+  
+      firstleftref.value.indexinit(props.aid);
     }
   }else if(key==1){
     firstleftref.value.firstshow=false;