From 52756e8a22ff5d3c5e9cf90dfa5b87742c60350d Mon Sep 17 00:00:00 2001
From: 艺术家 <10819716+q100102@user.noreply.gitee.com>
Date: 星期四, 22 五月 2025 16:24:23 +0800
Subject: [PATCH] 功能优化
---
项目代码/伸缩杆/client/src/api/newapi/Parameters.js | 6
项目代码/可视化大屏/client/src/utils/index.js | 4
项目代码/伸缩杆.7z | 0
项目代码/伸缩杆/client/src/views/tts/PickAndDrop/Manualcontrol.vue | 183 ++++++++++++++++++++++++--
项目代码/伸缩杆/client/src/views/tts/Parametersettings/Parametersettings.vue | 34 ++++
项目代码/伸缩杆/client/src/utils/index.js | 4
项目代码/可视化大屏.7z | 0
项目代码/伸缩杆/client/src/views/system/UserInfo.vue | 6
项目代码/伸缩杆/client/src/views/tts/UserManagement/Usermanagement.vue | 12 +
项目代码/伸缩杆/client/src/views/tts/Maintenancemanagement/Maintenancemanagement.vue | 4
项目代码/伸缩杆/client/vite.config.js | 2
项目代码/伸缩杆/client/src/views/tts/DataLogging/Datalogging.vue | 9
项目代码/可视化大屏/client/vite.config.js | 2
项目代码/可视化大屏/client/src/views/system/UserInfo.vue | 6
项目代码/伸缩杆/client/src/views/tts/PickAndDrop/PickAndDrop.vue | 119 ++++++++++++++--
15 files changed, 336 insertions(+), 55 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206.7z" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206.7z"
index 241c57b..18f9f04 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206.7z"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206.7z"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/api/newapi/Parameters.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/api/newapi/Parameters.js"
index 736e388..feaabef 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/api/newapi/Parameters.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/api/newapi/Parameters.js"
@@ -6,4 +6,8 @@
//鎵嬪姩浼稿嚭缂╁洖
export const ManualOperation = (data) => http.post(`/api/Parameters/ManualOperation?position=${data.position}&ExtendedState=${data.ExtendedState}`);
//鑾峰彇鍙傛暟
-export const GetParameter = (data) => http.post(`/api/Parameters/BackfillSpeed`);
\ No newline at end of file
+export const GetParameter = (data) => http.post(`/api/Parameters/BackfillSpeed`);
+//鏆傚仠
+export const Pouse = () => http.post(`/api/Parameters/PauseButton`);
+//鑾峰彇褰撳墠浼哥缉鏉嗕綅缃�
+export const GetPosition = () => http.post(`/api/Parameters/CurrentLocation`);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/utils/index.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/utils/index.js"
index c1b1b87..66dc0fe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/utils/index.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/utils/index.js"
@@ -1,9 +1,9 @@
import { dayjs } from "element-plus";
// import XLSX from "xlsx"; //瀵煎叆xlsx
-export const baseUrl = "http://192.168.2.103:9093"
+export const baseUrl = "http://192.168.1.103:9093"
// http://192.168.0.80:1598
-// http://192.168.2.103:9093
+// http://192.168.1.103:9093
//瀵硅薄杞現ormData鐢熸垚鏂规硶
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/system/UserInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/system/UserInfo.vue"
index a9cd1d0..0f5fc2d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/system/UserInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/system/UserInfo.vue"
@@ -11,12 +11,12 @@
>
<el-image
style="width: 100px; height: 100px"
- :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
+ :src="'http://192.168.1.103:9093' + userInfo.headImageUrl"
:fit="fit"
/>
<!-- <img
v-if="userInfo.headImageUrl"
- :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
+ :src="'http://192.168.1.103:9093' + userInfo.headImageUrl"
class="avatar"
/>
<el-icon v-else class="avatar-uploader-icon">
@@ -163,7 +163,7 @@
ref="upload"
name="fileInput"
class="avatar-uploader"
- action="http://192.168.2.103:9093/api/User/SaveFiles"
+ action="http://192.168.1.103:9093/api/User/SaveFiles"
list-type="picture-card"
:auto-upload="true"
limit="1"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/DataLogging/Datalogging.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/DataLogging/Datalogging.vue"
index 6a1ff74..81f9094 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/DataLogging/Datalogging.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/DataLogging/Datalogging.vue"
@@ -106,7 +106,7 @@
<template #default="scope">
<el-image
style="width: 5rem; height: 5rem"
- :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
+ :src="'http://192.168.1.103:9093' + scope.row.headImageUrl"
show-progress
:initial-index="4"
fit="cover"
@@ -118,8 +118,7 @@
label="鍒嗛厤鏃堕棿"
align="center"
/>
- <el-table-column prop="" label="鍒嗛厤妫�淇憳" align="center">
- <template #default> {{ userName }} </template>
+ <el-table-column prop="Creater" label="鍒嗛厤妫�淇憳" align="center">
</el-table-column>
</el-table>
@@ -150,7 +149,7 @@
<template #default="scope">
<el-image
style="width: 5rem; height: 5rem"
- :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
+ :src="'http://192.168.1.103:9093' + scope.row.headImageUrl"
show-progress
:initial-index="4"
fit="cover"
@@ -199,7 +198,7 @@
<template #default="scope">
<el-image
style="width: 5rem; height: 5rem"
- :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
+ :src="'http://192.168.1.103:9093' + scope.row.headImageUrl"
show-progress
:initial-index="4"
fit="cover"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/Maintenancemanagement/Maintenancemanagement.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/Maintenancemanagement/Maintenancemanagement.vue"
index b61dcc4..aa6679f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/Maintenancemanagement/Maintenancemanagement.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/Maintenancemanagement/Maintenancemanagement.vue"
@@ -79,7 +79,7 @@
<template #default="scope">
<el-image
style="width: 5rem; height: 5rem"
- :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
+ :src="'http://192.168.1.103:9093' + scope.row.headImageUrl"
:fit="fit"
/>
</template>
@@ -217,7 +217,7 @@
<template #default="scope">
<el-image
style="width: 5rem; height: 5rem"
- :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
+ :src="'http://192.168.1.103:9093' + scope.row.headImageUrl"
:fit="fit"
/>
</template>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/Parametersettings/Parametersettings.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/Parametersettings/Parametersettings.vue"
index 27095a8..6ba99b5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/Parametersettings/Parametersettings.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/Parametersettings/Parametersettings.vue"
@@ -64,6 +64,30 @@
v-model="ruleForm.manualRetraction"
/>
</el-form-item>
+ <el-form-item prop="leftPosition">
+ <template #label>
+ <span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
+ >宸LC鑷姩浼稿埌浣嶏細</span
+ >
+ </template>
+ <el-input
+ style="height: 1.88rem"
+ placeholder="璇疯緭鍏�"
+ v-model="ruleForm.leftPosition"
+ />
+ </el-form-item>
+ <el-form-item prop="rightPosition">
+ <template #label>
+ <span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
+ >鍙砅LC鑷姩浼稿埌浣嶏細</span
+ >
+ </template>
+ <el-input
+ style="height: 1.88rem"
+ placeholder="璇疯緭鍏�"
+ v-model="ruleForm.rightPosition"
+ />
+ </el-form-item>
<el-form-item>
<div
style="
@@ -195,10 +219,13 @@
manualRetraction: 0,
depid: userInfo.depid,
account: userInfo.userName,
+ leftPosition: 0,
+ rightPosition: 0,
});
-
//淇濆瓨
const submitForm = () => {
+ console.log(ruleForm.value);
+
AddData(ruleForm.value).then((res) => {
if (res.code == 0) {
ElMessage.success("淇濆瓨鎴愬姛");
@@ -216,9 +243,14 @@
res.data == null ? 0 : res.data.manualExtend;
ruleForm.value.manualRetraction =
res.data == null ? 0 : res.data.manualRetraction;
+ ruleForm.value.leftPosition =
+ res.data == null ? 0 : res.data.leftPosition;
+ ruleForm.value.rightPosition =
+ res.data == null ? 0 : res.data.rightPosition;
}
});
};
+
onMounted(() => {
getParameter();
});
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/Manualcontrol.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/Manualcontrol.vue"
index 819777e..93d1536 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/Manualcontrol.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/Manualcontrol.vue"
@@ -1,6 +1,104 @@
<template>
<div class="Manualcontrol">
<div class="button">
+ <div class="button_l">
+ <el-button
+ @click="handleAutoPickAndDrop('浼稿嚭')"
+ type="primary"
+ size="small"
+ style="
+ width: 14.69rem;
+ height: 5.06rem;
+ color: rgba(64, 253, 240, 1);
+ background-color: rgba(6, 229, 231, 0.3);
+ border: none;
+ border-top: 0.25rem solid rgba(6, 229, 231, 1);
+ "
+ >
+ <div class="btnicon">
+ <span
+ style="
+ width: 1rem;
+ height: 1rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 50% 50%;
+ border: 0.1rem solid rgb(0, 0, 0);
+ color: rgb(0, 0, 0);
+ font-size: 0.75rem;
+ margin-left: 0.1rem;
+ "
+ >i</span
+ >
+ </div>
+ <span style="font-size: 2.25rem; text-align: center">瀹氫綅浼告寜閽�</span>
+ </el-button>
+ <el-button
+ @click="handleAutoPickAndDrop('缂╁洖')"
+ type="primary"
+ size="small"
+ style="
+ width: 14.69rem;
+ height: 5.06rem;
+ color: rgba(64, 253, 240, 1);
+ background-color: rgba(6, 229, 231, 0.3);
+ border: none;
+ border-top: 0.25rem solid rgba(6, 229, 231, 1);
+ "
+ >
+ <div class="btnicon">
+ <span
+ style="
+ width: 1rem;
+ height: 1rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 50% 50%;
+ border: 0.1rem solid rgb(0, 0, 0);
+ color: rgb(0, 0, 0);
+ font-size: 0.75rem;
+ margin-left: 0.1rem;
+ "
+ >i</span
+ >
+ </div>
+ <span style="font-size: 2.25rem; text-align: center">瀹氫綅缂╂寜閽�</span>
+ </el-button>
+ <el-button
+ @click="handlePouse"
+ type="primary"
+ size="small"
+ style="
+ width: 14.69rem;
+ height: 5.06rem;
+ color: rgba(64, 253, 240, 1);
+ background-color: rgba(6, 229, 231, 0.3);
+ border: none;
+ border-top: 0.25rem solid rgba(6, 229, 231, 1);
+ "
+ >
+ <div class="btnicon">
+ <span
+ style="
+ width: 1rem;
+ height: 1rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 50% 50%;
+ border: 0.1rem solid rgb(0, 0, 0);
+ color: rgb(0, 0, 0);
+ font-size: 0.75rem;
+ margin-left: 0.1rem;
+ "
+ >i</span
+ >
+ </div>
+ <span style="font-size: 2.25rem; text-align: center">鏆傚仠</span>
+ </el-button>
+ </div>
<el-button
@click="jumpRouter('/PickAndDrop')"
class="btn"
@@ -81,6 +179,9 @@
</div>
<span style="font-size: 2.25rem; text-align: center">缂╁洖</span>
</el-button>
+ <div style="color: #fff; font-size: 2rem; margin-left: 15rem">
+ 鍙充晶浼哥缉鏉�
+ </div>
</div>
</div>
<div class="operate">
@@ -173,6 +274,9 @@
</div>
<span style="font-size: 2.25rem; text-align: center">缂╁洖</span>
</el-button>
+ <div style="color: #fff; font-size: 2rem; margin-left: 15rem">
+ 宸︿晶浼哥缉鏉�
+ </div>
</div>
</div>
<div class="operate">
@@ -233,7 +337,7 @@
>i</span
>
</div>
- <span style="font-size: 2.25rem; text-align: center">浼稿嚭</span>
+ <span style="font-size: 2.25rem; text-align: center">鐐瑰姩浼�</span>
</el-button>
<el-button
@click="handManualOperation('宸�', '缂╁洖')"
@@ -265,12 +369,13 @@
>i</span
>
</div>
- <span style="font-size: 2.25rem; text-align: center">缂╁洖</span>
+ <span style="font-size: 2.25rem; text-align: center">鐐瑰姩缂�</span>
</el-button>
</div>
- <div style="color: #fff; font-size: 2rem; margin-left: 20rem">
- 宸︿晶浼哥缉鏉�
- </div>
+ <div style="color: #fff; font-size: 2rem">宸︿晶浼哥缉鏉�</div>
+ <span style="color: #fff; font-size: 2rem"
+ >褰撳墠浼哥缉鏉嗕綅缃細{{ Position.right }}</span
+ >
</div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
@@ -328,7 +433,7 @@
>i</span
>
</div>
- <span style="font-size: 2.25rem; text-align: center">浼稿嚭</span>
+ <span style="font-size: 2.25rem; text-align: center">鐐瑰姩浼�</span>
</el-button>
<el-button
@click="handManualOperation('鍙�', '缂╁洖')"
@@ -360,12 +465,13 @@
>i</span
>
</div>
- <span style="font-size: 2.25rem; text-align: center">缂╁洖</span>
+ <span style="font-size: 2.25rem; text-align: center">鐐瑰姩缂�</span>
</el-button>
</div>
- <div style="color: #fff; font-size: 2rem; margin-left: 20rem">
- 鍙充晶浼哥缉鏉�
- </div>
+ <div style="color: #fff; font-size: 2rem">鍙充晶浼哥缉鏉�</div>
+ <span style="color: #fff; font-size: 2rem"
+ >褰撳墠浼哥缉鏉嗕綅缃細{{ Position.right }}</span
+ >
</div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
@@ -397,10 +503,20 @@
import { ref, onMounted, nextTick } from "vue";
import { useRouter } from "vue-router";
import { ElMessage } from "element-plus";
-import { ManualOperation } from "@/api/newapi/Parameters.js";
+import {
+ ManualOperation,
+ GetPosition,
+ AutoPickAndDrop,
+ Pouse,
+} from "@/api/newapi/Parameters.js";
const router = useRouter();
const isMobile = ref(false);
+const Position = ref({
+ left: 0,
+ right: 0,
+});
+
const jumpRouter = (path) => {
router.push(path);
};
@@ -430,6 +546,44 @@
console.log(res);
};
+const handleAutoPickAndDrop = async (val) => {
+ try {
+ const response = await AutoPickAndDrop({
+ ExtendedState: val,
+ });
+ if (response.code === 0) {
+ ElMessage.success(`${val}鎴愬姛`);
+ } else {
+ ElMessage.error(`${val}澶辫触`);
+ }
+ } catch (error) {
+ console.error(error);
+ ElMessage.error("鎿嶄綔澶辫触");
+ }
+};
+const handlePouse = async () => {
+ try {
+ const response = await Pouse();
+ if (response.code === 0) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ console.error(error);
+ ElMessage.error(error);
+ }
+};
+
+//鑾峰彇褰撳墠浣嶇疆
+const getPosition = () => {
+ GetPosition().then((res) => {
+ if (res.code == 0) {
+ Position.value.left = res.data.left;
+ Position.value.right = res.data.right;
+ }
+ });
+};
onMounted(() => {
// 鐩戝惉绐楀彛澶у皬鍙樺寲
window.addEventListener("resize", () => {
@@ -449,6 +603,7 @@
// 濡傛灉绐楀彛瀹藉害灏忎簬绛変簬1080px锛屾墽琛岀浉搴旂殑鎿嶄綔
isMobile.value = false;
}
+ getPosition();
});
</script>
<style lang="scss" scoped>
@@ -460,7 +615,7 @@
.button {
height: 7.83rem;
display: flex;
- justify-content: center;
+ justify-content: space-between;
.btn {
position: relative;
@@ -876,7 +1031,7 @@
.model {
display: flex;
-
+ justify-content: space-between;
.model_btn {
display: flex;
@@ -1031,7 +1186,7 @@
.model {
display: flex;
-
+ justify-content: space-between;
.model_btn {
display: flex;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/PickAndDrop.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/PickAndDrop.vue"
index 8e85b24..394ef4c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/PickAndDrop.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/PickAndDrop/PickAndDrop.vue"
@@ -1,7 +1,7 @@
<template>
<div class="PickAndDrop">
<div class="button">
- <div class="button_l">
+ <!-- <div class="button_l">
<el-button
@click="handleAutoPickAndDrop('浼稿嚭')"
type="primary"
@@ -32,7 +32,7 @@
>i</span
>
</div>
- <span style="font-size: 2.25rem; text-align: center">浼稿嚭</span>
+ <span style="font-size: 2.25rem; text-align: center">瀹氫綅浼告寜閽�</span>
</el-button>
<el-button
@click="handleAutoPickAndDrop('缂╁洖')"
@@ -64,9 +64,41 @@
>i</span
>
</div>
- <span style="font-size: 2.25rem; text-align: center">缂╁洖</span>
+ <span style="font-size: 2.25rem; text-align: center">瀹氫綅缂╂寜閽�</span>
</el-button>
- </div>
+ <el-button
+ @click="handlePouse"
+ type="primary"
+ size="small"
+ style="
+ width: 14.69rem;
+ height: 5.06rem;
+ color: rgba(64, 253, 240, 1);
+ background-color: rgba(6, 229, 231, 0.3);
+ border: none;
+ border-top: 0.25rem solid rgba(6, 229, 231, 1);
+ "
+ >
+ <div class="btnicon">
+ <span
+ style="
+ width: 1rem;
+ height: 1rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 50% 50%;
+ border: 0.1rem solid rgb(0, 0, 0);
+ color: rgb(0, 0, 0);
+ font-size: 0.75rem;
+ margin-left: 0.1rem;
+ "
+ >i</span
+ >
+ </div>
+ <span style="font-size: 2.25rem; text-align: center">鏆傚仠</span>
+ </el-button>
+ </div> -->
<div class="button_r">
<el-button
@click="jumpRouter('/Manualcontrol')"
@@ -87,7 +119,11 @@
</div>
<div v-if="isMobile" class="content">
<div class="content_l">
- <div class="model">宸︿晶浼哥缉鏉�</div>
+ <div class="model">
+ <span>褰撳墠浼哥缉鏉嗕綅缃細{{ Position.right }}</span>
+ <span>宸︿晶浼哥缉鏉�</span>
+ <span></span>
+ </div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
<div class="item">缂╁埌浣�</div>
@@ -112,7 +148,11 @@
</div>
</div>
<div class="content_r">
- <div class="model">鍙充晶浼哥缉鏉�</div>
+ <div class="model">
+ <span>褰撳墠浼哥缉鏉嗕綅缃細{{ Position.right }}</span>
+ <span>宸︿晶浼哥缉鏉�</span>
+ <span></span>
+ </div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
<div class="item">缂╁埌浣�</div>
@@ -139,7 +179,11 @@
</div>
<div v-else class="content_mobile">
<div class="content_l">
- <div class="model">宸︿晶浼哥缉鏉�</div>
+ <div class="model">
+ <span>褰撳墠浼哥缉鏉嗕綅缃細{{ Position.left }}</span>
+ <span>宸︿晶浼哥缉鏉�</span>
+ <span></span>
+ </div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
<div class="item">缂╁埌浣�</div>
@@ -164,7 +208,11 @@
</div>
</div>
<div class="content_r">
- <div class="model">鍙充晶浼哥缉鏉�</div>
+ <div class="model">
+ <span>褰撳墠浼哥缉鏉嗕綅缃細{{ Position.right }}</span>
+ <span>宸︿晶浼哥缉鏉�</span>
+ <span></span>
+ </div>
<div class="operate">
<div class="item">浼稿埌浣�</div>
<div class="item">缂╁埌浣�</div>
@@ -195,10 +243,18 @@
import { ref, onMounted, nextTick } from "vue";
import { useRouter } from "vue-router";
import { ElMessage } from "element-plus";
-import { AutoPickAndDrop } from "@/api/newapi/Parameters.js";
+import {
+ AutoPickAndDrop,
+ Pouse,
+ GetPosition,
+} from "@/api/newapi/Parameters.js";
const router = useRouter();
const isMobile = ref(false);
+const Position = ref({
+ left: 0,
+ right: 0,
+});
const jumpRouter = (path) => {
router.push(path);
@@ -217,6 +273,29 @@
console.error(error);
ElMessage.error("鎿嶄綔澶辫触");
}
+};
+const handlePouse = async () => {
+ try {
+ const response = await Pouse();
+ if (response.code === 0) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ } catch (error) {
+ console.error(error);
+ ElMessage.error(error);
+ }
+};
+
+//鑾峰彇褰撳墠浣嶇疆
+const getPosition = () => {
+ GetPosition().then((res) => {
+ if (res.code == 0) {
+ Position.value.left = res.data.lift;
+ Position.value.right = res.data.right;
+ }
+ });
};
onMounted(() => {
// 鐩戝惉绐楀彛澶у皬鍙樺寲
@@ -237,6 +316,7 @@
// 濡傛灉绐楀彛瀹藉害灏忎簬绛変簬1080px锛屾墽琛岀浉搴旂殑鎿嶄綔
isMobile.value = false;
}
+ getPosition();
});
</script>
<style lang="scss" scoped>
@@ -248,7 +328,7 @@
.button {
height: 7.83rem;
display: flex;
- justify-content: space-between;
+ justify-content: center;
.button_l {
display: flex;
.btnicon {
@@ -360,7 +440,9 @@
padding: 2rem 0rem;
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
@@ -505,7 +587,9 @@
padding: 2rem 0rem;
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
@@ -650,14 +734,14 @@
box-shadow: 0rem 0.13rem 0.38rem 0rem rgba(6, 229, 231, 1);
border: 0.06rem solid rgba(6, 229, 231, 1);
padding: 2rem 0rem;
-
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
-
.operate {
display: flex;
flex-direction: column;
@@ -790,10 +874,11 @@
border: 0.06rem solid rgba(6, 229, 231, 1);
margin-top: 10%;
padding: 2rem 0rem;
-
.model {
color: #fff;
- text-align: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 0rem 2rem;
width: 100%;
font-size: 2rem;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/UserManagement/Usermanagement.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/UserManagement/Usermanagement.vue"
index a92b6fa..e91385e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/UserManagement/Usermanagement.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/UserManagement/Usermanagement.vue"
@@ -182,7 +182,7 @@
<template #default="scope">
<el-image
style="width: 5rem; height: 5rem"
- :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
+ :src="'http://192.168.1.103:9093' + scope.row.headImageUrl"
show-progress
:initial-index="4"
fit="cover"
@@ -587,7 +587,7 @@
ref="uploadRef"
name="files"
class="avatar-uploader"
- action="http://192.168.2.103:9093/api/User/SaveFiles"
+ action="http://192.168.1.103:9093/api/User/SaveFiles"
list-type="picture-card"
limit="1"
:auto-upload="true"
@@ -1179,12 +1179,18 @@
await formEl.validate((valid, fields) => {
if (valid) {
if (formUser.value.id != undefined) {
+ if (!formUser.value.userteam.includes('缁�')) {
+ formUser.value.userteam = formUser.value.userteam + '缁�'
+ }
UpdateUser(formUser.value).then((res) => {
ElMessage({ message: "淇敼鎴愬姛", type: "success" });
dialogVisible.value = false;
initData();
});
} else {
+ if (!formUser.value.userteam.includes('缁�')) {
+ formUser.value.userteam = formUser.value.userteam + '缁�'
+ }
AddUser(formUser.value).then((res) => {
ElMessage({ message: "鎻愪氦鎴愬姛", type: "success" });
dialogVisible.value = false;
@@ -1274,7 +1280,7 @@
fileList.value = [
{
name: "1",
- url: "http://192.168.2.103:9093" + obj.headImageUrl,
+ url: "http://192.168.1.103:9093" + obj.headImageUrl,
},
];
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/vite.config.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/vite.config.js"
index 3db36f5..b4fd3b2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/vite.config.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/vite.config.js"
@@ -34,7 +34,7 @@
server: {
proxy: {
'/api': {
- target: 'http://192.168.2.103:9093', // 鐩爣鎺ュ彛鐨勫煙鍚�
+ target: 'http://192.168.1.103:9093', // 鐩爣鎺ュ彛鐨勫煙鍚�
changeOrigin: true, // 鏄惁璺ㄥ煙
rewrite: (path) => path.replace(/^\/api/, '') // 璺緞閲嶅啓
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217.7z" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217.7z"
index 93a0282..606890f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217.7z"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217.7z"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/src/utils/index.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/src/utils/index.js"
index c1b1b87..66dc0fe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/src/utils/index.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/src/utils/index.js"
@@ -1,9 +1,9 @@
import { dayjs } from "element-plus";
// import XLSX from "xlsx"; //瀵煎叆xlsx
-export const baseUrl = "http://192.168.2.103:9093"
+export const baseUrl = "http://192.168.1.103:9093"
// http://192.168.0.80:1598
-// http://192.168.2.103:9093
+// http://192.168.1.103:9093
//瀵硅薄杞現ormData鐢熸垚鏂规硶
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/src/views/system/UserInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/src/views/system/UserInfo.vue"
index a9cd1d0..0f5fc2d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/src/views/system/UserInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/src/views/system/UserInfo.vue"
@@ -11,12 +11,12 @@
>
<el-image
style="width: 100px; height: 100px"
- :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
+ :src="'http://192.168.1.103:9093' + userInfo.headImageUrl"
:fit="fit"
/>
<!-- <img
v-if="userInfo.headImageUrl"
- :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
+ :src="'http://192.168.1.103:9093' + userInfo.headImageUrl"
class="avatar"
/>
<el-icon v-else class="avatar-uploader-icon">
@@ -163,7 +163,7 @@
ref="upload"
name="fileInput"
class="avatar-uploader"
- action="http://192.168.2.103:9093/api/User/SaveFiles"
+ action="http://192.168.1.103:9093/api/User/SaveFiles"
list-type="picture-card"
:auto-upload="true"
limit="1"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/vite.config.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/vite.config.js"
index 03bdd4a..f4abe4b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/vite.config.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\217\257\350\247\206\345\214\226\345\244\247\345\261\217/client/vite.config.js"
@@ -34,7 +34,7 @@
server: {
proxy: {
'/api': {
- target: 'http://192.168.2.103:9093/', // 鐩爣鎺ュ彛鐨勫煙鍚�
+ target: 'http://192.168.1.103:9093/', // 鐩爣鎺ュ彛鐨勫煙鍚�
changeOrigin: true, // 鏄惁璺ㄥ煙
rewrite: (path) => path.replace(/^\/api/, '') // 璺緞閲嶅啓
}
--
Gitblit v1.9.3