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

projects/mesxc-zhp #314

Merged
juzi merged 2 commits from projects/mesxc-zhp into projects/mesxc-test 2024-04-08 14:09:53 +08:00
Conversation 0 Commits 2 Files Changed 18 +5410 -5126
44 changed files with 5410 additions and 5126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6c54c223c5 - Show all commits

4
src/views/cost/energyCost/index.vue
View File

@ -92,7 +92,9 @@ export default {
param: 'searchTime',
},
{
type: 'button',
type: this.$auth.hasPermi('cost:energyCost:query')
? 'button'
: '',
btnName: '查询',
name: 'search',
color: 'primary',

4
src/views/cost/energyCostHis/index.vue
View File

@ -116,7 +116,9 @@ export default {
defaultSelect: [],
},
{
type: 'button',
type: this.$auth.hasPermi('cost:energyCostHis:query')
? 'button'
: '',
btnName: '查询',
name: 'search',
color: 'primary',

4
src/views/cost/rawMaterialConfig/index.vue
View File

@ -124,7 +124,9 @@ export default {
filterable: true,
},
{
type: 'button',
type: this.$auth.hasPermi('cost:rawMaterialConfig:query')
? 'button'
: '',
btnName: '查询',
name: 'search',
color: 'primary',

4
src/views/cost/rawMaterialCost/index.vue
View File

@ -97,7 +97,9 @@ export default {
param: 'searchTime',
},
{
type: 'button',
type: this.$auth.hasPermi('cost:rawMaterialCost:query')
? 'button'
: '',
btnName: '查询',
name: 'search',
color: 'primary',

4
src/views/cost/rawMaterialCostHis/index.vue
View File

@ -115,7 +115,9 @@ export default {
defaultSelect: [],
},
{
type: 'button',
type: this.$auth.hasPermi('cost:rawMaterialCostHis:query')
? 'button'
: '',
btnName: '查询',
name: 'search',
color: 'primary',

235
src/views/delivery/deliveryLog/index.vue
View File

@ -4,31 +4,27 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<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="160"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
@clickBtn="handleClick" />
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
<!-- 新增 -->
<base-dialog
:dialogTitle="addOrEditTitle"
@ -36,9 +32,10 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="50%"
>
<add-or-update ref="addOrUpdate" @successSubmit="successSubmit" />
width="50%">
<add-or-update
ref="addOrUpdate"
@successSubmit="successSubmit" />
</base-dialog>
<!-- 装车 -->
<base-dialog
@ -47,73 +44,78 @@
@cancel="handleCancel2"
@confirm="handleConfirm2"
:before-close="handleCancel2"
width="50%"
>
<loaded-page ref="loadedPage" @successSubmit="successSubmit2" />
width="50%">
<loaded-page
ref="loadedPage"
@successSubmit="successSubmit2" />
</base-dialog>
<!-- 发货详情 -->
<delivery-log-detail ref='deliveryLogDetail' v-if='showDetail' />
<delivery-log-detail
ref="deliveryLogDetail"
v-if="showDetail" />
</div>
</template>
<script>
import { parseTime } from '@/utils/ruoyi'
import { deliveryLogPage, deliveryLogDelete } from '@/api/base/delivery'
import AddOrUpdate from './components/addOrUpdate'
import LoadedPage from './components/loadedPage'
import DeliveryLogDetail from './components/deliveryLogDetail.vue'
import { parseTime } from '@/utils/ruoyi';
import { deliveryLogPage, deliveryLogDelete } from '@/api/base/delivery';
import AddOrUpdate from './components/addOrUpdate';
import LoadedPage from './components/loadedPage';
import DeliveryLogDetail from './components/deliveryLogDetail.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'orderName',
label: '订单名',
minWidth: 100,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'name',
label: '发货单名称',
minWidth: 100,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'deliveryTime',
label: '发货时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'code',
label: '发货单号',
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'deliverPerName',
label: '发货负责人',
minWidth: 100
minWidth: 100,
},
{
prop: 'principal',
label: '运输负责人',
minWidth: 100
minWidth: 100,
},
{
prop: 'principalCall',
label: '运输联系方式',
minWidth: 110,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'principalCost',
label: '运输费用',
align: 'right'
align: 'right',
},
{
prop: 'remark',
label: '备注',
showOverflowtooltip: true
}
]
showOverflowtooltip: true,
},
];
export default {
name: "DeliveryLog",
name: 'DeliveryLog',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -121,34 +123,38 @@ export default {
type: 'input',
label: '订单名',
param: 'orderName',
defaultSelect: ''
defaultSelect: '',
},
{
type: 'input',
label: '发货单名称',
param: 'name'
param: 'name',
},
{
type: 'input',
label: '发货单号',
param: 'code'
param: 'code',
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: this.$auth.hasPermi('extend:delivery-log:create') ? 'separate' : '',
type: this.$auth.hasPermi('extend:delivery-log:create')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('extend:delivery-log:create') ? 'button' : '',
type: this.$auth.hasPermi('extend:delivery-log:create')
? 'button'
: '',
btnName: '新增',
name: 'add',
color: 'success',
plain: true
}
plain: true,
},
],
// 查询参数
queryParams: {
@ -156,158 +162,163 @@ export default {
pageSize: 20,
orderName: '',
code: '',
name: ''
name: '',
},
tableProps,
list: [],
tableH: this.tableHeight(260),
total: 0,
tableBtn: [
this.$auth.hasPermi('extend:delivery-log:loaded')
? {
type: 'loaded',
btnName: '装车'
btnName: '装车',
}
: undefined,
this.$auth.hasPermi('extend:delivery-log:detail')
? {
type: 'detail',
btnName: '详情'
btnName: '详情',
}
: undefined,
this.$auth.hasPermi('extend:delivery-log:update')
? {
type: 'edit',
btnName: '编辑'
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('extend:delivery-log:delete')
? {
type: 'delete',
btnName: '删除'
btnName: '删除',
}
: undefined
: undefined,
].filter((v) => v),
addOrEditTitle: '',
centervisible: false,
centervisible2: false,
showDetail: false
}
showDetail: false,
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1]
this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
let arr = location.href.split('?')[1];
this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1]);
} else {
this.formConfig[0].defaultSelect = ''
this.formConfig[0].defaultSelect = '';
}
this.queryParams.orderName = this.formConfig[0].defaultSelect
this.queryParams.orderName = this.formConfig[0].defaultSelect;
this.getList();
},
components: { AddOrUpdate, LoadedPage, DeliveryLogDetail },
watch: {
$route: 'initData'
$route: 'initData',
},
methods: {
initData(to) {
if (to.name === 'DeliveryLog') {
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1]
this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
let arr = location.href.split('?')[1];
this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1]);
} else {
this.formConfig[0].defaultSelect = ''
this.formConfig[0].defaultSelect = '';
}
this.queryParams.orderName = this.formConfig[0].defaultSelect
this.getList()
this.queryParams.orderName = this.formConfig[0].defaultSelect;
this.getList();
}
},
getList() {
deliveryLogPage({...this.queryParams}).then(res => {
let arr = res.data.list || []
arr && arr.map(item => {
item.principalCost = item.principalCost.toFixed(2)
})
this.list = arr
this.total = res.data.total || 0
})
deliveryLogPage({ ...this.queryParams }).then((res) => {
let arr = res.data.list || [];
arr &&
arr.map((item) => {
item.principalCost = item.principalCost.toFixed(2);
});
this.list = arr;
this.total = res.data.total || 0;
});
},
buttonClick(val) {
if (val.btnName === 'search') {
this.queryParams.name = val.name
this.queryParams.orderName = val.orderName
this.queryParams.code = val.code
this.getList()
this.queryParams.name = val.name;
this.queryParams.orderName = val.orderName;
this.queryParams.code = val.code;
this.getList();
} else {
this.addOrEditTitle = '新增'
this.centervisible = true
this.addOrEditTitle = '新增';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.addOrUpdate.init()
})
this.$refs.addOrUpdate.init();
});
}
},
handleClick(val) {
console.log(val)
console.log(val);
switch (val.type) {
case 'edit':
this.addOrEditTitle = '编辑'
this.centervisible = true
this.addOrEditTitle = '编辑';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.addOrUpdate.init(val.data.id)
})
break
this.$refs.addOrUpdate.init(val.data.id);
});
break;
case 'delete':
this.handleDelete(val.data)
break
this.handleDelete(val.data);
break;
case 'loaded':
this.centervisible2 = true
this.centervisible2 = true;
this.$nextTick(() => {
this.$refs.loadedPage.init(val.data.id, val.data.code, val.data.orderId)
})
break
this.$refs.loadedPage.init(
val.data.id,
val.data.code,
val.data.orderId
);
});
break;
default:
this.showDetail = true
this.showDetail = true;
this.$nextTick(() => {
this.$refs.deliveryLogDetail.init(val.data)
})
this.$refs.deliveryLogDetail.init(val.data);
});
}
},
// 新增
handleCancel() {
this.$refs.addOrUpdate.formClear()
this.centervisible = false
this.addOrEditTitle = ''
this.$refs.addOrUpdate.formClear();
this.centervisible = false;
this.addOrEditTitle = '';
},
handleConfirm() {
this.$refs.addOrUpdate.submitForm()
this.$refs.addOrUpdate.submitForm();
},
successSubmit() {
this.handleCancel()
this.getList()
this.handleCancel();
this.getList();
},
// 删除
handleDelete(val) {
this.$modal.confirm('是否确认删除发货单名为"' + val.name + '"的数据项?').then(function() {
return deliveryLogDelete({ id: val.id })
}).then(() => {
this.$modal
.confirm('是否确认删除发货单名为"' + val.name + '"的数据项?')
.then(function () {
return deliveryLogDelete({ id: val.id });
})
.then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
this.$modal.msgSuccess('操作成功');
})
.catch(() => {});
},
// 装车
handleCancel2() {
this.$refs.loadedPage.formClear()
this.centervisible2 = false
this.$refs.loadedPage.formClear();
this.centervisible2 = false;
},
handleConfirm2() {
this.$refs.loadedPage.submitForm()
this.$refs.loadedPage.submitForm();
},
successSubmit2() {
this.handleCancel2()
this.getList()
}
}
}
this.handleCancel2();
this.getList();
},
},
};
</script>

82
src/views/delivery/deliveryLogDet/index.vue
View File

@ -4,127 +4,121 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<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"
@clickBtn="handleClick"
/>
@clickBtn="handleClick" />
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
<!-- 详情抽屉 -->
<delivery-log-det-detail ref='deliveryLogDetail'/>
<delivery-log-det-detail ref="deliveryLogDetail" />
</div>
</template>
<script>
import { deliveryProgressPage } from '@/api/base/delivery'
import DeliveryLogDetDetail from './components/deliveryLogDetDetail.vue'
import { deliveryProgressPage } from '@/api/base/delivery';
import DeliveryLogDetDetail from './components/deliveryLogDetDetail.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'orderName',
label: '订单名',
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'customerName',
label: '客户名称',
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'unit',
label: '单位'
label: '单位',
},
{
prop: 'orderNum',
label: '订单数量'
label: '订单数量',
},
{
prop: 'num',
label: '发货数量'
label: '发货数量',
},
{
prop: 'rate',
label: '累计发货比例(%)'
}
]
label: '累计发货比例(%)',
},
];
export default {
name: "DeliveryLogDet",
name: 'DeliveryLogDet',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
{
type: 'input',
label: '订单名',
param: 'orderName'
param: 'orderName',
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
}
color: 'primary',
},
],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 20,
orderName: ''
orderName: '',
},
tableProps,
list: [],
tableH: this.tableHeight(260),
total: 0,
tableBtn: [
this.$auth.hasPermi('extend:delivery-log-det:detail')
? {
type: 'detail',
btnName: '详情'
}
: undefined
].filter((v) => v)
btnName: '详情',
}
: undefined,
].filter((v) => v),
};
},
components: { DeliveryLogDetDetail },
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
this.getList();
},
methods: {
getList() {
deliveryProgressPage({...this.queryParams}).then(res => {
this.list = res.data.list || []
this.total = res.data.total || 0
})
deliveryProgressPage({ ...this.queryParams }).then((res) => {
this.list = res.data.list || [];
this.total = res.data.total || 0;
});
},
buttonClick(val) {
this.queryParams.orderName = val.orderName
this.getList()
this.queryParams.orderName = val.orderName;
this.getList();
},
handleClick(val) {
console.log(val)
console.log(val);
this.$nextTick(() => {
this.$refs.deliveryLogDetail.init(val.data)
})
}
}
}
this.$refs.deliveryLogDetail.init(val.data);
});
},
},
};
</script>

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

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

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

@ -80,10 +80,13 @@
</el-button>
</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-button
v-hasPermi="['analysis:qoq-analysis:export']"
type="primary"
size="small"
@click="exportData"

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

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

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

