更新

src/layout/direct/exportDetail.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="top">
         <el-col :span="7" class="image">
-          <el-image :src="exportInfo.imgpath"></el-image>
+          <el-image :src="exportInfo.img_path"></el-image>
         </el-col>
         <el-col :span="17" class="info">
           <p>
@@ -11,38 +11,49 @@
             <span>性別:{{ exportInfo.gender }}</span>
           </p>
           <p>
-            <span>民族:{{ exportInfo.nation }}</span>
-            <span>出生年月:{{ exportInfo.birth }}</span>
+            <span>职务:{{ exportInfo.position }}</span>
+            <span>出生日期:{{ exportInfo.birthday }}</span>
           </p>
           <p>
-            <span>毕业院校:{{ exportInfo.school }}</span>
-            <span>所学专业:{{ exportInfo.major_studied }}</span>
+            <span>院校:{{ exportInfo.school }}</span>
+            <span>专业:{{ exportInfo.major }}</span>
           </p>
           <p>
-            <span>学历:{{ exportInfo.eduback }}</span>
-            <span>学位:{{ exportInfo.degree }}</span>
+            <span>学历:{{ exportInfo.xl }}</span>
+            <span>学位:{{ exportInfo.xw }}</span>
           </p>
           <p>
-            <span>电话:{{ exportInfo.tel }}</span>
-            <span>邮箱:{{ exportInfo.phone }}</span>
+            <span>电话:{{ exportInfo.phone }}</span>
+            <span>邮箱:{{ exportInfo.email }}</span>
           </p>
         </el-col>
         <el-col :span="24" class="down">
           <div>
-            <span>职务:{{ exportInfo.position }}</span>
+            <span>身份证号 :{{ exportInfo.cardnumber }}</span>
             <span>从事专业:{{ exportInfo.professional }}</span>
           </div>
           <div>
-            <span>当前住址:{{ exportInfo.addr }}</span>
+            <span>项目:{{ exportInfo.project }}</span>
+            <span>学术成就 :{{ exportInfo.academic }}</span>
+          </div>
+
+          <div>
+            <span>职称级别:{{ exportInfo.level }}</span>
+            <span>职称名称 :{{ exportInfo.levelname }}</span>
+          </div>
+
+          <div>
+            <span>地址:{{ exportInfo.addr }}</span>
+            <span>论文:{{ exportInfo.paper }}</span>
           </div>
           <div>
-            <span>可供咨询领域:{{ exportInfo.field }}</span>
+            <span>备注 :{{ exportInfo.remark }}</span>
           </div>
           <div>
             <p>工作简介:</p>
-            <p class="profile" v-if="scope != ''">{{ exportInfo.job_profile }}</p>
-            <p class="profile1" v-else>{{ exportInfo.job_profile }}</p>
-            <el-button size="mini" v-if="exportInfo.job_profile != null">
+            <p class="profile" v-if="scope != ''">{{ exportInfo.resume }}</p>
+            <p class="profile1" v-else>{{ exportInfo.resume }}</p>
+            <el-button size="mini" v-if="exportInfo.resume != null">
               <span v-if="scope != ''" @click="scopeMore()">更多</span>
               <span v-else @click="scopeMore1()">收起</span>
             </el-button>

src/layout/market/zhuanjia.vue

@@ -2,46 +2,50 @@
   <div id="context">
     <el-col :span="24" class="one">
       <el-col :span="7" class="oneLeft">
-        <el-image :src="zhuanjiainfo.imgpath" style="height:210px"> </el-image>
+        <el-image :src="zhuanjiainfo.img_path" style="height:210px"> </el-image>
       </el-col>
       <el-col :span="17" class="oneRight">
         <p class="textOver">姓名 {{ zhuanjiainfo.name }}</p>
         <p>
-          <span>民族:{{ zhuanjiainfo.gender || '暂无' }}</span>
-          <span>出生年月:{{ zhuanjiainfo.birth || '暂无' }}/{{ zhuanjiainfo.priceunit || '暂无' }}</span>
+          <span>性别:{{ zhuanjiainfo.gender || '暂无' }}</span>
+          <span>出生年月:{{ zhuanjiainfo.birthday || '暂无' }}</span>
         </p>
         <p>
           <span> 毕业院校:{{ zhuanjiainfo.school }} </span>
