DESKTOP-6LTVLN7\Liumouren 2 rokov pred
rodič
commit
ee8281b20d

+ 7 - 1
src/assets/global.css

@@ -192,13 +192,16 @@
 /* table */
 .el-dialog__body *,
 #WholeProcessManagement
-  *:not(.el-pager li, .el-pagination .btn-prev, .StepsMyBox, .StepsMyBox *),
+  *:not(.el-pager li, .el-pagination .btn-prev, .StepsMyBox, .StepsMyBox *,.el-table__row,.el-table__header-wrapper),
 tr,
 td,
 th {
   background-color: transparent !important;
 }
 
+.el-table__row{
+  background: #00395c !important;
+}
 .el-table__row:hover{
   cursor: pointer !important;
   color: #fff !important;
@@ -206,6 +209,9 @@ th {
   background: #FFFFFF32 !important;
 }
 
+.el-table__header-wrapper{
+  background: #00000064 !important;
+}
 /* .el-table__body-wrapper  */
 .is-scrolling-none.el-table__body {
   background-color: #00000032 !important;

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

@@ -14,7 +14,7 @@
         我的任务
       </div>
     </template>
-    <el-form :inline="true" ref="myTaskForm" :model="formInline" class="demo-form-inline">
+    <el-form :inline="true" ref="myTaskForm" :model="formInline">
       <el-form-item label="任务类型">
         <el-select size="mini" v-model="formInline.taskType" placeholder="任务类型">
           <el-option-group v-for="group in taskTypeOptions" :key="group.label" :label="group.label">

+ 0 - 12
src/components/common/WholeProcessManagement.vue

@@ -5,7 +5,6 @@
       :inline="true"
       ref="myTaskForm"
       :model="formInline"
-      class="demo-form-inline"
       style="padding: 10px"
     >
       <el-form-item label="任务类型">
@@ -74,16 +73,6 @@
         </template>
       </el-table-column>
       <el-table-column prop="taskType" label="任务类型"> </el-table-column>
-      <!-- <el-table-column fixed="right" label="操作">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            icon="el-icon-search"
-            @click="ToView(scope.$index, tableData)"
-            >查看</el-button
-          >
-        </template>
-      </el-table-column> -->
     </el-table>
     <div id="WholeProcessManagement-footer">
       <Pagination :paginationData="paginationData" />
@@ -298,7 +287,6 @@ export default {
     display: flex;
     align-items: center;
     justify-content: flex-end;
-
   }
 }
 </style>

+ 1 - 1
src/components/layout/Header.vue

@@ -173,7 +173,7 @@ export default {
   padding: 0 30px;
   font-size: 24px;
   font-family: pingfangSC;
-  font-weight: 400;
+  font-weight: bold;
   color: #74ffff;
   line-height: 60px;
   border: none !important;

+ 4 - 1
src/components/layout/MenuCard.vue

@@ -2,6 +2,9 @@
   <!-- 外边框 -->
   <div
     ref="menuCard"
+    v-loading="!menuData"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
     :class="$ifLeftMenu(menuData.title != undefined ? menuData.title : '') ? 'menuMainBoxA' : 'menuMainBox'"
     :style="{
       width: menuData.boxWidth ? menuData.boxWidth + 'px' : '410px',
@@ -62,7 +65,7 @@
         {{ menuData.title }}
       </div>
     </div>
-    <!-- 主题 -->
+    <!-- -------------------------------------------------主题------------------------------------------ -->
     <div class="menuMainBox_main" v-if="menuData.type === 'card'">
       <!-- 上部 -->
       <div class="menuMainBox_main_top" v-if="!menuData.topSolt">

+ 2 - 2
src/views/HomeView.vue

@@ -129,7 +129,7 @@
         }"
       />
     </div>
-    <!-- 右侧菜单列 -->
+    <!-- 首页右侧菜单列 -->
     <div class="rightMenus">
       <MenuCard :menuData="menus.right[0]"></MenuCard>
       <MenuCard :menuData="menus.right[1]"></MenuCard>
@@ -139,7 +139,7 @@
         </template>
       </MenuCard>
     </div>
-    <!-- 右侧菜单列 -->
+    <!-- 土地资源右侧菜单列 -->
     <div class="rightMenus">
       <MenuCard :menuData="menus.right[3]">
         <template slot="top">