@ -69,10 +69,13 @@
</el-button>
</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-button
v-hasPermi="['analysis:yoy-analysis:export']"
type="primary"
size="small"
@click="exportData"

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

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

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

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

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

@ -20,9 +20,9 @@
@change="changeSelect(scope.row, 'tableName')">
<el-option
v-for="item in tableNameList"
:key="item.id"
:key="item.value"
:label="item.label"
:value="item.id"></el-option>
:value="item.value"></el-option>
</el-select>
</div>
</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-col :span="24">
<add-table
:table-props="tableProps"
:table-data="tableData"
:table-name-list="tableNameList"
@emitFun="inputChange"
@emitButtonClick="emitButtonClick" />
<!-- <base-table
border
:table-props="tableProps"
:table-data="tableData"
:add-button-show="addButtonShow"
@emitFun="inputChange"
@emitButtonClick="emitButtonClick" /> -->
</el-col>
</el-row>
</el-form>
@ -64,21 +56,7 @@ import {
} from '@/api/base/energyQuantityManual';
import moment from 'moment';
import AddTable from './AddTable';
import InputArea from './InputArea';
import SelectArea from './SelectArea';
import { energyTableGet } from '@/api/base/energyQuantityManual';
const tableProps = [
{
prop: 'tableName',
label: '表名*',
subcomponent: SelectArea,
},
{
prop: 'readingQuantity',
label: '抄表数*',
subcomponent: InputArea,
},
];
export default {
name: 'EnergyQuantityManualAdd',
props: {
@ -92,7 +70,6 @@ export default {
},
data() {
return {
tableProps,
tableData: [],
tableNameList: [], //表名list
addButtonShow: '新增',
@ -122,6 +99,7 @@ export default {
} else if (params.type === 'meterReading') {
this.isEdit = false;
this.form.energyTypeId = params.energyTypeId;
this.selEnergyType(this.form.energyTypeId);
let obj = {};
obj.tableName = params.tableName + '';
obj.readingQuantity = 0;
@ -133,6 +111,7 @@ export default {
energyQuantityManualGet({ id: this.form.id }).then((res) => {
if (res.code === 0) {
this.form.energyTypeId = res.data.energyTypeId;
this.selEnergyType(this.form.energyTypeId);
this.form.recordTime = res.data.recordTime
? res.data.recordTime
: null;
@ -164,6 +143,11 @@ export default {
this.tableNameList = [];
energyTableGet({ energyTypeId: id }).then((res) => {
this.tableNameList = res.data.tableObjs || [];
if (this.tableNameList.length === 0) {
this.$modal.msgWarning(
'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
);
}
});
},
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 EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'energyType',
prop: 'energyTypeLabel',
label: '能源类型',
minWidth: 110,
filter: publicFormatter('energy_type'),
showOverflowtooltip: true,
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('energy_unit'),
filter: publicFormatter('unit_dict'),
minWidth: 110,
},
{
@ -142,7 +142,6 @@ export default {
},
],
tableProps,
tableH: this.tableHeight(260),
// 总条数
total: 0,
// 班次基础信息列表
@ -181,10 +180,8 @@ export default {
};
},
components: { EnergyQuantityManualAdd },
mixins: [tableHeightMixin],
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260);
});
let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
let start = moment(
moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
@ -244,6 +241,11 @@ export default {
? item.amount.toFixed(2)
: ''
: '';
this.getDictDatas('energy_type').map((subItem) => {
if (item.energyType === subItem.value) {
item.energyTypeLabel = subItem.label;
}
});
});
this.list = arr;
this.total = response.data.total;
@ -305,7 +307,7 @@ export default {
handleDelete(row) {
console.log(row.id);
this.$modal
.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?')
.confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
.then(function () {
return energyQuantityManualDelete({ id: row.id });
})

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

@ -1,99 +1,114 @@
<template>
<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"
:selectWidth="55" :max-height="tableH" @selection-change="selectChange" />
<pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
<base-table
:page="queryParams.pageNo"
: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" />
</div>
</template>
<script>
import { getEnergyQuantityRealtimePage } from "@/api/base/energyQuantityRealtime"
import { getEnergyTypeListAll } from "@/api/base/energyType"
// import { publicFormatter } from '@/utils/dict'
import FileSaver from "file-saver"
import * as XLSX from 'xlsx/xlsx.mjs'
import { getEnergyQuantityRealtimePage } from '@/api/base/energyQuantityRealtime';
import { getEnergyTypeListAll } from '@/api/base/energyType';
// import { publicFormatter } from '@/utils/dict';
import FileSaver from 'file-saver';
import * as XLSX from 'xlsx/xlsx.mjs';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'objName',
label: '统计对象',
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'objCode',
label: '对象编码',
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'energyTypeName',
prop: 'energyTypeLabel',
label: '能源类型',
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'startValue',
label: '初始值'
label: '初始值',
},
{
prop: 'endValue',
label: '当前值'
label: '当前值',
},
{
prop: 'diffValue',
label: '差值'
label: '差值',
},
{
prop: 'amount',
label: '金额'
}
]
label: '金额',
},
];
export default {
name: "EnergyQuantityRealtime",
name: 'EnergyQuantityRealtime',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
{
type: 'select',
label: '能源类型',
labelField: 'labelName',
selectOptions: [],
param: 'energyTypeId',
filterable: true
filterable: true,
},
{
type: 'datePicker',
label: '时间',
dateType: 'datetimerange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp",
valueFormat: 'timestamp',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'timeVal',
defaultSelect: [],
width: 350
width: 350,
},
{
type: 'button',
btnName: '查询',
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: '导出',
name: 'export',
color: 'primary',
plain: true
}
plain: true,
},
],
tableProps,
tableH: this.tableHeight(260),
// 总条数
total: 0,
// 班次基础信息列表
@ -104,78 +119,97 @@ export default {
pageSize: 20,
energyTypeId: '',
startTime: null,
endTime: null
endTime: null,
},
energyTypeList: [],
exportList: []
exportList: [],
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1].split('&')
this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
let arr = location.href.split('?')[1].split('&');
this.formConfig[1].defaultSelect = [
arr[0].split('=')[1],
arr[1].split('=')[1],
];
} 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.endTime = this.formConfig[1].defaultSelect[1]
this.queryParams.startTime = this.formConfig[1].defaultSelect[0];
this.queryParams.endTime = this.formConfig[1].defaultSelect[1];
this.getList();
this.getTypeList()
this.getTypeList();
},
watch: {
$route: 'initData'
$route: 'initData',
},
methods: {
initData(to) {
if (to.name === 'EnergyQuantityRealtime') {
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1].split('&')
this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
let arr = location.href.split('?')[1].split('&');
this.formConfig[1].defaultSelect = [
arr[0].split('=')[1],
arr[1].split('=')[1],
];
} 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.endTime = this.formConfig[1].defaultSelect[1]
this.getList()
this.queryParams.startTime = this.formConfig[1].defaultSelect[0];
this.queryParams.endTime = this.formConfig[1].defaultSelect[1];
this.getList();
}
},
buttonClick(val) {
this.queryParams.pageNo = 1;
this.queryParams.energyTypeId = val.energyTypeId
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
this.queryParams.energyTypeId = val.energyTypeId;
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
switch (val.btnName) {
case 'search':
this.getList()
break
this.getList();
break;
default:
this.exportTable()
this.exportTable();
}
},
/** 查询列表 */
getList() {
getEnergyQuantityRealtimePage(this.queryParams).then(response => {
let arr = response.data.list || []
arr && arr.map(item => {
item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : ''
})
this.list = arr
getEnergyQuantityRealtimePage(this.queryParams).then((response) => {
let arr = response.data.list || [];
arr &&
arr.map((item) => {
item.amount = item.amount
? !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.exportList = []
this.exportList = [];
});
},
getTypeList() {
getEnergyTypeListAll().then((res) => {
this.formConfig[0].selectOptions = res.data || []
this.energyTypeList = res.data || []
})
this.formConfig[0].selectOptions = res.data || [];
this.energyTypeList = res.data || [];
});
},
selectChange(val) {
console.log(val)
this.exportList = val
console.log(val);
this.exportList = val;
},
// 勾选导出
exportTable() {
@ -183,38 +217,38 @@ export default {
let body = this.exportList.map((x) => [
x.objName,
x.objCode,
x.energyTypeName,
x.energyTypeLabel,
x.startValue,
x.endValue,
x.diffValue,
x.amount
])
let header = []
x.amount,
]);
let header = [];
this.tableProps.map((y) => {
header.push(y.label)
})
body.unshift(header)
console.log(body)
const filename = '能源抄表.xlsx'
const ws_name = 'Sheet1'
const wb = XLSX.utils.book_new()
const ws = XLSX.utils.aoa_to_sheet(body)
XLSX.utils.book_append_sheet(wb, ws, ws_name)
header.push(y.label);
});
body.unshift(header);
console.log(body);
const filename = '能源抄表.xlsx';
const ws_name = 'Sheet1';
const wb = XLSX.utils.book_new();
const ws = XLSX.utils.aoa_to_sheet(body);
XLSX.utils.book_append_sheet(wb, ws, ws_name);
let wbout = XLSX.write(wb, {
bookType: 'xlsx',
bookSST: false,
type: 'array'
})
type: 'array',
});
FileSaver.saveAs(
new Blob([wbout], {
type: 'application/octet-stream'
type: 'application/octet-stream',
}),
filename
)
);
} else {
this.$modal.msgWarning('请勾选需要导出的数据')
}
}
this.$modal.msgWarning('请勾选需要导出的数据');
}
},
},
};
</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 InnerTable from './components/InnerTable';
import EnergyTypeAdd from './components/energyTypeAdd';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'code',
@ -48,9 +49,8 @@ const tableProps = [
minWidth: 150,
},
{
prop: 'name',
prop: 'energyTypeLabel',
label: '能源类型',
filter: publicFormatter('energy_type'),
},
{
prop: 'unit',
@ -70,6 +70,7 @@ const tableProps = [
export default {
name: 'EnergyType',
components: { EnergyTypeAdd },
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -96,7 +97,7 @@ export default {
}
: undefined,
].filter((v) => v),
tableH: this.tableHeight(220),
heightNum: 220,
pricingMethodList: [
{ value: 0, label: '分时间段计价' },
{ value: 1, label: '分使用量计价' },
@ -118,9 +119,6 @@ export default {
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(220);
});
this.getList();
},
methods: {
@ -142,6 +140,11 @@ export default {
item.pricingMethod = i.label;
}
});
this.getDictDatas('energy_type').map((subItem) => {
if (item.name === subItem.value) {
item.energyTypeLabel = subItem.label;
}
});
});
this.list = arr;
this.total = response.data.total;
@ -174,8 +177,9 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
console.log(row);
this.$modal
.confirm('是否确认删除能源类型为"' + row.name + '"的数据项?')
.confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
.then(function () {
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 { publicFormatter } from '@/utils/dict';
import tableNameConfigUpdate from './components/tableNameConfigUpdate.vue';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'energyType',
@ -63,10 +64,11 @@ export default {
pageNo: 1,
pageSize: 100,
},
tableH: this.tableHeight(165),
heightNum: 165,
centervisible: false,
};
},
mixins: [tableHeightMixin],
created() {
this.getList();
},

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

