sgc/mes-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
andy 2026-07-24 17:53:26 +08:00
parent 97fa422b21
commit 0f40b136e7
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/NCcode/index.vue
View File

@ -351,10 +351,10 @@ const pagination = reactive({
const columns = [ const columns = [
{ // {
type: 'selection', // type: 'selection',
minWidth:60 // minWidth:60
}, // },
{ {
align:"center", align:"center",
title:"NC代码编号", title:"NC代码编号",
@ -585,9 +585,9 @@ let formData = reactive<any>({
deviceId:'', //设备ID deviceId:'', //设备ID
deviceName:'', //设备名称 deviceName:'', //设备名称
status:1, //状态：1-启用 0-禁用 status:1, //状态：1-启用 0-禁用
isIssued:1, //是否已下发：1-已下发 0-未下发 // isIssued:1, //是否已下发：1-已下发 0-未下发
issueTime:null, //下发时间 // issueTime:null, //下发时间
issueBy:'', //下发人 // issueBy:'', //下发人
remark:'' //备注 remark:'' //备注
}) })
const addrules = { const addrules = {
@ -632,9 +632,9 @@ function addhand(type:any,row?:any) {
formData.deviceId = row.deviceId formData.deviceId = row.deviceId
formData.deviceName = row.deviceName formData.deviceName = row.deviceName
formData.status = row.status formData.status = row.status
formData.isIssued = row.isIssued // formData.isIssued = row.isIssued
formData.issueTime = row.issueTime // formData.issueTime = row.issueTime
formData.issueBy = row.issueBy // formData.issueBy = row.issueBy
formData.remark = row.remark formData.remark = row.remark
}else{ }else{
formData.id = '' formData.id = ''
@ -645,9 +645,9 @@ function addhand(type:any,row?:any) {
formData.deviceId = '' formData.deviceId = ''
formData.deviceName = '' formData.deviceName = ''
formData.status = 1 formData.status = 1
formData.isIssued = '' // formData.isIssued = ''
formData.issueTime = '' // formData.issueTime = ''
formData.issueBy = '' // formData.issueBy = ''
formData.remark = '' formData.remark = ''
} }
} }

11
src/views/proterminal/index.vue
View File

@ -24,7 +24,7 @@
</div> </div>
<div> <div>
<n-button v-if="isfullscr" ghost style="margin-right: 20px;color: #fff;" @click="exitFullscreen"> <!-- <n-button v-if="isfullscr" ghost style="margin-right: 20px;color: #fff;" @click="exitFullscreen">
<template #icon> <template #icon>
<n-icon> <n-icon>
<Contract /> <Contract />
@ -39,8 +39,8 @@
</n-icon> </n-icon>
</template> </template>
全屏 全屏
</n-button> </n-button> -->
<n-button @click="refresh" ghost style="margin-right: 20px;color: #fff;"> <!-- <n-button @click="refresh" ghost style="margin-right: 20px;color: #fff;">
<template #icon> <template #icon>
<n-icon> <n-icon>
<Sync /> <Sync />
@ -48,7 +48,7 @@
</template> </template>
刷新 刷新
</n-button> </n-button> -->
<!--switchworks--> <!--switchworks-->
<n-button ghost style="color: #fff;" @click="handover"> <n-button ghost style="color: #fff;" @click="handover">
<template #icon> <template #icon>
@ -1126,9 +1126,6 @@ function loginhand() {
...logindata, ...logindata,
code:'' code:''
}) })
} }
}) })
} }