diff --git a/src/components/chart/LineMulti.vue b/src/components/chart/LineMulti.vue index 4a9ab25..df6c2ba 100644 --- a/src/components/chart/LineMulti.vue +++ b/src/components/chart/LineMulti.vue @@ -47,10 +47,6 @@ containLabel: true }), }, - seriesLabel: { - type: Object, - default: () => ({show: false, position: 'top'}), - }, }, emits: ['click'], setup(props, { emit }) { diff --git a/src/views/zh/housingestateInfo/HousingestateInfo.api.ts b/src/views/zh/housingestateInfo/HousingestateInfo.api.ts index d8e4956..42505ae 100644 --- a/src/views/zh/housingestateInfo/HousingestateInfo.api.ts +++ b/src/views/zh/housingestateInfo/HousingestateInfo.api.ts @@ -41,6 +41,10 @@ export const getExportUrl = Api.exportXls; */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }); +}; export const queryXqHyXzList = (params) => defHttp.get({ url: Api.queryXqHyXzList, params }); export const queryXqHyTdcsList = (params) => defHttp.get({ url: Api.queryXqHyTdcsList, params }); diff --git a/src/views/zh/housingestateInfo/xqHyxzIndex.vue b/src/views/zh/housingestateInfo/xqHyxzIndex.vue index 305ff5d..f9eb2f8 100644 --- a/src/views/zh/housingestateInfo/xqHyxzIndex.vue +++ b/src/views/zh/housingestateInfo/xqHyxzIndex.vue @@ -42,8 +42,10 @@ - - + + + + @@ -60,6 +62,7 @@ const housingestates = ref(); const izList = ref(false) const detailVisible = ref(false); + const confirmLoading = ref(false); const detailData = ref([]); const parmas = reactive({ @@ -104,13 +107,13 @@ // 查看详情 const handleView = async (record) => { - console.log("🚀 ~ handleView ~ record:", record) + detailVisible.value = true; try { + confirmLoading.value = true; detailData.value = []; const res = await queryXzhyDetailList({ housingestateId: record.housingestateId,beginTime:parmas.beginTime,endTime:parmas.endTime,pageSize: -1 }); detailData.value = res.records; - console.log("🚀 ~ handleView ~ res:", res) - detailVisible.value = true; + confirmLoading.value = false; } catch (error) { console.error('获取详情失败:', error); } diff --git a/src/views/zh/housingestateInfo/xqTdcsIndex.vue b/src/views/zh/housingestateInfo/xqTdcsIndex.vue index 9e900df..b6291d0 100644 --- a/src/views/zh/housingestateInfo/xqTdcsIndex.vue +++ b/src/views/zh/housingestateInfo/xqTdcsIndex.vue @@ -42,8 +42,10 @@ - - + + + + @@ -58,9 +60,10 @@ const dataSource = ref([]); const dateValue = ref(); const housingestates = ref(); -const izList = ref(false) -const detailVisible = ref(false); -const detailData = ref([]); + const izList = ref(false) + const detailVisible = ref(false); + const confirmLoading = ref(false); + const detailData = ref([]); async function getHousingestates(){ housingestates.value = await housingestateList(null); @@ -74,13 +77,13 @@ const detailData = ref([]); // 查看详情 const handleView = async (record) => { - console.log("🚀 ~ handleView ~ record:", record) + detailVisible.value = true; try { + confirmLoading.value = true; detailData.value = []; const res = await queryTdcsDetailList({ housingestateId: record.housingestateId,beginTime:parmas.beginTime,endTime:parmas.endTime,pageSize: -1 }); detailData.value = res.records; - console.log("🚀 ~ handleView ~ res:", res) - detailVisible.value = true; + confirmLoading.value = false; } catch (error) { console.error('获取详情失败:', error); } diff --git a/src/views/zh/housingestateInfo/xqTdzlIndex.vue b/src/views/zh/housingestateInfo/xqTdzlIndex.vue index bb1450c..ee27a33 100644 --- a/src/views/zh/housingestateInfo/xqTdzlIndex.vue +++ b/src/views/zh/housingestateInfo/xqTdzlIndex.vue @@ -42,8 +42,10 @@ - - + + + + @@ -58,9 +60,10 @@ const dataSource = ref([]); const dateValue = ref(); const housingestates = ref(); -const izList = ref(false) -const detailVisible = ref(false); -const detailData = ref([]); + const izList = ref(false) + const detailVisible = ref(false); + const confirmLoading = ref(false); + const detailData = ref([]); async function getHousingestates(){ housingestates.value = await housingestateList(null); @@ -74,13 +77,14 @@ const detailData = ref([]); // 查看详情 const handleView = async (record) => { - console.log("🚀 ~ handleView ~ record:", record) + detailVisible.value = true; try { + confirmLoading.value = true; detailData.value = []; const res = await queryTdcsDetailList({ housingestateId: record.housingestateId,beginTime:parmas.beginTime,endTime:parmas.endTime,pageSize: -1 }); detailData.value = res.records; - console.log("🚀 ~ handleView ~ res:", res) - detailVisible.value = true; + confirmLoading.value = false; + } catch (error) { console.error('获取详情失败:', error); } diff --git a/src/views/zh/hy/tdcs/index.vue b/src/views/zh/hy/tdcs/index.vue index bc0a8ed..1e4e605 100644 --- a/src/views/zh/hy/tdcs/index.vue +++ b/src/views/zh/hy/tdcs/index.vue @@ -42,27 +42,29 @@ - - -
订单状态 - - 全部 - 正常 - 违规 - 部分违规 - 待审核 - 异常 - 忽略 - -
- - - - + + + +
订单状态 + + 全部 + 正常 + 违规 + 部分违规 + 待审核 + 异常 + 忽略 + +
+ + + + + @@ -80,6 +82,7 @@ const dateValue = ref(); const housingestates = ref(); const izList = ref(false) const detailVisible = ref(false); +const confirmLoading = ref(false); const detailData = ref([]); async function getHousingestates() { @@ -155,11 +158,13 @@ const handleView = async (record) => { // 查看详情 async function loadDetailDate(){ + detailVisible.value = true; try { + confirmLoading.value = true; detailData.value = []; - const res = await queryHywgList({ beginTime:parmas.beginTime,endTime:parmas.endTime,housingestateId:parmas.housingestateId,phone:detailParmas.phone,invalid:detailParmas.invalid }); + const res = await queryHyjlList({ beginTime:parmas.beginTime,endTime:parmas.endTime,housingestateId:parmas.housingestateId,phone:detailParmas.phone,invalid:detailParmas.invalid }); detailData.value = res; - detailVisible.value = true; + confirmLoading.value = false; } catch (error) { console.error('获取详情失败:', error); } diff --git a/src/views/zh/hy/tdzl/index.vue b/src/views/zh/hy/tdzl/index.vue index 720bae3..dc9848e 100644 --- a/src/views/zh/hy/tdzl/index.vue +++ b/src/views/zh/hy/tdzl/index.vue @@ -42,27 +42,29 @@ - - -
订单状态 - - 全部 - 正常 - 违规 - 部分违规 - 待审核 - 异常 - 忽略 - -
- - - - + + + +
订单状态 + + 全部 + 正常 + 违规 + 部分违规 + 待审核 + 异常 + 忽略 + +
+ + + + + @@ -79,6 +81,7 @@ const housingestates = ref(); const izList = ref(false) const detailVisible = ref(false); + const confirmLoading = ref(false); const detailData = ref([]); async function getHousingestates(){ @@ -91,7 +94,6 @@ type: '1', housingestateId: '', pageSize: 10, - type: '1', }) const detailParmas = reactive({ @@ -155,11 +157,13 @@ // 查看详情 async function loadDetailDate(){ + detailVisible.value = true; try { + confirmLoading.value = true; detailData.value = []; const res = await queryHyjlList({ beginTime:parmas.beginTime,endTime:parmas.endTime,housingestateId:parmas.housingestateId,phone:detailParmas.phone,invalid:detailParmas.invalid }); detailData.value = res; - detailVisible.value = true; + confirmLoading.value = false; } catch (error) { console.error('获取详情失败:', error); } diff --git a/src/views/zh/hy/wg/index.vue b/src/views/zh/hy/wg/index.vue index 40b8344..c79a195 100644 --- a/src/views/zh/hy/wg/index.vue +++ b/src/views/zh/hy/wg/index.vue @@ -41,23 +41,25 @@ - - -
订单状态 - - 全部 - 违规 - 部分违规 - -
- - - - + + + +
订单状态 + + 全部 + 违规 + 部分违规 + +
+ + + + + @@ -73,6 +75,7 @@ const dateValue = ref(); const housingestates = ref(); const izList = ref(false) const detailVisible = ref(false); +const confirmLoading = ref(false); const detailData = ref([]); async function getHousingestates() { @@ -144,7 +147,9 @@ const handleView = async (record) => { // 查看详情 async function loadDetailDate(){ + detailVisible.value = true; try { + confirmLoading.value = true; detailData.value = []; let detailParams = { beginTime:detailParmas.shortDay+' 00:00:00', @@ -154,7 +159,7 @@ async function loadDetailDate(){ }; const res = await queryHywgList(detailParams); detailData.value = res; - detailVisible.value = true; + confirmLoading.value = false; } catch (error) { console.error('获取详情失败:', error); } diff --git a/src/views/zh/qy/qy.api.ts b/src/views/zh/qy/qy.api.ts new file mode 100644 index 0000000..46f54ed --- /dev/null +++ b/src/views/zh/qy/qy.api.ts @@ -0,0 +1,53 @@ +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + staffList = '/zh/qy/queryStaffList', + housingestateList = '/zh/hy/queryHousingestateList', + querySjQyList = '/zh/qy/querySjQyList', + querySjQyZlList = '/zh/qy/querySjQyZlList', + querySjQyCsList = '/zh/qy/querySjQyCsList', + querySjdQyCsList = '/zh/qy/querySjdQyCsList', + querySjdQyZlList = '/zh/qy/querySjdQyZlList', + queryXqQyCsListlList = '/zh/qy/queryXqQyCsListlList', +} + +/** + * 获取司机 + * @param params + */ +export const staffList = (params) => defHttp.get({ url: Api.staffList, params }); +/** + * 获取小区 + * @param params + */ +export const housingestateList = (params) => defHttp.get({ url: Api.housingestateList, params }); +/** + * 司机清运列表 + * @param params + */ +export const sjQyList = (params) => defHttp.get({ url: Api.querySjQyList, params }); +/** + * 司机清运重量排行榜 + * @param params + */ +export const sjQyZlList = (params) => defHttp.get({ url: Api.querySjQyZlList, params }); +/** + * 司机清运次数排行榜 + * @param params + */ +export const sjQyCsList = (params) => defHttp.get({ url: Api.querySjQyCsList, params }); +/** + * 时间段清运次数统计 + * @param params + */ +export const sjdQyCsList = (params) => defHttp.get({ url: Api.querySjdQyCsList, params }); +/** + * 时间段清运重量统计 + * @param params + */ +export const sjdQyZlList = (params) => defHttp.get({ url: Api.querySjdQyZlList, params }); +/** + * 小区清运次数排行榜 + * @param params + */ +export const xqQyCsList = (params) => defHttp.get({ url: Api.queryXqQyCsListlList, params }); diff --git a/src/views/zh/qy/qy.data.ts b/src/views/zh/qy/qy.data.ts new file mode 100644 index 0000000..d3df94c --- /dev/null +++ b/src/views/zh/qy/qy.data.ts @@ -0,0 +1,222 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +import {ref} from "vue"; + +export const detailSjqyColumns : BasicColumn[] =[ + { + title: '序号', + dataIndex: 'rowNumber', + key: 'rowNumber', + align: 'center' + }, + { + title: '司机电话', + dataIndex: 'staffPhone', + key: 'staffPhone', + align: 'center' + }, + { + title: '司机', + dataIndex: 'staffName', + key: 'staffName', + align: 'center' + }, + { + title: '区域', + dataIndex: 'housingName', + key: 'housingName', + align: 'center' + }, + { + title: '设备', + dataIndex: 'content', + key: 'content', + align: 'center' + }, + { + title: '桶', + dataIndex: 'dtu', + key: 'dtu', + align: 'center' + }, + { + title: '清运重量(公斤)', + dataIndex: 'thisWeight', + key: 'thisWeight', + align: 'center' + }, + { + title: '清运状态', + dataIndex: 'status', + key: 'status', + align: 'center', + customRender: function ({ text }) { + if (text == '0') { + return '创建'; + } else if (text == '1') { + return '完成'; + } else if (text == '2') { + return '无效'; + } else{ + return ''; + } + }, + }, + { + title: '清运开始时间', + dataIndex: 'startTime', + key: 'startTime', + align: 'center' + }, + { + title: '清运完成时间', + dataIndex: 'finishedTime', + key: 'finishedTime', + align: 'center' + }, +] + +export const sjqyzlColumns : BasicColumn[] =[ + { + title: '序号', + dataIndex: 'rowNumber', + key: 'rowNumber', + align: 'center' + }, + { + title: '司机电话', + dataIndex: 'phone', + key: 'phone', + align: 'center' + }, + { + title: '司机', + dataIndex: 'name', + key: 'name', + align: 'center' + }, + { + title: '清运重量(吨)', + dataIndex: 'value', + key: 'value', + align: 'center' + }, + { + title: '操作', + key: 'action', + align: 'center', + width: '150px', + } +] + +export const sjqycsColumns : BasicColumn[] =[ + { + title: '序号', + dataIndex: 'rowNumber', + key: 'rowNumber', + align: 'center' + }, + { + title: '司机电话', + dataIndex: 'phone', + key: 'phone', + align: 'center' + }, + { + title: '司机', + dataIndex: 'name', + key: 'name', + align: 'center' + }, + { + title: '清运次数', + dataIndex: 'value', + key: 'value', + align: 'center' + }, + { + title: '操作', + key: 'action', + align: 'center', + width: '150px', + } +] + +export const sjdqycsColumns : BasicColumn[] =[ + { + title: '时间', + dataIndex: 'name', + key: 'name', + align: 'center' + }, + { + title: '清运次数', + dataIndex: 'value', + key: 'value', + align: 'center' + }, + { + title: '操作', + key: 'action', + align: 'center', + width: '150px', + } +] + + +export const sjdqyzlColumns : BasicColumn[] =[ + { + title: '时间', + dataIndex: 'name', + key: 'name', + align: 'center' + }, + { + title: '清运重量(吨)', + dataIndex: 'value', + key: 'value', + align: 'center' + }, + { + title: '操作', + key: 'action', + align: 'center', + width: '150px', + } +] + +export const xqqyColumns : BasicColumn[] =[ + { + title: '序号', + dataIndex: 'rowNumber', + key: 'rowNumber', + align: 'center' + }, + { + title: '小区名称', + dataIndex: 'housingName', + key: 'housingName', + align: 'center' + }, + { + title: '设备地点', + dataIndex: 'content', + key: 'content', + align: 'center' + }, + { + title: '清运次数', + dataIndex: 'value', + key: 'value', + align: 'center' + }, + { + title: '操作', + key: 'action', + align: 'center', + width: '150px', + } +] diff --git a/src/views/zh/qy/sjdcs/index.vue b/src/views/zh/qy/sjdcs/index.vue new file mode 100644 index 0000000..49ffe45 --- /dev/null +++ b/src/views/zh/qy/sjdcs/index.vue @@ -0,0 +1,179 @@ + + + diff --git a/src/views/zh/qy/sjdzl/index.vue b/src/views/zh/qy/sjdzl/index.vue new file mode 100644 index 0000000..461d065 --- /dev/null +++ b/src/views/zh/qy/sjdzl/index.vue @@ -0,0 +1,182 @@ + + + diff --git a/src/views/zh/qy/sjqycs/index.vue b/src/views/zh/qy/sjqycs/index.vue new file mode 100644 index 0000000..9d1526f --- /dev/null +++ b/src/views/zh/qy/sjqycs/index.vue @@ -0,0 +1,197 @@ + + + diff --git a/src/views/zh/qy/sjqyzl/index.vue b/src/views/zh/qy/sjqyzl/index.vue new file mode 100644 index 0000000..91240be --- /dev/null +++ b/src/views/zh/qy/sjqyzl/index.vue @@ -0,0 +1,197 @@ + + + diff --git a/src/views/zh/qy/xqqycs/index.vue b/src/views/zh/qy/xqqycs/index.vue new file mode 100644 index 0000000..eb3cc7d --- /dev/null +++ b/src/views/zh/qy/xqqycs/index.vue @@ -0,0 +1,199 @@ + + + diff --git a/src/views/zh/shebei/tdcs/index.vue b/src/views/zh/shebei/tdcs/index.vue index b1c5d86..4212d3e 100644 --- a/src/views/zh/shebei/tdcs/index.vue +++ b/src/views/zh/shebei/tdcs/index.vue @@ -43,27 +43,29 @@ - - -
订单状态 - - 全部 - 正常 - 违规 - 部分违规 - 待审核 - 异常 - 忽略 - -
- - - - + + + +
订单状态 + + 全部 + 正常 + 违规 + 部分违规 + 待审核 + 异常 + 忽略 + +
+ + + + + @@ -81,6 +83,7 @@ const dateValue = ref(); const housingestates = ref(); const izList = ref(false) const detailVisible = ref(false); +const confirmLoading = ref(false); const detailData = ref([]); async function getHousingestates() { @@ -163,11 +166,13 @@ const handleView = async (record) => { // 查看详情 async function loadDetailDate(){ + detailVisible.value = true; try { + confirmLoading.value = true; detailData.value = []; const res = await queryHyjlList({ beginTime:parmas.beginTime,endTime:parmas.endTime,imei:detailParmas.imei,invalid:detailParmas.invalid }); detailData.value = res; - detailVisible.value = true; + confirmLoading.value = false; } catch (error) { console.error('获取详情失败:', error); } diff --git a/src/views/zh/shebei/tdzl/index.vue b/src/views/zh/shebei/tdzl/index.vue index 9dc6b0f..b30e4b8 100644 --- a/src/views/zh/shebei/tdzl/index.vue +++ b/src/views/zh/shebei/tdzl/index.vue @@ -43,27 +43,29 @@ - - -
订单状态 - - 全部 - 正常 - 违规 - 部分违规 - 待审核 - 异常 - 忽略 - -
- - - - + + + +
订单状态 + + 全部 + 正常 + 违规 + 部分违规 + 待审核 + 异常 + 忽略 + +
+ + + + + @@ -80,6 +82,7 @@ const dateValue = ref(); const housingestates = ref(); const izList = ref(false) const detailVisible = ref(false); +const confirmLoading = ref(false); const detailData = ref([]); async function getHousingestates() { @@ -162,11 +165,13 @@ const handleView = async (record) => { // 查看详情 async function loadDetailDate(){ + detailVisible.value = true; try { + confirmLoading.value = true; detailData.value = []; const res = await queryHyjlList({ beginTime:parmas.beginTime,endTime:parmas.endTime,imei:detailParmas.imei,invalid:detailParmas.invalid }); detailData.value = res; - detailVisible.value = true; + confirmLoading.value = false; } catch (error) { console.error('获取详情失败:', error); }