Commit feb12ceef0f0ccd8429d7551b9caafe768b5ac21
----
Showing
13 changed files
with
446 additions
and
444 deletions
HHECS.Web/src/api/main.js
1 | 1 | import request from '@/utils/request' |
2 | 2 | |
3 | 3 | // 开始处理 |
4 | -export function resume() { | |
5 | - return request({ | |
6 | - url: '/api/Index/Resume', | |
7 | - method: 'post' | |
8 | - // data, | |
9 | - }) | |
4 | +export function resume () { | |
5 | + return request({ | |
6 | + url: '/api/Index/Resume', | |
7 | + method: 'post' | |
8 | + // data, | |
9 | + }) | |
10 | 10 | } |
11 | 11 | |
12 | 12 | // 暂停处理 |
13 | -export function pause() { | |
14 | - return request({ | |
15 | - url: '/api/Index/Pause', | |
16 | - method: 'post' | |
17 | - // data, | |
18 | - }) | |
13 | +export function pause () { | |
14 | + return request({ | |
15 | + url: '/api/Index/Pause', | |
16 | + method: 'post' | |
17 | + // data, | |
18 | + }) | |
19 | 19 | } |
20 | 20 | |
21 | 21 | // 获取状态 |
22 | -export function getExecuteStatus() { | |
23 | - return request({ | |
24 | - url: '/api/Index/GetExecuteStatus', | |
25 | - method: 'get' | |
26 | - // data, | |
27 | - }) | |
22 | +export function getExecuteStatus () { | |
23 | + return request({ | |
24 | + url: '/api/Index/GetExecuteStatus', | |
25 | + method: 'get' | |
26 | + // data, | |
27 | + }) | |
28 | 28 | } |
29 | 29 | |
30 | 30 | // 设置自动发送 |
31 | -export function setAutoSendStatus(data) { | |
32 | - return request({ | |
33 | - url: '/api/Index/SetAutoSendStatus?auto=' + data, | |
34 | - method: 'get' | |
35 | - // data, | |
36 | - }) | |
31 | +export function setAutoSendStatus (data) { | |
32 | + return request({ | |
33 | + url: '/api/Index/SetAutoSendStatus?auto=' + data, | |
34 | + method: 'get' | |
35 | + // data, | |
36 | + }) | |
37 | 37 | } |
38 | 38 | |
39 | 39 | // 获取自动发送 |
40 | -export function getAutoSendStatus() { | |
41 | - return request({ | |
42 | - url: '/api/Index/GetAutoSendStatus', | |
43 | - method: 'get' | |
44 | - // data, | |
45 | - }) | |
40 | +export function getAutoSendStatus () { | |
41 | + return request({ | |
42 | + url: '/api/Index/GetAutoSendStatus', | |
43 | + method: 'get' | |
44 | + // data, | |
45 | + }) | |
46 | 46 | } |
47 | 47 | |
48 | 48 | // 获取执行详情 |
49 | -export function getExecuteDetail() { | |
50 | - return request({ | |
51 | - url: '/api/Index/GetExecuteDetail', | |
52 | - method: 'get' | |
53 | - // data, | |
54 | - }) | |
49 | +export function getExecuteDetail () { | |
50 | + return request({ | |
51 | + url: '/api/Index/GetExecuteDetail', | |
52 | + method: 'get' | |
53 | + // data, | |
54 | + }) | |
55 | 55 | } |
56 | 56 | |
57 | 57 | // 获取概述 |
58 | -export function getOverviews() { | |
59 | - return request({ | |
60 | - url: '/api/Index/GetOverviews', | |
61 | - method: 'get' | |
62 | - // data, | |
63 | - }) | |
58 | +export function getOverviews () { | |
59 | + return request({ | |
60 | + url: '/api/Index/GetOverviews', | |
61 | + method: 'get' | |
62 | + // data, | |
63 | + }) | |
64 | 64 | } |
65 | 65 | |
66 | 66 | // 获取堆垛机信息 |
67 | -export function getSRMInfo() { | |
68 | - return request({ | |
69 | - url: '/api/Index/GetSRMInfo', | |
70 | - method: 'get' | |
71 | - }) | |
67 | +export function getSRMInfo () { | |
68 | + return request({ | |
69 | + url: '/api/Index/GetSRMInfo', | |
70 | + method: 'get' | |
71 | + }) | |
72 | 72 | } |
73 | 73 | |
74 | 74 | // 获取站台信息 |
75 | -export function getStationMonitorInfo() { | |
76 | - return request({ | |
77 | - url: '/api/Index/GetStationMonitorInfo', | |
78 | - method: 'get' | |
79 | - }) | |
75 | +export function getStationMonitorInfo () { | |
76 | + return request({ | |
77 | + url: '/api/Index/GetStationMonitorInfo', | |
78 | + method: 'get' | |
79 | + }) | |
80 | 80 | } |
81 | 81 | |
82 | 82 | // 获取RGV信息 |
83 | -export function getRGVInfo() { | |
84 | - return request({ | |
85 | - url: '/api/Index/GetRGVInfo', | |
86 | - method: 'get' | |
87 | - }) | |
83 | +export function getRGVInfo () { | |
84 | + return request({ | |
85 | + url: '/api/Index/GetRGVInfo', | |
86 | + method: 'get' | |
87 | + }) | |
88 | 88 | } |
89 | 89 | |
90 | 90 | // 获取CRGV信息 |
91 | -export function getCRGVInfo() { | |
92 | - return request({ | |
93 | - url: '/api/Index/GetCRGVInfo', | |
94 | - method: 'get' | |
95 | - }) | |
91 | +export function getCRGVInfo () { | |
92 | + return request({ | |
93 | + url: '/api/Index/GetCRGVInfo', | |
94 | + method: 'get' | |
95 | + }) | |
96 | +} | |
97 | +// 获取执行线程 | |
98 | +export function GetExecuteDetail () { | |
99 | + return request({ | |
100 | + url: '/api/Index/GetExecuteDetail', | |
101 | + method: 'get' | |
102 | + }) | |
103 | +} | |
104 | +// 调度诊断 | |
105 | +export function GetExecutorDiagnosisInfo () { | |
106 | + return request({ | |
107 | + url: '/api/Index/ExecutorDiagnosisInfo', | |
108 | + method: 'get' | |
109 | + }) | |
110 | +} | |
111 | +//调度日志 | |
112 | +export function GetExecuteLogs () { | |
113 | + return request({ | |
114 | + url: '/api/Index/GetExecuteLogs', | |
115 | + method: 'get' | |
116 | + }) | |
117 | +} | |
118 | +//站台 | |
119 | +export function GetStationInfo () { | |
120 | + return request({ | |
121 | + url: '/api/Index/GetStationInfo?id=0', | |
122 | + method: 'get', | |
123 | + | |
124 | + }) | |
96 | 125 | } |
... | ... |
HHECS.Web/src/icons/svg/crgv-task.svg
0 → 100644
1 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1743491565188" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="934" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M987.428571 512v292.571429H36.571429V73.142857h219.428571v365.714286h73.142857V219.428571h658.285714v292.571429z m-804.571428-365.714286h-73.142857v292.571429h73.142857V146.285714z m146.285714 365.714286h-219.428571v219.428571h804.571428V512h-585.142857z m585.142857-219.428571h-512v146.285714h512V292.571429z m-731.428571 292.571428h292.571428v73.142857h-292.571428V585.142857z m804.571428 365.714286H36.571429v-73.142857h950.857142v73.142857z" p-id="935" fill="#BFCBD9"></path></svg> | |
0 | 2 | \ No newline at end of file |
... | ... |
HHECS.Web/src/icons/svg/ddj-task.svg
0 → 100644
1 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1743491230185" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1370" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M587.50394482 122.55434297c0-8.33358962 6.76396259-15.09755221 15.11373369-15.09755335h60.4063926c8.34977223 0 15.11373483 6.76396259 15.11373483 15.09755335V198.07446926a15.09755221 15.09755221 0 0 1-15.11373483 15.09755221H602.61767851a15.09755221 15.09755221 0 0 1-15.11373369-15.09755221v-75.52012629z" p-id="1371" fill="#BFCBD9"></path><path d="M253.09234517 89.12289223A46.39301518 46.39301518 0 0 0 206.69932999 42.72987705h-4.30433962A46.39301518 46.39301518 0 0 0 156.00197518 89.12289223V576.72691371h-56.63604963a16.18172814 16.18172814 0 0 0-12.02302408 5.35615146l-72.81777777 80.90864299A16.18172814 16.18172814 0 0 0 10.36641963 673.8172837v307.45283925a16.18172814 16.18172814 0 0 0 16.18172814 16.18172928h210.36246926a16.18172814 16.18172814 0 0 0 16.18172814-16.18172928v-48.54518442h569.11138816a48.54518557 48.54518557 0 1 0 91.5724015 0H965.08839481a16.18172814 16.18172814 0 0 0 16.18172814-16.18172815v-64.72691371a16.18172814 16.18172814 0 0 0-16.18172814-16.18172928H783.04395037a16.18172814 16.18172814 0 1 0 0 32.36345743H948.90666667v32.36345628H253.09234517v-32.36345628h355.99802482a16.18172814 16.18172814 0 1 0 0-32.36345743H253.09234517V487.72740779h614.90567965a16.18172814 16.18172814 0 0 0 8.15559111-2.20071595l97.09036999-56.6360485A16.18172814 16.18172814 0 0 0 965.08839481 398.72790073h-157.44821703c2.75089408-5.90633074 4.25579406-12.49229483 4.25579406-19.41807332V137.66807666A46.39301518 46.39301518 0 0 0 765.51913927 91.27506147h-271.8530378A46.39301518 46.39301518 0 0 0 447.27308629 137.66807666V379.30982741c0 6.92577963 1.52108259 13.51174371 4.2557952 19.41807332H317.81925888V196.45629667a16.18172814 16.18172814 0 0 0-16.18172814-16.18172928h-48.54518557V89.12289223zM851.81629667 948.90666667a16.18172814 16.18172814 0 1 1 32.36345629 0 16.18172814 16.18172814 0 0 1-32.36345629 0z m-663.45086406 16.18172814V89.12289223c0-7.75104739 6.27851037-14.0295589 14.02955776-14.0295589h4.30433962c7.75104739 0 14.0295589 6.27851037 14.0295589 14.0295589V965.08839481h-32.36345628z m-32.36345743 0H42.72987705V680.03106816L106.56679481 609.09036999H156.00197518v355.99802482z m707.62698297-509.72444444H253.09234517v-242.72592555h32.36345742V414.90963001a16.18172814 16.18172814 0 0 0 16.18172815 16.18172814h603.59465073l-41.60322332 24.27259222zM493.66610147 123.6385189h77.67229668v74.43595036c0 17.28208555 13.99719481 31.27928149 31.27928036 31.27928036h60.4063926a31.27928149 31.27928149 0 0 0 31.29546297-31.27928036V123.6385189h71.19960519c7.73486592 0 14.01337629 6.27851037 14.01337628 14.02955776V379.30982741a14.0295589 14.0295589 0 0 1-14.01337628 14.02955776h-271.8530378A14.0295589 14.0295589 0 0 1 479.63654371 379.30982741V137.66807666c0-7.75104739 6.27851037-14.0295589 14.02955776-14.02955776z m110.03575296 0h58.25422223v73.35177443h-58.25422223V123.6385189z" p-id="1372" fill="#BFCBD9"></path><path d="M544.36345629 302.17152739m16.18172928 0l48.54518442 0q16.18172814 0 16.18172928 16.18172928l0 0q0 16.18172814-16.18172928 16.18172815l-48.54518442 0q-16.18172814 0-16.18172928-16.18172815l0 0q0-16.18172814 16.18172928-16.18172928Z" p-id="1373" fill="#BFCBD9"></path><path d="M714.27160519 851.81629667a20.22716075 20.22716075 0 1 1-40.45432149 0 20.22716075 20.22716075 0 0 1 40.45432149 0z" p-id="1374" fill="#BFCBD9"></path></svg> | |
0 | 2 | \ No newline at end of file |
... | ... |
HHECS.Web/src/icons/svg/main-task.svg
0 → 100644
1 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1743492069164" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1296" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M109.714286 73.142857c-21.942857 0-36.571429 14.628571-36.571429 36.571429v804.571428c0 21.942857 14.628571 36.571429 36.571429 36.571429h804.571428c21.942857 0 36.571429-14.628571 36.571429-36.571429v-804.571428c0-21.942857-14.628571-36.571429-36.571429-36.571429h-804.571428z m0-73.142857h804.571428c58.514286 0 109.714286 51.2 109.714286 109.714286v804.571428c0 58.514286-51.2 109.714286-109.714286 109.714286h-804.571428C51.2 1024 0 972.8 0 914.285714v-804.571428C0 51.2 51.2 0 109.714286 0z m438.857143 292.571429h219.428571c21.942857 0 36.571429 14.628571 36.571429 36.571428s-14.628571 36.571429-36.571429 36.571429h-219.428571c-21.942857 0-36.571429-14.628571-36.571429-36.571429s14.628571-36.571429 36.571429-36.571428z m-219.428572 438.857142c21.942857 0 36.571429-14.628571 36.571429-36.571428S351.085714 658.285714 329.142857 658.285714s-36.571429 14.628571-36.571428 36.571429 14.628571 36.571429 36.571428 36.571428z m0 73.142858C270.628571 804.571429 219.428571 753.371429 219.428571 694.857143S270.628571 585.142857 329.142857 585.142857 438.857143 636.342857 438.857143 694.857143 387.657143 804.571429 329.142857 804.571429z m-7.314286-446.171429L241.371429 277.942857c-14.628571-14.628571-36.571429-14.628571-51.2 0-14.628571 14.628571-14.628571 36.571429 0 51.2L292.571429 431.542857c7.314286 7.314286 21.942857 14.628571 29.257142 14.628572s21.942857 0 29.257143-7.314286l153.6-153.6c14.628571-14.628571 14.628571-36.571429 0-51.2-14.628571-14.628571-36.571429-14.628571-51.2 0L321.828571 358.4zM548.571429 658.285714h219.428571c21.942857 0 36.571429 14.628571 36.571429 36.571429s-14.628571 36.571429-36.571429 36.571428h-219.428571c-21.942857 0-36.571429-14.628571-36.571429-36.571428s14.628571-36.571429 36.571429-36.571429z" p-id="1297" fill="#BFCBD9"></path></svg> | |
0 | 2 | \ No newline at end of file |
... | ... |
HHECS.Web/src/icons/svg/rgv-task.svg
0 → 100644
1 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1743491977136" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="934" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M14.8973037 879.02814815a31.06891852 31.06891852 0 0 1 31.06891852-31.06891851h932.06755556a31.06891852 31.06891852 0 0 1 0 62.13783703H45.96622222a31.06891852 31.06891852 0 0 1-31.06891852-31.06891852zM739.83873539 335.32207408a31.06891852 31.06891852 0 0 1 31.06891853-31.06891852h129.45382756a82.85044978 82.85044978 0 0 1 82.85044979 82.85044979v336.57995021a82.85044978 82.85044978 0 0 1-82.85044979 82.85044979h-776.72296296a82.85044978 82.85044978 0 0 1-82.85044979-82.85044979v-155.34459259a82.85044978 82.85044978 0 0 1 82.85044979-82.85044979h616.20021687V335.32207408z m62.13783705 31.06891851v150.1664391a31.06891852 31.06891852 0 0 1-31.06891852 31.06891853H123.63851852a20.71261275 20.71261275 0 0 0-20.71261275 20.71261275v155.34459259c0 11.39193719 9.32067555 20.71261275 20.71261275 20.71261275h776.72296296a20.71261275 20.71261275 0 0 0 20.71261275-20.71261275V387.10360535a20.71261275 20.71261275 0 0 0-20.71261275-20.71261276h-98.38490904z" p-id="935" fill="#BFCBD9"></path><path d="M170.2418963 646.01125926a31.06891852 31.06891852 0 0 1 31.06891852-31.06891851h103.56306132a31.06891852 31.06891852 0 0 1 0 62.13783703H201.31081482a31.06891852 31.06891852 0 0 1-31.06891852-31.06891852zM118.46036502 154.08671645a31.06891852 31.06891852 0 0 1 31.06891853-31.06891851h517.81530904a31.06891852 31.06891852 0 0 1 31.06891852 31.06891851v362.47071524a31.06891852 31.06891852 0 0 1-31.06891852 31.06891853H149.52928355a31.06891852 31.06891852 0 0 1-31.06891853-31.06891853v-362.47071524z m62.13783704 31.06891853v300.3328782h455.67747202V185.15563498H180.59820206z" p-id="936" fill="#BFCBD9"></path><path d="M118.46036502 335.32207408a31.06891852 31.06891852 0 0 1 31.06891853-31.06891852h517.81530904a31.06891852 31.06891852 0 1 1 0 62.13783703H149.52928355a31.06891852 31.06891852 0 0 1-31.06891853-31.06891851zM739.83873539 516.55743169a31.06891852 31.06891852 0 0 1 31.06891853-31.06891851h181.23535883a31.06891852 31.06891852 0 0 1 0 62.13783704H770.90765392a31.06891852 31.06891852 0 0 1-31.06891853-31.06891853z" p-id="937" fill="#BFCBD9"></path></svg> | |
0 | 2 | \ No newline at end of file |
... | ... |
HHECS.Web/src/icons/svg/task.svg
0 → 100644
1 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1602818111971" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2544" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M722.794 445.378L442.403 725.77l-141.197-141.2c-15.62-15.619-40.947-15.621-56.568 0-15.621 15.621-15.621 40.947 0 56.568l169.481 169.483c7.811 7.812 18.046 11.716 28.284 11.716 10.237 0 20.474-3.905 28.284-11.716l308.675-308.675c15.621-15.621 15.621-40.947 0-56.568s-40.947-15.621-56.568 0z" p-id="2545"></path><path d="M852.153 163.004H736.204c-0.681-46.657-38.378-84.514-84.987-85.398-4.558-43.546-41.485-77.6-86.219-77.6H458.999c-44.732 0-81.66 34.054-86.218 77.6-46.605 0.888-84.307 38.744-84.987 85.398H171.846c-46.965 0-85.038 38.073-85.038 85.039v690.912c0 46.966 38.073 85.039 85.038 85.039h680.307c46.964 0 85.038-38.073 85.038-85.039V248.043c0-46.966-38.074-85.039-85.038-85.039z m-477.699-25.415h27.854c16.567 0 29.999-13.431 29.999-30v-20.89c0-14.719 11.975-26.693 26.692-26.693h105.999c14.719 0 26.693 11.975 26.693 26.693v20.891c0 16.568 13.432 30 30 30h27.854c14.29 0 25.99 11.288 26.66 25.415 0.02 0.424 0.032 0.849 0.032 1.278V233.311c0 14.718-11.974 26.692-26.692 26.692H374.454c-14.719 0-26.693-11.974-26.693-26.692V164.283c0-0.429 0.012-0.854 0.032-1.278 0.669-14.128 12.371-25.416 26.661-25.416z m502.737 801.366c0 13.806-11.231 25.039-25.038 25.039H171.846c-13.807 0-25.039-11.233-25.039-25.039V248.043c0-13.807 11.232-25.04 25.039-25.04h115.916v10.307c0 47.802 38.89 86.691 86.692 86.691h275.091c47.803 0 86.691-38.889 86.691-86.691v-10.307h115.917c13.807 0 25.038 11.233 25.038 25.04v690.912z" p-id="2546"></path></svg> | |
0 | 2 | \ No newline at end of file |
... | ... |
HHECS.Web/src/layout/components/Navbar.vue
... | ... | @@ -25,7 +25,7 @@ |
25 | 25 | <el-dropdown-menu slot="dropdown" class="user-dropdown"> |
26 | 26 | <router-link to="/"> |
27 | 27 | <el-dropdown-item> 中文 </el-dropdown-item> |
28 | - <el-dropdown-item> 日文 </el-dropdown-item> | |
28 | + <el-dropdown-item> 英文 </el-dropdown-item> | |
29 | 29 | </router-link> |
30 | 30 | </el-dropdown-menu> |
31 | 31 | </el-dropdown> |
... | ... | @@ -39,10 +39,8 @@ |
39 | 39 | <i class="el-icon-caret-bottom" /> |
40 | 40 | </div> |
41 | 41 | <el-dropdown-menu slot="dropdown" class="user-dropdown"> |
42 | - <router-link to="/"> | |
43 | - <el-dropdown-item> | |
44 | - <span>版本</span> | |
45 | - </el-dropdown-item> | |
42 | + <router-link to="/system"> | |
43 | + <el-dropdown-item>授权</el-dropdown-item> | |
46 | 44 | </router-link> |
47 | 45 | <el-dropdown-item divided @click.native="logout"> |
48 | 46 | <span style="display: block">{{ $gl("logOut") }}</span> |
... | ... | @@ -54,35 +52,35 @@ |
54 | 52 | </template> |
55 | 53 | |
56 | 54 | <script> |
57 | -import Breadcrumb from "@/components/Breadcrumb"; | |
58 | -import Hamburger from "@/components/Hamburger"; | |
59 | -import Screenfull from "@/components/Screenfull"; | |
60 | -import { mapGetters } from "vuex"; | |
55 | +import Breadcrumb from '@/components/Breadcrumb' | |
56 | +import Hamburger from '@/components/Hamburger' | |
57 | +import Screenfull from '@/components/Screenfull' | |
58 | +import { mapGetters } from 'vuex' | |
61 | 59 | |
62 | 60 | export default { |
63 | 61 | components: { |
64 | 62 | Breadcrumb, |
65 | 63 | Hamburger, |
66 | - Screenfull, | |
64 | + Screenfull | |
67 | 65 | }, |
68 | 66 | data() { |
69 | - return {}; | |
67 | + return {} | |
70 | 68 | }, |
71 | 69 | computed: { |
72 | - ...mapGetters(["sidebar", "avatar", "name"]), | |
70 | + ...mapGetters(['sidebar', 'avatar', 'name']) | |
73 | 71 | }, |
74 | 72 | methods: { |
75 | 73 | toggleSideBar() { |
76 | - this.$store.dispatch("app/toggleSideBar"); | |
74 | + this.$store.dispatch('app/toggleSideBar') | |
77 | 75 | }, |
78 | 76 | async logout() { |
79 | - window.$currentLang = "zh"; | |
80 | - localStorage.setItem("currentLang", "zh"); | |
81 | - await this.$store.dispatch("user/logout"); | |
82 | - this.$router.push(`/login?redirect=${this.$route.fullPath}`); | |
83 | - }, | |
84 | - }, | |
85 | -}; | |
77 | + window.$currentLang = 'zh' | |
78 | + localStorage.setItem('currentLang', 'zh') | |
79 | + await this.$store.dispatch('user/logout') | |
80 | + this.$router.push(`/login?redirect=${this.$route.fullPath}`) | |
81 | + } | |
82 | + } | |
83 | +} | |
86 | 84 | </script> |
87 | 85 | |
88 | 86 | <style lang="scss" scoped> |
... | ... |
HHECS.Web/src/router/index.js
... | ... | @@ -56,35 +56,50 @@ export const constantRoutes = [ |
56 | 56 | }, |
57 | 57 | |
58 | 58 | { |
59 | + path: '/', | |
60 | + component: Layout, | |
61 | + hidden: true, | |
62 | + redirect: 'noredirect', | |
63 | + children: [ | |
64 | + { | |
65 | + path: 'system', | |
66 | + component: (resolve) => require(['@/views/system/index'], resolve), | |
67 | + name: 'system', | |
68 | + meta: { title: '授权', icon: 'user' } | |
69 | + } | |
70 | + ] | |
71 | + }, | |
72 | + | |
73 | + { | |
59 | 74 | path: '/example', |
60 | 75 | component: Layout, |
61 | 76 | redirect: '/example/table', |
62 | 77 | name: '任务管理', |
63 | - meta: { title: '任务管理', icon: 'el-icon-s-help' }, | |
78 | + meta: { title: '任务管理', icon: 'task' }, | |
64 | 79 | children: [ |
65 | 80 | { |
66 | 81 | path: '主任务', |
67 | 82 | name: '主任务', |
68 | 83 | component: () => import('@/views/table/taskModel_host'), |
69 | - meta: { title: '主任务', icon: 'table' } | |
84 | + meta: { title: '主任务', icon: 'main-task' } | |
70 | 85 | }, |
71 | 86 | { |
72 | 87 | path: '堆垛机任务', |
73 | 88 | name: '堆垛机任务', |
74 | 89 | component: () => import('@/views/table/taskModel_stacker'), |
75 | - meta: { title: '堆垛机任务', icon: 'tree' } | |
90 | + meta: { title: '堆垛机任务', icon: 'ddj-task' } | |
76 | 91 | }, |
77 | 92 | { |
78 | 93 | path: 'CRGV任务', |
79 | 94 | name: 'CRGV任务', |
80 | 95 | component: () => import('@/views/table/taskModel_CRGV'), |
81 | - meta: { title: 'CRGV任务', icon: 'table' } | |
96 | + meta: { title: 'CRGV任务', icon: 'crgv-task' } | |
82 | 97 | }, |
83 | 98 | { |
84 | 99 | path: 'RGV任务', |
85 | 100 | name: 'RGV任务', |
86 | 101 | component: () => import('@/views/table/taskModel_RGV'), |
87 | - meta: { title: 'RGV任务', icon: 'tree' } | |
102 | + meta: { title: 'RGV任务', icon: 'rgv-task' } | |
88 | 103 | } |
89 | 104 | ] |
90 | 105 | }, |
... | ... |
HHECS.Web/src/views/login/index.vue
... | ... | @@ -51,7 +51,7 @@ |
51 | 51 | |
52 | 52 | <el-form-item prop="password"> |
53 | 53 | <span class="svg-container"> |
54 | - <svg-icon icon-class="password" /> | |
54 | + <svg-icon icon-class="language" /> | |
55 | 55 | </span> |
56 | 56 | <el-select v-model="value" placeholder="请选择语言"> |
57 | 57 | <el-option |
... | ... | @@ -59,8 +59,7 @@ |
59 | 59 | :key="item.value" |
60 | 60 | :label="item.label" |
61 | 61 | :value="item.value" |
62 | - > | |
63 | - </el-option> | |
62 | + /> | |
64 | 63 | </el-select> |
65 | 64 | </el-form-item> |
66 | 65 | |
... | ... | @@ -69,8 +68,7 @@ |
69 | 68 | type="primary" |
70 | 69 | style="width: 100%; margin-bottom: 30px" |
71 | 70 | @click.native.prevent="handleLogin" |
72 | - >{{ $gl("login") }}</el-button | |
73 | - > | |
71 | + >{{ $gl("login") }}</el-button> | |
74 | 72 | |
75 | 73 | <div class="tips"> |
76 | 74 | <!-- <span style="margin-right:20px;">username: admin</span> |
... | ... | @@ -82,77 +80,77 @@ |
82 | 80 | |
83 | 81 | <script> |
84 | 82 | export default { |
85 | - name: "Login", | |
83 | + name: 'Login', | |
86 | 84 | data() { |
87 | 85 | // 从 localStorage 中读取当前语言,默认为 'zh' |
88 | - const initialLang = localStorage.getItem("currentLang") || "zh"; | |
86 | + const initialLang = localStorage.getItem('currentLang') || 'zh' | |
89 | 87 | return { |
90 | 88 | loginForm: { |
91 | - username: "admin", | |
92 | - password: "123456", | |
89 | + username: 'admin', | |
90 | + password: '123456' | |
93 | 91 | }, |
94 | 92 | loginRules: {}, |
95 | 93 | loading: false, |
96 | - passwordType: "password", | |
94 | + passwordType: 'password', | |
97 | 95 | redirect: undefined, |
98 | 96 | options: [ |
99 | 97 | { |
100 | - value: "zh", | |
101 | - label: "中文", | |
98 | + value: 'zh', | |
99 | + label: '中文' | |
102 | 100 | }, |
103 | 101 | { |
104 | - value: "en", | |
105 | - label: "英语", | |
106 | - }, | |
102 | + value: 'en', | |
103 | + label: '英语' | |
104 | + } | |
107 | 105 | ], |
108 | - value: initialLang, | |
109 | - }; | |
106 | + value: initialLang | |
107 | + } | |
110 | 108 | }, |
111 | 109 | watch: { |
112 | 110 | value(newVal) { |
113 | 111 | // 将当前语言存储到 localStorage 中 |
114 | - localStorage.setItem("currentLang", newVal); | |
115 | - window.$currentLang = newVal; | |
112 | + localStorage.setItem('currentLang', newVal) | |
113 | + window.$currentLang = newVal | |
116 | 114 | }, |
117 | 115 | $route: { |
118 | - handler: function (route) { | |
119 | - this.redirect = route.query && route.query.redirect; | |
116 | + handler: function(route) { | |
117 | + this.redirect = route.query && route.query.redirect | |
120 | 118 | }, |
121 | - immediate: true, | |
122 | - }, | |
119 | + immediate: true | |
120 | + } | |
123 | 121 | }, |
124 | 122 | mounted() {}, |
125 | 123 | methods: { |
126 | 124 | showPwd() { |
127 | - if (this.passwordType === "password") { | |
128 | - this.passwordType = ""; | |
125 | + if (this.passwordType === 'password') { | |
126 | + this.passwordType = '' | |
129 | 127 | } else { |
130 | - this.passwordType = "password"; | |
128 | + this.passwordType = 'password' | |
131 | 129 | } |
132 | 130 | this.$nextTick(() => { |
133 | - this.$refs.password.focus(); | |
134 | - }); | |
131 | + this.$refs.password.focus() | |
132 | + }) | |
135 | 133 | }, |
136 | 134 | handleLogin() { |
137 | 135 | this.$refs.loginForm.validate((valid) => { |
138 | 136 | if (valid) { |
139 | - this.loading = true; | |
140 | - console.log(this.loginForm); | |
137 | + this.loading = true | |
138 | + console.log(this.loginForm) | |
141 | 139 | this.$store |
142 | - .dispatch("user/login", this.loginForm) | |
140 | + .dispatch('user/login', this.loginForm) | |
143 | 141 | .then(() => { |
144 | - console.log("登录成功"); | |
145 | - this.$router.push({ path: "/" }); | |
146 | - this.loading = false; | |
142 | + console.log('登录成功') | |
143 | + this.$router.push({ path: '/' }) | |
144 | + this.loading = false | |
147 | 145 | }) |
148 | 146 | .catch(() => { |
149 | - this.loading = false; | |
150 | - }); | |
147 | + this.loading = false | |
148 | + }) | |
151 | 149 | } |
152 | - }); | |
153 | - }, | |
154 | - }, | |
155 | -}; | |
150 | + }) | |
151 | + } | |
152 | + } | |
153 | +} | |
156 | 154 | </script> |
157 | 155 | |
158 | 156 | <style lang="scss"> |
... | ... |
HHECS.Web/src/views/main/components/StationData.vue
... | ... | @@ -16,50 +16,27 @@ |
16 | 16 | </template> |
17 | 17 | |
18 | 18 | <script> |
19 | +import { GetStationInfo } from "@/api/main"; | |
19 | 20 | export default { |
20 | 21 | name: "StationData", |
21 | 22 | data() { |
22 | 23 | return { |
23 | - tableData: [ | |
24 | - { | |
25 | - date: "2016-05-03", | |
26 | - name: "王小虎", | |
27 | - address: "上海市普陀区金沙江路 1518 弄", | |
28 | - }, | |
29 | - { | |
30 | - date: "2016-05-02", | |
31 | - name: "王小虎", | |
32 | - address: "上海市普陀区金沙江路 1518 弄", | |
33 | - }, | |
34 | - { | |
35 | - date: "2016-05-04", | |
36 | - name: "王小虎", | |
37 | - address: "上海市普陀区金沙江路 1518 弄", | |
38 | - }, | |
39 | - { | |
40 | - date: "2016-05-01", | |
41 | - name: "王小虎", | |
42 | - address: "上海市普陀区金沙江路 1518 弄", | |
43 | - }, | |
44 | - { | |
45 | - date: "2016-05-08", | |
46 | - name: "王小虎", | |
47 | - address: "上海市普陀区金沙江路 1518 弄", | |
48 | - }, | |
49 | - { | |
50 | - date: "2016-05-06", | |
51 | - name: "王小虎", | |
52 | - address: "上海市普陀区金沙江路 1518 弄", | |
53 | - }, | |
54 | - { | |
55 | - date: "2016-05-07", | |
56 | - name: "王小虎", | |
57 | - address: "上海市普陀区金沙江路 1518 弄", | |
58 | - }, | |
59 | - ], | |
24 | + tableData: [], | |
60 | 25 | }; |
61 | 26 | }, |
62 | - methods: {}, | |
27 | + methods: { | |
28 | + GetStationInfo() { | |
29 | + GetStationInfo().then((res) => { | |
30 | + console.log("站台", res.data); | |
31 | + if (res.code === "Success") { | |
32 | + this.tableData = res.data; | |
33 | + } | |
34 | + }); | |
35 | + }, | |
36 | + }, | |
37 | + created() { | |
38 | + this.GetStationInfo(); | |
39 | + }, | |
63 | 40 | }; |
64 | 41 | </script> |
65 | 42 | |
... | ... |
HHECS.Web/src/views/main/components/TaskCompensation.vue
... | ... | @@ -9,23 +9,27 @@ |
9 | 9 | type="primary" |
10 | 10 | size="small" |
11 | 11 | icon="el-icon-refresh" |
12 | + @click="getZxxctableData" | |
12 | 13 | >调度程序重置</el-button |
13 | 14 | > |
14 | 15 | </div> |
15 | 16 | <div style="height: 90%; margin-top: 3px"> |
16 | 17 | <el-table |
17 | - :data="tableData" | |
18 | + :data="zxxctableData" | |
18 | 19 | style="width: 100%; height: 100%" |
19 | 20 | border |
20 | 21 | height="450" |
21 | 22 | stripe |
22 | 23 | highlight-current-row |
23 | 24 | > |
24 | - <el-table-column prop="date" label="日期" width="180"> | |
25 | + <el-table-column prop="code" label="线程标记" width="180"> | |
25 | 26 | </el-table-column> |
26 | - <el-table-column prop="name" label="名称" width="180"> | |
27 | + <el-table-column prop="status" label="执行状态" width="180"> | |
28 | + </el-table-column> | |
29 | + <el-table-column prop="time" label="耗时"> </el-table-column> | |
30 | + <el-table-column prop="remark" label="备注"> </el-table-column> | |
31 | + <el-table-column prop="equipmentCodes" label="关联设备"> | |
27 | 32 | </el-table-column> |
28 | - <el-table-column prop="address" label="地址"> </el-table-column> | |
29 | 33 | </el-table> |
30 | 34 | </div> |
31 | 35 | </div> |
... | ... | @@ -37,6 +41,7 @@ |
37 | 41 | type="primary" |
38 | 42 | size="small" |
39 | 43 | icon="el-icon-refresh-left" |
44 | + @click="zhengdauntableData" | |
40 | 45 | >调度诊断</el-button |
41 | 46 | > |
42 | 47 | <el-button |
... | ... | @@ -44,8 +49,10 @@ |
44 | 49 | type="primary" |
45 | 50 | size="small" |
46 | 51 | icon="el-icon-delete-solid" |
52 | + @click="clearLog" | |
47 | 53 | >诊断日志清除</el-button |
48 | 54 | > |
55 | + ``` | |
49 | 56 | </div> |
50 | 57 | <div style="height: 90%; margin-top: 3px"> |
51 | 58 | <el-table |
... | ... | @@ -55,13 +62,12 @@ |
55 | 62 | height="450" |
56 | 63 | stripe |
57 | 64 | highlight-current-row |
58 | - :row-style="rowStyle" | |
59 | 65 | > |
60 | - <el-table-column prop="date" label="日期" width="180"> | |
66 | + <el-table-column prop="time" label="诊断时间" width="180"> | |
61 | 67 | </el-table-column> |
62 | - <el-table-column prop="name" label="名称" width="180"> | |
68 | + <el-table-column prop="level" label="日志级别" width="180"> | |
63 | 69 | </el-table-column> |
64 | - <el-table-column prop="address" label="地址"> </el-table-column> | |
70 | + <el-table-column prop="content" label="日志内容"> </el-table-column> | |
65 | 71 | </el-table> |
66 | 72 | </div> |
67 | 73 | </div> |
... | ... | @@ -80,21 +86,46 @@ |
80 | 86 | > |
81 | 87 | 调度日志 |
82 | 88 | </div> |
83 | - <div style="height: 90%; margin-top: 3px"> | |
89 | + | |
90 | + <div style="height: 80%; margin-top: 3px"> | |
84 | 91 | <el-table |
85 | - :data="dDtableData" | |
92 | + :data=" | |
93 | + dDtableData.slice( | |
94 | + (currentPage - 1) * pageSize, | |
95 | + currentPage * pageSize | |
96 | + ) | |
97 | + " | |
86 | 98 | style="width: 100%; height: 100%" |
87 | 99 | border |
88 | - height="940" | |
100 | + height="900" | |
89 | 101 | stripe |
90 | 102 | highlight-current-row |
91 | 103 | > |
92 | - <el-table-column prop="date" label="日期" width="180"> | |
104 | + <el-table-column fixed prop="time" label="时间" width="180"> | |
105 | + </el-table-column> | |
106 | + <el-table-column prop="type" label="分类" width="180"> | |
107 | + </el-table-column> | |
108 | + <el-table-column prop="bllResultCode" label="处理结果"> | |
109 | + </el-table-column> | |
110 | + <el-table-column prop="equipmentCode" label="设备"> | |
93 | 111 | </el-table-column> |
94 | - <el-table-column prop="name" label="名称" width="180"> | |
112 | + <el-table-column prop="description" label="描述"> </el-table-column> | |
113 | + <el-table-column prop="errorCode" label="报错代码"> | |
95 | 114 | </el-table-column> |
96 | - <el-table-column prop="address" label="地址"> </el-table-column> | |
97 | 115 | </el-table> |
116 | + <div class="block" style="margin-top: 5px"> | |
117 | + <el-pagination | |
118 | + align="center" | |
119 | + @size-change="handleSizeChange" | |
120 | + @current-change="handleCurrentChange" | |
121 | + :current-page="currentPage" | |
122 | + :page-sizes="[1, 5, 10, 20]" | |
123 | + :page-size="pageSize" | |
124 | + layout="total, sizes, prev, pager, next, jumper" | |
125 | + :total="dDtableData.length" | |
126 | + > | |
127 | + </el-pagination> | |
128 | + </div> | |
98 | 129 | </div> |
99 | 130 | </div> |
100 | 131 | </div> |
... | ... | @@ -102,207 +133,89 @@ |
102 | 133 | </template> |
103 | 134 | |
104 | 135 | <script> |
136 | +import { | |
137 | + GetExecuteDetail, | |
138 | + GetExecutorDiagnosisInfo, | |
139 | + GetExecuteLogs, | |
140 | +} from "@/api/main"; | |
105 | 141 | export default { |
106 | 142 | name: "TaskCompensation", |
107 | 143 | data() { |
108 | 144 | return { |
109 | - tableData: [ | |
110 | - { | |
111 | - date: "2016-05-03", | |
112 | - name: "王小虎", | |
113 | - address: "上海市普陀区金沙江路 1518 弄", | |
114 | - }, | |
115 | - { | |
116 | - date: "2016-05-02", | |
117 | - name: "王小虎", | |
118 | - address: "上海市普陀区金沙江路 1518 弄", | |
119 | - }, | |
120 | - { | |
121 | - date: "2016-05-04", | |
122 | - name: "王小虎", | |
123 | - address: "上海市普陀区金沙江路 1518 弄", | |
124 | - }, | |
125 | - { | |
126 | - date: "2016-05-01", | |
127 | - name: "王小虎", | |
128 | - address: "上海市普陀区金沙江路 1518 弄", | |
129 | - }, | |
130 | - { | |
131 | - date: "2016-05-08", | |
132 | - name: "王小虎", | |
133 | - address: "上海市普陀区金沙江路 1518 弄", | |
134 | - }, | |
135 | - { | |
136 | - date: "2016-05-06", | |
137 | - name: "王小虎", | |
138 | - address: "上海市普陀区金沙江路 1518 弄", | |
139 | - }, | |
140 | - { | |
141 | - date: "2016-05-07", | |
142 | - name: "王小虎", | |
143 | - address: "上海市普陀区金沙江路 1518 弄", | |
144 | - }, | |
145 | - { | |
146 | - date: "2016-05-07", | |
147 | - name: "王小虎", | |
148 | - address: "上海市普陀区金沙江路 1518 弄", | |
149 | - }, | |
150 | - { | |
151 | - date: "2016-05-07", | |
152 | - name: "王小虎", | |
153 | - address: "上海市普陀区金沙江路 1518 弄", | |
154 | - }, | |
155 | - { | |
156 | - date: "2016-05-07", | |
157 | - name: "王小虎", | |
158 | - address: "上海市普陀区金沙江路 1518 弄", | |
159 | - }, | |
160 | - ], | |
161 | - eqBjtableData: [ | |
162 | - { | |
163 | - date: "2016-05-03", | |
164 | - name: "王小虎", | |
165 | - address: "上海市普陀区金沙江路 1518 弄", | |
166 | - }, | |
167 | - ], | |
168 | - dDtableData: [ | |
169 | - { | |
170 | - date: "2016-05-03", | |
171 | - name: "王小虎", | |
172 | - address: "上海市普陀区金沙江路 1518 弄", | |
173 | - }, | |
174 | - { | |
175 | - date: "2016-05-03", | |
176 | - name: "王小虎", | |
177 | - address: "上海市普陀区金沙江路 1518 弄", | |
178 | - }, | |
179 | - { | |
180 | - date: "2016-05-03", | |
181 | - name: "王小虎", | |
182 | - address: "上海市普陀区金沙江路 1518 弄", | |
183 | - }, | |
184 | - { | |
185 | - date: "2016-05-03", | |
186 | - name: "王小虎", | |
187 | - address: "上海市普陀区金沙江路 1518 弄", | |
188 | - }, | |
189 | - { | |
190 | - date: "2016-05-03", | |
191 | - name: "王小虎", | |
192 | - address: "上海市普陀区金沙江路 1518 弄", | |
193 | - }, | |
194 | - { | |
195 | - date: "2016-05-03", | |
196 | - name: "王小虎", | |
197 | - address: "上海市普陀区金沙江路 1518 弄", | |
198 | - }, | |
199 | - { | |
200 | - date: "2016-05-03", | |
201 | - name: "王小虎", | |
202 | - address: "上海市普陀区金沙江路 1518 弄", | |
203 | - }, | |
204 | - { | |
205 | - date: "2016-05-03", | |
206 | - name: "王小虎", | |
207 | - address: "上海市普陀区金沙江路 1518 弄", | |
208 | - }, | |
209 | - { | |
210 | - date: "2016-05-03", | |
211 | - name: "王小虎", | |
212 | - address: "上海市普陀区金沙江路 1518 弄", | |
213 | - }, | |
214 | - { | |
215 | - date: "2016-05-03", | |
216 | - name: "王小虎", | |
217 | - address: "上海市普陀区金沙江路 1518 弄", | |
218 | - }, | |
219 | - { | |
220 | - date: "2016-05-03", | |
221 | - name: "王小虎", | |
222 | - address: "上海市普陀区金沙江路 1518 弄", | |
223 | - }, | |
224 | - { | |
225 | - date: "2016-05-03", | |
226 | - name: "王小虎", | |
227 | - address: "上海市普陀区金沙江路 1518 弄", | |
228 | - }, | |
229 | - { | |
230 | - date: "2016-05-03", | |
231 | - name: "王小虎", | |
232 | - address: "上海市普陀区金沙江路 1518 弄", | |
233 | - }, | |
234 | - { | |
235 | - date: "2016-05-03", | |
236 | - name: "王小虎", | |
237 | - address: "上海市普陀区金沙江路 1518 弄", | |
238 | - }, | |
239 | - { | |
240 | - date: "2016-05-03", | |
241 | - name: "王小虎", | |
242 | - address: "上海市普陀区金沙江路 1518 弄", | |
243 | - }, | |
244 | - { | |
245 | - date: "2016-05-03", | |
246 | - name: "王小虎", | |
247 | - address: "上海市普陀区金沙江路 1518 弄", | |
248 | - }, | |
249 | - { | |
250 | - date: "2016-05-03", | |
251 | - name: "王小虎", | |
252 | - address: "上海市普陀区金沙江路 1518 弄", | |
253 | - }, | |
254 | - { | |
255 | - date: "2016-05-03", | |
256 | - name: "王小虎", | |
257 | - address: "上海市普陀区金沙江路 1518 弄", | |
258 | - }, | |
259 | - { | |
260 | - date: "2016-05-03", | |
261 | - name: "王小虎", | |
262 | - address: "上海市普陀区金沙江路 1518 弄", | |
263 | - }, | |
264 | - { | |
265 | - date: "2016-05-03", | |
266 | - name: "王小虎", | |
267 | - address: "上海市普陀区金沙江路 1518 弄", | |
268 | - }, | |
269 | - { | |
270 | - date: "2016-05-03", | |
271 | - name: "王小虎", | |
272 | - address: "上海市普陀区金沙江路 1518 弄", | |
273 | - }, | |
274 | - { | |
275 | - date: "2016-05-03", | |
276 | - name: "王小虎", | |
277 | - address: "上海市普陀区金沙江路 1518 弄", | |
278 | - }, | |
279 | - { | |
280 | - date: "2016-05-03", | |
281 | - name: "王小虎", | |
282 | - address: "上海市普陀区金沙江路 1518 弄", | |
283 | - }, | |
284 | - { | |
285 | - date: "2016-05-03", | |
286 | - name: "王小虎", | |
287 | - address: "上海市普陀区金沙江路 1518 弄", | |
288 | - }, | |
289 | - { | |
290 | - date: "2016-05-03", | |
291 | - name: "王小虎", | |
292 | - address: "上海市普陀区金沙江路 1518 弄", | |
293 | - }, | |
294 | - { | |
295 | - date: "2016-05-03", | |
296 | - name: "王小虎", | |
297 | - address: "上海市普陀区金沙江路 1518 弄", | |
298 | - }, | |
299 | - ], | |
145 | + zxxctableData: [], | |
146 | + eqBjtableData: [], | |
147 | + dDtableData: [], | |
148 | + timer: null, | |
149 | + currentPage: 1, // 当前页码 | |
150 | + total: 100, // 总条数 | |
151 | + pageSize: 10, // 每页的数据条数 | |
300 | 152 | }; |
301 | 153 | }, |
302 | 154 | methods: { |
303 | - rowStyle() { | |
304 | - return { backgroundColor: "red" }; | |
155 | + getZxxctableData() { | |
156 | + this.$message({ | |
157 | + message: "调度程序重置", | |
158 | + type: "success", | |
159 | + }); | |
160 | + }, | |
161 | + | |
162 | + GetExecuteDetail() { | |
163 | + GetExecuteDetail().then((res) => { | |
164 | + console.log("执行线程", res); | |
165 | + if (res.code == "Success") { | |
166 | + this.zxxctableData = res.data; | |
167 | + } | |
168 | + }); | |
169 | + }, | |
170 | + GetExecutorDiagnosisInfo() { | |
171 | + GetExecutorDiagnosisInfo().then((res) => { | |
172 | + console.log("诊断", res); | |
173 | + if (res.code == "Success") { | |
174 | + this.eqBjtableData = res.data; | |
175 | + } | |
176 | + }); | |
177 | + }, | |
178 | + clearLog() { | |
179 | + this.eqBjtableData = []; | |
180 | + }, | |
181 | + zhengdauntableData() { | |
182 | + this.$message({ | |
183 | + message: "调度诊断", | |
184 | + type: "success", | |
185 | + }); | |
186 | + this.GetExecutorDiagnosisInfo(); | |
187 | + }, | |
188 | + GetExecuteLogs() { | |
189 | + GetExecuteLogs().then((res) => { | |
190 | + console.log("调度日志", res); | |
191 | + if (res.code == "Success") { | |
192 | + // 截取最新的 100 条数据 | |
193 | + this.dDtableData = res.data.slice(-100).reverse(); | |
194 | + } | |
195 | + }); | |
305 | 196 | }, |
197 | + //每页条数改变时触发 选择一页显示多少行 | |
198 | + handleSizeChange(val) { | |
199 | + console.log(`每页 ${val} 条`); | |
200 | + this.currentPage = 1; | |
201 | + this.pageSize = val; | |
202 | + }, | |
203 | + //当前页改变时触发 跳转其他页 | |
204 | + handleCurrentChange(val) { | |
205 | + console.log(`当前页: ${val}`); | |
206 | + this.currentPage = val; | |
207 | + }, | |
208 | + }, | |
209 | + created() { | |
210 | + this.GetExecuteDetail(); | |
211 | + this.GetExecuteLogs(); | |
212 | + this.timer = setInterval(() => { | |
213 | + this.GetExecuteDetail(); | |
214 | + this.GetExecuteLogs(); | |
215 | + }, 3000); | |
216 | + }, | |
217 | + beforeDestroy() { | |
218 | + clearInterval(this.timer); // 清除定时器 | |
306 | 219 | }, |
307 | 220 | }; |
308 | 221 | </script> |
... | ... | @@ -347,3 +260,20 @@ export default { |
347 | 260 | height: 100%; |
348 | 261 | } |
349 | 262 | </style> |
263 | +<style lang="scss" scoped> | |
264 | +//修改表头字体颜色 | |
265 | +::v-deep.el-table thead { | |
266 | + color: #101010; | |
267 | + font-weight: 600; | |
268 | +} | |
269 | + | |
270 | +.success-cell { | |
271 | + background-color: #27cf35 !important; // 绿色 | |
272 | +} | |
273 | +.warning-cell { | |
274 | + background-color: #d1922d !important; // 黄色 | |
275 | +} | |
276 | +.error-cell { | |
277 | + background-color: #cf384e !important; // 红色 | |
278 | +} | |
279 | +</style> | |
... | ... |
HHECS.Web/src/views/main/index.vue
... | ... | @@ -4,153 +4,152 @@ |
4 | 4 | <el-card shadow="always"> |
5 | 5 | <el-button |
6 | 6 | type="success" |
7 | - @click="resume" | |
8 | 7 | size="small" |
9 | 8 | icon="el-icon-video-play" |
10 | 9 | :disabled="startDeal" |
11 | - >开始处理</el-button | |
12 | - > | |
10 | + @click="resume" | |
11 | + >开始处理</el-button> | |
13 | 12 | <el-button |
14 | 13 | type="danger" |
15 | - @click="pause" | |
16 | 14 | size="small" |
17 | 15 | icon="el-icon-video-pause" |
18 | 16 | :disabled="!startDeal" |
19 | - >暂停处理</el-button | |
20 | - > | |
21 | - <el-divider direction="vertical"></el-divider> | |
17 | + @click="pause" | |
18 | + >暂停处理</el-button> | |
19 | + <el-divider direction="vertical" /> | |
22 | 20 | <el-tag :type="startDeal ? 'success' : 'info'" effect="dark"> |
23 | - <i v-if="startDeal" class="el-icon-loading"></i> | |
24 | - <i v-else class="el-icon-warning-outline"></i> | |
25 | - {{ startDeal == true ? "运行中" : "未运行" }}</el-tag | |
26 | - > | |
27 | - <el-divider direction="vertical"></el-divider> | |
21 | + <i v-if="startDeal" class="el-icon-loading" /> | |
22 | + <i v-else class="el-icon-warning-outline" /> | |
23 | + {{ startDeal == true ? "运行中" : "未运行" }}</el-tag> | |
24 | + <el-divider direction="vertical" /> | |
28 | 25 | <el-switch |
29 | 26 | v-model="autoSend" |
30 | 27 | active-color="#13ce66" |
31 | 28 | inactive-color="#909399" |
32 | 29 | active-text="自动下发" |
33 | 30 | @change="autoSendStatusChanged" |
34 | - > | |
35 | - </el-switch> | |
31 | + /> | |
36 | 32 | </el-card> |
37 | 33 | </div> |
38 | - <el-tabs v-model="activeName" type="card" @tab-click="handleClick"> | |
39 | - <el-tab-pane label="设备监控" name="first"> | |
40 | - <DeviceMonitor /> | |
41 | - </el-tab-pane> | |
42 | - <el-tab-pane label="设备数据" name="second"> | |
43 | - <DeviceData /> | |
44 | - </el-tab-pane> | |
45 | - <el-tab-pane label="站台数据" name="third"> | |
46 | - <StationData /> | |
47 | - </el-tab-pane> | |
48 | - <el-tab-pane label="执行与日志" name="fourth"> | |
49 | - <TaskCompensation /> | |
50 | - </el-tab-pane> | |
51 | - </el-tabs> | |
34 | + <div class="app-container"> | |
35 | + <el-tabs v-model="activeName" type="card" @tab-click="handleClick"> | |
36 | + <el-tab-pane label="设备监控" name="first"> | |
37 | + <DeviceMonitor /> | |
38 | + </el-tab-pane> | |
39 | + <el-tab-pane label="设备数据" name="second"> | |
40 | + <DeviceData /> | |
41 | + </el-tab-pane> | |
42 | + <el-tab-pane label="站台数据" name="third"> | |
43 | + <StationData /> | |
44 | + </el-tab-pane> | |
45 | + <el-tab-pane label="执行与日志" name="fourth"> | |
46 | + <TaskCompensation /> | |
47 | + </el-tab-pane> | |
48 | + </el-tabs> | |
49 | + </div> | |
50 | + | |
52 | 51 | </div> |
53 | 52 | </template> |
54 | 53 | |
55 | 54 | <script> |
56 | 55 | import { |
57 | -getAutoSendStatus, | |
58 | -getExecuteStatus, | |
59 | -pause, | |
60 | -resume, | |
61 | -setAutoSendStatus, | |
62 | -} from "@/api/main"; | |
63 | -import { mapGetters } from "vuex"; | |
64 | -import DeviceData from "./components/DeviceData.vue"; // 设备数据组件 | |
65 | -import DeviceMonitor from "./components/DeviceMonitor.vue"; // 设备监控组件 | |
66 | -import StationData from "./components/StationData.vue"; // 站台数据组件 | |
67 | -import TaskCompensation from "./components/TaskCompensation.vue"; // 定时任务补偿组件 | |
56 | + getAutoSendStatus, | |
57 | + getExecuteStatus, | |
58 | + pause, | |
59 | + resume, | |
60 | + setAutoSendStatus | |
61 | +} from '@/api/main' | |
62 | +import { mapGetters } from 'vuex' | |
63 | +import DeviceData from './components/DeviceData.vue' // 设备数据组件 | |
64 | +import DeviceMonitor from './components/DeviceMonitor.vue' // 设备监控组件 | |
65 | +import StationData from './components/StationData.vue' // 站台数据组件 | |
66 | +import TaskCompensation from './components/TaskCompensation.vue' // 定时任务补偿组件 | |
68 | 67 | |
69 | 68 | export default { |
70 | - name: "mainPage", | |
69 | + name: 'MainPage', | |
71 | 70 | components: { |
72 | 71 | DeviceMonitor, |
73 | 72 | DeviceData, |
74 | 73 | StationData, |
75 | - TaskCompensation, | |
74 | + TaskCompensation | |
76 | 75 | }, |
77 | 76 | data() { |
78 | 77 | return { |
79 | 78 | startDeal: false, // 开始处理中 |
80 | 79 | autoSend: false, // 是否自动下发 |
81 | - activeName: "first", //默认显示 | |
82 | - interval: null, | |
83 | - }; | |
80 | + activeName: 'first', // 默认显示 | |
81 | + interval: null | |
82 | + } | |
84 | 83 | }, |
85 | 84 | computed: { |
86 | - ...mapGetters(["name"]), | |
85 | + ...mapGetters(['name']) | |
87 | 86 | }, |
88 | 87 | mounted() { |
89 | 88 | this.interval = setInterval(() => { |
90 | - this.refreshExecuteStatus(); | |
91 | - this.refreshAutoSendStatus(); | |
92 | - }, 1000); | |
89 | + this.refreshExecuteStatus() | |
90 | + this.refreshAutoSendStatus() | |
91 | + }, 1000) | |
93 | 92 | }, |
94 | 93 | beforeDestroy() { |
95 | - clearInterval(this.interval); | |
94 | + clearInterval(this.interval) | |
96 | 95 | }, |
97 | 96 | methods: { |
98 | - //开始处理 | |
97 | + // 开始处理 | |
99 | 98 | resume() { |
100 | 99 | resume() |
101 | 100 | .then((response) => {}) |
102 | 101 | .catch((err) => { |
103 | - console.log(err); | |
104 | - }); | |
102 | + console.log(err) | |
103 | + }) | |
105 | 104 | }, |
106 | 105 | |
107 | - //暂停处理 | |
106 | + // 暂停处理 | |
108 | 107 | pause() { |
109 | 108 | pause() |
110 | 109 | .then((response) => {}) |
111 | 110 | .catch((err) => { |
112 | - console.log(err); | |
113 | - }); | |
111 | + console.log(err) | |
112 | + }) | |
114 | 113 | }, |
115 | 114 | |
116 | - //刷新执行状态 | |
115 | + // 刷新执行状态 | |
117 | 116 | refreshExecuteStatus() { |
118 | 117 | getExecuteStatus() |
119 | 118 | .then((response) => { |
120 | - this.startDeal = response.data.status == "Running"; | |
119 | + this.startDeal = response.data.status == 'Running' | |
121 | 120 | }) |
122 | 121 | .catch((err) => { |
123 | - console.log(err); | |
124 | - }); | |
122 | + console.log(err) | |
123 | + }) | |
125 | 124 | }, |
126 | 125 | |
127 | - //刷新自动下发状态 | |
126 | + // 刷新自动下发状态 | |
128 | 127 | refreshAutoSendStatus() { |
129 | - //获取自动下发状态 | |
128 | + // 获取自动下发状态 | |
130 | 129 | getAutoSendStatus() |
131 | 130 | .then((response) => { |
132 | - this.autoSend = response.data; | |
131 | + this.autoSend = response.data | |
133 | 132 | }) |
134 | 133 | .catch((err) => { |
135 | - console.log(err); | |
136 | - }); | |
134 | + console.log(err) | |
135 | + }) | |
137 | 136 | }, |
138 | 137 | |
139 | - //自动下发状态改变事件 | |
138 | + // 自动下发状态改变事件 | |
140 | 139 | autoSendStatusChanged(e) { |
141 | - //获取自动下发状态 | |
140 | + // 获取自动下发状态 | |
142 | 141 | setAutoSendStatus(e) |
143 | 142 | .then((response) => {}) |
144 | 143 | .catch((err) => { |
145 | - console.log(err); | |
146 | - }); | |
144 | + console.log(err) | |
145 | + }) | |
147 | 146 | }, |
148 | 147 | |
149 | 148 | handleClick(tab, event) { |
150 | - console.log(tab, event); | |
151 | - }, | |
152 | - }, | |
153 | -}; | |
149 | + console.log(tab, event) | |
150 | + } | |
151 | + } | |
152 | +} | |
154 | 153 | </script> |
155 | 154 | |
156 | 155 | <style lang="scss" scoped> |
... | ... |
HHECS.Web/src/views/system/index.vue
0 → 100644
1 | +<template> | |
2 | + <div class="app-container"> | |
3 | + <el-row :gutter="20"> | |
4 | + <el-col :span="12" :offset="2"> | |
5 | + <div class="grid-content"> | |
6 | + <el-row> | |
7 | + <el-col :span="4" :sm="4" :xs="12" style="text-align:left">公司软件:</el-col> | |
8 | + <el-col :span="20" :sm="20" :xs="12" style="text-align:left">ECS5.0</el-col> | |
9 | + </el-row> | |
10 | + <el-row> | |
11 | + <el-col :span="4" :sm="4" :xs="12" style="text-align:left">授权版本:</el-col> | |
12 | + <el-col :span="20" :sm="20" :xs="12" style="text-align:left">正式版</el-col> | |
13 | + </el-row> | |
14 | + <el-row> | |
15 | + <el-col :span="4" :sm="4" :xs="12" style="text-align:left">到期时间:</el-col> | |
16 | + <el-col :span="20" :sm="20" :xs="12" style="text-align:left">1/1/3000 12:00:00 AM</el-col> | |
17 | + </el-row> | |
18 | + <el-row> | |
19 | + <el-col :span="4" :sm="4" :xs="12" style="text-align:left">许可证:</el-col> | |
20 | + <el-col :span="20" :sm="20" :xs="12" style="text-align:left"><el-tag type="success">有效</el-tag></el-col> | |
21 | + </el-row> | |
22 | + <el-row style="margin-top:20px ;"> | |
23 | + <el-button type="primary">更新授权</el-button> | |
24 | + </el-row> | |
25 | + </div> | |
26 | + </el-col> | |
27 | + </el-row> | |
28 | + </div> | |
29 | +</template> | |
30 | + | |
31 | +<script> | |
32 | + | |
33 | +export default { | |
34 | + data() { | |
35 | + return { | |
36 | + } | |
37 | + } | |
38 | +} | |
39 | +</script> | |
40 | +<style scoped> | |
41 | +.grid-content{ | |
42 | + padding-top: 40px; | |
43 | + color: #333333; | |
44 | +} | |
45 | +.el-col { | |
46 | + line-height: 36px; | |
47 | +} | |
48 | +.el-tag{ | |
49 | + font-size: 14px; | |
50 | +} | |
51 | +</style> | |
... | ... |