diff --git a/src/api/energy/powerUse/OrderEnergy.js b/src/api/energy/powerUse/OrderEnergy.js
new file mode 100644
index 0000000..4d6d59c
--- /dev/null
+++ b/src/api/energy/powerUse/OrderEnergy.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询unitPrice列表
+export function listOrderEnergy(query) {
+ return request({
+ url: '/energy/report/analysis/OrderEnergyReport',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询unitPrice详细
+export function getUnitPrice(picId) {
+ return request({
+ url: '/mes/unitPrice/' + picId,
+ method: 'get'
+ });
+}
+
+// 新增unitPrice
+export function addUnitPrice(data) {
+ return request({
+ url: '/mes/unitPrice',
+ method: 'post',
+ data: data
+ });
+}
+
+// 修改unitPrice
+export function updateUnitPrice(data) {
+ return request({
+ url: '/mes/unitPrice',
+ method: 'put',
+ data: data
+ });
+}
+
+// 删除unitPrice
+export function delUnitPrice(picId) {
+ return request({
+ url: '/mes/unitPrice/' + picId,
+ method: 'delete'
+ });
+}
diff --git a/src/views/energy/powerUse/OrderEnergy/index.vue b/src/views/energy/powerUse/OrderEnergy/index.vue
new file mode 100644
index 0000000..6c23e70
--- /dev/null
+++ b/src/views/energy/powerUse/OrderEnergy/index.vue
@@ -0,0 +1,253 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 0a1d1a6..50611e8 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -250,14 +250,15 @@
v-if="refreshNewWorkerTable" v-loading="newWorkerLoading"class="my-print-table":data="printData.workTable"
border style="width: 100%">
-
+
-
+
-
+
+
@@ -605,8 +606,9 @@ export default {
}
@media print {
#printFrom{
- font-family: Microsoft YaHei !important;
- color: #000 !important;
+ font-family: "SimSun", "宋体" !important;
+ color: #000 !important;
+ font-size: 14pt !important; /* 调整字体大小 */
}
}