Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/components/PreviewImg/index.vue

@@ -8,7 +8,7 @@
     <v-window v-model="window" show-arrows @update:model-value="val => window = val">
       <v-window-item v-for="val in list" :key="val">
         <!-- <v-img v-if="isImage || checkIsImage(val)" width="900" height="800" :src="val"></v-img> -->
-        <div v-if="isImage || checkIsImage(val)" style="width: 50vw; height: 90vh;margin: auto;">
+        <div v-if="isImage || checkIsImage(val)" style="height: 90vh;margin: auto;">
           <img :src="val" alt="" style="object-fit: scale-down;width: 100%; height: 100%;">
         </div>
         <video v-else :src="val" controls height="800" width="1000" preload="preload" :showPlay="true"></video>
@@ -54,7 +54,7 @@ const handleChange = (e) => {
 <style scoped lang="scss">
 .close {
   position: absolute;
-  right: -190px;
+  right: -270px;
   top: 0;
   cursor: pointer;
 }

src/layout/company/navBar.vue

@@ -128,6 +128,7 @@ const handleLogout = async (exit = true) => {
 const enterpriseList = ref([])
 
 const menuList = ref([
+  { title: t('setting.editPassword'), icon: 'mdi-shield-lock-open-outline', change: () => router.push({ path: '/recruit/enterprise/staffChangePassword' }) },
   { title: t('setting.logOut'), icon: 'mdi-logout', change: handleLogout }
 ])
 const items = computed(() => {

src/views/recruit/enterprise/resume/components/table.vue

@@ -99,6 +99,7 @@ const headers = ref([
   { title: '工作经验', key: 'person.expName', sortable: false },
   { title: '最高学历', key: 'person.eduName', sortable: false },
   { title: '岗位薪资', key: 'job', value: item => item.job.payFrom && item.job.payTo ? `${item.job.payFrom ? item.job.payFrom + '-' : ''}${item.job.payTo}${item.job.payName ? '/' + item.job.payName : ''}` : '面议', sortable: false },
+  { title: '投递简历时间', key: 'createTime', sortable: false },
   { title: '状态', key: 'status', sortable: false },
   { title: '操作', value: 'actions', sortable: false }
 ])

src/views/recruit/enterprise/resume/index.vue

@@ -27,6 +27,7 @@ import { getDict } from '@/hooks/web/useDictionaries'
 import { getInterviewInvitePage } from '@/api/recruit/enterprise/interview'
 import TablePage from './components/table.vue'
 import Screen from './components/screen.vue'
+import { timesTampChange } from '@/utils/date'
 
 const total = ref(0)
 const query = ref({
@@ -80,6 +81,7 @@ const getList = async () => {
     obj.jobClosed = e?.job?.status === '1' || false // 职位已关闭
     obj.person = Object.assign(e.person, dealDictObjData({}, e.person))
     obj.job = Object.assign(e.job, dealDictObjData({}, e.job))
+    obj.createTime = timesTampChange(e.createTime, 'Y-M-D h:m')
     return obj
   })
 }