@@ -268,7 +268,7 @@ const formModel = ref({
password: "",
repassword: "",
name: "",
- department: '',
+ clssid: '',
studentNumb: "",
mobile: '',
captcha: "",
@@ -280,14 +280,15 @@ const getFacultiesList = async (data: any) => {
console.log(res, 'res11')
FacultiesList.value = res.result
}
+const deepValues = ref([])
// 配置部门级联选择器
const props = {
lazy: true,
checkStrictly: true,
emitPath: false,
async lazyLoad(node: any, resolve: any) {
- // console.log(node);
-
+ console.log(node);
+ deepValues.value = node.pathValues
await getFacultiesList({
primaryType: node.level + 1,
pid: node.value,
@@ -319,7 +320,7 @@ const rules = {
{
min: 5,
max: 11,
- message: "学号长度最小五位最大三十位",
+ message: "学号长度最小五位最大十一位",
trigger: ["change", "blur"],
},
],
@@ -352,12 +353,20 @@ const rules = {
trigger: "blur",
},
],
+ mobile:[
+ { required: true, message: "请输入手机号", trigger: "blur" },
+ {
+ pattern: /^1[3-9]\d{9}$/,
+ message: "手机号长度最小六位最大十五位",
+ trigger: ["change", "blur"],
+ },
+ ]
};
const register = async () => {
await formRef.value.validate();
console.log("开始注册请求");
let data = {
- department: formModel.value.department,
+ clssid: formModel.value.clssid,
mobile: formModel.value.mobile,
captcha: formModel.value.captcha,
checkKey: 1629428467008,
@@ -365,6 +374,7 @@ const register = async () => {
username: formModel.value.username,
realname: formModel.value.name,
workno: formModel.value.studentNumb,
+ depid: deepValues.value.splice(0, 2).join(',')
};
const res: any = await sturegister(data)
if (res.code === 200) {
From 9baff1e9033926ac4c54c545ea60421c7ce5be07 Mon Sep 17 00:00:00 2001
From: xy <2115269706@qq.com>
Date: Fri, 14 Mar 2025 17:35:10 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B3=A8=E5=86=8C?=
=?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/layout/loginPage.vue | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/layout/loginPage.vue b/src/layout/loginPage.vue
index e11e5c8..8de0429 100644
--- a/src/layout/loginPage.vue
+++ b/src/layout/loginPage.vue
@@ -145,7 +145,7 @@
注册
+ auto-insert-space @click="toLogin">
返回到登录页
@@ -237,7 +237,7 @@
登录
去注册
+ @click="toRegister">去注册
@@ -250,6 +250,7 @@
From 7954d34524efdc0f1caec8fd76931c3cb60d2551 Mon Sep 17 00:00:00 2001
From: JayChou
Date: Wed, 19 Mar 2025 15:37:56 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E7=AB=AF=E7=A8=8B=E5=BA=8F=E7=BC=96=E5=86=99=20=E5=B0=81?=
=?UTF-8?q?=E8=A3=85=E5=AE=9E=E9=AA=8C=E6=AD=A5=E9=AA=A4=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +
pnpm-lock.yaml | 23 ++
src/api/index.ts | 46 ++-
src/assets/images/idea.png | Bin 0 -> 44976 bytes
src/main.ts | 7 +
src/permissions.ts | 13 +-
src/router/index.ts | 7 +-
src/store/modules/setting.ts | 43 ++-
src/store/modules/user.ts | 23 +-
src/utils/index.ts | 12 +
src/utils/setStep.ts | 16 +
src/views/compiler/index.vue | 77 +++++
src/views/designRoute/components/wenBenYu.vue | 35 ++-
.../designRoute/components/wenBenYu2.vue | 10 +-
src/views/designRoute/index.vue | 105 ++++---
src/views/program/components/yibiao.vue | 8 +-
src/views/program/index.vue | 281 ++++++++++++++----
17 files changed, 579 insertions(+), 129 deletions(-)
create mode 100644 src/assets/images/idea.png
create mode 100644 src/utils/index.ts
create mode 100644 src/utils/setStep.ts
create mode 100644 src/views/compiler/index.vue
diff --git a/package.json b/package.json
index c7275f2..e0d6e59 100644
--- a/package.json
+++ b/package.json
@@ -19,10 +19,12 @@
"@antv/x6-plugin-transform": "^2.1.8",
"@antv/x6-vue-shape": "^2.1.2",
"@element-plus/icons-vue": "^2.3.1",
+ "@highlightjs/vue-plugin": "^2.1.0",
"@kjgl77/datav-vue3": "^1.7.3",
"axios": "^1.7.2",
"echarts": "^5.6.0",
"element-plus": "^2.9.5",
+ "highlight.js": "^11.11.1",
"insert-css": "^2.0.0",
"lib-flexible": "^0.3.2",
"pinia": "^2.1.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 11ad3e4..d641ff1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -38,6 +38,9 @@ importers:
'@element-plus/icons-vue':
specifier: ^2.3.1
version: 2.3.1(vue@3.4.29(typescript@5.2.2))
+ '@highlightjs/vue-plugin':
+ specifier: ^2.1.0
+ version: 2.1.0(highlight.js@11.11.1)(vue@3.4.29(typescript@5.2.2))
'@kjgl77/datav-vue3':
specifier: ^1.7.3
version: 1.7.3(vue@3.4.29(typescript@5.2.2))
@@ -50,6 +53,9 @@ importers:
element-plus:
specifier: ^2.9.5
version: 2.9.5(vue@3.4.29(typescript@5.2.2))
+ highlight.js:
+ specifier: ^11.11.1
+ version: 11.11.1
insert-css:
specifier: ^2.0.0
version: 2.0.0
@@ -344,6 +350,12 @@ packages:
'@floating-ui/utils@0.2.9':
resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==}
+ '@highlightjs/vue-plugin@2.1.0':
+ resolution: {integrity: sha512-E+bmk4ncca+hBEYRV2a+1aIzIV0VSY/e5ArjpuSN9IO7wBJrzUE2u4ESCwrbQD7sAy+jWQjkV5qCCWgc+pu7CQ==}
+ peerDependencies:
+ highlight.js: ^11.0.1
+ vue: ^3
+
'@jiaminghi/bezier-curve@0.0.9':
resolution: {integrity: sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==}
@@ -772,6 +784,10 @@ packages:
resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
hasBin: true
+ highlight.js@11.11.1:
+ resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==}
+ engines: {node: '>=12.0.0'}
+
htmlparser2@8.0.2:
resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
@@ -1362,6 +1378,11 @@ snapshots:
'@floating-ui/utils@0.2.9': {}
+ '@highlightjs/vue-plugin@2.1.0(highlight.js@11.11.1)(vue@3.4.29(typescript@5.2.2))':
+ dependencies:
+ highlight.js: 11.11.1
+ vue: 3.4.29(typescript@5.2.2)
+
'@jiaminghi/bezier-curve@0.0.9':
dependencies:
'@babel/runtime': 7.24.7
@@ -1847,6 +1868,8 @@ snapshots:
he@1.2.0: {}
+ highlight.js@11.11.1: {}
+
htmlparser2@8.0.2:
dependencies:
domelementtype: 2.3.0
diff --git a/src/api/index.ts b/src/api/index.ts
index 3879b01..9b23e72 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,14 +1,38 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
export const login = (data: any) => {
- return request({
- url: '/sys/login',
- method: 'post',
- data
- })
-}
+ return request({
+ url: "/sys/login",
+ method: "post",
+ data,
+ });
+};
export const getCode = (time: any) => {
- return request({
- url: '/sys/randomImage/' + time,
- })
- }
\ No newline at end of file
+ return request({
+ url: "/sys/randomImage/" + time,
+ });
+};
+// 获取用户信息
+export const getUserInfo = () => {
+ return request({
+ url: "/sys/user/getUserInfo",
+ method: "get",
+ });
+};
+
+// 实验步骤
+export const setStep = (params: any) => {
+ return request({
+ url: "/experimentrecords/xnExperimentRecords/check",
+ method: "get",
+ params
+ })
+}
+// 获取步骤id
+export const getStepId = () => {
+ return request({
+ url: "/experimentrecords/xnExperimentRecords/getProcedureList",
+ method: "get",
+
+ })
+}
\ No newline at end of file
diff --git a/src/assets/images/idea.png b/src/assets/images/idea.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6b88c606a619fa4299f8233be3c03099ea9f295
GIT binary patch
literal 44976
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
literal 0
HcmV?d00001
diff --git a/src/main.ts b/src/main.ts
index e979875..21fcf3a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -7,7 +7,14 @@ import 'element-plus/dist/index.css'; // 引入 Element Plus 的样式文件
import '@/utils/rem.js'
import DataVVue3 from '@kjgl77/datav-vue3'
import pinia from '@/store/index'
+//引入依赖和语言
+import 'highlight.js/styles/stackoverflow-light.css'
+// import hljs from "highlight.js/lib/core";
+// import hljsVuePlugin from "@highlightjs/vue-plugin";
+// import java from "highlight.js/lib/languages/java";
const app = createApp(App)
+// hljs.registerLanguage("java", java);
+// app.use(hljsVuePlugin);
app.use(ElementPlus)
app.use(pinia)
app.use(DataVVue3)
diff --git a/src/permissions.ts b/src/permissions.ts
index 3bc2aa0..fa9a430 100644
--- a/src/permissions.ts
+++ b/src/permissions.ts
@@ -14,10 +14,19 @@ router.beforeEach((to: any, from: any, next: any) => {
} else {
const token = getToken();
if (token) {
- next();
+ console.log(store.userInfo);
+
+ if (store.userInfo) {
+ next();
+ } else {
+ store.getUserInfo().then(() => {
+ next();
+ });
+ }
+ // next();
} else {
next("/login");
}
}
});
-export default router;
\ No newline at end of file
+export default router;
diff --git a/src/router/index.ts b/src/router/index.ts
index 8d73740..73e7f74 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -19,7 +19,12 @@ const routerList: any = [
path: "program",
name: "Program",
component: () => import("@/views/program/index.vue"),
- }
+ },
+ {
+ path: "compiler",
+ name: "Compiler",
+ component: () => import("@/views/compiler/index.vue"),
+ },
],
},
{
diff --git a/src/store/modules/setting.ts b/src/store/modules/setting.ts
index f86ce30..74494ec 100644
--- a/src/store/modules/setting.ts
+++ b/src/store/modules/setting.ts
@@ -16,6 +16,11 @@ const settingStore = defineStore("settingStore", {
sdsz: 0, // 湿度数值
falg: false,
timer: null,
+ experimentPreservation: false, // 是否设计好实验
+ saveRoute: false, // 是否保存路由
+ stepIds: null,
+ wenduCode: null,
+ shiduCode:null
};
},
actions: {
@@ -27,7 +32,7 @@ const settingStore = defineStore("settingStore", {
this.qw = value;
},
- setValue(value: number, name: string) {
+ setValue(value: number | boolean, name: string) {
this[name] = value;
},
openHeating() {
@@ -46,7 +51,7 @@ const settingStore = defineStore("settingStore", {
}
},
calculateTemperature() {
- this.qw <= 0 ? this.qw=1 : this.qw;
+ this.qw <= 0 ? (this.qw = 1) : this.qw;
const a = (100000 * this.zl * this.srmj) / this.jrgl;
let time = 0;
let currentTemp = this.qw;
@@ -61,6 +66,40 @@ const settingStore = defineStore("settingStore", {
clearInterval(interval);
}
+ time += 1; // 每秒增加 1s
+ }, 1000);
+ },
+ simulateHeatingAndHumidifying() {
+ // 计算时间常数
+ const a = (100000 * this.zl * this.srmj) / this.jrgl;
+ const b = (10000 * this.jsmj) / this.jsgl;
+
+ let time = 0;
+ let currentTemp = this.qw;
+ let currentHumidity = this.cssd;
+
+ const interval = setInterval(() => {
+ // 计算温度
+ currentTemp = (1 - Math.exp(-time / a)) * 100 + this.qw;
+ if (currentTemp > 100) currentTemp = 100;
+
+ // 计算湿度
+ currentHumidity = (1 - Math.exp(-time / b)) * 100 + this.cssd;
+ if (currentHumidity > 100) currentHumidity = 100;
+
+ console.log(
+ `时间: ${time}s, 温度: ${currentTemp.toFixed(
+ 2
+ )}°C, 湿度: ${currentHumidity}%RH`
+ );
+ this.qw = currentTemp >= 100 ? 100 : currentTemp;
+ this.cssd = currentHumidity >= 100 ? 100 : Number(currentHumidity.toFixed(2));
+ // 停止加热 & 加湿
+ if (currentTemp >= 100 && currentHumidity >= 100) {
+ console.log("温度和湿度均达到上限，停止模拟！");
+ clearInterval(interval);
+ }
+
time += 1; // 每秒增加 1s
}, 1000);
},
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index a2c0c45..6b37de5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,30 +1,37 @@
import { defineStore } from "pinia";
-import { getToken,setToken } from "@/utils/auth";
-import { login } from "@/api";
+import { getToken, setToken } from "@/utils/auth";
+import { login, getUserInfo } from "@/api";
import { ElMessage } from "element-plus";
const userStore = defineStore("userStore", {
state: () => ({
token: getToken(),
- userInfo: {},
+ userInfo: null,
}),
actions: {
async logIn(form: any) {
console.log(form);
const res: any = await login(form);
// if(res.code === 500) return ElMessage.error(res.msg)
- if(res.code !== 200) {
- ElMessage.error(res.msg)
- return false
+ if (res.code !== 200) {
+ ElMessage.error(res.msg);
+ return false;
}
this.token = res.result.token;
this.userInfo = res.result.userInfo;
setToken(this.token);
console.log(res);
- return true
+ return true;
},
clearStatus() {
this.token = "";
- this.userInfo = {};
+ this.userInfo = null;
+ },
+ async getUserInfo() {
+ const res:any = await getUserInfo();
+ this.userInfo = res.result.userInfo;
+ console.log(res);
+
+ // this.userInfo = res.result;
},
},
});
diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 0000000..8c8eebe
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1,12 @@
+// 格式化时间 年月日时分秒
+export function formatDate(date: any) {
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, "0");
+ const day = String(date.getDate()).padStart(2, "0");
+ const hours = String(date.getHours()).padStart(2, "0");
+ const minutes = String(date.getMinutes()).padStart(2, "0");
+ const seconds = String(date.getSeconds()).padStart(2, "0");
+ console.log(`${year}-${month}-${day} ${hours}:${minutes}:${seconds}`);
+
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
\ No newline at end of file
diff --git a/src/utils/setStep.ts b/src/utils/setStep.ts
new file mode 100644
index 0000000..14b1391
--- /dev/null
+++ b/src/utils/setStep.ts
@@ -0,0 +1,16 @@
+import { setStep, getStepId } from "../api/index";
+import settingStore from "../store/modules/setting";
+import pinia from "@/store";
+const useStore = settingStore(pinia);
+export const setStepEvent = async (step: number, controlsSt: string) => {
+ let id: any = null;
+ if (!useStore.stepIds) {
+ const data: any = await getStepId();
+ useStore.stepIds = data.result.map((item: any) => item.id);
+ id = useStore.stepIds[step - 1];
+ // return id;
+ await setStep({ id, controlsSt });
+ } else {
+ await setStep({ id: useStore.stepIds[step - 1], controlsSt });
+ }
+};
diff --git a/src/views/compiler/index.vue b/src/views/compiler/index.vue
new file mode 100644
index 0000000..d88adbf
--- /dev/null
+++ b/src/views/compiler/index.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+ oisafkahsdkjfhasdf sdfhkjsahfdlkjas \n /n sldhfkajshfd salkdhflkasf asfasdf
+
+
+
+ 保存
+
+
W
t
T
-
+
diff --git a/src/views/designRoute/components/wenBenYu2.vue b/src/views/designRoute/components/wenBenYu2.vue
index 8797e8f..caa5d0f 100644
--- a/src/views/designRoute/components/wenBenYu2.vue
+++ b/src/views/designRoute/components/wenBenYu2.vue
@@ -6,12 +6,18 @@