@ -182,6 +182,7 @@ export default {
limitType: '',
minValue: 0,
maxValue: 0,
tableName: '',
},
objIds: [], // 回显数组
isEdit: false, //是否是编辑
@ -214,6 +215,9 @@ export default {
if (res.code === 0) {
this.form = res.data;
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.limitType = this.form.limitType
? this.form.limitType + ''
@ -294,7 +298,7 @@ export default {
},
selectObj(val) {
this.form.objectId = val[val.length - 1];
this.form.objectType = val.length - 1;
this.form.objectType = val.length;
if (this.form.energyTypeId && this.form.type) {
this.getDetailList();
this.form.plcParamId = '';

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 { publicFormatter } from '@/utils/dict';
import EnergyLimitAdd from './components/energyLimitAdd';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'method',
@ -104,6 +105,7 @@ const tableProps = [
export default {
name: 'EnergyLimit',
components: { EnergyLimitAdd },
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -156,7 +158,6 @@ export default {
}
: undefined,
].filter((v) => v),
tableH: this.tableHeight(260),
// 总条数
total: 0,
// 班次基础信息列表
@ -181,9 +182,6 @@ export default {
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260);
});
this.getList();
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 { publicFormatter } from '@/utils/dict';
import { parseTime } from '@/utils/ruoyi';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'objName',
@ -123,6 +124,7 @@ const tableProps2 = [
];
export default {
name: 'EnergyOverlimitLog',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -151,10 +153,10 @@ export default {
activeName: 'auto',
tableProps,
tableProps2,
tableH: this.tableHeight(260),
total: 0,
list: [],
list2: [],
heightNum: 300,
// 查询参数
queryParams: {
pageNo: 1,
@ -170,9 +172,6 @@ export default {
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260);
});
this.getList();
this.getTypeList();
},

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

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

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

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

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

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

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

@ -3,16 +3,15 @@
title="新增"
:visible.sync="centervisible"
size="60%"
@close='closeA'
:show-close='false'>
@close="closeA"
:show-close="false">
<div class="box">
<!-- 搜索工作栏 -->
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
:removeBlue='true'
@headBtnClick="buttonClick"
/>
:removeBlue="true"
@headBtnClick="buttonClick" />
<!-- 列表 -->
<base-table
:page="queryParams.pageNo"
@ -21,44 +20,44 @@
:table-data="list"
:max-height="tableH"
:selectWidth="55"
@selection-change="selectChange"
>
</base-table>
@selection-change="selectChange"></base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
</div>
</el-drawer>
</template>
<script>
import { addParamPage, createEnergyStatisticsDet } from '@/api/monitoring/energyStatisticsDet'
import { publicFormatter } from '@/utils/dict'
import {
addParamPage,
createEnergyStatisticsDet,
} from '@/api/monitoring/energyStatisticsDet';
import { publicFormatter } from '@/utils/dict';
const tableProps = [
{
prop: 'objName',
label: '所属对象'
label: '所属对象',
},
{
prop: 'objCode',
label: '对象编码'
label: '对象编码',
},
{
prop: 'paramName',
label: '参数名称'
label: '参数名称',
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('energy_unit')
filter: publicFormatter('unit_dict'),
},
{
prop: 'desc',
label: '描述'
}
]
label: '描述',
},
];
export default {
name: 'EnergyStatisticsDetAdd',
data() {
@ -71,30 +70,30 @@ export default {
selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
labelField: 'label',
valueField: 'value',
param: 'objType'
param: 'objType',
},
{
type: 'input',
label: '参数名称',
placeholder: '参数名称',
param: 'paramName'
param: 'paramName',
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: 'separate'
type: 'separate',
},
{
type: 'button',
btnName: '关联',
name: 'add',
color: 'primary',
plain: true
}
plain: true,
},
],
queryParams: {
pageNo: 1,
@ -102,75 +101,75 @@ export default {
energyTypeId: null,
statisticId: null,
paramName: '',
objType: ''
objType: '',
},
tableProps,
list: [],
total: 0,
tableH: this.tableHeight(260),
selectedList: []
}
selectedList: [],
};
},
methods: {
init(param) {
this.queryParams.statisticId = param.statisticsId
this.queryParams.energyTypeId = param.energyTypeId
this.queryParams.statisticId = param.statisticsId;
this.queryParams.energyTypeId = param.energyTypeId;
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
this.centervisible = true
this.getList()
this.tableH = this.tableHeight(260);
});
this.centervisible = true;
this.getList();
},
getList() {
addParamPage({...this.queryParams}).then((res) => {
this.list = res.data.list || []
this.total = res.data.total
})
addParamPage({ ...this.queryParams }).then((res) => {
this.list = res.data.list || [];
this.total = res.data.total;
});
},
buttonClick(val) {
switch (val.btnName) {
case 'search':
this.queryParams.pageNo = 1;
this.queryParams.objType = val.objType
this.queryParams.paramName = val.paramName
this.getList()
break
this.queryParams.objType = val.objType;
this.queryParams.paramName = val.paramName;
this.getList();
break;
default:
// 关联
this.connectParam()
this.connectParam();
}
},
// 选中数据
selectChange(val) {
this.selectedList = val
this.selectedList = val;
},
// 关联
connectParam() {
let param = {
statisticsId: this.queryParams.statisticId,
plcParamIds: []
}
plcParamIds: [],
};
if (this.selectedList.length === 0) {
this.$modal.msgWarning("请选勾选数据")
return false
this.$modal.msgWarning('请选勾选数据');
return false;
} else {
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) {
this.$modal.msgSuccess("操作成功");
this.$modal.msgSuccess('操作成功');
this.queryParams.pageNo = 1;
this.getList()
this.getList();
}
})
});
},
closeA() {
this.$emit('closeDet')
}
}
}
this.$emit('closeDet');
},
},
};
</script>
<style lang="scss" scoped>
.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 EnergyStatisticsAdd from './components/energyStatisticsAdd';
import EnergyStatisticsDet from './components/energyStatisticsDet';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'name',
@ -70,9 +71,9 @@ const tableProps = [
filter: publicFormatter('statistic_type'),
},
{
prop: 'energyType',
prop: 'energyTypeLabel',
label: '能源类型',
filter: publicFormatter('energy_type'),
showOverflowtooltip: true,
},
{
prop: 'paramNum',
@ -86,6 +87,7 @@ const tableProps = [
export default {
name: 'EnergyStatistics',
components: { EnergyStatisticsAdd, EnergyStatisticsDet },
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -139,7 +141,6 @@ export default {
}
: undefined,
].filter((v) => v),
tableH: this.tableHeight(260),
// 总条数
total: 0,
// 班次基础信息列表
@ -158,9 +159,6 @@ export default {
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260);
});
this.getList();
},
mounted() {
@ -187,6 +185,13 @@ export default {
getList() {
getEnergyStatisticsPage(this.queryParams).then((response) => {
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.total = response.data.total;
});

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

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

248
src/views/group/base/groupClasses/index.vue
View File

@ -1,67 +1,94 @@
<template>
<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">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
</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" />
<!-- 新增 -->
<base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
@confirm="handleConfirm" :before-close="handleCancel" width='50%'>
<group-class-add ref="classList" @successSubmit="successSubmit" />
<base-dialog
:dialogTitle="addOrEditTitle"
:dialogVisible="centervisible"
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="50%">
<group-class-add
ref="classList"
@successSubmit="successSubmit" />
</base-dialog>
</div>
</template>
<script>
import { getGroupClassesPage, deleteGroupClasses, updateGroupClasses } from "@/api/base/groupClasses";
import GroupClassAdd from './components/groupClassAdd'
import { formatDate } from '@/utils'
import { publicFormatter } from '@/utils/dict'
import {
getGroupClassesPage,
deleteGroupClasses,
updateGroupClasses,
} from '@/api/base/groupClasses';
import GroupClassAdd from './components/groupClassAdd';
import { formatDate } from '@/utils';
import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'enableTimeStr',
label: '生效时段',
minWidth: 300
minWidth: 300,
},
{
prop: 'roomNameDict',
label: '车间名称',
filter: publicFormatter('workshop'),
minWidth: 100
minWidth: 100,
},
{
prop: 'name',
label: '班次名称'
label: '班次名称',
},
{
prop: 'timeStr',
label: '班次时间',
minWidth: 100
minWidth: 100,
},
{
prop: 'code',
label: '班次编码',
minWidth: 200
minWidth: 200,
},
{
prop: 'status',
label: '班次状态'
label: '班次状态',
},
{
prop: 'remark',
label: '备注'
}
]
label: '备注',
},
];
export default {
name: "GroupClasses",
name: 'GroupClasses',
components: { GroupClassAdd },
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -69,24 +96,26 @@ export default {
type: 'input',
label: '班次名称',
placeholder: '班次名称',
param: 'name'
param: 'name',
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: 'separate'
type: 'separate',
},
{
type: this.$auth.hasPermi('base:group-classes:create') ? 'button' : '',
type: this.$auth.hasPermi('base:group-classes:create')
? 'button'
: '',
btnName: '新增',
name: 'add',
color: 'success',
plain: true
}
plain: true,
},
],
tableProps,
tableBtn: [
@ -100,145 +129,164 @@ export default {
{
type: 'unequal',
name: 'status',
value: '不可用'
}
]
}
value: '不可用',
},
],
},
}
: undefined,
this.$auth.hasPermi('base:group-classes:update')
? {
type: 'edit',
btnName: '编辑'
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('base:group-classes:delete')
? {
type: 'delete',
btnName: '删除'
btnName: '删除',
}
: undefined
: undefined,
].filter((v) => v),
tableH: this.tableHeight(260),
// 总条数
total: 0,
// 班次基础信息列表
list: [],
// 弹出层标题
addOrEditTitle: "",
addOrEditTitle: '',
// 是否显示弹出层
centervisible: false,
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 20,
name: null
}
name: null,
},
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
this.getList()
this.getList();
},
methods: {
buttonClick(val) {
switch (val.btnName) {
case 'search':
this.queryParams.pageNo = 1;
this.queryParams.name = val.name
this.getList()
break
this.queryParams.name = val.name;
this.getList();
break;
default:
this.addOrEditTitle = '新增'
this.centervisible = true
this.addOrEditTitle = '新增';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.classList.init()
})
this.$refs.classList.init();
});
}
},
/** 查询列表 */
getList() {
getGroupClassesPage(this.queryParams).then(res => {
getGroupClassesPage(this.queryParams).then((res) => {
if (res.code === 0 && res.data.list.length > 0) {
res.data.list.map(item => {
item.enableTimeStr = formatDate(item.enableTime) + '至' + (item.disableTime ? formatDate(item.disableTime) : '永久')
item.timeStr = item.startTime.slice(0, 5) + '-' + item.endTime.slice(0, 5)
item.status = item.status === true ? '可用' : '不可用'
})
res.data.list.map((item) => {
item.enableTimeStr =
formatDate(item.enableTime) +
'至' +
(item.disableTime ? formatDate(item.disableTime) : '永久');
item.timeStr =
item.startTime.slice(0, 5) + '-' + item.endTime.slice(0, 5);
item.status = item.status === true ? '可用' : '不可用';
});
this.list = res.data.list;
this.total = res.data.total;
} else {
this.list = []
this.total = 0
this.list = [];
this.total = 0;
}
});
},
handleClick(val) {
switch (val.type) {
case 'edit':
this.addOrEditTitle = '编辑'
this.addOrEditTitle = '编辑';
this.$nextTick(() => {
this.$refs.classList.init(val.data.id)
})
this.centervisible = true
break
this.$refs.classList.init(val.data.id);
});
this.centervisible = true;
break;
case 'cancel':
this.discard(val.data)
break
this.discard(val.data);
break;
default:
this.handleDelete(val.data)
this.handleDelete(val.data);
}
},
handleCancel() {
this.$refs.classList.formClear()
this.centervisible = false
this.addOrEditTitle = ''
this.$refs.classList.formClear();
this.centervisible = false;
this.addOrEditTitle = '';
},
handleConfirm() {
this.$refs.classList.submitForm()
this.$refs.classList.submitForm();
},
successSubmit() {
this.handleCancel()
this.getList()
this.handleCancel();
this.getList();
},
discard(row) {
let obj = {}
obj.id = row.id
obj.startTime = row.startTime
obj.endTime = row.endTime
obj.enableTime = row.enableTime
obj.disableTime = Date.parse(new Date())
this.$modal.confirm('是否确认作废班次名称为"' + row.name + '"的数据项?').then(function () {
return updateGroupClasses({ ...obj })
}).then(() => {
let obj = {};
obj.id = row.id;
obj.startTime = row.startTime;
obj.endTime = row.endTime;
obj.enableTime = row.enableTime;
obj.disableTime = Date.parse(new Date());
this.$modal
.confirm('是否确认作废班次名称为"' + row.name + '"的数据项?')
.then(function () {
return updateGroupClasses({ ...obj });
})
.then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => { });
this.$modal.msgSuccess('操作成功');
})
.catch(() => {});
},
/** 删除按钮操作 */
handleDelete(row) {
console.log(row)
let _this = this
if (row.status === '可用') {// 可用
_this.$modal.confirm('删除的班次"' + row.name + '"可能会影响交接班计划，请点取消再次确认！').then(function () {
return _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function () {
console.log(row);
let _this = this;
if (row.status === '可用') {
// 可用
_this.$modal
.confirm(
'删除的班次"' +
row.name +
'"可能会影响交接班计划，请点取消再次确认！'
)
.then(function () {
return _this.$modal
.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
.then(function () {
return deleteGroupClasses(row.id);
}).then(() => {
_this.getList();
_this.$modal.msgSuccess("删除成功");
}).catch(() => { });
})
} else {
_this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function () {
return deleteGroupClasses(row.id);
}).then(() => {
.then(() => {
_this.getList();
_this.$modal.msgSuccess("删除成功");
}).catch(() => { });
}
}
_this.$modal.msgSuccess('删除成功');
})
.catch(() => {});
});
} else {
_this.$modal
.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
.then(function () {
return deleteGroupClasses(row.id);
})
.then(() => {
_this.getList();
_this.$modal.msgSuccess('删除成功');
})
.catch(() => {});
}
},
},
};
</script>

171
src/views/group/base/groupTeam/index.vue
View File

