Commit 6ed14d79 by huangqy

修复问题

parent da9d0103
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-table-column type="index" label="序号" width="70" 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"/>
<el-table-column prop="percentage" label="进度" align="center"> <el-table-column prop="percentage" label="进度" align="center">
<template #default="scope"> <template #default="scope">
{{scope.row.percentage}}% {{scope.row.percentage}}%
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<span>物资列表</span> <span>物资列表</span>
</template> </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: '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"/>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
{{ scope.row.stationType == 'IN' ? '入库' : '出库' }} {{ scope.row.stationType == 'IN' ? '入库' : '出库' }}
</template> </template>
</el-table-column> </el-table-column>
<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="modelName" label="号型" align="center"/> <el-table-column prop="modelName" label="号型" align="center"/>
<el-table-column prop="amount" label="箱内数量" align="center"/> <el-table-column prop="amount" label="箱内数量" align="center"/>
...@@ -290,16 +290,13 @@ export default defineComponent({ ...@@ -290,16 +290,13 @@ export default defineComponent({
console.log(message) console.log(message)
if (message.noticeType == 0 || message.noticeType == 4) { if (message.noticeType == 0 || message.noticeType == 4) {
logData.value = '' logData.value = ''
map1.set(message.stationId + 'd', 'red')
map1.set(message.stationId + 'g', 'red')
if (message.noticeType == 0 && message.noticeInfo == 1) { if (message.noticeType == 0 && message.noticeInfo == 1) {
map1.set(message.stationId + 'd', 'green') map1.set(message.stationId + 'd', 'green')
} }
if (message.noticeType == 4 && message.noticeInfo == 1) { if (message.noticeType == 4 && message.noticeInfo == 1) {
map1.set(message.stationId + 'g', 'green') map1.set(message.stationId + 'g', 'green')
} }
let str = '<div>【通道' + message.stationId + ': ' + '</div><div class=' + map1.get(message.stationId + 'd') + '></div><div>读写器</div><div class='+ map1.get(message.stationId + 'g') + '></div><div>GPIO</div>】' let str = '<div>【通道' + message.stationId + ': ' + '</div><div class=' + (map1.get(message.stationId + 'd') || 'red')+ '></div><div>读写器</div><div class='+ (map1.get(message.stationId + 'g') || 'red') + '></div><div>GPIO</div>】'
console.log(map1.get(message.stationId + 'd'), map1.get(message.stationId + 'g'))
map.set(message.stationId, str) map.set(message.stationId, str)
const sortedArr = Array.from(map).sort((a, b) => a[0] > b[0] ? 1 : -1); const sortedArr = Array.from(map).sort((a, b) => a[0] > b[0] ? 1 : -1);
for(let [key, value] of sortedArr) { for(let [key, value] of sortedArr) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论