@@ -16,7 +16,7 @@ export const useDeviceStore = defineStore('devices', () => {
|
|||||||
try {
|
try {
|
||||||
const response = await getDevicetList(query);
|
const response = await getDevicetList(query);
|
||||||
console.log('获取设备列表:', response);
|
console.log('获取设备列表:', response);
|
||||||
deviceList.value = response.data;
|
deviceList.value = response.rows;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('获取设备列表失败', error);
|
console.error('获取设备列表失败', error);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,9 +7,9 @@
|
|||||||
<el-form-item label="报警编号" prop="alarmCode">
|
<el-form-item label="报警编号" prop="alarmCode">
|
||||||
<el-input v-model="queryParams.alarmCode" placeholder="请输入报警编号" clearable @keyup.enter="handleQuery" />
|
<el-input v-model="queryParams.alarmCode" placeholder="请输入报警编号" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="设备选择" prop="userName">
|
<el-form-item label="设备选择" prop="deviceId">
|
||||||
<el-select v-model="queryParams.userName" placeholder="请选择" clearable style="width: 160px">
|
<el-select v-model="queryParams.deviceId" placeholder="请选择" clearable style="width: 160px">
|
||||||
<el-option label="绑定的设备" :value="0" />
|
<el-option v-for="item in deviceInfo" :key="item.id || item.code" :label="item.name" :value="item.id" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="报警时间" prop="queryTime">
|
<el-form-item label="报警时间" prop="queryTime">
|
||||||
@@ -260,8 +260,21 @@ const submitForm = async () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
//获取设备名称-搜索_设备选择
|
||||||
|
const deviceInfo = ref([]);
|
||||||
|
const getDeviceName = async () => {
|
||||||
|
try {
|
||||||
|
await getdeviceList();
|
||||||
|
deviceInfo.value = deviceList.value;
|
||||||
|
console.log('设备列表:', deviceInfo.value);
|
||||||
|
} catch (error) {
|
||||||
|
proxy?.$modal.msgError('获取设备列表失败');
|
||||||
|
}
|
||||||
|
// const res = await getdeviceList();
|
||||||
|
// deviceInfo.value = res?.rows;
|
||||||
|
};
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
getList();
|
getList();
|
||||||
getdeviceList();
|
getDeviceName();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
<div v-show="showSearch" class="mb-[10px]">
|
<div v-show="showSearch" class="mb-[10px]">
|
||||||
<el-card shadow="hover">
|
<el-card shadow="hover">
|
||||||
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
||||||
<el-form-item label="设备选择" prop="userName">
|
<el-form-item label="设备选择" prop="deviceId">
|
||||||
<el-select v-model="queryParams.userName" placeholder="请选择" clearable style="width: 160px">
|
<el-select v-model="queryParams.deviceId" placeholder="请选择" clearable style="width: 160px">
|
||||||
<el-option label="绑定的设备" :value="0" />
|
<el-option v-for="item in deviceInfo" :key="item.id || item.code" :label="item.name" :value="item.id" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="报警编号" prop="alarmCode">
|
<el-form-item label="报警编号" prop="alarmCode">
|
||||||
@@ -91,6 +91,11 @@ import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/fileList/
|
|||||||
import { download } from '@/utils/request';
|
import { download } from '@/utils/request';
|
||||||
import { onBeforeRouteLeave } from 'vue-router';
|
import { onBeforeRouteLeave } from 'vue-router';
|
||||||
//import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
|
//import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
|
||||||
|
import { useDeviceStore } from '@/store/modules/equipmentList';
|
||||||
|
import { storeToRefs } from 'pinia';
|
||||||
|
const deviceStore = useDeviceStore();
|
||||||
|
const { deviceList } = storeToRefs(deviceStore);
|
||||||
|
const { getdeviceList } = deviceStore;
|
||||||
|
|
||||||
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
||||||
|
|
||||||
@@ -272,6 +277,23 @@ onBeforeRouteLeave(() => {
|
|||||||
dialog.visible = false;
|
dialog.visible = false;
|
||||||
monitorVideoUrl.value = '';
|
monitorVideoUrl.value = '';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//获取设备名称-搜索_设备选择
|
||||||
|
const deviceInfo = ref([]);
|
||||||
|
const getDeviceName = async () => {
|
||||||
|
try {
|
||||||
|
await getdeviceList();
|
||||||
|
deviceInfo.value = deviceList.value;
|
||||||
|
console.log('设备列表:', deviceInfo.value);
|
||||||
|
} catch (error) {
|
||||||
|
proxy?.$modal.msgError('获取设备列表失败');
|
||||||
|
}
|
||||||
|
// const res = await getdeviceList();
|
||||||
|
// deviceInfo.value = res?.rows;
|
||||||
|
};
|
||||||
|
onMounted(() => {
|
||||||
|
getDeviceName();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|||||||
Reference in New Issue
Block a user