签到记录

src/components/Enterprise/hotPromoted.vue

@@ -9,7 +9,7 @@
           </div>
           <div class="company-info">
             <h3>{{ item.enterprise.anotherName }}</h3>
-            <p>{{ item.financingName }}<span class="vline"></span>{{ item.scaleName }}<span class="vline"></span>{{ item.industryName }}</p>
+            <p>{{ item.financingName }}<span class="septal-line"></span>{{ item.scaleName }}<span class="septal-line"></span>{{ item.industryName }}</p>
           </div>
         </div>
         <!-- 职位列表 -->

src/components/Position/item.vue

@@ -33,7 +33,7 @@
             </div>
             <p class="names float-right">
               <span>{{ item.industryName }}</span>
-              <span class="vline"></span>
+              <span class="septal-line"></span>
               <span>{{ item.scaleName }}</span>
             </p>
           </div>

src/styles/index.css

@@ -21,6 +21,86 @@
   --zIndex-breadcrumbs: 999;
 }
 
+.color-222 {
+  color: #222;
+}
+
+.color-333 {
+  color: #333;
+}
+
+.color-666 {
+  color: #666;
+}
+
+.color-777 {
+  color: #777;
+}
+
+.color-999 {
+  color: #999;
+}
+
+.color-ccc {
+  color: #ccc;
+}
+
+.color-f3f3f3 {
+  color: #f3f3f3;
+}
+
+.color-f2f4f742 {
+  color: #f2f4f742;
+}
+
+.color-f8f8f8 {
+  color: #f8f8f8;
+}
+
+.color-f2f4f7 {
+  color: #f2f4f7;
+}
+
+.color-d5e6e8 {
+  color: #d5e6e8;
+}
+
+.font-size-12 {
+  font-size: 12px;
+}
+
+.font-size-13 {
+  font-size: 13px;
+}
+
+.font-size-14 {
+  font-size: 14px;
+}
+
+.font-size-15 {
+  font-size: 15px;
+}
+
+.font-size-16 {
+  font-size: 16px;
+}
+
+.font-size-17 {
+  font-size: 17px;
+}
+
+.font-size-18 {
+  font-size: 18px;
+}
+
+.font-size-19 {
+  font-size: 19px;
+}
+
+.font-size-20 {
+  font-size: 20px;
+}
+
 .buttons {
   height: 36px;
   width: 224px;
@@ -61,7 +141,7 @@
   overflow: hidden;
 }
 
