diff --git a/src/api/lab/asyncdata/index.js b/src/api/lab/asyncdata/index.js new file mode 100644 index 0000000..c67306a --- /dev/null +++ b/src/api/lab/asyncdata/index.js @@ -0,0 +1,8 @@ +import request from '@/config/axios' + +export const asyncLabData = async (params) => { + return await request.get({ + url: `/lab/asynclab/asyncLabData`, + params + }) +} \ No newline at end of file diff --git a/src/api/lab/stretch/stretchthreehundred/index.ts b/src/api/lab/stretch/stretchthreehundred/index.ts index e1b4022..efdd5eb 100644 --- a/src/api/lab/stretch/stretchthreehundred/index.ts +++ b/src/api/lab/stretch/stretchthreehundred/index.ts @@ -113,6 +113,11 @@ export const importTemplate = () => { return request.download({ url: '/lab/stretchthreehundred/get-import-template' }) } +// 查询曲线实验编号列表 +export const getQxSyzbhs = async (syzbh: String) => { + return await request.get({ url: `/lab/stretchthreehundred/getQxSyzbhs?syzbh=` + syzbh }) +} + // 查询曲线图数据 export const getStretchThreeQxInfo = async (syzbh: String) => { return await request.get({ url: `/lab/stretchthreehundred/getStretchThreeQxInfo?syzbh=` + syzbh }) diff --git a/src/api/pszc/pszccommon/index.ts b/src/api/pszc/pszccommon/index.ts new file mode 100644 index 0000000..46b7d00 --- /dev/null +++ b/src/api/pszc/pszccommon/index.ts @@ -0,0 +1,22 @@ +import request from '@/config/axios' + +// 动态获取下拉数据 +// flag 1 冷拔-步进炉 ；2 冷拔-固熔炉 ; 3 冷拔-缝式炉 ; 4 冷拔-水表 ; 5 冷拔-智能电表 ; 6 冷拔-穿孔机 ; 7 冷拔-天然气总量 +// type 1 数据点数据 ; 2 仪表数据 +export const selectCdPros = async (params) => { + return await request.get({ url: `/pszccommon/selectCdPros`, params }) +} + +// flag 1 环形加热炉 ；2 穿孔机 ; 3 延伸机 ; 4 定经机 ; 5 热轧水表 +export const selectHr90Pros = async (params) => { + return await request.get({ url: `/pszccommon/selectHr90Pros`, params }) +} + +// flag 1 环形加热炉 ；2 环形加热炉天然气管理 ; 3 穿孔机 ; 4 延伸机 ; 5 定经机 ; 6 热轧水表 +export const selectHr108Pros = async (params) => { + return await request.get({ url: `/pszccommon/selectHr108Pros`, params }) +} + +export const selectHrTrqPros = async (params) => { + return await request.get({ url: `/pszccommon/selectHrTrqPros`, params }) +} \ No newline at end of file diff --git a/src/api/tjanalysis/index.ts b/src/api/tjanalysis/index.ts index f37559b..450548c 100644 --- a/src/api/tjanalysis/index.ts +++ b/src/api/tjanalysis/index.ts @@ -25,3 +25,22 @@ export const queryNatgasdatatotal = async (params) => { return await request.get({ url: `/tjanalysis/queryNatgasdatatotal`, params }) } +// 智能报表统计 +export const queryElectricdataAllTj = async (params) => { + return await request.get({ url: `/tjanalysis/queryElectricdataAllTj`, params }) +} + +// 导出智能报表 +export const exportElectricdataAllTj = async (params) => { + return await request.download({ url: `/tjanalysis/exportElectricdataAllTj`, params}) +} + +// 热轧天然气数据日统计报表 +export const queryNatgasdataDay = async (params) => { + return await request.get({ url: `/tjanalysis/queryNatgasdataDay`, params}) +} + +// 智能水表数据日统计表 +export const queryWaterDay = async (params) => { + return await request.get({ url: `/tjanalysis/queryWaterDay`, params}) +} diff --git a/src/components/Qxview/src/QxviewThree.vue b/src/components/Qxview/src/QxviewThree.vue index 3257b03..650bb94 100644 --- a/src/components/Qxview/src/QxviewThree.vue +++ b/src/components/Qxview/src/QxviewThree.vue @@ -1,19 +1,40 @@ @@ -24,17 +45,20 @@ import { formatTime } from '@/utils' import { useUserStore } from '@/store/modules/user' import { useWatermark } from '@/hooks/web/useWatermark' import { pieOptions, barOptions , lineOptions } from './echarts-data' +import * as Stretch300Api from '@/api/lab/stretch/stretchthreehundred' + defineOptions({ name: 'QxviewThree' }) const { t } = useI18n() const userStore = useUserStore() const { setWatermark } = useWatermark() const loading = ref(false) +const sybhList = ref([]) const dialogVisible = ref(false) // 弹窗的是否展示 const lineOptionsData = reactive(lineOptions) as EChartsOption -const open = (vData , title) => { - console.log(vData) +const open = (bhList , vData , title) => { + sybhList.value = bhList initData(vData , title) loading.value = false dialogVisible.value = true @@ -42,6 +66,14 @@ const open = (vData , title) => { defineExpose({ open }) // 提供 open 方法，用于打开弹窗 +const changeData = async (item) => { + const data = await Stretch300Api.getStretchThreeQxInfo(item) + if (data != null && data.dataList != null) { + initData(data.dataList , "实验力-位移") + } else { + initData([] , "实验力-位移") + } +} // 初始化曲线数据 const initData = async (datas , title) => { if (datas != null) { diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue index 28f796b..553250b 100644 --- a/src/layout/components/Message/src/Message.vue +++ b/src/layout/components/Message/src/Message.vue @@ -33,14 +33,14 @@ const goMyList = () => { // ========== 初始化 ========= onMounted(() => { // 首次加载小红点 - getUnreadCount() + // getUnreadCount() // 轮询刷新小红点 - setInterval( - () => { - getUnreadCount() - }, - 1000 * 60 * 2 - ) + // setInterval( + // () => { + // getUnreadCount() + // }, + // 1000 * 60 * 2 + // ) }) + diff --git a/src/views/tjanalysis/irealdata/index.vue b/src/views/tjanalysis/irealdata/index.vue index 98d1179..977eef4 100644 --- a/src/views/tjanalysis/irealdata/index.vue +++ b/src/views/tjanalysis/irealdata/index.vue @@ -25,17 +25,17 @@ header-row-style="height: 50px; text-align: center" :span-method="arraySpanMethod" :row-class-name="tableRowClassName" :cell-class-name="tableCellClassName"> - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/views/tjanalysis/natgasdatacd/index.vue b/src/views/tjanalysis/natgasdatacd/index.vue new file mode 100644 index 0000000..bff2d18 --- /dev/null +++ b/src/views/tjanalysis/natgasdatacd/index.vue @@ -0,0 +1,121 @@ + + + + + + diff --git a/src/views/tjanalysis/natgasdatahr/index.vue b/src/views/tjanalysis/natgasdatahr/index.vue new file mode 100644 index 0000000..383fcc3 --- /dev/null +++ b/src/views/tjanalysis/natgasdatahr/index.vue @@ -0,0 +1,120 @@ + + + + + + diff --git a/src/views/tjanalysis/waterday/index.vue b/src/views/tjanalysis/waterday/index.vue new file mode 100644 index 0000000..e24f698 --- /dev/null +++ b/src/views/tjanalysis/waterday/index.vue @@ -0,0 +1,125 @@ + + + + + +