|
@@ -6,6 +6,13 @@
|
|
|
<el-divider direction="vertical"></el-divider>
|
|
|
<div class="condition-list">
|
|
|
<floor-cascader :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>
|
|
|
+ <model-file ref="modelFile" @change="handleChangeModel"></model-file>
|
|
|
<my-cascader :isWidth="false" ref="cascader" @change="changeDevice"></my-cascader>
|
|
|
<assets-cascader :isWidth="false" ref="assets" @change="changeAssets"></assets-cascader>
|
|
|
</div>
|
|
@@ -14,7 +21,7 @@
|
|
|
<div class="tabel-box">
|
|
|
<model-table v-if="taskType == 'model'"></model-table>
|
|
|
<device-table v-else-if="taskType == 'device'"></device-table>
|
|
|
- <assets-device v-else-if="taskType == 'assets'"></assets-device>
|
|
|
+ <assets-table 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>
|
|
|
</div>
|
|
@@ -28,6 +35,7 @@ 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 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"
|
|
@@ -38,6 +46,7 @@ export default {
|
|
|
components: {
|
|
|
taskStatistics,
|
|
|
floorCascader,
|
|
|
+ modelFile,
|
|
|
myCascader,
|
|
|
assetsCascader,
|
|
|
modelTable,
|
|
@@ -64,6 +73,18 @@ export default {
|
|
|
{ value: "tear", label: '现场撕码任务' },
|
|
|
{ value: "replace", label: '现场换码任务' }
|
|
|
],
|
|
|
+ taskStateList: [{
|
|
|
+ value: 'wait',
|
|
|
+ label: '待验证'
|
|
|
+ }, {
|
|
|
+ value: 'already',
|
|
|
+ label: '已验证'
|
|
|
+ }, {
|
|
|
+ value: 'notFound',
|
|
|
+ label: '未找到'
|
|
|
+ }],
|
|
|
+ taskState: 'wait',//任务执行情况
|
|
|
+ modelValue: [],//模型文件
|
|
|
taskTypes: ['verification','model'],
|
|
|
addTaskDialog: false, //是否显示添加任务弹窗
|
|
|
}
|
|
@@ -73,6 +94,9 @@ export default {
|
|
|
handleChangeTask(val){
|
|
|
|
|
|
},
|
|
|
+ changeState() {
|
|
|
+
|
|
|
+ },
|
|
|
changeFloor(){
|
|
|
|
|
|
},
|
|
@@ -82,6 +106,9 @@ export default {
|
|
|
changeAssets(){
|
|
|
|
|
|
},
|
|
|
+ handleChangeModel() {
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
@@ -98,6 +125,14 @@ 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;
|