diff --git a/frontend/src/api/check/test/index.ts b/frontend/src/api/check/test/index.ts index a14cd62..105b40f 100644 --- a/frontend/src/api/check/test/index.ts +++ b/frontend/src/api/check/test/index.ts @@ -87,7 +87,7 @@ export const changeErrorSystem = (params: { deviceId: string, code: string }) => { - return http.post("/result/changeErrorSystem", params, {loading: false}); + return http.post("/result/changeErrorSystem", params, {loading: true}); } /** diff --git a/frontend/src/api/device/device/index.ts b/frontend/src/api/device/device/index.ts index fe584ad..4d276d0 100644 --- a/frontend/src/api/device/device/index.ts +++ b/frontend/src/api/device/device/index.ts @@ -1,4 +1,4 @@ -import type { Device } from '@/api/device/interface/device' +import type {Device} from '@/api/device/interface/device' import http from '@/api' /** @@ -7,57 +7,65 @@ import http from '@/api' //获取被检设备 export const getPqDevList = (params: Device.ReqPqDevParams) => { - return http.post(`/pqDev/list`, params) + return http.post(`/pqDev/list`, params) } //添加被检设备 export const addPqDev = (params: Device.ResPqDev) => { - return http.post(`/pqDev/add`, params) + return http.post(`/pqDev/add`, params) } //编辑被检设备 export const updatePqDev = (params: Device.ResPqDev) => { - return http.post(`/pqDev/update`, params) + return http.post(`/pqDev/update`, params) } //删除被检设备 export const deletePqDev = (params: string[]) => { - return http.post(`/pqDev/delete`, params) + return http.post(`/pqDev/delete`, params) } -// export const downloadTemplate = () => { -// return http.download(`/pqDev/downloadTemplate`) +//导出被检设备 +export const exportPqDev = (params: Device.ReqPqDevParams) => { + return http.download(`/pqDev/export`, params) +} +// 下载导入文件模板 +export const downloadTemplate = () => { + return http.download(`/pqDev/downloadTemplate`) +} + +//导入被检设备 +export const importPqDev = (params: Device.ReqPqDevParams) => { + return http.uploadExcel(`/pqDev/import`, params) +} + +//导入比对式被检设备 +export const importContrastPqDev = (params: Device.ReqPqDevParams) => { + return http.upload(`/pqDev/importContrast`, params) +} + +// //导出灿能二楼设备 +// export const exportCNDev = (params: Device.ReqPqDevParams) => { +// return http.download(`/pqDev/exportCNDev`, params) +// } +// +// // 下载灿能二楼设备导入文件模板 +// export const downloadCNDevTemplate = () => { +// return http.download(`/pqDev/downloadCNDevTemplate`) +// } +// +// //导入灿能二楼设备 +// export const importCNDev = (params: Device.ReqPqDevParams) => { +// return http.uploadExcel(`/pqDev/importCNDev`, params) // } -// //导入被检设备(比对) -// export const importPqDev=(params: Device.ReqPqDevParams)=>{ -// return http.upload(`/pqDev/import`, params) -// } -// //导入比对式被检设备 -// export const importContrastPqDev=(params: Device.ReqPqDevParams)=>{ -// return http.upload(`/pqDev/importContrast`, params) -// } -//导出灿能二楼设备 -export const exportCNDev = (params: Device.ReqPqDevParams) => { - return http.download(`/pqDev/exportCNDev`, params) -} - -// 下载灿能二楼设备导入文件模板 -export const downloadCNDevTemplate = () => { - return http.download(`/pqDev/downloadCNDevTemplate`) -} - -//导入灿能二楼设备 -export const importCNDev = (params: Device.ReqPqDevParams) => { - return http.uploadExcel(`/pqDev/importCNDev`, params) -} //根据设备类型决定(电源、icd、模板、通道数、额定电压、额定电流); export const getPqDev = () => { - return http.get(`/devType/listAll`) + return http.get(`/devType/listAll`) } //被检设备归档 export const documentedPqDev = (ids: string[]) => { - return http.post(`/pqDev/documented`, ids) + return http.post(`/pqDev/documented`, ids) } diff --git a/frontend/src/api/user/login/index.ts b/frontend/src/api/user/login/index.ts index f663338..12aa883 100644 --- a/frontend/src/api/user/login/index.ts +++ b/frontend/src/api/user/login/index.ts @@ -38,3 +38,8 @@ export const refreshToken = () => { ) } +//获取场景 +export const getCurrentScene = () => { + return http.get('/admin/getCurrentScene', {}, { loading: false }) +} + diff --git a/frontend/src/views/home/tabs/model.vue b/frontend/src/views/home/tabs/model.vue index f4b165c..b9ab99c 100644 --- a/frontend/src/views/home/tabs/model.vue +++ b/frontend/src/views/home/tabs/model.vue @@ -52,6 +52,7 @@ import { ElMessage } from "element-plus"; import { useAuthStore } from "@/stores/modules/auth"; import { useModeStore, useAppSceneStore } from "@/stores/modules/mode"; // 引入模式 store import { ref } from "vue"; +import {getCurrentScene} from "@/api/user/login"; const authStore = useAuthStore(); const modeStore = useModeStore(); // 使用模式 store const AppSceneStore = useAppSceneStore(); @@ -82,7 +83,9 @@ const modeList = [ ]; const handelOpen = async (item: any) => { modeStore.setCurrentMode(item.code); // 将模式code存入 store - AppSceneStore.setCurrentMode('1');//0:省级平台,1:设备出厂,2:研发自测 + const {data:scene} = await getCurrentScene(); // 获取当前场景 + // AppSceneStore.setCurrentMode(scene+'');//0:省级平台,1:设备出厂,2:研发自测 + AppSceneStore.setCurrentMode('0');//0:省级平台,1:设备出厂,2:研发自测 await authStore.setShowMenu(); return; // if (isActive) { diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue index 715b353..60beb58 100644 --- a/frontend/src/views/machine/device/index.vue +++ b/frontend/src/views/machine/device/index.vue @@ -1,9 +1,9 @@