From a04b8970aa94f80c4c4937706c787391759aded7 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 13 十二月 2023 15:54:17 +0800
Subject: [PATCH] 1、全局车间层级以及部门层级树默认展开 2、车间看板页面设备详情弹窗背景透明度改为不透明 3、所有含有车间层级树页面新增弹窗中的选择设备弹窗内容由表格选择调整为树方式 4、报警分析页面表格字段出现次数与合计持续时间增加排序功能以及表格请求数据设置加载中动画 5、设备利用率、设备开动率以及班次利用率页面表格有关时间值调整为小时并保留两位小数以及通过与后端数据联调，增加表格平均值及合计值展示 6、设备综合效率分析页面表格班次字段若数据过长则省略 7、用户管理页面添加用户与重新设定密码弹窗中的登录密码校验长度与数据字典password_length设置保持一致以及表格车间字段若数据过长则省略
---
src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue | 69 ++++++++++++++--------------------
1 files changed, 28 insertions(+), 41 deletions(-)
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
index 6490ffe..0096e25 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
@@ -47,22 +47,22 @@
</a-col> -->
<a-col :span="12">
<a-form-item
- label="瀹夊叏瑕佹眰"
+ label="淇濆吇閮ㄤ綅"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ畨鍏ㄨ姹�'"
- v-decorator="['maintenanceRequire', validatorRules.maintenanceRequire ]"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚儴浣�'"
+ v-decorator="['location', validatorRules.location ]"
/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <!-- <a-col :span="12">
<a-form-item
label="淇濆吇椤圭洰缂栧彿"
:labelCol="labelCol"
@@ -70,12 +70,12 @@
>
<a-input
allow-clear
- :disabled="codeDisable"
+ :disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚」鐩紪鍙�'"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="12">
<a-form-item
label="淇濆吇椤圭洰鍚嶇О"
@@ -90,8 +90,22 @@
/>
</a-form-item>
</a-col>
+ <a-col :span="12">
+ <a-form-item
+ label="淇濆吇鏍囧噯"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏绘爣鍑�'"
+ v-decorator="['standard', validatorRules.standard ]"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="淇濆吇鏂规硶"
@@ -120,26 +134,12 @@
:placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏诲伐鍏�'"
v-decorator="['maintenanceTool', validatorRules.maintenanceTool ]"
/>
- <!-- dictCode="mom_eam_inspection_type,name,id,status!='0' and del_flag!='1'" -->
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
- <a-col :span="12">
- <a-form-item
- label="淇濆吇鏍囧噯"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏绘爣鍑�'"
- v-decorator="['standard', validatorRules.standard ]"
- />
- </a-form-item>
- </a-col>
- <a-col :span="12">
+
+ <!-- <a-col :span="12">
<a-form-item
label="缁翠繚涓撲笟"
:labelCol="labelCol"
@@ -154,9 +154,9 @@
v-decorator="['maintenanceSpecialtyId', validatorRules.maintenanceSpecialtyId]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="宸ユ椂瀹氶"
@@ -172,21 +172,8 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
- <a-form-item
- label="淇濆吇閮ㄤ綅"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚儴浣�'"
- v-decorator="['location', validatorRules.location ]"
- />
- </a-form-item>
- </a-col>
- </a-row>
+
+ </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
--
Gitblit v1.9.3