-          <span>所学专业:{{ zhuanjiainfo.major_studied }}</span>
+          <span>专业:{{ zhuanjiainfo.major || '暂无' }}</span>
         </p>
         <p>
-          <span>学历:{{ zhuanjiainfo.eduback || '暂无' }}</span>
-          <span>学位:{{ zhuanjiainfo.degree || '暂无' }}</span>
+          <span>学历:{{ zhuanjiainfo.xl || '暂无' }}</span>
+          <span>学位:{{ zhuanjiainfo.xw || '暂无' }}</span>
         </p>
         <p>
-          <span>办公电话：{{ zhuanjiainfo.tel || '暂无' }}</span>
+          <span>电话号码：{{ zhuanjiainfo.phone || '暂无' }}</span>
           <span>邮箱:{{ zhuanjiainfo.email || '暂无' }}</span>
         </p>
       </el-col>
       <el-col :span="24" class="newRight">
         <div>
           <p>
-            <span>职务:{{ zhuanjiainfo.position || '暂无' }}</span
-            ><span>从事专业:{{ zhuanjiainfo.email || '暂无' }}</span>
-            <span>住址:{{ zhuanjiainfo.email || '暂无' }}</span>
-            <span>可供咨询领域:{{ zhuanjiainfo.email || '暂无' }}</span>
+            <span>身份证号:{{ zhuanjiainfo.cardnumber || '暂无' }}</span>
+            <span>地址:{{ zhuanjiainfo.addr || '暂无' }}</span>
+            <span>职称级别:{{ zhuanjiainfo.level || '暂无' }}</span>
+            <span>职称名称:{{ zhuanjiainfo.levelname || '暂无' }}</span>
+            <span>职务:{{ zhuanjiainfo.position || '暂无' }}</span>
+            <span>项目:{{ zhuanjiainfo.project || '暂无' }}</span>
+            <span>学术成就:{{ zhuanjiainfo.academic || '暂无' }}</span>
+            <span>论文:{{ zhuanjiainfo.paper || '暂无' }}</span>
+            <span>备注:{{ zhuanjiainfo.remark || '暂无' }}</span>
+            <span>从事专业:{{ zhuanjiainfo.professional || '暂无' }}</span>
           </p>
         </div>
         <div></div>
-        <div></div>
-        <div></div>
-        <div>
+        <div class="news">
           <p>工作简介:</p>
-          <p class="job_profile" v-if="job_profile != ''">{{ zhuanjiainfo.job_profile || '暂无' }}</p>
-          <p class="job_profile1" v-else>{{ zhuanjiainfo.job_profile || '暂无' }}</p>
-          <el-button size="mini" v-if="zhuanjiainfo.job_profile != null">
-            <span v-if="job_profile != ''" @click="job_profileMore()">更多</span>
-            <span v-else @click="job_profileMore1()">收起</span>
+          <p class="resume" v-if="resume != ''">{{ zhuanjiainfo.resume || '暂无' }}</p>
+          <p class="resume1" v-else>{{ zhuanjiainfo.resume || '暂无' }}</p>
+          <el-button size="mini" v-if="zhuanjiainfo.resume != null">
+            <span v-if="resume != ''" @click="resumeMore()">更多</span>
+            <span v-else @click="resumeMore1()">收起</span>
           </el-button>
         </div>
       </el-col>
