Browse Source

基质列表分页错误和新增验证

master
王梦远 3 weeks ago
parent
commit
5e2c027c9b
  1. 35
      src/components/martix/Edit/index.vue
  2. 26
      src/views/main/index.vue
  3. 4
      src/views/matrixCraft/index.vue

35
src/components/martix/Edit/index.vue

@ -57,15 +57,40 @@ const cancel = () => {
<template> <template>
<FtDialog visible :title="form.id ? '编辑基质' : '新增基质'" width="40%" :ok-handle="okHandle" @cancel="cancel"> <FtDialog visible :title="form.id ? '编辑基质' : '新增基质'" width="40%" :ok-handle="okHandle" @cancel="cancel">
<el-form ref="formRef" label-width="120" :model="form" :rules="rules">
<el-form-item label="基质名称" prop="name">
<el-input v-model="form.name" placeholder="" />
</el-form-item>
</el-form>
<div class="dialog-content">
<el-form ref="formRef" label-width="120" :model="form" :rules="rules">
<el-form-item
label="基质名称" prop="name" :rules="[
{
required: true,
message: '请输入基质名称',
trigger: 'blur',
},
{
min: 1,
max: 20,
message: '1-20个字符',
trigger: ['blur', 'change'],
},
]"
>
<el-input v-model="form.name" placeholder="" />
</el-form-item>
</el-form>
</div>
</FtDialog> </FtDialog>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
:deep(.el-form-item__error) {
font-size: 40px;
}
.dialog-content {
display: flex;
align-items: center; /* 垂直居中 */
justify-content: center; /* 水平居中 */
height: 400px; /* 确保容器高度撑开 */
}
.el-select { .el-select {
width: 80%; width: 80%;
} }

26
src/views/main/index.vue

@ -5,9 +5,7 @@ import Check from 'components/home/Check/index.vue'
import Environment from 'components/home/Environment/index.vue' import Environment from 'components/home/Environment/index.vue'
import Stop from 'components/home/Stop/index.vue' import Stop from 'components/home/Stop/index.vue'
import { ElMessageBox } from 'element-plus' import { ElMessageBox } from 'element-plus'
import { FtMessage } from 'libs/message'
import { isClose, socket } from 'libs/socket' import { isClose, socket } from 'libs/socket'
import { sendControl } from 'libs/utils'
import { useSystemStore } from 'stores/useSystemStore' // systemStore import { useSystemStore } from 'stores/useSystemStore' // systemStore
import { computed, ref, watch } from 'vue' import { computed, ref, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
@ -62,30 +60,6 @@ const statusMessage = (data: any) => {
const sensorMessage = async (data: any) => { const sensorMessage = async (data: any) => {
// systemStore systemInfo // systemStore systemInfo
systemStore.updateSystemSensor(data) systemStore.updateSystemSensor(data)
if (systemStore.systemStatus.dehumidifierRunning && systemStore.systemSensor.humidity <= systemStore.targetHumidity) {
const params = {
cmdCode: 'dehumidifier_stop',
cmdId: '',
}
await sendControl(params)
FtMessage.success('当前湿度已达目标湿度,除湿已完成')
}
if (systemStore.systemStatus.slidePlatHeating && systemStore.systemSensor.slideTemperature >= systemStore.targetSlideTemperature) {
const params = {
cmdCode: 'slide_plat_heat_stop',
cmdId: '',
}
await sendControl(params)
FtMessage.success('当前温度已达目标温度,加热已完成')
}
if (systemStore.systemStatus.nozzleHeating && systemStore.systemSensor.nozzleTemperature >= systemStore.targetNozzleTemperature) {
const params = {
cmdCode: 'nozzle_heat_stop',
cmdId: '',
}
await sendControl(params)
FtMessage.success('当前温度已达目标温度,加热已完成')
}
} }
socket.init(statusMessage, 'device_status_change') socket.init(statusMessage, 'device_status_change')

4
src/views/matrixCraft/index.vue

@ -130,12 +130,12 @@ const ok = () => {
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="matrixName" label="基质名称" /> <el-table-column prop="matrixName" label="基质名称" />
<el-table-column prop="name" label="工艺名称" /> <el-table-column prop="name" label="工艺名称" />
<el-table-column prop="reateTime" label="创建时间" />
<el-table-column prop="createTime" label="创建时间" />
</el-table> </el-table>
</div> </div>
<div class="table-footer"> <div class="table-footer">
<el-pagination size="large" :total background layout="prev, pager, next,total" @change="pageChange" />
<el-pagination size="large" background layout="prev, pager, next, total" :total @change="pageChange" />
</div> </div>
<Edit v-if="addVisible" :id="formId" :type="editType" @ok="ok" @cancel="addVisible = false" /> <Edit v-if="addVisible" :id="formId" :type="editType" @ok="ok" @cancel="addVisible = false" />
</div> </div>

Loading…
Cancel
Save