Merge branch 'master' of http://120.78.165.83:8123/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/ProblemInfoController.java

@@ -37,9 +37,9 @@ public class ProblemInfoController {
      * @Param
      **/
     @GetMapping("/getInfoListByPage")
-    public Map<String, Object> getInfoListByPage(Integer page, Integer limit, Integer puserId) {
-        if (Blank.isNotEmpty(page) && Blank.isNotEmpty(limit) && Blank.isNotEmpty(puserId)) {
-            return problemInfoService.selectAllByPage(page, limit, puserId);
+    public Map<String, Object> getInfoListByPage(Integer page, Integer limit) {
+        if (Blank.isNotEmpty(page) && Blank.isNotEmpty(limit)) {
+            return problemInfoService.selectAllByPage(page, limit);
         } else {
             return SendUtil.send(0, null);
         }
@@ -75,7 +75,7 @@ public class ProblemInfoController {
     public Map<String, Object> addInfo(HttpServletRequest request, @RequestParam(value = "files", required = false) MultipartFile[] files, ProblemInfo problemInfo) {
         try {
             return problemInfoService.addProblemInfo(files, problemInfo);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return SendUtil.send(false, ConstStr.ADD_FAILED);

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/YxnnController.java → nngkxxdp/src/main/java/com/example/nngkxxdp/controller/YxnaController.java

@@ -1,7 +1,7 @@
 package com.example.nngkxxdp.controller;
 
 import com.example.nngkxxdp.entity.ImpressionNanan;
-import com.example.nngkxxdp.service.YxnnService;
+import com.example.nngkxxdp.service.YxnaService;
 import com.example.nngkxxdp.util.Blank;
 import com.example.nngkxxdp.util.ConstStr;
 import com.example.nngkxxdp.util.SendUtil;
@@ -18,10 +18,10 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("yxna")
-public class YxnnController {
+public class YxnaController {
 
     @Autowired
-    private YxnnService yxnnService;
+    private YxnaService yxnaService;
 
     /**
      * 上传图片文件,并保存相应的信息
@@ -30,7 +30,7 @@ public class YxnnController {
     @PostMapping("/uploadOneDocumet")
     public Map<String, Object> uploadOneDocumet(@RequestParam(value = "file") MultipartFile file) {
         try {
-            return yxnnService.uploadOneDocumet(file);
+            return yxnaService.uploadOneDocumet(file);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -40,7 +40,7 @@ public class YxnnController {
     @PostMapping("/saveImpressionNanan")
     public Map<String, Object> saveImpressionNanan(ImpressionNanan impressionNanan) {
         try {
-            return yxnnService.saveImpressionNanan(impressionNanan);
+            return yxnaService.saveImpressionNanan(impressionNanan);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -54,7 +54,7 @@ public class YxnnController {
     @PostMapping("/uploadDocumet")
     public Map<String, Object> uploadDocument(@RequestParam(value = "file", required = false) MultipartFile file, ImpressionNanan impressionNanan) {
         try {
-            return yxnnService.saveDocumetIn(file, impressionNanan);
+            return yxnaService.saveDocumetIn(file, impressionNanan);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -71,7 +71,7 @@ public class YxnnController {
     public Map<String, Object> getDocumentPageFront(int page, int limit, String pictureType, String examineState) {
         try {
             if (Blank.isNotEmpty(page) && Blank.isNotEmpty(limit) && page > 0 && limit > 0 && Blank.isNotEmpty(pictureType) && Blank.isNotEmpty(examineState)) {
-                return SendUtil.send(true, null, yxnnService.getDocumentPageFront(page, limit, pictureType, examineState));
+                return SendUtil.send(true, null, yxnaService.getDocumentPageFront(page, limit, pictureType, examineState));
             }
             return SendUtil.send(true, null, "page和limit不能为空,且要大于0.pictureType和examineState不能为空");
         } catch (Exception e) {
@@ -90,7 +90,7 @@ public class YxnnController {
     public Map<String, Object> getDocumentPage(int page, int limit, String pictureType, String examineState, String uploaderPhone, String pictureTitle, String pictureAuthor) {
         try {
             if (Blank.isNotEmpty(page) && Blank.isNotEmpty(limit) && page > 0 && limit > 0) {
-                return yxnnService.getDocumentPage(page, limit, pictureType, examineState, uploaderPhone, pictureTitle, pictureAuthor);
+                return yxnaService.getDocumentPage(page, limit, pictureType, examineState, uploaderPhone, pictureTitle, pictureAuthor);
             }
             return SendUtil.send(true, null, "page和limit不能为空,且要大于0");
         } catch (Exception e) {
@@ -106,7 +106,7 @@ public class YxnnController {
     public Map<String, Object> getImpressionPage(int page, int limit) {
         try {
             if (Blank.isNotEmpty(page) && Blank.isNotEmpty(limit) && page > 0 && limit > 0) {
-                return yxnnService.getImpressionPage(page, limit);
+                return yxnaService.getImpressionPage(page, limit);
             }
             return SendUtil.send(true, null, "page和limit不能为空,且要大于0");
         } catch (Exception e) {
@@ -124,7 +124,7 @@ public class YxnnController {
             if (Blank.isEmpty(id)) {
                 return SendUtil.send(false, "id为空");
             }
-            return SendUtil.send(true, null, yxnnService.getDocumentByIdFront(id));
+            return SendUtil.send(true, null, yxnaService.getDocumentByIdFront(id));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -140,7 +140,7 @@ public class YxnnController {
             if (Blank.isEmpty(id)) {
                 return SendUtil.send(false, "id为空");
             }
-            return SendUtil.send(true, null, yxnnService.getDocumentById(id));
+            return SendUtil.send(true, null, yxnaService.getDocumentById(id));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -156,7 +156,7 @@ public class YxnnController {
             if (Blank.isEmpty(impressionNanan.getId())) {
                 return SendUtil.send(false, "", "id为空");
             }
-            return yxnnService.updateDocumentById(file, impressionNanan);
+            return yxnaService.updateDocumentById(file, impressionNanan);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -172,7 +172,7 @@ public class YxnnController {
             if (Blank.isEmpty(impressionNanan.getId())) {
                 return SendUtil.send(false, "", "id为空");
             }
-            return yxnnService.updateDocument(impressionNanan);
+            return yxnaService.updateDocument(impressionNanan);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -188,7 +188,7 @@ public class YxnnController {
             if (Blank.isEmpty(id)) {
                 return SendUtil.send(false, "id为空");
             }
-            return yxnnService.deleteDocumentById(id);
+            return yxnaService.deleteDocumentById(id);
         } catch (Exception e) {
             e.printStackTrace();
         }

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/ProblemInfoDao.java

@@ -9,34 +9,35 @@ import java.util.Map;
 public interface ProblemInfoDao {
 
     /**
+     * @return
      * @Author :LL
      * @Description 获取所有问题信息
      * @Date 2021/10/20 17:30
      * @Param
-     * @return
      **/
     boolean addProblemInfo(ProblemInfo user);
+
     /**
+     * @return
      * @Author :LL
      * @Description 获取所有问题信息
      * @Date 2021/10/20 17:30
      * @Param
-     * @return
      **/
-    Map<String,Object> selectById(@Param("Id") Integer id);
+    Map<String, Object> selectById(@Param("Id") Integer id);
 
     /**
+     * @return
      * @Author :LL
      * @Description 获取所有问题信息
      * @Date 2021/10/20 17:30
      * @Param
-     * @return
      **/
-    List<Map<String,Object>> selectAllByPage(@Param("offset") int offset, @Param("limit") int limit, @Param("puserId") int puserId);
-    
+    List<Map<String, Object>> selectAllByPage(@Param("offset") int offset, @Param("limit") int limit);
+
     boolean addProblemInfos(@Param("list") List<ProblemInfo> list);
-    
+
     Integer getDeptIdByName(@Param("deptName") String deptName);
 
-    int getProblemCount(int puserId);
+    int getProblemCount();
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/YxnnDao.java → nngkxxdp/src/main/java/com/example/nngkxxdp/dao/YxnaDao.java

@@ -12,7 +12,7 @@ import java.util.Map;
  * @date 2022/6/20
  */
 @Repository
-public interface YxnnDao {
+public interface YxnaDao {
 
     int getDocumentCount(@Param("pictureType") String pictureType, @Param("examineState") String examineState, @Param("uploaderPhone") String uploaderPhone, @Param("pictureTitle") String pictureTitle, @Param("pictureAuthor") String pictureAuthor);
 

nngkxxdp/src/main/java/com/example/nngkxxdp/entity/ProblemInfo.java

@@ -38,7 +38,7 @@ public class ProblemInfo implements Serializable {
     /**
      * 状态
      */
-    private Integer state;
+    private Integer state = 0;
     /**
      * 问题提出人
      */

nngkxxdp/src/main/java/com/example/nngkxxdp/service/ProblemInfoService.java

@@ -17,21 +17,24 @@ import java.util.Map;
 public interface ProblemInfoService {
     /**
      * 查询单个问题信息
+     *
      * @param
      * @return
      */
 
-    Map<String,Object> selectById(Integer Id);
+    Map<String, Object> selectById(Integer Id);
 
     /**
      * 查询所有问题信息
+     *
      * @param
      * @return
      */
-    Map<String,Object> selectAllByPage( int offset,  int limit, int puserId);
+    Map<String, Object> selectAllByPage(int offset, int limit);
 
     /**
      * 新增问题信息
+     *
      * @param files
      * @param problemInfo
      * @return

nngkxxdp/src/main/java/com/example/nngkxxdp/service/YxnnService.java → nngkxxdp/src/main/java/com/example/nngkxxdp/service/YxnaService.java

@@ -10,7 +10,7 @@ import java.util.Map;
  * @author zhoupeng
  * @date 2022/6/20
  */
-public interface YxnnService {
+public interface YxnaService {
 
     /**
      * 门户网站访问地址

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

@@ -44,10 +44,10 @@ public class ProblemInfoServiceImpl implements ProblemInfoService {
     }
 
     @Override
-    public Map<String, Object> selectAllByPage(int offset, int limit, int puserId) {
+    public Map<String, Object> selectAllByPage(int offset, int limit) {
         offset = (offset - 1) * limit;
-        int count = problemInfoDao.getProblemCount(puserId);
-        List<Map<String, Object>> maps = problemInfoDao.selectAllByPage(offset, limit, puserId);
+        int count = problemInfoDao.getProblemCount();
+        List<Map<String, Object>> maps = problemInfoDao.selectAllByPage(offset, limit);
         for (Map<String, Object> map : maps) {
             Integer id = Convert.toInt(map.get("id"));
             List<Map<String, Object>> imgUrls = problemInfoImageDao.selectAllByInfoId(id);

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/YxnnServiceImpl.java → nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/YxnaServiceImpl.java

@@ -3,9 +3,9 @@ package com.example.nngkxxdp.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.lang.Validator;
-import com.example.nngkxxdp.dao.YxnnDao;
+import com.example.nngkxxdp.dao.YxnaDao;
 import com.example.nngkxxdp.entity.ImpressionNanan;
-import com.example.nngkxxdp.service.YxnnService;
+import com.example.nngkxxdp.service.YxnaService;
 import com.example.nngkxxdp.util.Blank;
 import com.example.nngkxxdp.util.ConstStr;
 import com.example.nngkxxdp.util.ConstantUtil;
@@ -29,7 +29,7 @@ import java.util.Map;
  */
 @Service
 @Transactional
-public class YxnnServiceImpl implements YxnnService {
+public class YxnaServiceImpl implements YxnaService {
 
     @Value("${file.location}")
     private String location;
@@ -37,14 +37,14 @@ public class YxnnServiceImpl implements YxnnService {
     private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Autowired
-    private YxnnDao yxnnDao;
+    private YxnaDao yxnaDao;
 
     @Override
     public Map<String, Object> getDocumentPageFront(int page, int limit, String pictureType, String examineState) {
         int startRows = (page - 1) * limit;
-        int count = yxnnDao.getDocumentCountFront(pictureType, examineState);
+        int count = yxnaDao.getDocumentCountFront(pictureType, examineState);
         if (count > 0) {
-            List<Map<String, Object>> mapList = yxnnDao.getDocumentPageFront(startRows, limit, pictureType, examineState);
+            List<Map<String, Object>> mapList = yxnaDao.getDocumentPageFront(startRows, limit, pictureType, examineState);
             for (Map<String, Object> map : mapList) {
                 if ((int) map.get("isPublic") == ConstantUtil.IS_NOT_PUBLIC) {
                     String uploaderPhone = map.get("uploaderPhone").toString();
@@ -62,9 +62,9 @@ public class YxnnServiceImpl implements YxnnService {
     @Override
     public Map<String, Object> getDocumentPage(int page, int limit, String pictureType, String examineState, String uploaderPhone, String pictureTitle, String pictureAuthor) {
         int startRows = (page - 1) * limit;
-        int count = yxnnDao.getDocumentCount(pictureType, examineState, uploaderPhone, pictureTitle, pictureAuthor);
+        int count = yxnaDao.getDocumentCount(pictureType, examineState, uploaderPhone, pictureTitle, pictureAuthor);
         if (count > 0) {
-            return SendUtil.layuiTable(count, yxnnDao.getDocumentPage(startRows, limit, pictureType, examineState, uploaderPhone, pictureTitle, pictureAuthor));
+            return SendUtil.layuiTable(count, yxnaDao.getDocumentPage(startRows, limit, pictureType, examineState, uploaderPhone, pictureTitle, pictureAuthor));
         }
         return SendUtil.layuiTable(0, null);
     }
@@ -113,7 +113,7 @@ public class YxnnServiceImpl implements YxnnService {
         impressionNanan.setUrlAddress(newName);
         impressionNanan.setUploadTime(DateUtil.parse(sdf.format(new Date()), "yyyy-MM-dd HH:mm:ss"));
         impressionNanan.setUpdateTime(DateUtil.parse(sdf.format(new Date()), "yyyy-MM-dd HH:mm:ss"));
-        if (yxnnDao.saveDocumetIn(impressionNanan) <= 0) {
+        if (yxnaDao.saveDocumetIn(impressionNanan) <= 0) {
             return SendUtil.send(false, ConstStr.ADD_FAILED, "");
         }
         return SendUtil.send(true, ConstStr.ADD_SUCCESS, "");
@@ -121,7 +121,7 @@ public class YxnnServiceImpl implements YxnnService {
 
     @Override
     public ImpressionNanan getDocumentByIdFront(Integer id) {
-        ImpressionNanan impressionNanan = yxnnDao.getDocumentById(id);
+        ImpressionNanan impressionNanan = yxnaDao.getDocumentById(id);
         if (impressionNanan.getIsPublic() == ConstantUtil.IS_NOT_PUBLIC) {
             String uploaderPhone = impressionNanan.getUploaderPhone();
             impressionNanan.setUploaderPhone(uploaderPhone.substring(0, 1) + "*********" + uploaderPhone.substring(10, 11));
@@ -134,13 +134,13 @@ public class YxnnServiceImpl implements YxnnService {
 
     @Override
     public ImpressionNanan getDocumentById(Integer id) {
-        return yxnnDao.getDocumentById(id);
+        return yxnaDao.getDocumentById(id);
     }
 
     @Override
     public Map<String, Object> deleteDocumentById(Integer id) {
         //通过id查询单个的信息
-        ImpressionNanan impressionNanan = yxnnDao.getDocumentById(id);
+        ImpressionNanan impressionNanan = yxnaDao.getDocumentById(id);
         if (Blank.isNotEmpty(impressionNanan.getUrlAddress())) {
             File file = new File(location + impressionNanan.getUrlAddress());
             //删出对应的文件,以及对应的文件信息
@@ -148,7 +148,7 @@ public class YxnnServiceImpl implements YxnnService {
                 file.delete();
             }
         }
-        if (yxnnDao.deleteDocumentById(id) <= 0) {
+        if (yxnaDao.deleteDocumentById(id) <= 0) {
             return SendUtil.send(false, ConstStr.DELETEUSER_FAILED, "");
         }
         return SendUtil.send(true, ConstStr.DELETEUSER_SUCCESS, "");
@@ -196,7 +196,7 @@ public class YxnnServiceImpl implements YxnnService {
             impressionNanan.setUrlAddress(newName);
         }
         impressionNanan.setUpdateTime(DateUtil.parse(sdf.format(new Date()), "yyyy-MM-dd HH:mm:ss"));
-        if (yxnnDao.updateDocumentById(impressionNanan) <= 0) {
+        if (yxnaDao.updateDocumentById(impressionNanan) <= 0) {
             return SendUtil.send(false, ConstStr.UPDATEUSER_FAILED, "");
         }
         return SendUtil.send(true, ConstStr.UPDATEUSER_SUCCESS, "");
@@ -226,7 +226,7 @@ public class YxnnServiceImpl implements YxnnService {
             return SendUtil.send(false, ConstStr.ADD_FAILED, "图片描述长度不能大于200");
         }
         impressionNanan.setUpdateTime(DateUtil.parse(sdf.format(new Date()), "yyyy-MM-dd HH:mm:ss"));
-        if (yxnnDao.updateDocumentById(impressionNanan) <= 0) {
+        if (yxnaDao.updateDocumentById(impressionNanan) <= 0) {
             return SendUtil.send(false, ConstStr.UPDATEUSER_FAILED, "");
         }
         return SendUtil.send(true, ConstStr.UPDATEUSER_SUCCESS, "");
@@ -279,7 +279,7 @@ public class YxnnServiceImpl implements YxnnService {
             return SendUtil.send(false, ConstStr.ADD_FAILED, "图片描述长度不能大于200");
         }
         impressionNanan.setUploadTime(DateUtil.parse(sdf.format(new Date()), "yyyy-MM-dd HH:mm:ss"));
-        if (yxnnDao.saveDocumetIn(impressionNanan) <= 0) {
+        if (yxnaDao.saveDocumetIn(impressionNanan) <= 0) {
             return SendUtil.send(false, ConstStr.ADD_FAILED, "");
         }
         return SendUtil.send(true, ConstStr.ADD_SUCCESS, "");
@@ -288,9 +288,9 @@ public class YxnnServiceImpl implements YxnnService {
     @Override
     public Map<String, Object> getImpressionPage(int page, int limit) {
         int startRows = (page - 1) * limit;
-        int count = yxnnDao.getImpressionCount();
+        int count = yxnaDao.getImpressionCount();
         if (count > 0) {
-            return SendUtil.layuiTable(count, yxnnDao.getImpressionPage(startRows, limit));
+            return SendUtil.layuiTable(count, yxnaDao.getImpressionPage(startRows, limit));
         }
         return SendUtil.layuiTable(0, null);
     }

nngkxxdp/src/main/resources/mapper/YxnnDao.xml → nngkxxdp/src/main/resources/mapper/YxnaDao.xml

@@ -1,6 +1,6 @@
 <?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.dao.YxnnDao">
+<mapper namespace="com.example.nngkxxdp.dao.YxnaDao">
     <select id="getDocumentCount" resultType="Integer">
         select count(*)
         from impression_nanan

nngkxxdp/src/main/resources/static/constans.js

@@ -0,0 +1,88 @@
+// var PATH = "http://data.cqna.gov.cn";
+// var PATH = "http://localhost:7777";
+var PATH = "";
+/** GET 网络请求
+ * @param {Object} uri
+ * @param {Object} async
+ * @param {Object} params
+ * @param {Object} callback
+ * @param {Object} errorback
+ */
+function get(uri, async, params, callback, errorback) {
+    request('get', uri, async, params, callback, errorback);
+}
+
+/** POST 网络请求
+ * @param {Object} uri
+ * @param {Object} async
+ * @param {Object} params
+ * @param {Object} callback
+ * @param {Object} errorback
+ */
+function post(uri, async, params, callback, errorback) {
+    request('post', uri, async, params, callback, errorback);
+}
+
+/**
+ * 网络请求
+ * @param {Object} type
+ * @param {Object} uri
+ * @param {Object} async
+ * @param {Object} params
+ * @param {Object} callback
+ * @param {Object} errorback
+ */
+function request(type, uri, async, params, callback, errorback) {
+    $.ajax({
+        type: type,
+        async: async,
+        url: PATH + uri,
+        beforeSend: function(request) {
+            if(sessionStorage.LOGIN_TOKEN){
+                request.setRequestHeader("token", sessionStorage.LOGIN_TOKEN);
+            }
+        },
+        data: params,
+        dataType: 'json',
+        success: function(res) {
+            if (callback) callback(res);
+        },
+        error: function(err) {
+            if(layer){
+                if(err.status == 403){
+                    layer.msg("登录失效，请重新登录", {icon:5});
+                    logout();
+                    tologin();
+                }else{
+                    layer.msg("连接失败", {icon:5});
+                    console.info("连接失败", err);
+                }
+            }
+            if (errorback) errorback(err);
+        }
+    });
+}
+
+function logout(){
+    sessionStorage.clear();
+
+//	window.location.reload();
+}
+
+function tologin(){
+//	window.location = "login.html";
+    $("#loginForm")[0].reset();
+    layer.open({
+        type: 1,
+        title: '',
+        closeBtn: 0,
+        content: $('#loginDiv'), //这里content是一个普通的String
+        end: function() {
+            $('#loginDiv').css('display', 'none');
+        },
+        success: function() {
+            $('#loginDiv').css('display', 'block');
+
+        }
+    });
+}

nngkxxdp/src/main/resources/static/impression/album.html

@@ -139,7 +139,7 @@
             </div>
         </div>
     </div>
-    <script src="../page/js/constans.js"></script>
+    <script src="../constans.js"></script>
     <script src="js/jquery-3.5.1.min.js"></script>
     <script src="js/activejF.js"></script>
     <script src="js/vuemin.js"></script>

nngkxxdp/src/main/resources/static/impression/css/album.css

@@ -221,11 +221,12 @@ a {
 .middleContent>ul>li {
     width: 23.125vw;
     margin-bottom: 33px;
-    /* margin-right: 1.45833vw; */
 }
+
 .middleContent>ul>li:last-child:not(:nth-child(3n)) {
     margin-right: calc(68% / 2);
 }
+
 .middleContent>ul>li>img {
     width: 23.125vw;
     height: 13.02083vw;
@@ -245,6 +246,7 @@ a {
     padding-top: 1.5625vw;
     padding-left: 1.19791vw;
 }
+
 .contentIntroduce>div{
     width: 19.01041vw;
     padding-left: 1.19791vw;
@@ -255,6 +257,7 @@ a {
     overflow: hidden;
     -webkit-line-clamp: 5;
 }
+
 .contentIntroduce>div>p{
     font-size: 0.72916vw;
     color: #666;
@@ -278,7 +281,7 @@ a {
     background-color:#fff !important;
 }
 
-@media screen and (min-width: 1280px) and (max-width: 1360px) {
+/* @media screen and (min-width: 1280px) and (max-width: 1360px) {
     .middleBackground {
         height: 567px;
     }
@@ -313,22 +316,6 @@ a {
         line-height: 21px;
         margin-top: 33px;
     }
-    .middleContent>ul>li {
-        /* width: 315px; */
-        margin-bottom: 33px;
-        /* margin-right:1.09375vw; */
-    }
-    
-    .middleContent>ul>li>img {
-        width: 315px;
-        height: 177px;
-        display: block;
-    }
-
-    .contentIntroduce {
-        height: 161px;
-        width: 315px;
-    }
 
     .contentIntroduce>p {
         font-size: 21px;
@@ -336,19 +323,20 @@ a {
         padding-left: 9px;
     }
     .contentIntroduce>div{
-        /* width: 313px; */
+        width: 313px;
         padding-left: 11px;
         padding-top: 6px;
     }
     .contentIntroduce>div>p{
         font-size: 12px;
     }
-}
+} */
 
 /* 弹框 */
 .popup {
     width: 1000px;
 }
+
 .content {
     display: flex;
     background-color: #fff;
@@ -377,6 +365,7 @@ a {
 .author>p {
     margin: 0 10px;
 }
+
 /*底部*/
 .footer {
     width: 100%;
@@ -390,7 +379,6 @@ a {
     width: 100%;
     height: 62px;
     border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-
 }
 
 .footer_nav>div {

nngkxxdp/src/main/resources/static/impression/impression.html

@@ -332,7 +332,7 @@
             </div>
         </div>
     </div>
-    <script src="../page/js/constans.js"></script>
+    <script src="../constans.js"></script>
     <script src="js/jquery-3.5.1.min.js"></script>
     <script src="js/activejF.js"></script>
     <script src="js/vuemin.js"></script>

nngkxxdp/src/main/resources/static/impression/js/album.js

@@ -1,4 +1,4 @@
-var PATH = 'http://192.168.0.220:7777'
+// var PATH = 'http://192.168.0.220:7777'
 new Vue({
     el: '#app',
     data: {

nngkxxdp/src/main/resources/static/impression/js/constans.js

@@ -1,90 +0,0 @@
-// var PATH = "http://data.cqna.gov.cn";
-// var PATH = "http://localhost:7777";
-var PATH = "";
-/** GET 网络请求c
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function get(uri, async, params, callback, errorback) {
-	request('get', uri, async, params, callback, errorback);
-}
-
-/** POST 网络请求
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function post(uri, async, params, callback, errorback) {
-    request('post', uri, async, params, callback, errorback);
-}
-
-/**
- * 网络请求
- * @param {Object} type
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function request(type, uri, async, params, callback, errorback) {
-	$.ajax({
-		type: type,
-		async: async,
-		url: PATH + uri,
-		beforeSend: function(request) {
-			if(sessionStorage.LOGIN_TOKEN){
-				request.setRequestHeader("token", sessionStorage.LOGIN_TOKEN);
-			}
-		},
-		data: params,
-		dataType: 'json',
-		success: function(res) {
-			if (callback) callback(res);
-		},
-		error: function(err) {
-			if(layer){
-				if(err.status == 403){
-					layer.msg("登录失效，请重新登录", {icon:5});
-					logout();
-					tologin();
-				}else{
-					layer.msg("连接失败", {icon:5});
-					console.info("连接失败", err);
-				}
-			}
-			if (errorback) errorback(err);
-		}
-	});
-}
-
-function logout(){
-	sessionStorage.clear();
-	
-//	window.location.reload();
-}
-
-function tologin(){
-//	window.location = "login.html";
-	$("#loginForm")[0].reset();
-	layer.open({
-	  type: 1, 
-	  title: '',
-	  closeBtn: 0,
-	  content: $('#loginDiv'), //这里content是一个普通的String
-	  end: function() {
-		  loginTypeMsg = 0;
-		  $('#loginDiv').css('display', 'none');
-	  },
-	  success: function() {
-		  loginTypeMsg = 1;
-		  $('#loginDiv').css('display', 'block');
-
-	  }
-	});
-}

nngkxxdp/src/main/resources/static/intelligence/intelligence.html

@@ -639,7 +639,7 @@
 <footer>ICP备案：渝ICP备2021011583号 政府网站标识码：5001080014 渝公网安备 50010802001142号</footer>
 <script src="./js/jquery-3.5.1.min.js"></script>
 <script src="./layui/layui.js"></script>
-<script src="../zdjc/js/constans.js"></script>
+<script src="../constans.js"></script>
 <!--南岸区人民政府网站有，只是暂时存放，待以后拿到数据再说 -->
 <script>
     // PC端 移动端 跳转

nngkxxdp/src/main/resources/static/intelligence/mobile_intelligence.html

@@ -35,7 +35,7 @@
     </div>
 </main>
 <script src="js/jquery-3.5.1.min.js"></script>
-<script src="../zdjc/js/constans.js"></script>
+<script src="../constans.js"></script>
 <script>
     // PC端 移动端 跳转
     var is_mobi = navigator.userAgent.toLowerCase().match(/(ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;

nngkxxdp/src/main/resources/static/nan/bgLogin.html

@@ -6,7 +6,7 @@
 		<link rel="stylesheet" type="text/css" href="layui/css/layui.css" />
 		<script src="jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
 		<script src="layui/layui.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/constans.js"></script>
+		<script src="../constans.js"></script>
 		<script src="js/login.js" type="text/javascript" charset="utf-8" ></script>
 		<title></title>
 	</head>

nngkxxdp/src/main/resources/static/nan/fwgl.html

@@ -21,7 +21,7 @@
 	</div>
 <!--<script src="js/jquery.min.js"></script>
 <script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>-->
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script type="text/javascript" src="js/fwgl/postManagement.js" charset="utf-8"></script>
 
 <!-- <div id="xy"></div> -->

nngkxxdp/src/main/resources/static/nan/fwgl_xz.html

@@ -146,7 +146,7 @@
 			</div>
 		</form>
 	</div>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script type="text/javascript" src="js/fwgl/postManagement_xz.js" charset="utf-8"></script>
 <script type="text/javascript">
 

nngkxxdp/src/main/resources/static/nan/js/constans.js

@@ -1,88 +0,0 @@
-// var PATH = "http://data.cqna.gov.cn";
-// var PATH = "http://localhost:7777";
-var PATH = "";
-/** GET 网络请求
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function get(uri, async, params, callback, errorback) {
-	request('get', uri, async, params, callback, errorback);
-}
-
-/** POST 网络请求
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function post(uri, async, params, callback, errorback) {
-    request('post', uri, async, params, callback, errorback);
-}
-
-/**
- * 网络请求
- * @param {Object} type
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function request(type, uri, async, params, callback, errorback) {
-	$.ajax({
-		type: type,
-		async: async,
-		url: PATH + uri,
-		beforeSend: function(request) {
-			if(sessionStorage.LOGIN_TOKEN){
-				request.setRequestHeader("token", sessionStorage.LOGIN_TOKEN);
-			}
-		},
-		data: params,
-		dataType: 'json',
-		success: function(res) {
-			if (callback) callback(res);
-		},
-		error: function(err) {
-			if(layer){
-				if(err.status == 403){
-					layer.msg("登录失效，请重新登录", {icon:5});
-					logout();
-					tologin();
-				}else{
-					layer.msg("连接失败", {icon:5});
-					console.info("连接失败", err);
-				}
-			}
-			if (errorback) errorback(err);
-		}
-	});
-}
-
-function logout(){
-	sessionStorage.clear();
-	
-//	window.location.reload();
-}
-
-function tologin(){
-//	window.location = "login.html";
-	$("#loginForm")[0].reset();
-	layer.open({
-	  type: 1, 
-	  title: '',
-	  closeBtn: 0,
-	  content: $('#loginDiv'), //这里content是一个普通的String
-	  end: function() {
-		  $('#loginDiv').css('display', 'none');
-	  },
-	  success: function() {
-		  $('#loginDiv').css('display', 'block');
-
-	  }
-	});
-}

nngkxxdp/src/main/resources/static/nan/login.html

@@ -54,7 +54,7 @@
 
 <script src="js/jquery.min.js"></script>
 <script src="layui/layui.js"></script>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script src="js/login.js"></script>
 </body>
 </html>

nngkxxdp/src/main/resources/static/nan/wtgl.html

@@ -30,7 +30,7 @@
 
 </div>
 
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script>
 	layui.use([ 'table', 'jquery', 'form', 'laydate' ], function() {
 		$ = layui.jquery, table = layui.table, layer = layui.layer, form = layui.form, laydate = layui.laydate;

nngkxxdp/src/main/resources/static/nan/yjfk.html

@@ -45,6 +45,6 @@
 				layer = layui.layer;
 	})
 </script>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script type="text/javascript" src="js/yjfk/yjfk.js" charset="utf-8"></script>
 </html>

nngkxxdp/src/main/resources/static/nan/yjfk_fk.html

@@ -42,6 +42,6 @@
 		onclick="back()">返回</button>
 </div>
 
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script type="text/javascript" src="js/yjfk/yjfk_fk.js" charset="utf-8"></script>
 

nngkxxdp/src/main/resources/static/nan/yjsh.html

@@ -12,7 +12,7 @@
 	
 </div>
 
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script src="js/yjsh/opinion.js"></script>
 
 

nngkxxdp/src/main/resources/static/nan/yjsh_sh.html

@@ -56,7 +56,7 @@
 	
 </div>
 <script src="js/yjsh/reviewOpinion.js"></script>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script type="text/javascript">
 	layui.use(['form', 'jquery'], function() {
 		$ = layui.jquery,

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

@@ -584,6 +584,7 @@
 		<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 src="../constans.js" type="text/javascript" charset="utf-8"></script>
 		<script src="js/enterStatisMain.js" type="text/javascript" charset="utf-8"></script>
 		<script src="js/highcharts.js"></script>
 		<script src="js/highcharts-3d.js"></script>

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

@@ -106,6 +106,7 @@
 
 <script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="js/echarts.min.js" charset="utf-8"></script>
+<script type="text/javascript" src="../constans.js" charset="UTF-8"></script>
 <script type="text/javascript" src="js/letterBox.js" charset="utf-8"></script>
 </body>
 </html>

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

@@ -171,6 +171,7 @@
         </div>
     </div>
 	<script src="./js/jquery-3.5.1.min.js"></script>
+    <script src="../constans.js"></script>
     <script type="text/javascript" src="../page/layui/layui.js" charset="utf-8"></script>
 	<script src="./js/echarts.min.js"></script>
 	<script src="js/echart3.js"></script>

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

@@ -1,5 +1,3 @@
-const PATH = 'http://192.168.1.253:7777';
-//  const PATH = 'http://data.cqna.gov.cn';
 const detailLimitDefault = 10;
 
 
@@ -337,7 +335,7 @@ function drawHandleByBarChart() {
 }
 
 /**
- * 近90天办理类别统计（饼图）
+ * 近90天办理类别统计（饼图） 2022/7/15
  */
 function drawHandleTypeByPieChart() {
     let pieData = [];

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

@@ -1,5 +1,3 @@
-const PATH = 'http://192.168.1.253:7777';
-//  const PATH = 'http://data.cqna.gov.cn';
 const detailLimitDefault = 10;
 
 layui.use(['laypage'], function () {
@@ -336,7 +334,7 @@ function drawHandleByBarChart() {
 }
 
 /**
- * 近90天办理类别统计（饼图）
+ * 近90天办理类别统计（饼图）2022/7/15
  */
 function drawHandleTypeByPieChart() {
     let pieData = [];

nngkxxdp/src/main/resources/static/page/enter_webStatis.html

@@ -733,7 +733,7 @@
 <script src="js/jquery.min.js"></script>
 <script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="js/echarts.min.js" charset="utf-8"></script>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script type="text/javascript" src="js/base/webStatis.js" charset="utf-8"></script>
 <script type="text/javascript">
     layui.use('laypage', function(){

nngkxxdp/src/main/resources/static/page/h_list.html

@@ -18,7 +18,7 @@
      <script src="js/jquery.min.js"></script>
      <script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>
      <script type="text/javascript" src="js/echarts.min.js" charset="utf-8"></script>
-     <script src="js/constans.js"></script>
+     <script src="../constans.js"></script>
      <script type="text/html" id="titleTpl"> {{d.LAY_TABLE_INDEX+1}}</script>
      <script type="text/javascript" src="js/base/excelList.js" charset="utf-8"></script>
 </body>

nngkxxdp/src/main/resources/static/page/h_post.html

@@ -20,6 +20,6 @@
 <script src="js/jquery.min.js"></script>
 <script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="js/echarts.min.js" charset="utf-8"></script>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script type="text/javascript" src="js/base/postManagement.js" charset="utf-8"></script>
 </body>

nngkxxdp/src/main/resources/static/page/index.html

@@ -1726,7 +1726,7 @@
 <script type="text/javascript" src="../page/js/jquery.min.js"></script>
 <script type="text/javascript" src="../page/layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="../page/js/echarts.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="../page/js/constans.js"></script>
+<script type="text/javascript" src="../constans.js"></script>
 <script type="text/javascript" src="../page/js/base/wzkp.item.js"></script>
 <script type="text/javascript" src="../page/js/base/mslm.item.js"></script>
 <script type="text/javascript" src="../page/js/base/bmjdgxqk.item.js"></script>

nngkxxdp/src/main/resources/static/page/js/constans.js

@@ -1,90 +0,0 @@
-// var PATH = "http://data.cqna.gov.cn";
-// var PATH = "http://localhost:7777";
-var PATH = "";
-/** GET 网络请求c
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function get(uri, async, params, callback, errorback) {
-	request('get', uri, async, params, callback, errorback);
-}
-
-/** POST 网络请求
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function post(uri, async, params, callback, errorback) {
-    request('post', uri, async, params, callback, errorback);
-}
-
-/**
- * 网络请求
- * @param {Object} type
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function request(type, uri, async, params, callback, errorback) {
-	$.ajax({
-		type: type,
-		async: async,
-		url: PATH + uri,
-		beforeSend: function(request) {
-			if(sessionStorage.LOGIN_TOKEN){
-				request.setRequestHeader("token", sessionStorage.LOGIN_TOKEN);
-			}
-		},
-		data: params,
-		dataType: 'json',
-		success: function(res) {
-			if (callback) callback(res);
-		},
-		error: function(err) {
-			if(layer){
-				if(err.status == 403){
-					layer.msg("登录失效，请重新登录", {icon:5});
-					logout();
-					tologin();
-				}else{
-					layer.msg("连接失败", {icon:5});
-					console.info("连接失败", err);
-				}
-			}
-			if (errorback) errorback(err);
-		}
-	});
-}
-
-function logout(){
-	sessionStorage.clear();
-	
-//	window.location.reload();
-}
-
-function tologin(){
-//	window.location = "login.html";
-	$("#loginForm")[0].reset();
-	layer.open({
-	  type: 1, 
-	  title: '',
-	  closeBtn: 0,
-	  content: $('#loginDiv'), //这里content是一个普通的String
-	  end: function() {
-		  loginTypeMsg = 0;
-		  $('#loginDiv').css('display', 'none');
-	  },
-	  success: function() {
-		  loginTypeMsg = 1;
-		  $('#loginDiv').css('display', 'block');
-
-	  }
-	});
-}

nngkxxdp/src/main/resources/static/page/login.html

@@ -54,7 +54,7 @@
 </div>
 <script src="js/jquery.min.js"></script>
 <script src="layui/layui.js"></script>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script src="js/base/login.js"></script>
 </body>
 </html>

nngkxxdp/src/main/resources/static/page/lr_index.html

@@ -319,7 +319,7 @@
 	</div>
 	<script type="text/javascript" src="js/jquery.min.js" charset="utf-8"></script>
 	<script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="js/constans.js" charset="utf-8"></script>
+	<script type="text/javascript" src="../constans.js" charset="utf-8"></script>
 	<script type="text/javascript" src="js/base/lr_index.js" charset="utf-8"></script>
 	<script type="text/javascript" src="js/base/xxlr.item.js" charset="utf-8"></script>
 	<script type="text/javascript" src="js/base/lsjl.item.js" charset="utf-8"></script>

nngkxxdp/src/main/resources/static/page/lr_login.html

@@ -97,7 +97,7 @@
 	</div>
 <script src="js/jquery.min.js"></script>
 <script src="layui/layui.js"></script>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script type="text/javascript" src="js/base/lr_login.js"></script>
 </body>
 </html>

nngkxxdp/src/main/resources/static/page/welcome.html

@@ -347,7 +347,7 @@
 	</body>
 	<script type="text/javascript" src="./js/jquery.min.js"></script>
 	<script type="text/javascript" src="./layui/layui.js" charset="utf-8"></script>
-	<script type="text/javascript" src="../page/js/constans.js"></script>
+	<script type="text/javascript" src="../constans.js"></script>
 	<script type="text/javascript" src="./js/base/welcome.js" charset="utf-8"></script>
 	<script>
 		function fileDownload(id) {

nngkxxdp/src/main/resources/static/wzkp/wzkp.html

@@ -1976,7 +1976,7 @@
 <script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="layui/layui.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript" src="../page/js/echarts.min.js" charset="utf-8"></script>
-<script src="../zdjc/js/constans.js"></script>
+<script src="../constans.js"></script>
 <script>
     var dataList = [];
     var newDataList = [];

nngkxxdp/src/main/resources/static/zdjc/decision.html

@@ -125,7 +125,7 @@
 
 		<script type="text/javascript" src="./layui/layui.js"></script>
 		<script type="text/javascript" src="./js/jquery-3.5.1.min.js"></script>
-		<script type="text/javascript" src="js/constans.js"></script>
+		<script type="text/javascript" src="../constans.js"></script>
 		<script type="text/javascript" src="./js/decision.js"></script>
 		<script>
 			layui.use('layer', function() {

nngkxxdp/src/main/resources/static/zdjc/details.html

@@ -233,7 +233,7 @@
 <script src="./js/jquery-3.5.1.min.js"></script>
 <script src="./layui/layui.js"></script>
 <script src="./pdfjs/build/pdf.js"></script>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script src="../nan/js/yjfk/yjfk_fk.js"></script>
  <script src="./js/details.js"></script>
 <script src="./js/tanchuang.js"></script>

nngkxxdp/src/main/resources/static/zdjc/js/constans.js

@@ -1,88 +0,0 @@
-// var PATH = "https://data.cqna.gov.cn";
-// var PATH = "http://localhost:7777";
-var PATH = "";
-/** GET 网络请求
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function get(uri, async, params, callback, errorback) {
-	request('get', uri, async, params, callback, errorback);
-}
-
-/** POST 网络请求
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function post(uri, async, params, callback, errorback) {
-    request('post', uri, async, params, callback, errorback);
-}
-
-/**
- * 网络请求
- * @param {Object} type
- * @param {Object} uri
- * @param {Object} async
- * @param {Object} params
- * @param {Object} callback
- * @param {Object} errorback
- */
-function request(type, uri, async, params, callback, errorback) {
-	$.ajax({
-		type: type,
-		async: async,
-		url: PATH + uri,
-		beforeSend: function(request) {
-			if(sessionStorage.LOGIN_TOKEN){
-				request.setRequestHeader("token", sessionStorage.LOGIN_TOKEN);
-			}
-		},
-		data: params,
-		dataType: 'json',
-		success: function(res) {
-			if (callback) callback(res);
-		},
-		error: function(err) {
-			if(layer){
-				if(err.status == 403){
-					layer.msg("登录失效，请重新登录", {icon:5});
-					logout();
-					tologin();
-				}else{
-					layer.msg("连接失败", {icon:5});
-					console.info("连接失败", err);
-				}
-			}
-			if (errorback) errorback(err);
-		}
-	});
-}
-
-function logout(){
-	sessionStorage.clear();
-	
-//	window.location.reload();
-}
-
-function tologin(){
-//	window.location = "login.html";
-	$("#loginForm")[0].reset();
-	layer.open({
-	  type: 1, 
-	  title: '',
-	  closeBtn: 0,
-	  content: $('#loginDiv'), //这里content是一个普通的String
-	  end: function() {
-		  $('#loginDiv').css('display', 'none');
-	  },
-	  success: function() {
-		  $('#loginDiv').css('display', 'block');
-
-	  }
-	});
-}

nngkxxdp/src/main/resources/static/zdjc/login.html

@@ -54,7 +54,7 @@
 </div>
 <script src="./js/jquery-3.5.1.min.js"></script>
 <script src="layui/layui.js"></script>
-<script src="js/constans.js"></script>
+<script src="../constans.js"></script>
 <script src="js/login.js"></script>
 </body>
 </html>

nngkxxdp/src/main/resources/static/zdjc/tanchaung.html

@@ -45,7 +45,7 @@
 			<script src="layui/layui.js"></script>
 			<script src="./js/jquery-3.5.1.min.js"></script>
 			<script src="./js/tanchuang.js"></script>
-			<script src="js/constans.js"></script>
+			<script src="../constans.js"></script>
 
 	</body>
 </html>