Merge branch 'projects/mesxc-test' into projects/mesxc-dy
This commit is contained in:
helloDy
commit
db2cbb64c9
2
.env.dev
2
.env.dev
@ -1,7 +1,7 @@
|
||||
###
|
||||
# @Author: Do not edit
|
||||
# @Date: 2023-08-29 09:40:39
|
||||
# @LastEditTime: 2024-03-05 09:48:49
|
||||
# @LastEditTime: 2024-03-13 14:57:16
|
||||
# @LastEditors: zhp
|
||||
# @Description:
|
||||
###
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
import axios from 'axios'
|
||||
import {Message, MessageBox, Notification, Loading} from 'element-ui'
|
||||
import { Message, MessageBox, Notification, Loading } from 'element-ui'
|
||||
import store from '@/store'
|
||||
import {getAccessToken, getRefreshToken, getTenantId, setToken} from '@/utils/auth'
|
||||
import { getAccessToken, getRefreshToken, getTenantId, setToken } from '@/utils/auth'
|
||||
import errorCode from '@/utils/errorCode'
|
||||
import {getPath, getTenantEnable} from "@/utils/ruoyi";
|
||||
import {refreshToken} from "@/api/login";
|
||||
import { getPath, getTenantEnable } from "@/utils/ruoyi";
|
||||
import { refreshToken } from "@/api/login";
|
||||
|
||||
// 需要忽略的提示。忽略后，自动 Promise.reject('error')
|
||||
const ignoreMsgs = [
|
||||
@ -42,7 +42,7 @@ const service = axios.create({
|
||||
let loadingInstance = null
|
||||
function startLoading() {
|
||||
loadingInstance = Loading.service({
|
||||
fullscreen: false,
|
||||
fullscreen: true,
|
||||
text: '拼命加载中...',
|
||||
background: 'rgba(0, 0, 0, 0.1)'
|
||||
})
|
||||
@ -86,7 +86,7 @@ service.interceptors.request.use(config => {
|
||||
for (const propName of Object.keys(config.params)) {
|
||||
const value = config.params[propName];
|
||||
const part = encodeURIComponent(propName) + '='
|
||||
if (value !== null && typeof(value) !== "undefined") {
|
||||
if (value !== null && typeof (value) !== "undefined") {
|
||||
if (typeof value === 'object') {
|
||||
for (const key of Object.keys(value)) {
|
||||
let params = propName + '[' + key + ']';
|
||||
@ -104,9 +104,9 @@ service.interceptors.request.use(config => {
|
||||
}
|
||||
return config
|
||||
}, error => {
|
||||
tryHideFullScreenLoading()
|
||||
console.log(error)
|
||||
Promise.reject(error)
|
||||
tryHideFullScreenLoading()
|
||||
console.log(error)
|
||||
Promise.reject(error)
|
||||
})
|
||||
|
||||
// 响应拦截器
|
||||
@ -189,23 +189,23 @@ service.interceptors.response.use(async res => {
|
||||
return res.data
|
||||
}
|
||||
}, error => {
|
||||
tryHideFullScreenLoading()
|
||||
console.log('err' + error)
|
||||
let {message} = error;
|
||||
if (message === "Network Error") {
|
||||
message = "后端接口连接异常";
|
||||
} else if (message.includes("timeout")) {
|
||||
message = "系统接口请求超时";
|
||||
} else if (message.includes("Request failed with status code")) {
|
||||
message = "系统接口" + message.substr(message.length - 3) + "异常";
|
||||
}
|
||||
Message({
|
||||
message: message,
|
||||
type: 'error',
|
||||
duration: 5 * 1000
|
||||
})
|
||||
return Promise.reject(error)
|
||||
tryHideFullScreenLoading()
|
||||
console.log('err' + error)
|
||||
let { message } = error;
|
||||
if (message === "Network Error") {
|
||||
message = "后端接口连接异常";
|
||||
} else if (message.includes("timeout")) {
|
||||
message = "系统接口请求超时";
|
||||
} else if (message.includes("Request failed with status code")) {
|
||||
message = "系统接口" + message.substr(message.length - 3) + "异常";
|
||||
}
|
||||
Message({
|
||||
message: message,
|
||||
type: 'error',
|
||||
duration: 5 * 1000
|
||||
})
|
||||
return Promise.reject(error)
|
||||
}
|
||||
)
|
||||
|
||||
export function getBaseHeader() {
|
||||
@ -219,10 +219,10 @@ function handleAuthorized() {
|
||||
if (!isRelogin.show) {
|
||||
isRelogin.show = true;
|
||||
MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
|
||||
confirmButtonText: '重新登录',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}
|
||||
confirmButtonText: '重新登录',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}
|
||||
).then(() => {
|
||||
isRelogin.show = false;
|
||||
store.dispatch('LogOut').then(() => {
|
||||
|
||||
@ -1,17 +1,11 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-01-29 16:50:26
|
||||
* @LastEditTime: 2024-02-29 15:48:11
|
||||
* @LastEditTime: 2024-03-13 09:07:37
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2021-07-19 15:18:30
|
||||
* @LastEditors: zhp
|
||||
* @LastEditTime: 2024-01-29 17:05:37
|
||||
* @Description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div id="container" ref="container" class="visual-container" :style="styles">
|
||||
<el-row class="container-title" :style="{
|
||||
@ -19,7 +13,7 @@
|
||||
lineHeight: 88 + 'px',
|
||||
fontSize: 31 + 'px'
|
||||
}">
|
||||
<img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
|
||||
<img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
|
||||
许昌安彩冷端看板
|
||||
<h3 class="unit">单位：河南汇融数字科技有限公司</h3>
|
||||
<h3 class="time">{{ times }}</h3>
|
||||
@ -715,7 +709,7 @@ export default {
|
||||
`<span style="color:rgba(255,255,255,0.7)">${this.getSize(item.size) || ''}</span>`,
|
||||
`<span style="color:rgba(255,255,255,0.7)">${item.productArea + '㎡' || ''}</span>`,
|
||||
`<span style="color:rgba(255,255,255,0.7)">${item.wasteArea + '㎡' || ''}</span>`,
|
||||
`<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:rgba(255,255,255,0.7)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>
|
||||
`<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>
|
||||
<div style = "${(item.product * 100).toFixed(2) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>`
|
||||
])
|
||||
this.cutConfig.data = cutArr
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-01-29 13:45:56
|
||||
* @LastEditTime: 2024-02-18 14:20:01
|
||||
* @LastEditTime: 2024-03-13 08:58:01
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -87,7 +87,7 @@ export default {
|
||||
legend: {
|
||||
bottom: '10%',
|
||||
left: 'center',
|
||||
itemWidth: 20,
|
||||
itemWidth: 12,
|
||||
itemHeight:12,
|
||||
icon: 'rect',
|
||||
textStyle: {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-09-21 09:06:28
|
||||
* @LastEditTime: 2024-02-01 15:52:41
|
||||
* @LastEditTime: 2024-03-13 08:51:12
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -172,7 +172,7 @@ export default {
|
||||
axisLine: {
|
||||
lineStyle: {
|
||||
type: 'solid',
|
||||
color: '#213259', // 左边线的颜色
|
||||
color: '#25528f',
|
||||
width: '1' // 坐标线的宽度
|
||||
}
|
||||
},
|
||||
@ -186,7 +186,7 @@ export default {
|
||||
},
|
||||
splitLine: {
|
||||
lineStyle: {
|
||||
color: '#213259'
|
||||
color: '#25528f'
|
||||
}
|
||||
},
|
||||
data: nameList
|
||||
@ -215,7 +215,7 @@ export default {
|
||||
show: true,
|
||||
lineStyle: {
|
||||
type: 'solid',
|
||||
color: '#213259', // 左边线的颜色
|
||||
color: '#25528f',
|
||||
width: '1' // 坐标线的宽度
|
||||
}
|
||||
},
|
||||
@ -228,7 +228,7 @@ export default {
|
||||
},
|
||||
splitLine: {
|
||||
lineStyle: {
|
||||
color: '#213259'
|
||||
color: '#25528f'
|
||||
}
|
||||
}
|
||||
// type: 'value'
|
||||
@ -260,7 +260,7 @@ export default {
|
||||
show: true,
|
||||
lineStyle: {
|
||||
type: 'solid',
|
||||
color: '#213259', // 左边线的颜色
|
||||
color: '#25528f', // 左边线的颜色
|
||||
width: '1' // 坐标线的宽度
|
||||
}
|
||||
},
|
||||
@ -275,7 +275,7 @@ export default {
|
||||
},
|
||||
splitLine: {
|
||||
lineStyle: {
|
||||
color: '#213259'
|
||||
color: '#25528f'
|
||||
}
|
||||
}
|
||||
// type: 'value'
|
||||
|
||||
@ -145,7 +145,7 @@ export default {
|
||||
axisLine: {
|
||||
lineStyle: {
|
||||
type: 'solid',
|
||||
color: '#213259', // 左边线的颜色
|
||||
color: '#25528f', // 左边线的颜色
|
||||
width: '1' // 坐标线的宽度
|
||||
}
|
||||
},
|
||||
@ -156,7 +156,7 @@ export default {
|
||||
},
|
||||
splitLine: {
|
||||
lineStyle: {
|
||||
color: '#213259'
|
||||
color: '#25528f'
|
||||
}
|
||||
},
|
||||
data: this.nameList
|
||||
@ -172,17 +172,17 @@ export default {
|
||||
axisLabel: {
|
||||
color: "#fff",
|
||||
fontSize: 12,
|
||||
formatter: '{value}/kwh'
|
||||
// formatter: '{value}/kwh'
|
||||
},
|
||||
axisLine: {
|
||||
show: true,
|
||||
lineStyle: {
|
||||
color: "#213259",
|
||||
color: "#25528f",
|
||||
},
|
||||
},
|
||||
splitLine: {
|
||||
lineStyle: {
|
||||
color: "#213259a0",
|
||||
color: "#25528f",
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-12-27 13:54:52
|
||||
* @LastEditTime: 2024-02-21 14:38:54
|
||||
* @LastEditTime: 2024-03-13 09:04:11
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -170,8 +170,8 @@ export default {
|
||||
// }
|
||||
this.chart.setOption({
|
||||
legend: {
|
||||
// top: '2.5%',
|
||||
// right: '20px',
|
||||
itemWidth: 12,
|
||||
itemHeight: 12,
|
||||
icon: 'rect',
|
||||
textStyle: {
|
||||
color: '#ffffff'
|
||||
|
||||
@ -2,11 +2,7 @@
|
||||
<el-form ref="form" :rules="rules" label-width="100px" :model="form">
|
||||
<el-form-item label="员工" prop="workerId" v-if='!isEdit'>
|
||||
<el-select v-model="form.workerId" placeholder="请选择" filterable style="width: 100%;" @change="selectWorker()">
|
||||
<el-option
|
||||
v-for="item in workerList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
<el-option v-for="item in workerList" :key="item.id" :label="item.name" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@ -48,12 +44,12 @@ export default {
|
||||
this.form.teamId = param.teamId
|
||||
this.form.majorName = param.majorName
|
||||
this.workName = param.workName
|
||||
otherWorkerList({teamId:this.form.teamId}).then(res => {
|
||||
otherWorkerList({ teamId: this.form.teamId }).then(res => {
|
||||
this.workerList = res.data || []
|
||||
if (param.id) {
|
||||
this.isEdit = true
|
||||
this.form.id = param.id
|
||||
groupTeamDet({id: this.form.id}).then((res) => {
|
||||
groupTeamDet({ id: this.form.id }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.form.workerId = res.data.workerId
|
||||
this.form.remark = res.data.remark
|
||||
@ -72,7 +68,7 @@ export default {
|
||||
this.form.majorName = item.majorName
|
||||
}
|
||||
})
|
||||
}else{
|
||||
} else {
|
||||
this.form.majorName = ''
|
||||
}
|
||||
},
|
||||
|
||||
@ -9,18 +9,15 @@
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<p class="boldTitle">车间名称</p>
|
||||
<p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ? getDictDataLabel('workshop',queryParams.roomNameDict) : '-' }}</p>
|
||||
<p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ?
|
||||
getDictDataLabel('workshop', queryParams.roomNameDict) : '-' }}</p>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<p class="boldTitle">班组名称</p>
|
||||
<p class="lightText">{{ queryParams.teamName ? queryParams.teamName : '-' }}</p>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<base-table
|
||||
:table-props="tableProps"
|
||||
:table-data="tableData"
|
||||
:max-height="tableH"
|
||||
/>
|
||||
<base-table :table-props="tableProps" :table-data="tableData" :max-height="tableH" :page="1" :limit="1000000" />
|
||||
</div>
|
||||
</el-drawer>
|
||||
</div>
|
||||
@ -47,7 +44,7 @@ const tableProps = [
|
||||
},
|
||||
{
|
||||
prop: 'workTime',
|
||||
label: '工作时长'
|
||||
label: '工作时长(h)'
|
||||
}
|
||||
]
|
||||
export default {
|
||||
@ -83,21 +80,24 @@ export default {
|
||||
<style lang="scss" scoped>
|
||||
.box {
|
||||
padding: 0 32px;
|
||||
|
||||
.topBox {
|
||||
padding-bottom: 30px;
|
||||
margin-bottom: 30px;
|
||||
border-bottom: 1px solid #E9E9E9;
|
||||
|
||||
.boldTitle {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
color: rgba(0,0,0,0.85);
|
||||
color: rgba(0, 0, 0, 0.85);
|
||||
margin: 0;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.lightText {
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
color: rgba(102,102,102,0.75);
|
||||
color: rgba(102, 102, 102, 0.75);
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,28 +2,20 @@
|
||||
<el-form :inline="true" class="demo-form-inline">
|
||||
<span class="blue-block"></span>
|
||||
<el-form-item label="班次信息">
|
||||
<el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in classesArr"
|
||||
:key="item.id"
|
||||
:label="(item.roomName?item.roomName:'')+'-'+item.name"
|
||||
:value="item.id">
|
||||
<span>{{ item.roomName }}-{{item.name}}</span>
|
||||
<el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable
|
||||
filterable>
|
||||
<el-option v-for="item in classesArr" :key="item.id"
|
||||
:label="(item.roomName ? item.roomName : '') + '-' + item.name" :value="item.id">
|
||||
<span>{{ item.roomName }}-{{ item.name }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="班组信息">
|
||||
<el-input v-model="queryParams.teamName" placeholder="班组信息" style="width: 200px;" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上班时间">
|
||||
<el-date-picker
|
||||
v-model="queryParams.tiemStr"
|
||||
type="daterange"
|
||||
format='yyyy-MM-dd'
|
||||
value-format='yyyy-MM-dd'
|
||||
range-separator='-'
|
||||
style="width: 250px;"
|
||||
size="small">
|
||||
<el-form-item label="上班日期">
|
||||
<el-date-picker v-model="queryParams.tiemStr" type="daterange" format='yyyy-MM-dd' value-format='yyyy-MM-dd'
|
||||
range-separator='-' style="width: 250px;" size="small">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
@ -69,6 +61,7 @@ export default {
|
||||
font-size: 16px;
|
||||
color: #0B58FF;
|
||||
}
|
||||
|
||||
.el-input__prefix .el-icon-date {
|
||||
font-size: 16px;
|
||||
color: #0B58FF;
|
||||
@ -83,6 +76,7 @@ export default {
|
||||
background: #E8E8E8;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.demo-form-inline {
|
||||
.blue-block {
|
||||
display: inline-block;
|
||||
|
||||
@ -1,12 +1,8 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-drawer title="查看详情" :visible.sync="visible" size="70%" :wrapperClosable='false' @closed="closeDrawer">
|
||||
<el-drawer title="生产情况" :visible.sync="visible" size="70%" @closed="closeDrawer" :show-close='false'>
|
||||
<div class="box">
|
||||
<base-table
|
||||
:table-props="tableProps"
|
||||
:table-data="tableData"
|
||||
:max-height="tableH"
|
||||
/>
|
||||
<base-table :table-props="tableProps" :table-data="tableData" :max-height="tableH" />
|
||||
</div>
|
||||
</el-drawer>
|
||||
</div>
|
||||
@ -53,7 +49,7 @@ export default {
|
||||
init(params) {
|
||||
this.visible = true
|
||||
// console.log(params)
|
||||
getByScheduling({id:params.id}).then(res => {
|
||||
getByScheduling({ id: params.id }).then(res => {
|
||||
let dataList1 = []
|
||||
let dataList2 = []
|
||||
if (res.data.nameData && res.data.nameData.length > 0) {
|
||||
@ -90,11 +86,11 @@ export default {
|
||||
timeArr.push(this.parseTime(item.name))
|
||||
tablePropsObj.prop = item.name
|
||||
tablePropsObj.label = this.parseTime(item.name)
|
||||
tablePropsObj.children[0].prop = item.name+'sumInput'
|
||||
tablePropsObj.children[1].prop = item.name+'sumOutput'
|
||||
tablePropsObj.children[2].prop = item.name+'goodArea'
|
||||
tablePropsObj.children[3].prop = item.name+'dynamicValue'
|
||||
tablePropsObj.children[4].prop = item.name+'dynamicRatio'
|
||||
tablePropsObj.children[0].prop = item.name + 'sumInput'
|
||||
tablePropsObj.children[1].prop = item.name + 'sumOutput'
|
||||
tablePropsObj.children[2].prop = item.name + 'goodArea'
|
||||
tablePropsObj.children[3].prop = item.name + 'dynamicValue'
|
||||
tablePropsObj.children[4].prop = item.name + 'dynamicRatio'
|
||||
this.tableProps.push(tablePropsObj)
|
||||
})
|
||||
getSchedulingMonitoringRecord({
|
||||
@ -111,15 +107,15 @@ export default {
|
||||
obj.workOrderList = dataList1.data[i].workOrderList
|
||||
let subData1 = dataList1.data[i].data
|
||||
for (let ii = 0; ii < subData1.length; ii++) {
|
||||
obj[subData1[ii].dynamicName+'sumInput'] = subData1[ii].dynamicValue.sumInput
|
||||
obj[subData1[ii].dynamicName+'sumOutput'] = subData1[ii].dynamicValue.sumOutput
|
||||
obj[subData1[ii].dynamicName+'goodArea'] = subData1[ii].dynamicValue.goodArea
|
||||
obj[subData1[ii].dynamicName + 'sumInput'] = subData1[ii].dynamicValue.sumInput
|
||||
obj[subData1[ii].dynamicName + 'sumOutput'] = subData1[ii].dynamicValue.sumOutput
|
||||
obj[subData1[ii].dynamicName + 'goodArea'] = subData1[ii].dynamicValue.goodArea
|
||||
}
|
||||
for (let j = 0; j < dataList2.data.length; j++) {
|
||||
let subData2 = dataList2.data[j].data
|
||||
for (let jj = 0; jj < subData2.length; jj++) {
|
||||
obj[subData2[jj].dynamicName+'dynamicValue'] = subData2[jj].dynamicValue
|
||||
obj[subData2[jj].dynamicName+'dynamicRatio'] = obj[subData2[jj].dynamicName+'dynamicValue'] / obj[subData2[jj].dynamicName+'sumOutput']
|
||||
obj[subData2[jj].dynamicName + 'dynamicValue'] = subData2[jj].dynamicValue
|
||||
obj[subData2[jj].dynamicName + 'dynamicRatio'] = obj[subData2[jj].dynamicName + 'dynamicValue'] / obj[subData2[jj].dynamicName + 'sumOutput']
|
||||
}
|
||||
}
|
||||
this.tableData.push(obj)
|
||||
|
||||
@ -1,37 +1,22 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- 搜索工作栏 -->
|
||||
<search-area @submit="buttonClick"/>
|
||||
<search-area @submit="buttonClick" />
|
||||
<!-- <search-bar
|
||||
:formConfigs="formConfig"
|
||||
ref="searchBarForm"
|
||||
@headBtnClick="buttonClick"
|
||||
/> -->
|
||||
<!-- 列表 -->
|
||||
<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"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
<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"
|
||||
@clickBtn="handleClick" />
|
||||
</base-table>
|
||||
<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" />
|
||||
<!-- 查看生产情况 -->
|
||||
<team-production-detail v-if='paramVisible' ref='schedulingMonitoringDetail'/>
|
||||
<team-production-detail v-if='paramVisible' ref='schedulingMonitoringDetail' />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@ -86,38 +71,6 @@ export default {
|
||||
name: 'GroupTeamScheduling',
|
||||
data() {
|
||||
return {
|
||||
formConfig: [
|
||||
{
|
||||
type: 'select',
|
||||
label: '班次信息',
|
||||
selectOptions: [],
|
||||
param: 'classesId'
|
||||
},
|
||||
{
|
||||
type: 'input',
|
||||
label: '班组信息',
|
||||
placeholder: '班组信息',
|
||||
param: 'teamName'
|
||||
},
|
||||
{
|
||||
type: 'datePicker',
|
||||
label: '上班日期',
|
||||
dateType: 'daterange',
|
||||
format: 'yyyy-MM-dd',
|
||||
valueFormat: 'yyyy-MM-dd',
|
||||
rangeSeparator: '-',
|
||||
// valueFormat: "timestamp",
|
||||
param: 'tiemStr',
|
||||
defaultSelect: '',
|
||||
width: 250
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
btnName: '查询',
|
||||
name: 'search',
|
||||
color: 'primary'
|
||||
}
|
||||
],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNo: 1,
|
||||
@ -128,11 +81,12 @@ export default {
|
||||
},
|
||||
tableProps,
|
||||
tableBtn: [
|
||||
this.$auth.hasPermi('base:team-production:detail')
|
||||
this.$auth.hasPermi('base:team-production:detail')
|
||||
? {
|
||||
type: 'detail',
|
||||
btnName: '详情'
|
||||
}
|
||||
type: 'productionDetail',
|
||||
btnName: '查看',
|
||||
showTip: '生产情况'
|
||||
}
|
||||
: undefined
|
||||
].filter((v) => v),
|
||||
list: [],
|
||||
@ -158,7 +112,7 @@ export default {
|
||||
this.getList()
|
||||
},
|
||||
getList() {
|
||||
groupTeamSchedulingPage({...this.queryParams}).then(res => {
|
||||
groupTeamSchedulingPage({ ...this.queryParams }).then(res => {
|
||||
console.log(res)
|
||||
this.list = res.data.list || []
|
||||
this.total = res.data.total || 0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-12-08 13:46:17
|
||||
* @LastEditTime: 2024-03-01 15:22:06
|
||||
* @LastEditTime: 2024-03-12 14:54:05
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -58,7 +58,8 @@
|
||||
<el-col :span="8">
|
||||
<el-form-item label="检测时间" prop="checkTime"
|
||||
:rules="[{ required: true, message: '检测时间不能为空', trigger: 'change' }]">
|
||||
<el-date-picker v-model="dataForm.checkTime" type="datetime" placeholder="选择检测时间">
|
||||
<el-date-picker value-format="timestamp" v-model="dataForm.checkTime" type="datetime"
|
||||
placeholder="选择检测时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -80,7 +81,7 @@
|
||||
<el-col :span="8">
|
||||
<el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
|
||||
:rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
|
||||
<el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
|
||||
<el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
|
||||
style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
|
||||
v-model.number="dataForm.checkValueList[index].checkValue"
|
||||
@change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-01-24 15:15:24
|
||||
* @LastEditTime: 2024-03-11 15:51:20
|
||||
* @LastEditTime: 2024-03-13 15:21:30
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -100,11 +100,13 @@ export default {
|
||||
await this.urlOptions.getDataListURL(this.listQuery).then(response => {
|
||||
this.tableData = response.data.filter(item => {
|
||||
this.proLineList.forEach(it => {
|
||||
if (item.lineId === it.id) {
|
||||
if (item.lineId === it.id) {
|
||||
item.lineName = it.name
|
||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null
|
||||
item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null
|
||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null
|
||||
|
||||
item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null
|
||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
}
|
||||
})
|
||||
if (item.det === false) {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: Do not edit
|
||||
* @Date: 2023-12-13 14:10:04
|
||||
* @LastEditTime: 2024-03-11 16:10:25
|
||||
* @LastEditTime: 2024-03-13 15:27:43
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -197,6 +197,12 @@ const cols = [
|
||||
},
|
||||
methods: {
|
||||
updateData() {
|
||||
this.data.forEach((ele, index) => {
|
||||
delete ele.dailyOutputTrend
|
||||
delete ele.originalGlassStatisticsTrend
|
||||
delete ele.actualProductTrend
|
||||
delete ele.originalGlassPassTrend
|
||||
});
|
||||
updateGlass(this.data).then(response => {
|
||||
updateGlassRemark(this.sum).then(res => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
|
||||
@ -81,9 +81,10 @@ export default {
|
||||
this.proLineList.forEach(it => {
|
||||
if (item.lineId === it.id) {
|
||||
item.lineName = it.name
|
||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null
|
||||
item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null
|
||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null
|
||||
item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null
|
||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
}
|
||||
})
|
||||
if (item.det === false) {
|
||||
|
||||
@ -172,9 +172,10 @@ export default {
|
||||
this.proLineList.forEach(it => {
|
||||
if (item.lineId === it.id) {
|
||||
item.lineName = it.name
|
||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null
|
||||
item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null
|
||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null
|
||||
item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null
|
||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
}
|
||||
})
|
||||
if (item.det === false) {
|
||||
|
||||
@ -82,9 +82,10 @@ export default {
|
||||
this.tableData = response.data.filter(item => {
|
||||
this.proLineList.forEach(it => {
|
||||
if (item.lineId === it.id) {
|
||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null
|
||||
item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null
|
||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null
|
||||
item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null
|
||||
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
|
||||
item.lineName = it.name
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-12-12 13:45:25
|
||||
* @LastEditTime: 2024-03-12 11:17:53
|
||||
* @LastEditTime: 2024-03-13 15:28:18
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -47,7 +47,8 @@
|
||||
<el-table-column prop="inputTrend" label="增减" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
|
||||
<span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined}} </span>
|
||||
<span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' :
|
||||
undefined}} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -70,7 +71,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) +
|
||||
'%' : undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -91,7 +93,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend + '%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' :
|
||||
undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -114,7 +117,9 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }}
|
||||
<span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
|
||||
100).toFixed(2)) +
|
||||
'%' : undefined }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -527,10 +532,16 @@ export default {
|
||||
}
|
||||
})
|
||||
let updateArr = this.list
|
||||
updateArr.forEach((ele, index) => {
|
||||
delete ele.inputTrend
|
||||
delete ele.goodProductTrend
|
||||
delete ele.missCheckTrend
|
||||
delete ele.goodProductPassTrend
|
||||
});
|
||||
// console.log(JSON.stringify(updateArr[1]))
|
||||
const result = await Promise.all([
|
||||
await updateSumProductionDataList(obj),
|
||||
await updateProductionDataList(updateArr),
|
||||
await updateProductionDataList(updateArr)
|
||||
])
|
||||
console.log(result);
|
||||
if (result[0].data == true && result[1].data == true) {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-12-12 13:45:25
|
||||
* @LastEditTime: 2024-03-12 11:14:04
|
||||
* @LastEditTime: 2024-03-13 15:29:17
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -49,7 +49,8 @@
|
||||
<el-table-column prop="inputTrend" label="增减" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
|
||||
<span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend *
|
||||
100).toFixed(2)) + '%' : undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -72,7 +73,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend *
|
||||
100).toFixed(2)) + '%' : undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -93,7 +95,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend +'%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
|
||||
100).toFixed(2)) +'%' : undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -116,7 +119,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' :undefined }}
|
||||
<span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
|
||||
100).toFixed(2))+ '%' :undefined }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -531,6 +535,12 @@ export default {
|
||||
}
|
||||
})
|
||||
let updateArr = this.list
|
||||
updateArr.forEach((ele, index) => {
|
||||
delete ele.inputTrend
|
||||
delete ele.goodProductTrend
|
||||
delete ele.missCheckTrend
|
||||
delete ele.goodProductPassTrend
|
||||
});
|
||||
// console.log(JSON.stringify(updateArr[1]))
|
||||
const result = await Promise.all([
|
||||
await updateSumProductionDataList(obj),
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-12-12 13:45:25
|
||||
* @LastEditTime: 2024-03-12 11:17:14
|
||||
* @LastEditTime: 2024-03-14 13:46:39
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -9,9 +9,7 @@
|
||||
<div class="app-container">
|
||||
<el-form :inline="true" :model="dataForm" class="demo-form-inline">
|
||||
<el-form-item>
|
||||
<el-date-picker clearable v-model="monthValue" type="monthrange" range-separator="至" start-placeholder="开始日期"
|
||||
end-placeholder="结束日期" value-format="timestamp" :clearable="false" :picker-options="pickerOptions"
|
||||
size="small" style='width:350px;' @change="timeSelect">
|
||||
<el-date-picker clearable v-model="reportTime" @change="changeTime" type="date" placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-button type="primary" @click="getDataList()">查询</el-button>
|
||||
@ -431,7 +429,8 @@ export default {
|
||||
// explainText: undefined,
|
||||
// remark: undefined,
|
||||
// },
|
||||
// 查询参数
|
||||
// 查询参数
|
||||
reportTime:'',
|
||||
dataForm: {
|
||||
// pageSize: 100,
|
||||
// pageNo:1,
|
||||
@ -449,10 +448,41 @@ export default {
|
||||
// this.getProductLineList();
|
||||
},
|
||||
mounted() {
|
||||
this.getTodayStartTimeAndEndTime()
|
||||
this.getDataList()
|
||||
this.getDict()
|
||||
},
|
||||
methods: {
|
||||
format(shijianchuo) {
|
||||
//shijianchuo是整数，否则要parseInt转换
|
||||
var time = moment(new Date(shijianchuo)).format('YYYY-MM-DD HH:mm:ss')
|
||||
// console.log(time)
|
||||
// var y = time.getFullYear();
|
||||
// var m = time.getMonth() + 1;
|
||||
// var d = time.getDate();
|
||||
// var h = time.getHours();
|
||||
// var mm = time.getMinutes();
|
||||
// var s = time.getSeconds();
|
||||
return time
|
||||
},
|
||||
getTodayStartTimeAndEndTime() {
|
||||
this.reportTime = new Date()
|
||||
this.changeTime(this.reportTime)
|
||||
},
|
||||
changeTime(val) {
|
||||
console.log(val)
|
||||
if (val) {
|
||||
// console.log(val)
|
||||
// console.log(val.setHours(7, 0, 0))
|
||||
// console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
|
||||
// let time = this.format(val.setHours(7, 0, 0))
|
||||
this.dataForm.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
|
||||
this.dataForm.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
|
||||
console.log(this.dataForm.reportTime);
|
||||
} else {
|
||||
this.dataForm.reportTime = []
|
||||
}
|
||||
},
|
||||
async getDict() {
|
||||
// 产线列表
|
||||
const res = await getCorePLList()
|
||||
@ -530,18 +560,7 @@ export default {
|
||||
}
|
||||
},
|
||||
async getDataList() {
|
||||
if (this.monthValue.length > 0) {
|
||||
console.log(this.monthValue)
|
||||
this.dataForm.reportTime[0] = this.transformTime(this.monthValue[0])
|
||||
// this.queryParams.startTime = this.monthValue[0]
|
||||
this.dataForm.reportTime[1] = this.transformTime(this.monthValue[1])
|
||||
this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD')
|
||||
console.log(this.timeTips);
|
||||
} else {
|
||||
// this.$modal.msgError('月范围不能为空')
|
||||
// return false
|
||||
}
|
||||
|
||||
this.timeTips = moment(new Date()).format('YYYY-MM-DD') + ' - ' + moment(new Date().setHours(7, 0, 0) + 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
|
||||
console.log(this.dataForm);
|
||||
const res = await this.$axios({
|
||||
url: 'base/report-auto-delive/listPlus',
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-12-12 13:45:25
|
||||
* @LastEditTime: 2024-03-12 11:14:55
|
||||
* @LastEditTime: 2024-03-13 15:29:26
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -10,7 +10,7 @@
|
||||
<el-form :inline="true" :model="dataForm" class="demo-form-inline">
|
||||
<el-form-item>
|
||||
<el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
|
||||
:picker-options="{firstDayOfWeek: 5}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
|
||||
:picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
|
||||
style="width: 350px" placeholder="选择周">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
@ -50,7 +50,8 @@
|
||||
<el-table-column prop="inputTrend" label="增减" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
|
||||
<span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend *
|
||||
100).toFixed(2)) + '%' : undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -73,7 +74,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend *
|
||||
100).toFixed(2)) + '%' : undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -94,7 +96,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend + '%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
|
||||
100).toFixed(2)) + '%' : undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -117,7 +120,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }}
|
||||
<span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
|
||||
100).toFixed(2)) + '%' :undefined }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -501,6 +505,12 @@ export default {
|
||||
}
|
||||
})
|
||||
let updateArr = this.list
|
||||
updateArr.forEach((ele, index) => {
|
||||
delete ele.inputTrend
|
||||
delete ele.goodProductTrend
|
||||
delete ele.missCheckTrend
|
||||
delete ele.goodProductPassTrend
|
||||
});
|
||||
// console.log(JSON.stringify(updateArr[1]))
|
||||
const result = await Promise.all([
|
||||
await updateSumProductionDataList(obj),
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-12-12 13:45:25
|
||||
* @LastEditTime: 2024-03-12 11:15:05
|
||||
* @LastEditTime: 2024-03-13 15:29:35
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -52,7 +52,8 @@
|
||||
<el-table-column prop="inputTrend" label="增减" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
|
||||
<span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend *
|
||||
100).toFixed(2)) + '%' : undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -75,7 +76,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span>
|
||||
<span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend *
|
||||
100).toFixed(2)) + '%' : undefined }} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
@ -96,7 +98,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend + '%' : undefined }}
|
||||
<span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
|
||||
100).toFixed(2)) + '%' : undefined }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -120,7 +123,8 @@
|
||||
<template slot-scope="scope">
|
||||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
|
||||
</el-input>
|
||||
<span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }}
|
||||
<span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
|
||||
100).toFixed(2)) + '%' : undefined }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -445,6 +449,12 @@ export default {
|
||||
}
|
||||
})
|
||||
let updateArr = this.list
|
||||
updateArr.forEach((ele, index) => {
|
||||
delete ele.inputTrend
|
||||
delete ele.goodProductTrend
|
||||
delete ele.missCheckTrend
|
||||
delete ele.goodProductPassTrend
|
||||
});
|
||||
// console.log(JSON.stringify(updateArr[1]))
|
||||
const result = await Promise.all([
|
||||
await updateSumProductionDataList(obj),
|
||||
|
||||
@ -117,12 +117,12 @@
|
||||
import moment from 'moment';
|
||||
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
import EquipmentDrawer from '../components/firefightingDrawer';
|
||||
import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
|
||||
|
||||
import {
|
||||
createEquipment,
|
||||
updateEquipment,
|
||||
deleteEquipment,
|
||||
getEquipment,
|
||||
getEquipmentPage,
|
||||
exportEquipmentExcel,
|
||||
} from '@/api/base/equipment';
|
||||
@ -134,6 +134,7 @@ export default {
|
||||
components: {
|
||||
Editor,
|
||||
EquipmentDrawer,
|
||||
BaseDialog: BaseDialogWrapper
|
||||
},
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
|
||||
@ -116,12 +116,12 @@
|
||||
import moment from 'moment';
|
||||
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
import EquipmentDrawer from '../components/manageDrawer';
|
||||
import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
|
||||
|
||||
import {
|
||||
createEquipment,
|
||||
updateEquipment,
|
||||
deleteEquipment,
|
||||
getEquipment,
|
||||
getEquipmentPage,
|
||||
exportEquipmentExcel,
|
||||
} from '@/api/base/equipment';
|
||||
@ -133,6 +133,7 @@ export default {
|
||||
components: {
|
||||
Editor,
|
||||
EquipmentDrawer,
|
||||
BaseDialog: BaseDialogWrapper
|
||||
},
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
|
||||
@ -126,12 +126,14 @@ import {
|
||||
} from '@/api/base/equipment';
|
||||
import Editor from '@/components/Editor';
|
||||
import AssetsUpload from '../components/AssetsUpload.vue';
|
||||
import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
|
||||
|
||||
export default {
|
||||
name: 'SpecialEquipmentForSafety',
|
||||
components: {
|
||||
Editor,
|
||||
EquipmentDrawer,
|
||||
BaseDialog: BaseDialogWrapper,
|
||||
},
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
|
||||
@ -51,7 +51,8 @@
|
||||
<addOrUpdata
|
||||
v-if="addOrUpdateVisible"
|
||||
ref="addOrUpdate"
|
||||
@refreshDataList="getList" />
|
||||
@refreshDataList="getList"
|
||||
@destroy="addOrUpdateVisible = false" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -60,10 +61,11 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
import addOrUpdata from './add-or-updata.vue';
|
||||
import add from './add.vue';
|
||||
import { parseTime } from '../../core/mixins/code-filter';
|
||||
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
|
||||
|
||||
export default {
|
||||
name: 'SpecialEquipmentCheckConfig',
|
||||
components: { addOrUpdata, add },
|
||||
components: { addOrUpdata, add, BaseDialog: BaseDialogWrapperVue },
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
return {
|
||||
@ -188,6 +190,7 @@ export default {
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
status: 0,
|
||||
special: true,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
|
||||
@ -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%"
|
||||
@ -171,7 +173,7 @@
|
||||
</div>
|
||||
|
||||
<div class="drawer-body__footer">
|
||||
<el-button style="" @click="handleCancel">
|
||||
<el-button v-if="!disableEdit" @click="handleCancel">
|
||||
{{ disableEdit ? '返回' : '取消' }}
|
||||
</el-button>
|
||||
<el-button
|
||||
@ -206,35 +208,11 @@
|
||||
<script>
|
||||
import DialogForm from '../../../components/DialogForm/index.vue';
|
||||
import { groupConnectWorkshop } from '@/utils/equipment-module';
|
||||
|
||||
const SmallTitle = {
|
||||
name: 'SmallTitle',
|
||||
props: ['size'],
|
||||
components: {},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return h(
|
||||
'span',
|
||||
{
|
||||
class: 'small-title',
|
||||
style: {
|
||||
fontSize: '18px',
|
||||
lineHeight:
|
||||
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
|
||||
fontWeight: 500,
|
||||
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
|
||||
},
|
||||
},
|
||||
this.$slots.default
|
||||
);
|
||||
},
|
||||
};
|
||||
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
|
||||
import SmallTitle from '../components/SmallTitle.js';
|
||||
|
||||
export default {
|
||||
components: { SmallTitle, DialogForm },
|
||||
components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapperVue },
|
||||
props: ['dataId'], // dataId 作为一个通用的存放id的字段
|
||||
data() {
|
||||
return {
|
||||
@ -411,6 +389,35 @@ export default {
|
||||
this.getList('inspector');
|
||||
},
|
||||
methods: {
|
||||
/** 确认是否关闭 */
|
||||
async handleConfirmClose() {
|
||||
if (this.disableEdit) return this.handleCancel();
|
||||
|
||||
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>
|
||||
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
|
||||
确定关闭将不保留编辑内容
|
||||
</p>
|
||||
</div>,
|
||||
{
|
||||
confirmButtonText: '确 定',
|
||||
cancelButtonText: '取 消',
|
||||
type: 'warning',
|
||||
}
|
||||
)
|
||||
) {
|
||||
this.handleCancel();
|
||||
}
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
handleSearchBarBtnClick(btn) {
|
||||
switch (btn.btnName) {
|
||||
case 'search':
|
||||
|
||||
@ -64,10 +64,18 @@ import { parseTime } from '../../core/mixins/code-filter';
|
||||
import CheckOrderListTable from './CheckOrderListTable.vue';
|
||||
import edit from './Content-edit.vue';
|
||||
import AddCheckDet from './Content-add_detail.vue';
|
||||
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
|
||||
|
||||
export default {
|
||||
name: 'SpecialEquipmentCheckConfig',
|
||||
components: { addOrUpdata, add, edit, AddCheckDet, CheckOrderListTable },
|
||||
components: {
|
||||
addOrUpdata,
|
||||
add,
|
||||
edit,
|
||||
AddCheckDet,
|
||||
BaseDialog: BaseDialogWrapperVue,
|
||||
CheckOrderListTable,
|
||||
},
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
return {
|
||||
@ -86,7 +94,7 @@ export default {
|
||||
? {
|
||||
type: 'edit',
|
||||
btnName: '修改',
|
||||
}
|
||||
}
|
||||
: undefined,
|
||||
{
|
||||
type: 'detail',
|
||||
@ -96,7 +104,7 @@ export default {
|
||||
? {
|
||||
type: 'delete',
|
||||
btnName: '删除',
|
||||
}
|
||||
}
|
||||
: undefined,
|
||||
].filter((v) => v),
|
||||
tableProps: [
|
||||
@ -334,9 +342,8 @@ export default {
|
||||
}
|
||||
|
||||
return this.$axios({
|
||||
url:
|
||||
`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
|
||||
// + checkPersonParam,
|
||||
url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
|
||||
// + checkPersonParam,
|
||||
// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
|
||||
method: 'put',
|
||||
data: [id],
|
||||
|
||||
@ -7,9 +7,10 @@
|
||||
|
||||
<template>
|
||||
<el-drawer
|
||||
:visible="visible"
|
||||
:visible.sync="visible"
|
||||
:show-close="false"
|
||||
:wrapper-closable="false"
|
||||
:wrapper-closable="true"
|
||||
:close-on-click-modal="true"
|
||||
class="drawer"
|
||||
custom-class="mes-drawer"
|
||||
size="60%"
|
||||
@ -30,13 +31,13 @@
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="巡检单名称" prop="name">
|
||||
<div style="">{{ form.name }}</div>
|
||||
<div style="">{{ form.name || '---' }}</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="部门" prop="department">
|
||||
<div style="">{{ form.department }}</div>
|
||||
<div style="">{{ form.department || '---' }}</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
@ -111,7 +112,7 @@
|
||||
</div>
|
||||
|
||||
<div class="drawer-body__footer">
|
||||
<el-button style="" @click="handleCancel">
|
||||
<el-button v-if="!disableEdit" @click="handleCancel">
|
||||
{{ disableEdit ? '返回' : '取消' }}
|
||||
</el-button>
|
||||
<el-button
|
||||
@ -146,35 +147,11 @@
|
||||
<script>
|
||||
import { parseTime } from '../../core/mixins/code-filter';
|
||||
import DialogForm from '../../../components/DialogForm/index.vue';
|
||||
|
||||
const SmallTitle = {
|
||||
name: 'SmallTitle',
|
||||
props: ['size'],
|
||||
components: {},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return h(
|
||||
'span',
|
||||
{
|
||||
class: 'small-title',
|
||||
style: {
|
||||
fontSize: '18px',
|
||||
lineHeight:
|
||||
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
|
||||
fontWeight: 500,
|
||||
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
|
||||
},
|
||||
},
|
||||
this.$slots.default
|
||||
);
|
||||
},
|
||||
};
|
||||
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
|
||||
import SmallTitle from '../components/SmallTitle.js';
|
||||
|
||||
export default {
|
||||
components: { SmallTitle, DialogForm },
|
||||
components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapperVue },
|
||||
props: ['dataId'], // dataId 作为一个通用的存放id的字段
|
||||
filters: { parseTime },
|
||||
data() {
|
||||
|
||||
@ -49,12 +49,21 @@
|
||||
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
import { parseTime } from '../../core/mixins/code-filter';
|
||||
import RecordDetail from './Record-detail.vue';
|
||||
import moment from 'moment';
|
||||
|
||||
export default {
|
||||
name: 'SpecialEquipmentCheckRecord',
|
||||
components: { RecordDetail },
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
const today = new Date();
|
||||
const twoDaysAgo = new Date(today.getTime() - 2 * 24 * 60 * 60 * 1000);
|
||||
twoDaysAgo.setHours(0, 0, 0, 0);
|
||||
const t = [
|
||||
moment(twoDaysAgo).format('yyyy-MM-DD HH:mm:ss'),
|
||||
moment(today).format('yyyy-MM-DD HH:mm:ss'),
|
||||
];
|
||||
|
||||
return {
|
||||
detailOpen: false,
|
||||
addOrUpdateVisible: false,
|
||||
@ -151,6 +160,7 @@ export default {
|
||||
endPlaceholder: '结束日期',
|
||||
defaultTime: ['00:00:00', '23:59:59'],
|
||||
param: 'actualCheckTime',
|
||||
defaultSelect: t,
|
||||
// width: 350,
|
||||
},
|
||||
{
|
||||
@ -189,6 +199,7 @@ export default {
|
||||
pageSize: 10,
|
||||
special: true,
|
||||
status: 2,
|
||||
actualCheckTime: t,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
@ -204,7 +215,7 @@ export default {
|
||||
getList() {
|
||||
this.loading = true;
|
||||
// 执行查询
|
||||
this.recv(this.queryParams).then((response) => {
|
||||
this.recv({ ...this.queryParams }).then((response) => {
|
||||
this.list = response.data.list;
|
||||
this.total = response.data.total;
|
||||
this.loading = false;
|
||||
|
||||
@ -9,7 +9,9 @@
|
||||
<el-drawer
|
||||
:visible.sync="visible"
|
||||
:show-close="false"
|
||||
:wrapper-closable="true"
|
||||
:wrapperClosable="true"
|
||||
:close-on-click-modal="true"
|
||||
@closed="$emit('destroy')"
|
||||
class="drawer"
|
||||
size="50%">
|
||||
<small-title slot="title" :no-padding="true">
|
||||
@ -37,12 +39,12 @@
|
||||
</el-col> -->
|
||||
<el-col :span="8">
|
||||
<el-form-item label="巡检单名称" prop="name">
|
||||
{{ dataForm.name }}
|
||||
{{ dataForm.name || '---' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="部门" prop="department">
|
||||
{{ dataForm.department }}
|
||||
{{ dataForm.department || '---' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
@ -94,7 +96,7 @@
|
||||
@pagination="getList" />
|
||||
|
||||
<!-- <div class="drawer-body__footer">
|
||||
<el-button type="primary" @click="goback()">关闭</el-button>
|
||||
<el-button type="primary" @click="goback()">返回</el-button>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
@ -111,7 +113,7 @@
|
||||
<script>
|
||||
import SmallTitle from './SmallTitle';
|
||||
import attrAdd from './attr-add';
|
||||
import { DICT_TYPE, getDictDatas } from '@/utils/dict';
|
||||
// import { DICT_TYPE, getDictDatas } from '@/utils/dict';
|
||||
import { parseTime } from '../../core/mixins/code-filter';
|
||||
|
||||
const tableBtn = [
|
||||
@ -183,6 +185,33 @@ export default {
|
||||
},
|
||||
mounted() {},
|
||||
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>
|
||||
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
|
||||
确定关闭将不保留编辑内容
|
||||
</p>
|
||||
</div>,
|
||||
{
|
||||
confirmButtonText: '确 定',
|
||||
cancelButtonText: '取 消',
|
||||
type: 'warning',
|
||||
}
|
||||
)
|
||||
) {
|
||||
this.visible = false;
|
||||
}
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
initData() {
|
||||
this.checkDetList.splice(0);
|
||||
this.checkDetList.total = 0;
|
||||
@ -245,7 +274,7 @@ export default {
|
||||
});
|
||||
},
|
||||
goback() {
|
||||
this.$emit('refreshDataList');
|
||||
// this.$emit('refreshDataList');
|
||||
this.visible = false;
|
||||
// this.initData();
|
||||
},
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
|
||||
<el-row style="text-align: right">
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
|
||||
<el-button type="primary" @click="dataFormSubmit()">保存</el-button>
|
||||
</el-row>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
59
src/views/specialEquipment/components/BaseDialogWrapper.vue
Normal file
59
src/views/specialEquipment/components/BaseDialogWrapper.vue
Normal file
@ -0,0 +1,59 @@
|
||||
<!--
|
||||
filename: BaseDialogWrapper.vue
|
||||
author: liubin
|
||||
date: 2024-03-13 13:51:14
|
||||
description: 对BaseDialog的封装，自定义保存、取消按钮
|
||||
-->
|
||||
|
||||
<template>
|
||||
<base-dialog
|
||||
:dialogTitle="dialogTitle"
|
||||
:dialogVisible="dialogVisible"
|
||||
:width="width"
|
||||
:custom-class="customClass"
|
||||
:append-to-body="appendToBody"
|
||||
@close="$emit('close')">
|
||||
<slot />
|
||||
<template #footer>
|
||||
<el-row slot="footer" type="flex" justify="end">
|
||||
<el-col :span="24">
|
||||
<el-button size="small" class="btnTextStyle" @click="$emit('cancel')">
|
||||
取消
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
class="btnTextStyle"
|
||||
size="small"
|
||||
@click="$emit('confirm')">
|
||||
保存
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</template>
|
||||
</base-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'BaseDialogWrapper',
|
||||
components: {},
|
||||
props: [
|
||||
'dialogTitle',
|
||||
'dialogVisible',
|
||||
'appendToBody',
|
||||
'width',
|
||||
'customClass',
|
||||
],
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.baseDialog .btnTextStyle {
|
||||
letter-spacing: 6px;
|
||||
padding: 9px 10px 9px 16px;
|
||||
font-size: 14px;
|
||||
}
|
||||
</style>
|
||||
32
src/views/specialEquipment/components/SmallTitle.js
Normal file
32
src/views/specialEquipment/components/SmallTitle.js
Normal file
@ -0,0 +1,32 @@
|
||||
// <!--
|
||||
// filename: SmallTitle.js
|
||||
// author: liubin
|
||||
// date: 2024-03-13 14:21:01
|
||||
// description:
|
||||
// -->
|
||||
|
||||
export default {
|
||||
name: 'SmallTitle',
|
||||
props: ['size'],
|
||||
components: {},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return h(
|
||||
'span',
|
||||
{
|
||||
class: 'small-title',
|
||||
style: {
|
||||
fontSize: '18px',
|
||||
lineHeight:
|
||||
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
|
||||
fontWeight: 500,
|
||||
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
|
||||
},
|
||||
},
|
||||
this.$slots.default
|
||||
);
|
||||
},
|
||||
};
|
||||
@ -121,35 +121,16 @@
|
||||
<script>
|
||||
import DialogForm from './DialogForm';
|
||||
import EquipmentInfoForm from './EquipmentInfoForm.vue';
|
||||
|
||||
const SmallTitle = {
|
||||
name: 'SmallTitle',
|
||||
props: ['size'],
|
||||
components: {},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return h(
|
||||
'span',
|
||||
{
|
||||
class: 'small-title',
|
||||
style: {
|
||||
fontSize: '18px',
|
||||
lineHeight:
|
||||
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
|
||||
fontWeight: 500,
|
||||
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
|
||||
},
|
||||
},
|
||||
this.$slots.default
|
||||
);
|
||||
},
|
||||
};
|
||||
import BaseDialogWrapper from './BaseDialogWrapper.vue';
|
||||
import SmallTitle from './SmallTitle.js';
|
||||
|
||||
export default {
|
||||
components: { SmallTitle, DialogForm, EquipmentInfoForm },
|
||||
components: {
|
||||
SmallTitle,
|
||||
DialogForm,
|
||||
EquipmentInfoForm,
|
||||
BaseDialog: BaseDialogWrapper,
|
||||
},
|
||||
props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
|
||||
data() {
|
||||
return {
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
description:
|
||||
-->
|
||||
|
||||
|
||||
<template>
|
||||
<el-drawer
|
||||
:visible="visible"
|
||||
@ -122,35 +121,16 @@
|
||||
<script>
|
||||
import DialogForm from './DialogForm';
|
||||
import EquipmentInfoForm from './manageDrawerForm.vue';
|
||||
|
||||
const SmallTitle = {
|
||||
name: 'SmallTitle',
|
||||
props: ['size'],
|
||||
components: {},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return h(
|
||||
'span',
|
||||
{
|
||||
class: 'small-title',
|
||||
style: {
|
||||
fontSize: '18px',
|
||||
lineHeight:
|
||||
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
|
||||
fontWeight: 500,
|
||||
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
|
||||
},
|
||||
},
|
||||
this.$slots.default
|
||||
);
|
||||
},
|
||||
};
|
||||
import BaseDialogWrapper from './BaseDialogWrapper.vue';
|
||||
import SmallTitle from './SmallTitle.js';
|
||||
|
||||
export default {
|
||||
components: { SmallTitle, DialogForm, EquipmentInfoForm },
|
||||
components: {
|
||||
SmallTitle,
|
||||
DialogForm,
|
||||
EquipmentInfoForm,
|
||||
BaseDialog: BaseDialogWrapper,
|
||||
},
|
||||
props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
|
||||
data() {
|
||||
return {
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
description:
|
||||
-->
|
||||
|
||||
|
||||
<template>
|
||||
<el-drawer
|
||||
:visible="visible"
|
||||
@ -122,35 +121,16 @@
|
||||
<script>
|
||||
import DialogForm from './DialogForm';
|
||||
import EquipmentInfoForm from './EquipmentInfoForm.vue';
|
||||
|
||||
const SmallTitle = {
|
||||
name: 'SmallTitle',
|
||||
props: ['size'],
|
||||
components: {},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return h(
|
||||
'span',
|
||||
{
|
||||
class: 'small-title',
|
||||
style: {
|
||||
fontSize: '18px',
|
||||
lineHeight:
|
||||
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
|
||||
fontWeight: 500,
|
||||
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
|
||||
},
|
||||
},
|
||||
this.$slots.default
|
||||
);
|
||||
},
|
||||
};
|
||||
import BaseDialogWrapper from './BaseDialogWrapper.vue';
|
||||
import SmallTitle from './SmallTitle.js';
|
||||
|
||||
export default {
|
||||
components: { SmallTitle, DialogForm, EquipmentInfoForm },
|
||||
components: {
|
||||
SmallTitle,
|
||||
DialogForm,
|
||||
EquipmentInfoForm,
|
||||
BaseDialog: BaseDialogWrapper,
|
||||
},
|
||||
props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
|
||||
data() {
|
||||
return {
|
||||
|
||||
@ -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%"
|
||||
@ -115,7 +117,7 @@
|
||||
</div>
|
||||
|
||||
<div class="drawer-body__footer">
|
||||
<el-button style="" @click="cancel">返回</el-button>
|
||||
<!-- <el-button style="" @click="cancel">返回</el-button> -->
|
||||
<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
|
||||
编辑
|
||||
</el-button>
|
||||
@ -143,32 +145,7 @@
|
||||
|
||||
<script>
|
||||
import DialogForm from '@/components/DialogForm';
|
||||
|
||||
const SmallTitle = {
|
||||
name: 'SmallTitle',
|
||||
props: ['size'],
|
||||
components: {},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return h(
|
||||
'span',
|
||||
{
|
||||
class: 'small-title',
|
||||
style: {
|
||||
fontSize: '18px',
|
||||
lineHeight:
|
||||
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
|
||||
fontWeight: 500,
|
||||
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
|
||||
},
|
||||
},
|
||||
this.$slots.default
|
||||
);
|
||||
},
|
||||
};
|
||||
import SmallTitle from '../components/SmallTitle.js';
|
||||
|
||||
export default {
|
||||
name: 'PlanConfig--addContent',
|
||||
@ -263,6 +240,35 @@ export default {
|
||||
this.loadEquipments();
|
||||
},
|
||||
methods: {
|
||||
/** 确认是否关闭 */
|
||||
async handleConfirmClose() {
|
||||
if (this.mode.includes('detail')) return this.cancel();
|
||||
|
||||
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>
|
||||
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
|
||||
确定关闭将不保留编辑内容
|
||||
</p>
|
||||
</div>,
|
||||
{
|
||||
confirmButtonText: '确 定',
|
||||
cancelButtonText: '取 消',
|
||||
type: 'warning',
|
||||
}
|
||||
)
|
||||
) {
|
||||
this.cancel();
|
||||
}
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
show({
|
||||
departmentName,
|
||||
id,
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { publicFormatter } from '@/utils/dict';
|
||||
// import { publicFormatter } from '@/utils/dict';
|
||||
// import moment from 'moment';
|
||||
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record';
|
||||
|
||||
@ -123,7 +123,8 @@
|
||||
type: 'number',
|
||||
message: '请输入正确的数字',
|
||||
trigger: 'blur',
|
||||
transform: (val) => Number(val) && parseInt(val) === Number(val),
|
||||
transform: (val) =>
|
||||
Number(val) && parseInt(val) === Number(val) && Number(val),
|
||||
},
|
||||
{ required: true, message: '保养频率不能为空', trigger: 'blur' },
|
||||
]">
|
||||
|
||||
@ -2,14 +2,16 @@
|
||||
filename: PlanConfig--addContent.vue
|
||||
author: liubin
|
||||
date: 2024-02-04 09:40:04
|
||||
description:
|
||||
description: 计划配置-添加内容
|
||||
-->
|
||||
|
||||
<template>
|
||||
<el-drawer
|
||||
:visible="visible"
|
||||
:visible.sync="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%"
|
||||
@ -19,7 +21,7 @@
|
||||
mode.includes('detail')
|
||||
? '详情'
|
||||
: mode.includes('edit')
|
||||
? '编辑'
|
||||
? '添加内容'
|
||||
: '新增'
|
||||
}}
|
||||
</SmallTitle>
|
||||
@ -38,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>
|
||||
@ -143,36 +145,12 @@
|
||||
|
||||
<script>
|
||||
import DialogForm from '@/components/DialogForm';
|
||||
|
||||
const SmallTitle = {
|
||||
name: 'SmallTitle',
|
||||
props: ['size'],
|
||||
components: {},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return h(
|
||||
'span',
|
||||
{
|
||||
class: 'small-title',
|
||||
style: {
|
||||
fontSize: '18px',
|
||||
lineHeight:
|
||||
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
|
||||
fontWeight: 500,
|
||||
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
|
||||
},
|
||||
},
|
||||
this.$slots.default
|
||||
);
|
||||
},
|
||||
};
|
||||
import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
|
||||
import SmallTitle from '../components/SmallTitle.js';
|
||||
|
||||
export default {
|
||||
name: 'PlanConfig--addContent',
|
||||
components: { SmallTitle, DialogForm },
|
||||
components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapper },
|
||||
props: ['maintainData'],
|
||||
data() {
|
||||
return {
|
||||
@ -263,6 +241,35 @@ export default {
|
||||
this.loadEquipments();
|
||||
},
|
||||
methods: {
|
||||
/** 确认是否关闭 */
|
||||
async handleConfirmClose() {
|
||||
if (this.mode.includes('detail')) return this.cancel();
|
||||
if (document.querySelector('.small-title').innerText.includes('添加内容')) return this.cancel();
|
||||
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>
|
||||
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
|
||||
确定关闭将不保留编辑内容
|
||||
</p>
|
||||
</div>,
|
||||
{
|
||||
confirmButtonText: '确 定',
|
||||
cancelButtonText: '取 消',
|
||||
type: 'warning',
|
||||
}
|
||||
)
|
||||
) {
|
||||
this.cancel();
|
||||
}
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
show({
|
||||
departmentName,
|
||||
id,
|
||||
|
||||
@ -65,10 +65,15 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
|
||||
import PlanConfigAdd from './PlanConfig--add.vue';
|
||||
import PlanConfigAddContent from './PlanConfig--addContent.vue';
|
||||
import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
|
||||
|
||||
export default {
|
||||
name: 'SpecialEquipmentPlanConfig',
|
||||
components: { DialogForm: PlanConfigAdd, PlanConfigAddContent },
|
||||
components: {
|
||||
BaseDialog: BaseDialogWrapper,
|
||||
DialogForm: PlanConfigAdd,
|
||||
PlanConfigAddContent,
|
||||
},
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
const t = new Date();
|
||||
@ -98,7 +103,7 @@ export default {
|
||||
: undefined,
|
||||
].filter((v) => v),
|
||||
tableProps: [
|
||||
{ prop: 'name', label: '计划名称' },
|
||||
{ prop: 'name', label: '保养计划名称' },
|
||||
{ prop: 'departmentName', label: '部门' },
|
||||
{ width: 144, prop: 'lineName', label: '产线名' },
|
||||
{ width: 132, prop: 'maintenancePeriod', label: '保养频率(天/次)' },
|
||||
|
||||
@ -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%"
|
||||
@ -84,7 +86,7 @@
|
||||
</div>
|
||||
|
||||
<div class="drawer-body__footer">
|
||||
<el-button style="" @click="cancel">返回</el-button>
|
||||
<!-- <el-button style="" @click="cancel">返回</el-button> -->
|
||||
<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
|
||||
编辑
|
||||
</el-button>
|
||||
@ -112,36 +114,12 @@
|
||||
|
||||
<script>
|
||||
import DialogForm from '@/components/DialogForm';
|
||||
|
||||
const SmallTitle = {
|
||||
name: 'SmallTitle',
|
||||
props: ['size'],
|
||||
components: {},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return h(
|
||||
'span',
|
||||
{
|
||||
class: 'small-title',
|
||||
style: {
|
||||
fontSize: '18px',
|
||||
lineHeight:
|
||||
this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
|
||||
fontWeight: 500,
|
||||
fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
|
||||
},
|
||||
},
|
||||
this.$slots.default
|
||||
);
|
||||
},
|
||||
};
|
||||
import SmallTitle from '../components/SmallTitle.js';
|
||||
import BaseDialogWrapper from '../components/BaseDialogWrapper';
|
||||
|
||||
export default {
|
||||
name: 'PlanConfig--addContent',
|
||||
components: { SmallTitle, DialogForm },
|
||||
components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapper },
|
||||
props: ['maintainData'],
|
||||
data() {
|
||||
return {
|
||||
@ -229,6 +207,35 @@ export default {
|
||||
this.loadEquipments();
|
||||
},
|
||||
methods: {
|
||||
/** 确认是否关闭 */
|
||||
async handleConfirmClose() {
|
||||
if (this.mode.includes('detail')) return this.cancel();
|
||||
|
||||
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>
|
||||
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
|
||||
确定关闭将不保留编辑内容
|
||||
</p>
|
||||
</div>,
|
||||
{
|
||||
confirmButtonText: '确 定',
|
||||
cancelButtonText: '取 消',
|
||||
type: 'warning',
|
||||
}
|
||||
)
|
||||
) {
|
||||
this.cancel();
|
||||
}
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
show({ planMaintainWorker, id, maintainWorker }) {
|
||||
this.form = Object.assign(
|
||||
{},
|
||||
@ -305,17 +312,14 @@ export default {
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await this.$axios(
|
||||
'/base/equipment-maintain-log-det/page',
|
||||
{
|
||||
params: {
|
||||
pageNo: this.detailTableQuery.pageNo,
|
||||
pageSize: this.detailTableQuery.pageSize,
|
||||
// planId: this.form.id,
|
||||
logId: this.form.id,
|
||||
},
|
||||
}
|
||||
);
|
||||
const res = await this.$axios('/base/equipment-maintain-log-det/page', {
|
||||
params: {
|
||||
pageNo: this.detailTableQuery.pageNo,
|
||||
pageSize: this.detailTableQuery.pageSize,
|
||||
// planId: this.form.id,
|
||||
logId: this.form.id,
|
||||
},
|
||||
});
|
||||
this.detailList = res.data?.list || [];
|
||||
this.detailTotal = res.data?.total || 0;
|
||||
this.detailLoading = false;
|
||||
|
||||
@ -108,6 +108,14 @@ export default {
|
||||
components: { DialogForm, RecordDetail },
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
const today = new Date();
|
||||
const twoDaysAgo = new Date(today.getTime() - 2 * 24 * 60 * 60 * 1000);
|
||||
twoDaysAgo.setHours(0, 0, 0, 0);
|
||||
const t = [
|
||||
moment(twoDaysAgo).format('yyyy-MM-DD HH:mm:ss'),
|
||||
moment(today).format('yyyy-MM-DD HH:mm:ss'),
|
||||
];
|
||||
|
||||
return {
|
||||
recordDetailVisible: false,
|
||||
searchBarKeys: [
|
||||
@ -301,7 +309,7 @@ export default {
|
||||
endPlaceholder: '结束日期',
|
||||
defaultTime: ['00:00:00', '23:59:59'],
|
||||
param: 'startTime',
|
||||
defaultSelect: null,
|
||||
defaultSelect: t,
|
||||
// width: 350,
|
||||
},
|
||||
// {
|
||||
@ -500,7 +508,7 @@ export default {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
maintainPlanId: null,
|
||||
startTime: null,
|
||||
startTime: t,
|
||||
// relatePlan: null,
|
||||
// equipmentId: null,
|
||||
special: true,
|
||||
|
||||
@ -70,10 +70,11 @@ import {
|
||||
import { parseTime } from '@/utils/ruoyi';
|
||||
import htmls from './htmls.vue';
|
||||
import DialogForm from './Repair--add.vue';
|
||||
import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
|
||||
|
||||
export default {
|
||||
name: 'SpecialEquipmentRepair',
|
||||
components: { DetailDrawer, DialogForm },
|
||||
components: { DetailDrawer, DialogForm, BaseDialog: BaseDialogWrapperVue },
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
return {
|
||||
|
||||
@ -97,42 +97,39 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import moment from 'moment';
|
||||
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
|
||||
import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue';
|
||||
import PlannedEditDrawer from './WaitingListPlanned--edit.vue';
|
||||
import UnplannedAddDet from './WaitingListUnplanned--add_detail.vue';
|
||||
import {
|
||||
exportMaintainLogExcel,
|
||||
} from '@/api/equipment/base/maintain/record';
|
||||
import { exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
|
||||
import WaitingListTable from './WaitingListTable.vue';
|
||||
import RecordDetail from './Record--detail.vue';
|
||||
import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
|
||||
|
||||
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
|
||||
|
||||
const btn = {
|
||||
name: 'tableBtn',
|
||||
props: ['injectData'],
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
methods: {
|
||||
handleClick() {
|
||||
this.$emit('emitData', {
|
||||
action: this.injectData.label,
|
||||
value: this.injectData,
|
||||
});
|
||||
},
|
||||
},
|
||||
render: function (h) {
|
||||
return (
|
||||
<el-button type="text" onClick={this.handleClick}>
|
||||
{this.injectData.name}
|
||||
</el-button>
|
||||
);
|
||||
},
|
||||
};
|
||||
// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
|
||||
// const btn = {
|
||||
// name: 'tableBtn',
|
||||
// props: ['injectData'],
|
||||
// data() {
|
||||
// return {};
|
||||
// },
|
||||
// methods: {
|
||||
// handleClick() {
|
||||
// this.$emit('emitData', {
|
||||
// action: this.injectData.label,
|
||||
// value: this.injectData,
|
||||
// });
|
||||
// },
|
||||
// },
|
||||
// render: function (h) {
|
||||
// return (
|
||||
// <el-button type="text" onClick={this.handleClick}>
|
||||
// {this.injectData.name}
|
||||
// </el-button>
|
||||
// );
|
||||
// },
|
||||
// };
|
||||
|
||||
export default {
|
||||
name: 'SpecialEquipmentMaintainRecord',
|
||||
@ -143,6 +140,7 @@ export default {
|
||||
UnplannedEditDrawer,
|
||||
UnplannedAddDet,
|
||||
PlannedEditDrawer,
|
||||
BaseDialog: BaseDialogWrapper,
|
||||
},
|
||||
mixins: [basicPageMixin],
|
||||
data() {
|
||||
|
||||
@ -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%"
|
||||
@ -482,6 +484,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>
|
||||
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
|
||||
确定关闭将不保留编辑内容
|
||||
</p>
|
||||
</div>,
|
||||
{
|
||||
confirmButtonText: '确 定',
|
||||
cancelButtonText: '取 消',
|
||||
type: 'warning',
|
||||
}
|
||||
)
|
||||
) {
|
||||
this.handleCancel();
|
||||
}
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
handleSearchBarBtnClick(btn) {
|
||||
switch (btn.btnName) {
|
||||
case 'search':
|
||||
|
||||
@ -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%"
|
||||
@ -419,6 +421,34 @@ 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>
|
||||
<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
|
||||
确定关闭将不保留编辑内容
|
||||
</p>
|
||||
</div>,
|
||||
{
|
||||
confirmButtonText: '确 定',
|
||||
cancelButtonText: '取 消',
|
||||
type: 'warning',
|
||||
}
|
||||
)
|
||||
) {
|
||||
this.handleCancel();
|
||||
}
|
||||
} catch (err) {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
handleSearchBarBtnClick(btn) {
|
||||
console.log('btn', btn);
|
||||
switch (btn.btnName) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user