n20-common-lib 2.7.20 → 2.7.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.20",
+  "version": "2.7.22",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/operatingStatus/index.vue

@@ -2,8 +2,7 @@
   <el-carousel height="50px" :interval="3000" direction="vertical" indicator-position="none" :autoplay="true">
     <el-carousel-item v-for="tip in tips" :key="tip.id">
       <div v-if="tip.isShow === '1'" v-title:br="list" :class="`tip_color_${tip.style || 'default'}`">
-        {{ tip.busNname }}{{ enumData[tip.busState]
-        }}{{ tip.busNname === $lc('财司系统') ? '(' + tip.currency + ')' : ''
+        {{ tip.busNname }}{{ enumData[tip.busState] }}{{ tip.busCode.includes('CENTER') ? '(' + tip.currency + ')' : ''
         }}{{ tip.isError === '1' ? '(有异常)' : '' }}
       </div>
     </el-carousel-item>
@@ -68,7 +67,7 @@ export default {
       this.list = cloneDeep(data)
         .map((tip) => {
           return `${tip.updateTime || tip.createtime}${tip.busNname}${enumData[tip.busState]}${
-            tip.busNname === $lc('财司系统') ? '(' + tip.currency + ')' : ''
+            tip.busCode.includes('CENTER') ? '(' + tip.currency + ')' : ''
           }`
         })
         .join(',')

package/src/plugins/Sign/NetSM3/index.js

@@ -204,7 +204,7 @@ export async function getSign(plain, dn) {
   let answer
   const checkRes = await getCertInfo(dn)
 
-  if (checkRes != 'checkRes') {
+  if (checkRes === -1 || ['dnListEmpty', 'dnIsEmpty', 'Empty'].includes(checkRes)) {
     switch (checkRes) {
       case 'dnListEmpty':
         Message.warning('没有匹配到证书!')

package/src/plugins/Sign/SkfSign/index.js

@@ -203,7 +203,7 @@ export async function getSign(plain, dn) {
   }
   const checkRes = await getCertInfo(dn)
 
-  if (checkRes) {
+  if (checkRes === -1 || ['dnListEmpty', 'dnIsEmpty', 'Empty'].includes(checkRes)) {
     switch (checkRes) {
       case 'dnListEmpty':
         Message.warning('没有匹配到证书!')

package/src/plugins/Sign/sign.js

@@ -89,8 +89,20 @@ export function getCertInfo(dn) {
   IWSAGetAllCertsListInfoByCertDN('', 'Sign', parseCA(dn), 0, (dnList) => {
     certInfo = verifyDn(dnList, dn)
   })
-  if (certInfo === -1) {
-    Message.warning('没有匹配到证书!')
+  if (checkRes === -1 || ['dnListEmpty', 'dnIsEmpty', 'Empty'].includes(checkRes)) {
+    switch (checkRes) {
+      case 'dnListEmpty':
+        Message.warning('没有匹配到证书!')
+        break
+      case 'dnIsEmpty':
+        Message.warning('DN参数为空!')
+        break
+      case 'Empty':
+        Message.warning('当前Ukey不匹配!')
+        break
+      default:
+        Message.warning('没有匹配到证书!')
+    }
     return ''
   }