bug调整

This commit is contained in:
2024-12-05 10:48:55 +08:00
parent 9c627a5f81
commit 22cb306c06
3 changed files with 46 additions and 36 deletions

View File

@@ -3,9 +3,9 @@
<div v-show="view"> <div v-show="view">
<TableHeader datePicker ref="TableHeaderRef"> <TableHeader datePicker ref="TableHeaderRef">
<template #select> <template #select>
<el-form-item label="筛选"> <!-- <el-form-item label="筛选">-->
<el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选" /> <!-- <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选" />-->
</el-form-item> <!-- </el-form-item>-->
</template> </template>
<template #operation> <template #operation>
<el-button icon="el-icon-Tickets" type="primary" @click="analysis1">分析记录管理</el-button> <el-button icon="el-icon-Tickets" type="primary" @click="analysis1">分析记录管理</el-button>

View File

@@ -234,7 +234,7 @@ const exportExcel = () => {
const exportExcelTemplate = () => { const exportExcelTemplate = () => {
downloadTemplate().then((res: any) => { downloadTemplate().then((res: any) => {
let blob = new Blob([res], { let blob = new Blob([res], {
type: 'application/vnd.ms-excel' type: 'text/csv'
}) })
const url = window.URL.createObjectURL(blob) const url = window.URL.createObjectURL(blob)
const link = document.createElement('a') const link = document.createElement('a')

View File

@@ -2,63 +2,63 @@
<template> <template>
<el-dialog <el-dialog
draggable draggable
class="cn-operate-dialog" class='cn-operate-dialog'
v-model="productLineVisible" v-model='productLineVisible'
:title="title" :title='title'
style="width: 415px;" style='width: 415px;'
top="30vh" top='30vh'
> >
<el-scrollbar> <el-scrollbar>
<el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef"> <el-form :inline='false' :model='form' label-width='120px' :rules='rules' ref='formRef'>
<el-form-item label="生产线名" prop="name"> <el-form-item label='生产线名' prop='name'>
<el-input v-model="form.name" placeholder="请输入生产线名" clearable /> <el-input v-model='form.name' placeholder='请输入生产线名' clearable @input='handleInput' />
</el-form-item> </el-form-item>
<el-form-item label="关联进线" prop="incomingLineId"> <el-form-item label='关联进线' prop='incomingLineId'>
<el-select v-model="form.incomingLineId"> <el-select v-model='form.incomingLineId'>
<el-option <el-option
v-for="item in incomingLineList" v-for='item in incomingLineList'
:key="item.id" :key='item.id'
:label="item.name" :label='item.name'
:value="item.id" :value='item.id'
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="计算模式" prop="calcMode"> <el-form-item label='计算模式' prop='calcMode'>
<el-radio-group v-model="form.calcMode"> <el-radio-group v-model='form.calcMode'>
<el-tooltip <el-tooltip
class="box-item" class='box-item'
effect="light" effect='light'
content="单次中断不计算终端、原料损失" content='单次中断不计算终端、原料损失'
placement="bottom-start" placement='bottom-start'
> >
<el-radio border label="0">模式一</el-radio> <el-radio border label='0'>模式一</el-radio>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
class="box-item" class='box-item'
effect="light" effect='light'
content="单次中断计算终端、原料损失" content='单次中断计算终端、原料损失'
placement="bottom-start" placement='bottom-start'
> >
<el-radio border label="1">模式二</el-radio> <el-radio border label='1'>模式二</el-radio>
</el-tooltip> </el-tooltip>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="产能损失" prop="capacityLoss"> <el-form-item label='产能损失' prop='capacityLoss'>
<el-input v-model="form.capacityLoss" placeholder="请输入产能损失" clearable> <el-input v-model='form.capacityLoss' placeholder='请输入产能损失' clearable @input='handleInputCapacityLoss'>
<template #append>万元</template> <template #append>万元</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-scrollbar> </el-scrollbar>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class='dialog-footer'>
<el-button @click="productLineVisible = false">取消</el-button> <el-button @click='productLineVisible = false'>取消</el-button>
<el-button type="primary" @click="submit">确认</el-button> <el-button type='primary' @click='submit'>确认</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
<script lang="ts" setup> <script lang='ts' setup>
import { ref, reactive, inject } from 'vue' import { ref, reactive, inject } from 'vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { querySgIncomingLineByUserId } from '@/api/advance-boot/sgGroven/incomingLine' import { querySgIncomingLineByUserId } from '@/api/advance-boot/sgGroven/incomingLine'
@@ -72,6 +72,7 @@ const formRef = ref()
const regex = /^[+]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$/ const regex = /^[+]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$/
let incomingLineList: any = reactive([]) let incomingLineList: any = reactive([])
// 注意不要和表单ref的命名冲突 // 注意不要和表单ref的命名冲突
const form = reactive({ const form = reactive({
id: '', id: '',
@@ -121,6 +122,15 @@ const resetForm = () => {
} }
} }
const handleInput = (value: string) => {
form.name = value.trim()
}
const handleInputCapacityLoss = (value: string) => {
form.capacityLoss = Number(value.trim())
}
//初始化进线下拉框 //初始化进线下拉框
const initIncomingLine = async () => { const initIncomingLine = async () => {
//根据业务用户id去查找 //根据业务用户id去查找