From 3ce2d50102929e6e245249ce61bbadd300f3e24e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 14 八月 2024 16:12:28 +0800
Subject: [PATCH] 设备维护校验调整 OEE列表间距调整
---
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 113 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 41 deletions(-)
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 30a09dd..1908396 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -1,12 +1,11 @@
<template>
- <a-drawer
+ <a-modal
:title="title"
:maskClosable="true"
:width="drawerWidth"
- placement="right"
- :closable="true"
- @close="handleCancel"
+ @cancel="visible=false"
:visible="visible"
+ :footer="null"
style="height: 100%;overflow: auto;padding-bottom: 53px;">
<template slot="title">
@@ -23,15 +22,15 @@
<a-form-model ref="form" :form="form" :model="model" :rules="validatorRules">
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="璁惧缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
+ <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
<a-input-search :readOnly="true"
v-model="model.equipmentId"
- :disabled="disSeach" @search="deviceSearch" enter-button placeholder='璇烽�夋嫨璁惧缂栫爜'/>
+ :disabled="disSeach" @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="disSeach" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ <a-form-model-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentName">
+ <a-input :disabled="disSeach" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
v-model="model.equipmentName"/>
</a-form-model-item>
</a-col>
@@ -39,18 +38,10 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+ <a-form-model-item v-if="isDepartType == 0" label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" 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-col>
- <a-col :span="12">
- <a-form-model-item v-if="isDepartType == 0" label="杞﹂棿鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" 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" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>
- </a-form-model-item>
<a-form-model-item v-if="isDepartType == -1" label="璁惧绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="璇烽�夋嫨璁惧绫诲瀷"
:triggerChange="true"
@@ -60,6 +51,13 @@
</a-select-option>
</a-select>
</a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="杞﹂棿鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" 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" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>
+ </a-form-model-item>
+
</a-col>
</a-row>
<a-row :gutter="24">
@@ -80,7 +78,7 @@
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧鍔熺巼" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="璁惧鍔熺巼(kw)" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囧姛鐜�"
v-model="model.devicePower"/>
</a-form-model-item>
@@ -111,8 +109,8 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧鍨嬪彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囧瀷鍙�"
+ <a-form-model-item label="璁惧鍨嬪彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentModel">
+ <a-input :disabled="disSeach" allow-clear placeholder="璇疯緭鍏ヨ澶囧瀷鍙�"
v-model="model.equipmentModel"/>
</a-form-model-item>
</a-col>
@@ -120,11 +118,32 @@
<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" 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">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="model.deviceLevel" allow-clear/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item label="璁惧绉嶇被" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="model.deviceCategory" allow-clear/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
<a-form-model-item label="鎺掑簭" :labelCol="labelCol" :wrapperCol="wrapperCol">
<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">
<a-col :span='12'>
<a-form-model-item v-if="isDepartType == 0" label="绯荤粺鐗堟湰鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ョ郴缁熺増鏈彿"
@@ -145,14 +164,14 @@
</a-spin>
- <div class="drawer-bootom-button" v-show="!disableSubmit">
- <a-popconfirm title="纭畾鏀惧純缂栬緫锛�" @confirm="handleCancel" okText="纭畾" cancelText="鍙栨秷">
+ <div class="drawer-bottom-button" v-show="!disableSubmit">
+ <a-popconfirm title="纭畾鏀惧純鎿嶄綔锛�" @confirm="close" okText="纭畾" cancelText="鍙栨秷">
<a-button style="margin-right: .8rem">鍙栨秷</a-button>
</a-popconfirm>
<a-button @click="handleSubmit" type="primary" :loading="confirmLoading">鎻愪氦</a-button>
</div>
<device-list-model ref="deviceListModel" @sendSelectionRows="getDeviceRows"></device-list-model>
- </a-drawer>
+ </a-modal>
</template>
@@ -201,14 +220,21 @@
equipmentId:
[
{
- required: true, message: '璇烽�夋嫨璁惧缂栧彿!',
+ required: true, message: '璇烽�夋嫨璁惧缂栧彿!'
},
- // {
- // validator: this.validatequipmentId
- // }
],
- // trigger: 'blur' // 瑙﹀彂鏂瑰紡
-
+ equipmentName:
+ [
+ {
+ required: true, message: '璇疯緭鍏ヨ澶囧悕绉�!'
+ },
+ ],
+ equipmentModel:
+ [
+ {
+ required: true, message: '璇疯緭鍏ヨ澶囧瀷鍙�!'
+ },
+ ],
selectedProduction:
[
{
@@ -226,11 +252,14 @@
equipmentModel: "",
equipmentIp: "",
dataPort: "",
- driveType: ""
+ driveType: "",
+ systemType: "",
+ deviceLevel: "",
+ deviceCategory: ""
},
labelCol: {
xs: { span: 24 },
- sm: { span: 6 },
+ sm: { span: 8 },
},
wrapperCol: {
xs: { span: 24 },
@@ -308,6 +337,7 @@
getDeviceRows(val) {
console.log(val)
if(val.equipmentid ){
+ this.removeValidate()
this.model.equipmentId = val.equipmentid
this.model.equipmentName = val.equipmentname
this.model.equipmentModel = val.equipmentmodel
@@ -347,6 +377,7 @@
that.visible = true;
//鏍规嵁灞忓箷瀹藉害鑷�傚簲鎶藉眽瀹藉害
this.resetScreenSize();
+
// that.userId = record.id;
// console.log(record)
that.model = Object.assign({}, record);
@@ -449,8 +480,6 @@
})
},
-
-
refresh () {
this.userId=""
this.nextDepartOptions=[];
@@ -489,7 +518,7 @@
obj.then((res)=>{
if(res.success){
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
@@ -549,11 +578,6 @@
// }
// })
// },
- handleCancel () {
- this.close()
- },
-
-
// validatequipmentId(rule, value, callback){
// if(!value){
@@ -587,8 +611,15 @@
}else{
this.departIdShow=true;
}
+ },
+ /**
+ * 缂栬緫鎴栨煡鐪嬭鎯呮暟鎹椂娓呴櫎鎶藉眽琛ㄥ崟楠岃瘉
+ */
+ removeValidate(){
+ this.$refs.form.clearValidate()
}
- }
+ },
+
}
</script>
@@ -612,7 +643,7 @@
padding-bottom:10px;
}
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: -8px;
width: 100%;
--
Gitblit v1.9.3