Преглед на файлове

adm:feat > 现场任务管理,设备台账,模型,资产相关接口替换

shaun-sheep преди 4 години
родител
ревизия
c4927d535d

+ 7 - 6
src/api/data_admin/buildTaskApi.js

@@ -37,7 +37,8 @@ export function queryModelDiglog(param, success) {
 
 //查询模型任务
 export function queryModelTask(param, success) {
-  let url = `${baseUrl}${modelScanTask}/page-query`;
+  // let url = `${baseUrl}${modelScanTask}/page-query`;
+  let url = `${baseUrl}${scan}/task/model/page-query`;
   http.postJson(url, param, success);
 }
 
@@ -49,14 +50,14 @@ export function updateModelTask(param, success) {
 
 //查询设备分类
 export function queryModelCategory(param, success) {
-  let url = `${baseUrl}${modelScanTask}/model-category-query`;
+  // let url = `${baseUrl}${modelScanTask}/model-category-query`;
+  let url = `${baseUrl}${scan}/task/model/model-category-query`;
   http.postJson(url, param, success);
 }
 
 //查询模型文件夹和文件
 export function queryModelFile(param, success) {
-  //todo
-  let url = `${baseUrl}${modelScanTask}/model-file-query`;
+  let url = `${baseUrl}${scan}/task/model/model-file-query`;
   // let url = `${scan}/task/model/model-file-query`;
   http.postJson(url, param, success);
 }
@@ -93,10 +94,10 @@ export function updateDeviceTask(param, success) {
   http.postJson(url, param, success)
 }
 
-//查询设备分类
+//设备台账任务接口 查询设备分类
 export function queryDeviceCategory(param, success) {
   // let url = `${baseUrl}${equipScanTask}/equip-category-query`;
-  let url = `${scan}/task/equip/equip-category-query`;
+  let url = `${baseUrl}${scan}/task/equip/category/query`;
   http.postJson(url, param, success)
 }
 

+ 22 - 22
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -18,25 +18,25 @@
             </el-form>
           </template>
         </el-table-column>
-        <el-table-column prop="FolderName" label="所属模型文件夹" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="FileName" label="模型文件名" width="80" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="folderName" label="所属模型文件夹" width="110" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="fileName" label="模型文件名" width="80" show-overflow-tooltip></el-table-column>
         <el-table-column label="设备本地名称" show-overflow-tooltip width="100">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.EquipLocalName }}
-              <el-badge v-if="scope.row.Component&&scope.row.Component.length?true:false"
-                        :value="scope.row.Component&&scope.row.Component.length?scope.row.Component.length:0"
+              {{ scope.row.localName }}
+              <el-badge v-if="scope.row.component&&scope.row.component.length?true:false"
+                        :value="scope.row.component&&scope.row.component.length?scope.row.component.length:0"
                         class="item" type="warning">
               </el-badge>
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="EquipLocalID" label="设备本地编码" show-overflow-tooltip width="100"></el-table-column>
-        <el-table-column prop="EquipCategory.EquipName" label="设备类" show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column prop="BIMID" label="BIM Id" show-overflow-tooltip width="80"></el-table-column>
+        <el-table-column prop="localId" label="设备本地编码" show-overflow-tooltip width="100"></el-table-column>
+        <el-table-column prop="equipCategory.name" label="设备类" show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column prop="bimId" label="BIM Id" show-overflow-tooltip width="80"></el-table-column>
         <el-table-column prop="type" label="现场验证操作规定" width="150">
           <template slot-scope="scope">
-            <el-select style="width:100px;" v-model="scope.row.SchemeId" placeholder="请选择">
+            <el-select style="width:100px;" v-model="scope.row.schemeId" placeholder="请选择">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
             </el-select>
           </template>
@@ -130,7 +130,7 @@ export default {
           }
         ],
         filters: `projectId='${this.projectId}'`,
