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

Merge pull request 'projects/mesxc-zjl' (#312) from projects/mesxc-zjl into projects/mesxc-test

Browse Source 
Reviewed-on: #312
This commit is contained in:
朱菊兰 2024-04-08 10:44:09 +08:00
commit b5b952e1cc
25 changed files with 2059 additions and 1934 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,8 +187,11 @@
@click="resetBtn"> @click="resetBtn">
重置 重置
</el-button> </el-button>
<span class="separateStyle"></span> <span
class="separateStyle"
v-hasPermi="['analysis:contrast-analysis:export']"></span>
<el-button <el-button
v-hasPermi="['analysis:contrast-analysis:export']"
type="primary" type="primary"
size="small" size="small"
plain plain

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

@ -80,10 +80,13 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="separateStyle"></span> <span
class="separateStyle"
v-hasPermi="['analysis:qoq-analysis:export']"></span>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
v-hasPermi="['analysis:qoq-analysis:export']"
type="primary" type="primary"
size="small" size="small"
@click="exportData" @click="exportData"

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

@ -170,8 +170,11 @@
@click="resetBtn"> @click="resetBtn">
重置 重置
</el-button> </el-button>
<span class="separateStyle"></span> <span
class="separateStyle"
v-hasPermi="['analysis:trend-analysis:export']"></span>
<el-button <el-button
v-hasPermi="['analysis:trend-analysis:export']"
type="primary" type="primary"
size="small" size="small"
plain plain

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

@ -69,10 +69,13 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="separateStyle"></span> <span
class="separateStyle"
v-hasPermi="['analysis:yoy-analysis:export']"></span>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
v-hasPermi="['analysis:yoy-analysis:export']"
type="primary" type="primary"
size="small" size="small"
@click="exportData" @click="exportData"

158
src/views/energy/base/energyPlc/index.vue
View File

@ -1,63 +1,84 @@
<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 :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list" <base-table
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-props="tableProps"
:table-data="list"
:max-height="tableH"> :max-height="tableH">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn" <method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="80"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
<pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total" <pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList" /> @pagination="getList" />
<!-- 新增 --> <!-- 新增 -->
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel" <base-dialog
@confirm="handleConfirm" :before-close="handleCancel"> :dialogTitle="addOrEditTitle"
<energy-plc-add ref="energyPlc" @successSubmit="successSubmit" /> :dialogVisible="centervisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel">
<energy-plc-add
ref="energyPlc"
@successSubmit="successSubmit" />
</base-dialog> </base-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getEnergyPlcPage, deleteEnergyPlc } from "@/api/base/energyPlc"; import { getEnergyPlcPage, deleteEnergyPlc } from '@/api/base/energyPlc';
// import { publicFormatter } from '@/utils/dict' import EnergyPlcAdd from './components/energyPlcAdd.vue';
import EnergyPlcAdd from './components/energyPlcAdd.vue' import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'plcTableName', prop: 'plcTableName',
label: '关联表名', label: '关联表名',
showOverflowtooltip: true showOverflowtooltip: true,
}, },
{ {
prop: 'code', prop: 'code',
label: '关联表编码', label: '关联表编码',
minWidth: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true,
}, },
{ {
prop: 'name', prop: 'name',
label: '标识名', label: '标识名',
minWidth: 150, minWidth: 150,
showOverflowtooltip: true showOverflowtooltip: true,
}, },
{ {
prop: 'enName', prop: 'enName',
label: '英文标识名' label: '英文标识名',
}, },
{ {
prop: 'collection', prop: 'collection',
label: '是否采集' label: '是否采集',
}, },
{ {
prop: 'description', prop: 'description',
label: '描述', label: '描述',
showOverflowtooltip: true showOverflowtooltip: true,
} },
] ];
export default { export default {
name: "EnergyPlc", name: 'EnergyPlc',
components: { EnergyPlcAdd }, components: { EnergyPlcAdd },
mixins: [tableHeightMixin],
data() { data() {
return { return {
formConfig: [ formConfig: [
@ -65,65 +86,61 @@ export default {
type: 'input', type: 'input',
label: '标识名', label: '标识名',
placeholder: '标识名', placeholder: '标识名',
param: 'name' param: 'name',
}, },
{ {
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:create') ? 'button' : '', type: this.$auth.hasPermi('base:energy-plc:create') ? 'button' : '',
btnName: '新增', btnName: '新增',
name: 'add', name: 'add',
color: 'success', color: 'success',
plain: true plain: true,
} },
], ],
tableProps, tableProps,
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:energy-plc:update') this.$auth.hasPermi('base:energy-plc:update')
? { ? {
type: 'edit', type: 'edit',
btnName: '编辑' btnName: '编辑',
} }
: undefined, : undefined,
this.$auth.hasPermi('base:energy-plc:delete') this.$auth.hasPermi('base:energy-plc:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除' btnName: '删除',
} }
: undefined : undefined,
].filter((v) => v), ].filter((v) => v),
tableH: this.tableHeight(260),
collectionList: [ collectionList: [
{ value: 0, label: '否' }, { value: 0, label: '否' },
{ value: 1, label: '是' } { value: 1, label: '是' },
], ],
// 总条数 // 总条数
total: 0, total: 0,
// 班次基础信息列表 // 班次基础信息列表
list: [], list: [],
// 弹出层标题 // 弹出层标题
addOrEditTitle: "", addOrEditTitle: '',
// 是否显示弹出层 // 是否显示弹出层
centervisible: false, centervisible: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 20,
name: null name: null,
} },
}; };
}, },
created() { created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
this.getList(); this.getList();
}, },
methods: { methods: {
@ -131,67 +148,72 @@ export default {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
this.queryParams.name = val.name this.queryParams.name = val.name;
this.getList() this.getList();
break break;
default: default:
this.addOrEditTitle = '新增' this.addOrEditTitle = '新增';
this.centervisible = true this.centervisible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.energyPlc.init() this.$refs.energyPlc.init();
}) });
} }
}, },
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
getEnergyPlcPage(this.queryParams).then(response => { getEnergyPlcPage(this.queryParams).then((response) => {
let arr = response.data.list || []; let arr = response.data.list || [];
arr && arr.map(item => { arr &&
this.collectionList.map(i => { arr.map((item) => {
this.collectionList.map((i) => {
if (item.collection === i.value) { if (item.collection === i.value) {
item.collection = i.label item.collection = i.label;
} }
}) });
}) });
this.list = arr this.list = arr;
this.total = response.data.total; this.total = response.data.total;
}); });
}, },
handleClick(val) { handleClick(val) {
switch (val.type) { switch (val.type) {
case 'edit': case 'edit':
this.addOrEditTitle = '编辑' this.addOrEditTitle = '编辑';
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.energyPlc.init(val.data.id) this.$refs.energyPlc.init(val.data.id);
}) });
this.centervisible = true this.centervisible = true;
break break;
default: default:
this.handleDelete(val.data) this.handleDelete(val.data);
} }
}, },
handleCancel() { handleCancel() {
this.$refs.energyPlc.formClear() this.$refs.energyPlc.formClear();
this.centervisible = false this.centervisible = false;
this.addOrEditTitle = '' this.addOrEditTitle = '';
}, },
handleConfirm() { handleConfirm() {
this.$refs.energyPlc.submitForm() this.$refs.energyPlc.submitForm();
}, },
successSubmit() { successSubmit() {
this.handleCancel() this.handleCancel();
this.getList() this.getList();
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?').then(function () { this.$modal
.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?')
.then(function () {
return deleteEnergyPlc(row.id); return deleteEnergyPlc(row.id);
}).then(() => { })
.then(() => {
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功');
}).catch(() => { }); })
} .catch(() => {});
} },
},
}; };
</script> </script>

206
src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue
View File