@ -1,12 +1,10 @@
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<base-table
:page="queryParams.pageNo"
@ -14,23 +12,20 @@
:table-props="tableProps"
:table-data="list"
:max-height="tableH"
@emitFun="handleTableEvents"
>
@emitFun="handleTableEvents">
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="80"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
@clickBtn="handleClick" />
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
<!-- 新增 -->
<base-dialog
:dialogTitle="addOrEditTitle"
@ -38,66 +33,76 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width='40%'
>
<group-team-add ref="groupList" @successSubmit="successSubmit" />
width="40%">
<group-team-add
ref="groupList"
@successSubmit="successSubmit" />
</base-dialog>
<!-- 组员编辑 -->
<worker-edit v-if='paramVisible' ref='workerEditParam' @closeDrawer="closeDrawer"></worker-edit>
<worker-edit
v-if="paramVisible"
ref="workerEditParam"
@closeDrawer="closeDrawer"></worker-edit>
</div>
</template>
<script>
import { getGroupTeamPage, deleteGroupTeam, updateGroupTeam } from "@/api/base/groupTeam";
import { parseTime } from '@/utils/ruoyi'
import GroupTeamAdd from './components/groupTeamAdd'
import StatusBtn from './components/statusBtn'
import WorkerOperate from './components/workerOperate'
import WorkerEdit from './components/workerEdit'
import { publicFormatter } from '@/utils/dict'
import {
getGroupTeamPage,
deleteGroupTeam,
updateGroupTeam,
} from '@/api/base/groupTeam';
import { parseTime } from '@/utils/ruoyi';
import GroupTeamAdd from './components/groupTeamAdd';
import StatusBtn from './components/statusBtn';
import WorkerOperate from './components/workerOperate';
import WorkerEdit from './components/workerEdit';
import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'createTime',
label: '创建时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'roomNameDict',
label: '车间名称',
filter: publicFormatter('workshop')
filter: publicFormatter('workshop'),
},
{
prop: 'name',
label: '班组名称'
label: '班组名称',
},
{
prop: 'code',
label: '编码',
minWidth: 220
minWidth: 220,
},
{
prop: 'num',
label: '班组人数'
label: '班组人数',
},
{
prop: 'leaderName',
label: '组长'
label: '组长',
},
{
prop: 'enabled',
label: '班组状态',
subcomponent: StatusBtn
subcomponent: StatusBtn,
},
{
prop: 'workerName',
label: '组员',
subcomponent: WorkerOperate
subcomponent: WorkerOperate,
},
]
];
export default {
name: "GroupTeam",
name: 'GroupTeam',
components: { GroupTeamAdd, WorkerEdit },
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -105,53 +110,52 @@ export default {
type: 'input',
label: '班组名称',
placeholder: '班组名称',
param: 'name'
param: 'name',
},
{
type: 'input',
label: '组长',
placeholder: '组长',
param: 'leaderName'
param: 'leaderName',
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: 'separate'
type: 'separate',
},
{
type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
btnName: '新增',
name: 'add',
color: 'success',
plain: true
}
plain: true,
},
],
tableProps,
tableBtn: [
this.$auth.hasPermi('base:group-team:update')
? {
type: 'edit',
btnName: '编辑'
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('base:group-team:delete')
? {
type: 'delete',
btnName: '删除'
btnName: '删除',
}
: undefined
: undefined,
].filter((v) => v),
tableH: this.tableHeight(260),
// 总条数
total: 0,
// 班次基础信息列表
list: [],
// 弹出层标题
addOrEditTitle: "",
addOrEditTitle: '',
// 是否显示弹出层
centervisible: false,
// 查询参数
@ -159,15 +163,12 @@ export default {
pageNo: 1,
pageSize: 20,
name: null,
code: null
code: null,
},
paramVisible: false
paramVisible: false,
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
this.getList();
},
methods: {
@ -175,21 +176,21 @@ export default {
switch (val.btnName) {
case 'search':
this.queryParams.pageNo = 1;
this.queryParams.leaderName = val.leaderName
this.queryParams.name = val.name
this.getList()
break
this.queryParams.leaderName = val.leaderName;
this.queryParams.name = val.name;
this.getList();
break;
default:
this.addOrEditTitle = '新增'
this.centervisible = true
this.addOrEditTitle = '新增';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.groupList.init()
})
this.$refs.groupList.init();
});
}
},
/** 查询列表 */
getList() {
getGroupTeamPage(this.queryParams).then(response => {
getGroupTeamPage(this.queryParams).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
});
@ -197,57 +198,63 @@ export default {
handleClick(val) {
switch (val.type) {
case 'edit':
this.addOrEditTitle = '编辑'
this.addOrEditTitle = '编辑';
this.$nextTick(() => {
this.$refs.groupList.init(val.data.id)
})
this.centervisible = true
break
this.$refs.groupList.init(val.data.id);
});
this.centervisible = true;
break;
default:
this.handleDelete(val.data)
this.handleDelete(val.data);
}
},
// 班组状态
handleTableEvents(params) {
console.log(params)
if (params.name === 'state') {// 班组状态
console.log(params);
if (params.name === 'state') {
// 班组状态
updateGroupTeam({ ...params.payload }).then((res) => {
if (res.code === 0) {
this.$modal.msgSuccess("操作成功");
this.$modal.msgSuccess('操作成功');
}
})
}else {// 编辑&查看
this.paramVisible = true
});
} else {
// 编辑&查看
this.paramVisible = true;
this.$nextTick(() => {
this.$refs.workerEditParam.init(params)
})
this.$refs.workerEditParam.init(params);
});
}
},
handleCancel() {
this.$refs.groupList.formClear()
this.centervisible = false
this.addOrEditTitle = ''
this.$refs.groupList.formClear();
this.centervisible = false;
this.addOrEditTitle = '';
},
handleConfirm() {
this.$refs.groupList.submitForm()
this.$refs.groupList.submitForm();
},
successSubmit() {
this.handleCancel()
this.getList()
this.handleCancel();
this.getList();
},
/** 删除按钮操作 */
handleDelete(row) {
this.$modal.confirm('是否确认删除班组名称为"' + row.name + '"的数据项?').then(function() {
this.$modal
.confirm('是否确认删除班组名称为"' + row.name + '"的数据项?')
.then(function () {
return deleteGroupTeam(row.id);
}).then(() => {
})
.then(() => {
this.queryParams.pageNo = 1;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
this.$modal.msgSuccess('删除成功');
})
.catch(() => {});
},
closeDrawer() {
this.getList()
}
}
this.getList();
},
},
};
</script>

114
src/views/group/monitoring/groupTeamView/index.vue
View File

@ -4,61 +4,62 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<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="160"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
@clickBtn="handleClick" />
</base-table>
<!-- 查看详情 -->
<group-team-view-detail v-if="paramVisible" ref="groupTeamViewDetail"/>
<group-team-view-detail
v-if="paramVisible"
ref="groupTeamViewDetail" />
</div>
</template>
<script>
import { getByWorkOrder } from '@/api/monitoring/groupTeamView'
import { workOrderList } from '@/api/base/workOrder'
import GroupTeamViewDetail from './components/groupTeamViewDetail.vue'
import { publicFormatter } from '@/utils/dict'
import { getByWorkOrder } from '@/api/monitoring/groupTeamView';
import { workOrderList } from '@/api/base/workOrder';
import GroupTeamViewDetail from './components/groupTeamViewDetail.vue';
import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'roomNameDict',
label: '车间名称',
filter: publicFormatter('workshop'),
showOverflowtooltip: true,
minWidth: 100
minWidth: 100,
},
{
prop: 'name',
label: '班组名称'
label: '班组名称',
},
{
prop: 'leaderName',
label: '班组长'
label: '班组长',
},
{
prop: 'num',
label: '人数'
label: '人数',
},
{
prop: 'workCount',
label: '上班次数'
}
]
label: '上班次数',
},
];
export default {
name: 'GroupTeamView',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -68,85 +69,82 @@ export default {
selectOptions: [],
param: 'workOrderId',
clearable: false,
filterable: true
filterable: true,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
}
color: 'primary',
},
],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 1000,
workOrderId: ''
workOrderId: '',
},
heightNum: 220,
workOrderList: [],
workOrderName: '',
tableBtn: [
this.$auth.hasPermi('base:group-team-view:detail')
? {
type: 'detail',
btnName: '详情'
btnName: '详情',
}
: undefined
: undefined,
].filter((v) => v),
tableProps,
tableH: this.tableHeight(220),
list: [],
paramVisible: false
}
paramVisible: false,
};
},
components: { GroupTeamViewDetail },
mounted() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(220)
})
this.getOrderList()
this.getOrderList();
},
methods: {
// 获取工单list
getOrderList() {
workOrderList().then(res => {
console.log(res)
this.formConfig[0].selectOptions = res.data || []
this.workOrderList = res.data || []
})
workOrderList().then((res) => {
console.log(res);
this.formConfig[0].selectOptions = res.data || [];
this.workOrderList = res.data || [];
});
},
// 查询
buttonClick(val) {
if (!val.workOrderId) {
this.$modal.msgWarning('工单不能为空')
return false
this.$modal.msgWarning('工单不能为空');
return false;
}
this.queryParams.workOrderId = val.workOrderId
this.getList()
this.queryParams.workOrderId = val.workOrderId;
this.getList();
},
// 获取table数据
getList() {
getByWorkOrder({ id: this.queryParams.workOrderId }).then(res => {
this.list = res.data || []
})
getByWorkOrder({ id: this.queryParams.workOrderId }).then((res) => {
this.list = res.data || [];
});
},
handleClick(val) {
this.paramVisible = true
let params = {}
params.teamId = val.data.id
params.teamName = val.data.name
this.workOrderList.map(item => {
this.paramVisible = true;
let params = {};
params.teamId = val.data.id;
params.teamName = val.data.name;
this.workOrderList.map((item) => {
if (val.data.workOrderId === item.id) {
this.workOrderName = item.name
this.workOrderName = item.name;
}
})
params.workOrderId = val.data.workOrderId
params.workOrderName = this.workOrderName
params.roomNameDict = val.data.roomNameDict
});
params.workOrderId = val.data.workOrderId;
params.workOrderName = this.workOrderName;
params.roomNameDict = val.data.roomNameDict;
this.$nextTick(() => {
this.$refs.groupTeamViewDetail.init(params)
})
}
}
}
this.$refs.groupTeamViewDetail.init(params);
});
},
},
};
</script>

104
src/views/group/monitoring/teamProduction/index.vue
View File

@ -8,30 +8,45 @@
@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">
<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" />
</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" />
<!-- 查看生产情况 -->
<team-production-detail v-if='paramVisible' ref='schedulingMonitoringDetail' />
<team-production-detail
v-if="paramVisible"
ref="schedulingMonitoringDetail" />
</div>
</template>
<script>
import { groupTeamSchedulingPage } from '@/api/monitoring/teamProduction'
import { parseTime } from '@/utils/ruoyi'
import TeamProductionDetail from './components/teamProductionDetail'
import { publicFormatter } from '@/utils/dict'
import SearchArea from './components/searchArea'
import { groupTeamSchedulingPage } from '@/api/monitoring/teamProduction';
import { parseTime } from '@/utils/ruoyi';
import TeamProductionDetail from './components/teamProductionDetail';
import { publicFormatter } from '@/utils/dict';
import SearchArea from './components/searchArea';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'roomNameDict',
label: '车间名称',
filter: publicFormatter('workshop'),
showOverflowtooltip: true,
minWidth: 100
minWidth: 100,
},
// {
// prop: 'createTime',
@ -42,33 +57,34 @@ const tableProps = [
{
prop: 'startDay',
label: '上班日期',
minWidth: 100
minWidth: 100,
},
{
prop: 'startTime',
label: '上班时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'endTime',
label: '下班时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'classesName',
label: '班次名称',
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'teamName',
label: '班组名称',
showOverflowtooltip: true
}
]
showOverflowtooltip: true,
},
];
export default {
name: 'GroupTeamScheduling',
mixins: [tableHeightMixin],
data() {
return {
// 查询参数
@ -77,7 +93,7 @@ export default {
pageSize: 20,
classesId: '',
teamName: '',
startDay: []
startDay: [],
},
tableProps,
tableBtn: [
@ -85,46 +101,46 @@ export default {
? {
type: 'productionDetail',
btnName: '查看',
showTip: '生产情况'
showTip: '生产情况',
}
: undefined
: undefined,
].filter((v) => v),
list: [],
tableH: this.tableHeight(260),
total: 0,
paramVisible: false
}
paramVisible: false,
};
},
components: { TeamProductionDetail, SearchArea },
mounted() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
this.getList()
this.getList();
},
methods: {
buttonClick(val) {
this.queryParams.pageNo = 1;
this.queryParams.classesId = val.classesId
this.queryParams.teamName = val.teamName
this.queryParams.startDay[0] = val.tiemStr ? val.tiemStr[0] + ' 00:00:00' : ''
this.queryParams.startDay[1] = val.tiemStr ? val.tiemStr[1] + ' 23:59:59' : ''
this.getList()
this.queryParams.classesId = val.classesId;
this.queryParams.teamName = val.teamName;
this.queryParams.startDay[0] = val.tiemStr
? val.tiemStr[0] + ' 00:00:00'
: '';
this.queryParams.startDay[1] = val.tiemStr
? val.tiemStr[1] + ' 23:59:59'
: '';
this.getList();
},
getList() {
groupTeamSchedulingPage({ ...this.queryParams }).then(res => {
console.log(res)
this.list = res.data.list || []
this.total = res.data.total || 0
})
groupTeamSchedulingPage({ ...this.queryParams }).then((res) => {
console.log(res);
this.list = res.data.list || [];
this.total = res.data.total || 0;
});
},
handleClick(val) {
console.log(val)
this.paramVisible = true
console.log(val);
this.paramVisible = true;
this.$nextTick(() => {
this.$refs.schedulingMonitoringDetail.init(val.data)
})
}
}
}
this.$refs.schedulingMonitoringDetail.init(val.data);
});
},
},
};
</script>

