| 
					
				 | 
			
			
				@@ -46,8 +46,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </el-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <el-table v-loading="loading" :data="defList" border> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column label="指标ID" align="center" prop="metricsId" width="80"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-table-column label="指标名称" align="left" prop="metricsName" width="260"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-table-column label="指标分类" align="left" width="200"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-table-column label="指标名称" align="left" prop="metricsName"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-table-column label="指标分类" align="left" width="150"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <template #default="scope"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <span v-for="(item,i) in scope.row.metricsTypes" :key="`${scope.$index}_${item}`"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             {{ item.typeName }}<span v-if="i!==scope.row.metricsTypes.length-1">、</span> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -59,14 +59,13 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <dict-tag :options="metrics_category" :value="scope.row.metricsType"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-table-column> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-table-column label="指标编码" align="left" prop="metricsCode" width="200"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <el-table-column label="指标获取公式" align="left" prop="metricsExp"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-table-column label="指标编码" align="left" prop="metricsCode" width="160"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <el-table-column label="指标获取公式" align="left" prop="metricsExp"  width="300"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column label="更新时间" align="center" 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="remark" width="200"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="200"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <template #default="scope"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['metrics:def:edit']"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -123,10 +122,6 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-form-item label="告警-高" prop="alarmHigh"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-input v-model="form.alarmHigh" placeholder="请输入告警-高数值"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-form-item label="备注" prop="remark"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" show-word-limit maxlength="300" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    :autosize="{minRows: 4, maxRows: 6}"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-form> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <template #footer> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <div class="dialog-footer"> 
			 |