@ -1,16 +1,35 @@
<template> <template>
<div> <div>
<el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'> <el-drawer
:title="drawerTitle"
:visible.sync="visible"
size="70%"
@close="closeD"
:show-close="false">
<div class="box"> <div class="box">
<el-form :inline="true"> <el-form :inline="true">
<el-form-item label="关联表名"> <el-form-item label="关联表名">
<el-input v-model="plcTableName" size='small' readonly></el-input> <el-input
v-model="plcTableName"
size="small"
readonly
style="width: 250px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="对象"> <el-form-item label="对象">
<el-input v-model="objName" size='small' readonly></el-input> <el-input
v-model="objName"
size="small"
readonly
style="width: 250px"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="showBtn"> <el-form-item v-if="showBtn">
<el-button type="success" size='small' plain @click="addNew">新增</el-button> <el-button
type="success"
size="small"
plain
@click="addNew">
新增
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<base-table <base-table
@ -18,23 +37,20 @@
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-props="tableProps" :table-props="tableProps"
:table-data="tableData" :table-data="tableData"
:max-height="tableH" :max-height="tableH">
>
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="100" :width="100"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick" />
/>
</base-table> </base-table>
<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>
</el-drawer> </el-drawer>
<!-- 新增 --> <!-- 新增 -->
@ -43,43 +59,48 @@
:dialogVisible="centervisible" :dialogVisible="centervisible"
@cancel="handleCancel" @cancel="handleCancel"
@confirm="handleConfirm" @confirm="handleConfirm"
:before-close="handleCancel" :before-close="handleCancel">
> <energy-plc-param-add
<energy-plc-param-add ref="energyPlcParam" @successSubmit="successSubmit" /> ref="energyPlcParam"
@successSubmit="successSubmit" />
</base-dialog> </base-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getEnergyPlcParamPage, deleteEnergyPlcParam } from '@/api/base/energyPlcParam' import {
import EnergyPlcParamAdd from './energyPlcParamAdd' getEnergyPlcParamPage,
import { publicFormatter } from '@/utils/dict' deleteEnergyPlcParam,
} from '@/api/base/energyPlcParam';
import EnergyPlcParamAdd from './energyPlcParamAdd';
import { publicFormatter } from '@/utils/dict';
const tableProps = [ const tableProps = [
{ {
prop: 'typeId', prop: 'typeId',
label: '能源类型' label: '能源类型',
filter: publicFormatter('energy_type'),
}, },
{ {
prop: 'plcParamName', prop: 'plcParamName',
label: '参数列名' label: '参数列名',
}, },
{ {
prop: 'name', prop: 'name',
label: '参数名称' label: '参数名称',
}, },
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('energy_unit') filter: publicFormatter('unit_dict'),
}, },
{ {
prop: 'collection', prop: 'collection',
label: '是否采集' label: '是否采集',
}, },
{ {
prop: 'description', prop: 'description',
label: '描述' label: '描述',
} },
] ];
export default { export default {
name: 'EnergyPlcParam', name: 'EnergyPlcParam',
props: { props: {
@ -87,9 +108,9 @@ export default {
type: Array, type: Array,
required: true, required: true,
default: () => { default: () => {
return [] return [];
} },
} },
}, },
data() { data() {
return { return {
@ -103,121 +124,132 @@ export default {
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 30, pageSize: 30,
connectId: null connectId: null,
}, },
plcTableName: '', plcTableName: '',
objName: '', objName: '',
// 弹出层标题 // 弹出层标题
addOrEditTitle: "", addOrEditTitle: '',
// 是否显示弹出层 // 是否显示弹出层
centervisible: false, centervisible: false,
collectionList: [ collectionList: [
{value: 0,label: '否'}, { value: 0, label: '否' },
{value: 1,label: '是'} { value: 1, label: '是' },
], ],
showBtn: true showBtn: true,
} };
}, },
components: { EnergyPlcParamAdd }, components: { EnergyPlcParamAdd },
created() { created() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.tableH = this.tableHeight(115) this.tableH = this.tableHeight(115);
}) });
}, },
methods: { methods: {
init(data,title) { init(data, title) {
this.visible = true this.visible = true;
this.queryParams.connectId = data.id this.queryParams.connectId = data.id;
this.plcTableName = data.plcTableName this.plcTableName = data.plcTableName;
this.objName = data.objName this.objName = data.objName;
this.getList() this.getList();
if (title === 'detail') { if (title === 'detail') {
this.drawerTitle = '查看参数' this.drawerTitle = '查看参数';
this.showBtn = false this.showBtn = false;
this.tableBtn = [] this.tableBtn = [];
} else { } else {
this.drawerTitle = '参数绑定' this.drawerTitle = '参数绑定';
this.showBtn = true this.showBtn = true;
this.tableBtn = [ this.tableBtn = [
{ {
type: 'edit', type: 'edit',
btnName: '编辑' btnName: '编辑',
}, },
{ {
type: 'delete', type: 'delete',
btnName: '删除' btnName: '删除',
} },
] ];
} }
}, },
getList() { getList() {
getEnergyPlcParamPage({...this.queryParams}).then((res) => { getEnergyPlcParamPage({ ...this.queryParams }).then((res) => {
let arr = res.data.list || [] let arr = res.data.list || [];
arr&&arr.map(item => { arr &&
this.collectionList.map(i => { arr.map((item) => {
this.collectionList.map((i) => {
if (item.collection === i.value) { if (item.collection === i.value) {
item.collection = i.label item.collection = i.label;
} }
}) });
this.energyTypeList.map(j => { this.energyTypeList.map((j) => {
if (item.typeId === j.id) { if (item.typeId === j.id) {
item.typeId = j.name item.typeId = j.name;
} }
}) });
}) });
this.tableData = arr this.tableData = arr;
this.total = res.data.total; this.total = res.data.total;
}) });
}, },
// 新增 // 新增
addNew() { addNew() {
this.addOrEditTitle = '新增' this.addOrEditTitle = '新增';
this.centervisible = true this.centervisible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: ''}) this.$refs.energyPlcParam.init({
}) connectId: this.queryParams.connectId,
id: '',
});
});
}, },
handleCancel() { handleCancel() {
this.$refs.energyPlcParam.formClear() this.$refs.energyPlcParam.formClear();
this.centervisible = false this.centervisible = false;
this.addOrEditTitle = '' this.addOrEditTitle = '';
}, },
handleConfirm() { handleConfirm() {
this.$refs.energyPlcParam.submitForm() this.$refs.energyPlcParam.submitForm();
}, },
successSubmit() { successSubmit() {
this.handleCancel() this.handleCancel();
this.getList() this.getList();
}, },
handleClick(val) { handleClick(val) {
console.log(val) console.log(val);
switch (val.type) { switch (val.type) {
case 'edit': case 'edit':
this.addOrEditTitle = '编辑' this.addOrEditTitle = '编辑';
this.centervisible = true this.centervisible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: val.data.id}) this.$refs.energyPlcParam.init({
}) connectId: this.queryParams.connectId,
break id: val.data.id,
});
});
break;
default: default:
this.handleDelete(val.data) this.handleDelete(val.data);
} }
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除参数列名为"' + row.plcParamName + '"的数据项?').then(function() { this.$modal
.confirm('是否确认删除参数列名为"' + row.plcParamName + '"的数据项?')
.then(function () {
return deleteEnergyPlcParam(row.id); return deleteEnergyPlcParam(row.id);
}).then(() => { })
.then(() => {
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功');
}).catch(() => {}); })
.catch(() => {});
}, },
closeD() { closeD() {
this.$emit('closeDrawer') this.$emit('closeDrawer');
} },
} },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {

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

@ -57,14 +57,18 @@ 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';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'objName', prop: 'objName',
label: '对象', label: '对象',
minWidth: 130,
showOverflowtooltip: true,
}, },
{ {
prop: 'objCode', prop: 'objCode',
label: '对象编码', label: '对象编码',
minWidth: 150,
showOverflowtooltip: true, showOverflowtooltip: true,
}, },
{ {
@ -86,11 +90,13 @@ const tableProps = [
{ {
prop: 'varNum', prop: 'varNum',
label: '绑定参数数量', label: '绑定参数数量',
width: 110,
}, },
]; ];
export default { export default {
name: 'EnergyPlcConnect', name: 'EnergyPlcConnect',
components: { EnergyPlcConnectAdd, EnergyPlcParam }, components: { EnergyPlcConnectAdd, EnergyPlcParam },
mixins: [tableHeightMixin],
data() { data() {
return { return {
formConfig: [ formConfig: [
@ -144,7 +150,6 @@ export default {
} }
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableH: this.tableHeight(260),
// 总条数 // 总条数
total: 0, total: 0,
// 班次基础信息列表 // 班次基础信息列表
@ -165,9 +170,6 @@ export default {
}; };
}, },
created() { created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260);
});
this.getList(); this.getList();
}, },
mounted() { mounted() {

4
src/views/energy/base/energyQuantityManual/components/AddTable.vue
View File

@ -20,9 +20,9 @@
@change="changeSelect(scope.row, 'tableName')"> @change="changeSelect(scope.row, 'tableName')">
<el-option <el-option
v-for="item in tableNameList" v-for="item in tableNameList"
:key="item.id" :key="item.value"
:label="item.label" :label="item.label"
:value="item.id"></el-option> :value="item.value"></el-option>
</el-select> </el-select>
</div> </div>
</template> </template>

38
src/views/energy/base/energyQuantityManual/components/InputArea.vue
View File

@ -1,38 +0,0 @@
<template>
<div class="tableInner">
<!-- <el-input v-model="list[itemProp]" @blur="changeInput" /> -->
<el-input-number v-model="list[itemProp]" @change="changeInput" :min="0" :max="999999999" style='width: 100%;' :controls='false' :precision='2'></el-input-number>
</div>
</template>
<script>
export default {
name: 'InputArea',
props: {
injectData: {
type: Object,
default: () => ({})
},
itemProp: {
type: String
}
},
data() {
return {
list: this.injectData
}
},
methods: {
changeInput() {
console.log(this.list)
this.$emit('emitData', this.list)
}
}
}
</script>
<style scoped>
.tableInner .el-input__inner {
border: none;
padding: 0;
height: 33px;
}
</style>

44
src/views/energy/base/energyQuantityManual/components/SelectArea.vue
View File

@ -1,44 +0,0 @@
<template>
<div class="tableInner">
<el-select v-model="list[itemProp]" placeholder="请选择" style="width: 100%;" @change="changeSelect">
<el-option
v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</template>
<script>
export default {
name: 'SelectArea',
props: {
injectData: {
type: Object,
default: () => ({})
},
itemProp: {
type: String
}
},
data() {
return {
list: this.injectData
}
},
methods: {
changeSelect() {
console.log(this.list)
this.$emit('emitData', this.list)
}
}
}
</script>
<style scoped>
.tableInner .el-input__inner {
border: none;
padding: 0;
height: 33px;
}
</style>

30
src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
View File

@ -40,18 +40,10 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<add-table <add-table
:table-props="tableProps"
:table-data="tableData" :table-data="tableData"
:table-name-list="tableNameList" :table-name-list="tableNameList"
@emitFun="inputChange" @emitFun="inputChange"
@emitButtonClick="emitButtonClick" /> @emitButtonClick="emitButtonClick" />
<!-- <base-table
border
:table-props="tableProps"
:table-data="tableData"
:add-button-show="addButtonShow"
@emitFun="inputChange"
@emitButtonClick="emitButtonClick" /> -->
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -64,21 +56,7 @@ import {
} from '@/api/base/energyQuantityManual'; } from '@/api/base/energyQuantityManual';
import moment from 'moment'; import moment from 'moment';
import AddTable from './AddTable'; import AddTable from './AddTable';
import InputArea from './InputArea';
import SelectArea from './SelectArea';
import { energyTableGet } from '@/api/base/energyQuantityManual'; import { energyTableGet } from '@/api/base/energyQuantityManual';
const tableProps = [
{
prop: 'tableName',
label: '表名*',
subcomponent: SelectArea,
},
{
prop: 'readingQuantity',
label: '抄表数*',
subcomponent: InputArea,
},
];
export default { export default {
name: 'EnergyQuantityManualAdd', name: 'EnergyQuantityManualAdd',
props: { props: {
@ -92,7 +70,6 @@ export default {
}, },
data() { data() {
return { return {
tableProps,
tableData: [], tableData: [],
tableNameList: [], //表名list tableNameList: [], //表名list
addButtonShow: '新增', addButtonShow: '新增',
@ -122,6 +99,7 @@ export default {
} else if (params.type === 'meterReading') { } else if (params.type === 'meterReading') {
this.isEdit = false; this.isEdit = false;
this.form.energyTypeId = params.energyTypeId; this.form.energyTypeId = params.energyTypeId;
this.selEnergyType(this.form.energyTypeId);
let obj = {}; let obj = {};
obj.tableName = params.tableName + ''; obj.tableName = params.tableName + '';
obj.readingQuantity = 0; obj.readingQuantity = 0;
@ -133,6 +111,7 @@ export default {
energyQuantityManualGet({ id: this.form.id }).then((res) => { energyQuantityManualGet({ id: this.form.id }).then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.form.energyTypeId = res.data.energyTypeId; this.form.energyTypeId = res.data.energyTypeId;
this.selEnergyType(this.form.energyTypeId);
this.form.recordTime = res.data.recordTime this.form.recordTime = res.data.recordTime
? res.data.recordTime ? res.data.recordTime
: null; : null;
@ -164,6 +143,11 @@ export default {
this.tableNameList = []; this.tableNameList = [];
energyTableGet({ energyTypeId: id }).then((res) => { energyTableGet({ energyTypeId: id }).then((res) => {
this.tableNameList = res.data.tableObjs || []; this.tableNameList = res.data.tableObjs || [];
if (this.tableNameList.length === 0) {
this.$modal.msgWarning(
'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
);
}
}); });
}, },
submitForm() { submitForm() {

18
src/views/energy/base/energyQuantityManual/index.vue
View File

@ -52,18 +52,18 @@ import { publicFormatter } from '@/utils/dict';
import { parseTimeTable } from '@/utils/ruoyi'; import { parseTimeTable } from '@/utils/ruoyi';
import EnergyQuantityManualAdd from './components/energyQuantityManualAdd'; import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
import moment from 'moment'; import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'energyType', prop: 'energyTypeLabel',
label: '能源类型', label: '能源类型',
minWidth: 110, minWidth: 110,
filter: publicFormatter('energy_type'),
showOverflowtooltip: true, showOverflowtooltip: true,
}, },
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('energy_unit'), filter: publicFormatter('unit_dict'),
minWidth: 110, minWidth: 110,
}, },
{ {
@ -142,7 +142,6 @@ export default {
}, },
], ],
tableProps, tableProps,
tableH: this.tableHeight(260),
// 总条数 // 总条数
total: 0, total: 0,
// 班次基础信息列表 // 班次基础信息列表
@ -181,10 +180,8 @@ export default {
}; };
}, },
components: { EnergyQuantityManualAdd }, components: { EnergyQuantityManualAdd },
mixins: [tableHeightMixin],
created() { created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260);
});
let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf(); let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
let start = moment( let start = moment(
moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00') moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
@ -244,6 +241,11 @@ export default {
? item.amount.toFixed(2) ? item.amount.toFixed(2)
: '' : ''
: ''; : '';
this.getDictDatas('energy_type').map((subItem) => {
if (item.energyType === subItem.value) {
item.energyTypeLabel = subItem.label;
}
});
}); });
this.list = arr; this.list = arr;
this.total = response.data.total; this.total = response.data.total;
@ -305,7 +307,7 @@ export default {
handleDelete(row) { handleDelete(row) {
console.log(row.id); console.log(row.id);
this.$modal this.$modal
.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?') .confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
.then(function () { .then(function () {
return energyQuantityManualDelete({ id: row.id }); return energyQuantityManualDelete({ id: row.id });
}) })

206
src/views/energy/base/energyQuantityRealtime/index.vue
View File

@ -1,99 +1,114 @@
<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 :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list" <base-table
:selectWidth="55" :max-height="tableH" @selection-change="selectChange" /> :page="queryParams.pageNo"
<pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total" :limit="queryParams.pageSize"
:table-props="tableProps"
:table-data="list"
:selectWidth="55"
:max-height="tableH"
@selection-change="selectChange" />
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList" /> @pagination="getList" />
</div> </div>
</template> </template>
<script> <script>
import { getEnergyQuantityRealtimePage } from "@/api/base/energyQuantityRealtime" import { getEnergyQuantityRealtimePage } from '@/api/base/energyQuantityRealtime';
import { getEnergyTypeListAll } from "@/api/base/energyType" import { getEnergyTypeListAll } from '@/api/base/energyType';
// import { publicFormatter } from '@/utils/dict' // import { publicFormatter } from '@/utils/dict';
import FileSaver from "file-saver" import FileSaver from 'file-saver';
import * as XLSX from 'xlsx/xlsx.mjs' import * as XLSX from 'xlsx/xlsx.mjs';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'objName', prop: 'objName',
label: '统计对象', label: '统计对象',
showOverflowtooltip: true showOverflowtooltip: true,
}, },
{ {
prop: 'objCode', prop: 'objCode',
label: '对象编码', label: '对象编码',
showOverflowtooltip: true showOverflowtooltip: true,
}, },
{ {
prop: 'energyTypeName', prop: 'energyTypeLabel',
label: '能源类型', label: '能源类型',
showOverflowtooltip: true showOverflowtooltip: true,
}, },
{ {
prop: 'startValue', prop: 'startValue',
label: '初始值' label: '初始值',
}, },
{ {
prop: 'endValue', prop: 'endValue',
label: '当前值' label: '当前值',
}, },
{ {
prop: 'diffValue', prop: 'diffValue',
label: '差值' label: '差值',
}, },
{ {
prop: 'amount', prop: 'amount',
label: '金额' label: '金额',
} },
] ];
export default { export default {
name: "EnergyQuantityRealtime", name: 'EnergyQuantityRealtime',
mixins: [tableHeightMixin],
data() { data() {
return { return {
formConfig: [ formConfig: [
{ {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
labelField: 'labelName',
selectOptions: [], selectOptions: [],
param: 'energyTypeId', param: 'energyTypeId',
filterable: true filterable: true,
}, },
{ {
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('base:energy-quantity-realtime:export') ? 'button' : '', type: this.$auth.hasPermi('base:energy-quantity-realtime:export')
? 'button'
: '',
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
color: 'primary', color: 'primary',
plain: true plain: true,
} },
], ],
tableProps, tableProps,
tableH: this.tableHeight(260),
// 总条数 // 总条数
total: 0, total: 0,
// 班次基础信息列表 // 班次基础信息列表
@ -104,78 +119,97 @@ export default {
pageSize: 20, pageSize: 20,
energyTypeId: '', energyTypeId: '',
startTime: null, startTime: null,
endTime: null endTime: null,
}, },
energyTypeList: [], energyTypeList: [],
exportList: [] exportList: [],
}; };
}, },
created() { created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
if (location.href.indexOf('?') > 0) { if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1].split('&') let arr = location.href.split('?')[1].split('&');
this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]] this.formConfig[1].defaultSelect = [
arr[0].split('=')[1],
arr[1].split('=')[1],
];
} else { } else {
this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()] this.formConfig[1].defaultSelect = [
Date.now() - 7 * 24 * 3600000,
Date.now(),
];
} }
this.queryParams.startTime = this.formConfig[1].defaultSelect[0] this.queryParams.startTime = this.formConfig[1].defaultSelect[0];
this.queryParams.endTime = this.formConfig[1].defaultSelect[1] this.queryParams.endTime = this.formConfig[1].defaultSelect[1];
this.getList(); this.getList();
this.getTypeList() this.getTypeList();
}, },
watch: { watch: {
$route: 'initData' $route: 'initData',
}, },
methods: { methods: {
initData(to) { initData(to) {
if (to.name === 'EnergyQuantityRealtime') { if (to.name === 'EnergyQuantityRealtime') {
if (location.href.indexOf('?') > 0) { if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1].split('&') let arr = location.href.split('?')[1].split('&');
this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]] this.formConfig[1].defaultSelect = [
arr[0].split('=')[1],
arr[1].split('=')[1],
];
} else { } else {
this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()] this.formConfig[1].defaultSelect = [
Date.now() - 7 * 24 * 3600000,
Date.now(),
];
} }
this.queryParams.startTime = this.formConfig[1].defaultSelect[0] this.queryParams.startTime = this.formConfig[1].defaultSelect[0];
this.queryParams.endTime = this.formConfig[1].defaultSelect[1] this.queryParams.endTime = this.formConfig[1].defaultSelect[1];
this.getList() this.getList();
} }
}, },
buttonClick(val) { buttonClick(val) {
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
this.queryParams.energyTypeId = val.energyTypeId this.queryParams.energyTypeId = val.energyTypeId;
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.getList() this.getList();
break break;
default: default:
this.exportTable() this.exportTable();
} }
}, },
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
getEnergyQuantityRealtimePage(this.queryParams).then(response => { getEnergyQuantityRealtimePage(this.queryParams).then((response) => {
let arr = response.data.list || [] let arr = response.data.list || [];
arr && arr.map(item => { arr &&
item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : '' arr.map((item) => {
}) item.amount = item.amount
this.list = arr ? !isNaN(parseFloat(item.amount)) && isFinite(item.amount)
? item.amount.toFixed(2)
: ''
: '';
this.getDictDatas('energy_type').map((subItem) => {
if (item.energyTypeName === subItem.value) {
item.energyTypeLabel = subItem.label;
}
});
});
this.list = arr;
this.total = response.data.total; this.total = response.data.total;
this.exportList = [] this.exportList = [];
}); });
}, },
getTypeList() { getTypeList() {
getEnergyTypeListAll().then((res) => { getEnergyTypeListAll().then((res) => {
this.formConfig[0].selectOptions = res.data || [] this.formConfig[0].selectOptions = res.data || [];
this.energyTypeList = res.data || [] this.energyTypeList = res.data || [];
}) });
}, },
selectChange(val) { selectChange(val) {
console.log(val) console.log(val);
this.exportList = val this.exportList = val;
}, },
// 勾选导出 // 勾选导出
exportTable() { exportTable() {
@ -183,38 +217,38 @@ export default {
let body = this.exportList.map((x) => [ let body = this.exportList.map((x) => [
x.objName, x.objName,
x.objCode, x.objCode,
x.energyTypeName, x.energyTypeLabel,
x.startValue, x.startValue,
x.endValue, x.endValue,
x.diffValue, x.diffValue,
x.amount x.amount,
]) ]);
let header = [] let header = [];
this.tableProps.map((y) => { this.tableProps.map((y) => {
header.push(y.label) header.push(y.label);
}) });
body.unshift(header) body.unshift(header);
console.log(body) console.log(body);
const filename = '能源抄表.xlsx' const filename = '能源抄表.xlsx';
const ws_name = 'Sheet1' const ws_name = 'Sheet1';
const wb = XLSX.utils.book_new() const wb = XLSX.utils.book_new();
const ws = XLSX.utils.aoa_to_sheet(body) const ws = XLSX.utils.aoa_to_sheet(body);
XLSX.utils.book_append_sheet(wb, ws, ws_name) XLSX.utils.book_append_sheet(wb, ws, ws_name);
let wbout = XLSX.write(wb, { let wbout = XLSX.write(wb, {
bookType: 'xlsx', bookType: 'xlsx',
bookSST: false, bookSST: false,
type: 'array' type: 'array',
}) });
FileSaver.saveAs( FileSaver.saveAs(
new Blob([wbout], { new Blob([wbout], {
type: 'application/octet-stream' type: 'application/octet-stream',
}), }),
filename filename
) );
} else { } else {
this.$modal.msgWarning('请勾选需要导出的数据') this.$modal.msgWarning('请勾选需要导出的数据');
}
}
} }
},
},
}; };
</script> </script>

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

