1

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/dp/DpController.java

@@ -67,6 +67,29 @@ public class DpController {
     private BuildingManagementService buildingManagementService;
 
 
+    /**
+     * 首页统计
+     */
+    @ApiLog("首页统计")
+    @ApiOperation(value = "首页统计")
+    @GetMapping("InfoStatistics")
+    public ResponseEntity<HashMap<String, Object>> InfoStatistics() throws Exception {
+        HashMap<String, Object> map=enterpriseInfoService.getInfoStatistics();
+        return ResponseEntity.ok (map);
+    }
+
+    /**
+     * 行业列表
+     */
+    @ApiLog("行业列表")
+    @ApiOperation(value = "行业列表")
+    @GetMapping("InfoStatistics_industry")
+    public ResponseEntity<List<HashMap<String, Object>>> InfoStatistics_industry() throws Exception {
+        List<HashMap<String, Object>> map=enterpriseInfoService.getInfoStatistics6();
+        return ResponseEntity.ok (map);
+    }
+
+
     /**
      * 企业信息统计
      */
@@ -87,28 +110,7 @@ public class DpController {
         map.put("xfqcs",aa.getDes10());//消防器材数
         map.put("xfqcsfgq",aa.getDes11());//消防器材是否过期
 
-        //租金缴纳时间(放在了物业费缴纳中)
-        //String adate=enterprisePropertyService.getQyLatestPayDate(qyid);
-        //map.put("payDate",adate);
-
-        //租金缴纳时间去除（2024-11-11）
-        //消防设备数量、消防设备是否过期,放在企业基本信息表中（2024-11-11）
-
-        //租金缴纳时间、消防设备数量、消防设备是否过期
-//        HashMap<String, Object> adate=enterpriseOtherService.getQyLatestInfo(qyid);
-//        if(adate!=null){
-//            map.put("payDate",adate.get("payTime").toString());
-//            map.put("eqNum",adate.get("eqNum").toString());
-//            map.put("isExpired",adate.get("isExpired").toString());
-//        }else{
-//            map.put("payDate","");
-//            map.put("eqNum","");
-//            map.put("isExpired","");
-//        }
 
-        //员工数(企业人员功能已去除，咱是用不到)
-//        int userCount=qyUserService.getQyUserCount(qyid);
-//        map.put("userCount",userCount);
 
         //上一年度销售额、上一年度入库税收、本年度销售额、本年度入库税收（2024-11-11 数据中添加税源办查询的数据并且标记des3=1）
         HashMap<String, Object> map2=saleInventoryService.getSaleStatistics(qyid);

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/controller/EnterpriseInfoController.java

@@ -223,77 +223,65 @@ public class EnterpriseInfoController {
 		//新增时，添加企业账号；编辑时，编辑企业账号。
 		if(enterpriseInfoDTO.getId()==null||enterpriseInfoDTO.getId().equals("")){
 			enterpriseInfoDTO.setId(enterpriseid);
-			//保存前判断： 有入驻时间时，状态为1已入驻
-			if(enterpriseInfoDTO.getEntryTime()!=null){
-				enterpriseInfoDTO.setDes6("1");
-			}
-			//有撤场时间时，企业状态为2已撤场 ;
-			if(enterpriseInfoDTO.getDes5()!=null&&!enterpriseInfoDTO.getDes5().equals("")){
-				enterpriseInfoDTO.setDes6("2");
-			}
-			enterpriseInfoService.saveOrUpdate(enterpriseInfoWrapper.toEntity (enterpriseInfoDTO));
-
-			//将企业同时在机构中插入
-			String lyofficeid=officeService.getOfficeIdFromMiddleTable(enterpriseInfoDTO.getDes1(),"2");
-			Office office=officeService.getById(lyofficeid);
-			UserDTO cuserDTO = UserUtils.getCurrentUserDTO();//
-			officeService.insertOffice(officeid,"2","4","1",enterpriseInfoDTO.getName(),lyofficeid,office.getParentIds()+lyofficeid+",",cuserDTO.getId());
-
-			//保存一下中间表
-			officeService.saveOfficeMiddleTable(officeid,"",enterpriseid,"3");
-
-			UserDTO userDTO=new UserDTO();
-			userDTO.setLoginName(enterpriseInfoDTO.getPhone());
-			userDTO.setPassword ( SecurityUtils.encryptPassword ( enterpriseInfoDTO.getPhone() ) );
-
-			userDTO.setName(enterpriseInfoDTO.getName());
-			userDTO.setMobile(enterpriseInfoDTO.getPhone());
-
-			OfficeDTO of=new OfficeDTO();
-			of.setId("1852255263109984258");//潘黄园区
-			userDTO.setCompanyDTO(of);
 
-			OfficeDTO of2=new OfficeDTO();
-			of2.setId(officeid);
-			userDTO.setOfficeDTO(of2);
-
-			userDTO.setNo("001");
-			RoleDTO ro=new RoleDTO();
-			ro.setId("38a14f1f42ed424eab4cb5d489596b0d");//企业用户
-			List<RoleDTO> ros=new ArrayList<>();
-			ros.add(ro);
-			userDTO.setRoleDTOList(ros);
-			userDTO.setLoginFlag("1");
-
-			userService.saveOrUpdate ( userDTO );
+			enterpriseInfoService.saveOrUpdate(enterpriseInfoWrapper.toEntity (enterpriseInfoDTO));
 
+			int re=enterpriseInfoService.generateAccount ( enterpriseInfoDTO);
 
 		}else{
-			//保存前判断： 有入驻时间时，状态为1已入驻
-			if(enterpriseInfoDTO.getEntryTime()!=null){
-				enterpriseInfoDTO.setDes6("1");
-			}
-			//有撤场时间时，企业状态为2已撤场 ;
-			if(enterpriseInfoDTO.getDes5()!=null&&!enterpriseInfoDTO.getDes5().equals("")){
-				enterpriseInfoDTO.setDes6("2");
-			}
+
 			enterpriseInfoService.saveOrUpdate (enterpriseInfoWrapper.toEntity (enterpriseInfoDTO));
 
 			UserDTO olduserDTO=userService.getUserByLoginName(oldLoginname);
-			if(olduserDTO!=null){
+			if(olduserDTO!=null){//有账号就编辑
 				olduserDTO.setLoginName(enterpriseInfoDTO.getPhone());
-				olduserDTO.setPassword ( SecurityUtils.encryptPassword ( enterpriseInfoDTO.getPhone() ) );
 				olduserDTO.setMobile(enterpriseInfoDTO.getPhone());
 				userService.saveOrUpdate ( olduserDTO );
+			}else{//没账号就新增
+				int re=enterpriseInfoService.generateAccount ( enterpriseInfoDTO);
 			}
-
 		}
 
-
-
         return ResponseEntity.ok ( "保存企业基本信息成功" );
 	}
 
+	/**
+	 * 一键生成账号
+	 */
+	@ApiLog("一键生成账号")
+	@ApiOperation(value = "一键生成账号")
+	@GetMapping("generateAccount")
+	public ResponseEntity <String> generateAccount(String ids) {
+		String idArray[] = ids.split(",");
+		int a=0,b=0,c=0;
+
+
+		for(int i=0;i<idArray.length;i++){
+			String id=idArray[i];
+			if(id!=null&&!id.equals("")){
+
+				EnterpriseInfoDTO ef=enterpriseInfoWrapper.toDTO ( enterpriseInfoService.getById ( id ) );
+				int re=enterpriseInfoService.generateAccount ( ef);
+				if(re==1){
+					a++;
+				}else if(re==2){
+					b++;
+				}else if(re==3){
+					c++;
+				}
+
+			}
+		}
+		String res=c+" 家企业账号已生成!";
+		if(a!=0){
+			res=res+" 其中"+a+" 家 企业联系电话未填写!";
+		}
+		if(b!=0){
+			res=res+" 其中"+b+" 家 企业账号已经生成过！";
+		}
+
+		return ResponseEntity.ok( res );
+	}
 
 	/**
 	 * 删除企业基本信息
@@ -374,7 +362,7 @@ public class EnterpriseInfoController {
     @PreAuthorize ("hasAnyAuthority('enterpriseinfo:enterpriseInfo:import')")
     @GetMapping("import/template")
     public void importFileTemplate(HttpServletResponse response) throws IOException {
-        String fileName = "企业基本信息数据导入模板.xlsx";
+        String fileName = "规上工业企业数据导入模板.xlsx";
         List<EnterpriseInfoDTO> list = Lists.newArrayList();
         EasyExcelUtils.newInstance ( enterpriseInfoService, enterpriseInfoWrapper ).exportExcel ( list,  "企业基本信息数据", EnterpriseInfoDTO.class, fileName, null, response );
     }

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/mapper/EnterpriseInfoMapper.java

@@ -36,6 +36,15 @@ public interface EnterpriseInfoMapper extends BaseMapper<EnterpriseInfo> {
     HashMap<String, Object> getLyinfoforuserid(String userid);
 
 
+    HashMap<String, Object> getInfoStatistics();
+
+    int getInfoStatistics1();
+    int getInfoStatistics2();
+    int getInfoStatistics3();
+    int getInfoStatistics4();
+    int getInfoStatistics5();
+    List<HashMap<String, Object>> getInfoStatistics6();
+
 
     EnterpriseInfoDTO findByName(String name);
 

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/mapper/xml/EnterpriseInfoMapper.xml

@@ -98,6 +98,38 @@
         where u.id=#{userid}
     </select>
 
+    <select id="getInfoStatistics" resultType="map">
+        SELECT b.building_name,ei.name,ei.floor,ei.des3,ei.lxr,ei.phone
+        FROM `sys_user` u
+                 left join ly_office_build ob on ob.office_id=u.office_id
+                 left join ly_enterprise_info ei on ei.id=ob.qy_id
+                 left join yl_building_management b on b.id=ei.des1
+        where u.id=#{userid}
+    </select>
+
+    <select id="getInfoStatistics1" resultType="integer">
+        SELECT COUNT(id) as enterprisec from ly_enterprise_info where del_flag=0
+    </select>
+    <select id="getInfoStatistics2" resultType="integer">
+        SELECT COUNT(*) as todayc from (SELECT create_by from sys_log where type=1 and DATE(create_date) = CURDATE()  GROUP BY create_by) c;
+    </select>
+    <select id="getInfoStatistics3" resultType="integer">
+        SELECT COUNT(*) as samemonthc from (SELECT create_by from sys_log where type=1 and YEAR(create_date) = YEAR(CURDATE())
+        AND MONTH(create_date) = MONTH(CURDATE())  GROUP BY create_by) c;
+    </select>
+    <select id="getInfoStatistics4" resultType="integer">
+        SELECT COUNT(*) as industryc from (SELECT industry,COUNT(*) as cc from ly_enterprise_info where del_flag=0  GROUP BY industry)c
+    </select>
+    <select id="getInfoStatistics5" resultType="integer">
+        SELECT COUNT(id) as enterprisec from ly_enterprise_info where del_flag=0 and DATE(create_date) = CURDATE()
+    </select>
+
+    <select id="getInfoStatistics6" resultType="map">
+        SELECT * from (SELECT industry,COUNT(*) as cc from ly_enterprise_info where del_flag=0  GROUP BY industry)c ORDER BY cc desc
+    </select>
+
+
+
     <select id="getLyinfoforuserid" resultType="map">
         SELECT b.building_name,b.building_contacts,b.building_phone
         FROM `sys_user` u

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/service/EnterpriseInfoService.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.buildinginfo.domain.BuildingManagement;
 import com.jeeplus.enterpriseelectricity.service.dto.EnterpriseElectricityDTO;
 import com.jeeplus.enterpriseinfo.service.dto.EnterpriseInfoDTO;
+import com.jeeplus.enterpriseinfo.service.mapstruct.EnterpriseInfoWrapper;
 import com.jeeplus.enterpriseother.service.dto.EnterpriseOtherDTO;
 import com.jeeplus.security.util.SecurityUtils;
 import com.jeeplus.sys.domain.Office;
@@ -25,9 +26,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jeeplus.enterpriseinfo.domain.EnterpriseInfo;
 import com.jeeplus.enterpriseinfo.mapper.EnterpriseInfoMapper;
 
+import java.time.Year;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Random;
 import java.util.UUID;
 
 /**
@@ -42,6 +45,9 @@ public class EnterpriseInfoService extends ServiceImpl<EnterpriseInfoMapper, Ent
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private EnterpriseInfoWrapper enterpriseInfoWrapper;
+
     @Autowired
     private OfficeService officeService;
 
@@ -123,6 +129,93 @@ public class EnterpriseInfoService extends ServiceImpl<EnterpriseInfoMapper, Ent
         return aa;
     }
 
+    public HashMap<String, Object> getInfoStatistics() {
+        HashMap<String, Object> aa=new HashMap<>();
+
+        int a1=baseMapper.getInfoStatistics1 ();
+        int a2=baseMapper.getInfoStatistics2 ();
+        int a3=baseMapper.getInfoStatistics3 ();
+        int a4=baseMapper.getInfoStatistics4 ();
+        int a5=baseMapper.getInfoStatistics5 ();
+
+        aa.put("enterprisec",a1);
+        aa.put("todayc",a2);
+        aa.put("samemonthc",a3);
+        aa.put("industryc",a4);
+        aa.put("todayenterprisec",a5);
+
+        return aa;
+    }
+
+    public List<HashMap<String, Object>> getInfoStatistics6() {
+        return baseMapper.getInfoStatistics6 ();
+    }
+
+
+
+    public int generateAccount(EnterpriseInfoDTO ef){
+        //1：企业联系电话未填写；    2：已经生成过；   3：正常生成；
+
+        //判断是否已经生成过账号
+        if(ef.getDes6()==null||!ef.getDes6().equals("1")){
+            if(ef.getPhone()!=null&&!ef.getPhone().equals("")){
+
+                //生成用户
+                UserDTO userDTO=new UserDTO();
+                userDTO.setLoginName(ef.getPhone());
+                String password=generateRandomString(8);//随机生成初始密码
+                userDTO.setPassword ( SecurityUtils.encryptPassword ( password ) );
+
+                userDTO.setName(ef.getLxr());
+                userDTO.setRemarks(ef.getName());
+                userDTO.setMobile(ef.getPhone());
+
+                OfficeDTO of=new OfficeDTO();
+                of.setId("1890304178267557890");//规上企业
+                userDTO.setCompanyDTO(of);
+                userDTO.setOfficeDTO(of);
+
+                userDTO.setNo("001");
+                RoleDTO ro=new RoleDTO();
+                ro.setId("38a14f1f42ed424eab4cb5d489596b0d");//企业用户
+                List<RoleDTO> ros=new ArrayList<>();
+                ros.add(ro);
+                userDTO.setRoleDTOList(ros);
+                userDTO.setLoginFlag("1");
+                userService.saveOrUpdate ( userDTO );
+
+                //更新企业信息
+                ef.setDes5(password);
+                ef.setDes6("1");
+                saveOrUpdate(enterpriseInfoWrapper.toEntity (ef));
+
+                //正常生成
+                return 3;
+            }else{
+                //企业联系电话未填写
+                return 1;
+            }
+        }else{
+            //已经生成过
+            return 2;
+        }
+
+
+    }
+
+    public static String generateRandomString(int length) {
+        String charSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        StringBuilder sb = new StringBuilder(length);
+
+        Random random = new Random();
+        for (int i = 0; i < length; i++) {
+            int randomIndex = random.nextInt(charSet.length());
+            char randomChar = charSet.charAt(randomIndex);
+            sb.append(randomChar);
+        }
+        return sb.toString();
+    }
+
     //根据企业基本信息表，补全  机构表和中间表
     public String ce11() {
         List<EnterpriseInfoDTO> aa=baseMapper.findList();

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/service/dto/EnterpriseInfoDTO.java

@@ -5,6 +5,8 @@ package com.jeeplus.enterpriseinfo.service.dto;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.query.Query;
 import com.jeeplus.core.query.QueryType;
@@ -32,271 +34,127 @@ public class EnterpriseInfoDTO extends BaseDTO {
 	@ExcelProperty("企业名称")
 	private String name;
 
+	/**
+	 * 属地
+	 */
+	@ExcelProperty("属地")
+	@Query(type = QueryType.EQ)
+	private String des1;
+
 	/**
      * 企业类型
      */
-	@NotNull(message="企业类型不能为空")
-	@ExcelProperty("企业类型")
+	@NotNull(message="所属行业不能为空")
+	@ExcelProperty("所属行业")
 	private String industry;
+	@ExcelIgnore
 	private String industryName;
 
-	/**
-     * 入驻时间
-     */
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@NotNull(message="入驻时间不能为空")
-    @Query(type = QueryType.BETWEEN)
-	@ExcelProperty("入驻时间")
-	private Date entryTime;
+	@ExcelProperty("销售规模")
+	private String des3;
 
-	/**
-     * 办公面积
-     */
-	@ExcelProperty("办公面积（平）")
-	private String officeArea;
+	@ExcelProperty("主导产品一")
+	private String bz1;
 
-	/**
-     * 年租金
-     */
-	@ExcelProperty("年租金")
-	private String annualRent;
+	@ExcelProperty("主导产品一产业链上下游")
+	private String bz2;
 
-	/**
-     * 楼层
-     */
-	@NotNull(message="楼层不能为空")
-    @Query(type = QueryType.EQ)
-	@ExcelProperty("楼层（F）")
-	private String floor;
+	@ExcelProperty("主导产品二")
+	private String bz3;
 
-	/**
-     * 联系人
-     */
-	@NotNull(message="联系人不能为空")
-    @Query(type = QueryType.LIKE)
-	@ExcelProperty("联系人")
+	@ExcelProperty("主导产品二产业链上下游")
+	private String bz4;
+
+	@ExcelProperty("工信局联系人")
+	private String bz5;
+
+	@ExcelProperty("联系电话")
+	private String bz6;
+
+
+	@Query(type = QueryType.LIKE)
+	@ExcelProperty("企业联系人")
 	private String lxr;
 
-	/**
-     * 联系人手机
-     */
-	@NotNull(message="联系人手机不能为空")
-    @Query(type = QueryType.LIKE)
-	@ExcelProperty("联系人手机")
+
+	@Query(type = QueryType.LIKE)
+	@ExcelProperty("企业联系人电话")
 	private String phone;
 
-	/**
-     * 备注1
-     */
-	@ExcelProperty("备注1")
-	@Query(type = QueryType.EQ)
-	private String des1;
-	/**
-	 * 楼宇名称
-	 */
+	@ExcelIgnore
+	@JsonFormat(pattern = "yyyy-MM-dd")
+    @Query(type = QueryType.BETWEEN)
+	private Date entryTime;
+	@ExcelIgnore
+	private String officeArea;
+	@ExcelIgnore
+	private String annualRent;
+	@ExcelIgnore
+    @Query(type = QueryType.EQ)
+	private String floor;
+	@ExcelIgnore
 	private String lyname;
-	/**
-     * 备注2
-     */
-	@ExcelProperty("备注2")
+	@ExcelIgnore
 	private String des2;
-
-	/**
-     * 备注3
-     */
-	@ExcelProperty("备注3")
-	private String des3;
-
-
-	/**
-	 * 合约起始时间
-	 */
+	@ExcelIgnore
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelProperty("合约起始时间")
 	private Date htStime;
-
-	/**
-	 * 合约到期时间
-	 */
+	@ExcelIgnore
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelProperty("合约到期时间")
 	private Date htEtime;
-
-	/**
-	 * 企业简介
-	 */
-	@ExcelProperty("企业简介")
+	@ExcelIgnore
 	private String qyDes;
-
-	/**
-	 * 主营内容
-	 */
-	@ExcelProperty("主营内容")
+	@ExcelIgnore
 	private String businessContent;
-
-	/**
-	 * 用工总数
-	 */
-	@ExcelProperty("用工总数")
+	@ExcelIgnore
 	private Long totalNumber;
-
-	/**
-	 * 社保人数
-	 */
-	@ExcelProperty("社保人数")
+	@ExcelIgnore
 	private Long securityNumber;
-
-	/**
-	 * 本科以下
-	 */
-	@ExcelProperty("本科以下")
+	@ExcelIgnore
 	private Long belowUndergraduate;
-
-	/**
-	 * 本科
-	 */
-	@ExcelProperty("本科")
+	@ExcelIgnore
 	private Long undergraduate;
-
-	/**
-	 * 研究生
-	 */
-	@ExcelProperty("研究生")
+	@ExcelIgnore
 	private Long postgraduate;
-
-	/**
-	 * 博士生
-	 */
-	@ExcelProperty("博士生")
+	@ExcelIgnore
 	private Long doctoralStudent;
-
-	/**
-	 * 实用新型专利授权数
-	 */
-	@ExcelProperty("实用新型专利授权数")
+	@ExcelIgnore
 	private Long num2;
-
-	/**
-	 * 发明专利授权数
-	 */
-	@ExcelProperty("发明专利授权数")
+	@ExcelIgnore
 	private Long num3;
-
-	/**
-	 * 软著数
-	 */
-	@ExcelProperty("软著数")
+	@ExcelIgnore
 	private Long softWritingNumbers;
 
-	/**
-	 * 今年准备申报项目明细
-	 */
-	@ExcelProperty("今年准备申报项目明细")
-	private String bz1;
-
-	/**
-	 * 今年项目认定明细
-	 */
-	@ExcelProperty("今年项目认定明细")
-	private String bz2;
-
-	/**
-	 * 是否是国家高企
-	 */
-	@ExcelProperty("是否是国家高企")
-	private String bz3;
-
-	/**
-	 * 意向哪年申报国家高企
-	 */
-	@ExcelProperty("意向哪年申报国家高企")
-	private String bz4;
-
-	/**
-	 * 是否是规上企业
-	 */
-	@ExcelProperty("是否是规上企业")
-	private String bz5;
 
-	/**
-	 * 什么时候能达到规上企业标准
-	 */
-	@ExcelProperty("什么时候能达到规上企业标准")
-	private String bz6;
 
 
 
 
-	/**
-     * 备注4
-     */
-	@ExcelProperty("备注4")
+	@ExcelIgnore
 	private String des4;
-
-	/**
-     * 备注5
-     */
-	@ExcelProperty("备注5")
+	@ExcelIgnore
 	private String des5;
-
-	/**
-     * 企业状态
-     */
-	@ExcelProperty("企业状态")
+	@ExcelIgnore
 	private String des6;
-
-	/**
-     * 备注7
-     */
-	@ExcelProperty("备注7")
+	@ExcelIgnore
 	private String des7;
-
-	/**
-     * 备注8
-     */
-	@ExcelProperty("备注8")
+	@ExcelIgnore
 	private String des8;
-
-	/**
-     * 备注9
-     */
-	@ExcelProperty("备注9")
+	@ExcelIgnore
 	private String des9;
-
-	/**
-     * 备注10
-     */
-	@ExcelProperty("备注10")
+	@ExcelIgnore
 	private String des10;
-	/**
-	 * 备注10
-	 */
-	@ExcelProperty("备注11")
+	@ExcelIgnore
 	private String des11;
-	/**
-	 * 备注10
-	 */
-	@ExcelProperty("备注12")
+	@ExcelIgnore
 	private String des12;
-	/**
-	 * 备注10
-	 */
-	@ExcelProperty("备注13")
+	@ExcelIgnore
 	private String des13;
-	/**
-	 * 备注10
-	 */
-	@ExcelProperty("备注14")
+	@ExcelIgnore
 	private String des14;
-	/**
-	 * 备注10
-	 */
-	@ExcelProperty("备注15")
+	@ExcelIgnore
 	private String des15;
-	/**
-	 * 备注16
-	 */
-	@ExcelProperty("备注16")
+	@ExcelIgnore
 	private String des16;
 
 

jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/aop/logging/utils/LogUtils.java

@@ -69,6 +69,15 @@ public class LogUtils {
          */
         String userId = null;
         String token = TokenProvider.resolveToken ( request );
+
+        //2025-2-14,添加登录时token为null,然后从post请求的结果中拿取token
+        if(token==null&&functionName.equals("用户登录")){
+            int startindex = result.indexOf("token=");
+            String a=result.substring(startindex+6);
+            int endindex = a.indexOf("}");
+            token=a.substring(0,endindex);
+        }
+
         String loginName = TokenProvider.getLoginName ( token );
         if ( StrUtil.isNotEmpty ( loginName ) ) {
             UserDTO user = UserUtils.getByLoginName ( loginName );

jp-console/jeeplus-web/src/main/resources/application-development.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8070
+  port: 8071
   servlet:
     context-path:
   tomcat:
@@ -48,7 +48,7 @@ spring:
         master:
           username: root
           password: root
-          url: jdbc:mysql://localhost:3306/yc_lysz_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://localhost:3306/yd_qycpfb_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai
           driver-class-name: com.mysql.cj.jdbc.Driver
 
           #oracle database settings

jp-console/jeeplus-web/src/main/resources/application-production.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8070
+  port: 8071
   servlet:
     context-path:
   tomcat:
@@ -50,7 +50,7 @@ spring:
         master:
           username: root
           password: dmjxcc@20210730
-          url: jdbc:mysql://39.105.5.238:3306/yc_lysz?useUnicode=true&characterEncoding=utf-8&useSSL=false&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://39.105.5.238:3306/yd_qycpfb?useUnicode=true&characterEncoding=utf-8&useSSL=false&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai
           driver-class-name: com.mysql.cj.jdbc.Driver
 
           #oracle database settings
@@ -86,7 +86,7 @@ spring:
     host: localhost
     port: 6379
     expireTime: 3600000 #单位秒
-    database: 6
+    database: 7
   mvc.servlet.load-on-startup: 1
   jmx:
     enabled: false
@@ -168,7 +168,7 @@ config:
     type: local
     baseDir: local
     local:
-      location: /usr/local/panhuangly/accessory
+      location: /usr/local/yd_qycpfb/accessory
     aliyun:
       endpoint:
       accessKeyId:

jp-mobile/common/config.js

@@ -2,10 +2,11 @@ let APP_SERVER_URL = ""
 
 if(process.env.NODE_ENV === 'development'){
     // 开发环境    http://47.97.69.114:8088/#/login 
-    APP_SERVER_URL = 'http://47.97.69.114:8088/panhuangly/'
+    //APP_SERVER_URL = 'http://47.97.69.114:8088/panhuangly/'
+	APP_SERVER_URL = 'http://192.168.139.90:8071'
 }else{
     // 生产环境
-    APP_SERVER_URL = '/panhuangly'
+    APP_SERVER_URL = '/yd_qycpfb'
 }
 
 export default APP_SERVER_URL

jp-mobile/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "huidu",
-    "appid" : "__UNI__E5D1519",
+    "appid" : "__UNI__09A1C76",
     "description" : "潘黄街道楼宇数字园区综合平台",
     "versionName" : "huidu mobile 1.0",
     "versionCode" : 1,
@@ -64,7 +64,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://localhost:8082", // 需要跨域的域名
+                    "target" : "http://192.168.139.90:8071", // 需要跨域的域名
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {
@@ -90,7 +90,7 @@
             }
         },
         "router" : {
-            "base" : "/panhuanglyH5/"
+            "base" : "/yd_qycpfbH5/"
         },
         "optimization" : {
             "treeShaking" : {

jp-mobile/package-lock.json

@@ -1,33 +1,62 @@
 {
   "name": "ColorUI-UniApp",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
   "requires": true,
-  "dependencies": {
-    "lodash": {
+  "packages": {
+    "": {
+      "name": "ColorUI-UniApp",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "lodash.pick": "^4.4.0",
+        "moment": "^2.27.0",
+        "prettier": "^1.12.1",
+        "qs": "^6.9.4"
+      },
+      "devDependencies": {}
+    },
+    "node_modules/lodash": {
       "version": "4.17.20",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
       "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
     },
-    "lodash.pick": {
+    "node_modules/lodash.pick": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM="
+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
+      "deprecated": "This package is deprecated. Use destructuring assignment syntax instead."
     },
-    "moment": {
+    "node_modules/moment": {
       "version": "2.27.0",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
-      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==",
+      "engines": {
+        "node": "*"
+      }
     },
-    "prettier": {
+    "node_modules/prettier": {
       "version": "1.12.1",
       "resolved": "http://registry.npm.taobao.org/prettier/download/prettier-1.12.1.tgz",
-      "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU="
+      "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=",
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "qs": {
+    "node_modules/qs": {
       "version": "6.9.4",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
-      "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
+      "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     }
   }
 }

jp-mobile/pages/comList/comList.vue

@@ -35,25 +35,18 @@
 						<view class="item-title">
 							
 							<view>
-								{{item.name.substring(0,14)}}
+								{{item.name}}
 							</view>
-							<view class="btn-box" v-if="stype == 5">
-								<view class="edit-botton" @click.stop="edit(item.id)">修改</view>
-								<view class="del-botton" @click.stop="del(item.id)">删除</view>
-							</view>
-						</view>
-						<view class="item-line">
-							<view class="item-name">所属楼宇：</view>
-							<view class="item-content">{{item.lyname}}</view>
+
 						</view>
 						<view class="item-line">
-							<view class="item-name">所属楼层：</view>
-							<view class="item-content">{{item.floor}}-{{item.des3}}</view>
+							<view class="item-name">{{item.bz1}}、{{item.bz3}}</view>
+							
 						</view>
 						<view class="item-line">
-							<view class="item-name">联系人&emsp;：</view>
-							<view class="item-content">{{item.lxr}}（{{item.phone}}）</view>
+							<view class="item-name2">{{item.industry}}</view>
 						</view>
+
 					</view>
 									
 					
@@ -305,6 +298,11 @@
 		color: #333;
 	}
 	
+	.item-name2{
+		font-size: 30rpx;
+		color: #55aaff;
+	}
+	
 	.item-content{
 		color: #1497EF;
 		font-size: 30rpx;

jp-mobile/pages/index/index.vue

@@ -1,7 +1,7 @@
 <template name="apps">
 	<view>
 		<cu-custom bgColor="bg-blue">
-			<block slot="content">首页</block>
+			<block slot="content">盐都区工业企业产品发布平台</block>
 		</cu-custom>
 
 		<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" :interval="3000" :duration="800">
@@ -12,31 +12,63 @@
 
 
 		<view class="line-box">
-			<view class="btn-box-1 mart-t" v-if="stype != 3">
-				<navigator class="h-200" hover-class="none" url="/pages/buildList/buildList">
-				</navigator>
+			<view class="center-box">
+				<view class="center-left-box">
+					<view class="btn-box-1 mart-t">
+						{{t1}}
+					</view>
+					<view class="btn-box-2 mart-t">
+						{{t2}}
+					</view>
+					<view class="btn-box-3 mart-t">
+						{{t3}}
+					</view>
+					<view class="btn-box-4 mart-t">
+						{{t4}}
+					</view>
+													
+				</view>
+				<view class="center-left-box">
+					<view class="btn-box-text mart-t">
+						入库企业数
+					</view>
+					<view class="btn-box-text mart-t">
+						当日活跃数
+					</view>
+					<view class="btn-box-text mart-t">
+						当月活跃数
+					</view>
+					<view class="btn-box-text mart-t">
+						企业行业数
+					</view>
+				</view>
 			</view>
-			<view class="btn-box-2 mart-t">
-				<navigator class="h-200" hover-class="none" url="/pages/comList/comList">
-
-				</navigator>
-			</view>
-			<view class="btn-box-3 mart-t">
-				<navigator class="h-200" hover-class="none" url="/pages/revenue/RevenueList">
-				</navigator>
-			</view>
-			<view class="btn-box-4 mart-t">
-				<navigator class="h-200" hover-class="none" url="/pages/map/mapVisualization-th">
-
-				</navigator>
-			</view>
-			<view class="btn-box-5 mart-t">
-				<navigator class="h-200" hover-class="none" url="/pages/analysis/analysis">
-				</navigator>
-			</view>
-			<view class="btn-box-6 mart-t" @click="outlogin">
-
+			
+			<view class="center-box">
+				<view class="kuai-text">快捷入口</view>
+				
+				<view class="center-left-box">
+					<view class="btn-Imbox" >
+						<image  class="center-img" src="/static/img/icon4.png"></image>
+						<p>新增企业</p>
+					</view>
+					<view class="btn-Imbox" @click="totongxunlu">
+						<image  class="center-img" src="/static/img/icon3.png"></image>
+						<p>企业通讯录</p>
+					</view>
+
+					<view class="btn-Imbox">
+						
+					</view>
+					<view class="btn-Imbox">
+						
+					</view>
+													
+				</view>
 			</view>
+			
+			
+			
 		</view>
 
 
@@ -49,6 +81,10 @@
 		name: "apps",
 		data() {
 			return {
+				t1:"424",
+				t2:"45",
+				t3:"332",
+				t4:"112",
 				stype: "", // 企业 => 3  楼宇 => 2  园区 => 1  zfadmin => 4  admin=> 5
 			};
 		},
@@ -63,6 +99,11 @@
 
 
 		methods: {
+			totongxunlu(){
+				uni.navigateTo({
+					url: '/pages/comList/comList'
+				})
+			},
 
 			getRole() {
 				let userInfo = uni.getStorageSync('WMS-userinfo')
@@ -124,44 +165,111 @@
 	}
 
 	.line-box {
-		display: flex;
+
 		padding-left: 20rpx;
 		padding-right: 20rpx;
-		justify-content: space-between;
 		margin-top: 20rpx;
-		flex-wrap: wrap;
+
 	}
 
 	.mart-t {
 		margin-top: 30rpx;
 	}
+	
+	.center-box{
+		margin-top: 20rpx;
+		width: 100%;
+		border-radius: 25rpx;
+		border-radius: 25rpx;		
+		background: #fff;
+		box-shadow: 0px 8px 16px 2px rgba(101, 101, 101, 0.2);
+		padding-bottom: 30rpx;
+		display: flex;
+		flex-wrap: wrap;
+	}
+	
+	.center-left-box {
+		width: 100%;		
+		padding-bottom: 30rpx;
+		display: flex;
+		flex-wrap: wrap;
+	}
+	
+	.btn-box-text {
+		flex:1;
+		height: 20rpx;
+		text-align: center;
+		color: #000000;
+		font-size: 14px;
+		font-weight: 700;
+	}
 
 	.btn-box-1 {
-		width: 337rpx;
-		height: 200rpx;
-		background-image: url('../../static/img/btn1.png');
-		background-size: 100% 100%;
+		flex:1;
+		height: 30rpx;
+		text-align: center;
+		color: #36A7F3;
+		font-size: x-large;
+		font-weight: 700;
 	}
 
 	.btn-box-2 {
-		width: 337rpx;
-		height: 200rpx;
-		background-image: url('../../static/img/btn4.png');
-		background-size: 100% 100%;
+		flex:1;
+		height: 30rpx;
+		text-align: center;
+		color:#F3365A;
+		font-size: x-large;
+		font-weight: 700;
 	}
 
 	.btn-box-3 {
-		width: 337rpx;
-		height: 200rpx;
-		background-image: url('../../static/img/btn2.png');
-		background-size: 100% 100%;
+		flex:1;
+		height: 30rpx;
+		text-align: center;
+		color:#15D578;
+		font-size: x-large;
+		font-weight: 700;
 	}
 
 	.btn-box-4 {
-		width: 337rpx;
-		height: 200rpx;
-		background-image: url('../../static/img/btn5.png');
-		background-size: 100% 100%;
+		flex:1;
+		height: 30rpx;
+		text-align: center;
+		color:#F1A31B;
+		font-size: x-large;
+		font-weight: 700;
+	}
+	
+	.btn-Imbox {
+		flex:1;
+		height: 150rpx;
+		padding-top: 8rpx;
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+		justify-content: center; /* 子元素内部内容竖向居中 */
+		align-items: center; /* 子元素内部内容水平居中 */
+		text-align: center; /* 文字居中 */
+		
+	}
+	.btn-Imbox p {
+	  font-size: 14px; /* 文字大小，可根据需要调整 */
+	  margin: 0; /* 去掉默认的外边距 */
+	  font-weight: 700;
+	}
+	
+	.center-img{
+		width: 90rpx;
+		height: 90rpx;
+		text-align: center;
+	}
+	
+	.kuai-text{
+		color: #000000;
+		font-weight: 900;
+		font-size: 34rpx;
+		padding-top: 20rpx;
+		padding-left: 20rpx;
 	}
 
 	.btn-box-5 {

jp-mobile/pages/login/login.vue

@@ -2,7 +2,7 @@
 	<view class="zai-box">
 		<image src="../../static/img/login.png" mode='aspectFit' class="zai-logo"></image>
 		<!-- <view style="height: 300rpx;"></view> -->
-		<view class="zai-title">潘黄楼宇</view>
+		<view class="zai-title">盐都企业</view>
 			<form>
 				<view class="cu-form-group">
 					<view class="title">用户名</view>

jp-ui/.env.development

@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 # Jeeplus快速开发平台/后台地址
-VUE_APP_SERVER_URL = 'http://localhost:8070'
+VUE_APP_SERVER_URL = 'http://localhost:8071'
 # VUE_APP_SERVER_URL = 'http://localhost:8082'
 # VUE_APP_SERVER_URL = 'http://36.138.196.105:8070'
 # VUE_APP_SERVER_URL = 'http://192.168.139.50:8082'
@@ -13,4 +13,4 @@ VUE_APP_SERVER_URL = 'http://localhost:8070'
 #单点登录设置
 VUE_APP_SSO_LOGIN  = 'false'
 VUE_APP_CAS_SERVER = 'https://www.cainiao.com:8443/cas'
-VUE_APP_CLIENT_LOGIN = 'http://localhost:3000/#/casLogin'
+VUE_APP_CLIENT_LOGIN = 'http://localhost:3000/#/casLogin'

jp-ui/.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 #Jeeplus快速开发平台/后台地址
-VUE_APP_SERVER_URL = 'http://47.97.69.114:8088/panhuangly/'
+VUE_APP_SERVER_URL = 'http://47.97.69.114:8089/yd_qycpfbWeb/'
 
 #单点登录设置
 VUE_APP_SSO_LOGIN  = 'false'

jp-ui/public/index.html

@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>潘黄街道楼宇数字园区综合平台</title>
+  <title>盐都区工业企业产品发布平台</title>
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/static/img/favicon.ico">

jp-ui/src/api/bigScreen/bigScreenApi.js

@@ -158,9 +158,17 @@ export default {
     },
 
     // /firstdp/firstdp/BackendFirst
-    BackendFirst: function (params) {
+    InfoStatistics: function (params) {
         return request({
-            url: '/firstdp/firstdp/BackendFirst',
+            url: '/dp/dp/InfoStatistics',
+            method: 'get',
+            params: params
+        })
+    },
+
+    InfoStatistics_industry: function (params) {
+        return request({
+            url: '/dp/dp/InfoStatistics_industry',
             method: 'get',
             params: params
         })

jp-ui/src/api/enterpriseinfo/enterpriseInfoService.js

@@ -17,6 +17,14 @@ export default {
     })
   },
 
+  generateAccount: function (ids) {
+    return request({
+      url: '/enterpriseinfo/enterpriseInfo/generateAccount',
+      method: 'get',
+      params: {ids: ids}
+    })
+  },
+
   queryById: function (id) {
     return request({
       url: '/enterpriseinfo/enterpriseInfo/queryById',

jp-ui/src/views/layout/_common_top.vue

@@ -241,20 +241,7 @@
         })
       })
 
-      enterpriseDemandsService.list({state: 1, current: 1, size: 10}).then(({data}) => {
-        this.noticeTabs[2].count = data.total
-        this.noticeTabs[2].url = '/enterprisedemands/EnterpriseDemandsList'
-        this.noticeTabs[2].list = data.records.map((item) => {
-          return {
-            id: item.id,
-            avatar: '',
-            title: item.title,
-            description: item.content,
-            datetime: item.createDate,
-            type: '企业诉求'
-          }
-        })
-      })
+      
     },
     mounted () {
       if (this.defaultLayout === 'top') {

jp-ui/src/views/modules/enterpriseinfo/EnterpriseInfoForm.vue

@@ -23,558 +23,112 @@
                  </el-form-item>
               </el-col>
               <el-col :span="8">
-                  <el-form-item label="企业类型" prop="industry"
+                  <el-form-item label="属地" prop="des1"
                       :rules="[
-                        {required: true, message:'企业类型不能为空', trigger:'blur'}
+                        {required: true, message:'属地不能为空', trigger:'blur'}
                        ]">
-                    <el-select v-model="inputForm.industry" placeholder="请选择"  style="width: 100%;" multiple>
-                        <el-option
-                          v-for="item in $dictUtils.getDictList('industrial_type')"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                    </el-select>
+                    <el-input v-model="inputForm.des1" placeholder="请填写属地"     ></el-input>
                  </el-form-item>
               </el-col>
 
               <el-col :span="8">
-                  <el-form-item label="所属楼宇" prop="des1"
+                  <el-form-item label="所属行业" prop="industry"
                       :rules="[
-                        {required: true, message:'所属楼宇不能为空', trigger:'blur'}
+                        {required: true, message:'所属行业不能为空', trigger:'blur'}
                        ]">
-                    <!-- <SelectTree
-                      ref="des1"
-                      :props="{
-                          value: 'id',             // ID字段名
-                          label: 'name',         // 显示名称
-                          children: 'children'    // 子级字段名
-                        }"
-
-                      :url="`/sys/office/treeData2?type=2`"
-                      :value="inputForm.des1"
-                      :clearable="true"
-                      :accordion="true"
-                      @getValue="(value) => {inputForm.des1=value}"/> -->
-
-                      <GridSelect
-                        title="选择所属楼宇"
-                        labelName = 'buildingName'
-                        labelValue = 'id'
-                        :value = "inputForm.des1"
-                        :limit="1"
-                        @getValue='(value) => {inputForm.des1=value}'
-                        :columns="[
-                        {
-                          prop: 'buildingName',
-                          label: '楼宇名称'
-                        },
-                        {
-                          prop: 'placeSelectName',
-                          label: '地点'
-                        },
-                        {
-                          prop: 'buildingContacts',
-                          label: '楼宇联系人'
-                        },
-                        {
-                          prop: 'buildingArea',
-                          label: '楼宇总面积'
-                        }
-                        ]"
-                        :searchs="[
-                        {
-                          prop: 'buildingName',
-                          label: '楼宇名称'
-                        }
-                        ]"
-                        dataListUrl="/buildinginfo/buildingManagement/list"
-                        queryEntityUrl="/buildinginfo/buildingManagement/queryById">
-                      </GridSelect>
-
+                    <el-input v-model="inputForm.industry" placeholder="请填写所属行业"     ></el-input>
                  </el-form-item>
               </el-col>
 
-
               <el-col :span="8">
-                  <el-form-item label="入驻时间" prop="entryTime"
+                  <el-form-item label="销售规模" prop="des3"
                       :rules="[
-                        {required: true, message:'入驻时间不能为空', trigger:'blur'}
+                        {required: true, message:'销售规模不能为空', trigger:'blur'}
                        ]">
-                      <el-date-picker
-                            style="width: 100%;"
-                            v-model="inputForm.entryTime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="选择日期时间">
-                          </el-date-picker>
+                    <el-input v-model="inputForm.des3" placeholder="请填写销售规模"     ></el-input>
                  </el-form-item>
               </el-col>
+
               <el-col :span="8">
-                  <el-form-item label="撤场时间" prop="des5"
+                  <el-form-item label="主导产品一" prop="bz1"
                       :rules="[
+                        {required: true, message:'主导产品一不能为空', trigger:'blur'}
                        ]">
-                      <el-date-picker
-                            style="width: 100%;"
-                            v-model="inputForm.des5"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="选择日期时间">
-                          </el-date-picker>
+                    <el-input v-model="inputForm.bz1" placeholder="请填写主导产品一"     ></el-input>
                  </el-form-item>
               </el-col>
+
               <el-col :span="8">
-                  <el-form-item label="办公面积(平)" prop="officeArea"
+                  <el-form-item label="产业链上下游" prop="bz2"
                       :rules="[
                        ]">
-                    <el-input v-model="inputForm.officeArea" placeholder="请填写办公面积"     ></el-input>
+                    <el-input v-model="inputForm.bz2" placeholder="请填写产业链上下游"     ></el-input>
                  </el-form-item>
               </el-col>
-              <!-- <el-col :span="8">
-                  <el-form-item label="年租金(元)" prop="annualRent"
-                      :rules="[
-                       ]">
-                    <el-input v-model="inputForm.annualRent" placeholder="请填写年租金"     ></el-input>
-                 </el-form-item>
-              </el-col> -->
+
               <el-col :span="8">
-                  <el-form-item label="楼层(F)" prop="floor"
+                  <el-form-item label="主导产品二" prop="bz3"
                       :rules="[
-                        {required: true, message:'楼层不能为空', trigger:'blur'}
+
                        ]">
-                    <el-input v-model="inputForm.floor" placeholder="请填写楼层"     ></el-input>
+                    <el-input v-model="inputForm.bz3" placeholder="请填写主导产品二"     ></el-input>
                  </el-form-item>
               </el-col>
+
               <el-col :span="8">
-                  <el-form-item label="房间号" prop="des3"
+                  <el-form-item label="产业链上下游" prop="bz4"
                       :rules="[
-                        {required: true, message:'房间号不能为空', trigger:'blur'}
                        ]">
-                    <el-input v-model="inputForm.des3" placeholder="请填写房间号"     ></el-input>
+                    <el-input v-model="inputForm.bz4" placeholder="请填写产业链上下游"     ></el-input>
                  </el-form-item>
               </el-col>
+
               <el-col :span="8">
-                  <el-form-item label="联系人" prop="lxr"
+                  <el-form-item label="工信局联系人" prop="bz5"
                       :rules="[
-                        {required: true, message:'联系人不能为空', trigger:'blur'}
+                        {required: true, message:'工信局联系人不能为空', trigger:'blur'}
                        ]">
-                    <el-input v-model="inputForm.lxr" placeholder="请填写联系人"     ></el-input>
+                    <el-input v-model="inputForm.bz5" placeholder="请填写工信局联系人"     ></el-input>
                  </el-form-item>
               </el-col>
               <el-col :span="8">
-                  <el-form-item label="联系人手机" prop="phone"
+                  <el-form-item label="联系人手机" prop="bz6"
                       :rules="[
                         {required: true, message:'联系人手机不能为空', trigger:'blur'},
                         {validator: validator.isMobile, trigger:'blur'}
                        ]">
-                    <el-input v-model="inputForm.phone" placeholder="请填写联系人手机"     ></el-input>
+                    <el-input v-model="inputForm.bz6" placeholder="请填写联系人手机"     ></el-input>
                  </el-form-item>
               </el-col>
 
               <el-col :span="8">
-                  <el-form-item label="合约起始时间" prop="htStime"
-                      :rules="[
-                        {required: true, message:'合约起始时间不能为空', trigger:'blur'}
-                       ]">
-                      <el-date-picker
-                            style="width: 100%;"
-                            v-model="inputForm.htStime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="选择日期时间">
-                          </el-date-picker>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="合约到期时间" prop="htEtime"
-                      :rules="[
-                        {required: true, message:'合约到期时间不能为空', trigger:'blur'}
-                       ]">
-                      <el-date-picker
-                            style="width: 100%;"
-                            v-model="inputForm.htEtime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="选择日期时间">
-                          </el-date-picker>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="主营内容" prop="businessContent"
-                      :rules="[
-                       ]">
-                    <el-input v-model="inputForm.businessContent" placeholder="请填写主营内容"     ></el-input>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="用工总数" prop="totalNumber"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.totalNumber" placeholder="请填写用工总数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="社保人数" prop="securityNumber"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.securityNumber" placeholder="请填写社保人数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="男生人数" prop="des7"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.des7" placeholder="请填写男生人数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="女生人数" prop="des8"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.des8" placeholder="请填写女生人数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="党员人数" prop="des9"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.des9" placeholder="请填写党员人数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="本科以下人数" prop="belowUndergraduate"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.belowUndergraduate" placeholder="请填写本科以下人数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="本科人数" prop="undergraduate"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.undergraduate" placeholder="请填写本科人数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="硕士生人数" prop="postgraduate"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.postgraduate" placeholder="请填写硕士生人数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="博士生人数" prop="doctoralStudent"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.doctoralStudent" placeholder="请填写博士生人数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                  <el-form-item label="实用新型专利授权数" prop="num2"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.num2" placeholder="请填写实用新型专利授权数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="发明专利授权数" prop="num3"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.num3" placeholder="请填写发明专利授权数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="软著数" prop="softWritingNumbers"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.softWritingNumbers" placeholder="请填写软著数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="消防器材数" prop="des10"
-                      :rules="[
-                       ]">
-                <el-input-number v-model="inputForm.des10" placeholder="请填写消防器材数"     style="width: 100%;"></el-input-number>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="消防器材是否过期" prop="des11"
-                      :rules="[
-                       ]">
-                    <el-select v-model="inputForm.des11" placeholder="请选择"  style="width: 100%;">
-                              <el-option
-                                v-for="item in $dictUtils.getDictList('yes_no')"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                              </el-option>
-                          </el-select>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="今年准备申报项目明细" prop="bz1"
-                      :rules="[
-                       ]">
-                    <el-input v-model="inputForm.bz1" placeholder="请填写今年准备申报项目明细"     ></el-input>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="今年项目认定明细" prop="bz2"
-                      :rules="[
-                       ]">
-                    <el-input v-model="inputForm.bz2" placeholder="请填写今年项目认定明细"     ></el-input>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="是否是国家高企" prop="bz3"
+                  <el-form-item label="企业联系人" prop="lxr"
                       :rules="[
