From e8cc1fc50b32559fd6e1c07a9c2635805dde76d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’> Date: Wed, 13 Sep 2023 16:00:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 10 +- src/api/core/analysis/index.js | 24 ++ src/api/core/monitoring/index.js | 16 + src/assets/images/pay/icon/alipay_app.svg | 2 +- src/views/base/equipmentPlcConnect/http.js | 9 +- src/views/core/analysis/LineChart.vue | 93 +++++ .../core/analysis/balanceAnalysis/index.vue | 331 ++++++++++-------- .../core/analysis/yieldAnalysis/index.vue | 233 +++++++----- .../sectionStatisticsSearch/index.vue | 79 +++-- 9 files changed, 534 insertions(+), 263 deletions(-) create mode 100644 src/api/core/analysis/index.js create mode 100644 src/api/core/monitoring/index.js create mode 100644 src/views/core/analysis/LineChart.vue diff --git a/.env.dev b/.env.dev index e5856184..ab61468a 100644 --- a/.env.dev +++ b/.env.dev @@ -1,10 +1,10 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-09-11 15:55:29 - # @LastEditors: DY - # @Description: -### + # @LastEditTime: 2023-09-12 14:01:15 + # @LastEditors: zhp + # @Description: +### # 开发环境配置 ENV = 'development' @@ -12,7 +12,7 @@ ENV = 'development' VUE_APP_TITLE = 芋道管理系统 # 芋道管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.1.49:48080' +VUE_APP_BASE_API = 'http://192.168.1.188:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080' # VUE_APP_BASE_API = 'http://192.168.0.33:48080' # VUE_APP_BASE_API = 'http://192.168.1.188:48080' diff --git a/src/api/core/analysis/index.js b/src/api/core/analysis/index.js new file mode 100644 index 00000000..af791ff5 --- /dev/null +++ b/src/api/core/analysis/index.js @@ -0,0 +1,24 @@ +/* + * @Author: zhp + * @Date: 2023-09-12 14:07:04 + * @LastEditTime: 2023-09-13 09:53:45 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +export function getYieldAnalysisPageData(data) { + return request({ + url: '/analysis/production-analysis/getOutput', + method: 'post', + data: data + }) +} + +export function getCT(data) { + return request({ + url: '/analysis/production-analysis/getCT', + method: 'post', + data: data + }) +} diff --git a/src/api/core/monitoring/index.js b/src/api/core/monitoring/index.js new file mode 100644 index 00000000..13eb6963 --- /dev/null +++ b/src/api/core/monitoring/index.js @@ -0,0 +1,16 @@ +/* + * @Author: zhp + * @Date: 2023-09-12 14:07:04 + * @LastEditTime: 2023-09-13 09:46:44 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +export function getSectionDataSearch(data) { + return request({ + url: '/monitoring/production-monitor/getSectionDataSearch', + method: 'post', + data: data + }) +} diff --git a/src/assets/images/pay/icon/alipay_app.svg b/src/assets/images/pay/icon/alipay_app.svg index ebf11883..c77a3d9f 100644 --- a/src/assets/images/pay/icon/alipay_app.svg +++ b/src/assets/images/pay/icon/alipay_app.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/views/base/equipmentPlcConnect/http.js b/src/views/base/equipmentPlcConnect/http.js index 16544450..b87d0ed7 100644 --- a/src/views/base/equipmentPlcConnect/http.js +++ b/src/views/base/equipmentPlcConnect/http.js @@ -1,6 +1,13 @@ +/* + * @Author: zhp + * @Date: 2023-09-11 16:18:44 + * @LastEditTime: 2023-09-12 14:25:01 + * @LastEditors: zhp + * @Description: + */ import Mock from 'mockjs'; -const baseURL = 'http://192.168.1.49:48080/admin-api'; +const baseURL = 'http://192.168.1.188:48080/admin-api'; Mock.setup({ timeout: 200, diff --git a/src/views/core/analysis/LineChart.vue b/src/views/core/analysis/LineChart.vue new file mode 100644 index 00000000..49c1565f --- /dev/null +++ b/src/views/core/analysis/LineChart.vue @@ -0,0 +1,93 @@ + + + + diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue index e0de210b..a3a2ca3f 100644 --- a/src/views/core/analysis/balanceAnalysis/index.vue +++ b/src/views/core/analysis/balanceAnalysis/index.vue @@ -1,159 +1,200 @@ - diff --git a/src/views/core/analysis/yieldAnalysis/index.vue b/src/views/core/analysis/yieldAnalysis/index.vue index ee6a5ce5..ed38a9fb 100644 --- a/src/views/core/analysis/yieldAnalysis/index.vue +++ b/src/views/core/analysis/yieldAnalysis/index.vue @@ -1,114 +1,95 @@ + + diff --git a/src/views/core/monitoring/sectionStatistics/index.vue b/src/views/core/monitoring/sectionStatistics/index.vue index 0aeaf6ad..152f4acd 100644 --- a/src/views/core/monitoring/sectionStatistics/index.vue +++ b/src/views/core/monitoring/sectionStatistics/index.vue @@ -1,7 +1,7 @@ @@ -9,6 +9,7 @@
import { parseTime } from '../../mixins/code-filter'; -import { - getFactoryPage, - exportFactoryExcel, -} from '@/api/core/base/factory'; +import { getWorkshopSectionList, getPdList, getSectionAutoReport } from '@/api/core/monitoring/sectionStatistics' const tableProps = [ { - prop: 'code', - label: '产线类型', - align: 'center', + prop: 'reportType', + label: '产线类型' }, { - prop: 'createTime', + prop: 'reportStartTime', label: '统计开始时间', - align: 'center', filter: parseTime, }, { - prop: 'createTime3', + prop: 'reportEndTime', label: '统计结束时间', - align: 'center', filter: parseTime, }, { - prop: 'name', - label: '产线名称', - align: 'center', + prop: 'lineName', + label: '产线名称' }, { - prop: 'name1', - label: '工段名称', - align: 'center', + prop: 'sectionName', + label: '工段名称' }, { - prop: 'address', - label: '投入数量/片', - align: 'center', + prop: 'inputNum', + label: '投入数量/片' }, { - prop: 'remark44', - label: '产出数量/片', - align: 'center', + prop: 'outputNum', + label: '产出数量/片' }, { - prop: 'remark23', - label: '产出面积/㎡', - align: 'center', + prop: 'outputArea', + label: '产出面积/㎡' }, { - prop: 'remark145', - label: '损耗数量/片', - align: 'center', + prop: 'lossNum', + label: '损耗数量/片' }, { - prop: 'remark22', - label: '损耗面积/㎡', - align: 'center', + prop: 'lossArea', + label: '损耗面积/㎡' }, { - prop: 'remark1', - label: '损耗比例%', - align: 'center', + prop: 'lossRatio', + label: '损耗比例%' } ]; @@ -107,15 +94,8 @@ export default { data() { return { urlOptions: { - getDataListURL: getFactoryPage, - exportURL: exportFactoryExcel, + getDataListURL: getSectionAutoReport }, - urlOptions: { - getDataListURL: '', - deleteURL: '', - statusUrl: '', - exportURL: '' - }, tableData: [], listQuery: { pageSize: 10, @@ -145,8 +125,21 @@ export default { { type: 'select', label: '报表类型', - selectOptions: [], - param: 'name', + selectOptions: [ + { + id: 1, + name: '日' + }, + { + id: 2, + name: '周' + }, + { + id: 3, + name: '月' + } + ], + param: 'reportType', }, { type: 'datePicker', @@ -158,8 +151,7 @@ export default { startPlaceholder: '开始时间', endPlaceholder: '结束时间', param: 'timeVal', - defaultSelect: [], - width: 350 + defaultSelect: [] }, { type: 'button', @@ -180,8 +172,20 @@ export default { ], }; }, - created() {}, + created() { + this.getDataList() + this.getPdLineList() + }, methods: { + getPdLineList() { + getPdList().then((res) => { + this.formConfig[0].selectOptions = res.data || [] + }) + // 获取工段list + getWorkshopSectionList().then((res) => { + this.formConfig[1].selectOptions = res.data || [] + }) + }, selectChange(val) { console.log(val) this.selectedList = val @@ -191,8 +195,11 @@ export default { case 'search': this.listQuery.pageNo = 1; this.listQuery.pageSize = 10; - this.listQuery.name = val.name; - this.listQuery.code = val.code; + this.listQuery.lineId = val.line ? val.line : undefined; + this.listQuery.sectionId = val.section ? val.section : undefined; + this.listQuery.reportType = val.reportType ? val.reportType : undefined; + this.listQuery.reportStartTime = [new Date(val.timeVal[0]).getTime()]; + this.listQuery.reportEndTime = [new Date(val.timeVal[1]).getTime()]; this.getDataList(); break; case 'export': @@ -206,7 +213,10 @@ export default { getDataList() { this.dataListLoading = true; this.urlOptions.getDataListURL(this.listQuery).then(response => { - this.tableData = response.data.list; + this.tableData = response.data.list.map(item => { + item.reportType = item.reportType === 1 ? '日' : item.reportType === 2 ? '周' : '月' + return item + }); this.total = response.data.total; this.dataListLoading = false; }); From bc5d3d44d5ca65527d97d1539aa8702d36949d73 Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Sat, 16 Sep 2023 17:51:09 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- .../core/analysis/balanceAnalysis/index.vue | 115 +++++++++---- src/views/core/monitoring/auto/index.vue | 32 ++-- src/views/core/monitoring/data/index.vue | 74 ++++++++- src/views/core/monitoring/data24/index.vue | 156 ++++++++++-------- .../monitoring/sectionStatistics/index.vue | 98 +++++++++-- 6 files changed, 344 insertions(+), 133 deletions(-) diff --git a/.env.dev b/.env.dev index 2dc89b0f..d9a29fce 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-09-15 14:38:26 + # @LastEditTime: 2023-09-16 09:41:07 # @LastEditors: DY # @Description: ### diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue index a3a2ca3f..ffa09229 100644 --- a/src/views/core/analysis/balanceAnalysis/index.vue +++ b/src/views/core/analysis/balanceAnalysis/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/energy/monitoring/energyReportSearch/index.vue b/src/views/energy/monitoring/energyReportSearch/index.vue index b14bef5c..db0166b2 100644 --- a/src/views/energy/monitoring/energyReportSearch/index.vue +++ b/src/views/energy/monitoring/energyReportSearch/index.vue @@ -118,16 +118,16 @@ export default { window.addEventListener('resize', () => { this.tableH = this.tableHeight(260) }) - this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()] + if (this.$route.params.startTime && this.$route.params.endTime) { + this.formConfig[2].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime] + } else { + this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()] + } this.queryParams.startTime = this.formConfig[2].defaultSelect[0] this.queryParams.endTime = this.formConfig[2].defaultSelect[1] this.getList() this.getTypeList() }, - mounted() { - console.log(this.$route.params.name) - console.log('22222') - }, methods: { getTypeList() { getEnergyTypeListAll().then((res) => { diff --git a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue index fd021693..e31166b6 100644 --- a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue +++ b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue @@ -75,7 +75,7 @@ export default { { type: 'input', label: '参数名称', - placeholder: '方案名称', + placeholder: '参数名称', param: 'paramName' }, { diff --git a/src/views/group/base/groupClasses/components/groupClassAdd.vue b/src/views/group/base/groupClasses/components/groupClassAdd.vue index 4154787d..52272a1e 100644 --- a/src/views/group/base/groupClasses/components/groupClassAdd.vue +++ b/src/views/group/base/groupClasses/components/groupClassAdd.vue @@ -46,7 +46,7 @@ format='HH:mm' value-format='HH:mm' style="width: 100%;" - @change="timeFun" + @change="timeFun('start')" > @@ -58,7 +58,7 @@ format='HH:mm' value-format='HH:mm' style="width: 100%;" - @change="timeFun" + @change="timeFun('end')" > @@ -126,12 +126,19 @@ export default { }) } }, - timeFun() { + timeFun(val) { if (this.form.startTime && this.form.endTime) { if (this.form.startTime > this.form.endTime) { this.form.daySpan = 1 - } else { + } else if (this.form.startTime < this.form.endTime) { this.form.daySpan = 0 + } else { + if (val === 'start') { + this.form.startTime = '' + } else { + this.form.endTime = '' + } + this.$modal.msgWarning('班次开始时间和结束时间不能相同') } } }, diff --git a/src/views/group/base/groupClasses/index.vue b/src/views/group/base/groupClasses/index.vue index cf629042..0e065e83 100644 --- a/src/views/group/base/groupClasses/index.vue +++ b/src/views/group/base/groupClasses/index.vue @@ -116,7 +116,17 @@ export default { : undefined, { type: 'cancel', - btnName: '作废' + btnName: '作废', + showParam: { + type: '&', + data: [ + { + type: 'unequal', + name: 'status', + value: '不可用' + } + ] + } }, this.$auth.hasPermi('base:group-classes:delete') ? { @@ -225,8 +235,9 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - if (row.status) { - let _this = this + console.log(row) + let _this = this + if (row.status === '可用') {// 可用 _this.$modal.confirm('删除的班次"' + row.name + '"可能会影响交接班计划，请点取消再次确认！').then(function() { return _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function() { return deleteGroupClasses(row.id); diff --git a/src/views/group/base/groupTeam/components/groupTeamAdd.vue b/src/views/group/base/groupTeam/components/groupTeamAdd.vue index 628a601c..d1f7967b 100644 --- a/src/views/group/base/groupTeam/components/groupTeamAdd.vue +++ b/src/views/group/base/groupTeam/components/groupTeamAdd.vue @@ -7,7 +7,7 @@ - + diff --git a/src/views/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue index 11bb250a..c1cb2e50 100644 --- a/src/views/group/base/groupTeamScheduling/index.vue +++ b/src/views/group/base/groupTeamScheduling/index.vue @@ -37,7 +37,6 @@ 班组上下片查询 班组能源查询 班组检测查询 - 查询
@@ -66,7 +65,7 @@
- + { - this.list = res.data || [] + let obj = res.data || {} + if (obj) { + for (let item in obj) { + for (let i = 0; i < obj[item].length; i++) { + if (!obj[item][i].teamId) { + obj[item][i].teamId = '' + } + } + } + } + this.list = obj }).catch(() => { - this.list = [] + this.list = {} this.settingBtnDis = true // 禁用设置按钮 }) }, @@ -287,10 +174,18 @@ export default { }, // 确认 confirmSetting() { + let num = 0 + // 当月数据的话，今天及今天之前的不传 + if (moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')) { + num = Number(moment().format('DD')) + } else { + num = 0 + } + // 下月数据全部都传 // 打平数据 let tempArr = Object.values(this.list) let arr = [] - for (let i = 0; i < tempArr.length; i++) { + for (let i = num; i < tempArr.length; i++) { for (let j = 0; j < tempArr[i].length; j++) { arr.push(tempArr[i][j]) } @@ -298,6 +193,7 @@ export default { createOrUpdateList(arr).then(res => { if (res.code === 0) { this.showSetting = !this.showSetting + this.$modal.msgSuccess("操作成功") this.getList() // 数据更新 } }) @@ -314,9 +210,9 @@ export default { }, // 自动排班 schedulingBtn() { + let tempData = this.list // 次月1号有值前端排班 if (this.list[1][0].teamId) { - console.log('次月1号有值前端排班') let tempArr = Object.values(this.list) let arr = [] let n = 0 @@ -332,27 +228,24 @@ export default { } } } - console.log(arr) + let tempNum = 0 for (let k = 0; k < tempArr.length; k++) { for (let v = 0; v < tempArr[k].length; v++) { - let t = (k*(k+1)+v) % arr.length - // console.log(t) + let t = tempNum % arr.length if (arr.length === 1) { - this.list[k+1][v].teamId = arr[0] + tempData[k+1][v].teamId = arr[0] } else { - if (k === 0 && v === 0) { - this.list[k+1][v].teamId = arr[0] - } else { - this.list[k+1][v].teamId = arr[t] - } + tempData[k+1][v].teamId = arr[t] } + tempNum++ } } + this.list = [] + this.list = tempData } else { // 次月1号没有值,接口排班 - console.log('次月1号没有值接口排班') autoSet().then(res => { - this.list = res.data || [] + this.list = res.data || {} }) } }, @@ -389,33 +282,24 @@ export default { switch (val) { case '1': this.$router.push({ - path: '/core/monitoring/production-line-data', - // name: 'reportDesign', - params: { startTime: '1111', endTime: '2222' } + // path: '/core/monitoring/production-line-data', + name: 'ProductionLineData', + params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime } }) break; - case '2': + case '2': // 能源 this.$router.push({ - // path: '/energy/monitoring/energy-report-search', name: 'EnergyReportSearch', - params: { startTime: '1111', endTime: '2222' } + params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime } }) - console.log('aaa') break; default: this.$router.push({ - path: '/quality/monitoring/quality-statistics', - // name: 'reportDesign', - params: { startTime: '1111', endTime: '2222' } + // path: '/quality/monitoring/quality-statistics', + name: 'QualityStatistics', + params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime } }) } - }, - aaa() { - console.log(this.list) - }, - a() { - console.log('11111') - this.$forceUpdate() } } } From 5a314982249f7293fa1a7addd7fd861f161ec81e Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Tue, 19 Sep 2023 15:45:16 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 5 - src/assets/icons/svg/downward.svg | 12 + src/assets/icons/svg/upward.svg | 14 + src/assets/styles/index.scss | 13 +- src/main.js | 7 + .../components/searchArea.vue | 332 ++++++++++-------- .../analysis/contrastAnalysis/index.vue | 14 +- .../trendAnalysis/components/searchArea.vue | 292 ++++++++------- .../energy/analysis/trendAnalysis/index.vue | 13 +- .../energyType/components/energyTypeAdd.vue | 16 +- .../energy/monitoring/energyReport/index.vue | 8 +- .../monitoring/energyReportSearch/index.vue | 8 +- .../group/base/groupTeamScheduling/index.vue | 1 - .../monitoring/qualityStatistics/index.vue | 9 + 14 files changed, 451 insertions(+), 293 deletions(-) create mode 100644 src/assets/icons/svg/downward.svg create mode 100644 src/assets/icons/svg/upward.svg diff --git a/.env.dev b/.env.dev index 8a59d958..c54395cd 100644 --- a/.env.dev +++ b/.env.dev @@ -14,13 +14,8 @@ VUE_APP_TITLE = 芋道管理系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080' -<<<<<<< HEAD VUE_APP_BASE_API = 'http://192.168.0.33:48080' # VUE_APP_BASE_API = 'http://192.168.1.188:48080' -======= -# VUE_APP_BASE_API = 'http://192.168.0.33:48080' -VUE_APP_BASE_API = 'http://192.168.1.188:48080' ->>>>>>> test # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/assets/icons/svg/downward.svg b/src/assets/icons/svg/downward.svg new file mode 100644 index 00000000..995bcbc7 --- /dev/null +++ b/src/assets/icons/svg/downward.svg @@ -0,0 +1,12 @@ + + + 下拉展开 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/upward.svg b/src/assets/icons/svg/upward.svg new file mode 100644 index 00000000..ef5c4fcf --- /dev/null +++ b/src/assets/icons/svg/upward.svg @@ -0,0 +1,14 @@ + + + 收起 + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 5f755fb8..ca85a160 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -13,8 +13,17 @@ body { font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; } -label { - font-weight: 700; +// label { +// font-weight: 700; +// } +.searchBarBox .el-form-item--medium .el-form-item__label { + line-height: 40px; +} +.searchBarBox .el-form-item--medium .el-form-item__content { + line-height: 40px; +} +.searchBarBox .el-range-editor--small.el-input__inner { + height: 34px; } html { diff --git a/src/main.js b/src/main.js index 4d698738..eb160008 100644 --- a/src/main.js +++ b/src/main.js @@ -52,6 +52,13 @@ Vue.prototype.divide = divide; Vue.prototype.tableHeight = function(n) { return window.innerHeight - n } +Vue.prototype.searchBarWidth = function(name, num) { + if (document.getElementById(name) && document.getElementById(name).offsetWidth < num) { + return true + } else { + return false + } +} // 全局组件挂载 Vue.component('DictTag', DictTag); diff --git a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue index d8e7c1fd..9fb93919 100644 --- a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue +++ b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue @@ -1,151 +1,160 @@ diff --git a/src/views/core/monitoring/data/index.vue b/src/views/core/monitoring/data/index.vue index 7b0e6a0c..cf419c8f 100644 --- a/src/views/core/monitoring/data/index.vue +++ b/src/views/core/monitoring/data/index.vue @@ -1,7 +1,7 @@ @@ -157,6 +157,11 @@ export default { }; }, created() { + if (this.$route.params.startTime) { + this.formConfig[1].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime] + } + // const time = new Date() + // this.formConfig[1].defaultSelect = [time, time] this.getDataList() this.getPdLineList() }, From ebcf3d4d78f6735990418eab0869490894737c8b Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Wed, 20 Sep 2023 16:57:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base/groupTeamScheduling.js | 5 +- .../components/searchArea.vue | 2 +- .../trendAnalysis/components/searchArea.vue | 2 +- .../base/energyQuantityRealtime/index.vue | 67 ++++++++++++++++--- .../energyLimit/components/energyLimitAdd.vue | 18 ++++- .../energy/monitoring/energyLimit/index.vue | 3 +- .../monitoring/energyReportSearch/index.vue | 19 +++++- .../group/base/groupTeamScheduling/index.vue | 6 +- .../monitoring/qualityStatistics/index.vue | 17 +++++ 9 files changed, 118 insertions(+), 21 deletions(-) diff --git a/src/api/base/groupTeamScheduling.js b/src/api/base/groupTeamScheduling.js index 8fd9caac..95e38dd6 100644 --- a/src/api/base/groupTeamScheduling.js +++ b/src/api/base/groupTeamScheduling.js @@ -19,9 +19,10 @@ export function createOrUpdateList(data) { } // 自动排班，填充上月已有的排班 -export function autoSet() { +export function autoSet(query) { return request({ url: '/base/group-team-scheduling/autoSet', - method: 'get' + method: 'get', + params: query }) } \ No newline at end of file diff --git a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue index 9fb93919..3557d29e 100644 --- a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue +++ b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue @@ -443,7 +443,7 @@ export default { background-color: #0B58FF; border-radius: 1px; margin-right: 8px; - margin-top: 10px; + margin-top: 12px; } } diff --git a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue index a2b064aa..67842ab3 100644 --- a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue +++ b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue @@ -407,7 +407,7 @@ export default { background-color: #0B58FF; border-radius: 1px; margin-right: 8px; - margin-top: 10px; + margin-top: 12px; } } diff --git a/src/views/energy/base/energyQuantityRealtime/index.vue b/src/views/energy/base/energyQuantityRealtime/index.vue index d642fa61..9b63c40b 100644 --- a/src/views/energy/base/energyQuantityRealtime/index.vue +++ b/src/views/energy/base/energyQuantityRealtime/index.vue @@ -13,7 +13,9 @@ :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list" + :selectWidth="55" :max-height="tableH" + @selection-change="selectChange" />