From 122faf2b3a03f7ef381d70a38684fe0b70d42ebc Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 12 十二月 2023 22:17:39 +0800
Subject: [PATCH] 图片上传显示bug
---
src/views/smoke/report/components/overallSituation.vue | 119 +++++++++++++++--------------------------------------------
1 files changed, 31 insertions(+), 88 deletions(-)
diff --git a/src/views/smoke/report/components/overallSituation.vue b/src/views/smoke/report/components/overallSituation.vue
index b7ce7bf..0644259 100644
--- a/src/views/smoke/report/components/overallSituation.vue
+++ b/src/views/smoke/report/components/overallSituation.vue
@@ -18,98 +18,47 @@
:data="tableData"
:row-class-name="tableRowClassName"
>
- <el-table-column label="搴忓彿" type="index" width="60px">
+ <el-table-column label="搴忓彿" type="index" width="50">
</el-table-column>
- <el-table-column prop="Locale" label="鐩戞祴鐐�" width="120px">
+ <el-table-column prop="AcquitDate" label="閲囬泦鏃堕棿" width="auto" min-width="20%">
</el-table-column>
- <el-table-column prop="Addr" label="瀹夎鍦板潃" width="180px">
+ <el-table-column prop="Total" label="璁惧鎬绘暟" width="auto" min-width="10%">
</el-table-column>
<el-table-column
- prop="AcquitAtStr"
- label="閲囬泦鏃堕棿"
- width="100px"
+ prop="ComplianceCount"
+ label="杈炬爣鏁�"
+ width="auto" min-width="10%"
>
</el-table-column>
<el-table-column
- prop="FanStatusStr"
- label="椋庢満鐘舵��"
- width="80px"
+ prop="CompliancePercent"
+ label="杈炬爣姣斾緥"
+ width="auto" min-width="10%"
>
</el-table-column>
<el-table-column
- prop="FilterStatusStr"
- label="鍑�鍖栧櫒鐘舵��"
- width="95px"
+ prop="ExceedStandardCount"
+ label="瓒呮爣鏁�"
+ width="auto" min-width="10%"
>
</el-table-column>
<el-table-column
- prop="EmissionsConc"
- label="娌圭儫瀹炴椂娴撳害锛坢g/m3锛�"
- width="110px"
+ prop="ExceedStandardPercent"
+ label="瓒呮爣姣斾緥"
+ width="auto" min-width="10%"
>
</el-table-column>
<el-table-column
- prop="CEmissions"
- label="娌圭儫鎶樼畻娴撳害锛坢g/m3锛�"
- width="110px"
+ prop="OnlineCount"
+ label="鍦ㄧ嚎鏁�"
+ width="auto" min-width="10%"
>
</el-table-column>
<el-table-column
- prop="GranuleConc"
- label="棰楃矑鐗╁疄鏃舵祿搴︼紙mg/m3锛�"
- width="120px"
+ prop="OnlinePercent"
+ label="鍦ㄧ嚎姣斾緥"
+ width="auto" min-width="10%"
>
- </el-table-column>
- <el-table-column
- prop="CGranule"
- label="棰楃矑鐗╂姌绠楁祿搴︼紙mg/m3锛�"
- width="120px"
- >
- </el-table-column>
- <el-table-column
- prop="HydrocarbonConc"
- label="闈炵敳鐑锋�荤儍瀹炴椂娴撳害锛坢g/m3锛�"
- width="160px"
- >
- </el-table-column>
- <el-table-column
- prop="CHydrocarbon"
- label="闈炵敳鐑锋�荤儍鎶樼畻娴撳害锛坢g/m3锛�"
- width="160px"
- >
- </el-table-column>
- <el-table-column prop="StatusStr" label="鎺掓斁鐘舵��" width="80px">
- </el-table-column>
- <el-table-column
- prop="OnlineStatusStr"
- label="鏁翠綋鐘舵��"
- width="80px"
- >
- </el-table-column>
- <el-table-column prop="operation" label="鎿嶄綔" width="550px">
- <template slot-scope="scope">
- <div class="operation">
- <span @click="handleUpload(scope.row)"
- >涓�鐐逛竴妗�</span
- >
- <span class="line">|</span>
- <span @click="handleDispatch(scope.row)"
- >鏌ョ湅姣忓垎閽熸暟鎹�</span
- >
- <span class="line">|</span>
- <span @click="handleLearn(scope.row)"
- >鏌ョ湅10min娴撳害</span
- >
- <span class="line">|</span>
- <span @click="handleNotDeal(scope.row)"
- >鏌ョ湅灏忔椂鎶樼畻娴撳害</span
- >
- <span class="line">|</span>
- <span @click="handleNotDeal(scope.row)"
- >鐩戞祴鐐硅澶囩鐞�</span
- >
- </div>
- </template>
</el-table-column>
</el-table>
</div>
@@ -133,7 +82,7 @@
<script>
import MyHeader from "./header/header1.vue";
-import realTimeApi from "@/api/smoke/realTime";
+import statisticsApi from "@/api/smoke/statistics";
export default {
data() {
return {
@@ -159,18 +108,13 @@
};
}
- realTimeApi
- .findInTimeList(params)
- .then(({ list, total }) => {
- list.forEach(e => {
- e.AcquitAtStr = this.dateFormat("YYYY-mm-dd HH:MM", new Date(e.AcquitAt));
- e.FanStatusStr = this.FanStatusStr(e.FanStatus)
- e.FilterStatusStr = this.FanStatusStr(e.FilterStatus)
- e.OnlineStatusStr = this.OnlineStatusStr(e.OnlineStatus)
- e.StatusStr = this.StatusStr(e.Status)
- });
- this.tableData = list;
- this.totalNum = total;
+ statisticsApi
+ .findDataDetectorDailyStats(params)
+ .then((json) => {
+ let res = JSON.parse(json)
+
+ this.tableData = res.sumGroupByDates;
+ this.totalNum = res.sumGroupByDates.lengtn;
})
.catch((err) => this.$message.error(err));
},
@@ -182,7 +126,6 @@
realTimeApi
.exportInTime(params)
.then((res) => {
- debugger
let time = new Date();
let deathdate = time.toLocaleDateString();
const blob = new Blob([res.data], {
@@ -191,14 +134,14 @@
if (window.navigator.msSaveBlob) {
window.navigator.msSaveBlob(
blob,
- deathdate + "瀹炴椂鏁版嵁" + ".xls"
+ deathdate + "鐩戞祴鎬讳綋鎯呭喌鎶ヨ〃" + ".xls"
);
} else {
const url = window.URL.createObjectURL(blob);
const link = document.createElement("a");
link.style.display = "none";
link.href = url;
- link.download = deathdate + "瀹炴椂鏁版嵁" + ".xls";
+ link.download = deathdate + "鐩戞祴鎬讳綋鎯呭喌鎶ヨ〃" + ".xls";
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
--
Gitblit v1.8.0