日报页面UI 调整 ，对小屏支持

whepi-ui/templates/home/ribao.ftl

@@ -46,12 +46,12 @@
                         <input id="js_input_user_age" class="weui-input" autofocus="" type="text" placeholder="年龄" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 25%; text-align: center;" />
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="width: 20%;height: 5vh; line-height: 5vh;margin-left: 2vw;">基本状况</div>
+                        <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">基本状况</div>
                         <input id="js_input_user_status" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 75%;" />
                     </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>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="width: 20%;height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
+                        <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
                         <div style="width: 70%;display:flex; flex-direction: row;">
                             <div style="color: gray;height: 5vh; line-height: 5vh;margin-right: 5vw;">是否确诊</div>
 <#--                            <input id="switchQuezhen" class="weui-switch" type="checkbox">-->
@@ -62,33 +62,29 @@
                         </div>
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;">体温</div>
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 12%;">体温</div>
                         <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="text" placeholder="请输入" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
-                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;margin-left: 5vw;">咳嗽</div>
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 12%;margin-left: 5vw;">咳嗽</div>
                         <input id="js_input_user_kesou" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="color: gray;height: 5vh;line-height: 2.5vh; width: 10%;">肌肉酸痛</div>
+                        <div style="color: gray;height: 5vh;line-height: 2.5vh; width: 12%;">肌肉酸痛</div>
                         <input id="js_input_user_jirou" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
-                        <div style="color: gray;height: 5vh;line-height: 2.5vh; width: 10%;margin-left: 5vw;">呼吸困难</div>
+                        <div style="color: gray;height: 5vh;line-height: 2.5vh; width: 12%;margin-left: 5vw;">呼吸困难</div>
                         <input id="js_input_user_huxi" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;">胸闷</div>
-                        <input id="js_input_user_xiongmen" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
-                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;margin-left: 5vw;">乏力</div>
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 12%;">乏力</div>
                         <input id="js_input_user_fali" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
-                    </div>
-                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;">腹泻</div>
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 12%;margin-left: 5vw;">腹泻</div>
                         <input id="js_input_user_fuxie" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
-                        <div style="width: 50%; display: flex; flex-direction: row;">
-                            <input id="js_input_user_cishu" class="weui-input" autofocus="" type="text" placeholder="请输入" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 30%;" />
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 30%; margin-left: 3vw;">次/日</div>
-                        </div>
+                    </div>
+                    <div style="display:flex; flex-direction: row; margin-top: 1vh;">
+                        <div style="color: gray;height: 5vh; line-height: 5vh; margin-right: 2vw;">是否单间隔离</div>
+                        <input id="js_input_user_danjiangeli" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;margin-right: 2vw;">其他</div>
+                        <div style="color: gray;height: 5vh; line-height: 5vh;margin-right: 2vw;width: 13%;">其他</div>
                         <textarea id="shuruqita" class="weui-textarea" placeholder="输入内容（300字内）" rows="5" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
                     </div>
                     <div style="display: flex; justify-content: center;">

whepi-ui/templates/home/ribao.js

@@ -122,7 +122,7 @@ function ribao_init() {
       }]
   });
 
-  $("#js_input_user_xiongmen").select({
+  $("#js_input_user_danjiangeli").select({
     title: "选择胸闷情况",
     items: [
       {
@@ -130,16 +130,8 @@ function ribao_init() {
         value: "0",
       },
       {
-        title: "端坐呼吸",
+        title: "有",
         value: "1",
-      },
-      {
-        title: "活动无耐力",
-        value: "2",
-      },
-      {
-        title: "无变化",
-        value: "3",
       }]
   });
 

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -56,10 +56,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-            UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(1225325493987995649L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1225325493987995649L);
+//            UserOpen userOpen = homeService.getUserOpen();
+//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+            list = userRoleMapper.getUserRoleByUserId(1225325493987995649L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1225325493987995649L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");