Compare commits

..

No commits in common. "b6d3b17300caec99da6ea620208d22da1c4387a3" and "0dae8cd16d8a16264fc1384e1d46cff4a04742f3" have entirely different histories.

20 changed files with 3422 additions and 3816 deletions

View File

@ -18,9 +18,9 @@ VUE_APP_TITLE = MES系统
# VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
# VUE_APP_BASE_API = 'http://192.168.1.49:48082' # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
# VUE_APP_BASE_API = 'http://192.168.1.8:48082' # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
VUE_APP_BASE_API = 'http://192.168.4.173:48082' # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082' # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
# VUE_APP_BASE_API = 'http://192.168.0.33:48082' VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.62:48082' # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082' # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
# VUE_APP_BASE_API = 'http://192.168.1.47:48082' # VUE_APP_BASE_API = 'http://192.168.1.47:48082'

View File

@ -34,22 +34,4 @@ export function getQoq(data) {
method: 'post', method: 'post',
data: data data: data
}) })
}
// 获取能源设备树
export function getTree() {
return request({
url: '/analysis/energy-analysis/getTree',
method: 'get'
})
}
// 导出(走势分析)
export function exportTrend(data) {
return request({
url: '/analysis/energy-analysis/exportTrend',
method: 'post',
responseType: 'blob',
data: data
})
} }

View File

@ -68,4 +68,3 @@ export function exportEnergyTypeExcel(query) {
responseType: 'blob' responseType: 'blob'
}) })
} }

View File

@ -97,8 +97,6 @@ export const DICT_TYPE = {
TABLE_NAME: 'table_name', TABLE_NAME: 'table_name',
METHOD: 'method', METHOD: 'method',
PUSH: 'push', PUSH: 'push',
ENERGY_TYPE: 'energy_type',
// ============== ORDER - 订单模块 ============= // ============== ORDER - 订单模块 =============
ORDER_STATUS: 'order_status', ORDER_STATUS: 'order_status',
@ -119,7 +117,7 @@ export const DICT_TYPE = {
// ============== GROUP - 班组模块 ============= // ============== GROUP - 班组模块 =============
WORK_SHOP: 'workshop', WORK_SHOP: 'workshop',
// ============== GROUP - 质量模块 ============= // ============== GROUP - 质量模块 =============
MATERIAL_GRADE: 'material_grade' MATERIAL_GRADE: 'material_grade'
} }

View File

