Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/hir_web

.env.development

@@ -7,7 +7,7 @@ VUE_APP_BASE_PATH = '/'
 VUE_APP_IS_TEST = false
 
 # base api
-VUE_APP_BASE_API = 'http://123.56.94.154:7050'
+VUE_APP_BASE_API = 'http://106.14.89.110:7050'
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = false
 
@@ -37,7 +37,7 @@ VUE_APP_WORD_FOR_PERMISSION = false
 
 
 # dicom文件地址
-# VUE_APP_DICOM_PATH = 'http://123.56.94.154:7050'
+# VUE_APP_DICOM_PATH = 'http://106.14.89.110:7050'
 VUE_APP_DICOM_PATH = 'https://zyypacs.oss-cn-shanghai.aliyuncs.com'
 
 VUE_APP_DICOM_USA_PATH = 'https://zyypacs-usa.oss-us-west-1.aliyuncs.com'

.env.production

@@ -33,10 +33,10 @@ VUE_APP_WORD_FOR_PERMISSION = false
 
 
 # dicom文件地址
-# VUE_APP_DICOM_PATH = 'http://123.56.94.154:7050'
+# VUE_APP_DICOM_PATH = 'http://106.14.89.110:7050'
 
 VUE_APP_DICOM_PATH = 'https://zyypacs.oss-cn-shanghai.aliyuncs.com'
-#VUE_APP_DICOM_PATH = 'http://123.56.94.154:7000'
+#VUE_APP_DICOM_PATH = 'http://106.14.89.110:7000'
 #VUE_APP_DICOM_PATH = 'https://zyypacs-mdc.oss-cn-shanghai.aliyuncs.com'
 
 VUE_APP_DICOM_USA_PATH = 'https://zyypacs-usa.oss-us-west-1.aliyuncs.com'

.env.prop

@@ -27,7 +27,7 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!
 VUE_APP_WORD_FOR_PERMISSION = false
 
 # dicom文件地址
-VUE_APP_DICOM_PATH = 'http://123.56.94.154:7020'
+VUE_APP_DICOM_PATH = 'http://106.14.89.110:7020'
 
 VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai'
 

README.md