-.vline {
+.septal-line {
   display: inline-block;
   width: 1px;
   height: 10px;

src/styles/index.min.css

@@ -1 +1 @@
-:root{--zIndex-dialog:9999;--default-bgc:#f2f4f7;--v-primary-base:#00897B;--v-error-base:#fe574a;--v-primary-lighten1:#26A69A;--v-primary-lighten2:#4DB6AC;--v-primary-lighten3:#80CBC4;--v-primary-lighten4:#B2DFDB;--color-222:#222;--color-333:#333;--color-666:#666;--color-777:#777;--color-999:#999;--color-ccc:#ccc;--color-f3:#f3f3f3;--color-f2f4f742:#f2f4f742;--color-f8:#f8f8f8;--color-f2f4f7:#f2f4f7;--color-d5e6e8:#d5e6e8;--zIndex-breadcrumbs:999}.buttons{height:36px;width:224px}.half-button{height:36px;width:88px}.default-width{width:1184px;min-width:1184px;max-width:1184px;margin:0 auto}.defaultLink{color:#008978;cursor:pointer}.default-active{color:var(--v-primary-base) !important}.border-bottom-dashed{border-bottom:1px dashed var(--color-ccc)}.white-bgc{background-color:#fff}.ellipsis{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.vline{display:inline-block;width:1px;height:10px;vertical-align:middle;background-color:#e0e0e0;margin:0 10px}.resume-box{border-radius:5px;padding:20px 30px;background-color:#fff}.resume-header{display:flex;justify-content:space-between;align-items:center;height:36px}.resume-title{font-weight:700;font-size:18px;border-left:5px solid #00897B;padding-left:12px;line-height:17px}.resumeNoDataText{color:var(--color-666);font-size:14px}.card-box{width:100%;height:100%}
+:root{--zIndex-dialog:9999;--default-bgc:#f2f4f7;--v-primary-base:#00897B;--v-error-base:#fe574a;--v-primary-lighten1:#26A69A;--v-primary-lighten2:#4DB6AC;--v-primary-lighten3:#80CBC4;--v-primary-lighten4:#B2DFDB;--color-222:#222;--color-333:#333;--color-666:#666;--color-777:#777;--color-999:#999;--color-ccc:#ccc;--color-f3:#f3f3f3;--color-f2f4f742:#f2f4f742;--color-f8:#f8f8f8;--color-f2f4f7:#f2f4f7;--color-d5e6e8:#d5e6e8;--zIndex-breadcrumbs:999}.color-222{color:#222}.color-333{color:#333}.color-666{color:#666}.color-777{color:#777}.color-999{color:#999}.color-ccc{color:#ccc}.color-f3f3f3{color:#f3f3f3}.color-f2f4f742{color:#f2f4f742}.color-f8f8f8{color:#f8f8f8}.color-f2f4f7{color:#f2f4f7}.color-d5e6e8{color:#d5e6e8}.font-size-12{font-size:12px}.font-size-13{font-size:13px}.font-size-14{font-size:14px}.font-size-15{font-size:15px}.font-size-16{font-size:16px}.font-size-17{font-size:17px}.font-size-18{font-size:18px}.font-size-19{font-size:19px}.font-size-20{font-size:20px}.buttons{height:36px;width:224px}.half-button{height:36px;width:88px}.default-width{width:1184px;min-width:1184px;max-width:1184px;margin:0 auto}.defaultLink{color:#008978;cursor:pointer}.default-active{color:var(--v-primary-base) !important}.border-bottom-dashed{border-bottom:1px dashed var(--color-ccc)}.white-bgc{background-color:#fff}.ellipsis{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.septal-line{display:inline-block;width:1px;height:10px;vertical-align:middle;background-color:#e0e0e0;margin:0 10px}.resume-box{border-radius:5px;padding:20px 30px;background-color:#fff}.resume-header{display:flex;justify-content:space-between;align-items:center;height:36px}.resume-title{font-weight:700;font-size:18px;border-left:5px solid #00897B;padding-left:12px;line-height:17px}.resumeNoDataText{color:var(--color-666);font-size:14px}.card-box{width:100%;height:100%}

src/styles/index.scss

@@ -21,6 +21,28 @@
   --zIndex-breadcrumbs: 999;
 }
 
+.color-222 { color: #222; }
+.color-333 { color: #333; }
+.color-666 { color: #666; }
+.color-777 { color: #777; }
+.color-999 { color: #999; }
+.color-ccc { color: #ccc; }
+.color-f3f3f3 { color: #f3f3f3; }
+.color-f2f4f742 { color: #f2f4f742; }
+.color-f8f8f8 { color: #f8f8f8; }
+.color-f2f4f7 { color: #f2f4f7; }
+.color-d5e6e8 { color: #d5e6e8; }
+
+.font-size-12 { font-size: 12px; }
+.font-size-13 { font-size: 13px; }
+.font-size-14 { font-size: 14px; }
+.font-size-15 { font-size: 15px; }
+.font-size-16 { font-size: 16px; }
+.font-size-17 { font-size: 17px; }
+.font-size-18 { font-size: 18px; }
+.font-size-19 { font-size: 19px; }
+.font-size-20 { font-size: 20px; }
+
 // 长按钮
 .buttons {
   height: 36px;
@@ -67,7 +89,8 @@
   overflow: hidden;
 }
 
-.vline {
+// 分隔线
+.septal-line {
   display: inline-block;
   width: 1px;
   height: 10px;

src/views/integral/components/integralShow.vue

@@ -15,8 +15,8 @@
         </template>
         <!-- 任务中心 -->
         <template v-if="props.taskCenter">
-          <span class="vline"></span>
-          <span style=" color: var(--color-666); cursor: pointer;" @click="router.push({ path: '/recruit/personal/TaskCenter' })">赚取积分</span>
+          <span class="septal-line"></span>
+          <span class="mall-text" @click="router.push({ path: '/recruit/personal/TaskCenter' })">赚取积分</span>
         </template>
       </span>
     </div>

src/views/integral/pointsManagement/components/signInTable.vue

@@ -0,0 +1,39 @@
+<template>
+  <v-data-table
+    class="mt-3"
+    :items="items"
+    :headers="headers"
+    hover
+    item-value="id"
+  >
+    <template #bottom></template>
+  </v-data-table>
+</template>
+
+<script setup>
+defineOptions({ name: 'myRegistration-signInTable'})
+import { useI18n } from '@/hooks/web/useI18n'
+import { timesTampChange } from '@/utils/date'
+
+defineProps({
+  tab: String,
+  items: Array
+})
+
+const { t } = useI18n()
+const headers = [
+  { title: t('taskCenter.signInDays'), key: 'day' },
+  { title: t('taskCenter.points'), key: 'point' },
+  { title: t('taskCenter.createTime'), key: 'createTime', value: item => timesTampChange(item.createTime)}
+]
+</script>
+
+<style scoped lang="scss">
+:deep(.v-table > .v-table__wrapper > table > thead) {
+  background-color: #f7f8fa !important;
+}
+:deep(.v-selection-control__input) {
+  // color: var(--v-primary-base) !important;
+  color: #767778;
+}
+</style>

src/views/integral/pointsManagement/index.vue

@@ -36,6 +36,7 @@ const tab = 1
 // }
 const descriptiveTitle = '您当前可用积分'
 </script>
+
 <style lang="scss" scoped>
 </style>
 

src/views/integral/pointsManagement/pointsDetails.vue

@@ -3,11 +3,10 @@
   <div class="mt-3">
     <v-tabs v-model="tab" style="border-radius: 5px;" align-tabs="start" color="primary" bg-color="#f7f8fa" @update:model-value="handleChangeTab">
       <v-tab :value="1"> {{ $t('points.whole') }}</v-tab>
-      <!-- <v-tab :value="2"> {{ $t('points.In') }}</v-tab>
-      <v-tab :value="3"> {{ $t('points.freezing') }}</v-tab>
-      <v-tab :value="4"> {{ $t('points.pay') }}</v-tab> -->
+      <v-tab :value="2">{{ $t('sys.signIn') }}</v-tab>
     </v-tabs>
-    <TablePage  :items="dataList"></TablePage>
+    <TablePage v-if="tab === 1" :items="dataList"></TablePage>
+    <SignInTable v-if="tab === 2" :items="dataList"></SignInTable>
     <CtPagination
       v-if="total > 0"
       :total="total"
@@ -22,9 +21,11 @@
 defineOptions({name: 'personal-pointsManagement-pointsDetails'})
 import { ref } from 'vue'
 import TablePage from './components/integralTable.vue'
+import SignInTable from './components/signInTable.vue'
 import { getUserRewardPointPage } from '@/api/integral'
+import { getRewardSignInRecordPage } from '@/api/sign'
 
-const tab = ref(0)
+const tab = ref(1)
 
 // 数据
 const total = ref(0)
@@ -32,9 +33,10 @@ const pageNo = ref(1)
 const pageSize = ref(10)
 const dataList = ref([])
 
-// 积分明细
+// 积分、签到明细
 const getData = async () => {
-  const res = await getUserRewardPointPage(pageNo.value, pageSize.value)
+  const api = tab.value === 1 ? getUserRewardPointPage : getRewardSignInRecordPage
+  const res = await api(pageNo.value, pageSize.value)
   dataList.value = res.list
   total.value = res.total
 }
@@ -48,8 +50,7 @@ const handleChangePage = (e) => {
 // 切换
 const handleChangeTab = () => {
   pageNo.value = 1
-  // tab
-  // getData()
+  getData()
 }
 </script>
 <style lang="scss" scoped>

src/views/recruit/enterprise/publicRecruitmentManagement/commission/index.vue

@@ -1,6 +1,12 @@
 <template>
-  <v-card class="pa-5 card-box d-flex align-center justify-center">
-    <CtForm ref="formPageRef" :items="items" style="width: 600px;"></CtForm>
+  <v-card class="pa-5 card-box" style="height: 500px;">
+    <div class="resume-header mb-3">
+      <div class="resume-title">推荐人佣金比例设置</div>
+    </div>
+    <div class="d-flex flex-column align-center justify-center" style="height: 350px;">
+      <CtForm ref="formPageRef" :items="items" style="width: 500px;"></CtForm>
+      <v-btn class="buttons" color="primary">提 交</v-btn>
+    </div>
   </v-card>
 </template>
 
@@ -15,8 +21,8 @@ const items = ref({
       type: 'number',
       key: 'moneyReward',
       value: null,
-      label: '佣金比例 *',
-      rules: [v => !!v || '请填写佣金比例']
+      label: '推荐人佣金比例 *',
+      rules: [v => !!v || '请填写推荐人佣金比例']
     }
   ]
 })

src/views/recruit/enterprise/talentPool/components/details/educationExp.vue

@@ -21,7 +21,7 @@
         </div>
         <div class="level2 my-2">
           <span class="color6 font15">{{ item.major }}</span>
-          <span class="vline"  v-if="item.educationSystemType"></span>
+          <span class="septal-line"  v-if="item.educationSystemType"></span>
           <span class="color6 font15">{{ getText(item.educationSystemType, dictItemsObj.educationSystemType) }}</span>
         </div>
         <div class="level3">

src/views/recruit/enterprise/talentPool/components/details/vocationalSkills.vue

@@ -6,7 +6,7 @@
       :key="i" 
     >
       <span >{{ getText(k.skillId, skills) }}</span>
-      <span class="vline"></span>
+      <span class="septal-line"></span>
       <span style="color: var(--color-999);">{{ getText(k.level, skillLevelArr) }}</span>
     </div>
   </div>

src/views/recruit/personal/PersonalCenter/dynamic/left.vue

@@ -17,7 +17,7 @@
           </v-icon>
         </div>
         <div class="userInfo">
-          {{ baseInfo?.expTypeText || $t('common.currentlyUnavailable') }}<span class="vline"></span>{{ baseInfo?.eduTypeText || $t('common.currentlyUnavailable') }}
+          {{ baseInfo?.expTypeText || $t('common.currentlyUnavailable') }}<span class="septal-line"></span>{{ baseInfo?.eduTypeText || $t('common.currentlyUnavailable') }}
         </div>
         <div class="mt-3">
           <v-select 

src/views/recruit/personal/remuse/components/educationExp.vue

@@ -37,7 +37,7 @@
         </div>
         <div class="level2 my-2">
           <span class="color6 font15">{{ item.major }}</span>
-          <span class="vline"  v-if="item.educationSystemType"></span>
+          <span class="septal-line"  v-if="item.educationSystemType"></span>
           <span class="color6 font15">{{ getText(item.educationSystemType, dictItemsObj.educationSystemType) }}</span>
         </div>
         <div class="level3">

src/views/recruit/personal/remuse/components/vocationalSkills.vue

@@ -23,7 +23,7 @@
         @mouseleave="k.active = false"
       >
         <span >{{ getText(k.skillId, skills) }}</span>
-        <span class="vline"></span>
+        <span class="septal-line"></span>
         <span style="color: var(--color-999);">{{ getText(k.level, skillLevelArr) }}</span>
         <span class="float-right" v-if="k.active">
           <v-btn variant="text" color="primary" prepend-icon="mdi-square-edit-outline" @click="handleEdit(k)">{{ $t('common.edit') }}</v-btn>

src/views/recruit/personal/taskCenter/components/signIn.vue

@@ -38,7 +38,7 @@
     </div>
 
     <!-- 签到记录 -->
-    <v-navigation-drawer v-model="drawer" location="right" temporary width="600" class="drawer">
+    <!-- <v-navigation-drawer v-model="drawer" location="right" temporary width="600" class="drawer">
       <v-data-table
         :items="recordList"
         :headers="headers"
@@ -54,16 +54,21 @@
         :limit="pageSize"
         @handleChange="handleChangePage"
       ></CtPagination>
-    </v-navigation-drawer>
+    </v-navigation-drawer> -->
   </div>
 </template>
 
 <script setup>
 defineOptions({name: 'personal-taskCenter-signIn'})
 import { ref } from 'vue'
-import { timesTampChange } from '@/utils/date'
+// import { timesTampChange } from '@/utils/date'
 import { useI18n } from '@/hooks/web/useI18n'
-import { getRewardSignInRecordSummary, getRewardSignInConfigList, createRewardSignInRecord, getRewardSignInRecordPage } from '@/api/sign'
+import { 
+  getRewardSignInRecordSummary, 
+  getRewardSignInConfigList, 
+  createRewardSignInRecord, 
+  // getRewardSignInRecordPage 
+} from '@/api/sign'
 import integralShow from '@/views/integral/components/integralShow.vue'
 import Snackbar from '@/plugins/snackbar'
 
@@ -78,16 +83,16 @@ const todayNumber = ref()
 const signLoading = ref(false)
 
 // 签到记录
-const total = ref(0)
-const drawer = ref(false)
-const pageSize = ref(10)
-const pageNo = ref(1)
-const recordList = ref([])
-const headers = [
-  { title: t('taskCenter.signInDays'), key: 'day' },
-  { title: t('taskCenter.points'), key: 'point' },
-  { title: t('taskCenter.createTime'), key: 'createTime', value: item => timesTampChange(item.createTime)}
-]
+// const total = ref(0)
+// const drawer = ref(false)
+// const pageSize = ref(10)
+// const pageNo = ref(1)
+// const recordList = ref([])
+// const headers = [
+//   { title: t('taskCenter.signInDays'), key: 'day' },
+//   { title: t('taskCenter.points'), key: 'point' },
+//   { title: t('taskCenter.createTime'), key: 'createTime', value: item => timesTampChange(item.createTime)}
+// ]
 
 // 获取签到规则列表
 const getConfigList = async () => {
@@ -118,23 +123,24 @@ const handleSignIn = async () => {
 }
 
 // 签到记录
-const getRecordList = async () => {
-  const res = await getRewardSignInRecordPage(pageNo.value, pageSize.value)
-  recordList.value = res.list
-  total.value = res.total
-}
+// const getRecordList = async () => {
+//   const res = await getRewardSignInRecordPage(pageNo.value, pageSize.value)
+//   recordList.value = res.list
+//   total.value = res.total
+// }
 
 const handleRecord = () => {
-  drawer.value = true
-  pageNo.value = 1
-  recordList.value = []
-  getRecordList()
+  // drawer.value = true
+  // pageNo.value = 1
+  // recordList.value = []
+  // getRecordList()
+  window.open('/integral/pointsManagement')
 }
 
-const handleChangePage = (e) => {
-  pageNo.value = e
-  getRecordList()
-}
+// const handleChangePage = (e) => {
+//   pageNo.value = e
+//   getRecordList()
+// }
 </script>
 
 <style lang="scss" scoped>