zhangyu před 5 roky
rodič
revize
9623cc4ad1

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

@@ -47,8 +47,9 @@
 </template>
 
 <script>
-import { queryEquip } from "@/api/scan/request";
-import { mapGetters } from "vuex";
+import { queryEquip } from "@/api/scan/request"
+import { createModelTask } from "@/api/data_admin/buildTaskApi"
+import { mapGetters } from "vuex"
 export default {
   components: {
     
@@ -110,7 +111,7 @@ export default {
         PageNumber: this.page.pageNumber,
         PageSize: this.page.pageSize
       }
-      debugger
+
       if(this.params.spaceList && this.params.spaceList.length){
         //通过平面图区域查询(接口未支持)
       } else {
@@ -141,7 +142,9 @@ export default {
             })
           }
           item.FolderName = this.params.modelFolderName
+          item.FolderId = this.params.modelFolderId
           item.FileName = this.params.modelFileName
+          item.FileId = this.params.CurrentModelId
           item.SchemeId = "1"
           return item
         })
@@ -154,16 +157,25 @@ export default {
     },
     savaRelation() {
       if(this.selections.length){
+        let list = this.selections.map((item) => {
+          return {
+            EquipID: item.EquipID,
+            FileId: item.FileId,
+            FileName: item.FileName,
+            FolderId: item.FolderId,
+            FolderName: item.FolderName
+          }
+        })
         let params = {
-          
+          Content: list
         }
-        // linkSySh(params, res => {
+        createModelTask(params, res => {
           this.$emit('update:dialogVisible',false)
           this.$message.success('创建成功!')
           this.$router.push({name:'buildTask'})//跳转回首页
-        // })
+        })
       }else {
-        this.$message('请选择要创建的设备!')
+        this.$message('请选择要创建的任务!')
       }
     },
     //改变pagesize

+ 27 - 1
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { queryAssetsTask, deleteAssetsTask } from "@/api/data_admin/buildTaskApi"
+import { queryAssetsTask, deleteAssetsTask, createAssetsTask, updateAssetsTask } from "@/api/data_admin/buildTaskApi"
 import { mapGetters } from "vuex"
 import assetsDetail from '../detail/assetsDetail'
 export default {
@@ -140,6 +140,32 @@ export default {
         this.$message("取消删除")
       })
     },
+    //重新生成任务
+    handleRegenerate(index, row){
+      let params = {
+        Content: [{
+          EquipId: row.EquipId,
+          TaskState: -1
+        }]
+      }
+      createAssetsTask(params, res => {
+        this.$message.success('重新生成任务成功!')
+        this.getTableData()
+      })
+    },
+    //认可此任务执行情况
+    handleConfirm(index, row){
+      let params = {
+        Content: [{
+          EquipId: row.EquipId,
+          TaskState: 0
+        }]
+      }
+      updateAssetsTask(params, res => {
+        this.$message.success('更新成功!')
+        this.getTableData()
+      })
+    },
     //查看任务详情
     handleDetail(row) {
       this.drawer = true

+ 27 - 1
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import { queryDeviceTask, deleteDeviceTask } from "@/api/data_admin/buildTaskApi"
+import { queryDeviceTask, deleteDeviceTask, createDeviceTask, updateDeviceTask } from "@/api/data_admin/buildTaskApi"
 import { mapGetters } from "vuex"
 import deviceDetail from '../detail/deviceDetail'
 export default {
@@ -168,6 +168,32 @@ export default {
         this.$message("取消删除")
       })
     },
+    //重新生成任务
+    handleRegenerate(index, row){
+      let params = {
+        Content: [{
+          EquipId: row.EquipId,
+          TaskState: -1
+        }]
+      }
+      createDeviceTask(params, res => {
+        this.$message.success('重新生成任务成功!')
+        this.getTableData()
+      })
+    },
+    //认可此任务执行情况
+    handleConfirm(index, row){
+      let params = {
+        Content: [{
+          EquipId: row.EquipId,
+          TaskState: 0
+        }]
+      }
+      updateDeviceTask(params, res => {
+        this.$message.success('更新成功!')
+        this.getTableData()
+      })
+    },
     //查看任务详情
     handleDetail(index, row) {
       this.drawer = true

+ 31 - 1
src/components/data_admin/buildTask/table/modelTable.vue

@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import { queryModelTask, deleteModelTask } from "@/api/data_admin/buildTaskApi"
+import { queryModelTask, deleteModelTask, updateModelTask, createModelTask } from "@/api/data_admin/buildTaskApi"
 import { mapGetters } from "vuex"
 import deviceDetail from '../detail/deviceDetail'
 export default {
@@ -151,6 +151,36 @@ export default {
         this.$message("取消删除")
       })
     },
