优化

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

@@ -10,13 +10,16 @@ import com.jeeplus.common.utils.RequestUtils;
 import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.config.properties.JeePlusProperties;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.enterpriseelectricity.service.EnterpriseElectricityService;
 import com.jeeplus.enterpriseelectricity.service.dto.EnterpriseElectricityDTO;
 import com.jeeplus.enterpriseinfo.service.EnterpriseInfoService;
 import com.jeeplus.enterpriseinfo.service.dto.EnterpriseInfoDTO;
 import com.jeeplus.enterpriseinfo.service.mapstruct.EnterpriseInfoWrapper;
 import com.jeeplus.enterpriseother.service.EnterpriseOtherService;
 import com.jeeplus.enterpriseproperty.service.EnterprisePropertyService;
+import com.jeeplus.lyservice.service.LyServiceService;
 import com.jeeplus.parkmanagement.service.ParkManagementService;
+import com.jeeplus.question.service.DzfQuestionService;
 import com.jeeplus.qyuser.service.QyUserService;
 import com.jeeplus.saleinventory.service.SaleInventoryService;
 import com.jeeplus.sys.constant.CacheNames;
@@ -62,6 +65,9 @@ public class DpController {
     @Autowired
     private EnterpriseInfoWrapper enterpriseInfoWrapper;
 
+    @Autowired
+    private EnterpriseElectricityService enterpriseElectricityService;
+
     @Autowired
     private QyUserService qyUserService;
 
@@ -72,6 +78,9 @@ public class DpController {
 
     @Autowired
     private UserService userService;
+
+    @Autowired
+    private DzfQuestionService dzfQuestionService;
     /**
      * 首页统计
      */
@@ -80,9 +89,44 @@ public class DpController {
     @GetMapping("InfoStatistics")
     public ResponseEntity<HashMap<String, Object>> InfoStatistics() throws Exception {
         HashMap<String, Object> map=enterpriseInfoService.getInfoStatistics();
+        saleInventoryService.save_active (2);
+        return ResponseEntity.ok (map);
+    }
+
+    /**
+     * 大走访页面统计
+     */
+    @ApiLog("大走访页面统计")
+    @ApiOperation(value = "大走访页面统计")
+    @GetMapping("getDzfCount")
+    public ResponseEntity<HashMap<String, Object>> getDzfCount() throws Exception {
+        HashMap<String, Object> map=enterpriseInfoService.getDzfCount();
+        return ResponseEntity.ok (map);
+    }
+
+    /**
+     * 大走访页面统计
+     */
+    @ApiLog("大走访页面统计-办结问题数，问题总数")
+    @ApiOperation(value = "大走访页面统计-办结问题数，问题总数")
+    @GetMapping("getProgressMonth3")
+    public ResponseEntity<HashMap<String, Object>> getProgressMonth3() throws Exception {
+        HashMap<String, Object> map=dzfQuestionService.getProgressMonth3();
+        return ResponseEntity.ok (map);
+    }
+
+    /**
+     * 大走访页面统计
+     */
+    @ApiLog("大走访页面统计-政策总数")
+    @ApiOperation(value = "大走访页面统计-政策总数")
+    @GetMapping("getZcs")
+    public ResponseEntity<Integer> getZcs() throws Exception {
+        Integer map=enterpriseElectricityService.getZcs();
         return ResponseEntity.ok (map);
     }
 
+
     /**
      * 活跃用户统计
      */

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/dzfoprecord/controller/DzfQuestionOpRecordController.java

@@ -19,6 +19,7 @@ import com.jeeplus.question.service.DzfQuestionService;
 import com.jeeplus.question.service.dto.DzfQuestionDTO;
 import com.jeeplus.question.service.dto.DzfQuestionDetilDTO;
 import com.jeeplus.question.service.mapstruct.DzfQuestionDetilWrapper;
+import com.jeeplus.saleinventory.service.SaleInventoryService;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.UserUtils;
 import io.swagger.annotations.Api;
@@ -64,6 +65,9 @@ public class DzfQuestionOpRecordController {
 	@Autowired
 	private DzfQuestionDetilService dzfQuestionDetilService;
 
+	@Autowired
+	private SaleInventoryService saleInventoryService;
+
 	/**
 	 * 处理操作流程列表数据
 	 */
@@ -372,6 +376,7 @@ public class DzfQuestionOpRecordController {
 	@GetMapping("getDelCount")
 	public ResponseEntity<Map<String, String>> getDelCount() {
 		UserDTO userDTO = UserUtils.getCurrentUserDTO();
+		saleInventoryService.save_active (1);
 		return ResponseEntity.ok ( dzfQuestionOpRecordService.getDelCount ( userDTO.getLoginName(),userDTO.getId()) );
 	}
 

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/controller/EnterpriseElectricityController.java

@@ -13,8 +13,10 @@ import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.enterpriseinfo.domain.EnterpriseInfo;
 import com.jeeplus.enterpriseinfo.service.EnterpriseInfoService;
+import com.jeeplus.saleinventory.service.SaleInventoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +51,9 @@ public class EnterpriseElectricityController {
 	private EnterpriseElectricityWrapper enterpriseElectricityWrapper;
 	@Autowired
 	private EnterpriseInfoService enterpriseInfoService;
+
+	@Autowired
+	private SaleInventoryService saleInventoryService;
 	/**
 	 * 查询涉企政策列表数据
 	 */
@@ -58,6 +63,11 @@ public class EnterpriseElectricityController {
 	public ResponseEntity<IPage<EnterpriseElectricityDTO>> list(EnterpriseElectricityDTO enterpriseElectricityDTO, Page<EnterpriseElectricityDTO> page) throws Exception {
 		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (enterpriseElectricityDTO, EnterpriseElectricityDTO.class);
 		IPage<EnterpriseElectricityDTO> result = enterpriseElectricityService.findPage (page, queryWrapper);
+		//添加访问第一页时，添加活跃数
+		if(page.getCurrent()==1){
+			saleInventoryService.save_active (3);
+		}
+
 		return ResponseEntity.ok (result);
 	}
 
@@ -69,7 +79,21 @@ public class EnterpriseElectricityController {
 	@ApiOperation(value = "根据Id获取涉企政策数据")
 	@GetMapping("queryById")
 	public ResponseEntity<EnterpriseElectricityDTO> queryById(String id) {
-		return ResponseEntity.ok ( enterpriseElectricityWrapper.toDTO ( enterpriseElectricityService.getById ( id ) ) );
+		EnterpriseElectricityDTO aa=enterpriseElectricityWrapper.toDTO ( enterpriseElectricityService.getById ( id ) );
+
+		EnterpriseElectricityDTO bb = new EnterpriseElectricityDTO();
+		BeanUtils.copyProperties(aa, bb);
+
+		//累加阅读数
+		String cot=aa.getDes9();
+		if(cot==null){
+			aa.setDes9("1");
+		}else{
+			int cotnow=Integer.parseInt(cot)+1;
+			aa.setDes9(cotnow+"");
+		}
+		enterpriseElectricityService.saveOrUpdate (enterpriseElectricityWrapper.toEntity (aa));
+		return ResponseEntity.ok ( bb );
 	}
 
 	/**

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/mapper/EnterpriseElectricityMapper.java

@@ -13,6 +13,8 @@ import com.jeeplus.enterpriseelectricity.service.dto.EnterpriseElectricityDTO;
 import com.jeeplus.enterpriseother.service.dto.EnterpriseOtherDTO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
+
 /**
  * 涉企政策MAPPER接口
  * @author 尹宇
@@ -21,4 +23,7 @@ import org.apache.ibatis.annotations.Param;
 public interface EnterpriseElectricityMapper extends BaseMapper<EnterpriseElectricity> {
 
     IPage<EnterpriseElectricityDTO> findList(Page<EnterpriseElectricityDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+
+    int getZcs();
+
 }

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/mapper/xml/EnterpriseElectricityMapper.xml

@@ -18,7 +18,7 @@
 		a.des6 AS "des6",
 		a.des7 AS "des7",
 		a.des8 AS "des8",
-
+a.des9 AS "des9",
 
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
@@ -39,7 +39,7 @@
 		a.des2 AS "des2",
 		a.des3 AS "des3",
 		a.des8 AS "des8",
-
+		a.des9 AS "des9",
 
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
@@ -64,4 +64,9 @@
         ${ew.customSqlSegment}
     </select>
 
+	<select id="getZcs" resultType="integer">
+		SELECT COUNT(id) FROM `ly_enterprise_electricity` where del_flag=0
+	</select>
+
+
 </mapper>

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/service/EnterpriseElectricityService.java

@@ -14,6 +14,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jeeplus.enterpriseelectricity.domain.EnterpriseElectricity;
 import com.jeeplus.enterpriseelectricity.mapper.EnterpriseElectricityMapper;
 
+import java.util.HashMap;
+
 /**
  * 涉企政策Service
  * @author 尹宇
@@ -27,4 +29,9 @@ public class EnterpriseElectricityService extends ServiceImpl<EnterpriseElectric
         queryWrapper.eq ("a.del_flag", 0 ); // 排除已经删除
         return  baseMapper.findList (page, queryWrapper);
     }
+
+    public int getZcs() {
+        return baseMapper.getZcs();
+    }
+
 }

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

@@ -50,6 +50,9 @@ public interface EnterpriseInfoMapper extends BaseMapper<EnterpriseInfo> {
     int getInfoStatistics5();
     List<HashMap<String, Object>> getInfoStatistics6();
 
+    HashMap<String, Object> getDzfCount1();
+    HashMap<String, Object> getDzfCount2();
+
     int getInfoStatistics_Login1(String date);
     HashMap<String, Object> getInfoStatistics_Login2(String date);
     int getInfoStatistics_Login3(String date);

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

@@ -304,6 +304,19 @@
         left join (SELECT des14,phone from ly_enterprise_info GROUP BY phone) e on e.phone=d.login_name
     </select>
 
+    <select id="getDzfCount1" resultType="map">
+        SELECT des8,des1,des2,des3 from ly_sale_inventory where DATE(des8) = CURDATE()
+    </select>
+
+    <select id="getDzfCount2" resultType="map">
+        SELECT SUM(CAST(`des1` AS UNSIGNED)) AS total_count,
+               SUM(CAST(`des2` AS UNSIGNED)) AS total_count2,
+               SUM(CAST(`des3` AS UNSIGNED)) AS total_count3
+        FROM ly_sale_inventory
+        WHERE DATE_FORMAT(des8, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m');
+    </select>
+
+
 
     <select id="getAreaList" resultType="map">
         SELECT des1 FROM `ly_enterprise_info` where del_flag=0 group By des1

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

@@ -190,6 +190,26 @@ public class EnterpriseInfoService extends ServiceImpl<EnterpriseInfoMapper, Ent
         return aa;
     }
 
+    public HashMap<String, Object> getDzfCount() {
+
+        HashMap<String, Object> aa=baseMapper.getDzfCount1 ();
+        if(aa==null){
+            aa=new HashMap<>();
+            aa.put("des1","0");
+            aa.put("des2","0");
+            aa.put("des3","0");
+
+        }
+        HashMap<String, Object> a2=baseMapper.getDzfCount2 ();
+        if(a2!=null){
+            aa.putAll(a2);
+        }
+
+        return aa;
+    }
+
+
+
     public List<HashMap<String, Object>> getInfoStatistics6() {
         return baseMapper.getInfoStatistics6 ();
     }

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/mapper/DzfQuestionMapper.java

@@ -41,6 +41,8 @@ public interface DzfQuestionMapper extends BaseMapper<DzfQuestion> {
 
     HashMap<Object, Object> getProgressMonth(@Param("start")String start,@Param("end")String end);
 
+    HashMap<String, Object> getProgressMonth3();
+
     HashMap<Object, Object> getProgressYear(@Param("start")String start,@Param("end")String end);
 
     IPage<DzfQuestionDTO> findList3(Page<DzfQuestionDTO> page, String state,String start,String end);

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/mapper/xml/DzfQuestionMapper.xml

@@ -116,6 +116,11 @@
 		WHERE del_flag = 0 AND states IS NOT NULL;
 	</select>
 
+	<select id="getProgressMonth3" resultType="Map"  parameterType="String">
+		SELECT COUNT(*) allque, COUNT(CASE WHEN states = 0 THEN 1 END) AS finishs
+		FROM dzf_question_detil WHERE del_flag = 0 AND states IS NOT NULL
+	</select>
+
 	<select id="getProgressYear2" resultType="Map" parameterType="String">
 		SELECT COUNT(*) allque, COUNT(IF(states = 0,1,NULL )) AS finish
 		FROM

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/service/DzfQuestionService.java

@@ -101,6 +101,11 @@ public class DzfQuestionService extends ServiceImpl<DzfQuestionMapper, DzfQuesti
 		dzfQuestionDetilService.lambdaUpdate ().eq ( DzfQuestionDetil::getQidId, id ).remove ();
 	}
 
+	public HashMap<String, Object> getProgressMonth3() {
+		return baseMapper.getProgressMonth3();
+	}
+
+
     public HashMap<Object, String> getProgressStatistics(String start,String end) {
 		HashMap<Object, String> allNum = new HashMap<>();
 		// 月份

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/saleinventory/controller/SaleInventoryController.java

@@ -96,7 +96,7 @@ public class SaleInventoryController {
 	}
 
 	/**
-	 * 保存企业销售及入库
+	 * 保存企业销售及入库---调整为活跃数记录
 	 */
 	@ApiLog("保存企业销售及入库")
 	@ApiOperation(value = "保存企业销售及入库")
@@ -104,9 +104,9 @@ public class SaleInventoryController {
 	@PostMapping("save")
 	public  ResponseEntity <String> save(@Valid @RequestBody SaleInventoryDTO saleInventoryDTO) {
 		//新增或编辑表单保存
-		if(saleInventoryDTO.getDes3()==null||!saleInventoryDTO.getDes3().equals("1")){
-			saleInventoryDTO.setDes3("0");
-		}
+//		if(saleInventoryDTO.getDes3()==null||!saleInventoryDTO.getDes3().equals("1")){
+//			saleInventoryDTO.setDes3("0");
+//		}
 		saleInventoryService.saveOrUpdate (saleInventoryWrapper.toEntity (saleInventoryDTO));
         return ResponseEntity.ok ( "保存企业销售及入库成功" );
 	}

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/saleinventory/mapper/xml/SaleInventoryMapper.xml

@@ -5,7 +5,7 @@
 	<sql id="saleInventoryColumns">
 		a.id AS "id",
 		a.qi_id AS "qiId",
-		b.name AS "qyName",
+		a.qi_id AS "qyName",
 		a.lb AS "lb",
 		a.num AS "num",
 		a.amount AS "amount",
@@ -19,8 +19,8 @@
 		a.des6 AS "des6",
 		a.des7 AS "des7",
 		a.des8 AS "des8",
-		c.building_name AS "des9",
-		d.park_name AS "des10",
+		a.des9 AS "des9",
+		a.des10 AS "des10",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
@@ -30,10 +30,6 @@
 
 	<sql id="saleInventoryJoins">
 
-		LEFT JOIN sys_user qiId ON qiId.id = a.qi_id
-		LEFT JOIN ly_enterprise_info b ON b.id = a.qi_id
-		left join yl_building_management c on b.des1=c.id
-		left join ly_park_management d on c.park_management=d.id
 	</sql>
 
 

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/saleinventory/service/SaleInventoryService.java

@@ -9,6 +9,7 @@ import com.jeeplus.enterpriseinfo.service.dto.EnterpriseInfoDTO;
 import com.jeeplus.saleinventory.service.mapstruct.SaleInventoryWrapper;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.UserUtils;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,6 +22,7 @@ import com.jeeplus.saleinventory.domain.SaleInventory;
 import com.jeeplus.saleinventory.mapper.SaleInventoryMapper;
 
 import java.text.DecimalFormat;
+import java.time.LocalDate;
 import java.time.Month;
 import java.time.Year;
 import java.time.YearMonth;
@@ -62,6 +64,8 @@ public class SaleInventoryService extends ServiceImpl<SaleInventoryMapper, SaleI
 		return  baseMapper.findList (page, queryWrapper);
 	}
 
+
+
 	public HashMap<String, Object> getSaleStatistics(String qyid) {
 		int currentYear = Year.now().getValue();
 		int lastYear = currentYear - 1;
@@ -344,6 +348,57 @@ public class SaleInventoryService extends ServiceImpl<SaleInventoryMapper, SaleI
 		return "ok";
 	}
 
+	public String save_active(int type){
+		LocalDate today = LocalDate.now();
+		String formattedDate = today.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+		Page <SaleInventoryDTO> page=new Page<>(1,1);
+		QueryWrapper queryWrapper=new QueryWrapper<>();
+		queryWrapper.eq ("a.del_flag", 0 ); // 排除已经删除
+		queryWrapper.eq ("a.des8", formattedDate );
+		IPage <SaleInventoryDTO> list=baseMapper.findList (page, queryWrapper);
+
+		SaleInventoryDTO saleInventoryDTO;
+		if(list.getTotal()==0){
+			saleInventoryDTO=new SaleInventoryDTO();
+			saleInventoryDTO.setDes8(formattedDate);
+		}else{
+			saleInventoryDTO=list.getRecords().get(0);
+		}
+
+		//累加活跃数
+		if(type==1){
+			String des1=saleInventoryDTO.getDes1();
+			if(des1==null){
+				saleInventoryDTO.setDes1("1");
+			}else{
+				int des1i=Integer.parseInt(des1);
+				des1i++;
+				saleInventoryDTO.setDes1(des1i+"");
+			}
+		}else if(type==2){
+			String des2=saleInventoryDTO.getDes2();
+			if(des2==null){
+				saleInventoryDTO.setDes2("1");
+			}else{
+				int des2i=Integer.parseInt(des2);
+				des2i++;
+				saleInventoryDTO.setDes2(des2i+"");
+			}
+		}else{
+			String des3=saleInventoryDTO.getDes3();
+			if(des3==null){
+				saleInventoryDTO.setDes3("1");
+			}else{
+				int des3i=Integer.parseInt(des3);
+				des3i++;
+				saleInventoryDTO.setDes3(des3i+"");
+			}
+		}
+
+		saveOrUpdate (saleInventoryWrapper.toEntity (saleInventoryDTO));
+		return "";
+	}
+
 	private void saveSale(String lb,double oned,EnterpriseInfoDTO enterpriseInfoDTO,String des1,String des2){
 		DecimalFormat df = new DecimalFormat("#.00");
 		String formattedNumber = df.format(oned);

jp-mobile/api/auth/loginService.js

@@ -401,5 +401,29 @@ export default {
 			params: params
 		})
 	},
+	
+	getDzfCount: function(params) {
+		return request({
+			url: '/dp/dp/getDzfCount',
+			method: 'get',
+			params: params
+		})
+	},
+	
+	getProgressMonth3: function(params) {
+		return request({
+			url: '/dp/dp/getProgressMonth3',
+			method: 'get',
+			params: params
+		})
+	},
+	
+	getZcs: function(params) {
+		return request({
+			url: '/dp/dp/getZcs',
+			method: 'get',
+			params: params
+		})
+	},
 
 }

jp-mobile/common/config.js

@@ -3,7 +3,7 @@ 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://192.168.139.35:8071'
+	APP_SERVER_URL = 'http://192.168.139.43:8071'
 }else{
     // 生产环境
     APP_SERVER_URL = '/yd_qycpfb'

jp-mobile/pages/index/Dzfindex.vue

@@ -32,11 +32,43 @@
 			
 		</view> -->
 				
+				
+			
 
 		<view class="line-box" style="margin-top: 80rpx;">
+			<view class="center-box" v-if="roleIds=='1910175386924417025'||roleIds=='1910175949166673921'" >
+				<view class="center-left-box">
+					<view class="btn-box-1 mart-t">
+						{{pageInfo2.des1||0}}
+					</view>
+					<view class="btn-box-2 mart-t" @click="totongxunlu22">
+						{{pageInfo2.total_count}}
+					</view>
+					<view class="btn-box-3 mart-t" @click="totongxunlu23">
+						{{pageInfo3.finishs}}
+					</view>
+					<view class="btn-box-4 mart-t">
+						{{pageInfo3.allque}}
+					</view>
+													
+				</view>
+				<view class="center-left-box" style="margin-top: 0rpx;">
+					<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="center-box">
+			<view class="center-box" style="margin-top: 30rpx;">
 				<view class="kuai-text"></view>
 								
 				<view class="center-left-box">
@@ -122,6 +154,8 @@
 				isLogin:"",
 				roleIds:'',
 				pageInfo: {},
+				pageInfo2: {},
+				pageInfo3: {},
 				loginid:"",
 				p1:"",
 				p2:"",
@@ -178,6 +212,27 @@
 				uni.hideLoading();
 			})
 			
+			if(this.roleIds.indexOf("1910175386924417025") != -1||this.roleIds.indexOf("1910175949166673921") != -1){
+				loginService.getDzfCount().then(({
+					data
+				}) => {
+					
+					this.pageInfo2 = data;
+					
+				}).catch((e) => {
+					uni.hideLoading();
+				})
+				
+				loginService.getProgressMonth3().then(({
+					data
+				}) => {
+					this.pageInfo3 = data;
+				}).catch((e) => {
+					uni.hideLoading();
+				})
+			}
+			
+						
 			
 		},
 		onShow() {

jp-mobile/pages/index/index.vue

@@ -25,10 +25,11 @@
 						{{pageInfo.enterprisec}}
 					</view>
 					<view class="btn-box-2 mart-t" @click="totongxunlu22">
-						{{pageInfo.todayc}}
+						{{pageInfo2.des2||0}}
+						
 					</view>
 					<view class="btn-box-3 mart-t" @click="totongxunlu23">
-						{{pageInfo.samemonthc}}
+						{{pageInfo2.total_count2}}
 					</view>
 					<view class="btn-box-4 mart-t">
 						{{pageInfo.industryc}}
@@ -283,6 +284,7 @@
 				
 				isLogin:"",
 				pageInfo: {},
+				pageInfo2: {},
 				news:[],
 				loginid:"",
 				
@@ -571,6 +573,16 @@
 				
 			  });
 			  
+			  loginService.getDzfCount().then(({
+			  	data
+			  }) => {
+			  	
+			  	this.pageInfo2 = data;
+			  	
+			  }).catch((e) => {
+			  })
+			  
+			  
 			  loginService.enterpriseother({
 			  	current: 1,
 			  	size: 5,			  	

jp-mobile/pages/policy/policyInfo.vue

@@ -54,7 +54,10 @@
 
 			<view class="titlebg2">
 				<view class="titlet1" ></view>
-				<view class="titlet2" >政策内容</view>								
+				<view class="titlet2" style="width: 75%;" >政策内容</view>
+				<view class="item-des2">
+					阅读数：{{inputForm.des9||0}}
+				</view>							
 			</view>
 			
 			
@@ -125,6 +128,7 @@
 					des6: '',
 					des7: '',
 					des8: '',
+					des9: '',
 				},
 				text1:'',
 				text2:'',

jp-mobile/pages/policy/policyList.vue

@@ -39,7 +39,31 @@
 				</view>
 			</view>
 			
-			
+			<view class="center-box">
+				<view class="center-left-box">
+					<view class="btn-box-1 mart-t">
+						{{pageInfo2.des3||0}}
+					</view>
+					<view class="btn-box-2 mart-t">
+						{{pageInfo2.total_count3}}						
+					</view>
+					<view class="btn-box-3 mart-t">
+						{{Zcscount}}
+					</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>
+			</view>
 					
 			<view class="choose-box2" style="margin-top: 20rpx;margin-left: 20rpx;margin-right: 20rpx;">
 				<view style="width: 560rpx;">
@@ -83,10 +107,15 @@
 								
 								{{item.des1}}
 							</view>
-
-							<view class="item-des">									
-								政策发文日期:{{item.stime}}
+							<view style="display: flex;flex-direction: initial;">
+								<view class="item-des1">
+									政策发文日期:{{item.stime}}
+								</view>
+								<view class="item-des2">
+									阅读数：{{item.des9||0}}
+								</view>
 							</view>
+							
 						</view>
 						
 
@@ -124,6 +153,8 @@
 				bgColor: 'bg-blue', // 背景颜色
 				
 				isLogin:"",
+				Zcscount:"",
+				pageInfo2:{},
 				searchForm: {
 					des1:"",
 					des2:"",
@@ -157,7 +188,7 @@
 		created() {
 
 			//this.getParkList()
-			//this.getParkList2()			
+			this.getZcs()			
 		},
 		methods: {
 			
@@ -195,6 +226,23 @@
 			// 	})
 			// },
 			
+			getZcs(){
+				loginService.getDzfCount().then(({
+					data
+				}) => {
+					
+					this.pageInfo2 = data;
+					
+				}).catch((e) => {
+					uni.hideLoading();
+				})
+				
+				loginService.getZcs({}).then(({ data }) => {
+				  this.Zcscount = data;
+								
+				});
+			},
+			
 			
 			// 新增
 			add() {
@@ -518,6 +566,18 @@
 		-webkit-line-clamp: 3; /* 限制最多显示2行 */
 		-webkit-box-orient: vertical; /* 垂直排列 */
 		
+	}
+	.item-des1{
+		margin-top: 10rpx;
+		color: #565656;		
+		font-size: 24rpx;
+		width: 80%;
+	}
+	.item-des2{
+		margin-top: 10rpx;
+		color: #565656;					
+		font-size: 24rpx;
+		
 	}
 	/* 返回 */
 	.item-img {
@@ -617,4 +677,73 @@
 		color: #4285f4;
 		
 	}
+	
+	.mart-t {
+		margin-top: 30rpx;
+	}
+	
+	.center-box{
+		
+		margin: 20rpx;
+		width: 95%;
+		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 {
+		flex:1;
+		height: 30rpx;
+		text-align: center;
+		color: #36A7F3;
+		font-size: x-large;
+		font-weight: 700;
+	}
+	
+	.btn-box-2 {
+		flex:1;
+		height: 30rpx;
+		text-align: center;
+		color:#F3365A;
+		font-size: x-large;
+		font-weight: 700;
+	}
+	
+	.btn-box-3 {
+		flex:1;
+		height: 30rpx;
+		text-align: center;
+		color:#15D578;
+		font-size: x-large;
+		font-weight: 700;
+	}
+	
+	.btn-box-4 {
+		flex:1;
+		height: 30rpx;
+		text-align: center;
+		color:#F1A31B;
+		font-size: x-large;
+		font-weight: 700;
+	}
 </style>

jp-mobile/pages/progress/progressStatistics.vue

@@ -22,7 +22,7 @@
 							<uni-card margin="5px" shadow="0px 0px 3px 1px #36A7F3">
 								<view class="progress_section_1"></view><text>未办结问题数</text>
 								<view><text class="progress_num">{{unfinish}}</text>个</view>
-								<view class="progress_account">占比<text
+								<view class="progress_account">占当年<text
 										style="color: red;margin-left: 5px;">{{unfinishAccount}}%</text></view>
 							</uni-card>
 						</view>
@@ -32,7 +32,7 @@
 							<uni-card margin="5px" shadow="0px 0px 3px 1px #36A7F3">
 								<view class="progress_section_2"></view><text>办结问题数</text>
 								<view><text class="progress_num">{{finish}}</text>个</view>
-								<view class="progress_account">占比<text
+								<view class="progress_account">占当年<text
 										style="color: #36A7F3;margin-left: 5px;">{{finishAccount}}%</text></view>
 							</uni-card>
 						</view>