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

src/App.vue

@@ -322,7 +322,7 @@ export default {
 <style lang="scss">
 .mask {
   position: relative;
-  filter: blur(2px);
+  filter: blur(5px);
   user-select: none;
 }
 
@@ -334,7 +334,7 @@ export default {
   height: 100%;
   content: '';
   display: block;
-  background: rgba(255, 253, 253, 0.2);
+  background: rgba(255, 253, 253, 0.5);
 }
 
 $light_gray: #606266;

src/views/research/form.vue

@@ -8,7 +8,7 @@
       <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
       <div style="display: flex;justify-content: space-between;" v-if="!isPreview">
         <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state)
-            }}</el-tag></div>
+        }}</el-tag></div>
         <div>
           <!-- 提交 -->
           <el-button v-if="(state === 0 && userTypeEnumInt === 0)" type="primary" size="small"
@@ -198,7 +198,7 @@ export default {
   },
   computed: {
     isPM() {
-      return this.hasPermi(['role:pm', 'role:spm', 'role:cpm', 'role:apm'])
+      return this.hasPermi(['role:pm', 'role:spm', 'role:cpm', 'role:apm']) && this.state !== 3
     }
   },
   methods: {

src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue

@@ -40,9 +40,9 @@
                         @click.prevent="setToolActive('CircularEraser')">
                         <svg-icon icon-class="clear" class="svg-icon" />
                     </div>
-                    <div :class="['tool-item']">
+                    <!-- <div :class="['tool-item']"> 
                         <input type="file" @change="beginScanFiles($event)">
-                    </div>
+                    </div> -->
                 </div>
                 <div class="ConfigBox">
                     <div class="EraserConfig"
@@ -133,8 +133,8 @@
                     </div>
                     <div class="SegmentConfig">
                         <span>{{ $t('trials:reading:Segmentations:title:Border') }}</span>
-                        <el-slider v-model="SegmentConfig.outlineWidth" show-input :step="1" :max="10"
-                            input-size="mini" :show-input-controls="false" />
+                        <el-slider v-model="SegmentConfig.outlineWidth" show-input :step="1" :max="10" input-size="mini"
+                            :show-input-controls="false" />
                     </div>
                     <span class="line" />
                     <div class="SegmentConfig" style="justify-content: flex-start;">
@@ -143,7 +143,7 @@
                         </el-switch>
                         <span style="margin-left: 5px;">{{
                             $t('trials:reading:Segmentations:title:InactiveSegmentationsShow')
-                            }}</span>
+                        }}</span>
                     </div>
                 </div>
                 <template v-if="segmentList.length > 0">
@@ -326,7 +326,7 @@
                     <template slot-scope="scope">
                         <el-button type="text" @click.stop="restoreSegmentationVersion(scope.row)">{{
                             $t('trials:reading:Segmentations:button:recovery')
-                            }}</el-button>
+                        }}</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -602,6 +602,7 @@ export default {
         brushSize: {
             handler() {
                 this.setBrushSize(this.activeTool)
+                this.setSegmentConfig()
             },
             deep: true
         },

src/views/trials/trials-panel/reading/dicoms3D/components/tools/Note_RectangleRoiTool.js

@@ -330,7 +330,6 @@ class Note_RectangleRoiTool extends cornerstoneTools.RectangleROITool {
       );
 
       renderStatus = true;
-      return renderStatus;
     }
 
     return renderStatus;