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

feat: 设备管理添加一些字段及部分调整

This commit is contained in:
caoqianming 2024-04-23 13:43:16 +08:00
parent 841f2a27f8
commit 4cc204c594
5 changed files with 222 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/api/model/em.js
View File

@ -2,6 +2,49 @@ import config from "@/config"
import http from "@/utils/request"
/*EM接口*/
export default {
// 设备分类
ecate: {
list: {
name: "列表",
req: async function(data){
return await http.get(
`${config.API_URL}/em/ecate/`,
data
);
}
},
item: {
name: "获取详情",
req: async function(id){
return await http.get(
`${config.API_URL}/em/ecate/${id}/`
);
}
},
update: {
name: "更新",
req: async function(id, data){
return await http.put(
`${config.API_URL}/em/ecate/${id}/`,
data);
}
},
create: {
name: "创建",
req: async function(data){
return await http.post(
`${config.API_URL}/em/ecate/`,
data);
}
},
delete: {
name: "删除",
req: async function(id){
return await http.delete(
`${config.API_URL}/em/ecate/${id}/`);
}
},
},
// 设备
equipment: {
count_running_state: {

12
src/views/em/equipment.vue
View File

@ -11,7 +11,7 @@
</div>
<div class="right-panel">
<el-cascader v-model="query.belong_dept" :options="group" :props="groupsProps" clearable placeholder="所在车间"
:show-all-levels="false">
:show-all-levels="false" @change="handleQuery">
</el-cascader>
<!-- <el-select v-model="query.state" placeholder="设备状态" clearable>
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
@ -25,7 +25,7 @@
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" @selection-change="selectionChange">
<el-table-column type="selection" width="50" />
<el-table-column type="index" width="50" />
<el-table-column label="设备名称" prop="name" show-overflow-tooltip>
<el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column label="设备编号" prop="number">
</el-table-column>
@ -53,6 +53,12 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="运行状态">
<template #default="scope">
<el-tag :type="runningStateEnum[scope.row.running_state]?.type">{{
runningStateEnum[scope.row.running_state]?.text }}</el-tag>
</template>
</el-table-column>
<el-table-column label="所在车间" show-overflow-tooltip>
<template #default="scope">{{ scope.row.belong_dept_name }}</template>
</el-table-column>
@ -191,6 +197,7 @@
</el-dialog>
</template>
<script>
import { runningStateEnum } from "@/utils/enum.js";
import checkDialog from "./equipment_check.vue";
import saveDialog from "./equipment_form.vue";
import { genTree } from "@/utils/verificate";
@ -202,6 +209,7 @@ export default {
},
data() {
return {
runningStateEnum,
deptOptions: [],
dialog: {
save: false,

58
src/views/em/equipment_form.vue
View File

@ -12,14 +12,6 @@
</el-cascader>
</el-form-item>
</el-col>
<!-- <el-col :md="12" :sm="24">
<el-form-item label="所属部门">
<el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%"
@change="deptChange">
<el-option v-for="item in group" :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="所属工段">
<el-select v-model="form.mgroup" placeholder="所属工段" clearable style="width: 100%">
@ -38,14 +30,14 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="型号规格">
<el-input v-model="form.model" placeholder="规格型号规格" />
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="生产厂">
<el-input v-model="form.factory" placeholder="生产厂" />
</el-form-item>
<el-form-item
label="是否工段核心设备"
label-width="160"
>
<el-switch
v-model="form.is_core_for_mgroup"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="状态">
@ -55,8 +47,24 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-divider/>
<el-col :md="12" :sm="24">
<el-form-item label="设备分类">
<el-select v-model="form.cate" placeholder="所属大类" clearable style="width: 100%">
<el-option v-for="item in cateOptions" :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="型号规格">
<el-input v-model="form.model" placeholder="规格型号规格" />
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="生产厂">
<el-input v-model="form.factory" placeholder="生产厂" />
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="生产日期">
<el-date-picker v-model="form.production_date" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
@ -104,14 +112,15 @@
</el-form-item>
</el-col>
</el-row>
<el-divider/>
<el-row>
<el-col>
<el-form-item label="技术参数">
<el-button @click="addJsonItem">添加</el-button>
<el-button @click="addJsonItem" type="primary" size="small">添加</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row v-for="(item, $index) in parameter_json" :key="item">
<el-row v-for="(item, $index) in parameter_json" :key="item" :gutter="4">
<el-col :span="11">
<el-form-item label="参数名">
<el-input v-model="item.key" placeholder="参数名" />
@ -123,7 +132,7 @@
</el-form-item>
</el-col>
<el-col :span="2">
<el-button @click="delJsonItem($index)">删除</el-button>
<el-button @click="delJsonItem($index)" type="danger" size="small">删除</el-button>
</el-col>
</el-row>
</el-form>
@ -231,6 +240,7 @@ export default {
emits: ["success", "closed"],
data() {
return {
cateOptions:[],
loading: false,
mode: "add",
titleMap: {
@ -284,8 +294,14 @@ export default {
mounted() {
this.getGroup();
this.getBaseInfo();
this.getCateOptions();
},
methods: {
getCateOptions() {
this.$API.em.ecate.list.req({page:0}).then(res => {
this.cateOptions = res
})
},
getBaseInfo() {
this.baseInfo = this.$TOOL.data.get('BASE_INFO').base
console.log(this.baseInfo)

81
src/views/em/equipmentjc.vue
View File

@ -3,19 +3,29 @@
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
<el-button type="primary" @click="echeckrecord" v-auth="'echeckrecord.create'">批量巡检</el-button>
<!-- <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;"
@change="handleQuery">
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> -->
</div>
<div class="right-panel">
<el-cascader v-model="query.belong_dept" :options="group" :props="groupsProps" clearable placeholder="所在车间"
:show-all-levels="false">
:show-all-levels="false" @change="handleQuery">
</el-cascader>
<!-- <el-select v-model="query.state" placeholder="设备状态" clearable>
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
@change="handleQuery"></el-option>
</el-select> -->
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" @selection-change="selectionChange">
<el-table-column type="selection" width="50" />
<el-table-column type="index" width="50" />
<el-table-column label="设备名称" prop="name" show-overflow-tooltip>
<el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column label="设备编号" prop="number">
</el-table-column>
@ -43,6 +53,12 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="运行状态">
<template #default="scope">
<el-tag :type="runningStateEnum[scope.row.running_state]?.type">{{
runningStateEnum[scope.row.running_state]?.text }}</el-tag>
</template>
</el-table-column>
<el-table-column label="所在车间" show-overflow-tooltip>
<template #default="scope">{{ scope.row.belong_dept_name }}</template>
</el-table-column>
@ -78,6 +94,8 @@
</el-container>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
@closed="dialog.save = false"></save-dialog>
<check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
@closed="dialog.save = false"></check-dialog>
<el-drawer title="巡检记录" v-model="visibleRecord" :size="1000" destroy-on-close @closed="visibleRecord = false">
<el-container v-loading="loading">
<el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment'"
@ -141,6 +159,21 @@
<ehsUserSelect :multiple="false" @submit="getReceptionist" />
</span>
</el-form-item>
<!-- <el-form-item label="巡检人" prop="inspect_user">
<el-select
v-model="form.inspect_user"
placeholder="巡检人"
clearable
style="width:100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> -->
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="巡检结果" prop="result">
@ -164,28 +197,33 @@
</el-dialog>
</template>
<script>
import { runningStateEnum } from "@/utils/enum.js";
import checkDialog from "./equipment_check.vue";
import saveDialog from "./equipment_form.vue";
import { genTree } from "@/utils/verificate";
export default {
name: "治理设备",
name: "生产设备",
components: {
saveDialog,
checkDialog
},
data() {
return {
runningStateEnum,
deptOptions: [],
dialog: {
save: false,
check: false,
},
apiObj: this.$API.em.equipment.list,
paramsEquipment: { type: 30 },
query: { type: 30 },
paramsEquipment: { type: 40 },
query: { type: 40 },
apiObj2: this.$API.em.einspect.list,
query2: {
equipment: ''
},
group: [],
selection: [],
selectiones: [],
state_: {
10: '完好',
20: '限用',
@ -205,12 +243,12 @@ export default {
// { label: '禁用', value: 40 },
// ],
results_: {
'pass': '合格',
'fail': '不合格',
'pass': '正常',
'fail': '异常',
},
options: [
{ id: 'pass', name: '合格' },
{ id: 'fail', name: '不合格' }
{ id: 'pass', name: '正常' },
{ id: 'fail', name: '异常' }
],
form: {},
rules: {
@ -227,6 +265,20 @@ export default {
this.getDept()
},
methods: {
//表格选择后回调事件
selectionChange(selection) {
this.selectiones = selection;
},
echeckrecord() {
if (this.selectiones.length > 0) {
this.dialog.check = true;
this.$nextTick(() => {
this.$refs.checkDialog.open();
});
} else {
this.$message.warning("请选择要巡检的设备");
}
},
getDept() {
let that = this;
that.$API.system.dept.list.req({ page: 0 }).then(res => {
@ -242,21 +294,21 @@ export default {
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add", 10);
this.$refs.saveDialog.open("add", 40);
});
},
//编辑
table_edit(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit", 10).setData(row);
this.$refs.saveDialog.open("edit", 40).setData(row);
});
},
//查看
table_show(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("show", 10).setData(row);
this.$refs.saveDialog.open("show", 40).setData(row);
});
},
table_record(row) {
@ -309,6 +361,7 @@ export default {
this.$refs.table.refresh();
}
},
handleCheckSuccess() { },
handleQuery() {
this.$refs.table.queryData(this.query)
},

77
src/views/em/equipmentzl.vue
View File

@ -3,19 +3,29 @@
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
<el-button type="primary" @click="echeckrecord" v-auth="'echeckrecord.create'">批量巡检</el-button>
<!-- <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;"
@change="handleQuery">
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> -->
</div>
<div class="right-panel">
<el-cascader v-model="query.belong_dept" :options="group" :props="groupsProps" clearable placeholder="所在车间"
:show-all-levels="false">
:show-all-levels="false" @change="handleQuery">
</el-cascader>
<!-- <el-select v-model="query.state" placeholder="设备状态" clearable>
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
@change="handleQuery"></el-option>
</el-select> -->
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" @selection-change="selectionChange">
<el-table-column type="selection" width="50" />
<el-table-column type="index" width="50" />
<el-table-column label="设备名称" prop="name" show-overflow-tooltip>
<el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column label="设备编号" prop="number">
</el-table-column>
@ -43,6 +53,12 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="运行状态">
<template #default="scope">
<el-tag :type="runningStateEnum[scope.row.running_state]?.type">{{
runningStateEnum[scope.row.running_state]?.text }}</el-tag>
</template>
</el-table-column>
<el-table-column label="所在车间" show-overflow-tooltip>
<template #default="scope">{{ scope.row.belong_dept_name }}</template>
</el-table-column>
@ -78,6 +94,8 @@
</el-container>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
@closed="dialog.save = false"></save-dialog>
<check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
@closed="dialog.save = false"></check-dialog>
<el-drawer title="巡检记录" v-model="visibleRecord" :size="1000" destroy-on-close @closed="visibleRecord = false">
<el-container v-loading="loading">
<el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment'"
@ -141,6 +159,21 @@
<ehsUserSelect :multiple="false" @submit="getReceptionist" />
</span>
</el-form-item>
<!-- <el-form-item label="巡检人" prop="inspect_user">
<el-select
v-model="form.inspect_user"
placeholder="巡检人"
clearable
style="width:100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> -->
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="巡检结果" prop="result">
@ -164,18 +197,23 @@
</el-dialog>
</template>
<script>
import { runningStateEnum } from "@/utils/enum.js";
import checkDialog from "./equipment_check.vue";
import saveDialog from "./equipment_form.vue";
import { genTree } from "@/utils/verificate";
export default {
name: "rparty",
name: "生产设备",
components: {
saveDialog,
checkDialog
},
data() {
return {
runningStateEnum,
deptOptions: [],
dialog: {
save: false,
check: false,
},
apiObj: this.$API.em.equipment.list,
paramsEquipment: { type: 30 },
@ -185,7 +223,7 @@ export default {
equipment: ''
},
group: [],
selection: [],
selectiones: [],
state_: {
10: '完好',
20: '限用',
@ -205,12 +243,12 @@ export default {
// { label: '禁用', value: 40 },
// ],
results_: {
'pass': '合格',
'fail': '不合格',
'pass': '正常',
'fail': '异常',
},
options: [
{ id: 'pass', name: '合格' },
{ id: 'fail', name: '不合格' }
{ id: 'pass', name: '正常' },
{ id: 'fail', name: '异常' }
],
form: {},
rules: {
@ -227,6 +265,20 @@ export default {
this.getDept()
},
methods: {
//表格选择后回调事件
selectionChange(selection) {
this.selectiones = selection;
},
echeckrecord() {
if (this.selectiones.length > 0) {
this.dialog.check = true;
this.$nextTick(() => {
this.$refs.checkDialog.open();
});
} else {
this.$message.warning("请选择要巡检的设备");
}
},
getDept() {
let that = this;
that.$API.system.dept.list.req({ page: 0 }).then(res => {
@ -242,21 +294,21 @@ export default {
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add", 10);
this.$refs.saveDialog.open("add", 30);
});
},
//编辑
table_edit(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit", 10).setData(row);
this.$refs.saveDialog.open("edit", 30).setData(row);
});
},
//查看
table_show(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("show", 10).setData(row);
this.$refs.saveDialog.open("show", 30).setData(row);
});
},
table_record(row) {
@ -309,6 +361,7 @@ export default {
this.$refs.table.refresh();
}
},
handleCheckSuccess() { },
handleQuery() {
this.$refs.table.queryData(this.query)
},