diff --git a/package.json b/package.json index d6c2da8..9dbd7e7 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "pinia": "3.0.1", "screenfull": "6.0.2", "vue": "3.5.13", + "vue-baidu-map-3x": "1.0.40", "vue-router": "4.5.0", "vxe-table": "4.6.25" }, diff --git a/src/common/apis/tables/diceke/ExcavationQuantityReport.ts b/src/common/apis/tables/diceke/ExcavationQuantityReport.ts index b49ee5f..83d6355 100644 --- a/src/common/apis/tables/diceke/ExcavationQuantityReport.ts +++ b/src/common/apis/tables/diceke/ExcavationQuantityReport.ts @@ -1,13 +1,12 @@ import { request } from "@/http/axios"; -// /** 查 */ -// export function findAllMiningglossApi() { -// return request({ -// url: "/dicekeMiningloss/findAllMininggloss", -// method: "get", -// }); -// } - +/** 查 */ +export function findAllMiningglossApi() { + return request({ + url: "/dicekeMiningloss/findAllMininggloss", + method: "get", + }); +} // /** 删 */ // export function deletedicekeMininglossApi(lossID: any) { // return request({ diff --git a/src/main.ts b/src/main.ts index f082c47..83d3e38 100644 --- a/src/main.ts +++ b/src/main.ts @@ -14,6 +14,7 @@ import "@@/assets/styles/index.scss"; import "@@/assets/iconfont/iconfont.css"; import "virtual:uno.css"; import md5 from 'js-md5'; +// import BaiduMap from 'vue-baidu-map-3x' // 创建应用实例 const app = createApp(App); @@ -24,7 +25,12 @@ installPlugins(app); // 安装 pinia 和 router app.use(pinia).use(router); - +// //百度地图 +// app.use(BaiduMap, { +// ak: '7yzvYFhbIVXAhpllFyLKAKu6xZDYYlFl', +// v: '3.0', +// type: 'WebGL' +// }); // router 准备就绪后挂载应用 router.isReady().then(() => { app.mount("#app"); diff --git a/src/pages/demo/diceke/DicekeMiningrecord.vue b/src/pages/demo/diceke/DicekeMiningrecord.vue index 8dbf074..2012a6f 100644 --- a/src/pages/demo/diceke/DicekeMiningrecord.vue +++ b/src/pages/demo/diceke/DicekeMiningrecord.vue @@ -131,14 +131,7 @@ export default { diff --git a/src/pages/demo/electricLocomotiveWorkshop/singleMachineOutput.vue b/src/pages/demo/electricLocomotiveWorkshop/singleMachineOutput.vue index f74d459..8a7aa95 100644 --- a/src/pages/demo/electricLocomotiveWorkshop/singleMachineOutput.vue +++ b/src/pages/demo/electricLocomotiveWorkshop/singleMachineOutput.vue @@ -12,7 +12,182 @@ export default { return { date: "", machine: "", - tableList: [], + tableList: [ + { + //日期 + index: "1", + //东川河 + dongchuanRiver: { + vehiclesNum: "36", + tonnage: "", + }, + //西川河 + xichuanRiver: { + vehiclesNum: "", + tonnage: "", + }, + //合计 + riverAmount: "", + //选矿卸 + mineralProcessing: { + vehiclesNum: "36", + tonnage: "", + }, + mineralProcessingAmount: "", //合计 + workingWorkbench: "360", //作业台时 + count: "360", //计 + powerFailure: "", //停电 + fault: "", //故障 + standby: "", //待命 + other: "", //其他 + percentage: "360", //百分比 + }, + { + //日期 + index: "2", + //东川河 + dongchuanRiver: { + vehiclesNum: "", + tonnage: "", + }, + //西川河 + xichuanRiver: { + vehiclesNum: "72", + tonnage: "", + }, + //合计 + riverAmount: "", + //选矿卸 + mineralProcessing: { + vehiclesNum: "72", + tonnage: "", + }, + mineralProcessingAmount: "", //合计 + workingWorkbench: "660", //作业台时 + count: "60", //计 + powerFailure: "", //停电 + fault: "", //故障 + standby: "", //待命 + other: "", //其他 + percentage: "60", //百分比 + }, + { + //日期 + index: "3", + //东川河 + dongchuanRiver: { + vehiclesNum: "12", + tonnage: "", + }, + //西川河 + xichuanRiver: { + vehiclesNum: "36", + tonnage: "", + }, + //合计 + riverAmount: "", + //选矿卸 + mineralProcessing: { + vehiclesNum: "36", + tonnage: "", + }, + mineralProcessingAmount: "", //合计 + workingWorkbench: "360", //作业台时 + count: "360", //计 + powerFailure: "", //停电 + fault: "", //故障 + standby: "", //待命 + other: "", //其他 + percentage: "360", //百分比 + }, + { + //日期 + index: "4", + //东川河 + dongchuanRiver: { + vehiclesNum: "72", + tonnage: "", + }, + //西川河 + xichuanRiver: { + vehiclesNum: "", + tonnage: "", + }, + //合计 + riverAmount: "", + //选矿卸 + mineralProcessing: { + vehiclesNum: "84", + tonnage: "", + }, + mineralProcessingAmount: "", //合计 + workingWorkbench: "660", //作业台时 + count: "60", //计 + powerFailure: "", //停电 + fault: "", //故障 + standby: "", //待命 + other: "", //其他 + percentage: "60", //百分比 + }, + { + //日期 + index: "5", + //东川河 + dongchuanRiver: { + vehiclesNum: "36", + tonnage: "", + }, + //西川河 + xichuanRiver: { + vehiclesNum: "", + tonnage: "", + }, + //合计 + riverAmount: "", + //选矿卸 + mineralProcessing: { + vehiclesNum: "36", + tonnage: "", + }, + mineralProcessingAmount: "", //合计 + workingWorkbench: "360", //作业台时 + count: "360", //计 + powerFailure: "", //停电 + fault: "", //故障 + standby: "", //待命 + other: "", //其他 + percentage: "360", //百分比 + }, + { + //日期 + index: "6", + //东川河 + dongchuanRiver: { + vehiclesNum: "72", + tonnage: "", + }, + //西川河 + xichuanRiver: { + vehiclesNum: "", + tonnage: "", + }, + //合计 + riverAmount: "", + //选矿卸 + mineralProcessing: { + vehiclesNum: "72", + tonnage: "", + }, + mineralProcessingAmount: "", //合计 + workingWorkbench: "660", //作业台时 + count: "60", //计 + powerFailure: "", //停电 + fault: "", //故障 + standby: "", //待命 + other: "", //其他 + percentage: "60", //百分比 + }, + ], }; }, created() { @@ -31,82 +206,6 @@ export default { const res = await findTotalMiningByMonthApi(data); console.log(res); }, - removeDataById(id) { - ElMessageBox.confirm("此操作将永久删除降水量记录，是否继续？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - deletePrecipitation(id).then(() => { - // 删除成功 - ElMessage({ - type: "success", - message: "删除成功!", - }); - // 重新加载列表 - this.getList(); - }); - }) - .catch(() => { - ElMessage({ - type: "info", - message: "已取消删除", - }); - }); - }, - handleAdd() { - this.isEdit = false; // 设置为新增操作 - this.precipitationform = { plateRange: "" }; // 初始化为空数据 - this.updateprecipitationform = true; // 显示弹窗 - }, - handleEdit(id) { - this.isEdit = true; - findPrecipitationById(id) - .then((Response) => { - this.precipitationform = Response.data.precipitationById; - console.log(this.precipitationform); - this.updateprecipitationform = true; - }) - .catch(() => { - ElMessage.error("查询失败，请稍后重试"); - }); - }, - formatMonth(dateTime) { - if (!dateTime) return "-"; - return dateTime.slice(0, 7); // 直接截取 "yyyy-MM" - // 或用 dayjs（需安装）： - // return dayjs(dateTime).format('YYYY-MM'); - }, - updatePrecipitation() { - if (this.isEdit) { - updatePrecipitationApi(this.precipitationform) - .then(() => { - ElMessage({ - type: "success", - message: "修改成功!", - }); - this.updateprecipitationform = false; - this.getList(); - }) - .catch(() => { - ElMessage.error("修改失败，请稍后重试"); - }); - } else { - addPrecipitationApi(this.precipitationform) - .then(() => { - ElMessage({ - type: "success", - message: "新增成功!", - }); - this.updateprecipitationform = false; - this.getList(); - }) - .catch(() => { - ElMessage.error("新增失败，请稍后重试"); - }); - } - }, }, }; @@ -133,6 +232,13 @@ export default { >查询 +
+ 1501机台 + 2025年4月甲班 +
- - - + + - + @@ -174,62 +280,46 @@ export default { label="合计" > - - + + - + - - + + + > + > + > + > + > - diff --git a/types/auto/components.d.ts b/types/auto/components.d.ts index 4d2c955..10a94d9 100644 --- a/types/auto/components.d.ts +++ b/types/auto/components.d.ts @@ -48,6 +48,7 @@ declare module 'vue' { ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTree: typeof import('element-plus/es')['ElTree'] + ElUpload: typeof import('element-plus/es')['ElUpload'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] }