From b9260c7807d064f2b77ef9e92005a8c3257ec2e1 Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期四, 15 五月 2025 15:27:07 +0800
Subject: [PATCH] 代码提交
---
项目代码/伸缩杆/client/src/views/tts/AlarmReset/AlarmReset.vue | 2
项目代码/伸缩杆/client/src/api/newapi/Parameters.js | 6 +
项目代码/可视化大屏/client/src/utils/index.js | 4
项目代码/伸缩杆.7z | 0
项目代码/伸缩杆/client/src/views/tts/PickAndDrop/Manualcontrol.vue | 4
项目代码/伸缩杆/client/src/views/tts/Parametersettings/Parametersettings.vue | 30 ++++++++--
项目代码/可视化大屏/client/dist.7z | 0
项目代码/可视化大屏/client/src/api/http.js | 1
项目代码/可视化大屏/client/src/views/Index.vue | 8 +-
项目代码/伸缩杆/client/src/utils/index.js | 4
项目代码/可视化大屏.7z | 0
项目代码/伸缩杆/client/src/views/system/UserInfo.vue | 6 +-
项目代码/伸缩杆/client/src/views/tts/UserManagement/Usermanagement.vue | 75 +++++++++++++++++++++---
项目代码/伸缩杆/client/src/views/tts/Maintenancemanagement/Maintenancemanagement.vue | 4
项目代码/伸缩杆/client/vite.config.js | 2
项目代码/伸缩杆/client/src/views/tts/DataLogging/Datalogging.vue | 6 +-
项目代码/伸缩杆/client/dist.7z | 0
项目代码/可视化大屏/client/vite.config.js | 2
项目代码/可视化大屏/client/src/views/system/UserInfo.vue | 6 +-
19 files changed, 117 insertions(+), 43 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"
new file mode 100644
index 0000000..241c57b
--- /dev/null
+++ "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/dist.7z" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/dist.7z"
index 20854d6..668cdd7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/dist.7z"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/dist.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 b20b812..736e388 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"
@@ -1,7 +1,9 @@
import http from "../http";
-export const AddData = (data) => http.post("/api/Parameters/AddData", data);
+export const AddData = (data) => http.post("/api/Parameters/AddSpeed", data);
//鑷姩浼稿嚭缂╁洖
export const AutoPickAndDrop = (data) => http.post(`/api/Parameters/automation?ExtendedState=${data.ExtendedState}`);
//鎵嬪姩浼稿嚭缂╁洖
-export const ManualOperation = (data) => http.post(`/api/Parameters/ManualOperation?position=${data.position}&ExtendedState=${data.ExtendedState}`);
\ No newline at end of file
+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
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 40cda0e..c1b1b87 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.0.80:1598"
+export const baseUrl = "http://192.168.2.103:9093"
// http://192.168.0.80:1598
-// http://115.159.85.185:9098/
+// http://192.168.2.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 9c5f752..a9cd1d0 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.0.80:1598' + userInfo.headImageUrl"
+ :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
:fit="fit"
/>
<!-- <img
v-if="userInfo.headImageUrl"
- :src="'http://192.168.0.80:5000' + userInfo.headImageUrl"
+ :src="'http://192.168.2.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.0.80:1598/api/User/SaveFiles"
+ action="http://192.168.2.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/AlarmReset/AlarmReset.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/AlarmReset/AlarmReset.vue"
index 62d604a..b1124bc 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/AlarmReset/AlarmReset.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/AlarmReset/AlarmReset.vue"
@@ -72,7 +72,7 @@
clearInterval(timer.value);
// 鍒涘缓WebSocket杩炴帴
//"ws://127.0.0.1:9295/admin"
- client.value = new WebSocket("ws://192.168.0.80:5173/");
+ client.value = new WebSocket("ws://192.168.2.103:5173/");
client.value.onopen = function () {
console.log("WebSocket 杩炴帴鎴愬姛");
};
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 082070b..6a1ff74 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.0.80:1598' + scope.row.headImageUrl"
+ :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
show-progress
:initial-index="4"
fit="cover"
@@ -150,7 +150,7 @@
<template #default="scope">
<el-image
style="width: 5rem; height: 5rem"
- :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
+ :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
show-progress
:initial-index="4"
fit="cover"
@@ -199,7 +199,7 @@
<template #default="scope">
<el-image
style="width: 5rem; height: 5rem"
- :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
+ :src="'http://192.168.2.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 0811f20..b61dcc4 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.0.80:1598' + scope.row.headImageUrl"
+ :src="'http://192.168.2.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.0.80:1598' + scope.row.headImageUrl"
+ :src="'http://192.168.2.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 bc55d75..27095a8 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"
@@ -19,7 +19,7 @@
<el-form-item prop="extendSpeed">
<template #label>
<span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
- >鑷姩浼稿嚭閫熷害m/min锛�</span
+ >宸LC鑷姩浼稿嚭缂╁洖閫熷害m/min锛�</span
>
</template>
<el-input
@@ -31,7 +31,7 @@
<el-form-item prop="retractionSpeed">
<template #label>
<span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
- >鑷姩缂╁洖閫熷害m/min锛�</span
+ >鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害m/min锛�</span
>
</template>
<el-input
@@ -43,7 +43,7 @@
<el-form-item prop="manualExtend">
<template #label>
<span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
- >鎵嬪姩浼稿嚭閫熷害m/min锛�</span
+ >宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害m/min锛�</span
>
</template>
<el-input
@@ -55,7 +55,7 @@
<el-form-item prop="manualRetraction">
<template #label>
<span style="color: rgba(0, 9, 56, 1); font-size: 0.88rem"
- >鎵嬪姩缂╁洖閫熷害m/min锛�</span
+ >鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害m/min锛�</span
>
</template>
<el-input
@@ -179,9 +179,9 @@
</div>
</template>
<script setup>
-import { ref } from "vue";
+import { onMounted, ref } from "vue";
import { ElMessage } from "element-plus";
-import { AddData } from "@/api/newapi/Parameters";
+import { AddData, GetParameter } from "@/api/newapi/Parameters";
const userInfo = JSON.parse(localStorage.getItem("user"));
const ruleForm = ref({
creater: "string",
@@ -194,6 +194,7 @@
manualExtend: 0,
manualRetraction: 0,
depid: userInfo.depid,
+ account: userInfo.userName,
});
//淇濆瓨
@@ -204,6 +205,23 @@
}
});
};
+//鑾峰彇鍙傛暟
+const getParameter = () => {
+ GetParameter().then((res) => {
+ if (res.code == 0) {
+ ruleForm.value.extendSpeed = res.data == null ? 0 : res.data.extendSpeed;
+ ruleForm.value.retractionSpeed =
+ res.data == null ? 0 : res.data.retractionSpeed;
+ ruleForm.value.manualExtend =
+ res.data == null ? 0 : res.data.manualExtend;
+ ruleForm.value.manualRetraction =
+ res.data == null ? 0 : res.data.manualRetraction;
+ }
+ });
+};
+onMounted(() => {
+ getParameter();
+});
</script>
<style lang="scss" scoped>
.Parametersettings {
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 8470231..819777e 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"
@@ -412,12 +412,12 @@
});
if (res.code === 0) {
ElMessage({
- message: `${position}渚�${ExtendedState}鎴愬姛`,
+ message: `${position}渚�${ExtendedState}鎴愬姛锛�${position}PLC鎵嬪姩${ExtendedState}閫熷害涓�${res.data.manualExtend}`,
type: "success",
});
} else {
ElMessage({
- message: `${position}渚�${ExtendedState}澶辫触`,
+ message: `${position}渚�${ExtendedState}澶辫触锛�${position}PLC鎵嬪姩${ExtendedState}閫熷害涓�${res.data.manualExtend}`,
type: "error",
});
}
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 3e9ce22..a92b6fa 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"
@@ -162,7 +162,7 @@
min-width="3%"
/>
<el-table-column
- prop="role_Id"
+ prop="userteam"
label="鐢ㄦ埛鍒嗙粍"
align="center"
min-width="2%"
@@ -182,7 +182,7 @@
<template #default="scope">
<el-image
style="width: 5rem; height: 5rem"
- :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
+ :src="'http://192.168.2.103:9093' + scope.row.headImageUrl"
show-progress
:initial-index="4"
fit="cover"
@@ -508,7 +508,7 @@
<span style="color: red; margin-right: 0.2rem">*</span>
<span
style="font-size: 0.88rem; color: black; font-weight: bold"
- >閮ㄩ棬</span
+ >杞ㄩ亾绔�</span
>
</div>
</template>
@@ -526,6 +526,44 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="8">
+ <el-form-item prop="dept_Id">
+ <template #label>
+ <div style="display: flex; align-items: flex-end">
+ <span style="color: red; margin-right: 0.2rem">*</span>
+ <span
+ style="font-size: 0.88rem; color: black; font-weight: bold"
+ >缁�</span
+ >
+ </div>
+ </template>
+ <el-input
+ size="small"
+ v-model="formUser.userteam"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item prop="dept_Id">
+ <template #label>
+ <div style="display: flex; align-items: flex-end">
+ <span style="color: red; margin-right: 0.2rem">*</span>
+ <span
+ style="font-size: 0.88rem; color: black; font-weight: bold"
+ >鍗″彿</span
+ >
+ </div>
+ </template>
+ <el-input
+ size="small"
+ v-model="formUser.carnuber"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
<el-col :span="8">
<el-form-item>
<template #label>
@@ -549,7 +587,7 @@
ref="uploadRef"
name="files"
class="avatar-uploader"
- action="http://192.168.0.80:1598/api/User/SaveFiles"
+ action="http://192.168.2.103:9093/api/User/SaveFiles"
list-type="picture-card"
limit="1"
:auto-upload="true"
@@ -866,6 +904,8 @@
path: "",
usertruename: "",
dept_Id: 1,
+ carnuber: null,
+ userteam: "",
});
const rules = reactive({
userName: {
@@ -898,6 +938,16 @@
userTrueName: {
required: true,
message: "璇疯緭鍏ョ湡瀹炲鍚�",
+ trigger: "blur",
+ },
+ userteam: {
+ required: true,
+ message: "璇疯緭鍏ョ粍",
+ trigger: "blur",
+ },
+ carnuber: {
+ required: true,
+ message: "璇疯緭鍏ュ崱鍙�",
trigger: "blur",
},
});
@@ -1093,6 +1143,8 @@
enable: 1,
path: "",
user_Id: undefined,
+ userteam: "",
+ carnuber: null,
};
fileList.value = [];
};
@@ -1180,6 +1232,8 @@
enable: val.enable,
path: val.headImageUrl,
usertruename: val.userTrueName,
+ cardNumber: val.cardNumber,
+ userteam: val.userteam,
};
UpdateUser(data).then((res) => {
ElMessage({ message: "淇敼鎴愬姛", type: "success" });
@@ -1209,15 +1263,18 @@
enable: val.enable,
path: val.headImageUrl,
usertruename: val.userTrueName,
+ carnuber: val.cardNumber,
+ userteam: val.userteam,
+ dept_Id: val.dept_Id,
};
formUser.value = {
...obj,
};
- if (obj.headImageUrl != "") {
+ if (obj.headImageUrl != null) {
fileList.value = [
{
name: "1",
- url: "http://115.159.85.185:9098" + obj.headImageUrl,
+ url: "http://192.168.2.103:9093" + obj.headImageUrl,
},
];
}
@@ -1230,21 +1287,17 @@
let obj = Object.assign({}, val);
formUser.value = obj;
formpassword.value = val;
- newobj.value = Object.assign({}, val);
- console.log(newobj.value);
-
dialogVisible1.value = true;
};
//淇濆瓨淇敼瀵嗙爜
const savePassword = async (formEl) => {
let obj = Object.assign({}, newobj);
// obj.password = formpassword.value.password;
- console.log(formUser.value);
let formdata = {
id: formUser.value.user_Id,
oldPwd: formUser.value.userPwd,
- newPwd: formUser.value.newPwd,
+ newPwd: newobj.value.newPwd,
};
if (!formEl) return;
await formEl.validate((valid, fields) => {
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 65c86a5..3db36f5 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://115.159.85.185:9098/', // 鐩爣鎺ュ彛鐨勫煙鍚�
+ target: 'http://192.168.2.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"
new file mode 100644
index 0000000..93a0282
--- /dev/null
+++ "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/dist.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/client/dist.7z"
new file mode 100644
index 0000000..ed1ee41
--- /dev/null
+++ "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/dist.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/api/http.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/api/http.js"
index 723fc4f..0a78806 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/api/http.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/api/http.js"
@@ -145,6 +145,7 @@
? err.data.message
: "鏈嶅姟鍣ㄥ鐞嗗紓甯�"
);
+
}
)
.catch((error) => {
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 40cda0e..c1b1b87 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.0.80:1598"
+export const baseUrl = "http://192.168.2.103:9093"
// http://192.168.0.80:1598
-// http://115.159.85.185:9098/
+// http://192.168.2.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/Index.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/Index.vue"
index d74fa24..b4c48e9 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/Index.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/Index.vue"
@@ -61,7 +61,7 @@
align-items: center;
margin-top: 6%;
padding-bottom: 10%;
- height: 70%;
+ height: 60%;
box-sizing: border-box;
border-radius: 2rem;
background-color: rgba(39, 136, 214, 0.5);
@@ -85,7 +85,6 @@
height: 5rem;
font-size: 6rem;
font-weight: bold;
-
display: flex;
align-items: center;
padding-left: 2rem;
@@ -170,7 +169,7 @@
empty-text="鏆傛棤鏁版嵁"
:data="tableData"
style="width: 100%"
- height="750"
+ height="400"
:header-cell-style="{
height: '1.61rem',
color: '#fff',
@@ -278,6 +277,7 @@
pageSize: pageQuery.value.rows,
searchKeyword: queryForm.value.inputcontent,
status: queryForm.value.selectType,
+ account: "admin",
}).then((res) => {
tableData.value = res.data.items;
pageTotal.value = res.data.totalCount;
@@ -293,11 +293,11 @@
initData();
//鑾峰彇褰撳墠鏃堕棿
const date = new Date();
- await UpstreamInspectionRoad();
timer.value = setInterval(() => {
currentTime.value = formatTime(date, "yyyy-MM-dd hh:mm:ss");
date.setSeconds(date.getSeconds() + 1);
}, 1000);
+ // await UpstreamInspectionRoad();
});
onUnmounted(() => {
clearInterval(timer.value);
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 9c5f752..a9cd1d0 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.0.80:1598' + userInfo.headImageUrl"
+ :src="'http://192.168.2.103:9093' + userInfo.headImageUrl"
:fit="fit"
/>
<!-- <img
v-if="userInfo.headImageUrl"
- :src="'http://192.168.0.80:5000' + userInfo.headImageUrl"
+ :src="'http://192.168.2.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.0.80:1598/api/User/SaveFiles"
+ action="http://192.168.2.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 65c86a5..03bdd4a 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://115.159.85.185:9098/', // 鐩爣鎺ュ彛鐨勫煙鍚�
+ target: 'http://192.168.2.103:9093/', // 鐩爣鎺ュ彛鐨勫煙鍚�
changeOrigin: true, // 鏄惁璺ㄥ煙
rewrite: (path) => path.replace(/^\/api/, '') // 璺緞閲嶅啓
}
--
Gitblit v1.9.3