From 470a98a975f0c95853dcecbce75d88763e66c191 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 05 十二月 2024 18:30:07 +0800
Subject: [PATCH] last
---
src/views/system/tijian/index.vue | 3 ++-
src/views/sampling/sampling/index.vue | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index c7bdd2e..700a605 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -188,8 +188,9 @@
</el-table-column>
</el-table>
</div>
- <div style="width: 50%">
+ <div style="width: 50%" v-if="this.rightTabShow">
<el-table
+
v-loading="loading"
:data="tableList"
@selection-change="handleChange"
@@ -453,6 +454,7 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {},
+ rightTabShow: false
};
},
created() {
@@ -594,6 +596,8 @@
this.$nextTick(() => {
this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
// this.fetchData(this.samplingList[0].tjNumber);
+ // ddddddddddddddd
+ this.rightTabShow = true
});
}
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 8c2fdc5..faca2d3 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1620,6 +1620,7 @@
pacRemark: null,
},
// valueUrl: "ws://127.0.0.1:18890",
+ // valueUrl: "ws://192.168.1.3:6789/websocket",
valueUrl: "ws://127.0.0.1:6789/websocket",
valueUrls: "ws://127.0.0.1:6789/websocket",
// valueUrls: "ws://"+getIp() +":6789/websocket",
@@ -2407,7 +2408,7 @@
resultObj.data.img;
}
} else {
- this.$message.error(resultObj.msg)
+ this.$message.warning('璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇')
}/* if (resultObj.resultFlag == "-1") {
if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
//alert("璇诲崱鍣ㄦ湭杩炴帴");
--
Gitblit v1.8.0