diff --git a/src/api/report/temperatureHistory.js b/src/api/report/temperatureHistory.js index 1049d42..6c2fdea 100644 --- a/src/api/report/temperatureHistory.js +++ b/src/api/report/temperatureHistory.js @@ -42,3 +42,12 @@ export function delTemperatureHistory(objId) { method: 'delete' }) } + +//测温记录折线图 +export function getTestTemp(data) { + return request({ + url: '/report/temperatureHistory/testTemp', + method: 'post', + data: data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 8a81860..fcc9fb3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -272,6 +272,20 @@ export const dynamicRoutes = [ }, ], }, + { + path: "/report/temperature-record", + component: Layout, + hidden: true, + permissions: ["report:electricalInspection:list"], + children: [ + { + path: "index/:objId(\\d+)", + component: () => import("@/views/report/temperatureRecordReport/tempTest"), + name: "tempTest", + meta: {title: "查看测温报表曲线", activeMenu: "/report/temperatureTest"}, + }, + ], + }, { path: "/base/bom-info", component: Layout, diff --git a/src/views/report/adverseRecordYearOnYear/index.vue b/src/views/report/adverseRecordYearOnYear/index.vue index ff2e953..65e1b1a 100644 --- a/src/views/report/adverseRecordYearOnYear/index.vue +++ b/src/views/report/adverseRecordYearOnYear/index.vue @@ -34,7 +34,9 @@ + width="150" + fixed="left" + > + + { //分页查询 - console.log(response) this.total = response?.total || 0 - this.tableData = response.data + + const totalQSum = (response.data || []).reduce((accumulator, { q_SUM = 0 }) => accumulator + q_SUM, 0); + if (totalQSum > 0){ + response.data.forEach(e =>{ + e.q_rate = (e.q_SUM / totalQSum * 100).toFixed(2) + '%'; + }) + this.tableData = response.data + }else { + this.tableData = response.data + } + this.$refs.chart1.setData({ tooltip: { trigger: 'axis', diff --git a/src/views/report/temperatureRecordReport/index.vue b/src/views/report/temperatureRecordReport/index.vue index eac7641..627f457 100644 --- a/src/views/report/temperatureRecordReport/index.vue +++ b/src/views/report/temperatureRecordReport/index.vue @@ -78,7 +78,13 @@ - + + + diff --git a/src/views/report/temperatureRecordReport/tempTest.vue b/src/views/report/temperatureRecordReport/tempTest.vue new file mode 100644 index 0000000..98f8fff --- /dev/null +++ b/src/views/report/temperatureRecordReport/tempTest.vue @@ -0,0 +1,116 @@ + + +