-        orders: "createTime desc, equipID asc",
+        orders: "createTime desc, id asc",
         pageNumber: this.page.pageNumber,
         pageSize: this.page.pageSize
       }
@@ -180,35 +180,35 @@ export default {
     },
     // 表格数据格式化
     dataFormatter(res) {
-      this.tableData = res.Content.map(item => {
-        if (item.Component && item.Component.length) {
+      this.tableData = res.content.length && res.content.map(item => {
+        if (item.component && item.component.length) {
           item.ComponentCount = []
-          item.Component.map(parts => {
-            if (parts.EquipCategory && parts.EquipCategory.EquipCode && parts.EquipCategory.EquipName) {
+          item.component.map(parts => {
+            if (parts.equipCategory && parts.equipCategory.code && parts.equipCategory.name) {
               let index = item.ComponentCount.findIndex(c => {
-                return c.code == parts.EquipCategory.EquipCode
+                return c.code == parts.equipCategory.code
               })
               if (index != -1) {
                 item.ComponentCount[index].count++
               } else {
                 item.ComponentCount.push({
-                  name: parts.EquipCategory.EquipName,
-                  code: parts.EquipCategory.EquipCode,
+                  name: parts.equipCategory.name,
+                  code: parts.equipCategory.code,
                   count: 1
                 })
               }
             }
           })
         }
-        item.FolderName = this.params.modelFolderName
-        item.FolderId = this.params.modelFolderId
-        item.FileName = this.params.modelFileName
-        item.FileId = this.params.CurrentModelId
+        item.folderName = this.params.modelFolderName
+        item.floorId = this.params.modelFolderId
+        item.fileName = this.params.modelFileName
+        item.fileId = this.params.CurrentModelId
         // 后端定义默认值(前端取消默认值设定)
         // item.SchemeId = "1"
         return item
       })
-      this.page.total = res.Total
+      this.page.total = res.total
     },
     //选中项修改
     handleSelectionChange(val) {

+ 3 - 3
src/components/data_admin/buildTask/draw/drawModel.vue

@@ -127,7 +127,7 @@ export default {
       await this.getUnverificationDevice()
       this.view.scene.spaceList.forEach(item => {
         for(let deviceItem of this.deviceList) {
-          if(deviceItem.LocationJson && item.contains(deviceItem.LocationJson.X, -deviceItem.LocationJson.Y)){//注:坐标体系不同,Y坐标取反
+          if(deviceItem.locationJson && item.contains(deviceItem.locationJson.x, -deviceItem.locationJson.y)){//注:坐标体系不同,Y坐标取反
             item.highLightFlag = true
             break
           }
@@ -140,8 +140,8 @@ export default {
         pageNum = pageNum ? pageNum : 1
         let params = {
           filters: `taskState isNull;modelId='${this.CurrentModelId}'`,
-          orders: "createTime desc, equipID asc",
-          projection: ["equipID", "bimId", "bimLocation", "locationJson"],
+          orders: "createTime desc, id asc",
+          projection: ["id", "bimId", "bimLocation", "locationJson"],
           pageNumber: pageNum,
           pageSize: 1000
         }

+ 2 - 2
src/components/data_admin/buildTask/lib/modelCascader.vue

@@ -2,7 +2,7 @@
   <div id="cascaderMap">
     <span class="buildFloor" style="margin-right: 12px;">设备类别</span>
     <el-select v-model="value" placeholder="请选择" clearable filterable :style="isWidth ? '' : 'width:160px;'" size="small" @change="changeVal">
-      <el-option  v-for="item in options" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>
+      <el-option  v-for="item in options" :key="item.code" :label="item.name" :value="item.code"></el-option>
     </el-select>
   </div>
 </template>
@@ -52,7 +52,7 @@ export default {
     //获取当前项目下的模型任务-设备类型
     getData() {
       queryModelCategory('', res => {
-        this.options = res.Content
+        this.options = res.content
       })
     }
   }

+ 4 - 4
src/components/data_admin/buildTask/lib/modelFile.vue

@@ -50,9 +50,9 @@ export default {
     // 获取文件夹
     getDirectory() {
       queryModelFile("", res => {
-        this.options = res.Content.map(item => {
-          item.FileId = item.FolderId
-          item.FileName = item.FolderName
+        this.options = res.content.map(item => {
+          item.FileId = item.folderId
+          item.FileName = item.folderName
           return item
         })
       });
@@ -78,4 +78,4 @@ export default {
             font-size: 14px;
         }
     }
-</style>
+</style>

+ 6 - 7
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -150,15 +150,14 @@
               //     })
               //   }
               // }
-              // todo 待测试
-              if(parts.equipCategory && parts.equipCategory.equipCode && parts.equipCategory.equipName){
-                let index = item.componentCount.findIndex(c => {return c.code == parts.equipCategory.equipCode})
+              if(parts.equipCategory && parts.equipCategory.code && parts.equipCategory.name){
+                let index = item.ComponentCount.findIndex(c => {return c.code == parts.equipCategory.code})
                 if(index != -1){
-                  item.componentCount[index].count++
+                  item.ComponentCount[index].count++
                 } else {
-                  item.componentCount.push({
-                    name: parts.equipCategory.equipName,
-                    code: parts.equipCategory.equipCode,
+                  item.ComponentCount.push({
+                    name: parts.equipCategory.name,
+                    code: parts.equipCategory.code,
                     count: 1
                   })
                 }

+ 50 - 48
src/components/data_admin/buildTask/table/modelTable.vue

@@ -2,29 +2,29 @@
   <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="80"></el-table-column>
-        <el-table-column prop="FileName" label="模型文件名" show-overflow-tooltip min-width="80"></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.EquipLocalName}}
-              <el-badge v-if="scope.row.Component&&scope.row.Component.length?true:false"
-                        :value="scope.row.Component&&scope.row.Component.length?scope.row.Component.length:0"
+              {{scope.row.localName}}
+              <el-badge v-if="scope.row.component&&scope.row.component.length?true:false"
+                        :value="scope.row.component&&scope.row.component.length?scope.row.component.length:0"
                         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="80"></el-table-column>
-        <el-table-column prop="BIMID" label="BIM ID" show-overflow-tooltip min-width="220"></el-table-column>
-        <el-table-column prop="TaskState" label="任务执行情况" show-overflow-tooltip min-width="60"></el-table-column>
+        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="equipCategory.name" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="80"></el-table-column>
+        <el-table-column prop="bimId" label="BIM ID" show-overflow-tooltip min-width="220"></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.TaskState == '待验证' || scope.row.TaskState == '未找到'" title="查看详情" class="iconfont icon-xiangqing table-button" @click="handleDetail(scope.$index, scope.row)"></i>
-            <i v-if="scope.row.TaskState == '未找到'" title="重新生成任务" class="iconfont icon-Update table-button" @click="handleRegenerate(scope.$index, scope.row)"></i>
-            <i v-if="scope.row.TaskState == '待验证'" title="删除任务" class="iconfont icon-delete table-button" @click="handleDelete(scope.$index, scope.row)"></i>
-            <i v-if="scope.row.TaskState == '未找到'" title="认可此任务执行情况" class="iconfont icon-lijiqueren table-button" @click="handleConfirm(scope.$index, scope.row)"></i>
+            <i v-if="scope.row.taskState == '待验证' || scope.row.taskState == '未找到'" title="查看详情" class="iconfont icon-xiangqing table-button" @click="handleDetail(scope.$index, scope.row)"></i>
+            <i v-if="scope.row.taskState == '未找到'" title="重新生成任务" class="iconfont icon-Update table-button" @click="handleRegenerate(scope.$index, scope.row)"></i>
+            <i v-if="scope.row.taskState == '待验证'" title="删除任务" class="iconfont icon-delete table-button" @click="handleDelete(scope.$index, scope.row)"></i>
+            <i v-if="scope.row.taskState == '未找到'" title="认可此任务执行情况" class="iconfont icon-lijiqueren table-button" @click="handleConfirm(scope.$index, scope.row)"></i>
           </template>
         </el-table-column>
         <template slot="empty">
@@ -45,22 +45,22 @@
 </template>
 
 <script>
-  import {createModelTask, deleteModelTask, queryModelTask, updateModelTask} from "@/api/data_admin/buildTaskApi"
-  import tools from "@/utils/tools"
-  import {mapGetters} from "vuex"
-  import deviceDetail from '../detail/deviceDetail'
+import { createModelTask, deleteModelTask, queryModelTask, updateModelTask } from "@/api/data_admin/buildTaskApi"
+import tools from "@/utils/tools"
+import { mapGetters } from "vuex"
+import deviceDetail from '../detail/deviceDetail'
 
-  export default {
-    components: {
-      deviceDetail
-    },
-    computed: {
-      ...mapGetters("layout", ["projectId", "userInfo"])
-    },
-    props: {
-      paramsData: Object,
-    },
-    data() {
+export default {
+  components: {
+    deviceDetail
+  },
+  computed: {
+    ...mapGetters("layout", ["projectId", "userInfo"])
+  },
+  props: {
+    paramsData: Object,
+  },
+  data() {
     return {
       inSpaceType: '设备',
       loading: false, // loading
@@ -93,44 +93,46 @@
     getTableData() {
       this.loading = true
       let params = {
-        Filters: `ProjectId='${this.projectId}'`,
-        Cascade: [
+        filters: `projectId='${this.projectId}'`,
+        cascade: [
           {
-            Name: 'component'
+            name: 'component'
           }, {
-            Name: 'scanScheme'
+            name: 'scanScheme'
           }, {
-            Name: 'equipCategory'
+            name: 'equipCategory'
           }
         ],
-        Orders: "CreateTime desc, TaskId asc",
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
+        orders: "createTime desc, id asc",
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.pageSize
       }
       if(this.paramsData.taskState !== ''){
-        params.Filters += `;TaskState=${this.paramsData.taskState}`
+        params.filters += `;taskState=${this.paramsData.taskState}`
       }
       if(this.paramsData.modelFile){
-        params.Filters += `;FileId='${this.paramsData.modelFile}'`
+        params.filters += `;fileId='${this.paramsData.modelFile}'`
       }
       if(this.paramsData.modelCategory){
-        params.Filters += `;Category='${this.paramsData.modelCategory}'`
+        params.filters += `;category='${this.paramsData.modelCategory}'`
       }
       queryModelTask(params, res => {
         this.loading = false
-        this.page.total = res.Total;
-        this.tableData = res.Content.map(item => {
-          if(item.Component && item.Component.length){
+        this.page.total = res.total;
+        this.tableData = res.content.map(item => {
+          if (item.component && item.component.length) {
             item.ComponentCount = []
-            item.Component.map(parts => {
-              if(parts.EquipCategory && parts.EquipCategory.EquipCode && parts.EquipCategory.EquipName){
-                let index = item.ComponentCount.findIndex(c => {return c.code == parts.EquipCategory.EquipCode})
-                if(index != -1){
+            item.component.map(parts => {
+              if (parts.equipCategory && parts.equipCategory.code && parts.equipCategory.name) {
+                let index = item.ComponentCount.findIndex(c => {
+                  return c.code == parts.equipCategory.code
+                })
+                if (index != -1) {
                   item.ComponentCount[index].count++
                 } else {
                   item.ComponentCount.push({
-                    name: parts.EquipCategory.EquipName,
-                    code: parts.EquipCategory.EquipCode,
+                    name: parts.equipCategory.name,
+                    code: parts.equipCategory.code,
                     count: 1
                   })
                 }