From 7e28715b67d1eccee54956ad1a344ac9b393c05e Mon Sep 17 00:00:00 2001
From: liuhr <liuhr@taisoft.com.cn>
Date: Mon, 20 May 2024 10:36:56 +0800
Subject: [PATCH] =?UTF-8?q?[FEAT]:=201.=E4=BF=AE=E6=94=B9=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/json/menuInfo.json           |  2 +-
 src/layouts/MainLayout.vue       | 16 +++++++++-------
 src/layouts/MainScreenLayout.vue | 17 +++++++++--------
 src/layouts/loginIndex.vue       |  4 ++--
 src/pages/Index.vue              |  4 ++--
 src/scan/IndexScanner.vue        |  2 +-
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/json/menuInfo.json b/src/json/menuInfo.json
index cdab6aa..1e15963 100644
--- a/src/json/menuInfo.json
+++ b/src/json/menuInfo.json
@@ -1,5 +1,5 @@
 {
-    "menuName": "PVD管理系统",
+    "menuName": "CVD管理系统",
     "redirect": "/web/Index",
     "path": "/web",
     "name": "web",
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index dd07c48..472715a 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -6,8 +6,9 @@
         <!-- 收起菜單按鈕 -->
         <transition appear enter-active-class="animated zoomIn">
           <q-btn flat @click.capture="menuToggle" round :icon="drawer ? 'menu' : 'menu_open'" class="q-mr-sm">
-            <q-tooltip content-class="bg-amber text-black shadow-4" :offset="[15, 15]" content-style="font-size: 12px">{{
-              drawer ? "打开菜单" : "收起菜单" }}</q-tooltip>
+            <q-tooltip content-class="bg-amber text-black shadow-4" :offset="[15, 15]"
+              content-style="font-size: 12px">{{
+                drawer ? "打开菜单" : "收起菜单" }}</q-tooltip>
           </q-btn>
         </transition>
         <q-separator dark vertical inset />
@@ -18,7 +19,7 @@
           <!-- <q-icon name="img:statics/icons/wms.png" /> -->
           <q-toolbar-title shrink class="text-weight-bold">
             <!-- <q-img src="statics/icons/wms.png" width='28px' height='28px' style="margin-top:-5px" /> -->
-            PVD炉设备运行状态监测
+            CVD炉设备运行状态监测
           </q-toolbar-title>
         </q-btn>
         <!-- </transition> -->
@@ -114,8 +115,8 @@
           <q-form ref="updatePasswordFormRef">
             <div class="row q-col-gutter-md">
               <div class="col-xl-12 col-lg-12 col-xs-12">
-                <q-input class="text-h6" outlined v-model.trim="updatePasswordFormData.oldPassword" label="旧密码" autofocus
-                  :rules="[(val) => (val !== undefined && val !== '') || '请输入旧密码']" />
+                <q-input class="text-h6" outlined v-model.trim="updatePasswordFormData.oldPassword" label="旧密码"
+                  autofocus :rules="[(val) => (val !== undefined && val !== '') || '请输入旧密码']" />
               </div>
               <div class="col-xl-12 col-lg-12 col-xs-12">
                 <q-input class="text-h6" outlined v-model.trim="updatePasswordFormData.password" label="新密码"
@@ -123,8 +124,9 @@
                   @update:model-value="validatePassword" />
               </div>
               <div class="col-xl-12 col-lg-12 col-xs-12">
-                <q-input class="text-h6" outlined v-model.trim="updatePasswordFormData.newPassword" label="确认新密码" :rules="[(val) => (val !== undefined && val !== '') || '请再次输入新密码',
-                (val) => passwordEqual || '两次密码不一致']" @update:model-value="validatePassword" />
+                <q-input class="text-h6" outlined v-model.trim="updatePasswordFormData.newPassword" label="确认新密码"
+                  :rules="[(val) => (val !== undefined && val !== '') || '请再次输入新密码',
+                  (val) => passwordEqual || '两次密码不一致']" @update:model-value="validatePassword" />
               </div>
             </div>
           </q-form>
diff --git a/src/layouts/MainScreenLayout.vue b/src/layouts/MainScreenLayout.vue
index a4733e0..5ed777c 100644
--- a/src/layouts/MainScreenLayout.vue
+++ b/src/layouts/MainScreenLayout.vue
@@ -25,9 +25,9 @@
                         <!-- <q-icon name="img:https://cdn.quasar.dev/logo-v2/svg/logo.svg" /> -->
                         <q-toolbar-title shrink class="text-weight-bold desktop-only">
                             <!-- <q-img src="statics/icons/wms.png" width='28px' height='28px' style="margin-top:-5px" /> -->
-                            PVD炉设备运行状态监测
+                            CVD炉设备运行状态监测
                         </q-toolbar-title>
