mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

merge

Browse Source
This commit is contained in:
helloDy 2024-04-03 11:22:32 +08:00
commit 4571786780
45 changed files with 5194 additions and 4528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -1,7 +1,7 @@
### ###
# @Author: Do not edit # @Author: Do not edit
# @Date: 2023-08-29 09:40:39 # @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-03-29 14:45:32 # @LastEditTime: 2024-04-03 11:22:19
# @LastEditors: DY # @LastEditors: DY
# @Description: # @Description:
### ###
@ -18,7 +18,7 @@ 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.159:48080' # VUE_APP_BASE_API = 'http://192.168.4.173:48082'
# 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'

18
src/api/analysis/energyAnalysis.js
View File

@ -35,3 +35,21 @@ export function getQoq(data) {
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
})
}

1
src/api/base/energyType.js
View File

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

BIN
src/assets/img/OperationalOverview/AGV.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 126 KiB

BIN
src/assets/img/OperationalOverview/title.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 141 KiB

2
src/components/DialogForm/index.vue
View File

@ -12,7 +12,7 @@
:label-width="`${labelWidth}px`" :label-width="`${labelWidth}px`"
:size="size" :size="size"
:label-position="labelPosition" :label-position="labelPosition"
v-loading="formLoading"> v-loading="0 && formLoading">
<el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex"> <el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
<el-col v-for="col in row" :key="col.label" :span="24 / row.length"> <el-col v-for="col in row" :key="col.label" :span="24 / row.length">
<el-form-item :label="col.label" :prop="col.prop" :rules="col.rules"> <el-form-item :label="col.label" :prop="col.prop" :rules="col.rules">

4
src/utils/dict.js
View File

@ -97,6 +97,8 @@ 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',
@ -117,7 +119,7 @@ export const DICT_TYPE = {
// ============== GROUP - 班组模块 ============= // ============== GROUP - 班组模块 =============
WORK_SHOP: 'workshop', WORK_SHOP: 'workshop',
// ============== GROUP - 质量模块 ============= // ============== GROUP - 质量模块 =============
MATERIAL_GRADE: 'material_grade' MATERIAL_GRADE: 'material_grade'
} }

