xqu
/
huaxing-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改2D地图展示、优化首页子页面

Browse Source
master
Comair 2 years ago
parent 2ae474dff7
commit 485b6321c7
4 changed files with 213 additions and 211 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 360
      src/config.js
  2. 10
      src/views/index.vue
  3. 30
      src/views/wcs/stackerView/index.vue
  4. 6
      src/views/wcs/taskInfo/index.vue

360
src/config.js
Unescape View File

@ -7,102 +7,102 @@
*/
var arr=[
[1,1,1,"010101",1,0,120,380,100],
[1,1,2,"010102",1,0,120,380,100],
[1,1,3,"010103",1,0,120,380,100],
[1,1,4,"010104",1,0,120,380,100],
[1,2,1,"010201",1,0,120,380,100],
[1,2,2,"010202",1,0,120,380,100],
[1,2,3,"010203",1,0,120,380,100],
[1,2,4,"010204",1,0,120,380,100],
[1,3,1,"010301",1,0,120,380,100],
[1,3,2,"010302",1,0,120,380,100],
[1,3,3,"010303",1,0,120,380,100],
[1,3,4,"010304",1,0,120,380,100],
[1,4,1,"010401",1,0,120,380,100],
[1,4,2,"010402",1,0,120,380,100],
[1,4,3,"010403",1,0,120,380,100],
[1,4,4,"010404",1,0,120,380,100],
[1,5,1,"010501",1,0,120,380,100],
[1,5,2,"010502",1,0,120,380,100],
[1,5,3,"010503",1,0,120,380,100],
[1,5,4,"010504",1,0,120,380,100],
[1,6,1,"010601",1,0,120,380,100],
[1,6,2,"010602",1,0,120,380,100],
[1,6,3,"010603",1,0,120,380,100],
[1,6,4,"010604",1,0,120,380,100],
[1,7,1,"010701",1,0,120,380,100],
[1,7,2,"010702",1,0,120,380,100],
[1,7,3,"010703",1,0,120,380,100],
[1,7,4,"010704",1,0,120,380,100],
[1,8,1,"010801",1,0,120,380,100],
[1,8,2,"010802",1,0,120,380,100],
[1,8,3,"010803",1,0,120,380,100],
[1,8,4,"010804",1,0,120,380,100],
[1,9,1,"010901",1,0,120,380,100],
[1,9,2,"010902",1,0,120,380,100],
[1,9,3,"010903",1,0,120,380,100],
[1,9,4,"010904",1,0,120,380,100],
[1,10,1,"011001",1,0,120,380,100],
[1,10,2,"011002",1,0,120,380,100],
[1,10,3,"011003",1,0,120,380,100],
[1,10,4,"011004",1,0,120,380,100],
[1,11,1,"011101",1,0,120,380,100],
[1,11,2,"011102",1,0,120,380,100],
[1,11,3,"011103",1,0,120,380,100],
[1,11,4,"011104",1,0,120,380,100],
[1,12,1,"011201",1,0,120,380,100],
[1,12,2,"011202",1,0,120,380,100],
[1,12,3,"011203",1,0,120,380,100],
[1,12,4,"011204",1,0,120,380,100],
[1,13,1,"011301",1,0,120,380,100],
[1,13,2,"011302",1,0,120,380,100],
[1,13,3,"011303",1,0,120,380,100],
[1,13,4,"011304",1,0,120,380,100],
[1,14,1,"011401",1,0,120,380,100],
[1,14,2,"011402",1,0,120,380,100],
[1,14,3,"011403",1,0,120,380,100],
[1,14,4,"011404",1,0,120,380,100],
[1,15,1,"011501",1,0,120,380,100],
[1,15,2,"011502",1,0,120,380,100],
[1,15,3,"011503",1,0,120,380,100],
[1,15,4,"011504",1,0,120,380,100],
[1,16,1,"011601",1,0,120,380,100],
[1,16,2,"011602",1,0,120,380,100],
[1,16,3,"011603",1,0,120,380,100],
[1,16,4,"011604",1,0,120,380,100],
[1,17,1,"011701",1,0,120,380,100],
[1,17,2,"011702",1,0,120,380,100],
[1,17,3,"011703",1,0,120,380,100],
[1,17,4,"011704",1,0,120,380,100],
[1,18,1,"011801",1,0,120,380,100],
[1,18,2,"011802",1,0,120,380,100],
[1,18,3,"011803",1,0,120,380,100],
[1,18,4,"011804",1,0,120,380,100],
[1,19,1,"011901",1,0,120,380,100],
[1,19,2,"011902",1,0,120,380,100],
[1,19,3,"011903",1,0,120,380,100],
[1,19,4,"011904",1,0,120,380,100],
[1,20,1,"012001",1,0,120,380,100],
[1,20,2,"012002",1,0,120,380,100],
[1,20,3,"012003",1,0,120,380,100],
[1,20,4,"012004",1,0,120,380,100],
[1,21,1,"012101",1,0,120,380,100],
[1,21,2,"012102",1,0,120,380,100],
[1,21,3,"012103",1,0,120,380,100],
[1,21,4,"012104",1,0,120,380,100],
[1,22,1,"012201",1,0,120,380,100],
[1,22,2,"012202",1,0,120,380,100],
[1,22,3,"012203",1,0,120,380,100],
[1,22,4,"012204",1,0,120,380,100],
[1,23,1,"012301",1,0,120,380,100],
[1,23,2,"012302",1,0,120,380,100],
[1,23,3,"012303",1,0,120,380,100],
[1,23,4,"012304",1,0,120,380,100],
[1,24,1,"012401",1,0,120,380,100],
[1,24,2,"012402",1,0,120,380,100],
[1,24,3,"012403",1,0,120,380,100],
[1,24,4,"012404",1,0,120,380,100],
[2,1,1,"010101",1,0,120,380,100],
[2,1,2,"010102",1,0,120,380,100],
[2,1,3,"010103",1,0,120,380,100],
[2,1,4,"010104",1,0,120,380,100],
[2,2,1,"010201",1,0,120,380,100],
[2,2,2,"010202",1,0,120,380,100],
[2,2,3,"010203",1,0,120,380,100],
[2,2,4,"010204",1,0,120,380,100],
[2,3,1,"010301",1,0,120,380,100],
[2,3,2,"010302",1,0,120,380,100],
[2,3,3,"010303",1,0,120,380,100],
[2,3,4,"010304",1,0,120,380,100],
[2,4,1,"010401",1,0,120,380,100],
[2,4,2,"010402",1,0,120,380,100],
[2,4,3,"010403",1,0,120,380,100],
[2,4,4,"010404",1,0,120,380,100],
[2,5,1,"010501",1,0,120,380,100],
[2,5,2,"010502",1,0,120,380,100],
[2,5,3,"010503",1,0,120,380,100],
[2,5,4,"010504",1,0,120,380,100],
[2,6,1,"010601",1,0,120,380,100],
[2,6,2,"010602",1,0,120,380,100],
[2,6,3,"010603",1,0,120,380,100],
[2,6,4,"010604",1,0,120,380,100],
[2,7,1,"010701",1,0,120,380,100],
[2,7,2,"010702",1,0,120,380,100],
[2,7,3,"010703",1,0,120,380,100],
[2,7,4,"010704",1,0,120,380,100],
[2,8,1,"010801",1,0,120,380,100],
[2,8,2,"010802",1,0,120,380,100],
[2,8,3,"010803",1,0,120,380,100],
[2,8,4,"010804",1,0,120,380,100],
[2,9,1,"010901",1,0,120,380,100],
[2,9,2,"010902",1,0,120,380,100],
[2,9,3,"010903",1,0,120,380,100],
[2,9,4,"010904",1,0,120,380,100],
[2,10,1,"011001",1,0,120,380,100],
[2,10,2,"011002",1,0,120,380,100],
[2,10,3,"011003",1,0,120,380,100],
[2,10,4,"011004",1,0,120,380,100],
[2,11,1,"011101",1,0,120,380,100],
[2,11,2,"011102",1,0,120,380,100],
[2,11,3,"011103",1,0,120,380,100],
[2,11,4,"011104",1,0,120,380,100],
[2,12,1,"011201",1,0,120,380,100],
[2,12,2,"011202",1,0,120,380,100],
[2,12,3,"011203",1,0,120,380,100],
[2,12,4,"011204",1,0,120,380,100],
[2,13,1,"011301",1,0,120,380,100],
[2,13,2,"011302",1,0,120,380,100],
[2,13,3,"011303",1,0,120,380,100],
[2,13,4,"011304",1,0,120,380,100],
[2,14,1,"011401",1,0,120,380,100],
[2,14,2,"011402",1,0,120,380,100],
[2,14,3,"011403",1,0,120,380,100],
[2,14,4,"011404",1,0,120,380,100],
[2,15,1,"011501",1,0,120,380,100],
[2,15,2,"011502",1,0,120,380,100],
[2,15,3,"011503",1,0,120,380,100],
[2,15,4,"011504",1,0,120,380,100],
[2,16,1,"011601",1,0,120,380,100],
[2,16,2,"011602",1,0,120,380,100],
[2,16,3,"011603",1,0,120,380,100],
[2,16,4,"011604",1,0,120,380,100],
[2,17,1,"011701",1,0,120,380,100],
[2,17,2,"011702",1,0,120,380,100],
[2,17,3,"011703",1,0,120,380,100],
[2,17,4,"011704",1,0,120,380,100],
[2,18,1,"011801",1,0,120,380,100],
[2,18,2,"011802",1,0,120,380,100],
[2,18,3,"011803",1,0,120,380,100],
[2,18,4,"011804",1,0,120,380,100],
[2,19,1,"011901",1,0,120,380,100],
[2,19,2,"011902",1,0,120,380,100],
[2,19,3,"011903",1,0,120,380,100],
[2,19,4,"011904",1,0,120,380,100],
[2,20,1,"012001",1,0,120,380,100],
[2,20,2,"012002",1,0,120,380,100],
[2,20,3,"012003",1,0,120,380,100],
[2,20,4,"012004",1,0,120,380,100],
[2,21,1,"012101",1,0,120,380,100],
[2,21,2,"012102",1,0,120,380,100],
[2,21,3,"012103",1,0,120,380,100],
[2,21,4,"012104",1,0,120,380,100],
[2,22,1,"012201",1,0,120,380,100],
[2,22,2,"012202",1,0,120,380,100],
[2,22,3,"012203",1,0,120,380,100],
[2,22,4,"012204",1,0,120,380,100],
[2,23,1,"012301",1,0,120,380,100],
[2,23,2,"012302",1,0,120,380,100],
[2,23,3,"012303",1,0,120,380,100],
[2,23,4,"012304",1,0,120,380,100],
[2,24,1,"012401",1,0,120,380,100],
[2,24,2,"012402",1,0,120,380,100],
[2,24,3,"012403",1,0,120,380,100],
[2,24,4,"012404",1,0,120,380,100],
]
var arrRe=[
@ -498,90 +498,90 @@ var arrRe=[
latticeForPiler:[
...arr,
[2,2,1,"020201",1,0,120,380,100],
[2,2,2,"020202",1,0,120,380,100],
[2,2,3,"020203",1,0,120,380,100],
[2,2,4,"020204",1,0,120,380,100],
[2,3,1,"020301",1,0,120,380,100],
[2,3,2,"020302",1,0,120,380,100],
[2,3,3,"020303",1,0,120,380,100],
[2,3,4,"020304",1,0,120,380,100],
[2,4,1,"020401",1,0,120,380,100],
[2,4,2,"020402",1,0,120,380,100],
[2,4,3,"020403",1,0,120,380,100],
[2,4,4,"020404",1,0,120,380,100],
[2,5,1,"020501",1,0,120,380,100],
[2,5,2,"020502",1,0,120,380,100],
[2,5,3,"020503",1,0,120,380,100],
[2,5,4,"020504",1,0,120,380,100],
[2,6,1,"020601",1,0,120,380,100],
[2,6,2,"020602",1,0,120,380,100],
[2,6,3,"020603",1,0,120,380,100],
[2,6,4,"020604",1,0,120,380,100],
[2,7,1,"",1,0,120,380,100],
[2,7,2,"020702",1,0,120,380,100],
[2,7,3,"020703",1,0,120,380,100],
[2,7,4,"020704",1,0,120,380,100],
[2,8,1,"",1,0,120,380,100],
[2,8,2,"020802",1,0,120,380,100],
[2,8,3,"020803",1,0,120,380,100],
[2,8,4,"020804",1,0,120,380,100],
[2,9,1,"020901",1,0,120,380,100],
[2,9,2,"020902",1,0,120,380,100],
[2,9,3,"020903",1,0,120,380,100],
[2,9,4,"020904",1,0,120,380,100],
[2,10,1,"021001",1,0,120,380,100],
[2,10,2,"021002",1,0,120,380,100],
[2,10,3,"021003",1,0,120,380,100],
[2,10,4,"021004",1,0,120,380,100],
[2,11,1,"021101",1,0,120,380,100],
[2,11,2,"021102",1,0,120,380,100],
[2,11,3,"021103",1,0,120,380,100],
[2,11,4,"021104",1,0,120,380,100],
[2,12,1,"021201",1,0,120,380,100],
[2,12,2,"021202",1,0,120,380,100],
[2,12,3,"021203",1,0,120,380,100],
[2,12,4,"021204",1,0,120,380,100],
[2,13,1,"021301",1,0,120,380,100],
[2,13,2,"021302",1,0,120,380,100],
[2,13,3,"021303",1,0,120,380,100],
[2,13,4,"021304",1,0,120,380,100],
[2,14,1,"021401",1,0,120,380,100],
[2,14,2,"021402",1,0,120,380,100],
[2,14,3,"021403",1,0,120,380,100],
[2,14,4,"021404",1,0,120,380,100],
[2,15,1,"021501",1,0,120,380,100],
[2,15,2,"021502",1,0,120,380,100],
[2,15,3,"021503",1,0,120,380,100],
[2,15,4,"021504",1,0,120,380,100],
[2,16,1,"021601",1,0,120,380,100],
[2,16,2,"021602",1,0,120,380,100],
[2,16,3,"021603",1,0,120,380,100],
[2,16,4,"021604",1,0,120,380,100],
[2,17,1,"021701",1,0,120,380,100],
[2,17,2,"021702",1,0,120,380,100],
[2,17,3,"021703",1,0,120,380,100],
[2,17,4,"021704",1,0,120,380,100],
[2,18,1,"021801",1,0,120,380,100],
[2,18,2,"021802",1,0,120,380,100],
[2,18,3,"021803",1,0,120,380,100],
[2,18,4,"021804",1,0,120,380,100],
[2,19,1,"021901",1,0,120,380,100],
[2,19,2,"021902",1,0,120,380,100],
[2,19,3,"--",1,0,380,100],
[2,19,4,"---",1,0,380,100],
[2,20,1,"022001",1,0,120,380,100],
[2,20,2,"022002",1,0,120,380,100],
[2,20,3,"--",1,0,380,100],
[2,20,4,"---",1,0,380,100],
[2,21,1,"022101",1,0,120,380,100],
[2,21,2,"022102",1,0,120,380,100],
[2,21,3,"022103",1,0,120,380,100],
[2,21,4,"022104",1,0,120,380,100],
[2,22,1,"022201",1,0,120,380,100],
[2,22,2,"022202",1,0,120,380,100],
[2,22,3,"022203",1,0,120,380,100],
[2,22,4,"022204",1,0,120,380,100],
[1,2,4,"020201",1,0,120,380,100],
[1,2,3,"020202",1,0,120,380,100],
[1,2,2,"020203",1,0,120,380,100],
[1,2,1,"020204",1,0,120,380,100],
[1,3,4,"020301",1,0,120,380,100],
[1,3,3,"020302",1,0,120,380,100],
[1,3,2,"020303",1,0,120,380,100],
[1,3,1,"020304",1,0,120,380,100],
[1,4,4,"020401",1,0,120,380,100],
[1,4,3,"020402",1,0,120,380,100],
[1,4,2,"020403",1,0,120,380,100],
[1,4,1,"020404",1,0,120,380,100],
[1,5,4,"020501",1,0,120,380,100],
[1,5,3,"020502",1,0,120,380,100],
[1,5,2,"020503",1,0,120,380,100],
[1,5,1,"020504",1,0,120,380,100],
[1,6,4,"020601",1,0,120,380,100],
[1,6,3,"020602",1,0,120,380,100],
[1,6,2,"020603",1,0,120,380,100],
[1,6,1,"020604",1,0,120,380,100],
[1,7,4,"",1,0,120,380,100],
[1,7,3,"020702",1,0,120,380,100],
[1,7,2,"020703",1,0,120,380,100],
[1,7,1,"020704",1,0,120,380,100],
[1,8,4,"",1,0,120,380,100],
[1,8,3,"020802",1,0,120,380,100],
[1,8,2,"020803",1,0,120,380,100],
[1,8,1,"020804",1,0,120,380,100],
[1,9,4,"020901",1,0,120,380,100],
[1,9,3,"020902",1,0,120,380,100],
[1,9,2,"020903",1,0,120,380,100],
[1,9,1,"020904",1,0,120,380,100],
[1,10,4,"021001",1,0,120,380,100],
[1,10,3,"021002",1,0,120,380,100],
[1,10,2,"021003",1,0,120,380,100],
[1,10,1,"021004",1,0,120,380,100],
[1,11,4,"021101",1,0,120,380,100],
[1,11,3,"021102",1,0,120,380,100],
[1,11,2,"021103",1,0,120,380,100],
[1,11,1,"021104",1,0,120,380,100],
[1,12,4,"021201",1,0,120,380,100],
[1,12,3,"021202",1,0,120,380,100],
[1,12,2,"021203",1,0,120,380,100],
[1,12,1,"021204",1,0,120,380,100],
[1,13,4,"021301",1,0,120,380,100],
[1,13,3,"021302",1,0,120,380,100],
[1,13,2,"021303",1,0,120,380,100],
[1,13,1,"021304",1,0,120,380,100],
[1,14,4,"021401",1,0,120,380,100],
[1,14,3,"021402",1,0,120,380,100],
[1,14,2,"021403",1,0,120,380,100],
[1,14,1,"021404",1,0,120,380,100],
[1,15,4,"021501",1,0,120,380,100],
[1,15,3,"021502",1,0,120,380,100],
[1,15,2,"021503",1,0,120,380,100],
[1,15,1,"021504",1,0,120,380,100],
[1,16,4,"021601",1,0,120,380,100],
[1,16,3,"021602",1,0,120,380,100],
[1,16,2,"021603",1,0,120,380,100],
[1,16,1,"021604",1,0,120,380,100],
[1,17,4,"021701",1,0,120,380,100],
[1,17,3,"021702",1,0,120,380,100],
[1,17,2,"021703",1,0,120,380,100],
[1,17,1,"021704",1,0,120,380,100],
[1,18,4,"021801",1,0,120,380,100],
[1,18,3,"021802",1,0,120,380,100],
[1,18,2,"021803",1,0,120,380,100],
[1,18,1,"021804",1,0,120,380,100],
[1,19,4,"021901",1,0,120,380,100],
[1,19,3,"021902",1,0,120,380,100],
[1,19,2," ",1,0,120,380,100],
[1,19,1," ",1,0,120,380,100],
[1,20,4,"022001",1,0,120,380,100],
[1,20,3,"022002",1,0,120,380,100],
[1,20,2," ",1,0,120,380,100],
[1,20,1," ",1,0,120,380,100],
[1,21,4,"022101",1,0,120,380,100],
[1,21,3,"022102",1,0,120,380,100],
[1,21,2,"022103",1,0,120,380,100],
[1,21,1,"022104",1,0,120,380,100],
[1,22,4,"022201",1,0,120,380,100],
[1,22,3,"022202",1,0,120,380,100],
[1,22,2,"022203",1,0,120,380,100],
[1,22,1,"022204",1,0,120,380,100],
// [2,25,5,"022505",1,0,120,100,100],
// [2,26,6,"022606",1,0,120,100,100],
// [2,27,7,"022707",1,0,120,100,100]

10
src/views/index.vue
Unescape View File

@ -93,7 +93,7 @@
}"
style="width: 30px;height: 30px;float: right;cursor: pointer;"
>
<Table
<Table border
:height="550"
:columns="columns"
:data="tableData"
@ -583,16 +583,18 @@ export default {
columns: [
{
title: '货位',
key: 'locationName'
key: 'locationName',
width: 90
},
{
title: 'Box信息',
key: 'boxId'
key: 'boxId',
width: 120
},
{
title: '备注',
key: 'remark',
width: 150
width: 275
}
// {
// title: 333,

30
src/views/wcs/stackerView/index.vue
Unescape View File

@ -56,21 +56,21 @@
</el-table-column>
<el-table-column class="openOrClose" label="连接/关闭" align="center" >
<template slot-scope="scope">
<el-switch
v-show="scope.row.host"
v-model="scope.row.enable"
:active-value="1"
:inactive-value="0"
@change="connect1Change($event,scope.row)"
active-color="#13ce66"
inactive-color="#ff4949"
>
</el-switch>
</template>
</el-table-column>
<!-- <el-table-column class="openOrClose" label="连接/关闭" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-switch-->
<!-- v-show="scope.row.host"-->
<!-- v-model="scope.row.enable"-->
<!-- :active-value="1"-->
<!-- :inactive-value="0"-->
<!-- @change="connect1Change($event,scope.row)"-->
<!-- active-color="#13ce66"-->
<!-- inactive-color="#ff4949"-->
<!-- >-->
<!-- </el-switch>-->
<!-- </template>-->
<!-- </el-table-column>-->

6
src/views/wcs/taskInfo/index.vue
Unescape View File

@ -74,7 +74,7 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5"><el-button type="primary" size="mini">执行</el-button></el-col>
<el-col :span="1.5"><el-button type="success" size="mini">执行</el-button></el-col>
<el-col :span="1.5"><el-button type="info" size="mini">等待</el-button></el-col>
<el-col :span="1.5"><el-button type="danger" size="mini">错误</el-button></el-col>
@ -173,7 +173,7 @@
}
.el-table .primary-row {
background: #1890ff;
background: #13ce66;
}
</style>
@ -197,7 +197,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
tableRowClassName:'',
tableRowClassNames:'',
// 任务表格数据
taskInfoList: [],
// 弹出层标题

Write Preview
Loading…
Cancel
Save