From b395c6c17048f4862dd07e54fdb2122905402794 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期四, 18 一月 2024 14:00:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes
---
jcdm-ui/src/views/main/cfkb/Instructions/index.vue | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
index 4d6c15b..26cb331 100644
--- a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
@@ -9,12 +9,12 @@
</el-col>
<el-col :span="3">
<el-card shadow="always">
- <span class="centerText" style="margin-top: 26px">{{productCode}}</span>
+ <span class="centerText" style="margin-top: 26px">{{locationCode}}</span>
</el-card>
</el-col>
<el-col :span="15">
<el-card shadow="always">
- <span class="centerText">瑁呭壇杞�,鎷ㄥ弶</span>
+ <span class="centerText">{{locationName}}</span>
</el-card>
</el-col>
</el-row>
@@ -74,11 +74,14 @@
<script>
import {listFormulaChild} from "@/api/main/bs/formulaChild/formulaChild";
+import {listStationConf,getIp} from "@/api/main/sc/stationConf";
export default {
name: "index",
data() {
return {
+ locationCode: "鏈厤缃�",
+ locationName: "鏈厤缃伐浣�",
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -143,7 +146,9 @@
this.tableData = []
},
mounted() {
- this.changeProducts(this.productCode)
+ this.getStationConf()
+ // this.changeProducts(this.productCode)
+ this.changeProducts("2V91")
this.getNowTime()
// this.autoShow()
},
@@ -151,6 +156,18 @@
// currentTime:
// },
methods: {
+ /** 鏌ヨ宸ヤ綅缁堢閰嶇疆鍒楄〃 */
+ getStationConf() {
+ getIp().then(response => {
+ let queryParams = {
+ ipAddress: response.msg,
+ }
+ listStationConf(queryParams).then(response => {
+ this.locationName = response.rows[0].processesName
+ this.locationCode = response.rows[0].processesCode
+ });
+ });
+ },
//鑾峰彇褰撳墠鏃堕棿
getNowTime () {
let speed = 1000
--
Gitblit v1.9.3