diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6b0815897eb1479f16e5bc5b228aad325b2d6841..e11caaf372b4f9fadcd9f84458228e125dc73e82 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -65,6 +65,7 @@ const actions = {
           let userInfo = JSON.parse(JSON.stringify(data))
           delete userInfo.menuVoList
           setUserInfo(JSON.stringify(userInfo))
+          debugger
           JSON.stringify(data.menuVoList)
           // setToken(JSON.stringify(data.token));
           sessionStorage.setItem('token',data.token)
@@ -118,6 +119,7 @@ const actions = {
           let userInfoData = JSON.parse(JSON.stringify(data))
           delete userInfoData.menuVoList
           setUserInfo(JSON.stringify(userInfoData))
+          
           JSON.stringify(data.menuVoList)
           // setToken(JSON.stringify(data.token));
           sessionStorage.setItem('token',data.token)
diff --git a/src/utils/filters.js b/src/utils/filters.js
index 196b8928dffaf101cba0de349e3ab4f6333faa26..5a4d2cfb48a43fb5691207db2dbaa590889b6625 100644
--- a/src/utils/filters.js
+++ b/src/utils/filters.js
@@ -104,29 +104,29 @@ export function filter_alarm_type_img(val) {
   if (!val) return "";
   switch (val) {
     case "out_depot_time_red":
-      return require('@/assets/time_red.png');
+      return require("@/assets/time_red.png");
     case "out_depot_time_yellow":
-      return require('@/assets/time_yellow.png');
+      return require("@/assets/time_yellow.png");
     case "do_collect_weight_red":
-      return require('@/assets/weight_red.png');
+      return require("@/assets/weight_red.png");
     case "do_collect_weight_yellow":
-      return require('@/assets/weight_yellow.png');
+      return require("@/assets/weight_yellow.png");
     case "in_depot_weight_red":
-      return require('@/assets/weight_red.png');
+      return require("@/assets/weight_red.png");
     case "in_depot_weight_yellow":
-      return require('@/assets/weight_yellow.png');
+      return require("@/assets/weight_yellow.png");
     case "out_depot_weight_red":
-      return require('@/assets/weight_red.png');
+      return require("@/assets/weight_red.png");
     case "out_depot_weight_yellow":
-      return require('@/assets/weight_yellow.png');
+      return require("@/assets/weight_yellow.png");
     case "do_collect_time_red":
-      return require('@/assets/time_red.png');
+      return require("@/assets/time_red.png");
     case "do_collect_time_yellow":
-      return require('@/assets/time_yellow.png');
+      return require("@/assets/time_yellow.png");
     case "in_depot_time_red":
-      return require('@/assets/time_red.png');
+      return require("@/assets/time_red.png");
     case "in_depot_time_yellow":
-      return require('@/assets/time_yellow.png');
+      return require("@/assets/time_yellow.png");
   }
 }
 
@@ -175,3 +175,44 @@ export function timeFn(d1) {
     return `${seconds}秒`;
   }
 }
+
+export function timeFormat(value, format) {
+  if (!value) return;
+  let date = new Date(value);
+  let y = date.getFullYear();
+  let m = date.getMonth() + 1;
+  let d = date.getDate();
+  let h = date.getHours();
+  let min = date.getMinutes();
+  let s = date.getSeconds();
+  let result = "";
+  if (format == undefined) {
+    result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} ${
+      h < 10 ? "0" + h : h
+    }:${min < 10 ? "0" + min : min}:${s < 10 ? "0" + s : s}`;
+  }
+  if (format == "yyyy-mm-dd") {
+    result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
+  }
+  if (format == "yyyy-mm-dd HH:mm") {
+    result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} ${
+      h < 10 ? "0" + h : h
+    }:${min < 10 ? "0" + min : min}`;
+  }
+  if (format == "yyyy/mm/dd") {
+    result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
+  }
+  if (format == "yyyy-mm") {
+    result = `${y}-${m < 10 ? "0" + m : m}`;
+  }
+  if (format == "mm-dd") {
+    result = ` ${mm < 10 ? "0" + mm : mm}:${ddmin < 10 ? "0" + dd : dd}`;
+  }
+  if (format == "hh:mm") {
+    result = ` ${h < 10 ? "0" + h : h}:${min < 10 ? "0" + min : min}`;
+  }
+  if (format == "yyyy") {
+    result = `${y}`;
+  }
+  return result;
+}
diff --git a/src/views/userStatistics/components/medicalWasteTypes.vue b/src/views/userStatistics/components/medicalWasteTypes.vue
index 65c269b1c72c448d16b4d5e3da8e3e2abdb413f7..3fdd8a6ae690db91f33ca96d487c20510ee50b69 100644
--- a/src/views/userStatistics/components/medicalWasteTypes.vue
+++ b/src/views/userStatistics/components/medicalWasteTypes.vue
@@ -17,7 +17,7 @@
       </div>
     </div>
     <div
