Bladeren bron

adm:feat > 现场任务管理接口替换

shaun-sheep 4 jaren geleden
bovenliggende
commit
f59f1854d9

+ 20 - 29
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,38 +16,39 @@ 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);
 }
@@ -58,92 +56,85 @@ export function queryModelCategory(param, success) {
 //查询模型文件夹和文件
 export function queryModelFile(param, success) {
   let url = `${baseUrl}${scan}/task/model/model-file-query`;
-  // let url = `${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 = `${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)
 }

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

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

@@ -114,7 +114,7 @@ export default {
         cascade: [
           {
             name: "equipCategory",
-            projection: ["equipCode", "equipName"]
+            projection: ["code", "name"]
           },
           {
             name: "component",
@@ -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 => {
@@ -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)

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

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

+ 10 - 10
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -176,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()
@@ -188,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 => {
@@ -204,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 => {

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

@@ -151,7 +151,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = [{TaskId: row.TaskId}]
+        let params = [{taskId: row.TaskId}]
         deleteModelTask(params, res => {
           this.$message.success('删除成功')
           this.getTableData()
@@ -163,14 +163,14 @@ export default {
     //重新生成任务
     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 => {
@@ -181,11 +181,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
         }]
       }
       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
       })
     },

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