Merge pull request 'projects/mesxc-dy' (#303) from projects/mesxc-dy into projects/mesxc-test

Reviewed-on: #303
This commit is contained in:
朱菊兰 2024-04-03 15:11:41 +08:00
commit 28dbe075a4
48 changed files with 479 additions and 205 deletions

View File

@ -1,8 +1,8 @@
### ###
# @Author: Do not edit # @Author: Do not edit
# @Date: 2023-08-29 09:40:39 # @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-04-01 08:31:57 # @LastEditTime: 2024-04-03 11:22:19
# @LastEditors: zhp # @LastEditors: DY
# @Description: # @Description:
### ###
# 开发环境配置 # 开发环境配置

View File

@ -5,6 +5,7 @@ export default {
}; };
}, },
created() { created() {
this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
window.addEventListener('resize', this._setTableHeight); window.addEventListener('resize', this._setTableHeight);
}, },
destroyed() { destroyed() {
@ -12,7 +13,8 @@ export default {
}, },
methods: { methods: {
_setTableHeight() { _setTableHeight() {
this.tableH = this.tableHeight(260); this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
// this.tableH = this.tableHeight(260);
}, },
}, },
}; };

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -33,38 +34,49 @@ import {
getcoreAlarmLogPage getcoreAlarmLogPage
} from '@/api/base/coreAlarmLog'; } from '@/api/base/coreAlarmLog';
import {DICT_TYPE, getDictDatas, publicFormatter } from "@/utils/dict"; import {DICT_TYPE, getDictDatas, publicFormatter } from "@/utils/dict";
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'alarmTime', prop: 'alarmTime',
label: '报警时间', label: '报警时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'alarmSource', prop: 'alarmSource',
label: '报警来源' label: '报警来源',
width: 200,
showOverflowtooltip: true
}, },
{ {
prop: 'alarmType', prop: 'alarmType',
label: '报警类型' label: '报警类型',
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'alarmGrade', prop: 'alarmGrade',
label: '报警级别', label: '报警级别',
filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL) filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL),
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'alarmReason', prop: 'alarmReason',
label: '报警原因' label: '报警原因',
showOverflowtooltip: true
}, },
{ {
prop: 'alarmContent', prop: 'alarmContent',
label: '报警详细' label: '报警详细',
showOverflowtooltip: true
} }
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -74,7 +86,7 @@ export default {
tableBtn: [].filter((v)=>v), tableBtn: [].filter((v)=>v),
tableData: [], tableData: [],
listQuery: { listQuery: {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 0, total: 0,
alarmSource: undefined, alarmSource: undefined,

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-20 16:20:39 * @LastEditTime: 2024-04-02 16:46:17
* @Description: * @Description:
--> -->
<template> <template>
@ -96,7 +96,7 @@ export default {
dataRule: { dataRule: {
code: [{ required: true, message: "客户编号不能为空", trigger: "blur" }], code: [{ required: true, message: "客户编号不能为空", trigger: "blur" }],
name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }], name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }],
contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }], // contact: [{ required: true, message: "", trigger: "blur" }],
telephone: [ telephone: [
{ required: false, trigger: "blur", message: "手机号不能为空" }, { required: false, trigger: "blur", message: "手机号不能为空" },
{ {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,41 +46,56 @@ import {
getCustomerPage, getCustomerPage,
deleteCustomer deleteCustomer
} from '@/api/base/coreCustomer'; } from '@/api/base/coreCustomer';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '客户名称' label: '客户名称',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '客户编码' label: '客户编码',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'contact', prop: 'contact',
label: '联系人' label: '联系人',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'telephone', prop: 'telephone',
label: '联系电话' label: '联系电话',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'address', prop: 'address',
label: '地址' label: '地址',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
minWidth: 150,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,6 +46,7 @@ import {
getCoreDepartmentPage, getCoreDepartmentPage,
deleteCoreDepartment deleteCoreDepartment
} from '@/api/base/coreDepartment'; } from '@/api/base/coreDepartment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
@ -71,7 +73,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -64,8 +64,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="进日期" prop="enterTime" :rules="[]"> <el-form-item label="进日期" prop="enterTime" :rules="[]">
<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进日期" <el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进日期"
value-format="timestamp"></el-date-picker> value-format="timestamp"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -78,7 +79,7 @@
queryParams: { queryParams: {
equipmentId: form.id, equipmentId: form.id,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
}, },
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:core-equipment-attr:update') this.$auth.hasPermi('base:core-equipment-attr:update')
@ -118,6 +119,7 @@ import {
} from '@/api/base/equipment'; } from '@/api/base/equipment';
import Editor from '@/components/Editor'; import Editor from '@/components/Editor';
import AssetsUpload from './components/AssetsUpload.vue'; import AssetsUpload from './components/AssetsUpload.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'Equipment', name: 'Equipment',
@ -125,7 +127,7 @@ export default {
Editor, Editor,
EquipmentDrawer, EquipmentDrawer,
}, },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
searchBarKeys: ['name', 'code'], searchBarKeys: ['name', 'code'],
@ -157,8 +159,8 @@ export default {
width: 180, width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
}, },
{ prop: 'name', label: '设备名称' }, { prop: 'name', label: '设备名称', width: 180, showOverflowtooltip: true },
{ width: 256, prop: 'code', label: '设备编码' }, { width: 250, prop: 'code', label: '设备编码' },
{ prop: 'equipmentTypeName', label: '设备类型' }, { prop: 'equipmentTypeName', label: '设备类型' },
{ prop: 'enName', label: '英文名称' }, { prop: 'enName', label: '英文名称' },
{ prop: 'abbr', label: '缩写' }, { prop: 'abbr', label: '缩写' },
@ -484,7 +486,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
code: '', code: '',
name: '', name: '',
special: false special: false

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -51,13 +52,13 @@
import moment from 'moment'; import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import DialogForm from './dialogForm.vue'; import DialogForm from './dialogForm.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// import { getAccessToken } from '@/utils/auth'; // import { getAccessToken } from '@/utils/auth';
export default { export default {
name: 'EquipmentLineBind', name: 'EquipmentLineBind',
components: { DialogForm }, components: { DialogForm },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
basePath: '/base/core-equipment-bind-section', basePath: '/base/core-equipment-bind-section',
@ -81,12 +82,13 @@ export default {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
fixed: true, fixed: true,
width: 180, width: 150,
showOverflowtooltip: true,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
}, },
{ prop: 'productionLineName', label: '产线名称' }, { prop: 'productionLineName', label: '产线名称', width: 120, showOverflowtooltip: true },
{ prop: 'workshopSectionName', label: '工段名称' }, { prop: 'workshopSectionName', label: '工段名称', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名称' }, { prop: 'equipmentName', label: '设备名称', width: 150, showOverflowtooltip: true },
{ prop: 'sort', label: '工段中排序' }, { prop: 'sort', label: '工段中排序' },
{ {
prop: 'lineDataType', prop: 'lineDataType',
@ -236,7 +238,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
equipmentName: null, equipmentName: null,
productionLineId: null, productionLineId: null,
}, },

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -50,6 +51,7 @@
<script> <script>
import moment from 'moment'; import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
createEquipmentType, createEquipmentType,
@ -65,7 +67,7 @@ import {
export default { export default {
name: 'EquipmentType', name: 'EquipmentType',
components: {}, components: {},
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
searchBarKeys: ['name'], searchBarKeys: ['name'],
@ -171,7 +173,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
name: '', name: '',
}, },
// //

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -43,38 +44,51 @@ import basicPage from '../../core/mixins/basic-page';
import { parseTime } from '../../core/mixins/code-filter'; import { parseTime } from '../../core/mixins/code-filter';
import { getHotMaterialPage, deleteHotMaterial } from '@/api/base/coreHotMaterial'; import { getHotMaterialPage, deleteHotMaterial } from '@/api/base/coreHotMaterial';
import { publicFormatter } from "@/utils/dict"; import { publicFormatter } from "@/utils/dict";
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '原料名称' label: '原料名称',
minWidth: 250,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '原料编码' label: '原料编码',
width: 250,
showOverflowtooltip: true
}, },
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('unit_dict') filter: publicFormatter('unit_dict'),
width: 90,
showOverflowtooltip: true
}, },
{ {
prop: 'dailyCost', prop: 'dailyCost',
label: '每日消耗量' label: '每日消耗量',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
width: 120,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,6 +46,7 @@ import {
getCoreMajorPage, getCoreMajorPage,
deleteCoreMajor deleteCoreMajor
} from '@/api/base/coreMajor'; } from '@/api/base/coreMajor';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
@ -71,7 +73,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -2,15 +2,17 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-13 13:54:01 * @LastEditTime: 2024-03-27 13:47:24
* @Description: * @Description:
--> -->
<template> <template>
<el-drawer <el-drawer
:visible.sync="visible" :visible.sync="visible"
:show-close="false" :show-close="false"
:wrapper-closable="isdetail" :wrapper-closable="true"
class="drawer" class="drawer"
:before-close="beforeClose"
@closed="$emit('destroy')"
size="60%"> size="60%">
<small-title slot="title" :no-padding="true"> <small-title slot="title" :no-padding="true">
{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }} {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
@ -262,6 +264,15 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
beforeClose(done) {
if (!this.isdetail) {
this.$confirm('确认关闭?')
.then(_ => {
done();
})
.catch(_ => {});
}
},
clearArea() { clearArea() {
this.$set(this.dataForm, 'area', 0) this.$set(this.dataForm, 'area', 0)
this.$set(this.dataForm, 'weight', 0) this.$set(this.dataForm, 'weight', 0)

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -26,7 +27,8 @@
<add-or-update <add-or-update
v-if="addOrUpdateVisible" v-if="addOrUpdateVisible"
ref="addOrUpdate" ref="addOrUpdate"
@refreshDataList="getDataList" /> @refreshDataList="getDataList"
@destroy="addOrUpdateVisible = false" />
</div> </div>
</template> </template>
@ -39,43 +41,58 @@ import {
getCoreProductPage, getCoreProductPage,
deleteCoreProduct deleteCoreProduct
} from '@/api/base/coreProduct'; } from '@/api/base/coreProduct';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '产品名称' label: '产品名称',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '产品编码' label: '产品编码',
width: 190,
showOverflowtooltip: true
}, },
{ {
prop: 'productType', prop: 'productType',
label: '产品类型', label: '产品类型',
filter: publicFormatter('product_type') filter: publicFormatter('product_type'),
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'specifications', prop: 'specifications',
label: '规格' label: '规格',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('unit_dict') filter: publicFormatter('unit_dict'),
width: 90,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注', label: '备注',
width: 120,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -48,34 +49,47 @@ import {
import { getStatus } from '@/api/core/base/productionLine'; import { getStatus } from '@/api/core/base/productionLine';
import codeFilter from '../../core/mixins/code-filter'; import codeFilter from '../../core/mixins/code-filter';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'factoryName', prop: 'factoryName',
label: '工厂' label: '工厂',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'roomNameDict', prop: 'roomNameDict',
label: '车间名称', label: '车间名称',
filter: publicFormatter('workshop') filter: publicFormatter('workshop'),
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '产线名称' label: '产线名称',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '产线编码' label: '产线编码',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'enabled', prop: 'enabled',
label: '当前状态', label: '当前状态',
filter: codeFilter('lineStatus') filter: codeFilter('lineStatus'),
width: 120,
showOverflowtooltip: true
}, },
// { // {
// prop: 'tvalue', // prop: 'tvalue',
@ -83,16 +97,20 @@ const tableProps = [
// }, // },
{ {
prop: 'description', prop: 'description',
label: '描述' label: '描述',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
width: 120,
showOverflowtooltip: true
} }
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -2,7 +2,7 @@
* @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-22 10:27:43 * @LastEditTime: 2024-04-02 16:46:49
* @Description: * @Description:
--> -->
<template> <template>
@ -79,7 +79,7 @@ export default {
dataRule: { dataRule: {
code: [{ required: true, message: "供应商编号不能为空", trigger: "blur" }], code: [{ required: true, message: "供应商编号不能为空", trigger: "blur" }],
name: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }], name: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }],
contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }], // contact: [{ required: true, message: "", trigger: "blur" }],
telephone: [ telephone: [
{ required: false, trigger: "blur", message: "手机号不能为空" }, { required: false, trigger: "blur", message: "手机号不能为空" },
{ {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,41 +46,56 @@ import {
getCoreSupplierPage, getCoreSupplierPage,
deleteCoreSupplier deleteCoreSupplier
} from '@/api/base/coreSupplier'; } from '@/api/base/coreSupplier';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '供应商编码' label: '供应商编码',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '供应商名称' label: '供应商名称',
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'contact', prop: 'contact',
label: '联系人' label: '联系人',
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'telephone', prop: 'telephone',
label: '联系电话' label: '联系电话',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'address', prop: 'address',
label: '地址' label: '地址',
width: 180,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
minWidth: 90,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -46,20 +47,27 @@ import {
deleteCoreWorker deleteCoreWorker
} from '@/api/base/coreWorker'; } from '@/api/base/coreWorker';
import moment from 'moment'; import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '创建时间', label: '创建时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'name', prop: 'name',
label: '姓名' label: '姓名',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'code', prop: 'code',
label: '员工号' label: '员工号',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'sex', prop: 'sex',
@ -70,32 +78,44 @@ const tableProps = [
prop: 'entryTime', prop: 'entryTime',
label: '入职时间', label: '入职时间',
filter: (val) => val ? moment(val).format('yyyy-MM-DD') : '', filter: (val) => val ? moment(val).format('yyyy-MM-DD') : '',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'telephone', prop: 'telephone',
label: '联系电话' label: '联系电话',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'status', prop: 'status',
label: '状态', label: '状态',
filter: (val) => ['', '在职', '离职'][val] filter: (val) => ['', '在职', '离职'][val],
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'departmentName', prop: 'departmentName',
label: '部门' label: '部门',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'majorName', prop: 'majorName',
label: '专业' label: '专业',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
width: 150,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -45,12 +46,14 @@ import {
getCWSectionPage, getCWSectionPage,
deleteCWSection deleteCWSection
} from '@/api/base/coreWorkshopSection'; } from '@/api/base/coreWorkshopSection';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
label: '添加时间', label: '添加时间',
filter: parseTime filter: parseTime,
}, },
{ {
prop: 'code', prop: 'code',
@ -70,12 +73,13 @@ const tableProps = [
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -40,6 +41,7 @@ import {
} from '@/api/base/material'; } from '@/api/base/material';
import { listData } from "@/api/system/dict/data"; import { listData } from "@/api/system/dict/data";
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
@ -75,7 +77,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -38,6 +39,7 @@ import {
getMaterialPBPage, getMaterialPBPage,
deleteMaterialPB deleteMaterialPB
} from '@/api/base/materialProductBom'; } from '@/api/base/materialProductBom';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
@ -55,7 +57,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
components: { components: {
AddOrUpdate, AddOrUpdate,
}, },

View File

@ -106,6 +106,10 @@ export default {
activeIndex(val) { activeIndex(val) {
this.initChart(val); this.initChart(val);
}, },
daterange(val) {
console.log('222', val)
this.templateOption.xAxis.data = val
},
}, },
methods: { methods: {
/** /**
@ -124,8 +128,8 @@ export default {
}, },
/** 初始化/设置 图表 */ /** 初始化/设置 图表 */
initChart(val) { initChart(val) {
console.log('tableData', this.tableData);
if (!this.chart) this.chart = echarts.init(this.$refs.chartDiv); if (!this.chart) this.chart = echarts.init(this.$refs.chartDiv);
this.chart.clear();
switch (val) { switch (val) {
case 0: case 0:
const eqCt = this.tableData.map((row) => ({ const eqCt = this.tableData.map((row) => ({
@ -139,7 +143,7 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '设备CT' }, yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
series: eqCt, series: eqCt,
}); }, true);
break; break;
case 1: case 1:
const eqTt = this.tableData.map((row) => ({ const eqTt = this.tableData.map((row) => ({
@ -153,7 +157,7 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '设备TT' }, yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
series: eqTt, series: eqTt,
}); }, true);
break; break;
case 2: case 2:
const plCt = this.tableData.map((row) => ({ const plCt = this.tableData.map((row) => ({
@ -167,7 +171,7 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '产线CT' }, yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
series: plCt, series: plCt,
}); }, true);
break; break;
case 3: case 3:
const plTt = this.tableData.map((row) => ({ const plTt = this.tableData.map((row) => ({
@ -181,9 +185,10 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '产线TT' }, yAxis: { ...this.templateOption.yAxis, name: '产线TT' },
series: plTt, series: plTt,
}); }, true);
break; break;
default: default:
this.activeIndex = 0
const eqCt2 = this.tableData.map((row) => ({ const eqCt2 = this.tableData.map((row) => ({
name: row.equName, name: row.equName,
type: 'line', type: 'line',
@ -195,7 +200,7 @@ export default {
...this.templateOption, ...this.templateOption,
yAxis: { ...this.templateOption.yAxis, name: '设备CT' }, yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
series: eqCt2, series: eqCt2,
}); }, true);
} }
}, },
}, },

View File

@ -18,13 +18,15 @@
:page="1" :page="1"
:limit="999" :limit="999"
:table-props="tableProps" :table-props="tableProps"
:table-data="tableData" /> :table-data="tableData"
:max-height="tableH" />
<div v-if="tableData.length == 0" class="no-data-bg"></div> <div v-if="tableData.length == 0" class="no-data-bg"></div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph"> <el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph">
<div class="graph" style="height: 800px"> <div class="graph" style="height: 800px">
<!-- graph --> <!-- graph -->
<AnalysisChart <AnalysisChart
ref="analysisChart"
v-if="activeName == 'graph'" v-if="activeName == 'graph'"
:table-data="tableData" :table-data="tableData"
:daterange="dateArr"></AnalysisChart> :daterange="dateArr"></AnalysisChart>
@ -47,13 +49,14 @@ import BalanceChart from '../balanceChart';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import AnalysisChart from './chart.vue'; import AnalysisChart from './chart.vue';
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
components: { components: {
BalanceChart, BalanceChart,
AnalysisChart, AnalysisChart,
}, },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
activeName: 'table', activeName: 'table',
@ -176,6 +179,11 @@ export default {
// const p = this.tableProps // const p = this.tableProps
// const d = this.tableData // const d = this.tableData
// debugger; // debugger;
if (this.activeName == 'graph') {
this.$nextTick(() => {
this.$refs['analysisChart'].initChart()
})
}
this.ready = true; this.ready = true;
}, },

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -41,6 +42,7 @@
import AddOrUpdate from './add-or-updata'; import AddOrUpdate from './add-or-updata';
import basicPage from '../../mixins/basic-page'; import basicPage from '../../mixins/basic-page';
import { parseTime } from '../../mixins/code-filter'; import { parseTime } from '../../mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
deleteFactory, deleteFactory,
getFactoryPage getFactoryPage
@ -71,7 +73,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {

View File

@ -17,7 +17,7 @@ export default {
}, },
tableData: [], tableData: [],
listQuery: { listQuery: {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
}, },

View File

@ -27,13 +27,16 @@
import { getPdlDataOneDay } from '@/api/core/monitoring/data24' import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
import { parseTime } from '../../mixins/code-filter'; import { parseTime } from '../../mixins/code-filter';
import { getSchedulingMonitoringRecord1 } from '@/api/monitoring/teamProduction' import { getSchedulingMonitoringRecord1 } from '@/api/monitoring/teamProduction'
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'productionLineData24', name: 'productionLineData24',
mixins: [tableHeightMixin],
components: {}, components: {},
props: {}, props: {},
data() { data() {
return { return {
heightNum: 240,
urlOptions: { urlOptions: {
getDataListURL: getPdlDataOneDay getDataListURL: getPdlDataOneDay
}, },
@ -56,9 +59,9 @@ export default {
}, },
computed: {}, computed: {},
mounted() { mounted() {
window.addEventListener('resize', () => { // window.addEventListener('resize', () => {
this.tableH = this.tableHeight(240) // this.tableH = this.tableHeight(240)
}) // })
this.getList(); this.getList();
}, },
methods: { methods: {
@ -115,7 +118,7 @@ export default {
/** 把 list 里的数据转换成 tableProps 对应的格式 */ /** 把 list 里的数据转换成 tableProps 对应的格式 */
convertList(list) { convertList(list) {
// let sectionArr= [] // let sectionArr= []
let temp = Object.values(list.datamap) let temp = list.datamap ? Object.values(list?.datamap) : []
console.log('111', temp) console.log('111', temp)
temp.forEach(item => { temp.forEach(item => {

View File

@ -9,7 +9,8 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -33,6 +34,7 @@ import {
getEqAnalysis, getEqAnalysis,
exportEqAnalysisExcel, exportEqAnalysisExcel,
} from '@/api/equipment/analysis/statistics'; } from '@/api/equipment/analysis/statistics';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
// { // {
@ -52,35 +54,49 @@ const tableProps = [
{ {
prop: 'lineName', prop: 'lineName',
label: '产线', label: '产线',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'sectionName', prop: 'sectionName',
label: '工段', label: '工段',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'equipmentName', prop: 'equipmentName',
label: '设备名称', label: '设备名称',
minWidth: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'equipmentType', prop: 'equipmentType',
label: '设备类型', label: '设备类型',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'workTime', prop: 'workTime',
label: '工作时间累积(h)', label: '工作时间累积(h)',
width: 160,
showOverflowtooltip: true
}, },
{ {
prop: 'repairCount', prop: 'repairCount',
label: '维修次数', label: '维修次数',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'maintainCount', prop: 'maintainCount',
label: '保养次数', label: '保养次数',
width: 120,
showOverflowtooltip: true
}, },
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
const today = new Date(); const today = new Date();
@ -110,7 +126,7 @@ export default {
tableBtn: [].filter((v) => v), tableBtn: [].filter((v) => v),
tableData: [], tableData: [],
listQuery: { listQuery: {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
recordTime: [ recordTime: [

View File

@ -75,6 +75,12 @@ export default {
}, },
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: (v) => {
const num = String(v.value)?.split('.').length === 2 ? v.value?.toFixed(2) : v.value
return `<div>
<span>${v.name}: ${num}</span>
</div>`
}
}, },
legend: { legend: {
show: false, show: false,

View File

@ -19,7 +19,7 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
max-height="600" :max-height="tableH"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun">
<!-- <method-btn <!-- <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
@ -42,14 +42,16 @@
<script> <script>
import moment from 'moment'; import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'ExceptionAnalysis', name: 'ExceptionAnalysis',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
components: {}, components: {},
props: {}, props: {},
data() { data() {
return { return {
heightNum: 220,
searchBarKeys: ['name', 'code'], searchBarKeys: ['name', 'code'],
// tableBtn: [ // tableBtn: [
// this.$auth.hasPermi('base:equipment-group:update') // this.$auth.hasPermi('base:equipment-group:update')

View File

@ -48,9 +48,11 @@
<script> <script>
import moment from 'moment'; import moment from 'moment';
import LineChart from './components/lineChart.vue'; import LineChart from './components/lineChart.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'QualityAnalysis', name: 'QualityAnalysis',
mixins: [tableHeightMixin],
components: { LineChart }, components: { LineChart },
props: {}, props: {},
data() { data() {
@ -58,7 +60,6 @@ export default {
const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()]; const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
return { return {
dialogVisible: false, dialogVisible: false,
tableH: this.tableHeight(260),
urls: { urls: {
page: '/analysis/equipment-analysis/quality', page: '/analysis/equipment-analysis/quality',
}, },
@ -254,9 +255,9 @@ export default {
this.fillProductOptions(); this.fillProductOptions();
}, },
mounted() { mounted() {
window.addEventListener('resize', () => { // window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260) // this.tableH = this.tableHeight(260)
}) // })
this.$refs['search-bar'].headBtnClick('search'); this.$refs['search-bar'].headBtnClick('search');
}, },
methods: { methods: {

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -61,6 +62,8 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import AddOrUpdate from './AddOrUpdate.vue'; import AddOrUpdate from './AddOrUpdate.vue';
import moment from 'moment'; import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
const btn = { const btn = {
@ -89,7 +92,7 @@ const btn = {
export default { export default {
name: 'Record', name: 'Record',
components: { AddOrUpdate }, components: { AddOrUpdate },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
readOnly: false, readOnly: false,
@ -116,17 +119,17 @@ export default {
// : undefined, // : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'productionLine', label: '产线' }, { prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
{ prop: 'workshopSection', label: '工段' }, { prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
{ prop: 'equipment', label: '设备名称' }, { prop: 'equipment', label: '设备名称', width: 120, showOverflowtooltip: true },
{ {
prop: 'alarmGrade', prop: 'alarmGrade',
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, width: 150, showOverflowtooltip: true },
{ prop: 'alarmCode', label: '设备报警码' }, { prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true },
{ prop: 'alarmContent', label: '报警内容' }, { prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true },
{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn }, { prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, { prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
// { prop: 'remark', label: '' }, // { prop: 'remark', label: '' },
@ -203,7 +206,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
lineId: null, lineId: null,
equipmentId: null, equipmentId: null,
recordTime: [], recordTime: [],

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -70,7 +71,7 @@
queryParams: { queryParams: {
equipmentGroupId: alarmForm.id, equipmentGroupId: alarmForm.id,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
}, },
tableBtn: [ tableBtn: [
this.$auth.hasPermi('equipment:alarm-group:update') this.$auth.hasPermi('equipment:alarm-group:update')
@ -109,10 +110,11 @@ import { publicFormatter } from '@/utils/dict';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
// import { getAccessToken } from '@/utils/auth'; // import { getAccessToken } from '@/utils/auth';
import BasicDrawer from './components/BasicDrawer.vue'; import BasicDrawer from './components/BasicDrawer.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'EquipmentGroup', name: 'EquipmentGroup',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
components: { BasicDrawer }, components: { BasicDrawer },
data() { data() {
return { return {

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -72,7 +73,7 @@
queryParams: { queryParams: {
equipmentGroupId: alarmForm.id, equipmentGroupId: alarmForm.id,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
}, },
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:equipment-group:update') this.$auth.hasPermi('base:equipment-group:update')
@ -112,11 +113,12 @@ import moment from 'moment';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import BasicDrawer from './components/BasicDrawer.vue'; import BasicDrawer from './components/BasicDrawer.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'EquipmentBindGroup', name: 'EquipmentBindGroup',
components: { BasicDrawer }, components: { BasicDrawer },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
searchBarKeys: ['groupId', 'equipmentName'], searchBarKeys: ['groupId', 'equipmentName'],
@ -254,7 +256,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
equipmentName: null, equipmentName: null,
groupId: null, groupId: null,
}, },

View File

@ -19,7 +19,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -127,10 +128,11 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
import BasicDrawer from './components/BasicDrawer.vue'; import BasicDrawer from './components/BasicDrawer.vue';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import AddOrUpdate from './add-or-updata'; import AddOrUpdate from './add-or-updata';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'EquipmentPlcConnect', name: 'EquipmentPlcConnect',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
components: { BasicDrawer, AddOrUpdate }, components: { BasicDrawer, AddOrUpdate },
data() { data() {
return { return {
@ -156,14 +158,14 @@ export default {
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'productionLine', label: '产线' }, { prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
{ prop: 'workshopSection', label: '工段' }, { prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名' }, { prop: 'equipmentName', label: '设备名', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentCode', label: '设备编码' }, { prop: 'equipmentCode', label: '设备编码', width: 200, showOverflowtooltip: true },
{ prop: 'plcCode', label: '关联表编码' }, { prop: 'plcCode', label: '关联表编码', width: 220, showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名' }, { prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
{ prop: 'plcName', label: '标识名称' }, { prop: 'plcName', label: '标识名称', width: 150, showOverflowtooltip: true },
{ prop: 'bindingParameters', label: '绑定参数数量' }, { prop: 'bindingParameters', label: '绑定参数数量', width: 120, showOverflowtooltip: true },
// { // {
// _action: 'params-bind', // _action: 'params-bind',
// label: '', // label: '',
@ -269,7 +271,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
plcId: null, plcId: null,
equipmentId: null, equipmentId: null,
}, },

View File

@ -20,7 +20,8 @@
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
ref="pageTable" ref="pageTable"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -60,6 +61,7 @@ import {
exportEquipmentPlcExcel, exportEquipmentPlcExcel,
} from '@/api/base/equipmentPlc'; } from '@/api/base/equipmentPlc';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const switchBtn = { const switchBtn = {
name: 'SwitchBtn', name: 'SwitchBtn',
@ -99,7 +101,7 @@ const switchBtn = {
export default { export default {
name: 'EquipmentPlc', name: 'EquipmentPlc',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
components: {}, components: {},
data() { data() {
return { return {
@ -127,16 +129,16 @@ export default {
// width: 180, // width: 180,
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), // filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
// }, // },
{ prop: 'code', label: '编码' }, { prop: 'code', label: '编码', width: 180, showOverflowtooltip: true },
{ prop: 'plcTableName', label: '关联表名' }, { prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
{ prop: 'name', label: '标识名称' }, { prop: 'name', label: '标识名称', width: 150, showOverflowtooltip: true },
{ prop: 'enName', label: '英文名称' }, { prop: 'enName', label: '英文名称', width: 150, showOverflowtooltip: true },
{ {
prop: 'collection', prop: 'collection',
label: '是否采集', label: '是否采集',
subcomponent: switchBtn, subcomponent: switchBtn,
}, },
{ prop: 'description', label: '描述' }, { prop: 'description', label: '描述', minWidth: 150, showOverflowtooltip: true },
], ],
searchBarFormConfig: [ searchBarFormConfig: [
{ {
@ -240,7 +242,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
plcTableName: null, plcTableName: null,
name: null, name: null,
}, },

View File

@ -15,6 +15,7 @@
background: '#f2f4f9', background: '#f2f4f9',
color: '#606266', color: '#606266',
}" }"
:max-height="tableH"
class="waiting-list-table"> class="waiting-list-table">
<el-table-column <el-table-column
type="selection" type="selection"
@ -37,8 +38,9 @@
<el-table-column <el-table-column
v-if="selectedBox[0]" v-if="selectedBox[0]"
label="巡检单名称" label="巡检单名称"
:show-overflow-tooltip="true"
prop="name"></el-table-column> prop="name"></el-table-column>
<el-table-column v-if="selectedBox[1]" label="部门" prop="planName"> <el-table-column v-if="selectedBox[1]" label="部门" :show-overflow-tooltip="true" prop="planName">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.department || '---' }} {{ scope.row.department || '---' }}
</template> </template>
@ -46,6 +48,7 @@
<el-table-column <el-table-column
v-if="selectedBox[2]" v-if="selectedBox[2]"
label="巡检时间" label="巡检时间"
width="150"
prop="actualCheckTime"> prop="actualCheckTime">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.actualCheckTime | timeFilter }} {{ scope.row.actualCheckTime | timeFilter }}
@ -54,6 +57,8 @@
<el-table-column <el-table-column
v-if="selectedBox[3]" v-if="selectedBox[3]"
label="班次" label="班次"
width="180"
:show-overflow-tooltip="true"
prop="groupClass"> prop="groupClass">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.groupClass || '---' }} {{ scope.row.groupClass || '---' }}
@ -62,6 +67,7 @@
<el-table-column <el-table-column
v-if="selectedBox[4]" v-if="selectedBox[4]"
label="确认截止时间" label="确认截止时间"
width="150"
prop="confirmDueTime"> prop="confirmDueTime">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.confirmDueTime | timeFilter }} {{ scope.row.confirmDueTime | timeFilter }}
@ -70,6 +76,7 @@
<el-table-column <el-table-column
v-if="selectedBox[5]" v-if="selectedBox[5]"
width="150" width="150"
:show-overflow-tooltip="true"
label="备注" label="备注"
prop="remark"> prop="remark">
<template slot-scope="scope"> <template slot-scope="scope">
@ -172,6 +179,7 @@ export default {
true true
], ],
selectedPlan: [], selectedPlan: [],
tableH: this.tableHeight(260)
}; };
}, },
computed: { computed: {
@ -182,6 +190,16 @@ export default {
})); }));
}, },
}, },
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
},
destroyed() {
window.removeEventListener('resize', () => {
this.tableH = this.tableHeight(260)
});
},
methods: { methods: {
checkSelectable(row, index) { checkSelectable(row, index) {
return true; return true;

View File

@ -139,7 +139,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
maintainPlanId: null, maintainPlanId: null,
startTime: null, startTime: null,
special: false, special: false,

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -65,6 +66,7 @@ import addRecord from './addRecord.vue';
import AddContent from './addContent.vue'; import AddContent from './addContent.vue';
import { exportCheckOrderExcel, deleteEqCheckLog } from '@/api/equipment/base/inspection/record' import { exportCheckOrderExcel, deleteEqCheckLog } from '@/api/equipment/base/inspection/record'
import { parseTime } from '../../../../core/mixins/code-filter'; import { parseTime } from '../../../../core/mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@ -91,7 +93,7 @@ const btn = {
export default { export default {
name: 'EquipmentInspectionRecord', name: 'EquipmentInspectionRecord',
components: { addRecord, AddContent }, components: { addRecord, AddContent },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addOrUpdateVisible: false, addOrUpdateVisible: false,
@ -250,7 +252,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
special: false, special: false,
name: null, name: null,
actualCheckTime: null, actualCheckTime: null,

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -53,13 +54,14 @@ import addOrUpdata from './add-or-updata.vue';
import add from './add.vue'; import add from './add.vue';
import { parseTime } from '../../../../core/mixins/code-filter'; import { parseTime } from '../../../../core/mixins/code-filter';
import { groupClassesListAll } from '@/api/monitoring/teamProduction'; import { groupClassesListAll } from '@/api/monitoring/teamProduction';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// import { publicFormatter } from '@/utils/dict'; // import { publicFormatter } from '@/utils/dict';
// 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 {
name: 'EquipmentCheckSetting', name: 'EquipmentCheckSetting',
components: { addOrUpdata, add }, components: { addOrUpdata, add },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addOrUpdateVisible: false, addOrUpdateVisible: false,
@ -102,7 +104,7 @@ export default {
{ {
prop: 'code', prop: 'code',
label: '巡检单编码', label: '巡检单编码',
minWidth: 150, minWidth: 170,
showOverflowtooltip: true, showOverflowtooltip: true,
}, },
{ prop: 'department', label: '部门', showOverflowtooltip: true }, { prop: 'department', label: '部门', showOverflowtooltip: true },
@ -225,7 +227,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
equipmentId: null, equipmentId: null,
name: null, name: null,
special: false, special: false,

View File

@ -7,12 +7,13 @@
<template> <template>
<el-drawer <el-drawer
:visible="visible" :visible.sync="visible"
:show-close="false" :show-close="false"
:wrapper-closable="false" :wrapper-closable="true"
class="drawer" class="drawer"
custom-class="mes-drawer" custom-class="mes-drawer"
size="60%" size="60%"
:before-close="beforeClose"
@closed="$emit('destroy')"> @closed="$emit('destroy')">
<SmallTitle slot="title">编辑</SmallTitle> <SmallTitle slot="title">编辑</SmallTitle>
@ -344,6 +345,7 @@ export default {
label: '设备名称', label: '设备名称',
prop: 'equipmentId', prop: 'equipmentId',
url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false', url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
bind: { clearable: true, filterable: true },
// method: 'post', // method: 'post',
// queryParams: { // queryParams: {
// pageNo: 1, // pageNo: 1,
@ -443,6 +445,15 @@ export default {
this.getList('line'); this.getList('line');
}, },
methods: { methods: {
beforeClose(done) {
// if (!this.isdetail) {
this.$confirm('确认关闭?')
.then(_ => {
done();
})
.catch(_ => {});
// }
},
handleSearchBarBtnClick(btn) { handleSearchBarBtnClick(btn) {
switch (btn.btnName) { switch (btn.btnName) {
case 'search': case 'search':

View File

@ -15,6 +15,7 @@
background: '#f2f4f9', background: '#f2f4f9',
color: '#606266', color: '#606266',
}" }"
:max-height="tableH"
class="waiting-list-table"> class="waiting-list-table">
<el-table-column <el-table-column
type="selection" type="selection"
@ -36,8 +37,9 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="selectedBox[0]" v-if="selectedBox[0]"
width="128" width="160"
label="设备保养单号" label="设备保养单号"
:show-overflow-tooltip="true"
prop="maintainOrderNumber"></el-table-column> prop="maintainOrderNumber"></el-table-column>
<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName"> <el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
<template slot-scope="scope"> <template slot-scope="scope">
@ -224,6 +226,7 @@ export default {
true, true,
], ],
selectedPlan: [], selectedPlan: [],
tableH: this.tableHeight(260),
}; };
}, },
computed: { computed: {
@ -234,6 +237,16 @@ export default {
})); }));
}, },
}, },
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
},
destroyed() {
window.removeEventListener('resize', () => {
this.tableH = this.tableHeight(260)
});
},
methods: { methods: {
checkSelectable(row, index) { checkSelectable(row, index) {
return ( return (

View File

@ -335,6 +335,7 @@ export default {
label: '设备名称', label: '设备名称',
prop: 'equipmentId', prop: 'equipmentId',
url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false', url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
bind: { clearable: true, filterable: true },
// method: 'post', // method: 'post',
// queryParams: { // queryParams: {
// pageNo: 1, // pageNo: 1,

View File

@ -197,7 +197,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
maintainPlanId: null, maintainPlanId: null,
startTime: null, startTime: null,
special: false, special: false,

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<!-- <method-btn <!-- <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -59,6 +60,7 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record' import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import AddContent from '../PlanConfig/addContent.vue'; import AddContent from '../PlanConfig/addContent.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const remainBox = { const remainBox = {
name: 'RemainBox', name: 'RemainBox',
@ -116,7 +118,7 @@ const btn = {
export default { export default {
name: 'Monitor', name: 'Monitor',
components: { AddContent }, components: { AddContent },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addContent: false, addContent: false,
@ -129,7 +131,7 @@ export default {
// width: 180, // width: 180,
// filter: parseTime(createTime), // filter: parseTime(createTime),
// }, // },
{ prop: 'code', label: '保养计划单号', minWidth: 118, showOverflowtooltip: true }, { prop: 'code', label: '保养计划单号', width: 150, showOverflowtooltip: true },
{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true }, { prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true }, { prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true }, { prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@ -205,7 +207,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
special: false, special: false,
equipmentName: null, equipmentName: null,
createTime: null, createTime: null,

View File

@ -9,11 +9,12 @@
:table-props="tableProps" :table-props="tableProps"
:page="listQuery.pageNo" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :limit="listQuery.pageSize"
:table-data="tableData"> :table-data="tableData"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="120"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -53,6 +54,7 @@ import { parseTime, toDay } from '../../../../core/mixins/code-filter';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import { getPlanPage } from '@/api/equipment/base/maintain/planconfig'; import { getPlanPage } from '@/api/equipment/base/maintain/planconfig';
import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record'; import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
// { // {
@ -62,46 +64,64 @@ const tableProps = [
// }, // },
{ {
prop: 'name', prop: 'name',
label: '保养计划名称' label: '保养计划名称',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'departmentName', prop: 'departmentName',
label: '部门' label: '部门',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'lineName', prop: 'lineName',
label: '产线名' label: '产线名',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'maintenancePeriod', prop: 'maintenancePeriod',
label: '保养频率(天/次)' label: '保养频率(天/次)',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'firstMaintenanceTime', prop: 'firstMaintenanceTime',
label: '首次保养时间', label: '首次保养时间',
filter: parseTime filter: parseTime,
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'maintainDuration', prop: 'maintainDuration',
label: '保养时长' label: '保养时长',
width: 120,
showOverflowtooltip: true
}, },
{ {
prop: 'maintainer', prop: 'maintainer',
label: '计划保养人员' label: '计划保养人员',
width: 150,
showOverflowtooltip: true
}, },
{ {
prop: 'confirmTimeLimit', prop: 'confirmTimeLimit',
label: '确认时限', label: '确认时限',
filter: toDay filter: toDay,
width: 130,
showOverflowtooltip: true
}, },
{ {
prop: 'remark', prop: 'remark',
label: '备注' label: '备注',
width: 150,
showOverflowtooltip: true
} }
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -111,7 +131,7 @@ export default {
tableProps, tableProps,
addContent: false, addContent: false,
listQuery: { listQuery: {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 0, total: 0,
special: false, special: false,

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -65,6 +66,7 @@ import Editor from '@/components/Editor';
import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record'; import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
import AddContent from './addContent.vue'; import AddContent from './addContent.vue';
import { parseTime } from '../../../../core/mixins/code-filter'; import { parseTime } from '../../../../core/mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@ -91,7 +93,7 @@ const btn = {
export default { export default {
name: 'EquipmentMaintainRecord', name: 'EquipmentMaintainRecord',
components: { AddContent }, components: { AddContent },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addContent: false, addContent: false,
@ -337,7 +339,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
special: false, special: false,
maintainPlanId: null, maintainPlanId: null,
maintainPlanId: null, maintainPlanId: null,

View File

@ -12,7 +12,8 @@
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -58,12 +59,13 @@ import { deleteRepair, exportRepairLogExcel } from '@/api/equipment/base/repair'
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import htmls from './htmls.vue' import htmls from './htmls.vue'
import DialogForm from './Repair--add.vue'; import DialogForm from './Repair--add.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// 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 {
name: 'EquipmentRepair', name: 'EquipmentRepair',
components: { CustomDialogForm, DialogForm }, components: { CustomDialogForm, DialogForm },
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
addOrUpdateVisible: false, addOrUpdateVisible: false,
@ -102,16 +104,16 @@ export default {
// width: 180, // width: 180,
// filter: parseTime, // filter: parseTime,
// }, // },
{ prop: 'repairOrderNumber', label: '维修单号' }, { prop: 'repairOrderNumber', label: '维修单号', width: 180, showOverflowtooltip: true },
{ prop: 'lineName', label: '产线名' }, { prop: 'lineName', label: '产线名', width: 120, showOverflowtooltip: true },
{ prop: 'sectionName', label: '工段名' }, { prop: 'sectionName', label: '工段名', width: 120, showOverflowtooltip: true },
{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true }, { prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
{ prop: 'faultDetail', label: '故障明细', subcomponent: htmls }, { prop: 'faultDetail', label: '故障明细', subcomponent: htmls, width: 180, showOverflowtooltip: true },
// { prop: 'maintenanceDetail', label: '', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true }, // { prop: 'maintenanceDetail', label: '', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true },
{ {
prop: 'maintenanceStartTime', prop: 'maintenanceStartTime',
label: '维修开始时间', label: '维修开始时间',
width: 150, width: 150,
filter: parseTime, filter: parseTime,
}, },
{ {
@ -193,7 +195,7 @@ export default {
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
special: false, special: false,
maintenanceResult: null, maintenanceResult: null,
createTime: null, createTime: null,

View File

@ -88,7 +88,8 @@
:page="1" :page="1"
:limit="999" :limit="999"
:table-data="list" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun"
:max-height="tableH">
<!-- <method-btn <!-- <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
@ -119,9 +120,11 @@
<script> <script>
import Graph from './graph.vue'; import Graph from './graph.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'EquipmentProcessAmount', name: 'EquipmentProcessAmount',
mixins: [tableHeightMixin],
components: { Graph }, components: { Graph },
props: {}, props: {},
data() { data() {