From 44bddde6414f5c7565c21ef510c6c63dbc0971c3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 一月 2021 15:12:50 +0800
Subject: [PATCH] #test
---
src/main/webapp/views/crn.html | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 04c02b2..70068ac 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -44,18 +44,20 @@
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
<!-- 鎵ц鍛戒护 -->
+
+ <!-- 鎵ц鍛戒护 -->
<div class="command-log">
<h2>鎵ц涓殑鍛戒护</h2>
<div class="crn-command-item">
<label>1#</label>
-<!-- <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)">婕旂ず</button>-->
- <span> </span>
+ <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+ <!-- <span> </span>-->
<input id="crn1" disabled="disabled">
</div>
<div class="crn-command-item">
<label>2#</label>
-<!-- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)">婕旂ず</button>-->
- <span> </span>
+ <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+ <!-- <span> </span>-->
<input id="crn2" disabled="disabled">
</div>
</div>
@@ -229,6 +231,7 @@
setInterval(function () {
getCrnOutput();
operatorBlockShow();
+ initDemo();
},500);
// 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
@@ -550,22 +553,45 @@
crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
}
- // function demoSwitch(el) {
- // var crnId = el.split("-")[1];
- // layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺紑濮�'+crnId+"鍙峰爢鍨涙満婕旂ず", formType: 1, shadeClose: true}, function (pass, idx) {
- // layer.close(idx);
- // doDemo(crnId, pass); // 鍋滄wcs绯荤粺
- // });
- // }
+
+ var crnDemoData;
+ function initDemo() {
+ $.ajax({
+ url: baseUrl+"/crn/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?'鍋滄':'婕旂ず');
+ })
+ } else if (res.code === 403){
+ parent.location.href = baseUrl+"/login";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
function demoSwitch(el) {
var crnId = el.split("-")[1];
- layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾寮�濮嬫紨绀哄悧锛�', function(){
- doDemo(crnId, 'root'); // 鍋滄wcs绯荤粺
+ var opt;
+ if (crnDemoData == null) {
+ initDemo();
+ }
+ for (var i = 0; i<crnDemoData.length; i++) {
+ if (Number(crnDemoData[i].crnNo) === Number(crnId)) {
+ opt = !crnDemoData[i].demo;
+ }
+ }
+ layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾'+ (opt?'寮�濮�':'鍋滄') + '婕旂ず鍚楋紵', function(){
+ doDemo(crnId, 'root', opt); // 鍋滄wcs绯荤粺
});
}
- function doDemo(crnId, password) {
+ function doDemo(crnId, password, opt) {
// 鍔犺浇tips
var index = layer.load(1, {
shade: [0.1,'#fff']
@@ -576,7 +602,8 @@
// async: false,
data: {
crnId: Number(crnId),
- password: password
+ password: password,
+ opt: opt
},
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1