diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts index 7df2528..a1ead4d 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -80,7 +80,7 @@ export const tempRoute: AppRouteRecordRaw = { path: '/tempIndex', name: 'tempIndex', //新版后台登录,如果想要使用旧版登录放开即可 - component: () => import('/@/views/temperature/index.vue'), + component: () => import('/@/views/temperature/app/index.vue'), meta: { title: t('室内温度'), }, diff --git a/src/views/heating/extract/DataExtractConfigList.vue b/src/views/heating/extract/DataExtractConfigList.vue index d17349e..a385e6d 100644 --- a/src/views/heating/extract/DataExtractConfigList.vue +++ b/src/views/heating/extract/DataExtractConfigList.vue @@ -171,7 +171,7 @@ fixed: 'right', }, beforeFetch: async (params) => { - return Object.assign(params, queryParam); + return Object.assign(params, queryParam.value); }, }, exportConfig: { diff --git a/src/views/temperature/Gauge.vue b/src/views/temperature/app/Gauge.vue similarity index 100% rename from src/views/temperature/Gauge.vue rename to src/views/temperature/app/Gauge.vue diff --git a/src/views/temperature/Line.vue b/src/views/temperature/app/Line.vue similarity index 100% rename from src/views/temperature/Line.vue rename to src/views/temperature/app/Line.vue diff --git a/src/views/temperature/index.api.ts b/src/views/temperature/app/index.api.ts similarity index 100% rename from src/views/temperature/index.api.ts rename to src/views/temperature/app/index.api.ts diff --git a/src/views/temperature/index.vue b/src/views/temperature/app/index.vue similarity index 94% rename from src/views/temperature/index.vue rename to src/views/temperature/app/index.vue index 922f624..7f1489f 100644 --- a/src/views/temperature/index.vue +++ b/src/views/temperature/app/index.vue @@ -54,7 +54,7 @@ const TimeFun = () => { }; const getTempDataFn = async () => { - const resData = await findOne({"SDate": currentDate.value}); + const resData = await findOne({"SDate": currentDate.value,"code": "867896071477072"}); gaugeData.value["name"] = "实时温度"; gaugeData.value["value"] = resData.roomTemp; tempDate.value = resData.roomTemp; @@ -63,7 +63,7 @@ const getTempDataFn = async () => { const getTempLineFn = async () => { lineData.value = []; - const resData = await tempList({"SDate": currentDate.value}); + const resData = await tempList({"SDate": currentDate.value,"code": "867896071477072"}); // console.log('列表', resData); lineData.value = resData; }; diff --git a/src/views/temperature/report/Gauge.vue b/src/views/temperature/report/Gauge.vue new file mode 100644 index 0000000..d42c9c4 --- /dev/null +++ b/src/views/temperature/report/Gauge.vue @@ -0,0 +1,143 @@ + + diff --git a/src/views/temperature/report/Line.vue b/src/views/temperature/report/Line.vue new file mode 100644 index 0000000..d38f3e7 --- /dev/null +++ b/src/views/temperature/report/Line.vue @@ -0,0 +1,159 @@ + + diff --git a/src/views/temperature/report/Temperature.api.ts b/src/views/temperature/report/Temperature.api.ts new file mode 100644 index 0000000..fc2ceb8 --- /dev/null +++ b/src/views/temperature/report/Temperature.api.ts @@ -0,0 +1,16 @@ +import {defHttp} from '/@/utils/http/axios'; + +enum Api { + findOne = '/temp/temperature/findOne', + tempList = '/temp/temperature/list', +} + +/** + * 列表接口 + * @param params + */ +export const findOne = (params) => + defHttp.get({url: Api.findOne, params}); + +export const tempList = (params) => + defHttp.get({url: Api.tempList, params}); diff --git a/src/views/temperature/report/TemperatureList.vue b/src/views/temperature/report/TemperatureList.vue new file mode 100644 index 0000000..97ff73c --- /dev/null +++ b/src/views/temperature/report/TemperatureList.vue @@ -0,0 +1,157 @@ + + + + +