@ -40,6 +40,7 @@ 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';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'code', prop: 'code',
@ -48,9 +49,8 @@ const tableProps = [
minWidth: 150, minWidth: 150,
}, },
{ {
prop: 'name', prop: 'energyTypeLabel',
label: '能源类型', label: '能源类型',
filter: publicFormatter('energy_type'),
}, },
{ {
prop: 'unit', prop: 'unit',
@ -70,6 +70,7 @@ const tableProps = [
export default { export default {
name: 'EnergyType', name: 'EnergyType',
components: { EnergyTypeAdd }, components: { EnergyTypeAdd },
mixins: [tableHeightMixin],
data() { data() {
return { return {
formConfig: [ formConfig: [
@ -96,7 +97,7 @@ export default {
} }
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableH: this.tableHeight(220), heightNum: 220,
pricingMethodList: [ pricingMethodList: [
{ value: 0, label: '分时间段计价' }, { value: 0, label: '分时间段计价' },
{ value: 1, label: '分使用量计价' }, { value: 1, label: '分使用量计价' },
@ -118,9 +119,6 @@ export default {
}; };
}, },
created() { created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(220);
});
this.getList(); this.getList();
}, },
methods: { methods: {
@ -142,6 +140,11 @@ export default {
item.pricingMethod = i.label; item.pricingMethod = i.label;
} }
}); });
this.getDictDatas('energy_type').map((subItem) => {
if (item.name === subItem.value) {
item.energyTypeLabel = subItem.label;
}
});
}); });
this.list = arr; this.list = arr;
this.total = response.data.total; this.total = response.data.total;
@ -174,8 +177,9 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
console.log(row);
this.$modal this.$modal
.confirm('是否确认删除能源类型为"' + row.name + '"的数据项?') .confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
.then(function () { .then(function () {
return deleteEnergyType(row.id); return deleteEnergyType(row.id);
}) })