@@ -1,2 +1 @@
-# hir_web
+[![Build Status](https://drone.frp.extimaging.com/api/badges/XCKJ/hir_web/status.svg)](https://drone.frp.extimaging.com/XCKJ/hir_web)
-

src/permission.js

@@ -45,7 +45,7 @@ router.beforeEach(async (to, from, next) => {
       NProgress.done()
     } else {
       OSSclient()
-      const hasGetUserInfo = store.getters.name
+      const hasGetUserInfo = store.getters.userId
       if (hasGetUserInfo) {
         next()
       } else {

src/store/modules/user.js

@@ -104,6 +104,7 @@ const actions = {
               zzSessionStorage.setItem('userName', data.BasicInfo.UserName)
               commit('SET_TOKEN', data.JWTStr)
               commit('SET_NAME', data.BasicInfo.RealName)
+              zzSessionStorage.setItem('realName', data.BasicInfo.RealName)
               zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser)
               commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser)
               commit('SET_USERNAME', data.BasicInfo.UserName)
@@ -158,7 +159,7 @@ const actions = {
     commit('SET_PERMISSIONS', JSON.parse(zzSessionStorage.getItem('permissions')))
     commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser'))
     const user = JSON.parse(userString)
-    commit('SET_NAME', user.realName)
+    commit('SET_NAME', zzSessionStorage.getItem('realName'))
     commit('SET_USERID', user.id)
     commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))

src/utils/uploadZip.js

@@ -15,6 +15,7 @@ export const downloadImage = async (id, id2) => {
             SubjectVisitId: id2
         }
         let res = await requestPackageAndAnonymizImage(params);
+        flag[id2] = false;
         if (res.IsSuccess) {
             if (!res.Result) {
                 Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
@@ -28,10 +29,11 @@ export const downloadImage = async (id, id2) => {
             a.href = href;
             a.click();
             URL.revokeObjectURL(href);
-            this.$nextTick(() => {
+            let timer = setTimeout(() => {
                 a = null;
                 href = null;
-            });
+                timer = null;
+            }, 500)
             return 2;
         } else {
             return false;

src/views/dicom-show/dicom-series.vue

@@ -128,7 +128,7 @@ export default {
         //   imageIds.push(`wadouri:/api/instance/content/${item}`)
         // })
         // seriesInfo.InstanceList.forEach((id) => {
-        //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
+        //   imageIds.push(`wadouri:http://106.14.89.110:7000/instance/content/${id}`)
         // })
         seriesInfo.InstancePathList.forEach((path) => {
           imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${path}`)

src/views/dicom-show/dicom-study.vue

@@ -207,7 +207,7 @@ export default {
             //   imageIds.push(`wadouri:/api/instance/content/${id}`)
             // })
             // item.InstanceList.forEach((id) => {
-            //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
+            //   imageIds.push(`wadouri:http://106.14.89.110:7000/instance/content/${id}`)
             // })
             item.InstancePathList.forEach((path) => {
               imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${path}`)
@@ -376,7 +376,7 @@ export default {
         //   imageIds.push(`wadouri:/api/instance/content/${item}`)
         // })
         // seriesInfo.InstanceList.forEach((id) => {
-        //   imageIds.push(`wadouri:http://123.56.94.154:7000/instance/content/${id}`)
+        //   imageIds.push(`wadouri:http://106.14.89.110:7000/instance/content/${id}`)
         // })
         seriesInfo.InstancePathList.forEach((path) => {
           imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${path}`)

src/views/system/dicomAE/components/edit-dicom.vue

@@ -147,7 +147,7 @@ export default {
         Port: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("common:ruleMessage:portPattern"),
             trigger: "blur",
           },
           {
@@ -157,6 +157,20 @@ export default {
             message: this.$t("common:ruleMessage:portPattern"),
             trigger: "blur",
           },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                (String(value).includes(".") ||
+                  new RegExp(/\D/g).test(String(value)))
+              ) {
+                callback(new Error(this.$t("common:ruleMessage:portPattern")));
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur",
+          },
         ],
       },
       btnLoading: false,

src/views/system/dicomAE/index.vue

@@ -92,6 +92,13 @@
             }}</el-tag>
           </template>
         </el-table-column>
+        <!--创建时间-->
+        <el-table-column
+          :label="$t('system:dicom:table:CreateTime')"
+          prop="CreateTime"
+          min-width="120"
+          show-overflow-tooltip
+        />
         <!--最后测试时间-->
         <el-table-column
           :label="$t('system:dicom:table:LatestTestTime')"

src/views/system/hospital/index.vue

@@ -165,6 +165,7 @@ export default {
           this.$message.success(this.$t("common:message:savedSuccessfully"));
         }
       } catch (err) {
+        this.btnLoading = false;
         console.log(err);
       }
     },

src/views/system/notice/index.vue

@@ -259,9 +259,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{
+            {{ scope.row.EndDate ? scope.row.EndDate : scope.row.CreateTime }}
-              scope.row.StartDate ? scope.row.StartDate : scope.row.CreateTime
-            }}
           </template>
         </el-table-column>
         <el-table-column
@@ -507,4 +505,11 @@ export default {
     background-color: cadetblue;
   }
 }
+.el-upload-list__item-name {
+  display: inline-block;
+  width: 70%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

src/views/trials/trials-inspection/components/research-trials-list.vue

@@ -207,6 +207,7 @@ export default {
           this.total = this.list.length;
         }
       } catch (err) {
+        this.loading = false;
         console.log(err);
       }
     },
@@ -250,6 +251,7 @@ export default {
           this.$emit("getList");
         }
       } catch (err) {
+        this.loading = false;
         console.log(err);
       }
     },

src/views/trials/trials-panel/reading/reading-tracking/index.vue

@@ -283,9 +283,13 @@
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <!--评估报告disabled-->
-                <el-dropdown-item command="showReport">{{
+                <el-dropdown-item
-                  $t("trials:trials-panel:hirVisit:EvaluationReport")
+                  command="showReport"
-                }}</el-dropdown-item>
+                  :disabled="scope.row.ReadingTaskState !== 2"
+                  >{{
+                    $t("trials:trials-panel:hirVisit:EvaluationReport")
+                  }}</el-dropdown-item
+                >
                 <!--数据导出-->
                 <el-dropdown-item command="downloadImage">{{
                   $t("trials:reading:button:uploadImages")

vue.config.js

@@ -39,8 +39,8 @@ module.exports = {
         // target: 'http://123.56.181.144:8001', // 国内生产环境
         // target: 'http://123.56.181.144:8060/api', // 国内测试环境1
         // target: 'http://123.56.181.144:8000/api', // 国内测试环境
-        // target: 'http://123.56.94.154:8079', // 国内测试环境2
+        // target: 'http://106.14.89.110:8079', // 国内测试环境2
-        target: 'http://123.56.94.154:30010', // 国内测试环境2
+        target: 'http://106.14.89.110:30010', // 国内测试环境2
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,
         secure: false,
@@ -49,7 +49,7 @@ module.exports = {
         }
       },
       '/IRaCISData': {
-        target: 'http://123.56.94.154:30010', // 国内测试环境2
+        target: 'http://106.14.89.110:30010', // 国内测试环境2
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,
         pathRewrite: {
@@ -60,8 +60,8 @@ module.exports = {
         // target: 'http://123.56.181.144:8001', // 国内生产环境
         // target: 'http://123.56.181.144:8060/api', // 国内测试环境1
         // target: 'http://123.56.181.144:8000/api', // 国内测试环境
-        // target: 'http://123.56.94.154:8079', // 国内测试环境2
+        // target: 'http://106.14.89.110:8079', // 国内测试环境2
-        target: 'http://123.56.94.154:30020', // 国内测试环境2
+        target: 'http://106.14.89.110:30020', // 国内测试环境2
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,
         secure: false,