Browse Source

添加文案样式修改

zhangyu 5 years ago
parent
commit
53a10d8825
3 changed files with 21 additions and 9 deletions
  1. 6 3
      src/api/model/file.js
  2. 1 1
      src/components/model/file/floorTable.vue
  3. 14 5
      src/views/model/file/index.vue

+ 6 - 3
src/api/model/file.js

@@ -61,11 +61,14 @@ let api = {
         if (Name) {
             // 单个查询
             data = {
-                Filters: `Name='${Name}'`
+                Filters: `Name='${Name}'`,
+                Orders: "Name asc"
             }
         } else {
             // 多个查询
-            data = {}
+            data = {
+                Orders: "Name asc"
+            }
         }
         return httputils.postJson(`${baseUrl}/model-folder/query`, data, success)
     },
@@ -219,7 +222,7 @@ let api = {
     queryModelFile(FloorModelId, success) {
         let params = {
             Distince: true,
-            Filters: `FloorModelId='${FloorModelId}'`
+            Filters: `FloorModelId='${FloorModelId}';Removed=false`
         }
         return httputils.postJson(`${baseUrl}/model-file/query`, params, success)
     },

+ 1 - 1
src/components/model/file/floorTable.vue

@@ -17,7 +17,7 @@
           <i v-show="scope.row.Version && scope.row.Status == 4" class="iconfont icon-warn" style="cursor:pointer;" title="查看版本更新信息" @click="handleClickVersion(scope.row)"></i>
         </template>
       </el-table-column>
-      <el-table-column prop="AcceptTime" label="上传时间"></el-table-column>
+      <el-table-column prop="AcceptTime" label="上传时间" width="140"></el-table-column>
       <el-table-column prop="UserName" label="上传人"></el-table-column>
       <el-table-column prop="address" align="center" label="操作" width="240">
         <template slot-scope="scope">

+ 14 - 5
src/views/model/file/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="file_moddle_manage" v-loading="loading">
     <!-- 左边模型文件夹列表 -->
-    <el-col class="col_left" :span="5">
+    <div class="col_left">
       <div class="grid-content grid-left">
         <el-card class="box-card" :body-style="{ padding: '0px', height: '100%' }">
           <div class="top_hand left_top_hand">
@@ -28,16 +28,16 @@
                 <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>
+                  <span :title="item.Name">{{item.Name}}</span>
                 </li>
               </el-scrollbar>
             </ul>
           </div>
         </el-card>
       </div>
-    </el-col>
+    </div>
     <!-- 右边文件表格 -->
-    <el-col class="col_left" :span="19">
+    <div class="col_right">
       <el-card class="box-card" :body-style="{ padding: '0px', height:'100%' }">
         <!-- 顶部操作栏 -->
         <div class="top_hand right_top_hand">
@@ -49,7 +49,7 @@
           @replaceModel="repliaceModel" @percentFinish="queryFloorFile(currentFolderId)"
           :persentList="persentList"></floorTable>
       </el-card>
-    </el-col>
+    </div>
     <!-- 弹窗 开始-->
 
     <!-- 模型日志弹窗 -->
@@ -355,8 +355,14 @@ export default {
 #file_moddle_manage {
   width: 100%;
   height: 100%;
+  display: flex;
   overflow: hidden !important;
   .col_left {
+    width: 280px;
+    height: 100%;
+  }
+  .col_right {
+    width: calc(100% - 280px);
     height: 100%;
   }
   .grid-content {
@@ -432,6 +438,9 @@ export default {
         cursor: pointer;
         span {
           padding-left: 6px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
       }
       li:hover {