行业专家浏览

zh-baseversion-admin/src/main/java/com/zehong/web/controller/api/TokenController.java

 package com.zehong.web.controller.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zehong.common.core.domain.AjaxResult;
-import com.zehong.common.core.redis.RedisCache;
+import com.zehong.common.utils.GovernmentDataCopyUtil;
+import com.zehong.system.domain.TProAppInforBrowse;
+import com.zehong.system.domain.vo.ProAppInforBrowseVo;
+import com.zehong.system.service.ITProAppInforBrowseService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 @RestController
 @RequestMapping("/token")
 public class TokenController {
 
+    private static final Logger log = LoggerFactory.getLogger(TokenController.class);
 
     @Autowired
     private OutUtil outUtil;
 
+    @Autowired
+    private ITProAppInforBrowseService tProAppInforBrowseService;
+
     /**
      * 获取营业执照
      * @return
@@ -105,4 +113,37 @@ public class TokenController {
         JSONObject json = outUtil.setInfo(domain,"WRITE",list);
         return AjaxResult.success(json);
     }
+
+    @GetMapping(value = "/getProfessorInfo")
+    public AjaxResult getProfessorInfo(@RequestParam(value = "updateTime") String updateTime,@RequestParam(value = "pageIndex") Integer pageIndex,@RequestParam(value = "pageSize") Integer pageSize){
+
+        try {
+            Map<String,Object> map = new HashMap<>();
+            map.put("updateTime",updateTime);
+            map.put("pageIndex",pageIndex);
+            map.put("pageSize",pageSize);
+            JSONObject json = outUtil.getInfo("professor/application/information","READ",map);
+            if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
+                addProfessorInfo(json.getJSONArray("data"));
+            }
+            return AjaxResult.success("获取行业专家档案成功");
+        } catch (Exception e) {
+            log.error("获取行业专家档案失败",e);
+            return AjaxResult.error("获取行业专家档案失败");
+        }
+    }
+
+    /**
+     * 持久化行业专家档案
+     * @param data
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void addProfessorInfo(JSONArray data) throws IllegalAccessException {
+        for(int i = 0; i < data.size(); i++){
+            ProAppInforBrowseVo proAppInforBrowseVo = JSONObject.toJavaObject(data.getJSONObject(i), ProAppInforBrowseVo.class);
+            TProAppInforBrowse tProAppInforBrowse = new TProAppInforBrowse();
+            GovernmentDataCopyUtil.copyToLocalData(proAppInforBrowseVo,tProAppInforBrowse);
+            tProAppInforBrowseService.insertTProAppInforBrowse(tProAppInforBrowse);
+        }
+    }
 }

zh-baseversion-admin/src/main/java/com/zehong/web/controller/specialist/TProAppInforBrowseController.java

+package com.zehong.web.controller.specialist;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TProAppInforBrowse;
+import com.zehong.system.service.ITProAppInforBrowseService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 行业专家库-专家库浏览Controller
+ * 
+ * @author zehong
+ * @date 2024-05-08
+ */
+@RestController
+@RequestMapping("/specialist/browse")
+public class TProAppInforBrowseController extends BaseController
+{
+    @Autowired
+    private ITProAppInforBrowseService tProAppInforBrowseService;
+
+    /**
+     * 查询行业专家库-专家库浏览列表
+     */
+    @PreAuthorize("@ss.hasPermi('specialist:browse:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TProAppInforBrowse tProAppInforBrowse)
+    {
+        startPage();
+        List<TProAppInforBrowse> list = tProAppInforBrowseService.selectTProAppInforBrowseList(tProAppInforBrowse);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出行业专家库-专家库浏览列表
+     */
+    @PreAuthorize("@ss.hasPermi('specialist:browse:export')")
+    @Log(title = "行业专家库-专家库浏览", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TProAppInforBrowse tProAppInforBrowse)
+    {
+        List<TProAppInforBrowse> list = tProAppInforBrowseService.selectTProAppInforBrowseList(tProAppInforBrowse);
+        ExcelUtil<TProAppInforBrowse> util = new ExcelUtil<TProAppInforBrowse>(TProAppInforBrowse.class);
+        return util.exportExcel(list, "行业专家库-专家库浏览数据");
+    }
+
+    /**
+     * 获取行业专家库-专家库浏览详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('specialist:browse:query')")
+    @GetMapping(value = "/{fProAppInforId}")
+    public AjaxResult getInfo(@PathVariable("fProAppInforId") Long fProAppInforId)
+    {
+        return AjaxResult.success(tProAppInforBrowseService.selectTProAppInforBrowseById(fProAppInforId));
+    }
+
+    /**
+     * 新增行业专家库-专家库浏览
+     */
+    @PreAuthorize("@ss.hasPermi('specialist:browse:add')")
+    @Log(title = "行业专家库-专家库浏览", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TProAppInforBrowse tProAppInforBrowse)
+    {
+        return toAjax(tProAppInforBrowseService.insertTProAppInforBrowse(tProAppInforBrowse));
+    }
+
+    /**
+     * 修改行业专家库-专家库浏览
+     */
+    @PreAuthorize("@ss.hasPermi('specialist:browse:edit')")
+    @Log(title = "行业专家库-专家库浏览", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TProAppInforBrowse tProAppInforBrowse)
+    {
+        return toAjax(tProAppInforBrowseService.updateTProAppInforBrowse(tProAppInforBrowse));
+    }
+
+    /**
+     * 删除行业专家库-专家库浏览
+     */
+    @PreAuthorize("@ss.hasPermi('specialist:browse:remove')")
+    @Log(title = "行业专家库-专家库浏览", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fProAppInforIds}")
+    public AjaxResult remove(@PathVariable Long[] fProAppInforIds)
+    {
+        return toAjax(tProAppInforBrowseService.deleteTProAppInforBrowseByIds(fProAppInforIds));
+    }
+}

zh-baseversion-common/src/main/java/com/zehong/common/utils/GovernmentDataCopyUtil.java

@@ -11,11 +11,11 @@ import java.util.Map;
 public class GovernmentDataCopyUtil {
 
     /**
-     * 信息拷贝
+     * 拷贝为市局实体
      * @param source 源
      * @param target 目标对象
      */
-    public static void copyObjectInfo(Object source,Object target) throws IllegalAccessException {
+    public static void copyToGovernData(Object source,Object target) throws IllegalAccessException {
         Field[] fields = source.getClass().getDeclaredFields();
         Map<String,Field> targetMap = fieldsToMap(target.getClass().getDeclaredFields());
         for(Field field : fields){
@@ -31,6 +31,27 @@ public class GovernmentDataCopyUtil {
         }
     }
 
+    /**
+     * 拷贝为本地实体
+     * @param source 源
+     * @param target 目标对象
+     */
+    public static void copyToLocalData(Object source,Object target) throws IllegalAccessException {
+        Field[] fields = source.getClass().getDeclaredFields();
+        Map<String,Field> targetMap = fieldsToMap(target.getClass().getDeclaredFields());
+        for(Field field : fields){
+            field.setAccessible(true);
+            String name = field.getName();
+            String targetName = "f" + Character.toLowerCase(name.charAt(0)) + name.substring(1);
+            if(targetMap.containsKey(targetName)){
+                Object value = field.get(source);
+                if(null != value){
+                    targetMap.get(targetName).set(target,value);
+                }
+            }
+        }
+    }
+
     /**
      * field[]数组转map
      * @param fields  属性数组

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/ProAppInforBrowseVo.java

+package com.zehong.system.domain.vo;
+
+public class ProAppInforBrowseVo {
+
+    /** 专家姓名 */
+    private String name;
+
+    /** 身份证号 */
+    private String idNo;
+
+    /** 所在地区 */
+    private String area;
+
+    /** 性别：1-男性，2-女性 */
+    private String sex;
+
+    /** 出生日期 */
+    private String birthday;
+
+    /** 联系电话 */
+    private String phone;
+
+    /** 所属专业 */
+    private String major;
+
+    /** 工作单位编码 */
+    private String entUuid;
+
+    /** 工作单位名称 */
+    private String workUnit;
+
+    /** 职务 */
+    private String duties;
+
+    /** 专业技术职称 */
+    private String majorTitle;
+
+    /** 现从事专业 */
+    private String majorNow;
+
+    /** 从事行业燃气种类 可以是多个，逗号分割
+
+     03-0100-0101：管道燃气
+
+     03-0100-0102：液化天然气（LNG）
+
+     03-0100-0103：压缩天然气(CNG)
+
+     03-0200：液化石油气(LPG)
+
+     03-0300：人工煤气
+
+     03-0400：液化石油气混空气
+
+     03-0500：沼气
+
+     03-0600：氢气 */
+    private String gasType;
+
+    /** 擅长工作领域，可以是多个，逗号分割 */
+    private String goodArea;
+
+    /** 相关学习工作经历及工作业绩 */
+    private String learningWorkExperience;
+
+    /**聘用时间*/
+    private String employTime;
+
+    /**是否有效：0 有效，1 无效*/
+    private Long validType;
+
+    /** 是否省级专家 1 是，0 不是 */
+    private String thisProvinceFlag;
+
+    /**聘用批次*/
+    private String employBatch;
+
+    /** 最后修改时间 */
+    private String updateTime;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIdNo() {
+        return idNo;
+    }
+
+    public void setIdNo(String idNo) {
+        this.idNo = idNo;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getMajor() {
+        return major;
+    }
+
+    public void setMajor(String major) {
+        this.major = major;
+    }
+
+    public String getEntUuid() {
+        return entUuid;
+    }
+
+    public void setEntUuid(String entUuid) {
+        this.entUuid = entUuid;
+    }
+
+    public String getWorkUnit() {
+        return workUnit;
+    }
+
+    public void setWorkUnit(String workUnit) {
+        this.workUnit = workUnit;
+    }
+
+    public String getDuties() {
+        return duties;
+    }
+
+    public void setDuties(String duties) {
+        this.duties = duties;
+    }
+
+    public String getMajorTitle() {
+        return majorTitle;
+    }
+
+    public void setMajorTitle(String majorTitle) {
+        this.majorTitle = majorTitle;
+    }
+
+    public String getMajorNow() {
+        return majorNow;
+    }
+
+    public void setMajorNow(String majorNow) {
+        this.majorNow = majorNow;
+    }
+
+    public String getGasType() {
+        return gasType;
+    }
+
+    public void setGasType(String gasType) {
+        this.gasType = gasType;
+    }
+
+    public String getGoodArea() {
+        return goodArea;
+    }
+
+    public void setGoodArea(String goodArea) {
+        this.goodArea = goodArea;
+    }
+
+    public String getLearningWorkExperience() {
+        return learningWorkExperience;
+    }
+
+    public void setLearningWorkExperience(String learningWorkExperience) {
+        this.learningWorkExperience = learningWorkExperience;
+    }
+
+    public String getEmployTime() {
+        return employTime;
+    }
+
+    public void setEmployTime(String employTime) {
+        this.employTime = employTime;
+    }
+
+    public Long getValidType() {
+        return validType;
+    }
+
+    public void setValidType(Long validType) {
+        this.validType = validType;
+    }
+
+    public String getThisProvinceFlag() {
+        return thisProvinceFlag;
+    }
+
+    public void setThisProvinceFlag(String thisProvinceFlag) {
+        this.thisProvinceFlag = thisProvinceFlag;
+    }
+
+    public String getEmployBatch() {
+        return employBatch;
+    }
+
+    public void setEmployBatch(String employBatch) {
+        this.employBatch = employBatch;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TProAppInforBrowseMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TProAppInforBrowse;
+
+/**
+ * 行业专家库-专家库浏览Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-05-08
+ */
+public interface TProAppInforBrowseMapper 
+{
+    /**
+     * 查询行业专家库-专家库浏览
+     * 
+     * @param fProAppInforId 行业专家库-专家库浏览ID
+     * @return 行业专家库-专家库浏览
+     */
+    public TProAppInforBrowse selectTProAppInforBrowseById(Long fProAppInforId);
+
+    /**
+     * 查询行业专家库-专家库浏览列表
+     * 
+     * @param tProAppInforBrowse 行业专家库-专家库浏览
+     * @return 行业专家库-专家库浏览集合
+     */
+    public List<TProAppInforBrowse> selectTProAppInforBrowseList(TProAppInforBrowse tProAppInforBrowse);
+
+    /**
+     * 新增行业专家库-专家库浏览
+     * 
+     * @param tProAppInforBrowse 行业专家库-专家库浏览
+     * @return 结果
+     */
+    public int insertTProAppInforBrowse(TProAppInforBrowse tProAppInforBrowse);
+
+    /**
+     * 修改行业专家库-专家库浏览
+     * 
+     * @param tProAppInforBrowse 行业专家库-专家库浏览
+     * @return 结果
+     */
+    public int updateTProAppInforBrowse(TProAppInforBrowse tProAppInforBrowse);
+
+    /**
+     * 删除行业专家库-专家库浏览
+     * 
+     * @param fProAppInforId 行业专家库-专家库浏览ID
+     * @return 结果
+     */
+    public int deleteTProAppInforBrowseById(Long fProAppInforId);
+
+    /**
+     * 批量删除行业专家库-专家库浏览
+     * 
+     * @param fProAppInforIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTProAppInforBrowseByIds(Long[] fProAppInforIds);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/ITProAppInforBrowseService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TProAppInforBrowse;
+
+/**
+ * 行业专家库-专家库浏览Service接口
+ * 
+ * @author zehong
+ * @date 2024-05-08
+ */
+public interface ITProAppInforBrowseService 
+{
+    /**
+     * 查询行业专家库-专家库浏览
+     * 
+     * @param fProAppInforId 行业专家库-专家库浏览ID
+     * @return 行业专家库-专家库浏览
+     */
+    public TProAppInforBrowse selectTProAppInforBrowseById(Long fProAppInforId);
+
+    /**
+     * 查询行业专家库-专家库浏览列表
+     * 
+     * @param tProAppInforBrowse 行业专家库-专家库浏览
+     * @return 行业专家库-专家库浏览集合
+     */
+    public List<TProAppInforBrowse> selectTProAppInforBrowseList(TProAppInforBrowse tProAppInforBrowse);
+
+    /**
+     * 新增行业专家库-专家库浏览
+     * 
+     * @param tProAppInforBrowse 行业专家库-专家库浏览
+     * @return 结果
+     */
+    public int insertTProAppInforBrowse(TProAppInforBrowse tProAppInforBrowse);
+
+    /**
+     * 修改行业专家库-专家库浏览
+     * 
+     * @param tProAppInforBrowse 行业专家库-专家库浏览
+     * @return 结果
+     */
+    public int updateTProAppInforBrowse(TProAppInforBrowse tProAppInforBrowse);
+
+    /**
+     * 批量删除行业专家库-专家库浏览
+     * 
+     * @param fProAppInforIds 需要删除的行业专家库-专家库浏览ID
+     * @return 结果
+     */
+    public int deleteTProAppInforBrowseByIds(Long[] fProAppInforIds);
+
+    /**
+     * 删除行业专家库-专家库浏览信息
+     * 
+     * @param fProAppInforId 行业专家库-专家库浏览ID
+     * @return 结果
+     */
+    public int deleteTProAppInforBrowseById(Long fProAppInforId);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TProAppInforBrowseServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TProAppInforBrowseMapper;
+import com.zehong.system.domain.TProAppInforBrowse;
+import com.zehong.system.service.ITProAppInforBrowseService;
+
+/**
+ * 行业专家库-专家库浏览Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-05-08
+ */
+@Service
+public class TProAppInforBrowseServiceImpl implements ITProAppInforBrowseService 
+{
+    @Autowired
+    private TProAppInforBrowseMapper tProAppInforBrowseMapper;
+
+    /**
+     * 查询行业专家库-专家库浏览
+     * 
+     * @param fProAppInforId 行业专家库-专家库浏览ID
+     * @return 行业专家库-专家库浏览
+     */
+    @Override
+    public TProAppInforBrowse selectTProAppInforBrowseById(Long fProAppInforId)
+    {
+        return tProAppInforBrowseMapper.selectTProAppInforBrowseById(fProAppInforId);
+    }
+
+    /**
+     * 查询行业专家库-专家库浏览列表
+     * 
+     * @param tProAppInforBrowse 行业专家库-专家库浏览
+     * @return 行业专家库-专家库浏览
+     */
+    @Override
+    public List<TProAppInforBrowse> selectTProAppInforBrowseList(TProAppInforBrowse tProAppInforBrowse)
+    {
+        return tProAppInforBrowseMapper.selectTProAppInforBrowseList(tProAppInforBrowse);
+    }
+
+    /**
+     * 新增行业专家库-专家库浏览
+     * 
+     * @param tProAppInforBrowse 行业专家库-专家库浏览
+     * @return 结果
+     */
+    @Override
+    public int insertTProAppInforBrowse(TProAppInforBrowse tProAppInforBrowse)
+    {
+        return tProAppInforBrowseMapper.insertTProAppInforBrowse(tProAppInforBrowse);
+    }
+
+    /**
+     * 修改行业专家库-专家库浏览
+     * 
+     * @param tProAppInforBrowse 行业专家库-专家库浏览
+     * @return 结果
+     */
+    @Override
+    public int updateTProAppInforBrowse(TProAppInforBrowse tProAppInforBrowse)
+    {
+        return tProAppInforBrowseMapper.updateTProAppInforBrowse(tProAppInforBrowse);
+    }
+
+    /**
+     * 批量删除行业专家库-专家库浏览
+     * 
+     * @param fProAppInforIds 需要删除的行业专家库-专家库浏览ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTProAppInforBrowseByIds(Long[] fProAppInforIds)
+    {
+        return tProAppInforBrowseMapper.deleteTProAppInforBrowseByIds(fProAppInforIds);
+    }
+
+    /**
+     * 删除行业专家库-专家库浏览信息
+     * 
+     * @param fProAppInforId 行业专家库-专家库浏览ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTProAppInforBrowseById(Long fProAppInforId)
+    {
+        return tProAppInforBrowseMapper.deleteTProAppInforBrowseById(fProAppInforId);
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TProAppInforServiceImpl.java

@@ -128,7 +128,7 @@ public class TProAppInforServiceImpl implements ITProAppInforService {
         int result = tProAppInforMapper.updateTProAppInfor(updateInfo);
         TProAppInfor appInfor = tProAppInforMapper.selectTProAppInforById(fProAppInforId);
         ProAppInfoVo proAppInfoVo = new ProAppInfoVo();
-        GovernmentDataCopyUtil.copyObjectInfo(appInfor,proAppInfoVo);
+        GovernmentDataCopyUtil.copyToGovernData(appInfor,proAppInfoVo);
         List<ProAppInfoVo> data = new ArrayList<>();
         data.add(proAppInfoVo);
         JSONObject reportResult = governmentDataUtil.setInfo("professor/application/information","WRITE",data);

zh-baseversion-web/src/api/specialist/browse.js

+import request from '@/utils/request'
+
+// 查询行业专家库-专家库浏览列表
+export function listBrowse(query) {
+  return request({
+    url: '/specialist/browse/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询行业专家库-专家库浏览详细
+export function getBrowse(fProAppInforId) {
+  return request({
+    url: '/specialist/browse/' + fProAppInforId,
+    method: 'get'
+  })
+}
+
+// 新增行业专家库-专家库浏览
+export function addBrowse(data) {
+  return request({
+    url: '/specialist/browse',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改行业专家库-专家库浏览
+export function updateBrowse(data) {
+  return request({
+    url: '/specialist/browse',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除行业专家库-专家库浏览
+export function delBrowse(fProAppInforId) {
+  return request({
+    url: '/specialist/browse/' + fProAppInforId,
+    method: 'delete'
+  })
+}
+
+// 导出行业专家库-专家库浏览
+export function exportBrowse(query) {
+  return request({
+    url: '/specialist/browse/export',
+    method: 'get',
+    params: query
+  })
+}

zh-baseversion-web/src/views/specialist/browse/components/DetailInfo.vue

+<template>
+  <el-dialog title="详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
+    <el-form label-width="160px">
+      <el-row class="el-row-table">
+        <el-col :span="12">
+          <el-form-item label="专家姓名">
+            <span v-if="detailInfo.fName">{{ detailInfo.fName }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="人员编码">
+            <span v-if="detailInfo.fCode">{{ detailInfo.fCode }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="身份证号">
+            <span v-if="detailInfo.fIdNo">{{ detailInfo.fIdNo }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="性别">
+            <span v-if="detailInfo.fSex">{{ $parent.fSexFormat(detailInfo) }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="出生日期">
+            <span v-if="detailInfo.fBirthday">{{ detailInfo.fBirthday }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="邮箱">
+            <span v-if="detailInfo.fEmail">{{ detailInfo.fEmail }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="联系电话">
+            <span v-if="detailInfo.fPhone">{{ detailInfo.fPhone }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="文化程度">
+            <span v-if="detailInfo.fEducation">{{ detailInfo.fEducation }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="毕业院校">
+            <span v-if="detailInfo.fGraduationSchool">{{ detailInfo.fGraduationSchool }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="所属专业">
+            <span v-if="detailInfo.fMajor">{{ detailInfo.fMajor }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="毕业时间">
+            <span v-if="detailInfo.fGraduationTime">{{ detailInfo.fGraduationTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="工作单位编码">
+            <span v-if="detailInfo.fEntUuid">{{ detailInfo.fEntUuid }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="工作单位名称">
+            <span v-if="detailInfo.fWorkUnit">{{ detailInfo.fWorkUnit }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="参加工作时间">
+            <span v-if="detailInfo.fWorkTime">{{ detailInfo.fWorkTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="所在部门">
+            <span v-if="detailInfo.fDepartment">{{ detailInfo.fDepartment }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="职务">
+            <span v-if="detailInfo.fDuties">{{ detailInfo.fDuties }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="专业技术职称">
+            <span v-if="detailInfo.fMajorTitle">{{ detailInfo.fMajorTitle }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="现从事专业">
+            <span v-if="detailInfo.fMajorNow">{{ detailInfo.fMajorNow }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="从事专业工作年限">
+            <span v-if="detailInfo.fMajorLife">{{ detailInfo.fMajorLife }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="燃气种类">
+            <span v-if="detailInfo.fGasType">{{ $parent.fGasTypeFormat(detailInfo) }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="擅长工作领域">
+            <span v-if="detailInfo.fGoodArea">{{ detailInfo.fGoodArea }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="工作经历">
+            <span v-if="detailInfo.fLearningWorkExperience">{{ detailInfo.fLearningWorkExperience }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="所在地区">
+            <span v-if="detailInfo.fArea">{{ detailInfo.fArea }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="删除标记">
+            <span v-if="detailInfo.fDeleteFlag == 0">可用</span>
+            <span v-else-if="detailInfo.fDeleteFlag == 1">已删除</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="市局燃气主管部门意见">
+            <span v-if="detailInfo.fCRecord">{{ detailInfo.fCRecord }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="省级燃气主管部门意见">
+            <span v-if="detailInfo.fPRecord">{{ detailInfo.fPRecord }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="照片">
+            <el-image
+              :src="detailInfo.fPicture"
+              :preview-src-list="[detailInfo.fPicture]"
+              v-if="detailInfo.fPicture != '' && detailInfo.fPicture != null"
+              :z-index=5000
+              style="width: 200px;height: 200px;"
+            ></el-image>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="最后修改时间">
+            <span v-if="detailInfo.fUpdateTime">{{ detailInfo.fUpdateTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="是否省级专家">
+            <span v-if="detailInfo.fThisProvinceFlag">{{ $parent.fThisProvinceFlagFormat(detailInfo) }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="是否有效">
+            <span v-if="detailInfo.fValidType">{{ $parent.fValidTypeFormat(detailInfo) }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="聘用批次">
+            <span v-if="detailInfo.fEmployBatch">{{ detailInfo.fEmployBatch }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+    </el-form>
+  </el-dialog>
+
+</template>
+
+<script>
+  import { getBrowse } from "@/api/specialist/browse";
+  export default {
+    name: "detail-info",
+    data(){
+        return{
+          detailInfo: {},
+          detailOpen: false
+        }
+    },
+    methods:{
+      getDetailInfo(id){
+        getBrowse(id).then(res =>{
+          if(res.code == 200 && res.data){
+            this.detailInfo = res.data;
+            this.detailOpen = true;
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>