Browse Source

接口调试

zhangyu 5 năm trước cách đây
mục cha
commit
409f20370a

+ 22 - 0
src/api/data_admin/buildTaskApi.js

@@ -10,4 +10,26 @@ const baseUrl = '/api';
 export function queryTaskCount(param, success) {
   let url = `${baseUrl}/datacenter/scan-task-base/count`;
   http.postJson(url, param, success)
+}
+
+/*************************模型任务接口****************************/
+//创建模型任务
+export function createModelTask(param, success) {
+  let url = `${baseUrl}/datacenter/model-scan-task/create`;
+  http.postJson(url, param, success)
+}
+//根据id删除模型任务
+export function deleteModelTask(param, success) {
+  let url = `${baseUrl}/datacenter/model-scan-task/delete`;
+  http.postJson(url, param, success)
+}
+//查询模型任务
+export function queryModelTask(param, success) {
+  let url = `${baseUrl}/datacenter/model-scan-task/page-query`;
+  http.postJson(url, param, success)
+}
+//更新模型任务
+export function updateModelTask(param, success) {
+  let url = `${baseUrl}/datacenter/model-scan-task/update`;
+  http.postJson(url, param, success)
 }

+ 23 - 14
src/components/data_admin/buildTask/table/modelTable.vue

@@ -2,20 +2,20 @@
   <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="build" label="所属模型文件夹" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="floor" label="模型文件名" show-overflow-tooltip min-width="100"></el-table-column>
+        <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 :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.EquipLocalName}}
+              {{scope.row.LocalName}}
               <el-badge :value="scope.row.partsNum" class="item" type="warning"></el-badge>
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="CADID" label="BIM ID" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="taskType" label="任务执行情况" show-overflow-tooltip min-width="100"></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="CadId" 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="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 +42,7 @@
 </template>
 
 <script>
-import {  } from "@/api/scan/request"
+import { queryModelTask } from "@/api/data_admin/buildTaskApi"
 import { mapGetters } from "vuex"
 import deviceDetail from '../detail/deviceDetail'
 export default {
@@ -61,6 +61,11 @@ export default {
       loading: false, // loading
       drawer: false, // 详情侧弹窗
       detailId: '',
+      taskStateMap: {
+        '-1': '未找到',
+        '0': '已完成',
+        '1': '待验证'
+      },
       page: {
         pageSize: 50,
         pageSizes: [10, 20, 50, 100],
@@ -96,24 +101,28 @@ export default {
         Filters: `ProjectId='${this.projectId}'`,
         Cascade: [
           {
-            Name: 'equipmentList',
-            Cascade: [{ Name: 'equipCategory' }]
+            Name: 'equipment',
+            Cascade: [{ Name: 'component' }]
+          }, {
+            Name: 'equipmentList'
           }
         ],
-        Orders: "createTime desc, EquipID asc",
+        Orders: "createTime desc, Id asc",
         PageNumber: this.page.pageNumber,
         PageSize: this.page.pageSize
       }
-      if(this.paramsData.taskState){
+      if(this.paramsData.taskState != ''){
         params.Filters += `;TaskState='${this.paramsData.taskState}'`
       }
       if(this.paramsData.modelFile){
-        params.Filters += `;ModelFile='${this.paramsData.modelFile}'`
+        params.Filters += `;FileName='${this.paramsData.modelFile}'`
       }
       if(this.paramsData.category){
         params.Filters += `;Category='${this.paramsData.category}'`
       }
-      queryCenoteTableData(params, res => {
+      queryModelTask(params, res => {
+        debugger
+        this.page.total = res.Total;
         this.tableData = res.Content[0].EquipmentList || []
       })
     },

+ 31 - 10
src/components/data_admin/buildTask/taskStatistics.vue

@@ -3,24 +3,24 @@
 		<div class="statistics-all flex-row">
       <div class="statistics-progress">
         <div class="statistics-progress-num">
-          <p>25%</p>
+          <p>{{progress + '%'}}</p>
           <p>完成情况</p>
         </div>
-        <el-progress :width="90" type="circle" :percentage="25" :show-text="false"></el-progress>
+        <el-progress :width="90" type="circle" :percentage="progress" :show-text="false"></el-progress>
       </div>
       <div class="statistics-all-box flex-col">
-        <span>总任务:<b>2000</b></span>
-        <span>已完成:<b>500</b></span>
+        <span>总任务:<b>{{allCount}}</b></span>
+        <span>已完成:<b>{{alreadyCount}}</b></span>
       </div>
     </div>
 		<ul class="statistics-list flex-row">
       <li>
         <p class="statistics-list-text">未找到设备:</p>
-        <p class="statistics-list-num">2000</p>
+        <p class="statistics-list-num">{{notFoundCount}}</p>
       </li>
       <li>
         <p class="statistics-list-text">未完成验证任务:</p>
-        <p class="statistics-list-num">2000</p>
+        <p class="statistics-list-num">{{waitCount}}</p>
       </li>
       <li>
         <p class="statistics-list-text">未完成撕码任务:</p>
@@ -42,16 +42,37 @@ export default {
     
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId" ])
+    ...mapGetters("layout", ["projectId", "secret", "userId" ]),
+    progress(){
+      return Math.round(this.alreadyCount/this.allCount*100)
+    }
   },
   data() {
     return {
-
+      allCount: '',//总任务
+      alreadyCount: '',//已完成
+      notFoundCount: '',//未找到
+      waitCount: '',//未完成验证
     }
   },
-  mounted() { },
+  created() {
+    this.getTaskCount();
+  },
   methods: {
-
+    getTaskCount(){
+      queryTaskCount({},(res) => {
+        this.allCount = res.Count
+      })
+      queryTaskCount({Filters: `TaskState=0`},(res) => {
+        this.alreadyCount = res.Count
+      })
+      queryTaskCount({Filters: `TaskState=-1`},(res) => {
+        this.notFoundCount = res.Count
+      })
+      queryTaskCount({Filters: `TaskState=1`},(res) => {
+        this.waitCount = res.Count
+      })
+    }
   }
 }
 </script>

+ 6 - 4
src/views/data_admin/buildTask/index.vue

@@ -77,13 +77,13 @@ export default {
 				value: '',
 				label: '全部'
 			}, {
-				value: 'wait',
+				value: 1,
 				label: '待验证'
 			}, {
-				value: 'already',
+				value: 0,
 				label: '已完成'
 			}, {
-				value: 'notFound',
+				value: -1,
 				label: '未找到'
 			}],
 			taskState: '',//任务执行情况
@@ -103,7 +103,9 @@ export default {
 		handleChangeModel(val) {//修改模型文件
 			if(val[1]){
 				this.modelFile = val[1]
-			}
+			} else {
+        this.modelFile = ''
+      }
 		},
 		changeState(val) {//修改任务执行情况
 			this.taskState = val