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

merge test

Browse Source
This commit is contained in:
朱菊兰 2023-12-05 14:40:02 +08:00
commit 0a53bcb57e
24 changed files with 9586 additions and 9029 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -48,7 +48,7 @@
"benz-amr-recorder": "^1.1.5", "benz-amr-recorder": "^1.1.5",
"bpmn-js-token-simulation": "0.10.0", "bpmn-js-token-simulation": "0.10.0",
"clipboard": "2.0.8", "clipboard": "2.0.8",
"code-brick-zj": "^1.0.2", "code-brick-zj": "^1.0.5",
"core-js": "^3.26.0", "core-js": "^3.26.0",
"crypto-js": "^4.0.0", "crypto-js": "^4.0.0",
"diagram-js": "^12.3.0", "diagram-js": "^12.3.0",

5
src/components/Editor/index.vue
View File

@ -125,11 +125,8 @@ export default {
// 取消自动聚焦 start // 取消自动聚焦 start
this.Quill?.enable(false); this.Quill?.enable(false);
this.$nextTick(() => { this.$nextTick(() => {
this.Quill?.enable(true);
this.Quill?.blur(); this.Quill?.blur();
// if (!this.readOnly) { this.Quill?.enable(true);
// this.Quill?.enable();
// }
}); });
// 如果设置了上传地址则自定义图片上传事件 // 如果设置了上传地址则自定义图片上传事件
if (this.type === 'url') { if (this.type === 'url') {

1
src/mixins/lb/basicPageMixin.js
View File

@ -78,7 +78,6 @@ export default {
return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload); return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
}, },
del(payload) { del(payload) {
debugger;
return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload); return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
}, },

3
src/views/base/coreEquipment/index.vue
View File

