Home Explore Help
Register Sign In
huangxingxing
/
disaster
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

3.18

liuqiao 1 year ago
parent
2a9638309a
commit
d764d08e8e
11 changed files with 98 additions and 71 deletions
Split View Show Diff Stats
  1. 4 1
      dist/index.html
  2. BIN
      favicon.ico
  3. 3 1
      index.html
  4. 25 25
      src/router/index.js
  5. 3 5
      src/view/InfoDialoges.vue
  6. 1 1
      src/view/appmian.vue
  7. 2 6
      src/view/components/InfoAnimation.vue
  8. 2 2
      src/view/components/InfoBoundary.vue
  9. 2 2
      src/view/components/InfoDisaster.vue
  10. 6 19
      src/view/components/MenuMine.vue
  11. 50 9
      src/view/result.vue

+ 4 - 1
public/index.html → dist/index.html
View File 

@@ -2,7 +2,10 @@
 
 <html lang="en">
 
   <head>
 
     <meta charset="UTF-8" />
 
-    <link rel="icon" href="<%= BASE_URL %>favico.ico">
 
+    <!-- <link rel="icon" href="<%= BASE_URL %>favico.ico"> -->
 
+    <!-- <link rel="icon" href="<%= BASE_URL %>favico.ico" type="image/x-icon" /> -->
 
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
+    <link rel="shortcut icon" type="image/x-icon" href="<%= BASE_URL %>favicon.ico" />   
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title>灾情软件</title>
 
     <script type="module" crossorigin src="./assets/index-85a53adb.js"></script>

BIN
favicon.ico
View File


+ 3 - 1
index.html
View File 

@@ -2,7 +2,9 @@
 
 <html lang="en">
 
   <head>
 
     <meta charset="UTF-8" />
 
-    <link rel="icon" href="/assets/logo.png" />
 
+    <!-- <link rel="icon" href="/assets/logo.png" /> -->
 
+    <link rel="icon" href="favicon.ico">
 
+    <!-- <link rel="shortcut icon" type="image/x-icon" href="<%= BASE_URL %>favicon.ico" />    -->
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title></title>
 
   </head>

+ 25 - 25
src/router/index.js
View File 

@@ -31,37 +31,37 @@ const router = createRouter({
 
                 title: '首页'
 
             }
 
         },
 
-        {
 
-            path: '/resultLeft',
 
-            name:'resultLeft',
 
-            component: resultLeft,// 这是路由的籁加载，也可以其他方式
 
-        },
 
-        {
 
-            path: '/resultRight',
 
-            name:'resultRight',
 
-            components:{
 
-                resultRight:resultRight
 
-            } // 这是路由的籁加载，也可以其他方式
 
-        },
 
+
 
+{
 
+    path: '/goods',
 
+    name: 'goods',
 
+    component: {
 
+      // 这里的 goods 对应 router-view 中的 name
 
+      goods: resultLeft
 
+    }
 
+  },
 
+  {
 
+    path: '/orderinfo',
 
+    name: 'orderinfo',
 
+    component: {
 
+      // 这里的 orderinfo 对应 router-view 中的 name
 
+      orderinfo:resultRight
 
+    }
 
+}
 
+  
         // {
 
-        //     path: '/result/resultLeft',
 
+        //     path: '/resultLeft',
 
         //     name:'resultLeft',
 
-        //     components:{
 
-        //         resultLeft:resultLeft,
 
-        //          default:resultLeft,
 
-        //         'resultLeft':History
 
-        //       }
 
+        //     component: resultLeft,// 这是路由的籁加载，也可以其他方式
 
         // },
 
         // {
 
-        //     path: '/result/resultRight',
 
-        //      name:'resultRight',
 
+        //     path: '/resultRight',
 
+        //     name:'resultRight',
 
         //     components:{
 
-        //         resultRight:resultRight,
 
-        //      default:resultRight,
 
-        //      'resultRight':History
 
-        //       }
 
+        //         resultRight:resultRight
 
+        //     } // 这是路由的籁加载，也可以其他方式
 
         // },
 
-     
+        
     ]
 
 })
 
 //修改动态网页标题 beforeEach 导航钩子，路由改变前触发

+ 3 - 5
src/view/InfoDialoges.vue
View File 

