diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index d15b798..559bca8 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -306,7 +306,7 @@ export function getPrepareList(query) {
// 获取线体每月生产过程不良率
export function getLineQcData() {
- return requestnpm({
+ return request({
url: '/quality/qcInterface/getLineQcData',
method: 'get'
});
diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js
index 8f55246..284a511 100644
--- a/src/api/wms/outorderfc.js
+++ b/src/api/wms/outorderfc.js
@@ -122,7 +122,6 @@ export function listreturnderZC(query) {
method: 'post',
params: query
});
-
}
//
export function addreturnderZC(data) {
@@ -167,3 +166,34 @@ export function CKlist(query) {
params: query
});
}
+
+export function listckTS(query) {
+ return request({
+ url: '/wms/outorder/listckTS',
+ method: 'post',
+ params: query
+ });
+}
+// 查询物料信息列表
+export function listProduct(query) {
+ return request({
+ url: '/wms/matenews/listWmsOdsMateStorageNews',
+ method: 'get',
+ params: query
+ });
+}
+// 查询报工详细列表
+export function getCKList(data) {
+ return request({
+ url: '/wms/order/listCKT',
+ method: 'post',
+ params: data
+ });
+}
+export function addOdsProcureOutOrderTS(data) {
+ return request({
+ url: '/wms/outorder/addOdsProcureOutOrderTS',
+ method: 'post',
+ data: data
+ });
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 30c2056..b974304 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -313,14 +313,14 @@ export default {
setInterval(() => this.getAlarmData(), 1000 * 60);
this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST"));
this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT");
- /**
+
//先执行一次
this.getUnReadList();
// 实现轮询
this.timer = setInterval(() => {
setTimeout(this.getUnReadList(), 30000);
}, 30000);
- **/
+
},
components: {
diff --git a/src/views/dashboard/QcChartLine.vue b/src/views/dashboard/QcChartLine.vue
index f95ee8c..ce6c8d7 100644
--- a/src/views/dashboard/QcChartLine.vue
+++ b/src/views/dashboard/QcChartLine.vue
@@ -50,7 +50,7 @@
methods: {
getLineQcInfo(){
- getLineQcData().then(returnData => {
+ getLineQcData().then((returnData) => {
const chart = this.$refs.chart
if (chart) {
const myChart = this.$echarts.init(chart)
diff --git a/src/views/dashboard/crossBarChart.vue b/src/views/dashboard/crossBarChart.vue
index 3c09ca7..752d09a 100644
--- a/src/views/dashboard/crossBarChart.vue
+++ b/src/views/dashboard/crossBarChart.vue
@@ -123,6 +123,7 @@ export default {
inverse: true,
axisLabel: {
show: true,
+ interval: 0,
margin: 10,
textStyle: {
fontSize: "14",
diff --git a/src/views/energy/powerUse/RealTime/index.vue b/src/views/energy/powerUse/RealTime/index.vue
index d9c97ac..8c05618 100644
--- a/src/views/energy/powerUse/RealTime/index.vue
+++ b/src/views/energy/powerUse/RealTime/index.vue
@@ -41,84 +41,91 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- >一键秒表
+ >一键秒表
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+