后端问题修改

naqwzsjtj/naqwzsjtj/src/api/repair.js

@@ -31,5 +31,8 @@ export default {
   },
   removeWorker(data){
     return request.get("worker/deleteById",data)
+  },
+  listUser(data){
+    return request.get("worker/list",data)
   }
 }

naqwzsjtj/naqwzsjtj/src/views/repair/RepairWorker.vue

@@ -83,7 +83,7 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveWork">提交</el-button>
+        <el-button type="primary" @click="saveWork" :disabled="!add">提交</el-button>
         <el-button @click="workDialog = false">返回</el-button>
       </div>
     </el-dialog>
@@ -213,6 +213,10 @@
       },
       // 保存
       saveWork() {
+        if (!this.add){
+          this.$message.error('请检索手机号!');
+          return;
+        }
         if (
           !this.postManagement.name ||
           this.postManagement.name.length < 1
@@ -337,7 +341,7 @@
               } else {
                 this.$message({
                   type: "info",
-                  message: "删除失败",
+                  message: "删除失败,用户或存在关联食堂",
                 });
               }
             });

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

@@ -96,4 +96,10 @@ public interface CanteenDao {
     List<Map<String, Object>> getAllDeliciousByDishesId(String id);
 
     Map<String, Object> getLatestComment(@Param("dishesId") String dishesId, @Param("canteenId") String canteenId);
+
+    /**
+     * 查询当前权限用户是否存在食堂未跟换
+     */
+
+    Integer getWorkerIdtoCount(@Param("workerId") String workerId);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/filters/LoginFilter.java

@@ -51,7 +51,7 @@ public class LoginFilter implements Filter {
                 case "/mini/hlw/info":
                 case "/mini/hlw/forward":
                 case "/mini/hlw/getAllLeader":
-                case "/mini/canteen/test04":
+                case "/mini/hlw/favorites":
                     chain.doFilter(req, response);
                     break;
                 default:

nngkxxdp/src/main/java/com/example/nngkxxdp/program/constant/MiniConstant.java

@@ -129,4 +129,10 @@ public class MiniConstant {
      * 全文检索新闻接口
      */
     public final static String HL_RETRIEVAL_OF_NEWS = "/search.html";
+
+    /**
+     * appkey
+     */
+    public final static String APPKEY = "1F7zDYcGrbzA8mCrAmppvPTXp3PnX8Uf";
+
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/program/controller/SWorkerController.java

@@ -91,7 +91,7 @@ public class SWorkerController {
             return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS);
         }
         if (this.sWorkerService.checkUserRepeats(sWorker.getPhoneNum(), sWorker.getRole())){
-            SendUtil.send(false, ConstStr.ROLE_REPEAT);
+            return SendUtil.send(false, ConstStr.ROLE_REPEAT);
         }
         return SendUtil.send(true,this.sWorkerService.insert(sWorker));
     }

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

@@ -41,7 +41,7 @@ public interface AppletUserDao {
      * @param userId
      * @return
      */
-    String queryUserHlToken(String userId);
+    Map<String,String> queryUserHlToken(String userId);
 
     String findUser(@Param("phoneNum") String phoneNum);
 

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

@@ -0,0 +1,43 @@
+package com.example.nngkxxdp.program.entity.jsonobj;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class HLUserInfoDTO {
+    @JsonProperty("id")
+    private Integer id;
+    @JsonProperty("appId")
+    private Integer appId;
+    @JsonProperty("loginName")
+    private String loginName;
+    @JsonProperty("nickName")
+    private String nickName;
+    @JsonProperty("anonymousName")
+    private String anonymousName;
+    @JsonProperty("avatar")
+    private String avatar;
+    @JsonProperty("source")
+    private String source;
+    @JsonProperty("sourceType")
+    private Integer sourceType;
+    @JsonProperty("sessionId")
+    private String sessionId;
+    @JsonProperty("telephone")
+    private String telephone;
+    @JsonProperty("idCard")
+    private Object idCard;
+    @JsonProperty("name")
+    private Object name;
+    @JsonProperty("phone")
+    private Object phone;
+    @JsonProperty("sex")
+    private Integer sex;
+    @JsonProperty("email")
+    private Object email;
+    @JsonProperty("authTag")
+    private Object authTag;
+
+}

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

@@ -17,4 +17,6 @@ public class HlLoginDTO {
     private Long userId;
     @JsonProperty("sex")
     private Integer sex;
+    @JsonProperty("sessionId")
+    private String sessionId;
 }

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

@@ -38,12 +38,15 @@ public class HLWIntefaceImpl implements HLWIntefaceService {
     @Transactional
     @Override
     public Map<String, Object> favorites(String userId) {
-        String userToken = getUserToken(userId);
+        Map<String,String> user = getUserToken(userId);
+        if (ObjectUtil.isEmpty(user)){
+            return SendUtil.send(false, "", MiniConstant.RESULT_FAILED);
+        }
         // 拼装请求信息
         Map<String, Object> requiredParameter = new HashMap<>(5);
         requiredParameter.put("appId", 4);
-        requiredParameter.put("token", userToken);
-        requiredParameter.put("sessionId", "");
+        requiredParameter.put("token",user.get("token"));
+        requiredParameter.put("sessionId", user.get("sessionId"));
         HlwFavoritesDTO data = getJsonObject(MiniConstant.HL_COLLECT, requiredParameter, HlwFavoritesDTO.class);
         if (ObjectUtil.isEmpty(data)||ObjectUtil.isEmpty(data.getDataList())||data.getDataList().size()==0){
             return SendUtil.send(false, "", MiniConstant.RESULT_FAILED);
@@ -62,12 +65,15 @@ public class HLWIntefaceImpl implements HLWIntefaceService {
 
     @Override
     public Map<String, Object> comments(String userId, Integer type) {
-        String userToken = getUserToken(userId);
+        Map<String,String>  user = getUserToken(userId);
+        if (ObjectUtil.isEmpty(user)){
+            return SendUtil.send(false, "", MiniConstant.RESULT_FAILED);
+        }
         Map<String, Object> requiredParameter = new HashMap<>(5);
         requiredParameter.put("appId", 4);
-        requiredParameter.put("token", userToken);
         requiredParameter.put("type", type);
-        requiredParameter.put("sessionId", "");
+        requiredParameter.put("token",user.get("token"));
+        requiredParameter.put("sessionId", user.get("sessionId"));
         HlwCommentsDTO data = getJsonObject(MiniConstant.HL_REMARK, requiredParameter, HlwCommentsDTO.class);
         if (ObjectUtil.isEmpty(data)||ObjectUtil.isEmpty(data.getDataList())||data.getDataList().size()==0){
             return SendUtil.send(false, "", MiniConstant.RESULT_FAILED);
@@ -78,10 +84,14 @@ public class HLWIntefaceImpl implements HLWIntefaceService {
 
     @Override
     public Map<String, Object> praises(String userId) {
-        String userToken = getUserToken(userId);
+        Map<String,String> user = getUserToken(userId);
+        if (ObjectUtil.isEmpty(user)){
+            return SendUtil.send(false, "", MiniConstant.RESULT_FAILED);
+        }
         Map<String, Object> requiredParameter = new HashMap<>(5);
         requiredParameter.put("appId", 4);
-        requiredParameter.put("token", userToken);
+        requiredParameter.put("token",user.get("token"));
+        requiredParameter.put("sessionId", user.get("sessionId"));
         HlwPraisesDTO data = getJsonObject(MiniConstant.HL_GIVEALIKE, requiredParameter, HlwPraisesDTO.class);
         if (ObjectUtil.isEmpty(data)||ObjectUtil.isEmpty(data.getDataList())||data.getDataList().size()==0){
             return SendUtil.send(false, "", MiniConstant.RESULT_FAILED);
@@ -174,9 +184,9 @@ public class HLWIntefaceImpl implements HLWIntefaceService {
      * 获取用户token
      * @param userId
      */
-    private String getUserToken(String userId) {
+    private Map<String,String> getUserToken(String userId) {
         if (StrUtil.isEmpty(userId)){
-            return "";
+            return null;
         }
        return appletUserDao.queryUserHlToken(userId);
     }

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

@@ -4,13 +4,16 @@ import java.util.HashMap;
 import java.util.Map;
 
 import cn.hutool.json.JSONUtil;
+import cn.hutool.log.Log;
+import com.example.nngkxxdp.program.entity.jsonobj.HLUserInfoDTO;
 import com.example.nngkxxdp.program.entity.jsonobj.HlLoginDTO;
 import com.example.nngkxxdp.program.entity.vo.WxPhoneVo;
 import com.example.nngkxxdp.program.service.SWorkerService;
 import com.example.nngkxxdp.util.RedisUtil;
+import jdk.nashorn.internal.runtime.logging.Logger;
+import lombok.extern.log4j.Log4j2;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import com.example.nngkxxdp.program.constant.MiniConstant;
@@ -35,6 +38,7 @@ import lombok.RequiredArgsConstructor;
  */
 @Service("LoginService")
 @RequiredArgsConstructor
+@Log4j2
 public class MiniLoginServiceImpl implements MiniLoginService {
 
     @Value("${hlw}")
@@ -60,12 +64,12 @@ public class MiniLoginServiceImpl implements MiniLoginService {
             String s = HttpUtil.get(MiniConstant.LOGIN, requestParameters);
             JSONObject jsonObject = new JSONObject(s);
             if (ObjectUtil.isNotEmpty(jsonObject.get("errcode"))) {
-                return SendUtil.send(false, "登录失败");
+                return SendUtil.send(false, "登录失败3");
             }
             // 手机号获取
             WxPhoneVo wxPhoneVo = getWxPhone(phoneCode);
             if (!wxPhoneVo.getErrcode().equals(0)) {
-                return SendUtil.send(false, "登录失败");
+                return SendUtil.send(false, "登录失败2");
             }
             WxPhoneVo.PhoneInfoDTO phoneInfo = wxPhoneVo.getPhoneInfo();
             // 拼装登录对象
@@ -85,11 +89,13 @@ public class MiniLoginServiceImpl implements MiniLoginService {
             AppletUser info = appletUserDao.queryByOpenId(appletUser.getOpenid());
             // 请求华龙网接口
             HlLoginDTO hlLoginDTO = huaLongNetworkInterface(info.getOpenid());
+            HLUserInfoDTO hlUserInfoDTO = huaLongLoginUserInfo(hlLoginDTO.getToken());
             if (ObjectUtil.isEmpty(hlLoginDTO)){
-                return SendUtil.send(false, "登录失败");
+                return SendUtil.send(false, "登录失败1");
             }
+
             // 设置用户登录信息
-            setLogininfo(info, hlLoginDTO);
+            setLogininfo(info, hlLoginDTO,hlUserInfoDTO);
             info.setSessionKey(appletUser.getSessionKey());
             appletUserDao.update(info);
             String token = MiniTokenUtil.generateToken(info.getId(), info.getNickName(), 60 * 24);
@@ -101,19 +107,21 @@ public class MiniLoginServiceImpl implements MiniLoginService {
             returnedValue.put("userId", info.getId());
             returnedValue.put("role", sWorkerService.getUserType(info.getId()));
             returnedValue.put("hlToken", info.getToken());
+
             return SendUtil.send(true, "", returnedValue);
         } catch (Exception e) {
             e.printStackTrace();
-            return SendUtil.send(false, "登录失败");
+            return SendUtil.send(false, "登录失败err");
         }
     }
 
-    private void setLogininfo(AppletUser info, HlLoginDTO hlLoginDTO) {
+    private void setLogininfo(AppletUser info, HlLoginDTO hlLoginDTO, HLUserInfoDTO hlUserInfoDTO) {
         info.setToken(hlLoginDTO.getToken());
         info.setImgUrl(hlLoginDTO.getImgUrl());
         info.setNickName(hlLoginDTO.getNickName());
         info.setSex(hlLoginDTO.getSex());
         info.setUserId(hlLoginDTO.getUserId());
+        info.setSessionId(hlUserInfoDTO.getSessionId());
 
     }
 
@@ -127,6 +135,7 @@ public class MiniLoginServiceImpl implements MiniLoginService {
         Map<String, Object> objectObjectHashMap = new HashMap<>(1);
         objectObjectHashMap.put("unionId", openId);
         String post = HttpUtil.post(Path, objectObjectHashMap);
+        System.out.println(post);
         JSONObject jsonObject = JSONUtil.parseObj(post);
         if (Convert.toInt(jsonObject.get("code"))==-1){
             return null;
@@ -134,6 +143,20 @@ public class MiniLoginServiceImpl implements MiniLoginService {
         return JSONUtil.toBean(jsonObject.getJSONObject("data"), HlLoginDTO.class);
     }
 
+    private HLUserInfoDTO huaLongLoginUserInfo(String token){
+        String path = address+MiniConstant.HL_USER_INFO;
+        Map<String, Object> objectObjectHashMap = new HashMap<>(1);
+        objectObjectHashMap.put("appKey", MiniConstant.APPKEY);
+        objectObjectHashMap.put("token", token);
+        String post = HttpUtil.post(path, objectObjectHashMap);
+        System.out.println(post);;
+        JSONObject jsonObject = JSONUtil.parseObj(post);
+        if (Convert.toInt(jsonObject.get("code"))==-1){
+            return null;
+        }
+        return JSONUtil.toBean(jsonObject.getJSONObject("data"), HLUserInfoDTO.class);
+    }
+
     private WxPhoneVo getWxPhone(String phoneCode) {
         JSONObject jsonObject = new JSONObject();
         jsonObject.set("code", phoneCode);

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

@@ -4,12 +4,11 @@ package com.example.nngkxxdp.program.service.Impl;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.example.nngkxxdp.dao.CanteenDao;
 import com.example.nngkxxdp.program.dao.AppletUserDao;
 import com.example.nngkxxdp.program.dao.SWorkerDao;
 import com.example.nngkxxdp.program.entity.SWorker;
 import com.example.nngkxxdp.program.service.SWorkerService;
-import com.example.nngkxxdp.util.SendUtil;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
@@ -29,13 +28,15 @@ public class SWorkerServiceImpl implements SWorkerService {
     
     private final SWorkerDao sWorkerDao;
     private final AppletUserDao appletUserDao;
+    private final CanteenDao canteenDao;
 
 
 
     
-    public SWorkerServiceImpl(SWorkerDao sWorkerDao, AppletUserDao appletUserDao) {
+    public SWorkerServiceImpl(SWorkerDao sWorkerDao, AppletUserDao appletUserDao, CanteenDao canteenDao) {
         this.sWorkerDao = sWorkerDao;
         this.appletUserDao = appletUserDao;
+        this.canteenDao = canteenDao;
     }
     /**
      * 通过ID查询单条数据
@@ -99,6 +100,9 @@ public class SWorkerServiceImpl implements SWorkerService {
      */
     @Override
     public boolean deleteById(String id) {
+        if (canteenDao.getWorkerIdtoCount(id)>0){
+            return false;
+        }
         return this.sWorkerDao.deleteById(id) > 0;
     }
 
@@ -138,4 +142,6 @@ public class SWorkerServiceImpl implements SWorkerService {
     }
 
 
+
+
 }

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

@@ -98,8 +98,8 @@
         where openid = #{openid}
     </select>
 
-    <select id="queryUserHlToken" resultType="string">
-        select token
+    <select id="queryUserHlToken" resultType="map">
+        select token ,sessionId
         from  applet_user
         where id = #{userId}
     </select>

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

@@ -171,7 +171,8 @@
         and se.isviolations = 0
         and se.canteenId = #{id}
         and YEARWEEK(date_format(se.create_time, '%Y-%m-%d'), 1) = YEARWEEK(DATE_SUB(now(),INTERVAL 7 DAY), 1)
-        GROUP BY se.dishesId
+        GROUP BY se.id,
+                 se.dishesId
         ORDER BY se.score DESC, commentCount DESC
         limit 3
     </select>
@@ -189,5 +190,9 @@
         order by se.create_time DESC
         limit 1
     </select>
+    
+    <select id="getWorkerIdtoCount" resultType="int">
+        select count(*) from s_canteen where worker_id = #{workerId}
+    </select>
 
 </mapper>

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

@@ -209,7 +209,7 @@
 
     <select id="workOrderCount" resultType="int">
         select count(*) from s_repair
-        where user_id = #{userId}
+        where worker_id = #{userId}
         AND is_del = 0
         <if test="status != null and status.size > 0">
             AND status in
@@ -223,7 +223,7 @@
         select
         id, repair_type, user_description, repair_pic, phone_num, status, worker_description, result_pic, worker_id, create_time, update_time,user_id,appointment_time,maintenance_address
         from s_repair
-        where user_id = #{userId}
+        where worker_id = #{userId}
         AND is_del = 0
         <if test="status != null and status.size > 0">
             AND status in

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

@@ -1,282 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>数据汇总页面</title>
-
-		<link rel="stylesheet" type="text/css" href="css/index.css" />
-		<link rel="stylesheet" href="./layui/layui.css" media="all">
-
-		<link rel="stylesheet" href="./css/dataAll.css">
-		<style type="text/css">
-			body{
-				margin: 0px;
-				padding: 0px;
-				/*max-width: 1200px;*/
-				background: #f0f2f5;
-			}
-			.bodyBox{
-				width: 1200px;
-				margin: 0 auto;
-				height: 880px;
-			}
-
-			.box{
-				width: 25%;
-				height: 156px;
-				background: #FFFFFF;
-				border: 1px solid #FFFFFF;
-				box-shadow: 5px 9px 17px 1px rgba(122,122,122,0.16);
-				float: left;
-				margin:25px 50px 25px 25px;
-				cursor: pointer;
-			}
-			.box:hover{
-				background: #125DB2;
-				color: #fff;
-			}
-			/*.first{*/
-			/*	background: #125DB2;*/
-			/*}*/
-			.moduleIcon{
-				display: block;
-				width: 45px;
-				height: 45px;
-				margin: 40px auto 0;
-			}
-			.moduleName{
-				width: 91px;
-				height: 24px;
-				font-size: 18px;
-				font-family: Microsoft YaHei;
-				font-weight: bold;
-				color: #333333;
-				line-height: 24px;
-				text-align: center;
-			}
-			.box:hover .moduleName{
-				color: #fff;
-			}
-			.cutOffRule{
-				width: 2px;
-				height: 120px;
-				background: #EEEEEE;
-				float: left;
-				margin-top: 17px;
-			}
-			.moduleMenu{
-				width: 50%;
-				float: left;
-				height: 100%;
-				margin-top: 35px;
-				margin-left: 25px;
-			}
-			.moduleMenu li{
-				display: block;
-				width: 100%;
-				height: 30px;
-				font-size: 16px;
-				font-family: Microsoft YaHei;
-				font-weight: 300;
-				color: #333333;
-				line-height: 30px;
-			}
-			.box:hover .moduleMenu li {
-				color:#fff;
-			}
-			.img1{
-				display: block;
-			}
-			.img2{
-				display: none;
-			}
-
-			.box:hover .img1{
-				display: none;
-			}
-			.box:hover .img2{
-				display: block;
-			}
-
-			.floatingButton{
-				width: 130px !important;
-				height: 130px;
-				text-align: center;
-				border-radius: 100px;
-				background: #125DB2;
-				color: #fff;
-				font-size: 16px;
-				position: fixed;
-				z-index: 9999;
-				left: 80%;
-				bottom: 70%;
-				cursor: pointer;
-				font-weight: bold;
-				box-shadow: 5px 9px 17px 1px rgba(122,122,122,0.16);
-			}
-			/*.floatingButton:hover{*/
-			/*	background: #125DB2;*/
-			/*	color: #fff;*/
-			/*}*/
-		</style>
-	</head>
-	<body style="background-color: #f0f2f5;">
-		<div class="bodyBox">
-<!--			国民经济-->
-			<div class="box" onclick="goGmjj()">
-				<div style="width: 90px;height: 100%;float: left; ">
-					<img class="moduleIcon img1" src="./image/content_icon_financing_default.png">
-					<img class="moduleIcon img2" src="./image/content_icon_financing_hover.png">
-					<div class="moduleName">国民经济</div>
-				</div>
-				<div class="cutOffRule"></div>
-				<div>
-					<ul class="moduleMenu">
-						<li>国民经济数据统计</li>
-						<li>GDP地区生产总值...</li>
-						<li>建筑业总产值</li>
-					</ul>
-				</div>
-			</div>
-			<!--			政务服务-->
-			<div class="box" onclick="goZwfw()">
-				<div style="width: 90px;height: 100%;float: left; ">
-					<img class="moduleIcon img1" src="./image/content_icon_hands_default.png">
-					<img class="moduleIcon img2" src="./image/content_icon_hands_hover.png">
-					<div class="moduleName">政务服务</div>
-				</div>
-				<div class="cutOffRule"></div>
-				<div>
-					<ul class="moduleMenu">
-						<li>政务服务数据统计</li>
-						<li>本周办件数</li>
-						<li>事实办件详情</li>
-					</ul>
-				</div>
-			</div>
-			<!--			公开信箱-->
-			<div class="box" onclick="goGkyx()">
-				<div style="width: 90px;height: 100%;float: left; ">
-					<img class="moduleIcon img1" src="./image/content_icon_mail_default.png">
-					<img class="moduleIcon img2" src="./image/content_icon_mail_hover.png">
-					<div class="moduleName">公开信箱</div>
-				</div>
-				<div class="cutOffRule"></div>
-				<div>
-					<ul class="moduleMenu">
-						<li>公开信箱数据统计</li>
-						<li>本周信件数量</li>
-						<li>信箱信息</li>
-					</ul>
-				</div>
-			</div>
-			<!--			社会保障-->
-			<div class="box" onclick="goShbz()">
-				<div style="width: 90px;height: 100%;float: left; ">
-					<img class="moduleIcon img1" src="./image/content_icon_protect_default.png">
-					<img class="moduleIcon img2" src="./image/content_icon_protect_hover.png">
-					<div class="moduleName">社会保障</div>
-				</div>
-				<div class="cutOffRule"></div>
-				<div>
-					<ul class="moduleMenu">
-						<li>社会保障数据统计</li>
-						<li>新增就业人数</li>
-						<li>劳动争议案件</li>
-					</ul>
-				</div>
-			</div>
-			<!--			卫生医疗-->
-			<div class="box" onclick="goWsyl()">
-				<div style="width: 90px;height: 100%;float: left; ">
-					<img class="moduleIcon img1" src="./image/content_icon_love_default.png">
-					<img class="moduleIcon img2" src="./image/content_icon_love_hover.png">
-					<div class="moduleName">卫生医疗</div>
-				</div>
-				<div class="cutOffRule"></div>
-				<div>
-					<ul class="moduleMenu">
-						<li>医疗机构数、床位数</li>
-						<li>医疗卫生人员</li>
-						<li>诊疗人次</li>
-					</ul>
-				</div>
-			</div>
-			<!--			文化旅游-->
-			<div class="box" onclick="goWhly()">
-				<div style="width: 90px;height: 100%;float: left;">
-					<img class="moduleIcon img1" src="./image/content_icon_takeoff_default.png">
-					<img class="moduleIcon img2" src="./image/content_icon_takeoff_hover.png">
-					<div class="moduleName">文化旅游</div>
-				</div>
-				<div class="cutOffRule"></div>
-				<div>
-					<ul class="moduleMenu">
-						<li>接待海内外游客</li>
-						<li>过夜游客</li>
-						<li>旅游总收入</li>
-					</ul>
-				</div>
-			</div>
-			<!--			社会救助-->
-			<div class="box" onclick="goShjz()">
-				<div style="width: 90px;height: 100% ;float: left;">
-					<img class="moduleIcon img1" src="./image/content_icon_sport_default.png">
-					<img class="moduleIcon img2" src="./image/content_icon_sport_hover.png">
-					<div class="moduleName">社会救助</div>
-				</div>
-				<div class="cutOffRule"></div>
-				<div>
-					<ul class="moduleMenu">
-						<li>最低生活保障</li>
-						<li>特困救助供养数据</li>
-						<li>临时救助数据</li>
-					</ul>
-				</div>
-			</div>
-<!--			重庆市公共数据开发平台-->
-			<div class="floatingButton" onclick="goGgsjpt()"><p style="margin-top: 35px">重庆市
-				</br>公共数据开放</br>平台</p></div>
-		</div>
-	</body>
-	<script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
-	<script type="text/javascript">
-
-		function isMobileUserAgent() {
-			return /iphone|ipod|android.*mobile|windows.*phone|blackberry.*mobile/i.test(
-					window.parent.navigator.userAgent.toLowerCase("")
-			);
-		}
-		let PATH = "https://www.data.cqna.gov.cn/data/"
-		// let PATH = "http://localhost:7777/natj"
-
-		if (isMobileUserAgent()){
-			window.location='https://www.cqna.gov.cn/data/natj/enter_dataAllMobile.html'
-		}
-		function goGmjj(){
-			window.open("https://www.cqna.gov.cn/bm/qtjj/gmjjtj/")
-		}
-		function goZwfw(){
-			window.open("https://www.cqna.gov.cn/sjtj1/")
-		}
-		function goGkyx(){
-			window.open("https://www.cqna.gov.cn/hdjl_254/gkxxtjsj/")
-		}
-
-		function goShbz(){
-			window.open("https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=1")
-		}
-		function goWsyl(){
-			window.open("https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=3")
-		}
-		function goWhly(){
-			window.open("https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=2")
-		}
-		function goShjz(){
-			window.open("https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=4")
-		}
-		function goGgsjpt(){
-			window.open("https://data.cq.gov.cn/rop/assets")
-		}
-	</script>
-</html>

nngkxxdp/src/main/resources/static/natj/enter_dataAllMobile.html.bak

@@ -1,278 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-	<meta charset="utf-8">
-	<title>数据汇总页面</title>
-
-	<link rel="stylesheet" type="text/css" href="css/index.css" />
-	<link rel="stylesheet" href="./layui/layui.css" media="all">
-	<style type="text/css">
-		body {
-			margin: 0px;
-			padding: 0px;
-			/*max-width: 1200px;*/
-			background: #f0f2f5;
-		}
-
-		.bodyBox {
-			margin: 5px;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-		}
-
-		.box {
-			width: 80%;
-			height: 125px;
-			background: #FFFFFF;
-			border: 1px solid #FFFFFF;
-			box-shadow: 5px 9px 17px 1px rgba(122, 122, 122, 0.16);
-			cursor: pointer;
-			display: flex;
-			align-items: center;
-			margin: 23.5px;
-		}
-
-		.box:hover {
-			background: #125DB2;
-			color: #fff;
-		}
-
-		/*.first{*/
-		/*	background: #125DB2;*/
-		/*}*/
-		.moduleIcon {
-			display: block;
-			width: 45px;
-			height: 45px;
-		}
-
-		.moduleName {
-			width: 80px;
-			height: 12px;
-			font-size: 20px;
-			font-family: Microsoft YaHei;
-			font-weight: bold;
-			color: #333333;
-			line-height: 12px;
-			text-align: center;
-			margin-top: 7.5px;
-		}
-
-		.box:hover .moduleName {
-			color: #fff;
-		}
-
-		.cutOffRule {
-			width: 1px;
-			height: 95px;
-			background: #EEEEEE;
-		}
-
-		.moduleMenu {
-			margin-left: 20px;
-		}
-
-		.moduleMenu li {
-			display: block;
-			height: 30px;
-			font-size: 7.5px;
-			font-family: Microsoft YaHei;
-			font-weight: 300;
-			color: #1a1717;
-			line-height: 30px;
-		}
-
-		.box:hover .moduleMenu li {
-			color: #fff;
-		}
-
-		.img1 {
-			display: block;
-		}
-
-		.img2 {
-			display: none;
-		}
-
-		.box:hover .img1 {
-			display: none;
-		}
-
-		.box:hover .img2 {
-			display: block;
-		}
-
-		.floatingButton {
-			width: 80px !important;
-			height: 80px;
-			text-align: center;
-			border-radius: 50px;
-			line-height: 17.5px;
-			background: #125DB2;
-			color: #fff;
-			font-size: 10px;
-			position: fixed;
-			z-index: 9999;
-			left: 75%;
-			bottom: 55%;
-			cursor: pointer;
-			font-weight: bold;
-			box-shadow: 5px 9px 17px 1px rgba(122, 122, 122, 0.16);
-		}
-
-		.box .list {
-			width: 125px;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-		}
-	</style>
-</head>
-
-<body style="background-color: #f0f2f5;">
-	<div class="bodyBox">
-		<!--			国民经济-->
-		<div class="box" onclick="goGmjj()">
-			<div class="list">
-				<img class="moduleIcon img1" src="./image/content_icon_financing_default.png">
-				<img class="moduleIcon img2" src="./image/content_icon_financing_hover.png">
-				<div class="moduleName">国民经济</div>
-			</div>
-			<div class="cutOffRule"></div>
-			<ul class="moduleMenu">
-				<li>国民经济数据统计</li>
-				<li>GDP地区生产总值...</li>
-				<li>建筑业总产值</li>
-			</ul>
-		</div>
-		<!--			政务服务-->
-		<div class="box" onclick="goZwfw()">
-			<div class="list">
-				<img class="moduleIcon img1" src="./image/content_icon_hands_default.png">
-				<img class="moduleIcon img2" src="./image/content_icon_hands_hover.png">
-				<div class="moduleName">政务服务</div>
-			</div>
-			<div class="cutOffRule"></div>
-			<ul class="moduleMenu">
-				<li>政务服务数据统计</li>
-				<li>本周办件数</li>
-				<li>事实办件详情</li>
-			</ul>
-		</div>
-		<!--			公开信箱-->
-		<div class="box" onclick="goGkyx()">
-			<div class="list">
-				<img class="moduleIcon img1" src="./image/content_icon_mail_default.png">
-				<img class="moduleIcon img2" src="./image/content_icon_mail_hover.png">
-				<div class="moduleName">公开信箱</div>
-			</div>
-			<div class="cutOffRule"></div>
-			<ul class="moduleMenu">
-				<li>公开信箱数据统计</li>
-				<li>本周信件数量</li>
-				<li>信箱信息</li>
-			</ul>
-		</div>
-		<!--			社会保障-->
-		<div class="box" onclick="goShbz()">
-			<div class="list">
-				<img class="moduleIcon img1" src="./image/content_icon_protect_default.png">
-				<img class="moduleIcon img2" src="./image/content_icon_protect_hover.png">
-				<div class="moduleName">社会保障</div>
-			</div>
-			<div class="cutOffRule"></div>
-			<ul class="moduleMenu">
-				<li>社会保障数据统计</li>
-				<li>新增就业人数</li>
-				<li>劳动争议案件</li>
-			</ul>
-		</div>
-		<!--			卫生医疗-->
-		<div class="box" onclick="goWsyl()">
-			<div class="list">
-				<img class="moduleIcon img1" src="./image/content_icon_love_default.png">
-				<img class="moduleIcon img2" src="./image/content_icon_love_hover.png">
-				<div class="moduleName">卫生医疗</div>
-			</div>
-			<div class="cutOffRule"></div>
-			<ul class="moduleMenu">
-				<li>医疗机构数、床位数</li>
-				<li>医疗卫生人员</li>
-				<li>诊疗人次</li>
-			</ul>
-		</div>
-		<!--			文化旅游-->
-		<div class="box" onclick="goWhly()">
-			<div class="list">
-				<img class="moduleIcon img1" src="./image/content_icon_takeoff_default.png">
-				<img class="moduleIcon img2" src="./image/content_icon_takeoff_hover.png">
-				<div class="moduleName">文化旅游</div>
-			</div>
-			<div class="cutOffRule"></div>
-			<ul class="moduleMenu">
-				<li>接待海内外游客</li>
-				<li>过夜游客</li>
-				<li>旅游总收入</li>
-			</ul>
-		</div>
-		<!--			社会救助-->
-		<div class="box" onclick="goShjz()">
-			<div class="list">
-				<img class="moduleIcon img1" src="./image/content_icon_sport_default.png">
-				<img class="moduleIcon img2" src="./image/content_icon_sport_hover.png">
-				<div class="moduleName">社会救助</div>
-			</div>
-			<div class="cutOffRule"></div>
-			<ul class="moduleMenu">
-				<li>最低生活保障</li>
-				<li>特困救助供养数据</li>
-				<li>临时救助数据</li>
-			</ul>
-		</div>
-		<!--			重庆市公共数据开发平台-->
-		<div class="floatingButton" onclick="goGgsjpt()">
-			<p style="margin-top: 14px">重庆市
-				</br>公共数据开放</br>平台</p>
-		</div>
-	</div>
-</body>
-<script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript">
-	let PATH = "https://www.data.cqna.gov.cn/data/"
-	resizeFrame()
-	function resizeFrame(){
-		var content_iframe = window.parent.document.getElementsByTagName("iframe");//获取iframeID
-		$(content_iframe[1]).css("width", "100%")
-		$(content_iframe[1]).css("height", "1230px")
-	}
-	// let PATH = "http://localhost:7777/natj"
-	function goGmjj() {
-		window.open("https://www.cqna.gov.cn/bm/qtjj/gmjjtj/")
-	}
-	function goZwfw() {
-		window.open("https://www.cqna.gov.cn/sjtj1/")
-	}
-	function goGkyx() {
-		window.open("https://www.cqna.gov.cn/hdjl_254/gkxxtjsj/")
-	}
-
-	function goShbz() {
-		window.open("https://www.cqna.gov.cn/data/natj/dataCenter/indexMobile.html?id=1")
-	}
-	function goWsyl() {
-		window.open("https://www.cqna.gov.cn/data/natj/dataCenter/indexMobile.html?id=3")
-	}
-	function goWhly() {
-		window.open("https://www.cqna.gov.cn/data/natj/dataCenter/indexMobile.html?id=2")
-	}
-	function goShjz() {
-		window.open("https://www.cqna.gov.cn/data/natj/dataCenter/indexMobile.html?id=4")
-	}
-	function goGgsjpt() {
-		window.open("https://data.cq.gov.cn/rop/assets")
-	}
-</script>
-
-</html>