同步设备后的刷新按钮
This commit is contained in:
parent
4f05f6f460
commit
50a17fbd1d
|
@ -120,6 +120,7 @@ export default {
|
||||||
async syncData() {
|
async syncData() {
|
||||||
this.syncLoading = true;
|
this.syncLoading = true;
|
||||||
var res = await this.$API.third.tdevice.speakerSync.req({});
|
var res = await this.$API.third.tdevice.speakerSync.req({});
|
||||||
|
this.$refs.table.refresh();
|
||||||
this.syncLoading = false;
|
this.syncLoading = false;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -165,6 +165,7 @@ export default {
|
||||||
async syncData() {
|
async syncData() {
|
||||||
this.syncLoading = true;
|
this.syncLoading = true;
|
||||||
var res = await this.$API.third.tdevice.vchannelSync.req({});
|
var res = await this.$API.third.tdevice.vchannelSync.req({});
|
||||||
|
this.$refs.table.refresh();
|
||||||
this.syncLoading = false;
|
this.syncLoading = false;
|
||||||
},
|
},
|
||||||
getEmployeeList() {
|
getEmployeeList() {
|
||||||
|
|
|
@ -163,6 +163,7 @@ export default {
|
||||||
async syncData() {
|
async syncData() {
|
||||||
this.syncLoading = true;
|
this.syncLoading = true;
|
||||||
var res = await this.$API.third.tdevice.dchannelSync.req({});
|
var res = await this.$API.third.tdevice.dchannelSync.req({});
|
||||||
|
this.$refs.table.refresh();
|
||||||
this.syncLoading = false;
|
this.syncLoading = false;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
<el-table-column label="所在区域" prop="my_info.area_name" min-width="80"></el-table-column>
|
<el-table-column label="所在区域" prop="my_info.area_name" min-width="80"></el-table-column>
|
||||||
<el-table-column label="所在位置" min-width="150">
|
<el-table-column label="所在位置" min-width="150">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<div v-if="scope.row.my_info.location.x">
|
<div v-if="scope.row.my_info.location">
|
||||||
<div>
|
<div>
|
||||||
x:{{ scope.row.my_info.location.x }}
|
x:{{ scope.row.my_info.location.x }}
|
||||||
</div>
|
</div>
|
||||||
|
@ -198,6 +198,7 @@ export default {
|
||||||
async syncData() {
|
async syncData() {
|
||||||
this.syncLoading = true;
|
this.syncLoading = true;
|
||||||
var res = await this.$API.third.tdevice.vchannelSync.req({});
|
var res = await this.$API.third.tdevice.vchannelSync.req({});
|
||||||
|
this.$refs.table.refresh();
|
||||||
this.syncLoading = false;
|
this.syncLoading = false;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -46,9 +46,9 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :md="12" :sm="24">
|
<el-col :md="12" :sm="24">
|
||||||
<el-form-item label="处理时间" prop="hanle_minute">
|
<el-form-item label="处理时间" prop="handle_minute">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-model="form.hanle_minute"
|
v-model="form.handle_minute"
|
||||||
:min="0"
|
:min="0"
|
||||||
:max="32767"
|
:max="32767"
|
||||||
placeholder="分钟"
|
placeholder="分钟"
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="处理时间"
|
label="处理时间"
|
||||||
prop="hanle_minute"
|
prop="handle_minute"
|
||||||
width="80"
|
width="80"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<el-table-column label="喇叭开启" prop="speaker_on" width="80">
|
<el-table-column label="喇叭开启" prop="speaker_on" width="80">
|
||||||
|
|
|
@ -54,11 +54,7 @@
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button link size="small" @click="handleEdit(scope.row)"
|
<el-button link size="small" @click="handleEdit(scope.row)"
|
||||||
>编辑</el-button>
|
>编辑</el-button>
|
||||||
<el-popconfirm title="确定删除吗?">
|
<el-button link size="small" @click="handleDelete(scope.row)">删除</el-button>
|
||||||
<template #reference>
|
|
||||||
<el-button link size="small">删除</el-button>
|
|
||||||
</template>
|
|
||||||
</el-popconfirm>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</scTable>
|
</scTable>
|
||||||
|
@ -581,6 +577,11 @@ export default {
|
||||||
this.dialogVisible = true;
|
this.dialogVisible = true;
|
||||||
this.addForm = Object.assign({}, row);
|
this.addForm = Object.assign({}, row);
|
||||||
},
|
},
|
||||||
|
handleDelete(row) {
|
||||||
|
this.$API.wf.state.delete.req(row.id).then(res=>{
|
||||||
|
this.getList()
|
||||||
|
})
|
||||||
|
},
|
||||||
async getList() {
|
async getList() {
|
||||||
let res = await this.$API.wf.workflow.states.req(this.id);
|
let res = await this.$API.wf.workflow.states.req(this.id);
|
||||||
console.log(res);
|
console.log(res);
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
<span v-if="oplDetail.operation">{{oplDetail.operation_.area_.name}}</span>
|
<span v-if="oplDetail.operation">{{oplDetail.operation_.area_.name}}</span>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="作业状态:">
|
<el-descriptions-item label="作业状态:">
|
||||||
<span v-if="oplDetail.operation">{{state_[oplDetail.operation_.state]}}</span>
|
<span v-if="oplDetail.operation">{{state2_[oplDetail.operation_.state]}}</span>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="生产状态:">
|
<el-descriptions-item label="生产状态:">
|
||||||
<span v-if="oplDetail.operation">{{oplDetail.operation_.state_work }}</span>
|
<span v-if="oplDetail.operation">{{oplDetail.operation_.state_work }}</span>
|
||||||
|
@ -267,6 +267,14 @@
|
||||||
30: "待入厂",
|
30: "待入厂",
|
||||||
40: "进行中",
|
40: "进行中",
|
||||||
50: "已完成",
|
50: "已完成",
|
||||||
|
60: "已关闭"
|
||||||
|
},
|
||||||
|
state2_: {
|
||||||
|
10: "创建中",
|
||||||
|
20: "审批中",
|
||||||
|
30: "待作业",
|
||||||
|
40: "作业中",
|
||||||
|
50: "已结束",
|
||||||
},
|
},
|
||||||
noteOption: [
|
noteOption: [
|
||||||
{id: 10, name: '作业正常结束'},
|
{id: 10, name: '作业正常结束'},
|
||||||
|
|
|
@ -191,6 +191,11 @@
|
||||||
this.dialogVisible = true;
|
this.dialogVisible = true;
|
||||||
this.addForm = Object.assign({}, row);
|
this.addForm = Object.assign({}, row);
|
||||||
},
|
},
|
||||||
|
handleDelete(row) {
|
||||||
|
this.$API.wf.transition.delete.req(row.id).then(res=>{
|
||||||
|
this.getList()
|
||||||
|
})
|
||||||
|
},
|
||||||
async getList() {
|
async getList() {
|
||||||
let res = await this.$API.wf.workflow.transitions.req(this.id);
|
let res = await this.$API.wf.workflow.transitions.req(this.id);
|
||||||
this.list = res;
|
this.list = res;
|
||||||
|
|
Loading…
Reference in New Issue