From 19d7c2ed823619f06ec1a4069308199f4387f73b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Mon, 30 Jun 2025 18:00:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yanzhu-bigscreen/src/components/header.vue    |    3 +
 yanzhu-bigscreen/src/router/index.js          |    6 +
 .../quality/dialog/qualityCheckDialog.vue     |  285 +++++
 .../src/views/quality/qualityCheck.vue        | 1032 +++++++++++++++++
 .../trouble/SmzSspProblemmodifyMapper.xml     |    4 +-
 .../wechat/WXAttendanceController.java        |    6 +-
 .../miniprogram/pages/login/login.wxml        |    4 +
 .../miniprogram/pages/login/login.wxss        |   16 +-
 8 files changed, 1350 insertions(+), 6 deletions(-)
 create mode 100644 yanzhu-bigscreen/src/views/quality/dialog/qualityCheckDialog.vue
 create mode 100644 yanzhu-bigscreen/src/views/quality/qualityCheck.vue

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 @@
+<template>
+    <MyDialog v-if="show" v-model="show" width="60vw" height="75vh" class="safety-check-dialog">
+        <template slot="title">{{ title }}</template>
+        <div class="head-title-tab" style="padding: 10px 0px;">
+            <div :class="nav == 6 ? 'head-nav active' : 'head-nav'" @click="doNav(6)">待整改{{ counts[0] }}</div>
+            <div :class="nav == 3 ? 'head-nav active' : 'head-nav'" @click="doNav(3)">待复检{{ counts[1] }}</div>
+            <div :class="nav == 7 ? 'head-nav active' : 'head-nav'" @click="doNav(7)">复检驳回{{ counts[2] }}</div>
+            <div :class="nav == 4 ? 'head-nav active' : 'head-nav'" @click="doNav(4)">复检通过{{ counts[3] }}</div>
+            <div :class="nav == 5 ? 'head-nav active' : 'head-nav'" @click="doNav(5)">整改超时{{ counts[4] }}</div>
+        </div>
+        <div class="scroll data-list" :key="dataKey">
+            <div v-if="rows.length == 0" style="text-align: center;" class="div-no-data">
+                <img src="images/nodata.png" style="width: 120px;" />
+                <div style="text-align: center;font-size: 12px;color:#888;">暂无数据</div>
+            </div>
+            <div v-for="(it, idx) in rows" :key="idx" class="data-item">
+                <div class="left-image">
+                    <div class="left-header">
+                        <span class="sp-nav" :class="it.imgSel == 0 ? 'active' : ''" @click="it.imgSel = 0">整改前</span>
+                        <span class="sp-nav" :class="it.imgSel == 1 ? 'active' : ''" v-if="it.checkState == 4" @click="it.imgSel = 1">整改后</span>
+                    </div>
+                    <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl" v-if="it.imgSel == 0" :preview-src-list="[it.smarkUrl]"></el-image>
+                    <el-image class="img-sm" fit="scale-down" :src="it.marksPicture" v-if="it.imgSel == 1" :preview-src-list="[it.marksPicture]"></el-image>
+                </div>
+                <div class="right-data">
+                    <el-col :span="12">
+                        <span class="sp-label">隐串类型:</span>
+                        <span class="sp-value">{{ getDict(it.dangerType) }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">提交时间:</span>
+                        <span class="sp-value">{{ it.createTime }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">提交人:</span>
+                        <span class="sp-value">{{ it.createUser }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">整改人:</span>
+                        <span class="sp-value">{{ it.lordSentUser }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">抄送人:</span>
+                        <span class="sp-value">{{ it.copySendUser }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">截止时间:</span>
+                        <span class="sp-value">{{ it.nickedTime }}</span>
+                    </el-col>
+                    <el-col :span="24">
+                        <span class="sp-label">隐患描述:</span>
+                        <span class="sp-value">{{ it.workParts }}</span>
+                    </el-col>
+                    <el-col :span="24">
+                        <span class="sp-label">整改要求:</span>
+                        <span class="sp-value">{{ it.changeInfo }}</span>
+                    </el-col>
+                </div>
+            </div>
+        </div>
+        <el-pagination
+            v-if="rows.length > 0"
+            layout="total,prev, pager, next"
+            @current-change="handleCurrentChange"
+            :total="total"
+            :page-size="pageSize"
+            :current-page.sync="pageNum"
+            class="bg-pagination"
+        ></el-pagination>
+    </MyDialog>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            show: false,
+            title: '质量隐患排查',
+            prjInfo: {},
+            nav: 6,
+            problemType: null,
+            counts: [],
+            pageNum: 0,
+            pageSize: 10,
+            total: 0,
+            rows: [],
+            dataKey: 0,
+            dangerTypeDict: [],
+        }
+    },
+    methods: {
+        handleCurrentChange(n) {
+            this.pageNum = n
+            this.loadData()
+        },
+        getDict(n) {
+            let tmps = this.dangerTypeDict.filter((d) => d.value == n)
+            return tmps.length > 0 ? tmps[0].label : ''
+        },
+        doNav(n) {
+            this.nav = n
+            this.loadData()
+        },
+        showDialog(prj, n, dangerTypeDict) {
+            this.dangerTypeDict = dangerTypeDict
+            this.problemType = n == 0 ? null : n
+            this.prjInfo = prj
+            this.title = ['安全隐患排查', '日常巡检', '周检', '月检', '专项检查'][n]
+            this.pageNum = 0
+            this.show = true
+            this.getCount(n)
+            this.loadData()
+        },
+        getCount(n) {
+            let postData = {
+                projectId: this.prjInfo.id,
+                comId: this.prjInfo.comId,
+                infoType: 1,
+            }
+            if (n > 0) {
+                postData.problemType = n
+            }
+            this.$api.safety.listCountForBG(postData).then((d) => {
+                this.counts = d.data.filter((it) => it.projectName != 'a').map((it) => it.id)
+            })
+        },
+        loadData() {
+            let postData = {
+                projectId: this.prjInfo.id,
+                comId: this.prjInfo.comId,
+                infoType: 1,
+                pageNum: this.pageNum,
+                pageSize: this.pageSize,
+                problemType: this.problemType,
+                projectName: this.nav,
+            }
+            this.$api.safety.listForBG(postData).then((d) => {
+                this.total = d.total
+                this.rows = (d.rows || []).map((it) => {
+                    it.imgSel = 0
+                    return it
+                })
+                this.dataKey++
+            })
+        },
+    },
+}
+</script>
+
+<style lang="less">
+.safety-check-dialog {
+    .popup-project-introduction-min {
+        transform: translateY(20%);
+    }
+
+    .bg-pagination {
+        margin-top: 5px;
+    }
+
+    .data-list {
+        max-height: calc(75vh - 150px);
+        overflow-y: auto;
+
+        .div-no-data {
+            margin-top: 10vh;
+        }
+
+        .data-item {
+            display: flex;
+            background: #060f239d;
+            padding: 10px;
+            border: solid 1px #cccccc33;
+            margin-top: 20px;
+
+            &:first-child {
+                margin-top: 0;
+            }
+
+            .left-image {
+                width: 160px;
+                box-shadow: 1px 1px 10px 1px #ffffff3b;
+
+                .left-header {
+                    margin-bottom: 8px;
+                    background: #fff;
+
+                    .sp-nav {
+                        display: inline-block;
+                        width: 50%;
+                        line-height: 30px;
+                        text-align: center;
+                        background: #fff;
+                        color: #5b84eb;
+                        cursor: pointer;
+
+                        &.active {
+                            color: #fff;
+                            background: #5b84eb;
+                        }
+                    }
+                }
+
+                .el-image {
+                    width: 160px;
+                    height: 100px;
+                }
+            }
+
+            .right-data {
+                flex-grow: 1;
+                padding: 0px 20px;
+                line-height: 30px;
+
+                .sp-label {
+                    color: #8bffd2;
+                }
+            }
+        }
+    }
+}
+
+@media (min-width: 1921px) and (max-width: 2560px) {
+    .safety-check-dialog {
+        .bg-pagination {
+            margin-top: 5px;
+
+            * {
+                font-size: 20px !important;
+            }
+
+            button,
+            li {
+                height: 28px !important;
+                line-height: 28px !important;
+            }
+        }
+
+        .data-list {
+            max-height: calc(75vh - 180px);
+
+            .data-item {
+                .right-data {
+                    font-size: 18px;
+
+                    .sp-label {
+                        color: #8bffd2;
+                    }
+                }
+            }
+        }
+    }
+}
+
+@media (min-width: 2561px) {
+    .safety-check-dialog {
+        .bg-pagination {
+            margin-top: 15px;
+
+            * {
+                font-size: 24px !important;
+            }
+
+            button,
+            li {
+                height: 32px !important;
+                line-height: 32px !important;
+            }
+        }
+
+        .data-list {
+            max-height: calc(75vh - 180px);
+
+            .data-item {
+                .right-data {
+                    font-size: 24px;
+
+                    .sp-label {
+                        color: #8bffd2;
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
\ 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 @@
+<template>
+    <div class="project-safety-check main-page">
+        <el-col :span="6" class="h100">
+            <module-one-1-1 label="质量隐患排查" class="chart1-module">
+                <el-col :span="12" v-for="(it, idx) in chart1Data" :key="idx">
+                    <div class="equipment-list-min equipment-list-min_div quality-target-index-min quality-target-index-min_div">
+                        <div class="czz-number-img czz-number-img-blue">
+                            <svg-icon icon-class="notesearch"></svg-icon>
+                        </div>
+                        <div>
+                            <div class="equipment-list-data equipment-list-data_div_top">
+                                <span>{{ it.name }}</span>
+                            </div>
+                            <div class="equipment-list-data equipment-list-data_div_bottom">
+                                <span class="sp-data">{{ it.value || 0 }}</span>
+                                <span class="sp-unit">条</span>
+                            </div>
+                        </div>
+                    </div>
+                </el-col>
+            </module-one-1-1>
+            <module-one-2-1 label="日常巡检">
+                <img src="images/icon2001.png" class="img-openwin" @click="showDlg(1)" />
+                <div class="div-item-chart">
+                    <div class="data-item-chart">
+                        <div class="total-info">
+                            {{ item1Data.total }}
+                            <br />
+                            <span class="sp-label">问题总数</span>
+                        </div>
+                        <div class="chart-gif chart-overview-gif"></div>
+                        <my-chart :key="itemChartKey1" id="project-safety-check-item1" width="100%" height="100%" :render="o => renderDataItem(1)"></my-chart>
+                    </div>
+                    <div class="div-item-info" :key="itemChartKey1">
+                        <div v-for="(it, idx) in item1Data.infos" :key="idx" :class="'item-info'">
+                            <span class="sp-name">{{ it.name }}</span>
+                            <span class="sp-lend" :class="'is-' + it.type"></span>
+                            <span class="sp-value led-number">{{ it.value }}</span>
+                            <span class="sp-percent led-number" v-if="idx > 0">{{ it.percent }}%</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="div-item-data">
+                    <div class="glr-title">最新提交</div>
+                    <div class="div-item-list scroll">
+                        <div v-for="(it, idx) in item1Data.items" :key="idx" class="list-item">
+                            <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl" :preview-src-list="[it.smarkUrl]"></el-image>
+                            <div class="list-item-info">
+                                <div class="item-row">
+                                    <span class="sp-label">提交人:</span>
+                                    <span class="sp-data">{{ it.createUser }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">整改人:</span>
+                                    <span class="sp-data">{{ it.lordSentUser }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">复检人:</span>
+                                    <span class="sp-data">{{ it.recheckSendUser }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">隐患描述:</span>
+                                    <span class="sp-data">{{ it.workParts }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">整改要求:</span>
+                                    <span class="sp-data">{{ it.changeInfo }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">状态:</span>
+                                    <span class="sp-data">{{ getStatus(it.checkState) }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </module-one-2-1>
+        </el-col>
+        <el-col :span="18" class="h100">
+            <module-one-1-3 label="隐患类别统计">
+                <img src="images/icon2001.png" class="img-openwin" @click="showDlg(0)" />
+                <my-chart :key="chartKey2" id="project-safety-check-chart2" width="100%" height="100%" :render="renderChart2"></my-chart>
+            </module-one-1-3>
+            <el-row class="el-right">
+                <el-col :span="8">
+                    <module-one-2-1 label="周检">
+                        <img src="images/icon2001.png" class="img-openwin" @click="showDlg(2)" />
+                        <div class="div-item-chart">
+                            <div class="data-item-chart">
+                                <div class="total-info">
+                                    {{ item2Data.total }}
+                                    <br />
+                                    <span class="sp-label">问题总数</span>
+                                </div>
+                                <div class="chart-gif chart-overview-gif"></div>
+                                <my-chart :key="itemChartKey1" id="project-safety-check-item2" width="100%" height="100%" :render="o => renderDataItem(2)"></my-chart>
+                            </div>
+                            <div class="div-item-info" :key="itemChartKey1">
+                                <div v-for="(it, idx) in item2Data.infos" :key="idx" :class="'item-info'">
+                                    <span class="sp-name">{{ it.name }}</span>
+                                    <span class="sp-lend" :class="'is-' + it.type"></span>
+                                    <span class="sp-value led-number">{{ it.value }}</span>
+                                    <span class="sp-percent led-number" v-if="idx > 0">{{ it.percent }}%</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="div-item-data">
+                            <div class="glr-title">最新提交</div>
+                            <div class="div-item-list scroll">
+                                <div v-for="(it, idx) in item2Data.items" :key="idx" class="list-item">
+                                    <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl" :preview-src-list="[it.smarkUrl]"></el-image>
+                                    <div class="list-item-info">
+                                        <div class="item-row">
+                                            <span class="sp-label">提交人:</span>
+                                            <span class="sp-data">{{ it.createUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改人:</span>
+                                            <span class="sp-data">{{ it.lordSentUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">复检人:</span>
+                                            <span class="sp-data">{{ it.recheckSendUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">隐患描述:</span>
+                                            <span class="sp-data">{{ it.workParts }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改要求:</span>
+                                            <span class="sp-data">{{ it.changeInfo }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">状态:</span>
+                                            <span class="sp-data">{{ getStatus(it.checkState) }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </module-one-2-1>
+                </el-col>
+                <el-col :span="8">
+                    <module-one-2-1 label="月检">
+                        <img src="images/icon2001.png" class="img-openwin" @click="showDlg(3)" />
+                        <div class="div-item-chart">
+                            <div class="data-item-chart">
+                                <div class="total-info">
+                                    {{ item3Data.total }}
+                                    <br />
+                                    <span class="sp-label">问题总数</span>
+                                </div>
+                                <div class="chart-gif chart-overview-gif"></div>
+                                <my-chart :key="itemChartKey1" id="project-safety-check-item3" width="100%" height="100%" :render="o => renderDataItem(3)"></my-chart>
+                            </div>
+                            <div class="div-item-info" :key="itemChartKey1">
+                                <div v-for="(it, idx) in item3Data.infos" :key="idx" :class="'item-info'">
+                                    <span class="sp-name">{{ it.name }}</span>
+                                    <span class="sp-lend" :class="'is-' + it.type"></span>
+                                    <span class="sp-value led-number">{{ it.value }}</span>
+                                    <span class="sp-percent led-number" v-if="idx > 0">{{ it.percent }}%</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="div-item-data">
+                            <div class="glr-title">最新提交</div>
+                            <div class="div-item-list scroll">
+                                <div v-for="(it, idx) in item3Data.items" :key="idx" class="list-item">
+                                    <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl" :preview-src-list="[it.smarkUrl]"></el-image>
+                                    <div class="list-item-info">
+                                        <div class="item-row">
+                                            <span class="sp-label">提交人:</span>
+                                            <span class="sp-data">{{ it.createUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改人:</span>
+                                            <span class="sp-data">{{ it.lordSentUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">复检人:</span>
+                                            <span class="sp-data">{{ it.recheckSendUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">隐患描述:</span>
+                                            <span class="sp-data">{{ it.workParts }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改要求:</span>
+                                            <span class="sp-data">{{ it.changeInfo }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">状态:</span>
+                                            <span class="sp-data">{{ getStatus(it.checkState) }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </module-one-2-1>
+                </el-col>
+                <el-col :span="8">
+                    <module-one-2-1 label="专项检查">
+                        <img src="images/icon2001.png" class="img-openwin" @click="showDlg(4)" />
+                        <div class="div-item-chart">
+                            <div class="data-item-chart">
+                                <div class="total-info">
+                                    {{ item4Data.total }}
+                                    <br />
+                                    <span class="sp-label">问题总数</span>
+                                </div>
+                                <div class="chart-gif chart-overview-gif"></div>
+                                <my-chart :key="itemChartKey1" id="project-safety-check-item4" width="100%" height="100%" :render="o => renderDataItem(3)"></my-chart>
+                            </div>
+                            <div class="div-item-info" :key="itemChartKey1">
+                                <div v-for="(it, idx) in item4Data.infos" :key="idx" :class="'item-info'">
+                                    <span class="sp-name">{{ it.name }}</span>
+                                    <span class="sp-lend" :class="'is-' + it.type"></span>
+                                    <span class="sp-value led-number">{{ it.value }}</span>
+                                    <span class="sp-percent led-number" v-if="idx > 0">{{ it.percent }}%</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="div-item-data">
+                            <div class="glr-title">最新提交</div>
+                            <div class="div-item-list scroll">
+                                <div v-for="(it, idx) in item4Data.items" :key="idx" class="list-item">
+                                    <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl" :preview-src-list="[it.smarkUrl]"></el-image>
+                                    <div class="list-item-info">
+                                        <div class="item-row">
+                                            <span class="sp-label">提交人:</span>
+                                            <span class="sp-data">{{ it.createUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改人:</span>
+                                            <span class="sp-data">{{ it.lordSentUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">复检人:</span>
+                                            <span class="sp-data">{{ it.recheckSendUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">隐患描述:</span>
+                                            <span class="sp-data">{{ it.workParts }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改要求:</span>
+                                            <span class="sp-data">{{ it.changeInfo }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">状态:</span>
+                                            <span class="sp-data">{{ getStatus(it.checkState) }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </module-one-2-1>
+                </el-col>
+            </el-row>
+        </el-col>
+        <qualityCheckDialog ref="dlg" />
+    </div>
+</template>
+
+<script>
+import qualityCheckDialog from './dialog/qualityCheckDialog.vue'
+export default {
+    components: {
+        qualityCheckDialog,
+    },
+    data() {
+        return {
+            dangerTypeDict: [],
+            chartKey2: 0,
+            itemChartKey1: 0,
+            dpi: '',
+            selProject: null,
+            legendOpt1: {
+                icon: 'rect',
+                textStyle: {
+                    color: '#c3dbfd',
+                    fontSize: 14,
+                    rich: {
+                        name: {
+                            color: '#c3dbfd',
+                            padding: [0, 20, 0, 0],
+                        },
+                        percent: {
+                            color: '#4676FD',
+                        },
+                    },
+                },
+            },
+            overviewText: '问题数',
+            chart1Data: [],
+            chart2Data: [],
+            item1Data: {
+                total: 0,
+                datas: [],
+                infos: [],
+                items: [],
+            },
+            item2Data: {
+                total: 0,
+                datas: [],
+                infos: [],
+                items: [],
+            },
+            item3Data: {
+                total: 0,
+                datas: [],
+                infos: [],
+                items: [],
+            },
+            item4Data: {
+                total: 0,
+                datas: [],
+                infos: [],
+                items: [],
+            },
+        }
+    },
+    mounted() {
+        window.safetyApp = this
+        this.$store.dispatch('ChangeNav', 401)
+        this.$bus.$on('projectChange', (prj) => {
+            this.selProject = prj
+            this.init()
+        })
+        this.selProject = this.$store.getters.selProject
+        this.init()
+        this.dpi = this.$dpi()
+        window.addEventListener('resize', () => {
+            if (this.dpi != this.$dpi()) {
+                this.dpi = this.$dpi()
+                this.chartKey++
+                this.chartKey2++
+            }
+        })
+        this.$api.dict('ssp_proble_sub_type').then((d) => {
+            this.dangerTypeDict = d || []
+        })
+    },
+    methods: {
+        showDlg(n) {
+            this.$refs.dlg.showDialog(this.selProject, n, this.dangerTypeDict)
+        },
+        init() {
+            if (!this.selProject) {
+                return
+            }
+            let postData = {
+                projectId: this.selProject.id,
+                comId: this.selProject.comId,
+            }
+            let ajaxs = [
+                this.$api.safety.groupByProblemType({...postData,infoType: 1}),
+                this.$api.safety.groupByDangerType({...postData,infoType: 1}),
+                this.$api.safety.listCountForBG({ ...postData, problemType: 1, infoType: 1 }),
+                this.$api.safety.listForBG({ ...postData, problemType: 1, infoType: 1, pageNum: 1, pageSize: 5 }),
+                this.$api.safety.listCountForBG({ ...postData, problemType: 2, infoType: 1 }),
+                this.$api.safety.listForBG({ ...postData, problemType: 2, infoType: 1, pageNum: 1, pageSize: 5 }),
+                this.$api.safety.listCountForBG({ ...postData, problemType: 3, infoType: 1 }),
+                this.$api.safety.listForBG({ ...postData, problemType: 3, infoType: 1, pageNum: 1, pageSize: 5 }),
+                this.$api.safety.listCountForBG({ ...postData, problemType: 4, infoType: 1 }),
+                this.$api.safety.listForBG({ ...postData, problemType: 4, infoType: 1, pageNum: 1, pageSize: 5 }),
+            ]
+            this.$api.http.all(ajaxs).then((res) => {
+                this.chart1Data = (res[0].data || []).map((it) => {
+                    return {
+                        id: it.nickedInfo,
+                        value: it.id,
+                        name: it.problemType,
+                        data: it,
+                    }
+                })
+                this.chart2Data = (res[1].data || []).map((it) => {
+                    return {
+                        id: it.nickedInfo,
+                        name: it.dangerType,
+                        value1: it.id,
+                        value2: it.comId,
+                    }
+                })
+                this.showChart1() //安全隐患排查
+                this.showChart2() //隐患类别统计
+                this.makeItemData(this.item1Data, res[2].data)
+                this.item1Data.items = res[3].rows
+                this.makeItemData(this.item2Data, res[4].data)
+                this.item2Data.items = res[5].rows
+                this.makeItemData(this.item3Data, res[6].data)
+                this.item3Data.items = res[7].rows
+                this.makeItemData(this.item4Data, res[8].data)
+                this.item4Data.items = res[9].rows
+                this.itemChartKey1++
+            })
+        },
+        showChart1(n) {},
+        showChart2() {
+            this.chartKey2++
+        },
+        getStatus(s) {
+            let checkStates = [
+                { value: '0', label: '待整改' },
+                { value: '1', label: '待复检' },
+                { value: '3', label: '复检驳回' },
+                { value: '4', label: '复检通过' },
+            ]
+            let objs = checkStates.filter((it) => it.value == s)
+            return objs.length > 0 ? objs[0].label : ''
+        },
+        makeItemData(item, res) {
+            let labels = ['问题总数', '待整改', '待复检', '复检驳回', '整改完成', '超时整改']
+            item.total = res[0].id
+            let total = res[0].id
+            item.datas = []
+            for (let i = 1; i < 5; i++) {
+                item.datas.push({
+                    name: labels[i],
+                    value: res[i].id,
+                })
+            }
+            item.infos = []
+            for (let i = 0; i < res.length; i++) {
+                item.infos.push({
+                    name: labels[i],
+                    value: res[i].id,
+                    type: res[i].projectName,
+                    percent: total == 0 ? 0 : ((res[i].id / total) * 100.0).toFixed(1),
+                })
+            }
+        },
+        renderDataItem(n) {
+            let is1K = this.$dpi() == '1K'
+            let is2K = this.$dpi() == '2K'
+            let objs = this._data['item' + n + 'Data']
+            let option = {
+                color: ['#71BCC4', '#EEBE47', '#5EA85D', '#5B84EB', '#E76168'],
+                series: [
+                    {
+                        type: 'pie',
+                        radius: ['40%', '70%'],
+                        padAngle: 1,
+                        itemStyle: {
+                            borderRadius: 5,
+                        },
+                        emphasis: {
+                            label: {
+                                show: false,
+                            },
+                        },
+                        label: {
+                            show: false,
+                        },
+
+                        labelLine: {
+                            show: false,
+                        },
+                        data: objs.datas,
+                    },
+                ],
+            }
+            return option
+        },
+        renderChart2(opt) {
+            let is1K = this.$dpi() == '1K'
+            let is2K = this.$dpi() == '2K'
+            let option = {
+                grid: {
+                    left: '5%',
+                    right: '5%',
+                    bottom: '0%',
+                    top: '15%',
+                    containLabel: true,
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    valueFormatter: (v) => {
+                        return v
+                    },
+                    textStyle: {
+                        fontSize: is1K ? 12 : is2K ? 14 : 24,
+                    },
+                },
+                legend: {
+                    top: is1K ? '0%' : is2K ? '0%' : '0%',
+                    left: 'center',
+                    itemWidth: is1K ? 25 : is2K ? 30 : 40,
+                    itemHeight: is1K ? 14 : is2K ? 20 : 20,
+                    itemGap: is1K ? 20 : is2K ? 30 : 40,
+                    textStyle: {
+                        color: '#fff',
+                        fontSize: is1K ? 14 : is2K ? 20 : 30,
+                    },
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: this.chart2Data.map((it) => it.name.replace(/[“”]/g, "'")),
+                        axisLabel: {
+                            width: is1K ? 60 : is2K ? 140 : 220,
+                            margin: 15,
+                            rotate: 10,
+                            fontSize: is1K ? 12 : is2K ? 14 : 22,
+                            overflow: 'break',
+                            color: '#a2c8f9',
+                        },
+                        splitLine: {
+                            lineStyle: {
+                                opacity: 0.1,
+                            },
+                        },
+                    },
+                ],
+                yAxis: [
+                    {
+                        type: 'value',
+                        minInterval: 1,
+                        axisLabel: {
+                            formatter: '{value}',
+                            color: '#2ec2b3',
+                            fontSize: is1K ? 12 : is2K ? 14 : 24,
+                        },
+                        splitLine: {
+                            lineStyle: {
+                                opacity: 0.1,
+                            },
+                        },
+                    },
+                ],
+                series: [
+                    {
+                        name: '问题数',
+                        type: 'bar',
+                        barGap: '0%',
+                        barWidth: '20%',
+                        label: {
+                            show: true,
+                            position: 'top',
+                            color: '#4DAAFC',
+                            fontSize: is1K ? 12 : is2K ? 14 : 24,
+                        },
+                        lineStyle: {
+                            color: '#7ddff2',
+                        },
+                        itemStyle: {
+                            normal: { areaStyle: { type: 'default', color: '#7ddff2', opacity: 0.1 } },
+                        },
+                        data: this.chart2Data.map((it) => it.value1),
+                    },
+                    {
+                        name: '待改数',
+                        type: 'bar',
+                        barGap: '0%',
+                        barWidth: '20%',
+                        label: {
+                            show: true,
+                            position: 'top',
+                            color: '#4DAAFC',
+                            fontSize: is1K ? 12 : is2K ? 14 : 24,
+                        },
+                        lineStyle: {
+                            color: '#006594',
+                        },
+                        itemStyle: {
+                            normal: { areaStyle: { type: 'default', color: '#006594', opacity: 0.1 } },
+                        },
+                        data: this.chart2Data.map((it) => it.value2),
+                    },
+                ],
+            }
+            return option
+        },
+    },
+}
+</script>
+
+<style lang="less">
+.project-safety-check {
+    .screen-one-1-3 {
+        height: calc(33% - 20px) !important;
+    }
+
+    .el-right {
+        height: calc(66% - 20px) !important;
+
+        .el-col-8 {
+            height: 100%;
+
+            .screen-one-2-1 {
+                margin: 0px 20px;
+                height: calc(100% - 0px) !important;
+            }
+        }
+    }
+
+    .chart1-module {
+        .el-col-12 {
+            height: 50%;
+            width: 50%;
+            display: flex;
+
+            .czz-number-img {
+                display: flex;
+                width: 80px;
+                height: 80px;
+                align-items: center;
+                justify-content: center;
+
+                svg {
+                    width: 30px !important;
+                    height: 30px !important;
+                    fill: #00aaff59 !important;
+                }
+            }
+
+            .equipment-list-data_div_top {
+                span {
+                    font-size: 14px;
+                    color: #cbdaff;
+                    font-weight: normal;
+                }
+            }
+
+            .equipment-list-data_div_bottom {
+                margin-top: 10px;
+
+                .sp-data {
+                    font-size: 20px;
+                }
+
+                .sp-unit {
+                    font-size: 14px;
+                    color: #cbdaff;
+                    font-weight: normal;
+                }
+            }
+        }
+    }
+
+    .div-item-chart {
+        position: relative;
+        height: 230px;
+
+        .data-item-chart {
+            height: 230px;
+            width: 230px;
+            display: inline-block;
+            position: absolute;
+            left: -30px;
+
+            .total-info {
+                position: absolute;
+                font-size: 20px;
+                top: calc(50% - 20px);
+                left: calc(50% - 50px);
+                display: inline-block;
+                width: 100px;
+                height: 40px;
+                text-align: center;
+
+                .sp-label {
+                    font-size: 14px;
+                }
+            }
+
+            .chart-overview-gif {
+                width: 80px;
+                height: 80px;
+                top: calc(50% - 40px);
+                left: calc(50% - 40px);
+            }
+        }
+
+        .div-item-info {
+            display: inline-block;
+            width: calc(100% - 180px);
+            right: -0px;
+            top: 20px;
+            position: absolute;
+
+            .item-info {
+                line-height: 30px;
+
+                .sp-lend {
+                    display: inline-block;
+                    margin-left: 8px;
+                    width: 10px;
+                    height: 20px;
+                    position: relative;
+                    top: 4px;
+
+                    &.is-b {
+                        background-color: #71bcc4;
+                    }
+
+                    &.is-c {
+                        background-color: #eebe47;
+                    }
+
+                    &.is-d {
+                        background-color: #5ea85d;
+                    }
+
+                    &.is-e {
+                        background-color: #5b84eb;
+                    }
+                }
+
+                .sp-name {
+                    display: inline-block;
+                    text-align: right;
+                    width: 70px;
+                }
+
+                .sp-value {
+                    margin-left: 8px;
+                    font-size: 24px;
+                    display: inline-block;
+                    text-align: center;
+                    min-width: 70px;
+                }
+
+                .sp-percent {
+                    margin-left: 8px;
+                    color: #5b84eb;
+                }
+            }
+        }
+    }
+
+    .div-item-data {
+        height: calc(100% - 230px);
+
+        .div-item-list {
+            height: calc(100% - 20px);
+            overflow-y: auto;
+
+            .list-item {
+                display: flex;
+                margin-top: 10px;
+                border-top: solid 1px #cccccc88;
+                padding-top: 10px;
+
+                &:first-child {
+                    margin-top: 0px;
+                    border-top: none;
+                }
+
+                .img-sm {
+                    width: calc(100% - 300px);
+                    height: 120px;
+                }
+
+                .list-item-info {
+                    width: 300px;
+                    font-size: 12px;
+                    padding-left: 10px;
+
+                    .item-row {
+                        line-height: 24px;
+
+                        .sp-label {
+                            color: #8bffd2;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @media (min-width: 1921px) and (max-width: 2560px) {
+        .chart1-module {
+            .el-col-12 {
+                .czz-number-img {
+                    display: flex;
+                    width: 100px;
+                    height: 100px;
+
+                    svg {
+                        width: 40px !important;
+                        height: 40px !important;
+                    }
+                }
+
+                .equipment-list-data_div_top {
+                    span {
+                        font-size: 24px;
+                    }
+                }
+
+                .equipment-list-data_div_bottom {
+                    margin-top: 20px;
+
+                    .sp-data {
+                        font-size: 32px;
+                    }
+
+                    .sp-unit {
+                        font-size: 24px;
+                    }
+                }
+            }
+        }
+
+        .div-item-chart {
+            position: relative;
+            height: 260px;
+
+            .data-item-chart {
+                height: 260px;
+                width: 260px;
+                left: -30px;
+
+                .total-info {
+                    font-size: 24px;
+                    top: calc(50% - 20px);
+                    left: calc(50% - 50px);
+                    width: 100px;
+                    height: 40px;
+
+                    .sp-label {
+                        font-size: 20px;
+                    }
+                }
+
+                .chart-overview-gif {
+                    width: 80px;
+                    height: 80px;
+                    top: calc(50% - 40px);
+                    left: calc(50% - 40px);
+                }
+            }
+
+            .div-item-info {
+                width: calc(100% - 230px);
+                right: -0px;
+                top: 20px;
+
+                .item-info {
+                    line-height: 30px;
+
+                    .sp-lend {
+                        margin-left: 8px;
+                        width: 10px;
+                        height: 20px;
+                        top: 4px;
+                    }
+
+                    .sp-name {
+                        width: 90px;
+                        font-size: 20px;
+                    }
+
+                    .sp-value {
+                        margin-left: 8px;
+                        font-size: 32px;
+                        min-width: 150px;
+                    }
+
+                    .sp-percent {
+                        font-size: 20px;
+                        margin-left: 8px;
+                    }
+                }
+            }
+        }
+
+        .div-item-data {
+            height: calc(100% - 260px);
+
+            .glr-title {
+                font-size: 24px;
+            }
+
+            .div-item-list {
+                height: calc(100% - 20px);
+
+                .list-item {
+                    margin-top: 10px;
+                    padding-top: 10px;
+
+                    .img-sm {
+                        width: calc(100% - 400px);
+                        height: 120px;
+                    }
+
+                    .list-item-info {
+                        width: 400px;
+                        font-size: 16px;
+                        padding-left: 10px;
+
+                        .item-row {
+                            line-height: 30px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @media (min-width: 2561px) {
+        .chart1-module {
+            .el-col-12 {
+                .czz-number-img {
+                    display: flex;
+                    width: 160px;
+                    height: 160px;
+
+                    svg {
+                        width: 60px !important;
+                        height: 60px !important;
+                    }
+                }
+
+                .equipment-list-data_div_top {
+                    span {
+                        font-size: 32px;
+                    }
+                }
+
+                .equipment-list-data_div_bottom {
+                    margin-top: 20px;
+
+                    .sp-data {
+                        font-size: 40px;
+                    }
+
+                    .sp-unit {
+                        font-size: 32px;
+                    }
+                }
+            }
+        }
+
+        .div-item-chart {
+            position: relative;
+            height: 320px;
+
+            .data-item-chart {
+                height: 320px;
+                width: 320px;
+                left: -30px;
+
+                .total-info {
+                    font-size: 32px;
+                    top: calc(50% - 20px);
+                    left: calc(50% - 60px);
+                    width: 120px;
+                    height: 40px;
+
+                    .sp-label {
+                        font-size: 24px;
+                    }
+                }
+
+                .chart-overview-gif {
+                    width: 80px;
+                    height: 80px;
+                    top: calc(50% - 40px);
+                    left: calc(50% - 40px);
+                }
+            }
+
+            .div-item-info {
+                width: calc(100% - 300px);
+                right: -0px;
+                top: 20px;
+
+                .item-info {
+                    line-height: 40px;
+
+                    .sp-lend {
+                        margin-left: 8px;
+                        width: 10px;
+                        height: 20px;
+                        top: 4px;
+                    }
+
+                    .sp-name {
+                        width: 120px;
+                        font-size: 30px;
+                    }
+
+                    .sp-value {
+                        margin-left: 8px;
+                        font-size: 36px;
+                        min-width: 200px;
+                    }
+
+                    .sp-percent {
+                        font-size: 24px;
+                        margin-left: 8px;
+                    }
+                }
+            }
+        }
+
+        .div-item-data {
+            height: calc(100% - 320px);
+
+            .glr-title {
+                font-size: 28px;
+            }
+
+            .div-item-list {
+                height: calc(100% - 20px);
+
+                .list-item {
+                    margin-top: 10px;
+                    padding-top: 10px;
+
+                    .img-sm {
+                        width: calc(100% - 600px);
+                        height: 120px;
+                    }
+
+                    .list-item-info {
+                        width: 600px;
+                        font-size: 20px;
+                        padding-left: 10px;
+
+                        .item-row {
+                            line-height: 32px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
\ 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"
 
     <select id="groupByDangerType" parameterType="SmzSspProblemmodify" resultMap="SmzSspProblemmodifyResult">
         SELECT
-            a.cnt id,
+            ifNull(a.cnt,0) as id,
             b.cnt comId,
             dic.dict_value nickedInfo,
             dic.dict_label danger_type
@@ -524,5 +524,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 GROUP BY
                     dic.dict_value
             ) b ON b.dict_value = dic.dict_value
+            where 1=1
+            <if test="infoType != null "> and dic.remark = #{infoType}</if>
     </select>
 </mapper>
\ 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<String, Object> 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 @@
   <view class="wxlogin_btn">
     <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快捷登录</button>
   </view>
+
+  <view class="login_foot">
+    仅限特定人群登录
+  </view>
 </view>
\ 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;