From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 4d41e23..7bc3c27 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -22,10 +22,10 @@
<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">
@@ -78,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>
@@ -118,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="璇疯緭鍏ョ郴缁熺増鏈彿"
@@ -143,8 +164,8 @@
</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>
@@ -224,11 +245,14 @@
equipmentModel: "",
equipmentIp: "",
dataPort: "",
- driveType: ""
+ driveType: "",
+ systemType: "",
+ deviceLevel: "",
+ deviceCategory: ""
},
labelCol: {
xs: { span: 24 },
- sm: { span: 6 },
+ sm: { span: 8 },
},
wrapperCol: {
xs: { span: 24 },
@@ -611,7 +635,7 @@
padding-bottom:10px;
}
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: -8px;
width: 100%;
--
Gitblit v1.9.3