lv.wenbin vor 10 Monaten
Ursprung
Commit
0d62d9e45d

+ 15 - 49
ems-ui/src/views/alarm/alarm-info/index.vue

@@ -1,48 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="园区代码" prop="areaCode">
-        <el-input
-            v-model="queryParams.areaCode"
-            placeholder="请输入园区代码"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="对象类型" prop="objType">
-        <el-select v-model="queryParams.objType" placeholder="请选择对象类型" clearable>
-          <el-option
-              v-for="dict in dict.type.obj_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-          />
+      <el-form-item label="所属服务区" prop="areaCode" label-width="100ox">
+        <el-select v-model="queryParams.areaCode"  >
+          <el-option v-for="item in areaOptions" :label="item.label" :value="item.id" :key="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="对象代码" prop="objCode">
-        <el-input
-            v-model="queryParams.objCode"
-            placeholder="请输入对象代码"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="告警代码" prop="alarmCode">
-        <el-input
-            v-model="queryParams.alarmCode"
-            placeholder="请输入告警代码"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="告警描述" prop="alarmMsg">
-        <el-input
-            v-model="queryParams.alarmMsg"
-            placeholder="请输入告警描述"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="告警类型" prop="alarmType">
         <el-select v-model="queryParams.alarmType" placeholder="请选择告警类型" clearable>
           <el-option
@@ -131,8 +95,7 @@
 
     <el-table v-loading="loading" :data="alarmInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
-      <el-table-column label="园区代码" align="center" prop="areaCode" />
+      <el-table-column label="园区代码" align="left" prop="areaCode" />
       <el-table-column label="子系统" align="center" prop="subSystemName" />
       <el-table-column label="对象类型" align="center" prop="objType">
         <template slot-scope="scope">
@@ -140,14 +103,9 @@
         </template>
       </el-table-column>
       <el-table-column label="对象代码" align="center" prop="objCode" />
-      <el-table-column label="告警日期" align="center" prop="alarmDate" width="180">
+      <el-table-column label="告警时间" align="center" prop="alarmDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.alarmDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="告警时间" align="center" prop="alarmTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.alarmTime, '{hh}:{mm}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.alarmDate, '{y}-{m}-{d}') +" "+ parseTime(scope.row.alarmTime, '{hh}:{mm}:{s}')}}</span>
         </template>
       </el-table-column>
       <el-table-column label="告警代码" align="center" prop="alarmCode" />
@@ -267,6 +225,7 @@
 import { listSubsystem } from '@/api/adapter/subsystem';
 import { addAlarmInfo, delAlarmInfo, getAlarmInfo, listAlarmInfo, updateAlarmInfo } from '@/api/alarm/alarm-info';
 import dayjs from 'dayjs';
+import { areaTreeSelect } from '@/api/basecfg/area'
 
 export default {
   name: 'Alarm-info',
@@ -292,6 +251,7 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
+      areaOptions: undefined,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -361,6 +321,7 @@ export default {
     };
   },
   created() {
+    this.getAreaTree("Area");
     this.getList();
     this.getSubList();
   },
@@ -474,6 +435,11 @@ export default {
         ...this.queryParams,
       }, `alarm-info_${new Date().getTime()}.xlsx`);
     },
+    getAreaTree(tier) {
+      areaTreeSelect(tier).then(response => {
+        this.areaOptions = response.data;
+      });
+    }
   },
 };
 </script>

+ 3 - 4
ems-ui/src/views/alarm/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="策略名称" prop="policyName">
         <el-input
           v-model="queryParams.policyName"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="告警对象类型" prop="alarmObjType">
+      <el-form-item label="对象类型" prop="alarmObjType">
         <el-select v-model="queryParams.alarmObjType" placeholder="请选择告警对象类型" clearable>
           <el-option
             v-for="dict in dict.type.obj_type"
@@ -91,8 +91,7 @@
 
     <el-table v-loading="loading" :data="alarmList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
-      <el-table-column label="策略代码" align="center" prop="policyCode" />
+      <el-table-column label="策略代码" align="left" prop="policyCode" />
       <el-table-column label="策略名称" align="center" prop="policyName" />
       <el-table-column label="告警对象类型" align="center" prop="alarmObjType">
         <template slot-scope="scope">

