diff --git a/.env.dev b/.env.dev index bf3e1174..6c66dbce 100644 --- a/.env.dev +++ b/.env.dev @@ -1,8 +1,8 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2024-01-04 15:50:26 - # @LastEditors: zhp + # @LastEditTime: 2024-01-08 16:23:54 + # @LastEditors: DY # @Description: ### # 开发环境配置 @@ -27,7 +27,6 @@ VUE_APP_BASE_API = 'http://10.70.2.2:8080' VUE_APP_Socket_API = 'ws://10.70.2.2:8080' -# VUE_APP_BASE_API = 'http://100.64.0.23:48082' # 积木报表指向地址 VUE_APP_JIMU_API = 'http://10.70.2.22:8080' diff --git a/src/main.js b/src/main.js index cf12f4cc..82128eca 100644 --- a/src/main.js +++ b/src/main.js @@ -9,7 +9,7 @@ import store from './store'; import router from './router'; import directive from './directive'; // directive import plugins from './plugins'; // plugins -// import { borderBox1 } from '@jiaminghi/data-view' +import { scrollBoard } from '@jiaminghi/data-view' import './assets/icons'; // icon import './permission'; // permission control @@ -79,7 +79,7 @@ Vue.use(CodeBrickZj) Vue.use(directive); Vue.use(plugins); Vue.use(VueMeta); -// Vue.use(dataV) +Vue.use(scrollBoard) // Vue.use(hljs.vuePlugin); import scroll from 'vue-seamless-scroll' Vue.use(scroll) diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index 7966e519..7b69b33e 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -20,11 +20,71 @@ const state = { gasChartWeekTrend:{}, // 烟气 gasChartMonthTrend:{}, // 烟气 gasChartYearTrend:{}, // 烟气 + israCheckType: [], israDayStatistic: [],//缺陷统计 israWeekStatistic: [],//缺陷统计 israMonthStatistic: [],//缺陷统计 israYearStatistic: [],//缺陷统计 - productline: [] // 产线产量及良品率 + productline: [{ + "creator": "1", + "sumOutputNum": 15, + "outputNum": 15, + "passRate": 0.6, + "lineName": "3#深加工", + "updateTime": "2024-01-04T16:00:19", + "updater": "1", + "inputNum": 15, + "deleted": false, + "recordTime": "2023-12-25T20:00:00", + "createTime": "2023-10-13T10:44:27", + "tenantId": 1, + "id": 1712660539187441666, + "productionLineId": 1737313260027285506, + "sumInputNum": 15 + }, { + "creator": "1", + "sumOutputNum": 49, + "outputNum": 16, + "passRate": 0.3, + "lineName": "2#深加工", + "updateTime": "2024-01-04T16:00:19", + "updater": "1", + "inputNum": 17, + "deleted": false, + "recordTime": "2023-12-25T20:00:00", + "createTime": "2023-10-13T10:44:27", + "tenantId": 1, + "id": 1712660539187441665, + "productionLineId": 1737313119178362881, + "sumInputNum": 47 + }, { + "creator": "1", + "sumOutputNum": 29, + "outputNum": 18, + "passRate": 0.5, + "lineName": "1#深加工", + "updateTime": "2024-01-04T16:00:19", + "updater": "1", + "inputNum": 20, + "deleted": false, + "recordTime": "2023-12-25T20:00:00", + "createTime": "2023-10-13T10:43:17", + "tenantId": 1, + "id": 1712660244285927426, + "productionLineId": 1737312466842456065, + "sumInputNum": 27 + }], // SJG产线产量及良品率 + sjgEquipment:[ + {name: 'sadd', error:false,code: 'EQ202312121624540000072',status: "正常"} + ],// SJG设备报警 + workOrder: [], // 工单监控 + defectSum: [], // 缺陷汇总 + order: [],// 订单完成情况 + yieldRateTable: [],// 本日生产良率table + cutChartDay:[], + cutChartWeek:[], + cutChartMonth:[], + cutChartYear:[] }; const mutations = { SET_FANFREQUENCYINFO: (state, fanFrequencyInfo) => { @@ -73,12 +133,13 @@ const mutations = { state.exhaustGasInfo = exhaustGasInfo }, SET_EXHAUSTGASCHART: (state, exhaustGasChart) => { - state.gasChartDayTrend = exhaustGasChart.gasChartDayTrend - state.gasChartWeekTrend = exhaustGasChart.gasChartWeekTrend - state.gasChartMonthTrend = exhaustGasChart.gasChartMonthTrend - state.gasChartYearTrend = exhaustGasChart.gasChartYearTrend + state.gasChartDayTrend = exhaustGasChart.dayTrend + state.gasChartWeekTrend = exhaustGasChart.weekTrend + state.gasChartMonthTrend = exhaustGasChart.monthTrend + state.gasChartYearTrend = exhaustGasChart.yearTrend }, SET_DEFECTCHART: (state, israStatistic) => { + state.israCheckType = israStatistic.checkType state.israDayStatistic = israStatistic.dayStatistic state.israWeekStatistic = israStatistic.weekStatistic state.israMonthStatistic = israStatistic.monthStatistic @@ -86,6 +147,33 @@ const mutations = { }, SET_PRODUCTLINE: (state, productline) => { state.productline = productline + }, + SET_SJGEQ: (state, equipment) => { + state.sjgEquipment = equipment + }, + SET_WORKORDER: (state, workOrder) => { + state.workOrder = workOrder + }, + SET_DEFECTSUM: (state, defectSum) => { + state.defectSum = defectSum + }, + SET_ORDER: (state, order) => { + state.order = order + }, + SET_YIELDRATETABLE: (state, yieldRateTable) => { + state.yieldRateTable = yieldRateTable + }, + SET_CUTCHARDAY: (state, cutChartDay) => { + state.cutChartDay = cutChartDay + }, + SET_CUTCHARWEEK: (state, cutChartWeek) => { + state.cutChartWeek = cutChartWeek + }, + SET_CUTCHARMONTH: (state, cutChartMonth) => { + state.cutChartMonth = cutChartMonth + }, + SET_CUTCHARYEAR: (state, cutChartYear) => { + state.cutChartYear = cutChartYear } }; const actions = { @@ -130,6 +218,33 @@ const actions = { setProductline({ commit }, productline) { commit('SET_PRODUCTLINE', productline.payload) }, + setSJGEq({ commit }, equipment) { + commit('SET_SJGEQ', equipment.payload) + }, + setWorkOrder({ commit }, workOrder) { + commit('SET_WORKORDER', workOrder.payload) + }, + setDefectSum({ commit }, defectSum) { + commit('SET_DEFECTSUM', defectSum.payload) + }, + setOrder({ commit }, order) { + commit('SET_ORDER', order.payload) + }, + setYieldRateTable({ commit }, yieldRateTable) { + commit('SET_YIELDRATETABLE', yieldRateTable.payload) + }, + setCutChartDay({ commit }, cutChartDay) { + commit('SET_CUTCHARDAY', cutChartDay.payload) + }, + setCutChartWeek({ commit }, cutChartWeek) { + commit('SET_CUTCHARWEEK', cutChartWeek.payload) + }, + setCutChartMonth({ commit }, cutChartMonth) { + commit('SET_CUTCHARMONTH', cutChartMonth.payload) + }, + setCutChartYear({ commit }, cutChartYear) { + commit('SET_CUTCHARYEAR', cutChartYear.payload) + } }; export default { namespaced: true, diff --git a/src/styles/index.scss b/src/styles/index.scss index d162abed..7c145d7e 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -200,4 +200,12 @@ input, textarea{ // 弹出框,上下分布,去掉label的padding-bottom .el-form--label-top .el-form-item__label { padding: 0; +} + +// 大屏滚动表格 +.dv-scroll-board .rows .ceil, .dv-scroll-board .header .header-item { + border-right: 1px solid rgba(13, 23, 40, 1); +} +.dv-scroll-board .rows .ceil:last-child, .dv-scroll-board .header .header-item:last-child { + border-right: none; } \ No newline at end of file diff --git a/src/views/base/coreProduct/add-or-updata.vue b/src/views/base/coreProduct/add-or-updata.vue index 8c855299..0b2923e3 100644 --- a/src/views/base/coreProduct/add-or-updata.vue +++ b/src/views/base/coreProduct/add-or-updata.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: DY - * @LastEditTime: 2023-12-06 10:36:56 + * @LastEditTime: 2024-01-08 16:11:03 * @Description: -->