|  | @@ -50,19 +50,38 @@
 | 
	
		
			
				|  |  |                    />
 | 
	
		
			
				|  |  |                  </el-select>
 | 
	
		
			
				|  |  |                </el-form-item>
 | 
	
		
			
				|  |  | +              <el-form-item label="设备分类" prop="dataType">
 | 
	
		
			
				|  |  | +                  <el-select
 | 
	
		
			
				|  |  | +                    v-model="queryParams.dataType"
 | 
	
		
			
				|  |  | +                    clearable
 | 
	
		
			
				|  |  | +                    label="设备分类"
 | 
	
		
			
				|  |  | +                    placeholder="请选择设备分类"
 | 
	
		
			
				|  |  | +                    prop="dataType"
 | 
	
		
			
				|  |  | +                  >
 | 
	
		
			
				|  |  | +                    <el-option
 | 
	
		
			
				|  |  | +                      v-for="item in alarmTypes"
 | 
	
		
			
				|  |  | +                      :key="item.value"
 | 
	
		
			
				|  |  | +                      :label="item.label"
 | 
	
		
			
				|  |  | +                      :value="item.value">
 | 
	
		
			
				|  |  | +                    </el-option>
 | 
	
		
			
				|  |  | +                  </el-select>
 | 
	
		
			
				|  |  | +              </el-form-item>
 | 
	
		
			
				|  |  |                <el-form-item label="设备类型" prop="deviceTypeList">
 | 
	
		
			
				|  |  |                  <el-select
 | 
	
		
			
				|  |  |                    v-model="queryParams.deviceTypeList"
 | 
	
		
			
				|  |  |                    clearable
 | 
	
		
			
				|  |  |                    multiple
 | 
	
		
			
				|  |  | +                  label="设备类型"
 | 
	
		
			
				|  |  |                    placeholder="请选择设备类型"
 | 
	
		
			
				|  |  | +                  prop="deviceTypeList"
 | 
	
		
			
				|  |  |                  >
 | 
	
		
			
				|  |  |                    <el-option
 | 
	
		
			
				|  |  | -                    v-for="dict in deviceTypeList"
 | 
	
		
			
				|  |  | -                    :key="dict.code"
 | 
	
		
			
				|  |  | -                    :label="dict.name"
 | 
	
		
			
				|  |  | -                    :value="dict.code"
 | 
	
		
			
				|  |  | -                  />
 | 
	
		
			
				|  |  | +                    v-for="item in deviceTypeList"
 | 
	
		
			
				|  |  | +                    v-if="!queryParams.dataType || item.type.indexOf(queryParams.dataType) > -1"
 | 
	
		
			
				|  |  | +                    :key="item.value"
 | 
	
		
			
				|  |  | +                    :label="item.label"
 | 
	
		
			
				|  |  | +                    :value="item.value">
 | 
	
		
			
				|  |  | +                  </el-option>
 | 
	
		
			
				|  |  |                  </el-select>
 | 
	
		
			
				|  |  |                </el-form-item>
 | 
	
		
			
				|  |  |              </el-form>
 | 
	
	
		
			
				|  | @@ -128,7 +147,7 @@
 | 
	
		
			
				|  |  |              <el-table-column label="设备类型" align="center" prop="deviceType" width="150"/>
 | 
	
		
			
				|  |  |              <el-table-column label="告警状态" align="center" prop="stateText" width="150"/>
 | 
	
		
			
				|  |  |              <el-table-column label="最近一次上报时间" align="center" prop="updateTime" width="220"/>
 | 
	
		
			
				|  |  | -            <el-table-column label="上报内容" align="center" prop="info" width="220" show-overflow-tooltip="showOverflowTooltip"/>
 | 
	
		
			
				|  |  | +            <el-table-column label="上报内容" align="center" prop="info" width="220" show-overflow-tooltip />
 | 
	
		
			
				|  |  |              <el-table-column
 | 
	
		
			
				|  |  |                label="操作"
 | 
	
		
			
				|  |  |                align="center"
 | 
	
	
		
			
				|  | @@ -207,6 +226,16 @@ export default {
 | 
	
		
			
				|  |  |        showOverflowTooltip:true,
 | 
	
		
			
				|  |  |        dateRange:[],
 | 
	
		
			
				|  |  |        dataList:[],
 | 
	
		
			
				|  |  | +      alarmTypes:[
 | 
	
		
			
				|  |  | +        {
 | 
	
		
			
				|  |  | +          value: '0',
 | 
	
		
			
				|  |  | +          label: '动环主机类'
 | 
	
		
			
				|  |  | +        },
 | 
	
		
			
				|  |  | +        {
 | 
	
		
			
				|  |  | +          value: '1',
 | 
	
		
			
				|  |  | +          label: '报警主机类'
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +      ],
 | 
	
		
			
				|  |  |        deviceTypeList: [],
 | 
	
		
			
				|  |  |      };
 | 
	
		
			
				|  |  |    },
 | 
	
	
		
			
				|  | @@ -223,8 +252,9 @@ export default {
 | 
	
		
			
				|  |  |          .then((r) => {
 | 
	
		
			
				|  |  |            // 使用 map 而不是 filter 进行数据转换
 | 
	
		
			
				|  |  |            const transformedList = r.map((item) => ({
 | 
	
		
			
				|  |  | -            name: item.name,
 | 
	
		
			
				|  |  | -            code: item.code,
 | 
	
		
			
				|  |  | +            value: item.code,
 | 
	
		
			
				|  |  | +            label: item.name,
 | 
	
		
			
				|  |  | +            type: item.type
 | 
	
		
			
				|  |  |            }));
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |            // 将转换后的数据推送到 this.deviceTypeList
 |