1

src/components/Dicom/DicomTags.vue

@@ -94,8 +94,16 @@ export default {
           const element = dataSet.elements[propertyName]
           const tag = this.getTag(element.tag)
           elementObject.id = `${this.idx++}${new Date().getTime()}`
-          elementObject.tagCode = element.tag
+          if (!tag) {
-          elementObject.tagName = tag ? tag.name : ''
+            let group = element.tag.substring(1, 5)
+            let el = element.tag.substring(5, 9)
+            elementObject.tagCode = ('(' + group + ',' + el + ')').toUpperCase()
+          } else {
+            elementObject.tagCode = tag ? tag.tag : ''
+            elementObject.tagName = tag ? tag.name : ''
+          }
+          
+          
           elementObject.tagLength = element.length
           elementObject.value = ''
 

src/permission.js

@@ -25,15 +25,15 @@ router.beforeEach(async (to, from, next) => {
     if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
       if (to.path === '/ReviewersResearch') {
         await this.$store.dispatch('user/logout')
-        OSSclient()
+        await OSSclient()
       }
       if (to.path === '/ReviewersResearchForm') {
-        OSSclient()
+        await OSSclient()
       }
       next()
       NProgress.done()
     } else {
-      OSSclient()
+      await OSSclient()
       const hasGetUserInfo = store.getters.userId
       if (hasGetUserInfo) {
         next()
@@ -66,7 +66,7 @@ router.beforeEach(async (to, from, next) => {
       } else {
         // 在免登录whiteList中，直接进入
         if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
-          OSSclient()
+          await OSSclient()
         }
         next()
       }