|
@@ -6,21 +6,17 @@
|
|
|
<el-divider direction="vertical"></el-divider>
|
|
|
<div class="condition-list">
|
|
|
<floor-cascader v-show="taskType == 'device' || taskType == 'assets'" :isWidth="false" @change="changeFloor"></floor-cascader>
|
|
|
- <div class="task-state" v-show="taskType == 'model' || taskType == 'device' || taskType == 'assets'">
|
|
|
- <span class="task-stete-title" style="margin-right: 12px;">任务执行情况</span>
|
|
|
- <el-select v-model="taskState" placeholder="请选择" filterable style="width:120px;" size="small" @change="changeState">
|
|
|
- <el-option v-for="item in taskStateList" :key="item.code" :label="item.label" :value="item.value"></el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
+ <task-state v-show="taskType == 'model' || taskType == 'device' || taskType == 'assets'" ref="taskState" @change="changeState"></task-state>
|
|
|
<model-file v-show="taskType == 'model'" ref="modelFile" @change="handleChangeModel"></model-file>
|
|
|
- <my-cascader v-show="taskType == 'model' || taskType == 'device'" :isWidth="false" ref="cascader" @change="changeDevice"></my-cascader>
|
|
|
- <assets-cascader v-show="taskType == 'assets'" :isWidth="false" ref="assets" @change="changeAssets"></assets-cascader>
|
|
|
+ <model-cascader v-show="taskType == 'model'" :isWidth="false" ref="modelCascader" @change="changeModelCascader"></model-cascader>
|
|
|
+ <device-cascader v-show="taskType == 'device'" :isWidth="false" ref="deviceCascader" @change="changeDeviceCascader"></device-cascader>
|
|
|
+ <assets-cascader v-show="taskType == 'assets'" :isWidth="false" ref="assets" @change="changeAssetsCascader"></assets-cascader>
|
|
|
</div>
|
|
|
<el-button class="add-task" @click="addTaskDialog = true">添加验证任务</el-button>
|
|
|
</div>
|
|
|
<div class="tabel-box">
|
|
|
- <model-table :paramsData="{taskState, modelFile, category}" v-if="taskType == 'model'"></model-table>
|
|
|
- <device-table :paramsData="{buildfloor, taskState, category}" v-else-if="taskType == 'device'"></device-table>
|
|
|
+ <model-table :paramsData="{taskState, modelFile, modelCategory}" v-if="taskType == 'model'"></model-table>
|
|
|
+ <device-table :paramsData="{buildfloor, taskState, deviceCategory}" v-else-if="taskType == 'device'"></device-table>
|
|
|
<assets-table :paramsData="{buildfloor, taskState, family}" v-else-if="taskType == 'assets'"></assets-table>
|
|
|
<tear-table v-else-if="taskType == 'tear'"></tear-table>
|
|
|
<replace-table v-else-if="taskType == 'replace'"></replace-table>
|
|
@@ -33,9 +29,13 @@
|
|
|
import { mapGetters } from "vuex"
|
|
|
import taskStatistics from '@/components/data_admin/buildTask/taskStatistics'
|
|
|
import floorCascader from "@/components/ledger/lib/floorCascader"
|
|
|
-import assetsCascader from "@/components/ledger/lib/assets"
|
|
|
-import myCascader from "@/components/ledger/lib/cascader"
|
|
|
-import modelFile from "@/components/ready/buildfloor/modelFile"
|
|
|
+
|
|
|
+import taskState from "@/components/data_admin/buildTask/lib/taskState"
|
|
|
+import modelFile from "@/components/data_admin/buildTask/lib/modelFile"
|
|
|
+import modelCascader from "@/components/data_admin/buildTask/lib/modelCascader"
|
|
|
+import deviceCascader from "@/components/data_admin/buildTask/lib/deviceCascader"
|
|
|
+import assetsCascader from "@/components/data_admin/buildTask/lib/assetsCascader"
|
|
|
+
|
|
|
import modelTable from "@/components/data_admin/buildTask/table/modelTable"
|
|
|
import deviceTable from "@/components/data_admin/buildTask/table/deviceTable"
|
|
|
import assetsTable from "@/components/data_admin/buildTask/table/assetsTable"
|
|
@@ -44,10 +44,12 @@ import replaceTable from "@/components/data_admin/buildTask/table/replaceTable"
|
|
|
import addTask from "@/components/data_admin/buildTask/dialog/addTaskDialog"
|
|
|
export default {
|
|
|
components: {
|
|
|
+ taskState,
|
|
|
+ modelCascader,
|
|
|
taskStatistics,
|
|
|
floorCascader,
|
|
|
modelFile,
|
|
|
- myCascader,
|
|
|
+ deviceCascader,
|
|
|
assetsCascader,
|
|
|
modelTable,
|
|
|
deviceTable,
|
|
@@ -88,7 +90,8 @@ export default {
|
|
|
}],
|
|
|
taskState: '',//任务执行情况
|
|
|
modelFile: '',//模型文件
|
|
|
- category: '',//设备类型
|
|
|
+ modelCategory: '',//模型-设备类型
|
|
|
+ deviceCategory: '',//设备-设备类型
|
|
|
family: '',//设备族
|
|
|
buildfloor: ['all'],//建筑楼层
|
|
|
taskTypes: ['verification','model'],
|
|
@@ -113,11 +116,14 @@ export default {
|
|
|
changeFloor(val){//修改建筑楼层
|
|
|
this.buildfloor = val
|
|
|
},
|
|
|
- changeDevice(val){//修改设备类型
|
|
|
- this.category = val.code
|
|
|
+ changeModelCascader(val){//修改模型-设备类型
|
|
|
+ this.modelCategory = val.Code
|
|
|
+ },
|
|
|
+ changeDeviceCascader(val){//修改设备-设备类型
|
|
|
+ this.deviceCategory = val.Code
|
|
|
},
|
|
|
- changeAssets(val){//修改设备族
|
|
|
- this.family = val.code
|
|
|
+ changeAssetsCascader(val){//修改设备族
|
|
|
+ this.family = val.Code
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -135,14 +141,6 @@ export default {
|
|
|
display: inline-block;
|
|
|
vertical-align: middle;
|
|
|
line-height: 32px;
|
|
|
- .task-state{
|
|
|
- float: left;
|
|
|
- margin-left: 10px;
|
|
|
- .task-stete-title{
|
|
|
- color: #999999;
|
|
|
- font-size: 14px;
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
.add-task{
|
|
|
position: absolute;
|