@@ -1,8 +1,8 @@ | |||
### | |||
# @Author: Do not edit | |||
# @Date: 2023-08-29 09:40:39 | |||
# @LastEditTime: 2024-01-08 16:23:54 | |||
# @LastEditors: DY | |||
# @LastEditTime: 2024-01-09 16:27:57 | |||
# @LastEditors: zhp | |||
# @Description: | |||
### | |||
# 开发环境配置 | |||
@@ -9,7 +9,7 @@ import store from './store'; | |||
import router from './router'; | |||
import directive from './directive'; // directive | |||
import plugins from './plugins'; // plugins | |||
import { scrollBoard } from '@jiaminghi/data-view' | |||
// import { scrollBoard } from '@jiaminghi/data-view' | |||
import './assets/icons'; // icon | |||
import './permission'; // permission control | |||
@@ -79,7 +79,7 @@ Vue.use(CodeBrickZj) | |||
Vue.use(directive); | |||
Vue.use(plugins); | |||
Vue.use(VueMeta); | |||
Vue.use(scrollBoard) | |||
// Vue.use(scrollBoard) | |||
// Vue.use(hljs.vuePlugin); | |||
import scroll from 'vue-seamless-scroll' | |||
Vue.use(scroll) | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2021-07-19 15:18:30 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2023-11-23 11:14:30 | |||
* @LastEditTime: 2024-01-08 16:07:58 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -29,13 +29,13 @@ | |||
<el-row class="container-main flex-col" type="flex"> | |||
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15 * beilv" type="flex" class="flex-1"> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> | |||
<base-container :beilv="1" :title="'搬运任务'" :title-icon="'5_1'" :back="'energy'"> | |||
<base-table1 :page="1" :limit="9" :show-index="false" :beilv="1" :table-config="qualityYearTableProps" | |||
<base-container :beilv="1" :size="'middle'" :title="'搬运任务'" :title-icon="'5_1'" :back="'energy'"> | |||
<base-table1 :page="1" :limit="999" :show-index="false" :beilv="1" :table-config="qualityYearTableProps" | |||
:table-data="qualityYearList" /> | |||
</base-container> | |||
</el-col> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> | |||
<base-container :beilv="1" :title="'周转进度'" :title-icon="'5_3'" :back="'energy'"> | |||
<base-container :beilv="1" :size="'middle'" :title="'周转进度'" :title-icon="'5_3'" :back="'energy'"> | |||
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;"> | |||
<top-radio-group /> | |||
</div> --> | |||
@@ -85,16 +85,17 @@ | |||
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="12 * beilv" type="flex" class="flex-1"> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> | |||
<base-container :beilv="1" :height="256" :title="'库存管理'" :title-icon="'5_5'" :back="'energy'"> | |||
<base-container :beilv="1" :height="256" :size="'middle'" :title="'库存管理'" :title-icon="'5_5'" | |||
:back="'energy'"> | |||
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;"> | |||
<top-radio-group /> | |||
</div> --> | |||
<!-- <el-row :gutter="9 * beilv"> --> | |||
<!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> --> | |||
<base-table :page="1" :limit="9" :show-index="false" :beilv="1" :table-config="inventoryTableProps" | |||
:table-data="inventoryList" /> | |||
<!-- </el-col> --> | |||
<!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> | |||
<!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> --> | |||
<base-table :page="1" :limit="999" :show-index="false" :beilv="1" :table-config="inventoryTableProps" | |||
:table-data="inventoryList" /> | |||
<!-- </el-col> --> | |||
<!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> | |||
<base-table3 | |||
:page="2" | |||
:limit="5" | |||
@@ -107,12 +108,13 @@ | |||
</base-container> | |||
</el-col> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> | |||
<base-container :beilv="1" :height="318 + 338 + 16" :title="'库位信息'" :title-icon="'5_4'" :back="'energy'"> | |||
<base-container :beilv="1" :height="318 + 338 + 16" :size="'middle'" :title="'库位信息'" :title-icon="'5_4'" | |||
:back="'energy'"> | |||
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;"> | |||
<top-radio-group /> | |||
</div> --> | |||
<!-- 像下面这样表格里的limit值,也许可以用js动态计算出来 --> | |||
<base-table2 :page="1" :limit="9" :show-index="false" :beilv="1" :table-config="locationTableProps" | |||
<base-table2 :page="1" :limit="999" :show-index="false" :beilv="1" :table-config="locationTableProps" | |||
:table-data="locationList" /> | |||
</base-container> | |||
</el-col> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2021-07-19 15:18:30 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-01-04 16:41:17 | |||
* @LastEditTime: 2024-01-09 15:34:00 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -29,14 +29,14 @@ | |||
<el-row class="container-main flex-col" type="flex"> | |||
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1"> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8"> | |||
<base-container :title="'切割数据'" :title-icon="'eqAlarm'"> | |||
<base-container :title="'切割数据'" :size="'small'" :title-icon="'eqAlarm'"> | |||
<base-table1 :page="1" :limit="999" :show-index="false" :table-config="cutProps" | |||
:table-data="cutTableDataList" /> | |||
</base-container> | |||
</el-col> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8"> | |||
<base-container :title="'产量及良率统计'" :title-icon="'productLine'"> | |||
<base-container :title="'产量及良率统计'" :size="'small'" :title-icon="'energyMonitoring'"> | |||
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;"> | |||
<top-radio-group /> | |||
</div> --> | |||
@@ -47,7 +47,7 @@ | |||
</el-col> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8"> | |||
<base-container :title="'ISRA 缺陷数据'" :title-icon="'eqMonitoring'"> | |||
<base-container :title="'ISRA 缺陷数据'" :size="'small'" :title-icon="'scrap'"> | |||
<base-table1 :page="1" :limit="999" :show-index="false" :table-config="ISRATableProps" | |||
:table-data="ISRAList" /> | |||
</base-container> | |||
@@ -56,7 +56,7 @@ | |||
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="10" type="flex" class="flex-1"> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> | |||
<base-container :height="256" :title="'废片 缺陷数据'" :title-icon="'energyMonitoring'"> | |||
<base-container :height="256" :title="'废片 缺陷数据'" :size="'middle'" :title-icon="'scrap'"> | |||
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;"> | |||
<top-radio-group /> | |||
</div> --> | |||
@@ -78,7 +78,7 @@ | |||
</base-container> | |||
</el-col> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="14"> | |||
<base-container :height="318 + 338 + 16" :title="'设备状态监控'" :title-icon="'scrap'"> | |||
<base-container :height="318 + 338 + 16" :size="'middle'" :title="'设备状态监控'" :title-icon="'eqMonitoring'"> | |||
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;"> | |||
<top-radio-group /> | |||
</div> --> | |||
@@ -89,12 +89,12 @@ | |||
:table-data="funList" /> | |||
</el-col> | |||
<el-col :span="6"> | |||
<h3 style="margin: 5px 0 5px 0;">退火风机</h3> | |||
<h4 style="margin: 5px 0 5px 0;">退火风机</h4> | |||
<base-table1 :page="1" :limit="999" :show-index="false" :table-config="EqMonitoringPropsFun" | |||
:table-data="annealFunList" /> | |||
</el-col> | |||
<el-col :span="12" style="float: right;"> | |||
<h3 style="margin: 5px 0 5px 0;">产线设备</h3> | |||
<h4 style="margin: 5px 0 5px 0;">产线设备</h4> | |||
<base-table1 :page="1" :limit="999" :show-index="false" :table-config="EqMonitoringProps" | |||
:table-data="realEqList" /> | |||
</el-col> | |||
@@ -133,6 +133,7 @@ import screenfull from 'screenfull' | |||
// import BaseVideo from './components/baseVideo.vue' | |||
import alarmLevel from './components/alarmLevel' | |||
import pileBarChart from './components/pileBarChart' | |||
import colorDiv from './components/colorDiv' | |||
// import axios from '@/utils/request' | |||
import doubleYChart from './components/doubleYChart ' | |||
@@ -170,7 +171,10 @@ const cutProps = [ | |||
{ prop: 'size', label: '规格' }, | |||
{ prop: 'productArea', label: '良品面积', width: 80 }, | |||
{ prop: 'wasteArea', label: '废片面积', width: 80 }, | |||
{ prop: 'product', label: '良品率', width: 80 }, | |||
{ | |||
prop: 'product', label: '良品率', width: 80, | |||
subcomponent: colorDiv, | |||
}, | |||
] | |||
const cxNameList = ['周一', '周二', '周三', '周四', '周五'] | |||
@@ -527,8 +531,7 @@ export default { | |||
size: this.getSize(ele.size), | |||
productArea: ele.productArea + '㎡', | |||
wasteArea: ele.wasteArea + '㎡', | |||
product: (ele.product * 100).toFixed(2) + '%' | |||
product: (ele.product * 100).toFixed(2) | |||
} | |||
// } | |||
}); | |||
@@ -665,7 +668,7 @@ export default { | |||
width: 100%; | |||
background: url('../../assets/img/OperationalOverview/title.png') no-repeat; | |||
background-size: 100% 100%; | |||
color: #00fff0; | |||
color: #ffffff; | |||
text-align: center; | |||
.unit { | |||
@@ -683,7 +686,7 @@ export default { | |||
} | |||
.title-button { | |||
color: #00fff0; | |||
color: #ffffff; | |||
font-size: 20px; | |||
position: absolute; | |||
} | |||
@@ -2,13 +2,13 @@ | |||
* @Author: gtz | |||
* @Date: 2022-01-19 15:58:17 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-01-04 16:16:22 | |||
* @LastEditTime: 2024-01-08 16:03:05 | |||
* @Description: file content | |||
* @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue | |||
--> | |||
<template> | |||
<div class="base-container" ref="baseContainer" :style="{ height: '100%', fontSize: 12 + 'px', padding: 12 + 'px' }" | |||
:class="{ 'no-padding': noPadding, 'border-none': !showLine }"> | |||
:class="[{ 'no-padding': noPadding, 'border-none': !showLine }, 'base-container__' + size]"> | |||
<!-- <div class="base-container" :style="{height: height + 'px', fontSize: 12 + 'px', padding: 12 + 'px'}"> --> | |||
<template v-if="showLine"> | |||
<div class="line" /> | |||
@@ -74,6 +74,10 @@ export default { | |||
beilv: { | |||
type: Number, | |||
default: 1 | |||
}, | |||
size: { | |||
type: String, | |||
default: '' | |||
} | |||
}, | |||
data() { | |||
@@ -106,8 +110,25 @@ export default { | |||
// background-color: rgba($color: #061027, $alpha: 0.15); | |||
position: relative; | |||
// border: 2px solid; | |||
background: url('../../../../assets/img/energy.png') no-repeat; | |||
background-size: 100% 100%; | |||
// background: url('../../../../assets/img/energy.png') no-repeat; | |||
// background-size: 100% 100%; | |||
&__small { | |||
background: url(../../../../assets/img/short.png) no-repeat; | |||
background-size: 100% 100%; | |||
// background-position: 0 0; | |||
} | |||
&__middle { | |||
background: url(../../../../assets/img/middle.png) no-repeat; | |||
background-size: 100% 100%; | |||
// background-position: 0 0; | |||
} | |||
&__large { | |||
background: url(../../../../assets/img/high.png) no-repeat; | |||
background-size: 100% 100%; | |||
// background-position: 0 0; | |||
} | |||
// border-radius: 40px 0px 40px 0px; | |||
// border-image: linear-gradient(360deg, rgba(157, 246, 254, 0.05), rgba(100, 233, 252, 0.9)) 2 2; | |||
// .line { | |||
@@ -170,8 +191,8 @@ export default { | |||
.bar-title { | |||
width: 100%; | |||
color: #52fff1; | |||
font-size: 1.5em; | |||
color: #ffffff; | |||
font-size: 1.6em; | |||
padding: 0.67em; | |||
} | |||
@@ -1,26 +1,23 @@ | |||
<!-- | |||
* @Date: 2020-12-14 09:07:03 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-01-04 16:16:00 | |||
* @LastEditTime: 2024-01-08 14:09:05 | |||
* @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseTable.vue | |||
* @Description: | |||
--> | |||
<template> | |||
<div class="visual-base-table-container scroll_table"> | |||
<div style="display: inline-block; width: 100%"> | |||
<el-table class="top" v-loading="isLoading" | |||
:header-cell-style="{background:'rgba(4, 74, 132, .19)',color:'#fff',}" :row-style="setRowStyle" | |||
:data="renderData" border style="width: 100%; background: transparent"> | |||
:header-cell-style="{ background: 'rgba(32, 55, 96, 1)', color: '#fff', height: '33px', }" | |||
:row-style="setRowStyle" :data="renderData" border style="width: 100%; background: transparent"> | |||
<el-table-column prop="_pageIndex" label="序号" :width="50" align="center" /> | |||
<el-table-column v-for="item in renderTableHeadList" :key="item.prop" :show-overflow-tooltip="showOverflow" | |||
v-bind="item"> | |||
<template slot-scope="scope"> | |||
<component :is="item.subcomponent" v-if="item.subcomponent" :inject-data="{...scope.row, ...item}" | |||
@emitData="emitData" /> | |||
<span v-else>{{ scope.row[item.prop] | commonFilter(item.filter) }}</span> | |||
</template> | |||
</el-table-column> | |||
<slot name="content" /> | |||
@@ -33,11 +30,9 @@ | |||
<el-table-column v-for="item in renderTableHeadList" :key="item.prop" :show-overflow-tooltip="showOverflow" | |||
v-bind="item"> | |||
<template slot-scope="scope"> | |||
<component :is="item.subcomponent" v-if="item.subcomponent" :inject-data="{...scope.row, ...item}" | |||
@emitData="emitData" /> | |||
<span v-else>{{ scope.row[item.prop] | commonFilter(item.filter) }}</span> | |||
</template> | |||
</el-table-column> | |||
<slot name="content" /> | |||
@@ -45,7 +40,6 @@ | |||
</vue-seamless-scroll> | |||
</div> | |||
</div> | |||
</template> | |||
<script> | |||
import { isObject, isString } from 'lodash' | |||
@@ -0,0 +1,44 @@ | |||
<!-- | |||
* @Date: 2021-02-20 10:45:21 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-01-09 16:16:43 | |||
* @FilePath: \basic-admin\src\views\EquipmentManager\TypeParamSetting\ColorSqua.vue | |||
* @Description: | |||
--> | |||
<template> | |||
<span :class="[injectData.product <= 91 ? 'orange' : 'white']" > | |||
{{ injectData.product + "%" }} | |||
</span> | |||
</template> | |||
<script> | |||
export default { | |||
props: { | |||
injectData: { | |||
type: Object, | |||
default: () => ({}) | |||
} | |||
}, | |||
data() { | |||
return { | |||
color: 'rgba(255,255,255,0.5)', | |||
} | |||
}, | |||
mounted() { | |||
this.product = this.injectData.product | |||
}, | |||
methods: { | |||
emitClick() { | |||
console.log(this.injectData) | |||
} | |||
} | |||
} | |||
</script> | |||
<style scoped> | |||
.orange{ | |||
color:rgba(255, 209, 96, 1) | |||
} | |||
.white{ | |||
color:rgba(255, 255, 255, 0.5) | |||
} | |||
</style> |
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-09-21 09:06:28 | |||
* @LastEditTime: 2023-12-29 16:18:17 | |||
* @LastEditTime: 2024-01-09 14:42:02 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -88,11 +88,21 @@ export default { | |||
name: '产线产量', | |||
type: 'bar', | |||
yAxisIndex: 1, | |||
itemStyle: { | |||
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ | |||
{ offset: 0, color: '#9DD5FF' }, | |||
{ offset: 1, color: '#1295FF' } | |||
]) | |||
itemStyle: { | |||
normal: { | |||
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ | |||
{ offset: 0, color: '#9DD5FF' }, | |||
{ offset: 0.3, color: '#1295FF' } | |||
]), | |||
label: { | |||
show: true, //开启显示 | |||
position: 'top', //在上方显示 | |||
textStyle: { //数值样式 | |||
color: '#ced1d5', | |||
fontSize: 12 | |||
} | |||
}, | |||
} | |||
// barBorderRadius: this.borderRadius | |||
}, | |||
barWidth: 12, | |||
@@ -100,6 +110,7 @@ export default { | |||
}, | |||
{ | |||
name: '产线良品率', | |||
symbol: 'circle', //变为实心圆 | |||
type: 'line', | |||
yAxisIndex: 0, | |||
areaStyle: { | |||
@@ -126,10 +137,10 @@ export default { | |||
data: passRateList | |||
} | |||
] | |||
const colors = ['#5470C6', '#91CC75', '#EE6666'] | |||
// const colors = ['#5470C6', '#91CC75', '#EE6666'] | |||
this.chart = echarts.init(document.getElementById(this.id)) | |||
this.chart.setOption({ | |||
color: colors, | |||
// color: colors, | |||
tooltip: { | |||
trigger: 'axis', | |||
axisPointer: { | |||
@@ -137,8 +148,8 @@ export default { | |||
} | |||
}, | |||
grid: { | |||
left: "4%", | |||
right: "4%", | |||
left: "3%", | |||
right: "5%", | |||
bottom: "3%", | |||
width: 'auto', | |||
height: "auto", | |||
@@ -187,11 +198,13 @@ export default { | |||
type: 'value', | |||
name: '良品率/%', | |||
nameTextStyle: {// y轴上方单位的颜色 | |||
color: '#fff' | |||
color: '#fff', | |||
align: "left", | |||
}, | |||
position: 'right', | |||
alignTicks: true, | |||
axisLine: { | |||
show: true, | |||
lineStyle: { | |||
type: 'solid', | |||
color: '#213259', // 左边线的颜色 | |||
@@ -227,12 +240,15 @@ export default { | |||
scale: true, | |||
type: 'value', | |||
name: '产量/㎡', // y轴上方的单位 | |||
nameTextStyle: {// y轴上方单位的颜色 | |||
color: '#fff' | |||
nameTextStyle: { | |||
color: "#fff", | |||
// fontSize: 10, | |||
align: "right", | |||
}, | |||
position: 'left', | |||
alignTicks: true, | |||
axisLine: { | |||
show: true, | |||
lineStyle: { | |||
type: 'solid', | |||
color: '#213259', // 左边线的颜色 | |||
@@ -142,6 +142,7 @@ export default { | |||
} | |||
}, | |||
axisLabel: { | |||
show: true, // 是否显示 y 轴 | |||
textStyle: { | |||
color: 'rgba(255,255,255,1)' // 坐标值得具体的颜色 | |||
} | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2021-07-19 15:18:30 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-01-04 15:52:52 | |||
* @LastEditTime: 2024-01-08 16:06:49 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -29,21 +29,21 @@ | |||
<el-row class="container-main flex-col" type="flex"> | |||
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1" style="height: 50%;"> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%"> | |||
<base-container :title="'设备报警'" :height="318" :title-icon="'eqAlarm'"> | |||
<base-container :title="'设备报警'" :size="'small'" :height="318" :title-icon="'eqAlarm'"> | |||
<base-table1 :page="1" :limit="999" :show-index="false" :table-config="qualityYearTableProps" | |||
:table-data="equipmentList" /> | |||
</base-container> | |||
</el-col> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%"> | |||
<base-container :title="'各工序缺陷汇总'" :title-icon="'scrap'"> | |||
<base-container :title="'各工序缺陷汇总'" :size="'small'" :title-icon="'scrap'"> | |||
<base-table1 :page="1" :limit="999" :show-index="false" :table-config="qualityMonthTableProps" | |||
:table-data="qualityMonthList" /> | |||
</base-container> | |||
</el-col> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%"> | |||
<base-container :height="318" :title="'工单监控'" :title-icon="'eqMonitoring'"> | |||
<base-container :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'"> | |||
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;"> | |||
<top-radio-group /> | |||
</div> --> | |||
@@ -95,7 +95,7 @@ | |||
<el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="12" type="flex" class="flex-1"> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> | |||
<base-container :height="256" :title="'能源监控'" :title-icon="'energyMonitoring'"> | |||
<base-container :height="256" :size="'middle'" :title="'能源监控'" :title-icon="'energyMonitoring'"> | |||
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;"> | |||
<top-radio-group /> | |||
</div> --> | |||
@@ -117,7 +117,7 @@ | |||
</base-container> | |||
</el-col> | |||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12"> | |||
<base-container :height="318 + 338 + 16" :title="'产线产量及良品率'" :title-icon="'productLine'"> | |||
<base-container :height="318 + 338 + 16" :size="'middle'" :title="'产线产量及良品率'" :title-icon="'productLine'"> | |||
<!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;"> | |||
<top-radio-group /> | |||
</div> --> | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-08 13:46:17 | |||
* @LastEditTime: 2023-12-15 16:12:08 | |||
* @LastEditTime: 2024-01-09 16:03:22 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -455,8 +455,8 @@ export default { | |||
materialId: response.data.materialId | |||
}).then((res) => { | |||
console.log(res.data); | |||
this.ingredientList = res.data | |||
valueList = this.ingredientList.map((ele) => { | |||
let arr = res.data | |||
valueList = arr.map((ele) => { | |||
// console.log(ele) | |||
return { | |||
maxValue: ele.maxValue, | |||
@@ -466,6 +466,17 @@ export default { | |||
getQualityHotMaterialDetList({ | |||
mainId: response.data.id | |||
}).then((result) => { | |||
this.ingredientList = result.data.map((ele) => { | |||
return { | |||
name: ele.checkName, | |||
id: ele.id, | |||
checkDetId: ele.id, | |||
checkValue: ele.checkValue, | |||
// isStandard: true, | |||
// showIcon: false, | |||
} | |||
}) | |||
console.log(this.ingredientList); | |||
this.dataForm.checkValueList = result.data.map((ele) => { | |||
return { | |||
mainId: ele.mainId, | |||