35
src/views/OperationalOverview/AGVBoard.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-07-19 15:18:30 * @Date: 2021-07-19 15:18:30
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-28 15:28:07 * @LastEditTime: 2024-03-29 16:49:00
* @Description: * @Description:
--> -->
<template> <template>
@ -16,11 +16,11 @@
许昌安彩AGV原片周转看板 许昌安彩AGV原片周转看板
<h3 class="unit">单位：河南汇融数字科技有限公司</h3> <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
<h3 class="time">{{ times }}</h3> <h3 class="time">{{ times }}</h3>
<el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px', fontSize: '32px' }" <!-- <el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px', fontSize: '32px' }"
@click="changeFullScreen"> @click="changeFullScreen">
<svg-icon width="32" height="32" v-if="isFullScreen" icon-class="unFullScreenView" /> <svg-icon width="32" height="32" v-if="isFullScreen" icon-class="unFullScreenView" />
<svg-icon width="32" height="32" v-else icon-class="fullScreenView" /> <svg-icon width="32" height="32" v-else icon-class="fullScreenView" />
</el-button> </el-button> -->
</el-row> </el-row>
<el-row class="container-main flex-col" type="flex"> <el-row class="container-main flex-col" type="flex">
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15 * beilv" type="flex" class="flex-1"> <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15 * beilv" type="flex" class="flex-1">
@ -35,13 +35,15 @@
<base-container :beilv="1" :size="'eqStatus'" :title="'周转进度'" :title-icon="'order'" :back="'energy'"> <base-container :beilv="1" :size="'eqStatus'" :title="'周转进度'" :title-icon="'order'" :back="'energy'">
<div class="order" style="width:100%; overflow: hidden scroll;height: 350px;"> <div class="order" style="width:100%; overflow: hidden scroll;height: 350px;">
<el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: 1em"> <el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: 1em">
<p v-if="op.outRate === 1" class="now-secondary-title" style="color:#4679FD"> <!-- <p v-if="op.outRate === 1" class="now-secondary-title"
style="font-size: 14px; opacity: calc(.6);color:#4679FD">
<i class="el-icon-check" /> <i class="el-icon-check" />
{{ op.name }} {{ op.name }}
</p> </p> -->
<p v-else class="now-secondary-title">{{ op.name }}</p> <!-- <p class="now-secondary-title">{{ op.name }}</p> -->
<el-progress :stroke-width="10" define-back-color="rgba(32, 57, 96, 1)" text-color="white" <p class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</p>
:percentage="op.outRate * 100" class="custom-progress-bar" /> <el-progress style="width: 910px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
define-back-color="rgba(32, 57, 96, 1)" :percentage="op.outRate * 100" class="custom-progress-bar" />
</el-row> </el-row>
</div> </div>
</base-container> </base-container>
@ -496,7 +498,7 @@ export default {
seconds = "0" + seconds; seconds = "0" + seconds;
} }
//拼接格式化当前时间 //拼接格式化当前时间
this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds; this.times = year + "." + month + "." + day + " " + hours + ":" + minutes + ":" + seconds;
}, },
windowWidth(value) { windowWidth(value) {
this.clientWidth = value this.clientWidth = value
@ -530,11 +532,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.visual-container { .visual-container {
width: 1920px; width: 1920px;
height: 1080px; height: 1080px;
@ -556,7 +553,7 @@ export default {
top: 25px; top: 25px;
color: rgba(255, 255, 255, 0.80); color: rgba(255, 255, 255, 0.80);
font-size: 20px; font-size: 20px;
letter-spacing: 0px; letter-spacing: 1px;
} }
.time { .time {
position: absolute; position: absolute;
@ -564,7 +561,7 @@ export default {
top: 25px; top: 25px;
color: rgba(255, 255, 255, 0.80); color: rgba(255, 255, 255, 0.80);
font-size: 20px; font-size: 20px;
letter-spacing: 0px; letter-spacing: .72px;
} }
.title-button { .title-button {
color: #00fff0; color: #00fff0;
@ -607,6 +604,12 @@ export default {
::v-deep .el-progress-bar__inner { ::v-deep .el-progress-bar__inner {
background-color: unset; background-color: unset;
background-image: linear-gradient(to right, #4573fe, #47f8dc); background-image: linear-gradient(to right, #4573fe, #47f8dc);
}
::v-deep .el-progress__text {
margin-top: -70px;
margin-left: 820px;
// background-color: unset;
// background-image: linear-gradient(to right, #4573fe, #47f8dc);
} }
.visual-select { .visual-select {
position: absolute; position: absolute;

348
src/views/OperationalOverview/coldBoard.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 16:50:26 * @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-03-28 16:35:49 * @LastEditTime: 2024-04-02 15:01:40
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -17,11 +17,11 @@
许昌安彩冷端看板 许昌安彩冷端看板
<h3 class="unit">单位：河南汇融数字科技有限公司</h3> <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
<h3 class="time">{{ times }}</h3> <h3 class="time">{{ times }}</h3>
<el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px',fontSize:'32px'}" <!-- <el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px',fontSize:'32px'}"
@click="changeFullScreen"> @click="changeFullScreen">
<svg-icon width="32" height="32" v-if="isFullScreen" icon-class="unFullScreenView" /> <svg-icon width="32" height="32" v-if="isFullScreen" icon-class="unFullScreenView" />
<svg-icon width="32" height="32" v-else icon-class="fullScreenView" /> <svg-icon width="32" height="32" v-else icon-class="fullScreenView" />
</el-button> </el-button> -->
</el-row> </el-row>
<el-row class="container-main flex-col" type="flex"> <el-row class="container-main flex-col" type="flex">
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1"> <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1">
@ -40,6 +40,12 @@
<top-radio-group /> <top-radio-group />
</div> --> </div> -->
<!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 --> <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
<div v-if="coldDetData" class="myLegend">
<div class="barLegend"></div>
<h4 class="barText">产线产量</h4>
<div class="barCircle"></div>
<h4 class="barCircleText">产线良品率</h4>
</div>
<double-y-chart ref="productChart" :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList" <double-y-chart ref="productChart" :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList"
:height="359" :show-legend="true" /> :height="359" :show-legend="true" />
</base-container> </base-container>
@ -64,11 +70,11 @@
</div> --> </div> -->
<!-- <el-row :gutter="9"> --> <!-- <el-row :gutter="9"> -->
<!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> --> <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> -->
<pile-bar-chart style="margin-bottom: -15px" ref="firstPileChart" :height="90" /> <pile-bar-chart id=" 'one' " style="margin-top: -5px;" ref="firstPileChart" :height="80" />
<second-pile-bar-chart style="margin-bottom: -15px" id=" 'second' " ref="secondPileChart" :height="90" /> <second-pile-bar-chart id=" 'second' " ref="secondPileChart" :height="90" />
<third-pile-bar-chart style="margin-bottom: -15px" id=" 'third' " ref="thirdPileChart" :height="90" /> <third-pile-bar-chart id=" 'third' " ref="thirdPileChart" :height="90" />
<fourth-pile-bar-chart style="margin-bottom: -15px" id=" 'fourth' " ref="fourthPileChart" :height="90" /> <fourth-pile-bar-chart id=" 'fourth' " ref="fourthPileChart" :height="90" />
<fifth-pile-bar-chart style="margin-bottom: -15px" id=" 'fifth' " ref="fifthPileChart" :height="100" /> <fifth-pile-bar-chart style="margin-top: -5px;" id=" 'fifth' " ref="fifthPileChart" :height="90" />
<!-- <pile-bar-chart ref="secondPileChart" <!-- <pile-bar-chart ref="secondPileChart"
:height="90" /> :height="90" />
<pile-bar-chart ref="thirdPileChart" <pile-bar-chart ref="thirdPileChart"
@ -244,6 +250,7 @@ export default {
funWs: undefined, funWs: undefined,
SJGws: undefined, SJGws: undefined,
funWsData: {}, funWsData: {},
coldDetData:[],
SJGWsData: {}, SJGWsData: {},
cxNameList:[], cxNameList:[],
cxDataList:[], cxDataList:[],
@ -314,85 +321,7 @@ export default {
} }
}, },
mounted() { mounted() {
let nameList = [] this.getProductData()
let nameWasteList = []
let topNameList = []
let productList = []
let wasteList = []
let yieldList = []
// let sumAreaList = []
// let yieldList = []
// this.cutTableDataList =
let coldDetData = [
{
"first": 0.8834,
"lineName": "Y61",
"product": 0.8834,
"productArea": 35069.28,
"second": 0,
'sumArea': 38400,
'wastArea': 3330.72,
"yield": 0.9133
},
{
"first": 0.847,
"lineName": "Y62",
"product": 0.847,
"productArea": 26765.46,
"second": 0,
'sumArea': 1111111,
'wastArea': 22222,
"yield": 0.9133
},
{
"first": 0.8668,
"lineName": "Y63",
"product": 0.8668,
"productArea": 26448.46,
"second": 0,
'sumArea': 1111111,
'wastArea': 22222,
"yield": 0.9133
},
{
"first": 0.9064,
"lineName": "Y64",
"product": 0.9064,
"productArea": 26667.32,
"second": 0,
'sumArea': 1111111,
'wastArea': 22222,
"yield": 0.9133
},
{
"first": 0.8838,
"lineName": "Y65",
"product": 0.8838,
"productArea": 26554.32,
"second": 0,
'sumArea': 1111111,
'wastArea': 22222,
"yield": 0.9133
}
]
coldDetData.forEach((ele, index) => {
nameList.push(ele.lineName)
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea)
productList.push(ele.productArea)
wasteList.push(ele.wastArea)
nameWasteList.push('缺陷面积:' + ele.wastArea)
yieldList.push({
name: '良品',
yield:ele.yield
})
// sumAreaList.push(ele.sumArea)
// yieldList.push((ele.yield * 100).toFixed(3))
})
this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]])
this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]])
this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]])
this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
// this.$refs.productChart.initChart(nameList, yieldList, sumAreaList) // this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
this.getTimes() this.getTimes()
// console.log(moment(this.logoutTime - 28800000).format('HH:mm:ss')); // console.log(moment(this.logoutTime - 28800000).format('HH:mm:ss'));
@ -414,39 +343,123 @@ export default {
} }
}, },
methods: { methods: {
// getData() { getProductData() {
// let detData = [ let nameList = []
// { let nameWasteList = []
// name: '1', let topNameList = []
// run: '运行', let productList = []
// }, let wasteList = []
// { let yieldList = []
// name: '2', let sumAreaList = []
// run: '未运行', // let yieldList = []
// }, // this.cutTableDataList =
// { this.coldDetData = [
// name: '3', {
// run: '运行', "first": 0.8834,
// }, "lineName": "Y61",
// { "product": 0.8834,
// name: '4', "productArea": 35069.28,
// run: '未运行', "second": 0,
// }, 'sumArea': 38400,
// { 'wastArea': 3330.72,
// name: '1', "yield": 0.9133
// run: '运行', },
// }, {
// ] "first": 0.847,
// this.realEqList = detData.map((item, index) => [ "lineName": "Y62",
// // console.log(item) "product": 0.847,
// `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''} "productArea": 26765.46,
// </span>`, "second": 0,
// `<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`, 'sumArea': 1111111,
// `<span style="color:rgba(255,255,255,0.5)"><div style="${item.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.run || ''}</span>`, 'wastArea': 22222,
// ]) "yield": 0.9133
// this.realEqConfig.data = this.realEqList },
// this.$refs['realEqScrollBoard'].updateRows(this.realEqList) {
// }, "first": 0.8668,
"lineName": "Y63",
"product": 0.8668,
"productArea": 26448.46,
"second": 0,
'sumArea': 1111111,
'wastArea': 22222,
"yield": 0.9133
},
{
"first": 0.9064,
"lineName": "Y64",
"product": 0.9064,
"productArea": 26667.32,
"second": 0,
'sumArea': 1111111,
'wastArea': 22222,
"yield": 0.9133
},
{
"first": 0.8838,
"lineName": "Y65",
"product": 0.8838,
"productArea": 26554.32,
"second": 0,
'sumArea': 1111111,
'wastArea': 22222,
"yield": 0.9133
}
]
this.coldDetData.forEach((ele, index) => {
nameList.push(ele.lineName)
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡')
productList.push(ele.productArea)
wasteList.push(ele.wastArea)
nameWasteList.push('缺陷面积:' + ele.wastArea + '㎡')
// yieldList.push({
// name: '良品',
// yield:ele.yield
// })
sumAreaList.push(ele.sumArea)
yieldList.push((ele.yield * 100).toFixed(3))
})
this.$nextTick(() => {
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]])
this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]])
this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]])
this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
})
},
getData() {
let detData = [
{
name: '1',
run: '运行',
},
{
name: '2',
run: '未运行',
},
{
name: '3',
run: '运行',
},
{
name: '4',
run: '未运行',
},
{
name: '1',
run: '运行',
},
]
this.realEqList = detData.map((item, index) => [
// console.log(item)
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.run || ''}</span>`,
])
this.realEqConfig.data = this.realEqList
this.$refs['realEqScrollBoard'].updateRows(this.realEqList)
},
CutWebsocketClose(e) { CutWebsocketClose(e) {
this.Cutws.ws.onclose = (event) => { console.log(event );} this.Cutws.ws.onclose = (event) => { console.log(event );}
}, },
@ -495,7 +508,7 @@ export default {
seconds = "0" + seconds; seconds = "0" + seconds;
} }
//拼接格式化当前时间 //拼接格式化当前时间
this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds; this.times = year + "." + month + "." + day + " " + hours + ":" + minutes + ":" + seconds;
}, },
SJGInitWebSocket() { SJGInitWebSocket() {
let date = new Date().valueOf() let date = new Date().valueOf()
@ -525,10 +538,9 @@ export default {
]) ])
} }
this.realEqConfig.data = this.realEqList this.realEqConfig.data = this.realEqList
this.$nextTick(() => { // this.$nextTick(() => {
this.$refs['realEqScrollBoard'].updateRows(this.realEqList) this.$refs['realEqScrollBoard'].updateRows(this.realEqList)
// })
})
}; };
// if (typeof (WebSocket) === 'undefined') { // if (typeof (WebSocket) === 'undefined') {
// alert('您的浏览器不支持WebSocket') // alert('您的浏览器不支持WebSocket')
@ -572,7 +584,11 @@ export default {
<div style = "${(item.product * 100).toFixed(2) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>` <div style = "${(item.product * 100).toFixed(2) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>`
]) ])
this.cutConfig.data = cutArr this.cutConfig.data = cutArr
this.$refs['cutScrollBoard'].updateRows(cutArr) // this.$nextTick(() => {
this.$refs['cutScrollBoard'].updateRows(cutArr)
// })
// this.cutConfig.data = cutArr
// this.$refs['cutScrollBoard'].updateRows(cutArr)
} else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') { } else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
let nameList = [] let nameList = []
let nameWasteList = [] let nameWasteList = []
@ -581,22 +597,25 @@ export default {
let wasteList = [] let wasteList = []
let sumAreaList = [] let sumAreaList = []
let yieldList = [] let yieldList = []
this.coldDetData = this.cutWsData.coldDetData
// this.cutTableDataList = // this.cutTableDataList =
this.cutWsData.coldDetData.forEach((ele, index) => { this.cutWsData.coldDetData.forEach((ele, index) => {
nameList.push(ele.lineName) nameList.push(ele.lineName)
topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea) topNameList.push('产线: ' + ele.lineName + ' ' + '总面积:' + ele.sumArea + '㎡')
productList.push(ele.productArea) productList.push(ele.productArea)
wasteList.push(ele.wastArea) wasteList.push(ele.wastArea)
nameWasteList.push('缺陷面积:' + ele.wastArea) nameWasteList.push('缺陷面积:' + ele.wastArea + '㎡')
sumAreaList.push(ele.sumArea) sumAreaList.push(ele.sumArea)
yieldList.push(parseFloat((ele.yield * 100).toFixed(3))) yieldList.push(parseFloat((ele.yield * 100).toFixed(3)))
}) })
this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$nextTick(() => {
this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]]) this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
this.$refs.thirdPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]])
this.$refs.fourthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$refs.thirdPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
this.$refs.fifthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]]) this.$refs.fourthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList) this.$refs.fifthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
})
} }
}; };
// if (typeof (WebSocket) === 'undefined') { // if (typeof (WebSocket) === 'undefined') {
@ -632,17 +651,18 @@ export default {
for (let i in this.funWsData.data.annealFanInfo) { for (let i in this.funWsData.data.annealFanInfo) {
index++, index++,
arr.push([ arr.push([
` `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
<span style="color:rgba(255,255,255,0.5)" >${index || ''}
</span>`, </span>`,
`<span style="color:rgba(255,255,255,0.5)" >${i || ''} // `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
</span>`, // </span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.run || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.annealFanInfo[i] == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${this.funWsData.data.annealFanInfo[i] || ''}</span>`,
]) ])
} }
this.annealFunConfig.data = arr this.annealFunConfig.data = arr
this.$refs['annealFunScrollBoard'].updateRows(arr) // this.$nextTick(() => {
this.$refs['annealFunScrollBoard'].updateRows(arr)
// })
} }
if (this.funWsData.type === 'FanInfo') { if (this.funWsData.type === 'FanInfo') {
let arr = [] let arr = []
@ -650,14 +670,16 @@ export default {
for (let i in this.funWsData.data.fanInfo) { for (let i in this.funWsData.data.fanInfo) {
index++, index++,
arr.push([ arr.push([
`<span style="color:rgba(255,255,255,0.5)" >${index || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
`<span style="color:rgba(255,255,255,0.5)" >${i || ''}</span>`, </span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)"><div style="${item.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${item.run || ''}</span>`, `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.fanInfo[i] == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%; background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div> ${this.funWsData.data.fanInfo[i] || ''}</span>`,
]) ])
} }
this.funConfig.data = arr this.funConfig.data = arr
this.$refs['funScrollBoard'].updateRows(arr) // this.$nextTick(() => {
this.$refs['funScrollBoard'].updateRows(arr)
// })
} }
}; };
// if (typeof (WebSocket) === 'undefined') { // if (typeof (WebSocket) === 'undefined') {
@ -772,7 +794,37 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.myLegend{
position: absolute;
top: -20px;
right: 50px;
font-size: 12px;
color: rgba(255,255,255,.6);
.barLegend{
// float: left;
background: linear-gradient(#9DD5FF, #1295FF);
width: 10px;
height: 10px;
display: inline-block;
margin-right: 5px;
}
.barText{
// float: right;
display: inline-block;
margin-right: 10px;
}
.barCircle{
width: 7px;
height: 7px;
border-radius: 50%;
background-color: rgba(255, 209, 96, 1);
display: inline-block;
margin-right: 5px;
}
.barCircleText{
display: inline-block;
}
}
.visual-container { .visual-container {
width: 1920px; width: 1920px;
height: 1080px; height: 1080px;
@ -794,7 +846,7 @@ export default {
top: 25px; top: 25px;
color: rgba(255, 255, 255, 0.80); color: rgba(255, 255, 255, 0.80);
font-size: 20px; font-size: 20px;
letter-spacing: 0px; letter-spacing: 1px;
} }
.time { .time {
@ -803,7 +855,7 @@ export default {
color: rgba(255, 255, 255, 0.80); color: rgba(255, 255, 255, 0.80);
top: 25px; top: 25px;
font-size: 20px; font-size: 20px;
letter-spacing: 0px; letter-spacing: .72px;
} }
.title-button { .title-button {

5
src/views/OperationalOverview/components/PieChart.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-01-21 14:43:06 * @Date: 2022-01-21 14:43:06
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-28 16:45:24 * @LastEditTime: 2024-03-29 14:50:50
* @Description: * @Description:
--> -->
<template> <template>
@ -158,6 +158,9 @@ export default {
methods: { methods: {
initChart() { initChart() {
this.chart = echarts.init(document.getElementById(this.id)) this.chart = echarts.init(document.getElementById(this.id))
this.$nextTick(() => {
this.chart.resize();
});
this.chart.setOption({ this.chart.setOption({
title: this.showCenterTitle title: this.showCenterTitle
? { ? {

6
src/views/OperationalOverview/components/baseContainer/index.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz * @Author: gtz
* @Date: 2022-01-19 15:58:17 * @Date: 2022-01-19 15:58:17
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-27 10:26:35 * @LastEditTime: 2024-03-29 14:47:29
* @Description: file content * @Description: file content
* @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
--> -->
@ -164,7 +164,7 @@ export default {
width: 100%; width: 100%;
// background-color: rgba($color: #061027, $alpha: 0.15); // background-color: rgba($color: #061027, $alpha: 0.15);
position: relative; position: relative;
opacity: calc(.8); // opacity: calc(.8);
// border: 2px solid; // border: 2px solid;
// background: url('../../../../assets/img/energy.png') no-repeat; // background: url('../../../../assets/img/energy.png') no-repeat;
// background-size: 100% 100%; // background-size: 100% 100%;
@ -274,6 +274,8 @@ export default {
width: 100%; width: 100%;
color: #ffffff; color: #ffffff;
font-size: 24px; font-size: 24px;
font-weight: normal;
letter-spacing: .8px;
padding: 0.67em 0.67em 0.3em 0.67em; padding: 0.67em 0.67em 0.3em 0.67em;
display: flex; display: flex;
} }

63
src/views/OperationalOverview/components/coldDoubleYChart.vue
View File

@ -2,13 +2,13 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-09-21 09:06:28 * @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-03-25 18:34:58 * @LastEditTime: 2024-04-01 09:12:56
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
<template> <template>
<div> <div>
<div :id="id" class="productChart" :style="{ height: '390px', width: width }" /> <div :id="id" class="coldProductChart" :style="{ height: '390px', width: width }" />
</div> </div>
</template> </template>
@ -71,9 +71,9 @@ export default {
mounted() { mounted() {
console.log('mounted') console.log('mounted')
console.log('borderRadius: ', this.borderRadius) console.log('borderRadius: ', this.borderRadius)
// this.$nextTick(() => { this.$el.addEventListener('resize', () => {
// this.initChart() console.log('resziing.....');
// }) });
}, },
beforeDestroy() { beforeDestroy() {
if (!this.chart) { if (!this.chart) {
@ -114,6 +114,7 @@ export default {
name: '产线良品率', name: '产线良品率',
symbol: 'circle', //变为实心圆 symbol: 'circle', //变为实心圆
type: 'line', type: 'line',
// symbolSize: 7,
yAxisIndex: 0, yAxisIndex: 0,
areaStyle: { areaStyle: {
opacity: 0.8, opacity: 0.8,
@ -141,6 +142,16 @@ export default {
] ]
// const colors = ['#5470C6', '#91CC75', '#EE6666'] // const colors = ['#5470C6', '#91CC75', '#EE6666']
this.chart = echarts.init(document.getElementById(this.id)) this.chart = echarts.init(document.getElementById(this.id))
let isFinished = false //标记 isFinished
this.chart.on('finished', _ => {
if (!isFinished) {
console.log('我只执行一次')
isFinished = true
// this.isLoading = false //关闭loading
this.chart.resize() //重新渲染charts大小
}
console.log(113, 'finished')
})
this.chart.setOption({ this.chart.setOption({
// color: colors, // color: colors,
tooltip: { tooltip: {
@ -151,22 +162,33 @@ export default {
}, },
grid: { grid: {
left: "3%", left: "3%",
right: "5%", right: "10%",
bottom: "3%", bottom: "3%",
containLabel: true containLabel: true
}, },
legend: { // legend: {
itemWidth: 10, // itemWidth: 10,
itemHeight: 10, // itemHeight: 10,
top: '20', // top: '5',
// right: '20px', // right: '20px',
data: ['产线产量', '产线良品率'], // data: [
textStyle: { // // { icon: 'rect', name: '直接访问' },
fontSize: 12 * this.beilv, // { icon: 'roundRect', name: '产线产量' },
color: '#ced1d5' // // {
} // // icon: 'circle', name: '产线良品率',
}, // // itemWidth: 7,
// // itemHeight: 7,
// // },
// ],
// textStyle: {
// fontSize: 12 * this.beilv,
// color: '#ced1d5'
// }
// },
xAxis: { xAxis: {
axisTick: {
show: false
},
type: 'category', type: 'category',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
@ -202,7 +224,7 @@ export default {
type: 'value', type: 'value',
name: '良品率/%', name: '良品率/%',
nameTextStyle: {// y轴上方单位的颜色 nameTextStyle: {// y轴上方单位的颜色
color: '#fff', color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
align: "left", align: "left",
}, },
position: 'right', position: 'right',
@ -245,7 +267,7 @@ export default {
type: 'value', type: 'value',
name: '产量/㎡', // y轴上方的单位 name: '产量/㎡', // y轴上方的单位
nameTextStyle: { nameTextStyle: {
color: "#fff", color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
// fontSize: 10, // fontSize: 10,
align: "right", align: "right",
}, },
@ -286,7 +308,8 @@ export default {
} }
</script> </script>
<style> <style>
.productChart{
.coldProductChart{
top: -10px; top: -10px;
} }
</style> </style>

30
src/views/OperationalOverview/components/doubleYChart .vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-09-21 09:06:28 * @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-03-28 16:31:20 * @LastEditTime: 2024-03-29 16:26:28
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -106,7 +106,8 @@ export default {
position: 'top', //在上方显示 position: 'top', //在上方显示
textStyle: { //数值样式 textStyle: { //数值样式
color: '#ced1d5', color: '#ced1d5',
fontSize: 12 fontSize: 12,
fontWight:'bolder'
} }
}, },
} }
@ -142,7 +143,7 @@ export default {
} }
}, },
// data: passRateList // data: passRateList
data: [] data: passRateList
} }
] ]
// const colors = ['#5470C6', '#91CC75', '#EE6666'] // const colors = ['#5470C6', '#91CC75', '#EE6666']
@ -166,19 +167,23 @@ export default {
type: 'cross' type: 'cross'
} }
}, },
grid: { top: 90, right: 60, bottom: 20, left: 20, containLabel: true }, grid: { top: 90, right: 70, bottom: 20, left: 20, containLabel: true },
legend: { legend: {
itemWidth: 10, itemWidth: 10,
itemHeight: 10, itemHeight: 10,
top: '0%', top: '0%',
right: '20px', right: '20px',
data: ['产线产量', '产线良品率'], data: ['产线良品率', '产线产量'],
textStyle: { textStyle: {
fontSize: 12 * this.beilv, fontSize: 12 * this.beilv,
color: '#ced1d5' color: '#ced1d5',
fontWight: 'bolder'
} }
}, },
xAxis: { xAxis: {
axisTick: {
show: false
},
type: 'category', type: 'category',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
@ -187,8 +192,11 @@ export default {
width: '1' // 坐标线的宽度 width: '1' // 坐标线的宽度
} }
}, },
textStyle: {
fontWight: 'bolder'
},
axisLabel: { axisLabel: {
color: "#fff", color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 12, fontSize: 12,
// formatter: '{value}' // formatter: '{value}'
// textStyle: { // textStyle: {
@ -217,7 +225,7 @@ export default {
type: 'value', type: 'value',
name: '良品率/%', name: '良品率/%',
nameTextStyle: {// y轴上方单位的颜色 nameTextStyle: {// y轴上方单位的颜色
color: '#fff', color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
align: "left", align: "left",
}, },
position: 'right', position: 'right',
@ -231,7 +239,7 @@ export default {
} }
}, },
axisLabel: { axisLabel: {
color: "#fff", color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 12, fontSize: 12,
// formatter: '{value}' // formatter: '{value}'
formatter: '{value}%' formatter: '{value}%'
@ -261,7 +269,7 @@ export default {
type: 'value', type: 'value',
name: '产量/片', // y轴上方的单位 name: '产量/片', // y轴上方的单位
nameTextStyle: { nameTextStyle: {
color: "#fff", color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
// fontSize: 10, // fontSize: 10,
align: "right", align: "right",
}, },
@ -278,7 +286,7 @@ export default {
axisLabel: { axisLabel: {
// textStyle: { // textStyle: {
// color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色 // color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
color: "#fff", color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
// show: true, // show: true,
lineStyle: { lineStyle: {
color: "#25528f", color: "#25528f",

17
src/views/OperationalOverview/components/linearBarChart.vue
View File

@ -111,8 +111,9 @@ export default {
show: true, //开启显示 show: true, //开启显示
position: 'top', //在上方显示 position: 'top', //在上方显示
textStyle: { //数值样式 textStyle: { //数值样式
color: '#ced1d5', color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 12 fontSize: 12,
fontWeight: 'bolder'
} }
}, },
} }
@ -144,6 +145,9 @@ export default {
// } // }
// }, // },
xAxis: { xAxis: {
axisTick: {
show: false
},
type: 'category', type: 'category',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
@ -152,8 +156,11 @@ export default {
width: '1' // 坐标线的宽度 width: '1' // 坐标线的宽度
} }
}, },
textStyle: {
fontWeight: 'bolder'
},
axisLabel: { axisLabel: {
color: "#fff", color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 12, fontSize: 12,
// formatter: '{value}' // formatter: '{value}'
}, },
@ -167,13 +174,13 @@ export default {
yAxis: { yAxis: {
name: '单位kwh', name: '单位kwh',
nameTextStyle: { nameTextStyle: {
color: '#fff', color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 10, fontSize: 10,
align: 'right', align: 'right',
}, },
type: 'value', type: 'value',
axisLabel: { axisLabel: {
color: "#fff", color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
fontSize: 12, fontSize: 12,
// formatter: '{value}/kwh' // formatter: '{value}/kwh'
}, },

51
src/views/OperationalOverview/components/pileBarChart.vue
View File

@ -1,13 +1,13 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-27 13:54:52 * @Date: 2023-12-27 13:54:52
* @LastEditTime: 2024-03-28 16:30:14 * @LastEditTime: 2024-04-01 09:14:45
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
<template> <template>
<div> <div>
<div :id="id" class="productChart" :style="{ height: height + 'px', width: width }" /> <div :id="id" :style="{ height:'75px', width: width }" />
</div> </div>
</template> </template>
@ -71,7 +71,10 @@ export default {
} }
}, },
mounted() { mounted() {
console.log('mounted') // console.log('mounted')
window.addEventListener('resize', () => {
this.resize()
})
// console.log('borderRadius: ', this.borderRadius) // console.log('borderRadius: ', this.borderRadius)
// console.log('33333', this.dataList) // console.log('33333', this.dataList)
// let arr = [] // let arr = []
@ -91,6 +94,12 @@ export default {
this.chart = null this.chart = null
}, },
methods: { methods: {
resize() {
this.chart.resize({
width: 'auto',
height: 90
});;
},
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) { initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
let rawData = [] let rawData = []
let colors = ['#0fdedb', '#2359ec'] let colors = ['#0fdedb', '#2359ec']
@ -106,7 +115,6 @@ export default {
} }
// } // }
console.log('total', totalData) console.log('total', totalData)
this.chart = echarts.init(document.getElementById(this.id))
const series = [ const series = [
'良品', '良品',
'废品', '废品',
@ -137,6 +145,17 @@ export default {
// width, // width,
// height // height
// }) // })
this.chart = echarts.init(document.getElementById(this.id))
let isFinished = false //标记 isFinished
this.chart.on('finished', _ => {
if (!isFinished) {
console.log('我只执行一次')
isFinished = true
// this.isLoading = false //关闭loading
this.chart.resize() //重新渲染charts大小
}
console.log(113, 'finished')
})
this.chart.setOption({ this.chart.setOption({
legend: { legend: {
formatter: function (name) { formatter: function (name) {
@ -152,7 +171,8 @@ export default {
left: '20', left: '20',
icon: 'rect', icon: 'rect',
textStyle: { textStyle: {
color: '#ffffff' color: 'rgba(255,255,255,.6)',
fontSize:12,
} }
}, },
grid: { grid: {
@ -184,9 +204,9 @@ export default {
splitNumber: 50, splitNumber: 50,
// boundaryGap: [20, 20], // boundaryGap: [20, 20],
textStyle: { textStyle: {
color: '#ffffff', color: 'rgba(255,255,255,.6)',
verticalAlign: 'bottom', verticalAlign: 'bottom',
fontSize: 12, fontSize: 16,
align: 'left', align: 'left',
padding: [0, 0, 10, -5] padding: [0, 0, 10, -5]
} }
@ -212,9 +232,9 @@ export default {
splitNumber: 50, splitNumber: 50,
// boundaryGap: [20, 20], // boundaryGap: [20, 20],
textStyle: { textStyle: {
color: '#ffffff', color: 'rgba(255,255,255,.6)',
verticalAlign: 'bottom', verticalAlign: 'bottom',
fontSize: 12, fontSize: 16,
align: 'right', align: 'right',
padding: [0, 0, 10, -5] padding: [0, 0, 10, -5]
} }
@ -228,10 +248,15 @@ export default {
}, },
series:series series:series
}) })
this.chart.resize({ this.$nextTick(() => {
width: 'auto', setTimeout(() => {
height: 90 this.resize()
});; },1000);
})
// this.chart.resize({
// width: 'auto',
// height: 90
// });;
} }
} }
} }

1412
src/views/OperationalOverview/processingBoard.vue
View File

File diff suppressed because it is too large Load Diff

281
src/views/energy/analysis/contrastAnalysis/components/barChart.vue
View File

@ -1,148 +1,149 @@
<template> <template>
<div <div
id="analysischartBar" id="analysischartBar"
style="width: 100%" style="width: 100%"
:style="{ height: chartHeight + 'px' }" :style="{ height: chartHeight + 'px' }"></div>
></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(214) - 70 chartHeight: this.tableHeight(250) / 2,
} };
}, },
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(250) / 2;
}) });
}, },
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 : '' let num = temp[j].useNum ? temp[j].useNum.toFixed(2) : '';
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.map((item) => { params
let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>` .map((item) => {
let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</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 value = item.value ? item.value : '-' let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`;
let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>` let value = item.value ? item.value : '-';
return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px"> 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">
<span>${str}${seriesNameStr}</span> <span>${str}${seriesNameStr}</span>
<span>${valueStr}</span> <span>${valueStr}</span>
</span>` </span>`;
}).join(``) })
) .join(``)
} );
}, },
grid: { },
left: '4%', grid: {
right: '1%', left: '4%',
bottom: '1%', right: '1%',
containLabel: true bottom: '1%',
}, containLabel: true,
legend: { },
data: legendData, legend: {
right: '1%', data: legendData,
icon: 'rect', right: '1%',
itemHeight: 8, icon: 'rect',
itemWidth: 8 itemHeight: 8,
}, itemWidth: 8,
xAxis: { },
type: 'category', xAxis: {
data: xData, type: 'category',
axisLabel: { data: xData,
rotate: "45" axisLabel: {
} rotate: '45',
}, },
yAxis: { },
type: 'value' yAxis: {
}, type: 'value',
series: yData },
}; series: yData,
};
option && this.chart.setOption(option); option && this.chart.setOption(option);
} },
} },
} };
</script> </script>

126
src/views/energy/analysis/contrastAnalysis/components/lineChart.vue
View File

@ -1,126 +0,0 @@
<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>

1053
src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
View File

File diff suppressed because it is too large Load Diff

205
src/views/energy/analysis/contrastAnalysis/index.vue
View File

@ -1,96 +1,129 @@
<template> <template>
<div class="app-container contrastAnalysisBox" id="contrastAnalysisBox"> <div
<!-- 搜索工作栏 --> class="app-container contrastAnalysisBox"
<search-area :isFold="isFold" @submit="getList"/> id="contrastAnalysisBox">
<el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'> <!-- 搜索工作栏 -->
<el-tab-pane label="柱状图" name="bar"> <search-area
<bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim" /> :isFold="isFold"
</el-tab-pane> @submit="getList"
<el-tab-pane label="折线图" name="line"> @export="exportExl" />
<line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/> <div v-show="chartData.length">
</el-tab-pane> <bar-chart
</el-tabs> ref="analysisBarChart"
<!-- 没有数据 --> :chartData="chartData"
<div class="no-data-bg" v-show='!chartData.length'></div> :timeDim="timeDim" />
</div> <base-table
: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 LineChart from "./components/lineChart" import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
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, LineChart }, components: { SearchArea, BarChart },
data() { mixins: [tableHeightMixin],
return { data() {
isFold: false, return {
activeName: 'bar', isFold: false,
chartData: [], chartData: [],
timeDim: '' timeDim: '',
} tableProps: [],
}, list: [],
mounted() { tableH: this.tableHeight(250) / 2,
window.addEventListener('resize', () => { };
this.tableH = this.tableHeight(260) },
this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437) mounted() {
// console.log(document.getElementById("contrastAnalysisBox").offsetWidth) window.addEventListener('resize', () => {
}) this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437);
this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437) // console.log(document.getElementById("contrastAnalysisBox").offsetWidth)
}, });
methods: { this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437);
getList(params) { },
this.timeDim = params.timeDim methods: {
getCompare({ ...params }).then((res) => { _setTableHeight() {
console.log(res) this.tableH = this.tableHeight(250) / 2;
if (res.code === 0) { },
this.chartData = res.data || [] getList(params) {
} else { this.timeDim = params.timeDim;
this.chartData = [] getCompare({ ...params }).then((res) => {
} if (res.code === 0) {
}) this.getTableList(res.data || []);
}, this.chartData = res.data || [];
switchChart() { } else {
if (this.activeName === 'bar') { this.chartData = [];
this.$nextTick((res) => { }
this.$refs.analysisBarChart.getChart() });
}) },
} else { getTableList(arr) {
this.$nextTick((res) => { this.tableProps = [];
this.$refs.analysisLineChart.getChart() this.list = [];
}) 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 {
.el-tabs__nav::after { .contrast-out-table {
content: ""; margin-top: 20px;
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>

455
src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
View File

@ -1,232 +1,253 @@
<template> <template>
<el-form :inline="true" class="demo-form-inline"> <el-form
<span class="blue-block"></span> :inline="true"
<el-form-item label="对象选择" required> class="demo-form-inline">
<el-cascader <span class="blue-block"></span>
v-model="objArr" <el-form-item
:options="objList" label="对象选择"
:props="{ checkStrictly: true, value: 'id', label: 'name' }" required>
popper-class="cascaderParent" <el-select
size="small" v-model="queryParams.objId"
style="width: 250px;" 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"> <el-select
<el-date-picker v-model="queryParams.type"
v-model="monthValue" placeholder="请选择"
type="month" 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 === 2"> </el-select>
<el-date-picker </el-form-item>
v-model="weekValue" <el-form-item
type="week" label="时间"
format="yyyy 第 WW 周" required>
:picker-options="pickerOptionsWeek" <div v-show="queryParams.type === 1">
@change="selectTime" <el-date-picker
:clearable="false" v-model="monthValue"
size="small" type="month"
placeholder="选择周"> :picker-options="pickerOptions"
</el-date-picker> @change="selectTime"
</div> :clearable="false"
<div v-show="queryParams.type === 3"> size="small"
<el-date-picker placeholder="选择月"></el-date-picker>
v-model="dateValue" </div>
type="date" <div v-show="queryParams.type === 2">
:picker-options="pickerOptions" <el-date-picker
@change="selectTime" v-model="weekValue"
:clearable="false" type="week"
size="small" format="yyyy 第 WW 周"
placeholder="选择日"> :picker-options="pickerOptionsWeek"
</el-date-picker> @change="selectTime"
</div> :clearable="false"
</el-form-item> size="small"
<el-form-item> placeholder="选择周"></el-date-picker>
<el-button type="primary" size="small" @click="search">查询</el-button> </div>
</el-form-item> <div v-show="queryParams.type === 3">
<el-form-item> <el-date-picker
<span class="separateStyle"></span> v-model="dateValue"
</el-form-item> type="date"
<el-form-item> :picker-options="pickerOptions"
<el-button type="primary" size="small" @click="exportData" plain>导出</el-button> @change="selectTime"
</el-form-item> :clearable="false"
</el-form> 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/base/factory' import { getTree } from '@/api/analysis/energyAnalysis';
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: [ },
{id: 1, name: '月'}, timeType: [
{id: 2, name: '周'}, { id: 1, name: '月' },
{id: 3, name: '日'} { id: 2, name: '周' },
], { id: 3, name: '日' },
monthValue: '', ],
weekValue: '', monthValue: '',
dateValue: '', weekValue: '',
objArr: [], dateValue: '',
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: },
this.queryParams.searchTime = this.monthValue selectTime() {
break; switch (this.queryParams.type) {
case 2: case 1:
this.queryParams.searchTime = this.weekValue this.queryParams.searchTime = this.monthValue;
break; break;
default: case 2:
this.queryParams.searchTime = this.dateValue this.queryParams.searchTime = this.weekValue;
} break;
}, default:
// 查询 this.queryParams.searchTime = this.dateValue;
search() { }
if (this.objArr.length === 0) { },
this.$modal.msgError('请选择对象') // 查询
return false search() {
} else { if (!this.queryParams.objId) {
this.queryParams.objId = this.objArr[this.objArr.length-1] this.$modal.msgError('请选择对象');
} return false;
if (!this.queryParams.type) { }
this.$modal.msgError('请选择时间维度') if (!this.queryParams.type) {
return false this.$modal.msgError('请选择时间维度');
} return false;
if (!this.queryParams.searchTime) { }
this.$modal.msgError('请选择时间') if (!this.queryParams.searchTime) {
return false this.$modal.msgError('请选择时间');
} return false;
switch (this.queryParams.type) { }
case 1: switch (this.queryParams.type) {
this.queryParams.searchTime = this.transformTime(this.monthValue) case 1:
break; this.queryParams.searchTime = this.transformTime(this.monthValue);
case 2: break;
let value = moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59' case 2:
this.queryParams.searchTime = new Date(value).getTime() let value =
break; moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59';
default: this.queryParams.searchTime = new Date(value).getTime();
let value2 = moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59' break;
this.queryParams.searchTime = new Date(value2).getTime() default:
} let value2 =
this.$emit('submit', this.queryParams) moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59';
}, this.queryParams.searchTime = new Date(value2).getTime();
exportData() { }
let name this.$emit('submit', this.queryParams);
if (this.queryParams.objId) { },
name = this.getObjName(this.objList, this.queryParams.objId) exportData() {
} else { let name;
this.$modal.msgWarning("对象不能为空") if (this.queryParams.objId) {
return false name = this.getObjName(this.objList, this.queryParams.objId);
} } else {
this.$emit('exportD', {name: name}) this.$modal.msgWarning('对象不能为空');
}, return false;
// 递归取对象name }
getObjName(list, id) { this.$emit('exportD', { name: name });
let _this = this },
for (let i = 0; i < list.length; i++) { // 递归取对象name
let a = list[i] getObjName(list, id) {
if (a.id === id) { for (let i = 0; i < list.length; i++) {
return a.name let a = list[i];
} else { if (a.id === id) {
if (a.children && a.children.length > 0) { return a.name;
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 =
transformTime(timeStamp) {// 本月最后一天 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 month = moment(timeStamp).format('MM') return value;
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>

250
src/views/energy/analysis/qoqAnalysis/index.vue
View File

@ -1,132 +1,140 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<search-area @submit="getList" @exportD="exportData"/> <search-area
<!-- 表格 --> @submit="getList"
<div v-show="chartData.length"> @exportD="exportData" />
<base-table <!-- 表格 -->
:table-props="tableProps" <div v-show="chartData.length">
:table-data="list" <base-table
class="qoq-out-table" :table-props="tableProps"
/> :table-data="list"
<div class="chartTitle">环比分析图</div> class="qoq-out-table" />
<div style='width: 100%'> <div class="chartTitle">环比分析图</div>
<line-chart ref="analysisLineChart" :chartData="chartData"/> <div style="width: 100%">
</div> <line-chart
</div> ref="analysisLineChart"
<!-- 没有数据 --> :chartData="chartData" />
<div class="no-data-bg" v-show='!chartData.length'></div> </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(document.querySelector(".qoq-out-table")) var wb = XLSX.utils.table_to_book(
let fileName = val.name + "环比分析.xlsx" document.querySelector('.qoq-out-table')
var wbout = XLSX.write(wb, { );
bookType: "xlsx", let fileName = val.name + '环比分析.xlsx';
bookSST: true, var wbout = XLSX.write(wb, {
type: "array" bookType: 'xlsx',
}) bookSST: true,
try { type: 'array',
FileSaver.saveAs( });
new Blob([wbout], { type: "application/octet-stream" }), try {
fileName FileSaver.saveAs(
) new Blob([wbout], { type: 'application/octet-stream' }),
} catch (e) { fileName
if (typeof console !== "undefined") console.log(e, wbout); );
} this.$message.success('导出成功');
return wbout } catch (e) {
} else { if (typeof console !== 'undefined') console.log(e, wbout);
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>

191
src/views/energy/analysis/trendAnalysis/components/lineChart.vue
View File

@ -1,103 +1,102 @@
<template> <template>
<div <div
id="analysischartLine" id="analysischartLine"
style="width: 100%" style="width: 100%"
:style="{ height: chartHeight + 'px' }" :style="{ height: chartHeight + 'px' }"></div>
></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) - 70 chartHeight: this.tableHeight(214) - 100,
} };
}, },
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>

996
src/views/energy/analysis/trendAnalysis/components/searchArea.vue
View File

File diff suppressed because it is too large Load Diff

187
src/views/energy/analysis/trendAnalysis/index.vue
View File

@ -1,94 +1,113 @@
<template> <template>
<div class="app-container trendAnalysisBox" id="trendAnalysisBox"> <div
<!-- 搜索工作栏 --> class="app-container trendAnalysisBox"
<search-area :isFold="isFold" @submit="getList"/> id="trendAnalysisBox">
<el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'> <!-- 搜索工作栏 -->
<el-tab-pane label="柱状图" name="bar"> <search-area
<bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim"/> :isFold="isFold"
</el-tab-pane> @submit="getList"
<el-tab-pane label="折线图" name="line"> @export="exportExl" />
<line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/> <div v-show="chartData.length">
</el-tab-pane> <base-table
</el-tabs> :table-props="tableProps"
<!-- 没有数据 --> :table-data="list"
<div class="no-data-bg" v-show='!chartData.length'></div> class="trend-out-table" />
</div> <line-chart
ref="analysisLineChart"
:chartData="chartData"
:timeDim="timeDim" />
</div>
<!-- 没有数据 -->
<div
class="no-data-bg"
v-show="!chartData.length"></div>
</div>
</template> </template>
<script> <script>
import { getEnergyTrend } from "@/api/analysis/energyAnalysis" import { getEnergyTrend, exportTrend } from '@/api/analysis/energyAnalysis';
import SearchArea from "./components/searchArea" import SearchArea from './components/searchArea';
import BarChart from "./components/barChart" import LineChart from './components/lineChart';
import LineChart from "./components/lineChart"
// import moment from 'moment' // import moment from 'moment'
export default { export default {
name: 'TrendAnalysis', name: 'TrendAnalysis',
components: { SearchArea, BarChart, LineChart }, components: { SearchArea, LineChart },
data() { data() {
return { return {
isFold: false, isFold: false,
activeName: 'bar', chartData: [],
chartData: [], timeDim: '',
timeDim: '' tableProps: [],
} list: [],
}, };
mounted() { },
window.addEventListener('resize', () => { mounted() {
this.tableH = this.tableHeight(260) window.addEventListener('resize', () => {
this.isFold = this.searchBarWidth('trendAnalysisBox', 1263) this.tableH = this.tableHeight(260);
}) this.isFold = this.searchBarWidth('trendAnalysisBox', 1480);
this.isFold = this.searchBarWidth('trendAnalysisBox', 1263) });
}, this.isFold = this.searchBarWidth('trendAnalysisBox', 1480);
methods: { },
getList(params) { methods: {
this.timeDim = params.timeDim getList(params) {
getEnergyTrend({ ...params }).then((res) => { this.timeDim = params.timeDim;
if (res.code === 0) { getEnergyTrend({ ...params }).then((res) => {
this.chartData = res.data if (res.code === 0) {
} else { this.getTableList(res.data || []);
this.chartData = [] this.chartData = res.data || [];
} } else {
}) this.chartData = [];
}, }
switchChart() { });
if (this.activeName === 'bar') { },
this.$nextTick((res) => { getTableList(arr) {
this.$refs.analysisBarChart.getChart() this.tableProps = [];
}) this.list = [];
} else { let tempX = [];
this.$nextTick((res) => { let listObj = { useNum: '消耗量' }; // 数据
this.$refs.analysisLineChart.getChart() for (let i = 0; i < arr.length; i++) {
}) 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 {
.el-tabs__nav::after { .trend-out-table {
content: ""; margin-bottom: 15px;
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>

402
src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
View File

@ -1,205 +1,227 @@
<template> <template>
<el-form :inline="true" class="demo-form-inline"> <el-form
<span class="blue-block"></span> :inline="true"
<el-form-item label="对象选择" required> class="demo-form-inline">
<el-cascader <span class="blue-block"></span>
v-model="objArr" <el-form-item
:options="objList" label="对象选择"
:props="{ checkStrictly: true, value: 'id', label: 'name' }" required>
popper-class="cascaderParent" <el-select
size="small" v-model="queryParams.objId"
clearable></el-cascader> placeholder="请选择"
</el-form-item> style="width: 250px"
<el-form-item label="时间维度" required> filterable
<el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small"> size="small">
<el-option <el-option
v-for="item in timeType" v-for="item in objList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
:clearable="false"> :clearable="false"></el-option>
</el-option> </el-select>
</el-select> </el-form-item>
</el-form-item> <el-form-item
<el-form-item label="时间" required> label="时间维度"
<div v-show="queryParams.type === 1 || queryParams.type === 2"> required>
<el-date-picker <el-select
v-model="yearValue" v-model="queryParams.type"
type="year" placeholder="请选择"
:picker-options="pickerOptions" style="width: 80px"
@change="selectTime" size="small">
:clearable="false" <el-option
size="small" v-for="item in timeType"
placeholder="选择年"> :key="item.id"
</el-date-picker> :label="item.name"
</div> :value="item.id"
<div v-show="queryParams.type === 3"> :clearable="false"></el-option>
<el-date-picker </el-select>
v-model="yearMonth" </el-form-item>
type="month" <el-form-item
:picker-options="pickerOptions" label="时间"
@change="selectTime" required>
:clearable="false" <div v-show="queryParams.type === 1 || queryParams.type === 2">
size="small" <el-date-picker
placeholder="选择月"> v-model="yearValue"
</el-date-picker> type="year"
</div> :picker-options="pickerOptions"
</el-form-item> @change="selectTime"
<el-form-item> :clearable="false"
<el-button type="primary" size="small" @click="search">查询</el-button> size="small"
</el-form-item> placeholder="选择年"></el-date-picker>
<el-form-item> </div>
<span class="separateStyle"></span> <div v-show="queryParams.type === 3">
</el-form-item> <el-date-picker
<el-form-item> v-model="yearMonth"
<el-button type="primary" size="small" @click="exportData" plain>导出</el-button> type="month"
</el-form-item> :picker-options="pickerOptions"
</el-form> @change="selectTime"
: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/base/factory' import { getTree } from '@/api/analysis/energyAnalysis';
import moment from 'moment' import moment from 'moment';
export default { export default {
name: 'searchArea', name: 'searchArea',
data() { data() {
return { return {
// 查询参数 // 查询参数
queryParams: { queryParams: {
type: 1, // 1季度2月3日 type: 1, // 1季度2月3日
searchTime: null, searchTime: null,
objId: null objId: null,
}, objType: 1,
timeType: [ },
{id: 1, name: '季度'}, timeType: [
{id: 2, name: '月'}, { id: 1, name: '季度' },
{id: 3, name: '日'} { id: 2, name: '月' },
], { id: 3, name: '日' },
yearValue: '', ],
yearMonth: '', yearValue: '',
objArr: [], yearMonth: '',
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 },
} else { selectTime() {
this.queryParams.searchTime = this.yearValue if (this.queryParams.type === 3) {
} this.queryParams.searchTime = this.yearMonth;
}, } else {
// 查询 this.queryParams.searchTime = this.yearValue;
search() { }
if (this.objArr.length === 0) { },
this.$modal.msgError('请选择对象') // 查询
return false search() {
} else { if (!this.queryParams.objId) {
this.queryParams.objId = this.objArr[this.objArr.length-1] this.$modal.msgError('请选择对象');
} return false;
if (!this.queryParams.type) { }
this.$modal.msgError('请选择时间维度') if (!this.queryParams.type) {
return false this.$modal.msgError('请选择时间维度');
} return false;
if (!this.queryParams.searchTime) { }
this.$modal.msgError('请选择时间') if (!this.queryParams.searchTime) {
return false this.$modal.msgError('请选择时间');
} return false;
if (this.queryParams.type === 3) { }
this.queryParams.searchTime = this.transformTime(this.yearMonth) + '' if (this.queryParams.type === 3) {
} else { this.queryParams.searchTime = this.transformTime(this.yearMonth) + '';
this.queryParams.searchTime = this.transformYear(this.yearValue) + '' } else {
} this.queryParams.searchTime = this.transformYear(this.yearValue) + '';
this.$emit('submit', this.queryParams) }
}, this.$emit('submit', this.queryParams);
exportData() { },
let name exportData() {
if (this.queryParams.objId) { let name;
name = this.getObjName(this.objList, this.queryParams.objId) if (this.queryParams.objId) {
} else { name = this.getObjName(this.objList, this.queryParams.objId);
this.$modal.msgWarning("对象不能为空") } else {
return false this.$modal.msgWarning('对象不能为空');
} return false;
this.$emit('exportD', {name: name}) }
}, this.$emit('exportD', { name: name });
// 递归取对象name },
getObjName(list, id) { // 递归取对象name
let _this = this getObjName(list, id) {
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) },
if (res) { transformTime(timeStamp) {
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();
transformTime(timeStamp) {// 本月最后一天 return value;
let year = moment(timeStamp).format('YYYY') },
let month = moment(timeStamp).format('MM') transformYear(timeStamp) {
let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59' // 本年最后一天
let value = new Date(newData).getTime() let year = moment(timeStamp).format('YYYY');
return value let newData = year + '-12-31 23:59:59';
}, let value = new Date(newData).getTime();
transformYear(timeStamp) {// 本年最后一天 return value;
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>

284
src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
View File

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

488
src/views/energy/base/energyPlcConnect/index.vue
View File

@ -1,236 +1,270 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<!-- 搜索工作栏 --> <search-bar
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> :formConfigs="formConfig"
<!-- 列表 --> ref="searchBarForm"
<base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list" @headBtnClick="buttonClick" />
:max-height="tableH"> <!-- 列表 -->
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn" <base-table
@clickBtn="handleClick" /> :page="queryParams.pageNo"
</base-table> :limit="queryParams.pageSize"
<pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total" :table-props="tableProps"
@pagination="getList" /> :table-data="list"
<!-- 新增 --> :max-height="tableH">
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel" <method-btn
@confirm="handleConfirm" :before-close="handleCancel" width='30%'> v-if="tableBtn.length"
<energy-plc-connect-add ref="energyPlcConnect" :objList="objList" @successSubmit="successSubmit" /> slot="handleBtn"
</base-dialog> :width="160"
<!-- 参数绑定/查看 --> label="操作"
<energy-plc-param v-if="paramVisible" ref="plcParam" @closeDrawer="closeDrawer" :method-list="tableBtn"
:energyTypeList="energyTypeList"></energy-plc-param> @clickBtn="handleClick" />
</div> </base-table>
<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 { getEnergyPlcConnectPage, deleteEnergyPlcConnect } from "@/api/base/energyPlcConnect"; import {
getEnergyPlcConnectPage,
deleteEnergyPlcConnect,
} from '@/api/base/energyPlcConnect';
// import { publicFormatter } from '@/utils/dict' // import { publicFormatter } from '@/utils/dict'
import { getTree } from '@/api/base/factory' import { getTree } from '@/api/analysis/energyAnalysis';
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') ? 'button' : '', type: this.$auth.hasPermi('base:energy-plc-connect:create')
btnName: '新增', ? 'button'
name: 'add', : '',
color: 'success', btnName: '新增',
plain: true name: 'add',
} color: 'success',
], plain: true,
tableProps, },
tableBtn: [ ],
this.$auth.hasPermi('base:energy-plc-connect:bind') tableProps,
? { tableBtn: [
type: 'connect', this.$auth.hasPermi('base:energy-plc-connect:bind')
btnName: '绑定' ? {
} type: 'connect',
: undefined, btnName: '绑定',
{ }
type: 'detail', : undefined,
btnName: '详情' {
}, type: 'detail',
this.$auth.hasPermi('base:energy-plc-connect:update') btnName: '详情',
? { },
type: 'edit', this.$auth.hasPermi('base:energy-plc-connect:update')
btnName: '编辑' ? {
} type: 'edit',
: undefined, btnName: '编辑',
this.$auth.hasPermi('base:energy-plc-connect:delete') }
? { : undefined,
type: 'delete', this.$auth.hasPermi('base:energy-plc-connect:delete')
btnName: '删除' ? {
} type: 'delete',
: undefined btnName: '删除',
].filter((v) => v), }
tableH: this.tableHeight(260), : undefined,
// 总条数 ].filter((v) => v),
total: 0, tableH: this.tableHeight(260),
// 班次基础信息列表 // 总条数
list: [], total: 0,
// 弹出层标题 // 班次基础信息列表
addOrEditTitle: "", list: [],
// 是否显示弹出层 // 弹出层标题
centervisible: false, addOrEditTitle: '',
// 查询参数 // 是否显示弹出层
queryParams: { centervisible: false,
pageNo: 1, // 查询参数
pageSize: 20, queryParams: {
cnName: null pageNo: 1,
}, pageSize: 20,
paramVisible: false, cnName: null,
energyTypeList: [], },
objList: [] paramVisible: false,
}; energyTypeList: [],
}, objList: [],
created() { };
window.addEventListener('resize', () => { },
this.tableH = this.tableHeight(260) created() {
}) window.addEventListener('resize', () => {
this.getList(); this.tableH = this.tableHeight(260);
}, });
mounted() { this.getList();
// 获取能源列表 },
this.getEnergyTypeList() mounted() {
// 获取对象树形结构 // 获取能源列表
this.getObjTree() this.getEnergyTypeList();
}, // 获取对象树形结构
methods: { this.getObjTree();
buttonClick(val) { },
switch (val.btnName) { methods: {
case 'search': buttonClick(val) {
this.queryParams.pageNo = 1; switch (val.btnName) {
this.queryParams.cnName = val.cnName case 'search':
this.getList() this.queryParams.pageNo = 1;
break this.queryParams.cnName = val.cnName;
default: this.getList();
this.addOrEditTitle = '新增' break;
this.centervisible = true default:
this.$nextTick(() => { this.addOrEditTitle = '新增';
this.$refs.energyPlcConnect.init() this.centervisible = true;
}) this.$nextTick(() => {
} this.$refs.energyPlcConnect.init();
}, });
/** 查询列表 */ }
getList() { },
getEnergyPlcConnectPage(this.queryParams).then(response => { /** 查询列表 */
let arr = response.data.list || []; getList() {
this.list = arr getEnergyPlcConnectPage(this.queryParams).then((response) => {
this.total = response.data.total; let arr = response.data.list || [];
}); this.list = arr;
}, this.total = response.data.total;
handleClick(val) { });
console.log(val) },
switch (val.type) { handleClick(val) {
case 'edit': console.log(val);
this.addOrEditTitle = '编辑' switch (val.type) {
this.$nextTick(() => { case 'edit':
this.$refs.energyPlcConnect.init(val.data.id) this.addOrEditTitle = '编辑';
}) this.$nextTick(() => {
this.centervisible = true this.$refs.energyPlcConnect.init(val.data.id);
break });
case 'delete': this.centervisible = true;
this.handleDelete(val.data) break;
break case 'delete':
case 'detail': this.handleDelete(val.data);
this.paramVisible = true break;
this.$nextTick(() => { case 'detail':
this.$refs.plcParam.init(val.data, 'detail') this.paramVisible = true;
}) this.$nextTick(() => {
break this.$refs.plcParam.init(val.data, 'detail');
default: });
this.paramVisible = true break;
this.$nextTick(() => { default:
this.$refs.plcParam.init(val.data, 'connect') this.paramVisible = true;
}) this.$nextTick(() => {
} this.$refs.plcParam.init(val.data, 'connect');
}, });
handleCancel() { }
this.$refs.energyPlcConnect.formClear() },
this.centervisible = false handleCancel() {
this.addOrEditTitle = '' this.$refs.energyPlcConnect.formClear();
}, this.centervisible = false;
handleConfirm() { this.addOrEditTitle = '';
this.$refs.energyPlcConnect.submitForm() },
}, handleConfirm() {
successSubmit() { this.$refs.energyPlcConnect.submitForm();
this.handleCancel() },
this.getList() successSubmit() {
}, this.handleCancel();
/** 删除按钮操作 */ this.getList();
handleDelete(row) { },
this.$modal.confirm('是否确认删除对象为"' + row.objName + '"的数据项?').then(function () { /** 删除按钮操作 */
return deleteEnergyPlcConnect(row.id); handleDelete(row) {
}).then(() => { this.$modal
this.queryParams.pageNo = 1; .confirm('是否确认删除对象为"' + row.objName + '"的数据项?')
this.getList(); .then(function () {
this.$modal.msgSuccess("删除成功"); return deleteEnergyPlcConnect(row.id);
}).catch(() => { }); })
}, .then(() => {
closeDrawer() { this.queryParams.pageNo = 1;
this.getList() this.getList();
}, this.$modal.msgSuccess('删除成功');
getEnergyTypeList() { })
getEnergyTypeListAll().then((res) => { .catch(() => {});
this.energyTypeList = res.data || [] },
}) closeDrawer() {
}, this.getList();
getObjTree() { },
getTree().then(res => { getEnergyTypeList() {
this.objList = res.data || [] getEnergyTypeListAll().then((res) => {
}) this.energyTypeList = res.data || [];
} });
} },
getObjTree() {
getTree().then((res) => {
this.objList = res.data || [];
});
},
},
}; };
</script> </script>

737
src/views/energy/base/energyType/components/energyTypeAdd.vue
View File

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

399
src/views/energy/base/energyType/index.vue
View File

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

624
src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
View File

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

531
src/views/energy/monitoring/energyLimit/index.vue
View File

@ -1,269 +1,278 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<!-- 搜索工作栏 --> <search-bar
<search-bar :formConfigs="formConfig"
:formConfigs="formConfig" ref="searchBarForm"
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" <pagination
@clickBtn="handleClick" :page.sync="queryParams.pageNo"
/> :limit.sync="queryParams.pageSize"
</base-table> :total="total"
<pagination @pagination="getList" />
:page.sync="queryParams.pageNo" <!-- 新增 -->
:limit.sync="queryParams.pageSize" <base-dialog
:total="total" :dialogTitle="addOrEditTitle"
@pagination="getList" :dialogVisible="centervisible"
/> @cancel="handleCancel"
<!-- 新增 --> @confirm="handleConfirm"
<base-dialog :before-close="handleCancel"
:dialogTitle="addOrEditTitle" width="50%">
:dialogVisible="centervisible" <energy-limit-add
@cancel="handleCancel" ref="energyLimit"
@confirm="handleConfirm" @successSubmit="successSubmit"
:before-close="handleCancel" :energyTypeList="energyTypeList"
width='50%' :objList="objList" />
> </base-dialog>
<energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/> </div>
</base-dialog>
</div>
</template> </template>
<script> <script>
import { getEnergyLimitPage, deleteEnergyLimit } from "@/api/monitoring/energyLimit"; import {
import { getEnergyTypeListAll } from "@/api/base/energyType"; getEnergyLimitPage,
import { getTree } from '@/api/base/factory' deleteEnergyLimit,
import { publicFormatter } from '@/utils/dict' } from '@/api/monitoring/energyLimit';
import EnergyLimitAdd from './components/energyLimitAdd' import { getEnergyTypeListAll } from '@/api/base/energyType';
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', {
label: '监控模式', prop: 'type',
filter: (val) => (val != null ? ['合并', '详细'][val-1] : '-'), label: '监控模式',
}, filter: (val) => (val != null ? ['合并', '详细'][val - 1] : '-'),
{ },
prop: 'plcParamName', {
label: '监控参数' prop: 'plcParamName',
}, label: '监控参数',
{ },
prop: 'limitType', {
label: '指标类型', prop: 'limitType',
filter: publicFormatter('monitor_index_type') label: '指标类型',
}, filter: publicFormatter('monitor_index_type'),
{ },
prop: 'limitValue', {
label: '阈值' prop: 'limitValue',
} 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') ? 'button' : '', type: this.$auth.hasPermi('monitoring:energy-limit:create')
btnName: '新增', ? 'button'
name: 'add', : '',
color: 'success', btnName: '新增',
plain: true name: 'add',
} color: 'success',
], plain: true,
tableProps, },
tableBtn: [ ],
this.$auth.hasPermi('monitoring:energy-limit:update') tableProps,
? { tableBtn: [
type: 'edit', this.$auth.hasPermi('monitoring:energy-limit:update')
btnName: '编辑' ? {
} type: 'edit',
: undefined, btnName: '编辑',
this.$auth.hasPermi('monitoring:energy-limit:delete') }
? { : undefined,
type: 'delete', this.$auth.hasPermi('monitoring:energy-limit:delete')
btnName: '删除' ? {
} type: 'delete',
: undefined btnName: '删除',
].filter((v) => v), }
tableH: this.tableHeight(260), : undefined,
// 总条数 ].filter((v) => v),
total: 0, tableH: this.tableHeight(260),
// 班次基础信息列表 // 总条数
list: [], total: 0,
// 弹出层标题 // 班次基础信息列表
addOrEditTitle: "", list: [],
// 是否显示弹出层 // 弹出层标题
centervisible: false, addOrEditTitle: '',
// 查询参数 // 是否显示弹出层
queryParams: { centervisible: false,
pageNo: 1, // 查询参数
pageSize: 20, queryParams: {
energyTypeId: null, pageNo: 1,
limitType: null pageSize: 20,
}, energyTypeId: null,
energyTypeList: [], limitType: null,
typeList: [ },
{label: '合并', value: '1'}, energyTypeList: [],
{label: '详细', value: '2'} typeList: [
], { label: '合并', value: '1' },
objList: [] { label: '详细', value: '2' },
}; ],
}, objList: [],
created() { };
window.addEventListener('resize', () => { },
this.tableH = this.tableHeight(260) created() {
}) window.addEventListener('resize', () => {
this.getList(); this.tableH = this.tableHeight(260);
this.getTypeList() });
// 获取对象树形结构 this.getList();
this.getObjTree() this.getTypeList();
}, // 获取对象树形结构
methods: { this.getObjTree();
getTypeList() { },
getEnergyTypeListAll().then((res) => { methods: {
this.formConfig[0].selectOptions = res.data || [] getTypeList() {
this.energyTypeList = res.data || [] getEnergyTypeListAll().then((res) => {
}) this.formConfig[0].selectOptions = res.data || [];
}, this.energyTypeList = res.data || [];
buttonClick(val) { });
switch (val.btnName) { },
case 'search': buttonClick(val) {
this.queryParams.pageNo = 1; switch (val.btnName) {
this.queryParams.energyTypeId = val.energyTypeId case 'search':
this.queryParams.limitType = val.limitType this.queryParams.pageNo = 1;
this.getList() this.queryParams.energyTypeId = val.energyTypeId;
break this.queryParams.limitType = val.limitType;
default: this.getList();
this.addOrEditTitle = '新增' break;
this.centervisible = true default:
this.$nextTick(() => { this.addOrEditTitle = '新增';
this.$refs.energyLimit.init() this.centervisible = true;
}) this.$nextTick(() => {
} this.$refs.energyLimit.init();
}, });
/** 查询列表 */ }
getList() { },
getEnergyLimitPage(this.queryParams).then(response => { /** 查询列表 */
let arr = response.data.list || []; getList() {
arr&&arr.map(item => { getEnergyLimitPage(this.queryParams).then((response) => {
this.typeList.map(i => { let arr = response.data.list || [];
if (item.type === i.value) { arr &&
item.type = i.label arr.map((item) => {
} this.typeList.map((i) => {
}) if (item.type === i.value) {
if (item.minValue && item.maxValue) { item.type = i.label;
item.limitValue = item.minValue + '-' + item.maxValue }
} else if(item.minValue){ });
item.limitValue = '最小值' + item.minValue if (item.minValue && item.maxValue) {
}else if(item.maxValue){ item.limitValue = item.minValue + '-' + item.maxValue;
item.limitValue = '最大值' + item.maxValue } else if (item.minValue) {
} else { item.limitValue = '最小值' + item.minValue;
item.limitValue = '' } else if (item.maxValue) {
} item.limitValue = '最大值' + item.maxValue;
}) } else {
this.list = arr item.limitValue = '';
this.total = response.data.total; }
}); });
}, this.list = arr;
handleClick(val) { this.total = response.data.total;
switch (val.type) { });
case 'edit': },
this.addOrEditTitle = '编辑' handleClick(val) {
this.$nextTick(() => { switch (val.type) {
this.$refs.energyLimit.init(val.data.id) case 'edit':
}) this.addOrEditTitle = '编辑';
this.centervisible = true this.$nextTick(() => {
break this.$refs.energyLimit.init(val.data.id);
default: });
this.handleDelete(val.data) this.centervisible = true;
} break;
}, default:
handleCancel() { this.handleDelete(val.data);
this.$refs.energyLimit.formClear() }
this.centervisible = false },
this.addOrEditTitle = '' handleCancel() {
}, this.$refs.energyLimit.formClear();
handleConfirm() { this.centervisible = false;
this.$refs.energyLimit.submitForm() this.addOrEditTitle = '';
}, },
successSubmit() { handleConfirm() {
this.handleCancel() this.$refs.energyLimit.submitForm();
this.getList() },
}, successSubmit() {
/** 删除按钮操作 */ this.handleCancel();
handleDelete(row) { this.getList();
this.$modal.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?').then(function() { },
return deleteEnergyLimit(row.id); /** 删除按钮操作 */
}).then(() => { handleDelete(row) {
this.queryParams.pageNo = 1; this.$modal
this.getList(); .confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?')
this.$modal.msgSuccess("删除成功"); .then(function () {
}).catch(() => {}); return deleteEnergyLimit(row.id);
}, })
getObjTree() { .then(() => {
getTree().then(res => { this.queryParams.pageNo = 1;
this.objList = res.data || [] this.getList();
}) this.$modal.msgSuccess('删除成功');
} })
} .catch(() => {});
},
getObjTree() {
getTree().then((res) => {
this.objList = res.data || [];
});
},
},
}; };
</script> </script>

365
src/views/energy/monitoring/energyReport/index.vue
View File

@ -1,185 +1,196 @@
<template> <template>
<div class="app-container" id='energyReportBox'> <div
class="app-container"
<!-- 搜索工作栏 --> id="energyReportBox">
<search-bar <!-- 搜索工作栏 -->
:formConfigs="formConfig" <search-bar
ref="searchBarForm" :formConfigs="formConfig"
:isFold="isFold" ref="searchBarForm"
@headBtnClick="buttonClick" :isFold="isFold"
/> @headBtnClick="buttonClick" />
<!-- 列表 --> <!-- 列表 -->
<base-table <base-table
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-props="tableProps" :table-props="tableProps"
:table-data="list" :table-data="list"
:max-height="tableH" :max-height="tableH" />
/> <pagination
<pagination :page.sync="queryParams.pageNo"
:page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
:limit.sync="queryParams.pageSize" :total="total"
:total="total" @pagination="getList" />
@pagination="getList" </div>
/>
</div>
</template> </template>
<script> <script>
import { energyReportPageAuto, energyReportPageExportAuto } from "@/api/monitoring/energyReport" import {
import { getEnergyTypeListAll } from "@/api/base/energyType"; energyReportPageAuto,
import { publicFormatter } from '@/utils/dict' energyReportPageExportAuto,
import { parseTime } from '@/utils/ruoyi' } from '@/api/monitoring/energyReport';
import { getEnergyTypeListAll } from '@/api/base/energyType';
import { publicFormatter } from '@/utils/dict';
import { parseTime } from '@/utils/ruoyi';
const tableProps = [ const tableProps = [
{ {
prop: 'statisticType', prop: 'statisticType',
label: '统计类型', label: '统计类型',
filter: publicFormatter('statistic_type') filter: publicFormatter('statistic_type'),
}, },
{ {
prop: 'startTime', prop: 'startTime',
label: '开始时间', label: '开始时间',
filter: parseTime, filter: parseTime,
minWidth: 160 minWidth: 160,
}, },
{ {
prop: 'endTime', prop: 'endTime',
label: '结束时间', label: '结束时间',
filter: parseTime, filter: parseTime,
minWidth: 160 minWidth: 160,
}, },
{ {
prop: 'statisticName', prop: 'statisticName',
label: '统计方案' label: '统计方案',
}, },
{ {
prop: 'energyType', prop: 'energyType',
label: '能源类型' label: '能源类型',
}, },
{ {
prop: 'startNum', prop: 'startNum',
label: '抄表数(起始)' label: '抄表数(起始)',
}, },
{ {
prop: 'endNum', prop: 'endNum',
label: '抄表数(结束)' label: '抄表数(结束)',
}, },
{ {
prop: 'useNum', prop: 'useNum',
label: '消耗量' label: '消耗量',
} },
] ];
export default { export default {
name: "EnergyLimit", name: 'EnergyLimit',
data() { data() {
return { return {
isFold: false, isFold: false,
formConfig: [ formConfig: [
{ {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
selectOptions: [], selectOptions: [],
param: 'energyTypeId', param: 'energyTypeId',
filterable: true filterable: true,
}, },
{ {
type: 'select', type: 'select',
label: '统计类型', label: '统计类型',
selectOptions: this.getDictDatas(this.DICT_TYPE.STATISTIC_TYPE), selectOptions: this.getDictDatas(this.DICT_TYPE.STATISTIC_TYPE),
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
param: 'statisticType' param: 'statisticType',
}, },
{ {
type: 'datePicker', type: 'datePicker',
label: '时间', label: '时间',
dateType: 'datetimerange', dateType: 'datetimerange',
format: 'yyyy-MM-dd HH:mm:ss', format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp", valueFormat: 'timestamp',
rangeSeparator: '-', rangeSeparator: '-',
startPlaceholder: '开始时间', startPlaceholder: '开始时间',
endPlaceholder: '结束时间', endPlaceholder: '结束时间',
param: 'timeVal', param: 'timeVal',
defaultSelect: [], defaultSelect: [],
width: 350 width: 350,
}, },
{ {
type: 'button', type: 'button',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary' color: 'primary',
}, },
{ {
type: 'separate' type: 'separate',
}, },
{ {
type: this.$auth.hasPermi('monitoring:energy-report:export') ? 'button' : '', type: this.$auth.hasPermi('monitoring:energy-report:export')
btnName: '导出', ? 'button'
name: 'add', : '',
color: 'primary', btnName: '导出',
plain: true name: 'add',
} color: 'primary',
], plain: true,
tableProps, },
tableH: this.tableHeight(260), ],
// 总条数 tableProps,
total: 0, tableH: this.tableHeight(260),
// 班次基础信息列表 // 总条数
list: [], total: 0,
// 查询参数 // 班次基础信息列表
queryParams: { list: [],
pageNo: 1, // 查询参数
pageSize: 20, queryParams: {
energyTypeId: null, pageNo: 1,
statisticType: null, pageSize: 20,
startTime: null, energyTypeId: null,
endTime: null statisticType: null,
} startTime: null,
}; endTime: null,
}, },
created() { };
window.addEventListener('resize', () => { },
this.tableH = this.tableHeight(260) created() {
this.isFold = this.searchBarWidth('energyReportBox', 1198) window.addEventListener('resize', this._eventListeners);
}) this.getList();
this.getList() this.getTypeList();
this.getTypeList() },
}, mounted() {
mounted() { this.isFold = this.searchBarWidth('energyReportBox', 1198);
this.isFold = this.searchBarWidth('energyReportBox', 1198) },
}, destroyed() {
methods: { window.removeEventListener('resize', this._eventListeners);
getTypeList() { },
getEnergyTypeListAll().then((res) => { methods: {
this.formConfig[0].selectOptions = res.data || [] _eventListeners() {
// this.energyTypeList = res.data || [] this.tableH = this.tableHeight(260);
}) this.isFold = this.searchBarWidth('energyReportBox', 1198);
}, },
buttonClick(val) { getTypeList() {
switch (val.btnName) { getEnergyTypeListAll().then((res) => {
case 'search': this.formConfig[0].selectOptions = res.data || [];
this.queryParams.pageNo = 1 // this.energyTypeList = res.data || []
this.queryParams.energyTypeId = val.energyTypeId });
this.queryParams.statisticType = val.statisticType },
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null buttonClick(val) {
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null switch (val.btnName) {
this.getList() case 'search':
break this.queryParams.pageNo = 1;
default: this.queryParams.energyTypeId = val.energyTypeId;
this.$modal.confirm('是否确认导出').then(() => { this.queryParams.statisticType = val.statisticType;
return energyReportPageExportAuto({...this.queryParams}); this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
}).then(response => { this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
this.$download.excel(response, '能源统计报表.xls'); this.getList();
}).catch(() => {}) break;
} default:
}, this.$modal
/** 查询列表 */ .confirm('是否确认导出')
getList() { .then(() => {
energyReportPageAuto(this.queryParams).then(response => { return energyReportPageExportAuto({ ...this.queryParams });
this.list = response.data.list || []; })
this.total = response.data.total; .then((response) => {
}); this.$download.excel(response, '能源统计报表.xls');
} })
} .catch(() => {});
}
},
/** 查询列表 */
getList() {
energyReportPageAuto(this.queryParams).then((response) => {
this.list = response.data.list || [];
this.total = response.data.total;
});
},
},
}; };
</script> </script>

9
src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
View File

@ -4,7 +4,8 @@
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="buttonClick" /> <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="buttonClick" />
<!-- 列表 --> <!-- 列表 -->
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"> <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
:table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
@ -33,10 +34,10 @@ import {
import basicPage from '../../mixins/basic-page'; import basicPage from '../../mixins/basic-page';
import moment from 'moment'; import moment from 'moment';
import addOrUpdate from './dialogForm.vue'; import addOrUpdate from './dialogForm.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'QualityInspectionBoxBtn', name: 'QualityInspectionBoxBtn',
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
components: { addOrUpdate }, components: { addOrUpdate },
data() { data() {
return { return {
@ -114,7 +115,7 @@ export default {
// 查询参数 // 查询参数
listQuery: { listQuery: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
inspectionDetContent: null, inspectionDetContent: null,
}, },
addOrUpdateVisible: false, addOrUpdateVisible: false,

8
src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
View File

@ -4,7 +4,8 @@
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="buttonClick" /> <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="buttonClick" />
<!-- 列表 --> <!-- 列表 -->
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"> <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
:table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
@ -34,10 +35,11 @@ import basicPage from './basic-page';
import moment from 'moment'; import moment from 'moment';
import addOrUpdate from './dialogForm.vue'; import addOrUpdate from './dialogForm.vue';
import ProcessBomList from './ProcessBomList.vue'; import ProcessBomList from './ProcessBomList.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import row from './row.vue'; import row from './row.vue';
export default { export default {
name: 'QualityInspectionBoxBtn', name: 'QualityInspectionBoxBtn',
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
components: { addOrUpdate, ProcessBomList }, components: { addOrUpdate, ProcessBomList },
data() { data() {
return { return {
@ -123,7 +125,7 @@ export default {
// 查询参数 // 查询参数
listQuery: { listQuery: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
userName: null, userName: null,
nickName:null nickName:null
}, },

9
src/views/quality/base/qualityHotMaterial/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo" <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :table-data="tableData"> :limit="listQuery.pageSize" :table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
@ -29,6 +29,7 @@ import {
deleteQualityHotMaterial, deleteQualityHotMaterial,
getHotMaterialAllList getHotMaterialAllList
} from '@/api/base/qualityHotMaterial'; } from '@/api/base/qualityHotMaterial';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// import { getList, } from "@/api/base/qualityScrapType"; // import { getList, } from "@/api/base/qualityScrapType";
const tableProps = [ const tableProps = [
{ {
@ -74,7 +75,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [basicPage], mixins: [basicPage, tableHeightMixin],
data() { data() {
return { return {
urlOptions: { urlOptions: {
@ -207,7 +208,7 @@ export default {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.pageNo = 1; this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10; this.listQuery.pageSize = 20;
this.listQuery.materialId = val.materialId ? val.materialId : undefined; this.listQuery.materialId = val.materialId ? val.materialId : undefined;
this.listQuery.checkTime = val.checkTime ? val.checkTime : undefined; this.listQuery.checkTime = val.checkTime ? val.checkTime : undefined;
this.getDataList(); this.getDataList();
@ -215,7 +216,7 @@ export default {
case 'reset': case 'reset':
this.$refs.searchBarForm.resetForm(); this.$refs.searchBarForm.resetForm();
this.listQuery = { this.listQuery = {
pageSize: 10, pageSize: 20,
pageNo: 1, pageNo: 1,
total: 1, total: 1,
}; };

8
src/views/quality/base/qualityInspectionDet/index.vue
View File

@ -4,7 +4,7 @@
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" /> <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
<!-- 列表 --> <!-- 列表 -->
<base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list" <base-table :max-height="tableH" :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
@emitFun="handleEmitFun"> @emitFun="handleEmitFun">
<method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
@clickBtn="handleTableBtnClick" /> @clickBtn="handleTableBtnClick" />
@ -59,14 +59,14 @@ import {
getQualityInspectionDetPage, getQualityInspectionDetPage,
exportQualityInspectionDetExcel, exportQualityInspectionDetExcel,
} from '@/api/base/qualityInspectionDet'; } from '@/api/base/qualityInspectionDet';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import moment from 'moment'; import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
export default { export default {
name: 'QualityInspectionDet', name: 'QualityInspectionDet',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
typeList: [], // 检测类型列表 typeList: [], // 检测类型列表
@ -153,7 +153,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 20,
content: null, content: null,
createTime: [], createTime: [],
}, },

8
src/views/quality/base/qualityInspectionType/index.vue
View File

@ -4,8 +4,8 @@
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" /> <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
<!-- 列表 --> <!-- 列表 -->
<base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list" <base-table :max-height="tableH" :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize"
@emitFun="handleEmitFun"> :table-data="list" @emitFun="handleEmitFun">
<method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" :method-list="tableBtn"
@clickBtn="handleTableBtnClick" /> @clickBtn="handleTableBtnClick" />
</base-table> </base-table>
@ -61,10 +61,10 @@ import {
exportQualityInspectionTypeExcel, exportQualityInspectionTypeExcel,
} from '@/api/base/qualityInspectionType'; } from '@/api/base/qualityInspectionType';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'QualityInspectionType', name: 'QualityInspectionType',
mixins: [basicPageMixin], mixins: [basicPageMixin, tableHeightMixin],
data() { data() {
return { return {
tableBtn: [ tableBtn: [

13
src/views/quality/monitoring/materielDateFrom/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-25 16:07:07 * @LastEditTime: 2024-03-29 14:08:18
* @Description: * @Description:
--> -->
<template> <template>
@ -24,12 +24,12 @@
// import unitDict from './unitDict'; // import unitDict from './unitDict';
// import basicPage from '../mixins/basic-page'; // import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter'; import { parseTime } from '../mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
getMaterialUseLogPage, getMaterialUseLogPage,
getWorkOrderList, getWorkOrderList,
exportEnergyPlcExcel exportEnergyPlcExcel
} from '@/api/quality/materialTraceability'; } from '@/api/quality/materialTraceability';
const tableProps = [ const tableProps = [
{ {
prop: 'materialName', prop: 'materialName',
@ -73,6 +73,7 @@ const tableProps = [
]; ];
export default { export default {
mixins: [tableHeightMixin],
// mixins: [basicPage], // mixins: [basicPage],
data() { data() {
return { return {
@ -82,7 +83,7 @@ export default {
// // exportURL: exportPackingExcel, // // exportURL: exportPackingExcel,
// }, // },
tableProps, tableProps,
tableH: this.tableHeight(260), // tableH: this.tableHeight(260),
tableBtn: [ tableBtn: [
this.$auth.hasPermi(`base:packaging-print-log:update`) this.$auth.hasPermi(`base:packaging-print-log:update`)
? { ? {
@ -174,9 +175,9 @@ export default {
// AddOrUpdate, // AddOrUpdate,
}, },
created() { created() {
window.addEventListener('resize', () => { // window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260) // this.tableH = this.tableHeight(260)
}) // })
this.getList() this.getList()
this.getDict() this.getDict()
}, },

13
src/views/quality/monitoring/originalGlassRetrace/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-21 15:17:05 * @LastEditTime: 2024-03-29 14:08:30
* @Description: * @Description:
--> -->
<template> <template>
@ -25,6 +25,8 @@
// import basicPage from '../mixins/basic-page'; // import basicPage from '../mixins/basic-page';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import { parseTime } from '../mixins/code-filter'; import { parseTime } from '../mixins/code-filter';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import { import {
getOriginalGlassRetrace, getOriginalGlassRetrace,
getWorkOrderList, getWorkOrderList,
@ -85,6 +87,7 @@ const tableProps = [
export default { export default {
// mixins: [basicPage], // mixins: [basicPage],
mixins: [tableHeightMixin],
data() { data() {
return { return {
// urlOptions: { // urlOptions: {
@ -119,7 +122,7 @@ export default {
startTime: undefined, startTime: undefined,
endTime:undefined, endTime:undefined,
}, },
tableH: this.tableHeight(260), // tableH: this.tableHeight(260),
formConfig: [ formConfig: [
{ {
type: 'select', type: 'select',
@ -184,9 +187,9 @@ export default {
// AddOrUpdate, // AddOrUpdate,
}, },
created() { created() {
window.addEventListener('resize', () => { // window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260) // this.tableH = this.tableHeight(260)
}) // })
this.getList() this.getList()
this.getDict() this.getDict()
}, },

8
src/views/quality/monitoring/processTraceability/index.vue
View File

@ -2,13 +2,14 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-20 09:25:40 * @LastEditTime: 2024-03-29 15:32:33
* @Description: * @Description:
--> -->
<template> <template>
<div class="app-container"> <div class="app-container">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list"> <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
:table-data="list">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn" <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
@ -30,6 +31,7 @@ import {
// exportEnergyPlcExcel // exportEnergyPlcExcel
} from '@/api/quality/processTraceability'; } from '@/api/quality/processTraceability';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'name', prop: 'name',
@ -78,7 +80,7 @@ const tableProps = [
]; ];
export default { export default {
// mixins: [basicPage], mixins: [tableHeightMixin],
data() { data() {
return { return {
// urlOptions: { // urlOptions: {

9
src/views/quality/monitoring/processTraceabilityDetail/components/SmallTitle.vue
View File

@ -1,14 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-11-09 16:32:21 * @Date: 2023-11-09 16:32:21
* @LastEditTime: 2023-11-09 16:32:21 * @LastEditTime: 2024-03-29 14:21:52
* @LastEditors: zhp
* @Description:
-->
<!--
* @Author: zhp
* @Date: 2023-11-07 19:28:13
* @LastEditTime: 2023-11-08 14:11:43
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->

9
src/views/quality/monitoring/processTraceabilityDetail/index.vue
View File

@ -1,17 +1,10 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-11-28 10:41:50 * @Date: 2023-11-28 10:41:50
* @LastEditTime: 2023-11-28 10:49:43 * @LastEditTime: 2024-03-29 14:14:13
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
<!--
filename: index.vue
author: liubin
date: 2023-10-18 12:25:46
description:
-->
<template> <template>
<div class="app-container process-flow-view"> <div class="app-container process-flow-view">
<ProcessInfo /> <ProcessInfo />

51
src/views/specialEquipment/check/Record.vue
View File

@ -91,8 +91,18 @@ export default {
// : undefined, // : undefined,
].filter((v) => v), ].filter((v) => v),
tableProps: [ tableProps: [
{ prop: 'name', label: '巡检单名称', showOverflowtooltip: true }, {
{ prop: 'department', label: '部门', showOverflowtooltip: true }, prop: 'name',
label: '巡检单名称',
showOverflowtooltip: true,
filter: (v) => v ?? '---',
},
{
prop: 'department',
label: '部门',
showOverflowtooltip: true,
filter: (v) => v ?? '---',
},
{ {
prop: 'actualCheckTime', prop: 'actualCheckTime',
label: '巡检时间', label: '巡检时间',
@ -100,33 +110,12 @@ export default {
filter: parseTime, filter: parseTime,
showOverflowtooltip: true, showOverflowtooltip: true,
}, },
{ prop: 'groupClass', label: '班次', showOverflowtooltip: true }, {
// { prop: 'groupClass',
// prop: '_detail', label: '班次',
// label: '巡检内容', showOverflowtooltip: true,
// subcomponent: { filter: (v) => v ?? '---',
// name: 'ViewDetail', },
// props: ['injectData'],
// data() {
// return {};
// },
// methods: {
// handleClick() {
// this.$emit('emitData', {
// action: this.injectData.label,
// value: this.injectData,
// });
// },
// },
// render: function (h) {
// return (
// <el-button type="text" onClick={this.handleClick}>
// 详情
// </el-button>
// );
// },
// },
// },
{ prop: 'remark', label: '备注' }, { prop: 'remark', label: '备注' },
], ],
searchBarFormConfig: [ searchBarFormConfig: [
@ -161,9 +150,7 @@ export default {
type: 'separate', type: 'separate',
}, },
{ {
type: this.$auth.hasPermi('se:check-record:export') type: this.$auth.hasPermi('se:check-record:export') ? 'button' : '',
? 'button'
: '',
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
plain: true, plain: true,

5
src/views/specialEquipment/maintain/Record.vue
View File

@ -80,8 +80,9 @@ import {
import RecordDetail from './Record--detail.vue'; import RecordDetail from './Record--detail.vue';
import { TableBtn } from '@/components/tableInnerComponents'; import { TableBtn } from '@/components/tableInnerComponents';
const timeFilter = (val) => const timeFilter = (val) => {
val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---'; return val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---';
};
export default { export default {
name: 'SpecialEquipmentMaintainRecord', name: 'SpecialEquipmentMaintainRecord',