syyang 2 年 前
コミット
48794aafbc

+ 24 - 5
src/assets/styles/base.scss

@@ -2269,7 +2269,8 @@ div::-webkit-scrollbar {
 
   //曝光台
   .bgt-state {
-    width: 35%;
+    // width: 35%;
+	width:38%;
     padding: 0.3rem 0.5rem;
     border: 2px solid rgba(0, 174, 255, 0.9);
     -webkit-box-shadow: 0 0 0.5rem 0 #00c8ff inset;
@@ -2284,9 +2285,9 @@ div::-webkit-scrollbar {
     color: $white;
 
     .bgt-state-frequency {
-      width: 1.2rem;
-      height: 1.2rem;
-      font-size: 1rem;
+      width: 1.1rem;
+      height: 1.1rem;
+      font-size: 0.8rem;
       background-color: #1294a0;
       text-align: center;
       line-height: 1.2rem;
@@ -2833,7 +2834,9 @@ div::-webkit-scrollbar {
 }
 
 .el-dialog:not(.is-fullscreen) {
-  margin-top: 10vh !important;
+  // margin-top: 10vh !important;
+  margin-top: 2vh !important;
+  z-index: 9999;
 }
 
 
@@ -3120,3 +3123,19 @@ div::-webkit-scrollbar {
 	box-shadow: 0 0 0.5rem 0 #2700ff inset;
 	background-image: -webkit-gradient(linear, 0 0, 0 bottom, from(#55b8f7), to(#8f3bff));
 }
+
+.tree_scroll::-webkit-scrollbar{
+	width: 1px;
+	height: 4px;
+	background: #00335c;
+}
+.tz_tk .el-dialog{
+	width: 20% !important;
+}
+.tz_tk .el-form-item__label{
+	color: #d2d2d2;
+}
+
+.d-l-l-text h4{
+	color:#fff!important;
+}

+ 3 - 0
src/components/vBottomMenu.vue

@@ -842,6 +842,9 @@ export default {
   height: 2.5rem;
   display: flex;
   align-items: center;
+	
+	
+	z-index:9999;
 
   .light {
     position: absolute;

+ 26 - 4
src/views/eventdetailsdialog.vue

@@ -28,7 +28,7 @@
                       </el-carousel-item>
                     </el-carousel>
                   </div>
-                  <el-button size="mini" type="primary" @click="showUpdateYjYuAn">预案调整
+                  <el-button size="mini" type="primary" class="yatz_button" @click="showUpdateYjYuAn">预案调整
                   </el-button>
                 </div>
                 <!-- 应急预案end -->
@@ -48,8 +48,10 @@
                           <el-input type="number" v-model="radius" style="width: 80px;" placeholder="请输入搜索半径"/>
                         </div>
                       </div>
+					  
                     </dv-border-box-7>
                   </div>
+				  
                 </div>
                 <!-- 左侧资源end -->
                 <!-- 底部工具栏 -->
@@ -293,7 +295,7 @@
             v-model="filterText">
           </el-input>
           <el-tree
-            class="tree-border"
+            class="tree-border tree_scroll"
             style="height: 20vh; overflow-y:scroll"
             :data="deptOptionsLiandong"
             show-checkbox
@@ -332,7 +334,7 @@
       </el-form>
     </el-dialog>
     <el-dialog title="调整预案" :visible.sync="showGuanLianYuAnConfirm" v-if="showGuanLianYuAnConfirm" width="50%"
-               class="top-dialog">
+               class="top-dialog tz_tk">
       <el-form label-width="80px">
         <el-form-item label="关联预案">
           <el-select v-model="sendGuanLianYuAn" placeholder="请选择关联预案!" clearable>
@@ -344,8 +346,9 @@
             />
           </el-select>
         </el-form-item>
-        <el-button size="mini" type="primary" @click="updateYjYuAn">确定
+        <el-button size="mini" type="primary" class="fr_button" @click="updateYjYuAn">确定
         </el-button>
+		<div style="clear: both;"></div>
       </el-form>
     </el-dialog>
     <el-dialog title="火险报告" :visible.sync="showEventConfirm_gd" v-if="showEventConfirm_gd" width="100%"
@@ -1973,4 +1976,23 @@ table tr td input:hover {
 }
 
 
+// 20220928
+.yatz_button{
+	padding: 0.5rem 0.5rem;
+	color: #409EFF;
+	background: none;
+	border-color: #409EFF;
+}
+.yatz_button:hover{
+	color: #fff;
+	background: #409EFF;
+	border-color: #409EFF;
+}
+
+.fr_button{
+	float:right;
+	padding: 0.5rem 1.5rem;
+}
+
+
 </style>