Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pmk-channel-vue
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Members
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
黄麒宇
pmk-channel-vue
Commits
ba866a23
Commit
ba866a23
authored
Mar 07, 2023
by
huangqy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改逻辑
parent
b6d3cab1
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
36 行增加
和
40 行删除
+36
-40
base.css
src/assets/base.css
+2
-4
ChannelSetting.vue
src/views/ChannelSetting.vue
+0
-0
HomeView.vue
src/views/HomeView.vue
+12
-18
InTask.vue
src/views/InTask.vue
+5
-5
OutTask.vue
src/views/OutTask.vue
+5
-5
Query.vue
src/views/Query.vue
+1
-1
RFID.vue
src/views/RFID.vue
+10
-6
Setting.vue
src/views/Setting.vue
+1
-1
没有找到文件。
src/assets/base.css
View file @
ba866a23
...
...
@@ -83,8 +83,7 @@ body {
.el-tabs
{
--el-tabs-header-height
:
80px
!important
;
background-image
:
url('theme/bg.png')
;
background-size
:
cover
;
background-color
:
'#1F8A36'
;
color
:
#f8f8f8
;
}
...
...
@@ -98,8 +97,7 @@ body {
}
.el-card__header
{
background-image
:
url('theme/bg.png')
;
background-size
:
cover
;
background-color
:
'#1F8A36'
;
opacity
:
0.7
;
color
:
#fff
;
}
...
...
src/views/ChannelSetting.vue
View file @
ba866a23
差异被折叠。
点击展开。
src/views/HomeView.vue
View file @
ba866a23
<
template
>
<el-tabs
:tab-position=
"tabPosition"
type=
"card"
:stretch=
"true"
class=
"menu-tabs"
@
tab-change=
"tabChange"
:style=
"
{background
Image:'url('+ bg +')'
}">
<el-tabs
:tab-position=
"tabPosition"
type=
"card"
:stretch=
"true"
class=
"menu-tabs"
@
tab-change=
"tabChange"
:style=
"
{background
Color: color
}">
<el-tab-pane
v-for=
"item in tabList"
:key=
"item.title"
>
<template
#
label
>
<span
class=
"custom-tabs-label"
>
...
...
@@ -10,7 +10,8 @@
<component
:is=
"item.template"
:ref=
"item.template"
@
refresh=
"handleRefresh"
@
logChange=
"handleLogChange"
></component>
</el-tab-pane>
<el-card>
<div
v-html=
"log"
class=
"log-scroll"
style=
"display: flex;align-items: center;"
></div>
<!-- class="log-scroll" -->
<div
v-html=
"log"
style=
"display: flex;align-items: center;"
></div>
</el-card>
</el-tabs>
</template>
...
...
@@ -29,7 +30,7 @@ export default defineComponent({
const
{
proxy
}
=
getCurrentInstance
()
const
tabPosition
=
ref
(
'bottom'
)
const
log
=
ref
(
''
)
const
bg
=
ref
(
'/src/assets/theme/bg.png
'
)
const
color
=
ref
(
'#1f8a36
'
)
const
tabList
=
[
{
title
:
'射频识别'
,
icon
:
'iconfont icon-tiaozhishibie'
,
template
:
'RFID'
},
{
title
:
'入库作业'
,
icon
:
'iconfont icon-rukuguanli-'
,
template
:
'InTask'
},
...
...
@@ -38,16 +39,12 @@ export default defineComponent({
{
title
:
'查询'
,
icon
:
'iconfont icon-chaxun'
,
template
:
'Query'
},
{
title
:
'通道配置'
,
icon
:
'iconfont icon-shezhi'
,
template
:
'ChannelSetting'
},
]
const
a
=
sessionStorage
.
getItem
(
'loginbg'
)
if
(
a
==
'bg'
)
{
bg
.
value
=
'/src/assets/theme/bg.png'
}
if
(
a
==
'bg1'
)
{
bg
.
value
=
'/src/assets/theme/bg1.png'
}
if
(
a
==
'bg2'
)
{
bg
.
value
=
'/src/assets/theme/bg2.png'
if
(
sessionStorage
.
getItem
(
'bgColor'
))
{
color
.
value
=
sessionStorage
.
getItem
(
'bgColor'
)
}
console
.
log
(
color
.
value
)
setTimeout
(()
=>
{
changeBg
()
...
...
@@ -55,20 +52,17 @@ export default defineComponent({
function
changeBg
()
{
for
(
var
i
=
0
;
i
<
document
.
getElementsByClassName
(
'el-card__header'
).
length
;
i
++
){
document
.
getElementsByClassName
(
'el-card__header'
)[
i
].
style
.
background
Image
=
'url('
+
bg
.
value
+
')'
document
.
getElementsByClassName
(
'el-card__header'
)[
i
].
style
.
background
Color
=
color
.
value
}
}
function
tabChange
(
index
)
{
if
(
index
==
0
)
{
return
}
proxy
.
$refs
[
tabList
[
index
].
template
][
0
].
loadData
()
}
function
handleRefresh
()
{
proxy
.
$refs
.
InTask
[
0
].
loadData
()
proxy
.
$refs
.
OutTask
[
0
].
loadData
()
...
...
@@ -80,7 +74,7 @@ export default defineComponent({
tabPosition
,
tabList
,
log
,
bg
,
color
,
tabChange
,
handleRefresh
,
handleLogChange
...
...
src/views/InTask.vue
View file @
ba866a23
...
...
@@ -8,8 +8,8 @@
<el-button
round
class=
"button"
type=
"primary"
@
click=
"syncInBill"
:loading=
"loading"
>
入库单接收
</el-button>
</div>
</
template
>
<el-table
:data=
"billList"
ref=
"bill"
border
style=
"width: 100%;height: 28.5vh;"
highlight-current-row
@
row-click=
"billClick"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
6
0"
align=
"center"
/>
<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-column
type=
"index"
label=
"序号"
width=
"
7
0"
align=
"center"
/>
<el-table-column
prop=
"bizBillNo"
label=
"单据号"
align=
"center"
/>
<el-table-column
prop=
"billName"
label=
"凭证号"
align=
"center"
:show-overflow-tooltip=
"true"
/>
<el-table-column
prop=
"swOrgName"
label=
"收物单位"
align=
"center"
:show-overflow-tooltip=
"true"
/>
...
...
@@ -48,8 +48,8 @@
<
template
#
header
>
<span>
物资列表
</span>
</
template
>
<el-table
:data=
"goodsList"
ref=
"goods"
border
style=
"width: 100%;height: 28.5vh;"
highlight-current-row
@
row-click=
"goodsClick"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
6
0"
align=
"center"
/>
<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-column
type=
"index"
label=
"序号"
width=
"
7
0"
align=
"center"
/>
<el-table-column
prop=
"goodsCode"
label=
"品名代码"
align=
"center"
/>
<el-table-column
prop=
"goodsName"
label=
"品名"
align=
"center"
/>
<el-table-column
prop=
"planAmount"
label=
"计划数量"
align=
"center"
/>
...
...
@@ -73,7 +73,7 @@
<span>
号型列表
</span>
</div>
</
template
>
<el-table
:data=
"modelList"
border
style=
"width: 100%;height: 70vh;"
>
<el-table
:
header-cell-style=
"{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}"
:
data=
"modelList"
border
style=
"width: 100%;height: 70vh;"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"60"
align=
"center"
/>
<el-table-column
prop=
"modelName"
label=
"号型名称"
align=
"center"
/>
<el-table-column
prop=
"planAmount"
label=
"计划数量"
align=
"center"
/>
...
...
src/views/OutTask.vue
View file @
ba866a23
...
...
@@ -8,8 +8,8 @@
<el-button
round
class=
"button"
type=
"primary"
@
click=
"syncOutBill"
:loading=
"loading"
>
出库单接收
</el-button>
</div>
</
template
>
<el-table
:data=
"billList"
ref=
"bill"
border
style=
"width: 100%;height: 28.5vh;"
highlight-current-row
@
row-click=
"billClick"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
6
0"
align=
"center"
/>
<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-column
type=
"index"
label=
"序号"
width=
"
7
0"
align=
"center"
/>
<el-table-column
prop=
"bizBillNo"
label=
"单据号"
align=
"center"
/>
<el-table-column
prop=
"billName"
label=
"凭证号"
align=
"center"
/>
<el-table-column
prop=
"swOrgName"
label=
"收物单位"
align=
"center"
/>
...
...
@@ -48,7 +48,7 @@
<
template
#
header
>
<span>
物资列表
</span>
</
template
>
<el-table
: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: '600'}"
:
data=
"goodsList"
ref=
"goods"
border
style=
"width: 100%;height: 28.5vh;"
highlight-current-row
@
row-click=
"goodsClick"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"60"
align=
"center"
/>
<el-table-column
prop=
"goodsCode"
label=
"品名代码"
align=
"center"
/>
<el-table-column
prop=
"goodsName"
label=
"品名"
align=
"center"
/>
...
...
@@ -73,8 +73,8 @@
<span>
号型列表
</span>
</div>
</
template
>
<el-table
:data=
"modelList"
border
style=
"width: 100%;height: 70vh;"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
6
0"
align=
"center"
/>
<el-table
:
header-cell-style=
"{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}"
:
data=
"modelList"
border
style=
"width: 100%;height: 70vh;"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
7
0"
align=
"center"
/>
<el-table-column
prop=
"modelName"
label=
"号型名称"
align=
"center"
width=
"180"
/>
<el-table-column
prop=
"planAmount"
label=
"计划数量"
align=
"center"
/>
<el-table-column
prop=
"realAmount"
label=
"实际数量"
align=
"center"
/>
...
...
src/views/Query.vue
View file @
ba866a23
...
...
@@ -27,7 +27,7 @@
</el-col>
<el-col
:span=
"18"
>
<el-card
style=
"height: calc(100vh - 147px);"
>
<el-table
:data=
"logList"
border
size=
"large"
style=
"width: 100%;height: 78vh;"
>
<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-column
type=
"index"
label=
"序号"
width=
"70"
align=
"center"
/>
<el-table-column
prop=
"inState"
label=
"出入库"
align=
"center"
>
<template
#
default=
"scope"
>
...
...
src/views/RFID.vue
View file @
ba866a23
...
...
@@ -10,7 +10,7 @@
</
template
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"18"
>
<el-table
: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'}"
:
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"
>
...
...
@@ -242,7 +242,8 @@ export default defineComponent({
updateDevice
:
'/device/updateDevice'
,
removeDevice
:
'/device/removeDevice'
,
saveDevice
:
'/device/saveDevice'
,
updateConfig
:
'/config/updateConfig'
updateConfig
:
'/config/updateConfig'
,
getStoreCode
:
'/config/getStoreCode'
},
storeInfo
:
{},
storeCode
:
''
,
...
...
@@ -375,11 +376,14 @@ export default defineComponent({
})
})
}
else
{
postAction
(
state
.
url
.
getConfig
,
{}
).
then
(
res
=>
{
getAction
(
state
.
url
.
getStoreCode
).
then
(
res
=>
{
if
(
res
.
code
!==
99200
)
return
ElMessage
.
error
(
res
.
message
);
state
.
storeInfo
=
res
.
data
[
0
]
sessionStorage
.
setItem
(
'storeInfo'
,
JSON
.
stringify
(
state
.
storeInfo
))
loadData
()
postAction
(
state
.
url
.
getConfig
,
{
storeCode
:
res
.
data
}).
then
(
res
=>
{
if
(
res
.
code
!==
99200
)
return
ElMessage
.
error
(
res
.
message
);
state
.
storeInfo
=
res
.
data
[
0
]
sessionStorage
.
setItem
(
'storeInfo'
,
JSON
.
stringify
(
state
.
storeInfo
))
loadData
()
})
})
}
}
...
...
src/views/Setting.vue
View file @
ba866a23
...
...
@@ -35,7 +35,7 @@
</el-col>
<el-col
:span=
"18"
>
<el-card
style=
"height: calc(100vh - 147px);"
>
<el-table
:data=
"bindList"
border
size=
"large"
style=
"width: 100%;"
>
<el-table
:
header-cell-style=
"
{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :
data="bindList" border size="large" style="width: 100%;">
<el-table-column
type=
"index"
label=
"序号"
width=
"70"
align=
"center"
/>
<el-table-column
prop=
"stationId"
label=
"通道号"
align=
"center"
/>
<el-table-column
prop=
"state"
label=
"状态"
align=
"center"
>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论