2

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

@@ -58,6 +58,7 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -99,49 +100,94 @@ public class EnterpriseInfoController {
 	 */
 	@ApiLog("查询企业基本信息列表数据")
 	@ApiOperation(value = "查询企业基本信息列表数据")
-	@PreAuthorize("hasAuthority('enterpriseinfo:enterpriseInfo:list')")
 	@GetMapping("list")
 	public ResponseEntity<IPage<EnterpriseInfoDTO>> list(EnterpriseInfoDTO enterpriseInfoDTO, Page<EnterpriseInfoDTO> page) throws Exception {
 		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (enterpriseInfoDTO, EnterpriseInfoDTO.class);
 
-		//添加角色权限
 		UserDTO userDTO = UserUtils.getCurrentUserDTO();
-		String[] roleIds = userDTO.getRoleIds().split(",");
-		if(Arrays.asList(roleIds).contains("38a14f1f42ed424eab4cb5d489596b0d")){//企业用户
-			String officeid=userDTO.getOfficeDTO().getId();
-			String qyid=enterpriseInfoService.findQyidByOfficeid(officeid);
-			if(qyid!=null&&!qyid.equals("")){
-				queryWrapper.eq("a.id",qyid);
-			}
-		}else if(Arrays.asList(roleIds).contains("6931d8e6e4974f898010bb22fbccaa14")){//楼宇管理员
-			String officeid=userDTO.getOfficeDTO().getId();
-			String lyid=enterpriseInfoService.findLyidByOfficeid(officeid);
-			if(lyid!=null&&!lyid.equals("")){
-				queryWrapper.eq("des1",lyid);
-			}
-		}
-		//企业类型
-		List<DictValueDTO> person_type_list = dictValueService.lambdaQuery ().
-				eq ( DictValue::getDictTypeId, "1852233185762918402")
-				.list ().stream ().
-				map (dictValueWrapper::toDTO).collect (Collectors.toList ());
+		List<HashMap<String, Object>> map=new ArrayList<>();
 
 		IPage<EnterpriseInfoDTO> result = enterpriseInfoService.findPage (page, queryWrapper,enterpriseInfoDTO.getIndustry());
-		for(int i=0;i<result.getRecords().size();i++){
-			//有逗号表明有多个人员类型
-			if (StringUtils.isNotBlank(result.getRecords().get(i).getIndustry())) {
-				List<String> pt_array = Arrays.asList(result.getRecords().get(i).getIndustry().split(","));
-				String pt_names = person_type_list.stream()
-						.filter(dictValueDTO -> pt_array.contains(dictValueDTO.getValue()))
-						.map(dictValueDTO -> dictValueDTO.getLabel())
-						.collect(Collectors.joining(","));
-
-				if (StringUtils.isNotBlank(pt_names)) result.getRecords().get(i).setIndustryName(pt_names);
+		//未登录限制
+		if(userDTO.getLoginName()==null){
+			for(int i=0;i<result.getRecords().size();i++){
+				result.getRecords().set(i,nologindel(result.getRecords().get(i)));
 			}
 		}
 		return ResponseEntity.ok (result);
 	}
 
+	private EnterpriseInfoDTO nologindel(EnterpriseInfoDTO ei){
+		List<HashMap<String, Object>> map=enterpriseInfoService.getnologinstr("nol_ogin_show");
+		ei.setDes5("*******");//初始密码
+
+		for (int j=0;j<map.size();j++){
+			if(map.get(j).get("value").toString().equals("name")){//企业名称
+				ei.setName("*******");
+			}
+			if(map.get(j).get("value").toString().equals("des1")){//属地
+				ei.setDes1("***");
+			}
+			if(map.get(j).get("value").toString().equals("industry")){//所属行业
+				ei.setIndustry("****");
+			}
+			if(map.get(j).get("value").toString().equals("des3")){//销售规模
+				ei.setDes3("*****");
+			}
+			if(map.get(j).get("value").toString().equals("bz1")){//主导产品一
+				ei.setBz1("****");
+			}
+			if(map.get(j).get("value").toString().equals("bz2")){//产品1产业链上下游
+				ei.setBz2("****");
+			}
+			if(map.get(j).get("value").toString().equals("bz3")){//主导产品二
+				ei.setBz3("****");
+			}
+			if(map.get(j).get("value").toString().equals("bz4")){//产品2产业链上下游
+				ei.setBz4("****");
+			}
+
+			if(map.get(j).get("value").toString().equals("lxr")){//企业联系人
+				ei.setLxr("***");
+			}
+
+			if(map.get(j).get("value").toString().equals("phone")){//企业联系电话
+				ei.setPhone("***********");
+			}
+
+			if(map.get(j).get("value").toString().equals("bz5")){//工信局联系人
+				ei.setBz5("***********");
+			}
+
+			if(map.get(j).get("value").toString().equals("bz6")){//工信局联系电话
+				ei.setBz6("***********");
+			}
+		}
+		return ei;
+	}
+
+	/**
+	 * 选择属地
+	 */
+	@ApiLog("选择属地")
+	@ApiOperation(value = "选择属地")
+	@GetMapping("getAreaList")
+	public ResponseEntity<List<HashMap<String, Object>>> getAreaList() throws Exception {
+		List<HashMap<String, Object>> map=enterpriseInfoService.getAreaList();
+		return ResponseEntity.ok (map);
+	}
+
+	/**
+	 * 选择行业
+	 */
+	@ApiLog("选择行业")
+	@ApiOperation(value = "选择行业")
+	@GetMapping("getHyList")
+	public ResponseEntity<List<HashMap<String, Object>>> getHyList() throws Exception {
+		List<HashMap<String, Object>> map=enterpriseInfoService.getHyList();
+		return ResponseEntity.ok (map);
+	}
+
 	/**
 	 * Post 请求百度云模型
 	 */
@@ -194,10 +240,26 @@ public class EnterpriseInfoController {
 	 */
 	@ApiLog("根据Id获取企业基本信息数据")
 	@ApiOperation(value = "根据Id获取企业基本信息数据")
-	@PreAuthorize("hasAnyAuthority('enterpriseinfo:enterpriseInfo:view','enterpriseinfo:enterpriseInfo:add','enterpriseinfo:enterpriseInfo:edit')")
 	@GetMapping("queryById")
 	public ResponseEntity<EnterpriseInfoDTO> queryById(String id) {
-		return ResponseEntity.ok ( enterpriseInfoWrapper.toDTO ( enterpriseInfoService.getById ( id ) ) );
+		UserDTO userDTO = UserUtils.getCurrentUserDTO();
+
+		EnterpriseInfoDTO ei=enterpriseInfoWrapper.toDTO ( enterpriseInfoService.getById ( id ) );
+
+		//未登录限制
+		if(userDTO.getLoginName()==null){
+			ei=nologindel(ei);
+		}
+
+		return ResponseEntity.ok (ei);
+	}
+
+	@ApiLog("获取不展示字段")
+	@ApiOperation(value = "获取不展示字段")
+	@GetMapping("getnologinstr")
+	public ResponseEntity<List<HashMap<String, Object>>> getnologinstr(String str) {
+		List<HashMap<String, Object>> map=enterpriseInfoService.getnologinstr(str);
+		return ResponseEntity.ok ( map );
 	}
 
 	/**

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

@@ -45,6 +45,11 @@ public interface EnterpriseInfoMapper extends BaseMapper<EnterpriseInfo> {
     int getInfoStatistics5();
     List<HashMap<String, Object>> getInfoStatistics6();
 
+    List<HashMap<String, Object>> getAreaList();
+    List<HashMap<String, Object>> getHyList();
+    List<HashMap<String, Object>> getnologinstr(String str);
+
+
 
     EnterpriseInfoDTO findByName(String name);
 

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

@@ -71,11 +71,10 @@
         left join ly_park_management c on b.park_management=c.id
         ${ew.customSqlSegment}
 
-        <if test="industry != '' and industry != null">
-            and FIND_IN_SET(#{industry}, a.industry)
-        </if>
+
     </select>
 
+
     <select id="findByName" resultType="com.jeeplus.enterpriseinfo.service.dto.EnterpriseInfoDTO">
         SELECT *
         FROM ly_enterprise_info
@@ -128,6 +127,17 @@
         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="getAreaList" resultType="map">
+        SELECT des1 FROM `ly_enterprise_info` where del_flag=0 group By des1
+    </select>
+
+    <select id="getHyList" resultType="map">
+        SELECT industry FROM `ly_enterprise_info` where del_flag=0 group By industry
+    </select>
+
+    <select id="getnologinstr" resultType="map">
+        SELECT label,value FROM sys_dict_value where dict_type_id=(SELECT id FROM sys_dict_type where type=#{str})
+    </select>
 
 
     <select id="getLyinfoforuserid" resultType="map">

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

@@ -151,6 +151,17 @@ public class EnterpriseInfoService extends ServiceImpl<EnterpriseInfoMapper, Ent
         return baseMapper.getInfoStatistics6 ();
     }
 
+    public List<HashMap<String, Object>> getAreaList() {
+        return baseMapper.getAreaList ();
+    }
+
+    public List<HashMap<String, Object>> getHyList() {
+        return baseMapper.getHyList ();
+    }
+    public List<HashMap<String, Object>> getnologinstr(String str) {
+        return baseMapper.getnologinstr (str);
+    }
+
 
 
     public int generateAccount(EnterpriseInfoDTO ef){

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

@@ -38,7 +38,7 @@ public class EnterpriseInfoDTO extends BaseDTO {
 	 * 属地
 	 */
 	@ExcelProperty("属地")
-	@Query(type = QueryType.EQ)
+	@Query(type = QueryType.LIKE)
 	private String des1;
 
 	/**
@@ -46,32 +46,39 @@ public class EnterpriseInfoDTO extends BaseDTO {
      */
 	@NotNull(message="所属行业不能为空")
 	@ExcelProperty("所属行业")
+	@Query(type = QueryType.LIKE)
 	private String industry;
 	@ExcelIgnore
 	private String industryName;
 
 	@ExcelProperty("销售规模")
+	@Query(type = QueryType.LIKE)
 	private String des3;
 
 	@ExcelProperty("主导产品一")
+	@Query(type = QueryType.LIKE)
 	private String bz1;
 
 	@ExcelProperty("主导产品一产业链上下游")
+	@Query(type = QueryType.LIKE)
 	private String bz2;
 
 	@ExcelProperty("主导产品二")
+	@Query(type = QueryType.LIKE)
 	private String bz3;
 
 	@ExcelProperty("主导产品二产业链上下游")
+	@Query(type = QueryType.LIKE)
 	private String bz4;
 
 	@ExcelProperty("工信局联系人")
+	@Query(type = QueryType.LIKE)
 	private String bz5;
 
 	@ExcelProperty("联系电话")
+	@Query(type = QueryType.LIKE)
 	private String bz6;
 
-
 	@Query(type = QueryType.LIKE)
 	@ExcelProperty("企业联系人")
 	private String lxr;

jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/security/config/WebSecurityConfig.java

@@ -71,6 +71,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                         "/file/download",
                         "/sys/login",
                         "/app/sys/login",
+                        "/dp/dp/InfoStatistics",
+                        "/dp/dp/InfoStatistics_industry",
+                        "/enterpriseinfo/enterpriseInfo/list",
+                        "/enterpriseinfo/enterpriseInfo/queryById",
+                        "/enterpriseinfo/enterpriseInfo/getAreaList",
+                        "/enterpriseinfo/enterpriseInfo/getHyList",
+                        "/enterpriseinfo/enterpriseInfo/getnologinstr",
                         "/sys/sysConfig/getConfig",
                         "/getAppFlowChart",
                         "/sys/getCode",

jp-mobile/api/auth/loginService.js

@@ -20,6 +20,23 @@ export default {
 			method: 'get'
 		})
 	},
+	
+	InfoStatistics: function (params) {
+	    return request({
+	        url: '/dp/dp/InfoStatistics',
+	        method: 'get',
+	        params: params
+	    })
+	},
+	
+	InfoStatistics_industry: function (params) {
+	    return request({
+	        url: '/dp/dp/InfoStatistics_industry',
+	        method: 'get',
+	        params: params
+	    })
+	},
+	
 	savePwd: function(inputForm) {
 		return request({
 			url: '/sys/user/savePwd',
@@ -44,9 +61,17 @@ export default {
 	},
 
 	// /parkmanagement/parkManagement/list
-	parkList: function(params) {
+	getAreaList: function(params) {
 		return request({
-			url: '/parkmanagement/parkManagement/list1',
+			url: '/enterpriseinfo/enterpriseInfo/getAreaList',
+			method: 'get',
+			params: params
+		})
+	},
+	
+	getHyList: function(params) {
+		return request({
+			url: '/enterpriseinfo/enterpriseInfo/getHyList',
 			method: 'get',
 			params: params
 		})
@@ -109,6 +134,16 @@ export default {
 			}
 		})
 	},
+	
+	getnologinstr: function(str) {
+		return request({
+			url: '/enterpriseinfo/enterpriseInfo/getnologinstr',
+			method: 'get',
+			params: {
+				str: str
+			}
+		})
+	},
 
 	getStatisticsForPark: function(params) {
 		return request({

jp-mobile/colorui/main.css

@@ -3028,8 +3028,8 @@ scroll-view.cu-steps .cu-item {
 	margin-top: 20upx;
 }
 
-.margin-top {
-	margin-top: 25upx;
+.margin-left {
+	margin-left: 1upx;
 }
 
 .margin-top-lg {

jp-mobile/common/auth.js

@@ -89,6 +89,11 @@ function checkLogin () {
 	}
 }
 
+function checkisLogin () {
+		
+	return store.state.user.token;
+}
+
 export {
 	getUserToken,
 	setUserToken,
@@ -110,5 +115,6 @@ export {
 	setPermissions,
 	removePermissions,
 	hasPermission,
-	checkLogin
+	checkLogin,
+	checkisLogin
 }

jp-mobile/components/jp-picker/jp-picker.vue

@@ -2,7 +2,9 @@
 	<view>
 		<picker @change="PickerChange" :value="index" :disabled="disabled" :range-value="rangeValue"  :range-key="rangeKey" :range="range">
 			<view class=" picker action">
-				<view class="text-grey ">{{label || '请选择'}}</view>
+				<view class="text-grey ">
+					▾
+				</view>
 			</view>
 		</picker>
 	</view>

jp-mobile/pages/comEdit/comEdit.vue

@@ -12,281 +12,120 @@
 			<block slot="backText">返回</block>
 			<block slot="content">查看企业信息</block>
 		</cu-custom>
+		
+		<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" :interval="3000" :duration="800">
+			<swiper-item>
+				<image src="../../static/img/titlebg.jpg" class="swiper-item"></image>
+			</swiper-item>
+			<swiper-item>
+				<image src="../../static/img/titlebg.jpg" class="swiper-item"></image>
+			</swiper-item>			
+		</swiper>
+		
 		<form @submit="formSubmit" class="cu-list menu">
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text> 企业名称
-				</view>
-				<input v-model="inputForm.name" placeholder="请填写企业名称" :disabled="ischeck"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text>企业类型
-				</view>
-				<jp-picker v-model="inputForm.industry" rangeKey="label" rangeValue="value"
-					:range="$dictUtils.getDictList('industrial_type')" :disabled="ischeck">
-					<view class="picker">
-						{{$dictUtils.getDictLabel('industrial_type', inputForm.industry ,'请选择')}}
+			
+			<view class="show1">
+				
+				<view class="textbg">
+					<view class="text1">
+						 企业名称
 					</view>
-				</jp-picker>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text>所属楼宇
+					<view class="text2">
+						 {{inputForm.name}}
+					</view>				
 				</view>
 				
-				<picker @change="changeLYId" :value="lyIndex" :range="showLYList" :disabled="ischeck">
-					<view class=" picker action">
-						<view class="text-grey ">{{showLYList[lyIndex] || '请选择'}}</view>
+				<view class="textbg" @click="call1">
+					<!-- <view class="text1">
+						属地
 					</view>
-				</picker>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text>
-					入驻时间
-				</view>
-				<jp-datetime-picker v-model="inputForm.entryTime" mode="date" :disabled="ischeck"></jp-datetime-picker>
-			</view>
-			
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					撤场时间
-				</view>
-				<jp-datetime-picker v-model="inputForm.des5" mode="date" :disabled="ischeck"></jp-datetime-picker>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					办公面积（平）
-				</view>
-				<input v-model="inputForm.officeArea" placeholder="请填写办公面积" :disabled="ischeck"></input>
-			</view>
-
-			<!-- <view class="cu-form-group margin-top">
-				<view class="title">
-					年租金（元）
-				</view>
-				<input v-model="inputForm.annualRent" placeholder="请填写年租金" :disabled="ischeck"></input>
-			</view> -->
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text>
-					楼层
-				</view>
-				<input v-model="inputForm.floor" placeholder="请填写楼层" :disabled="ischeck"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text>
-					房间号
-				</view>
-				<input v-model="inputForm.des3" placeholder="请填写房间号" :disabled="ischeck"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text>
-					联系人
-				</view>
-				<input v-model="inputForm.lxr" placeholder="请填写联系人" :disabled="ischeck"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text>
-					联系人手机
-				</view>
-				<input v-model="inputForm.phone" placeholder="请填写联系人手机" :disabled="ischeck"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text>
-					合约起始时间
-				</view>
-				<jp-datetime-picker v-model="inputForm.htStime" mode="date" :disabled="ischeck"></jp-datetime-picker>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					<text class="red-color ">* </text>
-					合约到期时间
-				</view>
-				<jp-datetime-picker v-model="inputForm.htEtime" mode="date" :disabled="ischeck"></jp-datetime-picker>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					主营内容
+					<input v-model="inputForm.des1"  :disabled="ischeck"></input> -->
+					<view class="text1">
+						 负责人
+					</view>
+					<view class="text3">
+						 {{inputForm.lxr}}      <view v-if="inputForm.phone!=''"> （ </view>
+						 <view class="phone">{{inputForm.phone}} </view>   <view v-if="inputForm.phone!=''">） </view>
+						 <image class="phoneimg" src="/static/img/dianhua.png "></image>
+					</view>	
 				</view>
-				<input v-model="inputForm.businessContent" placeholder="请填写主营内容" :disabled="ischeck"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					用工总数
+				
+				<view class="textbg" @click="call2" style="margin-bottom: 10rpx;padding-bottom: 20rpx;" >
+					<!-- <view class="text1">
+						企业类型
+					</view>
+					<input v-model="inputForm.industry"  :disabled="ischeck"></input> -->
+					
+					<view class="text1">
+						 联系干部
+					</view>
+					<view class="text3">
+						 {{inputForm.bz5}}      <view v-if="inputForm.bz6!=''"> （ </view>
+						 <view class="phone">{{inputForm.bz6}} </view>   <view v-if="inputForm.bz6!=''"> ） </view>
+						 <image class="phoneimg" src="/static/img/dianhua.png "></image>
+					</view>	
+					
 				</view>
-				<input v-model="inputForm.totalNumber" placeholder="请填写用工总数" :disabled="ischeck" type="number"></input>
+				
 			</view>
 
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					社保人数
-				</view>
-				<input v-model="inputForm.securityNumber" placeholder="请填写社保人数" :disabled="ischeck"
-					type="number"></input>
+			<view class="titlebg2">
+				<view class="titlet1" ></view>
+				<view class="titlet2" >企业基本信息</view>								
 			</view>
 			
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					男生人数
-				</view>
-				<input v-model="inputForm.des7" placeholder="请填写男生人数" :disabled="ischeck"
-					type="number"></input>
-			</view>
 			
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					女生人数
+			<view class="textbg">
+				<view class="text1">
+					 属地
 				</view>
-				<input v-model="inputForm.des8" placeholder="请填写女生人数" :disabled="ischeck"
-					type="number"></input>
+				<view class="text2">
+					 {{inputForm.des1}}
+				</view>				
 			</view>
 			
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					党员人数
-				</view>
-				<input v-model="inputForm.des9" placeholder="请填写党员人数" :disabled="ischeck"
-					type="number"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					本科以下人数
+			<view class="textbg">
+				<view class="text1">
+					 所属行业
 				</view>
-				<input v-model="inputForm.belowUndergraduate" placeholder="请填写本科以下人数" :disabled="ischeck"
-					type="number"></input>
+				<view class="text2">
+					 {{inputForm.industry}}
+				</view>				
 			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					本科人数
-				</view>
-				<input v-model="inputForm.undergraduate" placeholder="请填写本科人数" :disabled="ischeck"
-					type="number"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					研究生人数
-				</view>
-				<input v-model="inputForm.postgraduate" placeholder="请填写研究生人数" :disabled="ischeck"
-					type="number"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					博士生人数
-				</view>
-				<input v-model="inputForm.doctoralStudent" placeholder="请填写博士生人数" :disabled="ischeck"
-					type="number"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					实用新型专利授权数
-				</view>
-				<input v-model="inputForm.num2" placeholder="请填写实用新型专利授权数" :disabled="ischeck" type="number"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					发明专利授权数
-				</view>
-				<input v-model="inputForm.num3" placeholder="请填写发明专利授权数" :disabled="ischeck" type="number"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					软著数
-				</view>
-				<input v-model="inputForm.softWritingNumbers" placeholder="请填写软著数" :disabled="ischeck"
-					type="number"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					今年准备申报项目明细
-				</view>
-				<input v-model="inputForm.bz1" placeholder="请填写今年准备申报项目明细" :disabled="ischeck"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					今年项目认定明细
-				</view>
-				<input v-model="inputForm.bz2" placeholder="请填写今年项目认定明细" :disabled="ischeck"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					是否是国家高企
-				</view>
-				<jp-picker v-model="inputForm.bz3" rangeKey="label" rangeValue="value"
-					:range="$dictUtils.getDictList('yes_no')" :disabled="ischeck">
-					<view class="picker">
-						{{$dictUtils.getDictLabel('yes_no', inputForm.bz3 ,'请选择')}}
-					</view>
-				</jp-picker>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					意向哪年申报国家高企
-				</view>
-				<input v-model="inputForm.bz4" placeholder="请填写意向哪年申报国家高企" :disabled="ischeck"></input>
-			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					是否是规上企业
+			
+			<view class="textbg">
+				<view class="text1">
+					 去年销售
 				</view>
-				<jp-picker v-model="inputForm.bz5" rangeKey="label" rangeValue="value"
-					:range="$dictUtils.getDictList('yes_no')" :disabled="ischeck">
-					<view class="picker">
-						{{$dictUtils.getDictLabel('yes_no', inputForm.bz5 ,'请选择')}}
-					</view>
-				</jp-picker>
+				<view class="text2">
+					 {{inputForm.des3}}
+				</view>				
 			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					什么时候能达到规上企业标准
+			
+			<view class="textbg">
+				<view class="text1">
+					 主导产品
 				</view>
-				<input v-model="inputForm.bz6" placeholder="请填写什么时候能达到规上企业标准" :disabled="ischeck"></input>
+				<view class="text2">
+					 {{text1}}
+				</view>				
 			</view>
-
-			<view class="cu-form-group margin-top">
-				<view class="title">
-					企业简介
+			
+			<view class="textbg" style="padding-bottom: 50rpx;">
+				<view class="text1">
+					 
 				</view>
-				<textarea v-model="inputForm.qyDes" placeholder="请填写企业简介" :disabled="ischeck"></textarea>
+				<view class="text2">
+					 {{text2}}
+				</view>				
 			</view>
+					
 			
 			<view style="height: 40rpx;"></view>
 
 
-
-			<view class="padding-xl" v-if="!ischeck">
-				<button form-type="submit" class="cu-btn block bg-blue margin-tb-sm lg">提交</button>
+			<view class="padding-xl" v-if="isadmin">
+				<button @click="sharezz" class="cu-btn block bg-blue margin-tb-sm lg">分享此企业账号</button>
 			</view>
 		</form>
 	</view>
@@ -298,7 +137,7 @@
 	import loginService from '@/api/auth/loginService.js'
 	export default {
 		onShow() {
-			this.$auth.checkLogin()
+			//this.$auth.checkLogin()
 		},
 		data() {
 			return {
@@ -342,8 +181,13 @@
 					des8: '',
 					des9: '',
 				},
+				text1:'',
+				text2:'',
 				parkList: [],
 				ischeck: false,
+				isLogin:"",
+				username:"",
+				isadmin:false,
 				lyIndex: '',
 				showLYList: [],
 			}
@@ -354,7 +198,15 @@
 			
 		},
 		onLoad(query) {
-			console.log(query, '==============>query')
+			this.isLogin=this.$auth.checkisLogin();
+			this.username=this.$auth.getUserInfo();
+			if(this.username!=undefined&&this.username!=''&&this.username!=null){
+				if(this.username.loginName=='admin'){
+					this.isadmin=true;
+				}
+			}
+			
+			console.log("是否登录："+this.username.loginName);
 			if (query && query.ischeck) {
 				this.ischeck = true
 				this.title = "查看企业信息";
@@ -362,7 +214,7 @@
 			if (query && query.id && !query.ischeck) {
 				this.title = "修改企业信息";
 			}
-			this.getParkList(query)
+			this.getComById(query)
 			
 		},
 		methods: {
@@ -397,6 +249,99 @@
 				})
 			},
 			
+			getComById(query) {
+				loginService.queryByIdCom(query.id).then(({
+					data
+				}) => {
+					//未登录
+					if(this.isLogin==null){
+						console.log('未登录')
+						//不做处理后台已做处理
+						this.setData(data);
+												
+					}else{
+						this.setData(data);
+					}
+					
+				}).catch((e) => {
+				
+				})
+			},
+			
+			
+			//账号分享
+			sharezz(){
+				
+				if (navigator.share) {
+				  navigator.share({
+					title: '分享标题',
+					text: '分享的文本内容',
+					url: 'https://example.com'
+				  }).then(() => {
+					console.log('分享成功');
+				  })
+				  .catch(console.error);
+				} else {
+				  console.log('当前浏览器不支持分享功能');
+				}
+				
+			},
+			
+			setData(data){
+				this.inputForm = this.recover(this.inputForm, data)
+				
+				if(this.inputForm.bz2!=''){
+					this.text1=this.inputForm.bz1+"  ("+this.inputForm.bz2+")"
+				}
+				if(this.inputForm.bz4!=''){
+					this.text2=this.inputForm.bz3+"  ("+this.inputForm.bz4+")"
+				}
+			},
+			
+			
+			call1(){
+				//未登录
+				if(this.isLogin==null){
+					uni.showModal({
+						title: '您还未登录，是否跳转登录页面？',
+						showCancel: true,
+						success: (res) => {
+							if (res.confirm) {
+								
+								uni.reLaunch({
+									url: '/pages/login/login'
+								})
+								
+							}
+						}
+					});
+				}else{
+					window.location.href = 'tel:'+this.inputForm.phone;
+				}
+								
+			},
+			
+			call2(){
+				//未登录
+				if(this.isLogin==null){
+					uni.showModal({
+						title: '您还未登录，是否跳转登录页面？',
+						showCancel: true,
+						success: (res) => {
+							if (res.confirm) {
+								
+								uni.reLaunch({
+									url: '/pages/login/login'
+								})
+								
+							}
+						}
+					});
+				}else{
+					window.location.href = 'tel:'+this.inputForm.bz6;
+				}
+			},
+			
 			changeLYId(e){
 				let index = e.detail.value
 				this.lyIndex = index
@@ -506,4 +451,72 @@
 	input,textarea{
 		color: #8799a3;
 	}
+	
+	.swiper {
+		width: 750rpx;
+		height: 360rpx;
+	}
+	
+	.swiper-item {
+		width: 750rpx;
+		height: 360rpx;
+		background-color: aliceblue;
+	}
+	.show1{
+		background-color: #2752eb;
+		padding-left: 8rpx;
+	}
+	.textbg{
+		display: flex;
+		background-color: white;
+		padding-top: 29rpx;
+	}
+	.text1{
+		width: 200rpx;
+		margin-left: 30rpx;
+		color: #393939;
+		font-size: 30rpx;
+	}
+	
+	.text2{
+		flex: 1;
+		color: #393939;
+		font-size: 30rpx;
+		padding-bottom: 2rpx;
+	}
+	.text3{
+		display: flex;
+	}
+	.phone{
+		display: flex;
+		color: #00aaff;
+		padding-left: 5rpx;
+		padding-right: 5rpx;
+		font-size: 30rpx;
+		align-items: center
+	}
+	.phoneimg{
+		margin-left: 10rpx;
+		width: 35rpx;
+		height: 35rpx;
+	}
+	.titlebg2{
+		display: flex;
+		background-color: white;
+		padding-left: 22rpx;
+		padding-top: 35rpx;
+		padding-bottom: 25rpx;
+		margin-bottom: 2rpx;
+	}
+	.titlet1{
+		width: 7rpx;
+		margin-top: 7rpx;
+		margin-bottom: 7rpx;
+		background-color: #2752eb;
+		margin-right: 8rpx;
+	}
+	.titlet2{
+		font-weight: 800;
+		color: #2752eb;
+	}
 </style>

jp-mobile/pages/comList/comList.vue

@@ -7,24 +7,36 @@
 			<view class="search-box">
 				
 				<view class="choose-box">
-					<jp-picker v-model="parkId" rangeKey="label" rangeValue="value"
-						:range="parkList2" empty="选择园区" :disabled="stype == 3">
+										
+					<input type="text"  placeholder="输入或选择属地" v-model="searchForm.des1" confirm-type="search" style="padding-left: 28rpx;"
+					></input>
+					
+					<jp-picker class="choose-boxp" v-model="searchForm.des1" rangeKey="label" rangeValue="value"
+						:range="parkList2"  >
 					</jp-picker>
 				</view>
 				<view class="choose-box">
-					<jp-picker v-model="parkId" rangeKey="label" rangeValue="value"
-						:range="parkList" :disabled="stype == 3" empty="选择楼宇">
+					
+					<input type="text"  placeholder="输入或选择行业" v-model="searchForm.industry" confirm-type="search" style="padding-left: 28rpx;"
+					></input>
+					
+					<jp-picker class="choose-boxp" v-model="searchForm.industry" rangeKey="label" rangeValue="value"
+						:range="parkList"  >
 					</jp-picker>
+					
 				</view>
-				
+								
+			</view>
+			<view class="search-box">
 				<view class="input-box">
-					<input type="text" placeholder="请输入企业名称" v-model="curWord" confirm-type="search"
+					<input type="text"  placeholder="输入关键词产品或企业名称" v-model="searchForm.name" confirm-type="search"
 					></input>
 				</view>
 				
 				<text class="cuIcon-search color-white" @click="doSearch"></text>
 			</view>
 			
+			
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" :up="upOption" @up="upCallback">
 				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
 					v-for="(item, index) in dataList" :key="index" @touchstart="ListTouchStart"
@@ -40,16 +52,16 @@
 
 						</view>
 						<view class="item-line">
-							<view class="item-name">{{item.bz1}}、{{item.bz3}}</view>
-							
+							<view v-if="item.bz3!=''" class="item-name">{{item.bz1}}、{{item.bz3}}</view>		
+							<view v-if="item.bz3==''" class="item-name">{{item.bz1}}</view>	
 						</view>
 						<view class="item-line">
 							<view class="item-name2">{{item.industry}}</view>
+							<view class="item-name3">{{item.des1}}</view>
 						</view>
 
 					</view>
-									
-					
+										
 					
 				</view>
 			</mescroll-body>
@@ -71,14 +83,23 @@
 	export default {
 		mixins: [MescrollMixin, MescrollMoreItemMixin], // 使用mixin (在main.js注册全局组件)
 		onShow(option) {
-			this.$auth.checkLogin()
+			//this.$auth.checkLogin()
+			
+			
+			this.isLogin=this.$auth.checkisLogin();
+			console.log("是否登录："+this.isLogin);
 		},
 		components: {
 			uniFab
 		},
 		data() {
 			return {
-				searchForm: {},
+				isLogin:"",
+				searchForm: {
+					des1:"",
+					industry:"",
+					name:"",
+				},
 				parkList2: [],
 				curWord: "", //当前搜索关键词
 				dataList: [], // 数据列表
@@ -101,43 +122,40 @@
 				this.getParkList()
 				this.getParkList2()
 			}
+			
+			this.$dictUtils.getDictList('industrial_type')
 		},
 		methods: {
 			
+			//选择属地
 			getParkList2() {
-				loginService.parkList({
-					current: 1,
-					size: 1000000,
+				loginService.getAreaList({
 				}).then(({
 					data
 				}) => {
-					this.parkList2 = data.records.map((item) => {
+					this.parkList2 = data.map((item) => {
 						return {
-							label: item.parkName,
-							value: item.id
+							label: item.des1,
+							value: item.des1
 						}
 					})
-					console.log(this.parkList2, '=============>')
 				}).catch(e => {
 					console.log(e)
 				})
 			},
 			
-			
+			//选择行业
 			getParkList() {
-				loginService.list({
-					current: 1,
-					size: 1000000,
+				loginService.getHyList({
 				}).then(({
 					data
 				}) => {
-					this.parkList = data.records.map((item) => {
+					this.parkList = data.map((item) => {
 						return {
-							label: item.buildingName,
-							value: item.id
+							label: item.industry,
+							value: item.industry
 						}
 					})
-					console.log(this.parkList, '=============>')
 				}).catch(e => {
 					console.log(e)
 				})
@@ -184,6 +202,7 @@
 			},
 			/*获取数据列表 */
 			upCallback(page) {
+				console.log("upCallback")
 				this.loading = true
 				loginService.comlist({
 					current: page.num,
@@ -208,6 +227,20 @@
 				})
 			},
 			
+			remoteMethod  (query) {
+			  if (query) {
+			    this.loading = true
+			    setTimeout(() => {
+			      this.loading = false
+			      this.parkList = this.parkList.filter((item) => {
+			        return item.label.toLowerCase().includes(query.toLowerCase())
+			      })
+			    }, 200)
+			  } else {
+			    this.parkList = []
+			  }
+			},
+			
 			// 输入监听
 			inputWord(e) {
 				
@@ -289,18 +322,35 @@
 		margin-top: 20rpx;
 	}
 	
+	.item-line2{
+		
+		height: 48rpx;
+		margin-top: 20rpx;
+	}
+	
 	.subtitle{
 		color: #E5880E;
 	}
 	
 	.item-name{
+		margin-top: 5rpx;
 		font-size: 30rpx;
 		color: #333;
 	}
 	
 	.item-name2{
-		font-size: 30rpx;
-		color: #55aaff;
+		font-size: 29rpx;
+		color: #8387AA;
+	}
+	
+	.item-name3{
+		display: flex;
+		width: 100%;
+		padding-right: 30rpx;
+		flex: 1;
+		justify-content: flex-end;
+		font-size: 29rpx;
+		color: #8387AA;
 	}
 	
 	.item-content{
@@ -358,18 +408,25 @@
 	
 	.input-box{
 		background: #fff;
-		height: 60rpx;
-		width: 420rpx;
+		height: 65rpx;
+		width: 640rpx;
 		display: flex;
 		align-items: center;
 		border-radius: 30rpx;
-		padding-left: 10rpx;
+		padding-left: 30rpx;
 		margin-right: 20rpx;
 	}
 	
+	.input-boxinput{
+		height: 75rpx;
+		font-size: 15rpx;
+	}
+	
+	
+	
 	.choose-box{
 		background: #fff;
-		width: 200rpx;
+		width: 350rpx;
 		border-radius: 30rpx;
 		height: 60rpx;
 		display: flex;
@@ -378,5 +435,10 @@
 		margin-right: 20rpx;
 	}
 	
+	.choose-boxp{
+		font-size: 32rpx;
+		width: 80rpx;
+	}
+	
 	
 </style>

jp-mobile/pages/index/index.vue

@@ -6,8 +6,11 @@
 
 		<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" :interval="3000" :duration="800">
 			<swiper-item>
-				<image src="../../static/img/banner.png" class="swiper-item"></image>
+				<image src="../../static/img/titlebg.jpg" class="swiper-item"></image>
 			</swiper-item>
+			<swiper-item>
+				<image src="../../static/img/titlebg.jpg" class="swiper-item"></image>
+			</swiper-item>			
 		</swiper>
 
 
@@ -15,16 +18,16 @@
 			<view class="center-box">
 				<view class="center-left-box">
 					<view class="btn-box-1 mart-t">
-						{{t1}}
+						{{pageInfo.enterprisec}}
 					</view>
 					<view class="btn-box-2 mart-t">
-						{{t2}}
+						{{pageInfo.todayc}}
 					</view>
 					<view class="btn-box-3 mart-t">
-						{{t3}}
+						{{pageInfo.samemonthc}}
 					</view>
 					<view class="btn-box-4 mart-t">
-						{{t4}}
+						{{pageInfo.industryc}}
 					</view>
 													
 				</view>
@@ -81,10 +84,8 @@
 		name: "apps",
 		data() {
 			return {
-				t1:"424",
-				t2:"45",
-				t3:"332",
-				t4:"112",
+				pageInfo: {},
+				
 				stype: "", // 企业 => 3  楼宇 => 2  园区 => 1  zfadmin => 4  admin=> 5
 			};
 		},
@@ -93,8 +94,9 @@
 		},
 		
 		created() {
-			this.$auth.checkLogin()
-			this.getRole()
+			//this.$auth.checkLogin()
+			//this.getRole()
+			this.getPageInfo();
 		},
 
 
@@ -104,6 +106,14 @@
 					url: '/pages/comList/comList'
 				})
 			},
+			
+			getPageInfo() {
+			  loginService.InfoStatistics({}).then(({ data }) => {
+			    this.pageInfo = data;
+			  });
+			
+			
+			},
 
 			getRole() {
 				let userInfo = uni.getStorageSync('WMS-userinfo')
@@ -261,6 +271,7 @@
 	.center-img{
 		width: 90rpx;
 		height: 90rpx;
+		margin-bottom: 10rpx;
 		text-align: center;
 	}
 	

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

@@ -230,6 +230,11 @@
           lxr: '',
           phone: '',
           des1: '',
+          des3: '',
+          bz1: '',
+          bz3: '',
+          bz5: '',
+          bz6: '',
           des7: ''
         },
         responseData: '',
@@ -265,17 +270,17 @@
         }).then(({data}) => {
           this.dataList = data.records
 
-          this.dataList.forEach(item => {
-            if (item.industry) {
-              let industryList = item.industry.split(",")
-              let industryValue = ""
-              for (var i = 0; i < industryList.length; i++) {
-                industryValue += this.$dictUtils.getDictLabel("hs_people_type", industryList[i],
-                  '-') + ","
-              }
-              item.industryValue = industryValue.substring(0, industryValue.length - 1)
-            }
-          })
+          // this.dataList.forEach(item => {
+          //   if (item.industry) {
+          //     let industryList = item.industry.split(",")
+          //     let industryValue = ""
+          //     for (var i = 0; i < industryList.length; i++) {
+          //       industryValue += this.$dictUtils.getDictLabel("hs_people_type", industryList[i],
+          //         '-') + ","
+          //     }
+          //     item.industryValue = industryValue.substring(0, industryValue.length - 1)
+          //   }
+          // })
 
           this.tablePage.total = data.total
           this.loading = false