From 20f77a55f8eeaceb026d1c5ad96de75d6edb712a Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 29 五月 2025 14:18:14 +0800
Subject: [PATCH] 1、报警分析页面报警页面调整比例饼图颜色 2、维修看板页面设备平均故障率柱状图Y轴去除%号以及去除柱子注释含义 3、设备管理页面新增弹窗添加禁止手输设备编号，新增安装位置字段（同时将MDC模块内所有设备名称显示调整为安装位置） 4、设备级看板页面的设备选择框新增安装位置显示 5、首页添加法士特沃克背景图 6、对比分析页面解决时间段查询选择框无法选择问题以及柱状图组件重置按钮关联设备树选择 7、OEE页面列表取消展示合格零件数量和加工零件数量字段，仅展示合格率字段
---
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 92 +++++++++++++++++++++++++---------------------
1 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 01384b6..037b5fa 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -19,17 +19,19 @@
</template>
<a-spin :spinning="confirmLoading">
- <a-form-model ref="form" :form="form" :model="model" :rules="validatorRules">
+ <a-form-model ref="form" :form="form" :model="model" :rules="validatorRules" :labelCol="labelCol"
+ :wrapperCol="wrapperCol">
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
- <a-input-search v-model="model.equipmentId" :disabled="disableSubmit" @search="deviceSearch" enter-button
+ <a-form-model-item label="缁熶竴缂栫爜" prop="equipmentId">
+ <a-input-search v-model="model.equipmentId" readOnly :disabled="disableSubmit" @search="deviceSearch"
+ enter-button
placeholder='璇烽�夋嫨缁熶竴缂栫爜'/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ <a-form-model-item label="瀹夎浣嶇疆">
+ <a-input :disabled="disableSubmit || model.id" allow-clear placeholder="璇疯緭鍏ュ畨瑁呬綅缃�"
v-model="model.equipmentName"/>
</a-form-model-item>
</a-col>
@@ -37,14 +39,14 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item v-if="isDepartType == 0" label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol"
+ <a-form-model-item v-if="isDepartType == 0" label="閮ㄩ棬鍒嗛厤"
v-show="!departDisabled">
<j-select-equipment-depart :disabled="disableSubmit" v-model="model.selectedDeparts" :multi="false"
@back="backDepartInfo" :backDepart="true"
:treeOpera="true"></j-select-equipment-depart>
</a-form-model-item>
- <a-form-model-item v-if="isDepartType == -1" label="璁惧绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item v-if="isDepartType == -1" label="璁惧绫诲瀷">
<a-select :disabled="disableSubmit" placeholder="璇烽�夋嫨璁惧绫诲瀷"
:triggerChange="true"
v-model="model.equipmentType">
@@ -55,7 +57,7 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="杞﹂棿鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!productionDisabled"
+ <a-form-model-item label="杞﹂棿鍒嗛厤" v-show="!productionDisabled"
ref="selectedProduction" prop="selectedProduction">
<!--<j-select-equipment-production v-decorator="['selectedProduction',{rules:[{required:true,message:'璇烽�夋嫨杞﹂棿!'}]}]" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>-->
<j-select-equipment-production :disabled="disableSubmit" v-model="model.selectedProduction" :multi="false"
@@ -67,11 +69,11 @@
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item v-if="isDepartType == -1" label="绯荤粺鐗堟湰鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item v-if="isDepartType == -1" label="绯荤粺鐗堟湰鍙�">
<a-input :disabled="disableSubmit" allow-clear placeholder="璇疯緭鍏ョ郴缁熺増鏈彿"
v-model="model.systemVersion"/>
</a-form-model-item>
- <a-form-model-item v-if="isDepartType == 0" label="璁惧绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item v-if="isDepartType == 0" label="璁惧绫诲瀷">
<a-select :disabled="disableSubmit" placeholder="璇烽�夋嫨璁惧绫诲瀷"
:triggerChange="true"
v-model="model.equipmentType">
@@ -83,7 +85,7 @@
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧鍔熺巼(kw)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="璁惧鍔熺巼(kw)">
<a-input :disabled="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囧姛鐜�"
v-model="model.devicePower"/>
</a-form-model-item>
@@ -92,13 +94,13 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="鏈哄簥IP" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" placeholder="璇疯緭鍏ユ満搴奍P"
+ <a-form-model-item label="鏈哄簥IP">
+ <a-input :disabled="true" placeholder="璇疯緭鍏ユ満搴奍P"
v-model="model.equipmentIp"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鏈哄簥绔彛" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="鏈哄簥绔彛">
<a-input :disabled="true" placeholder="璇疯緭鍏ユ満搴婄鍙�"
v-model="model.dataPort"/>
</a-form-model-item>
@@ -107,15 +109,15 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="椹卞姩绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="椹卞姩绫诲瀷">
<j-dict-select-tag :disabled="true" placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
:triggerChange="true" dictCode="mdc_driveType"
v-model="model.driveType" allow-clear/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧鍨嬪彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" allow-clear placeholder="璇疯緭鍏ヨ澶囧瀷鍙�"
+ <a-form-model-item label="璁惧鍨嬪彿">
+ <a-input :disabled="true" allow-clear placeholder="璇疯緭鍏ヨ澶囧瀷鍙�"
v-model="model.equipmentModel"/>
</a-form-model-item>
</a-col>
@@ -123,22 +125,23 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="绯荤粺绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag placeholder="璇烽�夋嫨绯荤粺绫诲瀷" :triggerChange="true" dictCode="system_type" :disabled="disableSubmit"
+ <a-form-model-item label="绯荤粺绫诲瀷">
+ <j-dict-select-tag placeholder="璇烽�夋嫨绯荤粺绫诲瀷" :triggerChange="true" dictCode="system_type"
+ :disabled="disableSubmit"
v-model="model.systemType" allow-clear/>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鎺掑簭" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="鎺掑簭">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="璇疯緭鍏ユ帓搴�"
v-model="model.sortNo" style="width: 100%"/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="24" v-if="systemType">
- <a-col :span='24'>
- <a-form-model-item label="绯荤粺绫诲瀷" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <a-row :gutter="24">
+ <a-col :span='12' v-if="systemType">
+ <a-form-model-item label="绯荤粺绫诲瀷">
<a-radio-group name="radioGroup" v-model="systemValue" :disabled="disableSubmit">
<a-radio value="1">DNC</a-radio>
<a-radio value="2">MDC</a-radio>
@@ -146,12 +149,17 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ <a-col :span='12'>
+ <a-form-model-item label="璁惧鍚嶇О">
+ <a-input v-model="model.equipmentAddress" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span='12'>
- <a-form-model-item v-if="isDepartType == 0" label="绯荤粺鐗堟湰鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item v-if="isDepartType == 0" label="绯荤粺鐗堟湰鍙�">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ョ郴缁熺増鏈彿"
v-model="model.systemVersion"/>
</a-form-model-item>
@@ -224,7 +232,7 @@
equipmentId:
[
{
- required: true, message: '璇烽�夋嫨璁惧缂栧彿!'
+ required: true, message: '璇烽�夋嫨璁惧缂栧彿锛�', trigger: 'change'
}
// {
// validator: this.validatequipmentId
@@ -235,7 +243,7 @@
selectedProduction:
[
{
- required: true, message: '璇烽�夋嫨杞﹂棿'
+ required: true, message: '璇烽�夋嫨杞﹂棿锛�'
}
]
@@ -355,7 +363,7 @@
console.log(val)
if (val.equipmentid) {
this.model.equipmentId = val.equipmentid
- this.model.equipmentName = val.equipmentname
+ this.model.equipmentAddress = val.equipmentname
this.model.equipmentModel = val.equipmentmodel
this.model.equipmentIp = val.equipmentip
this.model.dataPort = val.dataport
@@ -405,7 +413,7 @@
this.$nextTick(() => {
this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
- 'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName', 'systemValue'))
+ 'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName', 'systemValue', 'equipmentAddress'))
})
if (record.hasOwnProperty('id')) {
// that.getUserRoles(record.id);
@@ -431,7 +439,7 @@
if (screenWidth < 500) {
this.drawerWidth = screenWidth
} else {
- this.drawerWidth = 700
+ this.drawerWidth = 800
}
},
getUserDeparts(userid) {
@@ -525,20 +533,20 @@
// if(this.model.userIdentity!==2){
// this.model.departIds="";
// }
- if (this.systemValue==null){
- this.$message.warning('璇烽�夋嫨绯荤粺绫诲瀷!');
- return false;
+ if (this.systemValue == null) {
+ this.$message.warning('璇烽�夋嫨绯荤粺绫诲瀷!')
+ return false
}
- let obj;
- if(!this.model.id){
- this.model.id = this.userId;
- this.model.systemValue=this.systemValue;
- obj=addEquipment(this.model);
- }else{
- this.model.systemValue=this.systemValue;
- obj=editEquipment(this.model,{
- id: this.model.id
- });
+ let obj
+ if (!this.model.id) {
+ this.model.id = this.userId
+ this.model.systemValue = this.systemValue
+ obj = addEquipment(this.model)
+ } else {
+ this.model.systemValue = this.systemValue
+ obj = editEquipment(this.model, {
+ id: this.model.id
+ })
}
obj.then((res) => {
if (res.success) {
--
Gitblit v1.9.3