335
src/views/order/base/orderGroup/index.vue
View File

@ -4,31 +4,27 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<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="240"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
@clickBtn="handleClick" />
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
<!-- 新增&编辑 -->
<base-dialog
:dialogTitle="addOrEditTitle"
@ -36,9 +32,10 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width='60%'
>
<order-group-add ref="orderGroupAdd" @successSubmit="successSubmit" />
width="60%">
<order-group-add
ref="orderGroupAdd"
@successSubmit="successSubmit" />
</base-dialog>
<!-- 查看详情 -->
<!-- 新增工单 -->
@ -48,94 +45,97 @@
@cancel="bindOrderCancel"
@confirm="bindOrderConfirm"
:before-close="bindOrderCancel"
width='60%'
>
<bind-order ref="bindOrder" @bindOrderSubmit="bindOrderSubmit" />
width="60%">
<bind-order
ref="bindOrder"
@bindOrderSubmit="bindOrderSubmit" />
</base-dialog>
</div>
</template>
<script>
import { parseTime } from '@/utils/ruoyi'
import { getOrderGroupPage, groupOrderStatusSet } from '@/api/base/orderGroup'
import { customerList } from '@/api/base/orderManage'
import OrderGroupAdd from './components/orderGroupAdd'
import BindOrder from './components/bindOrder'
import { publicFormatter } from '@/utils/dict'
import { parseTime } from '@/utils/ruoyi';
import { getOrderGroupPage, groupOrderStatusSet } from '@/api/base/orderGroup';
import { customerList } from '@/api/base/orderManage';
import OrderGroupAdd from './components/orderGroupAdd';
import BindOrder from './components/bindOrder';
import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'createTime',
label: '添加时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'name',
label: '订单名称',
minWidth: 140,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'code',
label: '订单编码',
minWidth: 150
minWidth: 150,
},
{
prop: 'customerId',
label: '客户',
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'status',
label: '订单状态',
filter: publicFormatter('order_status')
filter: publicFormatter('order_status'),
},
{
prop: 'productName',
label: '产品名称',
minWidth: 200,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'specifications',
label: '产品规格',
minWidth: 120,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('unit_dict')
filter: publicFormatter('unit_dict'),
},
{
prop: 'planQuantity',
label: '计划加工量',
width: 100
width: 100,
},
{
prop: 'actualquantity',
label: '实际加工量',
width: 100
width: 100,
},
{
prop: 'deliveTime',
label: '交货时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'packReq',
label: '包装要求',
// filter: publicFormatter('pack_spec'),
minWidth: 120,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'orderIdNum',
label: '订单数量'
}
]
label: '订单数量',
},
];
export default {
name: 'OrderGroup',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -143,7 +143,7 @@ export default {
type: 'input',
label: '订单名称',
placeholder: '订单名称',
param: 'name'
param: 'name',
},
{
type: 'select',
@ -151,37 +151,39 @@ export default {
selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
labelField: 'label',
valueField: 'value',
param: 'status'
param: 'status',
},
{
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: "yyyy-MM-dd",
valueFormat: 'yyyy-MM-dd',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'timeVal',
defaultSelect: [],
width: 250
width: 250,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: this.$auth.hasPermi('base:order-group:create') ? 'separate' : '',
type: this.$auth.hasPermi('base:order-group:create')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
btnName: '新增',
name: 'add',
color: 'success',
plain: true
}
plain: true,
},
],
// 查询参数
queryParams: {
@ -189,12 +191,11 @@ export default {
pageSize: 20,
name: null,
status: null,
planFinishTime: []
planFinishTime: [],
},
total: 0,
tableProps,
list: [],
tableH: this.tableHeight(260),
tableBtn: [
this.$auth.hasPermi('base:order-group:bind')
? {
@ -207,10 +208,10 @@ export default {
{
type: 'less',
name: 'status',
value: 3
}
]
}
value: 3,
},
],
},
}
: undefined,
this.$auth.hasPermi('base:order-group:complete')
@ -224,10 +225,10 @@ export default {
{
type: 'equal',
name: 'status',
value: 3
}
]
}
value: 3,
},
],
},
}
: undefined,
this.$auth.hasPermi('base:order-group:termination')
@ -241,10 +242,10 @@ export default {
{
type: 'equal',
name: 'status',
value: 3
}
]
}
value: 3,
},
],
},
}
: undefined,
this.$auth.hasPermi('base:order-group:cancel')
@ -258,15 +259,15 @@ export default {
{
type: 'less',
name: 'status',
value: 2
}
]
}
value: 2,
},
],
},
}
: undefined,
{
type: 'detail',
btnName: '详情'
btnName: '详情',
},
this.$auth.hasPermi('base:order-group:edit')
? {
@ -278,163 +279,187 @@ export default {
{
type: 'less',
name: 'status',
value: 2
value: 2,
},
],
},
}
]
}
}
: undefined
: undefined,
].filter((v) => v),
addOrEditTitle: '',
centervisible: false,
priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
workIssueTitle: '',
bindOrderVisible: false,
orderDetailVisible: false
}
orderDetailVisible: false,
};
},
components: { OrderGroupAdd, BindOrder },
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
this.getList()
this.getList();
},
methods: {
getList() {
getOrderGroupPage({...this.queryParams}).then(res => {
let arr = res.data.records || []
this.total = res.data.total || 0
getOrderGroupPage({ ...this.queryParams }).then((res) => {
let arr = res.data.records || [];
this.total = res.data.total || 0;
if (arr.length > 0) {
customerList().then(result => {
let tempData = result.data || []
customerList().then((result) => {
let tempData = result.data || [];
if (tempData.length > 0) {
arr.map(item => {
arr.map((item) => {
for (let i of tempData) {
if (item.customerId === i.id) {
item.customerId = i.name
item.customerId = i.name;
}
}
})
this.list = arr
});
this.list = arr;
}
})
}else {
this.list = arr
});
} else {
this.list = arr;
}
})
});
},
buttonClick(val) {
console.log(val)
console.log(val);
if (val.btnName === 'search') {
this.queryParams.name = val.name
this.queryParams.status = val.status
this.queryParams.name = val.name;
this.queryParams.status = val.status;
if (val.timeVal && val.timeVal.length > 0) {
this.queryParams.planFinishTime[0] = val.timeVal[0] + ' 00:00:00'
this.queryParams.planFinishTime[1] = val.timeVal[1] + ' 23:59:59'
this.queryParams.planFinishTime[0] = val.timeVal[0] + ' 00:00:00';
this.queryParams.planFinishTime[1] = val.timeVal[1] + ' 23:59:59';
} else {
this.queryParams.planFinishTime = []
this.queryParams.planFinishTime = [];
}
this.getList()
this.getList();
} else {
this.addOrEditTitle = '新增'
this.centervisible = true
this.addOrEditTitle = '新增';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.orderGroupAdd.init()
})
this.$refs.orderGroupAdd.init();
});
}
},
handleClick(val) {
console.log(val)
console.log(val);
switch (val.type) {
case 'edit':
this.addOrEditTitle = '编辑'
this.centervisible = true
this.addOrEditTitle = '编辑';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.orderGroupAdd.init(val.data.id)
})
break
this.$refs.orderGroupAdd.init(val.data.id);
});
break;
case 'cancel':
this.handleEditStatus(val.data, '作废', '6')
break
this.handleEditStatus(val.data, '作废', '6');
break;
case 'detail':
this.$router.push({path: '/order/base/order-group/order-group-detail-data?orderGroupId='+ val.data.id})
break
this.$router.push({
path:
'/order/base/order-group/order-group-detail-data?orderGroupId=' +
val.data.id,
});
break;
case 'termination':
this.handleEditStatus(val.data, '终止', '5')
break
this.handleEditStatus(val.data, '终止', '5');
break;
case 'bind':
this.workIssueTitle = '绑定工单'
this.bindOrderVisible = true
this.workIssueTitle = '绑定工单';
this.bindOrderVisible = true;
this.$nextTick(() => {
this.$refs.bindOrder.init(val.data)
})
break
this.$refs.bindOrder.init(val.data);
});
break;
case 'complete':
this.handleEditStatus(val.data, '完成', '4')
break
this.handleEditStatus(val.data, '完成', '4');
break;
default:
}
},
// 完成,终止，作废
handleEditStatus(val, tip, status) {
let _this = this
if (val.orderIdNum > 0) {// 有下级订单
_this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
let _this = this;
if (val.orderIdNum > 0) {
// 有下级订单
_this
.$confirm(
'是否将"' + tip + '"操作同步至下级订单和工单?',
'确认信息',
{
type: 'warning',
distinguishCancelAndClose: true,
confirmButtonText: '同步',
cancelButtonText: '不同步'
}).then(function() {
console.log('同步')
groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
_this.getList();
_this.$modal.msgSuccess("操作成功");
})
}).catch(action => {
if (action === 'cancel') {
console.log('不同步')
groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
_this.getList();
_this.$modal.msgSuccess("操作成功");
})
}else {
return console.log('关闭')
cancelButtonText: '不同步',
}
})
}else{// 无下级订单
_this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
return groupOrderStatusSet({ id: val.id, status: status})
)
.then(function () {
console.log('同步');
groupOrderStatusSet({
id: val.id,
status: status,
isSync: true,
}).then(() => {
_this.getList();
_this.$modal.msgSuccess("操作成功");
}).catch(() => {});
_this.$modal.msgSuccess('操作成功');
});
})
.catch((action) => {
if (action === 'cancel') {
console.log('不同步');
groupOrderStatusSet({
id: val.id,
status: status,
isSync: false,
}).then(() => {
_this.getList();
_this.$modal.msgSuccess('操作成功');
});
} else {
return console.log('关闭');
}
});
} else {
// 无下级订单
_this.$modal
.confirm(
'是否确认"' + tip + '"集团订单名称为"' + val.name + '"的数据项?'
)
.then(function () {
return groupOrderStatusSet({ id: val.id, status: status });
})
.then(() => {
_this.getList();
_this.$modal.msgSuccess('操作成功');
})
.catch(() => {});
}
},
handleCancel() {
this.$refs.orderGroupAdd.formClear()
this.centervisible = false
this.addOrEditTitle = ''
this.$refs.orderGroupAdd.formClear();
this.centervisible = false;
this.addOrEditTitle = '';
},
handleConfirm() {
this.$refs.orderGroupAdd.submitForm()
this.$refs.orderGroupAdd.submitForm();
},
successSubmit() {
this.handleCancel()
this.getList()
this.handleCancel();
this.getList();
},
// 下发新增
bindOrderCancel() {
this.$refs.bindOrder.formClear()
this.bindOrderVisible = false
this.$refs.bindOrder.formClear();
this.bindOrderVisible = false;
},
bindOrderConfirm() {
this.$refs.bindOrder.bindOrderSubmit()
this.$refs.bindOrder.bindOrderSubmit();
},
bindOrderSubmit() {
this.bindOrderCancel()
this.getList()
}
}
}
this.bindOrderCancel();
this.getList();
},
},
};
</script>

344
src/views/order/base/orderManage/index.vue
View File

