From 79238fca27692f111c9fa4961ab02814839369a7 Mon Sep 17 00:00:00 2001
From: gtz217 <535262213@qq.com>
Date: Thu, 17 Mar 2022 10:52:22 +0800
Subject: [PATCH 1/2] 1

---
 src/layout/components/Navbar.vue              | 4 ++--
 src/views/dashboard/components/PortDetail.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 80e37a8..5bf80fe 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -11,10 +11,10 @@
 
     <div class="right-menu">
 
-      <div v-if="showhome" class="right-menu-back" @click="toHome">
+      <!-- <div v-if="showhome" class="right-menu-back" @click="toHome">
         <svg-icon class="item-icon" icon-class="home" />
         {{ 'navbar.homepage' | i18nFilter }}
-      </div>
+      </div> -->
 
       <template>
         <lang-select class="right-menu-item hover-effect" />
diff --git a/src/views/dashboard/components/PortDetail.vue b/src/views/dashboard/components/PortDetail.vue
index da16705..81d6201 100644
--- a/src/views/dashboard/components/PortDetail.vue
+++ b/src/views/dashboard/components/PortDetail.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: gtz
- * @LastEditTime: 2022-03-16 20:06:20
+ * @LastEditTime: 2022-03-17 10:49:54
  * @Description:
 -->
 <template>
-- 
2.45.2


From 61270a542dfabd4235c4fc62fb8301f721ae98dd Mon Sep 17 00:00:00 2001
From: gtz217 <535262213@qq.com>
Date: Thu, 17 Mar 2022 10:56:24 +0800
Subject: [PATCH 2/2] base eq

---
 .../basicData/Equipment/components/equipmentInfo-add.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/basicData/Equipment/components/equipmentInfo-add.vue b/src/views/basicData/Equipment/components/equipmentInfo-add.vue
index 6ea5827..0f85ac3 100644
--- a/src/views/basicData/Equipment/components/equipmentInfo-add.vue
+++ b/src/views/basicData/Equipment/components/equipmentInfo-add.vue
@@ -57,7 +57,7 @@
             <!-- <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
               <el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
             </el-form-item> -->
-            <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="EquipmentType">
+            <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
               <el-select v-model="dataForm.equipmentType" :placeholder="this.$t('module.basicData.cache.logisticsEquipment')" default>
                 <el-option
                   v-for="item in options"
@@ -399,7 +399,7 @@ export default {
         code: '',
         enName: '',
         abbr: '',
-        equipmentType: this.$t('module.basicData.cache.logisticsEquipment'),
+        equipmentType: '',
         spec: '',
         createTime: '',
         enterTime: '',
@@ -442,6 +442,11 @@ export default {
           required: true,
           message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentCode')]),
           trigger: 'blur'
+        }],
+        equipmentType: [{
+          required: true,
+          message: this.$i18nForm(['placeholder.select', this.$t('module.basicData.equipment.EquipmentType')]),
+          trigger: 'blur'
         }]
         // maintenanceCycle: [{
         //   required: true,
-- 
2.45.2