@@ -1361,11 +1361,6 @@ defineExpose({ monitor, accident2, leftcoll, classradio, aid, dialogVisible ,cha
 
     height: 0 !important;
 
     background-color: rgba(red, green, blue, 0) !important;
 
 }
 
-
 
-.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
 
-    background-color: rgba(104, 173, 255, 0) !important;
 
-}
 
-
 
 .el-button:focus,
 
 .el-button:hover {
 
     background: rgba(104, 173, 255, 1) !important;
 
@@ -1769,4 +1764,7 @@ ol {
 
 .spantext{
 
     cursor: pointer;
 
 }
 
+.tablebk .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
 
+    background-color: rgba(255, 255, 25, 0.5) !important;
 
+}
 
 </style>

+ 1 - 1
src/view/appmian.vue
View File 

@@ -46,7 +46,7 @@
 
                 <Dialoges ref="lliudialog" :addselect="addselect" :headerobj="headerobj" @headerclick="headerclick" @handleSelect="handleSelect"
 
                     @childfun="childfun" @moxingclick="moxingclick"></Dialoges>
 
                 <source-disaster ref="sourcedis" :classradio="classradio" :aid="aid" />
 
-                <info-boundary ref="boundary" :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>

+ 2 - 6
src/view/components/InfoAnimation.vue
View File 

@@ -1,7 +1,7 @@
 
 <template>
 
-  <!-- 所有弹出框 -->
 
+  <!-- 所有弹出框 -->   <!-- 推演结果 -->
 
   <div class="l_Dialog">
 
-    <!-- 推演结果 -->
 
+ 
     <el-aside width="278px" class="L_aside1 asideg asidegbg leftbgimg" v-show="monitor">
 
       <div class="result result1">
 
         <el-tabs
 
@@ -1117,10 +1117,6 @@ defineExpose({ monitor, accident5 });
 
   background-color: rgba(red, green, blue, 0) !important;
 
 }
 
 
-.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
 
-  background-color: rgba(104, 173, 255, 0) !important;
 
-}
 
