From 28189102d735bfc2c41720d1ef292bd9024b49f2 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 18 四月 2024 11:21:01 +0800
Subject: [PATCH] 1、首页 （1）设备级看板单击设备效率统计仪表盘图标跳转至统计分析页面并根据唯一编号筛选页面对应数据 （2）设备级看板点击设备班次按钮跳转至工作日历页面并根据设备编号筛选页面对应数据 （3）增加所有层级看板图表数据加载动画 （4）公司级以及分厂级看板利用率胶囊以及上月OEE车间单柱图表轴线刻度最大值采用动态设置方式而非固定100% （5）工段级看板上月OEE单柱图表轴线刻度最大值采用动态设置方式而非固定100% （6）工段级看板单击前7天利用率图表跳转至统计分析页面并根据唯一编号筛选页面对应数据 （7）工段级看板单击上月OEE图表跳转至设备综合效率分析页面并根据唯一编号筛选页面对应数据 2、调整全局导航栏页签间距，以便能在不超出导航栏的情况下同时放置更多页面页签
---
src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue | 90 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
index 4cf31ae..6d3f9aa 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
@@ -28,13 +28,13 @@
</a-col>
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-select
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨瀵硅薄閮ㄩ棬'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
v-decorator="['useId', validatorRules.useId]"
@@ -72,14 +72,14 @@
<a-col :span="12">
<a-form-item
- label="璁惧缂栫爜/鍚嶇О/鍨嬪彿"
+ label="缁熶竴缂栫爜/鍚嶇О/鍨嬪彿"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentNum', validatorRules.equipmentNum ]"
/>
</a-form-item>
@@ -112,7 +112,7 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
@@ -180,7 +180,7 @@
allow-clear
:disabled="true"
:placeholder="disableSubmit?'':'璇疯緭鍏ヨ矗浠荤彮缁�'"
- v-decorator="['teamName', validatorRules.teamName ]"
+ v-decorator="['teamName', {} ]"
/>
</a-form-item>
</a-col>
@@ -298,6 +298,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
<!-- <span
slot="photo"
@@ -423,37 +424,42 @@
},
width: 50,
},
+ // {
+ // title: '閮ㄤ綅',
+ // align: 'center',
+ // dataIndex: 'location'
+ // },
{
- title: '閮ㄤ綅',
+ title: '淇濆吇瑙掕壊',
align: 'center',
- dataIndex: 'location'
+ dataIndex: 'maintenanceRole'
},
{
- title: '淇濆吇椤圭洰',
+ title: '淇濆吇鍐呭',
align: 'center',
- dataIndex: 'maintenanceProjectNum'
+ dataIndex: 'maintenanceProjectName'
},
- {
- title: '淇濆吇鏍囧噯',
- align: 'center',
- dataIndex: 'standard'
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'maintenanceMethod'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool'
- },
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' }
- },
+ // {
+ // title: '淇濆吇鏍囧噯',
+ // align: 'center',
+ // dataIndex: 'standard'
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethod'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool'
+ // },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' }
+ // },
// {
// title: '缁翠繚涓撲笟',
// align: 'center',
@@ -487,7 +493,7 @@
},
useId: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: false, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
maintenanceCycleId: {
@@ -533,6 +539,7 @@
getMaintenanceProjectList: "/eam/dailyMaintenanceOrder/getMaintenanceProjectId",
getSysDeparts: "/eam/dailyMaintenanceOrder/getSysDeparts",
list: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
+ getNum: '/eam/sysIdentity/getNumNew'
},
}
@@ -541,6 +548,7 @@
methods: {
add() {
this.edit({})
+ this.getSeq()
},
edit(record) {
@@ -633,12 +641,12 @@
onSearchMaintenanceStandard() {
let data = this.form.getFieldsValue(['useId']);
- if (data.useId == null || data.useId == "") {
- this.$message.warning("璇峰厛閫夋嫨瀵硅薄閮ㄩ棬!");
- return
- }
+ // if (data.useId == null || data.useId == "") {
+ // this.$message.warning("璇峰厛閫夋嫨浣跨敤閮ㄩ棬!");
+ // return
+ // }
this.$refs.DailyMaintenanceStandardList.list(data.useId);
- this.$refs.DailyMaintenanceStandardList.title = "閫夋嫨鏃ュ父淇濆吇鏍囧噯";
+ this.$refs.DailyMaintenanceStandardList.title = "閫夋嫨浜岀骇淇濆吇鏍囧噯";
},
sendMaintenanceStandardRecord(data) {
let record = data.record;
@@ -669,6 +677,14 @@
})
},
+ getSeq() {
+ getAction(this.url.getNum, { type: 'MaintenanceOrder', length: 4 }).then(res => {
+ if (res.success) {
+ this.form.setFieldsValue({ "num": res.result })
+ }
+ })
+ },
+
handle3Change(val) {
let data = this.form.getFieldsValue(['maintenanceStandardId']);
getAction(this.url.getMaintenanceProjectList, { maintenanceStandardId: data.maintenanceStandardId, maintenanceCycleId: val }).then((res) => {
--
Gitblit v1.9.3