Merge branch 'master' into dev_xlk

src/App.vue

@@ -26,7 +26,7 @@ export default {
   display: none;
 }
 .backg {
-  background-image: url("./assets/knowledge/backgrand_picture.jpg");
+  background-image: url("./assets/knowledge/backgrand_picture.png");
   background-size: 100% 100%;
   /* margin-top: -170px; */
   background-attachment:fixed;

src/assets/styles/element-variables.scss

@@ -12,7 +12,7 @@ $--color-danger: #ff4949;
 
 $--button-font-weight: 400;
 
-// $--color-text-regular: #1f2d3d;
+$--color-text-regular: #1f2d3d;
 
 $--border-color-light: #dfe4ed;
 $--border-color-lighter: #e6ebf5;
@@ -20,9 +20,9 @@ $--border-color-lighter: #e6ebf5;
 $--table-border: 1px solid #dfe6ec;
 
 
-$--color-white: #232B4C;
+$--color-white: #27668e;
 
-$--background-color-base: #232B4C;
+$--background-color-base: #27668e;
 
 /* icon font path, required */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';

src/assets/styles/ruoyi.scss

@@ -275,50 +275,50 @@
 }
 
 .el-input__inner {
-	background-color: #232B4C;
+	background-color: #27668e;
 }
 
 .el-loading-mask {
 	background-color: transparent;
 }
 .el-form-item__label {
-	color: rgb(191, 203, 217);
+	color: #deedff;
 }
 .el-dialog__title {
-	color: #bfcbd9;
+	color: #deedff;
 }
 
 .el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,.el-menu--horizontal>.el-submenu .el-submenu__title:hover{background-color: transparent;}
 
 
  .el-tooltip__popper.is-dark {
-   background: #303133;
-   color: #ffffff;
+   background: #27668e;
+   color: #deedff;
  }
 
  .el-range-editor--small .el-range-input {
-	background-color: #232B4C;
-	color: #bfcbd9;
+	background-color: #27668e;
+	color: #deedff;
  }
 
  .el-tabs__item {
-	color: #888a8e;
+	color: #deedff;
  }
 
  .el-message-box__title {
-	color: #bfcbd9;
+	color: #deedff;
  }
 
  .el-dialog__body{
-    color: #bfcbd9
+    color: #deedff
 }
 
 .el-table__expand-icon {
-	color: #bfcbd9;
+	color: #deedff;
 }
 
 .el-card {
-	color: #bfcbd9;
+	color: #deedff;
 	background-color: transparent;
 }
 
@@ -331,29 +331,60 @@
 }
 
 .el-link.el-link--default {
-	color: #bfcbd9;
+	color: #deedff;
 }
 
 .el-upload__tip {
-	color: #bfcbd9;
+	color: #deedff;
 }
 
 .el-input__inner {
-	color: #bfcbd9;
+	color: #deedff;
 }
 .el-button--default {
-	color: #bfcbd9;
+	color: #deedff;
 }
 .el-select-dropdown__item {
-	color: #bfcbd9;
+	color: #deedff;
 }
 .el-tabs__item {
-	color: #bfcbd9;
+	color: #deedff;
 }
 .selected {
 	background-color: transparent;
 }
 
 .el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
-    background-color: white;
+    background-color: #265440;
+}
+.el-menu--horizontal > .el-menu-item {
+	color: #deedff;
+}
+
+.el-dropdown-menu__item {
+	color: #deedff;
+}
+
+.el-radio {
+	color: #deedff;
+}
+
+.el-message-box__content {
+	color: #deedff;
+}
+
+.el-checkbox {
+	color: #deedff;
+}
+
+.el-tag.el-tag--info {
+	color: #deedff;
+}
+
+.vue-treeselect__label {
+	color: #303030;
+}
+
+.el-textarea__inner {
+	color: #deedff;
 }

src/layout/components/Navbar.vue

@@ -131,7 +131,7 @@ export default {
 
   .topmenu-container {
     position: absolute;
-    left: 300px;
+    left: 50px;
     background-color: transparent;
   }
 

src/views/extract/info/classCreateV2.vue

@@ -46,7 +46,7 @@
     </el-row>
   </div>
 </template>
-  
+
 <script>
 import { getExtractByHandBySubtaskId, submitBySubTask } from "@/api/suport/hand";
 import { getEntityClassOption } from '@/api/neo4j/class'
@@ -97,7 +97,7 @@ export default {
     getResult(){
       this.loading = true
       getExtractByHandBySubtaskId(this.subTask.id).then(resp =>{
-          
+
           if(resp.data){
             this.extractByHands = resp.data
             for(let extractByHand of this.extractByHands) {
@@ -108,7 +108,7 @@ export default {
           } else {
             this.extractByHands[this.pageNum].details = this.getNewDetails();
           }
-          
+
           this.loading = false
         }
       )
@@ -215,4 +215,4 @@ export default {
   justify-content: center;
   align-items: center;
 }
-</style>
+</style>

src/views/login.vue

@@ -1,4 +1,5 @@
 <template>
+  <div>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <h3 class="title">故障智能分析与维护决策系统</h3>
@@ -59,6 +60,7 @@
       <span>Copyright © 2018-2022 kgraph All Rights Reserved.</span>
     </div>
   </div>
+</div>
 </template>
 
 <script>
@@ -161,13 +163,11 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/knowledge/backgrand_picture.jpg");
-  background-size: cover;
 }
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
-  color: #707070;
+  color: white;
 }
 
 .login-form {

src/views/register.vue

@@ -157,7 +157,7 @@ export default {
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
-  color: #707070;
+  color: #deedff;
 }
 
 .register-form {

src/views/search/pdf/index.vue

@@ -11,7 +11,7 @@
               </div>
             </li>
           <li v-for="(file, index) in fileList" :key="index" @click="showPdf(file)">
-            {{ file.name }}backgrand_picture
+            {{ file.name }}
               <div style="margin-bottom: 15px;">
                 <a>提供单位： <span id="department">xxx</span></a>
                 <a>提供人： <span id="author"></span>xxx</a>

src/views/searchV2/question/index.vue

@@ -11,7 +11,7 @@
         </el-col>
         <el-col :span="12">
           <div class="chat-window-wrapper" ref="chatWindowWrapper">
-            <el-card class="chat-window" ref="chatWindow">
+            <el-card class="chat-window" ref="chatWindow" shadow="never">
               <div v-for="(message, index) in messages" :key="index" class="message">
                 <img
                 :src="message.sender === 'user' ? require('@/assets/search/soldier.png') : require('@/assets/search/robot.png')"