-
 
 .el-button:focus,
 
 .el-button:hover {
 
   background: rgba(104, 173, 255, 1) !important;

+ 2 - 2
src/view/components/InfoBoundary.vue
View File 

@@ -1,6 +1,6 @@
 
 <template>
 
-  <!-- 所有弹出框 -->
 
-  <div class="l_Dialog bou">
 
+  <!-- 边界条件-->
 
+  <div class="l_Dialog bou tablebk">
 
     <!--火灾左侧栏-->
 
     <div class="common-layout" style="margin: 0">
 
       <el-aside

+ 2 - 2
src/view/components/InfoDisaster.vue
View File 

@@ -1,6 +1,6 @@
 
 <template>
 
-  <!-- 所有弹出框 灾情源设置-->
 
-  <div class="l_Dialog bbb">
 
+  <!--  灾情源设置-->
 
+  <div class="l_Dialog bbb tablebk">
 
     <!--火灾左侧栏-->
 
     <div class="common-layout" style="margin: 0" v-show="sour.collfire">
 
       <el-aside width="354px" class="L_aside L_aside1 asideg asidegbg leftbgimg1">

+ 6 - 19
src/view/components/MenuMine.vue
View File 

@@ -1097,11 +1097,6 @@ border-image: linear-gradient(180deg, rgba(31, 107, 255, 1), rgba(31, 107, 255,
 
     height: 0 !important;
 
     background-color: rgba(red, green, blue, 0) !important;
 
 }
 
-
 
-.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
 
-    background-color: rgba(255, 255, 25, 0) !important;
 
-}
 
-
 
 .el-button:focus,
 
 .el-button:hover {
 
     background: rgba(104, 173, 255, 1) !important;
 
@@ -1419,17 +1414,10 @@ ol {
 
     display: flex;
 
 } */
 
 
-.classtab .el-tabs__item {
 
-    /* flex: 1 */
 
-}
 
-
 
 .xinxi_header {
 
     border-bottom: none !important;
 
 }
 
 
-.classtab .el-tabs__nav {
 
-    /* width: 480px; */
 
-}
 
 
 .zhucentent .el-table__header tr {
 
     background-color: none !important;
 
@@ -1505,9 +1493,6 @@ ol {
 
     right: -22px;
 
 }
 
 
-/* input:disabled{
 
-  -webkit-text-fill-color:#fff!important;
 
-} */
 
 input[disabled]{
 
   -webkit-text-fill-color:#fff !important ;
 
   -webkit-opacity:1;
 
@@ -1515,10 +1500,6 @@ input[disabled]{
 
   cursor: not-allowed;
 
 }
 
 
-/* .el-input.is-disabled .el-input__inner{
 
-    color: #FFFFFF !important;
 
-    -webkit-text-fill-color:#FFFFFF !important;
 
-} */
 
 .el-input__inner::placeholder {
 
   color: #666 !important;
 
 }
 
@@ -1535,6 +1516,12 @@ input::-moz-placeholder { /* Mozilla Firefox 19+ */
 
 input:-ms-input-placeholder { /* Internet Explorer 10+ */
 
     color: #666;
 
 }
 
+/* .el-table__body tr.hover-row>td.el-table__cell, .el-table__body tr.hover-row.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell{
 
+    background-color: rgba(255, 255, 25, 0.5) !important;
 
 
+} */
 
+.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
 
+    background-color: rgba(255, 255, 25, 0.5) !important;
 
+}
 
 
 </style>

+ 50 - 9
src/view/result.vue
View File 

@@ -2,24 +2,23 @@
 
     <!--结果对比 -->
 
     <div  class="resultyem" v-show="resultyem">
 
         <div class="publicleft">
 
-            <h1>目标页</h1>
 
-            <router-link  :to="{path:'/resultLeft'}">目标页</router-link>
 
+          <div class="resultime">
 
+            <div class="text">指定时间</div>
 
+            <div class="time">{{timeline}}</div>
 
+          </div>
 
         </div>
 
  
         <div class="result_left results">
 
           <!-- <resultLeft/> -->
 
-            <router-view name="resultLeft">
 
-                <resultLeft/>
 
+            <router-view name="goods">
 
+                <!-- <resultLeft/> -->
 
             </router-view>
 
-        <router-view>
 
+        <router-view name="orderinfo">
 
 	 </router-view> 
     </div>
 
     <div class="result_right results">
 
      
-        <!-- <router-view name="resultRight"> -->
 
-            <!-- <h1>右边result_right</h1> -->
 
-        <!-- <resultRight/> -->
 
-        <!-- </router-view> -->
 
+ 
     </div>
 
     </div>
 
   </template>
 
@@ -29,7 +28,10 @@
 
     import { request, uploadFile } from "@/utils/request";
 
     import resultLeft from "./result/resultLeft.vue";
 
     import resultRight from "./result/resultRight.vue"
 
+    import { timestampToTime } from "@/js/lindex.js";
 
 let resultyem=ref(false);
 
+let timeline=ref("2024-03-03 14:00");
 
+let timing = ref(null);
 
 const accident6 = (key) => {
 
   if (key == "5") {
 
     resultyem.value=true;
 
@@ -37,6 +39,16 @@ const accident6 = (key) => {
 
     resultyem.value= false;
 
   }
 
 };
 
+const newtime=()=>{
 
+  timing.value = setInterval(() => {
 
+      const timestamp = new Date().getTime();
 
+      timeline.value = timestampToTime(timestamp);
 
+
 
+    }, 1000);
 
+}
 
+onMounted(() => {
 
+  newtime()
 
+});
 
 defineExpose({accident6});
 
 </script>
 
 <style scoped>
 
@@ -66,4 +78,33 @@ color:#fff;
 
     box-shadow: inset 0px 0px 17px 5px rgba(12, 97, 197, 0.2);
 
     /* border:1px solid #fff */
 
 }
 
+.resultime{
 
+  height: 70px;
 
+  border-bottom: 1px solid; 
+  border-image:  linear-gradient(347deg, rgb(16, 92, 240), rgb(18, 48, 102)) 1 1;
 
+
 
+}
 
+.resultime .text{
 
+font-size: 14px;
 
+width: 88px;
 
+font-weight: bold;
 
+line-height: 70px;
 
+text-align: center;
 
+display: inline-block;
 
+border-right: 1px solid;
 
+border-image:  linear-gradient(347deg, rgb(16, 92, 240), rgb(18, 48, 102)) 1 1;
 
+float: left;
 
+}
 
+.resultime .time{
 
+line-height: 70px;
 
+font-family: Microsoft YaHei UI, Microsoft YaHei UI;
 
+font-weight: bold;
 
+font-size: 14px;
 
+color: #FF0F0F;
 
+line-height: 70px;
 
+text-align: left;
 
+text-align: center;
 
+font-style: normal;
 
+text-transform: none;
 
+}
 
 </style>