Kaynağa Gözat

Merge remote-tracking branch 'origin/master'

guojing 5 yıl önce
ebeveyn
işleme
0d52ba7d55
79 değiştirilmiş dosya ile 340 ekleme ve 90 silme
  1. 1 0
      whepi-ui/css/app.0d06b8fd.css
  2. 1 0
      whepi-ui/css/chunk-4ed49933.df312b50.css
  3. 1 0
      whepi-ui/css/chunk-5562ea1c.54dc77dc.css
  4. 1 0
      whepi-ui/css/chunk-5b624388.44a53004.css
  5. 1 0
      whepi-ui/css/chunk-5ef44a67.064a2e94.css
  6. 1 0
      whepi-ui/css/chunk-6ab6e507.55e9460c.css
  7. 1 0
      whepi-ui/css/chunk-6cdc4b15.f5c344f0.css
  8. 1 0
      whepi-ui/css/chunk-72ab68c2.f5f5ee37.css
  9. 1 0
      whepi-ui/css/chunk-737f8e34.2e115144.css
  10. 1 0
      whepi-ui/css/chunk-74539060.70649e80.css
  11. 1 0
      whepi-ui/css/chunk-ab14af0e.637b2b96.css
  12. 1 0
      whepi-ui/css/chunk-c500236c.9334b350.css
  13. 1 0
      whepi-ui/css/chunk-dbc2a580.f2b98efb.css
  14. 1 0
      whepi-ui/css/chunk-f5b633fe.6ac591b9.css
  15. 1 0
      whepi-ui/css/chunk-f6ad3f88.28c88e88.css
  16. 1 0
      whepi-ui/css/chunk-fbdc2710.52dfe2b6.css
  17. 1 0
      whepi-ui/css/chunk-vendors.58740506.css
  18. BIN
      whepi-ui/favicon.ico
  19. 57 0
      whepi-ui/index.html
  20. 2 0
      whepi-ui/js/app.93cf23f0.js
  21. 1 0
      whepi-ui/js/app.93cf23f0.js.map
  22. 2 0
      whepi-ui/js/chunk-2ca1646c.42d41cf3.js
  23. 1 0
      whepi-ui/js/chunk-2ca1646c.42d41cf3.js.map
  24. 2 0
      whepi-ui/js/chunk-2d0cb6c2.28c553d1.js
  25. 1 0
      whepi-ui/js/chunk-2d0cb6c2.28c553d1.js.map
  26. 2 0
      whepi-ui/js/chunk-2d0d3628.ddbfa8dd.js
  27. 1 0
      whepi-ui/js/chunk-2d0d3628.ddbfa8dd.js.map
  28. 2 0
      whepi-ui/js/chunk-2d0e146b.ace28509.js
  29. 1 0
      whepi-ui/js/chunk-2d0e146b.ace28509.js.map
  30. 2 0
      whepi-ui/js/chunk-2d2291e5.bb4d3abf.js
  31. 1 0
      whepi-ui/js/chunk-2d2291e5.bb4d3abf.js.map
  32. 2 0
      whepi-ui/js/chunk-2d22b973.04855e3e.js
  33. 1 0
      whepi-ui/js/chunk-2d22b973.04855e3e.js.map
  34. 2 0
      whepi-ui/js/chunk-4ed49933.8edc234e.js
  35. 1 0
      whepi-ui/js/chunk-4ed49933.8edc234e.js.map
  36. 2 0
      whepi-ui/js/chunk-5562ea1c.79ac22cd.js
  37. 1 0
      whepi-ui/js/chunk-5562ea1c.79ac22cd.js.map
  38. 2 0
      whepi-ui/js/chunk-5b624388.e0a00440.js
  39. 1 0
      whepi-ui/js/chunk-5b624388.e0a00440.js.map
  40. 2 0
      whepi-ui/js/chunk-5ef44a67.4c551877.js
  41. 1 0
      whepi-ui/js/chunk-5ef44a67.4c551877.js.map
  42. 2 0
      whepi-ui/js/chunk-6ab6e507.ddbf44c7.js
  43. 1 0
      whepi-ui/js/chunk-6ab6e507.ddbf44c7.js.map
  44. 2 0
      whepi-ui/js/chunk-6cdc4b15.d99732e6.js
  45. 1 0
      whepi-ui/js/chunk-6cdc4b15.d99732e6.js.map
  46. 2 0
      whepi-ui/js/chunk-72ab68c2.7607cd2d.js
  47. 1 0
      whepi-ui/js/chunk-72ab68c2.7607cd2d.js.map
  48. 2 0
      whepi-ui/js/chunk-737f8e34.a2fc7003.js
  49. 1 0
      whepi-ui/js/chunk-737f8e34.a2fc7003.js.map
  50. 2 0
      whepi-ui/js/chunk-74539060.e77047f8.js
  51. 1 0
      whepi-ui/js/chunk-74539060.e77047f8.js.map
  52. 2 0
      whepi-ui/js/chunk-ab14af0e.a00dd59c.js
  53. 1 0
      whepi-ui/js/chunk-ab14af0e.a00dd59c.js.map
  54. 2 0
      whepi-ui/js/chunk-c500236c.ac9086ef.js
  55. 1 0
      whepi-ui/js/chunk-c500236c.ac9086ef.js.map
  56. 2 0
      whepi-ui/js/chunk-dbc2a580.4e4c4910.js
  57. 1 0
      whepi-ui/js/chunk-dbc2a580.4e4c4910.js.map
  58. 2 0
      whepi-ui/js/chunk-f5b633fe.ea217d56.js
  59. 1 0
      whepi-ui/js/chunk-f5b633fe.ea217d56.js.map
  60. 2 0
      whepi-ui/js/chunk-f6ad3f88.3f1b4281.js
  61. 1 0
      whepi-ui/js/chunk-f6ad3f88.3f1b4281.js.map
  62. 2 0
      whepi-ui/js/chunk-fbdc2710.e57e7b8a.js
  63. 1 0
      whepi-ui/js/chunk-fbdc2710.e57e7b8a.js.map
  64. 19 0
      whepi-ui/js/chunk-vendors.9a6cea8f.js
  65. 1 0
      whepi-ui/js/chunk-vendors.9a6cea8f.js.map
  66. 3 0
      whepi-ui/templates/home/home.ftl
  67. 3 3
      whepi-ui/templates/home/ribao.ftl
  68. 42 37
      whepi-ui/templates/home/ribao.js
  69. 12 10
      whepi-ui/templates/ok.html
  70. 30 0
      whepi-ui/www1.html
  71. 8 8
      whepi-web/src/main/java/com/bofeng/controller/RootController.java
  72. 4 4
      whepi-web/src/main/java/com/bofeng/controller/UserController.java
  73. 12 5
      whepi-web/src/main/java/com/bofeng/controller/WxUserOpenController.java
  74. 3 4
      whepi-web/src/main/java/com/bofeng/entity/ExcelRiBao.java
  75. 3 4
      whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLY.java
  76. 3 3
      whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoPrivate.java
  77. 22 8
      whepi-web/src/main/java/com/bofeng/entity/UserRole.java
  78. 34 3
      whepi-web/src/main/java/com/bofeng/service/MsReportService.java
  79. 1 1
      whepi-web/src/main/java/com/bofeng/wx/WxController.java

