浏览代码

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

haojianlong 4 年之前
父节点
当前提交
5162518dba

+ 25 - 33
src/api/data_admin/buildTaskApi.js

@@ -1,8 +1,5 @@
 import http from '../scan/httpUtil';
-
-const baseUrl = '/api';
-import { scan, modelScanTask, equipScanTask, dataCenter } from './../scan/config';
-
+import { baseUrl, scan } from './../scan/config';
 
 /**
  * info: 查询统计数量(查询总数量不传参数,查询已完成数量TaskState=0,查询未找到TaskState=-1,查询未验证TaskState=1)
@@ -19,130 +16,125 @@ export function queryTaskCount(param, success) {
 /*************************模型任务接口****************************/
 //创建模型任务
 export function createModelTask(param, success) {
-  let url = `${baseUrl}${modelScanTask}/create`;
+  // let url = `${baseUrl}${modelScanTask}/create`;
+  let url = `${baseUrl}${scan}/task/model/create`;
   http.postJson(url, param, success);
 }
 
 //根据id删除模型任务
 export function deleteModelTask(param, success) {
-  let url = `${baseUrl}${modelScanTask}/delete`;
+  // let url = `${baseUrl}${modelScanTask}/delete`;
+  let url = `${baseUrl}${scan}/task/model/delete`;
   http.postJson(url, param, success);
 }
 
 //查询:根据模型空间ID查询设备信息
 export function queryModelDiglog(param, success) {
-  let url = `${baseUrl}${modelScanTask}/equip-query`;
+  // let url = `${baseUrl}${modelScanTask}/equip-query`;
+  let url = `${baseUrl}${scan}/task/model/equip-query`;
   http.postJson(url, param, success);
 }
 
 //查询模型任务
 export function queryModelTask(param, success) {
-  let url = `${baseUrl}${modelScanTask}/page-query`;
+  let url = `${baseUrl}${scan}/task/model/page-query`;
   http.postJson(url, param, success);
 }
 
 //更新模型任务
 export function updateModelTask(param, success) {
-  let url = `${baseUrl}${modelScanTask}/update`;
+  let url = `${baseUrl}${scan}/task/model/update`;
   http.postJson(url, param, success);
 }
 
 //查询设备分类
 export function queryModelCategory(param, success) {
-  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 = `${scan}/task/model/model-file-query`;
+  let url = `${baseUrl}${scan}/task/model/model-file-query`;
   http.postJson(url, param, success);
 }
 
 //查询模型任务下的部件类型及数量
 export function modelCategoryCount(param, success) {
-  let url = `${baseUrl}${modelScanTask}/category-count`;
+  let url = `${baseUrl}${scan}/task/model/category-count`;
   http.postJson(url, param, success);
 }
 
 /*************************设备台账任务接口****************************/
 //创建设备台账任务
 export function createDeviceTask(param, success) {
-  let url = `${baseUrl}${equipScanTask}/create`;
+  let url = `${baseUrl}${scan}/task/equip/create`;
   http.postJson(url, param, success);
 }
 
 //根据id删除设备台账任务
 export function deleteDeviceTask(param, success) {
-  let url = `${baseUrl}${equipScanTask}/delete`;
+  let url = `${baseUrl}${scan}/task/equip/delete`;
   http.postJson(url, param, success);
 }
 
 //查询设备台账任务
 export function queryDeviceTask(param, success) {
-  // let url = `${baseUrl}${equipScanTask}/page-query`;
-  let url = `${scan}/task/equip/page-query`;
+  let url = `${baseUrl}${scan}/task/equip/page-query`;
   http.postJson(url, param, success)
 }
 
 //更新设备台账任务
 export function updateDeviceTask(param, success) {
-  let url = `${baseUrl}${equipScanTask}/update`;
+  let url = `${baseUrl}${scan}/task/equip/update`;
   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)
 }
 
 //查询设备任务下的部件类型及数量
 export function categoryCount(param, success) {
-  let url = `${baseUrl}${equipScanTask}/category-count`
+  let url = `${baseUrl}${scan}/task/equip/category-count`
   http.postJson(url, param, success)
 }
 
 /*************************资产台账任务接口****************************/
 //统计数量
 export function countAssetsTask(param, success) {
-  // let url = `${baseUrl}${dataCenter}/property-scan-task/count`;
-  let url = `${scan}/task/property/count`;
+  let url = `${baseUrl}${scan}/task/property/count`;
   http.postJson(url, param, success)
 }
 
 //创建设备台账任务
 export function createAssetsTask(param, success) {
-  // let url = `${baseUrl}${dataCenter}/property-scan-task/create`;
-  let url = `${scan}/task/property/create`;
+  let url = `${baseUrl}${scan}/task/property/create`;
   http.postJson(url, param, success)
 }
 
 //根据id删除设备台账任务
 export function deleteAssetsTask(param, success) {
-  let url = `${scan}/task/property/delete`;
+  let url = `${baseUrl}${scan}/task/property/delete`;
   http.postJson(url, param, success)
 }
 
 //查询资产台账任务 y
 export function queryAssetsTask(param, success) {
-  // let url = `${baseUrl}${dataCenter}/property-scan-task/page-query`;
-  let url = `${scan}/task/property/page-query`;
+  let url = `${baseUrl}${scan}/task/property/page-query`;
   http.postJson(url, param, success)
 }
 
 //更新资产台账任务
 export function updateAssetsTask(param, success) {
-  let url = `${scan}/task/property/update`;
+  let url = `${baseUrl}${scan}/task/property/update`;
   http.postJson(url, param, success)
 }
 
 //查询设备族
 export function queryAssetsFamily(param, success) {
-  // let url = `${baseUrl}${dataCenter}/property-scan-task/property-category-query`;
-  let url = `${scan}/task/property/property-category-query`;
+  let url = `${baseUrl}${scan}/task/property/property-category-query`;
   http.postJson(url, param, success)
 }