4
src/views/energy/base/tableNameConfig/index.vue
View File

@ -32,6 +32,7 @@
import { energyTablePage } from '@/api/base/energyQuantityManual'; import { energyTablePage } from '@/api/base/energyQuantityManual';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import tableNameConfigUpdate from './components/tableNameConfigUpdate.vue'; import tableNameConfigUpdate from './components/tableNameConfigUpdate.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'energyType', prop: 'energyType',
@ -63,10 +64,11 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 100, pageSize: 100,
}, },
tableH: this.tableHeight(165), heightNum: 165,
centervisible: false, centervisible: false,
}; };
}, },
mixins: [tableHeightMixin],
created() { created() {
this.getList(); this.getList();
}, },

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

@ -182,6 +182,7 @@ export default {
limitType: '', limitType: '',
minValue: 0, minValue: 0,
maxValue: 0, maxValue: 0,
tableName: '',
}, },
objIds: [], // 回显数组 objIds: [], // 回显数组
isEdit: false, //是否是编辑 isEdit: false, //是否是编辑
@ -214,6 +215,9 @@ export default {
if (res.code === 0) { if (res.code === 0) {
this.form = res.data; this.form = res.data;
this.form.plcParamId = res.data.plcParamId || ''; this.form.plcParamId = res.data.plcParamId || '';
this.form.tableName = this.form.tableName
? this.form.tableName + ''
: '';
this.form.method = this.form.method ? this.form.method + '' : ''; this.form.method = this.form.method ? this.form.method + '' : '';
this.form.limitType = this.form.limitType this.form.limitType = this.form.limitType
? this.form.limitType + '' ? this.form.limitType + ''

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

@ -51,6 +51,7 @@ import { getEnergyTypeListAll } from '@/api/base/energyType';
import { getTree } from '@/api/analysis/energyAnalysis'; import { getTree } from '@/api/analysis/energyAnalysis';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import EnergyLimitAdd from './components/energyLimitAdd'; import EnergyLimitAdd from './components/energyLimitAdd';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'method', prop: 'method',
@ -104,6 +105,7 @@ const tableProps = [
export default { export default {
name: 'EnergyLimit', name: 'EnergyLimit',
components: { EnergyLimitAdd }, components: { EnergyLimitAdd },
mixins: [tableHeightMixin],
data() { data() {
return { return {
formConfig: [ formConfig: [
@ -156,7 +158,6 @@ export default {
} }
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableH: this.tableHeight(260),
// 总条数 // 总条数
total: 0, total: 0,
// 班次基础信息列表 // 班次基础信息列表
@ -181,9 +182,6 @@ export default {
}; };
}, },
created() { created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260);
});
this.getList(); this.getList();
this.getTypeList(); this.getTypeList();
// 获取对象树形结构 // 获取对象树形结构

7
src/views/energy/monitoring/energyOverlimitLog/index.vue
View File

@ -45,6 +45,7 @@ import { getEnergyOverlimitLogPage } from '@/api/monitoring/energyOverlimitLog';
import { getEnergyTypeListAll } from '@/api/base/energyType'; import { getEnergyTypeListAll } from '@/api/base/energyType';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
import { parseTime } from '@/utils/ruoyi'; import { parseTime } from '@/utils/ruoyi';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'objName', prop: 'objName',
@ -123,6 +124,7 @@ const tableProps2 = [
]; ];
export default { export default {
name: 'EnergyOverlimitLog', name: 'EnergyOverlimitLog',
mixins: [tableHeightMixin],
data() { data() {
return { return {
formConfig: [ formConfig: [
@ -151,10 +153,10 @@ export default {
activeName: 'auto', activeName: 'auto',
tableProps, tableProps,
tableProps2, tableProps2,
tableH: this.tableHeight(260),
total: 0, total: 0,
list: [], list: [],
list2: [], list2: [],
heightNum: 300,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
@ -170,9 +172,6 @@ export default {
}; };
}, },
created() { created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260);
});
this.getList(); this.getList();
this.getTypeList(); this.getTypeList();
}, },

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

@ -72,7 +72,7 @@ const tableProps = [
}, },
]; ];
export default { export default {
name: 'EnergyLimit', name: 'EnergyReport',
data() { data() {
return { return {
isFold: false, isFold: false,
@ -181,7 +181,7 @@ export default {
return energyReportPageExportAuto({ ...this.queryParams }); return energyReportPageExportAuto({ ...this.queryParams });
}) })
.then((response) => { .then((response) => {
this.$download.excel(response, '能源统计报表.xls'); this.$download.excel(response, '能耗统计报表.xls');
}) })
.catch(() => {}); .catch(() => {});
} }

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

@ -1,57 +1,60 @@
<template> <template>
<div class="app-container" id='energyReportSearchBox'> <div
class="app-container"
id="energyReportSearchBox">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<search-bar <search-bar
:formConfigs="formConfig" :formConfigs="formConfig"
ref="searchBarForm" ref="searchBarForm"
:isFold="isFold" :isFold="isFold"
@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" />
/>
<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 { energyReportPage, energyReportPageExport } from "@/api/monitoring/energyReport"; import {
import { getEnergyTypeListAll } from "@/api/base/energyType" energyReportPage,
energyReportPageExport,
} from '@/api/monitoring/energyReport';
import { publicFormatter } from '@/utils/dict';
import { getEnergyTypeListAll } from '@/api/base/energyType';
const tableProps = [ const tableProps = [
{ {
prop: 'statisticName', prop: 'statisticName',
label: '统计方案' label: '统计方案',
}, },
{ {
prop: 'energyType', prop: 'energyType',
label: '能源类型' label: '能源类型',
filter: publicFormatter('energy_type'),
}, },
{ {
prop: 'startValue', prop: 'startValue',
label: '抄表数(起始)' label: '抄表数(起始)',
}, },
{ {
prop: 'endValue', prop: 'endValue',
label: '抄表数(结束)' label: '抄表数(结束)',
}, },
{ {
prop: 'diffValue', prop: 'diffValue',
label: '消耗量' label: '消耗量',
} },
] ];
export default { export default {
name: "EnergyReportSearch", name: 'EnergyReportSearch',
data() { data() {
return { return {
isFold: false, isFold: false,
@ -59,45 +62,48 @@ export default {
{ {
type: 'input', type: 'input',
label: '统计方案', label: '统计方案',
param: 'statisticName' param: 'statisticName',
}, },
{ {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
labelField: 'labelName',
selectOptions: [], selectOptions: [],
param: 'energyTypeId', param: 'energyTypeId',
filterable: true filterable: true,
}, },
{ {
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,
clearable: false clearable: false,
}, },
{ {
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-search:export') ? 'button' : '', type: this.$auth.hasPermi('monitoring:energy-report-search:export')
? 'button'
: '',
btnName: '导出', btnName: '导出',
name: 'add', name: 'add',
color: 'primary', color: 'primary',
plain: true plain: true,
} },
], ],
tableProps, tableProps,
tableH: this.tableHeight(260), tableH: this.tableHeight(260),
@ -111,51 +117,55 @@ export default {
pageSize: 20, pageSize: 20,
statisticName: null, statisticName: null,
startTime: null, startTime: null,
endTime: null endTime: null,
}, },
energyTypeList: [] energyTypeList: [],
}; };
}, },
mounted() { mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260) this.tableH = this.tableHeight(260);
this.isFold = this.searchBarWidth('energyReportSearchBox', 1180) this.isFold = this.searchBarWidth('energyReportSearchBox', 1180);
}) });
this.getList() this.getList();
this.getTypeList() this.getTypeList();
this.isFold = this.searchBarWidth('energyReportSearchBox', 1180) this.isFold = this.searchBarWidth('energyReportSearchBox', 1180);
}, },
methods: { methods: {
getTypeList() { getTypeList() {
getEnergyTypeListAll().then((res) => { getEnergyTypeListAll().then((res) => {
this.formConfig[1].selectOptions = res.data || [] this.formConfig[1].selectOptions = res.data || [];
}) });
}, },
buttonClick(val) { buttonClick(val) {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.queryParams.pageNo = 1 this.queryParams.pageNo = 1;
this.queryParams.statisticName = val.statisticName this.queryParams.statisticName = val.statisticName;
this.queryParams.energyTypeId = val.energyTypeId this.queryParams.energyTypeId = val.energyTypeId;
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
this.getList() this.getList();
break break;
default: default:
this.$modal.confirm('是否确认导出').then(() => { this.$modal
return energyReportPageExport({...this.queryParams}); .confirm('是否确认导出')
}).then(response => { .then(() => {
return energyReportPageExport({ ...this.queryParams });
})
.then((response) => {
this.$download.excel(response, '能源统计查询报表.xls'); this.$download.excel(response, '能源统计查询报表.xls');
}).catch(() => {}) })
.catch(() => {});
} }
}, },
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
energyReportPage({...this.queryParams}).then(response => { energyReportPage({ ...this.queryParams }).then((response) => {
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total; this.total = response.data.total;
}); });
} },
} },
}; };
</script> </script>