@ -4,31 +4,27 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<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="290"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
@clickBtn="handleClick" />
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
<!-- 新增&编辑 -->
<base-dialog
:dialogTitle="addOrEditTitle"
@ -36,9 +32,10 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width='60%'
>
<order-add ref="orderAdd" @successSubmit="successSubmit" />
width="60%">
<order-add
ref="orderAdd"
@successSubmit="successSubmit" />
</base-dialog>
<!-- 查看详情 -->
<!-- 新增工单 -->
@ -48,85 +45,93 @@
@cancel="addWorkOrderCancel"
@confirm="addWorkOrderConfirm"
:before-close="addWorkOrderCancel"
width='70%'
>
<add-work-order ref="addWorkOrder" @addWorkOrderSubmit="addWorkOrderSubmit" />
width="70%">
<add-work-order
ref="addWorkOrder"
@addWorkOrderSubmit="addWorkOrderSubmit" />
</base-dialog>
</div>
</template>
<script>
import { parseTime } from '@/utils/ruoyi'
import { getOrderPage, orderStatusSet, customerList, orderFinish } from '@/api/base/orderManage'
import OrderAdd from './components/orderAdd'
import AddWorkOrder from './components/addWorkOrder'
import { publicFormatter } from '@/utils/dict'
import { parseTime } from '@/utils/ruoyi';
import {
getOrderPage,
orderStatusSet,
customerList,
orderFinish,
} from '@/api/base/orderManage';
import OrderAdd from './components/orderAdd';
import AddWorkOrder from './components/addWorkOrder';
import { publicFormatter } from '@/utils/dict';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'createTime',
label: '添加时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'name',
label: '订单名称',
minWidth: 140,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'code',
label: '订单编码',
minWidth: 150,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'triggerOrigin',
label: '来源',
filter: publicFormatter('order_Origin')
filter: publicFormatter('order_Origin'),
},
{
prop: 'priority',
label: '优先级',
filter: publicFormatter('order_priority')
filter: publicFormatter('order_priority'),
},
{
prop: 'status',
label: '订单状态',
filter: publicFormatter('order_status')
filter: publicFormatter('order_status'),
},
{
prop: 'planQuantity',
label: '计划加工量',
width: 100
width: 100,
},
{
prop: 'actualQuantity',
label: '实际加工量',
width: 100
width: 100,
},
{
prop: 'productName',
label: '产品',
width: 200,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('unit_dict')
filter: publicFormatter('unit_dict'),
},
{
prop: 'price',
label: '单价(元)',
align: 'right'
align: 'right',
},
{
prop: 'workOrderNum',
label: '工单数量'
}
]
label: '工单数量',
},
];
export default {
name: 'OrderManage',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -134,7 +139,7 @@ export default {
type: 'input',
label: '订单名称',
placeholder: '订单名称',
param: 'name'
param: 'name',
},
{
type: 'select',
@ -142,37 +147,39 @@ export default {
selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
labelField: 'label',
valueField: 'value',
param: 'status'
param: 'status',
},
{
type: 'datePicker',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: "yyyy-MM-dd",
valueFormat: 'yyyy-MM-dd',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'timeVal',
defaultSelect: [],
width: 250
width: 250,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
type: this.$auth.hasPermi('base:order-manage:create')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
btnName: '新增',
name: 'add',
color: 'success',
plain: true
}
plain: true,
},
],
// 查询参数
queryParams: {
@ -180,12 +187,11 @@ export default {
pageSize: 20,
name: null,
status: null,
lastIssuedTime: []
lastIssuedTime: [],
},
total: 0,
tableProps,
list: [],
tableH: this.tableHeight(260),
tableBtn: [
this.$auth.hasPermi('base:order-manage:addWorkOrder')
? {
@ -198,10 +204,10 @@ export default {
{
type: 'less',
name: 'status',
value: 3
}
]
}
value: 3,
},
],
},
}
: undefined,
this.$auth.hasPermi('base:order-manage:bindWorkOrder')
@ -215,10 +221,10 @@ export default {
{
type: 'less',
name: 'status',
value: 3
}
]
}
value: 3,
},
],
},
}
: undefined,
this.$auth.hasPermi('base:order-manage:complete')
@ -232,10 +238,10 @@ export default {
{
type: 'equal',
name: 'status',
value: 3
}
]
}
value: 3,
},
],
},
}
: undefined,
this.$auth.hasPermi('base:order-manage:termination')
@ -249,10 +255,10 @@ export default {
{
type: 'equal',
name: 'status',
value: 3
}
]
}
value: 3,
},
],
},
}
: undefined,
this.$auth.hasPermi('base:order-manage:cancel')
@ -266,16 +272,16 @@ export default {
{
type: 'less',
name: 'status',
value: 2
}
]
}
value: 2,
},
],
},
}
: undefined,
this.$auth.hasPermi('base:order-manage:detail')
? {
type: 'detail',
btnName: '详情'
btnName: '详情',
}
: undefined,
this.$auth.hasPermi('base:order-manage:edit')
@ -288,172 +294,190 @@ export default {
{
type: 'less',
name: 'status',
value: 2
value: 2,
},
],
},
}
]
}
}
: undefined
: undefined,
].filter((v) => v),
addOrEditTitle: '',
centervisible: false,
priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
workIssueTitle: '',
addWorkOrdervisible: false,
orderDetailVisible: false
}
orderDetailVisible: false,
};
},
components: { OrderAdd, AddWorkOrder },
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
this.getList()
this.getList();
},
methods: {
getList() {
getOrderPage({...this.queryParams}).then(res => {
let arr = res.data.records || []
this.total = res.data.total || 0
getOrderPage({ ...this.queryParams }).then((res) => {
let arr = res.data.records || [];
this.total = res.data.total || 0;
if (arr.length > 0) {
customerList().then(result => {
let tempData = result.data || []
customerList().then((result) => {
let tempData = result.data || [];
if (tempData.length > 0) {
arr.map(item => {
arr.map((item) => {
for (let i of tempData) {
if (item.customerId === i.id) {
item.customerId = i.name
item.customerId = i.name;
}
}
item.price = item.price ? item.price.toFixed(2) : '0.00'
})
this.list = arr
item.price = item.price ? item.price.toFixed(2) : '0.00';
});
this.list = arr;
}
})
}else {
this.list = arr
});
} else {
this.list = arr;
}
})
});
},
buttonClick(val) {
console.log(val)
console.log(val);
if (val.btnName === 'search') {
this.queryParams.name = val.name
this.queryParams.status = val.status
this.queryParams.name = val.name;
this.queryParams.status = val.status;
if (val.timeVal && val.timeVal.length > 0) {
this.queryParams.lastIssuedTime[0] = val.timeVal[0] + ' 00:00:00'
this.queryParams.lastIssuedTime[1] = val.timeVal[1] + ' 23:59:59'
this.queryParams.lastIssuedTime[0] = val.timeVal[0] + ' 00:00:00';
this.queryParams.lastIssuedTime[1] = val.timeVal[1] + ' 23:59:59';
} else {
this.queryParams.lastIssuedTime = []
this.queryParams.lastIssuedTime = [];
}
this.getList()
this.getList();
} else {
this.addOrEditTitle = '新增'
this.centervisible = true
this.addOrEditTitle = '新增';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.orderAdd.init()
})
this.$refs.orderAdd.init();
});
}
},
handleClick(val) {
console.log(val)
console.log(val);
switch (val.type) {
case 'edit':
this.addOrEditTitle = '编辑'
this.centervisible = true
this.addOrEditTitle = '编辑';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.orderAdd.init(val.data.id)
})
break
this.$refs.orderAdd.init(val.data.id);
});
break;
case 'cancel':
this.handleEditStatus(val.data, '作废', '6')
break
this.handleEditStatus(val.data, '作废', '6');
break;
case 'termination':
this.handleEditStatus(val.data, '终止', '5')
break
this.handleEditStatus(val.data, '终止', '5');
break;
case 'detail':
this.$router.push({path: '/order/base/order-manage/order-detail-data?orderId='+ val.data.id})
break
this.$router.push({
path:
'/order/base/order-manage/order-detail-data?orderId=' +
val.data.id,
});
break;
case 'add':
this.workIssueTitle = '新增工单'
this.addWorkOrdervisible = true
this.workIssueTitle = '新增工单';
this.addWorkOrdervisible = true;
this.$nextTick(() => {
this.$refs.addWorkOrder.init(val.data, 'add')
})
break
this.$refs.addWorkOrder.init(val.data, 'add');
});
break;
case 'bind':
this.workIssueTitle = '绑定工单'
this.addWorkOrdervisible = true
this.workIssueTitle = '绑定工单';
this.addWorkOrdervisible = true;
this.$nextTick(() => {
this.$refs.addWorkOrder.init(val.data, 'bind')
})
break
this.$refs.addWorkOrder.init(val.data, 'bind');
});
break;
case 'complete':
this.handleEditStatus(val.data, '完成', '4')
break
this.handleEditStatus(val.data, '完成', '4');
break;
default:
}
},
// 完成,终止，作废
handleEditStatus(val, tip, status) {
let _this = this
if (val.workOrderNum > 0) {//有下级工单
_this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', {
let _this = this;
if (val.workOrderNum > 0) {
//有下级工单
_this
.$confirm('是否将"' + tip + '"操作同步至下级工单?', '确认信息', {
type: 'warning',
distinguishCancelAndClose: true,
confirmButtonText: '同步',
cancelButtonText: '不同步'
}).then(function() {
console.log('同步')
orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
_this.getList();
_this.$modal.msgSuccess("操作成功");
cancelButtonText: '不同步',
})
}).catch(action => {
if (action === 'cancel') {
console.log('不同步')
orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
.then(function () {
console.log('同步');
orderStatusSet({ id: val.id, status: status, isSync: true }).then(
() => {
_this.getList();
_this.$modal.msgSuccess("操作成功");
})
}else {
return console.log('关闭')
_this.$modal.msgSuccess('操作成功');
}
);
})
}else{// 无下级工单
_this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() {
return orderStatusSet({ id: val.id, status: status})
.catch((action) => {
if (action === 'cancel') {
console.log('不同步');
orderStatusSet({
id: val.id,
status: status,
isSync: false,
}).then(() => {
_this.getList();
_this.$modal.msgSuccess("操作成功");
}).catch(() => {});
_this.$modal.msgSuccess('操作成功');
});
} else {
return console.log('关闭');
}
});
} else {
// 无下级工单
_this.$modal
.confirm(
'是否确认"' + tip + '"厂务订单名称为"' + val.name + '"的数据项?'
)
.then(function () {
return orderStatusSet({ id: val.id, status: status });
})
.then(() => {
_this.getList();
_this.$modal.msgSuccess('操作成功');
})
.catch(() => {});
}
},
// 新增
handleCancel() {
this.$refs.orderAdd.formClear()
this.centervisible = false
this.addOrEditTitle = ''
this.$refs.orderAdd.formClear();
this.centervisible = false;
this.addOrEditTitle = '';
},
handleConfirm() {
this.$refs.orderAdd.submitForm()
this.$refs.orderAdd.submitForm();
},
successSubmit() {
this.handleCancel()
this.getList()
this.handleCancel();
this.getList();
},
// 下发新增
addWorkOrderCancel() {
this.$refs.addWorkOrder.formClear()
this.addWorkOrdervisible = false
this.$refs.addWorkOrder.formClear();
this.addWorkOrdervisible = false;
},
addWorkOrderConfirm() {
this.$refs.addWorkOrder.addWorkOrderSubmit()
this.$refs.addWorkOrder.addWorkOrderSubmit();
},
addWorkOrderSubmit() {
this.addWorkOrderCancel()
this.getList()
}
this.addWorkOrderCancel();
this.getList();
},
// bindWorkOrderCancel() {
// this.$refs.bindWorkOrder.formClear()
// this.bindWorkOrdervisible = false
@ -465,6 +489,6 @@ export default {
// this.bindWorkOrderCancel()
// this.getList()
// }
}
}
},
};
</script>

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

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

129
src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
View File

