liuqiao 1 vuosi sitten
vanhempi
säilyke
4743c880e1
4 muutettua tiedostoa jossa 94 lisäystä ja 15 poistoa
  1. BIN
      src/assets/img/Group204.png
  2. 24 4
      src/view/InfoDialoges.vue
  3. 54 10
      src/view/appmian.vue
  4. 16 1
      src/view/result.vue

BIN
src/assets/img/Group204.png


+ 24 - 4
src/view/InfoDialoges.vue

@@ -328,7 +328,7 @@ const changeModel= ()=>  {
 }
 let currentrow=ref(false);
 let placeholder=ref('某次某事件火灾事故');
-let emit = defineEmits(['headerclick', 'childfun', 'moxingclick','handleSelect'])
+let emit = defineEmits(['headerclick', 'childfun', 'moxingclick','handleSelect','leftsimulation'])
 const props = defineProps({
     addselect: {
         type: Function,
@@ -337,8 +337,10 @@ const props = defineProps({
     },
     headerobj: {
         type: Object,
+    },
+    valzaiqing:{
+        type:String
     }
-
 });
 let startlog=ref('0');
 let shigtext = ref('');
@@ -501,16 +503,34 @@ const accident = () => {
     if (idobj.value.name == '') {
         ElMessage.error('请选择项目')
     } else {
+        if(props.valzaiqing=='模拟数据'){
+        const params = {
+            transCode: 'D10017',
+            aid:aid.value,
+        }
+        request(params)
+            .then((res) => {
+                emit("leftsimulation",res);
+            })
+            .catch((err) => {
+            ElMessage.error(err.returnMsg)
+            
+            })
+      
+
+        }else{
+
+   
            initWebSocket();
           rizhi.value.logs='';
           newlog.value ='';
         emit('headerclick', sgdata.value);
-        dialog.value.dialogVisible_fire = false;
         emit('childfun');
         emit('moxingclick', true);
         pollute();
         emit('handleSelect', '1');
-
+    }
+    dialog.value.dialogVisible_fire = false;
     }
     fetchFileContent();
 

+ 54 - 10
src/view/appmian.vue

@@ -23,7 +23,7 @@
                         <el-menu-item index="5">结果对比</el-menu-item>
                     </el-menu>
                     <div class="ve_right">
-                        <div class="ve_timeioc"  v-if=" aid==null"  @click="qingsel">
+                        <div class="ve_timeioc"  v-if=" aid==null"  @click="titleclick()">
                             <span>请选择</span>
                         </div>
                         <div  v-else>
@@ -43,13 +43,13 @@
             </el-header>
 
             <el-main>
-                <Dialoges ref="lliudialog" :addselect="addselect" :headerobj="headerobj" @headerclick="headerclick" @handleSelect="handleSelect"
+                <Dialoges ref="lliudialog" :addselect="addselect" :valzaiqing="valzaiqing" :headerobj="headerobj" @leftsimulation="leftsimulation"  @headerclick="headerclick" @handleSelect="handleSelect"
                     @childfun="childfun" @moxingclick="moxingclick"></Dialoges>
                 <source-disaster ref="sourcedis" :classradio="classradio" :aid="aid" />
                 <info-boundary ref="boundary" :classradio="classradio" />
                 <info-animation ref="tanimation" :classradio="classradio" :aid="aid" />
                 <InfoVtkmodel ref="vtkmodel" />
-                <result ref="resultbidui"></result>
+                <result ref="resultbidui" @titleclick="titleclick"></result>
             </el-main>
         </el-container>
     </div>
@@ -74,18 +74,34 @@ import mitts from "@/utils/Bus"
 
 let lliudialog = ref();
 let sourcedis = ref();
-const title = "灾情推演软件";
-const activeIndex = ref('1')
-const activeIndex2 = ref('1')
 let classradio = ref()
 let boundary = ref();
 let tanimation = ref();
+const title = "灾情推演软件";
+const activeIndex = ref('1')
+const activeIndex2 = ref('1')
 let titlefalse = ref(false);
 let resultbidui=ref();
+let mnindex=ref("");
+let resultleft=ref({
+    totaltime:'',
+    reportstep:'',
+    pickertime:'',
+    coids:'',
+    aid:'7'
+});
+let resultright=ref({
+    totaltime:'',
+    reportstep:'',
+    pickertime:'',
+    cocodes:'' ,
+    aid:'7'
+});
 let headerobj = ref({
     time: '',
     name: "",
 })
+let valzaiqing=ref("");
 let router = useRouter();
 let sgdata = ref({});
 let aid = ref();
@@ -110,19 +126,47 @@ router.push({ path:"/configurator"})
 const addselect = () => {
     classradio.value = lliudialog.value.classradio;
 
+}
+// 获取模拟数据对比
+const leftsimulation=(res)=>{
+    if( mnindex.value=='1'){
+    resultleft.value.coids=res.coids;
+    resultleft.value.totaltime=res.totaltime;
+    resultleft.value.reportstep=res.reportstep;
+    resultleft.value.pickertime=res.acctime;
+
+    }else{
+    resultright.value.coids=res.coids;
+   resultrightresultleft.value.totaltime=res.totaltime;
+   resultright.value.reportstep=res.reportstep;
+    resultright.value.pickertime=res.acctime;
+    }
+
+  
+}
+//判断两个对象是否相等
+const objequality= ()=>{
+   
+
 }
 const moxingclick = (val) => {
     titlefalse.value = val;
 }
-const qingsel=()=>{
-    lliudialog.value.dialogVisible = true;
-}
+// const qingsel=()=>{
+//     lliudialog.value.dialogVisible = true;
+// }
 //点击头部弹出弹框
 
-const titleclick = () => {
+const titleclick = (val,index) => {
+    mnindex.value=index;
+    valzaiqing.value=val;
+    if(val=='模拟数据'){
+        lliudialog.value.dialogVisible = true;
+    }else{
     lliudialog.value.dialogVisible = true;
     clearInterval();
 }
+}
 //获取aid
 const aidlist = () => {
     sgdata.value = lliudialog.value.sgdata;

+ 16 - 1
src/view/result.vue

@@ -61,9 +61,13 @@
       </div>
     </div>
     <div class="result_left results">
+      <div class="elimgmn" @click="hazardtype('1')">
+      <el-image :src="mn" fit="contain"></el-image></div>
       <resultLeft :region="formInline.region" :count="formInline.count"/>
     </div>
     <div class="result_right results">
+      <div class="elimgmn" @click="hazardtype('2')">
+      <el-image :src="mn" fit="contain"></el-image></div>
       <resultRight :region="formInline.region" :count="formInline.count"/>
     </div>
   </div>
@@ -80,6 +84,8 @@ import t1 from "@/assets/img/t1.png";
 import t2 from "@/assets/img/t2.png";
 import t3 from "@/assets/img/t3.png";
 import t4 from "@/assets/img/t4.png";
+import mn from "@/assets/img/Group204.png";
+let emit = defineEmits(['titleclick'])
 let resultyem = ref(false);
 let timing = ref(null);
 let starttime = ref(1);
@@ -132,7 +138,9 @@ function regionchange(val) {
     }
   });
 }
-
+const hazardtype=(val)=>{
+  emit("titleclick","模拟数据",val);
+}
 onMounted(() => {
   newtime();
 });
@@ -191,6 +199,7 @@ defineExpose({ accident6 });
 }
 .results {
   flex: 1;
+  position: relative;
 }
 .result_left,
 .result_right {
@@ -252,4 +261,10 @@ defineExpose({ accident6 });
 .heigjie .el-select .el-input__inner {
   color: #fff;
 }
+.results .elimgmn{
+  position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 111;
+}
 </style>