+                        {required: true, message:'企业联系人不能为空', trigger:'blur'}
                        ]">
-                    <el-select v-model="inputForm.bz3" placeholder="请选择"  style="width: 100%;">
-                              <el-option
-                                v-for="item in $dictUtils.getDictList('yes_no')"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                              </el-option>
-                          </el-select>
+                    <el-input v-model="inputForm.lxr" placeholder="请填写企业联系人"     ></el-input>
                  </el-form-item>
               </el-col>
               <el-col :span="8">
-                  <el-form-item label="意向哪年申报国家高企" prop="bz4"
-                      :rules="[
-                       ]">
-                    <el-input v-model="inputForm.bz4" placeholder="请填写意向哪年申报国家高企"     ></el-input>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="是否是规上企业" prop="bz5"
-                      :rules="[
-                       ]">
-                      <el-select v-model="inputForm.bz5" placeholder="请选择"  style="width: 100%;">
-                                <el-option
-                                  v-for="item in $dictUtils.getDictList('yes_no')"
-                                  :key="item.value"
-                                  :label="item.label"
-                                  :value="item.value">
-                                </el-option>
-                            </el-select>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                  <el-form-item label="什么时候能达到规上企业标准" prop="bz6"
-                      :rules="[
-                       ]">
-                    <el-input v-model="inputForm.bz6" placeholder="请填写什么时候能达到规上企业标准"     ></el-input>
-                 </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                  <el-form-item label="企业简介" prop="qyDes"
+                  <el-form-item label="联系人手机" prop="phone"
                       :rules="[
