diff --git a/.env.dev b/.env.dev
index 2f3ffe42..67bd8cab 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-21 14:45:52
+ # @LastEditTime: 2024-03-25 15:59:53
# @LastEditors: zhp
# @Description:
###
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
# socket地址
-VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
+VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
# 积木报表指向地址
diff --git a/src/api/base/coreWorkOrder.js b/src/api/base/coreWorkOrder.js
index 84d69b54..43c6d176 100644
--- a/src/api/base/coreWorkOrder.js
+++ b/src/api/base/coreWorkOrder.js
@@ -1,7 +1,7 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-15 17:19:19
+ * @LastEditTime: 2024-03-21 10:49:24
* @LastEditors: DY
* @Description:
*/
@@ -118,6 +118,24 @@ export function getCoreWOMaPage(query) {
})
}
+// 获得工单预使用原料分页----根据产品id
+export function getlistByProductId(query) {
+ return request({
+ url: '/base/material-product-bom-det/listByProductId',
+ method: 'get',
+ params: query
+ })
+}
+
+// 获得工单预使用原料分页----根据工艺流程
+export function getlistByFlowId(query) {
+ return request({
+ url: '/extend/process-equ-material-bom-det/listByFlowId',
+ method: 'get',
+ params: query
+ })
+}
+
// 获得预计用料信息分页
export function getMaterialBomPage(query) {
return request({
@@ -162,3 +180,12 @@ export function updateConCoreWOr(data) {
data: data
})
}
+
+// 修改分配产量----批量
+export function updateBatchConCoreWOr(data) {
+ return request({
+ url: '/base/core-order-con-work-order/updateBatch',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/src/api/monitoring/teamProduction.js b/src/api/monitoring/teamProduction.js
index 792d694b..c8545a33 100644
--- a/src/api/monitoring/teamProduction.js
+++ b/src/api/monitoring/teamProduction.js
@@ -18,6 +18,15 @@ export function getSchedulingMonitoringRecord(query) {
})
}
+// 获得不同产线每小时报废数据,用于班组检测 班组生产情况详情(动态结构)
+export function getSchedulingMonitoringRecord1(query) {
+ return request({
+ url: '/base/quality-inspection-record/getSchedulingMonitoringRecord24h',
+ method: 'get',
+ params: query
+ })
+}
+
// 获得所有列表
export function groupClassesListAll(query) {
return request({
diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index 3d19ec29..2c05e32e 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -94,7 +94,7 @@
:show-file-list="false"
icon="el-icon-upload2"
:disabled="disabled"
- :before-upload="beforeUpload"
+ :before-upload="col.uploadTips ? beforeUploadPic : beforeUpload"
:on-success="
(response, file, fileList) => {
handleUploadSuccess(response, file, col.prop);
@@ -110,7 +110,7 @@
上传文件
- {{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
+ {{ '只能上传jpg/png文件, 大小不超过2MB' }}
@@ -416,6 +416,26 @@ export default {
// 上传成功的特殊处理
beforeUpload(file) {
+ const checkFileSize = () => {
+ const isLt2M = file.size / 1024 / 1024 < 2;
+ if (!isLt2M) {
+ this.$modal.msgError('上传文件大小不能超过 2MB!');
+ }
+ return isLt2M;
+ };
+ // const checkFileType = () => {
+ // const isJPG =
+ // file.type === 'image/jpeg' ||
+ // file.type === 'image/png' ||
+ // file.type === 'image/jpg';
+ // return isJPG;
+ // };
+ // return checkFileSize() && checkFileType();
+ return checkFileSize();
+ },
+
+ // 上传成功的特殊处理----图片
+ beforeUploadPic(file) {
const checkFileSize = () => {
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
@@ -428,6 +448,9 @@ export default {
file.type === 'image/jpeg' ||
file.type === 'image/png' ||
file.type === 'image/jpg';
+ if (!isJPG) {
+ this.$modal.msgError('只能上传jpg/png文件!');
+ }
return isJPG;
};
return checkFileSize() && checkFileType();
diff --git a/src/router/index.js b/src/router/index.js
index 5d060c2f..4d583179 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -28,136 +28,98 @@ Vue.use(Router);
// 公共路由
export const constantRoutes = [
- {
- path: '/redirect',
- component: Layout,
- hidden: true,
- children: [
- {
- path: '/redirect/:path(.*)',
- component: (resolve) => require(['@/views/redirect'], resolve),
- },
- ],
- },
- {
- path: '/login',
- component: (resolve) => require(['@/views/login'], resolve),
- hidden: true,
- },
- {
- path: '/sso',
- component: (resolve) => require(['@/views/sso'], resolve),
- hidden: true,
- },
- {
- path: '/social-login',
- component: (resolve) => require(['@/views/socialLogin'], resolve),
- hidden: true,
- },
- {
- path: '/404',
- component: (resolve) => require(['@/views/error/404'], resolve),
- hidden: true,
- },
- {
- path: '/401',
- component: (resolve) => require(['@/views/error/401'], resolve),
- hidden: true,
- },
- {
- path: '/print-design',
- component: (resolve) => require(['@/views/print/design'], resolve),
- hidden: true,
- },
- {
- path: '/',
- component: () => import('@/views/choicePart'),
- hidden: true,
- meta: { requireToken: true },
- },
- // {
- // path: '/',
- // component: Layout,
- // // redirect: 'core/base/factory',
- // // children: [{
- // // path: 'index',
- // // redirect: 'core/base/factory',
- // // component: (resolve) => require(['@/views/index'], resolve),
- // // name: '首页',
- // // meta: { title: '首页', icon: 'dashboard', affix: true }
- // // }
- // // ]
- // },
- {
- path: '/AGVBoard',
- name: 'AGVBoard',
- // component: Layout,
- // route level code-splitting
- // this generates a separate chunk (about.[hash].js) for this route
- // which is lazy-loaded when the route is visited.
- component: () =>
- import(
- /* webpackChunkName: "about" */ '@/views/OperationalOverview/AGVBoard.vue'
- ),
- },
- {
- path: '/coldBoard',
- name: 'coldBoard',
- // route level code-splitting
- // this generates a separate chunk (about.[hash].js) for this route
- // which is lazy-loaded when the route is visited.
- component: () =>
- import(
- /* webpackChunkName: "about" */ '@/views/OperationalOverview/coldBoard.vue'
- ),
- },
- {
- path: '/processingBoard',
- name: 'processingBoard',
- // route level code-splitting
- // this generates a separate chunk (about.[hash].js) for this route
- // which is lazy-loaded when the route is visited.
- component: () =>
- import(
- /* webpackChunkName: "about" */ '@/views/OperationalOverview/processingBoard.vue'
- ),
- },
- {
- path: '/user',
- component: Layout,
- hidden: true,
- redirect: 'noredirect',
- children: [
- {
- path: 'profile',
- component: (resolve) =>
- require(['@/views/system/user/profile/index'], resolve),
- name: 'Profile',
- meta: { title: '个人中心', icon: 'user' },
- },
- {
- path: 'notify-message',
- component: (resolve) =>
- require(['@/views/system/notify/my/index'], resolve),
- name: 'MyNotifyMessage',
- meta: { title: '我的站内信', icon: 'message' },
- },
- ],
- },
- {
- path: '/dict',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'type/data/:dictId(\\d+)',
- component: (resolve) => require(['@/views/system/dict/data'], resolve),
- name: 'SystemDictData',
- meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' },
- },
- ],
- },
-];
+ {
+ path: '/redirect',
+ component: Layout,
+ hidden: true,
+ children: [
+ {
+ path: '/redirect/:path(.*)',
+ component: (resolve) => require(['@/views/redirect'], resolve)
+ }
+ ]
+ },
+ {
+ path: '/login',
+ component: (resolve) => require(['@/views/login'], resolve),
+ hidden: true
+ },
+ {
+ path: '/sso',
+ component: (resolve) => require(['@/views/sso'], resolve),
+ hidden: true
+ },
+ {
+ path: '/social-login',
+ component: (resolve) => require(['@/views/socialLogin'], resolve),
+ hidden: true
+ },
+ {
+ path: '/404',
+ component: (resolve) => require(['@/views/error/404'], resolve),
+ hidden: true
+ },
+ {
+ path: '/401',
+ component: (resolve) => require(['@/views/error/401'], resolve),
+ hidden: true
+ },
+ {
+ path: '/print-design',
+ component: (resolve) => require(['@/views/print/design'], resolve),
+ hidden: true
+ },
+ {
+ path: '/',
+ component: () => import('@/views/choicePart'),
+ hidden: true,
+ meta: { requireToken: true }
+ },
+ {
+ path: '/AGVBoard',
+ name: 'AGVBoard',
+ component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/AGVBoard.vue')
+ },
+ {
+ path: '/coldBoard',
+ name: 'coldBoard',
+ component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/coldBoard.vue')
+ },
+ {
+ path: '/processingBoard',
+ name: 'processingBoard',
+ component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/processingBoard.vue')
+ },
+ {
+ path: '/user',
+ component: Layout,
+ hidden: true,
+ redirect: 'noredirect',
+ children: [{
+ path: 'profile',
+ component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
+ name: 'Profile',
+ meta: { title: '个人中心', icon: 'user' }
+ }, {
+ path: 'notify-message',
+ component: (resolve) => require(['@/views/system/notify/my/index'], resolve),
+ name: 'MyNotifyMessage',
+ meta: { title: '我的站内信', icon: 'message' },
+ }]
+ },
+ {
+ path: '/dict',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: 'type/data/:dictId(\\d+)',
+ component: (resolve) => require(['@/views/system/dict/data'], resolve),
+ name: 'SystemDictData',
+ meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' }
+ }
+ ]
+ }
+]
// 防止连续点击多次路由报错
let routerPush = Router.prototype.push;
diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue
index 68693080..87ba1df2 100644
--- a/src/views/OperationalOverview/AGVBoard.vue
+++ b/src/views/OperationalOverview/AGVBoard.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
- * @LastEditTime: 2024-03-12 09:05:20
+ * @LastEditTime: 2024-03-26 09:57:35
* @Description:
-->
@@ -36,17 +36,7 @@
-
-
-
-
-
@@ -89,50 +55,18 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -142,252 +76,7 @@ import baseContainer from './components/baseContainer'
import baseTable1 from './components/baseTable'
import baseTable from './components/baseTable'
import baseTable2 from './components/baseTable'
-// import TopRadioGroup from './components/topRadioGroup'
-// import pieChart1 from './components/PieChart'
-// import pieChart2 from './components/PieChart'
-// import pieChart3 from './components/PieChart'
-// import { mapGetters } from 'vuex'
import screenfull from 'screenfull'
-// import BaseVideo from './components/baseVideo.vue'
-// import alarmLevel from './components/alarmLevel'
-// import axios from '@/utils/request'
-// import doubleYChart from './components/doubleYChart '
-// import elementResizeDetectorMaker from 'element-resize-detector';
-// var erd = elementResizeDetectorMaker(); //创建实例
-// import LinearBarChart from './components/linearBarChart'
-const qualityTableProps1 = [
- {
- prop: 'name',
- label: '产线名称'
- },
- {
- prop: 'createTime',
- label: '发生时间'
- },
- {
- prop: 'code',
- label: '质量编码'
- },
- {
- prop: 'content',
- label: '质量内容'
- }
-]
-const qualityTableProps2 = [
- {
- prop: 'name',
- label: '工序名称'
- },
- {
- prop: 'createTime',
- label: '发生时间'
- },
- {
- prop: 'code',
- label: '质量编码'
- },
- {
- prop: 'content',
- label: '质量内容'
- }
-]
-const cxNameList = ['周一', '周二', '周三', '周四', '周五']
-
-const cxDataList = [
- {
- topColor: '#9DD5FF',
- bottomColor: '#1295FF',
- name: '电耗能',
- data: [100, 150, 121, 97, 140]
- },
- {
- topColor: '#FF8BC3',
- bottomColor: '#EB46A1',
- name: '水耗能',
- data: [110, 110, 151, 77, 110]
- },
- {
- topColor: '#85F6E9',
- bottomColor: '#2EC6B4',
- name: '天然气',
- data: [110, 120, 171, 287, 40]
- },
- {
- topColor: '#9496FF',
- bottomColor: '#6567FF',
- name: '焦炉煤气',
- data: [140, 157, 122, 27, 240]
- },
- {
- topColor: '#F68E8A',
- bottomColor: '#E95552',
- name: '余热发电',
- data: [170, 180, 127, 17, 340]
- },
- {
- topColor: '#FFE873',
- bottomColor: '#E7AE2A',
- name: '二氧化硫',
- data: [140, 160, 121, 57, 170]
- }
-]
-
-const qualityList1 = [
- { name: '钢一线', createTime: '2021.10.21 24:59:59', code: '2121321231', content: '气泡' },
- { name: '钢二线', createTime: '2021.11.22 24:59:59', code: '3321123213', content: '气泡' },
- { name: '钢三线', createTime: '2021.12.12 24:59:59', code: '4535435345', content: '气泡' },
- { name: '钢四线', createTime: '2021.12.20 24:59:59', code: '5465465466', content: '气泡' },
- { name: '钢五线', createTime: '2021.12.02 24:59:59', code: '2132131312', content: '气泡' },
- { name: '钢一线', createTime: '2021.10.21 24:59:59', code: '2121321231', content: '气泡' },
- { name: '钢二线', createTime: '2021.11.22 24:59:59', code: '3321123213', content: '气泡' },
- { name: '钢三线', createTime: '2021.12.12 24:59:59', code: '4535435345', content: '气泡' },
- { name: '钢四线', createTime: '2021.12.20 24:59:59', code: '5465465466', content: '气泡' },
- { name: '钢五线', createTime: '2021.12.02 24:59:59', code: '2132131312', content: '气泡' },
- { name: '钢一线', createTime: '2021.10.21 24:59:59', code: '2121321231', content: '气泡' },
- { name: '钢二线', createTime: '2021.11.22 24:59:59', code: '3321123213', content: '气泡' },
- { name: '钢三线', createTime: '2021.12.12 24:59:59', code: '4535435345', content: '气泡' },
- { name: '钢四线', createTime: '2021.12.20 24:59:59', code: '5465465466', content: '气泡' },
- { name: '钢五线', createTime: '2021.12.02 24:59:59', code: '2132131312', content: '气泡' },
- { name: '钢六线', createTime: '2021.12.11 24:59:59', code: '2132131212', content: '气泡' }
-]
-const qualityList2 = [
- { name: '上片', createTime: '2021.10.22 24:59:59', code: '2132132133', content: '气泡' },
- { name: '磨边', createTime: '2021.12.21 24:59:59', code: '2132131232', content: '气泡' },
- { name: '清洗', createTime: '2021.12.12 24:59:59', code: '1232131312', content: '气泡' },
- { name: '激光打孔', createTime: '2021.12.13 24:59:59', code: '2132132131', content: '气泡' },
- { name: 'AR镀膜', createTime: '2021.10.23 24:59:59', code: '2311212232', content: '气泡' },
- { name: '固化', createTime: '2021.09.22 24:59:59', code: '21321321312', content: '气泡' },
- { name: '清洗', createTime: '2021.12.12 24:59:59', code: '1232131312', content: '气泡' },
- { name: '激光打孔', createTime: '2021.12.13 24:59:59', code: '2132132131', content: '气泡' },
- { name: 'AR镀膜', createTime: '2021.10.23 24:59:59', code: '2311212232', content: '气泡' },
- { name: '固化', createTime: '2021.09.22 24:59:59', code: '21321321312', content: '气泡' },
- { name: '上片', createTime: '2021.10.22 24:59:59', code: '2132132133', content: '气泡' },
- { name: '磨边', createTime: '2021.12.21 24:59:59', code: '2132131232', content: '气泡' },
- { name: '清洗', createTime: '2021.12.12 24:59:59', code: '1232131312', content: '气泡' },
- { name: '激光打孔', createTime: '2021.12.13 24:59:59', code: '2132132131', content: '气泡' },
- { name: 'AR镀膜', createTime: '2021.10.23 24:59:59', code: '2311212232', content: '气泡' },
- { name: '固化', createTime: '2021.09.22 24:59:59', code: '21321321312', content: '气泡' },
- { name: '丝网印刷', createTime: '2021.12.21 24:59:59', code: '21321322132', content: '气泡' },
- { name: '钢化炉', createTime: '2021.12.20 24:59:59', code: '21321312321', content: '气泡' },
- { name: '检测设备', createTime: '2021.12.12 24:59:59', code: '21321322132', content: '气泡' },
- { name: '包装设备', createTime: '2021.12.23 24:59:59', code: '39284982931', content: '气泡' }
-]
-const legendData1 = [
- {
- name: '设备1',
- icon: 'circle',
- value: 196
- },
- {
- name: '设备2',
- icon: 'circle',
- value: 147
- },
- {
- name: '设备3',
- icon: 'circle',
- value: 24
- },
- {
- name: '设备4',
- icon: 'circle',
- value: 85
- },
- {
- name: '设备5',
- icon: 'circle',
- value: 8
- },
- {
- name: '设备6',
- icon: 'circle',
- value: 112
- },
- {
- name: '设备7',
- icon: 'circle',
- value: 146
- },
- {
- name: '设备8',
- icon: 'circle',
- value: 27
- },
- {
- name: '设备9',
- icon: 'circle',
- value: 2
- },
- {
- name: '设备10',
- icon: 'circle',
- value: 90
- }
-]
-const legendData2 = [
- {
- name: '磨边',
- icon: 'circle',
- value: 196
- },
- {
- name: '清洗',
- icon: 'circle',
- value: 135
- },
- {
- name: '固化',
- icon: 'circle',
- value: 144
- },
- {
- name: '镀膜',
- icon: 'circle',
- value: 97
- },
- {
- name: '激光打孔',
- icon: 'circle',
- value: 12
- },
- {
- name: '丝网印刷',
- icon: 'circle',
- value: 10
- },
- {
- name: '钢化炉',
- icon: 'circle',
- value: 3
- }
-]
-const legendData3 = [
- {
- name: '钢一线',
- icon: 'circle',
- value: 196
- },
- {
- name: '钢二线',
- icon: 'circle',
- value: 133
- },
- {
- name: '钢三线',
- icon: 'circle',
- value: 24
- },
- {
- name: '钢四线',
- icon: 'circle',
- value: 77
- },
- {
- name: '钢五线',
- icon: 'circle',
- value: 77
- }
-]
const locationTableProps = [
{
prop: 'eqName',
@@ -552,107 +241,6 @@ const qualityYearList = [
{ eqName: 'RQ20230920', eqCode: '3-03', level: '成品库B-D区-4', product: ' 3.2-1033*2089', productCode: 'CP5651696323', time: '2023年9月20日' },
{ eqName: 'RQ20230920', eqCode: '1-03', level: '成品库C-D区-4', product: ' 2.2-1033*2089', productCode: 'CP5651696323', time: '2023年9月20日' }
]
-const qualityMonthTableProps = [
- {
- prop: 'lineName',
- label: '产线名'
- },
- {
- prop: 'process',
- label: '工序'
- },
- {
- prop: 'eqName',
- label: '设备名'
- },
- {
- prop: 'eqCode',
- label: '设备编码'
- },
- {
- prop: 'long',
- label: '总运行时长(h)'
- },
- // {
- // prop: 'createTime',
- // label: '保养时间'
- // },
- {
- prop: 'status',
- label: '设备状态'
- }
- // {
- // prop: 'nextCreateTime',
- // label: '下次保养时间'
- // }
- // {
- // prop: 'nextLong',
- // label: '距离保养时间(天)',
- // // subcomponent: nextDay,
- // align: 'center'
- // }
-]
-
-const qualityMonthList = [
- {
- lineName: '钢一线',
- process: '41',
- eqName: '设备1',
- eqCode: '2312312',
- long: '255',
- // createTime: '2021-02-25 12:00:01',
- status: '报警'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: 365
- },
- {
- lineName: '钢二线',
- process: '41',
- eqName: '设备2',
- eqCode: '43434',
- long: '255',
- // createTime: '2021-11-25 12:00:01',
- status: '正常'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: 4
- },
- {
- lineName: '钢三线',
- process: '41',
- eqName: '设备3',
- eqCode: '23213212',
- long: '255',
- // createTime: '2021-10-25 12:00:01',
- status: '故障停机'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: 24
- },
- {
- lineName: '钢四线',
- process: '41',
- eqName: '设备4',
- eqCode: '23213',
- long: '255',
- // createTime: '2021-02-25 12:00:01',
- status: '故障停机'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: -36
- },
- {
- lineName: '钢五线',
- process: '41',
- eqName: '设备5',
- eqCode: '23121312',
- long: '255',
- // createTime: '2021-06-25 12:00:01',
- status: '待机'
- // nextCreateTime: '2022-12-25 12:00:01',
- // nextLong: 111
- }
-]
-
-// let resizeFun = null
-
export default {
name: 'ProductionMonitoringCockpit',
components: {
@@ -676,12 +264,10 @@ export default {
times:undefined,
value: 100,
qualityYearTableProps,
- cxNameList,
inventoryTableProps,
inventoryList,
locationList,
locationTableProps,
- cxDataList,
qualityYearList,
isFullScreen: false,
orderProcessList: [
@@ -710,18 +296,12 @@ export default {
outRate: '0.4'
}
],
- qualityTableProps1,
- qualityMonthList,
- qualityMonthTableProps,
+ // qualityTableProps1,
modelMonth: '',
- qualityList1,
// logoutTime: 43200000,
- qualityTableProps2,
- qualityList2,
+ // qualityTableProps2,
+ // qualityList2,
dateType: '0',
- legendData1,
- legendData2,
- legendData3
}
},
computed: {
@@ -770,23 +350,7 @@ export default {
this.beilv2 = _this.clientWidth / 1920
})()
}
- // this.beilv2 = window.innerWidth / 1920
- // addEventListener('resize', resizeFun = () => {
- // this.beilv2 = window.innerWidth / 1920
- // })
- // erd.listenTo(document, (element) => {
- // console.log(element.offsetWidth)
- // this.beilv2 = element.offsetWidth / 1920
-
- // // var width = element.offsetWidth;
- // // var height = element.offsetHeight;
- // });
},
- // beforeDestroy() {
- // //离开页面删除检测器和所有侦听器
- // // erd.uninstall(document); //这里用ref是因为vue离开页面后获取不到dom
- // removeEventListener('resize', resizeFun)
- // },
methods: {
getTimes() {
setInterval(this.getTimesInterval, 1000);
@@ -815,32 +379,6 @@ export default {
windowWidth(value) {
this.clientWidth = value
},
- // fetchList(type) {
- // switch (type) {
- // case 'order-process':
- // return axios({
- // url: '/analysis/factory-monitor/order',
- // method: 'post'
- // }).then(res => {
- // if (res.data) {
- // console.log(res)
- // this.orderProcessList = res.data
- // // this.orderProcessList = [
- // // { id: 1, name: '订单1', outRate: 0.5 },
- // // { id: 2, name: '订单2', outRate: 0.54 },
- // // { id: 3, name: '订单3', outRate: 0.45 },
- // // { id: 4, name: '订单4', outRate: 0.65 },
- // // { id: 5, name: '订单5', outRate: 0.35 },
- // // { id: 6, name: '订单6', outRate: 0.15 },
- // // { id: 7, name: '订单7', outRate: 0.5 },
- // // { id: 8, name: '订单8', outRate: 0.5 }
- // // ]
- // } else {
- // this.orderProcessList.splice(0)
- // }
- // })
- // }
- // },
change() {
this.isFullScreen = screenfull.isFullscreen
},
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index dcea1163..57703754 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
@@ -134,143 +134,32 @@
diff --git a/src/views/OperationalOverview/components/LineRadioGroup.vue b/src/views/OperationalOverview/components/LineRadioGroup.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue
deleted file mode 100644
index 49ef81f1..00000000
--- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChart.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue
deleted file mode 100644
index 1d5ef821..00000000
--- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/BarChartOne.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue
deleted file mode 100644
index cf643a53..00000000
--- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseContainer/index.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ title }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue
deleted file mode 100644
index 84b5976b..00000000
--- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/baseTable.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
- {{ scope.row[item.prop] | commonFilter(item.filter) }}
-
-
-
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue
deleted file mode 100644
index eef54784..00000000
--- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/colorDiv.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue b/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue
deleted file mode 100644
index 961ab65f..00000000
--- a/src/views/OperationalOverview/components/ProductionAndOperationCenterCockpit/topGroup.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue b/src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue
deleted file mode 100644
index dc3cf0b7..00000000
--- a/src/views/OperationalOverview/components/ProductionLineMonitoringCockpit/nowTeam.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
- - 开始时间 -
- 2021.1.26 13:30:21
-
-
-
- - 班组名称 -
- 中班执行一组
-
-
- - 原片投入(片) -
- 122
-
-
- - 投入面积(㎡) -
- 12000
-
-
-
-
- - 产品规格 -
- 110
-
-
- - 执行工单 -
- 110
-
-
- - 成品率 -
- 98.8%
-
-
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/SimpleLineChart.vue b/src/views/OperationalOverview/components/SimpleLineChart.vue
deleted file mode 100644
index a62b7157..00000000
--- a/src/views/OperationalOverview/components/SimpleLineChart.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/alarmLevel.vue b/src/views/OperationalOverview/components/alarmLevel.vue
deleted file mode 100644
index ec999515..00000000
--- a/src/views/OperationalOverview/components/alarmLevel.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
- {{ injectData.level }}级
-
-
-
diff --git a/src/views/OperationalOverview/components/baseContainer1/index.vue b/src/views/OperationalOverview/components/baseContainer1/index.vue
deleted file mode 100644
index 78249620..00000000
--- a/src/views/OperationalOverview/components/baseContainer1/index.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ title }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/baseTable.vue b/src/views/OperationalOverview/components/baseTable.vue
index 877e6d40..7e6ee542 100644
--- a/src/views/OperationalOverview/components/baseTable.vue
+++ b/src/views/OperationalOverview/components/baseTable.vue
@@ -1,8 +1,8 @@
@@ -158,7 +158,7 @@ export default {
}
diff --git a/src/views/OperationalOverview/components/coldDoubleYChart.vue b/src/views/OperationalOverview/components/coldDoubleYChart.vue
index 12279dae..38f2f777 100644
--- a/src/views/OperationalOverview/components/coldDoubleYChart.vue
+++ b/src/views/OperationalOverview/components/coldDoubleYChart.vue
@@ -2,7 +2,7 @@
@@ -158,7 +158,7 @@ export default {
legend: {
itemWidth: 10,
itemHeight: 10,
- top: '1%',
+ top: '20',
// right: '20px',
data: ['产线产量', '产线良品率'],
textStyle: {
diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue
index 2bff2e31..532bf265 100644
--- a/src/views/OperationalOverview/components/doubleYChart .vue
+++ b/src/views/OperationalOverview/components/doubleYChart .vue
@@ -1,7 +1,7 @@
diff --git a/src/views/OperationalOverview/components/linearBarChart.vue b/src/views/OperationalOverview/components/linearBarChart.vue
index f166f979..abcd3892 100644
--- a/src/views/OperationalOverview/components/linearBarChart.vue
+++ b/src/views/OperationalOverview/components/linearBarChart.vue
@@ -1,6 +1,6 @@
@@ -19,7 +19,7 @@ export default {
},
className: {
type: String,
- default: 'chart'
+ default: 'enChart'
},
width: {
type: String,
@@ -84,7 +84,7 @@ export default {
},
methods: {
initChart(nameList, dataList) {
- console.log('1111', dataList);
+ // console.log('1111', dataList);
// console.log(1)
this.chart = echarts.init(document.getElementById(this.id))
// if (dataList.length !== 0) {
@@ -123,13 +123,7 @@ export default {
type: 'shadow' // 默认为直线,可选为:'line' | 'shadow'
}
},
- grid: {
- top: 30,
- left: '2%',
- right: '2%',
- bottom: '3%',
- containLabel: true
- },
+ grid: { top: 90, right: 60, bottom: 20, left: 90 },
// legend: {
// itemWidth: 10,
// itemHeight: 10,
@@ -205,4 +199,11 @@ export default {
}
}
-
+
diff --git a/src/views/OperationalOverview/components/nextDay.vue b/src/views/OperationalOverview/components/nextDay.vue
deleted file mode 100644
index ba01a329..00000000
--- a/src/views/OperationalOverview/components/nextDay.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- {{ injectData.nextLong }}
-
-
-
-
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
index e03ec577..e985d875 100644
--- a/src/views/OperationalOverview/components/pileBarChart.vue
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -1,7 +1,7 @@
@@ -92,18 +92,17 @@ export default {
methods: {
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
let rawData = []
- rawData.push(passRateList,wasteList)
- // console.log(1)
- const totalData = [];
- for (let i = 0; i < rawData[0].length; ++i) {
- let sum = 0;
- for (let j = 0; j < rawData.length; ++j) {
- sum += rawData[j][i];
+ let colors = ['#0fdedb', '#2359ec']
+ rawData.push(passRateList, wasteList)
+ const totalData = [];
+ for (let i = 0; i < rawData[0].length; ++i) {
+ let sum = 0;
+ for (let j = 0; j < rawData.length; ++j) {
+ sum += rawData[j][i];
+ }
+ totalData.push(sum);
}
- totalData.push(sum);
- }
- let colors = ['#0fdedb', '#2359ec' ]
- console.log('total', totalData);
+ console.log('total', totalData);
this.chart = echarts.init(document.getElementById(this.id))
const series = [
'良品',
@@ -123,55 +122,16 @@ export default {
formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
},
color:colors[sid],
- data: rawData[sid].map((d, did) =>
+ data: rawData.length != 0 ? rawData[sid].map((d, did) =>
totalData[did] <= 0 ? 0 : d / totalData[did]
- )
+ ) : []
};
});
- // let series = [
- // {
- // // 辅助系列
- // name: '良品',
- // type: 'bar',
- // stack: 'total',
- // // silent: true,
- // // itemStyle: {
- // color: '#0fdedb',
- // // },
- // // barCategoryGap: '10%',
- // barWidth: 10,
- // data: passRateList
- // },
- // {
- // type: 'bar',
- // stack: 'total',
- // name: '废品',
- // // barCategoryGap: '10%',
- // data: wasteList,
- // // barWidth: 10,
- // // barWidth: 15,
- // // label: {
- // // position: [10, 10],
- // // normal: {
- // // position: [800, -24],
- // // show: true,
- // // textStyle: {
- // // color: '#2359ec',
- // // fontSize: 16,
- // // },
- // // },
- // // },
- // }
- // ]
- // for (i = 0; i < 5; i++) {
- // series.push({
-
- // })
- // }
this.chart.setOption({
legend: {
itemWidth: 12,
itemHeight: 12,
+ top:'10',
icon: 'rect',
textStyle: {
color: '#ffffff'
diff --git a/src/views/OperationalOverview/components/threeBarChart.vue b/src/views/OperationalOverview/components/threeBarChart.vue
deleted file mode 100644
index 43fce6d1..00000000
--- a/src/views/OperationalOverview/components/threeBarChart.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/topRadioGroup.vue b/src/views/OperationalOverview/components/topRadioGroup.vue
deleted file mode 100644
index f1339253..00000000
--- a/src/views/OperationalOverview/components/topRadioGroup.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/utilChart.vue b/src/views/OperationalOverview/components/utilChart.vue
deleted file mode 100644
index cc1b553a..00000000
--- a/src/views/OperationalOverview/components/utilChart.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
- {{ percent }}%
-
-
-
-
-
diff --git a/src/views/OperationalOverview/components/videoFooter.vue b/src/views/OperationalOverview/components/videoFooter.vue
deleted file mode 100644
index d9f3fcb7..00000000
--- a/src/views/OperationalOverview/components/videoFooter.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index dcf702b4..69629afe 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
- * @LastEditTime: 2024-03-21 16:07:39
+ * @LastEditTime: 2024-03-26 17:57:44
* @Description:
-->
@@ -16,24 +16,11 @@
许昌安彩深加工看板
单位:河南汇融数字科技有限公司
{{ times }}
-
-
-
@@ -41,36 +28,18 @@
-
-
-
-
-
-
@@ -82,368 +51,62 @@
-
-
-
-
-
-
-