@ -4,8 +4,7 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<base-table
:page="queryParams.pageNo"
@ -13,59 +12,63 @@
:table-props="tableProps"
:table-data="list"
:max-height="tableH"
:row-class-name="tableRowClassName"
/>
:row-class-name="tableRowClassName" />
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
</div>
</template>
<script>
import { publicFormatter } from '@/utils/dict'
import { parseTime } from '@/utils/ruoyi'
import { environmentalCheckRecordPage, environmentalCheckRecordExport, environmentalCheckPage } from '@/api/safetyEnvironmental/environmental'
import moment from 'moment'
import { publicFormatter } from '@/utils/dict';
import { parseTime } from '@/utils/ruoyi';
import {
environmentalCheckRecordPage,
environmentalCheckRecordExport,
environmentalCheckPage,
} from '@/api/safetyEnvironmental/environmental';
import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'checkName',
label: '指标名称'
label: '指标名称',
},
{
prop: 'checkValue',
label: '检测数值'
label: '检测数值',
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('environment_check_unit')
filter: publicFormatter('environment_check_unit'),
},
{
prop: 'checkTime',
label: '检测时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'origin',
label: '来源',
filter: (val) => ['手动', '自动'][val]
filter: (val) => ['手动', '自动'][val],
},
{
prop: 'recordPerson',
label: '录入人'
label: '录入人',
},
{
prop: 'recordTime',
label: '录入时间',
filter: parseTime,
minWidth: 160
}
]
minWidth: 160,
},
];
export default {
name: 'VocDetectionHistory',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -74,26 +77,26 @@ export default {
label: '指标名称',
selectOptions: [],
param: 'checkId',
filterable: true
filterable: true,
},
{
type: 'datePicker',
label: '时间',
dateType: 'datetimerange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp",
valueFormat: 'timestamp',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'timeVal',
defaultSelect: [],
width: 350
width: 350,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
@ -103,8 +106,8 @@ export default {
btnName: '导出',
name: 'export',
color: 'primary',
plain: true
}
plain: true,
},
],
// 查询参数
queryParams: {
@ -113,68 +116,68 @@ export default {
checkId: null,
checkType: 3,
startTime: null,
endTime: null
endTime: null,
},
tableProps,
list: [],
total: 0,
tableH: this.tableHeight(260)
}
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf()
this.formConfig[1].defaultSelect = [start, end]
this.queryParams.startTime = start
this.queryParams.endTime = end
this.getSelectList()
this.getList()
let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf();
this.formConfig[1].defaultSelect = [start, end];
this.queryParams.startTime = start;
this.queryParams.endTime = end;
this.getSelectList();
this.getList();
},
methods: {
buttonClick(val) {
this.queryParams.pageNo = 1;
this.queryParams.checkId = val.checkId
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
this.queryParams.checkId = val.checkId;
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
if (val.btnName === 'search') {
this.getList()
this.getList();
} else {
this.$modal.confirm('是否确认导出').then(() => {
return environmentalCheckRecordExport({...this.queryParams});
}).then(response => {
this.$modal
.confirm('是否确认导出')
.then(() => {
return environmentalCheckRecordExport({ ...this.queryParams });
})
.then((response) => {
this.$download.excel(response, '废水检测历史记录.xls');
}).catch(() => {})
})
.catch(() => {});
}
},
getList() {
environmentalCheckRecordPage({...this.queryParams}).then(res => {
this.list = res.data.list || []
this.total = res.data.total || 0
})
environmentalCheckRecordPage({ ...this.queryParams }).then((res) => {
this.list = res.data.list || [];
this.total = res.data.total || 0;
});
},
getSelectList() {
environmentalCheckPage({
pageNo: 1,
pageSize: 100,
checkType: 3
}).then(res => {
console.log(res)
this.formConfig[0].selectOptions = res.data.list || []
})
checkType: 3,
}).then((res) => {
console.log(res);
this.formConfig[0].selectOptions = res.data.list || [];
});
},
tableRowClassName({row, rowIndex}) {
console.log(row)
tableRowClassName({ row, rowIndex }) {
console.log(row);
if (row.markRed) {
return 'warning-row'
}else {
return ''
return 'warning-row';
} else {
return '';
}
}
}
}
},
},
};
</script>
<style lang='scss'>
.vocHis {

143
src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
View File

@ -4,31 +4,27 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<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"
@clickBtn="handleClick"
/>
@clickBtn="handleClick" />
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
<!-- 新增&编辑 -->
<base-dialog
:dialogTitle="addOrEditTitle"
@ -36,55 +32,61 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width='60%'
>
<voc-add ref="vocAdd" @successSubmit="successSubmit" />
width="60%">
<voc-add
ref="vocAdd"
@successSubmit="successSubmit" />
</base-dialog>
</div>
</template>
<script>
import { parseTime } from '@/utils/ruoyi'
import VocAdd from './components/vocAdd'
import { publicFormatter } from '@/utils/dict'
import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
import { parseTime } from '@/utils/ruoyi';
import VocAdd from './components/vocAdd';
import { publicFormatter } from '@/utils/dict';
import {
environmentalCheckPage,
environmentalCheckDelete,
} from '@/api/safetyEnvironmental/environmental';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'name',
label: '指标名称',
minWidth: 120,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'code',
label: '指标编码',
minWidth: 120
minWidth: 120,
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('environment_check_unit')
filter: publicFormatter('environment_check_unit'),
},
{
prop: 'minValue',
label: '最小值'
label: '最小值',
},
{
prop: 'maxValue',
label: '最大值'
label: '最大值',
},
{
prop: 'creator',
label: '创建人'
label: '创建人',
},
{
prop: 'createTime',
label: '创建时间',
filter: parseTime,
minWidth: 160
}
]
minWidth: 160,
},
];
export default {
name: 'VocDetectionIndication',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -92,13 +94,13 @@ export default {
type: 'input',
label: '指标名称',
placeholder: '指标名称',
param: 'name'
param: 'name',
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: this.$auth.hasPermi('base:voc:create') ? 'separate' : '',
@ -108,98 +110,101 @@ export default {
btnName: '新增',
name: 'add',
color: 'success',
plain: true
}
plain: true,
},
],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 20,
checkType: 3,
name: null
name: null,
},
total: 0,
tableProps,
list: [],
tableH: this.tableHeight(260),
tableBtn: [
this.$auth.hasPermi('base:voc:update')
? {
type: 'edit',
btnName: '编辑'
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('base:voc:delete')
? {
type: 'delete',
btnName: '删除'
btnName: '删除',
}
: undefined
].filter((v)=>v),
: undefined,
].filter((v) => v),
addOrEditTitle: '',
centervisible: false
}
centervisible: false,
};
},
components: { VocAdd },
mounted() {
this.getList()
this.getList();
},
methods: {
getList() {
environmentalCheckPage({...this.queryParams}).then(res => {
this.list = res.data.list || []
this.total = res.data.total || 0
})
environmentalCheckPage({ ...this.queryParams }).then((res) => {
this.list = res.data.list || [];
this.total = res.data.total || 0;
});
},
buttonClick(val) {
console.log(val)
console.log(val);
if (val.btnName === 'search') {
this.queryParams.name = val.name
this.getList()
this.queryParams.name = val.name;
this.getList();
} else {
this.addOrEditTitle = '新增'
this.centervisible = true
this.addOrEditTitle = '新增';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.vocAdd.init()
})
this.$refs.vocAdd.init();
});
}
},
handleClick(val) {
console.log(val)
console.log(val);
switch (val.type) {
case 'edit':
this.addOrEditTitle = '编辑'
this.centervisible = true
this.addOrEditTitle = '编辑';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.vocAdd.init(val.data.id)
})
break
this.$refs.vocAdd.init(val.data.id);
});
break;
default:
this.handleDelete(val.data)
this.handleDelete(val.data);
}
},
// 删除
handleDelete(val) {
this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
return environmentalCheckDelete({ id: val.id })
}).then(() => {
this.$modal
.confirm('是否确认删除"' + val.name + '"的数据项?')
.then(function () {
return environmentalCheckDelete({ id: val.id });
})
.then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
this.$modal.msgSuccess('操作成功');
})
.catch(() => {});
},
// 新增
handleCancel() {
this.$refs.vocAdd.formClear()
this.centervisible = false
this.addOrEditTitle = ''
this.$refs.vocAdd.formClear();
this.centervisible = false;
this.addOrEditTitle = '';
},
handleConfirm() {
this.$refs.vocAdd.submitForm()
this.$refs.vocAdd.submitForm();
},
successSubmit() {
this.handleCancel()
this.getList()
}
}
}
this.handleCancel();
this.getList();
},
},
};
</script>

129
src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
View File

@ -4,8 +4,7 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<base-table
:page="queryParams.pageNo"
@ -13,59 +12,63 @@
:table-props="tableProps"
:table-data="list"
:max-height="tableH"
:row-class-name="tableRowClassName"
/>
:row-class-name="tableRowClassName" />
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
</div>
</template>
<script>
import { publicFormatter } from '@/utils/dict'
import { parseTime } from '@/utils/ruoyi'
import { environmentalCheckRecordPage, environmentalCheckRecordExport, environmentalCheckPage } from '@/api/safetyEnvironmental/environmental'
import moment from 'moment'
import { publicFormatter } from '@/utils/dict';
import { parseTime } from '@/utils/ruoyi';
import {
environmentalCheckRecordPage,
environmentalCheckRecordExport,
environmentalCheckPage,
} from '@/api/safetyEnvironmental/environmental';
import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'checkName',
label: '指标名称'
label: '指标名称',
},
{
prop: 'checkValue',
label: '检测数值'
label: '检测数值',
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('environment_check_unit')
filter: publicFormatter('environment_check_unit'),
},
{
prop: 'checkTime',
label: '检测时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'origin',
label: '来源',
filter: (val) => ['手动', '自动'][val]
filter: (val) => ['手动', '自动'][val],
},
{
prop: 'recordPerson',
label: '录入人'
label: '录入人',
},
{
prop: 'recordTime',
label: '录入时间',
filter: parseTime,
minWidth: 160
}
]
minWidth: 160,
},
];
export default {
name: 'WasteGasDetectionHistory',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -74,26 +77,26 @@ export default {
label: '指标名称',
selectOptions: [],
param: 'checkId',
filterable: true
filterable: true,
},
{
type: 'datePicker',
label: '时间',
dateType: 'datetimerange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp",
valueFormat: 'timestamp',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'timeVal',
defaultSelect: [],
width: 350
width: 350,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
@ -103,8 +106,8 @@ export default {
btnName: '导出',
name: 'export',
color: 'primary',
plain: true
}
plain: true,
},
],
// 查询参数
queryParams: {
@ -113,68 +116,68 @@ export default {
checkId: null,
checkType: 2,
startTime: null,
endTime: null
endTime: null,
},
tableProps,
list: [],
total: 0,
tableH: this.tableHeight(260)
}
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf()
this.formConfig[1].defaultSelect = [start, end]
this.queryParams.startTime = start
this.queryParams.endTime = end
this.getSelectList()
this.getList()
let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf();
this.formConfig[1].defaultSelect = [start, end];
this.queryParams.startTime = start;
this.queryParams.endTime = end;
this.getSelectList();
this.getList();
},
methods: {
buttonClick(val) {
this.queryParams.pageNo = 1;
this.queryParams.checkId = val.checkId
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
this.queryParams.checkId = val.checkId;
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
if (val.btnName === 'search') {
this.getList()
this.getList();
} else {
this.$modal.confirm('是否确认导出').then(() => {
return environmentalCheckRecordExport({...this.queryParams});
}).then(response => {
this.$modal
.confirm('是否确认导出')
.then(() => {
return environmentalCheckRecordExport({ ...this.queryParams });
})
.then((response) => {
this.$download.excel(response, '废气检测历史记录.xls');
}).catch(() => {})
})
.catch(() => {});
}
},
getList() {
environmentalCheckRecordPage({...this.queryParams}).then(res => {
this.list = res.data.list || []
this.total = res.data.total || 0
})
environmentalCheckRecordPage({ ...this.queryParams }).then((res) => {
this.list = res.data.list || [];
this.total = res.data.total || 0;
});
},
getSelectList() {
environmentalCheckPage({
pageNo: 1,
pageSize: 100,
checkType: 2
}).then(res => {
console.log(res)
this.formConfig[0].selectOptions = res.data.list || []
})
checkType: 2,
}).then((res) => {
console.log(res);
this.formConfig[0].selectOptions = res.data.list || [];
});
},
tableRowClassName({row, rowIndex}) {
console.log(row)
tableRowClassName({ row, rowIndex }) {
console.log(row);
if (row.markRed) {
return 'warning-row'
}else {
return ''
return 'warning-row';
} else {
return '';
}
}
}
}
},
},
};
</script>
<style lang='scss'>
.wasteGasHis {

143
src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
View File

@ -4,31 +4,27 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<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"
@clickBtn="handleClick"
/>
@clickBtn="handleClick" />
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
<!-- 新增&编辑 -->
<base-dialog
:dialogTitle="addOrEditTitle"
@ -36,55 +32,61 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width='60%'
>
<waste-gas-add ref="wasteGasAdd" @successSubmit="successSubmit" />
width="60%">
<waste-gas-add
ref="wasteGasAdd"
@successSubmit="successSubmit" />
</base-dialog>
</div>
</template>
<script>
import { parseTime } from '@/utils/ruoyi'
import WasteGasAdd from './components/wasteGasAdd'
import { publicFormatter } from '@/utils/dict'
import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
import { parseTime } from '@/utils/ruoyi';
import WasteGasAdd from './components/wasteGasAdd';
import { publicFormatter } from '@/utils/dict';
import {
environmentalCheckPage,
environmentalCheckDelete,
} from '@/api/safetyEnvironmental/environmental';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'name',
label: '指标名称',
minWidth: 120,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'code',
label: '指标编码',
minWidth: 120
minWidth: 120,
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('environment_check_unit')
filter: publicFormatter('environment_check_unit'),
},
{
prop: 'minValue',
label: '最小值'
label: '最小值',
},
{
prop: 'maxValue',
label: '最大值'
label: '最大值',
},
{
prop: 'creator',
label: '创建人'
label: '创建人',
},
{
prop: 'createTime',
label: '创建时间',
filter: parseTime,
minWidth: 160
}
]
minWidth: 160,
},
];
export default {
name: 'WasteGasDetectionIndication',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -92,13 +94,13 @@ export default {
type: 'input',
label: '指标名称',
placeholder: '指标名称',
param: 'name'
param: 'name',
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: this.$auth.hasPermi('base:waste-gas:create') ? 'separate' : '',
@ -108,98 +110,101 @@ export default {
btnName: '新增',
name: 'add',
color: 'success',
plain: true
}
plain: true,
},
],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 20,
checkType: 2,
name: null
name: null,
},
total: 0,
tableProps,
list: [],
tableH: this.tableHeight(260),
tableBtn: [
this.$auth.hasPermi('base:waste-gas:update')
? {
type: 'edit',
btnName: '编辑'
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('base:waste-gas:delete')
? {
type: 'delete',
btnName: '删除'
btnName: '删除',
}
: undefined
].filter((v)=>v),
: undefined,
].filter((v) => v),
addOrEditTitle: '',
centervisible: false
}
centervisible: false,
};
},
components: { WasteGasAdd },
mounted() {
this.getList()
this.getList();
},
methods: {
getList() {
environmentalCheckPage({...this.queryParams}).then(res => {
this.list = res.data.list || []
this.total = res.data.total || 0
})
environmentalCheckPage({ ...this.queryParams }).then((res) => {
this.list = res.data.list || [];
this.total = res.data.total || 0;
});
},
buttonClick(val) {
console.log(val)
console.log(val);
if (val.btnName === 'search') {
this.queryParams.name = val.name
this.getList()
this.queryParams.name = val.name;
this.getList();
} else {
this.addOrEditTitle = '新增'
this.centervisible = true
this.addOrEditTitle = '新增';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.wasteGasAdd.init()
})
this.$refs.wasteGasAdd.init();
});
}
},
handleClick(val) {
console.log(val)
console.log(val);
switch (val.type) {
case 'edit':
this.addOrEditTitle = '编辑'
this.centervisible = true
this.addOrEditTitle = '编辑';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.wasteGasAdd.init(val.data.id)
})
break
this.$refs.wasteGasAdd.init(val.data.id);
});
break;
default:
this.handleDelete(val.data)
this.handleDelete(val.data);
}
},
// 删除
handleDelete(val) {
this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
return environmentalCheckDelete({ id: val.id })
}).then(() => {
this.$modal
.confirm('是否确认删除"' + val.name + '"的数据项?')
.then(function () {
return environmentalCheckDelete({ id: val.id });
})
.then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
this.$modal.msgSuccess('操作成功');
})
.catch(() => {});
},
// 新增
handleCancel() {
this.$refs.wasteGasAdd.formClear()
this.centervisible = false
this.addOrEditTitle = ''
this.$refs.wasteGasAdd.formClear();
this.centervisible = false;
this.addOrEditTitle = '';
},
handleConfirm() {
this.$refs.wasteGasAdd.submitForm()
this.$refs.wasteGasAdd.submitForm();
},
successSubmit() {
this.handleCancel()
this.getList()
}
}
}
this.handleCancel();
this.getList();
},
},
};
</script>

