yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

能源管理、大屏及大屏设置对接接口

Browse Source
dev
qiuhongwu 3 months ago
parent 0d73d7bab2
commit 79da5e8ca1
4 changed files with 447 additions and 330 deletions
Show Stats Download Patch File Download Diff File

280
mes-ui/mes-echarts/src/views/bottomRight.vue
Unescape View File

@ -8,159 +8,238 @@
</div> </div>
</div> </div>
<div class="ranking bg-color-black"> <div class="ranking bg-color-black">
<span class="ranking_span">各产品合格率(%)</span> <span class="ranking_span"> 能源管理</span>
<div class="item"> <div id="chart" ref="chart" style="width: 500px; height: 200px"></div>
<!-- <div class="item">
<div v-for="item in productOKRateList" :key="item.ProductName" class="ranking1"> <div v-for="item in productOKRateList" :key="item.ProductName" class="ranking1">
<dv-water-level-pond :config="item.config" style="width:105px;height:60px" /> <dv-water-level-pond :config="item.config" style="width:105px;height:60px" />
<span class="item_span">{{ item.ProductName }}</span> <span class="item_span">{{ item.ProductName }}</span>
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import bottomRightChart from "@/components/echart/bottom/bottomRightChart"; import bottomRightChart from '@/components/echart/bottom/bottomRightChart'
// import CenterChart from '@/components/echart/center/centerChartRate' // import CenterChart from '@/components/echart/center/centerChartRate'
import { request } from "@/utils/request.js"; import { request } from '@/utils/request.js'
import * as echarts from 'echarts'
export default { export default {
components: { components: {
// CenterChart, // CenterChart,
bottomRightChart, bottomRightChart
}, },
data() { data() {
return { return {
water: { water: {
data: [24, 45], data: [24, 45],
shape: "roundRect", shape: 'roundRect',
formatter: "{value}%", formatter: '{value}%',
waveNum: 3, waveNum: 3
}, },
productOKRateList: [], productOKRateList: [],
config: { config: {
data: [10], data: [10],
shape: "round", shape: 'round',
waveHeight: 10, waveHeight: 10,
waveNum: 2, waveNum: 2,
colors: ["#00FFFF", "#00B2EE"], colors: ['#00FFFF', '#00B2EE']
}, },
// 通过率和达标率的组件复用数据 // 通过率和达标率的组件复用数据
rate: [ rate: [
{ {
id: "centerRate1", id: 'centerRate1',
tips: 60, tips: 60,
colorData: { colorData: {
textStyle: "#3fc0fb", textStyle: '#3fc0fb',
series: { series: {
color: ["#00bcd44a", "transparent"], color: ['#00bcd44a', 'transparent'],
dataColor: { dataColor: {
normal: "#03a9f4", normal: '#03a9f4',
shadowColor: "#97e2f5", shadowColor: '#97e2f5'
}, }
}, }
}, }
}, },
{ {
id: "centerRate2", id: 'centerRate2',
tips: 40, tips: 40,
colorData: { colorData: {
textStyle: "#67e0e3", textStyle: '#67e0e3',
series: { series: {
color: ["#faf3a378", "transparent"], color: ['#faf3a378', 'transparent'],
dataColor: { dataColor: {
normal: "#ff9800", normal: '#ff9800',
shadowColor: "#fcebad", shadowColor: '#fcebad'
}, }
}, }
}, }
}, }
], ],
}; dates: [],
waters: [],
electricals: [],
gas: []
}
}, },
created() { created() {
// 使用 localStorage.getItem 通过键名获取存储的值 // 使用 localStorage.getItem 通过键名获取存储的值
const storedString = localStorage.getItem("myStoredArray"); const storedString = localStorage.getItem('myStoredArray')
// 检查存储的值是否存在 // 检查存储的值是否存在
if (storedString !== null) { if (storedString !== null) {
// 使用 JSON.parse 将字符串反序列化回数组 // 使用 JSON.parse 将字符串反序列化回数组
this.retrievedArray = JSON.parse(storedString); this.retrievedArray = JSON.parse(storedString)
this.retrievedArray.filter((item) => { this.retrievedArray.filter((item) => {
if (item.type == "QualifiedRateOfEachProduct") { if (item.type == 'QualifiedRateOfEachProduct') {
if (item.openMock == 1) { var datalist = JSON.parse(item.data)
var datalist = JSON.parse(item.mockData);
// this.productOKRateList = datalist[0]; datalist[0].forEach((item) => {
const EachProductmock=[] item = item.substring(5)
for (let i = 0; i < datalist[0].length; i++) { this.dates.push(item)
const newRowmk = []; })
for (let j = 0; j < datalist.length; j++) { this.waters = datalist[1]
newRowmk.push(datalist[j][i]); this.electricals = datalist[2]
} this.gas = datalist[3]
EachProductmock.push(newRowmk);
}
this.productOKRateList = [];
for (const item of EachProductmock) {
var n = {
data: [item[1]*1],
shape: "roundRect",
formatter: "{value}%",
waveNum: 2,
waveHeight: 10,
// 判断合格率低于95显示红色
colors:
item[1] > 95
? ["#00FFFF", "#00B2EE"]
: ["#ff6600", "#cc0000"],
};
this.productOKRateList.push({
ProductName: item[0],
config: n,
});
}
} else {
var datalist = JSON.parse(item.data);
// this.productOKRateList = datalist[0];
const EachProductmock=[]
for (let i = 0; i < datalist[0].length; i++) {
const newRowmk = [];
for (let j = 0; j < datalist.length; j++) {
newRowmk.push(datalist[j][i]);
}
EachProductmock.push(newRowmk);
}
this.productOKRateList = [];
for (const item of EachProductmock) {
var n = {
data: [item[1]*1],
shape: "roundRect",
formatter: "{value}%",
waveNum: 2,
waveHeight: 10,
// 判断合格率低于95显示红色
colors:
item[1] > 95
? ["#00FFFF", "#00B2EE"]
: ["#ff6600", "#cc0000"],
};
this.productOKRateList.push({
ProductName: item[0],
config: n,
});
}
}
} }
}); })
} }
}, },
mounted() { mounted() {
this.initChart()
}, },
methods: { methods: {
initChart() {
}, // 初始化 ECharts 实例
}; const chartInstance = echarts.init(this.$refs.chart)
// 指定图表的配置项和数据
const option = {
color: ['#5b9bd5', '#ed7d31'],
grid: {
top: 20,
bottom: 70,
left: '12%',
right: '2%',
show: false,
axisLine: { lineStyle: { color: 'transparent' } },
axisTick: { show: false },
splitLine: { show: false }
},
legend: {
bottom: '10',
itemWidth: 30,
itemHeight: 6,
data: ['水(吨)', '电(度)', '气(立方米)'],
textStyle: {
color: '#fff'
}
},
xAxis: [
{
// name: '日期',
nameLocation: 'center',
nameTextStyle: {
color: '#fff'
},
nameGap: 50,
axisLine: {
show: false
},
axisTick: {
show: false
},
axisLabel: {
rotate: 50,
color: '#fff',
interval: 0
},
splitLine: {
show: false,
lineStyle: {
color: '#fff'
}
},
data: this.dates
}
],
yAxis: [
{
name: '能源消耗',
nameLocation: 'center',
nameGap: 40,
nameTextStyle: {
color: '#fff'
},
axisLine: {
lineStyle: {
color: '#fff'
}
},
axisTick: {
show: false
},
splitLine: {
show: true,
lineStyle: {
color: '#CCC'
}
},
axisLabel: {
color: '#fff'
}
}
],
series: [
{
name: '水(吨)',
type: 'line',
itemStyle: {
color: '#5b9bd5',
borderColor: '#5b9bd5',
borderWidth: 4
},
lineStyle: {
width: 4
},
data: this.waters
},
{
name: '电(度)',
type: 'line',
itemStyle: {
color: '#ed7d31',
borderColor: '#ed7d31',
borderWidth: 4
},
lineStyle: {
width: 4
},
data: this.electricals
},
{
name: '气(立方米)',
type: 'line',
itemStyle: {
color: 'rgb(25 190 107)',
borderColor: 'rgb(25 190 107)',
borderWidth: 4
},
lineStyle: {
width: 4
},
data: this.gas
}
]
}
// 使用刚指定的配置项和数据显示图表。
chartInstance.setOption(option)
}
}
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -214,7 +293,7 @@ export default {
display: inline-block; display: inline-block;
padding: 5px 0; padding: 5px 0;
text-align: center; text-align: center;
width:100px; width: 100px;
overflow: hidden; /* 隐藏超出的内容 */ overflow: hidden; /* 隐藏超出的内容 */
text-overflow: ellipsis; /* 添加省略号 */ text-overflow: ellipsis; /* 添加省略号 */
white-space: nowrap; /* 防止内容换行 */ white-space: nowrap; /* 防止内容换行 */
@ -249,4 +328,3 @@ export default {
} }
} }
</style> </style>

