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

projects/mesxc-zhp #161

Closed
zhp wants to merge 119 commits from projects/mesxc-zhp into projects/mes-test
pull from: projects/mesxc-zhp
merge into: mt-fe-group:projects/mes-test
Conversation 0 Commits 119 Files Changed 261 +9447 -8942
12 changed files with 9447 additions and 8942 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8e7e31f918 - Show all commits

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);
}, },

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: [
{ {

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

@ -60,110 +60,112 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider style="margin-top: -10px" /> <el-divider />
<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true"> <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> {{ '设备维修信息' }}
<el-row :gutter="20"> </small-title>
<el-col :span="6"> <el-row :gutter="20">
<el-form-item <el-col :span="6">
label="维修开始时间" <el-form-item
prop="maintenanceStartTime" label="维修开始时间"
:rules="[{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]"> prop="maintenanceStartTime"
<el-date-picker :rules="[{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]">
v-model="dataForm.maintenanceStartTime" <el-date-picker
type="datetime" v-model="dataForm.maintenanceStartTime"
:disabled="disabled" type="datetime"
placeholder="请选择维修开始时间" :disabled="disabled"
value-format="timestamp" /> placeholder="请选择维修开始时间"
</el-form-item> value-format="timestamp" />
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item <el-col :span="6">
label="维修结束时间" <el-form-item
prop="maintenanceFinishTime" label="维修结束时间"
:rules="[{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]"> prop="maintenanceFinishTime"
<el-date-picker :rules="[{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]">
v-model="dataForm.maintenanceFinishTime" <el-date-picker
type="datetime" v-model="dataForm.maintenanceFinishTime"
:disabled="disabled" type="datetime"
placeholder="请选择维修开始时间" :disabled="disabled"
value-format="timestamp" /> placeholder="请选择维修开始时间"
</el-form-item> value-format="timestamp" />
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item <el-col :span="6">
label="维修方式" <el-form-item
prop="repairMode" label="维修方式"
:rules="[{ required: true, message: '维修方式不能为空', trigger: 'blur' }]"> prop="repairMode"
<el-select :rules="[{ required: true, message: '维修方式不能为空', trigger: 'blur' }]">
:disabled="disabled" <el-select
v-model="dataForm.repairMode" :disabled="disabled"
placeholder="请选择维修方式"> v-model="dataForm.repairMode"
<el-option placeholder="请选择维修方式">
v-for="opt in getDictDatas('repair-mode')" <el-option
:key="opt.value" v-for="opt in getDictDatas('repair-mode')"
:label="opt.label" :key="opt.value"
:value="opt.value" /> :label="opt.label"
</el-select> :value="opt.value" />
</el-form-item> </el-select>
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item label="故障类型" prop="faultType"> <el-col :span="6">
<el-select <el-form-item label="故障类型" prop="faultType">
:disabled="disabled" <el-select
v-model="dataForm.faultType" :disabled="disabled"
placeholder="请选择故障类型"> v-model="dataForm.faultType"
<el-option placeholder="请选择故障类型">
v-for="opt in getDictDatas('fault-type')" <el-option
:key="opt.value" v-for="opt in getDictDatas('fault-type')"
:label="opt.label" :key="opt.value"
:value="opt.value" /> :label="opt.label"
</el-select> :value="opt.value" />
</el-form-item> </el-select>
</el-col> </el-form-item>
</el-row> </el-col>
</el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col> <el-col>
<el-form-item <el-form-item
label="故障明细" label="故障明细"
prop="faultDetail" prop="faultDetail"
:rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]"> :rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
<!-- // 富文本 --> <!-- // 富文本 -->
<editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="150"/> <editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="150"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col> <el-col>
<el-form-item label="维修记录" prop="maintenanceDetail"> <el-form-item label="维修记录" prop="maintenanceDetail">
<!-- // 富文本 --> <!-- // 富文本 -->
<editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="150"/> <editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="150"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col> <el-col>
<el-form-item label="维修附件" prop="file"> <el-form-item label="维修附件" prop="file">
<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="disabled" @name="setFileName" /> <FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="disabled" @name="setFileName" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col> <el-col>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input
v-model="dataForm.remark" v-model="dataForm.remark"
:placeholder="`请输入备注`" :placeholder="`请输入备注`"
:disabled="disabled" /> :disabled="disabled" />
</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

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

@ -121,7 +121,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: '维修明细', 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 },

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

@ -9,72 +9,80 @@
<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>
<el-form <div class="content">
ref="form" <el-form
:model="dataForm" ref="form"
label-width="100px" :model="dataForm"
v-loading="formLoading"> label-width="100px"
<el-row :gutter="20"> label-position="top"
<el-col :span="12"> v-loading="formLoading">
<el-form-item label="配置名" prop="name"> <el-row :gutter="20">
<span>{{ dataForm.name }}</span> <el-col :span="6">
</el-form-item> <el-form-item label="配置名" prop="name">
</el-col> <span>{{ dataForm.name }}</span>
<el-col :span="12"> </el-form-item>
<el-form-item label="设备名称" prop="equipmentName"> </el-col>
<span>{{ dataForm.equipmentName }}</span> <el-col :span="6">
</el-form-item> <el-form-item label="设备名称" prop="equipmentName">
</el-col> <span>{{ dataForm.equipmentName }}</span>
</el-row> </el-form-item>
<el-row :gutter="20"> </el-col>
<el-col :span="12"> <el-col :span="6">
<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" />
</el-form-item> <!-- <editor v-model="dataForm.description" read-only :min-height="200"/> -->
</el-form> </el-form-item>
</el-form>
<div v-if="!disabled" class="action_btn"> <div>
<template> <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
<span style="display: inline-block;" @click="addNew()"> {{ '备品备件' }}
<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" /> </small-title>
<span class="add">添加</span> <div v-if="!disabled" class="action_btn">
</span> <template>
</template> <span style="display: inline-block;" @click="addNew()">
</div> <svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
<base-table <span class="add">添加</span>
:table-props="tableProps" </span>
:page="listQuery.pageNo" </template>
:limit="listQuery.pageSize" </div>
:table-data="list"> <base-table
<method-btn :table-props="tableProps"
v-if="!disabled" :page="listQuery.pageNo"
slot="handleBtn" :limit="listQuery.pageSize"
:width="120" :table-data="list">
label="操作" <method-btn
:method-list="tableBtn" v-if="!disabled"
@clickBtn="handleClick" /> slot="handleBtn"
</base-table> :width="120"
<pagination label="操作"
v-show="listQuery.total > 0" :method-list="tableBtn"
:total="listQuery.total" @clickBtn="handleClick" />
:page.sync="listQuery.pageNo" </base-table>
:limit.sync="listQuery.pageSize" <pagination
:page-sizes="[5, 10, 15]" v-show="listQuery.total > 0"
@pagination="getList" /> :total="listQuery.total"
:page.sync="listQuery.pageNo"
:limit.sync="listQuery.pageSize"
:page-sizes="[5, 10, 15]"
@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
@ -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
} }
}, },
], ],

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