+ 1 - 0
whepi-ui/css/app.0d06b8fd.css

@@ -0,0 +1 @@
+body{font-size:.42667rem;background-color:#f8f8f8;-webkit-font-smoothing:antialiased}

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-4ed49933.df312b50.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-5562ea1c.54dc77dc.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-5b624388.44a53004.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-5ef44a67.064a2e94.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-6ab6e507.55e9460c.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-6cdc4b15.f5c344f0.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-72ab68c2.f5f5ee37.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-737f8e34.2e115144.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-74539060.70649e80.css


+ 1 - 0
whepi-ui/css/chunk-ab14af0e.637b2b96.css

@@ -0,0 +1 @@
+.address{overflow:hidden}.address-title{height:8vh;position:relative}.address-title-txt{padding-left:.5rem;font-size:.5rem}.address-input{height:82vh;color:#505050;overflow:auto}.address-input-view{margin:0;font-size:.4rem;padding:.2rem 2rem}.address-input-view .van-cell{padding:.1rem .2rem;background-color:#e5e5e5}.address-input-code{margin:0;font-size:.4rem;padding:.2rem 2rem}.address-input-code .van-cell{padding:.1rem .2rem;border:.02667rem solid #999}.address-btn{height:10vh}

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-c500236c.9334b350.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-dbc2a580.f2b98efb.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-f5b633fe.6ac591b9.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-f6ad3f88.28c88e88.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-fbdc2710.52dfe2b6.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/css/chunk-vendors.58740506.css


BIN
whepi-ui/favicon.ico


+ 57 - 0
whepi-ui/index.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset=utf-8>
+    <meta http-equiv=X-UA-Compatible content="IE=edge">
+    <meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,viewport-fit=cover">
+    <link rel=icon href=/favicon.ico>
+    <title>抗击疫情</title>
+    <link href=/css/chunk-4ed49933.df312b50.css rel=prefetch>
+    <link href=/css/chunk-5562ea1c.54dc77dc.css rel=prefetch>
+    <link href=/css/chunk-5b624388.44a53004.css rel=prefetch>
+    <link href=/css/chunk-5ef44a67.064a2e94.css rel=prefetch>
+    <link href=/css/chunk-6ab6e507.55e9460c.css rel=prefetch>
+    <link href=/css/chunk-6cdc4b15.f5c344f0.css rel=prefetch>
+    <link href=/css/chunk-72ab68c2.f5f5ee37.css rel=prefetch>
+    <link href=/css/chunk-737f8e34.2e115144.css rel=prefetch>
+    <link href=/css/chunk-74539060.70649e80.css rel=prefetch>
+    <link href=/css/chunk-ab14af0e.637b2b96.css rel=prefetch>
+    <link href=/css/chunk-c500236c.9334b350.css rel=prefetch>
+    <link href=/css/chunk-dbc2a580.f2b98efb.css rel=prefetch>
+    <link href=/css/chunk-f5b633fe.6ac591b9.css rel=prefetch>
+    <link href=/css/chunk-f6ad3f88.28c88e88.css rel=prefetch>
+    <link href=/css/chunk-fbdc2710.52dfe2b6.css rel=prefetch>
+    <link href=/js/chunk-2ca1646c.42d41cf3.js rel=prefetch>
+    <link href=/js/chunk-2d0cb6c2.28c553d1.js rel=prefetch>
+    <link href=/js/chunk-2d0d3628.ddbfa8dd.js rel=prefetch>
+    <link href=/js/chunk-2d0e146b.ace28509.js rel=prefetch>
+    <link href=/js/chunk-2d2291e5.bb4d3abf.js rel=prefetch>
+    <link href=/js/chunk-2d22b973.04855e3e.js rel=prefetch>
+    <link href=/js/chunk-4ed49933.8edc234e.js rel=prefetch>
+    <link href=/js/chunk-5562ea1c.79ac22cd.js rel=prefetch>
+    <link href=/js/chunk-5b624388.e0a00440.js rel=prefetch>
+    <link href=/js/chunk-5ef44a67.4c551877.js rel=prefetch>
+    <link href=/js/chunk-6ab6e507.ddbf44c7.js rel=prefetch>
+    <link href=/js/chunk-6cdc4b15.d99732e6.js rel=prefetch>
+    <link href=/js/chunk-72ab68c2.7607cd2d.js rel=prefetch>
+    <link href=/js/chunk-737f8e34.a2fc7003.js rel=prefetch>
+    <link href=/js/chunk-74539060.e77047f8.js rel=prefetch>
+    <link href=/js/chunk-ab14af0e.a00dd59c.js rel=prefetch>
+    <link href=/js/chunk-c500236c.ac9086ef.js rel=prefetch>
+    <link href=/js/chunk-dbc2a580.4e4c4910.js rel=prefetch>
+    <link href=/js/chunk-f5b633fe.ea217d56.js rel=prefetch>
+    <link href=/js/chunk-f6ad3f88.3f1b4281.js rel=prefetch>
+    <link href=/js/chunk-fbdc2710.e57e7b8a.js rel=prefetch>
+    <link href=/css/app.0d06b8fd.css rel=preload as=style>
+    <link href=/css/chunk-vendors.58740506.css rel=preload as=style>
+    <link href=/js/app.93cf23f0.js rel=preload as=script>
+    <link href=/js/chunk-vendors.9a6cea8f.js rel=preload as=script>
+    <link href=/css/chunk-vendors.58740506.css rel=stylesheet>
+    <link href=/css/app.0d06b8fd.css rel=stylesheet>
+</head>
+<body>
+<div id=app></div>
+<script src=/js/chunk-vendors.9a6cea8f.js></script>
+<script src=/js/app.93cf23f0.js></script>
+</body>
+</html>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/app.93cf23f0.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/app.93cf23f0.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-2ca1646c.42d41cf3.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-2ca1646c.42d41cf3.js.map


+ 2 - 0
whepi-ui/js/chunk-2d0cb6c2.28c553d1.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0cb6c2"],{"4a32":function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},u=[],r=t("2877"),l={},a=Object(r["a"])(l,c,u,!1,null,null,null);n["default"]=a.exports}}]);
+//# sourceMappingURL=chunk-2d0cb6c2.28c553d1.js.map

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-2d0cb6c2.28c553d1.js.map


+ 2 - 0
whepi-ui/js/chunk-2d0d3628.ddbfa8dd.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d3628"],{"5d14":function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div")},i=[],u={name:"communityEpidemic"},d=u,a=t("2877"),o=Object(a["a"])(d,c,i,!1,null,"1e382d83",null);n["default"]=o.exports}}]);
+//# sourceMappingURL=chunk-2d0d3628.ddbfa8dd.js.map

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-2d0d3628.ddbfa8dd.js.map


