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

Merge pull request 'projects/mesxc-zhp' (#225) from projects/mesxc-zhp into projects/mesxc-test

Browse Source 
Reviewed-on: #225
This commit is contained in:
朱菊兰 2024-03-01 15:30:10 +08:00
commit 679f31af97
9 changed files with 77 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -1,8 +1,8 @@
### ###
# @Author: Do not edit # @Author: Do not edit
# @Date: 2023-08-29 09:40:39 # @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-02-29 15:53:50 # @LastEditTime: 2024-03-01 15:27:52
# @LastEditors: DY # @LastEditors: zhp
# @Description: # @Description:
### ###
# 开发环境配置 # 开发环境配置

3
src/views/OperationalOverview/AGVBoard.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-07-19 15:18:30 * @Date: 2021-07-19 15:18:30
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-02-23 16:11:33 * @LastEditTime: 2024-02-29 15:48:47
* @Description: * @Description:
--> -->
<template> <template>
@ -715,6 +715,7 @@ export default {
qualityMonthTableProps, qualityMonthTableProps,
modelMonth: '', modelMonth: '',
qualityList1, qualityList1,
// logoutTime: 43200000,
qualityTableProps2, qualityTableProps2,
qualityList2, qualityList2,
dateType: '0', dateType: '0',

46
src/views/OperationalOverview/coldBoard.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 16:50:26 * @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-02-23 16:11:40 * @LastEditTime: 2024-02-29 15:48:11
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -341,7 +341,9 @@ export default {
// offsetWidth: null, // offsetWidth: null,
cxNameList, cxNameList,
cxDataList, cxDataList,
// time:12,
cutProps, cutProps,
// logoutTime: 43200000,
cutTableDataList:[], cutTableDataList:[],
clientWidth: 0, clientWidth: 0,
containerWidth: 111111, containerWidth: 111111,
@ -432,36 +434,15 @@ export default {
this.beilv2 = _this.clientWidth / 1920 this.beilv2 = _this.clientWidth / 1920
})() })()
} }
// let obj = { // logoutInterval = setInterval(() => {
// 'a': 11111, // this.logoutTime -= 1000
// 'b': 22222, // }, 1000)
// 'c': 33333, // if (this.logoutTime === 0) {
// 'd': 44444, // this.SJGInitWebSocket()
// 'e': 55555, // this.CutInitWebSocket()
// this.funInitWebSocket()
// this.logoutTimeReset()
// } // }
// let index = 0
// for (let i in obj) {
// index++,
// console.log(index);
// }
// this.getList()
// const _this = this;
// window.onresize = () => {
// return (() => {
// _this.clientWidth = `${document.documentElement.clientWidth}`
// this.beilv2 = _this.clientWidth / 1920
// })()
// }
// this.beilv2 = window.innerWidth / 1920
// addEventListener('resize', resizeFun = () => {
// this.beilv2 = window.innerWidth / 1920
// })
// erd.listenTo(document, (element) => {
// this.beilv2 = element.offsetWidth / 1920
// // var width = element.offsetWidth;
// // var height = element.offsetHeight;
// });
}, },
// beforeDestroy() { // beforeDestroy() {
// //离开页面删除检测器和所有侦听器 // //离开页面删除检测器和所有侦听器
@ -469,13 +450,16 @@ export default {
// removeEventListener('resize', resizeFun) // removeEventListener('resize', resizeFun)
// }, // },
methods: { methods: {
// logoutTimeReset() {
// this.logoutTime = this.time * 60 * 60 * 1000
// },
CutWebsocketClose(e) { CutWebsocketClose(e) {
console.log('WebSocket 断开连接', e) console.log('WebSocket 断开连接', e)
}, },
SJGWebsocketClose(e) { SJGWebsocketClose(e) {
console.log('WebSocket 断开连接', e) console.log('WebSocket 断开连接', e)
}, },
funInitWebSocket(e) { funWebSocketClose(e) {
console.log('WebSocket 断开连接', e) console.log('WebSocket 断开连接', e)
}, },
formatTime(time, option) { formatTime(time, option) {

22
src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
View File

@ -51,8 +51,16 @@ export default {
label: '用户名称', label: '用户名称',
selectOptions: [], selectOptions: [],
labelField: 'name', labelField: 'name',
valueField: 'id', valueField: 'name',
param: 'userName', param: 'userName',
},
{
type: 'select',
label: '用户昵称',
selectOptions: [],
labelField: 'name',
valueField: 'name',
param: 'nickName',
}, },
{ {
type: 'button', type: 'button',
@ -143,10 +151,16 @@ export default {
}).then((res) => { }).then((res) => {
this.searchBarFormConfig[0].selectOptions = res.data.map((item) => { this.searchBarFormConfig[0].selectOptions = res.data.map((item) => {
return { return {
id: item.id, id: item.username,
name:item.username name:item.username
} }
}) })
this.searchBarFormConfig[1].selectOptions = res.data.map((item) => {
return {
id: item.nickname,
name: item.nickname
}
})
}) })
}, },
getDataList() { getDataList() {
@ -206,7 +220,9 @@ export default {
case 'search': case 'search':
this.listQuery.pageNo = 1; this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10; this.listQuery.pageSize = 10;
this.listQuery.inspectionDetContent = val.inspectionDetContent ? val.inspectionDetContent : undefined; this.listQuery.userName = val.userName ? val.userName : undefined;
this.listQuery.nickName = val.nickName ? val.nickName : undefined;
// this.listQuery.teamId = val.teamId ? val.teamId : undefined; // this.listQuery.teamId = val.teamId ? val.teamId : undefined;
this.getDataList() this.getDataList()
break; break;

13
src/views/quality/base/qualityHotMaterial/add-or-updata.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-08 13:46:17 * @Date: 2023-12-08 13:46:17
* @LastEditTime: 2024-01-22 15:29:53 * @LastEditTime: 2024-03-01 15:22:06
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -80,8 +80,9 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量" <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
:rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]"> :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
<el-input :disabled="isdetail" style="width: 90%;margin-right: 10px;" :max="item.maxValue" <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
:min='item.minValue' v-model="dataForm.checkValueList[index].checkValue" 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> @change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>
<span v-if="dataForm.checkValueList[index].showIcon"> <span v-if="dataForm.checkValueList[index].showIcon">
<!-- <i class="el-icon-success"></i> --> <!-- <i class="el-icon-success"></i> -->
@ -91,14 +92,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值" <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值">
>
<el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input> <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值" <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值">
>
<el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input> <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

4
src/views/quality/base/qualityScrapLog/add-or-updata.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-11-06 15:15:30 * @Date: 2023-11-06 15:15:30
* @LastEditTime: 2024-02-28 09:58:34 * @LastEditTime: 2024-03-01 10:33:48
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -130,7 +130,7 @@ export default {
mounted() { mounted() {
this.getDict() this.getDict()
console.log('我看看', this.dataForm) console.log('我看看', this.dataForm)
this.getCurrentTime() // this.getCurrentTime()
this.getWorksectionById() this.getWorksectionById()
}, },
methods: { methods: {

51
src/views/quality/base/qualityScrapLog/detail-or-updata.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-11-06 15:15:30 * @Date: 2023-11-06 15:15:30
* @LastEditTime: 2024-02-28 10:13:10 * @LastEditTime: 2024-03-01 10:18:39
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -75,7 +75,7 @@
</template> </template>
<script> <script>
import basicAdd from '../../../core/mixins/basic-add'; import basicAdd from './basic-add';
import { import {
createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList, createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog"; getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
@ -151,8 +151,8 @@ export default {
// this.dataForm.logTime = year + "-" + month + "-" + day; // this.dataForm.logTime = year + "-" + month + "-" + day;
console.log(this.dataForm.logTime); console.log(this.dataForm.logTime);
}, },
async getDict() { async getDict() {
// 物料列表 // 物料列表
const res = await getList() const res = await getList()
this.typeList = res.data this.typeList = res.data
getWorkOrderList().then((res) => { getWorkOrderList().then((res) => {
@ -182,16 +182,15 @@ export default {
getDetList().then((res) => { getDetList().then((res) => {
console.log(res); console.log(res);
// console.log(response); // console.log(response);
this.workOrderList = res.data.map((item) => { this.detList = res.data.map((item) => {
return { return {
name: item.name, name: item.content,
id: item.id id: item.id
} }
}) })
// console.log(this.formConfig[0].selectOptions); // console.log(this.formConfig[0].selectOptions);
// this.listQuery.total = response.data.total; // this.listQuery.total = response.data.total;
}) })
getTeamList().then((res) => { getTeamList().then((res) => {
console.log(res); console.log(res);
// console.log(response); // console.log(response);
@ -201,29 +200,12 @@ export default {
id: item.id id: item.id
} }
}) })
this.$axios({
url: '/base/core-workshop-section/listAll',
method: 'get',
// params: {
// id: lineId,
// },
}).then((res) => {
// console.log(data)
this.sectionList = res.data.map((item) => {
return {
name: item.name,
id: item.id,
};
});
})
// if (code == 0) {
// }
// console.log(this.formConfig[0].selectOptions); // console.log(this.formConfig[0].selectOptions);
// this.listQuery.total = response.data.total; // this.listQuery.total = response.data.total;
}) })
}, },
async getWorksectionById(lineId) { async getWorksectionById(lineId) {
if (lineId) {
const { code, data } = await this.$axios({ const { code, data } = await this.$axios({
url: '/base/core-workshop-section/listByParentId', url: '/base/core-workshop-section/listByParentId',
method: 'get', method: 'get',
@ -240,7 +222,24 @@ export default {
}; };
}); });
} }
} } else {
this.$axios({
url: '/base/core-workshop-section/listAll',
method: 'get',
// params: {
// id: lineId,
// },
}).then((res) => {
// console.log(data)
this.sectionList = res.data.map((item) => {
return {
name: item.name,
id: item.id,
};
});
})
}
},
}, },
}; };
</script> </script>

