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-14 14:54:37 +08:00
commit eba9d2ba60
30 changed files with 520 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/utils/request.js
View File

@ -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(() => {

12
src/views/group/base/groupTeam/components/workerTeamAdd.vue
View File

@ -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 = ''
}
},

18
src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue
View File

@ -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;
}
}

26
src/views/group/monitoring/teamProduction/components/searchArea.vue
View File

@ -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;

30
src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue
View File

@ -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)

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

@ -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

3
src/views/specialEquipment/basic/FireFighthing.vue
View File

@ -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() {

3
src/views/specialEquipment/basic/Manage.vue
View File

@ -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() {

2
src/views/specialEquipment/basic/Safety.vue
View File

@ -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() {

7
src/views/specialEquipment/check/Config.vue
View File

@ -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: {},

65
src/views/specialEquipment/check/Content-edit.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%"
@ -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':

19
src/views/specialEquipment/check/Content.vue
View File

@ -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],

41
src/views/specialEquipment/check/Record-detail.vue
View File

@ -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() {

41
src/views/specialEquipment/check/add-or-updata.vue
View File

@ -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();
},

2
src/views/specialEquipment/check/attr-add.vue
View File

@ -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
View 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
View 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
);
},
};

35
src/views/specialEquipment/components/firefightingDrawer.vue
View File

@ -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 {

36
src/views/specialEquipment/components/manageDrawer.vue
View File

@ -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 {

36
src/views/specialEquipment/components/safetyDrawer.vue
View File

@ -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 {

62
src/views/specialEquipment/maintain/Monitor--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%"
@ -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,

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

@ -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';

3
src/views/specialEquipment/maintain/PlanConfig--add.vue
View File

@ -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' },
]">

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

@ -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,

9
src/views/specialEquipment/maintain/PlanConfig.vue
View File

@ -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: '保养频率(天/次)' },

84
src/views/specialEquipment/maintain/Record--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%"
@ -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;

3
src/views/specialEquipment/maintain/Repair.vue
View File

@ -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 {

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

@ -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() {

31
src/views/specialEquipment/maintain/WaitingListPlanned--edit.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%"
@ -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':

32
src/views/specialEquipment/maintain/WaitingListUnplanned--edit.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%"
@ -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) {