From 7073a4ff0761c05664a0fa5ebc1c51b3bb58c268 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 03 十二月 2022 13:42:48 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 1
src/main/webapp/static/css/crn.css | 4
src/main/webapp/views/rgv.html | 193 ++++++++++++-----------
src/main/webapp/static/css/rgv.css | 252 +++++++++++++++++++++++++++++++
4 files changed, 353 insertions(+), 97 deletions(-)
diff --git a/src/main/webapp/static/css/crn.css b/src/main/webapp/static/css/crn.css
index ded525a..2dc5b06 100644
--- a/src/main/webapp/static/css/crn.css
+++ b/src/main/webapp/static/css/crn.css
@@ -14,7 +14,7 @@
background-color: #fff;
border-radius: 5px;
box-shadow: 0 0 3px rgba(0,0,0,.3);
- height: 25%;
+ height: 28%;
}
/* 宸� */
@@ -234,7 +234,7 @@
/* -------------------- 绗洓妯″潡 -------------------- */
.crn-output-board {
margin-top: 10px;
- height: 20%;
+ height: 15%;
background-color: #fff;
border-radius: 5px;
box-shadow: 0 0 3px rgba(0,0,0,.3);
diff --git a/src/main/webapp/static/css/rgv.css b/src/main/webapp/static/css/rgv.css
new file mode 100644
index 0000000..bd49d5b
--- /dev/null
+++ b/src/main/webapp/static/css/rgv.css
@@ -0,0 +1,252 @@
+body {
+ background-color: #6CA7A8;
+}
+.button-window {
+ float: left;
+ width: 100%;
+ height: 100%;
+ padding: 10px;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0 0 0 .3);
+}
+/* -------------------- 绗竴妯″潡 -------------------- */
+.log-board {
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ height: 28%;
+}
+
+/* 宸� */
+.command-log {
+ float: left;
+ height: 100%;
+ width: 20%;
+ text-align: center;
+}
+.command-log h2 {
+ padding: 10px;
+}
+.rgv-command-item {
+ padding: 4px 0;
+}
+.rgv-command-item label {
+ font-size: 20px;
+ font-weight: bold;
+ vertical-align: middle;
+}
+.rgv-command-item span {
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ background-color: #2e9926;
+ border-radius: 5px;
+ vertical-align: middle;
+}
+.rgv-command-item input {
+ vertical-align: middle;
+ outline: none;
+ width: 60%;
+}
+
+/* 鍙� */
+.rgv-state {
+ float: left;
+ height: 100%;
+ width: 100%;
+ overflow: auto;
+}
+/* 鍫嗗灈鏈虹姸鎬佽〃 */
+#rgv-state-table {
+ font-size: 12px;
+ border-collapse: collapse;
+ margin: 0 auto;
+ text-align: center;
+}
+#rgv-state-table td, #rgv-state-table th {
+ border: 1px solid #cad9ea;
+ color: #666;
+ height: 25px;
+}
+#rgv-state-table thead th {
+ background-color: #CCE8EB;
+ width: 300px;
+}
+#rgv-state-table tr:nth-child(odd) {
+ background: #fff;
+}
+#rgv-state-table tr:nth-child(even) {
+ background: #F5FAFA;
+}
+
+/* -------------------- 绗簩妯″潡 -------------------- */
+.rgv-msg {
+ /*overflow: auto;*/
+ margin-top: 10px;
+ height: 23%;
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+}
+/* 鍫嗗灈鏈虹姸鎬佷俊鎭〃 */
+#rgv-msg-table {
+ font-size: 12px;
+ border-collapse: collapse;
+ margin: 0 auto;
+ text-align: center;
+}
+#rgv-msg-table td, #rgv-msg-table th {
+ border: 1px solid #f1f1f1;
+ color: #666;
+ height: 30px;
+}
+#rgv-msg-table thead th {
+ background-color: #fff;
+ width: 400px;
+}
+#rgv-msg-table tr:nth-child(odd) {
+ background: #fff;
+}
+#rgv-msg-table tr:nth-child(even) {
+ background: #fff;
+}
+
+/* -------------------- 绗笁妯″潡 -------------------- */
+.rgv-operation {
+ position: relative;
+ margin-top: 10px;
+ height: 25%;
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+}
+
+/* 浠诲姟璁惧閫夋嫨妗� */
+.task-select {
+ height: 50%;
+ overflow: hidden;
+ padding: 20px 0 10px 20px;
+}
+.operator-item {
+ display: inline-block;
+ height: 100%;
+ width: 20%;
+ text-align: center;
+ position: relative;
+ vertical-align: middle;
+ padding: 10px 0px 10px 50px;
+}
+.operator-item .select-title {
+ display: inline-block;
+ position: absolute;
+ top: -11px;
+ left: 50%;
+ transform: translate(-50%, 0);
+ background-color: #fff;
+ color: #2e95d3;
+ font-size: 12px;
+ border: 1px solid #8d8d8d;
+ border-radius: 5px;
+ padding: 5px;
+ z-index: 999;
+}
+.operator-item .select-container {
+ padding: 10px 0;
+ height: 100%;
+ border: 1px solid #8d8d8d;
+ border-radius: 5px;
+}
+#rgv-select .select-container label {
+ display: inline-block;
+ padding: 0 20px;
+ vertical-align: middle; margin-top:-2px; margin-bottom:1px;
+
+}
+.select-container input {
+ display: inline-block;
+ font-size: 12px;
+ vertical-align: middle; margin-top:-2px; margin-bottom:1px;
+}
+.select-container-item {
+ display: inline-block;
+ margin: 0px auto;
+ padding: 0;
+}
+.select-container-item input {
+ height: 20px;
+ border: 1px solid #8D8D8D;
+ border-radius: 3px;
+ width: 80px;
+ outline: none;
+}
+
+/* 浠诲姟浣滀笟閫夋嫨妗� */
+.task-operator {
+ height: 50%;
+ overflow: hidden;
+ padding: 0 20px 10px 20px;
+}
+.task-operator fieldset {
+ padding: 15px 20px 5px 50px;
+ border-width: 1px;
+ border-style: solid;
+ height: 100%;
+}
+.task-operator legend {
+ margin-left: 20px;
+ padding: 0 10px;
+ font-size: 16px;
+ font-weight: 300;
+}
+button.item {
+ border: 1px solid #333;
+ font-size: 13px;
+ padding: 1px 1px 1px 1px;
+ width: 100px;
+ height: 40px;
+ outline: none;
+ cursor: pointer;
+ color: #333;
+ background-color: transparent;
+ margin-right: 5px;
+ border-radius: 5px;
+}
+button.item:hover {
+ background-color: #333;
+ color: #fff;
+}
+
+/* 鎵嬪姩鎿嶄綔閬僵 */
+.rgv-operation-shade {
+ position: absolute;
+ height: 100%;
+ width: 100%;
+ z-index: 1000;
+ text-align: center;
+ padding: 80px 0;
+}
+.rgv-operation-shade-span {
+ font-size: xx-large;
+ font-weight: bold;
+ color: red;
+}
+
+/* -------------------- 绗洓妯″潡 -------------------- */
+.rgv-output-board {
+ margin-top: 10px;
+ height: 15%;
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+}
+#rgv-output {
+ border-left: none;
+ border-right: none;
+ border-top: 1px solid #9d9d9d;
+ border-bottom: 1px solid #333;
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ resize:none;
+ color: #666;
+}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 7b3b178..7ad3bef 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -556,7 +556,6 @@
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++) {
diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index 55039cf..be5e6ba 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
<link rel="stylesheet" type="text/css" href="../static/css/common.css">
- <link rel="stylesheet" type="text/css" href="../static/css/crn.css">
+ <link rel="stylesheet" type="text/css" href="../static/css/rgv.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/js/layer/layer.js"></script>
@@ -51,7 +51,7 @@
<!-- 鎵ц鍛戒护 -->
<!-- 鎵ц鍛戒护 -->
- <div class="command-log">
+ <!--<div class="command-log">-->
<!-- <h3>鎵ц涓殑鍛戒护</h3>-->
<!-- <div class="crn-command-item">-->
<!-- <label>1#</label>-->
@@ -83,9 +83,9 @@
<!-- <!– <span> </span>–>-->
<!-- <input id="crn5" disabled="disabled">-->
<!-- </div>-->
- </div>
+<!-- </div>-->
<!-- RGV鐘舵�佷綅淇℃伅 -->
- <div class="crn-state">
+ <div class="rgv-state">
<table id="rgv-state-table">
<thead>
<tr>
@@ -110,7 +110,7 @@
</div>
</div>
<!-- RGV鐘舵�� -->
- <div class="crn-msg">
+ <div class="rgv-msg">
<table id="rgv-msg-table">
<thead>
<tr>
@@ -135,11 +135,11 @@
</table>
</div>
<!-- 鎵嬪姩鎿嶄綔 -->
- <div class="crn-operation">
+ <div class="rgv-operation">
<!-- 閬僵灞� -->
- <div class="crn-operation-shade">
- <span class="crn-operation-shade-span">
+ <div class="rgv-operation-shade">
+ <span class="rgv-operation-shade-span">
WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
</span>
</div>
@@ -147,11 +147,11 @@
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 鍫嗗灈鏈洪�夋嫨 -->
- <div id="crn-select" class="operator-item" style="width: 55%">
+ <div id="rgv-select" class="operator-item" style="width: 55%">
<span class="select-title">RGV鍙�</span>
<div class="select-container" style="padding: 20px 0;">
- <label><input type="radio" name="crnSelect" value="1" checked> 1鍙稲GV</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙稲GV</label>
+ <label><input type="radio" name="rgvSelect" value="1" checked> 1鍙稲GV</label>
+ <label><input type="radio" name="rgvSelect" value="2"> 2鍙稲GV</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -223,37 +223,37 @@
</div>
<!-- 鍫嗗灈鏈烘棩蹇楄緭鍑� -->
- <div class="crn-output-board">
- <textarea id="crn-output"></textarea>
+ <div class="rgv-output-board">
+ <textarea id="rgv-output"></textarea>
</div>
</div>
</div>
</body>
<script>
// 绌虹櫧琛屾暟
- var crnStateTableBlankRows = 0;
- var crnMsgTableBlankRows = 0;
+ var rgvStateTableBlankRows = 0;
+ var rgvMsgTableBlankRows = 0;
// 瀹為檯琛屾暟
- var crnStateTableFullRows = 0;
- var crnMsgTableFullRows = 0;
+ var rgvStateTableFullRows = 0;
+ var rgvMsgTableFullRows = 0;
// 鍒濆鍖�
- var crnOutputDom = document.getElementById("crn-output");
+ var rgvOutputDom = document.getElementById("rgv-output");
$(document).ready(function() {
getCommandLog();
- initCrnStateTable();
- getCrnStateInfo();
- initCrnMsgTable();
- getCrnMsgInfo();
+ initRgvStateTable();
+ getRgvStateInfo();
+ initRgvMsgTable();
+ getRgvMsgInfo();
operatorBlockShow();
});
// 鏁版嵁鏇存柊
setInterval(function () {
- getCrnStateInfo();
- getCrnMsgInfo();
+ getRgvStateInfo();
+ getRgvMsgInfo();
getCommandLog();
},1000);
setInterval(function () {
- getCrnOutput();
+ getRgvOutput();
operatorBlockShow();
initDemo();
},500);
@@ -261,27 +261,27 @@
// 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
function operatorBlockShow() {
if (parent.systemRunning) {
- $('.crn-operation').css("opacity", "0.5");
- $('.crn-operation-shade').show();
- $('.crn-operation-shade-span').show();
+ $('.rgv-operation').css("opacity", "0.5");
+ $('.rgv-operation-shade').show();
+ $('.rgv-operation-shade-span').show();
} else {
- $('.crn-operation').css("opacity", "1");
- $('.crn-operation-shade').hide();
- $('.crn-operation-shade-span').hide();
+ $('.rgv-operation').css("opacity", "1");
+ $('.rgv-operation-shade').hide();
+ $('.rgv-operation-shade-span').hide();
}
}
// 鑾峰彇鍫嗗灈鏈烘墽琛屼腑鐨勫懡浠�
function getCommandLog() {
$.ajax({
- url: baseUrl + "/crn/command/ongoing",
+ url: baseUrl + "/rgv/command/ongoing",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
if (res.code === 200) {
var commands = res.data;
for (var i=0; i<commands.length;i++){
- $("#crn"+commands[i].crnNo).val(commands[i].command);
+ $("#rgv"+commands[i].rgvNo).val(commands[i].command);
}
} else if (res.code === 403) {
window.location.href = baseUrl + "/login";
@@ -293,32 +293,35 @@
}
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
- function getCrnStateInfo() {
+ function getRgvStateInfo() {
var tableEl = $('#rgv-state-table');
$.ajax({
- url: baseUrl+ "/crn/table/crn/state",
+ url: baseUrl+ "/rgv/table/rgv/state",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
+ console.log(res)
if (res.code === 200){
var table = res.data;
- if (table.length > crnStateTableBlankRows && table.length !== crnStateTableFullRows) {
- initCrnStateTable(table.length-crnStateTableBlankRows);
- crnStateTableFullRows = table.length;
+ if (table.length > rgvStateTableBlankRows && table.length !== rgvStateTableFullRows) {
+ initRgvStateTable(table.length-rgvStateTableBlankRows);
+ rgvStateTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i-1].crnNo);
+ setVal(tr.children("td").eq(0), table[i-1].rgvNo);
setVal(tr.children("td").eq(1), table[i-1].statusType);
setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].loading);
- setVal(tr.children("td").eq(4), table[i-1].bay);
- setVal(tr.children("td").eq(5), table[i-1].lev);
- setVal(tr.children("td").eq(6), table[i-1].forkOffset);
- setVal(tr.children("td").eq(7), table[i-1].liftPos);
- setVal(tr.children("td").eq(8), table[i-1].walkPos);
- setVal(tr.children("td").eq(9), table[i-1].warnCode);
- setVal(tr.children("td").eq(10), table[i-1].alarm);
+ setVal(tr.children("td").eq(3), table[i-1].workNo1);
+ setVal(tr.children("td").eq(4), table[i-1].status1);
+ setVal(tr.children("td").eq(5), table[i-1].loading1);
+ setVal(tr.children("td").eq(6), table[i-1].rgvPos);
+ setVal(tr.children("td").eq(7), table[i-1].walkPos);
+ setVal(tr.children("td").eq(8), table[i-1].workNo2);
+ setVal(tr.children("td").eq(9), table[i-1].status2);
+ setVal(tr.children("td").eq(10), table[i-1].loading2);
+ setVal(tr.children("td").eq(11), table[i-1].warnCode);
+ setVal(tr.children("td").eq(12), table[i-1].alarm);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -330,22 +333,22 @@
}
// 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ---- 琛ㄤ簩
- function getCrnMsgInfo() {
+ function getRgvMsgInfo() {
var tableEl = $('#rgv-msg-table');
$.ajax({
- url: baseUrl+ "/crn/table/crn/msg",
+ url: baseUrl+ "/rgv/table/rgv/msg",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
if (res.code === 200){
var table = res.data;
- if (table.length > crnStateTableBlankRows && table.length !== crnMsgTableFullRows) {
- initCrnStateTable(table.length-crnStateTableBlankRows);
- crnMsgTableFullRows = table.length;
+ if (table.length > rgvStateTableBlankRows && table.length !== rgvMsgTableFullRows) {
+ initRgvStateTable(table.length-rgvStateTableBlankRows);
+ rgvMsgTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i-1].crnNo);
+ setVal(tr.children("td").eq(0), table[i-1].rgvNo);
setVal(tr.children("td").eq(1), table[i-1].workNo);
setVal(tr.children("td").eq(2), table[i-1].status);
setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
@@ -372,7 +375,7 @@
// 鍫嗗灈鏈烘墜鍔ㄦ搷浣滃尯 -----------------------------------------------------------------------
function getReqParam() {
- var crnNo = $('input[name="crnSelect"]:checked').val();
+ var rgvNo = $('input[name="rgvSelect"]:checked').val();
var sourceStaNo = $('#sourceStaNo').val();
var sourceRow = $('#sourceRow').val();
var sourceBay = $('#sourceBay').val();
@@ -382,7 +385,7 @@
var bay = $('#bay').val();
var lev = $('#lev').val();
return {
- crnNo: crnNo,
+ rgvNo: rgvNo,
sourceStaNo: sourceStaNo,
sourceRow: sourceRow,
sourceBay: sourceBay,
@@ -396,98 +399,98 @@
// 鍏ュ簱
function put() {
- http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/put", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍑哄簱
function take() {
- http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/take", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 搴撲綅杞Щ
function stockMove() {
- http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/stockMove", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 绔欏埌绔�
function siteMove() {
- http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/siteMove", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍧愭爣绉诲姩
function coorMove() {
- http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/coorMove", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍥炲師鐐�
function bacOrigin() {
- http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/bacOrigin", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍥炲師鐐�
function reverseOrigin() {
- http.post(baseUrl+"/crn/operator/reverseOrigin", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/reverseOrigin", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 浠诲姟瀹屾垚
function taskComplete() {
- http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/taskComplete", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鏆傚仠
function pause() {
- http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/pause", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鍚姩
function boot() {
- http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/boot", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 娓呴櫎鍛戒护
function clearCommand() {
- http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/clearCommand", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 鎵嬪姩澶嶄綅
function handleReset() {
- http.post(baseUrl+"/crn/operator/handleReset", getReqParam(), function (res) {
+ http.post(baseUrl+"/rgv/operator/handleReset", getReqParam(), function (res) {
layer.msg(res.msg);
});
}
// 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
- function getCrnOutput() {
+ function getRgvOutput() {
$.ajax({
- url: baseUrl + "/crn/output/site",
+ url: baseUrl + "/rgv/output/site",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
console.log(res)
if (res.code === 200) {
- crnOutput(res.data);
+ rgvOutput(res.data);
} else if (res.code === 403) {
window.location.href = baseUrl + "/login";
} else {
@@ -500,14 +503,14 @@
// ------------------------------------------------------------------------------------------------
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ----- 琛ㄤ竴
- function initCrnStateTable(row) {
+ function initRgvStateTable(row) {
var line;
if (row === undefined){
var one = $('#rgv-state-table thead').height();
- var total = $('.crn-state').height();
+ var total = $('.rgv-state').height();
var count = total / one;
count = parseInt(count) - 1;
- crnStateTableBlankRows = count;
+ rgvStateTableBlankRows = count;
line = count;
} else {
line = row;
@@ -526,20 +529,22 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#rgv-state-table tbody').after(html);
}
// 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ----- 琛ㄤ簩
- function initCrnMsgTable(row) {
+ function initRgvMsgTable(row) {
var line;
if (row === undefined){
var one = $('#rgv-msg-table thead').height();
- var total = $('.crn-msg').height();
+ var total = $('.rgv-msg').height();
var count = total / one;
count = parseInt(count) - 1;
- crnMsgTableBlankRows = count;
+ rgvMsgTableBlankRows = count;
line = count;
} else {
line = row;
@@ -567,23 +572,23 @@
}
// 鏃ュ織杈撳嚭妗�
- function crnOutput(content){
- crnOutputDom.value += content;
- crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
+ function rgvOutput(content){
+ rgvOutputDom.value += content;
+ rgvOutputDom.scrollTop = rgvOutputDom.scrollHeight;
}
- var crnDemoData;
+ var rgvDemoData;
function initDemo() {
$.ajax({
- url: baseUrl+"/crn/demo/status",
+ url: baseUrl+"/rgv/demo/status",
async: false,
method: 'GET',
success: function (res) {
if (res.code === 200) {
- crnDemoData = res.data;
- crnDemoData.forEach(function (e) {
- $("#demoBtn-"+e.crnNo).html(e.demo?'鍋滄':'婕旂ず');
+ rgvDemoData = res.data;
+ rgvDemoData.forEach(function (e) {
+ $("#demoBtn-"+e.rgvNo).html(e.demo?'鍋滄':'婕旂ず');
})
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
@@ -595,32 +600,32 @@
}
function demoSwitch(el) {
- var crnId = el.split("-")[1];
+ var rgvId = el.split("-")[1];
var opt;
- if (crnDemoData == null) {
+ if (rgvDemoData == null) {
initDemo();
}
- for (var i = 0; i<crnDemoData.length; i++) {
- if (Number(crnDemoData[i].crnNo) === Number(crnId)) {
- opt = !crnDemoData[i].demo;
+ for (var i = 0; i<rgvDemoData.length; i++) {
+ if (Number(rgvDemoData[i].rgvNo) === Number(rgvId)) {
+ opt = !rgvDemoData[i].demo;
}
}
- layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾'+ (opt?'寮�濮�':'鍋滄') + '婕旂ず鍚楋紵', function(){
- doDemo(crnId, 'root', opt); // 鍋滄wcs绯荤粺
+ layer.confirm(rgvId + ' 鍙峰爢鍨涙満纭畾'+ (opt?'寮�濮�':'鍋滄') + '婕旂ず鍚楋紵', function(){
+ doDemo(rgvId, 'root', opt); // 鍋滄wcs绯荤粺
});
}
- function doDemo(crnId, password, opt) {
+ function doDemo(rgvId, password, opt) {
// 鍔犺浇tips
var index = layer.load(1, {
shade: [0.1,'#fff']
});
$.ajax({
- url: baseUrl+ "/crn/demo/switch",
+ url: baseUrl+ "/rgv/demo/switch",
headers: {'token': localStorage.getItem('token')},
// async: false,
data: {
- crnId: Number(crnId),
+ rgvId: Number(rgvId),
password: password,
opt: opt
},
--
Gitblit v1.9.1