From d9eeceed86c1ce43c73dda00a108595a078a8f3d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 29 五月 2025 18:44:53 +0800
Subject: [PATCH] *
---
src/main/webapp/views/deviceOperate/jarOperate.html | 408 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 289 insertions(+), 119 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index 60d1fa0..2733b32 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -5,11 +5,75 @@
<meta charset="UTF-8">
<title>纭寲缃愯澶�</title>
<link rel="stylesheet" href="../../static/css/element.css">
+ <link rel="stylesheet" href="../../static/css/element-ui.css">
+ <link rel="icon" href="../../static/images/favicon.ico" type="image/x-icon">
<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/vue.min.js"></script>
<script type="text/javascript" src="../../static/js/element.js"></script>
</head>
+<style scoped>
+ .floating-layer {
+ position: fixed;
+ top: 50%; /* 灞呬腑鏄剧ず */
+ left: 50%; /* 灞呬腑鏄剧ず */
+ transform: translate(-50%, -50%); /* 灞呬腑璋冩暣 */
+ background-color: #fff;
+ border: 2px solid #007bff; /* 浣跨敤鏇存槑鏄剧殑杈规棰滆壊 */
+ padding: 20px;
+ box-shadow: 0 4px 8px rgba(0,0,0,0.2);
+ border-radius: 8px;
+ z-index: 1000; /* 纭繚鍦ㄥ叾浠栧厓绱犱箣涓� */
+ width: 300px; /* 璁剧疆鍥哄畾瀹藉害浠ヤ繚鎸佹暣娲� */
+ text-align: center; /* 鍐呭灞呬腑 */
+ }
+
+ .layer-title {
+ margin-bottom: 15px;
+ font-size: 18px;
+ font-weight: bold;
+ color: #007bff; /* 涓庤竟妗嗛鑹茬浉鍛煎簲 */
+ }
+
+ .radio-list {
+ display: flex;
+ flex-direction: column;
+ align-items: center; /* 鍗曢�夋寜閽眳涓� */
+ }
+
+ .radio-item {
+ margin-bottom: 10px;
+ display: flex;
+ align-items: center;
+ justify-content: center; /* 姘村钩灞呬腑 */
+ width: 100%; /* 浣挎瘡涓崟閫夋寜閽」鍗犳嵁鏁翠釜瀹藉害 */
+ }
+
+ .radio-button {
+ margin-right: 10px;
+ transform: scale(1.2); /* 鏀惧ぇ鍗曢�夋寜閽互浣垮叾鏇村姞鏄庢樉 */
+ }
+
+ .radio-label {
+ font-size: 16px;
+ cursor: pointer;
+ user-select: none;
+ color: #333; /* 浣跨敤娣辫壊璋冧互鎻愰珮鍙鎬� */
+ }
+
+ /* 鍙�夌殑鍔ㄧ敾鏁堟灉 */
+ .floating-layer {
+ opacity: 0;
+ transform: translate(-50%, -50%) scale(0.8);
+ transition: opacity 0.3s, transform 0.3s;
+ }
+
+ .floating-layer.show {
+ opacity: 1;
+ transform: translate(-50%, -50%) scale(1);
+ }
+ /* 鎮ㄩ渶瑕佸湪 Vue 涓帶鍒� 'show' 绫荤殑娣诲姞鍜岀Щ闄� */
+</style>
<body>
<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
@@ -18,108 +82,86 @@
max-height="350" style="width: 100%">
<el-table-column property="jarNo" label="纭寲缃�">
</el-table-column>
- <el-table-column property="workNo" label="宸ヤ綔鍙�">
- </el-table-column>
+<!-- <el-table-column property="workNo" label="宸ヤ綔鍙�">-->
+<!-- </el-table-column>-->
<el-table-column property="jarStatus" label="鐘舵��">
</el-table-column>
<el-table-column property="jarMode" label="妯″紡">
</el-table-column>
- <el-table-column property="region" label="鍖哄煙">
+ <el-table-column property="jarTemperature$" label="娓╁害">
</el-table-column>
- <el-table-column property="jarCode" label="浠ｅ彿">
+ <el-table-column property="jarPressure$" label="鍘嬪姏">
+ </el-table-column>
+ <el-table-column property="jarCount$" label="鏈�澶у偍閲�">
</el-table-column>
<el-table-column property="jarErr" label="寮傚父浠ｇ爜">
</el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <template>
+ <el-popconfirm
+ confirm-button-text="Yes"
+ cancel-button-text="No"
+ title="纭畾瑕佷慨鏀规渶澶у偍閲忓悧?璇风‘淇濈綈鍐呮暟閲忓ぇ浜庣瓑浜庝慨鏀瑰�硷紒锛侊紒"
+ @confirm="confirmEvent"
+ @cancel="cancelEvent"
+ >
+ <template #reference>
+ <el-button>淇敼鏈�澶у偍閲�</el-button>
+ </template>
+ </el-popconfirm>
+ </template>
+<!-- <el-button style="" type="primary" plain size="medium" @click="confirmEvent()">淇敼</el-button>-->
+ </el-table-column>
</el-table>
</div>
-
+ <template>
+ <div v-if="valueUpdate" :class="['floating-layer', { show: showLayer }]">
+ <h3 class="layer-title">璇烽�夋嫨淇敼鐩爣鍊�</h3> <!-- 娣诲姞鏍囬浠ユ彁楂樺彲璇绘�� -->
+ <div class="radio-list">
+ <div
+ v-for="option in optionsUpdate"
+ :key="option.value"
+ class="radio-item"
+ >
+ <input
+ type="radio"
+ :value="option.value"
+ v-model="selectedOption"
+ @change="handleSubmit"
+ class="radio-button"
+ />
+ <label class="radio-label">{{ option.text }}</label>
+ </div>
+ </div>
+ </div>
+ </template>
<div style="width: 100%;display: flex;justify-content: center;margin-top: 10px;">
<div style="width: 55%;margin-right: 10px;">
<el-card class="box-card">
- <div slot="header" class="clearfix">
- <span>璁惧璋冭瘯</span>
+ <div slot="header" class="clearfix" style="display: flex;justify-content: space-between;align-items: center">
+ <span>纭寲搴撲綅</span>
+ <el-button style="" type="primary" plain size="medium" @click="historicalTasks()">鍘嗗彶浠诲姟</el-button>
</div>
- <div>
- <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline" v-if="rgvMode !== 2 && rgvMode !== 1 ">
-<!-- <el-form-item label="婧愮珯/婧愬簱浣�">-->
-<!-- <el-input v-model="formParam.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>-->
-<!-- </el-form-item>-->
- <el-form-item label="璧峰绔�">
- <el-input v-model="formParam.sourceRow" placeholder="璧峰绔�"></el-input>
- </el-form-item>
- <el-form-item label="鐩爣绔�">
- <el-input v-model="formParam.sourceBay" placeholder="鐩爣绔�"></el-input>
- </el-form-item>
- <el-form-item label="鍚姩">
- <el-button @click="initiate" type="warning">鎵ц浠诲姟</el-button>
- </el-form-item>
- </el-form>
+ <div v-if="currentIndex == null">
+ <el-empty description="璇烽�夋嫨璁惧"></el-empty>
+ </div>
+ <div v-else>
+ <el-table border :data="itemMast" highlight-current-row max-height="400" style="width: 100%">
+ <el-table-column property="id" label="搴忓彿">
+ </el-table-column>
+ <el-table-column property="jarWrkNo" label="宸ヤ綔鍙�">
+ </el-table-column>
+ <el-table-column property="status$" label="鐘舵��">
+ </el-table-column>
+ <el-table-column property="matnr" label="鐗╂枡鐮�">
+ </el-table-column>
+ <el-table-column property="maktx" label="鐗╂枡鍚嶇О">
+ </el-table-column>
+ <el-table-column property="weight" label="閲嶉噺">
+ </el-table-column>
+ </el-table>
+ </div>
- <div v-if="rgvMode === 2 ">
- <el-form :model="formParamD" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="璧峰绔�">
- <el-input v-model="formParamD.sourceRow" placeholder="璧峰绔�"></el-input>
- </el-form-item>
- <el-form-item label="鐩爣绔�">
- <el-input v-model="formParamD.sourceBay" placeholder="鐩爣绔�"></el-input>
- </el-form-item>
- <el-form-item label="鍚姩">
- <el-button @click="initiateD(1)" type="warning">鍙栬揣</el-button>
- <el-button @click="initiateD(2)" type="warning">鏀捐揣</el-button>
- <el-button @click="initiateD(3)" type="warning">XY绉诲姩</el-button>
- </el-form-item>
- </el-form>
- </div>
- <div v-if="demo === 'N' ">
- <el-button v-if="rgvMode === 0 " type="danger">鏈煡</el-button>
- <el-button v-if="rgvMode === -1 " type="danger">鏈煡</el-button>
- <el-button v-if="rgvMode === 3 " type="primary">鑱旀満</el-button>
- <el-button v-if="rgvMode === 2 " type="primary">鍗曟満</el-button>
- <el-button v-if="rgvMode === 1 " type="warning">鎵嬪姩</el-button>
- </div>
- <div v-if="rgvMode !== 0 ">
- <div style="margin: 10px auto 10px auto">
- <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 v-if="rgvMode !== 3 " @click="rgvStatus(15)" type="primary">鑱旀満</el-button>
- <el-button v-if="rgvMode !== 2 " @click="rgvStatus(14)" type="primary">鍗曟満</el-button>
- <el-button v-if="rgvMode !== 1 " @click="rgvStatus(12)" type="warning">鎵嬪姩</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(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 v-if="rgvMode === 1 " @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>
- <el-button @click="staTova(2,3)" type="warning">杈撻��-缃崲2</el-button>
- <el-button @click="staTova(2,5)" type="warning">杈撻��-缃崲3</el-button>
- <el-button @click="staTova(2,7)" type="warning">杈撻��-缃崲4</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(2,4)" type="warning">杈撻��-鐏岃1</el-button>
- <el-button @click="staTova(2,6)" type="warning">杈撻��-鐏岃2</el-button>
- <el-button @click="staTova(2,8)" type="warning">杈撻��-鐏岃3</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(1,10)" type="warning">缃崲1-鏀捐揣</el-button>
- <el-button @click="staTova(2,10)" type="warning">缃崲2-鏀捐揣</el-button>
- <el-button @click="staTova(3,10)" type="warning">缃崲3-鏀捐揣</el-button>
- <el-button @click="staTova(4,10)" type="warning">缃崲4-鏀捐揣</el-button>
- </div>
- </div>
- </div>
</el-card>
</div>
<div style="width: 45%;">
@@ -133,30 +175,53 @@
</div>
<div v-else>
<el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
- <el-descriptions-item label="RGV">{{ tableData[currentIndex].rgvNo }}
- </el-descriptions-item>
- <el-descriptions-item label="宸ヤ綔鍙�">
- {{ tableData[currentIndex].workNo1 }}
- </el-descriptions-item>
- <el-descriptions-item label="妯″紡">
- <el-tag>{{ tableData[currentIndex].statusType }}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item label="浠诲姟鐘舵��">
-
- <el-tag>{{ tableData[currentIndex].status}}</el-tag>
-
- </el-descriptions-item>
- <el-descriptions-item label="璁惧鐘舵��">
- <el-tag>{{ tableData[currentIndex].walkPos }}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].warnCode }}
- </el-descriptions-item>
- <el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].alarm }}
- </el-descriptions-item>
-<!-- <el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].staNo }}-->
+<!-- <el-descriptions-item label="纭寲缃�">{{ tableData[currentIndex].jarNo }}-->
<!-- </el-descriptions-item>-->
-<!-- <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].sourceStaNo }}-->
+ <el-descriptions-item label="鍖哄煙">{{ tableData[currentIndex].region }}
+ </el-descriptions-item>
+ <el-descriptions-item label="浠ｅ彿">{{ tableData[currentIndex].jarCode }}
+ </el-descriptions-item>
+<!-- <el-descriptions-item label="妯″紡">-->
+<!-- <el-tag>{{ tableData[currentIndex].jarMode }}</el-tag>-->
<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="璁惧鐘舵��">-->
+<!-- <el-tag>{{ tableData[currentIndex].jarStatus }}</el-tag>-->
+<!-- </el-descriptions-item>-->
+ <el-descriptions-item label="宸﹂棬">{{ tableData[currentIndex].leftDoor }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬">{{ tableData[currentIndex].rightDoor }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬鍙紑">{{ tableData[currentIndex].leftInEnable }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬鍙紑">{{ tableData[currentIndex].leftOutEnable }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬鍙叧">{{ tableData[currentIndex].rightInEnable }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬鍙叧">{{ tableData[currentIndex].rightOutEnable }}
+ </el-descriptions-item>
+
+<!-- <el-descriptions-item label="娓╁害">{{ tableData[currentIndex].jarTemperature$ }}-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="鍘嬪姏">{{ tableData[currentIndex].jarPressure$ }}-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="鏈�澶у偍閲�">{{ tableData[currentIndex].jarCount$ }}-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].jarErr }}-->
+<!-- </el-descriptions-item>-->
+ <el-descriptions-item label="宸﹂棬寮�闂ㄧ姸鎬�">{{ tableData[currentIndex].leftDoorOpen }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬鍏抽棬鐘舵��">{{ tableData[currentIndex].leftDoorClose }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬寮�闂ㄧ姸鎬�">{{ tableData[currentIndex].rightDoorOpen }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬鍏抽棬鐘舵��">{{ tableData[currentIndex].rightDoorClose }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鏈�杩戜竴娆′繚娓╂椂闂�">{{ tableData[currentIndex].holdingTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鏈�杩戜竴娆″紑闂ㄦ椂闂�">{{ tableData[currentIndex].openTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鏈�杩戜竴娆″叧闂ㄦ椂闂�">{{ tableData[currentIndex].closeTime }}
+ </el-descriptions-item>
</el-descriptions>
</div>
@@ -164,11 +229,26 @@
</el-card>
</div>
</div>
+
</div>
<script>
var app = new Vue({
el: '#app',
data: {
+ showLayer: false,
+ valueUpdate: false,
+ selectedOption: null,
+ updateJarNo: null,
+ optionsUpdate: [
+ { id: '1', value: '1', text: '1鎵�' },
+ { id: '2', value: '2', text: '2鎵�' },
+ { id: '3', value: '3', text: '3鎵�' },
+ { id: '4', value: '4', text: '4鎵�' },
+ { id: '5', value: '5', text: '5鎵�' },
+ { id: '6', value: '6', text: '6鎵�' },
+ { id: '7', value: '7', text: '7鎵�' },
+ { id: '999', value: '999', text: '鍙栨秷' },
+ ],
tableData: [],
currentRow: null,
currentTitle: "鏈�夋嫨璁惧",
@@ -214,15 +294,42 @@
}
],
demo: 'X',
- rgvMode: 0
+ rgvMode: 0,
+ itemMast: []
},
created() {
this.init()
},
watch: {
-
+ valueUpdate(newVal) {
+ if (newVal) {
+ this.showLayer = true;
+ // 鍙互鍦ㄨ繖閲屾坊鍔犲欢鏃跺叧闂眰鎴栧叾浠栭�昏緫
+ }
+ },
},
methods: {
+ historicalTasks(){
+ let that = this
+ that.selectedOption = 0;
+ that.valueUpdate = false;
+ if (that.currentIndex != null){
+ $.ajax({
+ url: baseUrl + "/basJarMastLog/historicalTasks/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data:{
+ id: that.tableData[that.currentIndex].jarNo
+ },
+ success: function (res) {
+ that.itemMast = res.data
+ // console.log(that.itemMast)
+ }
+ });
+ }
+
+ },
staTova(sta,end){
let that = this
that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
@@ -262,17 +369,80 @@
setInterval(() => {
this.getTableData()
- this.demoStatus()
+ // this.demoStatus()
}, 1000)
},
+ confirmEvent() {
+ var that = this
+ that.valueUpdate = true;
+ },
+ cancelEvent() {
+ var that = this
+ that.valueUpdate = false;
+ },
+ handleSubmit() {
+ if ( this.selectedOption > 998 ){
+ this.selectedOption = 0;
+ this.valueUpdate = false;
+ } else if ( this.selectedOption > 0 ){
+ var that = this
+ if (that.updateJarNo == null){
+ console.log("this.updateJarNo;null;null;null;null;null")
+ } else {
+ $.ajax({
+ url: baseUrl + "/basJar/update/uodate/jar/count/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ jarCount: that.selectedOption,
+ jarNo: that.updateJarNo
+ },
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ }
+ this.selectedOption = 0;
+ this.valueUpdate = false;
+ }
+ },
handleRowClick(row, col, event) {
- const index = this.tableData.indexOf(row)
- this.currentRow = row;
- this.currentIndex = index
- this.currentTitle = row.jarNo + "鍙风～鍖栫綈"
- this.formParam.rgvNo = row.rgvNo
- this.enableIn = row.inEnable == "Y" ? true : false
- this.enableOut = row.outEnable == "Y" ? true : false
+ var that = this
+ const index = that.tableData.indexOf(row)
+ that.currentRow = row;
+ that.currentIndex = index
+ this.updateJarNo = row.jarNo
+ that.currentTitle = row.jarNo + "鍙风～鍖栫綈"
+ that.formParam.rgvNo = row.rgvNo
+ that.enableIn = row.inEnable == "Y" ? true : false
+ that.enableOut = row.outEnable == "Y" ? true : false
+ this.selectedOption = 0;
+ this.valueUpdate = false;
+
+ $.ajax({
+ url: baseUrl + "/basJarMast/JatId/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ id: row.jarNo
+ },
+ success: function (res) {
+ that.itemMast = res.data
+ // console.log(that.itemMast)
+ }
+ });
},
getTableData() {
let that = this;
--
Gitblit v1.9.1