linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: linweidong:8263c44c0a62d42c68558256a031c123ab0e894f
Branches Tags
linweidong:main
..
compare: linweidong:0aeb381c76a2a133680a707f1ae5b5e1686524d2
Branches Tags
linweidong:main

No commits in common. '8263c44c0a62d42c68558256a031c123ab0e894f' and '0aeb381c76a2a133680a707f1ae5b5e1686524d2' have entirely different histories.
8263c44c0a ... 0aeb381c76

9 changed files with 27 additions and 63 deletions
Show Stats

9
src/api/mes/deviceledger/index.ts
Unescape Escape View File

@ -33,7 +33,6 @@ export interface DeviceLedgerVO {
inspectionList?: any[]
maintainList?: any[]
creator?: string // 创建人
creatorName?: string
createTime?: string | number | Date
updateTime?: string | number | Date
sort: number // 排序
@ -46,12 +45,8 @@ export const DeviceLedgerApi = {
return await request.get({ url: `/mes/device-ledger/page`, params })
},
getDeviceLedgerList: async () => {
return await request.get({ url: `/mes/device-ledger/list` })
},
getDeviceLedgerListByNoUsed: async () => {
return await request.get({ url: `/mes/device-ledger/noUsedlist` })
getDeviceLedgerList: async (params: any) => {
return await request.get({ url: `/mes/device-ledger/list`, params })
},
// 查询设备类型详情

4
src/api/mes/machine/index.ts
Unescape Escape View File

@ -58,7 +58,7 @@ export const MachineComponentApi = {
},
// 查询产线和机台列表
getPipelineAndMachineList: async () => {
return await request.get({ url: `/mes/machine-component/listPipelineAndMachine` })
getPipelineAndMachineList: async (params) => {
return await request.get({ url: `/mes/machine-component/listPipelineAndMachine`, params })
},
}

4
src/api/mes/organization/index.ts
Unescape Escape View File

@ -40,8 +40,8 @@ export type DeviceParameterAnalysisNodeVO = {
// 产线工位 API
export const OrganizationApi = {
// 查询产线工位列表
getOrganizationList: async () => {
return await request.get({ url: `/mes/organization/list` })
getOrganizationList: async (params) => {
return await request.get({ url: `/mes/organization/list`, params })
},
getListOrgWorker: async (params) => {
return await request.get({ url: `/mes/organization/listOrgWorker`, params })

4
src/locales/en.ts
Unescape Escape View File

@ -782,9 +782,7 @@ export default {
moldName: 'Name',
moldRemark: 'Remark',
fileUrl: 'File',
serialNumber: 'No.',
dvName: 'Device Name',
dvId: 'Please select device'
serialNumber: 'No.'
},
// Critical Component
EquipmentKeyItems: {

4
src/locales/zh-CN.ts
Unescape Escape View File

@ -774,9 +774,7 @@ export default {
moldName: '名称',
moldRemark: '备注',
fileUrl: '资料',
serialNumber: '序号',
dvName: '关联采集设备',
dvId: '请选择设备'
serialNumber: '序号'
},
// 设备关键件
EquipmentKeyItems: {

26
src/views/mes/deviceledger/DeviceLedgerForm.vue
Unescape Escape View File

@ -137,17 +137,11 @@
</el-col>
<el-col :span="24">
<el-form-item :label="t('EquipmentManagement.EquipmentLedger.dvName')" prop="dvId">
<el-select v-model="formData.dvId" filterable :placeholder="t('EquipmentManagement.EquipmentLedger.dvId')">
<el-option
v-for="item in deviceList"
:key="item.id"
:label="item.deviceName"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('EquipmentManagement.EquipmentLedger.remark')" prop="remark">
<el-input v-model="formData.remark" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderRemark')" type="textarea" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="t('EquipmentManagement.EquipmentLedger.criticalComponent')" prop="componentIds">
<el-select
@ -193,11 +187,6 @@
<UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="t('EquipmentManagement.EquipmentLedger.remark')" prop="remark">
<el-input v-model="formData.remark" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderRemark')" type="textarea" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
@ -215,7 +204,6 @@ import { getSimpleUserList, UserVO } from '@/api/system/user'
import { formatDate } from '@/utils/formatTime'
import type { FormRules } from 'element-plus'
import { ProductApi } from '@/api/erp/product/product'
import { DeviceApi,DeviceVO } from '@/api/iot/device'
/** 设备类型 表单 */
defineOptions({ name: 'DeviceLedgerForm' })
@ -227,7 +215,6 @@ const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const deviceList = ref<DeviceVO[]>([]) // 列表
const parseIdsValue = (value: any): number[] => {
if (!value) return []
@ -273,8 +260,7 @@ const initFormData = () => ({
componentIds: [] as number[],
beijianIds: [] as number[],
fileUrl: undefined,
sort: undefined,
dvId: undefined
sort: undefined
})
const formData = ref({
@ -325,7 +311,7 @@ const open = async (type: string, id?: number, defaultDeviceTypeId?: number) =>
formType.value = type
resetForm()
await ensureOptionsLoaded()
deviceList.value = await DeviceApi.getDeviceList()
if (type === 'create' && defaultDeviceTypeId) {
formData.value.deviceType = defaultDeviceTypeId
}

22
src/views/mes/deviceledger/index.vue
Unescape Escape View File

@ -86,14 +86,13 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to
width="140px" />
<!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.supplier')" align="center" prop="supplier" width="110px" /> -->
<!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.workshop')" align="center" prop="workshop" width="110px" /> -->
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.workshop')" align="center" prop="workshopName" min-width="150px" />
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceLocation')" align="center" prop="deviceLocation" min-width="150px" />
<!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.systemOrg')" align="center" prop="systemOrg" width="110px" /> -->
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceManagerName')" align="center" prop="deviceManagerName" width="150px" />
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.remark')" align="center" prop="remark" />
<!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.creatorName')" align="center" prop="creatorName" width="150px" />
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px" /> -->
<!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.updateTime')" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" /> -->
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.creatorName')" align="center" prop="creatorName" width="150px" />
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.updateTime')" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" />
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.operate')" align="center" min-width="160px" fixed="right">
<template #default="scope">
<el-button link @click="handleDetail(scope.row.id)">{{ t('EquipmentManagement.EquipmentLedger.detail') }}</el-button>
@ -136,7 +135,7 @@ link type="danger" @click="handleDelete(scope.row.id)"
}}</el-tag>
</el-descriptions-item>
<!-- <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.supplier')">{{ detailData?.supplier ?? '' }}</el-descriptions-item> -->
<!-- <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.workshop')">{{ detailData?.workshop ?? '' }}</el-descriptions-item> -->
<el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.workshop')">{{ detailData?.workshop ?? '' }}</el-descriptions-item>
<!-- <el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.systemOrg')">{{ detailData?.systemOrg ?? '' }}</el-descriptions-item> -->
<el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.deviceLocation')">{{ detailData?.deviceLocation ?? '' }}</el-descriptions-item>
<el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.deviceManagerName')">{{ detailData?.deviceManagerName ?? '' }}</el-descriptions-item>
@ -145,19 +144,8 @@ link type="danger" @click="handleDelete(scope.row.id)"
}}</el-descriptions-item>
<el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.remark')">{{ detailData?.remark ?? detailData?.deviceRemark ?? ''
}}</el-descriptions-item>
<el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.creatorName')">{{ detailData?.creatorName ?? '' }}</el-descriptions-item>
<el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.createTime')">{{ formatDetailDate(detailData?.createTime) }}</el-descriptions-item>
<el-descriptions-item :label="t('EquipmentManagement.EquipmentLedger.updateTime')">{{ formatDetailDate(detailData?.updateTime) }}</el-descriptions-item>
<!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.creatorName')" align="center" prop="creatorName" width="150px" />
<el-table-column :label="t('EquipmentManagement.EquipmentLedger.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px" /> -->
<!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.updateTime')" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" /> -->
</el-descriptions>
<el-tabs v-model="detailActiveTab" class="mt-12px">
<el-tab-pane :label="t('EquipmentManagement.EquipmentLedger.checkHistory')" name="check">
<div style="margin-bottom: 16px;">

11
src/views/mes/organization/OrganizationForm.vue
Unescape Escape View File

@ -125,11 +125,14 @@
</Dialog>
</template>
<script setup lang="ts">
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { getIntDictOptions, getBoolDictOptions, DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
import { defaultProps, handleTree } from '@/utils/tree'
import * as UserApi from "@/api/system/user";
import {WorkTeamApi} from "@/api/mes/workteam";
import {MachineComponentApi} from "@/api/mes/machine";
import {DeviceLedgerApi, DeviceLedgerVO} from "@/api/mes/deviceledger";
import {DeviceApi, DeviceVO} from "@/api/iot/device";
import {ZjTypeApi, ZjTypeVO} from "@/api/mes/zjtype";
/** 产线工位 表单 */
defineOptions({ name: 'OrganizationForm' })
@ -138,7 +141,7 @@ const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
// const deviceList = ref<DeviceVO[]>([]) // 列表
const deviceList = ref<DeviceLedgerVO[]>([]) // 列表
const deviceList = ref<ZjTypeVO[]>([]) // 列表
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@ -255,6 +258,6 @@ const getMachineComponentTree = async () => {
/** 初始化 **/
onMounted(async () => {
//console.log("ssss")
deviceList.value = await DeviceLedgerApi.getDeviceLedgerList()
deviceList.value = await DeviceApi.getDeviceList()
})
</script>

6
src/views/system/user/UserForm.vue
Unescape Escape View File

@ -129,11 +129,7 @@ const formData = ref({
roleIds: []
})
const formRules = reactive<FormRules>({
username: [{ required: true, message: t('SystemManagement.User.usernameRequired'), trigger: 'blur' },{
pattern: /^[a-zA-Z0-9_\-@.]+$/,
message: '用户名只能包含英文、数字、下划线、连字符、@和点',
trigger: 'blur'
}],
username: [{ required: true, message: t('SystemManagement.User.usernameRequired'), trigger: 'blur' }],
nickname: [{ required: true, message: t('SystemManagement.User.workNoRequired'), trigger: 'blur' }],
password: [{ required: true, message: t('SystemManagement.User.passwordRequired'), trigger: 'blur' }],
deptId: [{ required: true, message: t('SystemManagement.User.deptRequired'), trigger: 'blur' }],

Write Preview
Loading…
Cancel
Save