From 7cb1c8d975fb011c678996467b60740b06e5e17f Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Thu, 18 Sep 2025 18:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=A2=9E=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89=20=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E7=AD=9B=E9=80=89=E5=92=8C=E6=A3=80=E9=AA=8C=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/equipmentRecord/index.vue       | 15 ++++-
 .../equipment/safetyWarn/index.vue            | 56 +++++++++++++++----
 2 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/src/views/materialsStation/equipment/equipmentRecord/index.vue b/src/views/materialsStation/equipment/equipmentRecord/index.vue
index d4bf259b..b204c95b 100644
--- a/src/views/materialsStation/equipment/equipmentRecord/index.vue
+++ b/src/views/materialsStation/equipment/equipmentRecord/index.vue
@@ -125,6 +125,18 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="机具类型" prop="jiJuType">
+        <el-select
+          v-model="queryParams.jiJuType"
+          placeholder="请选择机具类型"
+          clearable
+          style="width: 240px"
+        >
+          <el-option label="施工机具" :value="1" />
+          <el-option label="安全工器具" :value="2" />
+        </el-select>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -316,7 +328,8 @@ export default {
         subUnitName: null,
         teamName: null,
         typeName: null, //物资名称
-        typeModelName: null //规格型号
+        typeModelName: null, //规格型号
+        jiJuType: null        // 机具类型 (1施工机具 2安全工器具)
       },
       tipForm: {
         departNum: 0, // 项目部总数
diff --git a/src/views/materialsStation/equipment/safetyWarn/index.vue b/src/views/materialsStation/equipment/safetyWarn/index.vue
index 1495f9fc..e4b89bb6 100644
--- a/src/views/materialsStation/equipment/safetyWarn/index.vue
+++ b/src/views/materialsStation/equipment/safetyWarn/index.vue
@@ -8,7 +8,7 @@
           placeholder="请输入分公司"
           clearable
           @keyup.enter.native="handleQuery"
-          style="width: 240px"
+          style="width: 220px"
         />
       </el-form-item>
 
@@ -18,7 +18,7 @@
           placeholder="请输入项目部"
           clearable
           @keyup.enter.native="handleQuery"
-          style="width: 240px"
+          style="width: 220px"
         />
       </el-form-item>
 
@@ -28,7 +28,7 @@
           placeholder="请输入工程"
           clearable
           @keyup.enter.native="handleQuery"
-          style="width: 240px"
+          style="width: 220px"
         />
       </el-form-item>
 
@@ -38,7 +38,7 @@
           placeholder="请输入分包单位"
           clearable
           @keyup.enter.native="handleQuery"
-          style="width: 240px"
+          style="width: 220px"
         />
       </el-form-item>
 
@@ -47,7 +47,7 @@
           v-model="queryParams.status"
           placeholder="请选择状态"
           clearable
-          style="width: 240px"
+          style="width: 220px"
         >
           <el-option label="正常" value="0" />
           <el-option label="1个月检测到期" value="2" />
@@ -64,7 +64,7 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          style="width: 240px"
+          style="width: 220px"
         ></el-date-picker>
       </el-form-item>
 
@@ -74,7 +74,7 @@
           placeholder="请输入班组名称"
           clearable
           @keyup.enter.native="handleQuery"
-          style="width: 240px"
+          style="width: 220px"
         />
       </el-form-item>
 
@@ -84,7 +84,17 @@
           placeholder="请输入物资类型"
           clearable
           @keyup.enter.native="handleQuery"
-          style="width: 240px"
+          style="width: 220px"
+        />
+      </el-form-item>
+
+      <el-form-item label="关键字" prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 220px"
         />
       </el-form-item>
 
@@ -136,6 +146,17 @@
           <span :class="getStatusClass(scope.row.status)">{{ getStatusText(scope.row.status) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="检验报告" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+    <span
+      style="color:#409EFF;cursor:pointer;"
+      @click="openReport(scope.row)"
+    >
+      {{ scope.row.reportCode }}
+    </span>
+        </template>
+      </el-table-column>
+
 
     </el-table>
 
@@ -279,6 +300,19 @@ export default {
 
       }
     },
+    openReport(row) {
+      let reportUrl = row.reportUrl;
+      let pdfUrl = "";
+      if (/https?/i.test(reportUrl)) {
+        console.log("URL包含http/https");
+        pdfUrl = reportUrl;
+      } else {
+        console.log("URL不包含http/https");
+        pdfUrl = "http://sgwpdm.ah.sgcc.com.cn/iws/smw/filePath/" + reportUrl;
+      }
+      // 打开新窗口
+      window.open(pdfUrl, "_blank");
+    },
   }
 }
 </script>
@@ -307,7 +341,7 @@ export default {
 
 .stat-row {
   margin-bottom: 10px;
-  
+
   .stat-item {
     background: #f5f7fa;
     padding: 8px 16px;
@@ -316,6 +350,6 @@ export default {
     font-size: 16px;
     white-space: nowrap;
   }
-  
+
 }
-</style>
\ No newline at end of file
+</style>