+ 2 - 0
whepi-ui/js/chunk-2d0e146b.ace28509.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e146b"],{"7a6a":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],a=t("2877"),c={},l=Object(a["a"])(c,u,r,!1,null,null,null);n["default"]=l.exports}}]);
+//# sourceMappingURL=chunk-2d0e146b.ace28509.js.map

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-2d0e146b.ace28509.js.map


+ 2 - 0
whepi-ui/js/chunk-2d2291e5.bb4d3abf.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2291e5"],{dba2:function(n,e,t){"use strict";t.r(e);var c=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div")},u=[],a={name:"communityBulletin"},i=a,l=t("2877"),o=Object(l["a"])(i,c,u,!1,null,"c11f4376",null);e["default"]=o.exports}}]);
+//# sourceMappingURL=chunk-2d2291e5.bb4d3abf.js.map

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-2d2291e5.bb4d3abf.js.map


+ 2 - 0
whepi-ui/js/chunk-2d22b973.04855e3e.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d22b973"],{f02e:function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div")},u=[],a={name:"countryEpidemic"},i=a,r=t("2877"),o=Object(r["a"])(i,c,u,!1,null,"877434ae",null);n["default"]=o.exports}}]);
+//# sourceMappingURL=chunk-2d22b973.04855e3e.js.map

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-2d22b973.04855e3e.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-4ed49933.8edc234e.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-4ed49933.8edc234e.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-5562ea1c.79ac22cd.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-5562ea1c.79ac22cd.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-5b624388.e0a00440.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-5b624388.e0a00440.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-5ef44a67.4c551877.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-5ef44a67.4c551877.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-6ab6e507.ddbf44c7.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-6ab6e507.ddbf44c7.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-6cdc4b15.d99732e6.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-6cdc4b15.d99732e6.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-72ab68c2.7607cd2d.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-72ab68c2.7607cd2d.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-737f8e34.a2fc7003.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-737f8e34.a2fc7003.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-74539060.e77047f8.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-74539060.e77047f8.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-ab14af0e.a00dd59c.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-ab14af0e.a00dd59c.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-c500236c.ac9086ef.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-c500236c.ac9086ef.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-dbc2a580.4e4c4910.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-dbc2a580.4e4c4910.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-f5b633fe.ea217d56.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-f5b633fe.ea217d56.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-f6ad3f88.3f1b4281.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-f6ad3f88.3f1b4281.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 2 - 0
whepi-ui/js/chunk-fbdc2710.e57e7b8a.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-fbdc2710.e57e7b8a.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 19 - 0
whepi-ui/js/chunk-vendors.9a6cea8f.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
whepi-ui/js/chunk-vendors.9a6cea8f.js.map


