Parcourir la source

feat: fix bug处理

lixiangrui il y a 3 semaines
Parent
commit
fb5b8614d8

+ 1 - 0
src/views/portraitManagement/components/card.vue

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

+ 61 - 43
src/views/portraitManagement/employeeProfile/index.vue

@@ -107,8 +107,8 @@
107
           <div class="content-bottom-left">
107
           <div class="content-bottom-left">
108
             <Card title="工作履历">
108
             <Card title="工作履历">
109
               <div class="work-history">
109
               <div class="work-history">
110
-                <span v-if="portrait.startWorkingDate">
111
-                  {{ formatWorkDate(portrait.startWorkingDate)  }}入职 | 司龄{{ portrait.workYears != null ? portrait.workYears : '-' }}年 | 开机年限{{ portrait.securityCheckYears != null ? portrait.securityCheckYears : '-'
110
+                <span v-if="portrait.entryDate">
111
+                  {{ formatWorkDate(portrait.entryDate)  }}入职 | 司龄{{ portrait.companyYears != null ? portrait.companyYears : '-' }}年 | 开机年限{{ portrait.xrayOperatorYears != null ? portrait.xrayOperatorYears : '-'
112
 
112
 
113
 
113
 
114
                   }}年 | 现任职{{ portrait.roleNames || '-' }}
114
                   }}年 | 现任职{{ portrait.roleNames || '-' }}
@@ -117,12 +117,14 @@
117
               </div>
117
               </div>
118
             </Card>
118
             </Card>
119
             <Card title="获奖记录">
119
             <Card title="获奖记录">
120
-              <div class="honor-item" v-for="(value, index) in portrait.awards" :key="index">
121
-                <div :style="{'--indexBgColor': value.color}">
122
-                  <div :data-index="index + 1"></div>
123
-                  {{ value.level2Name }} {{ value.level4Name }}
120
+              <div class="card-content">
121
+                <div class="honor-item" v-for="(value, index) in portrait.awards" :key="index">
122
+                  <div :style="{'--indexBgColor': value.color}">
123
+                    <div :data-index="index + 1"></div>
124
+                    {{ value.level2Name }} {{ value.level4Name }}
125
+                  </div>
126
+                  <div>{{ value.score || '-' }}分</div>
124
                 </div>
127
                 </div>
125
-                <div>{{ value.score || '-' }}分</div>
126
               </div>
128
               </div>
127
             </Card>
129
             </Card>
128
           </div>
130
           </div>
@@ -133,41 +135,43 @@
133
           </div>
135
           </div>
134
           <div class="content-bottom-right">
136
           <div class="content-bottom-right">
135
             <Card title="补充信息">
137
             <Card title="补充信息">
