Jelajahi Sumber

头部二级菜单调整,底部菜单我的任务组件调整。

DESKTOP-6LTVLN7\Liumouren 2 tahun lalu
induk
melakukan
2a56fa019a

+ 49 - 11
src/assets/global.css

@@ -118,8 +118,9 @@
   background-image: linear-gradient(to top, #002f56, #002645);
   box-sizing: border-box;
 }
-.el-dialog__title,.el-message-box__title {
-  color: #FFFFFF;
+.el-dialog__title,
+.el-message-box__title {
+  color: #ffffff;
 }
 .el-form-item__label,
 .el-message-box__message {
@@ -131,7 +132,8 @@
   color: #f2f6fc;
 }
 /* el-button--default */
-.el-button--default,.el-button--default:focus {
+.el-button--default,
+.el-button--default:focus {
   background-image: --webkit-linear-gradient(to top, #303133, #606266);
   background-image: --moz-linear-gradient(to top, #303133, #606266);
   background-image: linear-gradient(to top, #303133, #606266);
@@ -143,7 +145,8 @@
   background-image: linear-gradient(to top, #606266, #909399);
   color: #fff;
 }
-.el-button--primary,.el-button--primary:focus {
+.el-button--primary,
+.el-button--primary:focus {
   background-image: --webkit-linear-gradient(to top, #002f56, #00aaff);
   background-image: --moz-linear-gradient(to top, #002f56, #00aaff);
   background-image: linear-gradient(to top, #002f56, #00aaff);
@@ -154,15 +157,50 @@
   background-image: linear-gradient(to top, #00aaff, #1deef5);
 }
 /* table */
-.el-dialog__body *,tr,td,th{
+.el-dialog__body *,
+tr,
+td,
+th {
   background-color: transparent !important;
 }
-.el-table,.el-pagination__total,.el-pagination__jump{
-  color: #C0C4CC;
+/* .el-table__body-wrapper  */
+.is-scrolling-none {
+  background-color: #00000032 !important;
+}
+.el-table,
+.el-pagination__total,
+.el-pagination__jump {
+  color: #c0c4cc;
 }
-.el-table thead{
-  color: #FFFFFF;
+.el-table thead {
+  color: #ffffff;
 }
-.el-table__fixed{
+.el-table__fixed-right::before,
+.el-table__fixed::before,
+.el-table::before {
   height: 0;
-}
+}
+.has-gutter {
+  background-color: #00000064 !important;
+}
+/* 二级菜单 */
+.el-menu--popup-bottom-start {
+  background-color: #00aaffaa;
+}
+#app ~ .el-menu--horizontal .el-menu-item {
+  /* padding: 10px 0; */
+  margin: 10px;
+  height: 50px !important;
+  text-align: center;
+  font-size: 20px;
+  font-family: pingfangSC;
+  font-weight: bold;
+  line-height: 50px;
+  color: #ffffffaa;
+  background-color: #254fc6;
+  box-sizing: border-box;
+}
+#app ~ .el-menu--horizontal .is-active {
+  background: linear-gradient(0deg, #4279d2 0%, #0942c0 100%);
+  border: 1px solid #74ffff;
+}

+ 5 - 5
src/components/common/BottomForm/MyMission.vue

@@ -1,22 +1,22 @@
 <template>
   <!-- 我的任务弹窗 -->
-  <el-dialog title="我的任务" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
+  <el-dialog custom-class="myMission" title="我的任务" :visible.sync="dialogVisible" fullscreen :before-close="handleClose" >
     <el-form :inline="true" ref="myTaskForm" :model="formInline" class="demo-form-inline">
       <el-form-item label="任务类型">
-        <el-select v-model="formInline.taskType" placeholder="任务类型">
+        <el-select size="mini" v-model="formInline.taskType" placeholder="任务类型">
           <el-option-group v-for="group in taskTypeOptions" :key="group.label" :label="group.label">
             <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
           </el-option-group>
         </el-select>
       </el-form-item>
       <el-form-item label="关联项目">
-        <el-select v-model="formInline.associatedItems" placeholder="关联项目">
+        <el-select size="mini" v-model="formInline.associatedItems" placeholder="关联项目">
           <el-option v-for="item in associatedItemsOptions" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="审计状态">
-        <el-select v-model="formInline.auditStatus" placeholder="审计状态">
+        <el-select size="mini" v-model="formInline.auditStatus" placeholder="审计状态">
           <el-option label="已审核" value="ReviewedAndApproved"></el-option>
           <el-option label="未审核" value="NotReviewed"></el-option>
         </el-select>
@@ -26,7 +26,7 @@
         <el-button @click="resetForm()">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-table :data="tableData" style="width: 100%" height="50vh" stripe>
+    <el-table :data="tableData" style="width: 100%" height="70vh" stripe>
       <el-table-column type="index" width="50"> </el-table-column>
       <el-table-column prop="taskId" label="任务编号"> </el-table-column>
       <el-table-column prop="taskName" label="任务名称"> </el-table-column>

+ 4 - 4
src/components/common/BottomMenus.vue

@@ -12,9 +12,9 @@
     <!-- 我的任务弹窗 -->
     <MyMission @changeShowBottomMenusStatus="changeShowBottomMenusStatus" />
     <!-- 同屏对比弹窗 -->
-    <SameScreenComparison />
+    <SameScreenComparison  @changeShowBottomMenusStatus="changeShowBottomMenusStatus"/>
     <!-- 上传数据弹窗 -->
-    <UploadingData />
+    <UploadingData  @changeShowBottomMenusStatus="changeShowBottomMenusStatus"/>
     <!-- 自定义模型 -->
     <CustomModelDialog />
     <!-- 底部菜单主体 -->
@@ -229,13 +229,13 @@ export default {
     width: 220px;
     height: 70px;
     overflow: hidden;
-    z-index: 100000;
+    z-index: 2;
   }
 }
 // menusBox
 #menusBox {
   background-color: rgba(0, 47, 86, 0.6);
-  z-index: 99999;
+  z-index: 1;
   border: 1px solid #00aaff;
   position: absolute;
   bottom: 60px;