yanghao 1 napja
szülő
commit
db549bbcac

+ 4 - 5
src/components/UploadFile/src/UploadFile.vue

@@ -18,8 +18,7 @@
       :on-success="handleFileSuccess"
       :show-file-list="true"
       class="upload-file-uploader"
-      name="file"
-    >
+      name="file">
       <el-button type="primary">
         <Icon icon="ep:upload-filled" />
         选取文件
@@ -41,8 +40,7 @@
               :underline="false"
               download
               target="_blank"
-              type="primary"
-            >
+              type="primary">
               下载
             </el-link>
           </div>
@@ -93,7 +91,8 @@ const props = defineProps({
     'pptx',
     'mp4',
     'apk',
-    'wgt'
+    'wgt',
+    'bmp'
   ]), // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileSize: propTypes.number.def(50), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制

+ 13 - 5
src/views/pms/qhse/certificate.vue

@@ -13,7 +13,9 @@
       @node-click="handleDeptNodeClick" />
 
     <div class="stats-cards">
-      <div class="stats-card stats-card--expired stats-card--clickable" @click="handleStatCardClick('expired')">
+      <div
+        class="stats-card stats-card--expired stats-card--clickable"
+        @click="handleStatCardClick('expired')">
         <div class="flex items-center gap-2">
           <Icon icon="ep:info-filled" color="#de3b3b" />
           <div class="stats-card__label">已过期</div>
@@ -27,7 +29,9 @@
             class="stats-card__value text-[40px]! pt-10 text-center! text-[#e35656]!" />
         </div>
       </div>
-      <div class="stats-card stats-card--warn stats-card--clickable" @click="handleStatCardClick('warn')">
+      <div
+        class="stats-card stats-card--warn stats-card--clickable"
+        @click="handleStatCardClick('warn')">
         <div class="flex items-center gap-2">
           <Icon icon="ep:bell-filled" color="#d97706" />
           <div class="stats-card__label">60天预警</div>
@@ -40,7 +44,9 @@
             class="stats-card__value text-[40px]! pt-10 text-center! text-[#d97706]!" />
         </div>
       </div>
-      <div class="stats-card stats-card--total stats-card--clickable" @click="handleStatCardClick('total')">
+      <div
+        class="stats-card stats-card--total stats-card--clickable"
+        @click="handleStatCardClick('total')">
         <div class="flex items-center gap-2">
           <Icon icon="eos-icons:counting" color="#2563eb" />
           <div class="stats-card__label">证书总数</div>
@@ -54,7 +60,9 @@
             class="stats-card__value text-[40px]! pt-10 text-center! text-[#2563eb]!" />
         </div>
       </div>
-      <div class="stats-card stats-card--personal stats-card--clickable" @click="handleStatCardClick('personal')">
+      <div
+        class="stats-card stats-card--personal stats-card--clickable"
+        @click="handleStatCardClick('personal')">
         <div class="flex items-center gap-2">
           <Icon
             icon="material-symbols-light:account-circle-outline"
@@ -380,7 +388,7 @@
         <!-- <UploadImage v-model="formData.certPic" /> -->
         <UploadFile
           v-model="formData.certPic"
-          :file-type="['pdf', 'jpg', 'png', 'jpeg']"
+          :file-type="['pdf', 'jpg', 'png', 'jpeg', 'bmp']"
           :file-size="100"
           class="min-w-80px" />
       </el-form-item>

+ 1 - 1
src/views/pms/qhse/deviceCert/DeviceCertForm.vue

@@ -104,7 +104,7 @@
           <el-form-item label="附件" prop="file">
             <UploadFile
               v-model="formData.file"
-              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx']"
+              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx', 'bmp']"
               :limit="3"
               :file-size="100"
               class="min-w-80px" />

+ 1 - 1
src/views/pms/qhse/emergencyDrill/CertDrawer.vue

@@ -174,7 +174,7 @@
           <el-form-item label="附件" prop="file">
             <UploadFile
               v-model="formData.file"
-              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx']"
+              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx', 'bmp']"
               :limit="3"
               :file-size="100"
               class="min-w-80px" />

+ 1 - 1
src/views/pms/qhse/emergencyDrill/EmergencyDrillForm.vue

@@ -71,7 +71,7 @@
           <el-form-item label="附件" prop="file">
             <UploadFile
               v-model="formData.file"
-              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx']"
+              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx', 'bmp']"
               :limit="3"
               :file-size="100"
               class="min-w-80px" />

+ 1 - 1
src/views/pms/qhse/emergencyDrill/bookCheck/EmergencyBookForm.vue

@@ -80,7 +80,7 @@
           <el-form-item label="附件" prop="file">
             <UploadFile
               v-model="formData.file"
-              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx']"
+              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx', 'bmp']"
               :limit="3"
               :file-size="100"
               class="min-w-80px" />

