Prechádzať zdrojové kódy

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

shaun-sheep 5 rokov pred
rodič
commit
1d043e20ed

+ 1 - 1
package.json

@@ -78,7 +78,7 @@
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
     "vue-loader": "^13.3.0",
-    "vue-simple-uploader": "^0.7.2",
+    "vue-simple-uploader": "^0.7.4",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.5.2",
     "webpack": "^3.6.0",

+ 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/ledger/handsontables/assets.vue

@@ -5,7 +5,7 @@
         <!-- <span style="width:20px;float:left;display:block;height:20px;cursor: pointer;" @click="changeAssetsFalg">
           <i v-if="!onlyRead" class="el-icon-fa  el-icon-fa-eye"></i>
         </span> -->
-        <span>当前筛选条件下共{{page.total || '--'}}设备</span>
+        <span>当前筛选条件下共{{page.total || '--'}}资产</span>
       </div>
       <el-select v-model="onlyRead" @change="getHeaderData(mess)" style="width:100px;margin-right:20px;vertical-align:bottom;">
         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>

+ 1 - 1
src/components/ledger/handsontables/device.vue

@@ -762,7 +762,7 @@ export default {
             await deleteEquip(param, res => {
                 this.$message.success("删除成功")
                 this.$emit('close', {code: this.deleteCode})
-                this.getTableData()
+                // this.getTableData()
             })
         },
         // 更新

+ 14 - 10
src/components/ledger/lib/cascader.vue

@@ -1,8 +1,9 @@
 <template>
   <div id="cascaderMap">
     <span class="buildFloor" style="margin-right: 12px;">设备类别</span>
-    <el-select v-model="value" placeholder="请选择" clearable :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
-      <el-option  v-for="item in options" :key="item.code" :label="item.facility" :value="item.code"></el-option>
+    <el-select v-model="value" placeholder="请选择" clearable :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
+      @change="changeVal">
+      <el-option v-for="item in options" :key="item.code" :label="item.facility" :value="item.code"></el-option>
     </el-select>
     <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
       @change="changeVal" change-on-select></el-cascader> -->
@@ -54,12 +55,18 @@ export default {
     //修改val
     changeVal(val) {
       let value = {}
+      let flag = true;
       this.options.map(item => {
         if (item.code == val) {
+          flag = false;
           value = item
         }
       })
       this.value = val
+      if (flag) {
+        this.value = '';
+      }
+      console.log(value)
       this.$emit("change", value)
     },
     //获取当前项目下的设备类型(只拿到编码-需要过滤)
@@ -93,20 +100,17 @@ export default {
           resolve(res)
         })
       })
-      Promise.all([promise1,promise2]).then((res) => {
+      Promise.all([promise1, promise2]).then((res) => {
         let allData = res[0], data = res[1]
         this.options = this.formatOptions(allData.Content)
-        if (this.value) {
-          this.changeVal(this.value)
-        }
-        if(!this.all) {
+        if (!this.all) {
           this.content = data.Content.map(t => {
             return t.Category
           });
           this.filterForOptions();
-          if (this.value) {
-            this.changeVal(this.value)
-          }
+        }
+        if (this.value) {
+          this.changeVal(this.value)
         }
       })
     },

+ 52 - 60
src/components/ledger/lib/cenoteGraphy.vue

@@ -9,7 +9,8 @@
     <div class="canvas-box" v-show="floorMap" v-loading="canvasLoading">
       <canvas id="floorCanvas" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0"></canvas>
       <el-row class="canvas-actions-box">
-        <canvasFun @scale="scale" @fit="fit" @savePng="savePng" @saveSvg="saveSvg" @saveJson="saveJson" :config="config" ref="canvasFun"></canvasFun>
+        <canvasFun @scale="scale" @groupSelect="groupSelect" @fit="fit" @savePng="savePng" @saveSvg="saveSvg" @saveJson="saveJson" :config="config"
+          ref="canvasFun"></canvasFun>
       </el-row>
     </div>
   </div>
@@ -40,7 +41,8 @@ export default {
       selectAble: false,
       relatedSpaceIdList: [],//已关联的业务空间id
       config: {
-        isEdit: false
+        isEdit: false,
+        groupSelect: true
       },
     }
   },
@@ -68,7 +70,7 @@ export default {
           this.getGraphy();
         })
       }
-      else{
+      else {
         this.floorMap = '';
       }
     },
