Browse Source

4.19下班之前上传

liuqiao 1 year ago
parent
commit
d63f44fd5f

+ 4 - 0
src/style/style.css

@@ -1648,6 +1648,10 @@ font-size: .0677rem;
   height: calc(100vh - 64px);
   border-radius: 0px 0px 0px 0px; */
 }
+.woter {
+  margin-top: -15px;
+  margin-left: -15px;
+}
 .is-vertical{
   height: 100vh;
   background: radial-gradient(closest-side, #0B338B , #1C253D);

+ 7 - 8
src/view/InfoDialoges.vue

@@ -399,7 +399,7 @@ const changeModel= ()=>  {
 }
 let currentrow=ref(false);
 let placeholder=ref('某次某事件火灾事故');
-let emit = defineEmits(['headerclick', 'childfun', 'imgonclock','moxingclick','handleSelect','leftsimulation','resulysucss','websockfrist'])
+let emit = defineEmits(['headerclick', 'childfun', 'imgonclock','moxingclick','handleSelect','leftsimulation','resulysucss','websockfrist','funcfirst'])
 const props = defineProps({
     addselect: {
         type: Function,
@@ -639,7 +639,7 @@ const accident = () => {
         //  emit('handleSelect', '1');
         fetchFileContent();
         accident2(props.activeIndex)
-        rewu();
+       rewu();
         // if(state.value=="1"){
         //      emit('websockfrist');
         //     }
@@ -812,8 +812,6 @@ const rewu=()=>{
            // console.log("状态"+state.value);
            // emit('resulysucss'); 
             tuiyanobj.value.pickertime=res.acctime;
-            console.log(tuiyanobj.value.acctime)
-            console.log(options.value.length);
             value.value=arrvalue.value;   
             value.value=[];
             for (let i = 0; i <options.value.length; i++){
@@ -891,7 +889,10 @@ const selectchange = (val) => {
 }
 //推演的开始计算
 const calculate = () => {
+
     rizhi.value.logs='';
+    
+    emit('funcfirst');
     newlog.value ='';
     const params = {
         transCode: 'D00008',
@@ -905,7 +906,6 @@ const calculate = () => {
         coids: tuiyanobj.value.coids,
         cocodes: tuiyanobj.value.cocodes,
     }
-
     request(params)
         .then((res) => {
           //  initWebSocket();
@@ -971,9 +971,8 @@ const websocketonmessage = (res) => {
     //  console.log(res.data);
     getthislog(res.data);
     // console.log(res.data);
-    if(res.data=="求解——————————————————成功"){
-        console.log(111111)
-     //   emit('websockfrist');
+    if(res.data=="求解——————————————————成功"){    
+     emit('websockfrist');
     }
     reset();
 };

+ 5 - 0
src/view/appmian.vue

@@ -20,6 +20,7 @@
           :valzaiqing="valzaiqing"
           :headerobj="headerobj"
           :activeIndex="activeIndex"
+          @funcfirst="funcfirst"
           @imgonclock="imgonclock"
           @leftsimulation="leftsimulation"
           @headerclick="headerclick"
@@ -170,6 +171,10 @@ const resulysucss=(val)=>{
     indexref.value.changeColor(0);
   }
 }
+// 开始计算调用的func
+const funcfirst=()=>{
+  indexref.value.firstshowfuc();
+}
 //求解成功
 // const indexinit=()=>{
 // console.log(234789)

+ 3 - 8
src/view/index/first-left.vue

@@ -105,7 +105,7 @@
             
               <div class="animation_s">
               <el-slider
-                :max="60"
+                :max="endtime"
                 :min="0"
                 v-model="count"
                 @change="sliderchange"
@@ -254,7 +254,6 @@ const fcon = createFireControl();
 // 父组件获取的方法初始化 
 const indexinit= (id,radio)=>{
   aid.value=id;
-console.log(props.classradio);
 //  classradio.value=radio;
   //console.log(classradio.value);
   // fcon.step=count.value;
@@ -266,6 +265,7 @@ if(props.classradio=='Fire'){
 }else if(props.classradio=='Water'){
   formInline.value.region="Height";
 }
+myChart.clear();
  readJob();
 }
 function regionchange(val) {
@@ -295,7 +295,6 @@ const params = {
   transCode: "D10017",
   aid: aid.value,
 };
-console.log(111112222233343433+1)
 await request(params)
   .then((res) => {
     if (res.returnCode == "000000000") {
@@ -308,9 +307,7 @@ await request(params)
       vtkmodel.clearModeAddJg();
       reddate(new Date());
       vtkGridRead();
-  
       endtime.value= Number(res.totaltime)/Number(res.reportstep);
-      console.log( endtime.value);
     }else if(res.state=='-1'){
       ElMessage({
         message: " 求解失败",
@@ -340,7 +337,6 @@ await request(params)
 }
 //监测点数据获取
 async  function getMonitor() {
-
   const params = {
     transCode: "D10018",
     aid: aid.value,
@@ -527,7 +523,6 @@ const handleDelete=(event)=>{
  jcname.value=event.chname;
 
   currentrow1.value=true;
-//let arr=[];
   const params = {
     transCode: "D10019",
     aid: aid.value,
@@ -607,7 +602,7 @@ const linedata=()=>{
 const lineChart=()=>{
   // console.log(series.value);
   var chartDom = document.getElementById('line');
-var myChart = echarts.init(chartDom);
+ myChart = echarts.init(chartDom);
 //  myChart = echarts.init(document.getElementById('line'));
  
 let option = {

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

@@ -69,7 +69,10 @@ const firsrdata= ()=>{
     firstleftref.value.firstshow=true;
     firstleftref.value.indexinit(props.aid,props.classradio);
 }
-
+// 
+const firstshowfuc=()=>{
+  firstleftref.value.firstshow=false;
+}
 const indexchange=(key)=>{
   if(key==0){
     
@@ -97,7 +100,7 @@ const hiddfalse=()=>{
 const showhadend=()=>{
     btnlistshow.value=true;
 }
-     defineExpose({showhadend,changeColor,btnindex,btnlistshow,hiddfalse,currentIndex,firsrdata});
+     defineExpose({showhadend,changeColor,btnindex,btnlistshow,hiddfalse,currentIndex,firsrdata,firstshowfuc});
    </script>
    <style  lang="scss" scoped>