3.14

src/router/index.js

@@ -2,6 +2,9 @@
 
 import { createRouter, createWebHashHistory, } from "vue-router";
 import configurator from "@/view/configurator.vue"
+import resultLeft from '@/view/result/resultLeft.vue';
+import resultRight from '@/view/result/resultRight.vue';
+import result from '@/view/result.vue';
 const router = createRouter({
     history: createWebHashHistory(),
     routes: [
@@ -20,14 +23,54 @@ const router = createRouter({
         },
         {
             path: '/',
+            name:'appmian',
             component: () => import('@/view/appmian.vue'),
             meta:{
                 keepAlive:true // 需要缓存
             }
         },
-
+        {
+            path: '/resultLeft',
+            name:'resultLeft',
+            component: resultLeft,// 这是路由的籁加载，也可以其他方式
+        },
+        {
+            path: '/resultRight',
+            name:'resultRight',
+            components:{
+                resultRight:resultRight
+            } // 这是路由的籁加载，也可以其他方式
+        },
+        // {
+        //     path: '/result/resultLeft',
+        //     name:'resultLeft',
+        //     components:{
+        //         resultLeft:resultLeft,
+        //          default:resultLeft,
+        //         'resultLeft':History
+        //       }
+        // },
+        // {
+        //     path: '/result/resultRight',
+        //      name:'resultRight',
+        //     components:{
+        //         resultRight:resultRight,
+        //      default:resultRight,
+        //      'resultRight':History
+        //       }
+        // },
+     
     ]
 })
+//修改动态网页标题 beforeEach 导航钩子，路由改变前触发
+router.beforeEach((to,from,next) =>{
+    //window.document.title = to.meta.title;
+    window.document.title = to.name;
+    next();
+  })
+  router.afterEach((to,from,next) =>{
+    window.scrollTo(0,0);
+  })
 export default router;
 
 

src/view/InfoDialoges.vue

@@ -364,7 +364,7 @@ let idobj = ref({
 })
 const value1 = ref('')
 let loading = ref(true)
-let aid = ref("");
+let aid = ref();
 let firepid = ref("");
 let firesid = ref("");
 const currentPage4 = ref(1);

src/view/appmian.vue

@@ -20,6 +20,7 @@
 
                         <el-menu-item index="3">灾害推演</el-menu-item>
                         <el-menu-item index="4">推演结果</el-menu-item>
+                        <el-menu-item index="5">结果对比</el-menu-item>
                     </el-menu>
                     <div class="ve_right">
                         <div class="ve_timeioc"  v-if=" aid==null"  @click="qingsel">
@@ -48,6 +49,7 @@
                 <info-boundary ref="boundary" :classradio="classradio" :aid="aid" />
                 <info-animation ref="tanimation" :classradio="classradio" :aid="aid" />
                 <InfoVtkmodel ref="vtkmodel" />
+                <result ref="resultbidui"></result>
             </el-main>
         </el-container>
     </div>
@@ -64,6 +66,7 @@ import SourceDisaster from "./components/InfoDisaster.vue"
 import InfoBoundary from "./components/InfoBoundary.vue"
 import InfoAnimation from "./components/InfoAnimation.vue"
 import InfoVtkmodel from "./components/InfoVtkmodel.vue"
+import result from "./result.vue"
 import Vector from "@/assets/img/Vector.png";
 import { timestampToTime } from '@/js/lindex.js'
 import mitts from "@/utils/Bus"
@@ -78,6 +81,7 @@ let classradio = ref()
 let boundary = ref();
 let tanimation = ref();
 let titlefalse = ref(false);
+let resultbidui=ref();
 let headerobj = ref({
     time: '',
     name: "",
@@ -144,6 +148,7 @@ const handleSelect = (key) => {
             boundary.value.accident4(key);
             lliudialog.value.accident2(key);
             tanimation.value.monitor = false;
+            resultbidui.value.accident6(key)
             activeIndex.value='1';
             break;
         case '2':
@@ -152,6 +157,7 @@ const handleSelect = (key) => {
             sourcedis.value.accident3(key);
             lliudialog.value.accident2(key);
             tanimation.value.monitor = false;
+            resultbidui.value.accident6(key)
             activeIndex.value='2'
             break;
         case '3':
@@ -162,15 +168,26 @@ const handleSelect = (key) => {
             tanimation.value.monitor = false;
             activeIndex.value='3'
             lliudialog.value.addinitial();
+            resultbidui.value.accident6(key)
             break;
         case '4':
             boundary.value.accident4(key);
             tanimation.value.accident5(aid.value);
              sourcedis.value.accident3(key);
             lliudialog.value.accident2(key);
+            resultbidui.value.accident6(key)
             activeIndex.value='4'
-        default:
             break;
+            case '5':
+            sourcedis.value.changeModel();
+            sourcedis.value.accident3(key);
+            boundary.value.accident4(key);
+            lliudialog.value.accident2(key);
+            resultbidui.value.accident6(key)
+            tanimation.value.monitor = false;
+            activeIndex.value='5';
+        default:
+            break;  
     }
 }
 

src/view/components/InfoAnimation.vue

@@ -110,6 +110,7 @@
                   style="width: 100%"
                   @current-change="handleCurrentChange"
                   :row-class-name="tableRowClassName"
+                  :max-height="tableHeight"
                   :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
                 >
                   <el-table-column prop="name" label="监测点名称" />
@@ -164,6 +165,7 @@ const props = defineProps({
     // default: '',
   },
 });
+let tableHeight = ref(400);
 let danwei=ref("");
 let newcount = ref(0);
 const count = ref(0);

src/view/components/InfoDisaster.vue

@@ -842,7 +842,7 @@ const newtable = () => {
 const xiugaitable = () => {
   gdadd.value = "3";
   zhtext.value = "修改";
-  if (zqname.value == "") {
+  if (JSON.stringify(tableobj.value) == "{}") {
     ElMessage.error("你还没有选中修改的项目");
   } else {
     console.log(tableobj.value)

src/view/components/MenuMine.vue

@@ -296,8 +296,8 @@ import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
 import icon from "@/assets/img/icon.png";
 import g from "@/assets/img/g.jpg";
-import j from "@/assets/img/j.jpg";
-import y from "@/assets/img/y.jpg";
+import j from "@/assets/img/j.png";
+import y from "@/assets/img/y.png";
 import { timestampToTime } from '@/js/lindex.js';
 import NodeSelect from "./NodeLine.vue";
 let nodeselect = ref();
@@ -1503,12 +1503,10 @@ ol {
     position: absolute;
     position: absolute;
     overflow: hidden;
-    top: -8px;
+    top: 0;
     right: -22px;
 }
-.elimg .el-image{
-    height: 50px;
-}
+
 .el-input.is-disabled .el-input__inner{
     color: #FFFFFF !important;
     -webkit-text-fill-color:#FFFFFF !important;

src/view/result.vue

@@ -0,0 +1,69 @@
+<template>
+    <!--结果对比 -->
+    <div  class="resultyem" v-show="resultyem">
+        <div class="publicleft">
+            <h1>目标页</h1>
+            <router-link  :to="{path:'/resultLeft'}">目标页</router-link>
+        </div>
+ 
+        <div class="result_left results">
+          <!-- <resultLeft/> -->
+            <router-view name="resultLeft">
+                <resultLeft/>
+            </router-view>
+        <router-view>
+	 </router-view> 
+    </div>
+    <div class="result_right results">
+     
+        <!-- <router-view name="resultRight"> -->
+            <!-- <h1>右边result_right</h1> -->
+        <!-- <resultRight/> -->
+        <!-- </router-view> -->
+    </div>
+    </div>
+  </template>
+  <script setup>
+    import { ref, onMounted,defineProps, reactive, } from "vue";
+    import {RouterView,RouterLink } from "vue-router"
+    import { request, uploadFile } from "@/utils/request";
+    import resultLeft from "./result/resultLeft.vue";
+    import resultRight from "./result/resultRight.vue"
+let resultyem=ref(false);
+const accident6 = (key) => {
+  if (key == "5") {
+    resultyem.value=true;
+  } else {
+    resultyem.value= false;
+  }
+};
+defineExpose({accident6});
+</script>
+<style scoped>
+.resultyem{
+width: 100%;
+position: absolute;
+z-index: 12;
+top:70px;
+color:#fff;
+    display: flex;
+    box-shadow: inset 0px 0px 17px 5px rgba(12, 97, 197, 0.2);
+    border-radius: 0px 0px 0px 0px;
+}
+.results{
+   flex: 1;
+}
+.result_left,.result_right{
+    border-left: 2px solid;
+    /* border-right: 2px solid; */
+    /* border-image: linear-gradient(180deg, rgba(31, 107, 255, 0), rgba(255, 255, 255, 0.8)) 1 1; */
+    border-image: linear-gradient(180deg, rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.5)) 1 1;
+    box-shadow: inset 0px 0px 17px 5px rgba(12, 97, 197, 0.2);
+}
+.publicleft{
+    width: 270px;
+    height: calc(100vh - 70px);
+    box-shadow: inset 0px 0px 17px 5px rgba(12, 97, 197, 0.2);
+    /* border:1px solid #fff */
+}
+</style>

src/view/result/resultLeft.vue

@@ -0,0 +1,10 @@
+<template>
+    <!--结果对比 -->
+    <div  class="result_left">
+    <h1>我是Left组件</h1>
+    </div>
+  </template>
+  <script setup>
+</script>
+<style scoped>
+</style>

src/view/result/resultRight.vue

@@ -0,0 +1,10 @@
+<template>
+    <!--结果对比 -->
+    <div  class="resultRight">
+    <h1>我是resultRightt组件</h1>
+    </div>
+  </template>
+  <script setup>
+</script>
+<style scoped>
+</style>