mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

bug --

Browse Source
This commit is contained in:
helloDy
2024-03-14 20:19:42 +08:00
parent 149ec4c844
commit 67948c10cb
20 changed files with 299 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue
View File

@@ -28,7 +28,7 @@
<el-form-item
label="报警级别"
prop="grade"
:rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
:rules="[{ required: false, message: '报警级别不能为空', trigger: 'blur' }]">
<el-select
:disabled="disabled"
v-model="dataForm.grade"

109
src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue
View File

@@ -7,10 +7,11 @@
<template>
<el-drawer
:visible="visible"
:visible.sync="visible"
:show-close="false"
:wrapper-closable="false"
:wrapper-closable="true"
class="drawer"
:before-close="beforeClose"
custom-class="mes-drawer"
:size="size || '50%'"
@closed="$emit('destroy')">
@@ -43,7 +44,51 @@
:rows="formRows" /> -->
<!-- <el-row v-if="mode.includes('detail')" style="margin-bottom: 24px"> -->
<el-row style="margin-bottom: 24px">
<el-form
ref="form"
:model="dataForm"
label-width="100px"
v-loading="formLoading">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item
label="设备"
prop="equipmentId"
:rules="[{ required: true, message: '设备不能为空', trigger: 'change' }]">
<el-select
:disabled="isdetail"
v-model="dataForm.equipmentId"
placeholder="请选择设备"
@change="$emit('update', dataForm)">
<el-option
v-for="opt in equipmentList"
:key="opt.id"
:label="opt.name"
:value="opt.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="报警分组"
prop="groupId"
:rules="[{ required: true, message: '报警分组不能为空', trigger: 'change' }]">
<el-select
:disabled="isdetail"
v-model="dataForm.groupId"
placeholder="请选择报警分组"
@change="$emit('update', dataForm)">
<el-option
v-for="opt in grouList"
:key="opt.id"
:label="opt.name"
:value="opt.id" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- <el-row style="margin-bottom: 24px">
<el-col :span="8">
<div
class="title"
@@ -62,7 +107,7 @@
{{ form.code }}
</div>
</el-col>
</el-row>
</el-row> -->
<!-- <el-row v-else style="margin-bottom: 24px" :gutter="20">
<el-form ref="form" :model="form">
<el-col :span="8">
@@ -128,12 +173,11 @@
</section>
</div>
<div class="drawer-body__footer">
<div v-if="!mode.includes('detail')" class="drawer-body__footer">
<el-button style="" @click="handleCancel">取消</el-button>
<el-button
type="primary"
v-if="!mode.includes('detail')"
@click="handleCancel">
@click="handleSave">
确定
</el-button>
</div>
@@ -163,6 +207,8 @@
<script>
import BaseInfoForm from '@/components/DialogForm';
import DialogForm from './dialogForm';
import { getEquipmentList, getgroupAllList } from '@/api/equipment/base/config/config'
import { updateEquipmentBindGroup } from '@/api/base/equipmentBindGroup';
const SmallTitle = {
name: 'SmallTitle',
@@ -191,16 +237,21 @@ const SmallTitle = {
export default {
components: { SmallTitle, DialogForm, BaseInfoForm },
props: ['sections', 'defaultMode', 'dataId', 'size'], // dataId 作为一个通用的存放id的字段
props: ['sections', 'defaultMode', 'dataId', 'size', 'equipmentId', 'id'], // dataId 作为一个通用的存放id的字段
data() {
return {
mode: '',
visible: false,
showForm: false,
isdetail: false,
formLoading: false,
grouList: [],
equipmentList: [],
total: 0,
form: {},
list: [],
attrTitle: '',
dataForm: {},
attrForm: {
id: null,
equipmentGroupId: '',
@@ -325,6 +376,34 @@ export default {
}
},
methods: {
// handleSave() {
// updateEquipmentBindGroup(this.form).then((response) => {
// this.$modal.msgSuccess('修改成功');
// this.open = false;
// this.getList();
// });
// },
async getDict() {
const res = await getEquipmentList({
pageNo: 1,
pageSize: 100,
special: false
})
this.equipmentList = res.data.list
const groupRes = await getgroupAllList()
this.grouList = groupRes.data
},
beforeClose(done) {
if (this.mode.includes('edit')) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => {});
} else {
done()
}
},
handleTableBtnClick({ type, data }) {
switch (type) {
case 'edit':
@@ -342,6 +421,16 @@ export default {
init() {
this.visible = true;
// 设备分组传值
// this.dataForm = {
// equipmentId: this.equipmentId,
// groupId: this.dataId
// }
this.getDict()
this.$set(this.dataForm, 'equipmentId', this.equipmentId)
this.$set(this.dataForm, 'groupId', this.dataId)
this.$set(this.dataForm, 'id', this.id)
this.isdetail = this.mode === 'detail' ? true : false
},
async getAttrList() {
@@ -360,9 +449,9 @@ export default {
if (valid) {
const isEdit = !this.mode.includes('detail');
await this.$axios({
url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
url: '/base/equipment-bind-group/update',
method: isEdit ? 'put' : 'post',
data: this.form,
data: this.dataForm,
});
this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
this.visible = false;

8
src/views/equipment/base/config/BindGroup/index.vue
View File

@@ -48,6 +48,8 @@
size="45%"
:default-mode="editMode"
:data-id="alarmForm.id"
:equipment-id="equipmentId"
:id="id"
:sections="[
{
name: '基本信息',
@@ -220,7 +222,7 @@ export default {
{
select: true,
label: '设备',
url: '/base/core-equipment/page?pageNo=1&pageSize=100',
url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
prop: 'equipmentId',
bind: {
filterable: true,
@@ -266,6 +268,8 @@ export default {
equipmentGroupCode: undefined,
equipmentGroupName: undefined,
},
equipmentId: undefined,
id: undefined,
editVisible: false,
editMode: '',
drawerBaseInfoRows: [
@@ -440,6 +444,8 @@ export default {
this.alarmForm.id = groupId;
this.alarmForm.equipmentGroupCode = groupCode;
this.alarmForm.equipmentGroupName = groupName;
this.equipmentId = equipmentId;
this.id = id;
this.editVisible = true;
this.$nextTick(() => {
this.$refs['drawer'].init();

7
src/views/equipment/base/config/DataCollection/CollectionConfig.vue
View File

@@ -379,7 +379,7 @@ export default {
});
this.searchBarFormConfig[1].selectOptions = plcList.map((item) => {
return {
name: item.name,
name: item.code,
id: item.id,
};
});
@@ -463,7 +463,8 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = '添加设备与实时采集关系表（一对多）';
this.title = '添加设备采集配置';
this.$refs.addOrUpdate.init()
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -472,7 +473,7 @@ export default {
getEquipmentPlcConnect(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = '修改设备与实时采集关系表（一对多）';
this.title = '修改设备采集配置';
});
},
/** 提交按钮 */

35
src/views/equipment/base/config/DataCollection/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-02-22 10:08:13
* @LastEditTime: 2024-03-13 16:47:02
* @Description:
-->
<template>
@@ -39,9 +39,9 @@
<script>
import basicAdd from '../../../../core/mixins/basic-add';
import { createCorePL, updateCorePL, getCorePL, getCode, getCorePLList } from "@/api/base/coreProductionLine";
import { createCorePL, updateCorePL, getCorePL, getCode } from "@/api/base/coreProductionLine";
import { createEquipmentPlcConnect, updateEquipmentPlcConnect } from '@/api/base/equipmentPlcConnect';
import { getplcAllList, listByParentId } from "@/api/equipment/base/config/config";
import { getplcAllList, getTree } from "@/api/equipment/base/config/config";
export default {
mixins: [basicAdd],
@@ -95,22 +95,29 @@ export default {
this.getDict()
},
methods: {
init() {
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
})
},
async getDict() {
// 关联表名列表
const res = await getplcAllList();
this.plcList = res.data;
// 产线列表
const res1 = await getCorePLList();
// 树形结构
const res1 = await getTree();
this.plLineList = res1.data;
this.plLineList.forEach(item => {
listByParentId({ id: item.id }).then(resp => {
if (resp.data.length > 0) {
// item.children = resp.data
this.$set(item, 'children', resp.data)
// this.$forceUpdate()
}
})
})
// const res1 = await getCorePLList();
// this.plLineList = res1.data;
// this.plLineList.forEach(item => {
// listByParentId({ id: item.id }).then(resp => {
// if (resp.data.length > 0) {
// // item.children = resp.data
// this.$set(item, 'children', resp.data)
// // this.$forceUpdate()
// }
// })
// })
},
// 表单提交
dataFormSubmit() {

22
src/views/equipment/base/inspection/Record/index.vue
View File

@@ -98,12 +98,12 @@ export default {
addContent: false,
searchBarKeys: ['name', 'actualCheckTime'],
tableBtn: [
// this.$auth.hasPermi('equipment:check-record:detail')
// ? {
// type: 'detail',
// btnName: '详情',
// }
// : undefined,
this.$auth.hasPermi('equipment:check-record:detail')
? {
type: 'detail',
btnName: '详情',
}
: undefined,
// this.$auth.hasPermi('equipment:check-record:update')
// ? {
// type: 'edit',
@@ -122,7 +122,7 @@ export default {
{ prop: 'department', label: '部门' },
{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
{ prop: 'groupClass', label: '班次' },
{ prop: 'opt', label: '巡检内容', name: '详情', subcomponent: btn },
// { prop: 'opt', label: '巡检内容', name: '详情', subcomponent: btn },
{ prop: 'remark', label: '备注' }
// { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', 'PDA'][val] },
// { prop: 'sectionName', label: '计划巡检时间' },
@@ -416,10 +416,14 @@ export default {
.catch(() => {});
},
handleDetail({ id }) {
this.addOrUpdateVisible = true
this.addContent = true;
this.$nextTick(() => {
this.$refs.addOrUpdate.init(id, true);
this.$refs.addContent.init(id, true);
});
// this.addOrUpdateVisible = true
// this.$nextTick(() => {
// this.$refs.addOrUpdate.init(id, true);
// });
},
/** 导出按钮操作 */
handleExport() {

55
src/views/equipment/base/maintain/Monitor/index.vue
View File

@@ -73,7 +73,7 @@ const remainBox = {
color() {
if (this.value) {
const v = +this.value;
return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
return v <= 1 ? 'red' : v > 1 && v <= 2 ? 'yellow' : 'green';
}
return 'unset';
},
@@ -84,9 +84,10 @@ const remainBox = {
style={`background: ${
this.color
}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
this.color == 'red' ? '#fff' : 'unset'
// this.color == 'red' ? '#fff' : 'unset'
'#fff'
}`}>
{this.injectData[this.injectData.prop] || ''}
{this.injectData[this.injectData.prop]?.toFixed(0) || ''}
</div>
);
},
@@ -128,22 +129,26 @@ export default {
// width: 180,
// filter: parseTime(createTime),
// },
{ prop: 'code', label: '保养计划单号' },
{ prop: 'name', label: '保养计划名称' },
{ prop: 'departmentName', label: '部门' },
{ prop: 'lineName', label: '产线名' },
{ prop: 'code', label: '保养计划单号', minWidth: 118, showOverflowtooltip: true },
{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
{
prop: 'lastPlanMaintainTime',
label: '上次计划保养时间',
filter: parseTime,
minWidth: 160,
showOverflowtooltip: true
},
{
prop: 'lastMaintainTime',
label: '上次实际保养时间',
filter: parseTime,
minWidth: 160,
showOverflowtooltip: true
},
{ prop: 'nextPlanMaintainTime', label: '下次计划保养时间', filter: parseTime },
{ prop: 'maintainer', label: '计划保养人员' },
{ prop: 'nextPlanMaintainTime', label: '下次计划保养时间', filter: parseTime, minWidth: 160, showOverflowtooltip: true },
{ prop: 'maintainer', label: '计划保养人员', minWidth: 160, showOverflowtooltip: true },
// { prop: 'equipmentName', label: '设备名称' },
// { prop: 'equipmentCode', label: '设备编码' },
// { prop: 'maintenancePeriod', label: '保养频率' },
@@ -153,11 +158,12 @@ export default {
// filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
// },
// { prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn },
{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn, width: 100 },
{
prop: 'remainDays',
label: '距离下次保养剩余时间(天)',
subcomponent: remainBox,
minWidth: 210,
}
],
searchBarFormConfig: [
@@ -232,23 +238,24 @@ export default {
.catch(() => { });
},
initSearchBar() {
this.http('/base/core-equipment/page', 'get', {
special: false,
pageNo: 1,
pageSize: 99
}).then(({ data }) => {
this.$set(
this.searchBarFormConfig[1],
'selectOptions',
(data?.list || []).map((item) => ({
name: item.name,
id: item.id,
}))
);
});
// this.http('/base/core-equipment/page', 'get', {
// special: false,
// pageNo: 1,
// pageSize: 99
// }).then(({ data }) => {
// this.$set(
// this.searchBarFormConfig[1],
// 'selectOptions',
// (data?.list || []).map((item) => ({
// name: item.name,
// id: item.id,
// }))
// );
// });
this.http('/base/equipment-maintain-plan/page', 'get', {
pageNo: 1,
pageSize: 100,
special: false
}).then(({ data }) => {
this.$set(
this.searchBarFormConfig[0],

4
src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-02-28 19:52:13
* @LastEditTime: 2024-03-13 15:55:36
* @Description:
-->
<template>
@@ -67,7 +67,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="确认时限(h)" prop="confirmTimeLimit">
<el-input-number v-model="dataForm.confirmTimeLimit" :min="0" controls-position="right" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入单位平方数" />
<el-input-number v-model="dataForm.confirmTimeLimit" :min="0" controls-position="right" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入确认时限" />
</el-form-item>
</el-col>
</el-row>

39
src/views/equipment/base/maintain/Record/index.vue
View File

@@ -64,6 +64,7 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
import Editor from '@/components/Editor';
import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
import AddContent from './addContent.vue';
import { parseTime } from '../../../../core/mixins/code-filter';
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@@ -174,6 +175,7 @@ export default {
endPlaceholder: '结束日期',
defaultTime: ['00:00:00', '23:59:59'],
param: 'startTime',
defaultSelect: []
// width: 350,
},
// {
@@ -349,23 +351,28 @@ export default {
};
},
created() {
let end = moment().format('YYYY-MM-DD 08:00:00')
const current = new Date()
let start = parseTime(new Date(current.getFullYear(), current.getMonth(), current.getDate() - 3, 8, 0, 0))
this.searchBarFormConfig[1].defaultSelect = [start, end]
this.queryParams.startTime = [start, end]
this.initSearchBar();
if (this.$route.query) {
// this.queryParams.equipmentId =
// this.$route.query?.equipmentId ?? undefined;
this.queryParams.maintainPlanId =
this.$route.query?.maintainPlanId ?? undefined;
// this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
// this.searchBarFormConfig[0].defaultSelect =
// this.$route.query.equipmentId ?? undefined;
this.searchBarFormConfig[0].defaultSelect =
this.$route.query.maintainPlanId ?? undefined;
this.searchBarFormConfig[1].defaultSelect =
this.$route.query?.createTime ?? undefined;
// this.searchBarFormConfig[3].defaultSelect =
// Number(this.$route.query.relatePlan) ?? undefined;
}
// if (this.$route.query) {
// // this.queryParams.equipmentId =
// // this.$route.query?.equipmentId ?? undefined;
// this.queryParams.maintainPlanId =
// this.$route.query?.maintainPlanId ?? undefined;
// // this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
// this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
// // this.searchBarFormConfig[0].defaultSelect =
// // this.$route.query.equipmentId ?? undefined;
// this.searchBarFormConfig[0].defaultSelect =
// this.$route.query.maintainPlanId ?? undefined;
// this.searchBarFormConfig[1].defaultSelect =
// this.$route.query?.createTime ?? undefined;
// // this.searchBarFormConfig[3].defaultSelect =
// // Number(this.$route.query.relatePlan) ?? undefined;
// }
this.getList();
if (this.$route.query.addRecord) {
this.handleAdd()