learshaw 2 ماه پیش
والد
کامیت
646fc6488a
2فایلهای تغییر یافته به همراه43 افزوده شده و 11 حذف شده
  1. 19 5
      ems-ui-cloud/src/api/alarm/alarm.js
  2. 24 6
      ems-ui-cloud/src/views/inspection/report/index.vue

+ 19 - 5
ems-ui-cloud/src/api/alarm/alarm.js

@@ -52,7 +52,10 @@ export function confirmAlarm(alarmId, remark) {
   return request({
     url: '/ems/alarm/confirm/' + alarmId,
     method: 'put',
-    params: { remark }
+    data: {
+      alarmId: alarmId,
+      remark: remark
+    }
   })
 }
 
@@ -61,7 +64,11 @@ export function handleAlarm(alarmId, handleContent, handleResult) {
   return request({
     url: '/ems/alarm/handle/' + alarmId,
     method: 'put',
-    params: { handleContent, handleResult }
+    data: {
+      alarmId: alarmId,
+      handleContent: handleContent,
+      handleResult: handleResult
+    }
   })
 }
 
@@ -70,16 +77,23 @@ export function resolveAlarm(alarmId, resolveRemark) {
   return request({
     url: '/ems/alarm/resolve/' + alarmId,
     method: 'put',
-    params: { resolveRemark }
+    data: {
+      alarmId: alarmId,
+      resolveRemark: resolveRemark
+    }
   })
 }
 
 // 关闭告警
-export function closeAlarm(alarmId, reason) {
+export function closeAlarm(alarmId, resolveRemark) {
   return request({
     url: '/ems/alarm/close/' + alarmId,
     method: 'put',
-    params: { reason }
+    // 将参数放入 data 中,axios 会自动将其序列化为 JSON 放在 Request Body 里
+    data: {
+      alarmId: alarmId,
+      resolveRemark: resolveRemark
+    }
   })
 }
 

+ 24 - 6
ems-ui-cloud/src/views/inspection/report/index.vue

@@ -48,13 +48,13 @@
     <!-- 数据表格 -->
     <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="50" align="center" />
-      <el-table-column label="报告代码" align="left" prop="reportCode" width="180" show-overflow-tooltip>
+      <el-table-column label="报告代码" align="left" prop="reportCode" width="200" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-link type="primary" @click="handleView(scope.row)">{{ scope.row.reportCode }}</el-link>
         </template>
       </el-table-column>
-      <el-table-column label="计划名称" align="left" prop="planName" min-width="150" show-overflow-tooltip />
-      <el-table-column label="归属区域" align="center" prop="areaName" width="120" />
+      <el-table-column label="计划名称" align="left" prop="planName" min-width="120" show-overflow-tooltip />
+      <el-table-column label="归属区域" align="center" prop="areaName" width="180" />
       <el-table-column label="计划类型" align="center" width="100">
         <template slot-scope="scope">
           <el-tag :style="{ backgroundColor: getPlanTypeColor(scope.row.planType), borderColor: getPlanTypeColor(scope.row.planType) }"
@@ -84,8 +84,17 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="执行时间" align="center" prop="executeTime" width="150" />
-      <el-table-column label="完成时间" align="center" prop="finishTime" width="150" />
+      <el-table-column label="执行时间" align="center" prop="executeTime" width="150">
+        <template slot-scope="scope">
+          <span>{{ formatShortTime(scope.row.executeTime) }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="完成时间" align="center" prop="finishTime" width="150">
+        <template slot-scope="scope">
+          <span>{{ formatShortTime(scope.row.finishTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">
@@ -245,7 +254,16 @@ export default {
         params.endTime = this.dateRange[1]
       }
       this.download('/ems/inspection/report/export', params, `inspection_report_${new Date().getTime()}.xlsx`)
-    }
+    },
+
+    formatShortTime(time) {
+      if (!time) return '';
+      // 如果是标准的 yyyy-MM-dd HH:mm:ss 格式,直接截取前16位即可
+      if (typeof time === 'string' && time.length >= 16) {
+        return time.substring(0, 16);
+      }
+      return time;
+    },
   }
 }
 </script>