diff --git a/src/utils/request.js b/src/utils/request.js index 2dac191..5e58ce9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -24,7 +24,7 @@ const service = axios.create({ // request拦截器 service.interceptors.request.use(config => { if(localStorage.getItem('USER_POOL_NAME_CURRENT')){ - config.headers['poolName'] = config.header?.PoolName || localStorage.getItem('USER_POOL_NAME_CURRENT'); + config.headers['Poolname'] = config.header?.PoolName || localStorage.getItem('USER_POOL_NAME_CURRENT'); } // 是否需要设置 token const isToken = (config.headers || {}).isToken === false diff --git a/src/views/cs/index4.vue b/src/views/cs/index4.vue index 5b2d1ac..0a42f9f 100644 --- a/src/views/cs/index4.vue +++ b/src/views/cs/index4.vue @@ -51,22 +51,38 @@
{{ type }}机信息
-
-
-
{{ type }}{{ i.equipmentCode.split('').at(-1) }}
-
运行状态:
-
- - {{ k !== 7 ? '运行中' : '调试中' }} -
-
订单号:
-
{{ i.workorder_code }}
-
产品名称:
-
{{ i.product_name }}
-
完成数量:
-
{{ i.completed_count }}
-
-
+ + + + + + + + + + + + + + + +
+
+
{{ type }}{{ i.equipmentCode }}
+
运行状态:
+
+ + 调试中 + 运行中 +
+
订单号:
+
{{ i.workorder_code }}
+
产品名称:
+
{{ i.product_name }}
+
完成数量:
+
{{ i.completed_count }}
+
+
@@ -83,6 +99,7 @@ export default { data() { return { list: [], + lists: [], type: '成型', bz: '白班', equipmentCode: 'C', @@ -109,7 +126,64 @@ export default { shiftId: this.shiftId, equipmentCode: this.equipmentCode }).then((e) => { - this.list = e.data.rightlist.slice(0,7) + let aa = [ + { + "equipmentCode": "C1", + "workorder_code": "DD2024123000011-1", + "completed_count": 61, + "product_name": "Φ130mm微烟免拆白坯" + }, + { + "equipmentCode": "C2", + "workorder_code": "DD2024123000012-1", + "completed_count": 83, + "product_name": "Φ130mm微烟白坯" + }, + { + "equipmentCode": "C3", + "workorder_code": "DD2024123000012-1", + "completed_count": 78, + "product_name": "Φ130mm微烟白坯" + }, + { + "equipmentCode": "C4", + "workorder_code": "DD2024123000012-2", + "completed_count": 81, + "product_name": "Φ130mm微烟白坯" + }, + { + "equipmentCode": "C5", + "workorder_code": "DD2024123000013-1", + "completed_count": 71, + "product_name": "Φ125mm微烟白坯" + }, + { + "equipmentCode": "C6", + "workorder_code": "DD2024123000013-1", + "completed_count": 72, + "product_name": "Φ125mm微烟白坯" + }, + { + "equipmentCode": "C7", + "workorder_code": "DD2024123000013-2", + "completed_count": 82, + "product_name": "Φ125mm微烟白坯" + }, + { + "equipmentCode": "C8", + "workorder_code": "DD2024123000012-3", + "completed_count": 22, + "product_name": "Φ130mm微烟白坯" + } + ] + // this.list = aa.slice(0, 8).map(v => { + this.list = e.data.rightlist.slice(0, 8).map(v => { + return { + ...v, + equipmentCode: v.equipmentCode.split('').at(-1) + } + }) + this.lists = this.groupByCount(this.list) this.$refs.chart1.setData({ tooltip: { trigger: "axis", diff --git a/vue.config.js b/vue.config.js index d58fe97..74ea008 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,10 +36,13 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://192.168.202.20:8080`, - target: `http://localhost:8080`, + // target: `http://localhost:8080`, + // target: `http://172.18.80.215:8080`, // target: `http://192.168.3.93:8080`, // target: `http://192.168.3.158:8080`, - // target: `http://192.168.202.34:30000`, + // target: `http://10.11.176.97:8080`, + target: `http://192.168.202.34:30000/prod-api`, + // target: `http://192.168.202.20:9000/prod-api`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''