Merge branch 'qhse_person' of shuzhihua/pms-iot-vue into master

src/layout/components/Menu/src/components/useRenderMenuItem.tsx

@@ -153,6 +153,7 @@ export const useRenderMenuItem = () =>
                 '突发事件处置',
                 'QHSE月报管理',
                 '月报填报',
+                '月报汇总',
                 'QHSE资料库',
                 'QHSE资质证书',
                 'QHSE体系文件',

src/views/pms/qhse/monthlyReport/MonthlyReportAdd.vue

@@ -25,12 +25,13 @@
                 :check-strictly="false"
                 node-key="id"
                 filterable
+                disabled
                 placeholder="请选择所属队伍" />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
             <el-form-item label="月报标题" prop="title">
-              <el-input v-model="reportInfo.title" placeholder="请输入月报标题" />
+              <el-input disabled v-model="reportInfo.title" placeholder="请输入月报标题" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -41,6 +42,7 @@
                 v-model="reportInfo.yearMonths"
                 type="month"
                 placeholder="选择年月"
+                disabled
                 format="YYYY-MM"
                 value-format="YYYY-MM"
                 style="width: 100%" />

src/views/pms/qhse/reportSummary/preview-drawer.vue

@@ -206,6 +206,10 @@ function getMetricSummaryValue(field: keyof QhseMonthReportItem) {
 
   const numericValues = values.map((value) => Number(value))
   if (numericValues.every((value) => !Number.isNaN(value))) {
+    if (field === 'withoutAccident') {
+      return String(Math.min(...numericValues))
+    }
+
     const total = numericValues.reduce((sum, value) => sum + value, 0)
     return Number.isInteger(total) ? String(total) : total.toFixed(2)
   }