-    v-else
+      v-else
       class="h287 w100p"
       id="types"
     ></div>
@@ -25,6 +25,7 @@
 </template>
 <script>
 import * as echarts from "echarts";
+import * as statisticsApi from "@/api/statistics";
 export default {
   data() {
     return {
@@ -40,76 +41,91 @@ export default {
     },
   },
   mounted() {
-    this.handleInit()
+    this.handleInit();
   },
   // watch: {
   //   dataList(val) {
   //     console.log(val);
-  //     this.handleInit(); 
+  //     this.handleInit();
   //   },
   // },
   methods: {
     handleInit(_row) {
-      if (_row && _row.length != 0) {
-        this.dataListShow = false;
-        let myChart = echarts.init(document.getElementById("types"));
-        let option = {
-          color: [
-            "#37a2da",
-            "#32c5e9",
-            "#9fe6b8",
-            "#ffdb5c",
-            "#ff9f7f",
-            "#fb7293",
-            "#e7bcf3",
-            "#8378ea",
-          ],
-          tooltip: {
-            trigger: "item",
-            formatter: "{a} <br/>{b} : {c} ({d}%)",
-          },
-          toolbox: {
-            show: true,
-          },
-          grid: {
-            top: "8%",
-            left: "8%",
-            right: "8%",
-            bottom: "8%",
-            // containLabel: true
-          },
-          legend: {
-            orient: "vertical",
-            right: "0%",
-            align: "right",
-            top: "middle",
-            textStyle: {
-              color: "#8C8C8C",
-            },
-          },
-          series: [
-            {
-              name: "医废统计",
-              type: "pie",
-              radius: "65%", //设置饼图大小
-              center: ["40%", "50%"], //设置饼图位置
-              data: _row,
-              label: {
-                //去除饼图的指示折线label
-                normal: {
-                  show: false,
+      let _this = this;
+      statisticsApi.weekClassify().then((res) => {
+        if (res && res.success) {
+          let dataList = res.data;
+          let classifyReport = dataList.map((item) => {
+            return {
+              name: item.classifyName,
+              value: item.count,
+              weight: item.weight,
+            };
+          });
+          _this.$nextTick(() => {
+            if (classifyReport && classifyReport.length != 0) {
+              this.dataListShow = false;
+              let myChart = echarts.init(document.getElementById("types"));
+              let option = {
+                color: [
+                  "#37a2da",
+                  "#32c5e9",
+                  "#9fe6b8",
+                  "#ffdb5c",
+                  "#ff9f7f",
+                  "#fb7293",
+                  "#e7bcf3",
+                  "#8378ea",
+                ],
+                tooltip: {
+                  trigger: "item",
+                  formatter: "{a} <br/>{b} : {c} ({d}%)",
                 },
-              },
-            },
-          ],
-        };
-        myChart.setOption(option);
-        window.addEventListener("resize", function () {
-          myChart.resize();
-        });
-      } else {
-        this.dataListShow = true;
-      }
+                toolbox: {
+                  show: true,
+                },
+                grid: {
+                  top: "8%",
+                  left: "8%",
+                  right: "8%",
+                  bottom: "8%",
+                  // containLabel: true
+                },
+                legend: {
+                  orient: "vertical",
+                  right: "0%",
+                  align: "right",
+                  top: "middle",
+                  textStyle: {
+                    color: "#8C8C8C",
+                  },
+                },
+                series: [
+                  {
+                    name: "医废统计",
+                    type: "pie",
+                    radius: "65%", //设置饼图大小
+                    center: ["40%", "50%"], //设置饼图位置
+                    data: classifyReport,
+                    label: {
+                      //去除饼图的指示折线label
+                      normal: {
+                        show: false,
+                      },
+                    },
+                  },
+                ],
+              };
+              myChart.setOption(option);
+              window.addEventListener("resize", function () {
+                myChart.resize();
+              });
+            } else {
+              this.dataListShow = true;
+            }
+          });
+        }
+      });
     },
   },
 };
diff --git a/src/views/userStatistics/components/realTimeMedicalWaste.vue b/src/views/userStatistics/components/realTimeMedicalWaste.vue
index 7cf4629037b1b73d69cfb5ca91e239d8c8d5bf91..3b2f0a1c8b653ed23ee0b5de71491be214b44a7a 100644
--- a/src/views/userStatistics/components/realTimeMedicalWaste.vue
+++ b/src/views/userStatistics/components/realTimeMedicalWaste.vue
@@ -5,13 +5,23 @@
       v-if="dataListShow"
     >
       <div>
-        <img class="w190 h120" src="@/assets/nodata.png" alt="" />
-        <div style="color: #a8a8a8" class="fz14">暂无数据</div>
+        <img
+          class="w190 h120"
+          src="@/assets/nodata.png"
+          alt=""
+        />
+        <div
+          style="color: #a8a8a8"
+          class="fz14"
+        >暂无数据</div>
       </div>
     </div>
     <div v-else>
-      
-      <el-table  :data="tableData"  style="width: 100%">
+
+      <el-table
+        :data="tableData"
+        style="width: 100%"
+      >
         <el-table-column
           prop="hospitalDepartName"
           label="交接科室"
@@ -19,12 +29,20 @@
         </el-table-column>
         <el-table-column
           prop="createTime"
+          width="200"
           label="交接时间"
         >
         </el-table-column>
-        <el-table-column prop="userRevicerName" label="交接护士">
+        <el-table-column
+          prop="handUserStaffName"
+          label="交接人员"
+        >
         </el-table-column>
-        <el-table-column prop="wasteClassifyName" label="医废种类">
+        <el-table-column
+          prop="wasteClassifyName"
+          width="120"
+          label="医废种类"
+        >
         </el-table-column>
         <el-table-column
           prop="weight"
@@ -61,18 +79,59 @@ export default {
       };
       statisticsApi.collectList(params).then((res) => {
         if (res && res.success) {
-          console.log(111);
-          console.log(res.data);
           if (res.data && res.data.length != 0) {
             this.dataListShow = false;
           } else {
             this.dataListShow = true;
             return;
           }
-          this.tableData = res.data;
+          this.tableData = res.data.map((item) => {
+            item.createTime = this.timeFormat(item.createTime,'yyyy-mm-dd HH:mm');
+            return item
+          });
         }
       });
     },
+    timeFormat(value, format) {
+      if (!value) return;
+      let date = new Date(value);
+      let y = date.getFullYear();
+      let m = date.getMonth() + 1;
+      let d = date.getDate();
+      let h = date.getHours();
+      let min = date.getMinutes();
+      let s = date.getSeconds();
+      let result = "";
+      if (format == undefined) {
+        result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} ${
+          h < 10 ? "0" + h : h
+        }:${min < 10 ? "0" + min : min}:${s < 10 ? "0" + s : s}`;
+      }
+      if (format == "yyyy-mm-dd") {
+        result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
+      }
+      if (format == "yyyy-mm-dd HH:mm") {
+        result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} ${
+          h < 10 ? "0" + h : h
+        }:${min < 10 ? "0" + min : min}`;
+      }
+      if (format == "yyyy/mm/dd") {
+        result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
+      }
+      if (format == "yyyy-mm") {
+        result = `${y}-${m < 10 ? "0" + m : m}`;
+      }
+      if (format == "mm-dd") {
+        result = ` ${mm < 10 ? "0" + mm : mm}:${ddmin < 10 ? "0" + dd : dd}`;
+      }
+      if (format == "hh:mm") {
+        result = ` ${h < 10 ? "0" + h : h}:${min < 10 ? "0" + min : min}`;
+      }
+      if (format == "yyyy") {
+        result = `${y}`;
+      }
+      return result;
+    },
   },
 };
 </script>
