zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
shijing 2024-12-12 13:44:33 +08:00
parent 256e2b5009 5d94b20320
commit 0cb85ee6dd
3 changed files with 74 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/em/mpoint.vue
View File

@ -23,11 +23,31 @@
> >
</div> </div>
<div class="right-panel"> <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 <xtSelect
:apiObj="apiObjM" :apiObj="apiObjM"
:params="paramsM" :params="paramsM"
v-model="query.material" v-model="query.material"
style="width: 180px" style="width: 150px"
@change="handleQuery" @change="handleQuery"
placeholder="计量物料" placeholder="计量物料"
> >
@ -363,6 +383,7 @@ export default {
paramsM: {}, paramsM: {},
apiObj: this.$API.enm.mpoint.list, apiObj: this.$API.enm.mpoint.list,
apiObjMplog: null, apiObjMplog: null,
apiObjEm: this.$API.em.equipment.list,
params: {}, params: {},
params1: {}, params1: {},
query: {}, query: {},

60
src/views/em/mpoint_form.vue
View File

@ -91,25 +91,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </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-col :md="12" :sm="24">
<el-form-item <el-form-item
label="所属工段" label="所属工段"
@ -220,17 +202,38 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </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-col :md="12" :sm="24">
<el-form-item <el-form-item
label="是否表示运行状态" label="是否表示所属设备运行状态"
label-width="220" label-width="220"
> >
<el-switch <el-switch
v-model="form.is_rep_ep_running_state" v-model="form.is_rep_ep0_running_state"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-divider />
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="所监测设备"> <el-form-item label="所监测设备">
<el-select <el-select
@ -238,6 +241,7 @@
placeholder="所监测设备" placeholder="所监测设备"
clearable clearable
filterable filterable
:value-on-clear="null"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
@ -249,7 +253,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </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-col :md="8" :sm="24">
<el-form-item <el-form-item
label="状态量基准值" label="状态量基准值"
@ -376,6 +389,7 @@ export default {
interval: 10, interval: 10,
func_on_change: "", func_on_change: "",
is_rep_ep_running_state: false, is_rep_ep_running_state: false,
is_rep_ep0_running_state: false
}, },
rules: { rules: {
name: [{ required: true, message: "请输入测点名称" }], name: [{ required: true, message: "请输入测点名称" }],

25
src/views/enm_base/team.vue
View File

@ -136,16 +136,21 @@
this.isSaveing = true; this.isSaveing = true;
let res; let res;
if(this.type==='add'){ 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{ }else{
res = this.$API.mtm.team.update.req(that.form.id,that.form); this.$API.mtm.team.update.req(that.form.id,that.form).then(res=>{
} this.isSaveing = false;
if(res.err_msg){ this.limitedVisible = false;
this.$message.error(res.err_msg); this.$refs.table.refresh();
}else{ }).catch(e=>{
this.isSaveing = false; this.isSaveing = false;
this.limitedVisible = false; })
this.$refs.table.refresh();
} }
} }
}) })
@ -154,7 +159,7 @@
//编辑班组 //编辑班组
handleEdit(row){ handleEdit(row){
this.type='edit'; this.type='edit';
this.form=row; this.form=Object.assign({},row);
this.limitedVisible = true; this.limitedVisible = true;
}, },
//删除班组 //删除班组