diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue index b0b1b40..1299d5e 100644 --- a/src/views/laboratory/data/list.vue +++ b/src/views/laboratory/data/list.vue @@ -25,6 +25,7 @@ const user = useUserStore() // 用户信息 const $router = useRouter() +const $route = useRoute() const loadingTable = ref(false) const listMap = { temperatureHumidityList: ref([]), // 温湿度网络传感器 @@ -147,7 +148,7 @@ const listQuery: Ref = ref({ deptId: '', // 负责部门id（西昌组织下拉选择） deviceName: '', // 设备名称 - deviceNo: '', // 设备编号 + deviceNo: $route.query.deviceNo || '', // 设备编号 labName: user.lab, // 所属实验室 startResistance: undefined, // 起始内阻 endResistance: undefined, // 结束内阻 @@ -201,6 +202,8 @@ window.sessionStorage.setItem(buttonBoxActive, val) checkoutList.value = [] // clearList() + console.log('000111222') + fetchData() if (normalTableRef.value) { normalTableRef.value!.clearMulti() // 清除多选选中 @@ -336,10 +339,35 @@ listQuery.value.uploadEndTime = '' } }) -const $route = useRoute() onMounted(async () => { listQuery.value.deviceNo = $route.query.deviceNo ? $route.query.deviceNo as string : '' - fetchData(false) + if ($route.query.deviceTypeName === '烟雾报警器') { + currentMenu.value = 'smoke' // 当前选中的菜单 + currentIndex.value = 3 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === '温湿度网络传感器') { + currentMenu.value = 'temperatureHumidity' // 当前选中的菜单 + currentIndex.value = 0 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === '智能电量仪') { + currentMenu.value = 'electricQuantity' // 当前选中的菜单 + currentIndex.value = 1 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === '氧气传感器') { + currentMenu.value = 'oxygen' // 当前选中的菜单 + currentIndex.value = 2 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === 'UPS电源') { + currentMenu.value = 'ups' // 当前选中的菜单 + currentIndex.value = 4// 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === 'UPS检测') { + currentMenu.value = 'ups/monitor' // 当前选中的菜单 + currentIndex.value = 5// 当前选中的菜单索引 + } + // setTimeout(() => { + // fetchData() + // }, 3000) }) diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue index b0b1b40..1299d5e 100644 --- a/src/views/laboratory/data/list.vue +++ b/src/views/laboratory/data/list.vue @@ -25,6 +25,7 @@ const user = useUserStore() // 用户信息 const $router = useRouter() +const $route = useRoute() const loadingTable = ref(false) const listMap = { temperatureHumidityList: ref([]), // 温湿度网络传感器 @@ -147,7 +148,7 @@ const listQuery: Ref = ref({ deptId: '', // 负责部门id（西昌组织下拉选择） deviceName: '', // 设备名称 - deviceNo: '', // 设备编号 + deviceNo: $route.query.deviceNo || '', // 设备编号 labName: user.lab, // 所属实验室 startResistance: undefined, // 起始内阻 endResistance: undefined, // 结束内阻 @@ -201,6 +202,8 @@ window.sessionStorage.setItem(buttonBoxActive, val) checkoutList.value = [] // clearList() + console.log('000111222') + fetchData() if (normalTableRef.value) { normalTableRef.value!.clearMulti() // 清除多选选中 @@ -336,10 +339,35 @@ listQuery.value.uploadEndTime = '' } }) -const $route = useRoute() onMounted(async () => { listQuery.value.deviceNo = $route.query.deviceNo ? $route.query.deviceNo as string : '' - fetchData(false) + if ($route.query.deviceTypeName === '烟雾报警器') { + currentMenu.value = 'smoke' // 当前选中的菜单 + currentIndex.value = 3 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === '温湿度网络传感器') { + currentMenu.value = 'temperatureHumidity' // 当前选中的菜单 + currentIndex.value = 0 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === '智能电量仪') { + currentMenu.value = 'electricQuantity' // 当前选中的菜单 + currentIndex.value = 1 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === '氧气传感器') { + currentMenu.value = 'oxygen' // 当前选中的菜单 + currentIndex.value = 2 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === 'UPS电源') { + currentMenu.value = 'ups' // 当前选中的菜单 + currentIndex.value = 4// 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === 'UPS检测') { + currentMenu.value = 'ups/monitor' // 当前选中的菜单 + currentIndex.value = 5// 当前选中的菜单索引 + } + // setTimeout(() => { + // fetchData() + // }, 3000) }) diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue index 51fbbce..09de96d 100644 --- a/src/views/laboratory/equipment/list/list.vue +++ b/src/views/laboratory/equipment/list/list.vue @@ -146,7 +146,7 @@ } // 操作 -const handleEdit = (row: IList, val: string) => { +const handleEdit = (row: any, val: string) => { switch (val) { case 'delete': ElMessageBox.confirm( @@ -182,6 +182,8 @@ path: '/labData', query: { deviceNo: row.deviceNo, + deviceTypeName: row.deviceTypeName, + deviceType: row.deviceType, }, }) break diff --git a/src/views/laboratory/data/list.vue b/src/views/laboratory/data/list.vue index b0b1b40..1299d5e 100644 --- a/src/views/laboratory/data/list.vue +++ b/src/views/laboratory/data/list.vue @@ -25,6 +25,7 @@ const user = useUserStore() // 用户信息 const $router = useRouter() +const $route = useRoute() const loadingTable = ref(false) const listMap = { temperatureHumidityList: ref([]), // 温湿度网络传感器 @@ -147,7 +148,7 @@ const listQuery: Ref = ref({ deptId: '', // 负责部门id（西昌组织下拉选择） deviceName: '', // 设备名称 - deviceNo: '', // 设备编号 + deviceNo: $route.query.deviceNo || '', // 设备编号 labName: user.lab, // 所属实验室 startResistance: undefined, // 起始内阻 endResistance: undefined, // 结束内阻 @@ -201,6 +202,8 @@ window.sessionStorage.setItem(buttonBoxActive, val) checkoutList.value = [] // clearList() + console.log('000111222') + fetchData() if (normalTableRef.value) { normalTableRef.value!.clearMulti() // 清除多选选中 @@ -336,10 +339,35 @@ listQuery.value.uploadEndTime = '' } }) -const $route = useRoute() onMounted(async () => { listQuery.value.deviceNo = $route.query.deviceNo ? $route.query.deviceNo as string : '' - fetchData(false) + if ($route.query.deviceTypeName === '烟雾报警器') { + currentMenu.value = 'smoke' // 当前选中的菜单 + currentIndex.value = 3 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === '温湿度网络传感器') { + currentMenu.value = 'temperatureHumidity' // 当前选中的菜单 + currentIndex.value = 0 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === '智能电量仪') { + currentMenu.value = 'electricQuantity' // 当前选中的菜单 + currentIndex.value = 1 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === '氧气传感器') { + currentMenu.value = 'oxygen' // 当前选中的菜单 + currentIndex.value = 2 // 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === 'UPS电源') { + currentMenu.value = 'ups' // 当前选中的菜单 + currentIndex.value = 4// 当前选中的菜单索引 + } + else if ($route.query.deviceTypeName === 'UPS检测') { + currentMenu.value = 'ups/monitor' // 当前选中的菜单 + currentIndex.value = 5// 当前选中的菜单索引 + } + // setTimeout(() => { + // fetchData() + // }, 3000) }) diff --git a/src/views/laboratory/equipment/list/list.vue b/src/views/laboratory/equipment/list/list.vue index 51fbbce..09de96d 100644 --- a/src/views/laboratory/equipment/list/list.vue +++ b/src/views/laboratory/equipment/list/list.vue @@ -146,7 +146,7 @@ } // 操作 -const handleEdit = (row: IList, val: string) => { +const handleEdit = (row: any, val: string) => { switch (val) { case 'delete': ElMessageBox.confirm( @@ -182,6 +182,8 @@ path: '/labData', query: { deviceNo: row.deviceNo, + deviceTypeName: row.deviceTypeName, + deviceType: row.deviceType, }, }) break diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue index ba6bd89..939effb 100644 --- a/src/views/system/fileConfiguration/addDDialog.vue +++ b/src/views/system/fileConfiguration/addDDialog.vue @@ -114,8 +114,21 @@ ElMessage.warning('文件名长度超出最大限制') return } + let params + const systemTitle = JSON.parse(window.localStorage.getItem('currentSys')!).name + if (systemTitle === '实验室环境监控系统') { + params = { + ...ruleForm.value, + systemType: '3', + } + } + else { + params = { + ...ruleForm.value, + } + } if (title.value === '新增') { - addeFileListPage(ruleForm.value).then((res) => { + addeFileListPage(params).then((res) => { ElMessage({ type: 'success', message: '添加成功', @@ -124,7 +137,7 @@ }) } else { - updateFileListPage(ruleForm.value).then((res) => { + updateFileListPage(params).then((res) => { ElMessage({ type: 'success', message: '修改成功',