diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index eb9494b..4749fb1 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 唐河县安全隐患及应急救援管理平台
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = http://221.176.140.236:8082/ehs
+VUE_APP_BASE_API = http://221.176.140.236:8082/ehsTanghe
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/src/assets/images/ddzc.png b/ruoyi-ui/src/assets/images/ddzc.png
new file mode 100644
index 0000000..fea6eb9
Binary files /dev/null and b/ruoyi-ui/src/assets/images/ddzc.png differ
diff --git a/ruoyi-ui/src/assets/images/ftdh.png b/ruoyi-ui/src/assets/images/ftdh.png
new file mode 100644
index 0000000..fbdc3c4
Binary files /dev/null and b/ruoyi-ui/src/assets/images/ftdh.png differ
diff --git a/ruoyi-ui/src/assets/images/hui.png b/ruoyi-ui/src/assets/images/hui.png
new file mode 100644
index 0000000..1157f27
Binary files /dev/null and b/ruoyi-ui/src/assets/images/hui.png differ
diff --git a/ruoyi-ui/src/assets/images/menu (1).png b/ruoyi-ui/src/assets/images/menu (1).png
new file mode 100644
index 0000000..9daaf83
Binary files /dev/null and b/ruoyi-ui/src/assets/images/menu (1).png differ
diff --git a/ruoyi-ui/src/assets/images/menu (2).png b/ruoyi-ui/src/assets/images/menu (2).png
new file mode 100644
index 0000000..d818990
Binary files /dev/null and b/ruoyi-ui/src/assets/images/menu (2).png differ
diff --git a/ruoyi-ui/src/assets/images/menu (3).png b/ruoyi-ui/src/assets/images/menu (3).png
new file mode 100644
index 0000000..91ac1b3
Binary files /dev/null and b/ruoyi-ui/src/assets/images/menu (3).png differ
diff --git a/ruoyi-ui/src/assets/images/menu (4).png b/ruoyi-ui/src/assets/images/menu (4).png
new file mode 100644
index 0000000..93d1103
Binary files /dev/null and b/ruoyi-ui/src/assets/images/menu (4).png differ
diff --git a/ruoyi-ui/src/assets/images/menu (5).png b/ruoyi-ui/src/assets/images/menu (5).png
new file mode 100644
index 0000000..53de3bb
Binary files /dev/null and b/ruoyi-ui/src/assets/images/menu (5).png differ
diff --git a/ruoyi-ui/src/assets/images/menu (6).png b/ruoyi-ui/src/assets/images/menu (6).png
new file mode 100644
index 0000000..37de28e
Binary files /dev/null and b/ruoyi-ui/src/assets/images/menu (6).png differ
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index daca9e2..3b0305f 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -3,6 +3,7 @@
     :default-active="activeMenu"
     mode="horizontal"
     @select="handleSelect"
+    class="hide_menu"
   >
     <template v-for="(item, index) in topMenus">
       <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
@@ -193,4 +194,7 @@ export default {
   padding: 0 5px !important;
   margin: 0 10px !important;
 }
+.hide_menu{
+  display: none;
+}
 </style>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index a8cc5e4..60ae1c4 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -1,425 +1,224 @@
 <template>
