From 1b4fbdb92537036aed4d648967ef7e7ab8842aec Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 十一月 2025 16:37:11 +0800
Subject: [PATCH] #
---
src/main/webapp/views/watch/console.html | 74 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/views/watch/console.html b/src/main/webapp/views/watch/console.html
index 900337a..69b1781 100644
--- a/src/main/webapp/views/watch/console.html
+++ b/src/main/webapp/views/watch/console.html
@@ -21,7 +21,9 @@
<el-tab-pane label="鍫嗗灈鏈�" name="crn">
<watch-crn-card :param="crnParam"></watch-crn-card>
</el-tab-pane>
- <el-tab-pane label="杈撻�佺嚎" name="devp">杈撻�佺嚎</el-tab-pane>
+ <el-tab-pane label="杈撻�佺珯" name="devp">
+ <devp-card :param="devpParam"></devp-card>
+ </el-tab-pane>
<el-tab-pane label="RGV" name="rgv">RGV</el-tab-pane>
<el-tab-pane label="鍦板浘閰嶇疆" name="mapSetting">
<map-setting-card :param="mapSettingParam"></map-setting-card>
@@ -45,7 +47,7 @@
<div class="shelf">{{col.shelfIdx}}</div>
</div>
<div v-else-if="col.type == 'devp'">
- <div class="site" :style="{height: col.rowPx}" :id="'site-' + col.value" @click="openSite(col.value)">{{col.value}}</div>
+ <div class="site" :style="{height: col.rowPx}" :id="'site-' + getStationId(col.value)" @click="openSite(getStationId(col.value))">{{getStationId(col.value)}}</div>
</div>
<div v-else-if="col.type == 'rgv'" style="position: relative;">
<div class="rgv-item" v-if="getDeviceNo(col.value) != -1" :style="{width: col.width}" :id="'rgv-' + getDeviceNo(col.value)" @click="openRgv(getDeviceNo(col.value))">{{getDeviceNo(col.value)}}</div>
@@ -71,6 +73,7 @@
</div>
<script src="../../components/WatchCrnCard.js"></script>
+ <script src="../../components/DevpCard.js"></script>
<script src="../../components/MapSettingCard.js"></script>
<script>
var app = new Vue({
@@ -88,6 +91,9 @@
},
mapSettingParam: {
zoom: 70
+ },
+ devpParam: {
+ stationId: 0
}
},
created() {
@@ -101,11 +107,11 @@
this.getMap()
this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
- // this.consoleInterval = setInterval(() => {
- // this.getCrnInfo() //鑾峰彇鍫嗗灈鏈烘暟鎹�
- // this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
- // this.getRgvInfo() //鑾峰彇RGV鏁版嵁
- // }, 1000)
+ this.consoleInterval = setInterval(() => {
+ this.getCrnInfo() //鑾峰彇鍫嗗灈鏈烘暟鎹�
+ this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
+ this.getRgvInfo() //鑾峰彇RGV鏁版嵁
+ }, 1000)
},
//鑾峰彇鍦板浘鏁版嵁
getMap() {
@@ -113,7 +119,10 @@
let colPx = 35;
$.ajax({
- url: "./test.json",
+ url: baseUrl + "/basMap/lev/1/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
method: "get",
success: (res) => {
let data = res.data;
@@ -166,47 +175,25 @@
})
},
openSite(id) {
- this.siteWindow = true; //鎵撳紑绔欑偣淇℃伅寮圭獥
- $(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
- $.ajax({
- url: baseUrl + "/console/site/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- siteId: id
- },
- method: 'post',
- success: function(res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
+ this.devpParam.stationId = id;
},
getSiteInfo() {
//鑾峰彇杈撻�佺珯鐐规暟鎹�
$.ajax({
- url: baseUrl + "/console/latest/data/site",
+ url: baseUrl + "/console/latest/data/station",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
+ console.log(res)
if (res.code === 200) {
var sites = res.data;
for (var i = 0; i < sites.length; i++){
- var siteEl = $("#site-"+sites[i].siteId);
- siteEl.attr("class", "site " + sites[i].siteStatus);
- if (sites[i].workNo != null && sites[i].workNo>0) {
- siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
+ var siteEl = $("#site-"+sites[i].stationId);
+ siteEl.attr("class", "site " + sites[i].stationStatus);
+ if (sites[i].taskNo != null && sites[i].taskNo>0) {
+ siteEl.html(sites[i].stationId + "[" + sites[i].taskNo + "]");
} else {
- siteEl.html(sites[i].siteId);
+ siteEl.html(sites[i].stationId);
}
}
} else if (res.code === 403) {
@@ -454,6 +441,17 @@
return -1;
}
},
+ getStationId(obj) {
+ if (this.isJson(obj)) {
+ let data = JSON.parse(obj)
+ if (data.stationId == null || data.stationId == undefined) {
+ return -1;
+ }
+ return data.stationId;
+ }else {
+ return -1;
+ }
+ },
getTrackSiteNo(obj) {
if (this.isJson(obj)) {
let data = JSON.parse(obj)
--
Gitblit v1.9.1