@ -1,149 +1,148 @@
<template> <template>
<div <div
id="analysischartBar" id="analysischartBar"
style="width: 100%" style="width: 100%"
:style="{ height: chartHeight + 'px' }"></div> :style="{ height: chartHeight + 'px' }"
></div>
</template> </template>
<script> <script>
import * as echarts from 'echarts'; import * as echarts from 'echarts'
import resize from '@/utils/chartMixins/resize'; import resize from '@/utils/chartMixins/resize'
export default { export default {
name: 'BarChart', name: "BarChart",
mixins: [resize], mixins: [resize],
data() { data() {
return { return {
chartDom: '', chartDom: '',
chart: '', chart: '',
chartHeight: this.tableHeight(250) / 2, chartHeight: this.tableHeight(214) - 70
}; }
}, },
props: { props: {
chartData: { chartData: {
type: Array, type: Array,
required: true, required: true,
default: () => { default: () => {
return []; return []
}, }
}, },
timeDim: { timeDim: {
type: String, type: String,
default: '', default: ''
}, }
}, },
watch: { watch: {
chartData: function () { chartData: function () {
this.getChart(); this.getChart()
}, }
}, },
mounted() { mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.chartHeight = this.tableHeight(250) / 2; this.chartHeight = this.tableHeight(214) - 70
}); })
}, },
methods: { methods: {
getChart() { getChart() {
if ( if (
this.chart !== null && this.chart !== null &&
this.chart !== '' && this.chart !== '' &&
this.chart !== undefined this.chart !== undefined
) { ) {
this.chart.dispose(); // Dom this.chart.dispose() // Dom
} }
this.chartDom = document.getElementById('analysischartBar'); this.chartDom = document.getElementById('analysischartBar')
this.chart = echarts.init(this.chartDom); this.chart = echarts.init(this.chartDom)
let tempArr = []; let tempArr = []
let xData = []; let xData = []
let yData = []; let yData = []
let legendData = []; let legendData = []
if (this.chartData.length === 0) { if (this.chartData.length === 0) {
return false; return false
} else { } else {
tempArr = this.chartData[0].trendRespVOList; tempArr = this.chartData[0].trendRespVOList
} }
for (let k = 0; k < tempArr.length; k++) { for (let k = 0; k < tempArr.length; k++) {
let time = ''; let time = ''
if (this.timeDim === '3') { if (this.timeDim === '3') {
let year = tempArr[k].time.slice(0, 4); let year = tempArr[k].time.slice(0,4)
let weak = tempArr[k].time.slice(4, 6); let weak = tempArr[k].time.slice(4,6)
time = year + ' 第 ' + weak + ' 周'; time = year+' 第 '+weak+' 周'
} else { } else {
time = tempArr[k].time; time = tempArr[k].time
} }
xData.push(time); xData.push(time)
} }
for (let i = 0; i < this.chartData.length; i++) { for (let i = 0; i < this.chartData.length; i++) {
let obj = { let obj = {
name: this.chartData[i].objName + this.chartData[i].objCode, name: this.chartData[i].objName + this.chartData[i].objCode,
type: 'bar', type: 'bar',
barMaxWidth: 20, barMaxWidth: 20,
label: { label: {
show: true, show: true,
position: 'top', position: 'top'
}, },
data: [], data: []
}; }
legendData.push(this.chartData[i].objName + this.chartData[i].objCode); legendData.push(this.chartData[i].objName + this.chartData[i].objCode)
let temp = this.chartData[i].trendRespVOList; let temp = this.chartData[i].trendRespVOList
for (let j = 0; j < temp.length; j++) { for (let j = 0; j < temp.length; j++) {
let num = temp[j].useNum ? temp[j].useNum.toFixed(2) : ''; let num = temp[j].useNum ? temp[j].useNum : ''
obj.data.push(num); obj.data.push(num)
} }
yData.push(obj); yData.push(obj)
} }
var option = { var option = {
color: ['#FFDC94', '#8EF0AB', '#63BDFF', '#288AFF', '#7164FF'], color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF'],
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'shadow', type: 'shadow'
}, },
formatter: function (params) { formatter: function(params) {
return ( return (
params[0].axisValue + params[0].axisValue +
`<br>` + `<br>` +
params params.map((item) => {
.map((item) => { let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`
let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`; let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`; let value = item.value ? item.value : '-'
let value = item.value ? item.value : '-'; let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`
let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`; return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
<span>${str}${seriesNameStr}</span> <span>${str}${seriesNameStr}</span>
<span>${valueStr}</span> <span>${valueStr}</span>
</span>`; </span>`
}) }).join(``)
.join(``) )
); }
}, },
}, grid: {
grid: { left: '4%',
left: '4%', right: '1%',
right: '1%', bottom: '1%',
bottom: '1%', containLabel: true
containLabel: true, },
}, legend: {
legend: { data: legendData,
data: legendData, right: '1%',
right: '1%', icon: 'rect',
icon: 'rect', itemHeight: 8,
itemHeight: 8, itemWidth: 8
itemWidth: 8, },
}, xAxis: {
xAxis: { type: 'category',
type: 'category', data: xData,
data: xData, axisLabel: {
axisLabel: { rotate: "45"
rotate: '45', }
}, },
}, yAxis: {
yAxis: { type: 'value'
type: 'value', },
}, series: yData
series: yData, };
};
option && this.chart.setOption(option); option && this.chart.setOption(option);
}, }
}, }
}; }
</script> </script>

View File

@ -0,0 +1,126 @@
<template>
<div
id="analysischartLine"
style="width: 100%"
:style="{ height: chartHeight + 'px' }"
></div>
</template>
<script>
import * as echarts from 'echarts'
import resize from '@/utils/chartMixins/resize'
export default {
name: "LineChart",
mixins: [resize],
data() {
return {
chartDom: '',
chart: '',
chartHeight: this.tableHeight(214) - 70
}
},
props: {
chartData: {
type: Array,
required: true,
default: () => {
return []
}
},
timeDim: {
type: String,
default: ''
}
},
watch: {
chartData: function () {
this.getChart()
}
},
mounted() {
window.addEventListener('resize', () => {
this.chartHeight = this.tableHeight(214) - 70
})
},
methods: {
getChart() {
if (
this.chart !== null &&
this.chart !== '' &&
this.chart !== undefined
) {
this.chart.dispose() // Dom
}
this.chartDom = document.getElementById('analysischartLine')
this.chart = echarts.init(this.chartDom)
let tempArr = []
let xData = []
let yData = []
let legendData = []
if (this.chartData.length === 0) {
return false
} else {
tempArr = this.chartData[0].trendRespVOList
}
for (let k = 0; k < tempArr.length; k++) {
let time = ''
if (this.timeDim === '3') {
let year = tempArr[k].time.slice(0,4)
let weak = tempArr[k].time.slice(4,6)
time = year+' 第 '+weak+' 周'
} else {
time = tempArr[k].time
}
xData.push(time)
}
for (let i = 0; i < this.chartData.length; i++) {
let obj = {
name: this.chartData[i].objName + this.chartData[i].objCode,
type: 'line',
stack: 'Total',
data: []
}
legendData.push(this.chartData[i].objName + this.chartData[i].objCode)
let temp = this.chartData[i].trendRespVOList
for (let j = 0; j < temp.length; j++) {
let num = temp[j].useNum ? temp[j].useNum : ''
obj.data.push(num)
}
yData.push(obj)
}
var option = {
color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF'],
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'cross'
}
},
grid: {
left: '4%',
right: '1%',
bottom: '1%',
containLabel: true
},
legend: {
data: legendData,
right: '1%'
},
xAxis: {
type: 'category',
data: xData,
axisLabel: {
rotate: "45"
}
},
yAxis: {
type: 'value'
},
series: yData
};
option && this.chart.setOption(option);
}
}
}
</script>

View File

@ -1,129 +1,96 @@
<template> <template>
<div <div class="app-container contrastAnalysisBox" id="contrastAnalysisBox">
class="app-container contrastAnalysisBox" <!-- 搜索工作栏 -->
id="contrastAnalysisBox"> <search-area :isFold="isFold" @submit="getList"/>
<!-- 搜索工作栏 --> <el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'>
<search-area <el-tab-pane label="柱状图" name="bar">
:isFold="isFold" <bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim" />
@submit="getList" </el-tab-pane>
@export="exportExl" /> <el-tab-pane label="折线图" name="line">
<div v-show="chartData.length"> <line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/>
<bar-chart </el-tab-pane>
ref="analysisBarChart" </el-tabs>
:chartData="chartData" <!-- 没有数据 -->
:timeDim="timeDim" /> <div class="no-data-bg" v-show='!chartData.length'></div>
<base-table </div>
:table-props="tableProps"
:table-data="list"
:max-height="tableH"
class="contrast-out-table" />
</div>
<!-- 没有数据 -->
<div
class="no-data-bg"
v-show="!chartData.length"></div>
</div>
</template> </template>
<script> <script>
import { getCompare } from '@/api/analysis/energyAnalysis'; import { getCompare } from "@/api/analysis/energyAnalysis"
import SearchArea from './components/searchArea'; import SearchArea from "./components/searchArea"
import BarChart from './components/barChart'; import BarChart from "./components/barChart"
import tableHeightMixin from '@/mixins/lb/tableHeightMixin'; import LineChart from "./components/lineChart"
import FileSaver from 'file-saver';
import * as XLSX from 'xlsx/xlsx.mjs';
// import moment from 'moment' // import moment from 'moment'
export default { export default {
name: 'ContrastAnalysis', name: 'ContrastAnalysis',
components: { SearchArea, BarChart }, components: { SearchArea, BarChart, LineChart },
mixins: [tableHeightMixin], data() {
data() { return {
return { isFold: false,
isFold: false, activeName: 'bar',
chartData: [], chartData: [],
timeDim: '', timeDim: ''
tableProps: [], }
list: [], },
tableH: this.tableHeight(250) / 2, mounted() {
}; window.addEventListener('resize', () => {
}, this.tableH = this.tableHeight(260)
mounted() { this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437)
window.addEventListener('resize', () => { // console.log(document.getElementById("contrastAnalysisBox").offsetWidth)
this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437); })
// console.log(document.getElementById("contrastAnalysisBox").offsetWidth) this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437)
}); },
this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437); methods: {
}, getList(params) {
methods: { this.timeDim = params.timeDim
_setTableHeight() { getCompare({ ...params }).then((res) => {
this.tableH = this.tableHeight(250) / 2; console.log(res)
}, if (res.code === 0) {
getList(params) { this.chartData = res.data || []
this.timeDim = params.timeDim; } else {
getCompare({ ...params }).then((res) => { this.chartData = []
if (res.code === 0) { }
this.getTableList(res.data || []); })
this.chartData = res.data || []; },
} else { switchChart() {
this.chartData = []; if (this.activeName === 'bar') {
} this.$nextTick((res) => {
}); this.$refs.analysisBarChart.getChart()
}, })
getTableList(arr) { } else {
this.tableProps = []; this.$nextTick((res) => {
this.list = []; this.$refs.analysisLineChart.getChart()
let tempX = []; })
let timeArr = arr[0].trendRespVOList || []; }
this.list = timeArr.map((item) => { }
return { time: item.time }; }
}); }
for (let i = 0; i < arr.length; i++) {
let obj = {};
obj.prop = arr[i].objId;
obj.label = arr[i].objName;
obj.minWidth = 100;
tempX.push(obj);
let tiemList = arr[i].trendRespVOList;
for (let j = 0; j < tiemList.length; j++) {
this.list[j][arr[i].objId] = tiemList[j].useNum
? tiemList[j].useNum.toFixed(2)
: null;
}
}
this.tableProps = [{ prop: 'time', label: '时间' }].concat(tempX);
},
//
exportExl() {
if (this.list.length > 0) {
var wb = XLSX.utils.table_to_book(
document.querySelector('.contrast-out-table')
);
let fileName = '对比分析.xlsx';
var wbout = XLSX.write(wb, {
bookType: 'xlsx',
bookSST: true,
type: 'array',
});
try {
FileSaver.saveAs(
new Blob([wbout], { type: 'application/octet-stream' }),
fileName
);
this.$message.success('导出成功');
} catch (e) {
if (typeof console !== 'undefined') console.log(e, wbout);
}
return wbout;
} else {
this.$modal.msgWarning('暂无数据导出');
}
},
},
};
</script> </script>
<style lang='scss'> <style lang='scss'>
.contrastAnalysisBox { .contrastAnalysisBox {
.contrast-out-table { .el-tabs__nav::after {
margin-top: 20px; content: "";
} position: absolute;
left: 0;
bottom: 0;
width: 100%;
height: 2px;
background-color: #e4e7ed;
/* z-index: 1; */
}
.el-tabs__nav-wrap::after {
width: 0;
}
.el-tabs__item {
padding: 0 10px;
}
.el-tabs__item:hover {
color: rgba(0, 0, 0, 0.85);
}
.el-tabs__item.is-active {
color: rgba(0, 0, 0, 0.85);
}
.el-tabs__item {
color: rgba(0, 0, 0, 0.45);
}
} }
</style> </style>

View File

@ -1,253 +1,232 @@
<template> <template>
<el-form <el-form :inline="true" class="demo-form-inline">
:inline="true" <span class="blue-block"></span>
class="demo-form-inline"> <el-form-item label="对象选择" required>
<span class="blue-block"></span> <el-cascader
<el-form-item v-model="objArr"
label="对象选择" :options="objList"
required> :props="{ checkStrictly: true, value: 'id', label: 'name' }"
<el-select popper-class="cascaderParent"
v-model="queryParams.objId" size="small"
placeholder="请选择" style="width: 250px;"
style="width: 250px" clearable></el-cascader>
filterable </el-form-item>
size="small"> <el-form-item label="时间维度" required>
<el-option <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
v-for="item in objList" <el-option
:key="item.id" v-for="item in timeType"
:label="item.name" :key="item.id"
:value="item.id" :label="item.name"
:clearable="false"></el-option> :value="item.id"
</el-select> :clearable="false">
</el-form-item> </el-option>
<el-form-item </el-select>
label="时间维度" </el-form-item>
required> <el-form-item label="时间" required>
<el-select <div v-show="queryParams.type === 1">
v-model="queryParams.type" <el-date-picker
placeholder="请选择" v-model="monthValue"
style="width: 80px" type="month"
size="small"> :picker-options="pickerOptions"
<el-option @change="selectTime"
v-for="item in timeType" :clearable="false"
:key="item.id" size="small"
:label="item.name" placeholder="选择月">
:value="item.id" </el-date-picker>
:clearable="false"></el-option> </div>
</el-select> <div v-show="queryParams.type === 2">
</el-form-item> <el-date-picker
<el-form-item v-model="weekValue"
label="时间" type="week"
required> format="yyyy 第 WW 周"
<div v-show="queryParams.type === 1"> :picker-options="pickerOptionsWeek"
<el-date-picker @change="selectTime"
v-model="monthValue" :clearable="false"
type="month" size="small"
:picker-options="pickerOptions" placeholder="选择周">
@change="selectTime" </el-date-picker>
:clearable="false" </div>
size="small" <div v-show="queryParams.type === 3">
placeholder="选择月"></el-date-picker> <el-date-picker
</div> v-model="dateValue"
<div v-show="queryParams.type === 2"> type="date"
<el-date-picker :picker-options="pickerOptions"
v-model="weekValue" @change="selectTime"
type="week" :clearable="false"
format="yyyy 第 WW 周" size="small"
:picker-options="pickerOptionsWeek" placeholder="选择日">
@change="selectTime" </el-date-picker>
:clearable="false" </div>
size="small" </el-form-item>
placeholder="选择周"></el-date-picker> <el-form-item>
</div> <el-button type="primary" size="small" @click="search">查询</el-button>
<div v-show="queryParams.type === 3"> </el-form-item>
<el-date-picker <el-form-item>
v-model="dateValue" <span class="separateStyle"></span>
type="date" </el-form-item>
:picker-options="pickerOptions" <el-form-item>
@change="selectTime" <el-button type="primary" size="small" @click="exportData" plain>导出</el-button>
:clearable="false" </el-form-item>
size="small" </el-form>
placeholder="选择日"></el-date-picker>
</div>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="small"
@click="search">
查询
</el-button>
</el-form-item>
<el-form-item>
<span class="separateStyle"></span>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="small"
@click="exportData"
plain>
导出
</el-button>
</el-form-item>
</el-form>
</template> </template>
<script> <script>
import { getTree } from '@/api/analysis/energyAnalysis'; import { getTree } from '@/api/base/factory'
import moment from 'moment'; import moment from 'moment'
export default { export default {
name: 'searchArea', name: 'searchArea',
data() { data() {
return { return {
// //
queryParams: { queryParams: {
type: 1, type: 1,
searchTime: null, searchTime: null,
objId: null, objId: null
objType: 1, },
}, timeType: [
timeType: [ {id: 1, name: '月'},
{ id: 1, name: '月' }, {id: 2, name: '周'},
{ id: 2, name: '周' }, {id: 3, name: '日'}
{ id: 3, name: '日' }, ],
], monthValue: '',
monthValue: '', weekValue: '',
weekValue: '', dateValue: '',
dateValue: '', objArr: [],
objList: [], objList: [],
pickerOptions: { pickerOptions: {
disabledDate(date) { disabledDate(date) {
return date.getTime() > Date.now(); return date.getTime() > Date.now()
}, }
}, },
pickerOptionsWeek: { pickerOptionsWeek: {
disabledDate(time) { disabledDate(time) {
let day = Date.now(); let day = Date.now()
let limitTime = moment(day).day(-1); let limitTime = moment(day).day(-1)
return time.getTime() > new Date(limitTime).getTime(); return time.getTime() > new Date(limitTime).getTime()
}, }
}, }
}; }
}, },
mounted() { mounted() {
this.getObjTree(); this.getObjTree()
}, },
methods: { methods: {
getObjTree() { getObjTree() {
getTree().then((res) => { getTree().then(res => {
this.objList = res.data || []; this.objList = res.data || []
if (this.objList.length > 0) { })
this.queryParams.objId = this.objList[0].id; },
} selectTime() {
}); switch (this.queryParams.type) {
}, case 1:
selectTime() { this.queryParams.searchTime = this.monthValue
switch (this.queryParams.type) { break;
case 1: case 2:
this.queryParams.searchTime = this.monthValue; this.queryParams.searchTime = this.weekValue
break; break;
case 2: default:
this.queryParams.searchTime = this.weekValue; this.queryParams.searchTime = this.dateValue
break; }
default: },
this.queryParams.searchTime = this.dateValue; //
} search() {
}, if (this.objArr.length === 0) {
// this.$modal.msgError('请选择对象')
search() { return false
if (!this.queryParams.objId) { } else {
this.$modal.msgError('请选择对象'); this.queryParams.objId = this.objArr[this.objArr.length-1]
return false; }
} if (!this.queryParams.type) {
if (!this.queryParams.type) { this.$modal.msgError('请选择时间维度')
this.$modal.msgError('请选择时间维度'); return false
return false; }
} if (!this.queryParams.searchTime) {
if (!this.queryParams.searchTime) { this.$modal.msgError('请选择时间')
this.$modal.msgError('请选择时间'); return false
return false; }
} switch (this.queryParams.type) {
switch (this.queryParams.type) { case 1:
case 1: this.queryParams.searchTime = this.transformTime(this.monthValue)
this.queryParams.searchTime = this.transformTime(this.monthValue); break;
break; case 2:
case 2: let value = moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59'
let value = this.queryParams.searchTime = new Date(value).getTime()
moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59'; break;
this.queryParams.searchTime = new Date(value).getTime(); default:
break; let value2 = moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59'
default: this.queryParams.searchTime = new Date(value2).getTime()
let value2 = }
moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59'; this.$emit('submit', this.queryParams)
this.queryParams.searchTime = new Date(value2).getTime(); },
} exportData() {
this.$emit('submit', this.queryParams); let name
}, if (this.queryParams.objId) {
exportData() { name = this.getObjName(this.objList, this.queryParams.objId)
let name; } else {
if (this.queryParams.objId) { this.$modal.msgWarning("对象不能为空")
name = this.getObjName(this.objList, this.queryParams.objId); return false
} else { }
this.$modal.msgWarning('对象不能为空'); this.$emit('exportD', {name: name})
return false; },
} // name
this.$emit('exportD', { name: name }); getObjName(list, id) {
}, let _this = this
// name for (let i = 0; i < list.length; i++) {
getObjName(list, id) { let a = list[i]
for (let i = 0; i < list.length; i++) { if (a.id === id) {
let a = list[i]; return a.name
if (a.id === id) { } else {
return a.name; if (a.children && a.children.length > 0) {
} let res = _this.getObjName(a.children, id)
} if (res) {
}, return res
transformTime(timeStamp) { }
// }
let year = moment(timeStamp).format('YYYY'); }
let month = moment(timeStamp).format('MM'); }
let newData = },
moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59'; transformTime(timeStamp) {//
let value = new Date(newData).getTime(); let year = moment(timeStamp).format('YYYY')
return value; let month = moment(timeStamp).format('MM')
}, let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
}, let value = new Date(newData).getTime()
}; return value
}
}
}
</script> </script>
<style lang='scss'> <style lang='scss'>
/* 级联选择器 */
.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
display: none;
}
.demo-form-inline { .demo-form-inline {
.el-date-editor .el-range__icon { .el-date-editor .el-range__icon {
font-size: 16px; font-size: 16px;
color: #0b58ff; color: #0B58FF;
} }
.el-input__prefix .el-icon-date { .el-input__prefix .el-icon-date {
font-size: 16px; font-size: 16px;
color: #0b58ff; color: #0B58FF;
} }
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.separateStyle { .separateStyle {
display: inline-block; display: inline-block;
width: 1px; width: 1px;
height: 24px; height: 24px;
background: #e8e8e8; background: #E8E8E8;
vertical-align: middle; vertical-align: middle;
} }
.demo-form-inline { .demo-form-inline {
.blue-block { .blue-block {
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 16px; height: 16px;
background-color: #0b58ff; background-color: #0B58FF;
border-radius: 1px; border-radius: 1px;
margin-right: 8px; margin-right: 8px;
margin-top: 10px; margin-top: 10px;
} }
.el-form-item {
margin-right: 10px;
margin-bottom: 4px;
}
} }
</style> </style>

View File

@ -1,140 +1,132 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<search-area <search-area @submit="getList" @exportD="exportData"/>
@submit="getList" <!-- 表格 -->
@exportD="exportData" /> <div v-show="chartData.length">
<!-- 表格 --> <base-table
<div v-show="chartData.length"> :table-props="tableProps"
<base-table :table-data="list"
:table-props="tableProps" class="qoq-out-table"
:table-data="list" />
class="qoq-out-table" /> <div class="chartTitle">环比分析图</div>
<div class="chartTitle">环比分析图</div> <div style='width: 100%'>
<div style="width: 100%"> <line-chart ref="analysisLineChart" :chartData="chartData"/>
<line-chart </div>
ref="analysisLineChart" </div>
:chartData="chartData" /> <!-- 没有数据 -->
</div> <div class="no-data-bg" v-show='!chartData.length'></div>
</div> </div>
<!-- 没有数据 -->
<div
class="no-data-bg"
v-show="!chartData.length"></div>
</div>
</template> </template>
<script> <script>
import { getQoq } from '@/api/analysis/energyAnalysis'; import { getQoq } from "@/api/analysis/energyAnalysis"
import SearchArea from './components/searchArea'; import SearchArea from "./components/searchArea"
import LineChart from './components/lineChart'; import LineChart from "./components/lineChart"
import FileSaver from 'file-saver'; import FileSaver from "file-saver"
import * as XLSX from 'xlsx/xlsx.mjs'; import * as XLSX from 'xlsx/xlsx.mjs'
export default { export default {
name: 'QoqAnalysis', name: 'QoqAnalysis',
components: { SearchArea, LineChart }, components: { SearchArea, LineChart },
data() { data() {
return { return {
chartData: [], chartData: [],
tableProps: [], tableProps: [],
list: [], list: []
}; }
}, },
methods: { methods: {
getList(params) { getList(params) {
getQoq({ ...params }).then((res) => { getQoq({ ...params }).then((res) => {
if (res.code === 0 && res.data) { if (res.code === 0 && res.data) {
this.getTableList(res.data); this.getTableList(res.data)
} else { } else {
this.chartData = []; this.chartData = []
this.list = []; this.list = []
} }
}); })
}, },
getTableList(arr) { getTableList(arr) {
let data = arr.data; let data = arr.data
let nameData = arr.nameData; let nameData = arr.nameData
let tempX = []; let tempX = []
data[0].data.map((item) => { data[0].data.map((item) => {
let obj = {}; let obj = {}
obj.prop = item.dynamicName; obj.prop = item.dynamicName
obj.label = item.dynamicName; obj.label = item.dynamicName
obj.id = item.id; obj.id = item.id
obj.children = []; obj.children = []
tempX.push(obj); tempX.push(obj)
}); })
for (let i = 0; i < nameData.length; i++) { for (let i = 0; i < nameData.length; i++) {
for (let j = 0; j < tempX.length; j++) { for (let j = 0; j < tempX.length; j++) {
if (tempX[j].id === nameData[i].parentId) { if (tempX[j].id === nameData[i].parentId) {
let obj = {}; let obj = {}
obj.prop = tempX[j].prop + '_' + nameData[i].name; obj.prop = tempX[j].prop + '_' + nameData[i].name
obj.label = nameData[i].name; obj.label = nameData[i].name
tempX[j].children.push(obj); tempX[j].children.push(obj)
} }
} }
} }
this.tableProps = [{ prop: 'time', label: '时间' }].concat(tempX); this.tableProps = [{prop: 'time',label: '时间'}].concat(tempX)
// //
this.list = []; this.list = []
for (let k = 0; k < data.length; k++) { for (let k = 0; k < data.length; k++) {
let obj = {}; let obj = {}
obj.time = data[k].time; obj.time = data[k].time
let arr1 = data[k].data; let arr1 = data[k].data
obj.type = []; obj.type = []
for (let q = 0; q < arr1.length; q++) { for (let q = 0; q < arr1.length; q++) {
let name = arr1[q].dynamicName; let name = arr1[q].dynamicName
obj.type.push(name); obj.type.push(name)
let arr2 = arr1[q].children; let arr2 = arr1[q].children
for (let p = 0; p < arr2.length; p++) { for (let p = 0; p < arr2.length; p++) {
let prop = name + '_' + arr2[p].dynamicName; let prop = name + '_' + arr2[p].dynamicName
obj[prop] = arr2[p].dynamicValue; obj[prop] = arr2[p].dynamicValue
} }
} }
this.list.push(obj); this.list.push(obj)
} }
this.chartData = this.list; this.chartData = this.list
}, },
exportData(val) { exportData(val) {
if (this.list.length > 0) { if (this.list.length > 0) {
var wb = XLSX.utils.table_to_book( var wb = XLSX.utils.table_to_book(document.querySelector(".qoq-out-table"))
document.querySelector('.qoq-out-table') let fileName = val.name + "环比分析.xlsx"
); var wbout = XLSX.write(wb, {
let fileName = val.name + '环比分析.xlsx'; bookType: "xlsx",
var wbout = XLSX.write(wb, { bookSST: true,
bookType: 'xlsx', type: "array"
bookSST: true, })
type: 'array', try {
}); FileSaver.saveAs(
try { new Blob([wbout], { type: "application/octet-stream" }),
FileSaver.saveAs( fileName
new Blob([wbout], { type: 'application/octet-stream' }), )
fileName } catch (e) {
); if (typeof console !== "undefined") console.log(e, wbout);
this.$message.success('导出成功'); }
} catch (e) { return wbout
if (typeof console !== 'undefined') console.log(e, wbout); } else {
} this.$modal.msgWarning("暂无数据导出")
return wbout; }
} else { }
this.$modal.msgWarning('暂无数据导出'); }
} }
},
},
};
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
.chartTitle { .chartTitle {
font-size: 16px; font-size: 16px;
color: #000; color: #000;
margin-top: 20px; margin-top: 20px;
} }
.chartTitle::before { .chartTitle::before {
content: ''; content: '';
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 18px; height: 18px;
background-color: #0b58ff; background-color: #0B58FF;
border-radius: 1px; border-radius: 1px;
margin-right: 8px; margin-right: 8px;
vertical-align: bottom; vertical-align: bottom;
} }
</style> </style>

View File

@ -1,102 +1,103 @@
<template> <template>
<div <div
id="analysischartLine" id="analysischartLine"
style="width: 100%" style="width: 100%"
:style="{ height: chartHeight + 'px' }"></div> :style="{ height: chartHeight + 'px' }"
></div>
</template> </template>
<script> <script>
import * as echarts from 'echarts'; import * as echarts from 'echarts'
import resize from '@/utils/chartMixins/resize'; import resize from '@/utils/chartMixins/resize'
export default { export default {
name: 'LineChart', name: "LineChart",
mixins: [resize], mixins: [resize],
data() { data() {
return { return {
chartDom: '', chartDom: '',
chart: '', chart: '',
chartHeight: this.tableHeight(214) - 100, chartHeight: this.tableHeight(214) - 70
}; }
}, },
props: { props: {
chartData: { chartData: {
type: Array, type: Array,
required: true, required: true,
default: () => { default: () => {
return []; return []
}, }
}, },
timeDim: { timeDim: {
type: String, type: String,
default: '', default: ''
}, }
}, },
watch: { watch: {
chartData: function () { chartData: function () {
this.getChart(); this.getChart()
}, }
}, },
mounted() { mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.chartHeight = this.tableHeight(214) - 70; this.chartHeight = this.tableHeight(214) - 70
}); })
}, },
methods: { methods: {
getChart() { getChart() {
if ( if (
this.chart !== null && this.chart !== null &&
this.chart !== '' && this.chart !== '' &&
this.chart !== undefined this.chart !== undefined
) { ) {
this.chart.dispose(); // Dom this.chart.dispose() // Dom
} }
this.chartDom = document.getElementById('analysischartLine'); this.chartDom = document.getElementById('analysischartLine')
this.chart = echarts.init(this.chartDom); this.chart = echarts.init(this.chartDom)
let xData = []; let xData = []
let yData = []; let yData = []
for (let i = 0; i < this.chartData.length; i++) { for (let i = 0; i < this.chartData.length; i++) {
let time = ''; let time = ""
if (this.timeDim === '3') { if (this.timeDim === '3') {
let year = this.chartData[i].time.slice(0, 4); let year = this.chartData[i].time.slice(0,4)
let weak = this.chartData[i].time.slice(4, 6); let weak = this.chartData[i].time.slice(4,6)
time = year + ' 第 ' + weak + ' 周'; time = year+' 第 '+weak+' 周'
} else { } else {
time = this.chartData[i].time; time = this.chartData[i].time
} }
xData.push(time); xData.push(time)
yData.push(this.chartData[i].useNum); yData.push(this.chartData[i].useNum)
} }
var option = { var option = {
color: ['#288AFF'], color:['#288AFF'],
// tooltip: { // tooltip: {
// trigger: 'axis' // trigger: 'axis'
// }, // },
grid: { grid: {
left: '4%', left: '4%',
right: '1%', right: '1%',
bottom: '1%', bottom: '1%',
containLabel: true, containLabel: true
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
data: xData, data: xData,
axisLabel: { axisLabel: {
rotate: '45', rotate: "45"
}, }
}, },
yAxis: { yAxis: {
type: 'value', type: 'value'
}, },
series: [ series: [
{ {
data: yData, data: yData,
type: 'line', type: 'line'
}, }
], ]
}; };
option && this.chart.setOption(option); option && this.chart.setOption(option);
}, }
}, }
}; }
</script> </script>

View File

@ -1,113 +1,94 @@
<template> <template>
<div <div class="app-container trendAnalysisBox" id="trendAnalysisBox">
class="app-container trendAnalysisBox" <!-- 搜索工作栏 -->
id="trendAnalysisBox"> <search-area :isFold="isFold" @submit="getList"/>
<!-- 搜索工作栏 --> <el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'>
<search-area <el-tab-pane label="柱状图" name="bar">
:isFold="isFold" <bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim"/>
@submit="getList" </el-tab-pane>
@export="exportExl" /> <el-tab-pane label="折线图" name="line">
<div v-show="chartData.length"> <line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/>
<base-table </el-tab-pane>
:table-props="tableProps" </el-tabs>
:table-data="list" <!-- 没有数据 -->
class="trend-out-table" /> <div class="no-data-bg" v-show='!chartData.length'></div>
<line-chart </div>
ref="analysisLineChart"
:chartData="chartData"
:timeDim="timeDim" />
</div>
<!-- 没有数据 -->
<div
class="no-data-bg"
v-show="!chartData.length"></div>
</div>
</template> </template>
<script> <script>
import { getEnergyTrend, exportTrend } from '@/api/analysis/energyAnalysis'; import { getEnergyTrend } from "@/api/analysis/energyAnalysis"
import SearchArea from './components/searchArea'; import SearchArea from "./components/searchArea"
import LineChart from './components/lineChart'; import BarChart from "./components/barChart"
import LineChart from "./components/lineChart"
// import moment from 'moment' // import moment from 'moment'
export default { export default {
name: 'TrendAnalysis', name: 'TrendAnalysis',
components: { SearchArea, LineChart }, components: { SearchArea, BarChart, LineChart },
data() { data() {
return { return {
isFold: false, isFold: false,
chartData: [], activeName: 'bar',
timeDim: '', chartData: [],
tableProps: [], timeDim: ''
list: [], }
}; },
}, mounted() {
mounted() { window.addEventListener('resize', () => {
window.addEventListener('resize', () => { this.tableH = this.tableHeight(260)
this.tableH = this.tableHeight(260); this.isFold = this.searchBarWidth('trendAnalysisBox', 1263)
this.isFold = this.searchBarWidth('trendAnalysisBox', 1480); })
}); this.isFold = this.searchBarWidth('trendAnalysisBox', 1263)
this.isFold = this.searchBarWidth('trendAnalysisBox', 1480); },
}, methods: {
methods: { getList(params) {
getList(params) { this.timeDim = params.timeDim
this.timeDim = params.timeDim; getEnergyTrend({ ...params }).then((res) => {
getEnergyTrend({ ...params }).then((res) => { if (res.code === 0) {
if (res.code === 0) { this.chartData = res.data
this.getTableList(res.data || []); } else {
this.chartData = res.data || []; this.chartData = []
} else { }
this.chartData = []; })
} },
}); switchChart() {
}, if (this.activeName === 'bar') {
getTableList(arr) { this.$nextTick((res) => {
this.tableProps = []; this.$refs.analysisBarChart.getChart()
this.list = []; })
let tempX = []; } else {
let listObj = { useNum: '消耗量' }; // this.$nextTick((res) => {
for (let i = 0; i < arr.length; i++) { this.$refs.analysisLineChart.getChart()
let obj = {}; })
obj.prop = arr[i].time; }
obj.label = arr[i].time; }
obj.minWidth = 100; }
tempX.push(obj); }
listObj[arr[i].time] = arr[i].useNum || null;
}
this.tableProps = [{ prop: 'useNum', label: '时间' }].concat(tempX);
this.list.push(listObj);
},
// excel
exportExl(params) {
exportTrend({ ...params }).then((res) => {
// let fileName = '';
// const contentDisposition = res.headers['content-disposition'];
// if (contentDisposition) {
// fileName = decodeURIComponent(
// contentDisposition.slice(
// contentDisposition.indexOf('filename=') + 9
// )
// );
// }
const blob = new Blob([res.data]);
const reader = new FileReader();
reader.readAsDataURL(blob);
reader.onload = (e) => {
const a = document.createElement('a');
a.download = '走势分析';
a.href = e.target.result;
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
this.$message.success('导出成功');
};
});
},
},
};
</script> </script>
<style lang='scss'> <style lang='scss'>
.trendAnalysisBox { .trendAnalysisBox {
.trend-out-table { .el-tabs__nav::after {
margin-bottom: 15px; content: "";
} position: absolute;
left: 0;
bottom: 0;
width: 100%;
height: 2px;
background-color: #e4e7ed;
/* z-index: 1; */
}
.el-tabs__nav-wrap::after {
width: 0;
}
.el-tabs__item {
padding: 0 10px;
}
.el-tabs__item:hover {
color: rgba(0, 0, 0, 0.85);
}
.el-tabs__item.is-active {
color: rgba(0, 0, 0, 0.85);
}
.el-tabs__item {
color: rgba(0, 0, 0, 0.45);
}
} }
</style> </style>

View File

@ -1,227 +1,205 @@
<template> <template>
<el-form <el-form :inline="true" class="demo-form-inline">
:inline="true" <span class="blue-block"></span>
class="demo-form-inline"> <el-form-item label="对象选择" required>
<span class="blue-block"></span> <el-cascader
<el-form-item v-model="objArr"
label="对象选择" :options="objList"
required> :props="{ checkStrictly: true, value: 'id', label: 'name' }"
<el-select popper-class="cascaderParent"
v-model="queryParams.objId" size="small"
placeholder="请选择" clearable></el-cascader>
style="width: 250px" </el-form-item>
filterable <el-form-item label="时间维度" required>
size="small"> <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
<el-option <el-option
v-for="item in objList" v-for="item in timeType"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
:clearable="false"></el-option> :clearable="false">
</el-select> </el-option>
</el-form-item> </el-select>
<el-form-item </el-form-item>
label="时间维度" <el-form-item label="时间" required>
required> <div v-show="queryParams.type === 1 || queryParams.type === 2">
<el-select <el-date-picker
v-model="queryParams.type" v-model="yearValue"
placeholder="请选择" type="year"
style="width: 80px" :picker-options="pickerOptions"
size="small"> @change="selectTime"
<el-option :clearable="false"
v-for="item in timeType" size="small"
:key="item.id" placeholder="选择年">
:label="item.name" </el-date-picker>
:value="item.id" </div>
:clearable="false"></el-option> <div v-show="queryParams.type === 3">
</el-select> <el-date-picker
</el-form-item> v-model="yearMonth"
<el-form-item type="month"
label="时间" :picker-options="pickerOptions"
required> @change="selectTime"
<div v-show="queryParams.type === 1 || queryParams.type === 2"> :clearable="false"
<el-date-picker size="small"
v-model="yearValue" placeholder="选择月">
type="year" </el-date-picker>
:picker-options="pickerOptions" </div>
@change="selectTime" </el-form-item>
:clearable="false" <el-form-item>
size="small" <el-button type="primary" size="small" @click="search">查询</el-button>
placeholder="选择年"></el-date-picker> </el-form-item>
</div> <el-form-item>
<div v-show="queryParams.type === 3"> <span class="separateStyle"></span>
<el-date-picker </el-form-item>
v-model="yearMonth" <el-form-item>
type="month" <el-button type="primary" size="small" @click="exportData" plain>导出</el-button>
:picker-options="pickerOptions" </el-form-item>
@change="selectTime" </el-form>
:clearable="false"
size="small"
placeholder="选择月"></el-date-picker>
</div>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="small"
@click="search">
查询
</el-button>
</el-form-item>
<el-form-item>
<span class="separateStyle"></span>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="small"
@click="exportData"
plain>
导出
</el-button>
</el-form-item>
</el-form>
</template> </template>
<script> <script>
import { getTree } from '@/api/analysis/energyAnalysis'; import { getTree } from '@/api/base/factory'
import moment from 'moment'; import moment from 'moment'
export default { export default {
name: 'searchArea', name: 'searchArea',
data() { data() {
return { return {
// //
queryParams: { queryParams: {
type: 1, // 123 type: 1, // 123
searchTime: null, searchTime: null,
objId: null, objId: null
objType: 1, },
}, timeType: [
timeType: [ {id: 1, name: '季度'},
{ id: 1, name: '季度' }, {id: 2, name: '月'},
{ id: 2, name: '月' }, {id: 3, name: '日'}
{ id: 3, name: '日' }, ],
], yearValue: '',
yearValue: '', yearMonth: '',
yearMonth: '', objArr: [],
objList: [], objList: [],
pickerOptions: { pickerOptions: {
disabledDate(date) { disabledDate(date) {
return date.getTime() > Date.now(); return date.getTime() > Date.now()
}, }
}, }
}; }
}, },
mounted() { mounted() {
this.getObjTree(); this.getObjTree()
}, },
methods: { methods: {
getObjTree() { getObjTree() {
getTree().then((res) => { getTree().then(res => {
this.objList = res.data || []; this.objList = res.data || []
if (this.objList.length > 0) { })
this.queryParams.objId = this.objList[0].id; },
} selectTime() {
}); if (this.queryParams.type === 3) {
}, this.queryParams.searchTime = this.yearMonth
selectTime() { } else {
if (this.queryParams.type === 3) { this.queryParams.searchTime = this.yearValue
this.queryParams.searchTime = this.yearMonth; }
} else { },
this.queryParams.searchTime = this.yearValue; //
} search() {
}, if (this.objArr.length === 0) {
// this.$modal.msgError('请选择对象')
search() { return false
if (!this.queryParams.objId) { } else {
this.$modal.msgError('请选择对象'); this.queryParams.objId = this.objArr[this.objArr.length-1]
return false; }
} if (!this.queryParams.type) {
if (!this.queryParams.type) { this.$modal.msgError('请选择时间维度')
this.$modal.msgError('请选择时间维度'); return false
return false; }
} if (!this.queryParams.searchTime) {
if (!this.queryParams.searchTime) { this.$modal.msgError('请选择时间')
this.$modal.msgError('请选择时间'); return false
return false; }
} if (this.queryParams.type === 3) {
if (this.queryParams.type === 3) { this.queryParams.searchTime = this.transformTime(this.yearMonth) + ''
this.queryParams.searchTime = this.transformTime(this.yearMonth) + ''; } else {
} else { this.queryParams.searchTime = this.transformYear(this.yearValue) + ''
this.queryParams.searchTime = this.transformYear(this.yearValue) + ''; }
} this.$emit('submit', this.queryParams)
this.$emit('submit', this.queryParams); },
}, exportData() {
exportData() { let name
let name; if (this.queryParams.objId) {
if (this.queryParams.objId) { name = this.getObjName(this.objList, this.queryParams.objId)
name = this.getObjName(this.objList, this.queryParams.objId); } else {
} else { this.$modal.msgWarning("对象不能为空")
this.$modal.msgWarning('对象不能为空'); return false
return false; }
} this.$emit('exportD', {name: name})
this.$emit('exportD', { name: name }); },
}, // name
// name getObjName(list, id) {
getObjName(list, id) { let _this = this
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
let a = list[i]; let a = list[i]
if (a.id === id) { if (a.id === id) {
return a.name; return a.name
} } else {
} if (a.children && a.children.length > 0) {
}, let res = _this.getObjName(a.children, id)
transformTime(timeStamp) { if (res) {
// return res
let year = moment(timeStamp).format('YYYY'); }
let month = moment(timeStamp).format('MM'); }
let newData = }
moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59'; }
let value = new Date(newData).getTime(); },
return value; transformTime(timeStamp) {//
}, let year = moment(timeStamp).format('YYYY')
transformYear(timeStamp) { let month = moment(timeStamp).format('MM')
// let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
let year = moment(timeStamp).format('YYYY'); let value = new Date(newData).getTime()
let newData = year + '-12-31 23:59:59'; return value
let value = new Date(newData).getTime(); },
return value; transformYear(timeStamp) {//
}, let year = moment(timeStamp).format('YYYY')
}, let newData = year+'-12-31 23:59:59'
}; let value = new Date(newData).getTime()
return value
}
}
}
</script> </script>
<style lang='scss'> <style lang='scss'>
/* 级联选择器 */
.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
display: none;
}
.demo-form-inline { .demo-form-inline {
.el-date-editor .el-range__icon { .el-date-editor .el-range__icon {
font-size: 16px; font-size: 16px;
color: #0b58ff; color: #0B58FF;
} }
.el-input__prefix .el-icon-date { .el-input__prefix .el-icon-date {
font-size: 16px; font-size: 16px;
color: #0b58ff; color: #0B58FF;
} }
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.demo-form-inline { .demo-form-inline {
.blue-block { .blue-block {
display: inline-block; display: inline-block;
width: 4px; width: 4px;
height: 16px; height: 16px;
background-color: #0b58ff; background-color: #0B58FF;
border-radius: 1px; border-radius: 1px;
margin-right: 8px; margin-right: 8px;
margin-top: 10px; margin-top: 10px;
} }
.el-form-item {
margin-right: 10px;
margin-bottom: 4px;
}
} }
.separateStyle { .separateStyle {
display: inline-block; display: inline-block;
width: 1px; width: 1px;
height: 24px; height: 24px;
background: #e8e8e8; background: #E8E8E8;
vertical-align: middle; vertical-align: middle;
} }
</style> </style>

View File

@ -1,155 +1,139 @@
<template> <template>
<el-form <el-form ref="form" :rules="rules" label-width="100px" :model="form">
ref="form" <el-form-item label="关联表名" prop="plcId">
:rules="rules" <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;" filterable>
label-width="100px" <el-option
:model="form"> v-for="item in plcList"
<el-form-item :key="item.id"
label="关联表名" :label="item.plcTableName"
prop="plcId"> :value="item.id">
<el-select </el-option>
v-model="form.plcId" </el-select>
placeholder="请选择" </el-form-item>
style="width: 100%" <el-form-item label="对象" prop="bindObjectId">
filterable> <el-cascader
<el-option style='width: 100%;'
v-for="item in plcList" v-model="objIds"
:key="item.id" :options="objList"
:label="item.plcTableName" :props="{ checkStrictly: true, value: 'id', label: 'name' }"
:value="item.id"></el-option> popper-class="cascaderParent"
</el-select> @change="selectObj"
</el-form-item> clearable></el-cascader>
<el-form-item </el-form-item>
label="对象" </el-form>
prop="bindObjectId">
<el-cascader
style="width: 100%"
v-model="objIds"
:options="objList"
:props="{ checkStrictly: true, value: 'id', label: 'name' }"
@change="selectObj"
clearable></el-cascader>
</el-form-item>
</el-form>
</template> </template>
<script> <script>
import { import { getEnergyPlcConnect, updateEnergyPlcConnect, createEnergyPlcConnect } from '@/api/base/energyPlcConnect'
getEnergyPlcConnect, import { getEnergyPlcAll } from '@/api/base/energyPlc'
updateEnergyPlcConnect,
createEnergyPlcConnect,
} from '@/api/base/energyPlcConnect';
import { getEnergyPlcAll } from '@/api/base/energyPlc';
export default { export default {
name: 'EnergyPlcConnectAdd', name: 'EnergyPlcConnectAdd',
props: { props: {
objList: { objList: {
type: Array, type: Array,
default: () => [], default: () => []
}, },
}, },
data() { data() {
return { return {
form: { form: {
id: '', id: '',
plcId: '', plcId: '',
bindObjectId: '', bindObjectId: '',
bindObjectType: '', bindObjectType: ''
}, },
objIds: [], // objIds: [],//
plcList: [], plcList: [],
isEdit: false, // isEdit: false, //
rules: { rules: {
plcId: [ plcId: [{ required: true, message: '关联表名不能为空', trigger: 'change' }],
{ required: true, message: '关联表名不能为空', trigger: 'change' }, bindObjectId: [{ required: true, message: '对象不能为空', trigger: 'change' }]
], }
bindObjectId: [ }
{ required: true, message: '对象不能为空', trigger: 'change' }, },
], methods: {
}, init(id) {
}; getEnergyPlcAll().then((res) => {
}, this.plcList = res.data || []
methods: { })
init(id) { if (id) {
getEnergyPlcAll().then((res) => { this.isEdit = true
this.plcList = res.data || []; this.form.id = id
}); getEnergyPlcConnect( id ).then((res) => {
if (id) { if (res.code === 0) {
this.isEdit = true; this.form = res.data
this.form.id = id; this.objIds = this.changeDetSelect(this.form.bindObjectId, this.objList)
getEnergyPlcConnect(id).then((res) => { }
if (res.code === 0) { })
this.form = res.data; } else {
this.objIds = this.changeDetSelect( this.isEdit = false
this.form.bindObjectId, this.form.id = ''
this.objList }
); },
} //
}); changeDetSelect(key, treeData) {
} else { let arr = [] //
this.isEdit = false; let returnArr = [] //
this.form.id = ''; let depth = 0 //
} //
}, function childrenEach(childrendData, depthN) {
// for (var j = 0; j < childrendData.length; j++) {
changeDetSelect(key, treeData) { depth = depthN
let arr = []; // arr[depthN] = childrendData[j].id
let returnArr = []; // if (childrendData[j].id == key) {
let depth = 0; // returnArr = arr.slice(0, depthN + 1)
// break
function childrenEach(childrendData, depthN) { } else {
for (var j = 0; j < childrendData.length; j++) { if (childrendData[j].children) {
depth = depthN; depth++
arr[depthN] = childrendData[j].id; childrenEach(childrendData[j].children, depth)
if (childrendData[j].id == key) { }
returnArr = arr.slice(0, depthN + 1); }
break; }
} else { return returnArr
if (childrendData[j].children) { }
depth++; return childrenEach(treeData, depth)
childrenEach(childrendData[j].children, depth); },
} selectObj(val) {
} this.form.bindObjectId = val[val.length-1]
} this.form.bindObjectType = val.length-1
return returnArr; },
} submitForm() {
return childrenEach(treeData, depth); this.$refs['form'].validate((valid) => {
}, if (valid) {
selectObj(val) { if (this.isEdit) {
this.form.bindObjectId = val[val.length - 1]; //
this.form.bindObjectType = val.length - 1; updateEnergyPlcConnect({...this.form}).then((res) => {
}, if (res.code === 0) {
submitForm() { this.$modal.msgSuccess("操作成功");
this.$refs['form'].validate((valid) => { this.$emit('successSubmit')
if (valid) { }
if (this.isEdit) { })
// } else {
updateEnergyPlcConnect({ ...this.form }).then((res) => { createEnergyPlcConnect({...this.form}).then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.$modal.msgSuccess('操作成功'); this.$modal.msgSuccess("操作成功");
this.$emit('successSubmit'); this.$emit('successSubmit')
} }
}); })
} else { }
createEnergyPlcConnect({ ...this.form }).then((res) => { } else {
if (res.code === 0) { return false
this.$modal.msgSuccess('操作成功'); }
this.$emit('successSubmit'); })
} },
}); formClear() {
} this.form.id = ''
} else { this.form.plcId = ''
return false; this.form.bindObjectId = ''
} this.form.bindObjectType = ''
}); this.objIds = []
}, this.isEdit = false
formClear() { }
this.form.id = ''; }
this.form.plcId = ''; }
this.form.bindObjectId = ''; </script>
this.form.bindObjectType = ''; <style>
this.objIds = []; .cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
this.isEdit = false; display: none;
}, }
}, </style>
};
</script>

View File

@ -1,270 +1,236 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<search-bar <!-- 搜索工作栏 -->
:formConfigs="formConfig" <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
ref="searchBarForm" <!-- 列表 -->
@headBtnClick="buttonClick" /> <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
<!-- 列表 --> :max-height="tableH">
<base-table <method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn"
:page="queryParams.pageNo" @clickBtn="handleClick" />
:limit="queryParams.pageSize" </base-table>
:table-props="tableProps" <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
:table-data="list" @pagination="getList" />
:max-height="tableH"> <!-- 新增 -->
<method-btn <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
v-if="tableBtn.length" @confirm="handleConfirm" :before-close="handleCancel" width='30%'>
slot="handleBtn" <energy-plc-connect-add ref="energyPlcConnect" :objList="objList" @successSubmit="successSubmit" />
:width="160" </base-dialog>
label="操作" <!-- 参数绑定/查看 -->
:method-list="tableBtn" <energy-plc-param v-if="paramVisible" ref="plcParam" @closeDrawer="closeDrawer"
@clickBtn="handleClick" /> :energyTypeList="energyTypeList"></energy-plc-param>
</base-table> </div>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList" />
<!-- 新增 -->
<base-dialog
:dialogTitle="addOrEditTitle"
:dialogVisible="centervisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="30%">
<energy-plc-connect-add
ref="energyPlcConnect"
:objList="objList"
@successSubmit="successSubmit" />
</base-dialog>
<!-- 参数绑定/查看 -->
<energy-plc-param
v-if="paramVisible"
ref="plcParam"
@closeDrawer="closeDrawer"
:energyTypeList="energyTypeList"></energy-plc-param>
</div>
</template> </template>
<script> <script>
import { import { getEnergyPlcConnectPage, deleteEnergyPlcConnect } from "@/api/base/energyPlcConnect";
getEnergyPlcConnectPage,
deleteEnergyPlcConnect,
} from '@/api/base/energyPlcConnect';
// import { publicFormatter } from '@/utils/dict' // import { publicFormatter } from '@/utils/dict'
import { getTree } from '@/api/analysis/energyAnalysis'; import { getTree } from '@/api/base/factory'
import { getEnergyTypeListAll } from '@/api/base/energyType'; import { getEnergyTypeListAll } from '@/api/base/energyType'
import EnergyPlcConnectAdd from './components/energyPlcConnectAdd'; import EnergyPlcConnectAdd from './components/energyPlcConnectAdd'
import EnergyPlcParam from './components/energyPlcParam'; import EnergyPlcParam from './components/energyPlcParam'
const tableProps = [ const tableProps = [
{ {
prop: 'objName', prop: 'objName',
label: '对象', label: '对象'
}, },
{ {
prop: 'objCode', prop: 'objCode',
label: '对象编码', label: '对象编码',
showOverflowtooltip: true, showOverflowtooltip: true
}, },
{ {
prop: 'plcTableName', prop: 'plcTableName',
label: '关联表名', label: '关联表名'
}, },
{ {
prop: 'plcTableCode', prop: 'plcTableCode',
label: '关联表编码', label: '关联表编码',
minWidth: 150, minWidth: 150,
showOverflowtooltip: true, showOverflowtooltip: true
}, },
{ {
prop: 'cnName', prop: 'cnName',
label: '标识名', label: '标识名',
minWidth: 150, minWidth: 150,
showOverflowtooltip: true, showOverflowtooltip: true
}, },
{ {
prop: 'varNum', prop: 'varNum',
label: '绑定参数数量', label: '绑定参数数量'
}, }
]; ]
export default { export default {
name: 'EnergyPlcConnect', name: "EnergyPlcConnect",
components: { EnergyPlcConnectAdd, EnergyPlcParam }, components: { EnergyPlcConnectAdd, EnergyPlcParam },
data() { data() {
return { return {
formConfig: [ formConfig: [
{ {
type: 'input', type: 'input',
label: '标识名', label: '标识名',
placeholder: '标识名', placeholder: '标识名',
param: 'cnName', param: 'cnName'
}, },
{ {
type: 'button', type: 'button',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary'
}, },
{ {
type: 'separate', type: 'separate'
}, },
{ {
type: this.$auth.hasPermi('base:energy-plc-connect:create') type: this.$auth.hasPermi('base:energy-plc-connect:create') ? 'button' : '',
? 'button' btnName: '新增',
: '', name: 'add',
btnName: '新增', color: 'success',
name: 'add', plain: true
color: 'success', }
plain: true, ],
}, tableProps,
], tableBtn: [
tableProps, this.$auth.hasPermi('base:energy-plc-connect:bind')
tableBtn: [ ? {
this.$auth.hasPermi('base:energy-plc-connect:bind') type: 'connect',
? { btnName: '绑定'
type: 'connect', }
btnName: '绑定', : undefined,
} {
: undefined, type: 'detail',
{ btnName: '详情'
type: 'detail', },
btnName: '详情', this.$auth.hasPermi('base:energy-plc-connect:update')
}, ? {
this.$auth.hasPermi('base:energy-plc-connect:update') type: 'edit',
? { btnName: '编辑'
type: 'edit', }
btnName: '编辑', : undefined,
} this.$auth.hasPermi('base:energy-plc-connect:delete')
: undefined, ? {
this.$auth.hasPermi('base:energy-plc-connect:delete') type: 'delete',
? { btnName: '删除'
type: 'delete', }
btnName: '删除', : undefined
} ].filter((v) => v),
: undefined, tableH: this.tableHeight(260),
].filter((v) => v), //
tableH: this.tableHeight(260), total: 0,
// //
total: 0, list: [],
// //
list: [], addOrEditTitle: "",
// //
addOrEditTitle: '', centervisible: false,
// //
centervisible: false, queryParams: {
// pageNo: 1,
queryParams: { pageSize: 20,
pageNo: 1, cnName: null
pageSize: 20, },
cnName: null, paramVisible: false,
}, energyTypeList: [],
paramVisible: false, objList: []
energyTypeList: [], };
objList: [], },
}; created() {
}, window.addEventListener('resize', () => {
created() { this.tableH = this.tableHeight(260)
window.addEventListener('resize', () => { })
this.tableH = this.tableHeight(260); this.getList();
}); },
this.getList(); mounted() {
}, //
mounted() { this.getEnergyTypeList()
// //
this.getEnergyTypeList(); this.getObjTree()
// },
this.getObjTree(); methods: {
}, buttonClick(val) {
methods: { switch (val.btnName) {
buttonClick(val) { case 'search':
switch (val.btnName) { this.queryParams.pageNo = 1;
case 'search': this.queryParams.cnName = val.cnName
this.queryParams.pageNo = 1; this.getList()
this.queryParams.cnName = val.cnName; break
this.getList(); default:
break; this.addOrEditTitle = '新增'
default: this.centervisible = true
this.addOrEditTitle = '新增'; this.$nextTick(() => {
this.centervisible = true; this.$refs.energyPlcConnect.init()
this.$nextTick(() => { })
this.$refs.energyPlcConnect.init(); }
}); },
} /** 查询列表 */
}, getList() {
/** 查询列表 */ getEnergyPlcConnectPage(this.queryParams).then(response => {
getList() { let arr = response.data.list || [];
getEnergyPlcConnectPage(this.queryParams).then((response) => { this.list = arr
let arr = response.data.list || []; this.total = response.data.total;
this.list = arr; });
this.total = response.data.total; },
}); handleClick(val) {
}, console.log(val)
handleClick(val) { switch (val.type) {
console.log(val); case 'edit':
switch (val.type) { this.addOrEditTitle = '编辑'
case 'edit': this.$nextTick(() => {
this.addOrEditTitle = '编辑'; this.$refs.energyPlcConnect.init(val.data.id)
this.$nextTick(() => { })
this.$refs.energyPlcConnect.init(val.data.id); this.centervisible = true
}); break
this.centervisible = true; case 'delete':
break; this.handleDelete(val.data)
case 'delete': break
this.handleDelete(val.data); case 'detail':
break; this.paramVisible = true
case 'detail': this.$nextTick(() => {
this.paramVisible = true; this.$refs.plcParam.init(val.data, 'detail')
this.$nextTick(() => { })
this.$refs.plcParam.init(val.data, 'detail'); break
}); default:
break; this.paramVisible = true
default: this.$nextTick(() => {
this.paramVisible = true; this.$refs.plcParam.init(val.data, 'connect')
this.$nextTick(() => { })
this.$refs.plcParam.init(val.data, 'connect'); }
}); },
} handleCancel() {
}, this.$refs.energyPlcConnect.formClear()
handleCancel() { this.centervisible = false
this.$refs.energyPlcConnect.formClear(); this.addOrEditTitle = ''
this.centervisible = false; },
this.addOrEditTitle = ''; handleConfirm() {
}, this.$refs.energyPlcConnect.submitForm()
handleConfirm() { },
this.$refs.energyPlcConnect.submitForm(); successSubmit() {
}, this.handleCancel()
successSubmit() { this.getList()
this.handleCancel(); },
this.getList(); /** 删除按钮操作 */
}, handleDelete(row) {
/** 删除按钮操作 */ this.$modal.confirm('是否确认删除对象为"' + row.objName + '"的数据项?').then(function () {
handleDelete(row) { return deleteEnergyPlcConnect(row.id);
this.$modal }).then(() => {
.confirm('是否确认删除对象为"' + row.objName + '"的数据项?') this.queryParams.pageNo = 1;
.then(function () { this.getList();
return deleteEnergyPlcConnect(row.id); this.$modal.msgSuccess("删除成功");
}) }).catch(() => { });
.then(() => { },
this.queryParams.pageNo = 1; closeDrawer() {
this.getList(); this.getList()
this.$modal.msgSuccess('删除成功'); },
}) getEnergyTypeList() {
.catch(() => {}); getEnergyTypeListAll().then((res) => {
}, this.energyTypeList = res.data || []
closeDrawer() { })
this.getList(); },
}, getObjTree() {
getEnergyTypeList() { getTree().then(res => {
getEnergyTypeListAll().then((res) => { this.objList = res.data || []
this.energyTypeList = res.data || []; })
}); }
}, }
getObjTree() {
getTree().then((res) => {
this.objList = res.data || [];
});
},
},
}; };
</script> </script>

View File

@ -1,422 +1,329 @@
<template> <template>
<el-form <el-form ref="form" :rules="rules" label-width="100px" :model="form">
ref="form" <el-row>
:rules="rules" <el-col :span="12">
label-width="100px" <el-form-item label="能源类型" prop="name">
:model="form"> <el-input v-model="form.name"></el-input>
<el-row> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item <el-col :span="12">
label="能源类型" <el-form-item label="类型编码" prop="code">
prop="name"> <el-input v-model="form.code" disabled></el-input>
<el-select </el-form-item>
v-model="form.name" </el-col>
placeholder="请选择" </el-row>
style="width: 100%"> <el-row>
<el-option <el-col :span="12">
v-for="item in getDictDatas(DICT_TYPE.ENERGY_TYPE)" <el-form-item label="单位" prop="unit">
:key="item.value" <el-select v-model="form.unit" placeholder="请选择" style="width: 100%;">
:label="item.label" <el-option v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)" :key="item.value" :label="item.label"
:value="item.value"></el-option> :value="item.value">
</el-select> </el-option>
</el-form-item> </el-select>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item <el-col :span="12">
label="类型编码" <el-form-item label="计价方式" prop="pricingMethod">
prop="code"> <el-select v-model="form.pricingMethod" placeholder="请选择" style="width: 100%;">
<el-input <el-option label="时间段" :value='0'></el-option>
v-model="form.code" <el-option label="使用量" :value='1'></el-option>
disabled></el-input> <el-option label="固定价位" :value='2'></el-option>
</el-form-item> </el-select>
</el-col> </el-form-item>
</el-row> </el-col>
<el-row> </el-row>
<el-col :span="12"> <el-row>
<el-form-item <el-col :span="12" v-show="form.pricingMethod === 2">
label="单位" <el-form-item label="单价(元)" prop="pricingMethod">
prop="unit"> <el-input-number v-model="form.singlePrice" :precision="2" :min="0" :max="999999999"
<el-select style="width: 100%;"></el-input-number>
v-model="form.unit" </el-form-item>
placeholder="请选择" </el-col>
filterable <el-col :span="12" v-show="form.pricingMethod === 1">
style="width: 100%"> <el-form-item label="计量维度" prop="dim">
<el-option <el-select v-model="form.dim" placeholder="请选择" style="width: 100%;">
v-for="item in getDictDatas(DICT_TYPE.UNIT_DICT)" <el-option label="月" :value='4'></el-option>
:key="item.value" <el-option label="年" :value='5'></el-option>
:label="item.label" </el-select>
:value="item.value"></el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="24" v-show="form.pricingMethod === 0">
</el-col> <el-form-item label="时间段" prop="pricingMethod">
<el-col :span="12"> <base-table :key='timeKye' :table-props="tableProps1" :table-data="tableData1"
<el-form-item :add-button-show="addButtonShow" @emitButtonClick="emitButtonClick1" @emitFun="inputChange1">
label="计价方式" <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
prop="pricingMethod"> @clickBtn="handleClick1" />
<el-select </base-table>
v-model="form.pricingMethod" </el-form-item>
placeholder="请选择" </el-col>
style="width: 100%"> <el-col :span="24" v-show="form.pricingMethod === 1">
<el-option <el-form-item label="使用量" prop="pricingMethod">
label="时间段" <base-table :key='usedKye' :table-props="tableProps2" :table-data="tableData2"
:value="0"></el-option> :add-button-show="addButtonShow" @emitButtonClick="emitButtonClick2" @emitFun="inputChange2">
<el-option <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
label="使用量" @clickBtn="handleClick2" />
:value="1"></el-option> </base-table>
<el-option </el-form-item>
label="固定价位" </el-col>
:value="2"></el-option> </el-row>
</el-select> <el-row>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="是否推送" prop="push">
</el-row> <el-switch v-model="form.push"></el-switch>
<el-row> </el-form-item>
<el-col </el-col>
:span="12" <el-col :span="12">
v-show="form.pricingMethod === 2"> <el-form-item label="描述" prop="description">
<el-form-item <el-input v-model="form.description"></el-input>
label="单价(元)" </el-form-item>
prop="pricingMethod"> </el-col>
<el-input-number </el-row>
v-model="form.singlePrice" </el-form>
:precision="2"
:min="0"
:max="999999999"
style="width: 100%"></el-input-number>
</el-form-item>
</el-col>
<el-col
:span="12"
v-show="form.pricingMethod === 1">
<el-form-item
label="计量维度"
prop="dim">
<el-select
v-model="form.dim"
placeholder="请选择"
style="width: 100%">
<el-option
label="月"
:value="4"></el-option>
<el-option
label="年"
:value="5"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="24"
v-show="form.pricingMethod === 0">
<el-form-item
label="时间段"
prop="pricingMethod">
<base-table
:key="timeKye"
:table-props="tableProps1"
:table-data="tableData1"
:add-button-show="addButtonShow"
@emitButtonClick="emitButtonClick1"
@emitFun="inputChange1">
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="80"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick1" />
</base-table>
</el-form-item>
</el-col>
<el-col
:span="24"
v-show="form.pricingMethod === 1">
<el-form-item
label="使用量"
prop="pricingMethod">
<base-table
:key="usedKye"
:table-props="tableProps2"
:table-data="tableData2"
:add-button-show="addButtonShow"
@emitButtonClick="emitButtonClick2"
@emitFun="inputChange2">
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="80"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick2" />
</base-table>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item
label="描述"
prop="description">
<el-input v-model="form.description"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template> </template>
<script> <script>
import { import { getEnergyType, updateEnergyType, createEnergyType, getEnergyTypeCode } from '@/api/base/energyType'
getEnergyType, import inputArea from './InputArea.vue'
updateEnergyType, import timePickerArea from './TimePickerArea.vue'
createEnergyType,
getEnergyTypeCode,
} from '@/api/base/energyType';
import inputArea from './InputArea.vue';
import timePickerArea from './TimePickerArea.vue';
const tableProps1 = [ const tableProps1 = [
{ {
prop: 'startTime', prop: 'startTime',
label: '开始时间', label: '开始时间',
subcomponent: timePickerArea, subcomponent: timePickerArea
}, },
{ {
prop: 'endTime', prop: 'endTime',
label: '结束时间', label: '结束时间',
subcomponent: timePickerArea, subcomponent: timePickerArea
}, },
{ {
prop: 'price', prop: 'price',
label: '单价(元)', label: '单价(元)',
subcomponent: inputArea, subcomponent: inputArea
}, }
]; ]
const tableProps2 = [ const tableProps2 = [
{ {
prop: 'startUsed', prop: 'startUsed',
label: '下限值', label: '下限值',
// subcomponent: inputArea // subcomponent: inputArea
}, },
{ {
prop: 'endUsed', prop: 'endUsed',
label: '上限量', label: '上限量',
subcomponent: inputArea, subcomponent: inputArea
}, },
{ {
prop: 'price', prop: 'price',
label: '单价(元)', label: '单价(元)',
subcomponent: inputArea, subcomponent: inputArea
}, }
]; ]
export default { export default {
name: 'energyTypeAdd', name: 'energyTypeAdd',
data() { data() {
return { return {
form: { form: {
id: '', id: '',
name: '', name: '',
code: '', code: '',
unit: '', unit: '',
singlePrice: 0, singlePrice: 0,
pricingMethod: 2, pricingMethod: 2,
dim: '', dim: '',
description: '', push: false,
}, description: ''
isEdit: false, // },
rules: { isEdit: false, //
name: [ rules: {
{ required: true, message: '能源类型不能为空', trigger: 'blur' }, name: [{ required: true, message: '能源类型不能为空', trigger: 'blur' }],
], pricingMethod: [{ required: true, message: '计价方式不能为空', trigger: 'change' }]
pricingMethod: [ },
{ required: true, message: '计价方式不能为空', trigger: 'change' }, timeKye: 0,
], usedKye: 0,
}, tableProps1,
timeKye: 0, tableProps2,
usedKye: 0, tableData1: [],
tableProps1, tableData2: [],
tableProps2, tableBtn: [
tableData1: [], {
tableData2: [], type: 'delete',
tableBtn: [ name: '删除'
{ }
type: 'delete', ],
name: '删除', addButtonShow: '新增'
}, }
], },
addButtonShow: '新增', methods: {
}; init(id) {
}, if (id) {
methods: { this.isEdit = true
init(id) { this.form.id = id
if (id) { getEnergyType(id).then((res) => {
this.isEdit = true; if (res.code === 0) {
this.form.id = id; this.form.name = res.data.name
getEnergyType(id).then((res) => { this.form.code = res.data.code
if (res.code === 0) { this.form.unit = res.data.unit
this.form.name = res.data.name; this.form.pricingMethod = res.data.pricingMethod
this.form.code = res.data.code; this.form.push = res.data.push ? true : false
this.form.unit = res.data.unit; this.form.description = res.data.description
this.form.pricingMethod = res.data.pricingMethod; switch (this.form.pricingMethod) {
this.form.description = res.data.description; case 0:
switch (this.form.pricingMethod) { this.tableData1 = res.data.segPriceList || []
case 0: break;
this.tableData1 = res.data.segPriceList || []; case 1:
break; this.tableData2 = res.data.usedPriceList || []
case 1: this.form.dim = res.data.dim
this.tableData2 = res.data.usedPriceList || []; break;
this.form.dim = res.data.dim; default:
break; this.form.singlePrice = res.data.singlePrice || 0
default: }
this.form.singlePrice = res.data.singlePrice || 0; }
} })
} console.log(this.form)
}); } else {
console.log(this.form); this.isEdit = false
} else { this.form.id = ''
this.isEdit = false; getEnergyTypeCode().then((res) => {
this.form.id = ''; this.form.code = res.data
getEnergyTypeCode().then((res) => { })
this.form.code = res.data; }
}); },
} //
}, inputChange1(val) {
// this.tableData1[val._pageIndex - 1][val.prop] = val[val.prop]
inputChange1(val) { if ((this.tableData1.length > val._pageIndex) && val.prop === 'endTime') {
this.tableData1[val._pageIndex - 1][val.prop] = val[val.prop]; this.tableData1[val._pageIndex].startTime = val[val.prop]
if (this.tableData1.length > val._pageIndex && val.prop === 'endTime') { }
this.tableData1[val._pageIndex].startTime = val[val.prop]; this.timeKye++
} },
this.timeKye++; inputChange2(val) {
}, //
inputChange2(val) { if (!!val.endUsed && (val.endUsed <= val.startUsed)) {
// this.$modal.msgError('上限值不能等于或者小于下限值')
if (!!val.endUsed && val.endUsed <= val.startUsed) { return false
this.$modal.msgError('上限值不能等于或者小于下限值'); }
return false; this.tableData2[val._pageIndex - 1][val.prop] = val[val.prop]
} if ((this.tableData2.length > val._pageIndex) && val.prop === 'endUsed') {
this.tableData2[val._pageIndex - 1][val.prop] = val[val.prop]; this.tableData2[val._pageIndex].startUsed = val[val.prop]
if (this.tableData2.length > val._pageIndex && val.prop === 'endUsed') { }
this.tableData2[val._pageIndex].startUsed = val[val.prop]; this.usedKye++
} },
this.usedKye++; //
}, emitButtonClick1() {
// let n = this.tableData1.length
emitButtonClick1() { let obj = {}
let n = this.tableData1.length; obj.startTime = n === 0 ? '' : this.tableData1[n - 1].endTime
let obj = {}; obj.endTime = ''
obj.startTime = n === 0 ? '' : this.tableData1[n - 1].endTime; obj.price = 0
obj.endTime = ''; this.tableData1.push(obj)
obj.price = 0; },
this.tableData1.push(obj); emitButtonClick2() {
}, let n = this.tableData2.length
emitButtonClick2() { let obj = {}
let n = this.tableData2.length; obj.startUsed = n === 0 ? 0 : this.tableData2[n - 1].endUsed
let obj = {}; obj.endUsed = 0
obj.startUsed = n === 0 ? 0 : this.tableData2[n - 1].endUsed; obj.price = 0
obj.endUsed = 0; this.tableData2.push(obj)
obj.price = 0; },
this.tableData2.push(obj); //
}, handleClick1(val) {
// this.tableData1.splice(val.data._pageIndex - 1, 1)
handleClick1(val) { this.timeKye++
this.tableData1.splice(val.data._pageIndex - 1, 1); },
this.timeKye++; handleClick2(val) {
}, this.tableData2.splice(val.data._pageIndex - 1, 1)
handleClick2(val) { this.usedKye++
this.tableData2.splice(val.data._pageIndex - 1, 1); },
this.usedKye++; submitForm() {
}, this.$refs['form'].validate((valid) => {
submitForm() { if (valid) {
this.$refs['form'].validate((valid) => { switch (this.form.pricingMethod) {
if (valid) { case 0://
switch (this.form.pricingMethod) { if (this.tableData1.length === 0) {
case 0: // this.$modal.msgError('时间段表格数据不能为空')
if (this.tableData1.length === 0) { return false
this.$modal.msgError('时间段表格数据不能为空'); } else {
return false; this.tableData1.map(item => {
} else { if (item.price <= 0) {
this.tableData1.map((item) => { this.$modal.msgError('单价有误请检查,请检查')
if (item.price <= 0) { return false
this.$modal.msgError('单价有误请检查,请检查'); }
return false; })
} }
}); break;
} case 1:// 使
break; if (this.tableData2.length === 0) {
case 1: // 使 this.$modal.msgError('使用量表格数据不能为空')
if (this.tableData2.length === 0) { return false
this.$modal.msgError('使用量表格数据不能为空'); } else {
return false; this.tableData1.map(item => {
} else { if (item.price <= 0) {
this.tableData1.map((item) => { this.$modal.msgError('单价有误请检查,请检查')
if (item.price <= 0) { return false
this.$modal.msgError('单价有误请检查,请检查'); }
return false; })
} }
}); break;
} default://
break; if (!this.form.singlePrice) {
default: // this.$modal.msgError('单价有误请检查,请检查')
if (!this.form.singlePrice) { return false
this.$modal.msgError('单价有误请检查,请检查'); }
return false; }
} console.log(this.form)
} if (this.isEdit) {
console.log(this.form); //
if (this.isEdit) { updateEnergyType({
// id: this.form.id,
updateEnergyType({ code: this.form.code,
id: this.form.id, name: this.form.name,
code: this.form.code, unit: this.form.unit,
name: this.form.name, pricingMethod: this.form.pricingMethod,
unit: this.form.unit, description: this.form.description,
pricingMethod: this.form.pricingMethod, dim: this.form.pricingMethod === 1 ? this.form.dim : '',
description: this.form.description, singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
dim: this.form.pricingMethod === 1 ? this.form.dim : '', segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [],
singlePrice: usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [],
this.form.pricingMethod === 2 ? this.form.singlePrice : '', push: this.form.push ? 1 : 0
segPriceList: }).then((res) => {
this.form.pricingMethod === 0 ? this.tableData1 : [], if (res.code === 0) {
usedPriceList: this.$modal.msgSuccess("操作成功");
this.form.pricingMethod === 1 ? this.tableData2 : [], this.$emit('successSubmit')
}).then((res) => { }
if (res.code === 0) { })
this.$modal.msgSuccess('操作成功'); } else {
this.$emit('successSubmit'); createEnergyType({
} code: this.form.code,
}); name: this.form.name,
} else { unit: this.form.unit,
createEnergyType({ pricingMethod: this.form.pricingMethod,
code: this.form.code, description: this.form.description,
name: this.form.name, dim: this.form.pricingMethod === 1 ? this.form.dim : '',
unit: this.form.unit, singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
pricingMethod: this.form.pricingMethod, segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [],
description: this.form.description, usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [],
dim: this.form.pricingMethod === 1 ? this.form.dim : '', push: this.form.push ? 1 : 0
singlePrice: }).then((res) => {
this.form.pricingMethod === 2 ? this.form.singlePrice : '', if (res.code === 0) {
segPriceList: this.$modal.msgSuccess("操作成功");
this.form.pricingMethod === 0 ? this.tableData1 : [], this.$emit('successSubmit')
usedPriceList: }
this.form.pricingMethod === 1 ? this.tableData2 : [], })
}).then((res) => { }
if (res.code === 0) { } else {
this.$modal.msgSuccess('操作成功'); return false
this.$emit('successSubmit'); }
} })
}); },
} formClear() {
} else { this.$refs.form.resetFields()
return false; this.form.singlePrice = 0
} this.isEdit = false
}); this.timeKye = 0
}, this.usedKye = 0
formClear() { this.tableData1 = []
this.$refs.form.resetFields(); this.tableData2 = []
this.form.singlePrice = 0; }
this.isEdit = false; }
this.timeKye = 0; }
this.usedKye = 0;
this.tableData1 = [];
this.tableData2 = [];
},
},
};
</script> </script>

View File

@ -1,191 +1,224 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<search-bar <!-- 搜索工作栏 -->
:formConfigs="formConfig" <search-bar
ref="searchBarForm" :formConfigs="formConfig"
:removeBlue="true" ref="searchBarForm"
@headBtnClick="buttonClick" /> @headBtnClick="buttonClick"
<!-- 列表 --> />
<base-table <!-- 列表 -->
:page="queryParams.pageNo" <base-table
:limit="queryParams.pageSize" :page="queryParams.pageNo"
:table-props="tableProps" :limit="queryParams.pageSize"
:table-data="list" :table-props="tableProps"
:max-height="tableH"> :table-data="list"
<method-btn :max-height="tableH"
v-if="tableBtn.length" >
slot="handleBtn" <method-btn
:width="80" v-if="tableBtn.length"
label="操作" slot="handleBtn"
:method-list="tableBtn" :width="80"
@clickBtn="handleClick" /> label="操作"
</base-table> :method-list="tableBtn"
<!-- 新增 --> @clickBtn="handleClick"
<base-dialog />
:dialogTitle="addOrEditTitle" </base-table>
:dialogVisible="centervisible" <pagination
@cancel="handleCancel" :page.sync="queryParams.pageNo"
@confirm="handleConfirm" :limit.sync="queryParams.pageSize"
:before-close="handleCancel"> :total="total"
<energy-type-add @pagination="getList"
ref="energyType" />
@successSubmit="successSubmit" /> <!-- 新增 -->
</base-dialog> <base-dialog
</div> :dialogTitle="addOrEditTitle"
:dialogVisible="centervisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
>
<energy-type-add ref="energyType" @successSubmit="successSubmit" />
</base-dialog>
</div>
</template> </template>
<script> <script>
import { getEnergyTypePage, deleteEnergyType } from '@/api/base/energyType'; import { getEnergyTypePage, deleteEnergyType } from "@/api/base/energyType";
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict'
import InnerTable from './components/InnerTable'; import InnerTable from './components/InnerTable'
import EnergyTypeAdd from './components/energyTypeAdd'; import EnergyTypeAdd from './components/energyTypeAdd'
const tableProps = [ const tableProps = [
{ {
prop: 'code', prop: 'code',
label: '类型编码', label: '类型编码',
showOverflowtooltip: true, showOverflowtooltip: true,
minWidth: 150, minWidth: 150
}, },
{ {
prop: 'name', prop: 'name',
label: '能源类型', label: '能源类型'
filter: publicFormatter('energy_type'), },
}, {
{ prop: 'unit',
prop: 'unit', label: '单位',
label: '单位', filter: publicFormatter('energy_unit')
filter: publicFormatter('unit_dict'), },
}, {
{ prop: 'pricingMethod',
prop: 'pricingMethod', label: '计价方式'
label: '计价方式', },
}, {
{ prop: 'push',
prop: 'price', label: '是否推送',
label: '价格(元)', filter: publicFormatter('push')
subcomponent: InnerTable, },
}, {
]; prop: 'price',
label: '价格(元)',
subcomponent: InnerTable
}
]
export default { export default {
name: 'EnergyType', name: "EnergyType",
components: { EnergyTypeAdd }, components: { EnergyTypeAdd },
data() { data() {
return { return {
formConfig: [ formConfig: [
{ {
type: this.$auth.hasPermi('base:energy-type:create') ? 'button' : '', type: 'input',
btnName: '新增', label: '能源类型',
name: 'add', placeholder: '能源类型',
color: 'success', param: 'name'
plain: true, },
}, {
], type: 'button',
tableProps, btnName: '查询',
tableBtn: [ name: 'search',
this.$auth.hasPermi('base:energy-type:update') color: 'primary'
? { },
type: 'edit', {
btnName: '编辑', type: this.$auth.hasPermi('base:energy-type:create') ? 'separate' : '',
} },
: undefined, {
this.$auth.hasPermi('base:energy-type:delete') type: this.$auth.hasPermi('base:energy-type:create') ? 'button' : '',
? { btnName: '新增',
type: 'delete', name: 'add',
btnName: '删除', color: 'success',
} plain: true
: undefined, }
].filter((v) => v), ],
tableH: this.tableHeight(220), tableProps,
pricingMethodList: [ tableBtn: [
{ value: 0, label: '分时间段计价' }, this.$auth.hasPermi('base:energy-type:update')
{ value: 1, label: '分使用量计价' }, ? {
{ value: 2, label: '单一计价' }, type: 'edit',
], btnName: '编辑'
// }
total: 0, : undefined,
// this.$auth.hasPermi('base:energy-type:delete')
list: [], ? {
// type: 'delete',
addOrEditTitle: '', btnName: '删除'
// }
centervisible: false, : undefined
// ].filter((v) => v),
queryParams: { tableH: this.tableHeight(260),
pageNo: 1, pricingMethodList: [
pageSize: 100, {value: 0,label: '分时间段计价'},
}, {value: 1,label: '分使用量计价'},
}; {value: 2,label: '单一计价'}
}, ],
created() { //
window.addEventListener('resize', () => { total: 0,
this.tableH = this.tableHeight(220); //
}); list: [],
this.getList(); //
}, addOrEditTitle: "",
methods: { //
buttonClick() { centervisible: false,
this.addOrEditTitle = '新增'; //
this.centervisible = true; queryParams: {
this.$nextTick(() => { pageNo: 1,
this.$refs.energyType.init(); pageSize: 20,
}); name: null,
}, code: null
/** 查询列表 */ }
getList() { };
getEnergyTypePage(this.queryParams).then((response) => { },
let arr = response.data.list || []; created() {
arr && window.addEventListener('resize', () => {
arr.map((item) => { this.tableH = this.tableHeight(260)
this.pricingMethodList.map((i) => { })
if (item.pricingMethod === i.value) { this.getList();
item.pricingMethod = i.label; },
} methods: {
}); buttonClick(val) {
}); switch (val.btnName) {
this.list = arr; case 'search':
this.total = response.data.total; this.queryParams.pageNo = 1;
}); this.queryParams.name = val.name
}, this.queryParams.code = val.code
handleClick(val) { this.getList()
switch (val.type) { break
case 'edit': default:
this.addOrEditTitle = '编辑'; this.addOrEditTitle = '新增'
this.$nextTick(() => { this.centervisible = true
this.$refs.energyType.init(val.data.id); this.$nextTick(() => {
}); this.$refs.energyType.init()
this.centervisible = true; })
break; }
default: },
this.handleDelete(val.data); /** 查询列表 */
} getList() {
}, getEnergyTypePage(this.queryParams).then(response => {
handleCancel() { let arr = response.data.list || [];
this.$refs.energyType.formClear(); arr&&arr.map(item => {
this.centervisible = false; this.pricingMethodList.map(i => {
this.addOrEditTitle = ''; if (item.pricingMethod === i.value) {
}, item.pricingMethod = i.label
handleConfirm() { }
this.$refs.energyType.submitForm(); })
}, })
successSubmit() { this.list = arr
this.handleCancel(); this.total = response.data.total;
this.getList(); });
}, },
/** 删除按钮操作 */ handleClick(val) {
handleDelete(row) { switch (val.type) {
this.$modal case 'edit':
.confirm('是否确认删除能源类型为"' + row.name + '"的数据项?') this.addOrEditTitle = '编辑'
.then(function () { this.$nextTick(() => {
return deleteEnergyType(row.id); this.$refs.energyType.init(val.data.id)
}) })
.then(() => { this.centervisible = true
this.queryParams.pageNo = 1; break
this.getList(); default:
this.$modal.msgSuccess('删除成功'); this.handleDelete(val.data)
}) }
.catch(() => {}); },
}, handleCancel() {
}, this.$refs.energyType.formClear()
this.centervisible = false
this.addOrEditTitle = ''
},
handleConfirm() {
this.$refs.energyType.submitForm()
},
successSubmit() {
this.handleCancel()
this.getList()
},
/** 删除按钮操作 */
handleDelete(row) {
this.$modal.confirm('是否确认删除能源类型为"' + row.name + '"的数据项?').then(function() {
return deleteEnergyType(row.id);
}).then(() => {
this.queryParams.pageNo = 1;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}
}
}; };
</script> </script>

View File

@ -1,360 +1,282 @@
<template> <template>
<el-form <el-form ref="form" :rules="rules" label-width="110px" :model="form">
ref="form" <el-row>
:rules="rules" <el-col :span="12">
label-width="110px" <el-form-item label="抄表方式" prop="method">
:model="form"> <el-select v-model="form.method" placeholder="请选择" style="width: 100%;" @change="changeMethod">
<el-row> <el-option
<el-col :span="12"> v-for="item in getDictDatas(DICT_TYPE.METHOD)"
<el-form-item :key="item.value"
label="抄表方式" :label="item.label"
prop="method"> :value="item.value">
<el-select </el-option>
v-model="form.method" </el-select>
placeholder="请选择" </el-form-item>
style="width: 100%" </el-col>
@change="changeMethod"> <el-col :span="12" v-if='form.method == 1'>
<el-option <el-form-item label="监控对象" prop="objectId">
v-for="item in getDictDatas(DICT_TYPE.METHOD)" <el-cascader
:key="item.value" style='width: 100%;'
:label="item.label" v-model="objIds"
:value="item.value"></el-option> :options="objList"
</el-select> :props="{ checkStrictly: true, value: 'id', label: 'name' }"
</el-form-item> popper-class="cascaderParent"
</el-col> @change="selectObj"
<el-col clearable></el-cascader>
:span="12" </el-form-item>
v-if="form.method == 1"> </el-col>
<el-form-item <el-col :span="12" v-if='form.method == 2'>
label="监控对象" <el-form-item label="水/气表名" prop="tableName">
prop="objectId"> <el-select v-model="form.tableName" placeholder="请选择" style="width: 100%;">
<el-cascader <el-option
style="width: 100%" v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
v-model="objIds" :key="item.value"
:options="objList" :label="item.label"
:props="{ checkStrictly: true, value: 'id', label: 'name' }" :value="item.value">
popper-class="cascaderParent" </el-option>
@change="selectObj" </el-select>
clearable></el-cascader> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col <el-form-item label="监控能源类型" prop="energyTypeId">
:span="12" <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable @change="toggleType">
v-if="form.method == 2"> <el-option
<el-form-item v-for="item in this.energyTypeList"
label="能源表名" :key="item.id"
prop="tableName"> :label="item.name"
<el-select :value="item.id">
v-model="form.tableName" </el-option>
placeholder="请选择" </el-select>
style="width: 100%"> </el-form-item>
<el-option </el-col>
v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)" <el-col :span="12" v-if='form.method == 1'>
:key="item.value" <el-form-item label="监控模式" prop="type">
:label="item.label" <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
:value="item.value"></el-option> <el-option label="合并" :value= "1" ></el-option>
</el-select> <el-option label="详细" :value= "2" ></el-option>
</el-form-item> </el-select>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item <el-col :span="12" v-if='form.method == 1'>
label="监控能源类型" <el-form-item label="监控详细参数" prop="type" v-if="form.type === 2">
prop="energyTypeId"> <el-select v-model="form.plcParamId" placeholder="请选择" style="width: 100%;" @change="selectDetail">
<el-select <el-option
v-model="form.energyTypeId" v-for="item in detailList"
placeholder="请选择" :key="item.id"
style="width: 100%" :label="item.name"
filterable :value="item.id">
@change="toggleType"> </el-option>
<el-option </el-select>
v-for="item in this.energyTypeList" </el-form-item>
:key="item.id" </el-col>
:label="item.name" <el-col :span="12">
:value="item.id"></el-option> <el-form-item label="指标类型" prop="limitType">
</el-select> <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;" :disabled='form.method == 2'>
</el-form-item> <el-option
</el-col> v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
<el-col :key="item.value"
:span="12" :label="item.label"
v-if="form.method == 1"> :value="item.value">
<el-form-item </el-option>
label="监控模式" </el-select>
prop="type"> </el-form-item>
<el-select </el-col>
v-model="form.type" <el-col :span="12">
placeholder="请选择" <el-form-item label="消耗量阈值">
style="width: 100%" <el-input-number v-model="form.minValue" placeholder="最小值" :max="9999999" style="width: 50%;"></el-input-number>
@change="typeChange"> <el-input-number v-model="form.maxValue" placeholder="最大值" :max="9999999" style="width: 50%;"></el-input-number>
<el-option </el-form-item>
label="合并" </el-col>
:value="1"></el-option> </el-row>
<el-option </el-form>
label="详细"
:value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="12"
v-if="form.method == 1">
<el-form-item
label="监控详细参数"
prop="type"
v-if="form.type === 2">
<el-select
v-model="form.plcParamId"
placeholder="请选择"
style="width: 100%"
@change="selectDetail">
<el-option
v-for="item in detailList"
:key="item.id"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="指标类型"
prop="limitType">
<el-select
v-model="form.limitType"
placeholder="请选择"
style="width: 100%"
:disabled="form.method == 2">
<el-option
v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
:key="item.value"
:label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="消耗量阈值">
<el-input-number
v-model="form.minValue"
placeholder="最小值"
:max="9999999"
style="width: 50%"></el-input-number>
<el-input-number
v-model="form.maxValue"
placeholder="最大值"
:max="9999999"
style="width: 50%"></el-input-number>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template> </template>
<script> <script>
import { import { getEnergyLimit, updateEnergyLimit, createEnergyLimit, getEnergyParamList } from '@/api/monitoring/energyLimit'
getEnergyLimit,
updateEnergyLimit,
createEnergyLimit,
getEnergyParamList,
} from '@/api/monitoring/energyLimit';
export default { export default {
name: 'energyLimitAdd', name: 'energyLimitAdd',
props: { props: {
energyTypeList: { energyTypeList: {
type: Array, type: Array,
required: true, required: true,
default: () => { default: () => {
return []; return []
}, }
}, },
objList: { objList: {
type: Array, type: Array,
default: () => [], default: () => []
}, }
}, },
data() { data() {
return { return {
form: { form: {
id: '', id: '',
method: '1', method: '1',
objectId: '', objectId: '',
objectType: '', objectType: '',
energyTypeId: '', energyTypeId: '',
type: '', type: '',
plcParamId: '', plcParamId: '',
limitType: '', limitType: '',
minValue: 0, minValue: 0,
maxValue: 0, maxValue: 0
}, },
objIds: [], // objIds: [],//
isEdit: false, // isEdit: false, //
rules: { rules: {
method: [ method: [{ required: true, message: '抄表方式不能为空', trigger: 'change' }],
{ required: true, message: '抄表方式不能为空', trigger: 'change' }, objectId: [{ required: true, message: '监控对象不能为空', trigger: 'change' }],
], energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
objectId: [ type: [{ required: true, message: '监控模式不能为空', trigger: 'change' }],
{ required: true, message: '监控对象不能为空', trigger: 'change' }, limitType: [{ required: true, message: '指标类型不能为空', trigger: 'change' }]
], },
energyTypeId: [ detailList: []
{ required: true, message: '能源类型不能为空', trigger: 'change' }, }
], },
type: [ methods: {
{ required: true, message: '监控模式不能为空', trigger: 'change' }, init(id) {
], if (id) {
limitType: [ this.isEdit = true
{ required: true, message: '指标类型不能为空', trigger: 'change' }, this.form.id = id
], getEnergyLimit( id ).then((res) => {
}, if (res.code === 0) {
detailList: [], this.form = res.data
}; this.form.plcParamId = res.data.plcParamId || ''
}, this.form.method = this.form.method ? this.form.method + '' : ''
methods: { this.form.limitType = this.form.limitType ? this.form.limitType + '' : ''
init(id) { this.objIds = this.changeDetSelect(this.form.objectId, this.objList)
if (id) { if (this.form.type === 2) {
this.isEdit = true; this.getDetailList()
this.form.id = id; }
getEnergyLimit(id).then((res) => { }
if (res.code === 0) { })
this.form = res.data; } else {
this.form.plcParamId = res.data.plcParamId || ''; this.isEdit = false
this.form.method = this.form.method ? this.form.method + '' : ''; this.form.id = ''
this.form.limitType = this.form.limitType }
? this.form.limitType + '' },
: ''; //
this.objIds = this.changeDetSelect( changeMethod() {
this.form.objectId, if(this.form.method === '2'){
this.objList this.form.limitType = "2"
); }else{
if (this.form.type === 2) { this.form.limitType = ''
this.getDetailList(); }
} },
} //
}); getDetailList() {
} else { getEnergyParamList({
this.isEdit = false; objId: this.form.objectId,
this.form.id = ''; energyTypeId: this.form.energyTypeId
} }).then((res) => {
}, if (res.code === 0) {
// this.detailList = res.data
changeMethod() { } else {
if (this.form.method === '2') { this.detailList = []
this.form.limitType = '2'; }
} else { })
this.form.limitType = ''; },
} typeChange(val) {
}, console.log(this.form)
// this.form.plcParamId = ''
getDetailList() { if (val === 2) {
getEnergyParamList({ if (this.form.objectId && this.form.energyTypeId) {
objId: this.form.objectId, this.getDetailList()
energyTypeId: this.form.energyTypeId, }
}).then((res) => { }
if (res.code === 0) { },
this.detailList = res.data; toggleType() {
} else { if (this.form.energyTypeId && this.form.type) {
this.detailList = []; this.getDetailList()
} this.form.plcParamId = ''
}); }
}, },
typeChange(val) { //
console.log(this.form); changeDetSelect(key, treeData) {
this.form.plcParamId = ''; let arr = [] //
if (val === 2) { let returnArr = [] //
if (this.form.objectId && this.form.energyTypeId) { let depth = 0 //
this.getDetailList(); //
} function childrenEach(childrendData, depthN) {
} for (var j = 0; j < childrendData.length; j++) {
}, depth = depthN
toggleType() { arr[depthN] = childrendData[j].id
if (this.form.energyTypeId && this.form.type) { if (childrendData[j].id == key) {
this.getDetailList(); returnArr = arr.slice(0, depthN + 1)
this.form.plcParamId = ''; break
} } else {
}, if (childrendData[j].children) {
// depth++
changeDetSelect(key, treeData) { childrenEach(childrendData[j].children, depth)
let arr = []; // }
let returnArr = []; // }
let depth = 0; // }
// return returnArr
function childrenEach(childrendData, depthN) { }
for (var j = 0; j < childrendData.length; j++) { return childrenEach(treeData, depth)
depth = depthN; },
arr[depthN] = childrendData[j].id; selectObj(val) {
if (childrendData[j].id == key) { this.form.objectId = val[val.length-1]
returnArr = arr.slice(0, depthN + 1); this.form.objectType = val.length-1
break; if (this.form.energyTypeId && this.form.type) {
} else { this.getDetailList()
if (childrendData[j].children) { this.form.plcParamId = ''
depth++; }
childrenEach(childrendData[j].children, depth); },
} selectDetail() {
} this.$forceUpdate()
} },
return returnArr; submitForm() {
} this.$refs['form'].validate((valid) => {
return childrenEach(treeData, depth); if (valid) {
}, if (this.form.type === 2 && !this.form.plcParamId) {
selectObj(val) { this.$modal.msgError("监控模式为详细时,详细参数为必填");
this.form.objectId = val[val.length - 1]; return false
this.form.objectType = val.length - 1; }
if (this.form.energyTypeId && this.form.type) { if (this.form.minValue && this.form.maxValue) {
this.getDetailList(); if (this.form.minValue > this.form.maxValue) {
this.form.plcParamId = ''; this.$modal.msgError("消耗量阈值,最小值不能大于最大值");
} return false
}, }
selectDetail() { }
this.$forceUpdate(); this.form.minValue = this.form.minValue || 0
}, this.form.maxValue = this.form.maxValue || 0
submitForm() { if (this.isEdit) {
this.$refs['form'].validate((valid) => { //
if (valid) { updateEnergyLimit({...this.form}).then((res) => {
if (this.form.type === 2 && !this.form.plcParamId) { if (res.code === 0) {
this.$modal.msgError('监控模式为详细时,详细参数为必填'); this.$modal.msgSuccess("操作成功");
return false; this.$emit('successSubmit')
} }
if (this.form.minValue && this.form.maxValue) { })
if (this.form.minValue > this.form.maxValue) { } else {
this.$modal.msgError('消耗量阈值,最小值不能大于最大值'); createEnergyLimit({...this.form}).then((res) => {
return false; if (res.code === 0) {
} this.$modal.msgSuccess("操作成功");
} this.$emit('successSubmit')
this.form.minValue = this.form.minValue || 0; }
this.form.maxValue = this.form.maxValue || 0; })
if (this.isEdit) { }
// } else {
updateEnergyLimit({ ...this.form }).then((res) => { return false
if (res.code === 0) { }
this.$modal.msgSuccess('操作成功'); })
this.$emit('successSubmit'); },
} formClear() {
}); this.$refs.form.resetFields()
} else { this.form.type = ''
createEnergyLimit({ ...this.form }).then((res) => { this.form.plcParamId = ''
if (res.code === 0) { this.form.minValue = null
this.$modal.msgSuccess('操作成功'); this.form.maxValue = null
this.$emit('successSubmit'); this.objIds = ''
} this.detailList = []
}); this.isEdit = false
} }
} else { }
return false; }
}
});
},
formClear() {
this.$refs.form.resetFields();
this.form.type = '';
this.form.plcParamId = '';
this.form.minValue = null;
this.form.maxValue = null;
this.objIds = '';
this.detailList = [];
this.isEdit = false;
},
},
};
</script> </script>
<style> <style>
.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio { .cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
display: none; display: none;
} }
</style> </style>

View File

@ -1,278 +1,269 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<search-bar <!-- 搜索工作栏 -->
:formConfigs="formConfig" <search-bar
ref="searchBarForm" :formConfigs="formConfig"
@headBtnClick="buttonClick" /> ref="searchBarForm"
<!-- 列表 --> @headBtnClick="buttonClick"
<base-table />
:page="queryParams.pageNo" <!-- 列表 -->
:limit="queryParams.pageSize" <base-table
:table-props="tableProps" :page="queryParams.pageNo"
:table-data="list" :limit="queryParams.pageSize"
:max-height="tableH"> :table-props="tableProps"
<method-btn :table-data="list"
v-if="tableBtn.length" :max-height="tableH"
slot="handleBtn" >
:width="80" <method-btn
label="操作" v-if="tableBtn.length"
:method-list="tableBtn" slot="handleBtn"
@clickBtn="handleClick" /> :width="80"
</base-table> label="操作"
<pagination :method-list="tableBtn"
:page.sync="queryParams.pageNo" @clickBtn="handleClick"
:limit.sync="queryParams.pageSize" />
:total="total" </base-table>
@pagination="getList" /> <pagination
<!-- 新增 --> :page.sync="queryParams.pageNo"
<base-dialog :limit.sync="queryParams.pageSize"
:dialogTitle="addOrEditTitle" :total="total"
:dialogVisible="centervisible" @pagination="getList"
@cancel="handleCancel" />
@confirm="handleConfirm" <!-- 新增 -->
:before-close="handleCancel" <base-dialog
width="50%"> :dialogTitle="addOrEditTitle"
<energy-limit-add :dialogVisible="centervisible"
ref="energyLimit" @cancel="handleCancel"
@successSubmit="successSubmit" @confirm="handleConfirm"
:energyTypeList="energyTypeList" :before-close="handleCancel"
:objList="objList" /> width='50%'
</base-dialog> >
</div> <energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/>
</base-dialog>
</div>
</template> </template>
<script> <script>
import { import { getEnergyLimitPage, deleteEnergyLimit } from "@/api/monitoring/energyLimit";
getEnergyLimitPage, import { getEnergyTypeListAll } from "@/api/base/energyType";
deleteEnergyLimit, import { getTree } from '@/api/base/factory'
} from '@/api/monitoring/energyLimit'; import { publicFormatter } from '@/utils/dict'
import { getEnergyTypeListAll } from '@/api/base/energyType'; import EnergyLimitAdd from './components/energyLimitAdd'
import { getTree } from '@/api/base/factory';
import { publicFormatter } from '@/utils/dict';
import EnergyLimitAdd from './components/energyLimitAdd';
const tableProps = [ const tableProps = [
{ {
prop: 'method', prop: 'method',
label: '抄表方式', label: '抄表方式',
filter: publicFormatter('method'), filter: publicFormatter('method')
}, },
{ {
prop: 'objName', prop: 'objName',
label: '监控对象', label: '监控对象'
}, },
{ {
prop: 'objCode', prop: 'objCode',
label: '对象编码', label: '对象编码'
}, },
{ {
prop: 'tableName', prop: 'tableName',
label: '能源表名', label: '水/气表名',
filter: publicFormatter('table_name'), filter: publicFormatter('table_name')
}, },
{ {
prop: 'energyType', prop: 'energyType',
label: '能源类型', label: '能源类型'
filter: publicFormatter('energy_type'), },
}, {
{ prop: 'type',
prop: 'type', label: '监控模式',
label: '监控模式', filter: (val) => (val != null ? ['合并', '详细'][val-1] : '-'),
filter: (val) => (val != null ? ['合并', '详细'][val - 1] : '-'), },
}, {
{ prop: 'plcParamName',
prop: 'plcParamName', label: '监控参数'
label: '监控参数', },
}, {
{ prop: 'limitType',
prop: 'limitType', label: '指标类型',
label: '指标类型', filter: publicFormatter('monitor_index_type')
filter: publicFormatter('monitor_index_type'), },
}, {
{ prop: 'limitValue',
prop: 'limitValue', label: '阈值'
label: '阈值', }
}, ]
];
export default { export default {
name: 'EnergyLimit', name: "EnergyLimit",
components: { EnergyLimitAdd }, components: { EnergyLimitAdd },
data() { data() {
return { return {
formConfig: [ formConfig: [
{ {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
selectOptions: [], selectOptions: [],
param: 'energyTypeId', param: 'energyTypeId'
}, },
{ {
type: 'select', type: 'select',
label: '指标类型', label: '指标类型',
selectOptions: this.getDictDatas(this.DICT_TYPE.MONITOR_INDEX_TYPE), selectOptions: this.getDictDatas(this.DICT_TYPE.MONITOR_INDEX_TYPE),
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
param: 'limitType', param: 'limitType'
}, },
{ {
type: 'button', type: 'button',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary'
}, },
{ {
type: 'separate', type: 'separate'
}, },
{ {
type: this.$auth.hasPermi('monitoring:energy-limit:create') type: this.$auth.hasPermi('monitoring:energy-limit:create') ? 'button' : '',
? 'button' btnName: '新增',
: '', name: 'add',
btnName: '新增', color: 'success',
name: 'add', plain: true
color: 'success', }
plain: true, ],
}, tableProps,
], tableBtn: [
tableProps, this.$auth.hasPermi('monitoring:energy-limit:update')
tableBtn: [ ? {
this.$auth.hasPermi('monitoring:energy-limit:update') type: 'edit',
? { btnName: '编辑'
type: 'edit', }
btnName: '编辑', : undefined,
} this.$auth.hasPermi('monitoring:energy-limit:delete')
: undefined, ? {
this.$auth.hasPermi('monitoring:energy-limit:delete') type: 'delete',
? { btnName: '删除'
type: 'delete', }
btnName: '删除', : undefined
} ].filter((v) => v),
: undefined, tableH: this.tableHeight(260),
].filter((v) => v), //
tableH: this.tableHeight(260), total: 0,
// //
total: 0, list: [],
// //
list: [], addOrEditTitle: "",
// //
addOrEditTitle: '', centervisible: false,
// //
centervisible: false, queryParams: {
// pageNo: 1,
queryParams: { pageSize: 20,
pageNo: 1, energyTypeId: null,
pageSize: 20, limitType: null
energyTypeId: null, },
limitType: null, energyTypeList: [],
}, typeList: [
energyTypeList: [], {label: '合并', value: '1'},
typeList: [ {label: '详细', value: '2'}
{ label: '合并', value: '1' }, ],
{ label: '详细', value: '2' }, objList: []
], };
objList: [], },
}; created() {
}, window.addEventListener('resize', () => {
created() { this.tableH = this.tableHeight(260)
window.addEventListener('resize', () => { })
this.tableH = this.tableHeight(260); this.getList();
}); this.getTypeList()
this.getList(); //
this.getTypeList(); this.getObjTree()
// },
this.getObjTree(); methods: {
}, getTypeList() {
methods: { getEnergyTypeListAll().then((res) => {
getTypeList() { this.formConfig[0].selectOptions = res.data || []
getEnergyTypeListAll().then((res) => { this.energyTypeList = res.data || []
this.formConfig[0].selectOptions = res.data || []; })
this.energyTypeList = res.data || []; },
}); buttonClick(val) {
}, switch (val.btnName) {
buttonClick(val) { case 'search':
switch (val.btnName) { this.queryParams.pageNo = 1;
case 'search': this.queryParams.energyTypeId = val.energyTypeId
this.queryParams.pageNo = 1; this.queryParams.limitType = val.limitType
this.queryParams.energyTypeId = val.energyTypeId; this.getList()
this.queryParams.limitType = val.limitType; break
this.getList(); default:
break; this.addOrEditTitle = '新增'
default: this.centervisible = true
this.addOrEditTitle = '新增'; this.$nextTick(() => {
this.centervisible = true; this.$refs.energyLimit.init()
this.$nextTick(() => { })
this.$refs.energyLimit.init(); }
}); },
} /** 查询列表 */
}, getList() {
/** 查询列表 */ getEnergyLimitPage(this.queryParams).then(response => {
getList() { let arr = response.data.list || [];
getEnergyLimitPage(this.queryParams).then((response) => { arr&&arr.map(item => {
let arr = response.data.list || []; this.typeList.map(i => {
arr && if (item.type === i.value) {
arr.map((item) => { item.type = i.label
this.typeList.map((i) => { }
if (item.type === i.value) { })
item.type = i.label; if (item.minValue && item.maxValue) {
} item.limitValue = item.minValue + '-' + item.maxValue
}); } else if(item.minValue){
if (item.minValue && item.maxValue) { item.limitValue = '最小值' + item.minValue
item.limitValue = item.minValue + '-' + item.maxValue; }else if(item.maxValue){
} else if (item.minValue) { item.limitValue = '最大值' + item.maxValue
item.limitValue = '最小值' + item.minValue; } else {
} else if (item.maxValue) { item.limitValue = ''
item.limitValue = '最大值' + item.maxValue; }
} else { })
item.limitValue = ''; this.list = arr
} this.total = response.data.total;
}); });
this.list = arr; },
this.total = response.data.total; handleClick(val) {
}); switch (val.type) {
}, case 'edit':
handleClick(val) { this.addOrEditTitle = '编辑'
switch (val.type) { this.$nextTick(() => {
case 'edit': this.$refs.energyLimit.init(val.data.id)
this.addOrEditTitle = '编辑'; })
this.$nextTick(() => { this.centervisible = true
this.$refs.energyLimit.init(val.data.id); break
}); default:
this.centervisible = true; this.handleDelete(val.data)
break; }
default: },
this.handleDelete(val.data); handleCancel() {
} this.$refs.energyLimit.formClear()
}, this.centervisible = false
handleCancel() { this.addOrEditTitle = ''
this.$refs.energyLimit.formClear(); },
this.centervisible = false; handleConfirm() {
this.addOrEditTitle = ''; this.$refs.energyLimit.submitForm()
}, },
handleConfirm() { successSubmit() {
this.$refs.energyLimit.submitForm(); this.handleCancel()
}, this.getList()
successSubmit() { },
this.handleCancel(); /** 删除按钮操作 */
this.getList(); handleDelete(row) {
}, this.$modal.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?').then(function() {
/** 删除按钮操作 */ return deleteEnergyLimit(row.id);
handleDelete(row) { }).then(() => {
this.$modal this.queryParams.pageNo = 1;
.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?') this.getList();
.then(function () { this.$modal.msgSuccess("删除成功");
return deleteEnergyLimit(row.id); }).catch(() => {});
}) },
.then(() => { getObjTree() {
this.queryParams.pageNo = 1; getTree().then(res => {
this.getList(); this.objList = res.data || []
this.$modal.msgSuccess('删除成功'); })
}) }
.catch(() => {}); }
},
getObjTree() {
getTree().then((res) => {
this.objList = res.data || [];
});
},
},
}; };
</script> </script>