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

订单监控图

Browse Source
This commit is contained in:
朱菊兰
2023-11-22 16:58:32 +08:00
parent bad7175f87
commit dfc758bfae
24 changed files with 422 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
View File

@@ -39,14 +39,12 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="是否采集" prop="collection">
<el-switch v-model="form.collection"></el-switch>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="描述" prop="description">
<el-input v-model="form.description"></el-input>
</el-form-item>

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

@@ -37,6 +37,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width='30%'
>
<energy-plc-connect-add ref="energyPlcConnect" :objList="objList" @successSubmit="successSubmit" />
</base-dialog>

20
src/views/energy/base/energyType/components/InnerTable.vue
View File

@@ -9,7 +9,7 @@
width="120">
</el-table-column>
</el-table>
<span v-if='singlePrice'><span class='priceTitle'>单价(元): </span>{{ singlePrice }}</span>
<span v-if='singlePrice'><span class='priceTitle'>单价(元): </span>{{ singlePrice.toFixed(2) }}</span>
<el-button
slot="reference"
type="text"
@@ -32,7 +32,8 @@ const temp1 = [
},
{
prop: 'price',
label: '单价(元)'
label: '单价(元)',
align: 'right'
}
]
const temp2 = [
@@ -46,7 +47,8 @@ const temp2 = [
},
{
prop: 'price',
label: '单价(元)'
label: '单价(元)',
align: 'right'
}
]
export default {
@@ -78,12 +80,20 @@ export default {
console.log(res)
if (res.data.pricingMethod === 0) {
this.tableProps = this.temp1
this.tableData = res.data.segPriceList
this.singlePrice = ''
let arr1 = res.data.segPriceList
for (let item of arr1) {
item.price = item.price.toFixed(2)
}
this.tableData = arr1
} else if (res.data.pricingMethod === 1) {
this.tableProps = this.temp2
this.tableData = res.data.usedPriceList
this.singlePrice = ''
let arr2 = res.data.usedPriceList
for (let item of arr2) {
item.price = item.price.toFixed(2)
}
this.tableData = arr2
} else {
this.tableProps = []
this.tableData = []

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

@@ -1,5 +1,5 @@
<template>
<el-form ref="form" :rules="rules" label-width="80px" :model="form">
<el-form ref="form" :rules="rules" label-width="100px" :model="form">
<el-row>
<el-col :span="12">
<el-form-item label="能源类型" prop="name">

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

@@ -26,28 +26,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="监控模式" prop="type">
<el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
<el-option label="合并" :value= "1" ></el-option>
<el-option label="详细" :value= "2" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<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-row>
<el-row>
<el-col :span="12">
<el-form-item label="指标类型" prop="limitType">
@@ -61,10 +39,32 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="监控模式" prop="type">
<el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
<el-option label="合并" :value= "1" ></el-option>
<el-option label="详细" :value= "2" ></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="消耗量阈值">
<el-input-number v-model="form.minValue" placeholder="最小值" :max="10000000000000000" style="width: 50%;"></el-input-number>
<el-input-number v-model="form.maxValue" placeholder="最大值" :max="10000000000000000" style="width: 50%;"></el-input-number>
<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-col :span="12">
<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-row>

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

@@ -37,7 +37,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width='60%'
width='50%'
>
<energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/>
</base-dialog>

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

@@ -40,13 +40,13 @@ const tableProps = [
prop: 'startTime',
label: '开始时间',
filter: parseTime,
minWidth: 150
minWidth: 160
},
{
prop: 'endTime',
label: '结束时间',
filter: parseTime,
minWidth: 150
minWidth: 160
},
{
prop: 'statisticName',

5
src/views/energy/monitoring/energyReportSearch/index.vue
View File

@@ -70,7 +70,7 @@ export default {
},
{
type: 'datePicker',
label: '时间(必填)',
label: '时间',
dateType: 'datetimerange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp",
@@ -80,7 +80,8 @@ export default {
param: 'timeVal',
defaultSelect: [],
width: 350,
clearable: false
clearable: false,
required:true
},
{
type: 'button',

4
src/views/energy/monitoring/orderEnergy/index.vue
View File

@@ -172,11 +172,11 @@ export default {
this.$modal.msgWarning('工单不能为空')
return false
}
if (!val.objType) {
if (!val.energyTypeId) {
this.$modal.msgWarning('能源类型不能为空')
return false
}
if (!val.energyTypeId) {
if (!val.objType) {
this.$modal.msgWarning('对象维度不能为空')
return false
}