فهرست منبع

11.27修改bug和字体

liuqiao 9 ماه پیش
والد
کامیت
c147c2e209

+ 133 - 14
src/style/style.css

@@ -22,7 +22,7 @@ body,html{
     z-index: 333;
     width: 0.13042rem;
     top: 17.5%;
-    height:506px;
+    height:2.6354rem;
     left: 0;
   }
   .reghtzs{
@@ -34,7 +34,7 @@ body,html{
     z-index: 333;
     width: 0.13042rem;
     top: 17.5%;
-    height:506px;
+    height:2.6354rem;
     right: 0;
   }
   .line {
@@ -206,6 +206,10 @@ color: #fff;
     padding: 13px 0 7px 0;
     display: inline-block;
     width: 80px;
+    display: inline-flex;
+    justify-content: flex-start;
+    align-items: flex-start;
+     font-size: var(--el-form-label-font-size); 
   }
   
   .ddd {
@@ -450,7 +454,7 @@ color: #fff;
   } */
   .rightfl{
     position: absolute;
-    right: 28px;
+    right: .2083rem;
     top: 65px;
     height: 87vh;
     overflow: auto; 
@@ -897,6 +901,7 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
     text-align: left;
     font-style: normal;
     text-transform: none;
+    font-size: var(--el-form-label-font-size); 
 }
 
 .tianjia .el-dialog__body {
@@ -963,11 +968,11 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
 }
 .btns {
     width: .3125rem;
-    height: 23px;
     background-image: url(../assets/img/Rectangle399.png);
     background-repeat: no-repeat;
     background-size: cover;
-    line-height: 20px;
+    height: .1198rem;
+    line-height: .1042rem ;
     overflow: hidden;
     text-align: center;
     border: 1px solid #1A8CFE;
@@ -1025,10 +1030,10 @@ ol {
     cursor: pointer;
 }
 .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
-  background-color: #F9A466  !important;
+  background-color: #52C6FF  !important;
 }
 .tablebk .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
-  background-color: #F9A466  !important;
+  background-color: #52C6FF  !important;
 }
 .shigutable  .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
     background-color: rgba(255, 255, 25, 0) !important;
@@ -1048,6 +1053,7 @@ ol {
     background-position-x: center !important;
 }
 .asideg .el-collapse-item__header {
+    font-family: 'YouShe';
     height: 0.2084rem !important;
     width: 100%;
     color: #fff;
@@ -1301,13 +1307,13 @@ justify-content: space-between;
 }
 
 .footet-bottom ul li{
-
+ font-family: 'YouShe';
 width: 130px;
 height: 32px;
 text-align: center;
 line-height: 27px;
 font-weight: 400;
-font-size: 0.0833rem;
+font-size:16px;
 color: #58BBEC;
 letter-spacing: 1px;
 text-align: center;
@@ -1384,7 +1390,7 @@ z-index: 1;
 }
 .title_wrap .title .title-text {
   font-family: 'YouShe';
-  font-size: 0.125rem;
+  font-size: .1563rem;
    font-weight: 900;
    letter-spacing: 3px;
    color:#fff;
@@ -1418,6 +1424,10 @@ z-index: 1;
    display: flex;
    align-items: center;
 }
