zhangwenya před 9 měsíci
rodič
revize
ce7533c2de

+ 14 - 6
src/views/ms/mstpl/component/indicatorManger.vue

@@ -19,15 +19,15 @@
           </template>
         </el-table-column>
         <el-table-column label="指标编码" align="left" prop="metricsCode" width="160"/>
-        <el-table-column label="告警-低" align="left" width="80">
+        <el-table-column label="告警-低" align="center" width="80">
           <template #default="scope">
             <span v-if="editRow.indexOf(scope.row.metricsId) === -1">
               {{ scope.row.alarmLow }}
             </span>
-            <el-input v-model="scope.row.alarmLow" v-else size="small"/>
+            <el-input v-model="scope.row.alarmLow" v-else size="small" />
           </template>
         </el-table-column>
-        <el-table-column label="告警-中" align="left" width="80">
+        <el-table-column label="告警-中" align="center" width="80">
           <template #default="scope">
             <span v-if="editRow.indexOf(scope.row.metricsId) === -1">
               {{ scope.row.alarmMid }}
@@ -35,7 +35,7 @@
             <el-input v-model="scope.row.alarmMid" v-else size="small"/>
           </template>
         </el-table-column>
-        <el-table-column label="告警-高" align="left" width="80">
+        <el-table-column label="告警-高" align="center" width="80">
           <template #default="scope">
             <span v-if="editRow.indexOf(scope.row.metricsId) === -1">
               {{ scope.row.alarmHigh }}
@@ -43,6 +43,14 @@
             <el-input v-model="scope.row.alarmHigh" v-else size="small"/>
           </template>
         </el-table-column>
+        <el-table-column label="健康事件" align="center" width="80">
+          <template #default="scope">
+            <span v-if="editRow.indexOf(scope.row.metricsId) === -1">
+              {{ scope.row.event }}
+            </span>
+            <el-input v-model="scope.row.event" v-else size="small"/>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
           <template #default="scope">
             <el-button link type="primary" icon="Edit" @click="handleEdit(scope.row)" v-if="editRow.indexOf(scope.row.metricsId) === -1">
@@ -62,13 +70,13 @@
           :total="total"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
-          @pagination="getSelectDetails()"
+          @pagination="getSelectDetails(null)"
       />
     </el-col>
   </el-row>
 
   <!-- 添加或修改指标模板对话框 -->
-  <el-dialog title="新增指标" v-model="open" width="1000" append-to-body>
+  <el-dialog title="新增指标" v-model="open" width="1100" append-to-body>
     <div>
       <el-form :model="adParams" ref="queryRef" :inline="true" label-width="0"  @submit.native.prevent>
         <el-form-item label="" prop="metricsName" style="margin-right:10px">

+ 1 - 1
src/views/ms/mstpl/index.vue

@@ -61,7 +61,7 @@
     />
 
     <!-- 添加或修改指标模板对话框 -->
-    <el-dialog :title="title" v-model="open" :width="dialogType === 'add' ? 500 : 1200" append-to-body>
+    <el-dialog :title="title" v-model="open" :width="dialogType === 'add' ? 500 : 1100" append-to-body>
       <el-form ref="tplRef" :model="form" :rules="rules" label-width="80px" v-if="dialogType === 'add'">
         <el-form-item label="模板名称" prop="tplName">
           <el-input v-model="form.tplName" placeholder="请输入模板名称"/>

+ 7 - 7
src/views/obj/obj/component/runMetricsInfo.vue

@@ -22,14 +22,14 @@
       </template>
     </el-table-column>
     <el-table-column label="指标名称" align="left" prop="metricsName" />
-    <el-table-column label="指标编码" align="left" prop="metricsCode" />
-    <el-table-column label="指标当前值" align="left" prop="dvalue" />
+    <el-table-column label="指标编码" align="left" prop="metricsCode" width="120"/>
+    <el-table-column label="指标当前值" align="left" prop="dvalue" width="120"/>
 <!--    <el-table-column label="告警规则" align="left" prop="alarmRule" />-->
-    <el-table-column label="更新时间" align="left" prop="updateTime" width="180">
-      <template #default="scope">
-        <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span>
-      </template>
-    </el-table-column>
+<!--    <el-table-column label="更新时间" align="left" prop="updateTime" width="180">-->
+<!--      <template #default="scope">-->
+<!--        <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span>-->
+<!--      </template>-->
+<!--    </el-table-column>-->
     <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
       <template #default="scope">
         <el-button link type="primary" icon="DataLine" @click="metricsEcharts(scope.row)">指标趋势</el-button>