guhongwei 5 سال پیش
والد
کامیت
e7e7afe9fa
4فایلهای تغییر یافته به همراه51 افزوده شده و 27 حذف شده
  1. 1 1
      src/layout/common/top.vue
  2. 1 1
      src/store/user/state.js
  3. 3 3
      src/views/service/detail.vue
  4. 46 22
      src/views/service/parts/sign.vue

+ 1 - 1
src/layout/common/top.vue

@@ -6,7 +6,7 @@
           <span class="date">{{ data }}</span>
         </el-col>
         <el-col :span="12" class="login">
-          <span v-if="user.uid == null">
+          <span v-if="user == null">
             <el-button size="mini" @click="$router.push({ path: '/login' })">登录</el-button>
             <el-button size="mini" @click="$router.push({ path: '/register' })">注册</el-button>
           </span>

+ 1 - 1
src/store/user/state.js

@@ -1 +1 @@
-export const user = {};
+export const user = undefined;

+ 3 - 3
src/views/service/detail.vue

@@ -163,10 +163,10 @@ export default {
     margin: 0 0 10px 0;
   }
   .main {
-    min-height: 600px;
+    min-height: 800px;
     margin: 0 0 10px 0;
     .left {
-      min-height: 600px;
+      min-height: 800px;
       background: #fff;
       margin: 0 10px 0 0;
       .top {
@@ -192,7 +192,7 @@ export default {
     }
     .right {
       width: 78%;
-      min-height: 600px;
+      min-height: 800px;
       background: #fff;
     }
   }

+ 46 - 22
src/views/service/parts/sign.vue

@@ -17,11 +17,8 @@
             <el-col :span="8" class="right">更新时间:2020-5-19_00:00:00</el-col>
           </el-col>
           <el-col :span="24" class="table">
-            BIAOGER
-          </el-col>
-          <!--
-          <el-col :span="24">
             <el-table :data="tableData" border style="width: 100%">
+              <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
               <el-table-column prop="name" label="用户" align="center"> </el-table-column>
               <el-table-column prop="yingxing" label="运行作业" align="center"> </el-table-column>
               <el-table-column prop="paidui" label="排队作业" align="center"> </el-table-column>
@@ -29,7 +26,7 @@
               <el-table-column prop="diaduiheshu" label="排队核数" align="center"> </el-table-column>
               <el-table-column prop="huoyue" label="活跃结点" align="center"> </el-table-column>
             </el-table>
-          </el-col> -->
+          </el-col>
         </el-col>
       </el-col>
     </el-row>
@@ -45,7 +42,13 @@ export default {
   },
   components: {},
   data: function() {
-    return { resource: '', tableData: [{ name: '测试', yingxing: '0', heshu: '0', diaduiheshu: '230', huoyue: 'era' }] };
+    return {
+      radio: '1',
+      tableData: [
+        { name: '测试', yingxing: '0', heshu: '0', paidui: '0', diaduiheshu: '230', huoyue: 'era' },
+        { name: '测试', yingxing: '0', heshu: '0', paidui: '0', diaduiheshu: '230', huoyue: 'era' },
+      ],
+    };
   },
   created() {},
   methods: {},
@@ -86,7 +89,7 @@ export default {
 .info {
   border-top: 2px solid #054982;
   background-image: linear-gradient(0deg, #c4e0ec, #f0f7fa);
-  height: 500px;
+  min-height: 700px;
   .top {
     height: 50px;
     line-height: 50px;
@@ -120,25 +123,46 @@ export default {
   font-size: 16px;
   padding-left: 10px;
 }
-/deep/.el-table--border {
-  background-image: linear-gradient(0deg, #c4e0ec, #f0f7fa);
-  border: 1px solid #93a7b7;
+/deep/.el-table td {
+  padding: 8px 0;
+  border-bottom: 1px solid #93a7b7;
 }
-
-/deep/ .el-table--enable-row-transition .el-table__body td {
-  background-image: linear-gradient(0deg, #c4e0ec, #f0f7fa);
-  border: 1px solid #93a7b7;
+/deep/.el-table th {
+  padding: 8px 0;
 }
-
-/deep/ .el-table--border td,
-.el-table--border th,
-.el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
+/deep/.el-table {
+  background-color: transparent;
+}
+/deep/.el-table__expanded-cell {
+  background-color: transparent;
+}
+/deep/.el-table th {
+  background-color: transparent;
+}
+/deep/.el-table tr {
+  background-color: transparent;
+}
+/deep/.el-table th.is-leaf {
+  color: #000;
+  border-bottom: 1px solid #93a7b7;
+}
+/deep/.el-table--border td {
+  border-left: 1px solid #93a7b7;
   border-right: 1px solid #93a7b7;
-  background-image: linear-gradient(0deg, #c4e0ec, #f0f7fa);
 }
-
-/deep/ .el-table td,
-.el-table th.is-leaf {
+/deep/.el-table--border th {
+  border-right: 1px solid #93a7b7;
+  border-left: 1px solid #93a7b7;
+}
+/deep/.el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
+  border-right: 1px solid #93a7b7;
+}
+/deep/.el-table--border {
+  border-right: 1px solid #93a7b7;
+  border-bottom: 1px solid #93a7b7;
+}
+/deep/.el-table--group {
+  border-right: 1px solid #93a7b7;
   border-bottom: 1px solid #93a7b7;
 }
 </style>