-  <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="24">
-        <blockquote style="font-size: 14px">
-          本年度共有
-          <el-button type="text"  >{{
-            yearData.unitNum
-            }}</el-button>
-          家单位开展安全生产事故隐患排查治理，排查出隐患
-          <el-button type="text" @click="haddenClick(1,'')">{{
-            yearData.hiddenDangerNum
-            }}</el-button>
-          项，已整改
-          <el-button type="text" @click="haddenClick(2,'')">{{
-            yearData.haveRectifiedNum
-            }}</el-button>
-          项( 整改率为
-          <el-button type="text"  >{{
-            yearData.rectifyRate
-            }}</el-button>
-          未整改
-          <el-button type="text" @click="haddenClick(3,'')">{{
-            yearData.notRectifiedNum
-            }}</el-button>
-          项，超期未整改
-          <el-button type="text" @click="haddenClick(4,'')">{{
-            yearData.exceedNotRectifiedNum
-            }}</el-button>
-          项，累计落实整改治理资金
-          <el-button type="text"  >{{
-            yearData.rectifyMoneySum
-            }}</el-button>
-          万元。
-          <br />
-          <br />
-
-          <div v-for="(item, i) in hiddenList" :key="i">
-            累计排查出{{ item.name }}
-            <el-button type="text" @click="haddenClick(1,item.hiddenDangerGrade)">{{
-              item.hiddenDangerNum
-              }}</el-button>
-            项，已整改
-            <el-button type="text" @click="haddenClick(2,item.hiddenDangerGrade)">{{
-              item.haveRectifiedNum
-              }}</el-button>
-            项(整改率为
-            <el-button type="text" >{{
-              item.rectifyRate
-              }}</el-button>
-            )，未整改
-            <el-button type="text" @click="haddenClick(3,item.hiddenDangerGrade)">{{
-              item.notRectifiedNum
-              }}</el-button>
-            项，超期未整改
-            <el-button type="text" @click="haddenClick(4,item.hiddenDangerGrade)">{{
-              item.exceedNotRectifiedNum
-              }}</el-button>
-            项
-            <br />
-            <br />
-          </div>
-
-          其中，列入督办隐患治理项目
-          <el-button type="text" @click="haddenClick(5,'')">{{
-            collectData.hiddenDangerNum
-            }}</el-button>
-          项，已整改
-          <el-button type="text" @click="haddenClick(6,'')">{{
-            collectData.haveRectifiedNum
-            }}</el-button>
-          项(整改率为
-          <el-button type="text"  >{{
-            collectData.rectifyRate
-            }}</el-button>
-          未整改
-          <el-button type="text" @click="haddenClick(7,'')">{{
-            collectData.notRectifiedNum
-            }}</el-button>
-          项，超期未整改
-          <el-button type="text" @click="haddenClick(8,'')">{{
-            collectData.exceedNotRectifiedNum
-            }}</el-button>
-          项)
-          <br />
-        </blockquote>
-        <el-divider />
-        <el-table :data="hiddenList" style="width: 100%">
-          <el-table-column prop="name" align="center" label="隐患级别" />
-          <el-table-column
-            prop="hiddenDangerNum"
-            align="center"
-            label="隐患事故"
-          />
-          <el-table-column
-            prop="haveRectifiedNum"
-            align="center"
-            label="已整改"
-          />
-          <el-table-column prop="rectifyRate" align="center" label="整改率" />
-          <el-table-column
-            prop="notRectifiedNum"
-            align="center"
-            label="未整改"
-          />
-          <el-table-column
-            prop="exceedNotRectifiedNum"
-            align="center"
-            label="整改超期"
-          />
-        </el-table>
-      </el-col>
-    </el-row>
-
-    <!--公文借出会话框-->
-    <el-dialog
-      title="隐患查询"
-      :visible.sync="open"
-      width="1200px"
-      append-to-body
-    >
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="68px"
+  <el-menu
+    :default-active="activeMenu"
+    mode="horizontal"
+    @select="handleSelect"
+  >
+    <template v-for="(item, index) in topMenus">
+      <el-menu-item
+        :style="{ '--theme': theme } "
+        :index="item.path"
+        :key="index"
       >
-
-      </el-form>
-
-      <el-table v-loading="loading" border :data="detailsList">
-        <!--<el-table-column label="主键" align="center" prop="id" />-->
-        <el-table-column label="序号" align="center">
-          <template slot-scope="scope">
-            <span>{{ Number(scope.$index) + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="隐患内容"
-          align="center"
-          prop="hiddenDangerDesc"
-        />
-        <el-table-column
-          label="单位名称"
-          align="center"
-          prop="enterpriseName"
-        />
-        <el-table-column label="隐患级别" align="center" prop="hiddenDangerGrade">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.hidden_danger_grade" :value="scope.row.hiddenDangerGrade"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="隐患类型" align="center" prop="hiddenDangerType">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.hidden_danger_type" :value="scope.row.hiddenDangerType"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="排查出隐患日期" align="center" prop="checkTime">
-          <template slot-scope="scope">
-            <span>{{
-              parseTime(scope.row.checkTime, "{y}-{m}-{d} {h}:{i}:{s}")
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="整改期限" align="center" prop="rectifyTermTime">
-          <template slot-scope="scope">
-            <span>{{
-              parseTime(scope.row.rectifyTermTime, "{y}-{m}-{d} {h}:{i}:{s}")
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="整改责任人"
-          align="center"
-          prop="principalName"
-        />
-        <el-table-column label="整改情况" align="center" prop="status" >
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.hidden_danger_status" :value="scope.row.status"/>
-          </template>
-        </el-table-column>
-
-      </el-table>
-
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        <!-- <svg-icon
+          v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+          :icon-class="item.meta.icon"
+        /> -->
+        <img :src="item.meta.img" style="height: 40px; width:auto;" alt="">
+        {{ item.meta.title }}
+      </el-menu-item>
+    </template>
+
+    <!-- 顶部菜单超出数量折叠 -->
+    <!-- <el-submenu :style="{'--theme': theme}" index="more" v-if="topMenus.length > visibleNumber">
+      <template slot="title">更多菜单</template>
+      <template v-for="(item, index) in topMenus">
+        <el-menu-item
+          :index="item.path"
+          :key="index"
+          v-if="index >= visibleNumber">
+          <svg-icon
+            v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+            :icon-class="item.meta.icon"/>
+          {{ item.meta.title }}
+        </el-menu-item>
+      </template>
+    </el-submenu> -->
+  </el-menu>
 </template>
 
 <script>
-  import {
-    getEhsIndexStatistics,
-    getSuperviseAndHandle,
-    getEhsIndexStatisticsList,
-    detailslist,
-  } from "@/api/ehs/IndexStatistics";
-  import { parseTime } from "@/utils/ruoyi";
-
-  export default {
-    name: "Index",
-    dicts: ["hidden_danger_grade", "hidden_danger_status","hidden_danger_type" ],
-    data() {
-      return {
-        showSearch: true,
-        // 遮罩层
-        loading: true,
-        // 总条数
-        total: 0,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          isOverTime:null,
-          params: {
-            qxStartTime: null,
-            qxEndTime: null,
-            pcStartTime: null,
-            pcEndTime: null,
-            wcStartTime: null,
-            wcEndTime: null,
-          },
-        },
-        open: false,
-        yearData: {
-          unitNum: "",
-          hiddenDangerNum: "",
-          haveRectifiedNum: "",
-          notRectifiedNum: "",
-          exceedNotRectifiedNum: "",
-          rectifyMoneySum: "",
-          rectifyRate: "",
-        },
-        collectData: {
-          hiddenDangerNum: "",
-          haveRectifiedNum: "",
-          notRectifiedNum: "",
-          exceedNotRectifiedNum: "",
-          rectifyMoneySum: "",
-          rectifyRate: "",
-        },
-        hiddenList: [],
-        detailsList: [],
-        // 日期范围
-        dateRange: [],
-      };
+import { constantRoutes } from "@/router";
+
+// 隐藏侧边栏路由
+const hideList = ["/index", "/user/profile"];
+
+export default {
+  data() {
+    return {
+      // 顶部栏初始数
+      visibleNumber: 50,
+      // 当前激活菜单的 index
+      currentIndex: undefined,
+      img1:require('../assets/images/menu (1).png'),
+      img2:require('../assets/images/menu (2).png'),
+      img3:require('../assets/images/menu (3).png'),
+      img4:require('../assets/images/menu (4).png'),
+      img5:require('../assets/images/menu (5).png'),
+      img6:require('../assets/images/menu (6).png'),
+      img7:require('../assets/images/menu (6).png'),
+      img8:require('../assets/images/menu (6).png'),
+      img9:require('../assets/images/menu (6).png'),
+      img10:require('../assets/images/menu (6).png'),
+      img11:require('../assets/images/menu (6).png'),
+      img12:require('../assets/images/menu (6).png'),
+    };
+  },
+  computed: {
+    theme() {
+      return this.$store.state.settings.theme;
     },
-    created() {
-      this.getIndexDetails();
-      this.$alert('这是一段内容', '标题名称', {
-        confirmButtonText: '确定',
-        callback: action => {
-          //this.$router.push({ path: "ehs/ehsHiddenDanger/index" });
+    // 顶部显示菜单
+    topMenus() {
+      let topMenus = [];
+     let imgArr= [this.img1,this.img2,this.img3,this.img4,this.img5,this.img6,this.img7,this.img8,this.img9,this.img10,this.img11,this.img12]
+      this.routers.map((menu,index) => {
+        if (menu.hidden !== true) {
+          // 兼容顶部栏一级菜单内部跳转
+          if (menu.path === "/") {
+            topMenus.push(menu.children[0]);
+          } else {
+            menu.meta.img = imgArr[index]
+            topMenus.push(menu);
+          }
+          
         }
       });
+      return topMenus;
     },
-    methods: {
-      parseTime,
-      /** 获取拟稿部门下拉列表 */
-      getIndexDetails() {
-        getEhsIndexStatistics().then((res) => {
-          this.yearData.unitNum = res.data.unitNum;
-          this.yearData.hiddenDangerNum = res.data.hiddenDangerNum;
-          this.yearData.haveRectifiedNum = res.data.haveRectifiedNum;
-          this.yearData.notRectifiedNum = res.data.notRectifiedNum;
-          this.yearData.exceedNotRectifiedNum = res.data.exceedNotRectifiedNum;
-          this.yearData.rectifyMoneySum = res.data.rectifyMoneySum;
-          this.yearData.rectifyRate = res.data.rectifyRate;
-        });
-        getSuperviseAndHandle().then((res) => {
-          this.collectData.hiddenDangerNum = res.data.hiddenDangerNum;
-          this.collectData.haveRectifiedNum = res.data.haveRectifiedNum;
-          this.collectData.notRectifiedNum = res.data.notRectifiedNum;
-          this.collectData.exceedNotRectifiedNum = res.data.exceedNotRectifiedNum;
-          this.collectData.rectifyRate = res.data.rectifyRate;
-        });
-        getEhsIndexStatisticsList().then((res) => {
-          console.log(res);
-          this.hiddenList = res.data;
-        });
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      haddenClick(type,hiddenDangerGrade) {
-        this.open = true;
-        this.resetForm("queryForm");
-        this.queryParams.isOverTime = null;
-        this.queryParams.status = null;
-        this.queryParams.hiddenDangerGrade = null;
-        this.queryParams.isSupervise = null;
-        if(hiddenDangerGrade != ""){
-          this.queryParams.hiddenDangerGrade = hiddenDangerGrade;
+    // 所有的路由信息
+    routers() {
+      return this.$store.state.permission.topbarRouters;
+    },
+    // 设置子路由
+    childrenMenus() {
+      var childrenMenus = [];
+      this.routers.map((router) => {
+        for (var item in router.children) {
+          if (router.children[item].parentPath === undefined) {
+            if (router.path === "/") {
+              router.children[item].path = "/" + router.children[item].path;
+            } else {
+              if (!this.ishttp(router.children[item].path)) {
+                router.children[item].path =
+                  router.path + "/" + router.children[item].path;
+              }
+            }
+            router.children[item].parentPath = router.path;
+          }
+          childrenMenus.push(router.children[item]);
         }
-        if(type == 2){//已整改
-          this.queryParams.status = "10";
-        }else if(type == 3){//未整改isOverTime
-          this.queryParams.status = "0";
-        }else if(type == 4){//超期未整改
-          this.queryParams.isOverTime = "1";
-        }else if(type == 5){//列入督办隐患治理项目
-          this.queryParams.isSupervise = 1;
-        }else if(type == 6){//列入督办隐患治理项目 已整改
-          this.queryParams.isSupervise = 1;
-          this.queryParams.status = "10";
-        }else if(type == 7){//列入督办隐患治理项目 未整改
-          this.queryParams.isSupervise = 1;
-          this.queryParams.status = "0";
-        }else if(type == 8){//列入督办隐患治理项目 未整改
-          this.queryParams.isSupervise = 1;
-          this.queryParams.isOverTime = "1";
+      });
+      return constantRoutes.concat(childrenMenus);
+    },
+    // 默认激活的菜单
+    activeMenu() {
+      const path = this.$route.path;
+      let activePath = path;
+      if (
+        path !== undefined &&
+        path.lastIndexOf("/") > 0 &&
+        hideList.indexOf(path) === -1
+      ) {
+        const tmpPath = path.substring(1, path.length);
+        activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
+        if (!this.$route.meta.link) {
+          this.$store.dispatch("app/toggleSideBarHide", false);
+        }
+      } else if (!this.$route.children) {
+        activePath = path;
+        this.$store.dispatch("app/toggleSideBarHide", true);
+      }
+      this.activeRoutes(activePath);
+      return activePath;
+    },
+  },
+  //   beforeMount() {
+  //     window.addEventListener('resize', this.setVisibleNumber)
+  //   },
+  //   beforeDestroy() {
+  //     window.removeEventListener('resize', this.setVisibleNumber)
+  //   },
+  //   mounted() {
+  //     this.setVisibleNumber();
+  //   },
+  methods: {
+    // 根据宽度计算设置显示栏数
+    // setVisibleNumber() {
+    //   const width = document.body.getBoundingClientRect().width / 3;
+    //   this.visibleNumber = parseInt(width / 85);
+    // },
+    // 菜单选择事件
+    handleSelect(key, keyPath) {
+      this.currentIndex = key;
+      const route = this.routers.find((item) => item.path === key);
+      if (this.ishttp(key)) {
+        // http(s):// 路径新窗口打开
+        window.open(key, "_blank");
+      } else if (!route || !route.children) {
+        // 没有子路由路径内部打开
+        const routeMenu = this.childrenMenus.find((item) => item.path === key);
+        if (routeMenu && routeMenu.query) {
+          let query = JSON.parse(routeMenu.query);
+          this.$router.push({ path: key, query: query });
+        } else {
+          this.$router.push({ path: key });
         }
-        this.handleQuery();
-      },
-      getList() {
-        this.loading = true;
-        console.log(this.queryParams);
-        detailslist(this.queryParams).then((response) => {
-          this.detailsList = response.rows;
-          this.total = response.total;
-          this.loading = false;
+        this.$store.dispatch("app/toggleSideBarHide", true);
+      } else {
+        // 显示左侧联动菜单
+        this.activeRoutes(key);
+        this.$store.dispatch("app/toggleSideBarHide", false);
+      }
+    },
+    // 当前激活的路由
+    activeRoutes(key) {
+      var routes = [];
+      if (this.childrenMenus && this.childrenMenus.length > 0) {
+        this.childrenMenus.map((item) => {
+          if (key == item.parentPath || (key == "index" && "" == item.path)) {
+            routes.push(item);
+          }
         });
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.queryParams.params.qxStartTime = null;
-        this.queryParams.params.qxEndTime = null;
-        this.queryParams.params.pcStartTime = null;
-        this.queryParams.params.pcEndTime = null;
-        this.queryParams.params.wcStartTime = null;
-        this.queryParams.params.wcEndTime = null;
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-      },
-      /*statusToStr(value) {
-        if(value=="0")
-          return "未整改"
-        else if(value=="10")
-          return "已整改"
-        else
-          return "未知"
-      },*/
+      }
+      if (routes.length > 0) {
+        this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+      } else {
+        this.$store.dispatch("app/toggleSideBarHide", true);
+      }
+    },
+    ishttp(url) {
+      return url.indexOf("http://") !== -1 || url.indexOf("https://") !== -1;
     },
-  };
+  },
+};
 </script>
 
-<style scoped lang="scss">
-  .home {
-    blockquote {
-      padding: 10px 20px;
-      margin: 0 0 20px;
-      font-size: 17.5px;
-      border-left: 5px solid #eee;
-    }
-    hr {
-      margin-top: 20px;
-      margin-bottom: 20px;
-      border: 0;
-      border-top: 1px solid #eee;
-    }
-    .col-item {
-      margin-bottom: 20px;
-    }
-
-    ul {
-      padding: 0;
-      margin: 0;
-    }
-
-    font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: 13px;
-    color: #676a6c;
-    overflow-x: hidden;
-
-    ul {
-      list-style-type: none;
-    }
-
-    h4 {
-      margin-top: 0px;
-    }
-
-    h2 {
-      margin-top: 10px;
-      font-size: 26px;
-      font-weight: 100;
-    }
-
-    p {
-      margin-top: 10px;
-
-      b {
-        font-weight: 700;
-      }
-    }
-
-    .update-log {
-      ol {
-        display: block;
-        list-style-type: decimal;
-        margin-block-start: 1em;
-        margin-block-end: 1em;
-        margin-inline-start: 0;
-        margin-inline-end: 0;
-        padding-inline-start: 40px;
-      }
-    }
-  }
-</style>
+<style lang="scss" scoped>
+.el-menu-item {
+  display: block;
+  text-align: center;
+  width: 16.6%;
+  line-height: 100px;
+  height: auto;
+  border: 1px solid #c1c1c1 !important;
+
+  color: #494848;
+    font-weight: 600;
+    font-size: 17px;
+    letter-spacing: 1px;
+}
+
+.el-menu.el-menu--horizontal {
+    border-bottom: transparent;
+//  margin-left: 45px;
+//  margin-top: 40px;
+    width: 95%;
+    margin: 30px auto;
+}
+
+.el-menu-item.is-active {
+  border: 1px solid #{'var(--theme)'} !important;
+  color: #3b3d41;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index d99f3e9..148e8e4 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -9,11 +9,14 @@
             <!--<p class="pEnglish">Ministry of Emergency Management of the People's Republic of China</p>-->
           </span>
           <span class="slogan">
-            <p>对党忠诚  纪律严明</p>
-            <p>赴汤蹈火  竭诚为民</p>
+            <!-- <p>对党忠诚  纪律严明</p>
+            <p>赴汤蹈火  竭诚为民</p> -->
+            <img class="ft" src="../assets/images/ftdh.png" alt="">
+            <img class="ft" src="../assets/images/ddzc.png" alt="">
           </span>
         </div>
         <div class="rightBox">
+          <img src="../assets/images/hui.png" alt="">
           <span class="time">{{ currentTime  }}</span>
           <span class="day">
             <p>{{ currentDayOfWeek }}</p>
@@ -24,7 +27,7 @@
     </div>
     <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">唐河县应急管理平台</h3>
+      <h3 class="title">唐河县应急管理综合业务平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -305,7 +308,11 @@ export default {
         display: flex;
         align-items: center;
 
-
+        img{
+          width: 80px;
+          height: auto;
+          margin-right: 30px;
+        }
       }
     }
   }
@@ -327,6 +334,12 @@ export default {
     line-height: 10px;
     font-weight: 500;
     margin-left: 30px;
+    display: flex;
+    flex-direction: column;
+    .ft{
+      object-fit: contain;
+      width: 222px !important;
+    }
   }
 }
 .rightBox{
diff --git a/ruoyi-ui/src/views/yinhuan-index.vue b/ruoyi-ui/src/views/yinhuan-index.vue
new file mode 100644
index 0000000..44c3d94
--- /dev/null
+++ b/ruoyi-ui/src/views/yinhuan-index.vue
@@ -0,0 +1,419 @@
+<template>
+  <div class="app-container home">
+    <el-row :gutter="20">
+      <el-col :sm="24" :lg="24">
+        <blockquote style="font-size: 14px">
+          本年度共有
+          <el-button type="text"  >{{
+            yearData.unitNum
+            }}</el-button>
+          家单位开展安全生产事故隐患排查治理，排查出隐患
+          <el-button type="text" @click="haddenClick(1,'')">{{
+            yearData.hiddenDangerNum
+            }}</el-button>
+          项，已整改
+          <el-button type="text" @click="haddenClick(2,'')">{{
+            yearData.haveRectifiedNum
+            }}</el-button>
+          项( 整改率为
+          <el-button type="text"  >{{
+            yearData.rectifyRate
+            }}</el-button>
+          未整改
+          <el-button type="text" @click="haddenClick(3,'')">{{
+            yearData.notRectifiedNum
+            }}</el-button>
+          项，超期未整改
+          <el-button type="text" @click="haddenClick(4,'')">{{
+            yearData.exceedNotRectifiedNum
+            }}</el-button>
+          项，累计落实整改治理资金
+          <el-button type="text"  >{{
+            yearData.rectifyMoneySum
+            }}</el-button>
+          万元。
+          <br />
+          <br />
+
+          <div v-for="(item, i) in hiddenList" :key="i">
+            累计排查出{{ item.name }}
+            <el-button type="text" @click="haddenClick(1,item.hiddenDangerGrade)">{{
+              item.hiddenDangerNum
+              }}</el-button>
+            项，已整改
+            <el-button type="text" @click="haddenClick(2,item.hiddenDangerGrade)">{{
+              item.haveRectifiedNum
+              }}</el-button>
+            项(整改率为
+            <el-button type="text" >{{
+              item.rectifyRate
+              }}</el-button>
+            )，未整改
+            <el-button type="text" @click="haddenClick(3,item.hiddenDangerGrade)">{{
+              item.notRectifiedNum
+              }}</el-button>
+            项，超期未整改
+            <el-button type="text" @click="haddenClick(4,item.hiddenDangerGrade)">{{
+              item.exceedNotRectifiedNum
+              }}</el-button>
+            项
+            <br />
+            <br />
+          </div>
+
+          其中，列入督办隐患治理项目
+          <el-button type="text" @click="haddenClick(5,'')">{{
+            collectData.hiddenDangerNum
+            }}</el-button>
+          项，已整改
+          <el-button type="text" @click="haddenClick(6,'')">{{
+            collectData.haveRectifiedNum
+            }}</el-button>
+          项(整改率为
+          <el-button type="text"  >{{
+            collectData.rectifyRate
+            }}</el-button>
+          未整改
+          <el-button type="text" @click="haddenClick(7,'')">{{
+            collectData.notRectifiedNum
+            }}</el-button>
+          项，超期未整改
+          <el-button type="text" @click="haddenClick(8,'')">{{
+            collectData.exceedNotRectifiedNum
+            }}</el-button>
+          项)
+          <br />
+        </blockquote>
+        <el-divider />
+        <el-table :data="hiddenList" style="width: 100%">
+          <el-table-column prop="name" align="center" label="隐患级别" />
+          <el-table-column
+            prop="hiddenDangerNum"
+            align="center"
+            label="隐患事故"
+          />
+          <el-table-column
+            prop="haveRectifiedNum"
+            align="center"
+            label="已整改"
+          />
+          <el-table-column prop="rectifyRate" align="center" label="整改率" />
+          <el-table-column
+            prop="notRectifiedNum"
+            align="center"
+            label="未整改"
+          />
+          <el-table-column
+            prop="exceedNotRectifiedNum"
+            align="center"
+            label="整改超期"
+          />
+        </el-table>
+      </el-col>
+    </el-row>
+
+    <!--公文借出会话框-->
+    <el-dialog
+      title="隐患查询"
+      :visible.sync="open"
+      width="1200px"
+      append-to-body
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+
+      </el-form>
+
+      <el-table v-loading="loading" border :data="detailsList">
+        <!--<el-table-column label="主键" align="center" prop="id" />-->
+        <el-table-column label="序号" align="center">
+          <template slot-scope="scope">
+            <span>{{ Number(scope.$index) + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="隐患内容"
+          align="center"
+          prop="hiddenDangerDesc"
+        />
+        <el-table-column
+          label="单位名称"
+          align="center"
+          prop="enterpriseName"
+        />
+        <el-table-column label="隐患级别" align="center" prop="hiddenDangerGrade">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.hidden_danger_grade" :value="scope.row.hiddenDangerGrade"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="隐患类型" align="center" prop="hiddenDangerType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.hidden_danger_type" :value="scope.row.hiddenDangerType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="排查出隐患日期" align="center" prop="checkTime">
+          <template slot-scope="scope">
+            <span>{{
+              parseTime(scope.row.checkTime, "{y}-{m}-{d} {h}:{i}:{s}")
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="整改期限" align="center" prop="rectifyTermTime">
+          <template slot-scope="scope">
+            <span>{{
+              parseTime(scope.row.rectifyTermTime, "{y}-{m}-{d} {h}:{i}:{s}")
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="整改责任人"
+          align="center"
+          prop="principalName"
+        />
+        <el-table-column label="整改情况" align="center" prop="status" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.hidden_danger_status" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+
+      </el-table>
+
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    getEhsIndexStatistics,
+    getSuperviseAndHandle,
+    getEhsIndexStatisticsList,
+    detailslist,
+  } from "@/api/ehs/IndexStatistics";
+  import { parseTime } from "@/utils/ruoyi";
+
+  export default {
+    name: "Index",
+    dicts: ["hidden_danger_grade", "hidden_danger_status","hidden_danger_type" ],
+    data() {
+      return {
+        showSearch: true,
+        // 遮罩层
+        loading: true,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          isOverTime:null,
+          params: {
+            qxStartTime: null,
+            qxEndTime: null,
+            pcStartTime: null,
+            pcEndTime: null,
+            wcStartTime: null,
+            wcEndTime: null,
+          },
+        },
+        open: false,
+        yearData: {
+          unitNum: "",
+          hiddenDangerNum: "",
+          haveRectifiedNum: "",
+          notRectifiedNum: "",
+          exceedNotRectifiedNum: "",
+          rectifyMoneySum: "",
+          rectifyRate: "",
+        },
+        collectData: {
+          hiddenDangerNum: "",
+          haveRectifiedNum: "",
+          notRectifiedNum: "",
+          exceedNotRectifiedNum: "",
+          rectifyMoneySum: "",
+          rectifyRate: "",
+        },
+        hiddenList: [],
+        detailsList: [],
+        // 日期范围
+        dateRange: [],
+      };
+    },
+    created() {
+      this.getIndexDetails();
+    },
+    methods: {
+      parseTime,
+      /** 获取拟稿部门下拉列表 */
+      getIndexDetails() {
+        getEhsIndexStatistics().then((res) => {
+          this.yearData.unitNum = res.data.unitNum;
+          this.yearData.hiddenDangerNum = res.data.hiddenDangerNum;
+          this.yearData.haveRectifiedNum = res.data.haveRectifiedNum;
+          this.yearData.notRectifiedNum = res.data.notRectifiedNum;
+          this.yearData.exceedNotRectifiedNum = res.data.exceedNotRectifiedNum;
+          this.yearData.rectifyMoneySum = res.data.rectifyMoneySum;
+          this.yearData.rectifyRate = res.data.rectifyRate;
+        });
+        getSuperviseAndHandle().then((res) => {
+          this.collectData.hiddenDangerNum = res.data.hiddenDangerNum;
+          this.collectData.haveRectifiedNum = res.data.haveRectifiedNum;
+          this.collectData.notRectifiedNum = res.data.notRectifiedNum;
+          this.collectData.exceedNotRectifiedNum = res.data.exceedNotRectifiedNum;
+          this.collectData.rectifyRate = res.data.rectifyRate;
+        });
+        getEhsIndexStatisticsList().then((res) => {
+          console.log(res);
+          this.hiddenList = res.data;
+        });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      haddenClick(type,hiddenDangerGrade) {
+        this.open = true;
+        this.resetForm("queryForm");
+        this.queryParams.isOverTime = null;
+        this.queryParams.status = null;
+        this.queryParams.hiddenDangerGrade = null;
+        this.queryParams.isSupervise = null;
+        if(hiddenDangerGrade != ""){
+          this.queryParams.hiddenDangerGrade = hiddenDangerGrade;
+        }
+        if(type == 2){//已整改
+          this.queryParams.status = "10";
+        }else if(type == 3){//未整改isOverTime
+          this.queryParams.status = "0";
+        }else if(type == 4){//超期未整改
+          this.queryParams.isOverTime = "1";
+        }else if(type == 5){//列入督办隐患治理项目
+          this.queryParams.isSupervise = 1;
+        }else if(type == 6){//列入督办隐患治理项目 已整改
+          this.queryParams.isSupervise = 1;
+          this.queryParams.status = "10";
+        }else if(type == 7){//列入督办隐患治理项目 未整改
+          this.queryParams.isSupervise = 1;
+          this.queryParams.status = "0";
+        }else if(type == 8){//列入督办隐患治理项目 未整改
+          this.queryParams.isSupervise = 1;
+          this.queryParams.isOverTime = "1";
+        }
+        this.handleQuery();
+      },
+      getList() {
+        this.loading = true;
+        console.log(this.queryParams);
+        detailslist(this.queryParams).then((response) => {
+          this.detailsList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams.params.qxStartTime = null;
+        this.queryParams.params.qxEndTime = null;
+        this.queryParams.params.pcStartTime = null;
+        this.queryParams.params.pcEndTime = null;
+        this.queryParams.params.wcStartTime = null;
+        this.queryParams.params.wcEndTime = null;
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+      },
+      /*statusToStr(value) {
+        if(value=="0")
+          return "未整改"
+        else if(value=="10")
+          return "已整改"
+        else
+          return "未知"
+      },*/
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  .home {
+    blockquote {
+      padding: 10px 20px;
+      margin: 0 0 20px;
+      font-size: 17.5px;
+      border-left: 5px solid #eee;
+    }
+    hr {
+      margin-top: 20px;
+      margin-bottom: 20px;
+      border: 0;
+      border-top: 1px solid #eee;
+    }
+    .col-item {
+      margin-bottom: 20px;
+    }
+
+    ul {
+      padding: 0;
+      margin: 0;
+    }
+
+    font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 13px;
+    color: #676a6c;
+    overflow-x: hidden;
+
+    ul {
+      list-style-type: none;
+    }
+
+    h4 {
+      margin-top: 0px;
+    }
+
+    h2 {
+      margin-top: 10px;
+      font-size: 26px;
+      font-weight: 100;
+    }
+
+    p {
+      margin-top: 10px;
+
+      b {
+        font-weight: 700;
+      }
+    }
+
+    .update-log {
+      ol {
+        display: block;
+        list-style-type: decimal;
+        margin-block-start: 1em;
+        margin-block-end: 1em;
+        margin-inline-start: 0;
+        margin-inline-end: 0;
+        padding-inline-start: 40px;
+      }
+    }
+  }
+</style>