+                        {required: true, message:'联系人手机不能为空', trigger:'blur'},
+                        {validator: validator.isMobile, trigger:'blur'}
                        ]">
-                <el-input type="textarea" v-model="inputForm.qyDes" placeholder="请填写企业简介"     ></el-input>
+                    <el-input v-model="inputForm.phone" placeholder="请填写联系人手机"     ></el-input>
                  </el-form-item>
               </el-col>
 
 
               </el-row>
 
-              <div style=" padding-left: 80px;padding-top: 20px;"> 提示：创建企业基本信息会自动创建企业账号，企业账号的用户名和密码均为联系人手机号码。</div>
+              <div style=" padding-left: 80px;padding-top: 20px;"> </div>
 
           </el-form>
       </el-tab-pane>
 
-      <el-tab-pane label="电费信息" name="df"><!-- 电费信息列表 -->
-          <span slot="label"><i class="el-icon-tickets" style="font-size: 16px;"></i> <span style="font-size: 16px;font-weight: 600;">电费信息</span></span>
-
-         <div style="height: 680px;margin-bottom: 20px;">
-          <vxe-table border="inner" auto-resize resizable height="auto" :loading="loading" size="small"
-            ref="enterpriseElectricityTable" show-header-overflow show-overflow highlight-hover-row :menu-config="{}"
-            :print-config="{}" :import-config="{}" :export-config="{}" @sort-change="warnsortChangeHandle"
-            :sort-config="{remote:true}" :data="electdataList" :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
-            <vxe-column type="checkbox" width="40px"></vxe-column>
-
-
-            <vxe-column
-                field="stime"
-                sortable
-                title="开始时间">
-              </vxe-column>
-            <vxe-column
-                field="etime"
-                sortable
-                title="结束时间">
-              </vxe-column>
-            <vxe-column
-                field="amount"
-                sortable
-                title="金额(元)">
-              </vxe-column>
-            <vxe-column
-                field="degrees"
-                sortable
-                title="用电量">
-              </vxe-column>
-            <vxe-column
-                field="isPay"
-                sortable
-                title="是否缴费">
-                <template slot-scope="scope">
-                      {{ $dictUtils.getDictLabel("yes_no", scope.row.isPay, '-') }}
-                </template>
-              </vxe-column>
-
-            <vxe-column
-              fixed="right"
-              align="center"
-              width="200"
-              title="操作">
-              <template  slot-scope="scope">
-                <el-button v-if="hasPermission('enterpriseelectricity:enterpriseElectricity:view')" type="text" icon="el-icon-view" size="small" @click="viewWarn(scope.row.id)">查看</el-button>
-                <el-button v-if="hasPermission('enterpriseelectricity:enterpriseElectricity:edit')" type="text" icon="el-icon-edit" size="small" @click="editWarn(scope.row.id)">修改</el-button>
-                <el-button v-if="hasPermission('enterpriseelectricity:enterpriseElectricity:del')" type="text"  icon="el-icon-delete" size="small" @click="delWarn(scope.row.id)">删除</el-button>
-              </template>
-            </vxe-column>
-
-          </vxe-table>
-          <vxe-pager background size="small" :current-page="warntablePage.currentPage" :page-size="warntablePage.pageSize"
-            :total="warntablePage.total" :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
-            :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
-            @page-change="warncurrentChangeHandle">
-          </vxe-pager>
-        </div>
-
-
-      </el-tab-pane><!-- 电费信息列表 -->
-
-      <el-tab-pane label="水费信息" name="sf">
-          <span slot="label"><i class="el-icon-tickets" style="font-size: 16px;"></i> <span style="font-size: 16px;font-weight: 600;">水费信息</span></span>
-
-         <!-- 水费信息列表 -->
-         <div style="height: 680px;margin-bottom: 20px;">
-          <vxe-table border="inner" auto-resize resizable height="auto" :loading="loading" size="small"
-            ref="enterpriseWaterTable" show-header-overflow show-overflow highlight-hover-row :menu-config="{}"
-            :print-config="{}" :import-config="{}" :export-config="{}" @sort-change="sfsortChangeHandle"
-            :sort-config="{remote:true}" :data="sfdataList" :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
-            <vxe-column type="checkbox" width="40px"></vxe-column>
-
-
-            <vxe-column
-                field="stime"
-                sortable
-                title="开始时间">
-              </vxe-column>
-            <vxe-column
-                field="etime"
-                sortable
-                title="结束时间">
-              </vxe-column>
-            <vxe-column
-                field="amount"
-                sortable
-                title="金额(元)">
-              </vxe-column>
-            <vxe-column
-                field="isPay"
-                sortable
-                title="是否缴费">
-                <template slot-scope="scope">
-                      {{ $dictUtils.getDictLabel("yes_no", scope.row.isPay, '-') }}
-                </template>
-              </vxe-column>
-
-            <vxe-column
-              fixed="right"
-              align="center"
-              width="200"
-              title="操作">
-              <template  slot-scope="scope">
-                <el-button v-if="hasPermission('enterpriseelectricity:enterpriseElectricity:view')" type="text" icon="el-icon-view" size="small" @click="viewsf(scope.row.id)">查看</el-button>
-                <el-button v-if="hasPermission('enterpriseelectricity:enterpriseElectricity:edit')" type="text" icon="el-icon-edit" size="small" @click="editsf(scope.row.id)">修改</el-button>
-                <el-button v-if="hasPermission('enterpriseelectricity:enterpriseElectricity:del')" type="text"  icon="el-icon-delete" size="small" @click="delsf(scope.row.id)">删除</el-button>
-              </template>
-            </vxe-column>
-
-          </vxe-table>
-          <vxe-pager background size="small" :current-page="sftablePage.currentPage" :page-size="sftablePage.pageSize"
-            :total="sftablePage.total" :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
-            :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
-            @page-change="sfcurrentChangeHandle">
-          </vxe-pager>
-        </div>
-        <!-- 水费信息列表 -->
-
-      </el-tab-pane>
 
 
-      <el-tab-pane label="物业费信息" name="wyf">
-          <span slot="label"><i class="el-icon-tickets" style="font-size: 16px;"></i> <span style="font-size: 16px;font-weight: 600;">物业费信息</span></span>
-
-         <!-- 物业费信息 -->
-         <div style="height: 680px;margin-bottom: 20px;">
-          <vxe-table border="inner" auto-resize resizable height="auto" :loading="loading" size="small"
-            ref="enterprisePropertyTable" show-header-overflow show-overflow highlight-hover-row :menu-config="{}"
-            :print-config="{}" :import-config="{}" :export-config="{}" @sort-change="wyfsortChangeHandle"
-            :sort-config="{remote:true}" :data="wyfdataList" :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
-            <vxe-column type="checkbox" width="40px"></vxe-column>
-
-
-            <vxe-column
-                field="des2"
-                sortable
-                title="缴费时间">
-              </vxe-column>
-            <vxe-column
-                field="stime"
-                sortable
-                title="开始时间">
-              </vxe-column>
-            <vxe-column
-                field="etime"
-                sortable
-                title="结束时间">
-              </vxe-column>
-            <vxe-column
-                field="amount"
-                sortable
-                title="金额(元)">
-              </vxe-column>
-            <vxe-column
-                field="isPay"
-                sortable
-                title="是否缴费">
-                <template slot-scope="scope">
-                      {{ $dictUtils.getDictLabel("yes_no", scope.row.isPay, '-') }}
-                </template>
-              </vxe-column>
-
-            <vxe-column
-              fixed="right"
-              align="center"
-              width="200"
-              title="操作">
-              <template  slot-scope="scope">
-                <el-button v-if="hasPermission('enterpriseelectricity:enterpriseElectricity:view')" type="text" icon="el-icon-view" size="small" @click="viewwyf(scope.row.id)">查看</el-button>
-                <el-button v-if="hasPermission('enterpriseelectricity:enterpriseElectricity:edit')" type="text" icon="el-icon-edit" size="small" @click="editwyf(scope.row.id)">修改</el-button>
-                <el-button v-if="hasPermission('enterpriseelectricity:enterpriseElectricity:del')" type="text"  icon="el-icon-delete" size="small" @click="delwyf(scope.row.id)">删除</el-button>
-              </template>
-            </vxe-column>
-
-          </vxe-table>
-          <vxe-pager background size="small" :current-page="wyftablePage.currentPage" :page-size="wyftablePage.pageSize"
-            :total="wyftablePage.total" :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
-            :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
-            @page-change="wyfcurrentChangeHandle">
-          </vxe-pager>
-        </div>
-        <!-- 物业费信息 -->
-
-      </el-tab-pane>
-
     </el-tabs>
 
     <span slot="footer" class="dialog-footer">