-                        <q-toolbar-title shrink class="text-weight-bold mobile-only">PVD</q-toolbar-title>
+                        <q-toolbar-title shrink class="text-weight-bold mobile-only">CVD</q-toolbar-title>
                     </q-btn>
                     <q-separator dark vertical inset />
                     <q-btn flat no-caps no-wrap class="q-ml-xs q-mr-xs" :to="{ name: 'screen1' }">
@@ -89,18 +89,19 @@
                                         <q-tooltip content-class="bg-amber text-black shadow-4" :offset="[10, 10]"
                                             content-style="font-size: 12px">用户管理</q-tooltip>
                                     </q-btn>
-                                    <q-btn v-if="userType == 'admin'" style="margin-top: 5px" color="primary" label="PLC管理"
-                                        push v-close-popup icon="img:statics/icons/PLC.png" :to="{ name: 'device' }">
+                                    <q-btn v-if="userType == 'admin'" style="margin-top: 5px" color="primary"
+                                        label="PLC管理" push v-close-popup icon="img:statics/icons/PLC.png"
+                                        :to="{ name: 'device' }">
                                         <q-tooltip content-class="bg-amber text-black shadow-4" :offset="[10, 10]"
                                             content-style="font-size: 12px">PLC控制器管理</q-tooltip>
                                     </q-btn>
-                                    <q-btn v-if="userType == 'admin'" style="margin-top: 5px" color="primary" label="设备管理"
-                                        push v-close-popup icon="apps" :to="{ name: 'equipment' }">
+                                    <q-btn v-if="userType == 'admin'" style="margin-top: 5px" color="primary"
+                                        label="设备管理" push v-close-popup icon="apps" :to="{ name: 'equipment' }">
                                         <q-tooltip content-class="bg-amber text-black shadow-4" :offset="[10, 10]"
                                             content-style="font-size: 12px">设备管理</q-tooltip>
                                     </q-btn>
-                                    <q-btn v-if="userType == 'admin'" style="margin-top: 5px" color="primary" label="系统参数"
-                                        push v-close-popup icon="settings" :to="{ name: 'sysConfig' }">
+                                    <q-btn v-if="userType == 'admin'" style="margin-top: 5px" color="primary"
+                                        label="系统参数" push v-close-popup icon="settings" :to="{ name: 'sysConfig' }">
                                         <q-tooltip content-class="bg-amber text-black shadow-4" :offset="[10, 10]"
                                             content-style="font-size: 12px">系统参数设置</q-tooltip>
                                     </q-btn>
diff --git a/src/layouts/loginIndex.vue b/src/layouts/loginIndex.vue
index bbcc7ae..8d50a59 100644
--- a/src/layouts/loginIndex.vue
+++ b/src/layouts/loginIndex.vue
@@ -3,7 +3,7 @@
     <div class="loginIndex">
       <div class="loginBox">
         <!-- STXinwei -->
-        <div class="text-white text-h3 q-pa-xl" style="letter-spacing: 5px;">PVD炉数据大屏</div>
+        <div class="text-white text-h3 q-pa-xl" style="letter-spacing: 5px;">CVD炉数据大屏</div>
         <!-- <gifIcon :gif-json="gif" class="gif"></gifIcon> -->
         <div class="username">
           <!-- <a>用户名</a> -->
@@ -18,7 +18,7 @@
           <template v-slot:prepend>
             <q-icon name="account_circle" />
           </template>
-        </q-input> -->
+</q-input> -->
           <q-input style="width: 450px" dark rounded standout class="text-h6" placeholder="请输入用户名" label="用户名" autofocus
             v-model="loginFormData.userName" @keyup.enter="login"
             :rules="[(val) => val != undefined && val != '' || '用户名不能为空']">
diff --git a/src/pages/Index.vue b/src/pages/Index.vue
index a29c4f5..033d601 100644
--- a/src/pages/Index.vue
+++ b/src/pages/Index.vue
@@ -6,8 +6,8 @@
           <!-- <q-img src="public/favicon.ico" width='100px' height='100px' /> -->
           长城装备
         </div>
-        <div style="font-size: 32px; letter-spacing: 5px;">PVD系统</div>
-        <!-- <div style="font-size: 32px; letter-spacing: 2px">PVD系统</div> -->
+        <div style="font-size: 32px; letter-spacing: 5px;">CVD系统</div>
+        <!-- <div style="font-size: 32px; letter-spacing: 2px">CVD系统</div> -->
       </div>
       <div class="flex flex-center">
         <LottieWebCimo ref="lottie_web" style="width: 50%; max-width: 80%" />
diff --git a/src/scan/IndexScanner.vue b/src/scan/IndexScanner.vue
index ca95e06..bc029c4 100644
--- a/src/scan/IndexScanner.vue
+++ b/src/scan/IndexScanner.vue
@@ -6,7 +6,7 @@
           WELCOME
         </div>
         <div style="font-size: 18px; letter-spacing: 2px">
-          GreaterPVD
+          GreaterCVD
           <span v-if="isEnglish">&nbsp;</span>
           {{ $t('index.index_title') }}
         </div>