Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
0cb85ee6dd
|
@ -23,11 +23,31 @@
|
|||
>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<xtSelect
|
||||
:apiObj="apiObjEm"
|
||||
v-model="query.ep_belong"
|
||||
style="width: 150px"
|
||||
@change="handleQuery"
|
||||
placeholder="所属"
|
||||
>
|
||||
<el-table-column label="编号" prop="number"></el-table-column>
|
||||
<el-table-column label="名称" prop="name"></el-table-column>
|
||||
</xtSelect>
|
||||
<xtSelect
|
||||
:apiObj="apiObjEm"
|
||||
v-model="query.ep_monitored"
|
||||
style="width: 150px"
|
||||
@change="handleQuery"
|
||||
placeholder="所监测"
|
||||
>
|
||||
<el-table-column label="编号" prop="number"></el-table-column>
|
||||
<el-table-column label="名称" prop="name"></el-table-column>
|
||||
</xtSelect>
|
||||
<xtSelect
|
||||
:apiObj="apiObjM"
|
||||
:params="paramsM"
|
||||
v-model="query.material"
|
||||
style="width: 180px"
|
||||
style="width: 150px"
|
||||
@change="handleQuery"
|
||||
placeholder="计量物料"
|
||||
>
|
||||
|
@ -363,6 +383,7 @@ export default {
|
|||
paramsM: {},
|
||||
apiObj: this.$API.enm.mpoint.list,
|
||||
apiObjMplog: null,
|
||||
apiObjEm: this.$API.em.equipment.list,
|
||||
params: {},
|
||||
params1: {},
|
||||
query: {},
|
||||
|
|
|
@ -91,25 +91,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="所属设备">
|
||||
<el-select
|
||||
v-model="form.ep_belong"
|
||||
placeholder="所属设备"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
@clear="() => { form.ep_belong=null } "
|
||||
>
|
||||
<el-option
|
||||
v-for="item in epOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item
|
||||
label="所属工段"
|
||||
|
@ -220,17 +202,38 @@
|
|||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-divider />
|
||||
<el-divider/>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="所属设备">
|
||||
<el-select
|
||||
v-model="form.ep_belong"
|
||||
placeholder="所属设备"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
@clear="() => { form.ep_belong=null } "
|
||||
>
|
||||
<el-option
|
||||
v-for="item in epOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item
|
||||
label="是否表示运行状态"
|
||||
label="是否表示所属设备运行状态"
|
||||
label-width="220"
|
||||
>
|
||||
<el-switch
|
||||
v-model="form.is_rep_ep_running_state"
|
||||
v-model="form.is_rep_ep0_running_state"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-divider />
|
||||
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="所监测设备">
|
||||
<el-select
|
||||
|
@ -238,6 +241,7 @@
|
|||
placeholder="所监测设备"
|
||||
clearable
|
||||
filterable
|
||||
:value-on-clear="null"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
|
@ -249,7 +253,16 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item
|
||||
label="是否表示所监测设备运行状态"
|
||||
label-width="220"
|
||||
>
|
||||
<el-switch
|
||||
v-model="form.is_rep_ep_running_state"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="8" :sm="24">
|
||||
<el-form-item
|
||||
label="状态量基准值"
|
||||
|
@ -376,6 +389,7 @@ export default {
|
|||
interval: 10,
|
||||
func_on_change: "",
|
||||
is_rep_ep_running_state: false,
|
||||
is_rep_ep0_running_state: false
|
||||
},
|
||||
rules: {
|
||||
name: [{ required: true, message: "请输入测点名称" }],
|
||||
|
|
|
@ -136,16 +136,21 @@
|
|||
this.isSaveing = true;
|
||||
let res;
|
||||
if(this.type==='add'){
|
||||
res = this.$API.mtm.team.create.req(that.form);
|
||||
this.$API.mtm.team.create.req(that.form).then(res=>{
|
||||
this.isSaveing = false;
|
||||
this.limitedVisible = false;
|
||||
this.$refs.table.refresh();
|
||||
}).catch(e=>{
|
||||
this.isSaveing = false;
|
||||
})
|
||||
}else{
|
||||
res = this.$API.mtm.team.update.req(that.form.id,that.form);
|
||||
}
|
||||
if(res.err_msg){
|
||||
this.$message.error(res.err_msg);
|
||||
}else{
|
||||
this.isSaveing = false;
|
||||
this.limitedVisible = false;
|
||||
this.$refs.table.refresh();
|
||||
this.$API.mtm.team.update.req(that.form.id,that.form).then(res=>{
|
||||
this.isSaveing = false;
|
||||
this.limitedVisible = false;
|
||||
this.$refs.table.refresh();
|
||||
}).catch(e=>{
|
||||
this.isSaveing = false;
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
@ -154,7 +159,7 @@
|
|||
//编辑班组
|
||||
handleEdit(row){
|
||||
this.type='edit';
|
||||
this.form=row;
|
||||
this.form=Object.assign({},row);
|
||||
this.limitedVisible = true;
|
||||
},
|
||||
//删除班组
|
||||
|
|
Loading…
Reference in New Issue