@@ -715,238 +269,28 @@
               this.inputForm.industry = this.inputForm.industry.split(',')
               this.loading = false
             })
-            this.warnrefreshList();
-            this.sfrefreshList();
-            this.wyfrefreshList();
-          }
-        })
-      },
-      // -------电费----------
-      // 当前页
-      warncurrentChangeHandle({
-        currentPage,
-        pageSize
-      }) {
-        this.warntablePage.currentPage = currentPage
-        this.warntablePage.pageSize = pageSize
-        this.warnrefreshList()
-      },
-      // 排序
-      warnsortChangeHandle(column) {
-        this.warntablePage.orders = []
-        if (column.order != null) {
-          this.warntablePage.orders.push({
-            column: this.$utils.toLine(column.property),
-            asc: column.order === 'asc'
-          })
-        }
-        this.warnrefreshList()
-      },
-      warnrefreshList() {
-
-        this.loading = true
-        enterpriseElectricityService.list({
-          'current': this.warntablePage.currentPage,
-          'size': this.warntablePage.pageSize,
-          'orders': this.warntablePage.orders,
-          'qyId':this.inputForm.id
-        }).then(({data}) => {
-          this.electdataList = data.records
-          this.warntablePage.total = data.total
-          this.loading = false
-        })
-
-      },
-      // 修改
-      editWarn (id) {
-        id = id || this.$refs.enterpriseElectricityTable.getCheckboxRecords().map(item => {
-          return item.id
-        })[0]
-        this.$refs.enterpriseElectricityForm.init('edit', id)
-      },
-      // 查看
-      viewWarn (id) {
-        this.$refs.enterpriseElectricityForm.init('view', id)
-      },
-      // 删除
-      delWarn (id) {
-        let ids = id || this.$refs.enterpriseElectricityTable.getCheckboxRecords().map(item => {
-          return item.id
-        }).join(',')
-        this.$confirm(`确定删除所选项吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.loading = true
-          enterpriseElectricityService.delete(ids).then(({data}) => {
-            this.$message.success(data)
-            this.warnrefreshList()
-            this.loading = false
-          })
-        })
-      },
 
-      // -------电费----------
-
-      // -------水费----------
-      // 当前页
-      sfcurrentChangeHandle({
-        currentPage,
-        pageSize
-      }) {
-        this.sftablePage.currentPage = currentPage
-        this.sftablePage.pageSize = pageSize
-        this.sfrefreshList()
-      },
-      // 排序
-      sfsortChangeHandle(column) {
-        this.sftablePage.orders = []
-        if (column.order != null) {
-          this.sftablePage.orders.push({
-            column: this.$utils.toLine(column.property),
-            asc: column.order === 'asc'
-          })
-        }
-        this.sfrefreshList()
-      },
-      sfrefreshList() {
-
-        this.loading = true
-        enterpriseWaterService.list({
-          'current': this.sftablePage.currentPage,
-          'size': this.sftablePage.pageSize,
-          'orders': this.sftablePage.orders,
-          'qyId':this.inputForm.id
-        }).then(({data}) => {
-          this.sfdataList = data.records
-          this.sftablePage.total = data.total
-          this.loading = false
-        })
-
-      },
-      // 修改
-      editsf (id) {
-        id = id || this.$refs.enterpriseWaterTable.getCheckboxRecords().map(item => {
-          return item.id
-        })[0]
-        this.$refs.enterpriseWaterForm.init('edit', id)
-      },
-      // 查看
-      viewsf (id) {
-        this.$refs.enterpriseWaterForm.init('view', id)
-      },
-      // 删除
-      delsf (id) {
-        let ids = id || this.$refs.enterpriseWaterTable.getCheckboxRecords().map(item => {
-          return item.id
-        }).join(',')
-        this.$confirm(`确定删除所选项吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.loading = true
-          enterpriseWaterService.delete(ids).then(({data}) => {
-            this.$message.success(data)
-            this.sfrefreshList()
-            this.loading = false
-          })
-        })
-      },
-
-      // -------水费----------
-
-
-      // -------物业费----------
-      // 当前页
-      wyfcurrentChangeHandle({
-        currentPage,
-        pageSize
-      }) {
-        this.wyftablePage.currentPage = currentPage
-        this.wyftablePage.pageSize = pageSize
-        this.wyfrefreshList()
-      },
-      // 排序
-      wyfsortChangeHandle(column) {
-        this.wyftablePage.orders = []
-        if (column.order != null) {
-          this.wyftablePage.orders.push({
-            column: this.$utils.toLine(column.property),
-            asc: column.order === 'asc'
-          })
-        }
-        this.wyfrefreshList()
-      },
-      wyfrefreshList() {
-
-        this.loading = true
-        enterprisePropertyService.list({
-          'current': this.wyftablePage.currentPage,
-          'size': this.wyftablePage.pageSize,
-          'orders': this.wyftablePage.orders,
-          'qyId':this.inputForm.id
-        }).then(({data}) => {
-          this.wyfdataList = data.records
-          this.wyftablePage.total = data.total
-          this.loading = false
-        })
-
-      },
-      // 修改
-      editwyf (id) {
-        id = id || this.$refs.enterprisePropertyTable.getCheckboxRecords().map(item => {
-          return item.id
-        })[0]
-        this.$refs.enterprisePropertyForm.init('edit', id)
-      },
-      // 查看
-      viewwyf (id) {
-        this.$refs.enterprisePropertyForm.init('view', id)
-      },
-      // 删除
-      delwyf (id) {
-        let ids = id || this.$refs.enterprisePropertyTable.getCheckboxRecords().map(item => {
-          return item.id
-        }).join(',')
-        this.$confirm(`确定删除所选项吗?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.loading = true
-          enterpriseWaterService.delete(ids).then(({data}) => {
-            this.$message.success(data)
-            this.wyfrefreshList()
-            this.loading = false
-          })
+          }
         })
       },
 
-      // -------物业费----------
 
       // 表单提交
       doSubmit () {
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
 
-            if(this.inputForm.totalNumber!=this.inputForm.des7+this.inputForm.des8){
-              this.$message.success('用工总数应等于男生人数加女生人数，请核对！')
-            }else if(this.inputForm.totalNumber!=this.inputForm.belowUndergraduate+this.inputForm.undergraduate+this.inputForm.postgraduate+this.inputForm.doctoralStudent){
-              this.$message.success('用工总数应等于各学历数的人员总数，请核对！')
-            }else{
-              this.inputForm.industry = this.inputForm.industry.toString()
-              this.loading = true
-              enterpriseInfoService.save(this.inputForm).then(({data}) => {
-                this.visible = false
-                this.$message.success(data)
-                this.$emit('refreshDataList')
-                this.loading = false
-              }).catch(() => {
-                this.loading = false
-              })
-            }
+            this.inputForm.industry = this.inputForm.industry.toString()
+            this.loading = true
+            enterpriseInfoService.save(this.inputForm).then(({data}) => {
+              this.visible = false
+              this.$message.success(data)
+              this.$emit('refreshDataList')
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+
 
           }
         })

jp-ui/src/views/modules/enterpriseinfo/EnterpriseInfoList.vue

@@ -3,95 +3,12 @@
       <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
             <!-- 搜索框-->
 
-          <el-form-item prop="des7">
-            <GridSelect
-              title="选择所属园区"
-              labelName = 'parkName'
-              placeholder="请选择园区"
-              labelValue = 'id'
-              :value = "searchForm.des7"
-              :limit="1"
-              @getValue='(value) => {searchForm.des7=value}'
-              :columns="[
-              {
-                prop: 'parkName',
-                label: '园区名称'
-              },
-              {
-                prop: 'placeSelectName',
-                label: '地点'
-              },
-              {
-                prop: 'placeDetailed',
-                label: '详细地址'
-              },
-              {
-                prop: 'propertyName',
-                label: '物业名称'
-              }
-              ]"
-              :searchs="[
-              {
-                prop: 'parkName',
-                label: '园区名称'
-              }
-              ]"
-              dataListUrl="/parkmanagement/parkManagement/list"
-              queryEntityUrl="/parkmanagement/parkManagement/queryById">
-            </GridSelect>
-         </el-form-item>
-
-         <el-form-item prop="des1">
-            <GridSelect
-              title="选择所属楼宇"
-              labelName = 'buildingName'
-              placeholder="请选择楼宇"
-              labelValue = 'id'
-              :value = "searchForm.des1"
-              :limit="1"
-              @getValue='(value) => {searchForm.des1=value}'
-              :columns="[
-              {
-                prop: 'buildingName',
-                label: '楼宇名称'
-              },
-              {
-                prop: 'placeSelectName',
-                label: '地点'
-              },
-              {
-                prop: 'buildingContacts',
-                label: '楼宇联系人'
-              },
-              {
-                prop: 'buildingArea',
-                label: '楼宇总面积'
-              }
-              ]"
-              :searchs="[
-              {
-                prop: 'buildingName',
-                label: '楼宇名称'
-              },
-              {
-                prop: 'organizationType',
-                label: '组织类型',
-                value: searchForm.des7,
-                show: 1
-              }
-              ]"
-              dataListUrl="/buildinginfo/buildingManagement/list"
-              queryEntityUrl="/buildinginfo/buildingManagement/queryById">
-            </GridSelect>
-         </el-form-item>
-
          <el-form-item prop="name">
                 <el-input size="small" v-model="searchForm.name" placeholder="企业名称" clearable></el-input>
          </el-form-item>
 
-         <el-form-item prop="industry">
-            <!-- <el-input size="small" v-model="searchForm.industry" placeholder="企业类型" clearable></el-input> -->
-            <el-select v-model="searchForm.industry" placeholder="企业类型"  style="width: 100%;">
+         <!-- <el-form-item prop="industry">
+            <el-select v-model="searchForm.industry" placeholder="所属行业"  style="width: 100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('industrial_type')"
                   :key="item.value"
@@ -99,33 +16,48 @@
                   :value="item.value">
                 </el-option>
             </el-select>
+         </el-form-item> -->
+
+         <el-form-item prop="industry">
+            <el-input size="small" v-model="searchForm.industry" placeholder="所属行业" clearable></el-input>
          </el-form-item>
-         <el-form-item prop="entryTime">
-               <el-date-picker
-                    v-model="searchForm.entryTime"
-                    type="daterange"
-                    size="small"
-                    align="right"
-                    value-format="yyyy-MM-dd hh:mm:ss"
-                    unlink-panels
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期">
-                 </el-date-picker>
+
+         <el-form-item prop="des1">
+            <el-input size="small" v-model="searchForm.des1" placeholder="属地" clearable></el-input>
          </el-form-item>
-         <el-form-item prop="floor">
-                <el-input size="small" v-model="searchForm.floor" placeholder="楼层" clearable></el-input>
+
+         <el-form-item prop="des3">
+            <el-input size="small" v-model="searchForm.des3" placeholder="销售规模" clearable></el-input>
          </el-form-item>
+
+         <el-form-item prop="bz1">
+            <el-input size="small" v-model="searchForm.bz1" placeholder="主导产品一" clearable></el-input>
+         </el-form-item>
+
+         <el-form-item prop="bz3">
+            <el-input size="small" v-model="searchForm.bz3" placeholder="主导产品二" clearable></el-input>
+         </el-form-item>
+
          <el-form-item prop="lxr">
-                <el-input size="small" v-model="searchForm.lxr" placeholder="联系人" clearable></el-input>
+            <el-input size="small" v-model="searchForm.lxr" placeholder="企业联系人" clearable></el-input>
          </el-form-item>
          <el-form-item prop="phone">
-                <el-input size="small" v-model="searchForm.phone" placeholder="联系人手机" clearable></el-input>
+            <el-input size="small" v-model="searchForm.phone" placeholder="企业联系电话" clearable></el-input>
+         </el-form-item>
+
+         <el-form-item prop="bz5">
+            <el-input size="small" v-model="searchForm.bz5" placeholder="工信局联系人" clearable></el-input>
+         </el-form-item>
+         <el-form-item prop="bz6">
+            <el-input size="small" v-model="searchForm.bz6" placeholder="工信局联系电话" clearable></el-input>
+         </el-form-item>
+
+
+
+         <el-form-item>
+           <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+           <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
-            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
-          </el-form-item>
       </el-form>
 
      <div class="bg-white top">
@@ -134,7 +66,7 @@
             <el-button v-if="hasPermission('enterpriseinfo:enterpriseInfo:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
             <el-button type="primary" size="small" icon="el-icon-s-claim" @click="organizationKeepOnRecord()"
                 v-if="hasPermission('enterpriseinfo:enterpriseInfo:ko')"
-                :disabled="$refs.enterpriseInfoTable && $refs.enterpriseInfoTable.getCheckboxRecords().length !== 1">审核</el-button>
+                :disabled="$refs.enterpriseInfoTable && $refs.enterpriseInfoTable.getCheckboxRecords().length === 0">一键生成账号</el-button>
             <el-button v-if="hasPermission('enterpriseinfo:enterpriseInfo:edit')" type="warning" size="small" icon="el-icon-edit-outline" @click="edit()" :disabled="$refs.enterpriseInfoTable && $refs.enterpriseInfoTable.getCheckboxRecords().length !== 1" plain>修改</el-button>
             <el-button v-if="hasPermission('enterpriseinfo:enterpriseInfo:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.enterpriseInfoTable && $refs.enterpriseInfoTable.getCheckboxRecords().length === 0" plain>删除</el-button>
           </template>
@@ -150,7 +82,7 @@
             </vxe-button>
           </template>
         </vxe-toolbar>
-        <div style="height: calc(100% - 80px);">
+        <div style="height: calc(100% - 120px);">
         <vxe-table
             border="inner"
             auto-resize
@@ -186,16 +118,7 @@
             :cell-style="cellStyle">
             <vxe-column type="seq" width="40"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
-    <vxe-column
-      field="des16"
-      sortable
-      title="所属园区">
-    </vxe-column>
-    <vxe-column
-        field="lyname"
-        sortable
-        title="所属楼宇">
-    </vxe-column>
+
     <vxe-column
         field="name"
         sortable
@@ -206,63 +129,57 @@
               <span v-else>{{scope.row.name}}</span>
             </template>
       </vxe-column>
-    <vxe-column
-        field="industryName"
+
+      <vxe-column
+        field="des1"
         sortable
-        title="企业类型">
-        <!-- <template slot-scope="scope">
-          {{$dictUtils.getDictLabel("industrial_type", scope.row.industry)}}
-        </template> -->
+        title="属地">
       </vxe-column>
-    <vxe-column
-        field="entryTime"
-        sortable
-        title="入驻时间">
-        <template slot-scope="scope">
-          {{scope.row.entryTime}}
-        </template>
+      <vxe-column
+          field="industry"
+          sortable
+          title="所属行业">
       </vxe-column>
+
     <vxe-column
-        field="officeArea"
+        field="des3"
         sortable
-        title="办公面积(平)">
+        title="销售规模">
       </vxe-column>
-   <!-- <vxe-column
-        field="annualRent"
-        sortable
-        title="年租金(元)">
-      </vxe-column> -->
+
     <vxe-column
-        field="floor"
+        field="bz1"
         sortable
-        title="楼层(F)">
+        title="主导产品一">
       </vxe-column>
     <vxe-column
-        field="lxr"
+        field="bz2"
         sortable
-        title="联系人">
+        title="产业链上下游">
       </vxe-column>
     <vxe-column
-        field="phone"
+        field="bz3"
         sortable
-        title="联系人手机">
+        title="主导产品二">
       </vxe-column>
+
     <vxe-column
-        field="des6"
+        field="bz4"
         sortable
-        title="企业状态">
-        <template slot-scope="scope">
-          {{$dictUtils.getDictLabel("qy_state", scope.row.des6)}}
-        </template>
-      </vxe-column>
+        title="产业链上下游">
+        </vxe-column>
+
     <vxe-column
-        field="des12"
+        field="des6"
         sortable
-        title="审核状态">
+        title="企业账号">
         <template slot-scope="scope">
-          {{$dictUtils.getDictLabel("yes_no", scope.row.des12)}}
+              <el-button v-if="scope.row.des6=='1'" type="text" icon="el-icon-share" size="small" @click="copePassword(scope.row.phone,scope.row.des5)">{{ scope.row.phone }}</el-button>
+              <p v-if="scope.row.des6!='1'">未生成</p>
         </template>
       </vxe-column>
+
+
     <vxe-column
         field="updateDate"
         sortable
@@ -321,7 +238,7 @@
           total: 0,
           currentPage: 1,
           pageSize: 10,
-          orders: [{ column: 'a.create_date', asc: false }]
+          orders: [{ column: '', asc: false }]
         },
         loading: false
       }
@@ -368,18 +285,32 @@
 
         //this.fetchData2();
 
-        enterpriseInfoService.PostBaidu({
-          'talk': ""
-        }).then(({data}) => {
-          console.log(this.data);
-        })
+        // enterpriseInfoService.PostBaidu({
+        //   'talk': ""
+        // }).then(({data}) => {
+        //   console.log(this.data);
+        // })
 
-        enterpriseInfoService.PostBaidu2({
-          'talk': ""
-        }).then(({data}) => {
-          console.log(this.data);
-        })
+        // enterpriseInfoService.PostBaidu2({
+        //   'talk': ""
+        // }).then(({data}) => {
+        //   console.log(this.data);
+        // })
+
+      },
+
+      copePassword (ss1,ss2) {
 
+        this.copyTextToClipboard(ss1+","+ss2)
+        this.$message.success('用户名，初始密码 已经复制到剪切板，直接粘贴发送给用户！')
+      },
+      async copyTextToClipboard (text) {
+        try {
+          await navigator.clipboard.writeText(text)
+          console.log('Text copied to clipboard')
+        } catch (err) {
+          console.error('Failed to copy: ', err)
+        }
       },
 
 
@@ -548,39 +479,31 @@
           }
         }
       },
-      // 审核
+      // 一键生成账号
       organizationKeepOnRecord(id) {
-        let record = this.$refs.enterpriseInfoTable.getCheckboxRecords()[0];
-
-        if (record.des12 == '1') {
-          this.$message.error('已审核记录不支持审核操作！')
-          return;
-        }
-
         let ids = id || this.$refs.enterpriseInfoTable.getCheckboxRecords().map(item => {
           return item.id
         }).join(',')
-        this.$confirm(`确定审核所选项吗?`, '提示', {
+        this.$confirm(`确定生成所选项的企业账号吗?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
           this.loading = true
-          enterpriseInfoService.keepOnRecord(ids).then(({
-            data
-          }) => {
+          enterpriseInfoService.generateAccount(ids).then(({data}) => {
             this.$message.success(data)
             this.refreshList()
             this.loading = false
           })
         })
+
       },
       // 下载模板
       downloadTpl () {
         this.loading = true
         enterpriseInfoService.exportTemplate().then(({data}) => {
     // 将二进制流文件写入excel表，以下为重要步骤
-          this.$utils.downloadExcel(data, '请假表单导入模板')
+          this.$utils.downloadExcel(data, '规上工业企业导入模板')
           this.loading = false
         }).catch(function (err) {
           this.loading = false

jp-ui/src/views/modules/sys/dashboard/analysis/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="background-image">
     <div class="header">
-      <div class="roll-name-box">
+      <!-- <div class="roll-name-box">
         <div class="scroll-content">
           <span v-for="(item, index) in notifyList" :key="index">
             <span>{{ item.title}}:</span>
@@ -9,10 +9,10 @@
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
           </span>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="headline">
-      <div class="headline-text">潘黄街道楼宇数字园区综合平台</div>
+      <div class="headline-text">盐都区工业企业产品发布平台</div>
     </div>
     <div class="main">
       <div style="width: 2.5%"></div>
@@ -20,25 +20,25 @@
         <div class="main-periphery">
           <div style="height: 25%"></div>
           <div class="main-periphery-font" style="height: 30%; color: #031c57">
-            园区总数
+            今日入库企业数
           </div>
           <div
             class="main-periphery-numerical"
             style="height: 45%; color: #0843cd"
           >
-            {{ pageInfo.yqcount }}
+            {{ pageInfo.todayenterprisec }}
           </div>
         </div>
         <div class="main-periphery">
           <div style="height: 25%"></div>
           <div class="main-periphery-font" style="height: 30%; color: #031c57">
-            入驻企业总数
+            入库企业总数
           </div>
           <div
             class="main-periphery-numerical"
             style="height: 45%; color: #0843cd"
           >
-            {{ pageInfo.qiyecount }}
+            {{ pageInfo.enterprisec }}
           </div>
         </div>
       </div>
@@ -46,196 +46,95 @@
         <div class="main-periphery">
           <div style="height: 25%"></div>
           <div class="main-periphery-font" style="height: 30%; color: #063e2a">
-            楼宇总面积
-            <span class="main-periphery-font-small" style="color: #063e2a"
-              >(㎡)</span
-            >
+            今天活跃数
           </div>
           <div
             class="main-periphery-numerical"
             style="height: 45%; color: #028455"
           >
-            {{ pageInfo.louyuzmj }}
+            {{ pageInfo.todayc }}
           </div>
         </div>
+
         <div class="main-periphery">
           <div style="height: 25%"></div>
-          <div
-            class="main-periphery-font-small"
-            style="height: 30%; color: #063e2a"
-          >
-            已住面积
-            <span
-              class="main-periphery-font"
-              style="font-weight: bold; color: #028455; margin-left: 10px"
-              >{{ pageInfo.ruzhuzongmianji }}</span
-            >
-            <span
-              class="main-periphery-font-small"
-              style="font-weight: bold; color: #028455; margin-left: 10px"
-              >㎡</span
-            >
+          <div class="main-periphery-font" style="height: 30%; color: #063e2a">
+            当月活跃数
           </div>
           <div
-            class="main-periphery-font-small"
-            style="height: 30%; color: #063e2a"
+            class="main-periphery-numerical"
+            style="height: 45%; color: #028455"
           >
-            空余面积
-            <span
-              class="main-periphery-font"
-              style="font-weight: bold; color: #028455; margin-left: 10px"
-              >{{ pageInfo.kongzhimj }}</span
-            >
-            <span
-              class="main-periphery-font-small"
-              style="font-weight: bold; color: #028455; margin-left: 10px"
-              >㎡</span
-            >
+            {{ pageInfo.samemonthc }}
           </div>
         </div>
+
+
       </div>
-      <div class="main-3">
+
+      <div class="main-4">
         <div class="main-periphery">
           <div style="height: 25%"></div>
-          <div class="main-periphery-font" style="height: 30%; color: #351298">
-            科技创新
+          <div class="main-periphery-font" style="height: 30%; color: #764710">
+            入库企业行业
             <span
               class="main-periphery-font-small"
-              style="color: #351298"
+              style="color: #764710"
             ></span>
           </div>
           <div class="main-periphery2">
+            <div style="height: 15%"></div>
             <div
               class="main-periphery-font-small"
-              style="color: #351298"
-            >
-              目前已认定国家高企
-              <span
-                class="main-periphery-font"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
-                >{{ pageInfo2.gqs }}</span
-              >
-              <span
-                class="main-periphery-font-small"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
-                >家</span
-              >
-            </div>
-            <div
-              class="main-periphery-font-small"
-              style="color: #351298"
+              style="height: 30%; color: #764710"
             >
-              规上企业
+              {{pageInfo2[0].industry}}
               <span
                 class="main-periphery-font"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
-                >{{ pageInfo2.gsqys }}</span
+                style="font-weight: bold; color: #b86504; margin-left: 10px"
+                >{{ pageInfo2[0].cc }}</span
               >
               <span
                 class="main-periphery-font-small"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
+                style="font-weight: bold; color: #b86504; margin-left: 10px"
                 >家</span
               >
             </div>
-          </div>
-
-          <div class="main-periphery2">
+            <div style="height: 15%"></div>
             <div
               class="main-periphery-font-small"
-              style="color: #351298"
+              style="height: 30%; color: #764710"
             >
-              2025年意向申报国家高企
+              {{pageInfo2[1].industry}}
               <span
                 class="main-periphery-font"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 5px"
-                >{{ pageInfo2.yxsbs }}</span
+                style="font-weight: bold; color: #b86504; margin-left: 10px"
+                >{{ pageInfo2[1].cc }}</span
               >
               <span
                 class="main-periphery-font-small"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 5px"
+                style="font-weight: bold; color: #b86504; margin-left: 10px"
                 >家</span
               >
             </div>
-            <div
-              class="main-periphery-font-small"
-              style="color: #351298"
-            >
-              发明专利授权数
-              <span
-                class="main-periphery-font"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
-                >{{ pageInfo2.fmzls }}</span
-              >
-              <span
-                class="main-periphery-font-small"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
-                >件</span
-              >
-            </div>
           </div>
 
-          <div class="main-periphery2">
-            <div
-              class="main-periphery-font-small"
-              style="color: #351298"
-            >
-              实用新型专利授权数
-              <span
-                class="main-periphery-font"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
-                >{{ pageInfo2.syxxzls }}</span
-              >
-              <span
-                class="main-periphery-font-small"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
-                >件</span
-              >
-            </div>
-            <div
-              class="main-periphery-font-small"
-              style="color: #351298"
-            >
-              软著数
-              <span
-                class="main-periphery-font"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
-                >{{ pageInfo2.soft_writings }}</span
-              >
-              <span
-                class="main-periphery-font-small"
-                style="font-weight: bold; color: #bd4ae3; margin-left: 10px"
-                >件</span
-              >
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="main-4">
-        <div class="main-periphery">
-          <div style="height: 25%"></div>
-          <div class="main-periphery-font" style="height: 30%; color: #764710">
-            人才引进
-            <span
-              class="main-periphery-font-small"
-              style="color: #764710"
-            ></span>
-          </div>
           <div class="main-periphery2">
             <div style="height: 15%"></div>
             <div
               class="main-periphery-font-small"
               style="height: 30%; color: #764710"
             >
-              博士生人数
+              {{pageInfo2[2].industry}}
               <span
                 class="main-periphery-font"
                 style="font-weight: bold; color: #b86504; margin-left: 10px"
-                >{{ nowYQInfo.DoctoralStudent }}</span
+                >{{ pageInfo2[2].cc }}</span
               >
               <span
                 class="main-periphery-font-small"
                 style="font-weight: bold; color: #b86504; margin-left: 10px"
-                >人</span
+                >家</span
               >
             </div>
             <div style="height: 15%"></div>
@@ -243,55 +142,38 @@
               class="main-periphery-font-small"
               style="height: 30%; color: #764710"
             >
-              硕士生人数
+              {{pageInfo2[3].industry}}
               <span
                 class="main-periphery-font"
                 style="font-weight: bold; color: #b86504; margin-left: 10px"
-                >{{ nowYQInfo.Postgraduate }}</span
+                >{{ pageInfo2[3].cc }}</span
               >
               <span
                 class="main-periphery-font-small"
                 style="font-weight: bold; color: #b86504; margin-left: 10px"
-                >人</span
+                >家</span
               >
             </div>
-          </div>
 
-          <div class="main-periphery2">
-            <div style="height: 15%"></div>
-            <div
-              class="main-periphery-font-small"
-              style="height: 30%; color: #764710"
-            >
-              本科生人数
-              <span
-                class="main-periphery-font"
-                style="font-weight: bold; color: #b86504; margin-left: 10px"
-                >{{ nowYQInfo.Undergraduate }}</span
-              >
-              <span
-                class="main-periphery-font-small"
-                style="font-weight: bold; color: #b86504; margin-left: 10px"
-                >人</span
-              >
-            </div>
             <div style="height: 15%"></div>
             <div
               class="main-periphery-font-small"
               style="height: 30%; color: #764710"
             >
-              本科以下人数
+              {{pageInfo2[4].industry}}
               <span
                 class="main-periphery-font"
                 style="font-weight: bold; color: #b86504; margin-left: 10px"
-                >{{ nowYQInfo.BelowUndergraduate }}</span
+                >{{ pageInfo2[4].cc }}</span
               >
               <span
                 class="main-periphery-font-small"
                 style="font-weight: bold; color: #b86504; margin-left: 10px"
-                >人</span
+                >家</span
               >
             </div>
+
+
           </div>
         </div>
       </div>
@@ -460,7 +342,7 @@ export default {
       isBottom5: false,
       isBottom6: false,
       pageInfo: {},
-      pageInfo2: {},
+      pageInfo2: [],
       haveCJYQ: false,
       haveCJLY: false,
       haveCJQY: false,
@@ -486,18 +368,18 @@ export default {
     this.changeColor();
     this.getPageInfo();
     this.getMenuList();
-    this.getSaleStatisticsForOneBuilding();
     this.getNotifyList()
   },
   methods: {
     getPageInfo() {
-      bigScreenService.BackendFirst({}).then(({ data }) => {
+      bigScreenService.InfoStatistics({}).then(({ data }) => {
         this.pageInfo = data;
       });
 
-      bigScreenService.getQyfx({ year: "2025" }).then(({ data }) => {
+      bigScreenService.InfoStatistics_industry({ }).then(({ data }) => {
         this.pageInfo2 = data;
       });
+
     },
 
     getNotifyList() {
@@ -514,11 +396,7 @@ export default {
         });
     },
 
-    getSaleStatisticsForOneBuilding() {
-      bigScreenService.getSaleStatisticsForPark({}).then(({ data }) => {
-        this.nowYQInfo = { ...data[0] };
-      });
-    },
+
 
     getMenuList() {
       userService.getMenus().then(({ data }) => {
@@ -594,7 +472,7 @@ export default {
 
 .main-1 {
   margin-left: 1.5%;
-  width: 21%;
+  width: 29%;
   height: 80%;
   background-image: url("~@/assets/img/homePage/hou_5.png");
   background-size: 100% 100%;
@@ -603,7 +481,7 @@ export default {
 
 .main-2 {
   margin-left: 1.5%;
-  width: 23%;
+  width: 29%;
   height: 80%;
   background-image: url("~@/assets/img/homePage/hou_4.png");
   background-size: 100% 100%;
@@ -612,7 +490,7 @@ export default {
 
 .main-3 {
   margin-left: 1.5%;
-  width: 21%;
+  width: 29%;
   height: 80%;
   background-image: url("~@/assets/img/homePage/hou_3.png");
   background-size: 100% 100%;
@@ -621,7 +499,7 @@ export default {
 
 .main-4 {
   margin-left: 1.5%;
-  width: 21%;
+  width: 30%;
   height: 80%;
   background-image: url("~@/assets/img/homePage/hou_2.png");
   background-size: 100% 100%;

jp-ui/src/views/modules/sys/login/login.vue

@@ -8,7 +8,7 @@
                 <div class="login-time">
           {{time}}
         </div>
-        <p class="title">潘黄街道楼宇数字园区综合平台</p>
+        <p class="title">盐都区工业企业产品发布平台</p>
 
         <el-image src="/static/img/login.png">
     </el-image>