@ -9,81 +9,84 @@
<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>
<el-form <div class="content">
ref="form" <el-form
:model="dataForm" ref="form"
label-width="100px" :model="dataForm"
v-loading="formLoading"> label-width="90px"
<el-row :gutter="20"> v-loading="formLoading">
<el-col :span="12"> <el-row :gutter="20">
<el-form-item v-if="!isLog" label="配置名" prop="name"> <el-col :span="12">
<span>{{ dataForm.name }}</span> <el-form-item v-if="!isLog" label="配置名" prop="name">
</el-form-item> <span style="margin-left: 5px">{{ dataForm.name }}</span>
<el-form-item v-else label="产线名称" prop="lineName"> </el-form-item>
<span>{{ dataForm.lineName }}</span> <el-form-item v-else label="产线名称" prop="lineName">
</el-form-item> <span style="margin-left: 5px">{{ dataForm.lineName }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="设备名称" prop="equipmentName"> <el-col :span="12">
<span>{{ dataForm.equipmentName }}</span> <el-form-item label="设备名称" prop="equipmentName">
</el-form-item> <span style="margin-left: 5px">{{ dataForm.equipmentName }}</span>
</el-col> </el-form-item>
</el-row> </el-col>
<el-form-item label="描述" prop="faultTime"> </el-row>
<editor v-model="dataForm.description" read-only :min-height="200"/> <el-form-item label="描述" prop="description">
</el-form-item> <div v-html="dataForm.description" style="padding: 5px; margin-left: 5px; border: 1px solid #dfdfdf" />
</el-form> <!-- <editor v-model="dataForm.description" :read-only="true" :min-height="200"/> -->
</el-form-item>
<div v-if="!isLog"> </el-form>
<base-table
:table-props="tableProps" <div v-if="!isLog">
:page="listQuery.pageNo" <base-table
:limit="listQuery.pageSize" :table-props="tableProps"
:table-data="list"> :page="listQuery.pageNo"
<method-btn :limit="listQuery.pageSize"
v-if="!isLog" :table-data="list">
slot="handleBtn" <method-btn
:width="120" v-if="!isLog"
label="操作" slot="handleBtn"
:method-list="tableBtn" :width="120"
@clickBtn="handleClick" /> label="操作"
</base-table> :method-list="tableBtn"
<pagination @clickBtn="handleClick" />
v-show="listQuery.total > 0" </base-table>
:total="listQuery.total" <pagination
:page.sync="listQuery.pageNo" v-show="listQuery.total > 0"
:limit.sync="listQuery.pageSize" :total="listQuery.total"
:page-sizes="[5, 10, 15]" :page.sync="listQuery.pageNo"
@pagination="getList" /> :limit.sync="listQuery.pageSize"
:page-sizes="[5, 10, 15]"
@pagination="getList" />
</div>
<div v-else>
<!-- 搜索工作栏 -->
<SearchBar
:formConfigs="formConfig"
ref="search-bar"
@headBtnClick="buttonClick" />
<base-table
:table-props="tableProps1"
:page="listQuery1.pageNo"
:limit="listQuery1.pageSize"
:table-data="list1" />
<pagination
v-show="listQuery1.total > 0"
:total="listQuery1.total"
:page.sync="listQuery1.pageNo"
:limit.sync="listQuery1.pageSize"
:page-sizes="[5, 10, 15]"
@pagination="getList1" />
</div>
</div> </div>
<div v-else> <div v-if="isLog" class="drawer-body__footer">
<!-- 搜索工作栏 -->
<SearchBar
:formConfigs="formConfig"
ref="search-bar"
@headBtnClick="buttonClick" />
<base-table
:table-props="tableProps1"
:page="listQuery1.pageNo"
:limit="listQuery1.pageSize"
:table-data="list1" />
<pagination
v-show="listQuery1.total > 0"
:total="listQuery1.total"
:page.sync="listQuery1.pageNo"
:limit.sync="listQuery1.pageSize"
:page-sizes="[5, 10, 15]"
@pagination="getList1" />
</div>
<div class="drawer-body__footer">
<el-button type="primary" @click="goback()">关闭</el-button> <el-button type="primary" @click="goback()">关闭</el-button>
</div> </div>
@ -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