@@ -86,7 +88,6 @@ export default {
       let that = this;
       that.clearGraphy()
       that.scene = new DivideFloorScene();
-      that.scene.isSpaceSelectable = false;
       that.canvasLoading = true;
       that.scene.loadUrl(`/image-service/common/file_get?systemId=revit&key=${this.floorMap}`).then(res => {
         that.canvasLoading = false;
@@ -96,6 +97,7 @@ export default {
           return;
         }
         that.view.scene = that.scene;
+        that.scene.isSpaceSelectable = false;
         // 绘制业务空间
         that.getBusinessSpace();
         that.view.fitSceneToView();
@@ -108,7 +110,6 @@ export default {
     // 获取当前分区下的业务空间
     getBusinessSpace() {
       this.canvasLoading = true
-      this.clearZoneCanvas();
       let promise1 = new Promise((resolve, reject) => {
         let params = {
           data: {
@@ -155,81 +156,67 @@ export default {
         })
         // 绘制业务空间
         let tempArr = this.BSPRelaISPList.map((t, i) => {
-          let item = {
-            RoomLocalName: t.RoomLocalName,
-            OutLine: t.Outline,
-            RoomID: t.RoomID,
-            Color: colorArr[i % colorArr.length],
+          if (t.FloorId == this.buildingData[1] && t.ObjectType == this.space) {
+            return {
+              RoomLocalName: t.RoomLocalName,
+              OutLine: t.Outline,
+              RoomID: t.RoomID,
+              Color: colorArr[i % colorArr.length],
+              HighLightFlag: relatedZone.findIndex((item) => (item.RoomID == t.RoomID)) > -1,
+              Transparency: relatedZone.findIndex((item) => (item.RoomID == t.RoomID)) > -1 ? 20 : 1
+            }
+          } else {
+            return undefined
           }
-          return item;
-        })
-        this.scene.zoneList = [];
+        }).filter(item => item)
+        this.scene.removeAllZone();
         this.scene.addZoneList(tempArr);
         this.scene.click(this, this.canvasClick);
-        this.zoneList = this.scene.zoneList;
-        this.scene.zoneList.map(t => {
-          t.selected = false;
-          if (this.relatedSpaceIdList.indexOf(t.data.RoomID) != -1) {
-            // t.selected = true;
-            t.highLightFlag = true;
-          }
-        })
         this.canvasLoading = false;
       })
     },
     // canvas点击事件
     canvasClick(item, event) {
-      if (item.selectable) {
-        if (this.selectAble) {
-          if (this.relatedSpaceIdList.indexOf(item.data.RoomID) != -1) {
-            this.relatedSpaceIdList = this.relatedSpaceIdList.filter(t => { return t != item.data.RoomID });
-          }
-          else {
-            this.relatedSpaceIdList.push(item.data.RoomID);
-          }
-        }
-        else {
-          item.selected = !item.selected;
-        }
+      if (!this.config.isEdit) {
+        item.selected = false;
       }
     },
     //取消编辑
     cancelEdit() {
+      this.config.isEdit = false;
+      this.scene.clearZoneSelection();
       this.getBusinessSpace();
     },
+    //编辑
+    edit() {
+      this.config.isEdit = true;
+      this.scene.zoneList.map(t => {
+        t.selected = t.highLightFlag;
+        t.transparency = 20;
+        t.highLightFlag = false;
+      })
+    },
     //保存编辑
     saveEdit() {
+      let arr = this.scene.getSelectedZone();
       let param = {
         BuildingId: this.buildingData[0],
         FloorId: this.buildingData[1],
         Type: this.space,
         data: {
           ShaftId: this.$route.query.ShaftId,
-          SpaceIdList: this.relatedSpaceIdList
+          SpaceIdList: []
         }
       }
+      param.data.SpaceIdList = arr.map(t => {
+        return t.data.RoomID;
+      })
       shaftZoneLink(param, res => {
-        if (res.Result == "success") {
-          this.$message.success("保存成功");
-          this.getBusinessSpace();
-        }
+        this.config.isEdit = false;
+        this.$message.success("保存成功");
+        this.getBusinessSpace();
       })
     },
-    //是否可点
-    setSelectAble(val) {
-      if (this.scene) {
-        this.selectAble = val && !this.$route.query.onlyRead;
-        if (this.selectAble) {
-          this.scene.zoneList.map(t => {
-            t.highLightFlag = false;
-            t.selected = false;
-            if (this.relatedSpaceIdList.indexOf(t.data.RoomID) != -1) {
-              t.selected = true;
-            }
-          })
-        }
-      }
-    },
     // 清除canvas
     clearGraphy() {
       // debugger
@@ -240,12 +227,6 @@ export default {
       }
       this.view = new FloorView('floorCanvas')
     },
-    // 清空绘制业务空间
-    clearZoneCanvas() {
-      this.zoneList.map(t => {
-        this.scene.removeItem(t);
-      })
-    },
     // 适配底图到窗口
     fit() {
       this.view.fitSceneToView()
@@ -266,6 +247,10 @@ export default {
     saveSvg() {
       this.view.saveSceneSvg(`${this.buildingData[1]}.svg`, 6400, 4800);
     },
+    // 框选
+    groupSelect() {
+      this.scene.isRectSelection = 2;
+    },
     // 保存json
     saveJson() {
       this.view.saveFloorJson(`${this.buildingData[1]}.json`)
@@ -279,7 +264,14 @@ export default {
           this.$refs.canvasFun.sliderVal = s > 1000 ? 1000 : s;
         }
       }
-    }
+    },
+    "scene.isRectSelection": {
+      handler(n) {
+        if (!n) {
+          this.$refs.canvasFun.active = '';
+        }
+      }
+    },
   }
 }
 </script>

+ 4 - 2
src/components/ledger/rentList/roomCountDrawer.vue

@@ -4,7 +4,8 @@
       <div class="default-zone zone">
         <p>默认业务空间</p>
         <div v-if="!(readonly&&!zoneList.GeneralZone.length)">
-          <div v-for="(item,index) in zoneList.GeneralZone" :key="item.RoomID" class="zoneItem">
+          <div v-for="(item,index) in zoneList.GeneralZone" :key="item.RoomID" class="zoneItem"
+            :title="`${item.BuildLocalName}-${item.FloorLocalName}-${item.RoomLocalName || item.RoomName}`">
             {{item.BuildLocalName}}-{{item.FloorLocalName}}-{{item.RoomLocalName || item.RoomName}}
             <i size="mini" class="el-icon-delete" title="删除" @click="deleteZoneItem('GeneralZone',index)" v-if="!readonly"></i>
           </div>
@@ -22,7 +23,8 @@
       <div class="tenant-zone zone">
         <p>租户业务空间</p>
         <div v-if="!(readonly&&!zoneList.TenantZone.length)">
-          <div v-for="(item,index) in zoneList.TenantZone" :key="item.RoomID" class="zoneItem">
+          <div v-for="(item,index) in zoneList.TenantZone" :key="item.RoomID" class="zoneItem"
+            :title="`${item.BuildLocalName}-${item.FloorLocalName}-${item.RoomLocalName || item.RoomName}`">
             {{item.BuildLocalName}}-{{item.FloorLocalName}}-{{item.RoomLocalName || item.RoomName}}
             <i size="mini" class="el-icon-delete" title="删除" @click="deleteZoneItem('TenantZone',index)" v-if="!readonly"></i>
           </div>

+ 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">

+ 48 - 30
src/components/point/report/tabFunNumOverview.vue

@@ -2,8 +2,8 @@
   <div id="tabFunNumOverview">
     <!-- 查询 新增 -->
     <div class="query-area" style="padding:10px;">
-      <el-input :placeholder="`请输入表号功能号`" v-model="tabFunNum" @keyup.enter.native="getOverViewList()" style="width:240px;">
-        <i slot="suffix" class="el-input__icon el-icon-search" @click="getOverViewList()"></i>
+      <el-input :placeholder="`请输入表号功能号`" v-model="tabFunNum" @keyup.enter.native="handleCurrentChange(1)" style="width:240px;">
+        <i slot="suffix" class="el-input__icon el-icon-search" @click="handleCurrentChange(1)"></i>
       </el-input>
       <p style="overflow: hidden;float:right;">
         <el-button style="height:32px" @click='handleDrawer({},3)'>新增自定义</el-button>
@@ -22,17 +22,19 @@
         <el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100" header-align='left'></el-table-column>
         <el-table-column prop='Data.Data' label='查看分精度' show-overflow-tooltip min-width="90" header-align='center' align='center'>
           <template slot-scope="scope">
-            <el-button style="padding:7px 15px;" @click="handleDrawer(scope.row, 0)"><i class="el-icon-s-data" style="font-size:15px;"></i></el-button>
+            <el-button style="padding:7px 15px;" @click="handleDrawer(scope.row, 0)"><i class="el-icon-s-data" style="font-size:15px;"></i>
+            </el-button>
           </template>
         </el-table-column>
-        <el-table-column prop='Data.Time' label='对应值 - 获取时间' show-overflow-tooltip min-width="270" header-align='center' align='center' style="position:relative;">
+        <el-table-column prop='Data.Time' label='对应值 - 获取时间' show-overflow-tooltip min-width="270" header-align='center' align='center'
+          style="position:relative;">
           <template slot-scope="scope">
             <div style="width:175px;display:inline-block;">
               <span style="line-height:29px;">{{ scope.row.Data? (scope.row.Data.Data  || '--'): '--' }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
               <span style="line-height:29px;">{{ scope.row.Data? scope.row.Data.Time : '' }}</span>
             </div>
             <span style="width:55.33px;display:inline-block;padding-left:10px;">
-            <el-button class="dialog-btn" @click="refreshThisRow(scope.row)"><i class="el-icon-refresh"></i></el-button>
+              <el-button class="dialog-btn" @click="refreshThisRow(scope.row)"><i class="el-icon-refresh"></i></el-button>
             </span>
           </template>
         </el-table-column>
@@ -48,15 +50,15 @@
           <template slot-scope="scope">
             <span style="display:inline-block;width:16px;line-height:29px;">{{ scope.row.RelatedInstance }}</span>
             <span style="width:55.33px;display:inline-block;padding-left:10px;">
-              <el-button class="dialog-btn" v-if="scope.row.RelatedInstance" @click="handleDrawer(scope.row, 2)"><i class="el-icon-coin"></i></el-button>
+              <el-button class="dialog-btn" v-if="scope.row.RelatedInstance" @click="handleDrawer(scope.row, 2)"><i class="el-icon-coin"></i>
+              </el-button>
             </span>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页 -->
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="allTableData.length"
-        style="float:right;margin-top:10px;padding:2px 5px;">
+        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" style="float:right;margin-top:10px;padding:2px 5px;">
       </el-pagination>
     </div>
     <!-- 对话框和抽屉统一放在drawers中 -->
@@ -96,10 +98,12 @@ export default {
         color: '#2b2b2b',
         lineHeight: '30px'
       },
-      allTableData: [],//所有表格数据
+      // allTableData: [],//所有表格数据
+      tableData: [],
       pageSizes: [10, 20, 50, 100],
       pageSize: 50,
       currentPage: 1,
+      total: 0,
       loading: false,//加载
       tabFunNum: null,//表号功能号
       //抽屉
@@ -134,8 +138,15 @@ export default {
     //获取统计数据
     getOverViewList() {
       this.loading = true;
-      getTabFunNumOverview({ MeterFunc: this.tabFunNum }, res => {
-        this.allTableData = res.Content;
+      let pa = {
+        MeterFunc: this.tabFunNum,
+        PageSize: this.pageSize,
+        PageNumber: this.currentPage
+      }
+      getTabFunNumOverview(pa, res => {
+        // this.allTableData = res.Content;
+        this.tableData = res.Content;
+        this.total = res.Total
         this.loading = false;
       });
     },
@@ -146,23 +157,30 @@ export default {
         MeterFunc: row.MeterFunc
       }
       getTabFunNumOverview(pa, res => {
-        if (res.Content[0].Data) {
-          this.tableData[index].Data.Data = res.Content[0].Data.Data;
-          this.tableData[index].Data.Time = res.Content[0].Data.Time;
-        }
-        this.tableData[index].DataQuality = res.Content[0].DataQuality;
-        this.tableData[index].RelatedInstance = res.Content[0].RelatedInstance;
-        this.tableData[index].RelatedPoint = res.Content[0].RelatedPoint;
+        res.Content.forEach(t => {
+          if (t.MeterFunc == row.MeterFunc) {
+            if (t.Data) {
+              this.tableData[index].Data.Data = t.Data.Data || '';
+              this.tableData[index].Data.Time = t.Data.Time || '';
+            }
+            this.tableData[index].DataQuality = t.DataQuality;
+            this.tableData[index].RelatedInstance = t.RelatedInstance;
+            this.tableData[index].RelatedPoint = t.RelatedPoint;
+          }
+        })
         Message.success('已刷新');
       });
     },
     //分页更换size
     handleSizeChange(val) {
+      this.currentPage = 1;
       this.pageSize = val;
+      this.getOverViewList()
     },
     //分页更换页
     handleCurrentChange(val) {
       this.currentPage = val;
+      this.getOverViewList()
     },
     //子组件关闭抽屉
     closeDrawer() {
@@ -181,12 +199,12 @@ export default {
   },
   computed: {
     //根据分页,获取要展示的tableData
-    tableData: function () {
-      return this.allTableData.slice(
-        (this.currentPage - 1) * this.pageSize,
-        (this.currentPage * this.pageSize < this.allTableData.length) ? this.currentPage * this.pageSize : this.allTableData.length);
+    // tableData: function () {
+    //   return this.allTableData.slice(
+    //     (this.currentPage - 1) * this.pageSize,
+    //     (this.currentPage * this.pageSize < this.allTableData.length) ? this.currentPage * this.pageSize : this.allTableData.length);
 
-    }
+    // }
   },
   components: {
     historyChart,
@@ -214,20 +232,20 @@ export default {
   cursor: pointer;
   float: right;
 }
-.dialog-btn{
-  display:none;
-  height:29px;
+.dialog-btn {
+  display: none;
+  height: 29px;
 }
 /deep/ .el-drawer__body {
   height: 90%;
   overflow-y: auto;
 }
-/deep/ .el-table__body-wrapper tr:hover{
-  .dialog-btn{
-    display:inline;
+/deep/ .el-table__body-wrapper tr:hover {
+  .dialog-btn {
+    display: inline;
   }
 }
 /deep/ .el-dialog__body {
-  padding-bottom:20px;
+  padding-bottom: 20px;
 }
 </style>

+ 8 - 3
src/views/ledger/cenotelist/relatedSpace.vue

@@ -6,8 +6,8 @@
         <div class="edit-tool" v-if="!cenoteObj.onlyRead">
           <el-button v-if="isMyTab == 2" size="small" style="float:right" @click="dialogVisible = true">添加</el-button>
           <div v-else>
-            <el-button v-show="!isEdit" @click="isEdit = true" size="small" style="float:right">编辑</el-button>
-            <el-button v-show="isEdit" size="small" type="primary" @click="saveEdit" style="float:right">保存</el-button>
+            <el-button v-show="!isEdit" @click="changeEditType" size="small" style="float:right">编辑</el-button>
+            <el-button v-show="isEdit" size="small" @click="saveEdit" style="float:right">保存</el-button>
             <el-button v-show="isEdit" size="small" @click="cancelEdit" style="float:right">取消</el-button>
           </div>
           <addSpaceDialog :dialogVisible.sync="dialogVisible" ref="addSpaceDialog" @refresh="refresh" :params="cenoteObj" :spaceType="spaceType"
@@ -251,6 +251,11 @@ export default {
       let buildfloor = [this.building, fid]
       this.$refs.cenotegraphy.getFloorMap(buildfloor, this.space)
     },
+    // 编辑
+    changeEditType() {
+      this.isEdit = true;
+      this.$refs.cenotegraphy.edit();
+    },
     //取消编辑
     cancelEdit() {
       this.isEdit = false;
@@ -291,7 +296,7 @@ export default {
   watch: {
     isEdit: {
       handler(val) {
-        this.$refs.cenotegraphy.setSelectAble(val);
+        // this.$refs.cenotegraphy.setSelectAble(val);
       }
     },
     projectId: {

+ 1 - 1
src/views/ledger/facility/index.vue

@@ -81,7 +81,7 @@ export default {
     let deviceId = this.$route.params.deviceId;
     if (deviceId) {
       this.$nextTick(() => {
-        this.$refs.cascader.changeVal(deviceId)
+        this.$refs.cascader.setValue(deviceId)
       })
     }
   },

+ 3 - 3
src/views/ledger/spacelist/index.vue

@@ -192,9 +192,9 @@ export default {
     getMutiCount() {
       getSpaceBdFlCount({}, res => {
         this.mutiCount = res.Count;
-        // if (this.mutiCount > 0) {
-        //   this.getTips();
-        // }
+        if (this.mutiCount > 0) {
+          this.getTips();
+        }
       })
     },
     // 获取关系是否需要计算

+ 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 {