allen 2 жил өмнө
parent
commit
ba6b38a36f

+ 116 - 0
package-lock.json

@@ -46,6 +46,7 @@
         "vue": "2.6.12",
         "vue-count-to": "1.0.13",
         "vue-cropper": "0.5.5",
+        "vue-doc-preview": "^0.3.2",
         "vue-meta": "2.4.0",
         "vue-pdf": "^4.3.0",
         "vue-router": "3.4.9",
@@ -11639,6 +11640,17 @@
         "node": ">=0.12"
       }
     },
+    "node_modules/marked": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmmirror.com/marked/-/marked-0.4.0.tgz",
+      "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==",
+      "bin": {
+        "marked": "bin/marked"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz",
@@ -18421,6 +18433,58 @@
       "resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.5.5.tgz",
       "integrity": "sha512-5mGaBlS1EwLxUFwHHX2Q8zOZSiVfBUjOfolR+ZNKwu7Rh3u+GhwHYOyFkgZHhhoQBBNdyVB28O6W+MpMimhCbA=="
     },
+    "node_modules/vue-doc-preview": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmmirror.com/vue-doc-preview/-/vue-doc-preview-0.3.2.tgz",
+      "integrity": "sha512-1zRW/LOLpgtt+bdb4jRzsKfOngkJYzFJsKT0uH4/KqdUMVo7W8jhYUuVcllnw5mHVL/l4v3JESsqX+i8v3uhRw==",
+      "dependencies": {
+        "axios": "^0.18.0",
+        "highlight.js": "^9.12.0",
+        "marked": "^0.4.0"
+      }
+    },
+    "node_modules/vue-doc-preview/node_modules/axios": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.18.1.tgz",
+      "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+      "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
+      "dependencies": {
+        "follow-redirects": "1.5.10",
+        "is-buffer": "^2.0.2"
+      }
+    },
+    "node_modules/vue-doc-preview/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/vue-doc-preview/node_modules/follow-redirects": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.5.10.tgz",
+      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "dependencies": {
+        "debug": "=3.1.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/vue-doc-preview/node_modules/is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/vue-doc-preview/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
     "node_modules/vue-eslint-parser": {
       "version": "7.11.0",
       "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
@@ -29356,6 +29420,11 @@
         }
       }
     },
+    "marked": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmmirror.com/marked/-/marked-0.4.0.tgz",
+      "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="
+    },
     "material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz",
@@ -35063,6 +35132,53 @@
       "resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.5.5.tgz",
       "integrity": "sha512-5mGaBlS1EwLxUFwHHX2Q8zOZSiVfBUjOfolR+ZNKwu7Rh3u+GhwHYOyFkgZHhhoQBBNdyVB28O6W+MpMimhCbA=="
     },
+    "vue-doc-preview": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmmirror.com/vue-doc-preview/-/vue-doc-preview-0.3.2.tgz",
+      "integrity": "sha512-1zRW/LOLpgtt+bdb4jRzsKfOngkJYzFJsKT0uH4/KqdUMVo7W8jhYUuVcllnw5mHVL/l4v3JESsqX+i8v3uhRw==",
+      "requires": {
+        "axios": "^0.18.0",
+        "highlight.js": "^9.12.0",
+        "marked": "^0.4.0"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.18.1",
+          "resolved": "https://registry.npmmirror.com/axios/-/axios-0.18.1.tgz",
+          "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+          "requires": {
+            "follow-redirects": "1.5.10",
+            "is-buffer": "^2.0.2"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.5.10",
+          "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.5.10.tgz",
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+          "requires": {
+            "debug": "=3.1.0"
+          }
+        },
+        "is-buffer": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-2.0.5.tgz",
+          "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
     "vue-eslint-parser": {
       "version": "7.11.0",
       "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",

+ 1 - 0
package.json

@@ -73,6 +73,7 @@
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
+    "vue-doc-preview": "^0.3.2",
     "vue-meta": "2.4.0",
     "vue-pdf": "^4.3.0",
     "vue-router": "3.4.9",

+ 1 - 1
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;

BIN
src/assets/knowledge/backgrand_picture.png


+ 3 - 3
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';

+ 46 - 19
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,56 @@
 }
 
 .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;
 }

+ 1 - 1
src/layout/components/Navbar.vue

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

+ 6 - 3
src/views/extract/info/classCreateV2.vue

@@ -22,7 +22,8 @@
     <el-row>
       <el-col :span="12">
         <div style="margin: 10px; max-height: calc(100vh - 220px);overflow: auto;">
-          <ViewPdf :src="showPdfPath"/>
+          <!-- <ViewPdf :src="showPdfPath" :show-toolbar="false" :show-navigation="false"/> -->
+          <vue-doc-preview :url="showPdfPath" :showDownloadButton="false" type="office"/>
         </div>
       </el-col>
       <el-col :span="12">
@@ -52,10 +53,11 @@ import { getExtractByHandBySubtaskId, submitBySubTask } from "@/api/suport/hand"
 import { getEntityClassOption } from '@/api/neo4j/class'
 import { getDocPathBySunTaskId } from '@/api/extract/subTask'
 import ViewPdf from '@/views/search/pdf/view'
+import VueDocPreview from 'vue-doc-preview';
 
 export default {
   name: "ClassCreateResult",
-  components: { ViewPdf },
+  components: { ViewPdf, VueDocPreview },
   props:{
     subTask: {
       type: Object,
@@ -141,7 +143,8 @@ export default {
     },
     getPdfPath(){
       getDocPathBySunTaskId(this.subTask.id).then(resp => {
-        this.showPdfPath = process.env.VUE_APP_BASE_API + resp.data
+        this.showPdfPath = 'http://localhost'+ process.env.VUE_APP_BASE_API + resp.data
+        // this.showPdfPath = 'C:/Users/allen/Desktop/test/nginx.docx'
       })
     },
     handleApprove(isApprove) {

+ 3 - 3
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 {

+ 1 - 1
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 {

+ 1 - 1
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>

+ 1 - 1
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')"