From 60b945f2eebee0e121c8b4ad06a176d7e25c31cd Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 7 May 2024 18:02:56 +0800
Subject: [PATCH] plm BM

---
 src/views/common/login.vue                         | 14 +++++++++++++-
 src/views/main-navbar.vue                          |  4 ++--
 .../modules/project/projectInfo/projectInfo.vue    |  4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index 4bf55e5..98b76f4 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="site-wrapper site-page--login">
     <div class="site-content__wrapper">
+      <div  style="text-align: right;float: right;margin-top: 0%;height: 30%;width: 100%;vertical-align:middle;" >
+        <img style="margin-top: 5px;margin-right: 5px;max-width:  10%;max-height: 100%;vertical-align:middle;" src="~@/assets/img/ccl.png" >
+      </div>
       <div class="site-content">
         <div class="login-main">
           <h3 class="login-title">用户登陆</h3>
@@ -202,7 +205,16 @@
       padding: 15% 60px 180px;
       width: 350px;
       min-height: 100%;
-      background-color: #fff;
+      background-color: transparent;
+    }
+    .login-main-2 {
+      position: absolute;
+      top: 0;
+      right: 0;
+      padding: 15% 60px 180px;
+      width: 350px;
+      min-height: 100%;
+      background-color: transparent;
     }
     .login-title {
       font-size: 30px;
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index a2d1a19..46b8d65 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -10,7 +10,7 @@
             <icon-svg name="zhedie"></icon-svg>
           </el-menu-item>
         </el-menu>
-        <a class="site-navbar__brand-lg" href="javascript:;">{{'产品生命周期管理系统'}}</a>
+        <a class="site-navbar__brand-lg" href="javascript:;">{{'CCL PLM'}}</a>
         <a class="site-navbar__brand-mini" href="javascript:;">{{ pageLanguage.abbreviation }}</a>
       </h1>
 
@@ -484,7 +484,7 @@ export default {
   margin: 0 5px;
   color: #fff;
   margin-left: -25px;
-  font-size: 17px;
+  font-size: 18px;
 }
 
 .el-menu--horizontal > .el-menu-item {
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 7a2a555..4db3164 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -686,7 +686,7 @@
             serialNumber: '101002001Table1Priority',
             tableId: "101002001Table1",
             tableName: "项目信息主表",
-            columnProp: "priority",
+            columnProp: "priorityDesc",
             headerAlign: "center",
             align: "left",
             columnLabel: "优先级",
@@ -758,7 +758,7 @@
             serialNumber: '101002001Table1ProjectSource',
             tableId: "101002001Table1",
             tableName: "项目信息主表",
-            columnProp: "projectSource",
+            columnProp: "projectSourceDesc",
             headerAlign: "center",
             align: "left",
             columnLabel: "项目来源",