Merge branch 'master' of http://116.63.33.55/git/nazw

# Conflicts:
#	nngkxxdp/src/main/resources/static/hqzc/indexs.html

nngkxxdp/src/main/java/com/example/nngkxxdp/program/dao/AppletUserDao.java

@@ -33,4 +33,11 @@ public interface AppletUserDao {
      */
     Integer queryUserIsExist(String openId);
 
+    /**
+     * 获取华龙网token
+     * @param userId
+     * @return
+     */
+    String queryUserHlToken(String userId);
+
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/program/dao/HlwCollectionDao.java

@@ -0,0 +1,83 @@
+package com.example.nngkxxdp.program.dao;
+
+import com.example.nngkxxdp.program.entity.HlwCollection;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
+import java.util.List;
+
+/**
+ * (HlwCollection)表数据库访问层
+ *
+ * @author makejava
+ * @since 2022-11-09 14:32:17
+ */
+public interface HlwCollectionDao {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    HlwCollection queryById(Integer id);
+
+    /**
+     * 查询指定行数据
+     *
+     * @param hlwCollection 查询条件
+     * @param pageable         分页对象
+     * @return 对象列表
+     */
+    List<HlwCollection> queryAllByLimit(HlwCollection hlwCollection, @Param("pageable") Pageable pageable);
+
+    /**
+     * 统计总行数
+     *
+     * @param hlwCollection 查询条件
+     * @return 总行数
+     */
+    long count(HlwCollection hlwCollection);
+
+    /**
+     * 新增数据
+     *
+     * @param hlwCollection 实例对象
+     * @return 影响行数
+     */
+    int insert(HlwCollection hlwCollection);
+
+    /**
+     * 批量新增数据（MyBatis原生foreach方法）
+     *
+     * @param entities List<HlwCollection> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<HlwCollection> entities);
+
+    /**
+     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
+     *
+     * @param entities List<HlwCollection> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<HlwCollection> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param hlwCollection 实例对象
+     * @return 影响行数
+     */
+    int update(HlwCollection hlwCollection);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+}
+

nngkxxdp/src/main/java/com/example/nngkxxdp/program/entity/HlwCollection.java

@@ -0,0 +1,87 @@
+package com.example.nngkxxdp.program.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * (HlwCollection)实体类
+ *
+ * @author makejava
+ * @since 2022-11-09 14:32:17
+ */
+@Data
+public class HlwCollection implements Serializable {
+    private static final long serialVersionUID = 422202153114771680L;
+    
+    private Integer id;
+    
+    private Integer favoriteid;
+    
+    private Integer informationid;
+    
+    private Integer sortno;
+    
+    private Integer listviewtype;
+    
+    private String title;
+    
+    private String detailtitle;
+    
+    private String contenturl;
+    
+    private String infosource;
+    
+    private String onlinedate;
+    
+    private String onlinetime;
+    
+    private String replycount;
+    
+    private String viewcount;
+    
+    private Integer type;
+    
+    private Integer contexttype;
+    
+    private String infolabel;
+    
+    private String images;
+    
+    private Integer commenttype;
+    
+    private String url;
+    
+    private String shareurl;
+    
+    private String sharetitle;
+    
+    private String shareimgurl;
+    
+    private Integer detailviewtype;
+    
+    private Integer sourcetype;
+    
+    private String multipleimgcount;
+    
+    private String synopsis;
+    
+    private String livebegintime;
+    
+    private String livestatus;
+    
+    private String livetype;
+    
+    private Integer showviewcount;
+    
+    private String videoformat;
+    
+    private Integer outerlinkopentype;
+    
+    private String appuserid;
+    
+    private String name;
+    
+    private String imgurl;
+}
+

nngkxxdp/src/main/java/com/example/nngkxxdp/program/entity/jsonobj/HlwCollectionDTO.java

@@ -0,0 +1,91 @@
+package com.example.nngkxxdp.program.entity.jsonobj;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class HlwCollectionDTO {
+
+    @JsonProperty("dataList")
+    private List<DataListDTO> dataList;
+
+    @NoArgsConstructor
+    @Data
+    public static class DataListDTO {
+        @JsonProperty("favoriteId")
+        private Integer favoriteId;
+        @JsonProperty("id")
+        private Integer id;
+        @JsonProperty("informationId")
+        private Integer informationId;
+        @JsonProperty("sortNo")
+        private Long sortNo;
+        @JsonProperty("listViewType")
+        private Integer listViewType;
+        @JsonProperty("title")
+        private String title;
+        @JsonProperty("detailTitle")
+        private String detailTitle;
+        @JsonProperty("contentUrl")
+        private String contentUrl;
+        @JsonProperty("infoSource")
+        private String infoSource;
+        @JsonProperty("onlineDate")
+        private String onlineDate;
+        @JsonProperty("onlineTime")
+        private String onlineTime;
+        @JsonProperty("replyCount")
+        private Object replyCount;
+        @JsonProperty("viewCount")
+        private String viewCount;
+        @JsonProperty("type")
+        private Integer type;
+        @JsonProperty("contextType")
+        private Integer contextType;
+        @JsonProperty("infoLabel")
+        private Object infoLabel;
+        @JsonProperty("images")
+        private String images;
+        @JsonProperty("commentType")
+        private Integer commentType;
+        @JsonProperty("url")
+        private String url;
+        @JsonProperty("shareUrl")
+        private String shareUrl;
+        @JsonProperty("shareTitle")
+        private String shareTitle;
+        @JsonProperty("shareImgUrl")
+        private String shareImgUrl;
+        @JsonProperty("detailViewType")
+        private Integer detailViewType;
+        @JsonProperty("sourceType")
+        private Integer sourceType;
+        @JsonProperty("multipleImgCount")
+        private Integer multipleImgCount;
+        @JsonProperty("synopsis")
+        private Object synopsis;
+        @JsonProperty("liveBeginTime")
+        private Object liveBeginTime;
+        @JsonProperty("liveStatus")
+        private Object liveStatus;
+        @JsonProperty("liveType")
+        private Object liveType;
+        @JsonProperty("showViewCount")
+        private Integer showViewCount;
+        @JsonProperty("videoFormat")
+        private Object videoFormat;
+        @JsonProperty("outerLinkOpenType")
+        private Integer outerLinkOpenType;
+        @JsonProperty("appUserId")
+        private Object appUserId;
+        @JsonProperty("name")
+        private Object name;
+        @JsonProperty("imgUrl")
+        private Object imgUrl;
+    }
+}

nngkxxdp/src/main/java/com/example/nngkxxdp/program/service/Impl/HLWIntefaceImpl.java

@@ -1,20 +1,29 @@
 package com.example.nngkxxdp.program.service.Impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.example.nngkxxdp.program.constant.MiniConstant;
+import com.example.nngkxxdp.program.dao.AppletUserDao;
+import com.example.nngkxxdp.program.dao.HlwCollectionDao;
 import com.example.nngkxxdp.program.dao.HlwNewsPaperDao;
+import com.example.nngkxxdp.program.entity.HlwCollection;
 import com.example.nngkxxdp.program.entity.jsonobj.HlNewsDTO;
 import com.example.nngkxxdp.program.entity.jsonobj.HlNewsPaperDTO;
+import com.example.nngkxxdp.program.entity.jsonobj.HlwCollectionDTO;
 import com.example.nngkxxdp.program.service.HLWIntefaceService;
 import com.example.nngkxxdp.util.SendUtil;
 import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,14 +32,36 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class HLWIntefaceImpl implements HLWIntefaceService {
     private final HlwNewsPaperDao hlwNewsPaperDao;
+    private final AppletUserDao appletUserDao;
+    private final HlwCollectionDao hlwCollectionDao;
+
     @Value("${hlw}")
     private String address;
+    @Transactional
     @Override
     public Map<String, Object> favorites(String userId) {
-//        HttpUtil.post("")
-        return null;
+        String userToken = getUserToken(userId);
+        // 拼装请求信息
+        Map<String, Object> requiredParameter = new HashMap<>();
+        requiredParameter.put("appId", 4);
+        requiredParameter.put("token", userToken);
+        HlwCollectionDTO data = getJsonObject(MiniConstant.HL_COLLECT, requiredParameter, HlwCollectionDTO.class);
+        if (ObjectUtil.isEmpty(data)&&ObjectUtil.isEmpty(data.getDataList())&&data.getDataList().size()==0){
+            return SendUtil.send(false, "", MiniConstant.RESULT_FAILED);
+        }
+        List<HlwCollectionDTO.DataListDTO> dataList = data.getDataList();
+        List<HlwCollection> objects = new ArrayList<>();
+        for (HlwCollectionDTO.DataListDTO dataListDTO : dataList) {
+            HlwCollection hlwCollection = BeanUtil.copyProperties(dataListDTO, HlwCollection.class);
+            objects.add(hlwCollection);
+        }
+        hlwCollectionDao.insertOrUpdateBatch(objects);
+
+        return SendUtil.send(true,"",objects);
     }
 
+
+
     @Override
     public Map<String, Object> comments(String userId, Integer type) {
         return null;
@@ -48,18 +79,32 @@ public class HLWIntefaceImpl implements HLWIntefaceService {
         requiredParameter.put("appId", 4);
         requiredParameter.put("columnId", 14009);
         requiredParameter.put("isCarousel", false);
-        String post = HttpUtil.post(address + MiniConstant.HL_NEWSINFO, requiredParameter);
-        JSONObject jsonObject = JSONUtil.parseObj(post);
-        if (Convert.toInt(jsonObject.get("code")) !=0){
-            return SendUtil.send(false,MiniConstant.RESULT_FAILED);
+        HlNewsPaperDTO data = getJsonObject(MiniConstant.HL_NEWSINFO,requiredParameter,HlNewsPaperDTO.class);
+        if (ObjectUtil.isEmpty(data)&&data.getNews().size()==0){
+            return SendUtil.send(false, "", MiniConstant.RESULT_FAILED);
         }
-        HlNewsPaperDTO data = JSONUtil.toBean(jsonObject.getJSONObject("data"), HlNewsPaperDTO.class);
         List<HlNewsDTO> news = data.getNews();
-        for (HlNewsDTO hlNewsDTO : news) {
-            System.out.println(hlNewsDTO.toString());
-        }
         hlwNewsPaperDao.insertOrUpdateBatch(news);
-
         return SendUtil.send(true, "", news);
     }
+
+    private <T> T getJsonObject(String url,Map<String, Object> requiredParameter,Class<T> tClass) {
+        String post = HttpUtil.post(address + url, requiredParameter);
+        JSONObject jsonObject = JSONUtil.parseObj(post);
+        if (Convert.toInt(jsonObject.get("code")) != 0) {
+            return null;
+        }
+        return JSONUtil.toBean(jsonObject.getJSONObject("data"), tClass);
+    }
+
+    /**
+     * 获取用户token
+     * @param userId
+     */
+    private String getUserToken(String userId) {
+        if (StrUtil.isEmpty(userId)){
+            return "";
+        }
+       return appletUserDao.queryUserHlToken(userId);
+    }
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/PolicyDeliveryServiceImpl.java

@@ -103,7 +103,7 @@ public class PolicyDeliveryServiceImpl implements PolicyDeliveryService {
      */
     @Override
     public Map<String, Object> add(PolicyDeliveryDO policyDeliveryDO) {
-        if (Blank.isEmpty(policyDeliveryDO.getTitle(), policyDeliveryDO.getUnit(), policyDeliveryDO.getType(), policyDeliveryDO.getFreeApplication(), policyDeliveryDO.getIndustrySectors())) {
+        if (Blank.isEmpty(policyDeliveryDO.getTitle(), policyDeliveryDO.getUnit(), policyDeliveryDO.getFreeApplication(), policyDeliveryDO.getIndustrySectors())) {
             return SendUtil.send(false, ConstStr.ADD_FAILED);
         }
         policyDeliveryDO.setId(UUID.randomUUID().toString());
@@ -125,9 +125,12 @@ public class PolicyDeliveryServiceImpl implements PolicyDeliveryService {
      */
     @Override
     public Map<String, Object> update(PolicyDeliveryDO policyDeliveryDO) {
-        if (Blank.isEmpty(policyDeliveryDO.getTitle(), policyDeliveryDO.getUnit(), policyDeliveryDO.getType(), policyDeliveryDO.getFreeApplication(), policyDeliveryDO.getIndustrySectors())) {
+        if (Blank.isEmpty(policyDeliveryDO.getTitle(), policyDeliveryDO.getUnit(), policyDeliveryDO.getIndustrySectors())) {
             return SendUtil.send(false, ConstStr.UPDATEUSER_FAILED);
         }
+        if (Blank.isEmpty(policyDeliveryDO.getFreeApplication())) {
+            policyDeliveryDO.setFreeApplication(1);
+        }
         // 更新
         policyDeliveryDO.setUpdateTime(new Date());
         if (policyDeliveryDao.update(policyDeliveryDO) <= 0) {

nngkxxdp/src/main/resources/mapper/AppletUserDao.xml

@@ -97,4 +97,10 @@
         from applet_user
         where openid = #{openid}
     </select>
+
+    <select id="queryUserHlToken" resultType="string">
+        select token
+        from  applet_user
+        where id = #{userId}
+    </select>
 </mapper>

nngkxxdp/src/main/resources/mapper/HlwCollectionDao.xml

@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.nngkxxdp.program.dao.HlwCollectionDao">
+
+    <resultMap type="com.example.nngkxxdp.program.entity.HlwCollection" id="HlwCollectionMap">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="favoriteid" column="favoriteId" jdbcType="INTEGER"/>
+        <result property="informationid" column="informationId" jdbcType="INTEGER"/>
+        <result property="sortno" column="sortNo" jdbcType="INTEGER"/>
+        <result property="listviewtype" column="listViewType" jdbcType="INTEGER"/>
+        <result property="title" column="title" jdbcType="VARCHAR"/>
+        <result property="detailtitle" column="detailTitle" jdbcType="VARCHAR"/>
+        <result property="contenturl" column="contentUrl" jdbcType="VARCHAR"/>
+        <result property="infosource" column="infoSource" jdbcType="VARCHAR"/>
+        <result property="onlinedate" column="onlineDate" jdbcType="VARCHAR"/>
+        <result property="onlinetime" column="onlineTime" jdbcType="VARCHAR"/>
+        <result property="replycount" column="replyCount" jdbcType="VARCHAR"/>
+        <result property="viewcount" column="viewCount" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="INTEGER"/>
+        <result property="contexttype" column="contextType" jdbcType="INTEGER"/>
+        <result property="infolabel" column="infoLabel" jdbcType="VARCHAR"/>
+        <result property="images" column="images" jdbcType="VARCHAR"/>
+        <result property="commenttype" column="commentType" jdbcType="INTEGER"/>
+        <result property="url" column="url" jdbcType="VARCHAR"/>
+        <result property="shareurl" column="shareUrl" jdbcType="VARCHAR"/>
+        <result property="sharetitle" column="shareTitle" jdbcType="VARCHAR"/>
+        <result property="shareimgurl" column="shareImgUrl" jdbcType="VARCHAR"/>
+        <result property="detailviewtype" column="detailViewType" jdbcType="INTEGER"/>
+        <result property="sourcetype" column="sourceType" jdbcType="INTEGER"/>
+        <result property="multipleimgcount" column="multipleImgCount" jdbcType="VARCHAR"/>
+        <result property="synopsis" column="synopsis" jdbcType="VARCHAR"/>
+        <result property="livebegintime" column="liveBeginTime" jdbcType="VARCHAR"/>
+        <result property="livestatus" column="liveStatus" jdbcType="VARCHAR"/>
+        <result property="livetype" column="liveType" jdbcType="VARCHAR"/>
+        <result property="showviewcount" column="showViewCount" jdbcType="INTEGER"/>
+        <result property="videoformat" column="videoFormat" jdbcType="VARCHAR"/>
+        <result property="outerlinkopentype" column="outerLinkOpenType" jdbcType="INTEGER"/>
+        <result property="appuserid" column="appUserId" jdbcType="VARCHAR"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="imgurl" column="imgUrl" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="HlwCollectionMap">
+        select
+          id, favoriteId, informationId, sortNo, listViewType, title, detailTitle, contentUrl, infoSource, onlineDate, onlineTime, replyCount, viewCount, type, contextType, infoLabel, images, commentType, url, shareUrl, shareTitle, shareImgUrl, detailViewType, sourceType, multipleImgCount, synopsis, liveBeginTime, liveStatus, liveType, showViewCount, videoFormat, outerLinkOpenType, appUserId, name, imgUrl
+        from hlw_collection
+        where id = #{id}
+    </select>
+
+    <!--查询指定行数据-->
+    <select id="queryAllByLimit" resultMap="HlwCollectionMap">
+        select
+          id, favoriteId, informationId, sortNo, listViewType, title, detailTitle, contentUrl, infoSource, onlineDate, onlineTime, replyCount, viewCount, type, contextType, infoLabel, images, commentType, url, shareUrl, shareTitle, shareImgUrl, detailViewType, sourceType, multipleImgCount, synopsis, liveBeginTime, liveStatus, liveType, showViewCount, videoFormat, outerLinkOpenType, appUserId, name, imgUrl
+        from hlw_collection
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="favoriteid != null">
+                and favoriteId = #{favoriteid}
+            </if>
+            <if test="informationid != null">
+                and informationId = #{informationid}
+            </if>
+            <if test="sortno != null">
+                and sortNo = #{sortno}
+            </if>
+            <if test="listviewtype != null">
+                and listViewType = #{listviewtype}
+            </if>
+            <if test="title != null and title != ''">
+                and title = #{title}
+            </if>
+            <if test="detailtitle != null and detailtitle != ''">
+                and detailTitle = #{detailtitle}
+            </if>
+            <if test="contenturl != null and contenturl != ''">
+                and contentUrl = #{contenturl}
+            </if>
+            <if test="infosource != null and infosource != ''">
+                and infoSource = #{infosource}
+            </if>
+            <if test="onlinedate != null and onlinedate != ''">
+                and onlineDate = #{onlinedate}
+            </if>
+            <if test="onlinetime != null and onlinetime != ''">
+                and onlineTime = #{onlinetime}
+            </if>
+            <if test="replycount != null and replycount != ''">
+                and replyCount = #{replycount}
+            </if>
+            <if test="viewcount != null and viewcount != ''">
+                and viewCount = #{viewcount}
+            </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
+            <if test="contexttype != null">
+                and contextType = #{contexttype}
+            </if>
+            <if test="infolabel != null and infolabel != ''">
+                and infoLabel = #{infolabel}
+            </if>
+            <if test="images != null and images != ''">
+                and images = #{images}
+            </if>
+            <if test="commenttype != null">
+                and commentType = #{commenttype}
+            </if>
+            <if test="url != null and url != ''">
+                and url = #{url}
+            </if>
+            <if test="shareurl != null and shareurl != ''">
+                and shareUrl = #{shareurl}
+            </if>
+            <if test="sharetitle != null and sharetitle != ''">
+                and shareTitle = #{sharetitle}
+            </if>
+            <if test="shareimgurl != null and shareimgurl != ''">
+                and shareImgUrl = #{shareimgurl}
+            </if>
+            <if test="detailviewtype != null">
+                and detailViewType = #{detailviewtype}
+            </if>
+            <if test="sourcetype != null">
+                and sourceType = #{sourcetype}
+            </if>
+            <if test="multipleimgcount != null and multipleimgcount != ''">
+                and multipleImgCount = #{multipleimgcount}
+            </if>
+            <if test="synopsis != null and synopsis != ''">
+                and synopsis = #{synopsis}
+            </if>
+            <if test="livebegintime != null and livebegintime != ''">
+                and liveBeginTime = #{livebegintime}
+            </if>
+            <if test="livestatus != null and livestatus != ''">
+                and liveStatus = #{livestatus}
+            </if>
+            <if test="livetype != null and livetype != ''">
+                and liveType = #{livetype}
+            </if>
+            <if test="showviewcount != null">
+                and showViewCount = #{showviewcount}
+            </if>
+            <if test="videoformat != null and videoformat != ''">
+                and videoFormat = #{videoformat}
+            </if>
+            <if test="outerlinkopentype != null">
+                and outerLinkOpenType = #{outerlinkopentype}
+            </if>
+            <if test="appuserid != null and appuserid != ''">
+                and appUserId = #{appuserid}
+            </if>
+            <if test="name != null and name != ''">
+                and name = #{name}
+            </if>
+            <if test="imgurl != null and imgurl != ''">
+                and imgUrl = #{imgurl}
+            </if>
+        </where>
+        limit #{pageable.offset}, #{pageable.pageSize}
+    </select>
+
+    <!--统计总行数-->
+    <select id="count" resultType="java.lang.Long">
+        select count(1)
+        from hlw_collection
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="favoriteid != null">
+                and favoriteId = #{favoriteid}
+            </if>
+            <if test="informationid != null">
+                and informationId = #{informationid}
+            </if>
+            <if test="sortno != null">
+                and sortNo = #{sortno}
+            </if>
+            <if test="listviewtype != null">
+                and listViewType = #{listviewtype}
+            </if>
+            <if test="title != null and title != ''">
+                and title = #{title}
+            </if>
+            <if test="detailtitle != null and detailtitle != ''">
+                and detailTitle = #{detailtitle}
+            </if>
+            <if test="contenturl != null and contenturl != ''">
+                and contentUrl = #{contenturl}
+            </if>
+            <if test="infosource != null and infosource != ''">
+                and infoSource = #{infosource}
+            </if>
+            <if test="onlinedate != null and onlinedate != ''">
+                and onlineDate = #{onlinedate}
+            </if>
+            <if test="onlinetime != null and onlinetime != ''">
+                and onlineTime = #{onlinetime}
+            </if>
+            <if test="replycount != null and replycount != ''">
+                and replyCount = #{replycount}
+            </if>
+            <if test="viewcount != null and viewcount != ''">
+                and viewCount = #{viewcount}
+            </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
+            <if test="contexttype != null">
+                and contextType = #{contexttype}
+            </if>
+            <if test="infolabel != null and infolabel != ''">
+                and infoLabel = #{infolabel}
+            </if>
+            <if test="images != null and images != ''">
+                and images = #{images}
+            </if>
+            <if test="commenttype != null">
+                and commentType = #{commenttype}
+            </if>
+            <if test="url != null and url != ''">
+                and url = #{url}
+            </if>
+            <if test="shareurl != null and shareurl != ''">
+                and shareUrl = #{shareurl}
+            </if>
+            <if test="sharetitle != null and sharetitle != ''">
+                and shareTitle = #{sharetitle}
+            </if>
+            <if test="shareimgurl != null and shareimgurl != ''">
+                and shareImgUrl = #{shareimgurl}
+            </if>
+            <if test="detailviewtype != null">
+                and detailViewType = #{detailviewtype}
+            </if>
+            <if test="sourcetype != null">
+                and sourceType = #{sourcetype}
+            </if>
+            <if test="multipleimgcount != null and multipleimgcount != ''">
+                and multipleImgCount = #{multipleimgcount}
+            </if>
+            <if test="synopsis != null and synopsis != ''">
+                and synopsis = #{synopsis}
+            </if>
+            <if test="livebegintime != null and livebegintime != ''">
+                and liveBeginTime = #{livebegintime}
+            </if>
+            <if test="livestatus != null and livestatus != ''">
+                and liveStatus = #{livestatus}
+            </if>
+            <if test="livetype != null and livetype != ''">
+                and liveType = #{livetype}
+            </if>
+            <if test="showviewcount != null">
+                and showViewCount = #{showviewcount}
+            </if>
+            <if test="videoformat != null and videoformat != ''">
+                and videoFormat = #{videoformat}
+            </if>
+            <if test="outerlinkopentype != null">
+                and outerLinkOpenType = #{outerlinkopentype}
+            </if>
+            <if test="appuserid != null and appuserid != ''">
+                and appUserId = #{appuserid}
+            </if>
+            <if test="name != null and name != ''">
+                and name = #{name}
+            </if>
+            <if test="imgurl != null and imgurl != ''">
+                and imgUrl = #{imgurl}
+            </if>
+        </where>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+        insert into hlw_collection(favoriteId, informationId, sortNo, listViewType, title, detailTitle, contentUrl, infoSource, onlineDate, onlineTime, replyCount, viewCount, type, contextType, infoLabel, images, commentType, url, shareUrl, shareTitle, shareImgUrl, detailViewType, sourceType, multipleImgCount, synopsis, liveBeginTime, liveStatus, liveType, showViewCount, videoFormat, outerLinkOpenType, appUserId, name, imgUrl)
+        values (#{favoriteid}, #{informationid}, #{sortno}, #{listviewtype}, #{title}, #{detailtitle}, #{contenturl}, #{infosource}, #{onlinedate}, #{onlinetime}, #{replycount}, #{viewcount}, #{type}, #{contexttype}, #{infolabel}, #{images}, #{commenttype}, #{url}, #{shareurl}, #{sharetitle}, #{shareimgurl}, #{detailviewtype}, #{sourcetype}, #{multipleimgcount}, #{synopsis}, #{livebegintime}, #{livestatus}, #{livetype}, #{showviewcount}, #{videoformat}, #{outerlinkopentype}, #{appuserid}, #{name}, #{imgurl})
+    </insert>
+
+    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into hlw_collection(favoriteId, informationId, sortNo, listViewType, title, detailTitle, contentUrl, infoSource, onlineDate, onlineTime, replyCount, viewCount, type, contextType, infoLabel, images, commentType, url, shareUrl, shareTitle, shareImgUrl, detailViewType, sourceType, multipleImgCount, synopsis, liveBeginTime, liveStatus, liveType, showViewCount, videoFormat, outerLinkOpenType, appUserId, name, imgUrl)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+        (#{entity.favoriteid}, #{entity.informationid}, #{entity.sortno}, #{entity.listviewtype}, #{entity.title}, #{entity.detailtitle}, #{entity.contenturl}, #{entity.infosource}, #{entity.onlinedate}, #{entity.onlinetime}, #{entity.replycount}, #{entity.viewcount}, #{entity.type}, #{entity.contexttype}, #{entity.infolabel}, #{entity.images}, #{entity.commenttype}, #{entity.url}, #{entity.shareurl}, #{entity.sharetitle}, #{entity.shareimgurl}, #{entity.detailviewtype}, #{entity.sourcetype}, #{entity.multipleimgcount}, #{entity.synopsis}, #{entity.livebegintime}, #{entity.livestatus}, #{entity.livetype}, #{entity.showviewcount}, #{entity.videoformat}, #{entity.outerlinkopentype}, #{entity.appuserid}, #{entity.name}, #{entity.imgurl})
+        </foreach>
+    </insert>
+
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into hlw_collection(favoriteId, informationId, sortNo, listViewType, title, detailTitle, contentUrl, infoSource, onlineDate, onlineTime, replyCount, viewCount, type, contextType, infoLabel, images, commentType, url, shareUrl, shareTitle, shareImgUrl, detailViewType, sourceType, multipleImgCount, synopsis, liveBeginTime, liveStatus, liveType, showViewCount, videoFormat, outerLinkOpenType, appUserId, name, imgUrl)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.favoriteid}, #{entity.informationid}, #{entity.sortno}, #{entity.listviewtype}, #{entity.title}, #{entity.detailtitle}, #{entity.contenturl}, #{entity.infosource}, #{entity.onlinedate}, #{entity.onlinetime}, #{entity.replycount}, #{entity.viewcount}, #{entity.type}, #{entity.contexttype}, #{entity.infolabel}, #{entity.images}, #{entity.commenttype}, #{entity.url}, #{entity.shareurl}, #{entity.sharetitle}, #{entity.shareimgurl}, #{entity.detailviewtype}, #{entity.sourcetype}, #{entity.multipleimgcount}, #{entity.synopsis}, #{entity.livebegintime}, #{entity.livestatus}, #{entity.livetype}, #{entity.showviewcount}, #{entity.videoformat}, #{entity.outerlinkopentype}, #{entity.appuserid}, #{entity.name}, #{entity.imgurl})
+        </foreach>
+        on duplicate key update
+        favoriteId = values(favoriteId),
+        informationId = values(informationId),
+        sortNo = values(sortNo),
+        listViewType = values(listViewType),
+        title = values(title),
+        detailTitle = values(detailTitle),
+        contentUrl = values(contentUrl),
+        infoSource = values(infoSource),
+        onlineDate = values(onlineDate),
+        onlineTime = values(onlineTime),
+        replyCount = values(replyCount),
+        viewCount = values(viewCount),
+        type = values(type),
+        contextType = values(contextType),
+        infoLabel = values(infoLabel),
+        images = values(images),
+        commentType = values(commentType),
+        url = values(url),
+        shareUrl = values(shareUrl),
+        shareTitle = values(shareTitle),
+        shareImgUrl = values(shareImgUrl),
+        detailViewType = values(detailViewType),
+        sourceType = values(sourceType),
+        multipleImgCount = values(multipleImgCount),
+        synopsis = values(synopsis),
+        liveBeginTime = values(liveBeginTime),
+        liveStatus = values(liveStatus),
+        liveType = values(liveType),
+        showViewCount = values(showViewCount),
+        videoFormat = values(videoFormat),
+        outerLinkOpenType = values(outerLinkOpenType),
+        appUserId = values(appUserId),
+        name = values(name),
+        imgUrl = values(imgUrl)
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update hlw_collection
+        <set>
+            <if test="favoriteid != null">
+                favoriteId = #{favoriteid},
+            </if>
+            <if test="informationid != null">
+                informationId = #{informationid},
+            </if>
+            <if test="sortno != null">
+                sortNo = #{sortno},
+            </if>
+            <if test="listviewtype != null">
+                listViewType = #{listviewtype},
+            </if>
+            <if test="title != null and title != ''">
+                title = #{title},
+            </if>
+            <if test="detailtitle != null and detailtitle != ''">
+                detailTitle = #{detailtitle},
+            </if>
+            <if test="contenturl != null and contenturl != ''">
+                contentUrl = #{contenturl},
+            </if>
+            <if test="infosource != null and infosource != ''">
+                infoSource = #{infosource},
+            </if>
+            <if test="onlinedate != null and onlinedate != ''">
+                onlineDate = #{onlinedate},
+            </if>
+            <if test="onlinetime != null and onlinetime != ''">
+                onlineTime = #{onlinetime},
+            </if>
+            <if test="replycount != null and replycount != ''">
+                replyCount = #{replycount},
+            </if>
+            <if test="viewcount != null and viewcount != ''">
+                viewCount = #{viewcount},
+            </if>
+            <if test="type != null">
+                type = #{type},
+            </if>
+            <if test="contexttype != null">
+                contextType = #{contexttype},
+            </if>
+            <if test="infolabel != null and infolabel != ''">
+                infoLabel = #{infolabel},
+            </if>
+            <if test="images != null and images != ''">
+                images = #{images},
+            </if>
+            <if test="commenttype != null">
+                commentType = #{commenttype},
+            </if>
+            <if test="url != null and url != ''">
+                url = #{url},
+            </if>
+            <if test="shareurl != null and shareurl != ''">
+                shareUrl = #{shareurl},
+            </if>
+            <if test="sharetitle != null and sharetitle != ''">
+                shareTitle = #{sharetitle},
+            </if>
+            <if test="shareimgurl != null and shareimgurl != ''">
+                shareImgUrl = #{shareimgurl},
+            </if>
+            <if test="detailviewtype != null">
+                detailViewType = #{detailviewtype},
+            </if>
+            <if test="sourcetype != null">
+                sourceType = #{sourcetype},
+            </if>
+            <if test="multipleimgcount != null and multipleimgcount != ''">
+                multipleImgCount = #{multipleimgcount},
+            </if>
+            <if test="synopsis != null and synopsis != ''">
+                synopsis = #{synopsis},
+            </if>
+            <if test="livebegintime != null and livebegintime != ''">
+                liveBeginTime = #{livebegintime},
+            </if>
+            <if test="livestatus != null and livestatus != ''">
+                liveStatus = #{livestatus},
+            </if>
+            <if test="livetype != null and livetype != ''">
+                liveType = #{livetype},
+            </if>
+            <if test="showviewcount != null">
+                showViewCount = #{showviewcount},
+            </if>
+            <if test="videoformat != null and videoformat != ''">
+                videoFormat = #{videoformat},
+            </if>
+            <if test="outerlinkopentype != null">
+                outerLinkOpenType = #{outerlinkopentype},
+            </if>
+            <if test="appuserid != null and appuserid != ''">
+                appUserId = #{appuserid},
+            </if>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="imgurl != null and imgurl != ''">
+                imgUrl = #{imgurl},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete from hlw_collection where id = #{id}
+    </delete>
+
+</mapper>
+

nngkxxdp/src/main/resources/mapper/PolicyDeliveryDao.xml

@@ -153,6 +153,7 @@
                 AND free_application = #{freeApplication}
             </if>
         </where>
+        ORDER BY create_time DESC
         LIMIT #{startRows}, #{limit}
     </select>
 

nngkxxdp/src/main/resources/static/app/css/navigation.css

@@ -51,7 +51,7 @@ li {
 
 .flot {
     width: 24px;
-    height: 14px;
+    height: 19px;
 }
 
 .line {
@@ -60,6 +60,7 @@ li {
     border: 1px solid #666666;
     opacity: 0.2;
     margin-top: 20px;
+    background-color: #666666;
 }
 
 .icon {

nngkxxdp/src/main/resources/static/app/navigation.html

@@ -242,8 +242,11 @@
         var event = e || window.event
         var target = event.target
         if (target.nodeName == 'P') {
-            target.className = 'active'
             if (target.className == 'active') {
+                target.className = 'deActive'
+                zzbm=''
+            }else{
+                target.className = 'active'
                 zzbm = target.innerHTML
             }
         }

nngkxxdp/src/main/resources/static/hqzc/indexs.html

@@ -27,375 +27,425 @@
 </head>
 
 <body>
-    <!--内容开始-->
-    <!-- <div class="banner"></div> -->
-    <div class="box clearfix">
-        <div class="cap_title clearfix">
-            <h1 class="zt">惠企导航</h1>
-            <div class="search_box">
-                <input type="hidden" id="page">
-                <input id="qt" type="text" class="search_input" placeholder="请输入关键词"><input type="submit" name="button"
-                    onclick="showList()" class="search_btn" title="检索" alt="检索" value="检索" style="cursor: pointer">
-            </div>
+<!--内容开始-->
+<!-- <div class="banner"></div> -->
+<div class="box clearfix">
+    <div class="cap_title clearfix">
+        <h1 class="zt">惠企导航</h1>
+        <div class="search_box">
+            <input type="hidden" id="page">
+            <input id="qt" type="text" class="search_input" placeholder="请输入关键词"><input type="submit"
+                                                                                              name="button"
+                                                                                              onclick="showList()"
+                                                                                              class="search_btn"
+                                                                                              title="检索" alt="检索"
+                                                                                              value="检索"
+                                                                                              style="cursor: pointer">
         </div>
-        <div class="check_box clearfix">
-            <div class="check_title">支持类型：</div>
-            <ul class="check_content">
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="延期办理">延期办理</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="程序简化">程序简化</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="税费减免">税费减免</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="法律服务">法律服务</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="融资信贷">融资信贷</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="资金补贴">资金补贴</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="租金减免">租金减免</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="远程办事">远程办事</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="服务优化">服务优化</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="教育培训">教育培训</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="专项扶持">专项扶持</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="社保支持">社保支持</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="资金担保">资金担保</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="保险服务">保险服务</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="安全生产">安全生产</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="维护市场">维护市场</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="资金奖励">资金奖励</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="政府采购">政府采购</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"
-                        value="费用缓缴">费用缓缴</li>
-            </ul>
-            <div class="zk"><i></i>展开</div>
-        </div>
-        <div class="check_box clearfix">
-            <div class="check_title">行业领域：</div>
-            <ul class="check_content">
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
-                        value="文化旅游业">文化旅游业</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
-                        value="外资外贸">外资外贸</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox" value="普惠性">普惠性
-                </li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
-                        value="批发零售业">批发零售业</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox" value="农业">农业
-                </li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
-                        value="科技创新">科技创新</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
-                        value="交通运输业">交通运输业</li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox" value="工业">工业
-                </li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox" value="房地产">房地产
-                </li>
-                <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
-                        value="餐饮住宿业">餐饮住宿业</li>
-            </ul>
-            <div class="zk"><i></i>展开</div>
+    </div>
+    <div class="check_box clearfix">
+<!--        <div class="check_title">支持类型：</div>-->
+<!--        <ul class="check_content">-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="延期办理">延期办理-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="程序简化">程序简化-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="税费减免">税费减免-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="法律服务">法律服务-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="融资信贷">融资信贷-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="资金补贴">资金补贴-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="租金减免">租金减免-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="远程办事">远程办事-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="服务优化">服务优化-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="教育培训">教育培训-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="专项扶持">专项扶持-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="社保支持">社保支持-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="资金担保">资金担保-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="保险服务">保险服务-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="安全生产">安全生产-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="维护市场">维护市场-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="资金奖励">资金奖励-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="政府采购">政府采购-->
+<!--            </li>-->
+<!--            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="zcfxCheckbox"-->
+<!--                                      value="费用缓缴">费用缓缴-->
+<!--            </li>-->
+<!--        </ul>-->
+<!--        <div class="zk"><i></i>展开</div>-->
+    </div>
+    <div class="check_box clearfix">
+        <div class="check_title">行业领域：</div>
+        <ul class="check_content">
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
+                                      value="文化旅游业">文化旅游业
+            </li>
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
+                                      value="外资外贸">外资外贸
+            </li>
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox" value="普惠性">普惠性
+            </li>
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
+                                      value="批发零售业">批发零售业
+            </li>
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox" value="农业">农业
+            </li>
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
+                                      value="科技创新">科技创新
+            </li>
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
+                                      value="交通运输业">交通运输业
+            </li>
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox" value="工业">工业
+            </li>
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox" value="房地产">房地产
+            </li>
+            <li><label></label><input type="checkbox" onclick="clickCheckbox()" name="hylxCheckbox"
+                                      value="餐饮住宿业">餐饮住宿业
+            </li>
+        </ul>
+        <div class="zk"><i></i>展开</div>
+    </div>
+    <div class="check_box clearfix pb20">
+        <div class=" check_title">主责部门:</div>
+        <ul class=" check_content1 res_depart"></ul>
+        <div class="zk"><i></i>展开</div>
+    </div>
+    <div class="box mt20">
+        <div class="msg">为您查找到（<span id="totalDocs"></span>）条 惠企事项
+            <div class="msjxbtn"></div>
+<!--            <img style="cursor: pointer;"
+                        onclick="msjxClick()" src="./image/zt_qyfc_icon.png"><span style="cursor: pointer;"
+                        onclick="msjxClose()">关闭</span>-->
         </div>
-        <div class="check_box clearfix pb20">
-            <div class=" check_title">主责部门:</div>
-            <ul class=" check_content1 res_depart"></ul>
-            <div class="zk"><i></i>展开</div>
+        <input id="extra_param" name="free" hidden>
+        <div class="zclist">
         </div>
-        <div class="box mt20">
-            <div class="msg">为您查找到（<span id="totalDocs"></span>）条 惠企事项<div class="msjxbtn"><img style="cursor: pointer;"
-                        onclick="msjxClick()" src="./image/zt_qyfc_icon.png"><span style="cursor: pointer;"
-                        onclick="msjxClose()">关闭</span></div>
-            </div>
-            <input id="extra_param" name="free" hidden>
-            <div class="zclist">
-            </div>
+    </div>
+    <div style="width: 100%;display: flex;height: 52.5px;margin-top:20px" class="page">
+        <div id="pageMessage" style="width: 50%;display: flex;align-items: center;justify-content: flex-start">
         </div>
-        <div style="width: 100%;display: flex;height: 52.5px;margin-top:20px" class="page">
-            <div id="pageMessage" style="width: 50%;display: flex;align-items: center;justify-content: flex-start">
-            </div>
-            <div style="width: 50%;display: flex;align-items: center;justify-content: flex-end">
-                <button class="hand btn" id="page1" style="font-size: 17.5px;cursor: pointer">上一页</button>
-                <button class="hand btn" id="page2" style="font-size: 17.5px;margin-left: 4.3px;cursor: pointer">下一页</button>
-            </div>
+        <div style="width: 50%;display: flex;align-items: center;justify-content: flex-end">
+            <button class="hand btn" id="page1" style="font-size: 17.5px;cursor: pointer">上一页</button>
+            <button class="hand btn" id="page2" style="font-size: 17.5px;margin-left: 4.3px;cursor: pointer">下一页
+            </button>
         </div>
     </div>
-    <!--内容结束-->
-    <script>
-        pages = 1
-        limit = 10
-        var total
-        $(function () {
-            $("#page").val(1);
-            resDepartment()
-            showPolicyList();
-        });
-        function showList() {
-            $("#page").val(1);
-            /*var zcfxObj = document.getElementsByName("zcfxCheckbox");
-            for (var i = 0; i < zcfxObj.length; i++) {
-                zcfxObj[i].checked=false;
-            }
-            var qygmObj = document.getElementsByName("qygmCheckbox");
-            for (var i = 0; i < qygmObj.length; i++) {
-                qygmObj[i].checked=false;
-            }
-            var hylxObj = document.getElementsByName("hylxCheckbox");
-            for (var i = 0; i < hylxObj.length; i++) {
-                hylxObj[i].checked=false;
-            }
-            */
-            // var zzbmObj = document.getElementsByName("zzbmCheckbox");
-            // for (var i = 0; i < zzbmObj.length; i++) {
-            //     zzbmObj[i].checked = false;
-            // }
-            $(".check_content input").prop('checked', false);
-            $(".check_content label").removeClass("on")
-            showPolicyList();
+</div>
+<!--内容结束-->
+<script>
+    pages = 1
+    limit = 10
+    var total
+    $(function () {
+        $("#page").val(1);
+        resDepartment()
+        showPolicyList();
+    });
+
+    function showList() {
+        $("#page").val(1);
+        /*var zcfxObj = document.getElementsByName("zcfxCheckbox");
+        for (var i = 0; i < zcfxObj.length; i++) {
+            zcfxObj[i].checked=false;
         }
-        function msjxClick() {
-            $(".msjxbtn span").toggle();
-            var select = "./image/zt_qyfc_iconclose.png";
-            var unselect = "./image/zt_qyfc_icon.png";
-            var temp = $("#extra_param").val();
-            var params = '';
-            if (temp == 2) {
-                $(".msjxbtn").find("img").attr("src", unselect);
-                params = "1";
-            } else {
-                $(".msjxbtn").find("img").attr("src", select);
-                params = "2";
-            }
-            $("#extra_param").val(params);
-            pages =1;
-            clickCheckbox();
+        var qygmObj = document.getElementsByName("qygmCheckbox");
+        for (var i = 0; i < qygmObj.length; i++) {
+            qygmObj[i].checked=false;
         }
-        function msjxClose() {
-            $(".msjxbtn span").toggle();
-            $(".msjx").next("input").prop('checked', false);
-            $(".msjx").removeClass("on");
-            $(".msjxbtn").find("img").attr("src", "./image/zt_qyfc_icon.png");
-            clickCheckbox();
+        var hylxObj = document.getElementsByName("hylxCheckbox");
+        for (var i = 0; i < hylxObj.length; i++) {
+            hylxObj[i].checked=false;
         }
-        function clickCheckbox() {
-            $("#page").val(1);
-            showPolicyList();
+        */
+        // var zzbmObj = document.getElementsByName("zzbmCheckbox");
+        // for (var i = 0; i < zzbmObj.length; i++) {
+        //     zzbmObj[i].checked = false;
+        // }
+        $(".check_content input").prop('checked', false);
+        $(".check_content label").removeClass("on")
+        showPolicyList();
+    }
+
+    function msjxClick() {
+        $(".msjxbtn span").toggle();
+        var select = "./image/zt_qyfc_iconclose.png";
+        var unselect = "./image/zt_qyfc_icon.png";
+        var temp = $("#extra_param").val();
+        var params = '';
+        if (temp == 2) {
+            $(".msjxbtn").find("img").attr("src", unselect);
+            params = "1";
+        } else {
+            $(".msjxbtn").find("img").attr("src", select);
+            params = "2";
         }
+        $("#extra_param").val(params);
+        pages = 1;
+        clickCheckbox();
+    }
 
-        $("#page1").click(function () {
-            if (pages > 1) {
-                pages = pages - 1
-            }
-            showPolicyList()
-        })
-        $("#page2").click(function () {
-            if (pages < Math.ceil(total / limit)) {
-                pages = pages + 1
-            }
-            showPolicyList()
-        })
 
-        //展现文档信息
-        function showPolicyList() {
-            var page = $("#page").val();
-            var qt = $("#qt").val();
-            var zcfxArr = [];
-            var zcfxObj = document.getElementsByName("zcfxCheckbox");
-            for (var i = 0; i < zcfxObj.length; i++) {
-                if (zcfxObj[i].checked) {
-                    zcfxArr.push(zcfxObj[i].value);
-                }
+    function msjxClose() {
+        $(".msjxbtn span").toggle();
+        $(".msjx").next("input").prop('checked', false);
+        $(".msjx").removeClass("on");
+        $(".msjxbtn").find("img").attr("src", "./image/zt_qyfc_icon.png");
+        clickCheckbox();
+    }
+
+    function clickCheckbox() {
+        $("#page").val(1);
+        showPolicyList();
+    }
+
+    $("#page1").click(function () {
+        if (pages > 1) {
+            pages = pages - 1
+        }
+        showPolicyList()
+    })
+    $("#page2").click(function () {
+        if (pages < Math.ceil(total / limit)) {
+            pages = pages + 1
+            console.log(pages)
+        }
+        showPolicyList()
+    })
+
+    //展现文档信息
+    function showPolicyList() {
+        var page = $("#page").val();
+        var qt = $("#qt").val();
+        var zcfxArr = [];
+        var zcfxObj = document.getElementsByName("zcfxCheckbox");
+        for (var i = 0; i < zcfxObj.length; i++) {
+            if (zcfxObj[i].checked) {
+                zcfxArr.push(zcfxObj[i].value);
             }
-            zcfxArr = zcfxArr.join(',')
-            var qygmArr = [];
-            var qygmObj = document.getElementsByName("qygmCheckbox");
-            for (var i = 0; i < qygmObj.length; i++) {
-                if (qygmObj[i].checked) {
-                    qygmArr.push(qygmObj[i].value);
-                }
+        }
+        zcfxArr = zcfxArr.join(',')
+        var qygmArr = [];
+        var qygmObj = document.getElementsByName("qygmCheckbox");
+        for (var i = 0; i < qygmObj.length; i++) {
+            if (qygmObj[i].checked) {
+                qygmArr.push(qygmObj[i].value);
             }
-            var hylxArr = [];
-            var hylxObj = document.getElementsByName("hylxCheckbox");
-            for (var i = 0; i < hylxObj.length; i++) {
-                if (hylxObj[i].checked) {
-                    hylxArr.push(hylxObj[i].value);
-                }
+        }
+        var hylxArr = [];
+        var hylxObj = document.getElementsByName("hylxCheckbox");
+        for (var i = 0; i < hylxObj.length; i++) {
+            if (hylxObj[i].checked) {
+                hylxArr.push(hylxObj[i].value);
             }
-            hylxArr = hylxArr.join(',')
-            var zzbmArr = [];
-            var zzbmObj = document.getElementsByName("zzbmCheckbox");
-            for (var i = 0; i < zzbmObj.length; i++) {
-                if (zzbmObj[i].checked) {
-                    zzbmArr.push(zzbmObj[i].value);
-                }
+        }
+        hylxArr = hylxArr.join(',')
+        var zzbmArr = [];
+        var zzbmObj = document.getElementsByName("zzbmCheckbox");
+        for (var i = 0; i < zzbmObj.length; i++) {
+            if (zzbmObj[i].checked) {
+                zzbmArr.push(zzbmObj[i].value);
             }
-            zzbmArr = zzbmArr.join(',')
+        }
+        zzbmArr = zzbmArr.join(',')
 
-            var valTemp = $("#extra_param").val();
+        var valTemp = $("#extra_param").val();
 
-            $.ajax({
-                type: "get",
-                url: "https://www.cqna.gov.cn/data/policyDelivery/page",
-                data: { page: pages, limit: limit, title: qt, type: zcfxArr, qygmArr: qygmArr, industrySectors: hylxArr, unit: zzbmArr, freeApplication: valTemp },
-                dataType: "json",
-                success: function (data) {
+        $.ajax({
+            type: "get",
+            url: "https://www.cqna.gov.cn/data/policyDelivery/page",
+            data: {
+                page: pages,
+                limit: limit,
+                title: qt,
+                type: zcfxArr,
+                qygmArr: qygmArr,
+                industrySectors: hylxArr,
+                unit: zzbmArr,
+                freeApplication: valTemp
+            },
+            dataType: "json",
+            success: function (data) {
 
-                    if (data.code == 0) {
-                        $(".zclist").empty()
-                        document.getElementById("totalDocs").innerText = data.count;
+                if (data.code == 0) {
+                    $(".zclist").empty()
+                    document.getElementById("totalDocs").innerText = data.count;
 
 
-                        var docList = data.data;
+                    var docList = data.data;
 
-                        total = data.count
-                        var pageHtml;
-                        var pageStr = "共 " + Math.ceil(total / limit) + " 页, " + total + " 条记录，当前第 " + pages + " 页"
-                        pageHtml = "<div style='font-size: 17.5px'>" + pageStr + "</div>"
-                        $("#pageMessage").html(pageHtml)
+                    total = data.count
+                    var pageHtml;
+                    var pageStr = "共 " + Math.ceil(total / limit) + " 页, " + total + " 条记录，当前第 " + pages + " 页"
+                    pageHtml = "<div style='font-size: 17.5px'>" + pageStr + "</div>"
+                    $("#pageMessage").html(pageHtml)
 
-                        var html = "";
-                        if (docList!=null && docList.length > 0) {
-                            for (var i = 0; i < docList.length; i++) {
-                                html += '<dl>';
-                                var unit = docList[i].unit;
-                                unit = unit.replace("[", "");
-                                unit = unit.replace("]", "");
-                                html += '<dt class="clearfix"><i></i><p class="flot">' + docList[i].title + '</p><span>' + unit + '<i></i></span></dt>';
-                                html += '<dd>';
-                                if (docList[i].measures) {
-                                    html += '<p style="text - align: left;"><img src = "./image/cqnc-one.png" width = "100" height = "22" style = "" title = "惠企措施"></p > <p style="text-align: left;">' + docList[i].measures + '</p>'
-                                }
-                                if (docList[i].policyBasis) {
-                                    html += '<p style="text - align: left;"><img src = "./image/cqnc-two.png" width = "100" height = "22" style = "" title = "政策依据"></p > <p style="text-align: left;">' + docList[i].policyBasis + '</p>'
-                                }
-                                if (docList[i].applicableConditions) {
-                                    html += '<p style="text - align: left;"><img src = "./image/cqnc-three.png" width = "100" height = "22" style = "" title = "适用条件"></p > <p style="text-align: left;">' + docList[i].applicableConditions + '</p>'
-                                }
-                                if (docList[i].processingMethod) {
-                                    html += '<p style="text - align: left;"><img src = "./image/cqnc-four.png" width = "100" height = "22" style = "" title = "办理方式"></p > <p style="text-align: left;">' + docList[i].processingMethod + '</p>'
-                                }
-                                if (docList[i].processingTime) {
-                                    html += '<p style="text - align: left;"><img src = "./image/cqnc-five.png" width = "100" height = "22" style = "" title = "办理时间"></p > <p style="text-align: left;">' + docList[i].processingTime + '</p>'
-                                }
-                                if (docList[i].inquiryPhone) {
-                                    html += '<p style="text - align: left;"><img src = "./image/cqnc-six.png" width = "100" height = "22" style = "" title = "咨询电话"></p > <p style="text-align: left;">' + docList[i].inquiryPhone + '</p>'
-                                }
-                                html += '<div class="mobnone"><div class="ue_table">'
-                                if (docList[i].procedure) {
-                                    html += '<p style="text - align: left;"><img src = "./image/cqnc-seven.png" width = "100" height = "22" style = "" title = "办理流程"></p > <p style="text-align: left;">' + docList[i].procedure + '</p>'
-                                }
-                                if (docList[i].processingMaterials) {
-                                    html += '<p style="text - align: left;"><img src = "./image/cqnc-eight.png" width = "100" height = "22" style = "" title = "办理材料"></p > <p style="text-align: left;">' + docList[i].processingMaterials + '</p>'
-                                }
-                             
-                                html += '</dd>';
-                                html += '</dl>';
+                    var html = "";
+                    if (docList != null && docList.length > 0) {
+                        for (var i = 0; i < docList.length; i++) {
+                            html += '<dl>';
+                            var unit = docList[i].unit;
+                            unit = unit.replace("[", "");
+                            unit = unit.replace("]", "");
+                            html += '<dt class="clearfix"><i></i><p class="flot">' + docList[i].title + '</p><span>' + unit + '<i></i></span></dt>';
+                            html += '<dd>';
+                            if (docList[i].measures) {
+                                html += '<p style="text - align: left;"><img src = "./image/cqnc-one.png" width = "100" height = "22" style = "" title = "惠企措施"></p > <p style="text-align: left;">' + docList[i].measures + '</p>'
+                            }
+                            if (docList[i].policyBasis) {
+                                html += '<p style="text - align: left;"><img src = "./image/cqnc-two.png" width = "100" height = "22" style = "" title = "政策依据"></p > <p style="text-align: left;">' + docList[i].policyBasis + '</p>'
+                            }
+                            if (docList[i].applicableConditions) {
+                                html += '<p style="text - align: left;"><img src = "./image/cqnc-three.png" width = "100" height = "22" style = "" title = "适用条件"></p > <p style="text-align: left;">' + docList[i].applicableConditions + '</p>'
+                            }
+                            if (docList[i].processingMethod) {
+                                html += '<p style="text - align: left;"><img src = "./image/cqnc-four.png" width = "100" height = "22" style = "" title = "办理方式"></p > <p style="text-align: left;">' + docList[i].processingMethod + '</p>'
+                            }
+                            if (docList[i].processingTime) {
+                                html += '<p style="text - align: left;"><img src = "./image/cqnc-five.png" width = "100" height = "22" style = "" title = "办理时间"></p > <p style="text-align: left;">' + docList[i].processingTime + '</p>'
+                            }
+                            if (docList[i].inquiryPhone) {
+                                html += '<p style="text - align: left;"><img src = "./image/cqnc-six.png" width = "100" height = "22" style = "" title = "咨询电话"></p > <p style="text-align: left;">' + docList[i].inquiryPhone + '</p>'
+                            }
+                            html += '<div class="mobnone"><div class="ue_table">'
+                            if (docList[i].procedure) {
+                                html += '<p style="text - align: left;"><img src = "./image/cqnc-seven.png" width = "100" height = "22" style = "" title = "办理流程"></p > <p style="text-align: left;">' + docList[i].procedure + '</p>'
+                            }
+                            if (docList[i].processingMaterials) {
+                                html += '<p style="text - align: left;"><img src = "./image/cqnc-eight.png" width = "100" height = "22" style = "" title = "办理材料"></p > <p style="text-align: left;">' + docList[i].processingMaterials + '</p>'
                             }
-                        }
-                        $(".zclist").html(html);
 
-                        $(".zclist dl dt").click(function () {
-                            $(".zclist dl dd").css("display", "none");
-                            $(".zclist dl dt").removeClass("on");
-                            $(".zclist dl dt p").removeClass("on");
-                            $(".zclist dl dt p").addClass("flot");
-                            $(this).children(1).removeClass("flot");
-                            $(this).addClass("on");
-                            $(this).children(1).addClass("on");
-                            $(this).next("dd").css("display", "block");
-                            $('html,body').animate({ scrollTop: $(this).offset().top }, 500);
-                        });
-                        $(".pcnone").click(function () {
-                            clickCheckbox()
-                        })
+                            html += '</dd>';
+                            html += '</dl>';
+                        }
                     }
-                },
-            });
-        }
+                    $(".zclist").html(html);
 
+                    $(".zclist dl dt").click(function () {
+                        $(".zclist dl dd").css("display", "none");
+                        $(".zclist dl dt").removeClass("on");
+                        $(".zclist dl dt p").removeClass("on");
+                        $(".zclist dl dt p").addClass("flot");
+                        $(this).children(1).removeClass("flot");
+                        $(this).addClass("on");
+                        $(this).children(1).addClass("on");
+                        $(this).next("dd").css("display", "block");
+                        $('html,body').animate({scrollTop: $(this).offset().top}, 500);
+                    });
+                    $(".pcnone").click(function () {
+                        clickCheckbox()
+                    })
+                }
+            },
+        });
+    }
 
 
-        //渲染主责部门
-        function resDepartment() {
-            $.ajax({
-                type: "get",
-                url: "https://www.cqna.gov.cn/data/policyDelivery/unitList",
-                dataType: "json",
-                success: function ({ msg }) {
-                    if (msg.length > 0) {
-                        var html = ''
-                        for (let i = 0; i < msg.length; i++) {
-                            html += `<li><label jj="1"></label><input type="radio" onclick="clickCheckbox()" name="zzbmCheckbox"
+    //渲染主责部门
+    function resDepartment() {
+        $.ajax({
+            type: "get",
+            url: "https://www.cqna.gov.cn/data/policyDelivery/unitList",
+            dataType: "json",
+            success: function ({msg}) {
+                if (msg.length > 0) {
+                    var html = ''
+                    for (let i = 0; i < msg.length; i++) {
+                        html += `<li><label jj="1"></label><input type="radio" onclick="clickCheckbox()" name="zzbmCheckbox"
                         value="${msg[i]}">${msg[i]}</li>`
-                        }
                     }
-                    $('.res_depart').html(html)
-                },
+                }
+                $('.res_depart').html(html)
+            },
+        });
+    }
+</script>
+<script type="text/javascript">
+    $(function () {
+        setTimeout(() => {
+            $(".zk").click(function () {
+                var txt = $(this).html();
+                if (txt == "<i></i>展开") {
+                    $(this).prev("ul").height("auto");
+                    $(this).html("<i></i>收起");
+                    $(this).find("i").addClass("up");
+                } else {
+                    $(this).prev("ul").height("35");
+                    $(this).html("<i></i>展开");
+                    $(this).find("i").removeClass("up");
+                }
+            });
+        }, 500);
+        setTimeout(() => {
+            $(".check_content label").click(function () {
+                $(this).toggleClass("on");
+                if ($(this).attr("class").indexOf("msjx") >= 0) {
+                    $(".msjxbtn span").toggle();
+                }
+                if ($(this).attr('class') == "on" || $(this).attr('class') == "msjx on") {
+                    $(this).next("input").prop('checked', true);
+                    // $(".msjxbtn").find("img").attr("src","images/hqzcdx/zt_qyfc_iconclose.png");
+                } else {
+                    $(this).next("input").prop('checked', false);
+                    // $(".msjxbtn").find("img").attr("src","images/hqzcdx/zt_qyfc_icon.png");
+                }
+                pages = 1;
+                clickCheckbox();
             });
-        }
-    </script>
-    <script type="text/javascript">
-        $(function () {
-            setTimeout(() => {
-                $(".zk").click(function () {
-                    var txt = $(this).html();
-                    if (txt == "<i></i>展开") {
-                        $(this).prev("ul").height("auto");
-                        $(this).html("<i></i>收起");
-                        $(this).find("i").addClass("up");
-                    } else {
-                        $(this).prev("ul").height("35");
-                        $(this).html("<i></i>展开");
-                        $(this).find("i").removeClass("up");
-                    }
-                });
-            }, 500);
-            setTimeout(() => {
-                $(".check_content label").click(function () {
-                    $(this).toggleClass("on");
-                    if ($(this).attr("class").indexOf("msjx") >= 0) { $(".msjxbtn span").toggle(); }
-                    if ($(this).attr('class') == "on" || $(this).attr('class') == "msjx on") {
-                        $(this).next("input").prop('checked', true);
-                        // $(".msjxbtn").find("img").attr("src","images/hqzcdx/zt_qyfc_iconclose.png");
-                    }
-                    else {
-                        $(this).next("input").prop('checked', false);
-                        // $(".msjxbtn").find("img").attr("src","images/hqzcdx/zt_qyfc_icon.png");
-                    }
-                    pages = 1;
-                    clickCheckbox();
-                });
 
-                $(".check_content1 label").click(function () {
-                    $("[jj]").removeClass("on")
-                    if ($(this).attr('jj')=='1'){
-                        // $("[jj]").removeClass("on")
-                        $("[jj]").next("input").prop('checked', false);
-                        $("[jj]").attr("jj","1")
-                        $(this).attr("jj","2")
-                        $(this).toggleClass("on");
-                        $(this).next("input").prop('checked', true);
-                    }else {
-                        $("[jj]").attr("jj","1")
-                        $(this).next("input").prop('checked', false);
-                    }
-                    pages = 1;
-                    clickCheckbox();
-                });
-            }, 500);
-        });
-    </script>
+
+            $(".check_content1 label").click(function () {
+                console.log($(this).attr('jj') == '1')
+                $("[jj]").removeClass("on")
+                if ($(this).attr('jj') == '1') {
+                    // $("[jj]").removeClass("on")
+                    $("[jj]").next("input").prop('checked', false);
+                    $("[jj]").attr("jj", "1")
+                    $(this).attr("jj", "2")
+                    $(this).toggleClass("on");
+                    $(this).next("input").prop('checked', true);
+                } else {
+                    $("[jj]").attr("jj", "1")
+                    $(this).next("input").prop('checked', false);
+                }
+                pages = 1;
+                clickCheckbox();
+            });
+        }, 500);
+    });
+</script>
 </body>
 
 </html>

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/App.vue

@@ -13,9 +13,9 @@
 <style lang="less">
 
     body {
-        height: 0;
-        margin: 0;
-        padding: 0;
+        height: 0!important;
+        margin: 0!important;
+        padding: 0!important;
         font-family: Microsoft YaHei;
     }
     .el-tooltip__popper, .el-tooltip__popper.is-dark {

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/components/Tinymce/index.vue

@@ -2,17 +2,18 @@
   <div>
     <editor :init="{
         language: 'zh_CN',//语言
-        height: 500,
+        height: height,
         selector: 'textarea',  // change this value according to your HTML
         menubar: false,
+        branding: false,
         plugins: [
         'advlist autosave',
         'hr lists',
         'image',
-        'paste preview visualchars table'
+        'paste preview visualchars table link'
         ],
         toolbar:[
-        'bold italic styleselect underline strikethrough alignleft aligncenter alignright outdent indent undo redo removeformat hr bullist numlist image charmap table forecolor backcolor preview'],
+        'bold italic styleselect underline strikethrough alignleft aligncenter alignright outdent indent undo redo removeformat hr bullist numlist image charmap link table forecolor backcolor preview'],
         style_formats: [
           {
             title: '首行缩进',
@@ -66,7 +67,6 @@
 </template>
 <script>
   import Editor from '@tinymce/tinymce-vue'
-  import CONFIG from "../../../vue.config"
 
   import 'tinymce/tinymce'
   // Theme
@@ -86,6 +86,7 @@
   import 'tinymce/plugins/visualchars'
   import 'tinymce/plugins/preview'
   import 'tinymce/plugins/lists'
+  import 'tinymce/plugins/link'
   // icons
   import 'tinymce/icons/default'
   // langs
@@ -98,13 +99,17 @@
         type: String,
         default: ''
       },
+      height: {
+        type: Number,
+        default: 500
+      }
     },
     components: {
       'editor': Editor
     },
     data() {
       return {
-        picUrl: CONFIG.devServer.proxy['/'].target + 'policyDelivery/uploadFile'
+        picUrl: process.env.VUE_APP_BASE_API + 'policyDelivery/uploadFile'
       }
     },
     watch: {},
@@ -124,7 +129,7 @@
     var file = blobInfo.blob(); //转化为易于理解的file对象
     xhr = new XMLHttpRequest();
     xhr.withCredentials = false;
-    xhr.open('POST', CONFIG.devServer.proxy['/'].target + 'policyDelivery/uploadFile');
+    xhr.open('POST', process.env.VUE_APP_BASE_API + 'policyDelivery/uploadFile');
     xhr.setRequestHeader('utoken', JSON.parse(sessionStorage['utoken']));
     xhr.onload = function () {
       var json;
@@ -141,10 +146,15 @@
         failure(json.result.msg);
         return;
       }
-      success(CONFIG.devServer.proxy['/'].target + json.data.path);
+      success(process.env.VUE_APP_BASE_API + json.data.path);
     };
     formData = new FormData();
     formData.append('file', file, file.name); //此处与源文档不一样
     xhr.send(formData);
   };
-</script>
+</script>
+<style>
+  .tox-tinymce-aux {
+    z-index: 3000 !important;
+  }
+</style>

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/router/index.js

@@ -303,7 +303,7 @@ export const constantRoutes = [{
     name: 'policyDelivery',
     meta: {
       title: '政策兑现',
-      icon: 'el-icon-star-off'
+      icon: 'el-icon-document'
     },
     children: [{
         path: 'index',

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/policyDelivery/PolicyDeliveryIndex.vue

@@ -73,7 +73,7 @@
         </el-table-column>
         <el-table-column :width="210" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button class="but" type="primary" @click="showEditForm(scope.row.id)">
+            <el-button class="but" type="primary" @click="showEditForm(scope.row)">
               编辑
             </el-button>
             <el-button class="but" type="danger" @click="del(scope.row.id)">
@@ -180,11 +180,11 @@ export default {
           //   prop: 'processingMaterials',
           //   checked: true // 动态列
           // },
-          {
-            label: '类型',
-            prop: 'type',
-            checked: true // 动态列
-          },
+          // {
+          //   label: '类型',
+          //   prop: 'type',
+          //   checked: true // 动态列
+          // },
           {
             label: '行业领域',
             prop: 'industrySectors',
@@ -193,6 +193,13 @@ export default {
           {
             label: '免申即享',
             prop: 'freeApplication',
+            transform(value) {
+              if (value === 2) {
+                return '是'
+              } else {
+                return '否'
+              }
+            },
             checked: true // 动态列
           },
           {
@@ -236,8 +243,8 @@ export default {
     showAddForm() {
       this.$refs.refPolicyDeliveryEdit.showEditForm()
     },
-    showEditForm(id) {
-      this.$refs.refPolicyDeliveryEdit.showEditForm(id)
+    showEditForm(data) {
+      this.$refs.refPolicyDeliveryEdit.showEditForm(data)
     },
     del(id) {
       const message = '您确定要删除该数据吗'

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/policyDelivery/components/PolicyDeliveryEdit.vue

@@ -1,47 +1,60 @@
 <template>
-  <el-dialog title="" :close-on-click-modal="false" class="detailDialog" :modal-append-to-body="false" append-to-body width="40%" :visible.sync="dialog.visible" @closed="afterFormClosed">
+  <el-dialog title="" top="10px" :close-on-click-modal="false" class="detailDialog" :modal-append-to-body="false"
+    append-to-body width="60%" :visible.sync="dialog.visible" @closed="afterFormClosed">
     <div slot="title" style="height: 10px;">
       <div class="addTitle">{{ dialog.title }}</div>
     </div>
-    <el-form ref="refForm" v-loading="form.loading" :model="form" :rules="rules" label-width="80px">
+    <el-form ref="refForm" style="height: 500px;overflow-y: scroll;padding-right: 30px;" v-loading="form.loading"
+      :model="form" :rules="rules" label-width="80px">
       <el-form-item prop="title" label="标题">
         <el-input v-model="form.title" placeholder="标题" maxlength="255" />
       </el-form-item>
       <el-form-item prop="unit" label="单位">
         <el-input v-model="form.unit" placeholder="单位" maxlength="255" />
       </el-form-item>
-      <el-form-item prop="measures" label="惠企措施">
-        <el-input v-model="form.measures" placeholder="惠企措施" maxlength="255" />
+      <el-form-item prop="measures" v-if="isRouterAlive" label="惠企措施">
+        <tinymce v-model="form.measures" :height="200" ref="editor" />
       </el-form-item>
-      <el-form-item prop="policyBasis" label="政策依据">
-        <el-input v-model="form.policyBasis" placeholder="政策依据" maxlength="255" />
+      <el-form-item prop="policyBasis" v-if="isRouterAlive" label="政策依据">
+        <tinymce v-model="form.policyBasis" :height="200" ref="editor" />
       </el-form-item>
-      <el-form-item prop="applicableConditions" label="适用条件">
-        <el-input v-model="form.applicableConditions" placeholder="适用条件" maxlength="255" />
+      <el-form-item prop="applicableConditions" v-if="isRouterAlive" label="适用条件">
+        <tinymce v-model="form.applicableConditions" :height="200" ref="editor" />
       </el-form-item>
-      <el-form-item prop="processingMethod" label="办理方式">
-        <el-input v-model="form.processingMethod" placeholder="办理方式" maxlength="255" />
+      <el-form-item prop="processingMethod" v-if="isRouterAlive" label="办理方式">
+        <tinymce v-model="form.processingMethod" :height="200" ref="editor" />
       </el-form-item>
-      <el-form-item prop="processingTime" label="办理时间">
-        <el-input v-model="form.processingTime" placeholder="办理时间" maxlength="255" />
+      <el-form-item prop="processingTime" v-if="isRouterAlive" label="办理时间">
+        <tinymce v-model="form.processingTime" :height="200" ref="editor" />
       </el-form-item>
-      <el-form-item prop="inquiryPhone" label="咨询电话">
-        <el-input v-model="form.inquiryPhone" placeholder="咨询电话" maxlength="255" />
+      <el-form-item prop="inquiryPhone" v-if="isRouterAlive" label="咨询电话">
+        <tinymce v-model="form.inquiryPhone" :height="200" ref="editor" />
       </el-form-item>
-      <el-form-item prop="procedure" label="办理流程">
-        <el-input v-model="form.procedure" placeholder="办理流程" maxlength="255" />
+      <el-form-item prop="procedure" v-if="isRouterAlive" label="办理流程">
+        <tinymce v-model="form.procedure" :height="200" ref="editor" />
       </el-form-item>
-      <el-form-item prop="processingMaterials" label="办理材料">
-        <el-input v-model="form.processingMaterials" placeholder="办理材料" maxlength="255" />
+      <el-form-item prop="processingMaterials" v-if="isRouterAlive" label="办理材料">
+        <tinymce v-model="form.processingMaterials" :height="200" ref="editor" />
       </el-form-item>
-      <el-form-item prop="type" label="类型">
+      <!-- <el-form-item prop="type" label="类型">
         <el-input v-model="form.type" placeholder="类型" maxlength="255" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item prop="industrySectors" label="行业领域">
-        <el-input v-model="form.industrySectors" placeholder="行业领域" maxlength="255" />
+        <!-- <el-input v-model="form.industrySectors" placeholder="行业领域" maxlength="255" /> -->
+        <el-checkbox-group v-model="form.industrySectors">
+          <el-checkbox v-for="(item, index) in industrySectorsList" key="index" :label="item"></el-checkbox>
+        </el-checkbox-group>
       </el-form-item>
       <el-form-item prop="freeApplication" label="免申即享">
-        <el-input v-model="form.freeApplication" placeholder="免申即享" maxlength="255" />
+        <!-- <el-input v-model="form.freeApplication" placeholder="免申即享" maxlength="255" /> -->
+        <el-select v-model="form.freeApplication" placeholder="请选择类型" style="margin-right: 10px;width: 200px">
+          <el-option
+            v-for="(item, index) in freeCode"
+            :key="index"
+            :value="item.value"
+            :label="item.label"
+          />
+        </el-select>
       </el-form-item>
     </el-form>
     <div slot="footer">
@@ -52,105 +65,24 @@
 </template>
 
 <script>
-import { isEmpty } from '@/utils/tool'
-import policyDeliveryApi from '@/api/policyDelivery'
+  import {
+    isEmpty,
+    copy
+  } from '@/utils/tool'
+  import { freeCode } from '../constants/codeConsts'
+  import policyDeliveryApi from '@/api/policyDelivery'
+  import Tinymce from '@/components/Tinymce'
 
-export default {
-  name: 'PolicyDeliveryEdit',
-  components: {},
-  data() {
-    return {
-      data: [], // 数据
-      form: {
-        id: '', // id
-        title: '', // 标题
-        unit: '', // 单位
-        measures: '', // 惠企措施
-        policyBasis: '', // 政策依据
-        applicableConditions: '', // 适用条件
-        processingMethod: '', // 办理方式
-        processingTime: '', // 办理时间
-        inquiryPhone: '', // 咨询电话
-        procedure: '', // 办理流程
-        processingMaterials: '', // 办理材料
-        type: '', // 类型
-        industrySectors: '', // 行业领域
-        freeApplication: '', // 免申即享
-        loading: false
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ]
-      },
-      dialog: {
-        title: '',
-        visible: false
-      }
-    }
-  },
-  computed: {},
-  methods: {
-    submitForm() {
-      this.$refs.refForm.validate().then(() => {
-        if (isEmpty(this.form.id)) {
-          policyDeliveryApi.policyDeliveryAdd({
-            ...this.form
-          }).then(res => {
-            if (res.data.result) {
-              this.$message({
-                type: 'success',
-                message: '添加成功!'
-              })
-              this.dialog.visible = false
-              this.$emit('update-table')
-            } else {
-              this.$message({
-                type: 'info',
-                message: res.data.msg
-              })
-            }
-          })
-        } else {
-          policyDeliveryApi.policyDeliveryUpdate({
-            ...this.form
-          }).then(res => {
-            if (res.data.result) {
-              this.$message({
-                type: 'success',
-                message: '修改成功!'
-              })
-              this.dialog.visible = false
-              this.$emit('update-table')
-            } else {
-              this.$message({
-                type: 'info',
-                message: res.data.msg
-              })
-            }
-          })
-        }
-      }).catch(() => {
-        console.log('验证失败')
-      })
+  export default {
+    name: 'PolicyDeliveryEdit',
+    components: {
+      Tinymce
     },
-    showEditForm(id) {
-      this.dialog.visible = true
-      this.form.loading = true
-      this.form.loading = false
-      if (id) {
-        this.dialog.title = '编辑'
-        this.form.id = id
-        const params = {
-          id: id
-        }
-        policyDeliveryApi.policyDeliveryInfo({ params }).then((res) => {
-          const ret = res.data.data || []
-          this.form = ret
-        })
-      } else {
-        this.dialog.title = '新增'
-        this.form = {
+    data() {
+      return {
+        freeCode: freeCode,
+        data: [], // 数据
+        form: {
           id: '', // id
           title: '', // 标题
           unit: '', // 单位
@@ -162,33 +94,160 @@ export default {
           inquiryPhone: '', // 咨询电话
           procedure: '', // 办理流程
           processingMaterials: '', // 办理材料
-          type: '', // 类型
-          industrySectors: '', // 行业领域
+          // type: '', // 类型
+          industrySectors: [], // 行业领域
           freeApplication: '', // 免申即享
           loading: false
-        }
+        },
+        rules: {
+          title: [{
+            required: true,
+            message: '请输入标题',
+            trigger: 'blur'
+          }],
+          unit: [{
+            required: true,
+            message: '请输入单位',
+            trigger: 'blur'
+          }],
+          freeApplication: [{
+            required: true,
+            message: '请选择免申即享',
+            trigger: 'blur'
+          }],
+          industrySectors: [{
+            required: true,
+            message: '请选择行业领域',
+            trigger: 'blur'
+          }]
+        },
+        dialog: {
+          title: '',
+          visible: false
+        },
+        // 是否显示富文本
+        isRouterAlive: true,
+        industrySectorsList: ['文化旅游业', '外资外贸', '普惠性', '批发零售业', '农业', '科技创新',
+        '交通运输业', '工业', '房地产', '餐饮住宿业'],
       }
     },
-    afterFormClosed() {
-      this.$refs.refForm.resetFields()
-      this.form.id = null
+    computed: {},
+    methods: {
+      submitForm() {
+        this.$refs.refForm.validate().then(() => {
+          const tempPost = copy(this.form)
+          if (!isEmpty(tempPost.industrySectors)) {
+            tempPost.industrySectors = tempPost.industrySectors.join(',')
+          } else {
+            tempPost.industrySectors = ''
+            this.$message({
+              type: 'warning',
+              message: '请选择行业领域'
+            })
+          }
+          if (isEmpty(tempPost.id)) {
+            policyDeliveryApi.policyDeliveryAdd({
+              ...tempPost
+            }).then(res => {
+              if (res.data.result) {
+                this.$message({
+                  type: 'success',
+                  message: '添加成功!'
+                })
+                this.dialog.visible = false
+                this.$emit('update-table')
+              } else {
+                this.$message({
+                  type: 'info',
+                  message: res.data.msg
+                })
+              }
+            })
+          } else {
+            policyDeliveryApi.policyDeliveryUpdate({
+              ...tempPost
+            }).then(res => {
+              if (res.data.result) {
+                this.$message({
+                  type: 'success',
+                  message: '修改成功!'
+                })
+                this.dialog.visible = false
+                this.$emit('update-table')
+              } else {
+                this.$message({
+                  type: 'info',
+                  message: res.data.msg
+                })
+              }
+            })
+          }
+        }).catch(() => {
+          console.log('验证失败')
+        })
+      },
+      showEditForm(data) {
+        this.dialog.visible = true
+        this.form.loading = true
+        this.form.loading = false
+        if (data) {
+          this.isRouterAlive = false
+          this.dialog.title = '编辑'
+          this.$nextTick(() => {
+            this.form = JSON.parse(JSON.stringify(data))
+            if (this.form.industrySectors && !isEmpty(this.form.industrySectors)) {
+              this.form.industrySectors = this.form.industrySectors.split(',')
+            } else {
+              this.form.industrySectors = []
+            }
+            console.log(this.form)
+            this.isRouterAlive = true
+          })
+        } else {
+          this.isRouterAlive = false
+          this.dialog.title = '新增'
+          this.$nextTick(() => {
+            this.form = {
+            id: '', // id
+            title: '', // 标题
+            unit: '', // 单位
+            measures: '', // 惠企措施
+            policyBasis: '', // 政策依据
+            applicableConditions: '', // 适用条件
+            processingMethod: '', // 办理方式
+            processingTime: '', // 办理时间
+            inquiryPhone: '', // 咨询电话
+            procedure: '', // 办理流程
+            processingMaterials: '', // 办理材料
+            // type: [], // 类型
+            industrySectors: [], // 行业领域
+            freeApplication: 1, // 免申即享
+            loading: false
+            }
+            this.isRouterAlive = true
+          })
+        }
+      },
+      afterFormClosed() {
+        this.$refs.refForm.resetFields()
+        this.form.id = null
+      }
     }
   }
-}
 </script>
 
 <style lang="less" scoped>
-.menu-edit {
-  .color {
-    position: absolute;
-    right: 2px;
-    top: 2px;
-    z-index: 3;
+  .menu-edit {
+    .color {
+      position: absolute;
+      right: 2px;
+      top: 2px;
+      z-index: 3;
+    }
   }
-}
 
-.addTitle {
-        font-size: 18px;
-        font-weight: bold;
-    }
+  .addTitle {
+    font-size: 18px;
+    font-weight: bold;
+  }
 </style>

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/policyDelivery/constants/codeConsts.js

@@ -10,3 +10,15 @@ export const policyDeliveryState = [
   }
 ]
 
+// 免申即享选项
+export const freeCode = [
+  {
+    // 状态
+    value: 1,
+    label: '否'
+  },
+  {
+    value: 2,
+    label: '是'
+  }
+]

nngkxxdp/src/main/resources/static/natj/dataCenter/indexMobile.html

@@ -329,7 +329,7 @@
 <!-- 社会救助数据js -->
 <script src="js/socialAssistanceMobile.js"></script>
 <!-- 文化文旅数据js -->
-<script src="js/culturalTourism.js"></script>
+<script src="js/culturalTourismMobile.js"></script>
 <!-- 卫生医疗数据js -->
 <script src="js/healthCareNewMobile.js"></script>
 <!-- 教育领域数据js -->

nngkxxdp/src/main/resources/static/natj/dataCenter/js/culturalTourismMobile.js

@@ -0,0 +1,382 @@
+function culturalTourism() {
+    // 文化旅游
+    $('.cumulat').removeClass('click');
+    $('.thisMonth').addClass('click');
+    var shbzTableHtml = `
+        <ul class="title">
+        <li style="width: 101px;">范围</li>
+        <li><span>旅游总收入</span><span>（万元）</span></li>
+        <li><span>旅游从业人数</span><span>（人）</span></li>
+        </ul>
+                    <ul class="number">
+                        <li style="width: 100px;">当月</li>
+                        <li>322,450</li>
+                        <li>31,012</li>
+                    </ul>
+                `
+    $(".wsylTable").empty().html(shbzTableHtml)
+    var chartDom = document.getElementById('whlyEchar');
+    var myChart = echarts.init(chartDom);
+    var alldata = [[4256415, 225424], [31762696, 1724264]];
+    var option;
+    var data = alldata[0]
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            left: 100
+        },
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'none',
+            formatter: function (params) {
+                let total = params[0].value + params[1].value;
+                var html = "";
+                html = `<div
+                    style="font-size: 14px;font-family: Microsoft YaHei;color: #FFFFFF;width: 206px;border-radius: 10px;box-sizing: border-box;position: relative;">
+                    <div>`+ params[0].axisValue + `：</div>
+                    <div>`+ total.toLocaleString() + `人次<span style="margin-left:20px;"></span></div>
+                    <div style="width: 272px;height: 1px;background:rgb(255 255 255 / 32%);margin: 10px 0;"></div>
+                    <div><span
+                            style="width: 11px;height: 11px;background: `+ params[0].color + `;border-radius: 6px;display:inline-block;margin-right:5px;"></span><span>` + params[0].seriesName + `：
+                        `+ params[0].value.toLocaleString() + `人次</span>
+                    </div>
+                    <div><span
+                            style="width: 11px;height: 11px;background: `+ params[1].color + `;border-radius: 6px;display:inline-block;margin-right:5px;"></span><span>` + params[1].seriesName + `：
+                        `+ params[1].value.toLocaleString() + `人次</span><span style="margin-left:20px;"></span>
+                    </div>
+                </div>`
+                return html;
+            },
+            confine: true
+        },
+        xAxis: {
+            type: 'category',
+            data: ['接待海内外游客', '过夜游客'],
+            axisLabel: {
+                show: true,
+				rotate: -30,
+                textStyle: {
+                    color: '#333',  //更改坐标轴文字颜色
+                    fontSize: 14      //更改坐标轴文字大小
+                }
+            },
+            isTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            },
+        },
+        yAxis: {
+            type: 'value',
+            min: 0,
+            max: 5000000,
+            interval: 1000000,
+            axisLabel: {
+                formatter: '{value}人次'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        },
+        series: [
+            {
+                name: '海外游客',
+                barWidth: 100,
+                data: [0, 0],
+                type: 'bar',
+                itemStyle: {
+                    color: '#A7D0FD'
+                },
+
+            },
+            //4256415 225424 322450 31012
+            //31762696 1724264 2370899 286838
+            {
+                name: '海内游客',
+                barWidth: 100,
+                data: data,
+                type: 'bar',
+                barGap: '-100%',//移动第二个柱子的位置实现重叠
+                z: '-1',//改变这根柱子的层级使这根柱子在下面,
+                itemStyle: {
+                    color: '#509EF3'
+                }
+
+            }
+        ]
+    };
+    option && myChart.setOption(option);
+    // 文化旅游
+    $('.thisMonth').click(function () {
+        $('.cumulat').removeClass('click');
+        $('.thisMonth').addClass('click');
+        var shbzTableHtml = `
+        <ul class="title">
+        <li style="width: 101px;">范围</li>
+        <li><span>旅游总收入</span><span>（万元）</span></li>
+        <li><span>旅游从业人数</span><span>（人）</span></li>
+        </ul>
+                    <ul class="number">
+                        <li style="width: 100px;">当月</li>
+                        <li>322,450</li>
+                        <li>31,012</li>
+                    </ul>
+                `
+        $(".wsylTable").empty().html(shbzTableHtml)
+        var option;
+        var data = alldata[0]
+        option = {
+            grid: {
+                // 网格线配置
+                show: true,
+                lineStyle: {
+                    color: ["#e9e9e9"],
+                    width: 1,
+                    type: "solid",
+                },
+                left: 100
+            },
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                    type: 'shadow'
+                },
+                backgroundColor: "rgb(0 0 0 / 40%)",
+                borderColor: 'none',
+                formatter: function (params) {
+                    let total = params[0].value + params[1].value;
+                    var html = "";
+                    html = `<div
+                    style="font-size: 14px;font-family: Microsoft YaHei;color: #FFFFFF;width: 206px;border-radius: 10px;box-sizing: border-box;position: relative;">
+                    <div>`+ params[0].axisValue + `：</div>
+                    <div>`+ total.toLocaleString() + `人次<span style="margin-left:20px;"></span></div>
+                    <div style="width: 272px;height: 1px;background:rgb(255 255 255 / 32%);margin: 10px 0;"></div>
+                    <div><span
+                            style="width: 11px;height: 11px;background: `+ params[0].color + `;border-radius: 6px;display:inline-block;margin-right:5px;"></span><span>` + params[0].seriesName + `：
+                        `+ params[0].value.toLocaleString() + `人次</span>
+                    </div>
+                    <div><span
+                            style="width: 11px;height: 11px;background: `+ params[1].color + `;border-radius: 6px;display:inline-block;margin-right:5px;"></span><span>` + params[1].seriesName + `：
+                        `+ params[1].value.toLocaleString() + `人次</span><span style="margin-left:20px;"></span>
+                    </div>
+                </div>`
+                    return html;
+                },
+                confine: true
+            },
+            xAxis: {
+                type: 'category',
+                data: ['接待海内外游客', '过夜游客'],
+                axisLabel: {
+                    show: true,
+                    rotate: -30,
+                    textStyle: {
+                        color: '#333',  //更改坐标轴文字颜色
+                        fontSize: 14      //更改坐标轴文字大小
+                    }
+                },
+                isTick: {
+                    show: true  //坐标轴刻度线
+                },
+                axisLine: { //轴线
+                    show: true
+                },
+                splitLine: { //网格线
+                    show: true
+                },
+            },
+            yAxis: {
+                type: 'value',
+                min: 0,
+                max: 5000000,
+                interval: 1000000,
+                axisLabel: {
+                    formatter: '{value}(人次)'
+                },
+                axisTick: {
+                    show: true  //坐标轴刻度线
+                },
+                axisLine: { //轴线
+                    show: true
+                },
+                splitLine: { //网格线
+                    show: true
+                }
+            },
+            series: [
+                {
+                    name: '海外游客',
+                    barWidth: 100,
+                    data: [0, 0],
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#A7D0FD'
+                    }
+                },
+                //4256415 225424 322450 31012
+                //31762696 1724264 2370899 286838
+                {
+                    name: '海内游客',
+                    barWidth: 100,
+                    data: data,
+                    type: 'bar',
+                    barGap: '-100%',//移动第二个柱子的位置实现重叠
+                    z: '-1',//改变这根柱子的层级使这根柱子在下面,
+                    itemStyle: {
+                        color: '#509EF3'
+                    }
+
+                }
+            ]
+        };
+        myChart.clear();
+        option && myChart.setOption(option);
+    })
+    $('.cumulat').click(function () {
+        $('.cumulat').addClass('click');
+        $('.thisMonth').removeClass('click');
+        var shbzTableHtml = `
+        <ul class="title">
+        <li style="width: 101px;">范围</li>
+        <li><span>旅游总收入</span><span>（万元）</span></li>
+        <li><span>旅游从业人数</span><span>（人）</span></li>
+        </ul>
+                    <ul class="number">
+                        <li style="width: 100px;">累计</li>
+                        <li>2,370,899</li>
+                        <li>286,838</li>
+                    </ul>
+                `
+        $(".wsylTable").empty().html(shbzTableHtml)
+        var option;
+        var data = alldata[1]
+        option = {
+            grid: {
+                // 网格线配置
+                show: true,
+                lineStyle: {
+                    color: ["#e9e9e9"],
+                    width: 1,
+                    type: "solid",
+                },
+                left: 110
+            },
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                    type: 'shadow'
+                },
+                backgroundColor: "rgb(0 0 0 / 40%)",
+                borderColor: 'none',
+                formatter: function (params) {
+                    let total = params[0].value + params[1].value;
+                    
+                    var html = "";
+                    html = `<div
+                    style="font-size: 14px;font-family: Microsoft YaHei;color: #FFFFFF;width: 206px;border-radius: 10px;box-sizing: border-box;position: relative;">
+                    <div>`+ params[0].axisValue + `：</div>
+                    <div>`+ total.toLocaleString() + `人次<span style="margin-left:20px;"></span></div>
+                    <div style="width: 272px;height: 1px;background:rgb(255 255 255 / 32%);margin: 10px 0;"></div>
+                    <div><span
+                            style="width: 11px;height: 11px;background: `+ params[0].color + `;border-radius: 6px;display:inline-block;margin-right:5px;"></span><span>` + params[0].seriesName + `：
+                        `+ params[0].value.toLocaleString() + `人次</span>
+                    </div>
+                    <div><span
+                            style="width: 11px;height: 11px;background: `+ params[1].color + `;border-radius: 6px;display:inline-block;margin-right:5px;"></span><span>` + params[1].seriesName + `：
+                        `+ params[1].value.toLocaleString() + `人次</span><span style="margin-left:20px;"></span>
+                    </div>
+                </div>`
+                    return html;
+                },
+                confine: true
+            },
+            xAxis: {
+                type: 'category',
+                data: ['接待海内外游客', '过夜游客'],
+                axisLabel: {
+                    show: true,
+                    rotate: -30,
+                    textStyle: {
+                        color: '#333',  //更改坐标轴文字颜色
+                        fontSize: 14      //更改坐标轴文字大小
+                    }
+                },
+                isTick: {
+                    show: true  //坐标轴刻度线
+                },
+                axisLine: { //轴线
+                    show: true
+                },
+                splitLine: { //网格线
+                    show: true
+                },
+            },
+            yAxis: {
+                type: 'value',
+                min: 0,
+                max: 35000000,
+                interval: 10000000,
+                axisLabel: {
+                    formatter: '{value}(人次)'
+                },
+                axisTick: {
+                    show: true  //坐标轴刻度线
+                },
+                axisLine: { //轴线
+                    show: true
+                },
+                splitLine: { //网格线
+                    show: true
+                }
+            },
+            series: [
+                {
+                    name: '海外游客',
+                    barWidth: 100,
+                    data: [0, 0],
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#A7D0FD'
+                    }
+                },
+                //4256415 225424 322450 31012
+                //31762696 1724264 2370899 286838
+                {
+                    name: '海内游客',
+                    barWidth: 100,
+                    data: data,
+                    type: 'bar',
+                    barGap: '-100%',//移动第二个柱子的位置实现重叠
+                    z: '-1',//改变这根柱子的层级使这根柱子在下面,
+                    itemStyle: {
+                        color: '#509EF3'
+                    }
+
+                }
+            ]
+        };
+        myChart.clear();
+        option && myChart.setOption(option);
+    })
+
+}

nngkxxdp/src/main/resources/static/natj/dataCenter/js/education.js

@@ -55,7 +55,7 @@ function education() {
         "jdgc": 3794
     }]
     // 初始化年份
-    document.getElementById("yearl").value = '2021';
+    try{document.getElementById("yearl").value = '2021';}catch(e){}
     // 学生人数
     var chartDom = document.getElementById('jylyPerEchar');
     var myChart = echarts.init(chartDom);

nngkxxdp/src/main/resources/static/natj/dataCenter/js/healthCareNew.js

@@ -37,14 +37,9 @@ function healthCareNew() {
             left: 100
         },
         legend: [{
-            left: '20%',
-            orient: 'vertical',
-            data: ['医疗卫生机构床位数(个)', '医院、卫生院床位数(个)']
-        },
-        {
-            left: '60%',
-            orient: 'vertical',
-            data: ['保健院床位数(个)']
+            left: '15%',
+            top:'4%',
+            data: ['医疗卫生机构床位数(个)', '医院、卫生院床位数(个)','保健院床位数(个)']
         }
         ],
         tooltip: {

nngkxxdp/src/main/resources/static/natj/dataCenter/js/socialSecurity.js

@@ -26,8 +26,7 @@ function socialSecurity() {
         "casesClose": 3697,
         "arbitratAward": 318,
         "closeRate": 87
-    }]
-    
+    }]    
     // 初始化年份
     console.log(document.getElementById("year"))
     document.getElementById("year").value='2022';

nngkxxdp/src/main/resources/static/natj/enter_dataIndex.html

@@ -0,0 +1,678 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>数据汇总页面-重庆市南岸区人民政府网</title>
+    <link rel="stylesheet" href="dataCenter/css/conmon.css">
+    <link rel="stylesheet" href="./layui/layui.css" media="all">
+    <link rel="stylesheet" href="dataCenter/css/index.css">
+    <style>
+        body {
+            font-family: Microsoft YaHei;
+            background-color: #f5f5f5;
+        }
+
+        .main {
+            width: 1400px;
+            margin: 10px auto;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+        }
+
+        .plate {
+            width: 690px;
+            height: 448px;
+            background: #FFFFFF;
+            box-shadow: 0px 3px 12px 1px rgba(132, 133, 131, 0.2);
+            margin-bottom: 25px;
+        }
+
+        .plate .title {
+            width: 95%;
+            display: flex;
+            height: 60px;
+            justify-content: space-between;
+            align-items: center;
+            margin: auto;
+        }
+
+        .plate .title .more {
+            font-size: 14px;
+            font-weight: 400;
+            color: #125DB2;
+            cursor: pointer;
+        }
+
+
+        .plate .left {
+            display: flex;
+            align-items: flex-start;
+        }
+
+        .plate .left img {
+            margin-top: 5px;
+        }
+
+        .plate .left .theam {
+            font-size: 30px;
+            font-family: Microsoft YaHei;
+            font-weight: bold;
+            font-style: italic;
+            color: #125DB2;
+            width: 300px;
+            height: 44px;
+            background-image: url(images/bgline.png);
+            background-size: 100% 100%;
+            margin-left: 10px;
+            padding-left: 8px;
+            box-sizing: border-box;
+            line-height: 36px;
+        }
+
+        .plate .name {
+            width: 100%;
+            text-align: center;
+            font-size: 14px;
+            font-weight: bold;
+            color: #1267C7;
+            line-height: 26px;
+        }
+
+        .div-shbz .itemData li {
+            width: 318px;
+            height: 102px;
+            background: #F0F0F0;
+            font-size: 16px;
+        }
+
+        .div-shbz .itemData li .right .bottom .number {
+            font-size: 27px;
+        }
+
+        .plate .content {
+            display: flex;
+            width: 100%;
+            height: 350px;
+            flex-wrap: wrap;
+            justify-content: space-evenly;
+        }
+
+
+        .plate .content .right {
+            display: flex;
+            flex-direction: column;
+            margin-left: 20px;
+            float: right;
+            margin-top: 10px;
+        }
+
+        .plate .content span {
+            font-size: 24px;
+            color: #666666;
+        }
+
+        .plate .content i {
+            font-size: 30px;
+            font-weight: bold;
+            color: #333333;
+        }
+
+        .div-whwl .range {
+            margin-right: 15px;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="main">
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-gmjj.png" alt="" style="width: 32px;height:28px;">
+                    <div class="theam">国民经济</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/bm/qtjj/gmjjtj/')">更多</div>
+            </div>
+            <div class="name">GDP地区生产总值</div>
+            <div id="gdpmain" style="height: 350px;width: 690px;">
+            </div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-zwfw.png" alt="">
+                    <div class="theam">政务服务</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/sjtj1/')">更多</div>
+            </div>
+            <div class="name">一窗通办</div>
+            <div class="content">
+                <div class="list">
+                    <img src="images/zw2.png" alt="">
+                    <div class="right">
+                        <span>申请数</span>
+                        <i id="timer10" class="numChange">0</i>
+                    </div>
+                </div>
+                <div class="list">
+                    <img src="images/zw1.png" alt="">
+                    <div class="right">
+                        <span>办件数</span>
+                        <i id="timer11" class="numChange">0</i>
+                    </div>
+                </div>
+                <div class="list">
+                    <img src="images/zw4.png" alt="">
+                    <div class="right">
+                        <span>不予受理数</span>
+                        <i id="timer12" class="numChange">0</i>
+                    </div>
+                </div>
+                <div class="list">
+                    <img src="images/zw3.png" alt="">
+                    <div class="right">
+                        <span>办结数</span>
+                        <i id="timer13" class="numChange">0</i>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-shbz.png" alt="" style="width: 30px;height:34px;">
+                    <div class="theam">社会保障</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=1')">
+                    更多</div>
+            </div>
+            <div class="div-shbz">
+                <ul class="itemData">
+                    <li>
+                        <img src="images/jz1.png" alt="">
+                        <div class="right">
+                            <div>城镇新增就业人数</div>
+                            <div class="bottom">
+                                <div class="number">3.8</div>
+                                <div class="unit">万人</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz2.png" alt="">
+                        <div class="right">
+                            <div>城镇登记失业人员就业人数</div>
+                            <div class="bottom">
+                                <div class="number">0.93</div>
+                                <div class="unit">万人</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz3.png" alt="">
+                        <div class="right">
+                            <div>城镇登记失业率</div>
+                            <div class="bottom">
+                                <div class="number">-</div>
+                                <div class="unit">%</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz5.png" alt="">
+                        <div class="right">
+                            <div>创业贷款发放金额</div>
+                            <div class="bottom">
+                                <div class="number">2466</div>
+                                <div class="unit">万元</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz6.png" alt="">
+                        <div class="right">
+                            <div>参加职业技能鉴定</div>
+                            <div class="bottom">
+                                <div class="number">7489</div>
+                                <div class="unit">人</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz4.png" alt="">
+                        <div class="right">
+                            <div>补贴性职业培训人数</div>
+                            <div class="bottom">
+                                <div class="number">0.74</div>
+                                <div class="unit">万人</div>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-gkxx.png" alt="" style="width: 34px;height:25px;">
+                    <div class="theam">公开信箱</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/hdjl_254/gkxxtjsj/')">更多</div>
+            </div>
+            <div class="name">本年度公开信箱办理情况</div>
+            <div id="caseChart" style="height: 350px;width: 690px;"></div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-whwl.png" alt="" style="width: 36px;height:25px;">
+                    <div class="theam">文化旅游</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=2')">
+                    更多</div>
+            </div>
+            <div class="div-whwl">
+                <div class="range">
+                    <button class="thisMonth click" style="border-radius: 4px 0px 0px 4px;border-right: none;"
+                        onlick="thisMonth()">本月</button>
+                    <button class="cumulat" style="border-radius: 0px 4px 4px 0px;border-left: none;">累计</button>
+                </div>
+            </div>
+            <div id="whlyEchar" style="height: 390px;width: 690px;"></div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-wsyl.png" alt="" style="width: 33px;height:30px;">
+                    <div class="theam">卫生医疗</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=3')">
+                    更多</div>
+            </div>
+            <div id="wsylchar" style="height: 420px;width: 690px;"></div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-shjz.png" alt="" style="width: 32px;height:32px;">
+                    <div class="theam">社会救助</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=4')">
+                    更多</div>
+            </div>
+            <div class="name" style="margin: 10px auto;">2021年最低生活保障数据</div>
+            <div id="shjzEchars" style="height: 380px;width: 690px;"></div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-jyly.png" alt="" style="width: 40px;height:30px;">
+                    <div class="theam">教育领域</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=5')">
+                    更多</div>
+            </div>
+            <div class="name">2021年学生人数与学校数统计</div>
+            <div style="display: flex;margin-top: 10px;">
+                <div id="jylyPerEchar" style="width: 300px;height:380px;"></div>
+                <div id="jylySchoolEchar" style="width: 390px;height:380px;"></div>
+            </div>
+        </div>
+    </div>
+</body>
+<script src="layui/layui.js"></script>
+<script src="js/echarts.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
+<script type="text/javascript" src="../constans.js" charset="utf-8"></script>
+<script src="../nngkxxdp/js/letterBox.js"></script>
+<!-- 文化文旅数据js -->
+<script src="../natj/dataCenter/js/culturalTourism.js"></script>
+<!-- 卫生医疗数据js -->
+<script src="../natj/dataCenter/js/healthCareNew.js"></script>
+<!-- 教育领域数据js -->
+<script src="../natj/dataCenter/js/education.js"></script>
+<script>
+    //国民经济
+    var list = ''
+
+    function getData(url) {
+        return new Promise((resolve, reject) => {
+            $.ajax({
+                url: url,
+                dataType: 'json',
+                success: function (scenetree) {
+                    if (scenetree) {
+                        resolve(scenetree);
+                    }
+
+                }
+            });
+        })
+    }
+    function getBarg(list, unit) {
+        // var dateNum = ['date'];
+        var dateNum = [];
+        var alloneBasis = [];
+        var growth = [];
+        var allData = ['季度'];
+        for (var i = 0; i < list.length; i++) {
+            for (var j = 1; j <= list[i].totalNum.length; j++) {
+                var str = ' ';
+                if (j == 1) {
+                    str = list[i].date + '年' + ' ' + '第1季度';
+                    dateNum.push(str);
+                } else {
+                    str = list[i].date + '年' + ' ' + '第1~' + j + '季度';
+                    dateNum.push(str);
+                }
+            }
+            var totalNumList = list[i].totalNum;
+            for (var k = 0; k < totalNumList.length; k++) {
+                allData.push(totalNumList[k]);
+            }
+            var alloneBasisList = list[i].alloneBasis;
+            for (var n = 0; n < alloneBasisList.length; n++) {
+                alloneBasis.push(alloneBasisList[n]);
+            }
+
+            var growthList = list[i].growth;
+            if (list[i].growth) {
+                for (var n = 0; n < growthList.length; n++) {
+                    growth.push(growthList[n]);
+                }
+            }
+
+
+        };
+        var sourceData = [dateNum, alloneBasis];
+
+        return {
+            legend: {},
+            grid: {
+                left: '2%',
+                right: '10%',
+                bottom: '-2%',
+                containLabel: true
+            },
+            tooltip: {
+                trigger: 'item',
+
+                formatter: function (params) {
+                    // console.log(params);
+                    var htmlStr = '';
+                    var color = params.color; //图例颜色
+                    var seriesName = params.seriesName; //图例名称
+                    var xName = params.name; //x轴的名称
+                    var value = params.value; //y轴值
+                    var htmlStr = '<div>';
+                    htmlStr += seriesName + '<br/>';
+                    htmlStr +=
+                        '<span style="margin-right: 5px; font-size: 16pt; font-family: Consolas;display: inline-block; width: 10px; height: 10px; border-radius: 50%; background-color:' +
+                        color + ' ;"></span>';
+                    htmlStr += "<span style='min-height: 20pt; font-size: 10pt'>";
+                    htmlStr += xName;
+                    htmlStr += '</span>';
+                    htmlStr += "<span style='min-height: 20pt; font-size: 10pt; margin-left: 20px'>";
+                    // console.log(params.data.length);
+                    if (!value.length) {
+                        htmlStr += value + '%';
+                    } else {
+                        htmlStr += value[params.seriesIndex + 1] + unit; //选择对应value的坐标
+                    }
+                    htmlStr += '</span>'
+                    htmlStr += '</div>';
+                    return htmlStr;
+                }
+            },
+            dataset: {
+                source: sourceData
+            },
+            xAxis: [{
+                type: 'category',
+                axisLabel: {
+                    formatter: '{value}',
+                    interval: 0,
+                    rotate: -40
+                },
+                data: sourceData[0]
+
+            },
+
+            ],
+            yAxis: [{
+                gridIndex: 0,
+                axisLabel: {
+                    formatter: '{value}' + unit
+                }
+            },
+            {
+                type: 'value',
+                axisLabel: {
+                    formatter: '{value}%'
+                }
+            }
+
+
+            ],
+            series: [
+                // {
+                // 	name: '同比增减（%）',
+                // 	type: 'line',
+                // 	color: ['#91CC75'],
+                // 	yAxisIndex: 0,
+                // 	data: alloneBasis
+                // },
+                {
+                    name: '同比增减（%）',
+                    type: 'line',
+                    color: ['#91CC75'],
+                    yAxisIndex: 0,
+                    data: growth,
+                    symbolSize: 3, //一定要加这个字段才能显示
+                    itemStyle: {
+                        normal: {
+                            label: {
+                                show: true,
+                                position: 'top',
+                                textStyle: {
+                                    color: '#000'
+                                }
+                            }
+                        }
+                    },
+                }
+            ]
+
+
+        }
+    }
+    getData('./json/jdp.json').then(data => {
+        var list = data.GDP
+        var myChart = echarts.init(document.getElementById('gdpmain'));
+        var option = getBarg(list, '%');
+        myChart.setOption(option, true);
+    })
+
+</script>
+<script>
+    //政务服务
+    var path = "https://data.cqna.gov.cn";
+
+    console.log(window.setInterval("initDate(1)", 1000 * 30));
+    function initDate(area) {
+
+        $.ajax({
+            url: path + "/department/queryDepartmentItemRankByArea", //url地址
+            dataType: "json", //返回的数据类型
+            type: "get", //发起请求的方式
+            async: false,
+            data: {
+                "area": area
+            },
+            success: function (data) {
+                var listWeb = data.data.listWeb
+                application(data.data.listWeb)
+                return listWeb;
+            },
+
+
+            error: function () {
+                alert('网络错误，请稍后再试！');
+            }
+        });
+
+    }
+    //加载南岸区四窗同办
+    function application(listWeb) {
+        $("#timer10").html(listWeb.applicationNumber);
+        $("#timer11").html(listWeb.acceptNumber);
+        $("#timer12").html(listWeb.rejectionNumber);
+        $("#timer13").html(listWeb.serialNumber);
+    }
+</script>
+<script>
+    //社会救助
+    var jsonData = [
+        ['product', '最低生活保障人数(人)', '发放低保金(万元)', '城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)', '农村居民最低生活保障人数(人)', '农村居民发放低保金(万元)'],
+        ['2021年', 7467, 5800.80, 6792, 5317.40, 675, 483.40]
+    ]
+    var chartDom = document.getElementById('shjzEchars');
+    var myChart = echarts.init(chartDom);
+    var option;
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            right: 80
+        },
+        legend: [{
+            left: '2%',
+            orient: 'vertical',
+            data: ['最低生活保障人数(人)', '发放低保金(万元)']
+        },
+        {
+            left: '30%',
+            orient: 'vertical',
+            data: ['城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)']
+        }, {
+            left: '60%',
+            orient: 'vertical',
+            data: ['农村居民最低生活保障人数(人)', '农村居民发放低保金(万元)']
+        }
+        ],
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+            confine: true
+
+        },
+        dataset: {
+            source: jsonData
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: false  //坐标轴刻度线
+            },
+            axisLabel: {
+                show: false
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 12000,
+            interval: 3000,
+            axisLabel: {
+                formatter: '{value}(人)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        },
+        {
+            type: 'value',
+            min: 0,
+            max: 8000,
+            interval: 2000,
+            axisLabel: {
+                formatter: '{value}(万元)'
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#3C8DE6'
+            }
+        },
+        {
+            yAxisIndex: 1,
+            type: 'bar',
+            itemStyle: {
+                color: '#FAA639'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#8EC051'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#FA8A46'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#4DC4E7'
+            }
+        },
+        ]
+    };
+    option && myChart.setOption(option);
+</script>
+<script>
+    //公开信箱
+    drawHandleByBarChart();
+    //文化文旅
+    culturalTourism();
+    //教育领域
+    education();
+    //卫生医疗
+    healthCareNew();
+</script>
+
+</html>

nngkxxdp/src/main/resources/static/natj/enter_dataIndexMobile.html

@@ -0,0 +1,674 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>数据汇总页面-重庆市南岸区人民政府网</title>
+    <link rel="stylesheet" href="dataCenter/css/conmon.css">
+    <link rel="stylesheet" href="./layui/layui.css" media="all">
+    <link rel="stylesheet" href="dataCenter/css/indexMbile.css">
+    <style>
+        body {
+            font-family: Microsoft YaHei;
+        }
+
+        .main {
+            width: 100vw;
+            margin: 10px auto;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+        }
+
+        .plate {
+            width: 100vw;
+            background: #FFFFFF;
+            box-shadow: 0px 3px 12px 1px rgba(132, 133, 131, 0.2);
+            margin-bottom: 25px;
+        }
+
+        .plate .title {
+            width: 95%;
+            display: flex;
+            height: 60px;
+            justify-content: space-between;
+            align-items: center;
+            margin: auto;
+        }
+
+        .plate .title .more {
+            font-size: 12px;
+            font-weight: 400;
+            color: #125DB2;
+            cursor: pointer;
+        }
+        
+
+        .plate .left {
+            display: flex;
+            align-items: flex-start;
+        }
+        .plate .left img{
+            margin-top: 2px;
+        }
+
+        .plate .left .theam {
+            font-size: 18px;
+            font-family: Microsoft YaHei;
+            font-weight: bold;
+            font-style: italic;
+            color: #125DB2;
+            width: 196px;
+            height: 30px;
+            background-image: url(images/bglinem.png);
+            background-size: 100% 100%;
+            margin-left: 2px;
+            padding-left: 5px;
+            box-sizing: border-box;
+            line-height: 25px;
+        }
+
+        .plate .name {
+            width: 100%;
+            text-align: center;
+            font-size: 14px;
+            font-weight: bold;
+            color: #1267C7;
+            line-height: 26px;
+        }
+
+        .div-shbz .itemData li {
+            margin-bottom: 10px;
+        }
+
+        .plate .content {
+            display: flex;
+            width: 100%;
+            height: 250px;
+            flex-wrap: wrap;
+            justify-content: space-evenly;
+        }
+
+        .plate .content .list {
+            display: flex;
+            align-items: center;
+            width: 40%;
+            height: 60px;
+        }
+
+        .plate .content .right {
+            display: flex;
+            flex-direction: column;
+            margin-left: 5px;
+        }
+
+        .plate .content span {
+            font-size: 16px;
+            color: #666666;
+        }
+
+        .plate .content i {
+            font-size: 18px;
+            font-weight: bold;
+            color: #333333;
+        }
+
+        .div-whwl .range {
+            margin-right: 15px;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="main">
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-gmjjs.png" alt="" style="width: 20px;height:18px;">
+                    <div class="theam">国民经济</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/bm/qtjj/gmjjtj/')">更多</div>
+            </div>
+            <div class="name">GDP地区生产总值</div>
+            <div id="gdpmain" style="height: 350px;width: 100vw;">
+            </div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-zwfws.png" alt="" style="width: 22px;height:19px;">
+                    <div class="theam">政务服务</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/sjtj1/')">更多</div>
+            </div>
+            <div class="name">一窗通办</div>
+            <div class="content">
+                <div class="list">
+                    <img src="images/zw2m.png" alt="" style="width:88px;height:59px;">
+                    <div class="right">
+                        <span>申请数</span>
+                        <i id="timer10" class="numChange">0</i>
+                    </div>
+                </div>
+                <div class="list">
+                    <img src="images/zw1m.png" alt="" style="width:88px;height:75px;">
+                    <div class="right">
+                        <span>办件数</span>
+                        <i id="timer11" class="numChange">0</i>
+                    </div>
+                </div>
+                <div class="list">
+                    <img src="images/zw4m.png" alt="" style="width:88px;height:66px;">
+                    <div class="right">
+                        <span>不予受理数</span>
+                        <i id="timer12" class="numChange">0</i>
+                    </div>
+                </div>
+                <div class="list">
+                    <img src="images/zw3m.png" alt="" style="width:88px;height:67px;">
+                    <div class="right">
+                        <span>办结数</span>
+                        <i id="timer13" class="numChange">0</i>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-shbzs.png" alt="" style="width: 18px;height:19px;">
+                    <div class="theam">社会保障</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/indexMobile.html?id=1')">
+                    更多</div>
+            </div>
+            <div class="div-shbz">
+                <ul class="itemData">
+                    <li>
+                        <img src="images/jz1.png" alt="">
+                        <div class="right">
+                            <div>城镇新增就业人数</div>
+                            <div class="bottom">
+                                <div class="number">3.8</div>
+                                <div class="unit">万人</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz2.png" alt="">
+                        <div class="right">
+                            <div>城镇登记失业人员就业人数</div>
+                            <div class="bottom">
+                                <div class="number">0.93</div>
+                                <div class="unit">万人</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz3.png" alt="">
+                        <div class="right">
+                            <div>城镇登记失业率</div>
+                            <div class="bottom">
+                                <div class="number">-</div>
+                                <div class="unit">%</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz5.png" alt="">
+                        <div class="right">
+                            <div>创业贷款发放金额</div>
+                            <div class="bottom">
+                                <div class="number">2466</div>
+                                <div class="unit">万元</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz6.png" alt="">
+                        <div class="right">
+                            <div>参加职业技能鉴定</div>
+                            <div class="bottom">
+                                <div class="number">7489</div>
+                                <div class="unit">人</div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <img src="images/jz4.png" alt="">
+                        <div class="right">
+                            <div>补贴性职业培训人数</div>
+                            <div class="bottom">
+                                <div class="number">0.74</div>
+                                <div class="unit">万人</div>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-gkxxs.png" alt="" style="width: 18px;height:14px;">
+                    <div class="theam">公开信箱</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/hdjl_254/gkxxtjsj/')">更多</div>
+            </div>
+            <div class="name">本年度公开信箱办理情况</div>
+            <div id="caseChart" style="height: 350px;width: 100vw;"></div>
+        </div>
+        <div class="plate" style="overflow: hidden;">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-whwls.png" alt="" style="width: 20px;height:14px;">
+                    <div class="theam">文化旅游</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/indexMobile.html?id=2')">
+                    更多</div>
+            </div>
+            <div class="div-whwl">
+                <div class="range">
+                    <button class="thisMonth click" style="border-radius: 4px 0px 0px 4px;border-right: none;"
+                        onlick="thisMonth()">本月</button>
+                    <button class="cumulat" style="border-radius: 0px 4px 4px 0px;border-left: none;">累计</button>
+                </div>
+            </div>
+            <div id="whlyEchar" style="height: 390px;width: 98vw;margin: auto;"></div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-wsyls.png" alt="" style="width: 18px;height:17px;">
+                    <div class="theam">卫生医疗</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/indexMobile.html?id=3')">
+                    更多</div>
+            </div>
+            <div id="wsylchar" style="height: 420px;width: 98vw;margin: auto;"></div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-shjzs.png" alt="" style="width: 19px;height:17px;">
+                    <div class="theam">社会救助</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/indexMobile.html?id=4')">
+                    更多</div>
+            </div>
+            <div class="name" style="margin: 10px auto;">2021年最低生活保障数据</div>
+            <div id="shjzEchars" style="height: 380px;width: 100vw;"></div>
+        </div>
+        <div class="plate">
+            <div class="title">
+                <div class="left">
+                    <img src="images/logo-jylys.png" alt="" style="width: 23px;height:18px;">
+                    <div class="theam">教育领域</div>
+                </div>
+                <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/indexMobile.html?id=5')">
+                    更多</div>
+            </div>
+            <div class="name">2021年学生人数与学校数统计</div>
+            <div style="margin-top: 10px;">
+                <div id="jylyPerEchar" style="width: 100vw;height:380px;"></div>
+                <div id="jylySchoolEchar" style="width: 100vw;height:380px;"></div>
+            </div>
+        </div>
+    </div>
+</body>
+<script src="layui/layui.js"></script>
+<script src="js/echarts.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
+<script type="text/javascript" src="../constans.js" charset="utf-8"></script>
+<script src="../nngkxxdp/js/letterBox.js"></script>
+<!-- 文化文旅数据js -->
+<script src="../natj/dataCenter/js/culturalTourismMobile.js"></script>
+<!-- 卫生医疗数据js -->
+<script src="../natj/dataCenter/js/healthCareNewMobile.js"></script>
+<!-- 教育领域数据js -->
+<script src="../natj/dataCenter/js/education.js"></script>
+<script>
+    //国民经济
+    var list = ''
+
+    function getData(url) {
+        return new Promise((resolve, reject) => {
+            $.ajax({
+                url: url,
+                dataType: 'json',
+                success: function (scenetree) {
+                    if (scenetree) {
+                        resolve(scenetree);
+                    }
+
+                }
+            });
+        })
+    }
+ 
+    function getBarg(list, unit) {
+	// var dateNum = ['date'];
+	var dateNum = [];
+	var alloneBasis = [];
+	var growth = [];
+	var allData = ['季度'];
+	for (var i = 0; i < list.length; i++) {
+		for (var j = 1; j <= list[i].totalNum.length; j++) {
+			var str = ' ';
+			if (j == 1) {
+				str = list[i].date + '年' + ' ' + '第1季度';
+				dateNum.push(str);
+			} else {
+				str = list[i].date + '年' + ' ' + '第1~' + j + '季度';
+				dateNum.push(str);
+			}
+		}
+		var totalNumList = list[i].totalNum;
+		for (var k = 0; k < totalNumList.length; k++) {
+			allData.push(totalNumList[k]);
+		}
+		var alloneBasisList = list[i].alloneBasis;
+		for (var n = 0; n < alloneBasisList.length; n++) {
+			alloneBasis.push(alloneBasisList[n]);
+		}
+
+		var growthList = list[i].growth;
+		if (list[i].growth) {
+			for (var n = 0; n < growthList.length; n++) {
+				growth.push(growthList[n]);
+			}
+		}
+
+
+	};
+	var sourceData = [dateNum, alloneBasis];
+
+	return {
+		legend: {},
+		grid: {
+			left: '2%',
+			right: '10%',
+			containLabel: true
+		},
+		dataZoom:[//x轴滑动条
+			{
+				type: 'slider',
+				show: true,
+				xAxisIndex: [0],
+				start: 0,    //初始化时，滑动条宽度开始标度
+				bottom: '7%',
+				end: 45,
+				height: 2,
+				fillerColor:'#3E86FF',
+				showDataShadow: false,//是否显示数据阴影 默认auto
+				showDetail: false,//即拖拽时候是否显示详细数值信息 默认true
+			},
+			{
+				type:'inside',
+				xAxisIndex:0,
+				zoomOnMouseWheel:false,  //滚轮是否触发缩放
+				moveOnMouseMove:true,  //鼠标滚轮触发滚动
+				moveOnMouseWheel:true
+			}
+		],
+		tooltip: {
+			trigger: 'axis',
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+            confine: true
+		},
+		dataset: {
+			source: sourceData
+		},
+		xAxis: [{
+			type: 'category',
+			axisLabel: {
+				formatter: '{value}',
+				interval: 0,
+				rotate: -40
+			},
+			data: sourceData[0]
+
+		},
+
+		],
+		yAxis: [{
+			gridIndex: 0,
+			axisLabel: {
+				formatter: '{value}' + unit
+			}
+		},
+		{
+			type: 'value',
+			axisLabel: {
+				formatter: '{value}%'
+			}
+		}
+
+
+		],
+		series: [
+			// {
+			// 	name: '同比增减（%）',
+			// 	type: 'line',
+			// 	color: ['#91CC75'],
+			// 	yAxisIndex: 0,
+			// 	data: alloneBasis
+			// },
+			{
+				name: '同比增减（%）',
+				type: 'line',
+				color: ['#91CC75'],
+				yAxisIndex: 0,
+				data: growth,
+				symbolSize: 3, //一定要加这个字段才能显示
+				itemStyle: {
+					normal: {
+						label: {
+							show: true,
+							position: 'top',
+							textStyle: {
+								color: '#000'
+							}
+						}
+					}
+				},
+			}
+		]
+
+
+	}
+}
+    getData('./json/jdp.json').then(data => {
+        var list = data.GDP
+        var myChart = echarts.init(document.getElementById('gdpmain'));
+        var option = getBarg(list, '%');
+        myChart.setOption(option, true);
+    })
+
+</script>
+<script>
+    //政务服务
+    var path = "https://data.cqna.gov.cn";
+
+    console.log(window.setInterval("initDate(1)", 1000 * 30));
+    function initDate(area) {
+
+        $.ajax({
+            url: path + "/department/queryDepartmentItemRankByArea", //url地址
+            dataType: "json", //返回的数据类型
+            type: "get", //发起请求的方式
+            async: false,
+            data: {
+                "area": area
+            },
+            success: function (data) {
+                var listWeb = data.data.listWeb
+                application(data.data.listWeb)
+                return listWeb;
+            },
+
+
+            error: function () {
+                alert('网络错误，请稍后再试！');
+            }
+        });
+
+    }
+    //加载南岸区四窗同办
+    function application(listWeb) {
+        $("#timer10").html(listWeb.applicationNumber);
+        $("#timer11").html(listWeb.acceptNumber);
+        $("#timer12").html(listWeb.rejectionNumber);
+        $("#timer13").html(listWeb.serialNumber);
+    }
+</script>
+<script>
+    //社会救助
+    var jsonData = [
+        ['product', '最低生活保障人数(人)', '发放低保金(万元)', '城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)', '农村居民最低生活保障人数(人)', '农村居民发放低保金(万元)'],
+        ['2021年', 7467, 5800.80, 6792, 5317.40, 675, 483.40]
+    ]
+    var chartDom = document.getElementById('shjzEchars');
+    var myChart = echarts.init(chartDom);
+    var option;
+    option = {
+        grid: {
+            // 网格线配置
+            show: true,
+            lineStyle: {
+                color: ["#e9e9e9"],
+                width: 1,
+                type: "solid",
+            },
+            right: 80,
+            left: 80,
+            top: '30%'
+        },
+        legend: [{
+            left: '2%',
+            orient: 'vertical',
+            data: ['最低生活保障人数(人)', '发放低保金(万元)', '城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)']
+        },
+        {
+            left: '42%',
+            orient: 'vertical',
+            data: ['农村居民最低生活保障人数(人)', '农村居民发放低保金(万元)']
+        }
+        ],
+        tooltip: {
+            trigger: 'axis',
+            position:['10%','20%'],
+            axisPointer: {
+                type: 'shadow'
+            },
+            backgroundColor: "rgb(0 0 0 / 40%)",
+            borderColor: 'transparent',
+            textStyle: {
+                color: '#fff'
+            },
+            confine: true
+
+        },
+        dataset: {
+            source: jsonData
+        },
+        xAxis: {
+            type: 'category',
+            axisTick: {
+                show: false  //坐标轴刻度线
+            },
+            axisLabel: {
+                show: false
+            }
+        },
+        yAxis: [{
+            type: 'value',
+            min: 0,
+            max: 12000,
+            interval: 3000,
+            axisLabel: {
+                formatter: '{value}(人)'
+            },
+            axisTick: {
+                show: true  //坐标轴刻度线
+            },
+            axisLine: { //轴线
+                show: true
+            },
+            splitLine: { //网格线
+                show: true
+            }
+        },
+        {
+            type: 'value',
+            min: 0,
+            max: 8000,
+            interval: 2000,
+            axisLabel: {
+                formatter: '{value}(万元)'
+            }
+        }],
+        series: [{
+            type: 'bar',
+            itemStyle: {
+                color: '#3C8DE6'
+            }
+        },
+        {
+            yAxisIndex: 1,
+            type: 'bar',
+            itemStyle: {
+                color: '#FAA639'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#8EC051'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#FA8A46'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#4DC4E7'
+            }
+        },
+        ]
+    };
+    option && myChart.setOption(option);
+</script>
+<script>
+    //公开信箱
+    drawHandleByBarChart();
+    //文化文旅
+    culturalTourism();
+    //教育领域
+    education();
+    //卫生医疗
+    healthCareNew();
+</script>
+
+</html>

nngkxxdp/src/main/resources/static/natj/js/enterStatisMain_mobile.js

@@ -1468,7 +1468,7 @@ function getBarg(list, unit) {
 		grid: {
 			left: '2%',
 			right: '10%',
-			bottom: '-2%',
+			bottom: '-1%',
 			width: 1000,
 			containLabel: true
 		},

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/commentList/commentList.js

@@ -39,6 +39,13 @@ Page({
 			})
 		})
 	},
+	imageError(e) {
+		let temp = this.data.commentList;
+		temp[e.currentTarget.dataset.index].imgUrl = '';
+		this.setData({
+			commentList: temp
+		})
+	},
 
 	/**
 	 * 生命周期函数--监听页面初次渲染完成

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/commentList/commentList.wxml

@@ -3,7 +3,7 @@
 	<view class="top-cont">此菜品上周共获得<span>{{compliment}}</span>次点赞，获得<span>{{commentCount}}</span>次评论</view>
 	<view class="content">
 		<view wx:for="{{commentList}}" wx:key="index" class="cont-width">
-			<image class="logo" src="{{item.imgUrl ? item.imgUrl :'/pages/images/user_logo.png'}}" alt=""></image>
+			<image class="logo" src="{{item.imgUrl ? item.imgUrl :'/pages/images/user_logo.png'}}" alt="" binderror="imageError" data-index="{{index}}"></image>
 			<view class="right">
 				<view class="name">
 					<view class="left">

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/deliciousList/deliciousList.js

@@ -20,12 +20,34 @@ Page({
 		canteenList: []
 	},
 	getDeliciousList() {
+		var that = this;
 		request({
 			url: '/mini/canteen/getDeliciousList',
 			method: 'GET'
 		}).then(res => {
+			let temp = [];
+			res.data.forEach(element => {
+				if (element.deliciousList.length > 0) {
+					temp.push(element);
+				}
+			})
+			temp.forEach(element => {
+				element.deliciousList.forEach(item => {
+					if (item.dishesPic) {
+						wx.getImageInfo({
+							src: this.data.imgUrl + item.dishesPic,
+							fail() {
+								item.dishesPic = '';
+								that.setData({
+									canteenList: temp
+								})
+							}
+						});
+					}
+				});
+			});
 			this.setData({
-				canteenList: res.data
+				canteenList: temp
 			})
 		})
 	},

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ourCanteen/canteen.wxml

@@ -2,7 +2,7 @@
     <view class="cont-width first" bindtap="toMenu" wx:for="{{canteenList}}" wx:for-item="item" wx:for-index="index" wx:key="index" data-name="{{item.canteenName}}" data-item="{{item.id}}">
         <view class="cont-bg">
             <image style="height: 100%;width:100%" mode="scaleToFill" 
-			src="{{item.canteenPhotoPath ? baseUrl + item.canteenPhotoPath : imgUrl + 'cont_bg.png'}}"></image>
+			src="{{item.canteenPhotoPath ? baseUrl + item.canteenPhotoPath : imgUrl + 'cont_bg.png'}}" binderror="imageError" data-index="{{index}}"></image>
         </view>
         <view class="cont-name">
             <view class="title">{{item.canteenName}}</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ourCanteen/ourCanteen.js

@@ -1,185 +1,192 @@
 // pages/ourCanteen/index.js
 import {
-  imgUrl,
-  baseUrl
+	imgUrl,
+	baseUrl
 } from "../api/request"
 
 import {
-  getCanteenList
+	getCanteenList
 } from "../api/user-api";
 Page({
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
-	imgUrl: imgUrl,
-	baseUrl: baseUrl + '/',
-    tab: 0,
-    item: '',
-    canteenList: [],
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    // this.islogin();
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		imgUrl: imgUrl,
+		baseUrl: baseUrl + '/',
+		tab: 0,
+		item: '',
+		canteenList: [],
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad: function (options) {
+		// this.islogin();
 		this.canteenList();
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    this.setData({
-      item: 0
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-
-  changeItem: function (e) {
-    if (e.currentTarget.dataset.item == 1) {
-      wx.navigateTo({
-        url: '/pages/deliciousList/deliciousList'
-      })
-    } else {
-      this.setData({
-        item: e.currentTarget.dataset.item
-      })
-    }
-  },
-  changeTab: function (e) {
-    this.setData({
-      tab: e.detail.current
-    })
-  },
-
-  toMenu: function (e) {
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady: function () {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow: function () {
+		this.setData({
+			item: 0
+		})
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide: function () {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload: function () {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh: function () {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom: function () {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function () {
+
+	},
+	imageError(e) {
+		let temp = this.data.canteenList;
+		temp[e.currentTarget.dataset.index].canteenPhotoPath = '';
+		this.setData({
+			canteenList: temp
+		})
+	},
+
+	changeItem: function (e) {
+		if (e.currentTarget.dataset.item == 1) {
+			wx.navigateTo({
+				url: '/pages/deliciousList/deliciousList'
+			})
+		} else {
+			this.setData({
+				item: e.currentTarget.dataset.item
+			})
+		}
+	},
+	changeTab: function (e) {
+		this.setData({
+			tab: e.detail.current
+		})
+	},
+
+	toMenu: function (e) {
 		var canteenId = e.currentTarget.dataset.item;
 		var canteenName = e.currentTarget.dataset.name;
-		if (canteenId && canteenId !='') {
+		if (canteenId && canteenId != '') {
 			wx.navigateTo({
 				url: `/pages/menu/menu?canteenId=${canteenId}&canteenName=${canteenName}`
 			})
 		}
-    
-  },
-
-  // 阻止手动拖动
-  catchTouchMove: function (res) {
-    return true
-  },
-  islogin() {
-    let userid = wx.getStorageSync('userId');
-    if (userid === null || userid === '') {
-      this.showDialog();
-    }
-  },
-  showDialog() {
-    wx.showModal({
-      title: '未授权',
-      content: '您登录授权已过期,请重新登陆授权',
-      showCancel: false,
-      confirmText: '登陆',
-      success: function (res) {
-        wx.navigateTo({
-          url: '/pages/login/login',
-        });
-      },
-    });
+
+	},
+
+	// 阻止手动拖动
+	catchTouchMove: function (res) {
+		return true
+	},
+	islogin() {
+		let userid = wx.getStorageSync('userId');
+		if (userid === null || userid === '') {
+			this.showDialog();
+		}
+	},
+	showDialog() {
+		wx.showModal({
+			title: '未授权',
+			content: '您登录授权已过期,请重新登陆授权',
+			showCancel: false,
+			confirmText: '登陆',
+			success: function (res) {
+				wx.navigateTo({
+					url: '/pages/login/login',
+				});
+			},
+		});
 	},
 	back() {
 		wx.navigateBack({
 			delta: 1,
 		})
 	},
-  canteenList() {
-    getCanteenList().then(res => {
-      if (res.result) {
-        let data = res.data
-        for (let i = 0; i < data.length; i++) {
-          const element = data[i];
-          var timeFrame = "";
-          var timeFrameinfo = [];
-          var supplyTime= element.supplyTimeMaps.sort((a,b)=>{
-            return a.timeNode - b.timeNode
-          })
-          for (let j = 0; j < supplyTime.length; j++) {
-            const childElement = supplyTime[j];
-            switch (childElement.timeNode) {
-              case 1:
-                timeFrame+="早";
-                childElement.timeNode = "早上";
-                break
-              case 2:
-                timeFrame+="中";
-                childElement.timeNode = "中午";
-                break
-              case 3:
-                timeFrame+="晚";
-                childElement.timeNode = "晚上";
-                break
-              case 4:
-                timeFrame+="外卖";
-                childElement.timeNode = "外卖";
-                break
-            }
-            if(j!=supplyTime.length-1){
-              timeFrame+="/"
-            }
-            timeFrameinfo.push(childElement)
-          }
-          
-          data[i].timeFrame = timeFrame;
-          data[i].timeFrameinfo = timeFrameinfo;
-        }
-        this.setData({
-          canteenList:data
+	canteenList() {
+		getCanteenList().then(res => {
+			if (res.result) {
+				let data = res.data
+				for (let i = 0; i < data.length; i++) {
+					const element = data[i];
+					var timeFrame = "";
+					var timeFrameinfo = [];
+					var supplyTime = element.supplyTimeMaps.sort((a, b) => {
+						return a.timeNode - b.timeNode
+					})
+					for (let j = 0; j < supplyTime.length; j++) {
+						const childElement = supplyTime[j];
+						switch (childElement.timeNode) {
+							case 1:
+								timeFrame += "早";
+								childElement.timeNode = "早上";
+								break
+							case 2:
+								timeFrame += "中";
+								childElement.timeNode = "中午";
+								break
+							case 3:
+								timeFrame += "晚";
+								childElement.timeNode = "晚上";
+								break
+							case 4:
+								timeFrame += "外卖";
+								childElement.timeNode = "外卖";
+								break
+						}
+						if (j != supplyTime.length - 1) {
+							timeFrame += "/"
+						}
+						timeFrameinfo.push(childElement)
+					}
+
+					data[i].timeFrame = timeFrame;
+					data[i].timeFrameinfo = timeFrameinfo;
+				}
+				this.setData({
+					canteenList: data
 				})
-      }
-    })
-  }
+			}
+		})
+	}
 
 })