1

Merge branch 'uat' into uat_us
1
2024-07-30 13:42:24 +08:00 · 2024-07-30 13:33:09 +08:00 · 2024-07-30 10:43:24 +08:00 · 2024-07-30 10:18:31 +08:00 · 2024-07-25 14:54:41 +08:00 · 2024-07-24 13:10:42 +08:00
8 changed files with 198 additions and 197 deletions
--- a/.env.usa
+++ b/.env.usa
@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-12/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-30/'

 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
--- a/.env.usa_prod
+++ b/.env.usa_prod
@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-11/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-30/'

 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
--- a/src/components/Dicom/DicomCanvas.vue
+++ b/src/components/Dicom/DicomCanvas.vue
@ -874,192 +874,192 @@ export default {
      this.setAllToolsPassive()
    },
    onContextmenu(event) {
-      const colormapsList = cornerstone.colors.getColormapsList()
-      const colorItems = []
-      colorItems.push({
-        label: '默认值',
-        onClick: () => {
-          this.setColormap()
-        }
-      })
-      colormapsList.forEach(colormap => {
-        const item = {}
-        item.label = colormap.name
-        item.onClick = () => {
-          this.setColormap(colormap.id)
-        }
-        colorItems.push(item)
-      })
-      this.$contextmenu({
-        items: [
-          {
-            label: '移动',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Pan')
-            }
-          },
-          {
-            label: '缩放',
-            divided: true,
-            children: [
-              {
-                label: '自由缩放',
-                onClick: () => {
-                  this.setToolActive('Zoom')
-                }
-              },
-              {
-                label: '适应图像',
-                onClick: () => {
-                  this.fitToWindow()
-                }
-              },
-              {
-                label: '适应窗口',
-                onClick: () => {
-                  this.fitToImage()
-                }
-              }
-            ]
-          },
-          {
-            label: '透镜',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Magnify')
-            }
-          },
-          {
-            label: '旋转',
-            divided: true,
-            children: [
-              {
-                label: '默认值',
-                onClick: () => {
-                  this.resetRotate()
-                }
-              },
-              {
-                label: '自由旋转',
-                onClick: () => {
-                  this.setToolActive('Rotate')
-                }
-              },
-              {
-                label: '水平翻转',
-                onClick: () => {
-                  this.setRotate(true, false, 0)
-                }
-              },
-              {
-                label: '垂直翻转',
-                onClick: () => {
-                  this.setRotate(false, true, 0)
-                }
-              },
-              {
-                label: '左转90度',
-                onClick: () => {
-                  this.setRotate(false, false, -90)
-                }
-              },
-              {
-                label: '右转90度',
-                onClick: () => {
-                  this.setRotate(false, false, 90)
-                }
-              }
-            ]
-          },
+      // const colormapsList = cornerstone.colors.getColormapsList()
+      // const colorItems = []
+      // colorItems.push({
+      //   label: '默认值',
+      //   onClick: () => {
+      //     this.setColormap()
+      //   }
+      // })
+      // colormapsList.forEach(colormap => {
+      //   const item = {}
+      //   item.label = colormap.name
+      //   item.onClick = () => {
+      //     this.setColormap(colormap.id)
+      //   }
+      //   colorItems.push(item)
+      // })
+      // this.$contextmenu({
+      //   items: [
+      //     {
+      //       label: '移动',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Pan')
+      //       }
+      //     },
+      //     {
+      //       label: '缩放',
+      //       divided: true,
+      //       children: [
+      //         {
+      //           label: '自由缩放',
+      //           onClick: () => {
+      //             this.setToolActive('Zoom')
+      //           }
+      //         },
+      //         {
+      //           label: '适应图像',
+      //           onClick: () => {
+      //             this.fitToWindow()
+      //           }
+      //         },
+      //         {
+      //           label: '适应窗口',
+      //           onClick: () => {
+      //             this.fitToImage()
+      //           }
+      //         }
+      //       ]
+      //     },
+      //     {
+      //       label: '透镜',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Magnify')
+      //       }
+      //     },
+      //     {
+      //       label: '旋转',
+      //       divided: true,
+      //       children: [
+      //         {
+      //           label: '默认值',
+      //           onClick: () => {
+      //             this.resetRotate()
+      //           }
+      //         },
+      //         {
+      //           label: '自由旋转',
+      //           onClick: () => {
+      //             this.setToolActive('Rotate')
+      //           }
+      //         },
+      //         {
+      //           label: '水平翻转',
+      //           onClick: () => {
+      //             this.setRotate(true, false, 0)
+      //           }
+      //         },
+      //         {
+      //           label: '垂直翻转',
+      //           onClick: () => {
+      //             this.setRotate(false, true, 0)
+      //           }
+      //         },
+      //         {
+      //           label: '左转90度',
+      //           onClick: () => {
+      //             this.setRotate(false, false, -90)
+      //           }
+      //         },
+      //         {
+      //           label: '右转90度',
+      //           onClick: () => {
+      //             this.setRotate(false, false, 90)
+      //           }
+      //         }
+      //       ]
+      //     },

-          {
-            label: '测量',
-            divided: true,
-            minWidth: 0,
-            children: [
-              {
-                label: '探针',
-                onClick: () => {
-                  this.setToolActive('Probe')
-                }
-              },
-              {
-                label: '长度测量',
-                onClick: () => {
-                  this.setToolActive('Length')
-                }
-              },
-              {
-                label: '角度测量',
-                onClick: () => {
-                  this.setToolActive('Angle')
-                }
-              },
-              {
-                label: 'Cobb测量',
-                onClick: () => {
-                  this.setToolActive('CobbAngle')
-                }
-              },
-              {
-                label: '椭圆测量',
-                onClick: () => {
-                  this.setToolActive('EllipticalRoi')
-                }
-              },
-              {
-                label: '矩形测量',
-                onClick: () => {
-                  this.setToolActive('RectangleRoi')
-                }
-              },
-              {
-                label: '多边形标记',
-                onClick: () => {
-                  this.setToolActive('FreehandRoi')
-                }
-              },
-              {
-                label: '十字线',
-                onClick: () => {
-                  this.setToolActive('Bidirectional')
-                }
-              },
-              {
-                label: '文字标注',
-                onClick: () => {
-                  this.setToolActive('ArrowAnnotate')
-                }
-              }
-            ]
-          },
-          {
-            label: '调窗',
-            divided: true,
-            onClick: () => {
-              this.setToolActive('Wwwc')
-            }
-          },
-          {
-            label: '反色',
-            divided: true,
-            onClick: () => {
-              this.toggleInvert()
-            }
-          },
-          {
-            label: '伪彩',
-            children: colorItems
-          }
-        ],
-        event,
-        // x: event.clientX,
-        // y: event.clientY,
-        customClass: 'class-a',
-        zIndex: 3,
-        minWidth: 100
-      })
+      //     {
+      //       label: '测量',
+      //       divided: true,
+      //       minWidth: 0,
+      //       children: [
+      //         {
+      //           label: '探针',
+      //           onClick: () => {
+      //             this.setToolActive('Probe')
+      //           }
+      //         },
+      //         {
+      //           label: '长度测量',
+      //           onClick: () => {
+      //             this.setToolActive('Length')
+      //           }
+      //         },
+      //         {
+      //           label: '角度测量',
+      //           onClick: () => {
+      //             this.setToolActive('Angle')
+      //           }
+      //         },
+      //         {
+      //           label: 'Cobb测量',
+      //           onClick: () => {
+      //             this.setToolActive('CobbAngle')
+      //           }
+      //         },
+      //         {
+      //           label: '椭圆测量',
+      //           onClick: () => {
+      //             this.setToolActive('EllipticalRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '矩形测量',
+      //           onClick: () => {
+      //             this.setToolActive('RectangleRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '多边形标记',
+      //           onClick: () => {
+      //             this.setToolActive('FreehandRoi')
+      //           }
+      //         },
+      //         {
+      //           label: '十字线',
+      //           onClick: () => {
+      //             this.setToolActive('Bidirectional')
+      //           }
+      //         },
+      //         {
+      //           label: '文字标注',
+      //           onClick: () => {
+      //             this.setToolActive('ArrowAnnotate')
+      //           }
+      //         }
+      //       ]
+      //     },
+      //     {
+      //       label: '调窗',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.setToolActive('Wwwc')
+      //       }
+      //     },
+      //     {
+      //       label: '反色',
+      //       divided: true,
+      //       onClick: () => {
+      //         this.toggleInvert()
+      //       }
+      //     },
+      //     {
+      //       label: '伪彩',
+      //       children: colorItems
+      //     }
+      //   ],
+      //   event,
+      //   // x: event.clientX,
+      //   // y: event.clientY,
+      //   customClass: 'class-a',
+      //   zIndex: 3,
+      //   minWidth: 100
+      // })
      return false
    },
    getToolSate() {
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@ -91,21 +91,21 @@ export default {
        Code: [
          {
            required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
            trigger: "blur",
          },
        ],
        EMail: [
          {
            required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
            trigger: "blur",
          },
        ],
        username: [
          {
            required: true,
-            message: this.$t("common:ruleMessage:specify"),
+            message: this.$t("mfa:ruleMessage:specify"),
            trigger: "blur",
          },
        ],
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@ -85,13 +85,13 @@
          sortable="custom"
          show-overflow-tooltip
        />
-        <el-table-column
+        <!-- <el-table-column
          :label="$t('trials:loginLog:table:IPRegion')"
          prop="IPRegion"
          min-width="120"
          show-overflow-tooltip
          sortable="custom"
-        />
+        /> -->
        <el-table-column
          :label="$t('system:loginLog:table:LoginFaildName')"
          prop="LoginFaildName"
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@ -7,7 +7,7 @@
        {{ language==='en'?question.GroupEnName:question.GroupName }}
      </h4>
    </div>
-    <template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" />
+    <template v-else-if="((question.QuestionType === 56) && question.IsBaseLineTask)" />
    <template v-else>
      <el-form-item
        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0"
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@ -29,7 +29,7 @@
                  class="title"
                >
                  {{ item.QuestionName }}
-                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">(请重新评估)</span>
+                  <span v-if="isFirstChangeTask && item.TableQuestions.Answers.length > 0" style="color:red;font-size: 12px;">{{ $t("trials:reading:dicom:IRecist:reevaluate") }}</span>
                </div>
                <div v-else class="title">
                  {{ item.QuestionName }}
--- a/src/views/trials/trials-panel/reading/none-dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/index.vue
@ -59,7 +59,7 @@
      :show-close="false"
    >
      <span slot="title" class="dialog-footer">
-        当前阅片任务存在临床数据，请查看。若已查看，请点击“确认”
+        {{ $t('trials:reading:noneDicom:tip:hasCllinicalData') }}
      </span>
      <div :style="{'height':dialogH,'margin':0}">
        <ClinicalData
@ -70,7 +70,7 @@
      </div>

      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleConfirmCD">确认</el-button>
+        <el-button type="primary" @click="handleConfirmCD">{{$t("common:button:confirm")}}</el-button>
      </span>
    </el-dialog>

@ -136,7 +136,8 @@ export default {
    this.readingTool = this.$router.currentRoute.query.readingTool
    this.isNewSubject = this.$router.currentRoute.query.isNewSubject
    if (this.isNewSubject && this.isReadingTaskViewInOrder) {
-      this.$message.success(`已开始受试者${this.subjectCode}阅片任务`)
+      let message = this.$t('trials:reading:noneDicom:message:startRead').replace("xxx",this.subjectCode);
+      this.$message.success(message)
      changeURLStatic('isNewSubject', '')
    }
    if (this.$router.currentRoute.query.TokenKey) {
Author	SHA1	Message	Date
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	fbb41e3fd9	1 continuous-integration/drone/push Build is passing Details	2024-07-30 13:42:24 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	7311252d3c	Merge branch 'uat' into uat_us	2024-07-30 13:33:09 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	2e11c881f5	1	2024-07-30 10:43:24 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	535d30b6df	logo调整	2024-07-30 10:18:31 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	47fc6c5ef0	mfa国际化修改	2024-07-25 14:54:41 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	a0eaf2f64a	美国uat发布	2024-07-24 13:10:42 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	f32abfe230	1	2024-07-19 14:34:21 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	3f5092bcbb	1	2024-07-19 13:28:43 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	f0e6c5b9de	Merge branch 'uat' into uat_us	2024-07-19 13:24:35 +08:00
wangxiaoshuang	3ae982d422	国际化修改	2024-07-17 13:35:18 +08:00
wangxiaoshuang	978aacf085	非dicom阅片国际化修改	2024-07-17 11:16:38 +08:00
wangxiaoshuang	67ceadcc9c	登录日志访问ip屏蔽	2024-07-15 13:48:36 +08:00