+ 3 - 0
whepi-ui/templates/home/home.ftl

@@ -63,6 +63,9 @@
 
         <#if msReport ??>var msReport = ${msReport}</#if>;
         $('#ribao_jinrijujian').append(msReport.safetyNum);
+        if (msReport.reportStatus == 1) {
+            document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
+        }
         ribaoInitialization(msReport.reportId);
         $("#my-input-ribao").calendar();
         /*submit_back();*/

+ 3 - 3
whepi-ui/templates/home/ribao.ftl

@@ -36,7 +36,7 @@
                         注:请如实上报情况,便以相互帮助,小区是我家,团结就是力量!后期会有医生跟踪分析,给予大家医疗建议,请认真填报!
                     </span></div>
                     <div class="weui-btn-area">
-                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
+                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" style=""
                            onclick="addReport()">上报</a>
                     </div>
                 </div>
@@ -119,8 +119,8 @@
                             </div>
                         </label>
                     </div>
-                    <textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5"
-                              style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
+                    <#--<textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5"-->
+                              <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>-->
                     <input id="suspectedId" type="text" hidden="hidden" value=""/>
                     <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">

+ 42 - 37
whepi-ui/templates/home/ribao.js

@@ -224,13 +224,10 @@ function ribaoInitialization(reportId) {
     success: function (data) {
       console.log(data);
       if (data.data.length > 0) {
-        $('#btn_shangbao').text('上报');
         hasData = true;
         data.data.forEach(function (v) {
           ribao_cell(v);
         });
-      } else {
-        $('#btn_shangbao').text('上报');
       }
     },
     error: function () {
@@ -272,9 +269,9 @@ function ribao_cell(v) {
   var userName = v.userName + ":";
   var grender = getGreder(v.grender);
   var age = v.age;
-  // var familyStatus = "";
-  // if (v.familyStatus != 0)
-  //   familyStatus = "基本状况:" + getFamilyStatus(v.familyStatus) + ";";
+  var familyStatus = "";
+  if (v.familyStatus != 0)
+    familyStatus = "基本状况:" + getFamilyStatus(v.familyStatus) + ";";
   var medical = "";
   if (v.medical != 0)
     medical = "是否确诊:" + getMedical(v.medical) + ";";
@@ -301,14 +298,14 @@ function ribao_cell(v) {
     diarrhea = "腹泻现象:" + getDiarrhea(v.diarrhea) + ";";
   var others = "";
   if (v.others != "")
-    others = "其他:" + v.others;
+    others = "其他描述:" + v.others+ ";";
   var scoreRezult = "";
   if (v.scoreRezult != 0)
     scoreRezult = "评估结果:" + getScoreRezult(v.scoreRezult, v.temperatureScore) + ";";
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
     '                                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">' + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -324,9 +321,15 @@ function ribao_add() {
       $('#ribao')[0].style.display = 'none';
     }
 
-    // $("#js_input_user_status").val(getFamilyStatus(0));
-    // $("#js_input_user_status").attr("data-values", 0);
 
+    //基本情况
+    $("input[name='checkbox1']").removeAttr("checked");
+    $("input[name='checkbox2']").removeAttr("checked");
+    $("input[name='checkbox3']").removeAttr("checked");
+    $("input[name='checkbox4']").removeAttr("checked");
+    $("input[name='checkbox5']").removeAttr("checked");
+    $("input[name='checkbox6']").removeAttr("checked");
+    $("input[name='checkbox7']").removeAttr("checked");
 
     $("#switchQuezhen").val(getMedical(0));
     $("#switchQuezhen").attr("data-values", 0);
@@ -410,7 +413,8 @@ function ribaoCommit() {
   else
     familyStatus += ",0";
   //var familyStatus = $("#js_input_user_status").attr("data-values") == undefined ? 0 : $("#js_input_user_status").attr("data-values");
-  var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
+  //var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
+  var statusDesp = "";
   var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
   var singleRoom = $("#switchDanjiangeli").attr("data-values") == undefined ? 0 : $("#switchDanjiangeli").attr("data-values");
   var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
@@ -494,7 +498,7 @@ function ribaoCommit() {
       ribao_refrash();
 
       clearShow();
-
+      document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
     },
   });
 }
@@ -574,7 +578,7 @@ function updateSuspected(suspectedId) {
         // $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
         // $("#js_input_user_status").attr("data-values", suspected.familyStatus);
 
-        $("#jibenmiaoshu").val(suspected.statusDesp);
+        // $("#jibenmiaoshu").val(suspected.statusDesp);
 
         $("#switchQuezhen").val(getMedical(suspected.medical));
         $("#switchQuezhen").attr("data-values", suspected.medical);
@@ -622,6 +626,7 @@ function addReport() {
     },
     success: function (data) {
       $.toast(data.msg);
+      document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
     },
   });
 }
