Commit ba866a23 by huangqy

修改逻辑

parent b6d3cab1
...@@ -83,8 +83,7 @@ body { ...@@ -83,8 +83,7 @@ body {
.el-tabs { .el-tabs {
--el-tabs-header-height: 80px !important; --el-tabs-header-height: 80px !important;
background-image: url('theme/bg.png'); background-color: '#1F8A36';
background-size: cover;
color: #f8f8f8; color: #f8f8f8;
} }
...@@ -98,8 +97,7 @@ body { ...@@ -98,8 +97,7 @@ body {
} }
.el-card__header { .el-card__header {
background-image: url('theme/bg.png'); background-color: '#1F8A36';
background-size: cover;
opacity: 0.7; opacity: 0.7;
color: #fff; color: #fff;
} }
......
<template> <template>
<el-tabs :tab-position="tabPosition" type="card" :stretch="true" class="menu-tabs" @tab-change="tabChange" :style="{backgroundImage:'url('+ bg +')'}"> <el-tabs :tab-position="tabPosition" type="card" :stretch="true" class="menu-tabs" @tab-change="tabChange" :style="{backgroundColor: color }">
<el-tab-pane v-for="item in tabList" :key="item.title"> <el-tab-pane v-for="item in tabList" :key="item.title">
<template #label> <template #label>
<span class="custom-tabs-label"> <span class="custom-tabs-label">
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<component :is="item.template" :ref="item.template" @refresh="handleRefresh" @logChange="handleLogChange"></component> <component :is="item.template" :ref="item.template" @refresh="handleRefresh" @logChange="handleLogChange"></component>
</el-tab-pane> </el-tab-pane>
<el-card> <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-card>
</el-tabs> </el-tabs>
</template> </template>
...@@ -29,7 +30,7 @@ export default defineComponent({ ...@@ -29,7 +30,7 @@ export default defineComponent({
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const tabPosition = ref('bottom') const tabPosition = ref('bottom')
const log = ref('') const log = ref('')
const bg = ref('/src/assets/theme/bg.png') const color = ref('#1f8a36')
const tabList = [ const tabList = [
{title: '射频识别', icon: 'iconfont icon-tiaozhishibie', template: 'RFID'}, {title: '射频识别', icon: 'iconfont icon-tiaozhishibie', template: 'RFID'},
{title: '入库作业', icon: 'iconfont icon-rukuguanli-', template: 'InTask'}, {title: '入库作业', icon: 'iconfont icon-rukuguanli-', template: 'InTask'},
...@@ -38,37 +39,30 @@ export default defineComponent({ ...@@ -38,37 +39,30 @@ export default defineComponent({
{title: '查询', icon: 'iconfont icon-chaxun', template: 'Query'}, {title: '查询', icon: 'iconfont icon-chaxun', template: 'Query'},
{title: '通道配置', icon: 'iconfont icon-shezhi', template: 'ChannelSetting'}, {title: '通道配置', icon: 'iconfont icon-shezhi', template: 'ChannelSetting'},
] ]
const a = sessionStorage.getItem('loginbg')
if(a == 'bg') { if (sessionStorage.getItem('bgColor')) {
bg.value = '/src/assets/theme/bg.png' color.value = sessionStorage.getItem('bgColor')
}
if(a == 'bg1') {
bg.value = '/src/assets/theme/bg1.png'
}
if(a == 'bg2') {
bg.value = '/src/assets/theme/bg2.png'
} }
console.log(color.value)
setTimeout(()=> { setTimeout(()=> {
changeBg() changeBg()
}, 200) }, 200)
function changeBg() { function changeBg() {
for(var i =0;i< document.getElementsByClassName('el-card__header').length; i++){ for(var i =0;i< document.getElementsByClassName('el-card__header').length; i++){
document.getElementsByClassName('el-card__header')[i].style.backgroundImage = 'url(' + bg.value +')' document.getElementsByClassName('el-card__header')[i].style.backgroundColor = color.value
} }
} }
function tabChange(index) { function tabChange(index) {
if (index == 0) { if (index == 0) {
return return
} }
proxy.$refs[tabList[index].template][0].loadData() proxy.$refs[tabList[index].template][0].loadData()
} }
function handleRefresh() { function handleRefresh() {
proxy.$refs.InTask[0].loadData() proxy.$refs.InTask[0].loadData()
proxy.$refs.OutTask[0].loadData() proxy.$refs.OutTask[0].loadData()
...@@ -80,7 +74,7 @@ export default defineComponent({ ...@@ -80,7 +74,7 @@ export default defineComponent({
tabPosition, tabPosition,
tabList, tabList,
log, log,
bg, color,
tabChange, tabChange,
handleRefresh, handleRefresh,
handleLogChange handleLogChange
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<el-button round class="button" type="primary" @click="syncInBill" :loading="loading">入库单接收</el-button> <el-button round class="button" type="primary" @click="syncInBill" :loading="loading">入库单接收</el-button>
</div> </div>
</template> </template>
<el-table :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: '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="60" align="center"/> <el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="bizBillNo" label="单据号" 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="billName" label="凭证号" align="center" :show-overflow-tooltip="true"/>
<el-table-column prop="swOrgName" label="收物单位" align="center" :show-overflow-tooltip="true"/> <el-table-column prop="swOrgName" label="收物单位" align="center" :show-overflow-tooltip="true"/>
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<template #header> <template #header>
<span>物资列表</span> <span>物资列表</span>
</template> </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 type="index" label="序号" width="70" align="center"/>
<el-table-column prop="goodsCode" label="品名代码" align="center"/> <el-table-column prop="goodsCode" label="品名代码" align="center"/>
<el-table-column prop="goodsName" label="品名" align="center"/> <el-table-column prop="goodsName" label="品名" align="center"/>
<el-table-column prop="planAmount" label="计划数量" align="center"/> <el-table-column prop="planAmount" label="计划数量" align="center"/>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<span>号型列表</span> <span>号型列表</span>
</div> </div>
</template> </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 type="index" label="序号" width="60" align="center"/>
<el-table-column prop="modelName" label="号型名称" align="center"/> <el-table-column prop="modelName" label="号型名称" align="center"/>
<el-table-column prop="planAmount" label="计划数量" align="center"/> <el-table-column prop="planAmount" label="计划数量" align="center"/>
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<el-button round class="button" type="primary" @click="syncOutBill" :loading="loading">出库单接收</el-button> <el-button round class="button" type="primary" @click="syncOutBill" :loading="loading">出库单接收</el-button>
</div> </div>
</template> </template>
<el-table :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: '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="60" align="center"/> <el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="bizBillNo" label="单据号" align="center"/> <el-table-column prop="bizBillNo" label="单据号" align="center"/>
<el-table-column prop="billName" label="凭证号" align="center"/> <el-table-column prop="billName" label="凭证号" align="center"/>
<el-table-column prop="swOrgName" label="收物单位" align="center"/> <el-table-column prop="swOrgName" label="收物单位" align="center"/>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<template #header> <template #header>
<span>物资列表</span> <span>物资列表</span>
</template> </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 type="index" label="序号" width="60" align="center"/>
<el-table-column prop="goodsCode" label="品名代码" align="center"/> <el-table-column prop="goodsCode" label="品名代码" align="center"/>
<el-table-column prop="goodsName" label="品名" align="center"/> <el-table-column prop="goodsName" label="品名" align="center"/>
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
<span>号型列表</span> <span>号型列表</span>
</div> </div>
</template> </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 type="index" label="序号" width="70" align="center"/>
<el-table-column prop="modelName" label="号型名称" align="center" width="180"/> <el-table-column prop="modelName" label="号型名称" align="center" width="180"/>
<el-table-column prop="planAmount" label="计划数量" align="center"/> <el-table-column prop="planAmount" label="计划数量" align="center"/>
<el-table-column prop="realAmount" label="实际数量" align="center"/> <el-table-column prop="realAmount" label="实际数量" align="center"/>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<el-card style="height: calc(100vh - 147px);"> <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 type="index" label="序号" width="70" align="center"/>
<el-table-column prop="inState" label="出入库" align="center"> <el-table-column prop="inState" label="出入库" align="center">
<template #default="scope"> <template #default="scope">
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</template> </template>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="18"> <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 type="index" label="序号" width="70" align="center"/>
<el-table-column prop="stationType" label="作业类型" align="center"> <el-table-column prop="stationType" label="作业类型" align="center">
<template #default="scope"> <template #default="scope">
...@@ -242,7 +242,8 @@ export default defineComponent({ ...@@ -242,7 +242,8 @@ export default defineComponent({
updateDevice: '/device/updateDevice', updateDevice: '/device/updateDevice',
removeDevice: '/device/removeDevice', removeDevice: '/device/removeDevice',
saveDevice: '/device/saveDevice', saveDevice: '/device/saveDevice',
updateConfig: '/config/updateConfig' updateConfig: '/config/updateConfig',
getStoreCode: '/config/getStoreCode'
}, },
storeInfo: {}, storeInfo: {},
storeCode: '', storeCode: '',
...@@ -375,12 +376,15 @@ export default defineComponent({ ...@@ -375,12 +376,15 @@ export default defineComponent({
}) })
}) })
} else { } else {
postAction(state.url.getConfig, {}).then(res => { getAction(state.url.getStoreCode).then(res => {
if (res.code !== 99200) return ElMessage.error(res.message);
postAction(state.url.getConfig, {storeCode: res.data}).then(res => {
if (res.code !== 99200) return ElMessage.error(res.message); if (res.code !== 99200) return ElMessage.error(res.message);
state.storeInfo = res.data[0] state.storeInfo = res.data[0]
sessionStorage.setItem('storeInfo', JSON.stringify(state.storeInfo)) sessionStorage.setItem('storeInfo', JSON.stringify(state.storeInfo))
loadData() loadData()
}) })
})
} }
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<el-card style="height: calc(100vh - 147px);"> <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 type="index" label="序号" width="70" align="center"/>
<el-table-column prop="stationId" label="通道号" align="center"/> <el-table-column prop="stationId" label="通道号" align="center"/>
<el-table-column prop="state" label="状态" align="center"> <el-table-column prop="state" label="状态" align="center">
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论