+    //重新生成任务
+    handleRegenerate(index, row){
+      let params = {
+        Content: [{
+          EquipId: row.EquipId,
+          FileId: row.FileId,
+          FileName: row.FileName,
+          FolderId: row.FolderId,
+          FolderName: row.FolderName,
+          TaskState: -1
+        }]
+      }
+      createModelTask(params, res => {
+        this.$message.success('重新生成任务成功!')
+        this.getTableData()
+      })
+    },
+    //认可此任务执行情况
+    handleConfirm(index, row){
+      let params = {
+        Content: [{
+          EquipId: row.EquipId,
+          TaskState: 0
+        }]
+      }
+      updateModelTask(params, res => {
+        this.$message.success('更新成功!')
+        this.getTableData()
+      })
+    },
     //查看任务详情
     handleDetail(index, row) {
       this.drawer = true

+ 11 - 14
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -57,7 +57,8 @@ import { mapGetters } from "vuex"
 import floorCascader from "@/components/ledger/lib/floorCascader"
 import myCascader from "@/components/ledger/lib/assets"
 //api
-import { queryPartsDie, createPropertys, queryProperty } from "@/api/scan/request";
+import { queryProperty } from "@/api/scan/request"
+import { createAssetsTask } from "@/api/data_admin/buildTaskApi"
 export default {
   data() {
     return {
@@ -93,7 +94,11 @@ export default {
     this.getTableData()
   },
   watch: {
-    projectId() {}
+    projectId() {
+      this.page.pageNumber = 1
+      this.multipleSelection = []
+      this.getTableData()
+    }
   },
   methods: {
     //返回
@@ -196,25 +201,17 @@ export default {
       this.page.pageNumber = val
       this.getTableData()
     },
-    //查看详情
-    handleOpenDetail(row) {
-      // window.open(`http://adm.sagacloud.cn:8058/spread?id=${row.EquipID}&pid=${this.projectId}&secret=${this.secret}`,"_blank")
-      this.$message("开发中...")
-    },
     //创建已选
     handleClickCreate() {
       let list = this.multipleSelection.map((item) => {
-        return item.EquipID
+        return {EquipID: item.EquipID}
       })
       let param = {
-        Filters: `EquipID in ${JSON.stringify(list)}`
+        Content: list
       }
-      createPropertys(param, res => {
+      createAssetsTask(param, res => {
         this.$message.success("创建成功!")
-        this.$router.push({
-          name: "propertyLedger",
-          params: { Family: this.params.Family }
-        })
+        this.$router.push({ name: "buildTask" })
       })
     }
   }

+ 6 - 8
src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -73,7 +73,8 @@ import { mapGetters } from "vuex"
 import floorCascader from "@/components/ledger/lib/floorCascader"
 import myCascader from "@/components/ledger/lib/cascader"
 //api
-import { queryPartsDie, createPropertys, queryEquip } from "@/api/scan/request";
+import { queryEquip } from "@/api/scan/request"
+import { createDeviceTask } from "@/api/data_admin/buildTaskApi"
 export default {
   data() {
     return {
@@ -248,17 +249,14 @@ export default {
     //创建已选
     handleClickCreate() {
       let list = this.multipleSelection.map((item) => {
-        return item.EquipID
+        return {EquipID: item.EquipID}
       })
       let param = {
-        Filters: `EquipID in ${JSON.stringify(list)}`
+        Content: list
       }
-      createPropertys(param, res => {
+      createDeviceTask(param, res => {
         this.$message.success("创建成功!")
-        this.$router.push({
-          name: "propertyLedger",
-          params: { Family: this.params.Family }
-        })
+        this.$router.push({ name: "buildTask" })
       })
     }
   }

+ 5 - 0
src/views/data_admin/buildTask/addTask/addModelTask.vue

@@ -44,6 +44,7 @@ export default {
     return {
       dialogVisible: false,//是否显示弹窗
       modelFolderName: '',//模型文件夹名字
+      modelFolderId: '',//模型文件夹的id
       modelFileName: '',//模型文件名字
       modelFileList: [],
       CurrentModelId: '',//模型文件id
@@ -93,7 +94,10 @@ export default {
       this.modelFileList = []
       this.CurrentModelId = ''
       this.modelFolderName = ''
+      this.modelFolderId = ''
+      this.modelFileName = ''
       this.spaceList = []
+      this.dialogVisible = false
       this.$refs.drawModel.clearGraphy()
     },
     handleChangeModelFile(file){//切换模型文件
@@ -102,6 +106,7 @@ export default {
         return item
       })
       this.CurrentModelId = file.CurrentModelId
+      this.modelFolderId = file.FolderId
       this.modelFileName = file.FloorName
     },
     changeDevice(val){//切换设备类别