From b8ef2648b324d6e4c7f155e70221290f426a8dd8 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 26 Apr 2024 18:01:27 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E8=A1=A8=E5=8D=95]=20=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E3=80=81=E5=85=B3=E9=97=AD=E8=A1=A8=E5=8D=95=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/font/font.css                      |  7 ---
 src/assets/less/common.less                   | 51 ++++++++++++-------
 src/views/mobile/manage/Manage.vue            |  4 +-
 src/views/mobile/mine/Mine.vue                |  2 +-
 .../EquipmentManagement.vue                   |  4 +-
 .../systemSettings/SystemSettings.vue         |  4 +-
 .../systemSettings/modules/UserInfoModal.vue  |  2 +-
 src/views/user/Login.vue                      |  8 +--
 8 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/assets/font/font.css b/src/assets/font/font.css
index bc44302..8038f08 100644
--- a/src/assets/font/font.css
+++ b/src/assets/font/font.css
@@ -19,13 +19,6 @@
   font-style: normal;
 }
 
-@font-face {
-  font-family: 'DingTalk JinBuTi';
-  src: url('~@assets/font/Alibaba-PuHuiTi-Regular.ttf');
-  font-weight: normal;
-  font-style: normal;
-}
-
 @font-face {
   font-family: 'UnidreamLED';
   src: url('~@assets/font/UnidreamLED.ttf');
diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index d3f9e61..0bf52dd 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -92,6 +92,7 @@
 .ant-table.ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body,
 .ant-table .ant-table-tbody {
   background: #001125;
+  font-family: Rubik, Rubik, sans-serif;
 }
 .ant-table .ant-table-header,
 .ant-table .ant-table-thead,
@@ -222,14 +223,19 @@ input.ant-input,
 textarea.ant-input {
   background-color: transparent;
   transition: all .3s;
-
-  &:hover:not([disabled]) {
-    border-color: rgba(143,199,255,0.65);
-    box-shadow: 0 0 0 1px rgba(143,199,255,0.65) inset;
-  }
-  &:focus:not([disabled]) {
-    border-color: @primary-color;
-    box-shadow: 0 0 0 1px @primary-color inset;
+}
+// 没有提示必填的才会有样式
+.ant-form-item-control:not(.has-error) {
+  input.ant-input,
+  textarea.ant-input {
+    &:hover:not([disabled]) {
+      border-color: rgba(143,199,255,0.65);
+      box-shadow: 0 0 0 1px rgba(143,199,255,0.65) inset;
+    }
+    &:focus:not([disabled]) {
+      border-color: @primary-color;
+      box-shadow: 0 0 0 1px @primary-color inset;
+    }
   }
 }
 .ant-input-affix-wrapper:hover input.ant-input:not(.ant-input-disabled),
@@ -278,21 +284,30 @@ textarea.ant-input {
     background-color: transparent;
     transition: all .3s;
   }
-  .ant-select-selection:hover {
-    border-color: rgba(143,199,255,0.65);
-    box-shadow: 0 0 0 1px rgba(143,199,255,0.65) inset;
-  }
-  .ant-select-focused .ant-select-selection,
-  .ant-select-selection:focus,
-  .ant-select-selection:active {
-    border-color: @primary-color;
-    box-shadow: 0 0 0 1px @primary-color inset;
-  }
   &.ant-select-open .ant-select-selection {
     border-color: @primary-color;
     box-shadow: 0 0 0 1px @primary-color inset;
   }
 }
+// 没有提示必填的才会有样式
+.ant-form-item-control:not(.has-error) {
+  .ant-select {
+    .ant-select-selection:hover {
+      border-color: rgba(143,199,255,0.65);
+      box-shadow: 0 0 0 1px rgba(143,199,255,0.65) inset;
+    }
+    .ant-select-focused .ant-select-selection,
+    .ant-select-selection:focus,
+    .ant-select-selection:active {
+      border-color: @primary-color;
+      box-shadow: 0 0 0 1px @primary-color inset;
+    }
+    &.ant-select-open .ant-select-selection {
+      border-color: @primary-color;
+      box-shadow: 0 0 0 1px @primary-color inset;
+    }
+  }
+}
 /* 下拉框end */
 
 /* 表单禁用样式begin */
diff --git a/src/views/mobile/manage/Manage.vue b/src/views/mobile/manage/Manage.vue
index 35060a6..9174837 100644
--- a/src/views/mobile/manage/Manage.vue
+++ b/src/views/mobile/manage/Manage.vue
@@ -74,7 +74,7 @@
     </div>
     <div class="mb-12">
       <common-card title="添加设备">
-        <a-form :form="deviceForm" class="custom-vertical-form manage-page-form">
+        <a-form :form="deviceForm" class="custom-vertical-form manage-page-form" autocomplete="off">
           <div class="mb-12">
             <a-form-item label="设备名称">
               <a-input placeholder="请输入设备名称" :max-length="50"
@@ -118,7 +118,7 @@
     </div>
     <div class="mb-12">
       <common-card title="添加井口">
-        <a-form :form="wellheadForm" class="custom-vertical-form manage-page-form">
+        <a-form :form="wellheadForm" class="custom-vertical-form manage-page-form" autocomplete="off">
           <div class="mb-12">
             <a-form-item label="所属作业区">
               <a-input placeholder="请输入所属作业区" :max-length="50"
diff --git a/src/views/mobile/mine/Mine.vue b/src/views/mobile/mine/Mine.vue
index ec9e46b..7e973a4 100644
--- a/src/views/mobile/mine/Mine.vue
+++ b/src/views/mobile/mine/Mine.vue
@@ -1,7 +1,7 @@
 <template>
   <a-spin :spinning="loading">
     <div>
-      <a-form :form="form" class="custom-vertical-form">
+      <a-form :form="form" class="custom-vertical-form" autocomplete="off">
         <a-form-item style="margin-bottom: 0;">
           <div class="upload-avatar-box">
 <!--            <j-image-upload v-decorator="['avatar', validatorRules.avatar]"-->
diff --git a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue
index 3991be8..9072d86 100644
--- a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue
+++ b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue
@@ -93,7 +93,7 @@
         <a-row type="flex">
           <a-col flex="1" style="margin-right: 20px">
             <common-card title="添加设备">
-              <a-form :form="deviceForm" class="custom-vertical-form">
+              <a-form :form="deviceForm" class="custom-vertical-form" autocomplete="off">
                 <div class="mb-20">
                   <a-form-item label="设备名称">
                     <a-input placeholder="请输入设备名称" :max-length="50"
@@ -140,7 +140,7 @@
           </a-col>
           <a-col flex="1">
             <common-card title="添加井口">
-              <a-form :form="wellheadForm" class="custom-vertical-form">
+              <a-form :form="wellheadForm" class="custom-vertical-form" autocomplete="off">
                 <div class="mb-20">
                   <a-form-item label="所属作业区">
                     <a-input placeholder="请输入所属作业区" :max-length="50"
diff --git a/src/views/systemOverview/systemSettings/SystemSettings.vue b/src/views/systemOverview/systemSettings/SystemSettings.vue
index aaefca8..0c17af1 100644
--- a/src/views/systemOverview/systemSettings/SystemSettings.vue
+++ b/src/views/systemOverview/systemSettings/SystemSettings.vue
@@ -3,7 +3,7 @@
     <a-row :gutter="20" type="flex" class="mb-20">
       <a-col flex="556px">
         <common-card title="系统设置">
-          <a-form :form="sysSettingForm" class="custom-vertical-form">
+          <a-form :form="sysSettingForm" class="custom-vertical-form" autocomplete="off">
             <div class="mb-20">
               <a-form-item label="服务器IP">
                 <a-input placeholder="请输入服务器IP" :max-length="50"
@@ -87,7 +87,7 @@
     <a-row :gutter="20" type="flex">
       <a-col flex="556px">
         <common-card title="添加用户">
-          <a-form :form="addUserForm" class="custom-vertical-form">
+          <a-form :form="addUserForm" class="custom-vertical-form" autocomplete="off">
             <a-form-item style="margin-bottom: 0;">
               <div class="upload-avatar-box">
                 <j-image-upload v-decorator="['avatar', validatorRules.avatar]"
diff --git a/src/views/systemOverview/systemSettings/modules/UserInfoModal.vue b/src/views/systemOverview/systemSettings/modules/UserInfoModal.vue
index f99dcba..b15d4b3 100644
--- a/src/views/systemOverview/systemSettings/modules/UserInfoModal.vue
+++ b/src/views/systemOverview/systemSettings/modules/UserInfoModal.vue
@@ -11,7 +11,7 @@
     style="top:5%;height: 85%;overflow-y: hidden">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form" class="custom-vertical-form flex-column-between">
+      <a-form :form="form" class="custom-vertical-form flex-column-between" autocomplete="off">
         <a-form-item>
           <div class="upload-avatar-box">
             <j-image-upload v-decorator="['avatar', validatorRules.avatar]"
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 0f54c97..1726d95 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -478,11 +478,11 @@ export default {
           }
         }
         /deep/.ant-input {
-          border: none;
-          border-radius: 0;
+          border: none !important;
+          box-shadow: none !important;
           background: none !important;
-          border-bottom: 0.01rem solid rgba(0,148,255,0.4);
-          box-shadow: none;
+          border-bottom: 0.01rem solid rgba(0,148,255,0.4) !important;
+          border-radius: 0 !important;
           height: 0.48rem;
           padding-left: 0.36rem;
           font-family: PingFang SC, PingFang SC, sans-serif;