8
src/views/quality/monitoring/originalGlassRetrace/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-02-23 09:16:24 * @LastEditTime: 2024-03-01 10:27:29
* @Description: * @Description:
--> -->
<template> <template>
@ -124,8 +124,8 @@ export default {
label: '工单', label: '工单',
selectOptions: [], selectOptions: [],
labelField: 'name', labelField: 'name',
valueField: 'id', valueField: 'name',
param: 'workOrderId' param: 'workOrderName'
}, },
// { // {
// type: 'datePicker', // type: 'datePicker',
@ -233,7 +233,7 @@ export default {
buttonClick(val) { buttonClick(val) {
console.log(val) console.log(val)
if (val.btnName === 'search') { if (val.btnName === 'search') {
this.listQuery.workOrderId = val.workOrderId ? val.workOrderId :undefined this.listQuery.workOrderName = val.workOrderName ? val.workOrderName :undefined
// this.queryParams.status = val.status // this.queryParams.status = val.status
// if (val.timeVal && val.timeVal.length != 0 ) { // if (val.timeVal && val.timeVal.length != 0 ) {
// this.listQuery.startTime = val.timeVal[0] + ' 00:00:00' // this.listQuery.startTime = val.timeVal[0] + ' 00:00:00'

4
src/views/report/productionDayReport/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-12 13:45:25 * @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-01-24 16:53:41 * @LastEditTime: 2024-03-01 15:26:38
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -9,7 +9,7 @@
<div class="app-container"> <div class="app-container">
<el-form :inline="true" :model="dataForm" class="demo-form-inline"> <el-form :inline="true" :model="dataForm" class="demo-form-inline">
<el-form-item label="日" prop="reportTime"> <el-form-item label="日" prop="reportTime">
<el-date-picker v-model="reportTime" @change="changeTime" type="date" placeholder="选择日期"> <el-date-picker v-model="dataForm.reportTime" @change="changeTime" type="date" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button type="primary" @click="getDataList()">查询</el-button> <el-button type="primary" @click="getDataList()">查询</el-button>