n20-common-lib 1.3.151 → 1.3.153

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.151",
+  "version": "1.3.153",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/LoginTemporary/form.vue

@@ -280,11 +280,17 @@ export default {
       this.$refs['login-form'].validate((valid) => {
         if (!valid) return false
         auth.removeToken()
-        this.beforeLogin().then(() => {
+        if(this.beforeLogin){
+          this.beforeLogin().then(() => {
+            this.theType === 'account' && this.passwordLogin()
+            this.theType === 'pthon' && this.phoneLogin()
+            this.theType === 'accountPthon' && this.accountPthonLogin()
+          })
+        } else {
           this.theType === 'account' && this.passwordLogin()
           this.theType === 'pthon' && this.phoneLogin()
           this.theType === 'accountPthon' && this.accountPthonLogin()
-        })
+        }
 
       })
     },

package/src/plugins/Sign/index.js

@@ -1,3 +1,4 @@
+import { Notification } from 'element-ui';
 export async function getSign(p1, p2, p3) {
   let signType = window.sessionStorage.getItem('signType')
   let CaMap = {
@@ -10,11 +11,51 @@ export async function getSign(p1, p2, p3) {
     console.error('请设置签名服务公司sessionStorage.signType,公司字段映射:', CaMap)
     signType = 'inetSign'
   }
-  const por = new Promise((resolve) => {
+  // 检测信安助手安装
+ async function testNetSignCNG() {
+    let num = 0
+    let flag;
+    var PortList = [63451, 63455, 63460, 52100, 52110, 52150, 43110, 45130, 47101]
+    flag = await new Promise(resolve => {
+      function getPort() {
+        const port = PortList[num]
+        let scrpt = document.createElement('script')
+        scrpt.src = `https://127.0.0.1:${port}`
+        scrpt.addEventListener('load', function () {
+          resolve(true)
+          return
+        })
+        scrpt.addEventListener('error', function () {
+          num++
+          if (num < PortList.length) {
+            getPort()
+          } else {
+            resolve(false)
+          }
+        })
+        document.body.appendChild(scrpt)
+      }
+      getPort()
+    })
+    return flag
+  }
+  const por = new Promise( (resolve) => {
     if (signType === 'inetSign' /* 信安CA */) {
-      import('./sign.js').then(({ getSign }) => {
-        const sign = getSign(p1, p2, p3)
-        resolve(sign)
+      testNetSignCNG().then(res => {
+        if (res) {
+          import('./sign.js').then(({getSign}) => {
+            const sign = getSign(p1, p2, p3)
+            resolve(sign)
+          })
+        } else {
+          Notification({
+            title: '提示',
+            dangerouslyUseHTMLString: true,
+            message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="/portal/server-assets/NetSignCNG-v2.1.152.2.exe" download>下载安装</a>NetSignCNG签名助手</div>`,
+            duration: 5000
+          })
+          resolve('')
+        }
       })
     } else if (signType === 'bjcaSign' /* 北京CA */) {
       import('./bjca/index.js').then(({ getSign }) => {
@@ -28,10 +69,22 @@ export async function getSign(p1, p2, p3) {
         resolve(ItrusSign)
       })
     } else if (signType === 'SkfSign' /* 信安国密CA */) {
-      import('./SkfSign/index.js').then(({ getSign }) => {
-        const SkfSign = getSign(p1, p2, p3)
-        resolve(SkfSign)
-      })
+     testNetSignCNG().then(res =>{
+       if (res) {
+         import('./SkfSign/index.js').then(({getSign}) => {
+           const SkfSign = getSign(p1, p2, p3)
+           resolve(SkfSign)
+         })
+       } else {
+         Notification({
+           title: '提示',
+           dangerouslyUseHTMLString: true,
+           message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="/portal/server-assets/NetSignCNG-v2.1.152.2.exe" download>下载安装</a>NetSignCNG签名助手</div>`,
+           duration: 5000
+         })
+         resolve('')
+       }
+     })
     }
   })
   return por