+ 3 - 3
ems-ui/src/views/basecfg/device/index.vue

@@ -106,10 +106,10 @@
 
         <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column label="设备名称" align="center" prop="deviceName"/>
-          <el-table-column label="归属区域" align="left" prop="areaPath"/>
+          <el-table-column label="设备名称" align="left" prop="deviceName"/>
+          <el-table-column label="设备代码" align="left" prop="deviceCode" width="180px"/>
+          <el-table-column label="归属区域" align="left" prop="areaPath" width="280px"/>
           <el-table-column label="归属设施" align="center" prop="refFacsName"/>
-          <el-table-column label="设备代码" align="center" prop="deviceCode"/>
           <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
           <el-table-column label="所属子系统" align="center" prop="subsystemName"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

+ 2 - 2
ems-ui/src/views/devmgr/state/index.vue

@@ -55,15 +55,15 @@
 
         <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
           <el-table-column label="设备名称" align="left" prop="deviceName"/>
-          <el-table-column label="归属区域" align="left" prop="areaPath" width="200px"/>
+          <el-table-column label="归属区域" align="left" prop="areaPath" width="280px"/>
           <el-table-column label="归属设施" align="center" prop="refFacsName"/>
           <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
+          <el-table-column label="子系统" align="center" prop="subsystemName"/>
           <el-table-column label="设备状态" align="center" prop="deviceStatus">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_device_stat" :value="scope.row.deviceStatus"/>
             </template>
           </el-table-column>
-          <el-table-column label="子系统" align="center" prop="subsystemName"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text"  @click="handleDetail(scope.row)">详情</el-button>

+ 8 - 25
ems-ui/src/views/task/ManualInspection.vue

@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="任务代码" prop="taskCode">
-        <el-input
-            v-model="queryParams.taskCode"
-            placeholder="请输入任务代码"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="任务名称" prop="taskName">
         <el-input
             v-model="queryParams.taskName"
@@ -35,7 +27,7 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="巡检对象" prop="objType">
+      <el-form-item label="对象类型" prop="objType">
         <el-select v-model="queryParams.objType" placeholder="请选择巡检对象" clearable>
           <el-option
               v-for="dict in dict.type.obj_type"
@@ -45,14 +37,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="对象名称" prop="objName">
-        <el-input
-            v-model="queryParams.objName"
-            placeholder="请输入对象名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </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>
@@ -111,14 +95,14 @@
 
     <el-table v-loading="loading" :data="inspectionTaskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
-      <el-table-column label="任务代码" align="center" prop="taskCode" />
-      <el-table-column label="任务名称" align="center" prop="taskName" />
-      <el-table-column label="任务状态" align="center" prop="taskStatus">
+      <el-table-column label="任务代码" align="left" prop="taskCode" width="160px"/>
+      <el-table-column label="任务名称" align="left" prop="taskName" />
+      <el-table-column label="巡检对象" align="center" prop="objName" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.task_status" :value="scope.row.taskStatus" />
+          <span><dict-tag :options="dict.type.obj_type" :value="scope.row.objType" />{{ "-" + scope.row.objName}}</span>
         </template>
       </el-table-column>
+
       <el-table-column label="开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
@@ -130,12 +114,11 @@
         </template>
       </el-table-column>
       <el-table-column label="执行人" align="center" prop="executor" />
-      <el-table-column label="巡检对象" align="center" prop="objType">
+      <el-table-column label="任务状态" align="center" prop="taskStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.obj_type" :value="scope.row.objType" />
+          <dict-tag :options="dict.type.task_status" :value="scope.row.taskStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="对象名称" align="center" prop="objName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-info" @click="handleInspection(scope.row)" v-hasPermi="['ems:inspection-task:edit']">

+ 1 - 2
ems-ui/src/views/task/report/index.vue

@@ -85,8 +85,7 @@
 
     <el-table v-loading="loading" :data="inspectionReportList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
-      <el-table-column label="任务代码" align="center" prop="taskCode" />
+      <el-table-column label="任务代码" align="left" prop="taskCode" />
       <el-table-column label="结果状态" align="center" prop="resultStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.inspection_result" :value="scope.row.resultStatus" />