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

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

Browse Source
This commit is contained in:
朱菊兰
2024-04-11 15:36:54 +08:00
parent 5d3622bf62 a9e60dbe82
commit 673ddcb996
21 changed files with 228 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.env.dev
View File

@@ -1,7 +1,7 @@
### ###
# @Author: Do not edit # @Author: Do not edit
# @Date: 2023-08-29 09:40:39 # @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-04-10 08:26:13 # @LastEditTime: 2024-04-10 16:58:06
# @LastEditors: zhp # @LastEditors: zhp
# @Description: # @Description:
### ###
@@ -20,11 +20,11 @@ VUE_APP_TITLE = MES系统
# VUE_APP_BASE_API = 'http://192.168.1.8:48082' # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.173:9001' # VUE_APP_BASE_API = 'http://192.168.4.173:9001'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082' # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.62:48082' # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082' # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
# VUE_APP_BASE_API = 'http://192.168.1.47:48082' # VUE_APP_BASE_API = 'http://192.168.1.47:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082' VUE_APP_BASE_API = 'http://192.168.1.78:48082'
# socket地址 # socket地址
# VUE_APP_Socket_API = 'ws://10.70.2.2:8080' # VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' # VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'

10
src/api/base/qualityHotMaterial.js
View File

@@ -2,7 +2,7 @@
/* /*
* @Author: zhp * @Author: zhp
* @Date: 2023-11-06 15:38:12 * @Date: 2023-11-06 15:38:12
* @LastEditTime: 2024-04-09 15:14:40 * @LastEditTime: 2024-04-11 14:57:02
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
*/ */
@@ -94,7 +94,7 @@ export function getWorkerList(query) {
export function getMaterialCheckList(query) { export function getMaterialCheckList(query) {
return request({ return request({
url: '/base/core-hot-material-check/listByMaterial', url: 'base/quality-hot-material-det/filterList',
method: 'get', method: 'get',
params: query params: query
}) })
@@ -102,7 +102,7 @@ export function getMaterialCheckList(query) {
export function createQualityHotMaterialDet(query){ export function createQualityHotMaterialDet(query){
return request({ return request({
url: '/base/quality-hot-material-det/create', url: 'base/quality-hot-material-det/createBatch',
method: 'post', method: 'post',
data: query data: query
}) })
@@ -110,7 +110,7 @@ export function createQualityHotMaterialDet(query){
export function updateQualityHotMaterialDet(query){ export function updateQualityHotMaterialDet(query){
return request({ return request({
url: '/base/quality-hot-material-det/listbyfilter', url: 'base/quality-hot-material-det/updateBatch',
method: 'put', method: 'put',
data: query data: query
}) })
@@ -118,7 +118,7 @@ export function updateQualityHotMaterialDet(query){
export function getQualityHotMaterialDetList(query){ export function getQualityHotMaterialDetList(query){
return request({ return request({
url: '/base/quality-hot-material-det/listbyfilter', url: '/base/quality-hot-material-det/filterList',
method: 'get', method: 'get',
params: query params: query
}) })

2
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-04-07 16:05:59 * @LastEditTime: 2024-04-11 09:55:04
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->

56
src/views/OperationalOverview/components/ISRAChart.vue
View File

@@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 13:45:56 * @Date: 2024-01-29 13:45:56
* @LastEditTime: 2024-03-13 08:58:01 * @LastEditTime: 2024-04-11 11:02:53
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@@ -26,7 +26,7 @@ export default {
return { return {
chart: null, chart: null,
// notMsg:true, // notMsg:true,
colors:['#2760ff', '#518eec', '#0ee8e4', '#ddb523'], colors: ['#2760ff', '#518eec', '#49FBD6', '#ddb523'],
chartData: [] chartData: []
}; };
}, },
@@ -45,6 +45,31 @@ export default {
this.$emit('emitFun') this.$emit('emitFun')
} }
} }
},
mounted() {
this.chartData = [
{
name: '细长泡',
num: 1112,
yield: 0.97,
},
{
name: '长泡',
num: 1112,
yield: 0.97,
},
{
name: '开口泡',
num: 1112,
yield: 0.97,
},
{
name: '结石',
num: 1112,
yield: 0.97,
}
]
this.updateChart()
}, },
methods: { methods: {
updateChart() { updateChart() {
@@ -71,7 +96,7 @@ export default {
color:this.colors, color:this.colors,
title:{ title:{
text: num, text: num,
subtext: '总数', subtext: '总数/片',
top: '32%', top: '32%',
left: '49%', left: '49%',
textAlign: 'center', textAlign: 'center',
@@ -89,7 +114,7 @@ export default {
left: 'center', left: 'center',
itemWidth: 12, itemWidth: 12,
itemHeight:12, itemHeight:12,
icon: 'rect', icon: 'roundRect',
textStyle: { textStyle: {
color: '#fff' color: '#fff'
}, },
@@ -107,7 +132,19 @@ export default {
radius: ['45%', '70%'], radius: ['45%', '70%'],
avoidLabelOverlap: true, avoidLabelOverlap: true,
label: { label: {
show: false show: true,
normal: {
// 各分区的提示内容
// params: 即下面传入的data数组,通过自定义函数，展示你想要的内容和格式
formatter: function (params) {
console.log(params);
return params.value + " | " + params.percent.toFixed(0) + "%" + "\n\n" + params.name;
},
textStyle: { // 提示文字的样式
// color: '#595959',
fontSize: 24.48
}
}
}, },
labelLine: { labelLine: {
show: true, show: true,
@@ -115,13 +152,16 @@ export default {
data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({ data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({
name:item.name, name:item.name,
value: item.num, value: item.num,
label: {
color: this.colors[index % 4]
},
itemStyle:{ itemStyle:{
color:{ color:{
type: 'linear', type: 'linear',
x: 1, x: 0,
y: 1, y: 0,
x2: 0, x2: 0,
y2: 0, y2: 1,
global: false, global: false,
colorStops:[ colorStops:[
{offset: 0,color: this.colors[index%4]}, {offset: 0,color: this.colors[index%4]},

4
src/views/base/packagingPrintLog/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-04-08 11:49:33 * @LastEditTime: 2024-04-10 16:34:40
* @Description: * @Description:
--> -->
<template> <template>
@@ -142,7 +142,7 @@ export default {
// name: 'reset', // name: 'reset',
// }, // },
{ {
type: 'separate', type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '', type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',

19
src/views/extend/processEquMaterialBom/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-22 17:11:55 * @LastEditTime: 2024-04-11 13:35:46
* @Description: * @Description:
--> -->
<template> <template>
@@ -62,7 +62,8 @@
<div v-if="!isdetail" class="action_btn"> <div v-if="!isdetail" class="action_btn">
<template> <template>
<span style="display: inline-block;"> <span style="display: inline-block;">
<el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button> <el-button v-if="this.$auth.hasPermi('extend:process-equ-material-bom-det:add')" type="text"
@click="addNew()" icon="el-icon-plus">新增</el-button>
</span> </span>
</template> </template>
</div> </div>
@@ -101,11 +102,15 @@ import attrAdd from './attr-add';
import { publicFormatter } from '@/utils/dict'; import { publicFormatter } from '@/utils/dict';
const tableBtn = [ const tableBtn = [
{ {
type: 'edit', type: this.$auth.hasPermi('extend:process-equ-material-bom-det:update')
? 'edit'
: '',
btnName: '编辑', btnName: '编辑',
}, },
{ {
type: 'delete', type: this.$auth.hasPermi('extend:process-equ-material-bom-det:delete')
? 'delete'
: '',
btnName: '删除', btnName: '删除',
}, },
]; ];
@@ -237,9 +242,6 @@ export default {
// console.log(response); // console.log(response);
this.equipmentList = res.data this.equipmentList = res.data
}) })
getMaterialCode().then(res => {
this.dataForm.code = res.data
})
}, },
handleClick(raw) { handleClick(raw) {
if (raw.type === 'delete') { if (raw.type === 'delete') {
@@ -293,6 +295,9 @@ export default {
this.idAttrShow = true this.idAttrShow = true
} else { } else {
this.idAttrShow = false this.idAttrShow = false
getMaterialCode().then(res => {
this.dataForm.code = res.data
})
} }
this.$nextTick(() => { this.$nextTick(() => {

3
src/views/extend/processEquMaterialBom/index.vue
View File

@@ -118,7 +118,8 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', // type: 'separate',
type: this.$auth.hasPermi('extend:process-equ-material-bom:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('extend:process-equ-material-bom:create') ? 'button' : '', type: this.$auth.hasPermi('extend:process-equ-material-bom:create') ? 'button' : '',

24
src/views/extend/processEquValueBom/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-25 14:07:31 * @LastEditTime: 2024-04-11 13:35:42
* @Description: * @Description:
--> -->
<template> <template>
@@ -72,7 +72,8 @@
<div v-if="!isdetail" class="action_btn"> <div v-if="!isdetail" class="action_btn">
<template> <template>
<span style="display: inline-block;"> <span style="display: inline-block;">
<el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button> <el-button v-if="this.$auth.hasPermi('extend:process-equ-value-bom-det:add')" type="text"
@click="addNew()" icon="el-icon-plus">新增</el-button>
</span> </span>
</template> </template>
</div> </div>
@@ -111,11 +112,15 @@ import attrAdd from './attr-add';
const tableBtn = [ const tableBtn = [
{ {
type: 'edit', type: this.$auth.hasPermi('extend:process-equ-value-bom-det:update')
? 'edit'
: '',
btnName: '编辑', btnName: '编辑',
}, },
{ {
type: 'delete', type: this.$auth.hasPermi('extend:process-equ-value-bom-det:delete')
? 'delete'
: '',
btnName: '删除', btnName: '删除',
}, },
]; ];
@@ -156,7 +161,9 @@ const tableProps = [
const topBtnConfig = [ const topBtnConfig = [
{ {
type: 'add', type: this.$auth.hasPermi('extend:process-equ-value-bom-det:add')
? 'add'
: '',
btnName: 'btn.add' btnName: 'btn.add'
} }
] ]
@@ -246,9 +253,7 @@ export default {
// console.log(response); // console.log(response);
this.equipmentList = res.data this.equipmentList = res.data
}) })
getValueCode().then(res => {
this.dataForm.code = res.data
})
}, },
handleClick(raw) { handleClick(raw) {
if (raw.type === 'delete') { if (raw.type === 'delete') {
@@ -326,6 +331,9 @@ export default {
this.idAttrShow = true this.idAttrShow = true
} else { } else {
this.idAttrShow = false this.idAttrShow = false
getValueCode().then(res => {
this.dataForm.code = res.data
})
} }
this.$nextTick(() => { this.$nextTick(() => {

3
src/views/extend/processEquValueBom/index.vue
View File

@@ -119,7 +119,8 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', // type: 'separate',
type: this.$auth.hasPermi('extend:process-equ-value-bom:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('extend:process-equ-value-bom:create') ? 'button' : '', type: this.$auth.hasPermi('extend:process-equ-value-bom:create') ? 'button' : '',

4
src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
View File

@@ -62,7 +62,9 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')
? 'separate'
: '',
}, },
{ {
type: this.$auth.hasPermi('base:quality-inspection-box-btn:create') type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')

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

@@ -66,7 +66,7 @@ export default {
param: 'nickName', param: 'nickName',
}, },
{ {
type: this.$auth.hasPermi('base:quality-inspection-box-permissions:query') type: this.$auth.hasPermi('base:quality-inspection-box-btn-auth:query')
? 'button' ? 'button'
: '', : '',
btnName: '查询', btnName: '查询',
@@ -74,10 +74,12 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:quality-inspection-box-btn-auth:create')
? 'separate'
: '',
}, },
{ {
type: this.$auth.hasPermi('base:quality-inspection-box-permissions:create') type: this.$auth.hasPermi('base:quality-inspection-box-btn-auth:create')
? 'button' ? 'button'
: '', : '',
btnName: '新增', btnName: '新增',
@@ -87,13 +89,13 @@ export default {
}, },
], ],
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:quality-inspection-box-permissions:update') this.$auth.hasPermi('base:quality-inspection-box-btn-auth:update')
? { ? {
type: 'edit', type: 'edit',
btnName: '修改', btnName: '修改',
} }
: undefined, : undefined,
this.$auth.hasPermi('base:quality-inspection-box-permissions:delete') this.$auth.hasPermi('base:quality-inspection-box-btn-auth:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除', btnName: '删除',

107
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-03-25 08:50:25 * @LastEditTime: 2024-04-11 15:25:51
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@@ -73,31 +73,45 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row :gutter="24" v-for="(item,index) in ingredientList" :key="item.id"> <el-row :gutter="24" v-for="(item,index) in ingredientList" :key="item.id">
<el-col :span="6"> <el-col :span="4">
<el-form-item label="成分"> <el-form-item label="成分">
{{ item.name }} {{ item.checkName }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量" <el-form-item :prop="'checkValueList.' + index + '.minCheckValue'" label="最小检测值"
:rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]"> :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' style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
v-model.number="dataForm.checkValueList[index].checkValue" v-model.number="dataForm.checkValueList[index].minCheckValue"
@change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input> @change="judgeMinValue(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> -->
<svg-icon v-if="dataForm.checkValueList[index].isStandard" icon-class="standards" /> <svg-icon v-if="dataForm.checkValueList[index].isMinStandard" icon-class="standards" />
<svg-icon v-else icon-class="noStandards" /> <svg-icon v-else icon-class="noStandards" />
</span> </span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :prop="'checkValueList.' + index + '.maxCheckValue'" label="最大检测值"
:rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
<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].maxCheckValue"
@change="judgeMaxValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>
<span v-if="dataForm.checkValueList[index].showIcon">
<!-- <i class="el-icon-success"></i> -->
<svg-icon v-if="dataForm.checkValueList[index].isMaxStandard" icon-class="standards" />
<svg-icon v-else icon-class="noStandards" />
</span>
</el-form-item>
</el-col>
<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="6"> <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>
@@ -260,14 +274,25 @@ export default {
onInput() { onInput() {
this.$forceUpdate(); this.$forceUpdate();
}, },
judgeValue(val, minValue, maxValue, index) { judgeMinValue(val, minValue, maxValue, index) {
// console.log(cal);
if (val >= minValue && val <= maxValue) { if (val >= minValue && val <= maxValue) {
console.log(val) console.log(val)
this.dataForm.checkValueList[index].showIcon = true this.dataForm.checkValueList[index].showIcon = true
this.dataForm.checkValueList[index].isStandard = true this.dataForm.checkValueList[index].isMinStandard = true
} else { } else {
this.dataForm.checkValueList[index].showIcon = true this.dataForm.checkValueList[index].showIcon = true
this.dataForm.checkValueList[index].isStandard = false this.dataForm.checkValueList[index].isMinStandard = false
}
},
judgeMaxValue(val, minValue, maxValue, index) {
if (val >= minValue && val <= maxValue) {
console.log(val)
this.dataForm.checkValueList[index].showIcon = true
this.dataForm.checkValueList[index].isMaxStandard = true
} else {
this.dataForm.checkValueList[index].showIcon = true
this.dataForm.checkValueList[index].isMaxStandard = false
} }
}, },
handleClose() { handleClose() {
@@ -290,7 +315,7 @@ export default {
checkerId: this.dataForm.checkerId, checkerId: this.dataForm.checkerId,
checkTime: this.dataForm.checkTime, checkTime: this.dataForm.checkTime,
appearance: this.dataForm.appearance, appearance: this.dataForm.appearance,
checkResult: this.dataForm.checkResult, // checkResult: this.dataForm.checkResult,
materialGrade: this.dataForm.materialGrade, materialGrade: this.dataForm.materialGrade,
// checkValueList: [], // checkValueList: [],
checkResult: this.dataForm.checkResult, checkResult: this.dataForm.checkResult,
@@ -304,7 +329,9 @@ export default {
mainId: this.dataForm.id, mainId: this.dataForm.id,
id:ele.id, id:ele.id,
checkDetId: ele.checkDetId, checkDetId: ele.checkDetId,
checkValue: ele.checkValue minCheckValue: ele.minCheckValue,
maxCheckValue: ele.maxCheckValue
})) }))
}) })
Promise.all(array).then(res => { Promise.all(array).then(res => {
@@ -333,7 +360,7 @@ export default {
checkResult: this.dataForm.checkResult, checkResult: this.dataForm.checkResult,
materialGrade: this.dataForm.materialGrade, materialGrade: this.dataForm.materialGrade,
// checkValueList: [], // checkValueList: [],
checkResult: this.dataForm.checkResult, // checkResult: this.dataForm.checkResult,
materialGrade: this.dataForm.materialGrade, materialGrade: this.dataForm.materialGrade,
remark:this.dataForm.remark remark:this.dataForm.remark
} }
@@ -341,11 +368,15 @@ export default {
// this.idAttrShow = true; // this.idAttrShow = true;
let array = [] let array = []
this.dataForm.checkValueList.forEach(ele => { this.dataForm.checkValueList.forEach(ele => {
array.push(this.createDet({ array.push(this.createDet([
{
mainId: response.data, mainId: response.data,
checkDetId: ele.checkDetId, checkDetId: ele.checkDetId,
checkValue: ele.checkValue minCheckValue: ele.minCheckValue,
})) maxCheckValue: ele.maxCheckValue
}
]))
}) })
Promise.all(array).then(res => { Promise.all(array).then(res => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
@@ -376,14 +407,17 @@ export default {
getMaterialCheckList({ getMaterialCheckList({
materialId:val materialId:val
}).then((res) => { }).then((res) => {
console.log('aaaaaaaa', res.data);
this.ingredientList = res.data this.ingredientList = res.data
this.ingredientFlag = true this.ingredientFlag = true
this.dataForm.checkValueList = res.data.map((ele) => { this.dataForm.checkValueList = res.data.map((ele) => {
return { return {
mainId: null, mainId: null,
checkDetId: ele.id, checkDetId: ele.checkDetId,
checkValue: null, minCheckValue:undefined,
isStandard: true, maxCheckValue: undefined,
isMinStandard: true,
isMaxStandard: true,
showIcon:false, showIcon:false,
} }
}) })
@@ -477,28 +511,31 @@ export default {
this.urlOptions.infoURL(id).then(response => { this.urlOptions.infoURL(id).then(response => {
this.dataForm = response.data this.dataForm = response.data
getMaterialCheckList({ getMaterialCheckList({
materialId: response.data.materialId materialId: response.data.materialId,
mainId:id,
}).then((res) => { }).then((res) => {
console.log(res.data); console.log(res.data);
let arr = res.data let arr = res.data
valueList = arr.map((ele) => { valueList = arr.map((ele) => {
// console.log(ele) // console.log(ele)
return { return {
checkDetId:ele.id, checkDetId: ele.checkDetId,
maxValue: ele.maxValue, maxValue: ele.maxValue,
minValue: ele.minValue minValue: ele.minValue
} }
}) })
console.log(valueList); console.log(valueList);
getQualityHotMaterialDetList({ getQualityHotMaterialDetList({
mainId: response.data.id mainId: response.data.id,
materialId: response.data.materialId,
}).then((result) => { }).then((result) => {
this.ingredientList = result.data.map((ele) => { this.ingredientList = result.data.map((ele) => {
return { return {
name: ele.checkName, checkName: ele.checkName,
id: ele.id, id: ele.id,
checkDetId: ele.checkDetId, checkDetId: ele.checkDetId,
checkValue: ele.checkValue, minCheckValue: ele.minCheckValue,
maxCheckValue: ele.maxCheckValue,
maxValue:null, maxValue:null,
minValue: null minValue: null
} }
@@ -509,8 +546,10 @@ export default {
mainId: ele.mainId, mainId: ele.mainId,
id: ele.id, id: ele.id,
checkDetId: ele.checkDetId, checkDetId: ele.checkDetId,
checkValue: ele.checkValue, minCheckValue: ele.minCheckValue,
isStandard: true, maxCheckValue: ele.maxCheckValue,
isMinStandard: true,
isMaxStandard: true,
showIcon: false, showIcon: false,
} }
}) })
@@ -524,13 +563,21 @@ export default {
}) })
valueList.forEach((ele, index) => { valueList.forEach((ele, index) => {
this.dataForm.checkValueList.forEach((item, i) => { this.dataForm.checkValueList.forEach((item, i) => {
if (ele.checkDetId == item.checkDetId && item.checkValue >= ele.minValue && item.checkValue <= ele.maxValue) { if (ele.checkDetId == item.checkDetId && item.minCheckValue >= ele.minValue && item.minCheckValue <= ele.maxValue) {
console.log(1111) console.log(1111)
item.showIcon = true item.showIcon = true
item.isStandard = true item.isMinStandard = true
} else { } else {
item.showIcon = true item.showIcon = true
item.isStandard = false item.isMinStandard = false
}
if (ele.checkDetId == item.checkDetId && item.maxCheckValue >= ele.minValue && item.maxCheckValue <= ele.maxValue) {
console.log(1111)
item.showIcon = true
item.isMaxStandard = true
} else {
item.showIcon = true
item.isMaxStandard = false
} }
}) })
}) })

3
src/views/quality/base/qualityHotMaterial/index.vue
View File

@@ -141,7 +141,8 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'separate' : '',
// type: 'separate',
}, },
{ {
type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'button' : '', type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'button' : '',

5
src/views/quality/base/qualityInspectionDet/index.vue
View File

@@ -105,7 +105,10 @@ export default {
// name: 'reset', // name: 'reset',
// }, // },
{ {
type: 'separate', // type: 'separate',
type: this.$auth.hasPermi('base:quality-inspection-det:create')
? 'separate'
: '',
}, },
{ {
type: this.$auth.hasPermi('base:quality-inspection-det:create') type: this.$auth.hasPermi('base:quality-inspection-det:create')

5
src/views/quality/base/qualityInspectionType/index.vue
View File

@@ -147,7 +147,10 @@ export default {
// name: 'reset', // name: 'reset',
// }, // },
{ {
type: 'separate', type: this.$auth.hasPermi('base:quality-inspection-type:create')
? 'separate'
: '',
// type: 'separate',
}, },
{ {
type: this.$auth.hasPermi('base:quality-inspection-type:create') type: this.$auth.hasPermi('base:quality-inspection-type:create')

3
src/views/quality/base/qualityScrapDet/index.vue
View File

@@ -98,7 +98,8 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'separate' : '',
// type: 'separate',
}, },
{ {
type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '', type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',

3
src/views/quality/base/qualityScrapLog/index.vue
View File

@@ -125,7 +125,8 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'separate' : '',
// type: 'separate',
}, },
{ {
type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '', type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',

3
src/views/quality/base/qualityScrapType/index.vue
View File

@@ -88,7 +88,8 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi('base:quality-scrap-type:create') ? 'separate' : '',
// type: 'separate',
}, },
{ {
type: this.$auth.hasPermi('base:quality-scrap-type:create') ? 'button' : '', type: this.$auth.hasPermi('base:quality-scrap-type:create') ? 'button' : '',

7
src/views/quality/monitoring/equipmentTraceability/index.vue
View File

@@ -269,6 +269,13 @@ export default {
name: 'search', name: 'search',
color: 'primary', color: 'primary',
}, },
{
type: this.$auth.hasPermi(
'monitoring:equipment-traceability:export'
)
? 'separate'
: '',
},
{ {
type: this.$auth.hasPermi( type: this.$auth.hasPermi(
'monitoring:equipment-traceability:export' 'monitoring:equipment-traceability:export'

9
src/views/quality/monitoring/materielDateFrom/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-04-07 16:19:18 * @LastEditTime: 2024-04-10 16:31:48
* @Description: * @Description:
--> -->
<template> <template>
@@ -161,6 +161,13 @@ export default {
// type: 'separate', // type: 'separate',
// type: this.$auth.hasPermi('base:product:create') ? 'separate' : '', // type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
// }, // },
{
type: this.$auth.hasPermi(
'monitoring:materiel-date-from:export'
)
? 'separate'
: '',
},
{ {
type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '', type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
btnName: '导出', btnName: '导出',

7
src/views/quality/monitoring/qualityInspectionRecord/index.vue
View File

@@ -169,7 +169,12 @@ export default {
color: 'primary', color: 'primary',
}, },
{ {
type: 'separate', type: this.$auth.hasPermi(
'base:quality-inspection-record:create'
)
? 'separate'
: '',
// type: 'separate',
}, },
{ {
type: this.$auth.hasPermi( type: this.$auth.hasPermi(