Compare commits
No commits in common. "4fa49c46ff5c12359a572733db38feb705564554" and "a2c61b86cabd7ba49c4a22b1fe3ba66c7bc06329" have entirely different histories.
4fa49c46ff
...
a2c61b86ca
@ -102,7 +102,6 @@ export const DICT_TYPE = {
|
|||||||
ORDER_ORIGIN: 'order_Origin',
|
ORDER_ORIGIN: 'order_Origin',
|
||||||
ORDER_PRIORITY: 'order_priority',
|
ORDER_PRIORITY: 'order_priority',
|
||||||
PACK_SPEC: 'pack_spec',
|
PACK_SPEC: 'pack_spec',
|
||||||
WORK_ORDER_STATUS: 'work_order_status',
|
|
||||||
|
|
||||||
// ============== EQUIPMENT - 设备模块 =============
|
// ============== EQUIPMENT - 设备模块 =============
|
||||||
MAINTAIN_TYPE: 'maintain_type',
|
MAINTAIN_TYPE: 'maintain_type',
|
||||||
|
@ -106,7 +106,7 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'datePicker',
|
type: 'datePicker',
|
||||||
label: '抄表日期',
|
label: '时间',
|
||||||
dateType: 'daterange',
|
dateType: 'daterange',
|
||||||
format: 'yyyy-MM-dd',
|
format: 'yyyy-MM-dd',
|
||||||
valueFormat: "timestamp",
|
valueFormat: "timestamp",
|
||||||
|
@ -118,8 +118,8 @@ export default {
|
|||||||
type: '',
|
type: '',
|
||||||
plcParamId: '',
|
plcParamId: '',
|
||||||
limitType: '',
|
limitType: '',
|
||||||
minValue: 0,
|
minValue: null,
|
||||||
maxValue: 0
|
maxValue: null
|
||||||
},
|
},
|
||||||
objIds: [],// 回显数组
|
objIds: [],// 回显数组
|
||||||
isEdit: false, //是否是编辑
|
isEdit: false, //是否是编辑
|
||||||
@ -239,8 +239,7 @@ export default {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.form.minValue = this.form.minValue || 0
|
// this.form.limitType = Number(this.form.limitType)
|
||||||
this.form.maxValue = this.form.maxValue || 0
|
|
||||||
if (this.isEdit) {
|
if (this.isEdit) {
|
||||||
// 编辑
|
// 编辑
|
||||||
updateEnergyLimit({...this.form}).then((res) => {
|
updateEnergyLimit({...this.form}).then((res) => {
|
||||||
|
@ -116,16 +116,7 @@ export default {
|
|||||||
getGroupClasses(id).then((res) => {
|
getGroupClasses(id).then((res) => {
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
this.form = res.data
|
this.form = res.data
|
||||||
this.form.name = res.data.name
|
this.form.disableTime = res.data.disableTime || ''
|
||||||
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 {
|
} else {
|
||||||
|
@ -165,7 +165,7 @@ const tableProps1 = [
|
|||||||
{
|
{
|
||||||
prop: 'status',
|
prop: 'status',
|
||||||
label: '状态',
|
label: '状态',
|
||||||
filter: publicFormatter('work_order_status')
|
filter: publicFormatter('order_status')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'startProduceTime',
|
prop: 'startProduceTime',
|
||||||
|
@ -68,6 +68,7 @@ export default {
|
|||||||
}
|
}
|
||||||
obj.name = item
|
obj.name = item
|
||||||
obj.type = 'line'
|
obj.type = 'line'
|
||||||
|
obj.stack = 'Total'
|
||||||
obj.symbol = 'none'
|
obj.symbol = 'none'
|
||||||
obj.data = data
|
obj.data = data
|
||||||
seriesData.push(obj)
|
seriesData.push(obj)
|
||||||
@ -117,7 +118,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
grid: {
|
grid: {
|
||||||
left: '4%',
|
left: '3%',
|
||||||
right: '2%',
|
right: '2%',
|
||||||
bottom: '3%',
|
bottom: '3%',
|
||||||
containLabel: true
|
containLabel: true
|
||||||
|
@ -56,7 +56,7 @@ const tableProps = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'code',
|
prop: 'code',
|
||||||
label: '指标编码',
|
label: '指示编码',
|
||||||
minWidth: 120
|
minWidth: 120
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -35,14 +35,13 @@
|
|||||||
import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
|
import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
|
||||||
import LineChart from './../../components/lineChart'
|
import LineChart from './../../components/lineChart'
|
||||||
import SearchArea from './../../components/searchArea'
|
import SearchArea from './../../components/searchArea'
|
||||||
import moment from 'moment'
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Voc',
|
name: 'Voc',
|
||||||
data(){
|
data(){
|
||||||
return {
|
return {
|
||||||
realtimeList:[],
|
realtimeList:[],
|
||||||
queryParams:{
|
queryParams:{
|
||||||
checkType: 3,
|
checkType: 1,
|
||||||
timeDim: null,
|
timeDim: null,
|
||||||
timeRange: []
|
timeRange: []
|
||||||
},
|
},
|
||||||
@ -52,9 +51,6 @@ export default {
|
|||||||
components: { LineChart, SearchArea },
|
components: { LineChart, SearchArea },
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getMsg()
|
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: {
|
methods: {
|
||||||
getMsg() {
|
getMsg() {
|
||||||
@ -63,21 +59,19 @@ export default {
|
|||||||
this.realtimeList = res.data || []
|
this.realtimeList = res.data || []
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getTrend() {
|
getTrend(params) {
|
||||||
|
console.log(params)
|
||||||
|
this.queryParams.timeDim = params.timeDim
|
||||||
|
this.queryParams.timeRange[0] = params.startTime
|
||||||
|
this.queryParams.timeRange[1] = params.endTime
|
||||||
environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
|
environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
|
||||||
|
console.log(res)
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
this.chartData = res.data
|
this.chartData = res.data
|
||||||
} else {
|
} else {
|
||||||
this.chartData = {}
|
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()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -56,7 +56,7 @@ const tableProps = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'code',
|
prop: 'code',
|
||||||
label: '指标编码',
|
label: '指示编码',
|
||||||
minWidth: 120
|
minWidth: 120
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
|
import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
|
||||||
import LineChart from './../../components/lineChart'
|
import LineChart from './../../components/lineChart'
|
||||||
import SearchArea from './../../components/searchArea'
|
import SearchArea from './../../components/searchArea'
|
||||||
import moment from 'moment'
|
|
||||||
export default {
|
export default {
|
||||||
name: 'WasteGasManagement',
|
name: 'WasteGasManagement',
|
||||||
data(){
|
data(){
|
||||||
@ -52,9 +51,6 @@ export default {
|
|||||||
components: { LineChart, SearchArea },
|
components: { LineChart, SearchArea },
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getMsg()
|
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: {
|
methods: {
|
||||||
getMsg() {
|
getMsg() {
|
||||||
@ -63,21 +59,19 @@ export default {
|
|||||||
this.realtimeList = res.data || []
|
this.realtimeList = res.data || []
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getTrend() {
|
getTrend(params) {
|
||||||
|
console.log(params)
|
||||||
|
this.queryParams.timeDim = params.timeDim
|
||||||
|
this.queryParams.timeRange[0] = params.startTime
|
||||||
|
this.queryParams.timeRange[1] = params.endTime
|
||||||
environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
|
environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
|
||||||
|
console.log(res)
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
this.chartData = res.data
|
this.chartData = res.data
|
||||||
} else {
|
} else {
|
||||||
this.chartData = {}
|
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()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -56,7 +56,7 @@ const tableProps = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'code',
|
prop: 'code',
|
||||||
label: '指标编码',
|
label: '指示编码',
|
||||||
minWidth: 120
|
minWidth: 120
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
<span>检测指标趋势图</span>
|
<span>检测指标趋势图</span>
|
||||||
</div>
|
</div>
|
||||||
<!-- 搜索工作栏 -->
|
<!-- 搜索工作栏 -->
|
||||||
<search-area @submit="submitClick"/>
|
<search-area @submit="getTrend"/>
|
||||||
<line-chart :chartData="chartData" v-show='Object.keys(chartData).length !== 0' :timeDim="queryParams.timeDim"/>
|
<line-chart :chartData="chartData" v-show='Object.keys(chartData).length !== 0' :timeDim="queryParams.timeDim"/>
|
||||||
<!-- 没有数据 -->
|
<!-- 没有数据 -->
|
||||||
<div class="no-data-bg" v-show='Object.keys(chartData).length === 0'></div>
|
<div class="no-data-bg" v-show='Object.keys(chartData).length === 0'></div>
|
||||||
@ -33,7 +33,6 @@
|
|||||||
import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
|
import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
|
||||||
import LineChart from './../../components/lineChart'
|
import LineChart from './../../components/lineChart'
|
||||||
import SearchArea from './../../components/searchArea'
|
import SearchArea from './../../components/searchArea'
|
||||||
import moment from 'moment'
|
|
||||||
export default {
|
export default {
|
||||||
name: 'WasteWaterManagement',
|
name: 'WasteWaterManagement',
|
||||||
data(){
|
data(){
|
||||||
@ -50,31 +49,27 @@ export default {
|
|||||||
components: { LineChart, SearchArea },
|
components: { LineChart, SearchArea },
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getMsg()
|
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: {
|
methods: {
|
||||||
getMsg() {
|
getMsg() {
|
||||||
environmentalCheckRealtime({checkType: 1}).then(res => {
|
environmentalCheckRealtime({checkType: 1}).then(res => {
|
||||||
|
console.log(res)
|
||||||
this.realtimeList = res.data || []
|
this.realtimeList = res.data || []
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getTrend() {
|
getTrend(params) {
|
||||||
|
console.log(params)
|
||||||
|
this.queryParams.timeDim = params.timeDim
|
||||||
|
this.queryParams.timeRange[0] = params.startTime
|
||||||
|
this.queryParams.timeRange[1] = params.endTime
|
||||||
environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
|
environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
|
||||||
|
console.log(res)
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
this.chartData = res.data
|
this.chartData = res.data
|
||||||
} else {
|
} else {
|
||||||
this.chartData = {}
|
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()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user