zhangyu преди 5 години
родител
ревизия
4bf0132bf8
променени са 2 файла, в които са добавени 52 реда и са изтрити 47 реда
  1. 39 31
      src/components/model/file/floorTable.vue
  2. 13 16
      src/views/model/file/index.vue

+ 39 - 31
src/components/model/file/floorTable.vue

@@ -4,7 +4,6 @@
     :data="tableData"
     style="width: 100%"
     :height="maxHeight"
-    max-height="800px"
     :header-cell-style="{background:'#ccc',color:'#000'}"
   >
     <el-table-column prop="FloorName" label="模型文件" width="180">
@@ -17,45 +16,27 @@
     <el-table-column prop="Version" label="版本号"></el-table-column>
     <el-table-column prop="AcceptTime" label="上传时间"></el-table-column>
     <el-table-column prop="UserName" label="上传人"></el-table-column>
-    <el-table-column prop="address" label="操作">
+    <el-table-column prop="address" align="center" label="操作">
       <template slot-scope="scope">
         <div class="operate" v-show="!scope.row.isDown">
-          <el-button
-            type="primary"
-            size="mini"
-            class="iconfont icon-download"
-            @click="downloadModel(scope.row)"
-          ></el-button>
-          <el-button
-            type="primary"
-            size="mini"
-            class="iconfont icon-replace"
-            @click="repliaceModel(scope.row)"
-          ></el-button>
-          <el-button
-            type="primary"
-            size="mini"
-            class="iconfont icon-Log"
-            @click="queryModelLog(scope.row)"
-          ></el-button>
+          <el-button type="primary" size="mini" class="iconfont icon-download" @click="downloadModel(scope.row)" ></el-button>
+          <el-button type="primary" size="mini" class="iconfont icon-replace" @click="repliaceModel(scope.row)" ></el-button>
+          <el-button type="primary" size="mini" class="iconfont icon-Log" @click="queryModelLog(scope.row)" ></el-button>
         </div>
-        <div
-          :class="[scope.row.Status == 1 ||scope.row.Status == 2 ? 'upLoad-loading':'','upLoad']"
-          v-show="scope.row.isDown"
-        >
+        <div :class="[scope.row.Status == 1 ||scope.row.Status == 2 ? 'upLoad-loading':'','upLoad']" v-show="scope.row.isDown" >
           <div class="progress">
             <el-progress
               :text-inside="scope.row.Status == 1 || scope.row.Status == 2 ?false:true"
               :stroke-width="20"
               :percentage="scope.row.precent"
-              :status="scope.row.Status == 1 || scope.row.Status == 2 ?'warning':'success'"
+              :color="scope.row.Status == 1 || scope.row.Status == 2 ?'#909399':'#67C23A'"
             ></el-progress>
           </div>
           <div class="progress-right">
             <el-button
               v-show="!scope.row.Status"
               type="danger"
-              icon="el-icon-delete"
+              class="iconfont icon-termination"
               @click="closeUpdate(scope.row)"
               circle
             ></el-button>
@@ -159,12 +140,27 @@ export default {
 <style scoped lang="less">
 .box-card {
   height: 100%;
+  .operate {
+    .iconfont {
+      font-size: 12px;
+      padding: 7px 12px;
+    }
+  }
+  .icon-termination {
+    color: #F56C6C;
+    background: #fff;
+    padding: 0;
+    border: 0;
+    font-size: 20px;
+    margin-left: 5px;
+  }
   .upLoad {
     display: flex;
-    justify-content: flex-start;
+    justify-content: center;
     align-items: center;
+    padding: 4px 0;
     .progress {
-      width: 160px;
+      width: 150px;
       height: 20px;
     }
   }
@@ -172,15 +168,27 @@ export default {
     position: relative;
     justify-content: center;
     .progress {
-      width: 200px;
+      width: 220px;
+      height: 20px;
     }
     .progress-right {
       position: absolute;
-      left: 40%;
+      left: 50%;
       top: 50%;
       transform: translate(-50%, -50%);
-      color: #909399;
+      color: #fff;
     }
   }
 }
+/deep/ .el-icon-warning {
+  display: none;
+  // color: transparent;
+}
+/deep/ .el-progress__text {
+  display: none;
+}
+/deep/ .upLoad-loading .el-progress-bar {
+    padding-right: 44px;
+    margin-right: -44px;
+}
 </style>

+ 13 - 16
src/views/model/file/index.vue

@@ -3,7 +3,7 @@
     <!-- 左边模型文件夹列表 -->
     <el-col class="col_left" :span="5">
       <div class="grid-content grid-left">
-        <el-card class="box-card" :body-style="{ padding: '0px' }">
+        <el-card class="box-card" :body-style="{ padding: '0px', height: '100%' }">
           <div class="top_hand left_top_hand">
             <div class="folder-box">
               <el-tooltip class="item" effect="dark" content="新建文件夹" placement="top-start">
@@ -22,19 +22,12 @@
           <div class="folder-list">
             <div class="head">模型文件夹</div>
             <ul class="lists">
-              <li
-                @click="openFolder(index,item)"
-                v-for="(item,index) in navigationModel"
-                :key="index"
-                :class="[choiceIndex == index + 1 ? 'li-active' : '']"
-              >
-                <i
-                  :class="[choiceIndex == index + 1 ?  'el-icon-folder-opened':'el-icon-folder','icon_font']"
-                  width="40"
-                  height="40"
-                ></i>
-                <span>{{item.Name}}</span>
-              </li>
+              <el-scrollbar style="height:100%;">
+                <li @click="openFolder(index,item)" v-for="(item,index) in navigationModel" :key="index" :class="[choiceIndex == index + 1 ? 'li-active' : '']" >
+                  <i :class="[choiceIndex == index + 1 ?  'el-icon-folder-opened':'el-icon-folder','icon_font']" width="40" height="40" ></i>
+                  <span>{{item.Name}}</span>
+                </li>
+              </el-scrollbar>
             </ul>
           </div>
         </el-card>
@@ -539,6 +532,7 @@ export default {
   // 左侧文件夹列表
   .folder-list {
     width: 100%;
+    height: calc(100% - 60px);
     .head {
       height: 42px;
       width: 100%;
@@ -554,8 +548,8 @@ export default {
     .lists {
       width: 100%;
       margin-top: 10px;
-      height: 100%;
-      overflow-y:scroll
+      height: calc(100% - 52px);
+      overflow-y: auto;
       li {
         height: 42px;
         display: flex;
@@ -582,4 +576,7 @@ export default {
     font-size: 18px;
   }
 }
+/deep/ .el-scrollbar__wrap {
+  overflow-x: hidden;
+}
 </style>