+ 8 - 3
src/views/pms/qhse/index.vue

@@ -12,7 +12,9 @@
       @node-click="handleDeptNodeClick" />
 
     <div class="stats-cards min-w-0">
-      <div class="stats-card stats-card--expired stats-card--clickable" @click="handleStatCardClick('expired')">
+      <div
+        class="stats-card stats-card--expired stats-card--clickable"
+        @click="handleStatCardClick('expired')">
         <div class="stats-card__header">
           <el-icon class="stats-card__icon" :size="28">
             <Icon icon="ep:info-filled" />
@@ -27,7 +29,9 @@
             class="stats-card__value text-[40px]! pt-10 text-center! text-[#e35656]!" />
         </div>
       </div>
-      <div class="stats-card stats-card--warn stats-card--clickable" @click="handleStatCardClick('warn')">
+      <div
+        class="stats-card stats-card--warn stats-card--clickable"
+        @click="handleStatCardClick('warn')">
         <div class="stats-card__header">
           <el-icon class="stats-card__icon" :size="28">
             <Icon icon="ep:bell-filled" />
@@ -570,7 +574,8 @@ const formRules = {
   classify: [{ required: true, message: '分类不能为空', trigger: 'blur' }],
   deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
   measureCertNo: [{ required: true, message: '证书编码不能为空', trigger: 'blur' }],
-  validity: [{ required: true, message: '有效期不能为空', trigger: 'blur' }]
+  validity: [{ required: true, message: '有效期不能为空', trigger: 'blur' }],
+  serialNo: [{ required: true, message: '序列号不能为空', trigger: 'blur' }]
 }
 
 /** 查询列表 */

+ 2 - 5
src/views/pms/qhse/iotmeasuredetect/IotMeasureDetectForm.vue

@@ -15,10 +15,7 @@
               placeholder="计量器具"
               style="width: 300px">
               <template #append>
-                <el-link
-                  :disabled="measureSelectLocked"
-                  @click="selectMeasure"
-                  :underline="false">
+                <el-link :disabled="measureSelectLocked" @click="selectMeasure" :underline="false">
                   选择
                 </el-link>
               </template>
@@ -92,7 +89,7 @@
           <el-form-item label="附件" prop="file">
             <UploadFile
               v-model="formData.file"
-              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx']"
+              :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'xls', 'xlsx', 'bmp']"
               :limit="3"
               :file-size="100"
               class="min-w-80px" />

+ 1 - 1
src/views/pms/qhse/jsa/IotSocSummaryForm.vue

@@ -45,7 +45,7 @@
       <el-form-item label="附件" prop="jsaFile">
         <UploadFile
           v-model="formData.jsaFile"
-          :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg']"
+          :file-type="['doc', 'docx', 'pdf', 'jpg', 'png', 'jpeg', 'bmp']"
           :limit="3"
           :file-size="100"
           class="min-w-80px" />

+ 1 - 1
src/views/pms/qhse/ptw/index.vue

@@ -280,7 +280,7 @@
       <el-form-item label="附件" prop="file">
         <UploadFile
           v-model="formData.file"
-          :file-type="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'jpg', 'png', 'jpeg']"
+          :file-type="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'jpg', 'png', 'jpeg', 'bmp']"
           :limit="3"
           :file-size="100"
           class="min-w-80px" />

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

@@ -285,9 +285,9 @@ watch(
       <div class="qhse-report-preview__sheet">
         <div class="qhse-report-preview__sheet-title">QHSE 月度报告</div>
         <div class="qhse-report-preview__meta">
-          <span>年月:{{ formatDisplayValue('yearMonths') }}</span>
-          <span>填报人:{{ formatDisplayValue('personName') }}</span>
-          <span>创建日期:{{ formatDisplayValue('createTime') }}</span>
+          <span>年月:{{ props.yearMonths }}</span>
+          <!-- <span>填报人:{{ formatDisplayValue('personName') }}</span>
+          <span>创建日期:{{ formatDisplayValue('createTime') }}</span> -->
         </div>
 
         <div class="qhse-report-preview__table-wrap">

+ 2 - 2
src/views/pms/qhse/safety/index.vue

@@ -332,7 +332,7 @@
       <el-form-item label="照片" prop="hazardFile">
         <UploadFile
           v-model="formData.hazardFile"
-          :file-type="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'jpg', 'png', 'jpeg']"
+          :file-type="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'jpg', 'png', 'jpeg', 'bmp']"
           :limit="3"
           :file-size="100"
           class="min-w-80px" />
@@ -378,7 +378,7 @@
       <el-form-item label="整改附件" prop="rectifyFile">
         <UploadFile
           v-model="formData.rectifyFile"
-          :file-type="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'jpg', 'png', 'jpeg']"
+          :file-type="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'jpg', 'png', 'jpeg', 'bmp']"
           :limit="3"
           :file-size="100"
           class="min-w-80px" />