+.timers .logimg span{
+  font-family: 'YouShe';
+  margin-top: 6px;
+}
 .headertime{
   position: absolute;
     right:40px;
@@ -1462,14 +1472,18 @@ height:60px;
   background-position: center;
 }
 .bgk1 .imgtupian{
-  width: 0.7094rem;
+  font-size: .0938rem;
+  width: .8523rem;
   background-image: url(/src/assets/img/Rectangle456.png);
   background-size: 100% 100% !important;
   height: 30px;
   line-height: 30px;
+  font-family: 'YouShe';
 }
 .bgk1 .imgtupian2{
-  width: .9823rem;
+  font-family: 'YouShe';
+  font-size: .0938rem;
+width: .8523rem; 
   /* background-image: url(/src/assets/img/Rectangle1456.png); */
   background-image: url(/src/assets/img/Rectangle456.png);
   background-size: 100% 100% !important;
@@ -1556,6 +1570,7 @@ font-size: .0833rem;
   text-align: center;
   font-size: .1042rem;
   font-weight: bold;
+  font-family: 'YouShe';
 }
 .header_l .closeimg {
   position: absolute;
@@ -1871,7 +1886,8 @@ font-size: .0677rem;
 
 }
 .el-table__body tr.current-row>td.el-table__cell{
-background-color: #F9A466  !important;
+background-color: #52C6FF  !important;
+/* background-image: linear-gradient(to top, #41c0ff,#1D86E5, #00ABFF,#52C6FF) ; */
 }
 .jcshijian{
   margin-top: .1094rem;
@@ -1984,4 +2000,107 @@ a{
   background-repeat: no-repeat;
   line-height: 30px;
   background-size: 100% 100%;
-}
+}
+.el-select-dropdown{
+  background-image: url(../assets/img/box.png) !important;
+  background: rgba(13, 53, 133, 0.5);
+  background-repeat: no-repeat;
+  line-height: 30px;
+  background-size: 100% 100%;
+
+}
+.el-popper.is-light{
+  border: none;
+}
+.el-select-dropdown li{
+  color: #fff;
+}
+.el-select__tags .el-tag--info{
+  color: #00FFF0;
+  background-color: rgba(0, 0, 0, 0);
+}
+.el-popper.is-light .el-popper__arrow::before{
+  background: rgba(13, 53, 133, 0.5);
+}
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected{
+color: #3DDBFC;
+background-color: rgba(0, 0, 0, 0);
+}
+.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+  background-color: rgba(0, 0, 0, 0);
+}
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover{
+  background-color: rgba(0, 0, 0, 0);
+}
+ .el-picker__popper{
+  background-image: url(../assets/img/box.png) !important;
+  background-repeat: no-repeat !important;
+  background-size: 100% 100% !important;
+  /* background: rgba(13, 53, 133, 0.5); */
+
+}
+.el-picker__popper.el-popper{
+  background:none;
+}
+.el-picker-panel,.el-picker-panel__footer{
+  color: #fff;
+  background-color: rgba(0, 0, 0, 0);
+}
+.el-picker-panel__body .el-input__inner,.el-date-picker__header-label,.el-date-table th{
+  color: #fff;
+}
+.has-time .el-button>span{
+  color: #3DDBFC;
+}
+.el-picker-panel__footer{
+  background: rgba(0,102,201,0.1);
+    border-radius: 0px 0px 0px 0px;
+    border-top: 2px solid;
+    border-image: linear-gradient(326deg, rgba(0, 102, 201, 1), rgba(91, 175, 222, 1)) 1 1;
+}
+.el-date-picker__time-header{
+  background: rgba(0,102,201,0.1);
+    border-radius: 0px 0px 0px 0px;
+    border-bottom: 2px solid;
+    border-image: linear-gradient(326deg, rgba(0, 102, 201, 1), rgba(91, 175, 222, 1)) 1 1;
+}
+/* .no-wrap .cell {
+  white-space: nowrap;
+} */
+@media screen and (max-width:1650px){
+  .headMenu_2 .el-col{
+    transform:scale(0.9);
+    transform-origin: 0 0;
+  }
+  .headMenu_2{
+    height: 175px !important;
+  }
+}
+@media screen and (max-width:1330px){
+  .headMenu_2 .el-col{
+    transform:scale(0.8);
+    transform-origin: 0 0;
+  }
+  .headMenu_2{
+    height: 150px !important;
+  }
+  .asideTag2,.asideTag {
+    transform:scale(0.7);
+    transform-origin: 0 0;
+  }
+}
+@media screen and (max-width:1160px){
+  .headMenu_2 .el-col{
+    transform:scale(0.7);
+    transform-origin: 0 0;
+  }
+  .asideTag2{
+    left: 91%;
+  }
+  .el-aside{
+    width:170px !important;
+  }
+  .headMenu_2{
+    height: 135px !important;
+  }
+}

+ 20 - 0
src/utils/detectZoom.js

@@ -0,0 +1,20 @@
+// export const detectZoom =()=>{
+//     let ratio =0,
+//     screen = window.screen,
+//     ua = navigator.userAgent.toLowerCase();
+//     if (window.devicePixelRatio!== undefined) {
+//     ratio = window.devicePixelRatio;
+//     } else if (~ua.index0f('msie')) {
+//     if (screen.deviceXDPI &&screen.logicalXDPI) {
+//     ratio = screen.deviceXDPI / screen.logicalXDPI;
+//     } else if (
+//     window.outerWidth !== undefined &&
+//     window.innerWidth !== undefined
+//     ){
+//     ratio = window.outerWidth / window.innerWidth;
+//     }
+//     if (ratio) {
+//     ratio = Math.round(ratio * 100);
+//     }
+//     return ratio;
+// }

+ 2 - 2
src/view/InfoDialoges.vue

@@ -57,8 +57,8 @@
                     </el-table-column>
                     <el-table-column type="index" label="序号" width="50" />
                     <el-table-column prop="name" label="名称" />
-                    <el-table-column prop="name" label="来源" width="120" />
-                    <el-table-column prop="time" label="时间" width="180" />
+                    <el-table-column prop="name" label="来源" />
+                    <el-table-column prop="time" label="时间"  />
                 </el-table>
                 <div class="demo-pagination-block pagination">
                     <el-config-provider :locale="zhCn">

