Skip to content

P
pmk-channel-vue
Commit 9bd99ef4 by huangqy
Options

1111

parent 6ed14d79
正在显示 包含 137 行增加 和 17 行删除
src/views/ChannelSetting.vue
......@@ -66,6 +66,11 @@
</div>
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="channelList" border style="width: 100%;">
<el-table-column prop="stationId" label="通道号" align="center" width="100"/>
<el-table-column label="通道模式" align="center">
<template #default="scope">
{{scope.row.type == 'IN' ? '入库' : '出库' }}
</template>
</el-table-column>
<el-table-column prop="readerIp" label="读写器" align="center">
<template #default="scope">
{{scope.row.readerIp + ':' + scope.row.readerPort }}
......@@ -76,9 +81,14 @@
{{scope.row.gpioIp + ':' + scope.row.gpioPort }}
</template>
</el-table-column>
<el-table-column prop="ledIp" label="显示器" align="center">
<el-table-column label="1号显示屏" align="center">
<template #default="scope">
{{scope.row.ledIp1 + ':' + scope.row.ledPort1 }}
</template>
</el-table-column>
<el-table-column label="2号显示屏" align="center">
<template #default="scope">
{{scope.row.ledIp + ':' + scope.row.ledPort }}
{{scope.row.ledIp2 + ':' + scope.row.ledPort2 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center">
......@@ -119,11 +129,23 @@
</template>
</el-dialog>
<el-dialog v-model="innerVisible" width="30%" :title="title">
<el-form label-position="right" size="large" label-width="90px" :model="formData">
<el-form-item label="通道号">
<el-input v-model="formData.stationId" />
</el-form-item>
<el-dialog v-model="innerVisible" width="38%" :title="title">
<el-form label-position="right" size="large" label-width="120px" :model="formData">
<el-row>
<el-col :span="12">
<el-form-item label="通道号">
<el-input v-model="formData.stationId" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="通道模式">
<el-select v-model="formData.type" style="width: 100%;">
<el-option value="IN" label="入库模式"></el-option>
<el-option value="OUT" label="出库模式"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="读写器IP">
......@@ -159,13 +181,26 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="显示屏IP">
<el-input v-model="formData.ledIp"/>
<el-form-item label="1号显示屏IP">
<el-input v-model="formData.ledIp1"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="1号显示屏端口">
<el-input v-model="formData.ledPort1"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="2号显示屏IP">
<el-input v-model="formData.ledIp2"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="显示屏端口">
<el-input v-model="formData.ledPort"/>
<el-form-item label="2号显示屏端口">
<el-input v-model="formData.ledPort2"/>
</el-form-item>
</el-col>
</el-row>
......@@ -255,6 +290,7 @@ export default defineComponent({
const loadData = (arg) => {
getConfigPage()
getDevice()
resetConfig()
}
function getConfigPage() {
......@@ -319,6 +355,7 @@ export default defineComponent({
if (res.code !== 99200) return ElMessage.error(res.message);
if (res.data.length > 0) {
sysForm.value = JSON.parse(JSON.stringify(res.data[0]))
sysForm.value.isHide = JSON.parse(sessionStorage.getItem('storeInfo')).isHide
}
})
})
......
src/views/HomeView.vue
......@@ -64,6 +64,7 @@ export default defineComponent({
}
function handleRefresh() {
console.log('刷新起点')
proxy.$refs.InTask[0].loadData()
proxy.$refs.OutTask[0].loadData()
}
......
src/views/InTask.vue
......@@ -30,7 +30,7 @@
<template #default="scope">
<el-button type="success" size="small" @click="activateBill(scope.row)" v-if="scope.row.activeState == 0" :disabled="lockState">激活</el-button>
<el-button type="warning" size="small" @click="deactivate(scope.row)" v-if="scope.row.activeState == 1">解除</el-button>
<el-button type="primary" size="small" :disabled="scope.row.activeState !== 2" @click="reportBill(scope.row)">上报</el-button>
<el-button type="primary" size="small" @click="reportBill(scope.row)">上报</el-button>
</template>
</el-table-column>
</el-table>
......@@ -168,6 +168,7 @@ export default defineComponent({
}
const loadData = (arg) => {
console.log('刷新入库')
if (sessionStorage.getItem('storeInfo')) {
searchData.value.storeCode = JSON.parse(sessionStorage.getItem('storeInfo')).storeCode
searchData.value.type = 'IN'
......
src/views/OutTask.vue
......@@ -30,7 +30,7 @@
<template #default="scope">
<el-button type="success" size="small" @click="activateBill(scope.row)" v-if="scope.row.activeState == 0" :disabled="lockState">激活</el-button>
<el-button type="warning" size="small" @click="deactivate(scope.row)" v-if="scope.row.activeState == 1">解除</el-button>
<el-button type="primary" size="small" :disabled="scope.row.activeState !== 2" @click="reportBill(scope.row)">上报</el-button>
<el-button type="primary" size="small" @click="reportBill(scope.row)">上报</el-button>
</template>
</el-table-column>
</el-table>
......@@ -168,6 +168,7 @@ export default defineComponent({
}
const loadData = (arg) => {
console.log('刷新出库')
if (sessionStorage.getItem('storeInfo')) {
searchData.value.storeCode = JSON.parse(sessionStorage.getItem('storeInfo')).storeCode
searchData.value.type = 'OUT'
......
src/views/RFID.vue
......@@ -7,10 +7,12 @@
<span>实时出入库数据</span>
<el-button round style="float: right;" type="primary" @click="showChannelSetting">通道配置</el-button>
<el-button round style="float: right;margin-right: 10px;" type="warning" @click="clearData">清空数据</el-button>
<el-button round type="success" @click="changeType(item)" v-show="item.type" style="float: right;">{{ item.type == 'IN' ? '入库模式' : item.type == 'OUT' ? '出库模式': '' }}</el-button>
</template>
<el-row :gutter="20">
<el-col :span="18">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="item.logData" size="large" border style="width: 100%;" max-height="660">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}"
:row-class-name="tableRowClassName" :data="item.logData" size="large" border style="width: 100%;" max-height="660">
<el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="stationType" label="作业类型" align="center">
<template #default="scope">
......@@ -203,6 +205,54 @@
</el-row>
</el-card>
</el-collapse-item>
<el-collapse-item name="4">
<template #title>
<p class="title">&nbsp;LED屏配置</p>
</template>
<el-card style="margin: 25px 35px 0 35px;">
<el-row :gutter="40">
<el-col :span="12">
<el-form-item>
<el-input v-model="formData.ledIp1" placeholder="请输入1号显示屏IP">
<template #prefix>
<el-icon class="el-input__icon" style="color: #1296db"><Monitor /></el-icon>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<el-input v-model="formData.ledPort1" placeholder="请输入1号显示屏端口">
<template #prefix>
<el-icon class="el-input__icon" style="color: #1296db"><Help /></el-icon>
</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40" style="margin-top: 15px;">
<el-col :span="12">
<el-form-item>
<el-input v-model="formData.ledIp2" placeholder="请输入2号显示屏IP">
<template #prefix>
<el-icon class="el-input__icon" style="color: #1296db"><Monitor /></el-icon>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<el-input v-model="formData.ledPort2" placeholder="请输入2号显示屏端口">
<template #prefix>
<el-icon class="el-input__icon" style="color: #1296db"><Help /></el-icon>
</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-card>
</el-collapse-item>
</el-collapse>
</el-form>
<template #footer>
......@@ -229,7 +279,7 @@ export default defineComponent({
const visible = ref(false)
const formData = ref({})
const activeTab = ref(1)
const activeNames = ref(['1','2','3'])
const activeNames = ref(['1','2','3', '4'])
const readerType = ref(4)
const title = ref()
const power1 = ref()
......@@ -261,6 +311,14 @@ export default defineComponent({
});
const tableRowClassName = ( { row, rowIndex }) => {
if (row.isShow) {
return 'warning-row'
}
return ''
}
// websocket开始
let websock = null
......@@ -445,6 +503,18 @@ export default defineComponent({
})
}
function changeType(formData) {
if (formData.type == 'IN') {
formData.type = 'OUT'
} else {
formData.type = 'IN'
}
postAction(state.url.updateDevice, formData).then(res => {
if (res.code !== 99200) return ElMessage.error(res.message);
ElMessage.success(res.message)
})
}
function handleSubmit() {
if (readerType.value == 4) {
formData.value.readerPower = power1.value + ',' + power2.value + ',' + power3.value + ',' + power4.value
......@@ -483,18 +553,22 @@ export default defineComponent({
power8,
errList,
showErr,
tableRowClassName,
loadData,
showChannelSetting,
handleSubmit,
clearData,
changeErr
changeErr,
changeType
}
},
})
</script>
<style lang="less">
.el-table .warning-row {
--el-table-tr-bg-color: var(--el-color-warning-light-5);;
}
// 其他样式代码不变
......@@ -543,4 +617,10 @@ p {
.row .col_right {
float: left;
}
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论