|
@@ -4,27 +4,41 @@
|
|
|
<el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
|
|
|
<el-table-column label="所属建筑楼层" show-overflow-tooltip min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
- <div>{{scope.row.build}}-{{scope.row.floor}}</div>
|
|
|
+ <div>
|
|
|
+ {{scope.row.Building?scope.row.Building.BuildLocalName?scope.row.Building.BuildLocalName:'':''}} -
|
|
|
+ {{scope.row.Floor?scope.row.Floor.FloorLocalName?scope.row.Floor.FloorLocalName:'':''}}
|
|
|
+ </div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- {{scope.row.EquipLocalName}}
|
|
|
- <el-badge :value="scope.row.partsNum" class="item" type="warning"></el-badge>
|
|
|
+ {{scope.row.LocalName}}
|
|
|
+ <el-badge v-if="scope.row.Equipment?scope.row.Equipment.Component?scope.row.Equipment.Component.length:false:false"
|
|
|
+ :value="scope.row.Equipment?scope.row.Equipment.Component?scope.row.Equipment.Component.length:0: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="100"></el-table-column>
|
|
|
- <el-table-column prop="CADID" label="安装位置" 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="Equipment.EquipCategory.EquipName" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div>
|
|
|
+ {{scope.row.Equipment?
|
|
|
+ scope.row.Equipment.EquipCategory?
|
|
|
+ scope.row.Equipment.EquipCategory.EquipName?
|
|
|
+ scope.row.Equipment.EquipCategory.EquipName:'':'':''}}
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="InstallLocation" label="安装位置" 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>
|
|
|
- <i v-if="scope.row.taskType == '未找到'" title="重新生成任务" class="iconfont icon-Update table-button" @click="handleRegenerate(scope.$index, scope.row)"></i>
|
|
|
- <i v-if="scope.row.taskType == '待验证'" title="删除任务" class="iconfont icon-delete table-button" @click="handleDelete(scope.$index, scope.row)"></i>
|
|
|
- <i v-if="scope.row.taskType == '未找到'" 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">
|
|
@@ -39,17 +53,18 @@
|
|
|
:page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page.total">
|
|
|
</el-pagination>
|
|
|
<el-drawer title="任务详情" :visible.sync="drawer" direction="rtl" size="600px">
|
|
|
- <span>我来啦!</span>
|
|
|
+ <device-detail :id="detailId"></device-detail>
|
|
|
</el-drawer>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { } from "@/api/scan/request";
|
|
|
-import { mapGetters } from "vuex";
|
|
|
+import { queryDeviceTask, deleteDeviceTask } from "@/api/data_admin/buildTaskApi"
|
|
|
+import { mapGetters } from "vuex"
|
|
|
+import deviceDetail from '../detail/deviceDetail'
|
|
|
export default {
|
|
|
components: {
|
|
|
-
|
|
|
+ deviceDetail
|
|
|
},
|
|
|
computed: {
|
|
|
...mapGetters("layout", ["projectId"])
|
|
@@ -62,24 +77,19 @@ export default {
|
|
|
inSpaceType: '设备',
|
|
|
loading: false, // loading
|
|
|
drawer: false, // 详情侧弹窗
|
|
|
+ detailId: '',
|
|
|
+ tableData: [], //列表数据
|
|
|
page: {
|
|
|
pageSize: 50,
|
|
|
pageSizes: [10, 20, 50, 100],
|
|
|
pageNumber: 1,
|
|
|
total: 0
|
|
|
},
|
|
|
- tableData: [{
|
|
|
- build: 'A栋',
|
|
|
- floor: '3F',
|
|
|
- EquipLocalName: '风机',
|
|
|
- partsNum: 8,
|
|
|
- EquipLocalID: 'AS123124343',
|
|
|
- EquipCategory: {
|
|
|
- EquipName: '风机'
|
|
|
- },
|
|
|
- CADID: '6486416846184879',
|
|
|
- taskType: '未找到'
|
|
|
- }], //列表数据
|
|
|
+ taskStateMap: {
|
|
|
+ '-1': '未找到',
|
|
|
+ '0': '已完成',
|
|
|
+ '1': '待验证'
|
|
|
+ },
|
|
|
headerStyle: {
|
|
|
backgroundColor: '#e1e4e5',
|
|
|
color: '#2b2b2b',
|
|
@@ -97,32 +107,41 @@ export default {
|
|
|
Filters: `ProjectId='${this.projectId}'`,
|
|
|
Cascade: [
|
|
|
{
|
|
|
- Name: 'equipmentList',
|
|
|
- Cascade: [{ Name: 'equipCategory' }]
|
|
|
+ Name: 'component'
|
|
|
+ }, {
|
|
|
+ Name: 'building',
|
|
|
+ }, {
|
|
|
+ Name: 'floor',
|
|
|
+ }, {
|
|
|
+ Name: 'equipCategory'
|
|
|
}
|
|
|
],
|
|
|
- Orders: "createTime desc, EquipID asc",
|
|
|
+ Orders: "CreateTime desc, TaskId asc",
|
|
|
PageNumber: this.page.pageNumber,
|
|
|
PageSize: this.page.pageSize
|
|
|
}
|
|
|
if (this.paramsData.buildfloor[0] == "noKnow") {
|
|
|
- param.Filters += `buildingId isNull`
|
|
|
+ params.Filters += `;BuildingId isNull`
|
|
|
} else if (this.paramsData.buildfloor[0] && this.paramsData.buildfloor[0] != "all") {
|
|
|
- param.Filters += `buildingId='${this.paramsData.buildfloor[0]}'`
|
|
|
+ params.Filters += `;BuildingId='${this.paramsData.buildfloor[0]}'`
|
|
|
if (this.paramsData.buildfloor[1] == "noKnow") {
|
|
|
- param.Filters += `;floorId isNull`
|
|
|
+ params.Filters += `;FloorId isNull`
|
|
|
} else if (this.paramsData.buildfloor[1] && this.paramsData.buildfloor[1] != "all") {
|
|
|
- param.Filters += `;floorId='${this.paramsData.buildfloor[1]}'`
|
|
|
+ params.Filters += `;FloorId='${this.paramsData.buildfloor[1]}'`
|
|
|
}
|
|
|
}
|
|
|
- if(this.paramsData.taskState){
|
|
|
- params.Filters += `;TaskState='${this.paramsData.taskState}'`
|
|
|
+ if(this.paramsData.taskState !== ''){
|
|
|
+ params.Filters += `;TaskState=${this.paramsData.taskState}`
|
|
|
}
|
|
|
- if(this.paramsData.family){
|
|
|
- params.Filters += `;Family='${this.paramsData.family}'`
|
|
|
+ if(this.paramsData.category){
|
|
|
+ params.Filters += `;Category='${this.paramsData.category}'`
|
|
|
}
|
|
|
- queryCenoteTableData(params, res => {
|
|
|
- this.tableData = res.Content[0].EquipmentList || []
|
|
|
+ queryDeviceTask(params, res => {
|
|
|
+ this.page.total = res.Total;
|
|
|
+ this.tableData = res.Content.map(item => {
|
|
|
+ item.TaskState = this.taskStateMap[item.TaskState]
|
|
|
+ return item
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
// 删除关系
|
|
@@ -132,25 +151,19 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- // let params = {
|
|
|
- // EquipId: row.EquipID,
|
|
|
- // ShaftId: this.params.ShaftID
|
|
|
- // }
|
|
|
- // this.deleteEqInSh(params);
|
|
|
+ let params = [{TaskId: row.TaskId}]
|
|
|
+ deleteDeviceTask(params, res => {
|
|
|
+ this.$message.success('删除成功')
|
|
|
+ this.getTableData()
|
|
|
+ })
|
|
|
}).catch(() => {
|
|
|
this.$message("取消删除")
|
|
|
})
|
|
|
},
|
|
|
- // 删除设备所在竖井关系
|
|
|
- deleteEqInSh(params) {
|
|
|
- // eqinshUnlink(params, res => {
|
|
|
- // this.$message.success('删除成功')
|
|
|
- // this.getTableData()
|
|
|
- // })
|
|
|
- },
|
|
|
//查看任务详情
|
|
|
- handleDetail() {
|
|
|
+ handleDetail(index, row) {
|
|
|
this.drawer = true
|
|
|
+ this.detailId = row.TaskId
|
|
|
},
|
|
|
// 改变pagesize
|
|
|
handleSizeChange(pageSize) {
|