feat: fix bug处理

src/views/portraitManagement/components/card.vue

@@ -92,5 +92,6 @@ const props = defineProps({
     color: #fff;
     font-size: 16px;
     flex: 1;
+    overflow: hidden;
   }
 </style>

src/views/portraitManagement/employeeProfile/index.vue

@@ -107,8 +107,8 @@
           <div class="content-bottom-left">
             <Card title="工作履历">
               <div class="work-history">
-                <span v-if="portrait.startWorkingDate">
-                  {{ formatWorkDate(portrait.startWorkingDate)  }}入职 | 司龄{{ portrait.workYears != null ? portrait.workYears : '-' }}年 | 开机年限{{ portrait.securityCheckYears != null ? portrait.securityCheckYears : '-'
+                <span v-if="portrait.entryDate">
+                  {{ formatWorkDate(portrait.entryDate)  }}入职 | 司龄{{ portrait.companyYears != null ? portrait.companyYears : '-' }}年 | 开机年限{{ portrait.xrayOperatorYears != null ? portrait.xrayOperatorYears : '-'
 
 
                   }}年 | 现任职{{ portrait.roleNames || '-' }}
@@ -117,12 +117,14 @@
               </div>
             </Card>
             <Card title="获奖记录">
-              <div class="honor-item" v-for="(value, index) in portrait.awards" :key="index">
-                <div :style="{'--indexBgColor': value.color}">
-                  <div :data-index="index + 1"></div>
-                  {{ value.level2Name }} {{ value.level4Name }}
+              <div class="card-content">
+                <div class="honor-item" v-for="(value, index) in portrait.awards" :key="index">
+                  <div :style="{'--indexBgColor': value.color}">
+                    <div :data-index="index + 1"></div>
+                    {{ value.level2Name }} {{ value.level4Name }}
+                  </div>
+                  <div>{{ value.score || '-' }}分</div>
                 </div>
-                <div>{{ value.score || '-' }}分</div>
               </div>
             </Card>
           </div>
@@ -133,41 +135,43 @@
           </div>
           <div class="content-bottom-right">
             <Card title="补充信息">
-              <div class="supp-item">
-                <span class="s-lbl">政治面貌:</span>
-                <span class="s-val">{{ portrait.politicalStatusText || '-' }}</span>
-              </div>
-              <div class="supp-item supp-item-2">
-                <span class="s-lbl">性别:</span>
-                <span class="s-val">{{ portrait.sexText || '-' }}</span>
-              </div>
-              <div class="supp-item">
-                <span class="s-lbl">籍贯:</span>
-                <span class="s-val">{{ portrait.nativePlace || '-' }}</span>
-              </div>
-              <div class="supp-item supp-item-2">
-                <span class="s-lbl">民族:</span>
-                <span class="s-val">{{ portrait.nation || '-' }}</span>
-              </div>
-              <div class="supp-item">
-                <span class="s-lbl">年龄:</span>
-                <span class="s-val">{{ getAge(portrait.birthday) }}</span>
-              </div>
-              <div class="supp-item supp-item-2">
-                <span class="s-lbl">司龄:</span>
-                <span class="s-val">{{ portrait.workYears != null ? portrait.workYears+'年' : '-' }}</span>
-              </div>
-              <div class="supp-item">
-                <span class="s-lbl">性格特征:</span>
-                <span class="s-val">{{ portrait.characterCharacteristics || '-' }}</span>
-              </div>
-              <div class="supp-item supp-item-2">
-                <span class="s-lbl">工作风格:</span>
-                <span class="s-val">{{ portrait.workingStyle || '-' }}</span>
-              </div>
-              <div :class="i % 2 ? 'supp-item' : 'supp-item supp-item-2'" v-for="(p, i) in (portrait.postNames || '').split('、')" :key="i">
-                <span class="s-lbl">{{ i === 0 ? '业务岗位:' : ''}}</span>
-                <span class="s-val">{{ p }}</span>
+              <div class="card-content">
+                <div class="supp-item">
+                  <span class="s-lbl">政治面貌:</span>
+                  <span class="s-val">{{ portrait.politicalStatusText || '-' }}</span>
+                </div>
+                <div class="supp-item supp-item-2">
+                  <span class="s-lbl">性别:</span>
+                  <span class="s-val">{{ portrait.sexText || '-' }}</span>
+                </div>
+                <div class="supp-item">
+                  <span class="s-lbl">籍贯:</span>
+                  <span class="s-val">{{ portrait.nativePlace || '-' }}</span>
+                </div>
+                <div class="supp-item supp-item-2">
+                  <span class="s-lbl">民族:</span>
+                  <span class="s-val">{{ portrait.nation || '-' }}</span>
+                </div>
+                <div class="supp-item">
+                  <span class="s-lbl">年龄:</span>
+                  <span class="s-val">{{ getAge(portrait.birthday) }}</span>
+                </div>
+                <div class="supp-item supp-item-2">
+                  <span class="s-lbl">司龄:</span>
+                  <span class="s-val">{{ portrait.companyYears != null ? portrait.companyYears+'年' : '-' }}</span>
+                </div>
+                <div class="supp-item">
+                  <span class="s-lbl">性格特征:</span>
+                  <span class="s-val">{{ portrait.characterCharacteristics || '-' }}</span>
+                </div>
+                <div class="supp-item supp-item-2">
+                  <span class="s-lbl">工作风格:</span>
+                  <span class="s-val">{{ portrait.workingStyle || '-' }}</span>
+                </div>
+                <div :class="i % 2 ? 'supp-item' : 'supp-item supp-item-2'" v-for="(p, i) in (portrait.postNames || '').split('、')" :key="i">
+                  <span class="s-lbl">{{ i === 0 ? '业务岗位:' : ''}}</span>
+                  <span class="s-val">{{ p }}</span>
+                </div>
               </div>
             </Card>
           </div>
@@ -607,13 +611,14 @@ onMounted(() => {
     flex: 1;
     display: flex;
     column-gap: 15px;
+    overflow: hidden;
     .content-bottom-left {
       width: 380px;
       display: flex;
       flex-direction: column;
       row-gap: 15px;
       & > *:nth-child(1) {
-        flex: 1;
+        height: 160px;
         .work-history {
           font-size: 18px;
         }
@@ -634,6 +639,7 @@ onMounted(() => {
             display: flex;
             align-items: center;
             column-gap: 15px;
+            margin-left: 10px;
             & > div {
               width: 26px;
               height: 20px;
@@ -714,6 +720,18 @@ onMounted(() => {
         background: #261C48;
       }
     }
+    .card-content {
+      height: 100%;
+      overflow-x: hidden;
+      overflow-y: auto;
+      &::-webkit-scrollbar-track {
+        background: transparent;
+      }
+      &::-webkit-scrollbar-thumb {
+        background: linear-gradient(225deg, #4355cb, #873dc3);
+        border-radius: 4px;
+      }
+    }
   }
 }
 

src/views/score/dimension/index.vue

@@ -242,7 +242,7 @@ function selectDimension(dim) {
 }
 
 function handleAddDim() {
-  Object.assign(dimForm, { id: null, name: '', weight: 0, baseScore: 80, sortOrder: dimList.value.length + 1, status: '0', remark: '' })
+  Object.assign(dimForm, { org: selectedDim.value.org, id: null, name: '', weight: 0, baseScore: 80, sortOrder: dimList.value.length + 1, status: '0', remark: '' })
   dimDialogTitle.value = '新增维度'
   dimDialogVisible.value = true
 }
@@ -328,6 +328,7 @@ onMounted(loadDimensions)
 
 .dim-card {
   height: 100%;
+  margin-top: 15px;
 }
 
 .card-header {