+ 1 - 0
src/view/components/InfoAnimation.vue

@@ -797,6 +797,7 @@ defineExpose({ monitor, accident5 });
       width: 100%;
       background: rgba(13, 22, 57, 0.4);
       position: relative;
+      flex: 1;
 
       .righttext {
         display: inline-block;

+ 36 - 9
src/view/components/InfoBoundary.vue

@@ -40,7 +40,6 @@
                           label="边界类型"
                           prop="type"
                           align="center"
-                          width="80px"
                         >
                           <template #default="scope">
                             {{
@@ -55,17 +54,45 @@
                         <!-- <el-table-column  width="50">
                                                 //         <template #default="scope">{{scope.row.type == massflow ? '流量边界' : scope.row.type ==	Pressure?'压力边界' }} </template>
                                                 //     </el-table-column> -->
-                        <el-table-column prop="flow" label="流量(m³/s)" width="60"/>
+                        <!-- <el-table-column prop="flow" label="流量(m³/s)" /> -->
                         
-                          <!-- <el-table-column prop="flow" label="流量">
-                            <template  #default="{ row }">
+                          <el-table-column prop="flow" label="流量">
+                            <!-- <template  #default="{ row }">
                               {{ row.flow }} <br> (m³/s)
-                            </template>
-                          </el-table-column> -->
-                        <el-table-column prop="pressure" label="压强(pa)"  width="60"/>
-                        <el-table-column prop="temperature" label="温度(℃)" width="60" />
+                            </template> -->
+                            <template v-slot:header>
+                            <span >流量</span><br>
+                            <span >(m³/s)</span>
+                          </template>
+                          </el-table-column>
+                          <el-table-column prop="pressure" label="压强">
+                            <template v-slot:header>
+                            <span>压强</span><br>
+                            <span >(pa)</span>
+                          </template>
+                          </el-table-column>
+                          <el-table-column prop="temperature" label="温度">
+                            <template v-slot:header>
+                            <span >温度</span><br>
+                            <span >(℃)</span>
+                          </template>
+                          </el-table-column>
+                          <el-table-column prop="polcon1" label="二氧化碳">
+                            <template v-slot:header>
+                            <span >二氧化碳</span><br>
+                            <span >(%)</span>
+                          </template>
+                          </el-table-column>
+                          <el-table-column prop="polcon2" label="二氧化硫">
+                            <template v-slot:header>
+                            <span >二氧化硫</span><br>
+                            <span >(ppm)</span>
+                          </template>
+                          </el-table-column>
+                        <!-- <el-table-column prop="pressure" label="压强(pa)"  />
+                        <el-table-column prop="temperature" label="温度(℃)" />
                         <el-table-column prop="polcon1" label="二氧化碳(%)" />
-                        <el-table-column prop="polcon2" label="二氧化硫(ppm)" />
+                        <el-table-column prop="polcon2" label="二氧化硫(ppm)" /> -->
                       </el-table>
                       <div class="asdis_btn">
                         <div class="flex_a"   @click="

+ 1 - 1
src/view/components/InfoDisaster.vue

@@ -277,7 +277,7 @@
                         max-height="350px"
                         :highlight-current-row="currentrow" 
                       >
-                      <el-table-column type="index" label="序号" width="50" />
+                      <el-table-column type="index" label="序号" width="100"/>
                         <el-table-column prop="gfname" label="网格文件"  />
                         <el-table-column prop="bfname" label="边界文件"  />
                         <el-table-column label="操作" >

+ 4 - 1
src/view/index/first-left.vue

@@ -66,7 +66,7 @@
                         :highlight-current-row="currentrow1" 
                         :max-height="tableHeight"
                       >
-                      <el-table-column prop="chname" label="监测点"  />
+                      <el-table-column  prop="chname" label="监测点" width="120"  />
                 
                       <el-table-column
                           v-for="(header, index) in dynamicHeaders"
@@ -1137,4 +1137,7 @@ align-items: center;
     top: 77px;
     z-index: 1111;
 }
+.el-table .el-table__body-wrapper .el-table__body tbody tr td .cell{
+white-space: normal !important;
+}
 </style>

+ 1 - 1
src/view/result/leftcontent.vue

@@ -168,7 +168,7 @@
                                             </el-form-item>
                                         </div>
                                         <ul>
-                                            <li>
+                                            <li  style="margin-bottom: 5px;">
                                                 <div class="demo-datetime-picker">
                                                     <!-- <span class="inputtext_1">选择时间</span> -->
                                                     <div class="block">