233
src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue
View File

@ -1,17 +1,42 @@
<template> <template>
<div> <div>
<el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'> <el-drawer
:title="drawerTitle"
:visible.sync="visible"
size="70%"
@close="closeD"
:show-close="false">
<div class="box"> <div class="box">
<el-form :inline="true"> <el-form :inline="true">
<el-form-item label="方案名称"> <el-form-item label="方案名称">
<el-input v-model="name" size='small' readonly></el-input> <el-input
v-model="name"
size="small"
readonly></el-input>
</el-form-item> </el-form-item>
<el-form-item label="能源类型"> <el-form-item label="能源类型">
<el-input v-model="energyType" size='small' readonly></el-input> <el-input
v-model="energyTypeLabel"
size="small"
readonly></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="success" size='small' v-if="showBtn" plain @click="addNew">新增</el-button> <el-button
<el-button type="danger" size='small' v-if="showBtn" plain @click="deleteAll">批量删除</el-button> type="success"
size="small"
v-if="showBtn"
plain
@click="addNew">
新增
</el-button>
<el-button
type="danger"
size="small"
v-if="showBtn"
plain
@click="deleteAll">
批量删除
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<base-table <base-table
@ -21,56 +46,59 @@
:table-data="tableData" :table-data="tableData"
:max-height="tableH" :max-height="tableH"
:selectWidth="55" :selectWidth="55"
@selection-change="selectChange" @selection-change="selectChange">
>
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="80" :width="80"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick" />
/>
</base-table> </base-table>
<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>
</el-drawer> </el-drawer>
<!-- 新增 --> <!-- 新增 -->
<energy-statistics-det-add ref="energyStatistics" @closeDet="closeDet" /> <energy-statistics-det-add
ref="energyStatistics"
@closeDet="closeDet" />
</div> </div>
</template> </template>
<script> <script>
import { getEnergyStatisticsDetPage, deleteEnergyStatisticsDet, deleteMany } from '@/api/monitoring/energyStatisticsDet' import {
import EnergyStatisticsDetAdd from './energyStatisticsDetAdd' getEnergyStatisticsDetPage,
import { publicFormatter } from '@/utils/dict' deleteEnergyStatisticsDet,
deleteMany,
} from '@/api/monitoring/energyStatisticsDet';
import EnergyStatisticsDetAdd from './energyStatisticsDetAdd';
import { publicFormatter } from '@/utils/dict';
const tableProps = [ const tableProps = [
{ {
prop: 'objName', prop: 'objName',
label: '所属对象' label: '所属对象',
}, },
{ {
prop: 'objCode', prop: 'objCode',
label: '对象编码' label: '对象编码',
}, },
{ {
prop: 'paramName', prop: 'paramName',
label: '参数名称' label: '参数名称',
}, },
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('energy_unit') filter: publicFormatter('unit_dict'),
}, },
{ {
prop: 'desc', prop: 'desc',
label: '描述' label: '描述',
} },
] ];
export default { export default {
name: 'EnergyStatisticsDet', name: 'EnergyStatisticsDet',
props: { props: {
@ -78,9 +106,9 @@ export default {
type: Array, type: Array,
required: true, required: true,
default: () => { default: () => {
return [] return [];
} },
} },
}, },
data() { data() {
return { return {
@ -94,134 +122,147 @@ export default {
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 30, pageSize: 30,
statisticsId: null statisticsId: null,
}, },
name: '', name: '',
energyType: '', energyTypeLabel: '',
energyTypeId: '', energyTypeId: '',
// 弹出层标题 // 弹出层标题
addOrEditTitle: "", addOrEditTitle: '',
// 是否显示弹出层 // 是否显示弹出层
centervisible: false, centervisible: false,
collectionList: [ collectionList: [
{value: 0,label: '否'}, { value: 0, label: '否' },
{value: 1,label: '是'} { value: 1, label: '是' },
], ],
showBtn: true, showBtn: true,
selectedList: [] selectedList: [],
} };
}, },
components: { EnergyStatisticsDetAdd }, components: { EnergyStatisticsDetAdd },
created() { created() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.tableH = this.tableHeight(115) this.tableH = this.tableHeight(115);
}) });
}, },
methods: { methods: {
init(data,title) { init(data, title) {
this.visible = true this.visible = true;
this.queryParams.statisticsId = data.id this.queryParams.statisticsId = data.id;
this.name = data.name this.name = data.name;
this.energyType = data.energyType this.energyTypeLabel = data.energyTypeLabel;
this.energyTypeId = data.energyTypeId this.energyTypeId = data.energyTypeId;
this.getList() this.getList();
if (title === 'detail') { if (title === 'detail') {
this.drawerTitle = '查看参数' this.drawerTitle = '查看参数';
this.showBtn = false this.showBtn = false;
this.tableBtn = [] this.tableBtn = [];
} else { } else {
this.drawerTitle = '参数绑定' this.drawerTitle = '参数绑定';
this.showBtn = true this.showBtn = true;
this.tableBtn = [ this.tableBtn = [
{ {
type: 'delete', type: 'delete',
btnName: '删除' btnName: '删除',
} },
] ];
} }
}, },
getList() { getList() {
console.log(this.queryParams) console.log(this.queryParams);
getEnergyStatisticsDetPage({...this.queryParams}).then((res) => { getEnergyStatisticsDetPage({ ...this.queryParams }).then((res) => {
let arr = res.data.list || [] let arr = res.data.list || [];
arr&&arr.map(item => { arr &&
this.collectionList.map(i => { arr.map((item) => {
this.collectionList.map((i) => {
if (item.collection === i.value) { if (item.collection === i.value) {
item.collection = i.label item.collection = i.label;
} }
}) });
this.energyTypeList.map(j => { this.energyTypeList.map((j) => {
if (item.typeId === j.id) { if (item.typeId === j.id) {
item.typeId = j.name item.typeId = j.name;
} }
}) });
}) });
this.tableData = arr this.tableData = arr;
this.total = res.data.total; this.total = res.data.total;
}) });
}, },
// 新增 // 新增
addNew() { addNew() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.energyStatistics.init({'statisticsId': this.queryParams.statisticsId, energyTypeId:this.energyTypeId}) this.$refs.energyStatistics.init({
}) statisticsId: this.queryParams.statisticsId,
energyTypeId: this.energyTypeId,
});
});
}, },
selectChange(val) { selectChange(val) {
console.log(val) console.log(val);
this.selectedList = val this.selectedList = val;
}, },
// 批量删除 // 批量删除
deleteAll() { deleteAll() {
let arr = [] let arr = [];
if (this.selectedList.length === 0) { if (this.selectedList.length === 0) {
this.$modal.msgWarning("请选勾选数据") this.$modal.msgWarning('请选勾选数据');
return false return false;
} else { } else {
this.selectedList.map((item) => { this.selectedList.map((item) => {
arr.push(item.id) arr.push(item.id);
}) });
} }
this.$modal.confirm('是否确认删除所有勾选的数据项?').then(function() { this.$modal
.confirm('是否确认删除所有勾选的数据项?')
.then(function () {
return deleteMany(arr); return deleteMany(arr);
}).then(() => { })
this.queryParams.pageNo = 1 .then(() => {
this.getList() this.queryParams.pageNo = 1;
this.$modal.msgSuccess("删除成功") this.getList();
}).catch(() => {}) this.$modal.msgSuccess('删除成功');
})
.catch(() => {});
}, },
handleCancel() { handleCancel() {
this.$refs.energyStatistics.formClear() this.$refs.energyStatistics.formClear();
this.centervisible = false this.centervisible = false;
this.addOrEditTitle = '' this.addOrEditTitle = '';
}, },
handleConfirm() { handleConfirm() {
this.$refs.energyStatistics.submitForm() this.$refs.energyStatistics.submitForm();
}, },
successSubmit() { successSubmit() {
this.handleCancel() this.handleCancel();
this.getList() this.getList();
}, },
handleClick(val) { handleClick(val) {
this.handleDelete(val.data) this.handleDelete(val.data);
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除参数列名为"' + row.paramName + '"的数据项?').then(function() { this.$modal
.confirm('是否确认删除参数列名为"' + row.paramName + '"的数据项?')
.then(function () {
return deleteEnergyStatisticsDet(row.id); return deleteEnergyStatisticsDet(row.id);
}).then(() => { })
this.queryParams.pageNo = 1 .then(() => {
this.getList() this.queryParams.pageNo = 1;
this.$modal.msgSuccess("删除成功") this.getList();
}).catch(() => {}) this.$modal.msgSuccess('删除成功');
})
.catch(() => {});
}, },
closeD() { closeD() {
this.$emit('closeDrawer') this.$emit('closeDrawer');
}, },
closeDet() { // 关闭新增框 closeDet() {
this.getList() // 关闭新增框
} this.getList();
} },
} },
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {

115
src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue
View File

@ -3,16 +3,15 @@
title="新增" title="新增"
:visible.sync="centervisible" :visible.sync="centervisible"
size="60%" size="60%"
@close='closeA' @close="closeA"
:show-close='false'> :show-close="false">
<div class="box"> <div class="box">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<search-bar <search-bar
:formConfigs="formConfig" :formConfigs="formConfig"
ref="searchBarForm" ref="searchBarForm"
:removeBlue='true' :removeBlue="true"
@headBtnClick="buttonClick" @headBtnClick="buttonClick" />
/>
<!-- 列表 --> <!-- 列表 -->
<base-table <base-table
:page="queryParams.pageNo" :page="queryParams.pageNo"
@ -21,44 +20,44 @@
:table-data="list" :table-data="list"
:max-height="tableH" :max-height="tableH"
:selectWidth="55" :selectWidth="55"
@selection-change="selectChange" @selection-change="selectChange"></base-table>
>
</base-table>
<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>
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import { addParamPage, createEnergyStatisticsDet } from '@/api/monitoring/energyStatisticsDet' import {
import { publicFormatter } from '@/utils/dict' addParamPage,
createEnergyStatisticsDet,
} from '@/api/monitoring/energyStatisticsDet';
import { publicFormatter } from '@/utils/dict';
const tableProps = [ const tableProps = [
{ {
prop: 'objName', prop: 'objName',
label: '所属对象' label: '所属对象',
}, },
{ {
prop: 'objCode', prop: 'objCode',
label: '对象编码' label: '对象编码',
}, },
{ {
prop: 'paramName', prop: 'paramName',
label: '参数名称' label: '参数名称',
}, },
{ {
prop: 'unit', prop: 'unit',
label: '单位', label: '单位',
filter: publicFormatter('energy_unit') filter: publicFormatter('unit_dict'),
}, },
{ {
prop: 'desc', prop: 'desc',
label: '描述' label: '描述',
} },
] ];
export default { export default {
name: 'EnergyStatisticsDetAdd', name: 'EnergyStatisticsDetAdd',
data() { data() {
@ -71,30 +70,30 @@ export default {
selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE), selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
param: 'objType' param: 'objType',
}, },
{ {
type: 'input', type: 'input',
label: '参数名称', label: '参数名称',
placeholder: '参数名称', placeholder: '参数名称',
param: 'paramName' param: 'paramName',
}, },
{ {
type: 'button', type: 'button',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary' color: 'primary',
}, },
{ {
type: 'separate' type: 'separate',
}, },
{ {
type: 'button', type: 'button',
btnName: '关联', btnName: '关联',
name: 'add', name: 'add',
color: 'primary', color: 'primary',
plain: true plain: true,
} },
], ],
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
@ -102,75 +101,75 @@ export default {
energyTypeId: null, energyTypeId: null,
statisticId: null, statisticId: null,
paramName: '', paramName: '',
objType: '' objType: '',
}, },
tableProps, tableProps,
list: [], list: [],
total: 0, total: 0,
tableH: this.tableHeight(260), tableH: this.tableHeight(260),
selectedList: [] selectedList: [],
} };
}, },
methods: { methods: {
init(param) { init(param) {
this.queryParams.statisticId = param.statisticsId this.queryParams.statisticId = param.statisticsId;
this.queryParams.energyTypeId = param.energyTypeId this.queryParams.energyTypeId = param.energyTypeId;
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260) this.tableH = this.tableHeight(260);
}) });
this.centervisible = true this.centervisible = true;
this.getList() this.getList();
}, },
getList() { getList() {
addParamPage({...this.queryParams}).then((res) => { addParamPage({ ...this.queryParams }).then((res) => {
this.list = res.data.list || [] this.list = res.data.list || [];
this.total = res.data.total this.total = res.data.total;
}) });
}, },
buttonClick(val) { buttonClick(val) {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
this.queryParams.objType = val.objType this.queryParams.objType = val.objType;
this.queryParams.paramName = val.paramName this.queryParams.paramName = val.paramName;
this.getList() this.getList();
break break;
default: default:
// 关联 // 关联
this.connectParam() this.connectParam();
} }
}, },
// 选中数据 // 选中数据
selectChange(val) { selectChange(val) {
this.selectedList = val this.selectedList = val;
}, },
// 关联 // 关联
connectParam() { connectParam() {
let param = { let param = {
statisticsId: this.queryParams.statisticId, statisticsId: this.queryParams.statisticId,
plcParamIds: [] plcParamIds: [],
} };
if (this.selectedList.length === 0) { if (this.selectedList.length === 0) {
this.$modal.msgWarning("请选勾选数据") this.$modal.msgWarning('请选勾选数据');
return false return false;
} else { } else {
this.selectedList.map((item) => { this.selectedList.map((item) => {
param.plcParamIds.push(item.id) param.plcParamIds.push(item.id);
}) });
} }
createEnergyStatisticsDet({...param}).then((res) => { createEnergyStatisticsDet({ ...param }).then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.$modal.msgSuccess("操作成功"); this.$modal.msgSuccess('操作成功');
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
this.getList() this.getList();
} }
}) });
}, },
closeA() { closeA() {
this.$emit('closeDet') this.$emit('closeDet');
} },
} },
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {

17
src/views/energy/monitoring/energyStatistics/index.vue
View File

@ -53,6 +53,7 @@ import { publicFormatter } from '@/utils/dict';
import { getEnergyTypeListAll } from '@/api/base/energyType'; import { getEnergyTypeListAll } from '@/api/base/energyType';
import EnergyStatisticsAdd from './components/energyStatisticsAdd'; import EnergyStatisticsAdd from './components/energyStatisticsAdd';
import EnergyStatisticsDet from './components/energyStatisticsDet'; import EnergyStatisticsDet from './components/energyStatisticsDet';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [ const tableProps = [
{ {
prop: 'name', prop: 'name',
@ -70,9 +71,9 @@ const tableProps = [
filter: publicFormatter('statistic_type'), filter: publicFormatter('statistic_type'),
}, },
{ {
prop: 'energyType', prop: 'energyTypeLabel',
label: '能源类型', label: '能源类型',
filter: publicFormatter('energy_type'), showOverflowtooltip: true,
}, },
{ {
prop: 'paramNum', prop: 'paramNum',
@ -86,6 +87,7 @@ const tableProps = [
export default { export default {
name: 'EnergyStatistics', name: 'EnergyStatistics',
components: { EnergyStatisticsAdd, EnergyStatisticsDet }, components: { EnergyStatisticsAdd, EnergyStatisticsDet },
mixins: [tableHeightMixin],
data() { data() {
return { return {
formConfig: [ formConfig: [
@ -139,7 +141,6 @@ export default {
} }
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableH: this.tableHeight(260),
// 总条数 // 总条数
total: 0, total: 0,
// 班次基础信息列表 // 班次基础信息列表
@ -158,9 +159,6 @@ export default {
}; };
}, },
created() { created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260);
});
this.getList(); this.getList();
}, },
mounted() { mounted() {
@ -187,6 +185,13 @@ export default {
getList() { getList() {
getEnergyStatisticsPage(this.queryParams).then((response) => { getEnergyStatisticsPage(this.queryParams).then((response) => {
let arr = response.data.list || []; let arr = response.data.list || [];
arr.map((item) => {
this.getDictDatas('energy_type').map((subItem) => {
if (item.energyType === subItem.value) {
item.energyTypeLabel = subItem.label;
}
});
});
this.list = arr; this.list = arr;
this.total = response.data.total; this.total = response.data.total;
}); });

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

@ -5,8 +5,7 @@
<search-bar <search-bar
:formConfigs="formConfig" :formConfigs="formConfig"
ref="searchBarForm" ref="searchBarForm"
@headBtnClick="buttonClick" @headBtnClick="buttonClick" />
/>
</div> </div>
<div class="box2"> <div class="box2">
<div class="boxTitle"> <div class="boxTitle">
@ -14,29 +13,31 @@
<span>工单信息</span> <span>工单信息</span>
</div> </div>
<el-row> <el-row>
<el-col :span='4'> <el-col :span="4">
<div class="blodTip">工单名称</div> <div class="blodTip">工单名称</div>
<div class="lightTip">{{ orderMsg.name }}</div> <div class="lightTip">{{ orderMsg.name }}</div>
</el-col> </el-col>
<el-col :span='4'> <el-col :span="4">
<div class="blodTip">产品名称</div> <div class="blodTip">产品名称</div>
<div class="lightTip">{{orderMsg.productName }}</div> <div class="lightTip">{{ orderMsg.productName }}</div>
</el-col> </el-col>
<el-col :span='4'> <el-col :span="4">
<div class="blodTip">计划完成数量</div> <div class="blodTip">计划完成数量</div>
<div class="lightTip">{{orderMsg.planQuantity }}</div> <div class="lightTip">{{ orderMsg.planQuantity }}</div>
</el-col> </el-col>
<el-col :span='4'> <el-col :span="4">
<div class="blodTip">实际开始时间</div> <div class="blodTip">实际开始时间</div>
<div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div> <div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
</el-col> </el-col>
<el-col :span='4'> <el-col :span="4">
<div class="blodTip">实际完成时间</div> <div class="blodTip">实际完成时间</div>
<div class="lightTip">{{ parseTime(orderMsg.finishProduceTime) }}</div> <div class="lightTip">
{{ parseTime(orderMsg.finishProduceTime) }}
</div>
</el-col> </el-col>
<el-col :span='4'> <el-col :span="4">
<div class="blodTip">实际加工数量</div> <div class="blodTip">实际加工数量</div>
<div class="lightTip">{{orderMsg.actualQuantity }}</div> <div class="lightTip">{{ orderMsg.actualQuantity }}</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -46,8 +47,16 @@
<span>能耗信息</span> <span>能耗信息</span>
</div> </div>
<div class="toggleTabBox"> <div class="toggleTabBox">
<div :class="{ active: activeModule === 'dataList' }" @click="toggleTab('dataList')">数据列表</div> <div
<div :class="{ active: activeModule === 'barChart' }" @click="toggleTab('barChart')">柱状图</div> :class="{ active: activeModule === 'dataList' }"
@click="toggleTab('dataList')">
数据列表
</div>
<div
:class="{ active: activeModule === 'barChart' }"
@click="toggleTab('barChart')">
柱状图
</div>
</div> </div>
<div> <div>
<div v-show="activeModule === 'dataList'"> <div v-show="activeModule === 'dataList'">
@ -57,12 +66,13 @@
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-props="tableProps" :table-props="tableProps"
:table-data="tableData" :table-data="tableData"
:max-height="tableH" :max-height="tableH" />
/>
</div> </div>
<!-- 图形 --> <!-- 图形 -->
<div v-show="activeModule === 'barChart'"> <div v-show="activeModule === 'barChart'">
<bar-chart ref="orderEnergyChart" :chartData="chartData"/> <bar-chart
ref="orderEnergyChart"
:chartData="chartData" />
</div> </div>
</div> </div>
</div> </div>
@ -72,35 +82,40 @@
const tableProps = [ const tableProps = [
{ {
prop: 'objName', prop: 'objName',
label: '对象名称' label: '对象名称',
}, },
{ {
prop: 'objCode', prop: 'objCode',
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: '使用量',
} },
] ];
import { getEnergyTypeListAll } from '@/api/base/energyType' import { getEnergyTypeListAll } from '@/api/base/energyType';
import { workOrderList } from '@/api/base/orderManage' import { workOrderList } from '@/api/base/orderManage';
import { getWorkOrderMsg, getOrderEnergyData } from '@/api/monitoring/orderEnergy' import {
import BarChart from "./components/barChart" getWorkOrderMsg,
getOrderEnergyData,
} from '@/api/monitoring/orderEnergy';
import BarChart from './components/barChart';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default { export default {
name: 'OrderEnergy', name: 'OrderEnergy',
mixins: [tableHeightMixin],
data() { data() {
return { return {
formConfig: [ formConfig: [
@ -109,16 +124,17 @@ export default {
label: '工单', label: '工单',
selectOptions: [], selectOptions: [],
param: 'workOrderId', param: 'workOrderId',
clearable: false clearable: false,
}, },
{ {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
selectOptions: [], selectOptions: [],
param: 'energyTypeId', param: 'energyTypeId',
labelField: 'labelName',
filterable: true, filterable: true,
width: 120, width: 120,
clearable: false clearable: false,
}, },
{ {
type: 'select', type: 'select',
@ -128,89 +144,88 @@ export default {
valueField: 'value', valueField: 'value',
param: 'objType', param: 'objType',
width: 100, width: 100,
clearable: false clearable: false,
}, },
{ {
type: 'button', type: 'button',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary' color: 'primary',
} },
], ],
tableProps, tableProps,
tableData: [], tableData: [],
tableH: this.tableHeight(400), heightNum: 400,
// 查询参数 // 查询参数
queryParams: { queryParams: {
workOrderId: '', workOrderId: '',
objType: '', objType: '',
energyTypeId: '' energyTypeId: '',
}, },
orderMsg: {}, orderMsg: {},
chartData: [], chartData: [],
activeModule: 'dataList' activeModule: 'dataList',
} };
}, },
components: { BarChart }, components: { BarChart },
mounted() { mounted() {
window.addEventListener('resize', () => { this.getListArr();
this.tableH = this.tableHeight(400)
})
this.getListArr()
}, },
methods: { methods: {
getListArr() { getListArr() {
workOrderList().then(res => { workOrderList().then((res) => {
this.formConfig[0].selectOptions = res.data || [] this.formConfig[0].selectOptions = res.data || [];
}) });
getEnergyTypeListAll().then(res => { getEnergyTypeListAll().then((res) => {
this.formConfig[1].selectOptions = res.data || [] this.formConfig[1].selectOptions = res.data || [];
}) });
}, },
buttonClick(val) { buttonClick(val) {
if (!val.workOrderId) { if (!val.workOrderId) {
this.$modal.msgWarning('工单不能为空') this.$modal.msgWarning('工单不能为空');
return false return false;
} }
if (!val.energyTypeId) { if (!val.energyTypeId) {
this.$modal.msgWarning('能源类型不能为空') this.$modal.msgWarning('能源类型不能为空');
return false return false;
} }
if (!val.objType) { if (!val.objType) {
this.$modal.msgWarning('对象维度不能为空') this.$modal.msgWarning('对象维度不能为空');
return false return false;
} }
this.queryParams.workOrderId = val.workOrderId this.queryParams.workOrderId = val.workOrderId;
this.queryParams.objType = val.objType this.queryParams.objType = val.objType;
this.queryParams.energyTypeId = val.energyTypeId this.queryParams.energyTypeId = val.energyTypeId;
getWorkOrderMsg({ ...this.queryParams }).then(res => { getWorkOrderMsg({ ...this.queryParams }).then((res) => {
this.orderMsg = res.data || {} this.orderMsg = res.data || {};
getOrderEnergyData({ getOrderEnergyData({
...this.queryParams, ...this.queryParams,
startProduceTime: res.data.startProduceTime || '', startProduceTime: res.data.startProduceTime || '',
finishProduceTime: res.data.finishProduceTime || '' finishProduceTime: res.data.finishProduceTime || '',
}).then(result => { }).then((result) => {
this.tableData = result.data || [] this.tableData = result.data || [];
this.chartData = result.data || [] this.chartData = result.data || [];
}) });
}) });
}, },
toggleTab(val) { toggleTab(val) {
this.activeModule = val this.activeModule = val;
if (this.activeModule === 'barChart') { if (this.activeModule === 'barChart') {
this.$nextTick((res) => { this.$nextTick((res) => {
this.$refs.orderEnergyChart.getChart() this.$refs.orderEnergyChart.getChart();
}) });
} }
}, },
headBtnClick() {} headBtnClick() {},
} },
} };
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
.orderEnergyContainer { .orderEnergyContainer {
background-color: rgb(242, 244, 249); background-color: rgb(242, 244, 249);
.box1, .box2, .box3 { .box1,
.box2,
.box3 {
background-color: #fff; background-color: #fff;
border-radius: 9px; border-radius: 9px;
} }
@ -224,12 +239,15 @@ export default {
padding: 16px; padding: 16px;
.blodTip { .blodTip {
font-weight: 600; font-weight: 600;
color: rgba(0,0,0,0.85); color: rgba(0, 0, 0, 0.85);
margin-bottom: 8px; margin-bottom: 8px;
} }
.lightTip { .lightTip {
font-weight: 400; font-weight: 400;
color: rgba(102,102,102,0.75); color: rgba(102, 102, 102, 0.75);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
.box3 { .box3 {
@ -239,14 +257,14 @@ export default {
display: inline-block; display: inline-block;
div { div {
display: inline-block; display: inline-block;
padding:0 8px 4px; padding: 0 8px 4px;
color: rgba(102, 102, 102, 0.5); color: rgba(102, 102, 102, 0.5);
border-bottom: 2px solid rgba(242, 244, 249, 1); border-bottom: 2px solid rgba(242, 244, 249, 1);
cursor: pointer; cursor: pointer;
} }
.active { .active {
color: rgba(0,0,0,0.85); color: rgba(0, 0, 0, 0.85);
border-bottom-color: #0B58FF; border-bottom-color: #0b58ff;
} }
} }
} }
@ -255,14 +273,14 @@ export default {
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
margin:0 10px 20px 0; margin: 0 10px 20px 0;
} }
.blueTitle { .blueTitle {
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;

277
src/views/order/monitoring/orderCompletionMonitoring/index.vue
View File

@ -1,21 +1,47 @@
<template> <template>
<div class="app-container orderMonitoring"> <div class="app-container orderMonitoring">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> <search-bar
<el-tabs v-model="activeName" @tab-click="toggleTab"> :formConfigs="formConfig"
<el-tab-pane label="数据列表" name="dataList"></el-tab-pane> ref="searchBarForm"
<el-tab-pane label="环形图" name="barChart"></el-tab-pane> @headBtnClick="buttonClick" />
<el-tabs
v-model="activeName"
@tab-click="toggleTab">
<el-tab-pane
label="数据列表"
name="dataList"></el-tab-pane>
<el-tab-pane
label="环形图"
name="barChart"></el-tab-pane>
</el-tabs> </el-tabs>
<!-- 表 --> <!-- 表 -->
<div v-if="activeName === 'dataList'"> <div v-if="activeName === 'dataList'">
<base-table :page="1" :limit="1000000000000" :table-props="tableProps" :table-data="list" :max-height="tableH" <base-table
row-key="id" :tree-props="{ children: 'orderMonitorVOS', hasChildren: 'hasChildren' }"> :page="1"
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn" :limit="1000000000000"
:table-props="tableProps"
:table-data="list"
:max-height="tableH"
row-key="id"
:tree-props="{
children: 'orderMonitorVOS',
hasChildren: 'hasChildren',
}">
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="100"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" /> @clickBtn="handleClick" />
</base-table> </base-table>
</div> </div>
<!-- 图 --> <!-- 图 -->
<monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList' /> <monitoring-ring-charts
ref="monitoringRingCharts"
v-else
:chart-list="chartList" />
<!-- <pagination <!-- <pagination
:page.sync="queryParams.pageNo" :page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@ -25,94 +51,94 @@
</div> </div>
</template> </template>
<script> <script>
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi';
import { publicFormatter } from '@/utils/dict' import { publicFormatter } from '@/utils/dict';
import { orderGroupMonitor } from '@/api/base/orderGroup' import { orderGroupMonitor } from '@/api/base/orderGroup';
import MonitoringRingCharts from './../components/monitoringRingCharts' import MonitoringRingCharts from './../components/monitoringRingCharts';
import moment from "moment" import moment from 'moment';
const tableProps = [ const tableProps = [
{ {
prop: 'name', prop: 'name',
label: '订单名称', label: '订单名称',
minWidth: 140, minWidth: 140,
showOverflowtooltip: true showOverflowtooltip: true,
}, },
{ {
prop: 'orderType', prop: 'orderType',
label: '订单类型' label: '订单类型',
}, },
{ {
prop: 'customerName', prop: 'customerName',
label: '客户' label: '客户',
}, },
{ {
prop: 'productname', prop: 'productname',
label: '产品', label: '产品',
minWidth: 200, minWidth: 200,
showOverflowtooltip: true showOverflowtooltip: true,
}, },
{ {
prop: 'planStartTime', prop: 'planStartTime',
label: '计划开始时间', label: '计划开始时间',
filter: parseTime, filter: parseTime,
minWidth: 160 minWidth: 160,
}, },
{ {
prop: 'planFinishTime', prop: 'planFinishTime',
label: '计划完成时间', label: '计划完成时间',
filter: parseTime, filter: parseTime,
minWidth: 160 minWidth: 160,
}, },
{ {
prop: 'status', prop: 'status',
label: '订单状态', label: '订单状态',
filter: publicFormatter('order_status') filter: publicFormatter('order_status'),
}, },
{ {
prop: 'startProduceTime', prop: 'startProduceTime',
label: '实际开始时间', label: '实际开始时间',
filter: parseTime, filter: parseTime,
minWidth: 160 minWidth: 160,
}, },
{ {
prop: 'finishProduceTime', prop: 'finishProduceTime',
label: '实际完成时间', label: '实际完成时间',
filter: parseTime, filter: parseTime,
minWidth: 160 minWidth: 160,
}, },
{ {
prop: 'deliveTime', prop: 'deliveTime',
label: '交货时间', label: '交货时间',
filter: parseTime, filter: parseTime,
minWidth: 160 minWidth: 160,
}, },
{ {
prop: 'lineNames', prop: 'lineNames',
label: '加工线', label: '加工线',
filter: (val) => val ? val.join(',') : '', filter: (val) => (val ? val.join(',') : ''),
minWidth: 180 minWidth: 180,
}, },
{ {
prop: 'planQuantity', prop: 'planQuantity',
label: '计划生产量', label: '计划生产量',
width: 100 width: 100,
}, },
{ {
prop: 'actualquantity', prop: 'actualquantity',
label: '实际产出量', label: '实际产出量',
width: 100 width: 100,
}, },
{ {
prop: 'completeRate', prop: 'completeRate',
label: '订单完成率', label: '订单完成率',
width: 100 width: 100,
}, },
{ {
prop: 'orderNum', prop: 'orderNum',
label: '关联订单/工单数量', label: '关联订单/工单数量',
width: 110 width: 110,
} },
] ];
export default { export default {
name: 'OrderCompletionMonitoring', name: 'OrderCompletionMonitoring',
data() { data() {
@ -121,33 +147,33 @@ export default {
{ {
type: 'input', type: 'input',
label: '集团订单名称', label: '集团订单名称',
param: 'name' param: 'name',
}, },
{ {
type: 'datePicker', type: 'datePicker',
label: '时间段', label: '时间段',
dateType: 'daterange', dateType: 'daterange',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
valueFormat: "yyyy-MM-dd", valueFormat: 'yyyy-MM-dd',
rangeSeparator: '-', rangeSeparator: '-',
startPlaceholder: '开始时间', startPlaceholder: '开始时间',
endPlaceholder: '结束时间', endPlaceholder: '结束时间',
param: 'timeVal', param: 'timeVal',
defaultSelect: [], defaultSelect: [],
width: 250 width: 250,
}, },
{ {
type: 'button', type: 'button',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary' color: 'primary',
} },
], ],
activeName: 'dataList', activeName: 'dataList',
// 查询参数 // 查询参数
queryParams: { queryParams: {
name: null, name: null,
deliveTime: [] deliveTime: [],
}, },
tableProps, tableProps,
list: [], list: [],
@ -165,10 +191,10 @@ export default {
{ {
type: 'more', type: 'more',
name: 'orderNum', name: 'orderNum',
value: 1 value: 1,
} },
] ],
} },
} }
: undefined, : undefined,
this.$auth.hasPermi('base:order-completion-monitoring:qualityDet') this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
@ -182,17 +208,17 @@ export default {
{ {
type: 'more', type: 'more',
name: 'orderNum', name: 'orderNum',
value: 1 value: 1,
}, },
{ {
type: 'unequal', type: 'unequal',
name: 'woIdString', name: 'woIdString',
value: '' value: '',
},
],
},
} }
] : undefined,
}
}
: undefined
// this.$auth.hasPermi('base:order-completion-monitoring:sendOut') // this.$auth.hasPermi('base:order-completion-monitoring:sendOut')
// ? { // ? {
// type: 'sendOutDetail', // type: 'sendOutDetail',
@ -211,111 +237,124 @@ export default {
// } // }
// : undefined // : undefined
].filter((v) => v), ].filter((v) => v),
chartList: [] chartList: [],
} };
}, },
components: { MonitoringRingCharts }, components: { MonitoringRingCharts },
mounted() { mounted() {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260) this.tableH = this.tableHeight(260);
}) });
let start = moment().subtract(30, 'days').format('yyyy-MM-DD') let start = moment().subtract(30, 'days').format('yyyy-MM-DD');
let end = moment().format('yyyy-MM-DD') let end = moment().format('yyyy-MM-DD');
this.formConfig[1].defaultSelect = [start, end] this.formConfig[1].defaultSelect = [start, end];
this.queryParams.deliveTime[0] = start + ' 00:00:00' this.queryParams.deliveTime[0] = start + ' 00:00:00';
this.queryParams.deliveTime[1] = end + ' 23:59:59' this.queryParams.deliveTime[1] = end + ' 23:59:59';
this.getPage() this.getPage();
}, },
methods: { methods: {
getPage() { getPage() {
orderGroupMonitor({ ...this.queryParams }).then(res => { orderGroupMonitor({ ...this.queryParams }).then((res) => {
let arr = res.data || [] let arr = res.data || [];
if (arr.length > 0) { if (arr.length > 0) {
let color = ['#7164FF', '#288AFF', '#63BDFF', '#8EF0AB', '#FFCE6A'] let color = ['#7164FF', '#288AFF', '#63BDFF', '#8EF0AB', '#FFCE6A'];
let arr2 = [] let arr2 = [];
arr.map(item => { arr.map((item) => {
item.orderType = '集团订单'//前端写死订单类型 item.orderType = '集团订单'; //前端写死订单类型
let woIdString = ''//集团订单层添加工单str跳转质量用 let woIdString = ''; //集团订单层添加工单str跳转质量用
//=========图数据 //=========图数据
let arr3 = [] let arr3 = [];
let obj = {} let obj = {};
obj.orderGroupName = item.name obj.orderGroupName = item.name;
obj.id = item.id obj.id = item.id;
obj.num = item.planQuantity || 0 obj.num = item.planQuantity || 0;
let sunNum = 0 let sunNum = 0;
if (item.orderMonitorVOS && item.orderMonitorVOS.length > 0) { if (item.orderMonitorVOS && item.orderMonitorVOS.length > 0) {
for (let i = 0; i < item.orderMonitorVOS.length; i++) { for (let i = 0; i < item.orderMonitorVOS.length; i++) {
item.orderMonitorVOS[i].orderType = '厂务订单'//前端写死订单类型 item.orderMonitorVOS[i].orderType = '厂务订单'; //前端写死订单类型
item.orderMonitorVOS[i].id = item.orderMonitorVOS[i].orderid item.orderMonitorVOS[i].id = item.orderMonitorVOS[i].orderid;
item.orderMonitorVOS[i].orderNum = item.orderMonitorVOS[i].workOrderNum item.orderMonitorVOS[i].orderNum =
woIdString += item.orderMonitorVOS[i].woIdString ? item.orderMonitorVOS[i].woIdString : '' item.orderMonitorVOS[i].workOrderNum;
woIdString += item.orderMonitorVOS[i].woIdString
? item.orderMonitorVOS[i].woIdString + ','
: '';
//==============图数据 //==============图数据
let subObj = {} let subObj = {};
subObj.value = item.orderMonitorVOS[i].actualquantity subObj.value = item.orderMonitorVOS[i].actualquantity;
subObj.name = item.orderMonitorVOS[i].name subObj.name = item.orderMonitorVOS[i].name;
if (i < 5) { if (i < 5) {
subObj.color = color[i] subObj.color = color[i];
} else { } else {
subObj.color = color[i % 5] subObj.color = color[i % 5];
} }
sunNum += (item.orderMonitorVOS[i].actualquantity || 0) sunNum += item.orderMonitorVOS[i].actualquantity || 0;
arr3.push(subObj) arr3.push(subObj);
} }
woIdString = woIdString.slice(0, -1);
} }
item.woIdString = woIdString item.woIdString = woIdString;
arr3.push({ arr3.push({
value: item.planQuantity - sunNum > 0 ? item.planQuantity - sunNum : 0, value:
item.planQuantity - sunNum > 0 ? item.planQuantity - sunNum : 0,
name: '未生产', name: '未生产',
color: '#F5F5F5' color: '#F5F5F5',
}) });
obj.sunNum = sunNum obj.sunNum = sunNum;
obj.order = arr3 obj.order = arr3;
arr2.push(obj) arr2.push(obj);
}) });
this.chartList = arr2 this.chartList = arr2;
if (this.activeName === 'barChart' && this.chartList.length > 0) { if (this.activeName === 'barChart' && this.chartList.length > 0) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.monitoringRingCharts.initChart() this.$refs.monitoringRingCharts.initChart();
}) });
} }
} else { } else {
// 显示无数据的图片 // 显示无数据的图片
this.chartList = [] this.chartList = [];
} }
console.log(arr) console.log(arr);
this.list = arr this.list = arr;
}) });
}, },
// 查询 // 查询
buttonClick(val) { buttonClick(val) {
this.queryParams.name = val.name this.queryParams.name = val.name;
if (val.timeVal && val.timeVal.length > 0) { if (val.timeVal && val.timeVal.length > 0) {
this.queryParams.deliveTime[0] = val.timeVal[0] + ' 00:00:00' this.queryParams.deliveTime[0] = val.timeVal[0] + ' 00:00:00';
this.queryParams.deliveTime[1] = val.timeVal[1] + ' 23:59:59' this.queryParams.deliveTime[1] = val.timeVal[1] + ' 23:59:59';
} else { } else {
this.queryParams.deliveTime = [] this.queryParams.deliveTime = [];
} }
this.getPage() this.getPage();
}, },
handleClick(val) { handleClick(val) {
console.log(val) console.log(val);
switch (val.type) { switch (val.type) {
case 'orderDetail': case 'orderDetail':
if (val.data.orderType === '集团订单') { if (val.data.orderType === '集团订单') {
this.$router.push({// 去厂务订单详情 this.$router.push({
path: '/order/base/order-manage/order-detail-data?orderIdString=' + val.data.orderIds.join(',') // 去厂务订单详情
}) path:
'/order/base/order-manage/order-detail-data?orderIdString=' +
val.data.orderIds.join(','),
});
} else { } else {
this.$router.push({// 去工单详情 this.$router.push({
path: '/core/core-work-order-detail?woIdString=' + val.data.woIdString // 去工单详情
}) path:
'/core/core-work-order-detail?woIdString=' +
val.data.woIdString,
});
} }
break break;
case 'qualityDetail': case 'qualityDetail':
this.$router.push({ this.$router.push({
path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString=' + val.data.woIdString path:
}) '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString=' +
break val.data.woIdString,
});
break;
default: default:
// this.$router.push({ // this.$router.push({
// path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name) // path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
@ -325,17 +364,17 @@ export default {
toggleTab() { toggleTab() {
if (this.activeName === 'barChart' && this.chartList.length > 0) { if (this.activeName === 'barChart' && this.chartList.length > 0) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.monitoringRingCharts.initChart() this.$refs.monitoringRingCharts.initChart();
}) });
} }
} },
} },
} };
</script> </script>
<style lang='scss'> <style lang='scss'>
.orderMonitoring { .orderMonitoring {
.el-tabs__nav::after { .el-tabs__nav::after {
content: ""; content: '';
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0; bottom: 0;
@ -381,7 +420,7 @@ export default {
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;