From c80d68ee7d5ceb5f93289220a410737da3a7bf9f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 四月 2024 08:44:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ssdwcs' into ssdwcs
---
src/main/webapp/views/deviceOperate/rgvOperate.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index a28b408..dc6b8b2 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -54,8 +54,25 @@
</el-form>
<div>
- <el-button v-if="demo === 'N' " @click="demos('true')" type="warning">婕旂ず</el-button>
- <el-button v-if="demo === 'Y' " @click="demos('false')" type="warning">鍙栨秷婕旂ず</el-button>
+ <el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
+ <el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button @click="rgvStatus(8)" type="primary">鍚姩</el-button>
+ <el-button @click="rgvStatus(9)" type="primary">鍋滄</el-button>
+ <el-button @click="rgvStatus(14)" type="primary">鍗曟満</el-button>
+ <el-button @click="rgvStatus(15)" type="primary">鑱旀満</el-button>
+ <el-button @click="rgvStatus(11)" type="primary">澶嶄綅鎸夐挳</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button @click="rgvStatus(7)" type="warning">鎶ヨ娑堥煶</el-button>
+ <el-button @click="rgvStatus(12)" type="warning">鎵嬪姩</el-button>
+ <el-button @click="rgvStatus(13)" type="warning">鎵嬪姩瀹氫綅</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button :style="" @click="rgvStatus(5)" type="danger">寮哄埗鍚姩</el-button>
+ <el-button @click="rgvStatus(10)" type="danger">鎬ュ仠</el-button>
+ <el-button @click="rgvStatus(16)" type="danger">璐у弶瀹氫綅鍥炰腑</el-button>
</div>
<div style="margin-top: 5px" v-if="demo === 'Y'">
<el-button @click="staTova(2,1)" type="warning">杈撻��-缃崲1</el-button>
@@ -310,6 +327,39 @@
});
})
},
+ rgvStatus(method){
+ let that = this
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + "/rgv/demo/status/rgvStatus",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data:{
+ rgvNo : this.formParam.rgvNo,
+ status : Number(method)
+ },
+ method: 'Get',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ })
+ },
requestOperate(method) {
let that = this
that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
--
Gitblit v1.9.1