+ 1 - 2
src/api/scan/request.js

@@ -2052,10 +2052,9 @@ export function groupCreRelaZoneAndISp(param, success) {
   http.postJson(url, param.data, success)
 }
 
-// <<<<<<< HEAD
 //扫楼作业-扫楼日志查看
 export function queryUserLog(param, success) {
-  let url = `${baseUrl}/scanbuilding-2/user-log/query`;
+  let url = `${baseUrl}${scan}/user-log/query`;
   http.postJson(url, param, success)
 }
 

+ 10 - 10
src/components/data_admin/buildTask/detail/deviceDetail.vue

@@ -245,15 +245,15 @@
       //  查询设备部件数量
       handleContent(row) {
         let param = {
-          TaskId: row.TaskId,
-          EquipId: row.EquipId
+          taskId: row.taskId,
+          equipId: row.equipId
         }
         this.Name = ''
         this.Count = ''
         categoryCount(param, res => {
-          if (res.Content.length) {
-            this.Name = res.Content[0].Name
-            this.Count = res.Content[0].Count
+          if (res.content.length) {
+            this.Name = res.Content[0].name
+            this.Count = res.Content[0].count
           }
 
         })
@@ -261,15 +261,15 @@
       //  查询模型部件数量
       handleModelContent(row) {
         let param = {
-          TaskId: row.TaskId,
-          EquipId: row.EquipId
+          taskId: row.taskId,
+          equipId: row.equipId
         }
         this.Name = ''
         this.Count = ''
         modelCategoryCount(param, res => {
-          if (res.Content.length) {
-            this.Name = res.Content[0].Name
-            this.Count = res.Content[0].Count
+          if (res.content.length) {
+            this.Name = res.Content[0].name
+            this.Count = res.Content[0].count
           }
 
         })

+ 41 - 41
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>
@@ -114,7 +114,7 @@ export default {
         cascade: [
           {
             name: "equipCategory",
-            projection: ["equipCode", "equipName"]
+            projection: ["code", "name"]
           },
           {
             name: "component",
@@ -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
       }
@@ -157,12 +157,12 @@ export default {
           arr.push(list)
         })
         let param = {
-          ModelId: this.params.CurrentModelId,
-          IdList: arr,
-          Category: this.params.device || '',
+          modelId: this.params.CurrentModelId,
+          idList: arr,
+          classCode: this.params.device || '',
           filters: `classCode='${this.params.device || ''}'`,
-          PageNumber: this.page.pageNumber,
-          PageSize: this.page.pageSize
+          pageNumber: this.page.pageNumber,
+          pageSize: this.page.pageSize
         }
         // console.log(param,'param')
         queryModelDiglog(param, res => {
@@ -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) {
@@ -217,27 +217,27 @@ export default {
     savaRelation() {
       if (this.selections.length) {
         let list = this.selections.map((item) => {
-          if (item.SchemeId) {
+          if (item.schemeId) {
             return {
-              EquipId: item.EquipID,
-              FileId: item.FileId,
-              FileName: item.FileName,
-              FolderId: item.FolderId,
-              FolderName: item.FolderName,
-              SchemeId: item.SchemeId
+              id: item.id,
+              fileId: item.fileId,
+              fileName: item.fileName,
+              folderId: item.folderId,
+              folderName: item.folderName,
+              schemeId: item.schemeId
             }
           } else {
             return {
-              EquipId: item.EquipID,
-              FileId: item.FileId,
-              FileName: item.FileName,
-              FolderId: item.FolderId,
-              FolderName: item.FolderName
+              id: item.id,
+              fileId: item.fileId,
+              fileName: item.fileName,
+              folderId: item.folderId,
+              folderName: item.folderName,
             }
           }
         })
         let params = {
-          Content: list
+          content: list
         }
         createModelTask(params, res => {
           this.$emit('update:dialogVisible', false)

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

+ 1 - 1
src/components/data_admin/buildTask/lib/assetsCascader.vue

@@ -42,7 +42,7 @@ export default {
     changeVal(val) {
       let value = {}
       this.options.map(item => {
-        if (item.Code == val) {
+        if (item.code == val) {
           value = item
         }
       })

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

+ 12 - 11
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -41,10 +41,11 @@
 </template>
 
 <script>
-import { queryAssetsTask, deleteAssetsTask, createAssetsTask, updateAssetsTask } from "@/api/data_admin/buildTaskApi"
+import { createAssetsTask, deleteAssetsTask, queryAssetsTask, updateAssetsTask } from "@/api/data_admin/buildTaskApi"
 import tools from "@/utils/tools"
 import { mapGetters } from "vuex"
 import assetsDetail from '../detail/assetsDetail'
+
 export default {
   components: {
     assetsDetail
@@ -133,7 +134,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = [{TaskId: row.TaskId}]
+        let params = [{ taskId: row.taskId }]
         deleteAssetsTask(params, res => {
           this.$message.success('删除成功')
           this.getTableData()
@@ -145,10 +146,10 @@ export default {
     //重新生成任务
     handleRegenerate(index, row){
       let params = {
-        Content: [{
-          EquipId: row.EquipId,
-          SchemeId:row.SchemeId,
-          TaskState: -1
+        content: [{
+          equipId: row.equipId,
+          schemeId: row.schemeId,
+          taskState: -1
         }]
       }
       createAssetsTask(params, res => {
@@ -159,11 +160,11 @@ export default {
     //认可此任务执行情况
     handleConfirm(index, row){
       let params = {
-        Content: [{
-          ConfirmingPersonId: this.userInfo.userId,
-          ConfirmingPersonName: this.userInfo.userName,
-          TaskId: row.TaskId,
-          TaskState: 0
+        content: [{
+          confirmingPersonId: this.userInfo.userId,
+          confirmingPersonName: this.userInfo.userName,
+          taskId: row.taskId,
+          taskState: 0
         }]
       }
       updateAssetsTask(params, res => {

+ 16 - 17
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
                   })
                 }
@@ -177,7 +176,7 @@
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = [{TaskId: row.TaskId}]
+        let params = [{taskId: row.taskId}]
         deleteDeviceTask(params, res => {
           this.$message.success('删除成功')
           this.getTableData()
@@ -189,10 +188,10 @@
     //重新生成任务
     handleRegenerate(index, row){
       let params = {
-        Content: [{
-          EquipId: row.EquipId,
-          TaskState: -1,
-          SchemeId:row.SchemeId
+        content: [{
+          id: row.id,
+          taskState: -1,
+          schemeId:row.schemeId
         }]
       }
       createDeviceTask(params, res => {
@@ -205,11 +204,11 @@
     //认可此任务执行情况
     handleConfirm(index, row){
       let params = {
-        Content: [{
-          ConfirmingPersonId: this.userInfo.userId,
-          ConfirmingPersonName: this.userInfo.userName,
-          TaskId: row.TaskId,
-          TaskState: 0
+        content: [{
+          confirmingPersonId: this.userInfo.userId,
+          confirmingPersonName: this.userInfo.userName,
+          taskId: row.taskId,
+          taskState: 0
         }]
       }
       updateDeviceTask(params, res => {

+ 64 - 62
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
                   })
                 }
@@ -149,7 +151,7 @@
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = [{TaskId: row.TaskId}]
+        let params = [{taskId: row.TaskId}]
         deleteModelTask(params, res => {
           this.$message.success('删除成功')
           this.getTableData()
@@ -161,14 +163,14 @@
     //重新生成任务
     handleRegenerate(index, row){
       let params = {
-        Content: [{
-          EquipId: row.EquipId,
-          FileId: row.FileId,
-          FileName: row.FileName,
-          FolderId: row.FolderId,
-          FolderName: row.FolderName,
-          SchemeId: row.SchemeId,
-          TaskState: -1
+        content: [{
+          id: row.id,
+          fileId: row.fileId,
+          fileName: row.fileName,
+          folderId: row.folderId,
+          folderName: row.folderName,
+          schemeId: row.schemeId,
+          taskState: -1
         }]
       }
       createModelTask(params, res => {
@@ -179,11 +181,11 @@
     //认可此任务执行情况
     handleConfirm(index, row){
       let params = {
-        Content: [{
-          ConfirmingPersonId: this.userInfo.userId,
-          ConfirmingPersonName: this.userInfo.userName,
-          TaskId: row.TaskId,
-          TaskState: 0
+        content: [{
+          confirmingPersonId: this.userInfo.userId,
+          confirmingPersonName: this.userInfo.userName,
+          taskId: row.taskId,
+          taskState: 0
         }]
       }
       updateModelTask(params, res => {

+ 1 - 1
src/components/data_admin/buildTask/table/replaceTable.vue

@@ -141,7 +141,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = [{TaskId: row.TaskId}]
+        let params = [{taskId: row.taskId}]
         deleteAssetsTask(params, res => {
           this.$message.success('删除成功')
           this.getTableData()

+ 1 - 1
src/components/data_admin/buildTask/table/tearTable.vue

@@ -141,7 +141,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = [{TaskId: row.TaskId}]
+        let params = [{taskId: row.taskId}]
         deleteAssetsTask(params, res => {
           this.$message.success('删除成功')
           this.getTableData()

+ 2 - 2
src/components/data_admin/buildTask/taskStatistics.vue

@@ -75,10 +75,10 @@
       queryTaskCount({Filters: `TaskState=1`},(res) => {
         this.waitCount = res.count
       })
-      countAssetsTask({Filters: `TaskState=1&&TaskType='3'`},(res) => {
+      countAssetsTask({filters: `taskState=1&&taskType='3'`},(res) => {
         this.waitTearCount = res.count
       })
-      countAssetsTask({Filters: `TaskState=1&&TaskType='2'`},(res) => {
+      countAssetsTask({filters: `taskState=1&&taskType='2'`},(res) => {
         this.waitReplaceCount = res.count
       })
     },

+ 7 - 7
src/views/data_admin/buildAssets/report.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="saga-report">
     <section class="saga-report-section">
-      <el-row :gutter="20"  v-for="(item,index) in errorReport" :key="item.Id" style="margin-bottom: 10px">
+      <el-row :gutter="20"  v-for="(item,index) in errorReport" :key="item.id" style="margin-bottom: 10px">
           <el-col :span="12">
-            <h3>{{index +1}}.{{item.Name}}</h3>
-            <div class="problem-description">{{item.Note}}</div>
-            <h5>问题创建人:{{item.Author}}</h5>
+            <h3>{{index +1}}.{{item.name}}</h3>
+            <div class="problem-description">{{item.note}}</div>
+            <h5>问题创建人:{{item.author}}</h5>
           </el-col>
-          <el-col :span="12" v-show="item.Pic" v-for="pic in item.Pic" :key="pic.Key">
+          <el-col :span="12" v-show="item.pic" v-for="pic in item.pic" :key="pic.key">
             <h4 style="font-size: 14px">现场照片</h4>
             <el-image
-              :src="`/image-service/common/image_get?systemId=dataPlatform&key=${pic.Key}`"
-              style="width:100%;height: 300px" :alt="item.Name"
+              :src="`/image-service/common/image_get?systemId=dataPlatform&key=${pic.key}`"
+              style="width:100%;height: 300px" :alt="item.name"
               :fit="fill"></el-image>
           </el-col>
       </el-row>

+ 12 - 12
src/views/data_admin/buildLog/index.vue

@@ -175,16 +175,16 @@ export default {
       //     console.dirxml(err)
       //   })
       let param = {
-        Filters: `CreateTime>='${this.dateValue[0]} 00:00:00';CreateTime<='${this.dateValue[1]} 23:59:59'`,
-        PageNumber: pageNum,
-        PageSize: 1000
+        filters: `createTime>='${this.dateValue[0]} 00:00:00';createTime<='${this.dateValue[1]} 23:59:59'`,
+        pageNumber: pageNum,
+        pageSize: 1000
       }
       if (this.searchValue) {
-        param.Filters += `;Name contain '${this.searchValue}' or Phone contain '${this.searchValue}' or Action contain '${this.searchValue}' or Note contain '${this.searchValue}' or UserId contain '${this.searchValue}'`
+        param.filters += `;name contain '${this.searchValue}' or phone contain '${this.searchValue}' or action contain '${this.searchValue}' or note contain '${this.searchValue}' or userId contain '${this.searchValue}'`
       }
       queryUserLog(param, res => {
-        this.exportData = this.exportData.concat(res.Content);
-        if (res.Total / (res.PageSize * res.PageNumber) > 1) {
+        this.exportData = this.exportData.concat(res.content);
+        if (res.total / (res.pageSize * res.pageNumber) > 1) {
           this.downExcel(pageNum++)
         } else {
           let time = +new Date()
@@ -208,17 +208,17 @@ export default {
     },
     getLogData() {
       let param = {
-        Filters: `CreateTime>='${this.dateValue[0]} 00:00:00';CreateTime<='${this.dateValue[1]} 23:59:59'`,
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
+        filters: `createTime>='${this.dateValue[0]} 00:00:00';createTime<='${this.dateValue[1]} 23:59:59'`,
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.pageSize
       }
       if (this.searchValue) {
-        param.Filters += `;Name contain '${this.searchValue}' or Phone contain '${this.searchValue}' or Action contain '${this.searchValue}' or Note contain '${this.searchValue}' or UserId contain '${this.searchValue}'`
+        param.filters += `;name contain '${this.searchValue}' or phone contain '${this.searchValue}' or action contain '${this.searchValue}' or note contain '${this.searchValue}' or userId contain '${this.searchValue}'`
       }
       queryUserLog(param, res => {
         this.loading = false
-        this.page.total = res.Total
-        this.tableData = res.Content
+        this.page.total = res.total
+        this.tableData = res.content
       })
     },
     init() {

+ 5 - 5
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -231,19 +231,19 @@ export default {
     handleClickCreate() {
       if (this.multipleSelection.length) {
         let list = this.multipleSelection.map((item) => {
-          if (item.SchemeId) {
+          if (item.schemeId) {
             return {
-              EquipId: item.EquipID,
-              SchemeId: item.SchemeId
+              equipId: item.equipId,
+              schemeId: item.schemeId
             }
           } else {
             return {
-              EquipId: item.EquipID
+              equipId: item.equipId
             }
           }
         })
         let param = {
-          Content: list
+          content: list
         }
         createAssetsTask(param, res => {
           this.$message.success("创建成功!")

+ 19 - 19
src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -33,30 +33,30 @@
             <template slot-scope="scope">
               <div>
                 {{
-                  scope.row.Building ? scope.row.Building.BuildLocalName ? scope.row.Building.BuildLocalName : '' : ''
+                  scope.row.building ? scope.row.building.name ? scope.row.building.localName : '' : ''
                 }}
                 -
-                {{ scope.row.Floor ? scope.row.Floor.FloorLocalName ? scope.row.Floor.FloorLocalName : '' : '' }}
+                {{ scope.row.floor ? scope.row.floor.name ? scope.row.floor.localName : '' : '' }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="EquipLocalName" label="设备本地名称" show-overflow-tooltip>
+          <el-table-column prop="localName" label="设备本地名称" show-overflow-tooltip>
             <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="200"></el-table-column>
-          <el-table-column prop="EquipCategory.EquipName" label="设备类"></el-table-column>
-          <el-table-column prop="LedgerParam.Siteinstall.InstallLocation" label="安装位置"></el-table-column>
+          <el-table-column prop="localId" label="设备本地编码" show-overflow-tooltip width="200"></el-table-column>
+          <el-table-column prop="equipCategory.name" label="设备类"></el-table-column>
+          <el-table-column prop="infos.installLocation" label="安装位置"></el-table-column>
           <el-table-column prop="type" label="现场验证操作规定" width="200">
             <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>
@@ -182,16 +182,16 @@ export default {
           if (item.component && item.component.length) {
             item.ComponentCount = []
             item.component.map(parts => {
-              if (parts.equipCategory && parts.equipCategory.equipCode && parts.equipCategory.equipName) {
+              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
                   })
                 }
@@ -212,7 +212,7 @@ export default {
         cascade: [
           {
             name: "equipCategory",
-            projection: ["equipCode", "equipName"]
+            projection: ["code", "name"]
           },
           {
             name: "component",
@@ -286,17 +286,17 @@ export default {
         let list = this.multipleSelection.map((item) => {
           if (item.SchemeId) {
             return {
-              EquipId: item.EquipID,
-              SchemeId: item.SchemeId
+              id: item.id,
+              schemeId: item.schemeId
             }
           } else {
             return {
-              EquipId: item.EquipID
+              id: item.id
             }
           }
         })
         let param = {
-          Content: list
+          content: list
         }
         createDeviceTask(param, res => {
           this.$message.success("创建成功!")

+ 2 - 2
src/views/ledger/property/addpropertys.vue

@@ -24,7 +24,7 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column prop="equipCategory.equipName" label="设备类型" show-overflow-tooltip
+          <el-table-column prop="equipCategory.name" label="设备类型" show-overflow-tooltip
                            width="200"></el-table-column>
           <el-table-column prop="building.localName" label="所属建筑"></el-table-column>
           <el-table-column prop="floor.localName" label="所属楼层"></el-table-column>
@@ -149,7 +149,7 @@ export default {
         cascade: [
           {
             name: "equipCategory",
-            projection: ["equipCode", "equipName"]
+            projection: ["code", "name"]
           },
           {
             name: "building",