133
src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
View File

@ -4,8 +4,7 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<base-table
:page="queryParams.pageNo"
@ -13,59 +12,63 @@
:table-props="tableProps"
:table-data="list"
:max-height="tableH"
:row-class-name="tableRowClassName"
/>
:row-class-name="tableRowClassName" />
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
</div>
</template>
<script>
import { publicFormatter } from '@/utils/dict'
import { parseTime } from '@/utils/ruoyi'
import { environmentalCheckRecordPage, environmentalCheckRecordExport, environmentalCheckPage } from '@/api/safetyEnvironmental/environmental'
import moment from 'moment'
import { publicFormatter } from '@/utils/dict';
import { parseTime } from '@/utils/ruoyi';
import {
environmentalCheckRecordPage,
environmentalCheckRecordExport,
environmentalCheckPage,
} from '@/api/safetyEnvironmental/environmental';
import moment from 'moment';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'checkName',
label: '指标名称'
label: '指标名称',
},
{
prop: 'checkValue',
label: '检测数值'
label: '检测数值',
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('environment_check_unit')
filter: publicFormatter('environment_check_unit'),
},
{
prop: 'checkTime',
label: '检测时间',
filter: parseTime,
minWidth: 160
minWidth: 160,
},
{
prop: 'origin',
label: '来源',
filter: (val) => ['手动', '自动'][val]
filter: (val) => ['手动', '自动'][val],
},
{
prop: 'recordPerson',
label: '录入人'
label: '录入人',
},
{
prop: 'recordTime',
label: '录入时间',
filter: parseTime,
minWidth: 160
}
]
minWidth: 160,
},
];
export default {
name: 'WasteWaterDetectionHistory',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -74,37 +77,39 @@ export default {
label: '指标名称',
selectOptions: [],
param: 'checkId',
filterable: true
filterable: true,
},
{
type: 'datePicker',
label: '检测时间',
dateType: 'datetimerange',
format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: "timestamp",
valueFormat: 'timestamp',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'timeVal',
defaultSelect: [],
width: 350
width: 350,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: this.$auth.hasPermi('base:waste-water:export') ? 'separate' : '',
type: this.$auth.hasPermi('base:waste-water:export')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
btnName: '导出',
name: 'export',
color: 'primary',
plain: true
}
plain: true,
},
],
// 查询参数
queryParams: {
@ -113,68 +118,68 @@ export default {
checkId: null,
checkType: 1,
startTime: null,
endTime: null
endTime: null,
},
tableProps,
list: [],
total: 0,
tableH: this.tableHeight(260)
}
};
},
created() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260)
})
let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf()
this.formConfig[1].defaultSelect = [start, end]
this.queryParams.startTime = start
this.queryParams.endTime = end
this.getSelectList()
this.getList()
let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf();
this.formConfig[1].defaultSelect = [start, end];
this.queryParams.startTime = start;
this.queryParams.endTime = end;
this.getSelectList();
this.getList();
},
methods: {
buttonClick(val) {
this.queryParams.pageNo = 1;
this.queryParams.checkId = val.checkId
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
this.queryParams.checkId = val.checkId;
this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
if (val.btnName === 'search') {
this.getList()
this.getList();
} else {
this.$modal.confirm('是否确认导出').then(() => {
return environmentalCheckRecordExport({...this.queryParams});
}).then(response => {
this.$modal
.confirm('是否确认导出')
.then(() => {
return environmentalCheckRecordExport({ ...this.queryParams });
})
.then((response) => {
this.$download.excel(response, '废水检测历史记录.xls');
}).catch(() => {})
})
.catch(() => {});
}
},
getList() {
environmentalCheckRecordPage({...this.queryParams}).then(res => {
this.list = res.data.list || []
this.total = res.data.total || 0
})
environmentalCheckRecordPage({ ...this.queryParams }).then((res) => {
this.list = res.data.list || [];
this.total = res.data.total || 0;
});
},
getSelectList() {
environmentalCheckPage({
pageNo: 1,
pageSize: 100,
checkType: 1
}).then(res => {
console.log(res)
this.formConfig[0].selectOptions = res.data.list || []
})
checkType: 1,
}).then((res) => {
console.log(res);
this.formConfig[0].selectOptions = res.data.list || [];
});
},
tableRowClassName({row, rowIndex}) {
console.log(row)
tableRowClassName({ row, rowIndex }) {
console.log(row);
if (row.markRed) {
return 'warning-row'
}else {
return ''
return 'warning-row';
} else {
return '';
}
}
}
}
},
},
};
</script>
<style lang='scss'>
.wasteWaterHis {

147
src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
View File

@ -4,31 +4,27 @@
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
@headBtnClick="buttonClick" />
<!-- 列表 -->
<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"
@clickBtn="handleClick"
/>
@clickBtn="handleClick" />
</base-table>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
@pagination="getList" />
<!-- 新增&编辑 -->
<base-dialog
:dialogTitle="addOrEditTitle"
@ -36,55 +32,61 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width='60%'
>
<waste-water-add ref="wasteWaterAdd" @successSubmit="successSubmit" />
width="60%">
<waste-water-add
ref="wasteWaterAdd"
@successSubmit="successSubmit" />
</base-dialog>
</div>
</template>
<script>
import { parseTime } from '@/utils/ruoyi'
import WasteWaterAdd from './components/wasteWaterAdd'
import { publicFormatter } from '@/utils/dict'
import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
import { parseTime } from '@/utils/ruoyi';
import WasteWaterAdd from './components/wasteWaterAdd';
import { publicFormatter } from '@/utils/dict';
import {
environmentalCheckPage,
environmentalCheckDelete,
} from '@/api/safetyEnvironmental/environmental';
import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'name',
label: '指标名称',
minWidth: 120,
showOverflowtooltip: true
showOverflowtooltip: true,
},
{
prop: 'code',
label: '指标编码',
minWidth: 120
minWidth: 120,
},
{
prop: 'unit',
label: '单位',
filter: publicFormatter('environment_check_unit')
filter: publicFormatter('environment_check_unit'),
},
{
prop: 'minValue',
label: '最小值'
label: '最小值',
},
{
prop: 'maxValue',
label: '最大值'
label: '最大值',
},
{
prop: 'creator',
label: '创建人'
label: '创建人',
},
{
prop: 'createTime',
label: '创建时间',
filter: parseTime,
minWidth: 160
}
]
minWidth: 160,
},
];
export default {
name: 'WasteWaterDetectionIndication',
mixins: [tableHeightMixin],
data() {
return {
formConfig: [
@ -92,114 +94,119 @@ export default {
type: 'input',
label: '指标名称',
placeholder: '指标名称',
param: 'name'
param: 'name',
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary'
color: 'primary',
},
{
type: this.$auth.hasPermi('base:waste-water:create') ? 'separate' : '',
type: this.$auth.hasPermi('base:waste-water:create')
? 'separate'
: '',
},
{
type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
btnName: '新增',
name: 'add',
color: 'success',
plain: true
}
plain: true,
},
],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 20,
checkType: 1,
name: null
name: null,
},
total: 0,
tableProps,
list: [],
tableH: this.tableHeight(260),
tableBtn: [
this.$auth.hasPermi('base:waste-water:update')
? {
type: 'edit',
btnName: '编辑'
btnName: '编辑',
}
: undefined,
this.$auth.hasPermi('base:waste-water:delete')
? {
type: 'delete',
btnName: '删除'
btnName: '删除',
}
: undefined
].filter((v)=>v),
: undefined,
].filter((v) => v),
addOrEditTitle: '',
centervisible: false
}
centervisible: false,
};
},
components: { WasteWaterAdd },
mounted() {
this.getList()
this.getList();
},
methods: {
getList() {
environmentalCheckPage({...this.queryParams}).then(res => {
this.list = res.data.list || []
this.total = res.data.total || 0
})
environmentalCheckPage({ ...this.queryParams }).then((res) => {
this.list = res.data.list || [];
this.total = res.data.total || 0;
});
},
buttonClick(val) {
console.log(val)
console.log(val);
if (val.btnName === 'search') {
this.queryParams.name = val.name
this.getList()
this.queryParams.name = val.name;
this.getList();
} else {
this.addOrEditTitle = '新增'
this.centervisible = true
this.addOrEditTitle = '新增';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.wasteWaterAdd.init()
})
this.$refs.wasteWaterAdd.init();
});
}
},
handleClick(val) {
console.log(val)
console.log(val);
switch (val.type) {
case 'edit':
this.addOrEditTitle = '编辑'
this.centervisible = true
this.addOrEditTitle = '编辑';
this.centervisible = true;
this.$nextTick(() => {
this.$refs.wasteWaterAdd.init(val.data.id)
})
break
this.$refs.wasteWaterAdd.init(val.data.id);
});
break;
default:
this.handleDelete(val.data)
this.handleDelete(val.data);
}
},
// 删除
handleDelete(val) {
this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
return environmentalCheckDelete({ id: val.id })
}).then(() => {
this.$modal
.confirm('是否确认删除"' + val.name + '"的数据项?')
.then(function () {
return environmentalCheckDelete({ id: val.id });
})
.then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
this.$modal.msgSuccess('操作成功');
})
.catch(() => {});
},
// 新增
handleCancel() {
this.$refs.wasteWaterAdd.formClear()
this.centervisible = false
this.addOrEditTitle = ''
this.$refs.wasteWaterAdd.formClear();
this.centervisible = false;
this.addOrEditTitle = '';
},
handleConfirm() {
this.$refs.wasteWaterAdd.submitForm()
this.$refs.wasteWaterAdd.submitForm();
},
successSubmit() {
this.handleCancel()
this.getList()
}
}
}
this.handleCancel();
this.getList();
},
},
};
</script>