Browse Source

模型验证任务联调

zhangyu 5 years ago
parent
commit
a35677e9b7
1 changed files with 15 additions and 22 deletions
  1. 15 22
      src/components/data_admin/buildTask/table/modelTable.vue

+ 15 - 22
src/components/data_admin/buildTask/table/modelTable.vue

@@ -2,20 +2,22 @@
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
       <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
-        <el-table-column prop="FolderName" label="所属模型文件夹" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="FileName" label="模型文件名" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="FolderName" label="所属模型文件夹" show-overflow-tooltip min-width="80"></el-table-column>
+        <el-table-column prop="FileName" label="模型文件名" show-overflow-tooltip min-width="80"></el-table-column>
         <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
               {{scope.row.LocalName}}
-              <el-badge :value="scope.row.partsNum" class="item" type="warning"></el-badge>
+              <el-badge v-if="scope.row.Equipment.Component?scope.row.Equipment.Component.length:false" 
+                :value="scope.row.Equipment.Component?scope.row.Equipment.Component.length:0" class="item" type="warning">
+              </el-badge>
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="LocalId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="Category" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="BIMID" label="BIM ID" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="TaskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="80"></el-table-column>
+        <el-table-column prop="BIMID" label="BIM ID" show-overflow-tooltip min-width="190"></el-table-column>
+        <el-table-column prop="TaskState" label="任务执行情况" show-overflow-tooltip min-width="60"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
             <i v-if="scope.row.taskType == '待验证' || scope.row.taskType == '未找到'" title="查看详情" class="iconfont icon-xiangqing table-button" @click="handleDetail(scope.$index, scope.row)"></i>
@@ -42,7 +44,7 @@
 </template>
 
 <script>
-import { queryModelTask } from "@/api/data_admin/buildTaskApi"
+import { queryModelTask, deleteModelTask } from "@/api/data_admin/buildTaskApi"
 import { mapGetters } from "vuex"
 import deviceDetail from '../detail/deviceDetail'
 export default {
@@ -72,18 +74,7 @@ export default {
         pageNumber: 1,
         total: 0
       },
-      tableData: [{
-        build: 'A栋',
-        floor: '3F',
-        EquipLocalName: '风机',
-        partsNum: 8,
-        EquipLocalID: 'AS123124343',
-        EquipCategory: {
-          EquipName: '风机'
-        },
-        CADID: '6486416846184879',
-        taskType: '未找到'
-      }], //列表数据
+      tableData: [], //列表数据
       headerStyle: {
         backgroundColor: '#e1e4e5',
         color: '#2b2b2b',
@@ -103,17 +94,19 @@ export default {
           {
             Name: 'equipment',
             Cascade: [{ Name: 'component' }]
+          }, {
+            Name: 'equipCategory'
           }
         ],
         Orders: "CreateTime desc, TaskId asc",
         PageNumber: this.page.pageNumber,
         PageSize: this.page.pageSize
       }
-      if(this.paramsData.taskState != ''){
-        params.Filters += `;TaskState='${this.paramsData.taskState}'`
+      if(this.paramsData.taskState !== ''){
+        params.Filters += `;TaskState=${this.paramsData.taskState}`
       }
       if(this.paramsData.modelFile){
-        params.Filters += `;FileName='${this.paramsData.modelFile}'`
+        params.Filters += `;FileId='${this.paramsData.modelFile}'`
       }
       if(this.paramsData.category){
         params.Filters += `;Category='${this.paramsData.category}'`