Skip to content

P
pmk-channel-vue
Commit 9951adb3 by huangqy
Options

111

parent 5439345b
正在显示 包含 79 行增加 和 32 行删除
src/assets/base.css
......@@ -102,6 +102,12 @@ body {
color: #fff;
}
.card-title {
font-size: 20px;
font-weight: 'bold';
font-family: 'Times New Roman', Times, serif;
}
.el-dialog{
display: flex;
......
src/views/ChannelSetting.vue
<template>
<div>
<el-tabs type="border-card">
<el-tab-pane label="系统配置">
<el-tab-pane>
<template #label>
<span class="card-title">系统配置</span>
</template>
<el-card style="height: calc(100vh - 227.75px)">
<el-form :model="sysForm" :inline="true" style="margin-top: 20px;">
<el-form-item label="仓库编号" :rules="[{ required: true, message: '仓库编号不能为空', trigger: 'blur' }]">
......@@ -19,9 +22,9 @@
</el-form-item>
</el-tooltip>
<el-form-item>
<el-button round type="success" @click="resetConfig">读取</el-button>
<el-button round type="success" @click="saveConfig" v-if="sysForm.id">保存</el-button>
<el-button round type="success" @click="syncGoods">同步物资</el-button>
<el-button round type="primary" @click="resetConfig">读取</el-button>
<el-button round type="primary" @click="saveConfig" v-if="sysForm.id">保存</el-button>
<el-button round type="primary" @click="syncGoods">同步物资</el-button>
<el-dropdown @command="handleCommand">
<span style="cursor: pointer; background: #67c23a;margin-left: 12px;">
<img src="../assets/icons/主题.png" style="width: 32px;">
......@@ -59,7 +62,10 @@
</el-table>
</el-card>
</el-tab-pane>
<el-tab-pane label="通道配置">
<el-tab-pane>
<template #label>
<span class="card-title">通道配置</span>
</template>
<el-card style="height: calc(100vh - 227.75px)">
<div class="head-container">
<el-button class="filter-item" type="primary" style="float: right" @click="add">新增</el-button>
......
src/views/HomeView.vue
<template>
<el-tabs :tab-position="tabPosition" v-model="activeIndex" type="card" :stretch="true" class="menu-tabs" @tab-change="tabChange" :style="{backgroundColor: color }">
<el-tabs :tab-position="tabPosition" v-model="activeIndex" type="card" :stretch="true" class="menu-tabs" @tab-change="tabChange" :style="{backgroundColor: color}">
<el-tab-pane v-for="item in tabList" :key="item.title">
<template #label>
<span class="custom-tabs-label">
......@@ -11,7 +11,7 @@
</el-tab-pane>
<el-card>
<!-- class="log-scroll" -->
<div v-html="log" style="display: flex;align-items: center;"></div>
<div v-html="log" style="font-weight: 550;font-family: Times New Roman;display: flex;align-items: center;"></div>
</el-card>
</el-tabs>
</template>
......@@ -24,8 +24,9 @@ import OutTask from './OutTask.vue'
import Query from './Query.vue'
import Setting from './Setting.vue'
import ChannelSetting from './ChannelSetting.vue'
import NoOrder from './NoOrder.vue'
export default defineComponent({
components: { RFID, InTask, OutTask, Query, Setting, ChannelSetting },
components: { RFID, InTask, OutTask, Query, Setting, ChannelSetting, NoOrder },
setup() {
const { proxy } = getCurrentInstance()
const tabPosition = ref('bottom')
......@@ -34,6 +35,7 @@ export default defineComponent({
const color = ref('#1f8a36')
const tabList = [
{title: '射频识别', icon: 'iconfont icon-tiaozhishibie', template: 'RFID'},
{title: '无单据上报', icon: 'iconfont icon-tiaozhishibie', template: 'NoOrder'},
{title: '入库作业', icon: 'iconfont icon-rukuguanli-', template: 'InTask'},
{title: '出库作业', icon: 'iconfont icon-chukuguanli-', template: 'OutTask'},
// {title: '手动设置', icon: 'iconfont icon-shezhi', template: 'Setting'},
......@@ -73,6 +75,7 @@ export default defineComponent({
console.log('刷新起点')
proxy.$refs.InTask[0].loadData()
proxy.$refs.OutTask[0].loadData()
proxy.$refs.NoOrder[0].loadData()
}
function handleLogChange(data) {
log.value = data
......
src/views/InTask.vue
<template>
<el-row>
<el-col :span="16">
<el-col :span="15">
<el-card style="height: calc(50vh - 73.6px);">
<template #header>
<div class="card-header">
<span>计划任务</span>
<el-button round class="button" type="primary" @click="syncInBill" :loading="loading">入库单接收</el-button>
<el-button round class="button" type="warning" @click="syncInBill" :loading="loading">入库单接收</el-button>
</div>
</template>
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="billList" ref="bill" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="billClick">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="billList" ref="bill" border style="width: 100%;height: 27vh;" highlight-current-row @row-click="billClick">
<el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="bizBillNo" label="单据号" align="center"/>
<el-table-column prop="billName" label="凭证号" align="center" :show-overflow-tooltip="true"/>
......@@ -46,9 +46,11 @@
</el-card>
<el-card style="height: calc(50vh - 73.6px);">
<template #header>
<span>物资列表</span>
<div class="card-header">
<span>物资列表</span>
</div>
</template>
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="goodsList" ref="goods" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="goodsClick">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="goodsList" ref="goods" border style="width: 100%;height: 27vh;" highlight-current-row @row-click="goodsClick">
<el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="goodsCode" label="品名代码" align="center"/>
<el-table-column prop="goodsName" label="品名" align="center"/>
......@@ -66,14 +68,14 @@
/>
</el-card>
</el-col>
<el-col :span="8">
<el-col :span="9">
<el-card style="height: calc(100vh - 147px)">
<template #header>
<div style="height: 32px;">
<div class="card-header">
<span>号型列表</span>
</div>
</template>
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="modelList" border style="width: 100%;height: 70vh;">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="modelList" border style="width: 100%;height: 68vh;">
<el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="modelName" label="号型名称" align="center" show-overflow-tooltip/>
<el-table-column prop="planAmount" label="计划数量" align="center"/>
......@@ -303,7 +305,10 @@ export default defineComponent({
function syncInBill() {
loading.value = true
getAction(state.url.syncInBill, {storeCode: searchData.value.storeCode}).then(res => {
if (res.code !== 99200) return ElMessage.error(res.message);
if (res.code !== 99200) {
loading.value = false
return ElMessage.error(res.message);
}
ElMessage.success(res.message)
loading.value = false
loadData()
......@@ -357,6 +362,10 @@ export default defineComponent({
cursor: pointer;
}
.card-header {
height: 26px;
font-size: 20px;
font-weight: 'bold';
font-family: 'Times New Roman', Times, serif;
display: flex;
justify-content: space-between;
align-items: center;
......
src/views/OutTask.vue
<template>
<el-row>
<el-col :span="16">
<el-col :span="15">
<el-card style="height: calc(50vh - 73.6px);">
<template #header>
<div class="card-header">
<span>计划任务</span>
<el-button round class="button" type="primary" @click="syncOutBill" :loading="loading">出库单接收</el-button>
<el-button round class="button" type="warning" @click="syncOutBill" :loading="loading">出库单接收</el-button>
</div>
</template>
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="billList" ref="bill" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="billClick">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="billList" ref="bill" border style="width: 100%;height: 27vh;" highlight-current-row @row-click="billClick">
<el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="bizBillNo" label="单据号" align="center"/>
<el-table-column prop="billName" label="凭证号" align="center"/>
......@@ -46,9 +46,11 @@
</el-card>
<el-card style="height: calc(50vh - 73.6px);">
<template #header>
<span>物资列表</span>
<div class="card-header">
<span>物资列表</span>
</div>
</template>
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="goodsList" ref="goods" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="goodsClick">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="goodsList" ref="goods" border style="width: 100%;height: 27vh;" highlight-current-row @row-click="goodsClick">
<el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="goodsCode" label="品名代码" align="center"/>
<el-table-column prop="goodsName" label="品名" align="center"/>
......@@ -66,14 +68,14 @@
/>
</el-card>
</el-col>
<el-col :span="8">
<el-col :span="9">
<el-card style="height: calc(100vh - 147px)">
<template #header>
<div style="height: 32px;">
<div class="card-header">
<span>号型列表</span>
</div>
</template>
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="modelList" border style="width: 100%;height: 70vh;">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="modelList" border style="width: 100%;height: 68vh;">
<el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="modelName" label="号型名称" align="center" show-overflow-tooltip/>
<el-table-column prop="planAmount" label="计划数量" align="center"/>
......@@ -303,7 +305,10 @@ export default defineComponent({
function syncOutBill() {
loading.value = true
getAction(state.url.syncOutBill, {storeCode: searchData.value.storeCode}).then(res => {
if (res.code !== 99200) return ElMessage.error(res.message);
if (res.code !== 99200) {
loading.value = false
return ElMessage.error(res.message)
};
ElMessage.success(res.message)
loading.value = false
loadData()
......@@ -357,6 +362,10 @@ export default defineComponent({
cursor: pointer;
}
.card-header {
height: 26px;
font-size: 20px;
font-weight: 'bold';
font-family: 'Times New Roman', Times, serif;
display: flex;
justify-content: space-between;
align-items: center;
......
src/views/Query.vue
......@@ -2,7 +2,7 @@
<el-row>
<el-col :span="6">
<el-card style="height: calc(100vh - 147px);">
<el-form label-position="right" size="large" label-width="100px" :model="formData" style="max-width: 460px;">
<el-form label-position="right" size="large" label-width="80px" :model="formData" style="max-width: 460px;">
<el-form-item label="开始时间">
<el-date-picker v-model="searchData.startTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%;"/>
</el-form-item>
......@@ -27,7 +27,7 @@
</el-col>
<el-col :span="18">
<el-card style="height: calc(100vh - 147px);">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="logList" border size="large" style="width: 100%;height: 78vh;">
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="logList" border size="large" style="width: 100%;height: 75.8vh;">
<el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="inState" label="出入库" align="center">
<template #default="scope">
......
src/views/RFID.vue
<template>
<div>
<el-tabs type="border-card" v-model="activeTab">
<el-tab-pane v-for="item in channelList" :key="item" :label="'通道' + item.stationId" :name="item.stationId">
<el-tab-pane v-for="item in channelList" :key="item" :name="item.stationId">
<template #label>
<span class="card-title">通道{{ item.stationId }} </span>
</template>
<el-card style="height: calc(100vh - 227.75px)">
<template #header>
<span>实时出入库数据</span>
<span class="card-title">实时出入库数据</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>
......@@ -30,7 +33,7 @@
<el-card class="box-card">
<template #header>
<div style="text-align: center;">
<span>识别总箱数</span>
<span class="card-title">识别总箱数</span>
</div>
</template>
<div class="text">{{ item.logData.length }}箱</div>
......@@ -39,7 +42,7 @@
<el-card class="box-card">
<template #header>
<div style="text-align: center;cursor: pointer;">
<span @click="changeErr">异常次数 {{ item.errNum }}次</span>
<span @click="changeErr" class="card-title">异常次数 {{ item.errNum }}次</span>
</div>
</template>
<div style="height: 280px;overflow: auto" v-if="showErr">
......@@ -632,4 +635,15 @@ p {
justify-content: space-between;
align-items: center;
}
.card-title {
height: 26px;
font-size: 20px;
font-weight: 'bold';
font-family: 'Times New Roman', Times, serif;
}
</style>
<style scoped>
</style>
yarn.lock
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论