修改统计部分展示页面与bug

src/api/mes/material/information.js

@@ -146,3 +146,20 @@ export function updateCabinetOpenTimeout(data) {
     data: data
   })
 }
+
+//物资柜开柜门记录 数据接口 /dev-api/iscs/hardware/material-api/insertCabinetOpenRecord
+export function insertCabinetOpenRecord(data) {
+  return request({
+    url: '/iscs/hardware/material-api/insertCabinetOpenRecord',
+    method: 'post',
+    data: data
+  })
+}
+//物资柜关闭柜门 记录 /dev-api/iscs/hardware/material-api/updateCabinetClose
+export function updateCabinetClose(data) {
+  return request({
+    url: '/iscs/hardware/material-api/updateCabinetClose',
+    method: 'post',
+    data: data
+  })
+}

src/views/dashboard/LineChart.vue

@@ -114,7 +114,8 @@ export default {
                 }
               },
               smooth: true,
-              type: 'line',
+              type: 'bar',
+              stack: 'Ad',  // 启用堆叠效果
               data: loanCount || [],
               animationDuration: 2800,
               animationEasing: 'cubicInOut'
@@ -122,7 +123,8 @@ export default {
             {
               name: '归还',
               smooth: true,
-              type: 'line',
+              type: 'bar',
+              stack: 'Ad',  // 启用堆叠效果
               itemStyle: {
                 normal: {
                   color: '#3888fa',

src/views/mes/analogue/Lending/demo2.vue

@@ -44,9 +44,9 @@
 import Konva from 'konva'
 import {
   getExMaterials,
-  getIsMaterialsCabinets,
+  getIsMaterialsCabinets, insertCabinetOpenRecord,
   listMaterials,
-  selectMaterialsById,
+  selectMaterialsById, updateCabinetClose,
   updateIsMaterialById
 } from '@/api/mes/material/information'
 
@@ -87,10 +87,28 @@ export default {
         this.$message.success('柜门已打开')
         this.updateDraggableStatus()
         this.inputStatus = '当前柜门已打开'
+      //   开柜门新增记录接口
+        const data={
+          cabinetId:this.queryParams.materialsCabinetId,
+          userId:'106',
+          openType:'0'
+        }
+        insertCabinetOpenRecord(data).then(res => {
+          console.log(res,'开柜门新增记录')
+        })
       } else {
         this.$message.info('柜门已关闭')
         this.inputStatus = '当前柜门已关闭'
         this.updateMaterialsBatch() // 柜门关闭时调用批量更新接口
+        //关柜门新增柜门记录统计数据
+        const data={
+          cabinetId:this.queryParams.materialsCabinetId,
+          userId:'106',
+          openType:'0'
+        }
+        updateCabinetClose(data).then((res)=>{
+          console.log(res,'关柜门记录')
+        });
       }
     },
     // 获取物资柜信息

src/views/mes/analogue/Lending/demo5.vue

@@ -46,7 +46,11 @@ import {
   getIsMaterialsCabinets,
   listMaterials,
   selectMaterialsById,
-  updateIsMaterialById, insertIsMaterialsChangeRecord, updateMaterialsBindingRemove
+  updateIsMaterialById,
+  insertIsMaterialsChangeRecord,
+  updateMaterialsBindingRemove,
+  insertCabinetOpenRecord,
+  updateCabinetClose
 } from '@/api/mes/material/information'
 
 export default {
@@ -87,10 +91,28 @@ export default {
         this.$message.success('柜门已打开')
         this.updateDraggableStatus()
         this.inputStatus = '当前柜门已打开'
+        //   开柜门新增记录接口
+        const data={
+          cabinetId:this.queryParams.materialsCabinetId,
+          userId:'106',
+          openType:'2'
+        }
+        insertCabinetOpenRecord(data).then(res => {
+          console.log(res,'开柜门新增记录')
+        })
       } else {
         this.$message.info('柜门已关闭')
         this.inputStatus = '当前柜门已关闭'
         this.updateMaterialsBatch() // 柜门关闭时调用批量更新接口
+        //关柜门新增柜门记录统计数据
+        const data={
+          cabinetId:this.queryParams.materialsCabinetId,
+          userId:'106',
+          openType:'2'
+        }
+        updateCabinetClose(data).then((res)=>{
+          console.log(res,'关柜门记录')
+        });
       }
     },
     // 获取物资柜信息

src/views/mes/analogue/Lending/demo7.vue

@@ -46,7 +46,11 @@ import {
   getIsMaterialsCabinets,
   listMaterials,
   selectMaterialsById,
-  updateIsMaterialById, insertIsMaterialsChangeRecord, updateMaterialsBindingRemove
+  updateIsMaterialById,
+  insertIsMaterialsChangeRecord,
+  updateMaterialsBindingRemove,
+  insertCabinetOpenRecord,
+  updateCabinetClose
 } from '@/api/mes/material/information'
 
 export default {
@@ -88,10 +92,28 @@ export default {
         this.$message.success('柜门已打开')
         this.updateDraggableStatus()
         this.inputStatus = '当前柜门已打开'
+        //   开柜门新增记录接口
+        const data={
+          cabinetId:this.queryParams.materialsCabinetId,
+          userId:'106',
+          openType:'2'
+        }
+        insertCabinetOpenRecord(data).then(res => {
+          console.log(res,'开柜门新增记录')
+        })
       } else {
         this.$message.info('柜门已关闭')
         this.inputStatus = '当前柜门已关闭'
         this.updateMaterialsBatch() // 柜门关闭时调用批量更新接口
+        //关柜门新增柜门记录统计数据
+        const data={
+          cabinetId:this.queryParams.materialsCabinetId,
+          userId:'106',
+          openType:'2'
+        }
+        updateCabinetClose(data).then((res)=>{
+          console.log(res,'关柜门记录')
+        });
       }
     },
     // 获取物资柜信息

src/views/mes/email/emailTemplates/index.vue

@@ -54,19 +54,19 @@
           >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-no-more-click
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['iscs:template:remove']"
-          >批量删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          v-no-more-click-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['iscs:template:remove']"-->
+<!--          >批量删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"

src/views/mes/material/inspectionplan/index.vue

@@ -704,7 +704,7 @@ export default {
         }
       })
     },
