zhangli 2 роки тому
батько
коміт
00f603a997

+ 1 - 1
src/layouts/MainLayout.vue

@@ -814,7 +814,7 @@ background-color: rgba(0, 0, 0, 0.5);
   width: 1.666vw;
   margin-top: 1.04vw;
   margin-left: 2.083vw;
-  height: fit-content;
+  height: 1.5vw;
   /* display: inline-block; */
   -webkit-box-flex: 0;
 }

+ 8 - 1
src/views/modules/knowledge/album/detail.vue

@@ -785,6 +785,11 @@ export default {
     //新增目录
     catalogueHandleOk(){
       let that = this
+      let dataFind = that.albumArr.filter(item=>{return item.name==that.catalogueForm.name;})
+      if(dataFind.length != 0){
+        this.$message.error('目录名称重复。');
+        return false
+      }
       let pushEnd = false
       that.catalogueForm.dataList = []
       let catalogueForm = JSON.parse(JSON.stringify(that.catalogueForm))
@@ -1148,11 +1153,13 @@ export default {
   margin-bottom: 2vw;
 }
 .tableBoxAlbum /deep/.ant-table-thead{
-  height: 4.69791vw;
   font-size: 0.9375vw;
   color: #202124;
   background: #F9F9FA;
 }
+.tableBoxAlbum /deep/tr{
+  height: 3.69791vw;
+}
 .tableBoxAlbum /deep/.ant-table-column-title{
   font-weight: 550;
   font-size: 0.9375vw;

+ 8 - 6
src/views/modules/knowledge/album/index.vue

@@ -125,15 +125,17 @@ export default {
   },
   
   created() {
-    if(this.$router.query.scope) {
-      this.scope = this.$router.query.scope
-    }
-    if (this.user.photo && this.user.photo != '') {
-      this.imgUrl = '/api/api-system/system/core/sysFile/previewFile?fileId='+this.user.photo
-    }
     album.categories().then((res) => {
       this.classifyArr = res.data
     })
+    if (this.user.photo && this.user.photo != '') {
+      this.imgUrl = '/api/api-system/system/core/sysFile/previewFile?fileId='+this.user.photo
+    }
+    if(this.$router.query){
+      if(this.$router.query.scope) {
+        this.scope = this.$router.query.scope
+      }
+    }
   },
   mounted(){
     this.getData()

+ 22 - 39
src/views/modules/knowledge/components/DES.js

@@ -1,43 +1,26 @@
-import cryptoJs from 'crypto-js';
- 
-//随机生成指定数量的16进制key
-export const generatekey = (num) => {
-    let library = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    let key = "";
-    for (var i = 0; i < num; i++) {
-        let randomPoz = Math.floor(Math.random() * library.length);
-        key += library.substring(randomPoz, randomPoz + 1);
-    }
-    return key;
-}
- 
+import CryptoJS from 'crypto-js';
+
 //DES加密
-export const encryptDes = (message, key) => {
-    var keyHex = key
-    var option = { mode: cryptoJs.mode.ECB, padding: cryptoJs.pad.Pkcs7 }
-    console.log(message.toString(cryptoJs.enc.Utf8))
-    console.log(keyHex)
-    console.log(option)
-    var encrypted = cryptoJs.DES.encrypt(message.toString(cryptoJs.enc.Utf8), keyHex, option)
-    console.log(encrypted)
-    return cryptoJs.enc.Base64.stringify(encrypted.ciphertext)
+export const encrypt = (message) => {
+    var key = 'hkc';
+    var keyHex = CryptoJS.enc.Utf8.parse(key);
+    var encrypted = CryptoJS.DES.encrypt(message, keyHex, {
+        mode: CryptoJS.mode.ECB,
+        padding: CryptoJS.pad.Pkcs7
+    });
+    return encrypted.ciphertext.toString(CryptoJS.enc.Base64);
 }
- 
- 
+
 //DES解密
-export const decryptDes = (message, key) => {
-    //var keyHex = cryptoJs.enc.Utf8.parse(key)
-    var keyHex = key
-    //console.log(keyHex)
-    var decrypted = cryptoJs.DES.decrypt(
-        {
-            ciphertext: cryptoJs.enc.Base64.parse(message)
-        },
-        keyHex,
-        {
-            mode: cryptoJs.mode.ECB,
-            padding: cryptoJs.pad.Pkcs7
-        }
-    )
-    return decrypted.toString(cryptoJs.enc.Utf8)
+export const decrypt = (ciphertext) => {
+    var key = 'hkc';
+    var keyHex = CryptoJS.enc.Utf8.parse(key);
+    var decrypted = CryptoJS.DES.decrypt({
+        ciphertext: CryptoJS.enc.Base64.parse(ciphertext)
+    }, keyHex, {
+        mode: CryptoJS.mode.ECB,
+        padding: CryptoJS.pad.Pkcs7
+    });
+    var result = decrypted.toString(CryptoJS.enc.Utf8);
+    return result;
 }

+ 8 - 1
src/views/modules/knowledge/components/pageList.vue

@@ -127,6 +127,7 @@ import header0 from '../../../../image/header0.png'
 import header1 from '../../../../image/header1.png'
 import home from '@/api/knowledge/home'
 import contentData from '@/api/knowledge/contentData'
+import { encrypt, decrypt } from './DES.js'
 import {mapState} from "vuex";
 export default {
   props: {
@@ -189,7 +190,13 @@ export default {
           secretType:data.secretType
         }
         home.viewApi(getData).then((res) => {
-          window.open(res.data)
+          if(this.item.documentPath.indexOf('dcc系统')==0){
+            var encrypts = encrypt(this.user.userId);
+            console.log(this.user);
+            window.open(res.data+"&userId="+encrypts)
+          }else{
+            window.open(res.data)
+          }
         })
       }
     },

+ 4 - 4
src/views/modules/knowledge/home.vue

@@ -41,7 +41,7 @@ import home from '@/api/knowledge/home'
 import search from './components/search'
 import pageBar from './components/pageBar'
 import pageList from './components/pageList'
-import { encryptDes, decryptDes,generatekey } from './components/DES.js'
+import { encrypt, decrypt } from './components/DES.js'
 export default {
   name: 'home',
   components: {
@@ -73,9 +73,9 @@ export default {
   },
   created() {
    this.getBanner()
-   var keys = 'hkc'
-   var encrypts = encryptDes('admin',keys);
-   var dess = decryptDes(encrypts,keys)
+   var keys = '79#t7b87#4e2&61c7*4%*a3!@@f4290f'
+   var encrypts = encrypt('admin',keys);
+   var dess = decrypt('A6kNpE45yG4GolnGbZBsMO+qmPMgXSLB',keys)
    console.log(encrypts)
    console.log(dess)
    //this.getData()