|
@@ -70,10 +70,10 @@
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script setup>
|
|
<script setup>
|
|
|
-import {onMounted, ref} from "vue";
|
|
|
|
|
-import {ElMessage} from "element-plus";
|
|
|
|
|
-import {getflipalarmDataAll} from "@/api/ldzh/index";
|
|
|
|
|
-import {parseTime, parseTimeEnd} from "@/utils/ruoyi.js";
|
|
|
|
|
|
|
+import { onMounted, ref } from "vue";
|
|
|
|
|
+import { ElMessage } from "element-plus";
|
|
|
|
|
+import { getflipalarmDataAll } from "@/api/ldzh/index";
|
|
|
|
|
+import { parseTime, parseTimeEnd } from "@/utils/ruoyi.js";
|
|
|
|
|
|
|
|
const tableData = ref([]);
|
|
const tableData = ref([]);
|
|
|
const totals = ref(0);
|
|
const totals = ref(0);
|
|
@@ -84,22 +84,24 @@ const pageSize = ref(10);
|
|
|
|
|
|
|
|
// 构建查询参数
|
|
// 构建查询参数
|
|
|
const buildQueryParams = () => {
|
|
const buildQueryParams = () => {
|
|
|
- return ({
|
|
|
|
|
|
|
+ return {
|
|
|
pageNum: currentPage.value,
|
|
pageNum: currentPage.value,
|
|
|
pageSize: pageSize.value,
|
|
pageSize: pageSize.value,
|
|
|
query: [
|
|
query: [
|
|
|
{ column: "alarm_status", type: "ne", value: "0" },
|
|
{ column: "alarm_status", type: "ne", value: "0" },
|
|
|
...(dateRange.value?.length === 2
|
|
...(dateRange.value?.length === 2
|
|
|
- ? [
|
|
|
|
|
|
|
+ ? [
|
|
|
{
|
|
{
|
|
|
column: "create_time",
|
|
column: "create_time",
|
|
|
type: "between",
|
|
type: "between",
|
|
|
- value: `${parseTime(dateRange.value[0])},${parseTimeEnd(dateRange.value[1])}`,
|
|
|
|
|
|
|
+ value: `${parseTime(dateRange.value[0])},${parseTimeEnd(
|
|
|
|
|
+ dateRange.value[1]
|
|
|
|
|
+ )}`,
|
|
|
},
|
|
},
|
|
|
]
|
|
]
|
|
|
- : []),
|
|
|
|
|
|
|
+ : []),
|
|
|
],
|
|
],
|
|
|
- })
|
|
|
|
|
|
|
+ };
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
// 获取数据
|
|
// 获取数据
|
|
@@ -119,7 +121,7 @@ const getManholeAllData = async () => {
|
|
|
"初始数据值",
|
|
"初始数据值",
|
|
|
res,
|
|
res,
|
|
|
parseTime(dateRange.value[0]),
|
|
parseTime(dateRange.value[0]),
|
|
|
- parseTimeEnd(dateRange.value[1])
|
|
|
|
|
|
|
+ parseTimeEnd(dateRange.value[1])
|
|
|
);
|
|
);
|
|
|
if (totals.value === 0) {
|
|
if (totals.value === 0) {
|
|
|
ElMessage.warning("暂无数据");
|
|
ElMessage.warning("暂无数据");
|
|
@@ -147,7 +149,7 @@ const getEchartsAllData = async () => {
|
|
|
},
|
|
},
|
|
|
],
|
|
],
|
|
|
};
|
|
};
|
|
|
- console.log("获取图标数据条件", end);
|
|
|
|
|
|
|
+ console.log("获取图标数据条件", parseTimeEnd(dateRange.value[1]), end);
|
|
|
|
|
|
|
|
const res = await getflipalarmDataAll(end);
|
|
const res = await getflipalarmDataAll(end);
|
|
|
console.log("获取图标数据值", res);
|
|
console.log("获取图标数据值", res);
|