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

Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

Browse Source
This commit is contained in:
‘937886381’ 2024-03-21 16:35:02 +08:00
commit 96de42dc6a
16 changed files with 138 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,6 +111,7 @@ export default {
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'searchTime',
defaultSelect: [],
},
{
type: 'button',
@ -132,6 +133,14 @@ export default {
},
components: {},
created() {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
this.formConfig[2].defaultSelect = [start, end];
this.listQuery.reportTime = [
moment(start).startOf('day').format('x'),
moment(end).endOf('day').format('x'),
];
getEnergyTypeListAll().then((response) => {
this.formConfig[1].selectOptions = response.data;
});

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

@ -110,6 +110,7 @@ export default {
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
param: 'searchTime',
defaultSelect: [],
},
{
type: 'button',
@ -131,6 +132,14 @@ export default {
},
components: {},
created() {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
this.formConfig[2].defaultSelect = [start, end];
this.listQuery.times = [
moment(start).startOf('day').format('x'),
moment(end).endOf('day').format('x'),
];
getHotMaterialList().then((response) => {
this.formConfig[1].selectOptions = response.data;
});

14
src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
View File

@ -1,8 +1,5 @@
<template>
<div
id="analysischartLine"
style="width: 100%;height: 100%;"
></div>
<div id="analysischartLine" style="width: 100%;height: 100%;"></div>
</template>
<script>
import * as echarts from 'echarts'
@ -56,11 +53,10 @@ export default {
let yData = []
for (let j = 0; j < arr.length; j++) {
for (let k = 0; k < keys.length; k++) {
if (keys[k].indexOf(arr[j]+'_上年同期') > -1 || keys[k].indexOf(arr[j]+'_能源消耗') > -1) {
if (keys[k].indexOf(arr[j] + '_上年同期') > -1 || keys[k].indexOf(arr[j] + '_能源消耗') > -1) {
let obj = {
name: '',
type: 'line',
stack: 'Total',
data: []
}
obj.name = keys[k]
@ -71,14 +67,14 @@ export default {
for (let i = 0; i < this.chartData.length; i++) {
xData.push(this.chartData[i].time)
for (let p = 0; p < yData.length; p++) {
yData[p].data.push(this.chartData[i][ yData[p].name])
yData[p].data.push(this.chartData[i][yData[p].name])
}
}
var option = {
color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF','#FF6860','#FF9747','#B0EB42','#D680FF','#0043D2'],
color: ['#FFDC94', '#8EF0AB', '#63BDFF', '#288AFF', '#7164FF', '#FF6860', '#FF9747', '#B0EB42', '#D680FF', '#0043D2'],
legend: {
data: keys,
right:'1%'
right: '1%'
},
tooltip: {
trigger: 'axis'

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

@ -2,40 +2,22 @@
<div class="app-container energyOverlimitLog">
<!-- 搜索工作栏 -->
<search-bar
:formConfigs="formConfig"
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<el-tabs v-model="activeName" @tab-click="toggleTab">
<el-tab-pane label="自动抄表" name="auto"></el-tab-pane>
<el-tab-pane label="手动抄表" name="manual"></el-tab-pane>
</el-tabs>
<!-- 列表 -->
<div v-if="activeName === 'auto'">
<base-table
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-props="tableProps"
:table-data="list"
:max-height="tableH"
/>
<base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
:max-height="tableH" />
</div>
<div v-if="activeName === 'manual'">
<base-table
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-props="tableProps2"
:table-data="list2"
:max-height="tableH"
/>
<base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps2"
:table-data="list2" :max-height="tableH" />
</div>
<pagination
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
<pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
@pagination="getList" />
</div>
</template>
@ -160,8 +142,8 @@ export default {
method: '1'
},
typeList: [
{id: 1, name: '合并'},
{id: 2, name: '详细'}
{ id: 1, name: '合并' },
{ id: 2, name: '详细' }
]
};
},
@ -183,7 +165,7 @@ export default {
getList() {
getEnergyOverlimitLogPage(this.queryParams).then(response => {
let arr = response.data.list || [];
arr&&arr.map((item) => {
arr && arr.map((item) => {
this.typeList.map((i) => {
if (item.type === i.id) {
item.type = i.name
@ -191,15 +173,21 @@ export default {
})
if (item.minValue && item.maxValue) {
item.limitValue = item.minValue + '-' + item.maxValue
} else if(item.minValue){
} else if (item.minValue) {
item.limitValue = '最小值' + item.minValue
}else if(item.maxValue){
} else if (item.maxValue) {
item.limitValue = '最大值' + item.maxValue
} else {
item.limitValue = ''
}
})
this.list = arr
if (this.queryParams.method === '1') {
this.list = arr
this.list2 = []
} else {
this.list2 = arr
this.list1 = []
}
this.total = response.data.total;
});
},
@ -212,7 +200,7 @@ export default {
toggleTab() {
if (this.activeName === 'auto') {
this.queryParams.method = '1'
}else{
} else {
this.queryParams.method = '2'
}
this.queryParams.pageNo = 1
@ -232,21 +220,27 @@ export default {
height: 2px;
background-color: #e4e7ed;
}
.el-tabs__nav-wrap::after {
width: 0;
}
.el-tabs__item {
padding: 0 10px;
}
.el-tabs__item:hover {
color: rgba(0, 0, 0, 0.85);
}
.el-tabs__item.is-active {
color: rgba(0, 0, 0, 0.85);
}
.el-tabs__item {
color: rgba(0, 0, 0, 0.45);
}
.searchBarBox {
margin-bottom: 0;
}

4
src/views/specialEquipment/check/Content-add.vue
View File

@ -24,6 +24,8 @@
<el-form-item label="部门" prop="departmentId">
<el-select
v-model="dataForm.departmentId"
filterable
clearable
:placeholder="`请选择部门`">
<el-option
v-for="opt in departmentOptions"
@ -167,7 +169,7 @@ export default {
const workerlist = await this.$axios(
// '/base/core-worker/listAll'
'/base/core-worker/workerList'
);
);
if (workerlist.code == 0) {
inspectorList = inspectorList.concat(
workerlist.data.map((item) => ({

12
src/views/specialEquipment/check/Content-add_detail.vue
View File

@ -155,6 +155,18 @@ export default {
rules: [
{ required: true, message: '设备不能为空', trigger: 'blur' },
],
bind: {
clearable: true,
filterable: true
}
},
{
input: true,
label: '巡检项目',
prop: 'program',
rules: [
{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
],
},
],
[

4
src/views/specialEquipment/check/Content-edit.vue
View File

@ -251,6 +251,10 @@ export default {
rules: [
{ required: true, message: '设备不能为空', trigger: 'blur' },
],
bind: {
filterable: true,
clearable: true,
}
},
],
[

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

@ -91,7 +91,7 @@ export default {
tableProps: [
{ prop: 'name', label: '巡检单名称' },
{ prop: 'department', label: '部门' },
{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
{ prop: 'planCheckTime', label: '巡检时间', filter: parseTime },
{ prop: 'groupClass', label: '班次' },
// {
// prop: '_detail',

1
src/views/specialEquipment/check/add.vue
View File

@ -109,6 +109,7 @@ export default {
departmentId: null,
planCheckTime: null,
confirmTimeLimit: null,
checkPeriod: null,
groupClass: null,
remark: null,
// special: true,

12
src/views/specialEquipment/maintain/Monitor--detail.vue
View File

@ -40,37 +40,37 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="保养计划名称" prop="name">
<span>{{ form.name }}</span>
<span>{{ form.name || '---' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部门" prop="departmentName">
<span>{{ form.departmentName }}</span>
<span>{{ form.departmentName || '---' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产线名" prop="lineName">
<span>{{ form.lineName }}</span>
<span>{{ form.lineName || '---' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="保养频率" prop="maintenancePeriod">
<span>{{ form.maintenancePeriod }}</span>
<span>{{ form.maintenancePeriod || '---' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="保养时长" prop="maintainDuration">
<span>{{ form.maintainDuration }}</span>
<span>{{ form.maintainDuration || '---' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计划保养人员" prop="maintainer">
<span>{{ form.maintainer }}</span>
<span>{{ form.maintainer || '---' }}</span>
</el-form-item>
</el-col>
</el-row>

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

@ -119,7 +119,7 @@ const btn = {
render: function (h) {
return (
<el-button type="text" onClick={this.handleClick}>
{this.injectData.name}
{this.injectData.entryText}
</el-button>
);
},
@ -188,7 +188,7 @@ export default {
{
prop: 'opt2',
label: '保养内容',
name: '详情',
entryText: '详情',
subcomponent: btn,
width: 100,
},
@ -386,6 +386,7 @@ export default {
case '保养内容':
this.monitorDetailVisible = true;
this.$nextTick(() => {
console.log('value', value);
this.$refs.monitorDetailDrawer.show(value);
});
break;

4
src/views/specialEquipment/maintain/PlanConfig--addContent.vue
View File

@ -188,6 +188,10 @@ export default {
rules: [
{ required: true, message: '设备不能为空', trigger: 'blur' },
],
bind: {
filterable: true,
clearable: true,
}
},
],
[

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

@ -296,6 +296,8 @@ export default {
placeholder: '请选择保养计划名称',
param: 'maintainPlanId',
defaultSelect: null,
filterable: true,
clearable: true
},
// 开始结束时间
{

2
src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
View File

@ -269,6 +269,7 @@ export default {
},
mounted() {
// !this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
// this.getList('code');
this.getList('maintainer');
this.getList('department');
this.getList('line');
@ -328,6 +329,7 @@ export default {
'/base/core-department/listAll',
'/base/core-worker/workerList',
// '/base/core-worker/listAll',
'/base/equipment-maintain-log/getCode',
];
let res;
switch (source) {

19
src/views/specialEquipment/maintain/WaitingList.vue
View File

@ -381,6 +381,8 @@ export default {
placeholder: '请选择保养计划名称',
param: 'maintainPlanId',
defaultSelect: null,
clearable: true,
filterable: true,
},
// 开始结束时间
{
@ -669,8 +671,21 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = '添加待确认保养记录';
this.$axios({
url: '/base/equipment-maintain-log/getCode',
})
.then((res) => {
if (res.code == 0) {
this.form.maintainOrderNumber = res.data;
this.open = true;
this.title = '添加待确认保养记录';
}
})
.catch((err) => {
this.$message.error('获取保养单号出错');
this.open = true;
this.title = '添加待确认保养记录';
});
},
getConfirmed() {

35
src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue
View File

@ -9,7 +9,9 @@
<el-drawer
:visible="visible"
:show-close="false"
:wrapper-closable="false"
:wrapperClosable="true"
:close-on-click-modal="true"
:before-close="handleConfirmClose"
class="drawer"
custom-class="mes-drawer"
size="60%"
@ -172,6 +174,10 @@ export default {
rules: [
{ required: true, message: '设备不能为空', trigger: 'blur' },
],
bind: {
filterable: true,
clearable: true,
},
},
],
[
@ -253,6 +259,33 @@ export default {
// this.getList('line');
},
methods: {
/** 确认是否关闭 */
async handleConfirmClose() {
try {
if (
await this.$confirm(
<div style="position: relative; margin-bottom: 26px; overflow: visible;">
<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
确认要关闭页面吗?
</h1>
</div>,
// <p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
// 确定关闭将不保留编辑内容
// </p>
{
confirmButtonText: '确 定',
cancelButtonText: '取 消',
type: 'warning',
}
)
) {
this.handleConfirm();
}
} catch (err) {
return false;
}
},
handleSearchBarBtnClick(btn) {
switch (btn.btnName) {
case 'search':