Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

src/components/pages/liyuan/page/examineperson/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="testPersonExamine">
+  <div class="testPersonExamine" :style="{height: gotype == '/topTalent' ? 'calc(100% - 60px)' : '100%'}">
     <backPage v-if="gotype" tit="人才标准"></backPage>
     <div class="testTit" style="padding: 0 90px;box-sizing: border-box;">
       <div class="teaLis">
@@ -39,9 +39,9 @@
         >
       </div>
     </div>
-    <div style="flex: 1;overflow: hidden;" class="notes">
+    <!-- <div style="flex: 1;overflow: hidden;" class="notes">
       注：评价积分周期为2023年6月30日至2024年6月30日
-    </div>
+    </div> -->
     <div style="height:100%;overflow: auto;padding: 0 90px;box-sizing: border-box;" v-loading="tabLoad">
       <div class="sBox_table">
         <div class="table_title">
@@ -547,7 +547,7 @@ export default {
 .testPersonExamine {
   width: 100%;
   min-width: calc(100px * 10);
-  height: calc(100%);
+  height: 100%;
   /* overflow-x: scroll; */
   /* overflow: auto; */
   display: flex;

src/components/pages/liyuan/page/teadTest.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="i_body_box">
-        <backPage tit="考核资料"></backPage>
+        <backPage :tit="gotype == '/topTalent' ? '个人档案' : '考核资料'"></backPage>
         <div class="check_nav">
             <div class="nav all" :class="{ active: checkTypeValue == typeListStr }"
             @click="changeShowType(typeListStr)">
@@ -118,6 +118,7 @@ export default {
             userid: this.$route.query.userid,
             oid: this.$route.query.oid,
             sortId: this.$route.query.sortId,
+            gotype:(window.topU && window.topU.gotype) ?  window.topU.gotype : '',
             type: "",
             typeList:[],
             ExamineBase: [],
@@ -727,9 +728,12 @@ export default {
 
 <style scoped>
 .i_body_box {
-    height: calc(100% - 80px);
-    padding: 10px 0 0;
+    /* height: calc(100% - 80px); */
     box-sizing: border-box;
+    height: 100%;
+    display: flex;
+    background: #fff;
+    flex-direction: column;
 }
 
 .check_nav {

src/components/pages/sassPlatform/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="sassPlatform">
-    <backPage v-if="gotype" tit="表单管理"></backPage>
+    <backPage v-if="gotype" :tit="gotype == '/topTalent' ? '人才数据库' : '表单管理'"></backPage>
     <!-- v-if="gotype" -->
     <div class="sp_header">
       <div class="sp_h_tagArea">

src/components/pages/test/databoard.vue

@@ -1,9 +1,12 @@
 <template>
   <div
     class="pb_content"
-    :style="{padding : gotype ? '0 40px' : ''}"
     style="height: auto; width: calc(100% - 40px); margin: 0 auto;background: unset;box-sizing: border-box;"
-  >
+    :style="{padding : gotype ? '0 40px' : '',
+    background : gotype ? '#fff' : '',
+   width: gotype ? '100%' : 'calc(100% - 40px)'}"
+  
+    >
     <div style="width:100%;padding:0;box-sizing: border-box;" v-if="!gotype">
       <div class="pb_head top">
         <div style="display: flex;align-items: center;">
@@ -62,7 +65,7 @@
         </div>
       </div>
     </div>
-    <backPage style="padding-left: 0;" v-else tit="学生管理"></backPage>
+    <backPage style="padding-left: 0;" v-else tit="学生画像"></backPage>
     <div class="bbox_serch">
       <el-select
         v-model="selectTime"

src/components/pages/test/examine/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="testExamine" :style="{padding: gotype ? '0 90px' : '10px'}">
-    <backPage style="padding: 40px 0 0;" v-if="gotype" tit="考核审核"></backPage>
+    <backPage style="padding: 40px 0 0;" v-if="gotype" :tit="gotype == '/topTalent' ? '人才评估' : '考核审核'"></backPage>
 
     <div class="testTit">
       <div class="teaLis">