4
mes-ui/mes-ui-admin-vue3/src/views/biz/energy/EnergyForm.vue
Unescape View File

@ -4,7 +4,7 @@
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
label-width="100px" label-width="130px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="能源所属日期" prop="energyDate"> <el-form-item label="能源所属日期" prop="energyDate">
@ -105,4 +105,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

291
mes-ui/mes-ui-admin-vue3/src/views/biz/energy/index.vue
Unescape View File

@ -1,139 +1,142 @@
<template> <template>
<ContentWrap> <el-card class="hl-card">
<!-- 搜索工作栏 --> <template #header>
<el-form <span>能源管理</span>
class="-mb-15px" </template>
:model="queryParams" <ContentWrap>
ref="queryFormRef" <!-- 搜索工作栏 -->
:inline="true" <el-form
label-width="68px" class="-mb-15px"
> :model="queryParams"
<el-form-item label="编号" prop="id"> ref="queryFormRef"
<el-input :inline="true"
v-model="queryParams.id" label-width="120px"
placeholder="请输入编号" >
clearable <!-- <el-form-item label="编号" prop="id">
@keyup.enter="handleQuery" <el-input
class="!w-240px" v-model="queryParams.id"
/> placeholder="请输入编号"
</el-form-item> clearable
<el-form-item label="能源所属日期" prop="energyDate"> @keyup.enter="handleQuery"
<el-date-picker class="!w-240px"
v-model="queryParams.energyDate" />
value-format="YYYY-MM-DD HH:mm:ss" </el-form-item> -->
type="daterange" <el-form-item label="能源所属日期" prop="energyDate">
start-placeholder="开始日期" <el-date-picker
end-placeholder="结束日期" v-model="getDateRangevalue"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" type="date"
class="!w-240px" placeholder="发生时间"
/> class="!w-240px"
</el-form-item> @change="getDateRange"
<el-form-item label="水(吨)" prop="waterNum"> />
<el-input </el-form-item>
v-model="queryParams.waterNum" <!-- <el-form-item label="水(吨)" prop="waterNum">
placeholder="请输入水(吨)" <el-input
clearable v-model="queryParams.waterNum"
@keyup.enter="handleQuery" placeholder="请输入水(吨)"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="电(度)" prop="electricalNum"> />
<el-input </el-form-item>
v-model="queryParams.electricalNum" <el-form-item label="电(度)" prop="electricalNum">
placeholder="请输入电(度)" <el-input
clearable v-model="queryParams.electricalNum"
@keyup.enter="handleQuery" placeholder="请输入电(度)"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="气(立方米)" prop="gasNum"> />
<el-input </el-form-item>
v-model="queryParams.gasNum" <el-form-item label="气(立方米)" prop="gasNum">
placeholder="请输入气(立方米)" <el-input
clearable v-model="queryParams.gasNum"
@keyup.enter="handleQuery" placeholder="请输入气(立方米)"
class="!w-240px" clearable
/> @keyup.enter="handleQuery"
</el-form-item> class="!w-240px"
<el-form-item label="创建时间" prop="createTime"> />
<el-date-picker </el-form-item>
v-model="queryParams.createTime" <el-form-item label="创建时间" prop="createTime">
value-format="YYYY-MM-DD HH:mm:ss" <el-date-picker
type="daterange" v-model="queryParams.createTime"
start-placeholder="开始日期" value-format="YYYY-MM-DD HH:mm:ss"
end-placeholder="结束日期" type="daterange"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" start-placeholder="开始日期"
class="!w-240px" end-placeholder="结束日期"
/> :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
</el-form-item> class="!w-240px"
<el-form-item> />
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> </el-form-item> -->
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <el-form-item style="margin-left: 40px;">
<el-button <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
type="primary" <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
plain
@click="openForm('create')"
v-hasPermi="['biz:energy:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['biz:energy:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="能源所属日期" align="center" prop="energyDate" />
<el-table-column label="水(吨)" align="center" prop="waterNum" />
<el-table-column label="电(度)" align="center" prop="electricalNum" />
<el-table-column label="气(立方米)" align="center" prop="gasNum" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button <el-button
link
type="primary" type="primary"
@click="openForm('update', scope.row.id)" plain
v-hasPermi="['biz:energy:update']" @click="openForm('create')"
v-hasPermi="['biz:energy:create']"
> >
编辑 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-button <el-button
link type="success"
type="danger" plain
@click="handleDelete(scope.row.id)" @click="handleExport"
v-hasPermi="['biz:energy:delete']" :loading="exportLoading"
v-hasPermi="['biz:energy:export']"
> >
删除 <Icon icon="ep:download" class="mr-5px" /> 导出
</el-button> </el-button>
</template> </el-form-item>
</el-table-column> </el-form>
</el-table> </ContentWrap>
<!-- 分页 -->
<Pagination <!-- 列表 -->
:total="total" <ContentWrap>
v-model:page="queryParams.pageNo" <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table" >
v-model:limit="queryParams.pageSize" <el-table-column label="编号" align="center" prop="id" min-width="100"/>
@pagination="getList" <el-table-column label="能源所属日期" align="center" prop="energyDate" min-width="220"/>
/> <el-table-column label="水(吨)" align="center" prop="waterNum" min-width="100"/>
</ContentWrap> <el-table-column label="电(度)" align="center" prop="electricalNum" min-width="100"/>
<el-table-column label="气(立方米)" align="center" prop="gasNum" min-width="100"/>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
min-width="220px"
/>
<el-table-column label="操作" align="center" min-width="100">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['biz:energy:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['biz:energy:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</el-card>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<EnergyForm ref="formRef" @success="getList" /> <EnergyForm ref="formRef" @success="getList" />
@ -162,15 +165,45 @@ const queryParams = reactive({
electricalNum: undefined, electricalNum: undefined,
gasNum: undefined, gasNum: undefined,
createTime: [], createTime: [],
sDate:undefined,
eDate:undefined,
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中 const exportLoading = ref(false) // 导出的加载中
const getDateRangevalue = ref() // 日期范围
//处理日期
const getDateRange = (getDateRangevalue) => {
if (getDateRangevalue == null) {
queryParams.sDate = undefined
queryParams.eDate = undefined
} else {
queryParams.sDate =
getDateRangevalue.toLocaleDateString('en-CA', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
}) +
' ' +
'00:00:00'
queryParams.eDate =
getDateRangevalue.toLocaleDateString('en-CA', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
}) +
' ' +
'23:59:59'
}
}
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {
loading.value = true loading.value = true
try { try {
const data = await EnergyApi.getEnergyPage(queryParams) const data = await EnergyApi.getEnergyPage(queryParams)
data.list.forEach((item: any) => {
item.energyDate = item.energyDate.join('-')
})
list.value = data.list list.value = data.list
total.value = data.total total.value = data.total
} finally { } finally {
@ -228,4 +261,4 @@ const handleExport = async () => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

202
mes-ui/mes-ui-admin-vue3/src/views/majoys/screen/index.vue
Unescape View File

@ -241,7 +241,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-card class="hl-card-info"> <!-- <el-card class="hl-card-info">
<template #header> <template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">各产品合格率(%)</span> <div class="hl-card-info-icona"></div><span class="hl-card-info-text">各产品合格率(%)</span>
</template> </template>
@ -276,7 +276,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card> -->
<el-card class="hl-card-info"> <el-card class="hl-card-info">
<template #header> <template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">设备状态</span> <div class="hl-card-info-icona"></div><span class="hl-card-info-text">设备状态</span>
@ -403,21 +403,21 @@ const mockDataSwitchChange = async () => {
formData.value.ProductionOrderState.openMock = 0 formData.value.ProductionOrderState.openMock = 0
formData.value.QuantityOfEachProductProduced.openMock = 0 formData.value.QuantityOfEachProductProduced.openMock = 0
formData.value.UtilizationRateOfEquipment.openMock = 0 formData.value.UtilizationRateOfEquipment.openMock = 0
formData.value.QualifiedRateOfEachProduct.openMock = 0 // formData.value.QualifiedRateOfEachProduct.openMock = 0
formData.value.EquipmentOperationState.openMock = 0 formData.value.EquipmentOperationState.openMock = 0
formData.value.ProductionStateList.data = oldProductionStateListdata.value formData.value.ProductionStateList.data = oldProductionStateListdata.value
formData.value.ProductionOrderState.data = oldProductionOrderStatedata.value formData.value.ProductionOrderState.data = oldProductionOrderStatedata.value
formData.value.QuantityOfEachProductProduced.data = oldQuantityOfEachProductProduceddata.value formData.value.QuantityOfEachProductProduced.data = oldQuantityOfEachProductProduceddata.value
formData.value.UtilizationRateOfEquipment.data = oldUtilizationRateOfEquipmentdata.value formData.value.UtilizationRateOfEquipment.data = oldUtilizationRateOfEquipmentdata.value
debugger // debugger
formData.value.QualifiedRateOfEachProduct.data = oldQualifiedRateOfEachProductdata.value // formData.value.QualifiedRateOfEachProduct.data = oldQualifiedRateOfEachProductdata.value
formData.value.EquipmentOperationState.data = oldEquipmentOperationStatedata.value formData.value.EquipmentOperationState.data = oldEquipmentOperationStatedata.value
await ScreenApi.updateScreen(formData.value.ProductionStateList) await ScreenApi.updateScreen(formData.value.ProductionStateList)
await ScreenApi.updateScreen(formData.value.ProductionOrderState) await ScreenApi.updateScreen(formData.value.ProductionOrderState)
await ScreenApi.updateScreen(formData.value.QuantityOfEachProductProduced) await ScreenApi.updateScreen(formData.value.QuantityOfEachProductProduced)
await ScreenApi.updateScreen(formData.value.UtilizationRateOfEquipment) await ScreenApi.updateScreen(formData.value.UtilizationRateOfEquipment)
await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct) // await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
await ScreenApi.updateScreen(formData.value.EquipmentOperationState) await ScreenApi.updateScreen(formData.value.EquipmentOperationState)
reload() reload()
} else { } else {
@ -426,7 +426,7 @@ const mockDataSwitchChange = async () => {
formData.value.ProductionOrderState.openMock = 1 formData.value.ProductionOrderState.openMock = 1
formData.value.QuantityOfEachProductProduced.openMock = 1 formData.value.QuantityOfEachProductProduced.openMock = 1
formData.value.UtilizationRateOfEquipment.openMock = 1 formData.value.UtilizationRateOfEquipment.openMock = 1
formData.value.QualifiedRateOfEachProduct.openMock = 1 // formData.value.QualifiedRateOfEachProduct.openMock = 1
formData.value.EquipmentOperationState.openMock = 1 formData.value.EquipmentOperationState.openMock = 1
//如果mockdata里有值 页面显示模拟数据 //如果mockdata里有值 页面显示模拟数据
//把mockData字符chuan串转成数组 //把mockData字符chuan串转成数组
@ -442,9 +442,9 @@ const mockDataSwitchChange = async () => {
formData.value.UtilizationRateOfEquipment.mockData = JSON.parse( formData.value.UtilizationRateOfEquipment.mockData = JSON.parse(
formData.value.UtilizationRateOfEquipment.mockData formData.value.UtilizationRateOfEquipment.mockData
) )
formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse( // formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
formData.value.QualifiedRateOfEachProduct.mockData // formData.value.QualifiedRateOfEachProduct.mockData
) // )
formData.value.EquipmentOperationState.mockData = JSON.parse( formData.value.EquipmentOperationState.mockData = JSON.parse(
formData.value.EquipmentOperationState.mockData formData.value.EquipmentOperationState.mockData
) )
@ -477,17 +477,17 @@ const mockDataSwitchChange = async () => {
} }
formData.value.UtilizationRateOfEquipment.data = Equipmentmock formData.value.UtilizationRateOfEquipment.data = Equipmentmock
} }
if (formData.value.QualifiedRateOfEachProduct.mockData[0]?.length > 0) { // if (formData.value.QualifiedRateOfEachProduct.mockData[0]?.length > 0) {
const EachProductmock = [] // const EachProductmock = []
for (let i = 0; i < formData.value.QualifiedRateOfEachProduct.mockData[0].length; i++) { // for (let i = 0; i < formData.value.QualifiedRateOfEachProduct.mockData[0].length; i++) {
const newRowmk = [] // const newRowmk = []
for (let j = 0; j < formData.value.QualifiedRateOfEachProduct.mockData.length; j++) { // for (let j = 0; j < formData.value.QualifiedRateOfEachProduct.mockData.length; j++) {
newRowmk.push(formData.value.QualifiedRateOfEachProduct.mockData[j][i]) // newRowmk.push(formData.value.QualifiedRateOfEachProduct.mockData[j][i])
} // }
EachProductmock.push(newRowmk) // EachProductmock.push(newRowmk)
} // }
formData.value.QualifiedRateOfEachProduct.data = EachProductmock // formData.value.QualifiedRateOfEachProduct.data = EachProductmock
} // }
if (formData.value.EquipmentOperationState.mockData[0]?.length > 0) { if (formData.value.EquipmentOperationState.mockData[0]?.length > 0) {
formData.value.EquipmentOperationState.data = formData.value.EquipmentOperationState.mockData formData.value.EquipmentOperationState.data = formData.value.EquipmentOperationState.mockData
} }
@ -550,16 +550,16 @@ const formData: any = ref({
openMock: 0, openMock: 0,
mockData: [[], []] mockData: [[], []]
}, },
QualifiedRateOfEachProduct: { // QualifiedRateOfEachProduct: {
date: '20240328', // date: '20240328',
type: 'QualifiedRateOfEachProduct', // type: 'QualifiedRateOfEachProduct',
definition: { // definition: {
'1D': ['product', 'qualifiedRate'] // '1D': ['product', 'qualifiedRate']
}, // },
data: [[], []], // data: [[], []],
openMock: 0, // openMock: 0,
mockData: [[], []] // mockData: [[], []]
}, // },
EquipmentOperationState: { EquipmentOperationState: {
date: '20240328', date: '20240328',
type: 'EquipmentOperationState', type: 'EquipmentOperationState',
@ -597,7 +597,7 @@ const oldProductionStateListdata = ref([])
const oldProductionOrderStatedata = ref([]) const oldProductionOrderStatedata = ref([])
const oldQuantityOfEachProductProduceddata = ref([]) const oldQuantityOfEachProductProduceddata = ref([])
const oldUtilizationRateOfEquipmentdata = ref([]) const oldUtilizationRateOfEquipmentdata = ref([])
const oldQualifiedRateOfEachProductdata = ref([]) // const oldQualifiedRateOfEachProductdata = ref([])
const oldEquipmentOperationStatedata = ref([]) const oldEquipmentOperationStatedata = ref([])
const getlist = async () => { const getlist = async () => {
const datalist = await ScreenApi.getScreenAll() const datalist = await ScreenApi.getScreenAll()
@ -648,21 +648,23 @@ const getlist = async () => {
Equipmentmock.push(newRowmk) Equipmentmock.push(newRowmk)
} }
formData.value.UtilizationRateOfEquipment.data = Equipmentmock formData.value.UtilizationRateOfEquipment.data = Equipmentmock
} else if (datalistitem.type == 'QualifiedRateOfEachProduct') { } else
oldQualifiedRateOfEachProductdata.value = datalistitem.data // if (datalistitem.type == 'QualifiedRateOfEachProduct') {
// oldQualifiedRateOfEachProductdata.value = datalistitem.data
formData.value.QualifiedRateOfEachProduct = datalistitem // formData.value.QualifiedRateOfEachProduct = datalistitem
datalistitem.mockData = JSON.parse(datalistitem.mockData) // datalistitem.mockData = JSON.parse(datalistitem.mockData)
const EachProductmock = [] // const EachProductmock = []
for (let i = 0; i < datalistitem.mockData[0].length; i++) { // for (let i = 0; i < datalistitem.mockData[0].length; i++) {
const newRowmk = [] // const newRowmk = []
for (let j = 0; j < datalistitem.mockData.length; j++) { // for (let j = 0; j < datalistitem.mockData.length; j++) {
newRowmk.push(datalistitem.mockData[j][i]) // newRowmk.push(datalistitem.mockData[j][i])
} // }
EachProductmock.push(newRowmk) // EachProductmock.push(newRowmk)
} // }
formData.value.QualifiedRateOfEachProduct.data = EachProductmock // formData.value.QualifiedRateOfEachProduct.data = EachProductmock
} else if (datalistitem.type == 'EquipmentOperationState') { // } else
if (datalistitem.type == 'EquipmentOperationState') {
oldEquipmentOperationStatedata.value = datalistitem.data oldEquipmentOperationStatedata.value = datalistitem.data
formData.value.EquipmentOperationState = datalistitem formData.value.EquipmentOperationState = datalistitem
@ -728,28 +730,30 @@ const getlist = async () => {
} else { } else {
formData.value.UtilizationRateOfEquipment.data = null formData.value.UtilizationRateOfEquipment.data = null
} }
} else if (datalistitem.type == 'QualifiedRateOfEachProduct') { } else
oldQualifiedRateOfEachProductdata.value = datalistitem.data // if (datalistitem.type == 'QualifiedRateOfEachProduct') {
// 进度追踪项目明细 // oldQualifiedRateOfEachProductdata.value = datalistitem.data
formData.value.QualifiedRateOfEachProduct = datalistitem // // 进度追踪项目明细
// 遍历原始数据的第二维及后续元素，将它们按列添加到新的数组中 // formData.value.QualifiedRateOfEachProduct = datalistitem
datalistitem.data = JSON.parse(datalistitem.data) // // 遍历原始数据的第二维及后续元素，将它们按列添加到新的数组中
if (datalistitem.data != null && datalistitem.data.length > 0) { // datalistitem.data = JSON.parse(datalistitem.data)
const transposedData = [] // if (datalistitem.data != null && datalistitem.data.length > 0) {
for (let i = 0; i < datalistitem.data[0].length; i++) { // const transposedData = []
const newRow = [] // for (let i = 0; i < datalistitem.data[0].length; i++) {
for (let j = 0; j < datalistitem.data.length; j++) { // const newRow = []
newRow.push(datalistitem.data[j][i]) // for (let j = 0; j < datalistitem.data.length; j++) {
} // newRow.push(datalistitem.data[j][i])
transposedData.push(newRow) // }
} // transposedData.push(newRow)
// 更新formData // }
formData.value.QualifiedRateOfEachProduct.data = transposedData // // 更新formData
} else { // formData.value.QualifiedRateOfEachProduct.data = transposedData
formData.value.QualifiedRateOfEachProduct.data = null // } else {
} // formData.value.QualifiedRateOfEachProduct.data = null
// console.log(formData.value.ProgressTrackingOfProduction.data) // }
} else if (datalistitem.type == 'EquipmentOperationState') { // // console.log(formData.value.ProgressTrackingOfProduction.data)
// } else
if (datalistitem.type == 'EquipmentOperationState') {
oldEquipmentOperationStatedata.value = datalistitem.data oldEquipmentOperationStatedata.value = datalistitem.data
formData.value.EquipmentOperationState = datalistitem formData.value.EquipmentOperationState = datalistitem
datalistitem.data = JSON.parse(datalistitem.data) datalistitem.data = JSON.parse(datalistitem.data)
@ -794,14 +798,14 @@ const addUtilizationRateOfEquipment = () => {
formData.value.UtilizationRateOfEquipment.data.push(['', '']) formData.value.UtilizationRateOfEquipment.data.push(['', ''])
} }
} }
//新增各产品合格率 // //新增各产品合格率
const addQualifiedRateOfEachProduct = () => { // const addQualifiedRateOfEachProduct = () => {
if (formData.value.QualifiedRateOfEachProduct.data == null) { // if (formData.value.QualifiedRateOfEachProduct.data == null) {
formData.value.QualifiedRateOfEachProduct.data = [['', '']] // formData.value.QualifiedRateOfEachProduct.data = [['', '']]
} else { // } else {
formData.value.QualifiedRateOfEachProduct.data.push(['', '']) // formData.value.QualifiedRateOfEachProduct.data.push(['', ''])
} // }
} // }
//新增设备状态 //新增设备状态
const addEquipmentOperationState = () => { const addEquipmentOperationState = () => {
if (formData.value.EquipmentOperationState.data == null) { if (formData.value.EquipmentOperationState.data == null) {
@ -833,9 +837,9 @@ const handleDeleteEquipment = (index: number) => {
formData.value.UtilizationRateOfEquipment.data.splice(index, 1) formData.value.UtilizationRateOfEquipment.data.splice(index, 1)
} }
//删除各产品合格率 //删除各产品合格率
const handleDeleteProduct = (index: number) => { // const handleDeleteProduct = (index: number) => {
formData.value.QualifiedRateOfEachProduct.data.splice(index, 1) // formData.value.QualifiedRateOfEachProduct.data.splice(index, 1)
} // }
//删除设备状态 //删除设备状态
const handleDeletetionState = (index: number) => { const handleDeletetionState = (index: number) => {
@ -852,7 +856,7 @@ const submitForm = async () => {
await ScreenApi.updateScreen(formData.value.ProductionOrderState) await ScreenApi.updateScreen(formData.value.ProductionOrderState)
await ScreenApi.updateScreen(formData.value.QuantityOfEachProductProduced) await ScreenApi.updateScreen(formData.value.QuantityOfEachProductProduced)
await ScreenApi.updateScreen(formData.value.UtilizationRateOfEquipment) await ScreenApi.updateScreen(formData.value.UtilizationRateOfEquipment)
await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct) // await ScreenApi.updateScreen(formData.value.QualifiedRateOfEachProduct)
await ScreenApi.updateScreen(formData.value.EquipmentOperationState) await ScreenApi.updateScreen(formData.value.EquipmentOperationState)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getlist() getlist()
@ -899,21 +903,21 @@ const submitForm = async () => {
}, []) }, [])
formData.value.UtilizationRateOfEquipment.mockData = transposedArray2 formData.value.UtilizationRateOfEquipment.mockData = transposedArray2
//各产品合格率 //各产品合格率
formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse( // formData.value.QualifiedRateOfEachProduct.mockData = JSON.parse(
JSON.stringify(formData.value.QualifiedRateOfEachProduct.data) // JSON.stringify(formData.value.QualifiedRateOfEachProduct.data)
) // )
const QualifiedArray = formData.value.QualifiedRateOfEachProduct.mockData // const QualifiedArray = formData.value.QualifiedRateOfEachProduct.mockData
const transposedArray3 = QualifiedArray.reduce((acc, curr) => { // const transposedArray3 = QualifiedArray.reduce((acc, curr) => {
curr.forEach((el, i) => { // curr.forEach((el, i) => {
if (!acc[i]) { // if (!acc[i]) {
acc[i] = [el] // acc[i] = [el]
} else { // } else {
acc[i].push(el) // acc[i].push(el)
} // }
}) // })
return acc // return acc
}, []) // }, [])
formData.value.QualifiedRateOfEachProduct.mockData = transposedArray3 // formData.value.QualifiedRateOfEachProduct.mockData = transposedArray3
//设备状态 //设备状态
formData.value.EquipmentOperationState.mockData = JSON.parse( formData.value.EquipmentOperationState.mockData = JSON.parse(
@ -932,9 +936,11 @@ const submitForm = async () => {
item.data = oldQuantityOfEachProductProduceddata.value item.data = oldQuantityOfEachProductProduceddata.value
} else if (item.type == 'UtilizationRateOfEquipment') { } else if (item.type == 'UtilizationRateOfEquipment') {
item.data = oldUtilizationRateOfEquipmentdata.value item.data = oldUtilizationRateOfEquipmentdata.value
} else if (item.type == 'QualifiedRateOfEachProduct') { } else
item.data = oldQualifiedRateOfEachProductdata.value // if (item.type == 'QualifiedRateOfEachProduct') {
} else if (item.type == 'EquipmentOperationState') { // item.data = oldQualifiedRateOfEachProductdata.value
// } else
if (item.type == 'EquipmentOperationState') {
item.data = oldEquipmentOperationStatedata.value item.data = oldEquipmentOperationStatedata.value
} }
datalistitem.value.push(item) datalistitem.value.push(item)

Write Preview
Loading…
Cancel
Save