From 4df2c95e803ddbcaa96d12981b86e453309282a0 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 16 八月 2022 08:18:39 +0800
Subject: [PATCH] Merge branch 'gzynwcs' of http://47.97.1.152:5880/r/zy-wcs into gzynwcs
---
src/main/webapp/views/console.html | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 5c0f0e0..7960bd0 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -602,8 +602,8 @@
$('.site').on('click', function (e) {
var id = this.id.split("-")[1];
$("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
- $("#siteWindow").css('left', e.pageX);
- $("#siteWindow").css('top', e.pageY);
+ $("#siteWindow").css('left', e.pageX+20);
+ $("#siteWindow").css('top', e.pageY+20);
$("#crnWindow").attr("style", "display:none;");
$("#locWindow").attr("style", "display:none;");
$(".detailed").empty();
@@ -635,8 +635,8 @@
$('.machine').on('click', function (e) {
var id = this.id.split("-")[1];
$("#crnWindow").attr('style', 'display:block;');
- $("#crnWindow").css('left', e.pageX);
- $("#crnWindow").css('top', e.pageY);
+ $("#crnWindow").css('left', e.pageX+20);
+ $("#crnWindow").css('top', e.pageY+20);
$("#siteWindow").attr("style", "display:none;");
$("#locWindow").attr("style", "display:none;");
$('.detailed').empty();
@@ -679,8 +679,8 @@
success: function (res) {
if (res.code === 200) {
$("#locWindow").attr('style', 'display:block;');
- $("#locWindow").css('left', e.pageX);
- $("#locWindow").css('top', e.pageY);
+ $("#locWindow").css('left', e.pageX+10);
+ $("#locWindow").css('top', e.pageY+10);
$("#siteWindow").attr("style", "display:none;");
$("#crnWindow").attr("style", "display:none;");
$('.detailed').empty();
@@ -700,7 +700,7 @@
res.data[val] = "鍦ㄥ簱娴嬭瘯涓�"
break;
case "LOC_ERROR" :
- res.data[val] = "寮傚父"
+ res.data[val] = "寮傚父鎶ヨ"
break;
case "LOC_EMPTY" :
res.data[val] = "绌哄簱浣�"
--
Gitblit v1.9.1