diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue index 6b18ecf4..5a6944c6 100644 --- a/yanzhu-bigscreen/src/components/header.vue +++ b/yanzhu-bigscreen/src/components/header.vue @@ -312,6 +312,9 @@ export default { case 102: this.$router.push("/labor"); break; + case 401: + this.$router.push("/qualityCheck"); + break; case 501: this.$router.push("/photography"); break; diff --git a/yanzhu-bigscreen/src/router/index.js b/yanzhu-bigscreen/src/router/index.js index 6335498d..4c3a6be6 100644 --- a/yanzhu-bigscreen/src/router/index.js +++ b/yanzhu-bigscreen/src/router/index.js @@ -111,6 +111,12 @@ const routes = [ meta: { nav: 310 }, component: () => import(/* webpackChunkName: "safetyCheck" */ "../views/safety/aiWarning.vue"), }, + { + path: "/qualityCheck", + name: "qualityCheck", + meta: { nav: 401 }, + component: () => import(/* webpackChunkName: "qualityCheck" */ "../views/quality/qualityCheck.vue"), + }, { path: "/photography", name: "photography", diff --git a/yanzhu-bigscreen/src/views/quality/dialog/qualityCheckDialog.vue b/yanzhu-bigscreen/src/views/quality/dialog/qualityCheckDialog.vue new file mode 100644 index 00000000..96ef560d --- /dev/null +++ b/yanzhu-bigscreen/src/views/quality/dialog/qualityCheckDialog.vue @@ -0,0 +1,285 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-bigscreen/src/views/quality/qualityCheck.vue b/yanzhu-bigscreen/src/views/quality/qualityCheck.vue new file mode 100644 index 00000000..6c6379f6 --- /dev/null +++ b/yanzhu-bigscreen/src/views/quality/qualityCheck.vue @@ -0,0 +1,1032 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index e98ec73b..1585fee2 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -483,7 +483,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java index e1f2176e..e2bd2edc 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java @@ -102,7 +102,11 @@ public class WXAttendanceController extends BaseController { } Map data = new HashMap<>(); data.put("list",list); - data.put("user",Math.floorDiv(list.stream().mapToInt((u) -> Integer.valueOf(String.valueOf(u.get("total")))).sum(),list.size())); + if(list.size()>0){ + data.put("user",Math.floorDiv(list.stream().mapToInt((u) -> Integer.valueOf(String.valueOf(u.get("total")))).sum(),list.size())); + }else{ + data.put("user",0); + } return AjaxResult.success(data); } diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.wxml b/yanzhu-ui-app/miniprogram/pages/login/login.wxml index 089c646f..6eaa8133 100644 --- a/yanzhu-ui-app/miniprogram/pages/login/login.wxml +++ b/yanzhu-ui-app/miniprogram/pages/login/login.wxml @@ -37,4 +37,8 @@ + + + 仅限特定人群登录 + \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.wxss b/yanzhu-ui-app/miniprogram/pages/login/login.wxss index 9c6776ac..22fac7c9 100644 --- a/yanzhu-ui-app/miniprogram/pages/login/login.wxss +++ b/yanzhu-ui-app/miniprogram/pages/login/login.wxss @@ -15,18 +15,18 @@ page { } .login_title { - height: 158rpx; - line-height: 158rpx; + height: 125rpx; + line-height: 125rpx; color: #DDDDDD; font-size: 40rpx; font-weight: bold; text-align: center; word-spacing: 30rpx; background: url("https://xiangguan.sxyanzhu.com/profile/static/yanzhu_title.png") no-repeat left/100% 100%; - margin-bottom: 50px; + margin-bottom: 68px; } .login_title image{ - height: 148rpx; + height: 125rpx; } .login_bg { @@ -113,6 +113,14 @@ page { height: 100rpx; } +.login_foot{ + position: fixed; + width: 84%; + bottom: 50px; + text-align: center; + color: aquamarine; +} + .loadings{ margin-top: 15%; text-align: center;