From 69a65b32eab4f789674d2ae6b0bd88a8eeb22cfa Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Thu, 14 Dec 2023 15:48:35 +0800 Subject: [PATCH] =?UTF-8?q?12.14=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.js | 1 + .../base/energyQuantityManual/index.vue | 2 +- .../energyLimit/components/energyLimitAdd.vue | 7 ++++--- .../groupClasses/components/groupClassAdd.vue | 11 +++++++++- .../base/orderManage/orderDetailData.vue | 2 +- .../environmental/components/lineChart.vue | 3 +-- .../voc/vocDetectionIndication/index.vue | 2 +- .../environmental/voc/vocManagement/index.vue | 20 +++++++++++------- .../wasteGasDetectionIndication/index.vue | 2 +- .../wasteGas/wasteGasManagement/index.vue | 18 ++++++++++------ .../wasteWaterDetectionIndication/index.vue | 2 +- .../wasteWater/wasteWaterManagement/index.vue | 21 ++++++++++++------- 12 files changed, 59 insertions(+), 32 deletions(-) diff --git a/src/utils/dict.js b/src/utils/dict.js index 7030db51..9c500f2e 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -102,6 +102,7 @@ export const DICT_TYPE = { ORDER_ORIGIN: 'order_Origin', ORDER_PRIORITY: 'order_priority', PACK_SPEC: 'pack_spec', + WORK_ORDER_STATUS: 'work_order_status', // ============== EQUIPMENT - 设备模块 ============= MAINTAIN_TYPE: 'maintain_type', diff --git a/src/views/energy/base/energyQuantityManual/index.vue b/src/views/energy/base/energyQuantityManual/index.vue index 39d25b8b..49b80890 100644 --- a/src/views/energy/base/energyQuantityManual/index.vue +++ b/src/views/energy/base/energyQuantityManual/index.vue @@ -106,7 +106,7 @@ export default { }, { type: 'datePicker', - label: '时间', + label: '抄表日期', dateType: 'daterange', format: 'yyyy-MM-dd', valueFormat: "timestamp", diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue index 6a26d269..0650b380 100644 --- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue +++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue @@ -118,8 +118,8 @@ export default { type: '', plcParamId: '', limitType: '', - minValue: null, - maxValue: null + minValue: 0, + maxValue: 0 }, objIds: [],// 回显数组 isEdit: false, //是否是编辑 @@ -239,7 +239,8 @@ export default { return false } } - // this.form.limitType = Number(this.form.limitType) + this.form.minValue = this.form.minValue || 0 + this.form.maxValue = this.form.maxValue || 0 if (this.isEdit) { // 编辑 updateEnergyLimit({...this.form}).then((res) => { diff --git a/src/views/group/base/groupClasses/components/groupClassAdd.vue b/src/views/group/base/groupClasses/components/groupClassAdd.vue index e25a79c9..628bf6b4 100644 --- a/src/views/group/base/groupClasses/components/groupClassAdd.vue +++ b/src/views/group/base/groupClasses/components/groupClassAdd.vue @@ -116,7 +116,16 @@ export default { getGroupClasses(id).then((res) => { if (res.code === 0) { this.form = res.data - this.form.disableTime = res.data.disableTime || '' + this.form.name = res.data.name + this.form.code = res.data.code + this.form.enableTime = res.data.enableTime + // this.form.disableTime = res.data.disableTime || null + this.$set(this.form, 'disableTime', res.data.disableTime || null) + this.form.startTime = res.data.startTime + this.form.endTime = res.data.endTime + this.form.daySpan = res.data.daySpan + this.form.remark = res.data.remark + console.log(this.form) } }) } else { diff --git a/src/views/order/base/orderManage/orderDetailData.vue b/src/views/order/base/orderManage/orderDetailData.vue index cffafbe2..d0e22226 100644 --- a/src/views/order/base/orderManage/orderDetailData.vue +++ b/src/views/order/base/orderManage/orderDetailData.vue @@ -165,7 +165,7 @@ const tableProps1 = [ { prop: 'status', label: '状态', - filter: publicFormatter('order_status') + filter: publicFormatter('work_order_status') }, { prop: 'startProduceTime', diff --git a/src/views/safetyEnvironmental/environmental/components/lineChart.vue b/src/views/safetyEnvironmental/environmental/components/lineChart.vue index 05860c12..0db397d9 100644 --- a/src/views/safetyEnvironmental/environmental/components/lineChart.vue +++ b/src/views/safetyEnvironmental/environmental/components/lineChart.vue @@ -68,7 +68,6 @@ export default { } obj.name = item obj.type = 'line' - obj.stack = 'Total' obj.symbol = 'none' obj.data = data seriesData.push(obj) @@ -118,7 +117,7 @@ export default { } }, grid: { - left: '3%', + left: '4%', right: '2%', bottom: '3%', containLabel: true diff --git a/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue index 356822e0..21444f6f 100644 --- a/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue +++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue @@ -56,7 +56,7 @@ const tableProps = [ }, { prop: 'code', - label: '指示编码', + label: '指标编码', minWidth: 120 }, { diff --git a/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue index eaf0dccd..ab5ccdd5 100644 --- a/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue +++ b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue @@ -35,13 +35,14 @@ import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental' import LineChart from './../../components/lineChart' import SearchArea from './../../components/searchArea' +import moment from 'moment' export default { name: 'Voc', data(){ return { realtimeList:[], queryParams:{ - checkType: 1, + checkType: 3, timeDim: null, timeRange: [] }, @@ -51,6 +52,9 @@ export default { components: { LineChart, SearchArea }, mounted() { this.getMsg() + this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时 + this.queryParams.timeRange = [moment().startOf('day')+0, moment().endOf('day')-59*61*1000] + this.getTrend() }, methods: { getMsg() { @@ -59,19 +63,21 @@ export default { this.realtimeList = res.data || [] }) }, - getTrend(params) { - console.log(params) - this.queryParams.timeDim = params.timeDim - this.queryParams.timeRange[0] = params.startTime - this.queryParams.timeRange[1] = params.endTime + getTrend() { environmentalCheckRealtimeTrend({...this.queryParams}).then(res => { - console.log(res) if (res.code === 0) { this.chartData = res.data } else { this.chartData = {} } }) + }, + submitClick(params) { + console.log(params) + this.queryParams.timeDim = params.timeDim + this.queryParams.timeRange[0] = params.startTime + this.queryParams.timeRange[1] = params.endTime + this.getTrend() } } } diff --git a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue index 58c113b9..3a4a5fe5 100644 --- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue +++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue @@ -56,7 +56,7 @@ const tableProps = [ }, { prop: 'code', - label: '指示编码', + label: '指标编码', minWidth: 120 }, { diff --git a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue index 854cb516..3e0e80f4 100644 --- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue +++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue @@ -35,6 +35,7 @@ import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental' import LineChart from './../../components/lineChart' import SearchArea from './../../components/searchArea' +import moment from 'moment' export default { name: 'WasteGasManagement', data(){ @@ -51,6 +52,9 @@ export default { components: { LineChart, SearchArea }, mounted() { this.getMsg() + this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时 + this.queryParams.timeRange = [moment().startOf('day')+0, moment().endOf('day')-59*61*1000] + this.getTrend() }, methods: { getMsg() { @@ -59,19 +63,21 @@ export default { this.realtimeList = res.data || [] }) }, - getTrend(params) { - console.log(params) - this.queryParams.timeDim = params.timeDim - this.queryParams.timeRange[0] = params.startTime - this.queryParams.timeRange[1] = params.endTime + getTrend() { environmentalCheckRealtimeTrend({...this.queryParams}).then(res => { - console.log(res) if (res.code === 0) { this.chartData = res.data } else { this.chartData = {} } }) + }, + submitClick(params) { + console.log(params) + this.queryParams.timeDim = params.timeDim + this.queryParams.timeRange[0] = params.startTime + this.queryParams.timeRange[1] = params.endTime + this.getTrend() } } } diff --git a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue index 7a54de38..818ab7fe 100644 --- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue +++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue @@ -56,7 +56,7 @@ const tableProps = [ }, { prop: 'code', - label: '指示编码', + label: '指标编码', minWidth: 120 }, { diff --git a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue index 0545cb4c..c9a5d6f5 100644 --- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue +++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue @@ -22,7 +22,7 @@ 检测指标趋势图 - +
@@ -33,6 +33,7 @@ import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental' import LineChart from './../../components/lineChart' import SearchArea from './../../components/searchArea' +import moment from 'moment' export default { name: 'WasteWaterManagement', data(){ @@ -49,27 +50,31 @@ export default { components: { LineChart, SearchArea }, mounted() { this.getMsg() + this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时 + this.queryParams.timeRange = [moment().startOf('day')+0, moment().endOf('day')-59*61*1000] + this.getTrend() }, methods: { getMsg() { environmentalCheckRealtime({checkType: 1}).then(res => { - console.log(res) this.realtimeList = res.data || [] }) }, - getTrend(params) { - console.log(params) - this.queryParams.timeDim = params.timeDim - this.queryParams.timeRange[0] = params.startTime - this.queryParams.timeRange[1] = params.endTime + getTrend() { environmentalCheckRealtimeTrend({...this.queryParams}).then(res => { - console.log(res) if (res.code === 0) { this.chartData = res.data } else { this.chartData = {} } }) + }, + submitClick(params) { + console.log(params) + this.queryParams.timeDim = params.timeDim + this.queryParams.timeRange[0] = params.startTime + this.queryParams.timeRange[1] = params.endTime + this.getTrend() } } } -- 2.45.2