@@ -58,7 +62,7 @@ export default {
   components: {},
   data: () => ({
     scope: '123',
-    job_profile: '123',
+    resume: '123',
   }),
   created() {},
   computed: {},
@@ -71,12 +75,12 @@ export default {
       this.scope = '123';
     },
     // 更多
-    job_profileMore() {
-      this.introduction = '';
+    resumeMore() {
+      this.resume = '';
     },
     // 收起
-    job_profileMore1() {
-      this.introduction = '123';
+    resumeMore1() {
+      this.resume = '123';
     },
   },
 };
@@ -202,21 +206,22 @@ p {
     div:nth-child(2) p span:last-child:hover {
       cursor: pointer;
     }
-    div:nth-child(3) .moreScope {
+    div:nth-child(3) .resume {
       overflow: hidden;
       text-overflow: ellipsis;
       -webkit-line-clamp: 6;
       word-break: break-all;
       display: -webkit-box;
       -webkit-box-orient: vertical;
+      height: 200px;
     }
-    div:nth-child(3) .moreScope1 {
+    div:nth-child(3) .resume1 {
       overflow: none;
     }
     div:nth-child(3) .el-button {
       float: right;
     }
-    div:nth-child(5) .job_profileMore {
+    div:nth-child(3) .resumeMore {
       overflow: hidden;
       text-overflow: ellipsis;
       -webkit-line-clamp: 6;
@@ -224,7 +229,7 @@ p {
       display: -webkit-box;
       -webkit-box-orient: vertical;
     }
-    div:nth-child(5) .job_profileMore1 {
+    div:nth-child(3) .resumeMore1 {
       overflow: none;
     }
     div:last-child .el-button {
@@ -237,4 +242,16 @@ p {
     text-align: center;
   }
 }
+
+.resume {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 6;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+.resume1 {
+  overflow: none;
+}
 </style>

src/views/direct.vue

@@ -172,7 +172,11 @@
                   <el-col :span="24" class="two">
                     <el-col :span="12" class="twoList" v-for="(item, index) in expertList" :key="index">
                       <el-col :span="4" class="image">
-                        <el-image :src="item.imgpath"></el-image>
+                        <el-image
+                          :src="item.img_path"
+                          style="height: 92px;
+"
+                        ></el-image>
                       </el-col>
                       <el-col :span="20" class="info">
                         <p>
@@ -182,11 +186,11 @@
 
                         <p>
                           <span>性别:{{ item.gender }}</span>
-                          <span>民族:{{ item.nation }}</span>
+                          <span>院校:{{ item.school }}</span>
                         </p>
                         <p>
                           <span>职务:{{ item.position }}</span>
-                          <span>从事领域:{{ item.field }}</span>
+                          <span>从事专业:{{ item.professional }}</span>
                         </p>
                       </el-col>
                     </el-col>
@@ -194,7 +198,7 @@
                 </el-tab-pane>
               </el-tabs>
               <el-col :span="24" class="marketPublish">
-                <el-col :span="18"> <el-input v-model="name" placeholder="请输入名称" class="input"></el-input></el-col>
+                <el-col :span="18"> <el-input v-model="name" placeholder="请输入名称" style="height30px" class="newinput"></el-input></el-col>
                 <el-col :span="6"><el-button class="btnSearch" size="mini" @click="resetForm(name)">查询</el-button></el-col>
               </el-col>
             </el-col>
@@ -269,7 +273,7 @@ import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: mapProduct } = createNamespacedHelpers('marketproduct');
 const { mapActions: market } = createNamespacedHelpers('market');
 const { mapActions: dock } = createNamespacedHelpers('dock');
-const { mapActions: talentExperts } = createNamespacedHelpers('talentExperts');
+const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 
 import _ from 'loadsh';
 export default {
@@ -426,7 +430,7 @@ export default {
     ...mapProduct({ mapProductQuery: 'newquery' }),
     ...market({ marketFetch: 'fetch' }),
     ...dock({ dockQuery: 'query' }),
-    ...talentExperts({ expertQuery: 'query' }),
+    ...expertsuser({ expertQuery: 'query' }),
     //jishu
     async searchInfo(newname) {
       console.log(newname);
@@ -965,4 +969,22 @@ export default {
   font-size: 18px;
   color: #fff;
 }
+
+/deep/.el-input__inner {
+  -webkit-appearance: none;
+  background-color: #fff;
+  background-image: none;
+  border-radius: 4px;
+  border: 1px solid #dcdfe6;
+  box-sizing: border-box;
+  color: #606266;
+  display: inline-block;
+  font-size: inherit;
+  height: 30px;
+  line-height: 12px;
+  outline: 0;
+  padding: 0 15px;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  width: 100%;
+}
 </style>

src/views/market/index.vue

@@ -117,14 +117,14 @@
             </el-col>
             <el-col :span="24">
               <el-col :span="24" class="downRightList" v-for="(item, index) in expertsList" :key="index" @click.native="zhuanjiaDetail(item.id)">
-                <el-col :span="10"><el-image :src="item.imgpath"></el-image></el-col>
+                <el-col :span="10"><el-image :src="item.img_path"></el-image></el-col>
                 <el-col :span="14"
                   ><p>{{ item.name || '暂无' }}</p>
-                  <p>从事领域：</p>
-                  <p>{{ item.field || '暂无' }}</p></el-col
+                  <p>从事专业：</p>
+                  <p>{{ item.professional || '暂无' }}</p></el-col
                 >
                 <el-col :span="24"
-                  ><p>{{ item.job_profile || '暂无' }}</p></el-col
+                  ><p>{{ item.resume || '暂无' }}</p></el-col
                 >
               </el-col>
             </el-col>
@@ -167,7 +167,7 @@
 import _ from 'lodash';
 import { mapActions, mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: product } = createNamespacedHelpers('marketproduct');
-const { mapActions: talentExperts } = createNamespacedHelpers('talentExperts');
+const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 var moment = require('moment');
 export default {
   name: 'index',
@@ -207,7 +207,7 @@ export default {
 
   methods: {
     ...product(['newquery']),
-    ...talentExperts({ expertQuery: 'query' }),
+    ...expertsuser({ expertQuery: 'query' }),
     async search() {
       let res = await this.newquery({ skip: 0, limit: 6, totaltype: '0', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `tecList`, res.data);
@@ -216,7 +216,7 @@ export default {
       if (this.$checkRes(res)) this.$set(this, `newList`, res.data);
       res = await this.newquery({ skip: 0, limit: 4, totaltype: '2', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `serviceList`, res.data);
-      res = await this.expertQuery({ skip: 0, limit: 4, status: '1' });
+      res = await this.expertQuery({ skip: 0, limit: 4 });
       if (this.$checkRes(res)) this.$set(this, `expertsList`, res.data);
     },
     toProductList() {

src/views/market/marketlists.vue

@@ -52,7 +52,7 @@
               <p>{{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}</p>
               <p>
                 <span class="textOver" @click="clickzhuanjia(item.id)">{{ item.name }}</span>
-                <span>{{ item.job_profile }}</span>
+                <span>{{ item.resume }}</span>
               </p>
             </el-col>
           </el-col>
@@ -84,7 +84,7 @@
 import _ from 'lodash';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: product } = createNamespacedHelpers('enterpriseproject');
-const { mapActions: talentExperts } = createNamespacedHelpers('talentExperts');
+const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
 const { mapActions: tranaudit } = createNamespacedHelpers('tranaudit');
 import zhuanjia from '@/layout/market/zhuanjia.vue';
@@ -142,7 +142,7 @@ export default {
 
   methods: {
     ...product({ list: 'newquery', newfetch: 'newfetch' }),
-    ...talentExperts({ lists: 'query', fetch: 'fetch' }),
+    ...expertsuser({ lists: 'query', fetch: 'fetch' }),
     ...transaction({ transactioncreate: 'create', transactionfetch: 'fetch' }),
     ...tranaudit({ tranauditcreate: 'create' }),
     async searchList({ skip = 0, limit = 10, ...info } = {}) {
@@ -191,7 +191,7 @@ export default {
         this.$set(this, `hangyeList`, res.data);
       } else if (name == '专家供求') {
         let totaltype = this.totaltype;
-        res = await this.lists({ skip, limit, status: 1, ...info });
+        res = await this.lists({ skip, limit, ...info });
         this.$set(this, `jiaoyuList`, res.data);
       }
       this.$set(this, `pageTotal`, res.total);