@@ -665,9 +670,9 @@ function helpValue1(v) {
   var userName = v.userName + ":";
   var grender = getGreder(v.grender);
   var age = v.age;
-  // var familyStatus = "";
-  // if (v.familyStatus != 0)
-  //   familyStatus = "基本状况:" + getFamilyStatus(v.familyStatus) + ";";
+  var familyStatus = "";
+  if (v.familyStatus != 0)
+    familyStatus = "基本状况:" + getFamilyStatus(v.familyStatus) + ";";
   var medical = "";
   if (v.medical != 0)
     medical = "是否确诊:" + getMedical(v.medical) + ";";
@@ -694,13 +699,13 @@ function helpValue1(v) {
     diarrhea = "腹泻现象:" + getDiarrhea(v.diarrhea) + ";";
   var others = "";
   if (v.others != "")
-    others = "其他:" + v.others;
+    others = "其他描述:" + v.others + ";";
   var scoreRezult = "";
   if (v.scoreRezult != 0)
     scoreRezult = "评估结果:" + getScoreRezult(v.scoreRezult, v.temperatureScore) + ";";
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">' + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -714,25 +719,25 @@ function getGreder(greder) {
   return "";
 }
 
-// function getFamilyStatus(familyStatus) {
-//   if (familyStatus == 0)
-//     return "无病史";
-//   if (familyStatus == 1)
-//     return "心脑血管疾病(服用ARB)";
-//   else if (familyStatus == 2)
-//     return "心脑血管疾病(未服ARB)";
-//   else if (familyStatus == 3)
-//     return "呼吸系统病史";
-//   else if (familyStatus == 4)
-//     return "肿瘤病史";
-//   else if (familyStatus == 5)
-//     return "糖尿病史";
-//   else if (familyStatus == 6)
-//     return "服用过激素药物";
-//   else if (familyStatus == 7)
-//     return "妊娠期";
-//   return "";
-// }
+function getFamilyStatus(familyStatus) {
+  var familyStatusList = familyStatus.split(",");
+  var familyStatusString = "";
+  if (familyStatusList[0] == 1)
+    familyStatusString += "心脑血管疾病(服用ARB),";
+  if (familyStatusList[1] == 1)
+    familyStatusString += "心脑血管疾病(未服ARB),";
+  if (familyStatusList[2] == 1)
+    familyStatusString += "呼吸系统病史,";
+  if (familyStatusList[3] == 1)
+    familyStatusString += "肿瘤病史,";
+  if (familyStatusList[4] == 1)
+    familyStatusString += "糖尿病史,";
+  if (familyStatusList[5] == 1)
+    familyStatusString += "服用过激素药物,";
+  if (familyStatusList[6] == 1)
+    familyStatusString += "妊娠期,";
+  return familyStatusString.substring(0, familyStatusString.length - 1);
+}
 
 function getCough(cough) {
   if (cough == 0)

+ 12 - 10
whepi-ui/templates/ok.html

@@ -14,18 +14,20 @@
 </div>
 </body>
 </html>
+<script src="https://www.w3cways.com/demo/vconsole/vconsole.min.js?v=2.2.0"></script>
 <script>
   function clickwwwww() {
-    debugger;
-    $.ajax({
-      url: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect',
-      get: "get",
-      success: function (data) {
-        alert(data);
-        console.log(data);
-
-      },
-    });
+    window.location.href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect';
+    // debugger;
+    // $.ajax({
+    //   url: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect',
+    //   get: "get",
+    //   success: function (data) {
+    //     alert(data);
+    //     console.log(data);
+    //
+    //   },
+    // });
   }
   (function ($) {
 

+ 30 - 0
whepi-ui/www1.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>测试</title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+    <script src="/static/jquery/1.11.0/jquery.min.js"></script>
+</head>
+<body>
+<button style="height: 70px; width: 150px" onclick="click();"> 测试 </button>
+</body>
+<script>
+  (function ($) {
+
+  })(jQuery);
+
+  function click() {
+    debugger;
+    $.ajax({
+      url: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect',
+      get: "get",
+      success: function (data) {
+        alert(data);
+        console.log(data);
+
+      },
+    });
+  }
+</script>

+ 8 - 8
whepi-web/src/main/java/com/bofeng/controller/RootController.java

@@ -106,12 +106,12 @@ public class RootController {
         return Model.newSuccess(bofengProperties);
     }
 
-    @GetMapping(value = {"/"})
-    public ModelAndView index() {
-        if (!JwtHelper.isLogined()) {
-            return new ModelAndView(new RedirectViewJs("/user/login.html"));
-        }
-
-        return new ModelAndView(new RedirectViewJs("/admin/index.html"));
-    }
+//    @GetMapping(value = {"/"})
+//    public ModelAndView index() {
+////        if (!JwtHelper.isLogined()) {
+////            return new ModelAndView(new RedirectViewJs("/user/login.html"));
+////        }
+//
+//        return new ModelAndView(new RedirectViewJs("/index.html"));
+//    }
 }

+ 4 - 4
whepi-web/src/main/java/com/bofeng/controller/UserController.java

@@ -30,10 +30,10 @@ public class UserController {
     @Autowired
     private PlaceService placeService;
 
-    @GetMapping("/index.html")
-    public ModelAndView index() {
-        return new ModelAndView("/index.html");
-    }
+//    @GetMapping("/index.html")
+//    public ModelAndView index() {
+//        return new ModelAndView("/index.html");
+//    }
 
 //    @GetMapping("/user/logout.html")
 //    @PostMapping("/user/logout.html")

+ 12 - 5
whepi-web/src/main/java/com/bofeng/controller/WxUserOpenController.java

@@ -8,6 +8,7 @@ import com.bofeng.entity.UserRole;
 import com.bofeng.service.HomeService;
 import com.bofeng.service.WxUserOpenService;
 import com.yvan.Model;
+import com.yvan.platform.Conv;
 import com.yvan.platform.JsonWapper;
 import com.yvan.platform.StringUtils;
 import com.yvan.springmvc.HttpParameterParser;
@@ -17,6 +18,7 @@ import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -55,11 +57,16 @@ public class WxUserOpenController {
     }
 
     @ApiOperation("用户注册页面点登录")
-    @GetMapping("/userOpen/login")
-    public Model<Long> login() {
-        val parser = HttpParameterParser.newInstance(HttpUtils.currentRequest());
-        String openId = parser.getString("openId");
-        String code = parser.getString("code");
+    @PostMapping("/userOpen/login")
+    public Model<Long> login(@RequestBody String body) {
+//        val parser = HttpParameterParser.newInstance(HttpUtils.currentRequest());
+//        String openId = parser.getString("openId");
+//        String code = parser.getString("code");
+        JsonWapper jsonWapper = new JsonWapper(body);
+        Map map = jsonWapper.getInnerMap();
+        String openId = Conv.NS(map.get("openId"));
+        String code = Conv.NS(map.get("code"));
+
         if (StringUtils.isNullOrEmpty(code)) {
             return Model.newFail("code为空");
         }

+ 3 - 4
whepi-web/src/main/java/com/bofeng/entity/ExcelRiBao.java

@@ -125,9 +125,8 @@ public class ExcelRiBao {
     public String getBaseDesc() {
 
         if (Conv.NI(familyStatus.split(",")[0]) == 1) {
-            baseDesc = "心血管疾病(服用ARB),";
-        }
-        if (Conv.NI(familyStatus.split(",")[1]) == 1) {
+            baseDesc += "心血管疾病(服用ARB),";
+        } else if (Conv.NI(familyStatus.split(",")[1]) == 1) {
             baseDesc += "心血管疾病(未服用ARB),";
         }
         if (Conv.NI(familyStatus.split(",")[2]) == 1) {
@@ -145,7 +144,7 @@ public class ExcelRiBao {
         if (Conv.NI(familyStatus.split(",")[6]) == 1) {
             baseDesc += "妊娠期";
         }
-        return baseDesc.substring(0, baseDesc.length() - 1);
+        return baseDesc;
     }
 
     @ExcelProperty(value = "病情描述", index = 14)

+ 3 - 4
whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLY.java

@@ -127,9 +127,8 @@ public class ExcelRiBaoLY {
     public String getBaseDesc() {
 
         if (Conv.NI(familyStatus.split(",")[0]) == 1) {
-            baseDesc = "心血管疾病(服用ARB),";
-        }
-        if (Conv.NI(familyStatus.split(",")[1]) == 1) {
+            baseDesc += "心血管疾病(服用ARB),";
+        } else if (Conv.NI(familyStatus.split(",")[1]) == 1) {
             baseDesc += "心血管疾病(未服用ARB),";
         }
         if (Conv.NI(familyStatus.split(",")[2]) == 1) {
@@ -147,7 +146,7 @@ public class ExcelRiBaoLY {
         if (Conv.NI(familyStatus.split(",")[6]) == 1) {
             baseDesc += "妊娠期";
         }
-        return baseDesc.substring(0, baseDesc.length() - 1);
+        return baseDesc;
     }
 
     @ExcelProperty(value = "病情描述", index = 14)

+ 3 - 3
whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoPrivate.java

@@ -139,9 +139,9 @@ public class ExcelRiBaoPrivate {
     public String getBaseDesc() {
 
         if (Conv.NI(familyStatus.split(",")[0]) == 1) {
-            baseDesc = "心血管疾病(服用ARB),";
+            baseDesc += "心血管疾病(服用ARB),";
         }
-        if (Conv.NI(familyStatus.split(",")[1]) == 1) {
+        else if (Conv.NI(familyStatus.split(",")[1]) == 1) {
             baseDesc += "心血管疾病(未服用ARB),";
         }
         if (Conv.NI(familyStatus.split(",")[2]) == 1) {
@@ -159,7 +159,7 @@ public class ExcelRiBaoPrivate {
         if (Conv.NI(familyStatus.split(",")[6]) == 1) {
             baseDesc += "妊娠期";
         }
-        return baseDesc.substring(0, baseDesc.length() - 1);
+        return baseDesc;
     }
 
     @ExcelProperty(value = "病情描述", index = 17)

+ 22 - 8
whepi-web/src/main/java/com/bofeng/entity/UserRole.java

@@ -1,7 +1,9 @@
 package com.bofeng.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import org.joda.time.DateTime;
@@ -11,31 +13,43 @@ import org.joda.time.DateTime;
 @TableName("sys_user_role")
 public class UserRole {
 
-    @TableField("ur_id")
+    @ApiModelProperty("用户角色关系ID")
+    @TableId("UR_ID")
     private Long urId;
 
-    @TableField("user_id")
+    @ApiModelProperty("用户ID")
+    @TableField("USER_ID")
     private Long userId;
 
-    /* 1.家庭;2.业委会 */
-    @TableField("role_id")
-    private Integer roleId;
+    @ApiModelProperty("角色ID:1居民,2业委会,3商家")
+    @TableField("ROLE_ID")
+    private int roleId;
 
-    @TableField("property_id")
+    @ApiModelProperty("启用状态:0未启用、1已启用(默认1)")
+    @TableField("STATUS")
+    private int status;
+
+    @ApiModelProperty("属性ID,居民门牌ID,业委会ID")
+    @TableField("PROPERTY_ID")
     private Long propertyId;
 
-    @TableField("user_create")
+    @ApiModelProperty("新增人")
+    @TableField("USER_CREATE")
     private Long userCreate;
 
+    @ApiModelProperty("新增时间")
     @TableField(exist = false)
     private DateTime timeCreate;
 
-    @TableField("user_update")
+    @ApiModelProperty("修改人")
+    @TableField("USER_UPDATE")
     private Long userUpdate;
 
+    @ApiModelProperty("修改时间")
     @TableField(exist = false)
     private DateTime timeUpdate;
 
+
     @TableField(exist = false)
     private UptownHome uptownHome;
 

+ 34 - 3
whepi-web/src/main/java/com/bofeng/service/MsReportService.java

@@ -58,8 +58,9 @@ public class MsReportService {
     //获取今天数据
     public MsReport getReportByDateNow(Long userCreate) {
         //根据昨天的获取今天的
-       // msReportService.getNowByYesterday(userCreate);
+        // msReportService.getNowByYesterday(userCreate);
         //msReportService.getNowByYesterdayDate();
+        //msReportService.addReport250();
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
@@ -189,7 +190,7 @@ public class MsReportService {
         Long start = 0L, count = 100L;
         while (true) {
             //今天以前一共有多少用户
-            List<Long> listUser = msReportMapper.getUserByYesterdayDate(start,count);
+            List<Long> listUser = msReportMapper.getUserByYesterdayDate(start, count);
             if (listUser != null && listUser.size() > 0) {
                 for (Long userCreate : listUser) {
                     //判断用户今天是否有数据
@@ -261,7 +262,37 @@ public class MsReportService {
                 }
             }
             start += count;
-            if (listUser == null || listUser.size()<count) {
+            if (listUser == null || listUser.size() < count) {
+                break;
+            }
+        }
+    }
+
+    //添加250条记录
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void addReport250() {
+        //每次执行100条
+        Long count = 0L;
+        while (true) {
+            //添加日报
+            MsReport msReport1 = new MsReport();
+            msReport1.setReportId(IdWorker.getId());
+            msReport1.setHouseId(0L);
+            msReport1.setSafetyNum(0);
+            msReport1.setSureNum(0);
+            msReport1.setSuspectedNum(0);
+            msReport1.setNormalNum(0);
+            msReport1.setSingleNum(0);
+            msReport1.setRemarks("");
+            msReport1.setReportDate(DateTime.now().toDate());
+            msReport1.setReportStatus(0);//未上报
+            msReport1.setMsStatus(0);
+            msReport1.setUserCreate(count);
+            msReport1.setTimeCreate(DateTime.now());
+            msReport1.setUserUpdate(count);
+            msReport1.setTimeUpdate(DateTime.now());
+            count += msReportMapper.insert(msReport1);
+            if (count> 250) {
                 break;
             }
         }

+ 1 - 1
whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -156,7 +156,7 @@ public class WxController {
         btnHelp.setType(WxConsts.MenuButtonType.VIEW);
         btnHelp.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
-                                "/home/homeHelp.html",
+                                "/home/testOk.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
 //        btn3.getSubButtons().add(btnDesc);