@ -248,6 +248,9 @@ export default {
label: '设备编码', label: '设备编码',
prop: 'code', prop: 'code',
url: '/base/core-equipment/getCode', url: '/base/core-equipment/getCode',
rules: [
{ required: true, message: '设备编码不能为空', trigger: 'blur' },
],
}, },
{ {
input: true, input: true,

14
src/views/equipment/analysis/Visualization/index.vue
View File

@ -27,20 +27,20 @@
<div class="legend"> <div class="legend">
<div class="legend-item"> <div class="legend-item">
<span class="icon blue"></span> <span class="icon blue"></span>
<span class="text">工作时长</span> <span class="text">有效时长</span>
</div> </div>
<div class="legend-item"> <div class="legend-item">
<span class="icon green"></span> <span class="icon green"></span>
<span class="text">停机时长</span> <span class="text">关机时长</span>
</div> </div>
<div class="legend-item"> <div class="legend-item">
<span class="icon purple"></span> <span class="icon purple"></span>
<span class="text">故障时长</span> <span class="text">中断时长</span>
</div> </div>
<div class="legend-item"> <!-- <div class="legend-item">
<span class="icon yellow"></span> <span class="icon yellow"></span>
<span class="text">速度开动率</span> <span class="text">速度开动率</span>
</div> </div> -->
</div> </div>
<div v-if="list.length" class="graph-grid"> <div v-if="list.length" class="graph-grid">
<div class="bg-grid grid-line"> <div class="bg-grid grid-line">
@ -389,14 +389,14 @@ export default {
position: relative; position: relative;
padding: 4px 0; padding: 4px 0;
padding-left: 12px; padding-left: 12px;
font-size: 14px; font-size: 18px;
&::before { &::before {
content: ''; content: '';
position: absolute; position: absolute;
left: 0; left: 0;
top: 6px; top: 6px;
height: 16px; height: 20px;
width: 4px; width: 4px;
border-radius: 1px; border-radius: 1px;
background: #0b58ff; background: #0b58ff;

15
src/views/equipment/analysis/efficiency/components/pieChart.vue
View File

@ -16,23 +16,22 @@
<div class="data-view__item"> <div class="data-view__item">
<!-- <div class="data-view__item__value">111</div> --> <!-- <div class="data-view__item__value">111</div> -->
<div class="data-view__item__value">{{ textData.workTime }}</div> <div class="data-view__item__value">{{ textData.workTime }}</div>
<div class="data-view__item__title blue">工作时长</div> <div class="data-view__item__title blue">有效时长</div>
</div> </div>
<div class="data-view__item"> <div class="data-view__item">
<!-- <div class="data-view__item__value">22</div> --> <!-- <div class="data-view__item__value">22</div> -->
<div class="data-view__item__value">{{ textData.stopTime }}</div> <div class="data-view__item__value">{{ textData.stopTime }}</div>
<div class="data-view__item__title green">停机时长</div> <div class="data-view__item__title green">关机时长</div>
</div> </div>
<div class="data-view__item"> <div class="data-view__item">
<!-- <div class="data-view__item__value">10</div> --> <!-- <div class="data-view__item__value">10</div> -->
<div class="data-view__item__value">{{ textData.downTime }}</div> <div class="data-view__item__value">{{ textData.downTime }}</div>
<div class="data-view__item__title purple">故障时长</div> <div class="data-view__item__title purple">中断时长</div>
</div> </div>
<div class="data-view__item"> <!-- <div class="data-view__item">
<!-- <div class="data-view__item__value">100%</div> -->
<div class="data-view__item__value">{{ textData.peEfficiency }}</div> <div class="data-view__item__value">{{ textData.peEfficiency }}</div>
<div class="data-view__item__title yellow">速度开动率</div> <div class="data-view__item__title yellow">速度开动率</div>
</div> </div> -->
</div> </div>
</div> </div>
</template> </template>
@ -93,7 +92,7 @@ export default {
// 外环 // 外环
name: '', name: '',
type: 'pie', type: 'pie',
radius: ['75%', '90%'], radius: ['60%', '90%'],
center: ['50%', '48%'], center: ['50%', '48%'],
label: { label: {
show: false, show: false,
@ -259,7 +258,7 @@ export default {
} }
.data-view__item__title { .data-view__item__title {
font-size: 8px; font-size: 14px;
line-height: 14px; line-height: 14px;
} }

42
src/views/equipment/analysis/efficiency/index.vue
View File

@ -19,6 +19,7 @@
:page="1" :page="1"
:limit="10" :limit="10"
:table-data="list" :table-data="list"
height="65vh"
@emitFun="handleEmitFun" /> @emitFun="handleEmitFun" />
<!-- <el-row> <!-- <el-row>
@ -122,23 +123,24 @@ export default {
// : undefined, // : undefined,
// ].filter((v) => v), // ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'factoryName', label: '工厂' }, { prop: 'factoryName', label: '工厂', showOverflowtooltip: true },
{ prop: 'lineName', label: '产线' }, { prop: 'lineName', label: '产线', showOverflowtooltip: true },
{ prop: 'sectionName', label: '工段' }, { prop: 'sectionName', label: '工段', showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备' }, { prop: 'equipmentName', label: '设备', showOverflowtooltip: true },
{ {
label: '有效时间', label: '有效时间',
children: [ children: [
{ {
width: 128, width: 128,
prop: 'workTime', prop: 'workTime',
label: '工作时长[h]', label: '工作时长(h)',
filter: (val) => (val != null ? +Number(val).toFixed(2) : '-'),
}, },
{ {
width: 128, width: 128,
prop: 'workRate', prop: 'workRate',
label: '百分比[%]', label: '百分比(%)',
filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), filter: (val) => (val != null ? +Number(val).toFixed(0) : '-'),
}, },
], ],
}, },
@ -148,9 +150,10 @@ export default {
{ {
width: 128, width: 128,
prop: 'stopTime', prop: 'stopTime',
label: '停机时长[h]', label: '停机时长(h)',
filter: (val) => (val != null ? +Number(val).toFixed(0) : '-'),
}, },
{ width: 128, prop: 'stopRate', label: '百分比[%]' }, { width: 128, prop: 'stopRate', label: '百分比(%)', filter: (val) => (val != null ? +Number(val).toFixed(0) : '-'), },
], ],
}, },
{ {
@ -159,48 +162,52 @@ export default {
{ {
width: 128, width: 128,
prop: 'downTime', prop: 'downTime',
label: '故障时长[h]', label: '故障时长(h)',
filter: (val) => (val != null ? +val.toFixed(3) : '-'), filter: (val) => (val != null ? +val.toFixed(2) : '-'),
}, },
{ width: 128, prop: 'downRate', label: '百分比[%]' }, { width: 128, prop: 'downRate', label: '百分比(%)', filter: (val) => (val != null ? +Number(val).toFixed(0) : '-'), },
{ {
width: 128, width: 128,
prop: 'timeEfficiency', prop: 'timeEfficiency',
label: '时间开动率', label: '时间开动率',
filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), filter: (val) => (val != null ? +Number(val).toFixed(2) : '-'),
}, },
], ],
}, },
{ {
label: '速度损失', label: '速度损失',
showOverflowtooltip: true,
children: [ children: [
{ {
width: 128, width: 128,
prop: 'realProcSpeed', prop: 'realProcSpeed',
label: '实际加工速度', label: '实际加工速度',
filter: (val) => (val != null ? +Number(val).toFixed(2) : '-'),
}, },
{ {
width: 128, width: 128,
prop: 'designProcSpeed', prop: 'designProcSpeed',
label: '理论加工速度', label: '理论加工速度',
showOverflowtooltip: true,
filter: (val) => (val != null ? +Number(val).toFixed(2) : '-'),
}, },
{ {
width: 128, width: 128,
prop: 'peEfficiency', prop: 'peEfficiency',
label: '速度开动率', label: '速度开动率',
filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), filter: (val) => (val != null ? +Number(val).toFixed(2) : '-'),
}, },
], ],
}, },
{ {
prop: 'oee', prop: 'oee',
label: 'OEE', label: 'OEE',
filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), filter: (val) => (val != null ? +Number(val).toFixed(2) : '-'),
}, },
{ {
prop: 'teep', prop: 'teep',
label: 'TEEP', label: 'TEEP',
filter: (val) => (val != null ? +Number(val).toFixed(3) : '-'), filter: (val) => (val != null ? +Number(val).toFixed(2) : '-'),
}, },
// { // {
// _action: 'view-trend', // _action: 'view-trend',
@ -433,6 +440,9 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.app-container {
overflow: inherit;
}
.visualization { .visualization {
display: grid; display: grid;
grid-template-columns: repeat(3, minmax(240px, 1fr)); grid-template-columns: repeat(3, minmax(240px, 1fr));

12
src/views/equipment/base/alarm/Record/index.vue
View File

@ -94,7 +94,7 @@ export default {
return { return {
readOnly: false, readOnly: false,
chosedLogId: false, chosedLogId: false,
searchBarKeys: ['equipmentName', 'recordTime'], searchBarKeys: ['equipmentName', 'createTime'],
tableBtn: [ tableBtn: [
// this.$auth.hasPermi('equipment:spare-parts-config:update') // this.$auth.hasPermi('equipment:spare-parts-config:update')
// ? { // ? {
@ -124,11 +124,11 @@ export default {
label: '报警级别', label: '报警级别',
filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL), filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
}, },
{ prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺 { prop: 'createTime', label: '报警时间', filter: timeFilter },
{ prop: 'alarmCode', label: '设备报警码' }, // 接口缺 { prop: 'alarmCode', label: '设备报警码' },
{ prop: 'alarmContent', label: '报警内容' }, { prop: 'alarmContent', label: '报警内容' },
{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn }, { prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // TODO: 是否换成按钮， 群里问 { prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
// { prop: 'remark', label: '备注' }, // { prop: 'remark', label: '备注' },
], ],
searchBarFormConfig: [ searchBarFormConfig: [
@ -145,8 +145,8 @@ export default {
dateType: 'daterange', // datetimerange dateType: 'daterange', // datetimerange
// format: 'yyyy-MM-dd HH:mm:ss', // format: 'yyyy-MM-dd HH:mm:ss',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
valueFormat: 'timestamp', // valueFormat: 'timestamp',
// valueFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-', rangeSeparator: '-',
startPlaceholder: '开始日期', startPlaceholder: '开始日期',
endPlaceholder: '结束日期', endPlaceholder: '结束日期',

8
src/views/equipment/base/inspection/Content/index.vue
View File

@ -84,10 +84,10 @@ export default {
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'program', label: '巡检项目' }, { prop: 'program', label: '巡检项目', showOverflowtooltip: true },
{ prop: 'content', label: '巡检内容' }, { prop: 'content', label: '巡检内容', minWidth: 150, showOverflowtooltip: true },
{ prop: 'code', label: '巡检内容编码' }, { prop: 'code', label: '巡检内容编码', showOverflowtooltip: true },
{ prop: 'remark', label: '备注' }, { prop: 'remark', label: '备注', showOverflowtooltip: true },
], ],
searchBarFormConfig: [ searchBarFormConfig: [
{ {

35
src/views/equipment/base/inspection/Record/addRecord.vue
View File

@ -12,7 +12,7 @@
:show-close="false" :show-close="false"
:wrapper-closable="isdetail" :wrapper-closable="isdetail"
class="drawer" class="drawer"
size="60%" size="55%"
@closed="$emit('destroy')"> @closed="$emit('destroy')">
<small-title slot="title" :no-padding="true"> <small-title slot="title" :no-padding="true">
{{ isdetail ? '查看详情' : !dataForm.id ? '新增' : '编辑' }} {{ isdetail ? '查看详情' : !dataForm.id ? '新增' : '编辑' }}
@ -24,7 +24,7 @@
label-width="100px" label-width="100px"
v-loading="formLoading"> v-loading="formLoading">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="8">
<el-form-item label="设备名称" prop="equipmentId"> <el-form-item label="设备名称" prop="equipmentId">
<el-select <el-select
v-model="dataForm.equipmentId" v-model="dataForm.equipmentId"
@ -41,7 +41,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<!-- <el-form-item label="物料名称" prop="name"> <!-- <el-form-item label="物料名称" prop="name">
<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入物料名称" /> <el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入物料名称" />
</el-form-item> --> </el-form-item> -->
@ -61,21 +61,19 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="设备编码" prop="equipmentCode"> <el-form-item label="设备编码" prop="equipmentCode">
<el-input v-model="dataForm.equipmentCode" disabled clearable placeholder="请输入设备编码" /> <el-input v-model="dataForm.equipmentCode" disabled clearable placeholder="请输入设备编码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> </el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="巡检人" prop="responsible"> <el-form-item label="巡检人" prop="responsible">
<el-input v-model="dataForm.responsible" :disabled="isdetail" clearable placeholder="请输入巡检人" /> <el-input v-model="dataForm.responsible" :disabled="isdetail" clearable placeholder="请输入巡检人" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="巡检时间" prop="actualTime"> <el-form-item label="巡检时间" prop="actualTime">
<el-date-picker <el-date-picker
v-model="dataForm.actualTime" v-model="dataForm.actualTime"
@ -86,7 +84,7 @@
placeholder="选择巡检时间" /> placeholder="选择巡检时间" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="数据来源" prop="origin"> <el-form-item label="数据来源" prop="origin">
<el-select <el-select
v-model="dataForm.origin" v-model="dataForm.origin"
@ -95,7 +93,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择数据来源"> placeholder="请选择数据来源">
<el-option key="1" label="手动" :value="1" /> <el-option key="1" label="手动" :value="1" />
<el-option key="2" label="自动" :value="2" /> <el-option key="2" label="PDA" :value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -108,7 +106,8 @@
:table-data="list" /> :table-data="list" />
</el-form-item> </el-form-item>
<el-form-item label="巡检详情" prop="description"> <el-form-item label="巡检详情" prop="description">
<editor v-model="dataForm.description" :read-only="isdetail" :min-height="150"/> <editor v-if="!isdetail" v-model="dataForm.description" :min-height="150"/>
<div v-else v-html="dataForm.description" style="padding: 5px; margin-left: 5px; border: 1px solid #dfdfdf" />
</el-form-item> </el-form-item>
<el-form-item label="附件"> <el-form-item label="附件">
<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="isdetail" @name="setFileName" /> <FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="isdetail" @name="setFileName" />
@ -117,7 +116,7 @@
</el-form> </el-form>
<div v-if="!isdetail" class="drawer-body__footer"> <div v-if="!isdetail" class="drawer-body__footer">
<el-button type="primary" @click="goback()">取消</el-button> <el-button @click="goback()">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button> <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
</div> </div>
</el-drawer> </el-drawer>
@ -185,7 +184,7 @@ export default {
actualTime: undefined, actualTime: undefined,
responsible: undefined, responsible: undefined,
description: undefined, description: undefined,
origin: undefined, origin: 1,
files: [] files: []
}, },
list: [], list: [],
@ -220,9 +219,12 @@ export default {
async setConfig() { async setConfig() {
const configres = await getcheckConfigByEqList({equipmentId: this.dataForm.equipmentId}) const configres = await getcheckConfigByEqList({equipmentId: this.dataForm.equipmentId})
this.configList = configres.data this.configList = configres.data
this.dataForm.configId = this.configList.filter(it => {
return it.id === this.dataForm.configId
})[0]?.id ?? undefined
this.dataForm.equipmentCode = this.eqList.filter(item => { this.dataForm.equipmentCode = this.eqList.filter(item => {
return item.id === this.dataForm.equipmentId return item.id === this.dataForm.equipmentId
})[0].code })[0]?.code ?? undefined
}, },
goback() { goback() {
this.$emit('refreshDataList'); this.$emit('refreshDataList');
@ -265,6 +267,7 @@ export default {
this.file = this.dataForm.files[0].fileUrl this.file = this.dataForm.files[0].fileUrl
this.fileName = this.dataForm.files[0].fileName this.fileName = this.dataForm.files[0].fileName
} }
this.dataForm.description = this.dataForm.description || '无'
this.setConfig() this.setConfig()
this.setInspectionContet() this.setInspectionContet()
}); });

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

@ -94,7 +94,7 @@ export default {
tableProps: [ tableProps: [
{ prop: 'configName', label: '配置名称' }, { prop: 'configName', label: '配置名称' },
{ prop: 'equipmentName', label: '设备名称' }, { prop: 'equipmentName', label: '设备名称' },
{ prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', '自动'][val] }, { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', 'PDA'][val] },
// { prop: 'sectionName', label: '计划巡检时间' }, // { prop: 'sectionName', label: '计划巡检时间' },
{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime }, { prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
// { prop: 'maintenanceDetail', label: '完成状态' }, // { prop: 'maintenanceDetail', label: '完成状态' },
@ -131,6 +131,15 @@ export default {
{ {
type: 'separate', type: 'separate',
}, },
{
type: this.$auth.hasPermi('equipment:check-record:export')
? 'button'
: '',
btnName: '导出',
name: 'export',
plain: true,
color: 'primary',
},
{ {
type: this.$auth.hasPermi('equipment:check-record:create') type: this.$auth.hasPermi('equipment:check-record:create')
? 'button' ? 'button'
@ -140,17 +149,6 @@ export default {
plain: true, plain: true,
color: 'success', color: 'success',
}, },
{
type: 'separate',
},
{
type: this.$auth.hasPermi('equipment:check-record:export')
? 'button'
: '',
btnName: '导出',
name: 'export',
color: 'warning',
},
], ],
rows: [ rows: [
[ [

10
src/views/equipment/base/inspection/Settings/add-or-updata.vue
View File

@ -2,14 +2,14 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2023-11-27 10:48:55 * @LastEditTime: 2023-12-01 11:02:43
* @Description: * @Description:
--> -->
<template> <template>
<el-drawer <el-drawer
:visible.sync="visible" :visible.sync="visible"
:show-close="false" :show-close="false"
:wrapper-closable="false" :wrapper-closable="true"
class="drawer" class="drawer"
size="50%"> size="50%">
<small-title slot="title" :no-padding="true"> <small-title slot="title" :no-padding="true">
@ -43,6 +43,8 @@
</el-form> </el-form>
</div> </div>
<el-divider />
<div class="attr-list"> <div class="attr-list">
<small-title <small-title
style="margin: 16px 0; padding-left: 8px" style="margin: 16px 0; padding-left: 8px"
@ -78,9 +80,9 @@
:page-sizes="[5, 10, 15]" :page-sizes="[5, 10, 15]"
@pagination="getList" /> @pagination="getList" />
<div class="drawer-body__footer"> <!-- <div class="drawer-body__footer">
<el-button type="primary" @click="goback()">关闭</el-button> <el-button type="primary" @click="goback()">关闭</el-button>
</div> </div> -->
</div> </div>
</div> </div>

4
src/views/equipment/base/inspection/Settings/attr-add.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<el-dialog <el-dialog
:visible.sync="visible" :visible.sync="visible"
:width="'35%'" :width="'30%'"
:append-to-body="true" :append-to-body="true"
:close-on-click-modal="false" :close-on-click-modal="false"
class="dialog"> class="dialog">
@ -17,7 +17,7 @@
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
:rules="dataRule" :rules="dataRule"
label-width="100px" label-width="60px"
@keyup.enter.native="dataFormSubmit()"> @keyup.enter.native="dataFormSubmit()">
<el-form-item label="巡检" prop="checkId"> <el-form-item label="巡检" prop="checkId">
<el-select v-model="dataForm.checkId" filterable placeholder="请选择巡检" style="width: 100%"> <el-select v-model="dataForm.checkId" filterable placeholder="请选择巡检" style="width: 100%">

25
src/views/equipment/base/inspection/Settings/index.vue
View File

@ -66,6 +66,13 @@ export default {
addOrEditTitle: '', addOrEditTitle: '',
searchBarKeys: ['equipmentId', 'name'], searchBarKeys: ['equipmentId', 'name'],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('equipment:check-setting:addInsp')
? {
type: 'add',
btnName: '添加',
showTip: '添加巡检'
}
: undefined,
this.$auth.hasPermi('equipment:check-setting:update') this.$auth.hasPermi('equipment:check-setting:update')
? { ? {
type: 'edit', type: 'edit',
@ -78,12 +85,6 @@ export default {
btnName: '查看详情', btnName: '查看详情',
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:check-setting:addInsp')
? {
type: 'add',
btnName: '添加巡检',
}
: undefined,
this.$auth.hasPermi('equipment:check-setting:delete') this.$auth.hasPermi('equipment:check-setting:delete')
? { ? {
type: 'delete', type: 'delete',
@ -92,12 +93,12 @@ export default {
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'name', label: '配置名' }, { prop: 'name', label: '配置名', width: 110, showOverflowtooltip: true },
{ prop: 'code', label: '编码' }, { prop: 'code', label: '编码', minWidth: 150, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线' }, { prop: 'lineName', label: '产线', showOverflowtooltip: true },
{ prop: 'sectionName', label: '工段' }, { prop: 'sectionName', label: '工段', showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备' }, { prop: 'equipmentName', label: '设备', showOverflowtooltip: true },
{ prop: 'equipmentCode', label: '设备编码' }, { prop: 'equipmentCode', label: '设备编码', minWidth: 150, showOverflowtooltip: true },
// { prop: 'responsible', label: '负责人' }, // { prop: 'responsible', label: '负责人' },
{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问 { prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
], ],

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

@ -183,7 +183,7 @@ export default {
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
plain: true, plain: true,
color: 'warning', color: 'primary',
}, },
], ],
// 是否显示弹出层 // 是否显示弹出层

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

@ -170,7 +170,7 @@ export default {
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
plain: true, plain: true,
color: 'warning', color: 'primary',
}, },
{ {
type: this.$auth.hasPermi('equipment:maintain-record:create') type: this.$auth.hasPermi('equipment:maintain-record:create')

6
src/views/equipment/base/repair/CustomDialogForm.vue
View File

@ -60,8 +60,9 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider style="margin-top: -10px" /> <el-divider />
<div v-if=" disabled && dataForm.maintenanceStatus === 1 ? true : !disabled ? true : false">
<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true"> <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
{{ '设备维修信息' }} {{ '设备维修信息' }}
</small-title> </small-title>
@ -164,6 +165,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div>
</el-form> </el-form>
<div v-if="!disabled" class="drawer-body__footer"> <div v-if="!disabled" class="drawer-body__footer">
@ -249,7 +251,7 @@ export default {
getEqRepair(this.dataForm.id).then(response => { getEqRepair(this.dataForm.id).then(response => {
this.formLoading = false this.formLoading = false
this.dataForm = response.data; this.dataForm = response.data;
this.dataForm.maintenanceStatus = row.maintenanceStatus || 0 this.dataForm.maintenanceStatus = this.dataForm.maintenanceStatus || 0
if (this.dataForm.files.length > 0) { if (this.dataForm.files.length > 0) {
this.file = this.dataForm.files[0].fileUrl this.file = this.dataForm.files[0].fileUrl
this.fileName = this.dataForm.files[0].fileName this.fileName = this.dataForm.files[0].fileName

35
src/views/equipment/base/repair/htmls.vue Normal file
View File

@ -0,0 +1,35 @@
<!--
* @Author: zhp
* @Date: 2023-11-08 14:00:52
* @LastEditTime: 2023-12-01 10:12:27
* @LastEditors: DY
* @Description:
-->
<template>
<div v-html="content" />
</template>
<script>
export default {
props: {
injectData: {
type: Object,
default: () => ({})
}
},
data() {
return {
content: ''
}
},
mounted() {
this.getContent()
},
methods: {
getContent() {
this.content = this.injectData[this.injectData.prop] ?? ''
}
}
}
</script>

17
src/views/equipment/base/repair/index.vue
View File

@ -59,6 +59,7 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
import CustomDialogForm from './CustomDialogForm.vue'; import CustomDialogForm from './CustomDialogForm.vue';
import { deleteRepair, exportRepairLogExcel } from '@/api/equipment/base/repair' import { deleteRepair, exportRepairLogExcel } from '@/api/equipment/base/repair'
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import htmls from './htmls.vue'
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
export default { export default {
@ -121,7 +122,7 @@ export default {
{ prop: 'lineName', label: '产线' }, { prop: 'lineName', label: '产线' },
{ prop: 'sectionName', label: '工段' }, { prop: 'sectionName', label: '工段' },
{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true }, { prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
{ prop: 'maintenanceDetail', label: '维修明细' }, { prop: 'maintenanceDetail', label: '维修明细', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true },
{ prop: 'repairman', label: '维修工', minWidth: 100, showOverflowtooltip: true }, { prop: 'repairman', label: '维修工', minWidth: 100, showOverflowtooltip: true },
{ prop: 'repairmanPhone', label: '联系方式', minWidth: 100, showOverflowtooltip: true }, { prop: 'repairmanPhone', label: '联系方式', minWidth: 100, showOverflowtooltip: true },
{ prop: 'remark', label: '备注', minWidth: 120, showOverflowtooltip: true }, { prop: 'remark', label: '备注', minWidth: 120, showOverflowtooltip: true },
@ -168,6 +169,13 @@ export default {
{ {
type: 'separate', type: 'separate',
}, },
{
type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
btnName: '导出',
name: 'export',
plain: true,
color: 'primary',
},
{ {
type: this.$auth.hasPermi('equipment:repair:create') ? 'button' : '', type: this.$auth.hasPermi('equipment:repair:create') ? 'button' : '',
btnName: '新增', btnName: '新增',
@ -175,13 +183,6 @@ export default {
plain: true, plain: true,
color: 'success', color: 'success',
}, },
{
type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
btnName: '导出',
name: 'export',
plain: true,
color: 'warning',
},
], ],
rows: [ rows: [
[ [

35
src/views/equipment/base/spareParts/Config/addSparts.vue
View File

@ -9,41 +9,47 @@
<el-drawer <el-drawer
:visible.sync="visible" :visible.sync="visible"
:show-close="false" :show-close="false"
:wrapper-closable="false" :wrapper-closable="disabled"
class="drawer" class="drawer"
size="60%"> size="60%"
@closed="$emit('destroy')">
<small-title slot="title" :no-padding="true"> <small-title slot="title" :no-padding="true">
{{ disabled ? '查看备件' : '添加备件' }} {{ disabled ? '查看备件' : '添加备件' }}
</small-title> </small-title>
<div class="content">
<el-form <el-form
ref="form" ref="form"
:model="dataForm" :model="dataForm"
label-width="100px" label-width="100px"
label-position="top"
v-loading="formLoading"> v-loading="formLoading">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="6">
<el-form-item label="配置名" prop="name"> <el-form-item label="配置名" prop="name">
<span>{{ dataForm.name }}</span> <span>{{ dataForm.name }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="6">
<el-form-item label="设备名称" prop="equipmentName"> <el-form-item label="设备名称" prop="equipmentName">
<span>{{ dataForm.equipmentName }}</span> <span>{{ dataForm.equipmentName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="6">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="负责人" prop="responsible"> <el-form-item label="负责人" prop="responsible">
<span>{{ dataForm.responsible }}</span> <span>{{ dataForm.responsible }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="描述" prop="faultTime"> <el-form-item label="描述" prop="description">
<editor v-model="dataForm.description" read-only :min-height="200"/> <div v-html="dataForm.description" style="padding: 5px; margin: 0; border: 1px solid #dfdfdf" />
<!-- <editor v-model="dataForm.description" read-only :min-height="200"/> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<div>
<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
{{ '备品备件' }}
</small-title>
<div v-if="!disabled" class="action_btn"> <div v-if="!disabled" class="action_btn">
<template> <template>
<span style="display: inline-block;" @click="addNew()"> <span style="display: inline-block;" @click="addNew()">
@ -72,10 +78,12 @@
:limit.sync="listQuery.pageSize" :limit.sync="listQuery.pageSize"
:page-sizes="[5, 10, 15]" :page-sizes="[5, 10, 15]"
@pagination="getList" /> @pagination="getList" />
</div>
<div class="drawer-body__footer"> <div v-if="!disabled" class="drawer-body__footer">
<el-button type="primary" @click="goback()">关闭</el-button> <el-button type="primary" @click="goback()">关闭</el-button>
</div> </div>
</div>
<attr-add <attr-add
v-if="addOrUpdateVisible" v-if="addOrUpdateVisible"
@ -255,10 +263,10 @@ export default {
padding: 18px; padding: 18px;
} }
.action_btn { .action_btn {
/* float: right; */ float: right;
display: flex; display: flex;
justify-content: right; justify-content: right;
margin: 5px 15px; margin: -35px 15px;
font-size: 14px; font-size: 14px;
} }
.add { .add {
@ -312,4 +320,7 @@ export default {
justify-content: flex-end; justify-content: flex-end;
padding: 18px; padding: 18px;
} }
.content {
padding: 0 20px;
}
</style> </style>

44
src/views/equipment/base/spareParts/Config/index.vue
View File

@ -17,7 +17,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
label="操作" label="操作"
:width="250" :width="180"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleTableBtnClick" /> @clickBtn="handleTableBtnClick" />
</base-table> </base-table>
@ -34,7 +34,7 @@
<base-dialog <base-dialog
:dialogTitle="title" :dialogTitle="title"
:dialogVisible="open" :dialogVisible="open"
width="35%" width="50%"
@close="cancel" @close="cancel"
@cancel="cancel" @cancel="cancel"
@confirm="submitForm"> @confirm="submitForm">
@ -44,12 +44,14 @@
v-model="form" v-model="form"
:disabled="mode == 'detail'" :disabled="mode == 'detail'"
:has-files="false" :has-files="false"
:rows="rows" /> :rows="rows"
style="margin: 0 30px" />
</base-dialog> </base-dialog>
<addSparts <addSparts
v-if="addOrUpdateVisible" v-if="addOrUpdateVisible"
ref="addOrUpdate" ref="addOrUpdate"
@refreshDataList="getList" /> @refreshDataList="getList"
@destroy="addOrUpdateVisible = false" />
</div> </div>
</template> </template>
@ -79,22 +81,24 @@ export default {
// btnName: '详情', // btnName: '详情',
// } // }
// : undefined, // : undefined,
this.$auth.hasPermi('equipment:spare-parts-config:update') this.$auth.hasPermi('equipment:spare-parts-config:addParts')
? { ? {
type: 'edit', type: 'addParts',
btnName: '修改', btnName: '添加',
showTip: '添加备件'
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:spare-parts-config:queryParts') this.$auth.hasPermi('equipment:spare-parts-config:queryParts')
? { ? {
type: 'queryParts', type: 'queryParts',
btnName: '查看备件', btnName: '查看',
showTip: '查看备件'
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:spare-parts-config:addParts') this.$auth.hasPermi('equipment:spare-parts-config:update')
? { ? {
type: 'addParts', type: 'edit',
btnName: '添加备件', btnName: '修改',
} }
: undefined, : undefined,
this.$auth.hasPermi('equipment:spare-parts-config:delete') this.$auth.hasPermi('equipment:spare-parts-config:delete')
@ -105,15 +109,15 @@ export default {
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'name', label: '配置名' }, { prop: 'name', label: '配置名', minWidth: 100, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线' }, { prop: 'lineName', label: '产线', minWidth: 100, showOverflowtooltip: true },
{ prop: 'sectionName', label: '工段' }, { prop: 'sectionName', label: '工段', minWidth: 100, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名' }, { prop: 'equipmentName', label: '设备名', minWidth: 120, showOverflowtooltip: true },
{ prop: 'equipmentCode', label: '设备编码' }, { prop: 'equipmentCode', label: '设备编码', minWidth: 100, showOverflowtooltip: true },
{ prop: 'responsible', label: '负责人' }, { prop: 'responsible', label: '负责人', minWidth: 150, showOverflowtooltip: true },
// { prop: 'unit', label: '单位', filter: publicFormatter('unit_dict') }, // { prop: 'unit', label: '单位', filter: publicFormatter('unit_dict') },
{ prop: 'description', label: '描述', subcomponent: htmls }, { prop: 'description', label: '描述', subcomponent: htmls, minWidth: 120, showOverflowtooltip: true },
{ prop: 'sparePartNumber', label: '备品备件数量' }, { prop: 'sparePartNumber', label: '备品备件数量', width: 130 },
// { prop: 'remark', label: '备注' }, // { prop: 'remark', label: '备注' },
], ],
searchBarFormConfig: [ searchBarFormConfig: [
@ -198,7 +202,7 @@ export default {
prop: 'description', // TODO: 富文本 prop: 'description', // TODO: 富文本
subcomponent: Editor, subcomponent: Editor,
bind: { bind: {
'min-height': 192 'min-height': 150
} }
}, },
], ],

24
src/views/equipment/base/spareParts/Monitor/addSparts.vue
View File

@ -9,34 +9,36 @@
<el-drawer <el-drawer
:visible.sync="visible" :visible.sync="visible"
:show-close="false" :show-close="false"
:wrapper-closable="false" :wrapper-closable="!isLog"
class="drawer" class="drawer"
size="60%"> size="60%">
<small-title slot="title" :no-padding="true"> <small-title slot="title" :no-padding="true">
{{ !isLog ? '操作页面' : '更换记录' }} {{ !isLog ? '操作页面' : '更换记录' }}
</small-title> </small-title>
<div class="content">
<el-form <el-form
ref="form" ref="form"
:model="dataForm" :model="dataForm"
label-width="100px" label-width="90px"
v-loading="formLoading"> v-loading="formLoading">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="!isLog" label="配置名" prop="name"> <el-form-item v-if="!isLog" label="配置名" prop="name">
<span>{{ dataForm.name }}</span> <span style="margin-left: 5px">{{ dataForm.name }}</span>
</el-form-item> </el-form-item>
<el-form-item v-else label="产线名称" prop="lineName"> <el-form-item v-else label="产线名称" prop="lineName">
<span>{{ dataForm.lineName }}</span> <span style="margin-left: 5px">{{ dataForm.lineName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设备名称" prop="equipmentName"> <el-form-item label="设备名称" prop="equipmentName">
<span>{{ dataForm.equipmentName }}</span> <span style="margin-left: 5px">{{ dataForm.equipmentName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="描述" prop="faultTime"> <el-form-item label="描述" prop="description">
<editor v-model="dataForm.description" read-only :min-height="200"/> <div v-html="dataForm.description" style="padding: 5px; margin-left: 5px; border: 1px solid #dfdfdf" />
<!-- <editor v-model="dataForm.description" :read-only="true" :min-height="200"/> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -82,8 +84,9 @@
:page-sizes="[5, 10, 15]" :page-sizes="[5, 10, 15]"
@pagination="getList1" /> @pagination="getList1" />
</div> </div>
</div>
<div class="drawer-body__footer"> <div v-if="isLog" class="drawer-body__footer">
<el-button type="primary" @click="goback()">关闭</el-button> <el-button type="primary" @click="goback()">关闭</el-button>
</div> </div>
@ -249,7 +252,7 @@ export default {
type: 'button', type: 'button',
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
color: 'warning', color: 'primary',
plain: true plain: true
}, },
], ],
@ -429,4 +432,7 @@ export default {
justify-content: flex-end; justify-content: flex-end;
padding: 18px; padding: 18px;
} }
.content {
padding: 0 20px;
}
</style> </style>

22
src/views/equipment/base/spareParts/Monitor/index.vue
View File

@ -74,8 +74,7 @@ const remainBox = {
value() { value() {
const temp = this.injectData[this.injectData.prop] || null; const temp = this.injectData[this.injectData.prop] || null;
if (temp) { if (temp) {
console.log('12', temp); return temp === 'Green' ? '未超期' : temp === 'Red' ? '已超期' : '即将超期';
return temp === 'Green' ? 'green' : 'red';
} }
return this.injectData[this.injectData.prop] || null; return this.injectData[this.injectData.prop] || null;
}, },
@ -83,7 +82,7 @@ const remainBox = {
if (this.value) { if (this.value) {
// const v = +this.value; // const v = +this.value;
// return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green'; // return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
return this.value; return this.value === '未超期' ? '#37D97F' : this.value === '已超期' ? '#FF5454' : '#FFD767';
} }
return 'unset'; return 'unset';
}, },
@ -95,9 +94,9 @@ const remainBox = {
this.color this.color
// this.color == 'Green' ? 'green' : this.color == 'Red' ? 'red' : 'yellow' // this.color == 'Green' ? 'green' : this.color == 'Red' ? 'red' : 'yellow'
}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${ }; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
this.color == 'red' || this.color == 'green' ? '#fff' : 'unset' '#fff'
}`}> }`}>
{this.injectData[this.injectData.prop] || ''} {this.value}
</div> </div>
); );
}, },
@ -155,18 +154,19 @@ export default {
// : undefined, // : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'name', label: '配置名' }, { prop: 'name', label: '配置名', showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名称' }, { prop: 'lineName', label: '产线名称', showOverflowtooltip: true },
{ prop: 'sectionName', label: '工段名' }, { prop: 'sectionName', label: '工段名', showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名称' }, { prop: 'equipmentName', label: '设备名称', showOverflowtooltip: true },
{ prop: 'responsible', label: '负责人' }, { prop: 'responsible', label: '负责人', minWidth: 130, showOverflowtooltip: true },
{ prop: 'color', label: '是否超期', subcomponent: remainBox }, { prop: 'color', label: '是否超期', subcomponent: remainBox },
{ prop: 'opt1', label: '备件更换', name: '操作', subcomponent: btn }, { prop: 'opt1', label: '备件更换', name: '操作', subcomponent: btn, width: 110 },
{ {
prop: 'opt2', prop: 'opt2',
label: '更换记录', label: '更换记录',
name: '更新记录', name: '更新记录',
subcomponent: btn, subcomponent: btn,
width: 110
}, // TODO: 是否换成按钮， 群里问 }, // TODO: 是否换成按钮， 群里问
// { prop: 'remark', label: '备注' }, // { prop: 'remark', label: '备注' },
], ],

17814
yarn.lock
View File

File diff suppressed because it is too large Load Diff