4.25

src/style/style.css

@@ -18,7 +18,19 @@ body,html{
   .el-overlay-dialog {
     pointer-events: none;
 }
-
+.btnicon .el-collapse-item__header .el-collapse-item__arrow svg{
+  background-image: url(/src/assets/img/jian.png);
+  background-repeat: no-repeat;
+  background-position: center;
+  /* transform: rotate(346deg); */
+  background-size: cover;
+  transform: rotate(270deg);
+  -ms-transform: rotate(30deg);
+  transform-origin: 50% 50%;
+}
+.btnicon .el-collapse-item__header .el-collapse-item__arrow svg path {
+  display: none;
+}
 .summary-dlg {
     pointer-events: none;
 }
@@ -317,7 +329,7 @@ color: #fff;
   .asides_content .el-form-item__label {
     color: #FFFFFF !important;
   }
-  
+ 
   .asdis_btn {
     display: flex;
     margin-top: 9px;
@@ -397,7 +409,19 @@ color: #fff;
     font-style: normal;
     text-transform: none;
   }
-  
+  /* .jiance{
+    box-shadow: inset 0px 0px 17px 5px rgba(12, 97, 197, 0.2);
+    border-radius: 4px 4px 4px 4px;
+    border: 1px solid;
+    border-image: linear-gradient(180deg, rgb(31, 107, 255), rgba(31, 107, 255, 0.48)) 1 1;
+  } */
+  .rightfl{
+    position: absolute;
+    right: 0;
+    top: 65px;
+    height: 87vh;
+    overflow: auto; 
+  }
   .jiancedian1 {
     width: 1.7031rem;
     position: fixed;
@@ -485,8 +509,8 @@ color: #fff;
 
 .el-table .el-table__cell {
     padding: 0 !important;
-    height: 30px;
-    line-height: 30px;
+    height: .1563rem;
+    line-height: .1563rem;
 }
 
 /* .el-table tr,.el-table th.el-table__cell{
@@ -815,7 +839,7 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
 
 .color1 {
     font-weight: 400;
-    font-size: 13px;
+    font-size: .0677rem;
     color: #FFFFFF;
     line-height: 14px;
     text-align: left;
@@ -824,7 +848,7 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
 }
 
 .jc_padding .el-table tr {
-    height: 30px;
+    height: .1563rem;
     background-color: none;
 
 
@@ -1153,11 +1177,7 @@ ol {
 .el-tabs--card>.el-tabs__header .el-tabs__nav {
     border: none !important;
 }
-.el-table .el-table__cell {
-  padding: 0!important;
-  height: 30px;
-  line-height: 30px;
-}
+
 .l_btn .borderimg {
   border-radius: 4px;
   display: flex;
@@ -1177,12 +1197,12 @@ ol {
   height: 30px !important;
 
 }
-.footer{
+/* .footer{
   width: 100%;
   position: fixed;
   bottom: 0;
   z-index: 333333;
-}
+} */
 .footet-bottom {
   height: 52px;
   background-image: url(/src/assets/img/Line28.png);
@@ -1192,6 +1212,7 @@ ol {
   margin-bottom: 15px;
   position: relative;
   background: radial-gradient(#1C253D 100%);
+  z-index: 33333;
 }
 .footet-bottom ul {
   display: flex;
@@ -1498,6 +1519,10 @@ font-size: .0833rem;
 .rg-padding{
   padding: .0521rem;
 }
+.rightfl_hei{
+  position: relative;
+    z-index: 207;
+}
 .xian2{
   background: rgba(0,102,201,0.1);
   border-radius: 0px 0px 0px 0px;
@@ -1507,6 +1532,7 @@ font-size: .0833rem;
 .hedse{
   text-align: left;
   color: #fff;
+  font-size: .0729rem;
   line-height: .2083rem;
 }
 .iconimg1{
@@ -1529,8 +1555,10 @@ font-size: .0833rem;
   width: 80%;
 }
 .waterdisaster{
-  padding: .0729rem;
-background: rgba(26, 38, 69, 0.4);
+  font-size: .1563rem;
+  padding: 0.0729rem;
+  overflow: auto;
+  background: rgba(26, 38, 69, 0.4);
 
 }
 .re_tele{
@@ -1570,7 +1598,7 @@ justify-content: space-between;
   width: 0.9167rem;
   position: relative;
   padding: 0 0.1875rem;
-  height: 114px;
+  height:0.5938rem;
   overflow: hidden;
 
 }
@@ -1671,9 +1699,9 @@ font-size: .0677rem;
   position: fixed;
   right: 15px;
   top: 70px;
-  z-index: 207;
-  height: 80vh;
+  height: 87vh;
   overflow: auto;
+  z-index: 207;
 }
 .hie{
   overflow: auto;

src/view/components/MenuCheck.vue

@@ -26,7 +26,7 @@
                                     @row-click="handleDelete($event)"
                                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0) ' }">
                                     <el-table-column type="index" label="编号"  />
-                                    <el-table-column prop="chname" label="所在巷道" />
+                                    <el-table-column prop="chname" label="名称" />
                                     <el-table-column prop="pname" label="所在巷道" />
                                     <el-table-column prop="site" label="位置" />
                                 </el-table>
@@ -55,7 +55,7 @@
         </el-collapse-item>
             </el-collapse>
         <!-- 删除 -->
-        <el-dialog v-model="dialogsgdelect" width="400" class="dialog_class bgcolor tianjia">
+        <el-dialog v-model="dialogsgdelect"  align-center  :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
 
             <template #header="{ titleId, titleClass }">
                 <div class="my-header ">
@@ -77,7 +77,7 @@
             </div>
         </el-dialog>
         <!-- 添加 -->
-        <el-dialog v-model="sdialog.dianadddialog" width="500px"  class="dialog_class bgcolor tianjia">
+        <el-dialog v-model="sdialog.dianadddialog"  align-center  :append-to-body="true" width="500px"  class="dialog_class bgcolor tianjia">
           <template #header="{titleId, titleClass }">
           <div class="my-header ">
               <el-image :src="icon" fit="contain" ></el-image>

src/view/components/MenuMine.vue

@@ -9,11 +9,10 @@
         >
           <div class="demo-collapse">
             <el-collapse v-model="coolactiveName1" accordion>
-              <el-collapse-item name="1"  class="imgneon">
-           
+              <el-collapse-item name="1" class=" btnicon">
                 <template #title>
-                    <el-icon class="iconimg Frame3 imgneon" fit="contain"></el-icon>
-                  矿井信息
+                    <el-icon class="iconimg Frame3 " fit="contain"></el-icon>
+                  矿井信息<el-icon class="header-icon"> </el-icon>
                 </template>
                 <div class="asides_content">
                   <div class="jc_content tablecolor">
@@ -133,7 +132,7 @@
                 </el-tabs>
             </div>
             <!-- 添加弹窗 -->
-            <el-dialog v-model="sdialog.adddialog" width="480" class="dialog_class bgcolor tianjia">
+            <el-dialog v-model="sdialog.adddialog"     align-center   :append-to-body="true" width="480" class="dialog_class bgcolor tianjia">
 
 <template #header="{ titleId, titleClass }">
     <div class="my-header ">
@@ -176,7 +175,7 @@
 </div>
 </el-dialog>
 <!-- 删除 -->
-<el-dialog v-model="sdialog.dialogsgdelect" width="400" class="dialog_class bgcolor tianjia">
+<el-dialog v-model="sdialog.dialogsgdelect"  align-center  :append-to-body="true"  width="400" class="dialog_class bgcolor tianjia">
 
 <template #header="{ titleId, titleClass }">
     <div class="my-header ">
@@ -198,7 +197,7 @@
 </div>
 </el-dialog>
 <!-- 添加 -->
-<el-dialog v-model="sdialog.gdadddialog" width="480" class="dialog_class bgcolor tianjia">
+<el-dialog v-model="sdialog.gdadddialog"  align-center  :append-to-body="true" width="480" class="dialog_class bgcolor tianjia">
 
 <template #header="{ titleId, titleClass }">
     <div class="my-header ">
@@ -275,7 +274,7 @@
 </div>
 </el-dialog>
 <!-- 删除 -->
-<el-dialog v-model="sdialog.guddialogsgdelect" width="400" class="dialog_class bgcolor tianjia">
+<el-dialog v-model="sdialog.guddialogsgdelect"  align-center  :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
 
 <template #header="{ titleId, titleClass }">
     <div class="my-header ">

src/view/components/MenuPhysics.vue

@@ -55,7 +55,7 @@
         </el-collapse-item>
             </el-collapse>
         <!-- 添加 -->
-        <el-dialog v-model="addVisible" width="400" class="dialog_class bgcolor tianjia  foter_l tianjia">
+        <el-dialog v-model="addVisible"   width="400"  align-center  :append-to-body="true"  class="dialog_class bgcolor tianjia  foter_l tianjia">
 
             <template #header="{ titleId, titleClass }">
                 <div class="my-header ">
@@ -94,7 +94,7 @@
         </el-dialog>
 
         <!-- 删除 -->
-        <el-dialog v-model="dialogsgdelect" width="400" class="dialog_class bgcolor tianjia">
+        <el-dialog v-model="dialogsgdelect"  align-center  :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
 
             <template #header="{ titleId, titleClass }">
                 <div class="my-header ">

src/view/components/MenuSensor.vue

@@ -59,7 +59,7 @@
         </el-collapse-item>
             </el-collapse>
         <!-- 添加 -->
-        <el-dialog v-model="addVisible" width="400" class="dialog_class bgcolor tianjia  foter_l tianjia">
+        <el-dialog v-model="addVisible"  align-center  :append-to-body="true" width="400" class="dialog_class bgcolor tianjia  foter_l tianjia">
 
             <template #header="{ titleId, titleClass }">
                 <div class="my-header ">
@@ -100,7 +100,7 @@
         </el-dialog>
 
         <!-- 删除 -->
-        <el-dialog v-model="dialogsgdelect" width="400" class="dialog_class bgcolor tianjia">
+        <el-dialog v-model="dialogsgdelect"  align-center  :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
 
             <template #header="{ titleId, titleClass }">
                 <div class="my-header ">

src/view/components/Menudisaster.vue

@@ -148,7 +148,7 @@
       </div>
     </div>
   <!-- 修改 -->
-  <el-dialog v-model="xiugVisible" width="400" class="dialog_class bgcolor tianjia  foter_l tianjia">
+  <el-dialog v-model="xiugVisible"  align-center  :append-to-body="true" width="400" class="dialog_class bgcolor tianjia  foter_l tianjia">
  
  <template #header="{ titleId, titleClass }">
      <div class="my-header ">

src/view/components/Menupath.vue

@@ -198,7 +198,7 @@
         </div>
         </el-dialog>
          <!-- 删除 -->
-         <el-dialog v-model="dialogsgdelect" width="400" class="dialog_class bgcolor tianjia">
+         <el-dialog v-model="dialogsgdelect"  align-center  :append-to-body="true" width="400" class="dialog_class bgcolor tianjia">
  
              <template #header="{ titleId, titleClass }">
                  <div class="my-header ">

src/view/index/first-left.vue

@@ -1,8 +1,9 @@
 <template>
   <!-- 底部导航栏 -->
-  <div class="first-right l_Dialog tablebk"  v-show="firstshow">
-    <el-aside width="340px" class="L_aside L_aside1 asideg asidegbg leftbgimg1" v-show="firstshow">
-      <div class="demo-collapse jiancedian1 asideg1 jc_header collapseeion jianstyle">
+  <div class="rightfl"  v-show="firstshow" style="right: 0;">
+    <div class="rightfl_hei">
+    <el-aside width="1.7708rem" class="L_aside L_aside1 asideg asidegbg leftbgimg1" v-show="firstshow">
+      <div class="demo-collapse jiance asideg1 jc_header collapseeion jianstyle">
         <el-collapse accordion v-model="activeNames">
           <el-collapse-item name="1" class="imgneon">
             <template #title>
@@ -83,7 +84,7 @@
                 <div class="Firetile"><span>压力（Pa）：</span><span class="text2">{{ pa }}</span></div>
               </div>
             <div class="echart">
-            <div id="line" style="width: 1.526rem;height:1.03rem;"></div></div>
+            <div id="line" style="width: 1.526rem;height:.9375rem;"></div></div>
             <div class="zongji"  v-if="props.classradio=='Water'" >
                 <div class="zongjili img3">{{ heightnum }}<span>m</span></div>
                 <div class="zongjili img4">
@@ -96,7 +97,12 @@
             <!-- <div class="mgsnoe" style="height: 200px"></div> -->
           </el-collapse-item>
         </el-collapse>
-        <el-collapse accordion v-model="activeNames" class="bganimation">
+      </div>
+    </el-aside>
+      <!-- 动画 -->
+    <el-aside width="1.7708rem" class="L_aside L_aside1 asideg asidegbg leftbgimg1" v-show="firstshow">
+      <div class="demo-collapse jiance asideg1 jc_header collapseeion jianstyle">
+        <el-collapse accordion v-model="activeNames1" class="bganimation">
           <el-collapse-item name="2" class="imgneon">
             <template #title>
               <el-icon class="iconimg Frame3" fit="contain"></el-icon>
@@ -130,13 +136,9 @@
           </el-collapse-item>
         </el-collapse>
       </div>
-    </el-aside>
-    <!-- 动画 -->
-    <!-- <el-aside width="340px" class="L_aside L_aside1 asideg asidegbg leftbgimg1" v-show="firstshow">
-      <div class="demo-collapse jiancedian1 asideg1 jc_header collapseeion jianstyle">
-      
-      </div>
-    </el-aside> -->
+      </el-aside>
+    </div>
+
   </div>
   <htmldialog ref="htmldialogref" :isshow='isshow' @funidshow="funidshow"/>
 </template>
@@ -159,7 +161,8 @@ import t3 from "@/assets/img/t3.png";
 import t4 from "@/assets/img/t4.png";
 import htmldialog from "./htmldialog.vue"
 let firstshow = ref(false);
-let activeNames = ref(["1",'2']);
+let activeNames = ref(["1"]);
+let activeNames1=ref(["2"])
 let tableHeight = ref(130);
 let playshow=ref(true);
 let suspendshow=ref(false);

src/view/result.vue

@@ -380,14 +380,14 @@ defineExpose({ accident6, initAid, mntext1, mntext2, clickflat, endtime, zdtime,
 <style scoped lang="scss">
 .heigjie {
   width: 100%;
-  height: 50px;
-  line-height: 50px;
+  height: .2083rem;
+  line-height: .2083rem;
   background-image: url(/src/assets/img/Group10.png) !important;
   background-repeat: no-repeat;
   background-position: center;
    background-size: 100% 100%;
   .he_pading1 {
-    padding: 10px 9px 0 7px;
+    margin-left: 25px;
   }
 }
 
@@ -435,6 +435,7 @@ defineExpose({ accident6, initAid, mntext1, mntext2, clickflat, endtime, zdtime,
 .result_right {
   height: calc(100vh - 154px);
   background: rgba(26, 38, 69, 0.4);
+  overflow: auto;
 }
 
 .publicleft {
@@ -451,7 +452,7 @@ defineExpose({ accident6, initAid, mntext1, mntext2, clickflat, endtime, zdtime,
 }
 
 .resultime .text {
-  font-size: 14px;
+  font-size: 0.0792rem;
   width: 88px;
   font-weight: bold;
   line-height: 50px;
@@ -532,7 +533,7 @@ defineExpose({ accident6, initAid, mntext1, mntext2, clickflat, endtime, zdtime,
 }
 
 .wotermn {
-  line-height: 34px;
+  line-height: .2083rem;
 }
 
 .resultime .newtime {

src/view/result/Wdisaster.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 水灾灾害信息 -->
   <div class="waterdisaster"> 
-    <div class="asides_content">
+    <div class="asides_content baogaoshng">
               <div class="jc_content tablecolor">
                 <div class="jc_padding">
                   <div class="re_tele">灾害信息展示
@@ -50,7 +50,7 @@
                       <el-icon class="iconimg1 Frame3" fit="contain"></el-icon>{{ jcname }}
                 </div>
                 <div class="echart echartxian">
-                <div id="line2" style="width: 100%; height: 178px;"></div></div>
+                <div id="line2" style="width: 100%; height: 0.9375rem;"></div></div>
                 </div>
                 </div>
               </div>

src/view/result/Wdisaster2.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 水灾灾害信息 -->
   <div class="waterdisaster"> 
-    <div class="asides_content">
+    <div class="asides_content baogaoshng">
               <div class="jc_content tablecolor">
                 <div class="jc_padding">
                   <div class="re_tele">灾害信息展示
@@ -50,7 +50,7 @@
                       <el-icon class="iconimg1 Frame3" fit="contain"></el-icon>{{ jcname }}
                 </div>
                 <div class="echart echartxian">
-                <div id="line3" style="width: 100%; height: 178px;"></div></div>
+                <div id="line3" style="width: 100%; height: 0.9375rem;"></div></div>
                 </div>
                 </div>
               </div>