136
-              <div class="supp-item">
137
-                <span class="s-lbl">政治面貌:</span>
138
-                <span class="s-val">{{ portrait.politicalStatusText || '-' }}</span>
139
-              </div>
140
-              <div class="supp-item supp-item-2">
141
-                <span class="s-lbl">性别:</span>
142
-                <span class="s-val">{{ portrait.sexText || '-' }}</span>
143
-              </div>
144
-              <div class="supp-item">
145
-                <span class="s-lbl">籍贯:</span>
146
-                <span class="s-val">{{ portrait.nativePlace || '-' }}</span>
147
-              </div>
148
-              <div class="supp-item supp-item-2">
149
-                <span class="s-lbl">民族:</span>
150
-                <span class="s-val">{{ portrait.nation || '-' }}</span>
151
-              </div>
152
-              <div class="supp-item">
153
-                <span class="s-lbl">年龄:</span>
154
-                <span class="s-val">{{ getAge(portrait.birthday) }}</span>
155
-              </div>
156
-              <div class="supp-item supp-item-2">
157
-                <span class="s-lbl">司龄:</span>
158
-                <span class="s-val">{{ portrait.workYears != null ? portrait.workYears+'年' : '-' }}</span>
159
-              </div>
160
-              <div class="supp-item">
161
-                <span class="s-lbl">性格特征:</span>
162
-                <span class="s-val">{{ portrait.characterCharacteristics || '-' }}</span>
163
-              </div>
164
-              <div class="supp-item supp-item-2">
165
-                <span class="s-lbl">工作风格:</span>
166
-                <span class="s-val">{{ portrait.workingStyle || '-' }}</span>
167
-              </div>
168
-              <div :class="i % 2 ? 'supp-item' : 'supp-item supp-item-2'" v-for="(p, i) in (portrait.postNames || '').split('、')" :key="i">
169
-                <span class="s-lbl">{{ i === 0 ? '业务岗位:' : ''}}</span>
170
-                <span class="s-val">{{ p }}</span>
138
+              <div class="card-content">
139
+                <div class="supp-item">
140
+                  <span class="s-lbl">政治面貌:</span>
141
+                  <span class="s-val">{{ portrait.politicalStatusText || '-' }}</span>
142
+                </div>
143
+                <div class="supp-item supp-item-2">
144
+                  <span class="s-lbl">性别:</span>
145
+                  <span class="s-val">{{ portrait.sexText || '-' }}</span>
146
+                </div>
147
+                <div class="supp-item">
148
+                  <span class="s-lbl">籍贯:</span>
149
+                  <span class="s-val">{{ portrait.nativePlace || '-' }}</span>
150
+                </div>
151
+                <div class="supp-item supp-item-2">
152
+                  <span class="s-lbl">民族:</span>
153
+                  <span class="s-val">{{ portrait.nation || '-' }}</span>
154
+                </div>
155
+                <div class="supp-item">
156
+                  <span class="s-lbl">年龄:</span>
157
+                  <span class="s-val">{{ getAge(portrait.birthday) }}</span>
158
+                </div>
159
+                <div class="supp-item supp-item-2">
160
+                  <span class="s-lbl">司龄:</span>
161
+                  <span class="s-val">{{ portrait.companyYears != null ? portrait.companyYears+'年' : '-' }}</span>
162
+                </div>
163
+                <div class="supp-item">
164
+                  <span class="s-lbl">性格特征:</span>
165
+                  <span class="s-val">{{ portrait.characterCharacteristics || '-' }}</span>
166
+                </div>
167
+                <div class="supp-item supp-item-2">
168
+                  <span class="s-lbl">工作风格:</span>
169
+                  <span class="s-val">{{ portrait.workingStyle || '-' }}</span>
170
+                </div>
171
+                <div :class="i % 2 ? 'supp-item' : 'supp-item supp-item-2'" v-for="(p, i) in (portrait.postNames || '').split('、')" :key="i">
172
+                  <span class="s-lbl">{{ i === 0 ? '业务岗位:' : ''}}</span>
173
+                  <span class="s-val">{{ p }}</span>
174
+                </div>
171
               </div>
175
               </div>
172
             </Card>
176
             </Card>
173
           </div>
177
           </div>
@@ -607,13 +611,14 @@ onMounted(() => {
607
     flex: 1;
611
     flex: 1;
608
     display: flex;
612
     display: flex;
609
     column-gap: 15px;
613
     column-gap: 15px;
614
+    overflow: hidden;
610
     .content-bottom-left {
615
     .content-bottom-left {
611
       width: 380px;
616
       width: 380px;
612
       display: flex;
617
       display: flex;
613
       flex-direction: column;
618
       flex-direction: column;
614
       row-gap: 15px;
619
       row-gap: 15px;
615
       & > *:nth-child(1) {
620
       & > *:nth-child(1) {
616
-        flex: 1;
621
+        height: 160px;
617
         .work-history {
622
         .work-history {
618
           font-size: 18px;
623
           font-size: 18px;
619
         }
624
         }
@@ -634,6 +639,7 @@ onMounted(() => {
634
             display: flex;
639
             display: flex;
635
             align-items: center;
640
             align-items: center;
636
             column-gap: 15px;
641
             column-gap: 15px;
642
+            margin-left: 10px;
637
             & > div {
643
             & > div {
638
               width: 26px;
644
               width: 26px;
639
               height: 20px;
645
               height: 20px;
@@ -714,6 +720,18 @@ onMounted(() => {
714
         background: #261C48;
720
         background: #261C48;
715
       }
721
       }
716
     }
722
     }
723
+    .card-content {
724
+      height: 100%;
725
+      overflow-x: hidden;
726
+      overflow-y: auto;
727
+      &::-webkit-scrollbar-track {
728
+        background: transparent;
729
+      }
730
+      &::-webkit-scrollbar-thumb {
731
+        background: linear-gradient(225deg, #4355cb, #873dc3);
732
+        border-radius: 4px;
733
+      }
734
+    }
717
   }
735
   }
718
 }
736
 }
719
 
737
 

+ 2 - 1
src/views/score/dimension/index.vue

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