-    handleFrequencyChange(frequency) {
+    handleFrequencyChange(frequency, isInitial = false) {
       if (frequency === '月') {
         // 生成 1 到 31 的日期，并将个位数格式化为两位数
         this.planDateOptions = Array.from({ length: 31 }, (_, i) => {
@@ -728,7 +728,13 @@ export default {
       } else {
         this.planDateOptions = []
       }
-      //   每次更新都调用接口
+
+      // 如果不是初始化，清空计划日期
+      if (!isInitial) {
+        this.autoConfig.planDate = null
+      }
+
+      // 每次更新都调用接口
       this.handleClickAuto()
     },
 //     自动创建计划检查 回显函数
@@ -741,7 +747,23 @@ export default {
         this.autoConfig.planDate = res.data.planDate
         this.autoConfig.planFrequency = res.data.planFrequency
         this.autoConfig.checkUserId = res.data.checkUserId
-        this.handleFrequencyChange(res.data.planFrequency)
+
+        // 初始化时传入 isInitial 为 true
+        this.handleFrequencyChange(res.data.planFrequency, true)
+
+        // 如果频率是周，将 planDate 转换为对应的中文星期
+        if (res.data.planFrequency === '周') {
+          const weekMap = {
+            1: '周一',
+            2: '周二',
+            3: '周三',
+            4: '周四',
+            5: '周五',
+            6: '周六',
+            7: '周日'
+          }
+          this.autoConfig.planDate = weekMap[res.data.planDate] || res.data.planDate
+        }
 
         if (res.data.startStatus == '0') {
           this.autoConfig.startStatus = false

src/views/mes/material/standard/PropertyForm.vue

@@ -248,8 +248,8 @@ export default {
       },
       // 表单校验
       rules: {
-        valveName: [
-          { required: true, message: '名称不能为空', trigger: 'blur' }
+        valueName: [
+          { required: true, message: '物资规格不能为空', trigger: 'blur' }
         ],
         materialsTypeId: [
           { required: true, message: '物资类型不能为空', trigger: 'blur' }

src/views/mes/statisticians/LockerChange.vue

@@ -12,7 +12,7 @@
       end-placeholder="结束日期"
       :picker-options="pickerOptions" >
     </el-date-picker>
-    <div ref="barChart" style="width: 1000px; height: 700px;margin: 5% 0 0 20%"></div>  <!-- 这里指定了柱状图的宽高 -->
+    <div ref="barChart" style="width: 700px; height: 400px;margin-top: 3%"></div>  <!-- 这里指定了柱状图的宽高 -->
   </div>
 </template>
 
@@ -116,7 +116,7 @@ export default {
         title: {
           text: '物资更换统计',
           left: 'center',
-          top: '1%'
+          top: '0%'
         },
         tooltip: {
           trigger: 'axis',
@@ -136,7 +136,7 @@ export default {
           }
         },
         legend: {
-          data: ['累计更换次数','过期更换次数','损坏更换次数'],
+          data: ['正常更换次数','过期更换次数','损坏更换次数'],
           top: '5%',  // 调整图例距离顶部的距离，确保图例在标题下方
           left: 'center',  // 图例居中显示
         },
@@ -163,8 +163,9 @@ export default {
         ],
         series: [
           {
-            name: '累计更换次数',  // 修改为适当的名称
+            name: '正常更换次数',  // 修改为适当的名称
             type: 'bar',
+            stack: 'Ad',  // 启用堆叠效果
             barWidth: '25%',
             tooltip: {
               valueFormatter: function (value) {

src/views/mes/statisticians/LockerCollection.vue

@@ -12,7 +12,7 @@
       end-placeholder="结束日期"
       :picker-options="pickerOptions" >
     </el-date-picker>
-    <div ref="barChart" style="width: 1000px; height: 700px;margin: 5% 0 0 20%"></div>  <!-- 这里指定了柱状图的宽高 -->
+    <div ref="barChart" style="width: 700px; height: 400px;margin-top: 3%"></div>  <!-- 这里指定了柱状图的宽高 -->
   </div>
 </template>
 
@@ -115,7 +115,7 @@ export default {
         title: {
           text: '物资领取统计',
           left: 'center',
-          top: '1%'
+          top: '0%'
         },
         tooltip: {
           trigger: 'axis',

src/views/mes/statisticians/LockerDaily.vue

@@ -12,7 +12,7 @@
       end-placeholder="结束日期"
       :picker-options="pickerOptions" >
     </el-date-picker>
-    <div ref="barChart" style="width: 1200px; height: 700px;margin: 5% 0 0 20%"></div>  <!-- 这里指定了柱状图的宽高 -->
+    <div ref="barChart" style="width: 700px; height: 400px;margin-top: 3%"></div>  <!-- 这里指定了柱状图的宽高 -->
   </div>
 </template>
 
@@ -114,14 +114,15 @@ export default {
       // 提取 X 轴和 Y 轴的数据
       const day = this.cabinetData.map(item => item.day)
       const allCount = this.cabinetData.map(item => item.allCount)
-      const returnCount=this.cabinetData.map(item => item.returnCount)
-      const timeoutCount=this.cabinetData.map(item => item.timeoutCount)
+      const returnCount = this.cabinetData.map(item => item.returnCount)
+      const timeoutCount = this.cabinetData.map(item => item.timeoutCount)
+
       // 配置图表的选项
       const options = {
         title: {
           text: '每日领取归还统计',
           left: 'center',
-          top: '1%'
+          top: '0%'
         },
         tooltip: {
           trigger: 'axis',
@@ -135,13 +136,13 @@ export default {
         toolbox: {
           feature: {
             dataView: { show: true, readOnly: false },
-            magicType: { show: true, type: ['line', 'bar'] },
+            magicType: { show: true, type: ['line', 'bar'] }, // 保留切换功能
             restore: { show: true },
             saveAsImage: { show: true }
           }
         },
         legend: {
-          data: ['累计领取次数','累计正常归还次数','累计超时归还次数'],
+          data: ['累计领取次数', '累计正常归还次数', '累计超时归还次数'],
           top: '5%',  // 调整图例距离顶部的距离，确保图例在标题下方
           left: 'center',  // 图例居中显示
         },
@@ -168,46 +169,45 @@ export default {
         ],
         series: [
           {
-            name: '累计领取次数',  // 修改为适当的名称
-            type: 'line',
-            barWidth: '25%',
-
+            name: '累计领取次数',
+            type: 'bar',  // 改为柱状图
+            stack: 'total',  // 启用堆叠效果
             tooltip: {
               valueFormatter: function (value) {
-                return value + ' 次';  // 修改单位为 次
+                return value + ' 次';
               }
             },
             data: allCount,
             itemStyle: {
-              color: '#5470c6',  // 设置柱子的颜色为蓝色（你可以根据需要修改）
+              color: '#5470c6',  // 设置柱子的颜色
             }
           },
           {
-            name: '累计正常归还次数',  // 修改为适当的名称
-            type: 'line',
-            barWidth: '25%',
+            name: '累计正常归还次数',
+            type: 'bar',  // 改为柱状图
+            stack: 'total',  // 启用堆叠效果
             tooltip: {
               valueFormatter: function (value) {
-                return value + ' 次';  // 修改单位为 次
+                return value + ' 次';
               }
             },
             data: returnCount,
             itemStyle: {
-              color: '#a6d58f',  // 设置柱子的颜色为蓝色（你可以根据需要修改）
+              color: '#a6d58f',  // 设置柱子的颜色
             }
           },
           {
-            name: '累计超时归还次数',  // 修改为适当的名称
-            type: 'line',
-            barWidth: '25%',
+            name: '累计超时归还次数',
+            type: 'bar',  // 改为柱状图
+            stack: 'total',  // 启用堆叠效果
             tooltip: {
               valueFormatter: function (value) {
-                return value + ' 次';  // 修改单位为 次
+                return value + ' 次';
               }
             },
             data: timeoutCount,
             itemStyle: {
-              color: '#fac85a',  // 设置柱子的颜色为蓝色（你可以根据需要修改）
+              color: '#fac85a',  // 设置柱子的颜色
             }
           }
         ]

src/views/mes/statisticians/LockerLending.vue

@@ -12,7 +12,7 @@
       end-placeholder="结束日期"
       :picker-options="pickerOptions" >
     </el-date-picker>
-    <div ref="barChart" style="width: 1000px; height: 700px;margin: 5% 0 0 20%"></div>  <!-- 这里指定了柱状图的宽高 -->
+    <div ref="barChart" style="width: 700px; height: 400px;margin-top: 3%"></div>  <!-- 这里指定了柱状图的宽高 -->
   </div>
 </template>
 
@@ -109,7 +109,9 @@ export default {
       // 提取 X 轴和 Y 轴的数据
       const materialsTypeName = this.cabinetData.map(item => item.materialsTypeName)
       const averageTime = this.cabinetData.map(item => {
-        return item.averageTime/3600
+        // 使用 toFixed(2) 保留两位小数，或者 Math.round() 四舍五入到整数
+        return parseFloat((item.averageTime / 3600).toFixed(2)); // 保留两位小数
+        // 或者 return Math.round(item.averageTime / 3600); // 四舍五入到整数
       })
 
       // 配置图表的选项
@@ -117,7 +119,7 @@ export default {
         title: {
           text: '物资借出平均时长',
           left: 'center',
-          top: '1%'
+          top: '0%'
         },
         tooltip: {
           trigger: 'axis',
@@ -155,7 +157,7 @@ export default {
             type: 'value',
             name: '小时',
             axisLabel: {
-              formatter: '{value} 小时'  // 修改单位为 次
+              formatter: '{value} 小时'  // 修改单位为 小时
             },
             splitLine: {
               show: false  // 隐藏纵向的网格线
@@ -169,7 +171,7 @@ export default {
             barWidth: '25%',
             tooltip: {
               valueFormatter: function (value) {
-                return value + ' 次';  // 修改单位为 次
+                return value + ' 小时';  // 修改单位为 小时
               }
             },
             data: averageTime,

src/views/mes/statisticians/LockerMistake.vue

@@ -17,7 +17,7 @@
    </div>
     <!-- 使用 v-for 动态渲染饼图 -->
     <div class="pie-chart" v-for="(cabinet, index) in cabinetData" :key="index">
-      <div :id="'pieChart' + cabinet.cabinetId" style="width: 450px; height: 300px;"></div>
+      <div :id="'pieChart' + cabinet.cabinetId" style="width: 300px; height: 150px;"></div>
     </div>
   </div>
 </template>

src/views/mes/statisticians/LockerOne.vue

@@ -0,0 +1,39 @@
+<template>
+  <div>
+    <el-row>
+      <el-col :span="12">
+        <LockerOpen></LockerOpen>
+      </el-col>
+      <el-col :span="12">
+        <LockerLending></LockerLending>
+
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <LockerSpeciality></LockerSpeciality>
+      </el-col>
+      <el-col :span="12">
+        <LockerMistake></LockerMistake>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import LockerOpen from '@/views/mes/statisticians/LockerOpen.vue'
+import LockerMistake from '@/views/mes/statisticians/LockerMistake.vue'
+import LockerSpeciality from '@/views/mes/statisticians/LockerSpeciality.vue'
+import LockerLending from '@/views/mes/statisticians/LockerLending.vue'
+export default {
+  name: 'LockerTwo',
+  components: {
+    LockerOpen,
+    LockerMistake,
+    LockerSpeciality,
+    LockerLending
+  }
+}
+</script>
+<style scoped lang="scss">
+
+</style>

src/views/mes/statisticians/LockerOpen.vue

@@ -12,7 +12,7 @@
       end-placeholder="结束日期"
       :picker-options="pickerOptions" >
     </el-date-picker>
-    <div ref="barChart" style="width: 1000px; height: 700px;margin: 5% 0 0 20%"></div>  <!-- 这里指定了柱状图的宽高 -->
+    <div ref="barChart" style="width: 700px; height: 400px;margin-top: 3%"></div>  <!-- 这里指定了柱状图的宽高 -->
   </div>
 </template>
 
@@ -116,7 +116,7 @@ export default {
         title: {
           text: '物资柜开关次数',
           left: 'center',
-          top: '1%'
+          top: '0%'
         },
         tooltip: {
           trigger: 'axis',

src/views/mes/statisticians/LockerReturn.vue

@@ -12,7 +12,7 @@
       end-placeholder="结束日期"
       :picker-options="pickerOptions" >
     </el-date-picker>
-    <div ref="barChart" style="width: 1000px; height: 700px;margin: 5% 0 0 20%"></div>  <!-- 这里指定了柱状图的宽高 -->
+    <div ref="barChart" style="width: 700px; height: 400px;margin-top: 3%"></div>  <!-- 这里指定了柱状图的宽高 -->
   </div>
 </template>
 
@@ -116,7 +116,7 @@ export default {
         title: {
           text: '物资归还统计',
           left: 'center',
-          top: '1%'
+          top: '0%'
         },
         tooltip: {
           trigger: 'axis',

src/views/mes/statisticians/LockerSpeciality.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div ref="barChart" style="width: 1000px; height: 700px;margin: 5% 0 0 20%"></div>  <!-- 这里指定了柱状图的宽高 -->
+    <div ref="barChart" style="width: 700px; height: 400px;margin-top: 3%"></div>  <!-- 这里指定了柱状图的宽高 -->
   </div>
 </template>
 
@@ -46,7 +46,7 @@ export default {
         title: {
           text: '特殊状态物资统计',
           left: 'center',
-          top: '1%'
+          top: '0%'
         },
         tooltip: {
           trigger: 'axis',
@@ -82,7 +82,7 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: '次数',
+            name: '个',
             axisLabel: {
               formatter: '{value} '  // 修改单位为 次
             },

src/views/mes/statisticians/LockerTwo.vue

@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <el-row>
+      <el-col :span="12">
+        <LockerCollection></LockerCollection>
+      </el-col>
+      <el-col :span="12">
+        <LockerReturn></LockerReturn>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <LockerChange></LockerChange>
+      </el-col>
+      <el-col :span="12">
+        <LockerDaily></LockerDaily>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import LockerCollection from '@/views/mes/statisticians/LockerCollection.vue'
+import LockerReturn from '@/views/mes/statisticians/LockerReturn.vue'
+import LockerChange from '@/views/mes/statisticians/LockerChange.vue'
+import LockerDaily from '@/views/mes/statisticians/LockerDaily.vue'
+export default {
+  name: 'LockerTwo',
+  components: {
+    LockerCollection,
+    LockerReturn,
+    LockerChange,
+    LockerDaily
+  }
+}
+</script>
+<style scoped lang="scss">
+
+</style>