\ No newline at end of file
diff --git a/src/views/userStatistics/components/record.vue b/src/views/userStatistics/components/record.vue
index 6a000503fe902d9f56af702ed2b673912787ee97..5f6879beea206c286ec36e548134ca031be8ec43 100644
--- a/src/views/userStatistics/components/record.vue
+++ b/src/views/userStatistics/components/record.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="content h278 mb10 ">
+    <div class="content h310 mb10 ">
       <div
         class="s-tac s-d-flex s-ai-center s-jc-center h278"
         v-if="dataListShow"
diff --git a/src/views/userStatistics/components/recoveryTrend.vue b/src/views/userStatistics/components/recoveryTrend.vue
index 53dde66d0bf1b2a1e67cbda06c910d217c7d7a2a..b96d63a7812c39d473bab1a5e64e3393bce7c31a 100644
--- a/src/views/userStatistics/components/recoveryTrend.vue
+++ b/src/views/userStatistics/components/recoveryTrend.vue
@@ -44,7 +44,7 @@ export default {
             this.dataListShow = false;
           } else {
             this.dataListShow = true;
-            return
+            return;
           }
           for (let i = 1; i <= 12; i++) {
             let month = res.data.find((item) => {
@@ -61,7 +61,11 @@ export default {
             backgroundColor: "#fff",
             tooltip: {
               trigger: "axis",
-              backgroundColor: "rgba(0,0,0,0.5)",
+              backgroundColor: "rgb(0,0,0, 0.28)",
+              textStyle: {
+                color: "#fff",
+                fontSize:11
+              },
               axisPointer: {
                 lineStyle: {
                   color: {
@@ -88,6 +92,10 @@ export default {
                   },
                 },
               },
+              formatter(params) {
+                return `<div style="font-size:18px;">${params[0].axisValue}</div>
+              <div style="font-size:16px;margin-top:9px;">${params[0].value} KG</div>`;
+              },
             },
             grid: {
               top: "5%",
diff --git a/src/views/userStatistics/index.vue b/src/views/userStatistics/index.vue
index d8ffc0d203231c2abec3a306cd2bba2c926db760..df71a9eab49115b5b3abba6bc86a79db3f8ca885 100644
--- a/src/views/userStatistics/index.vue
+++ b/src/views/userStatistics/index.vue
@@ -8,22 +8,37 @@
       align="middle"
     >
       <a-col :span="6">
-        <a-card title="近7天医废种类占比统计" :bordered="false">
+        <a-card
+          title="近7天医废种类占比统计"
+          :bordered="false"
+        >
           <medicalWasteTypes ref="medicalWasteTypes"></medicalWasteTypes>
         </a-card>
       </a-col>
       <a-col :span="10">
-        <a-card title="各月医废回收趋势" :bordered="false">
+        <a-card
+          title="各月医废回收趋势"
+          :bordered="false"
+        >
           <recoveryTrend ref="recoveryTrend"></recoveryTrend>
         </a-card>
       </a-col>
       <a-col :span="6">
-        <a-card title="预警预览" :bordered="false">
-          <a-row type="flex" justify="space-between">
+        <a-card
+          title="预警预览"
+          :bordered="false"
+        >
+          <a-row
+            type="flex"
+            justify="space-between"
+          >
             <a-col :span="7">
               <div class="icon-1">
                 <div class="img1 mt25">
-                  <img src="../../assets/icon01.png" alt="" />
+                  <img
+                    src="../../assets/icon01.png"
+                    alt=""
+                  />
                 </div>
                 <div class="title fz16 pt15">
                   近七天<br />
@@ -37,7 +52,10 @@
             <a-col :span="7">
               <div class="icon-2">
                 <div class="img1 mt25">
-                  <img src="../../assets/icon02.png" alt="" />
+                  <img
+                    src="../../assets/icon02.png"
+                    alt=""
+                  />
                 </div>
                 <div class="title fz16 pt32">正在预警</div>
                 <div class="num fz28 pt27 ff">
@@ -48,7 +66,10 @@
             <a-col :span="7">
               <div class="icon-3">
                 <div class="img1 mt25">
-                  <img src="../../assets/icon03.png" alt="" />
+                  <img
+                    src="../../assets/icon03.png"
+                    alt=""
+                  />
                 </div>
                 <div class="title fz16 pt32">已处理</div>
                 <div class="num fz28 pt27 ff">
@@ -70,14 +91,34 @@
       align="middle"
     >
       <a-col :span="12">
-        <a-card title="实时医废收集情况" :bordered="false">
-          <realTimeMedicalWaste
-            ref="realTimeMedicalWaste"
-          ></realTimeMedicalWaste>
+        <a-card
+          title="实时医废收集情况"
+          :bordered="false"
+        >
+          <template #extra>
+            <span
+              v-if="userInfo1.type != 'admin'"
+              @click="handleGoTo('/medicalWaste/retrospect')"
+              class="s-tar flex-1 fz14 s-pointer"
+              style="display:block;color:#A8A8A8"
+            >更多 <right-outlined /></span>
+          </template>
+          <realTimeMedicalWaste ref="realTimeMedicalWaste"></realTimeMedicalWaste>
         </a-card>
       </a-col>
       <a-col :span="11">
-        <a-card title="预警信息" :bordered="false">
+        <a-card
+          title="预警信息"
+          :bordered="false"
+        >
+          <template #extra>
+            <span
+              v-if="userInfo1.type != 'admin'"
+              @click="handleGoTo('/alarmInfo/alarmRecord')"
+              class="s-tar flex-1 fz14 s-pointer"
+              style="display:block;color:#A8A8A8"
+            >更多 <right-outlined /></span>
+          </template>
           <warningInfo ref="warningInfo"></warningInfo>
         </a-card>
       </a-col>
@@ -87,14 +128,36 @@
       type="flex"
       justify="space-between"
     >
-      <a-col :span="userInfo.type=='admin'?14:24">
-        <a-card title="科室产生医废前15排行" :bordered="false">
-            <a-month-picker @change="chooseTime" v-model:value="monthRange" :format="monthFormat" valueFormat="YYYY/MM" />
+      <a-col :span="userInfo1.type=='admin'?14:24">
+        <a-card
+          title="科室产生医废前15排行"
+          :bordered="false"
+        >
+          <a-month-picker
+            @change="chooseTime"
+            v-model:value="monthRange"
+            :format="monthFormat"
+            valueFormat="YYYY/MM"
+          />
           <fifteenDepart ref="fifteenDepart"></fifteenDepart>
         </a-card>
       </a-col>
-      <a-col :span="9" v-if="userInfo.type='admin'">
-        <a-card title="医院申请记录" :bordered="false">
+      <a-col
+        :span="9"
+        v-if="userInfo1.type=='admin'"
+      >
+        <a-card
+          title="医院申请记录"
+          :bordered="false"
+        >
+          <template #extra>
+            <div
+              @click="handleGoTo1('/hospitalInstitutions/application')"
+              class="s-tar flex-1 fz14 s-pointer"
+              style="display:block;color:#A8A8A8"
+              href="#"
+            > 更多 <right-outlined /></div>
+          </template>
           <record ref="record"></record>
         </a-card>
       </a-col>
@@ -115,7 +178,8 @@ import * as statisticsApi from "@/api/statistics";
 import { getUserInfo, setUserInfo } from "@/utils/auth";
 import * as Utils from "@/utils";
 import { defineComponent, onMounted, reactive, ref, toRefs } from "vue";
- const monthFormat = 'YYYY/MM';
+import { useRouter } from "vue-router";
+const monthFormat = "YYYY/MM";
 export default {
   components: {
     gather,
@@ -129,10 +193,12 @@ export default {
     record,
   },
   setup() {
-          const userInfo = ref(getUserInfo() ? JSON.parse(getUserInfo()) : {})
+    const router = useRouter();
+    const userInfo1 = reactive(getUserInfo() ? JSON.parse(getUserInfo()) : {});
+    console.log("userInfo1", userInfo1.type);
     const warnBaseSituation = ref({});
-    const fifteenDepart = ref('')
-    const monthRange = ref('')
+    const fifteenDepart = ref("");
+    const monthRange = ref("");
     const handleInitWarnBaseSituation = () => {
       statisticsApi.warnBaseSituation().then((res) => {
         if (res && res.success) {
@@ -140,31 +206,45 @@ export default {
         }
       });
     };
-    const chooseTime = ()=>{
-       let params = {
+    const chooseTime = () => {
+      let params = {
         month: monthRange.value
-          ?monthRange.value.split("/")[1]
+          ? monthRange.value.split("/")[1]
           : Utils.parseTime(new Date(), "{m}"),
         year: monthRange.value
           ? monthRange.value.split("/")[0]
           : Utils.parseTime(new Date(), "{y}"),
       };
-      fifteenDepart.value.handleInit(params)
-
-
-    }
+      fifteenDepart.value.handleInit(params);
+    };
     onMounted(() => {
       handleInitWarnBaseSituation();
-      chooseTime()
+      chooseTime();
     });
+    const handleGoTo1 = (_row) => {
+      router.push({
+        path: _row,
+      });
+    };
+    const handleGoTo = (_row) => {
+      if (userInfo1.type == "admin") {
+        return;
+      }
+
+      router.push({
+        path: _row,
+      });
+    };
     return {
-        userInfo,
+      userInfo1,
       handleInitWarnBaseSituation,
       warnBaseSituation,
       chooseTime,
+      handleGoTo1,
+      handleGoTo,
       fifteenDepart,
       monthFormat,
-      monthRange
+      monthRange,
     };
   },
 };