From 98f2106aab3e6ed5fecec4aa625199febb108778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E7=8C=AB?=
<13581431+xiongmao1988@user.noreply.gitee.com>
Date: Thu, 11 Apr 2024 11:53:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E9=A1=B5=E9=9D=A2=E8=8D=AF?=
=?UTF-8?q?=E7=89=A9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/SliderVerify/index.vue | 1 +
src/views/login/login.vue | 2 +
src/views/remote-manage/remote-control.vue | 62 ++++++++++++++++++++--
vite.config.ts | 4 +-
4 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/src/components/SliderVerify/index.vue b/src/components/SliderVerify/index.vue
index be34cde..95eb848 100644
--- a/src/components/SliderVerify/index.vue
+++ b/src/components/SliderVerify/index.vue
@@ -109,6 +109,7 @@ export default defineComponent({
eText: {
type: String,
default: '请正确拼合图像',
+
},
isShowTip: {
type: Boolean,
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index e8ab828..a176562 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -323,6 +323,8 @@ const sendCode = () => {
}, 1000);
}
const login = async (type: string) => {
+ //加载效果:开始加载
+ loading.value=true;
const obj = loginParams.value
if (!currentHospital.value) {
ElMessage.warning('请在右上角选择院区')
diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue
index ad473b1..dbe7637 100644
--- a/src/views/remote-manage/remote-control.vue
+++ b/src/views/remote-manage/remote-control.vue
@@ -90,6 +90,56 @@
+
+
+
+
+
+
+
+
+
+ {{ table1SpeedVal || '请选择速度' }}
+
+
+
+ 速度(ug/kg/min)
+ 速度(ml/h)
+
+
+
+
+
+
+ —
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
确定
+
+
取消
+
+
+
@@ -208,6 +258,7 @@ const msgVal = ref('');
const unusual = ref([] as any);
const tableData = ref([] as any[]);
const tableDataStore = ref([] as any[]);
+const table1SpeedVal = ref('')
getDatabases();
onMounted(() => {
@@ -469,6 +520,10 @@ function getTableData(e: boolean) {
});
}
+// table 速度选择
+function table1SpeedCommand(e: any) {
+ table1SpeedVal.value = e
+}
function keepFit(designWidth: number, designHeight: number, renderDomId: string) {
let width = designWidth || 1920,
height = designHeight || 1010;
@@ -738,7 +793,7 @@ const tableItemCancel = (e: any) => {
.right-btn-box {
position: absolute;
- width: 70px;
+ width: 100px;
height: 62px;
top: calc(50% - 31px);
right: 0;
@@ -806,7 +861,7 @@ const tableItemCancel = (e: any) => {
.monitoring-message {
width: 670px;
- height: 550px;
+ height: 450px;
padding-bottom: 10px;
display: flex;
justify-content: space-between;
@@ -951,7 +1006,8 @@ const tableItemCancel = (e: any) => {
.table-box {
width: 100%;
- height: calc(100% - 589px);
+ height: calc(50% - 264.5px);
+ margin-bottom: 20px;
flex-grow: 1;
:deep(.el-table__inner-wrapper) {
diff --git a/vite.config.ts b/vite.config.ts
index 31d21ab..ba02f74 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -24,14 +24,14 @@ export default defineConfig({
proxy: {
'/api': {
//target: 'http://192.168.137.235:9999', // 目标服务器地址
- target: 'http://localhost:8888', // 目标服务器地址
+ target: 'http://192.168.1.117:9999', // 目标服务器地址
ws: true, // 是否启用 WebSocket
changeOrigin: true, // 是否修改请求头中的 Origin 字段
rewrite: (path) => path.replace(/^\/api/, ''),
},
'/socket.io': {
//target: 'ws://192.168.137.235:9999',
- target: 'ws://localhost:8888',
+ target: 'ws://192.168.1.117:9999',
ws: true,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/socket.io/, ''),