JayJiaJun/Variable_lane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.11

Browse Source
This commit is contained in:
JayJiaJun 2025-02-11 16:14:44 +08:00
parent 3eac2eed00
commit 1c87c36f81
2 changed files with 190 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
src/views/Home.vue
View File

@ -139,8 +139,10 @@
<el-table :data="plans" empty-text="暂无数据" border style="width: 100%; margin-bottom: 20px;"> <el-table :data="plans" empty-text="暂无数据" border style="width: 100%; margin-bottom: 20px;">
<el-table-column type="index" label="序号" width="60" align="center"></el-table-column> <el-table-column type="index" label="序号" width="60" align="center"></el-table-column>
<el-table-column prop="name" label="方案名称" min-width="15%" align="center"></el-table-column> <el-table-column prop="name" label="方案名称" min-width="15%" align="center"></el-table-column>
<el-table-column prop="timeRange" label="时间段" min-width="15%" align="center"></el-table-column> <el-table-column prop="timeRange" label="时间段" min-width="15%"
<el-table-column prop="selectedMode" label="车道模式" min-width="15%" align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="selectedMode" label="车道模式" min-width="15%"
align="center"></el-table-column>
<el-table-column prop="lanes" label="开放车道" min-width="15%" align="center"> <el-table-column prop="lanes" label="开放车道" min-width="15%" align="center">
<template #default="scope"> <template #default="scope">
<span v-for="(lane, index) in scope.row.lanes" :key="index"> <span v-for="(lane, index) in scope.row.lanes" :key="index">
@ -158,10 +160,8 @@
</el-table-column> </el-table-column>
<el-table-column label="使能" width="80" align="center"> <el-table-column label="使能" width="80" align="center">
<template #default="scope"> <template #default="scope">
<el-switch <el-switch v-model="scope.row.enabled"
v-model="scope.row.enabled" @change="(val) => handleStatusChange(val, scope.row)"></el-switch>
@change="(val) => handleStatusChange(val, scope.row)"
></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="120" align="center"> <el-table-column label="操作" width="120" align="center">
@ -181,20 +181,14 @@
<el-form-item label="车道模式"> <el-form-item label="车道模式">
<el-select v-model="newPlan.selectedMode" placeholder="请选择车道模式"> <el-select v-model="newPlan.selectedMode" placeholder="请选择车道模式">
<el-option label="左转 直行" value="0"></el-option> <el-option label="左转 直行" :value="1"></el-option>
<el-option label="右转 直行" value="1"></el-option> <el-option label="右转 直行" :value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间段设置"> <el-form-item label="时间段设置">
<el-time-picker <el-time-picker v-model="newPlan.timeRange" is-range range-separator="至"
v-model="newPlan.timeRange" start-placeholder="开始时间" end-placeholder="结束时间" style="width: 350px;" />
is-range
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
style="width: 350px;"
/>
</el-form-item> </el-form-item>
<el-form-item label="开放车道"> <el-form-item label="开放车道">
@ -273,7 +267,7 @@ export default {
endTime: '', endTime: '',
lanes: [], lanes: [],
timeRange: [], // 用于绑定时间段选择的数组 timeRange: [], // 用于绑定时间段选择的数组
selectedMode: '', // 用于绑定选择的值 selectedMode: null, // 初始值设为 null
repeatDays: [], // 添加重复日期数组 repeatDays: [], // 添加重复日期数组
}, },
plans: [ plans: [
@ -281,16 +275,16 @@ export default {
// id: 1, // id: 1,
// name: '早高峰方案', // name: '早高峰方案',
// timeRange: '07:30 - 09:30', // timeRange: '07:30 - 09:30',
// selectedMode: '0', // 左转直行 // selectedMode: 0, // 改为数字
// lanes: ['车道1', '车道2'], // lanes: ['车道1', '车道2'],
// repeatDays: [0, 1, 2, 3, 4], // 周一到周五 // repeatDays: [0, 1, 2, 3, 4],
// enabled: true // enabled: true
// }, // },
// { // {
// id: 2, // id: 2,
// name: '晚高峰方案', // name: '晚高峰方案',
// timeRange: '17:00 - 19:00', // timeRange: '17:00 - 19:00',
// selectedMode: '1', // 右转直行 // selectedMode: 1, // 改为数字
// lanes: ['车道2', '车道3', '车道4'], // lanes: ['车道2', '车道3', '车道4'],
// repeatDays: [0, 1, 2, 3, 4], // repeatDays: [0, 1, 2, 3, 4],
// enabled: false // enabled: false
@ -299,7 +293,7 @@ export default {
// id: 3, // id: 3,
// name: '周末方案', // name: '周末方案',
// timeRange: '09:00 - 18:00', // timeRange: '09:00 - 18:00',
// selectedMode: '0', // selectedMode: 0, // 改为数字
// lanes: ['车道1', '车道2', '车道3'], // lanes: ['车道1', '车道2', '车道3'],
// repeatDays: [5, 6], // 周六周日 // repeatDays: [5, 6], // 周六周日
// enabled: true // enabled: true
@ -341,7 +335,7 @@ export default {
resetNewPlan() { resetNewPlan() {
this.newPlan = { this.newPlan = {
name: '', name: '',
selectedMode: '', selectedMode: null,
timeRange: [], timeRange: [],
lanes: [], lanes: [],
repeatDays: [] repeatDays: []
@ -406,9 +400,18 @@ export default {
} }
}, },
// 方案添加 // 添加方案
async addPlan() { async addPlan() {
try { try {
// 验证方案数量是否超过 30
if (this.plans.length >= 30) {
ElMessage({
message: '无法添加新方案，方案数量已达到上限（30个）',
type: 'error'
});
return; // 终止提交
}
// 验证所有必填字段 // 验证所有必填字段
if (!this.newPlan.name) { if (!this.newPlan.name) {
ElMessage({ ElMessage({
@ -418,7 +421,7 @@ export default {
return; return;
} }
if (!this.newPlan.selectedMode) { if (this.newPlan.selectedMode === null) {
ElMessage({ ElMessage({
message: '请选择车道模式', message: '请选择车道模式',
type: 'error' type: 'error'
@ -435,29 +438,46 @@ export default {
let startTime, endTime; let startTime, endTime;
if (Array.isArray(this.newPlan.timeRange)) { if (Array.isArray(this.newPlan.timeRange)) {
[startTime, endTime] = this.newPlan.timeRange; [startTime, endTime] = this.newPlan.timeRange;
} else if (typeof this.newPlan.timeRange === 'string') {
[startTime, endTime] = this.newPlan.timeRange.split(' - ');
} }
// 处理车道 // 处理车道 - 转换为二进制字符串
const lanes = (this.newPlan.lanes || []).map(lane => { const lanesBinary = [0, 0, 0, 0]; // 初始化为 0000
return String(lane.replace('车道', '') - 1); (this.newPlan.lanes || []).forEach(lane => {
const laneIndex = parseInt(lane.replace('车道', '')) - 1; // 获取车道索引
if (laneIndex >= 0 && laneIndex < 4) {
lanesBinary[laneIndex] = 1; // 设置为 1
}
}); });
const lanesBinaryString = lanesBinary.join(''); // 转换为字符串
// 处理重复日期 - 转换为二进制字符串
const repeatDaysBinary = Array(7).fill(0); // 初始化为 0000000
(this.newPlan.repeatDays || []).forEach(day => {
repeatDaysBinary[day] = 1; // 设置为 1
});
const repeatDaysBinaryString = repeatDaysBinary.join(''); // 转换为字符串
// 生成新的方案 ID
const existingIds = this.plans.map(plan => plan.id);
let newId = 0; // 从 0 开始
while (existingIds.includes(newId)) {
newId++; // 找到下一个未使用的 ID
}
const planData = { const planData = {
JSON_id: getNextJsonId(), JSON_id: getNextJsonId(),
command: "set_scheme", command: "add_scheme",
parameters: { parameters: {
scheme: [{ scheme: [{
id: this.isEdit ? this.currentEditId : (this.plans.length + 1), id: newId, // 使用生成的 ID
name: this.newPlan.name, name: this.newPlan.name,
selectedMode: this.newPlan.selectedMode, selectedMode: this.newPlan.selectedMode,
timeRange: { timeRange: {
start: formatTime(startTime), start: formatTime(startTime),
end: formatTime(endTime) end: formatTime(endTime)
}, },
lanes: lanes, lanes: lanesBinaryString, // 使用二进制字符串
repeatDays: this.newPlan.repeatDays.map(day => Number(day)) repeatDays: repeatDaysBinaryString // 使用二进制字符串
}] }]
} }
}; };
@ -474,7 +494,7 @@ export default {
if (response.data?.parameters?.status === 0) { if (response.data?.parameters?.status === 0) {
const newPlanData = { const newPlanData = {
id: planData.parameters.scheme[0].id, id: newId, // 使用生成的 ID
name: this.newPlan.name, name: this.newPlan.name,
timeRange: `${formatTime(startTime)} - ${formatTime(endTime)}`, timeRange: `${formatTime(startTime)} - ${formatTime(endTime)}`,
selectedMode: this.newPlan.selectedMode, selectedMode: this.newPlan.selectedMode,
@ -483,14 +503,7 @@ export default {
enabled: true enabled: true
}; };
if (this.isEdit) { this.plans.push(newPlanData); // 添加新方案到列表
const index = this.plans.findIndex(p => p.id === this.currentEditId);
if (index !== -1) {
this.plans.splice(index, 1, newPlanData);
}
} else {
this.plans.push(newPlanData);
}
this.planDialogVisible = false; this.planDialogVisible = false;
this.resetNewPlan(); this.resetNewPlan();
@ -564,22 +577,34 @@ export default {
// 更新方案列表 // 更新方案列表
if (response.data.parameters.scheme) { if (response.data.parameters.scheme) {
this.plans = response.data.parameters.scheme.map(scheme => ({ this.plans = response.data.parameters.scheme.map(scheme => {
// 解析 lanes 二进制字符串
const lanesBinary = scheme.lanes.split('').map(Number); // 转换为数字数组
const lanes = lanesBinary.map((lane, index) => lane === 1 ? `车道${index + 1}` : null).filter(Boolean); // 过滤出开放的车道
// 解析 repeatDays 二进制字符串
const repeatDaysBinary = scheme.repeatDays.split('').map(Number); // 转换为数字数组
const repeatDays = repeatDaysBinary.map((day, index) => day === 1 ? index : null).filter(Boolean); // 过滤出选中的日期
return {
id: parseInt(scheme.id),
name: scheme.name, name: scheme.name,
timeRange: `${scheme.timeRange.start} - ${scheme.timeRange.end}`, timeRange: `${scheme.timeRange.start} - ${scheme.timeRange.end}`,
selectedMode: scheme.selectedMode, selectedMode: parseInt(scheme.selectedMode),
lanes: scheme.lanes.map(lane => `车道${parseInt(lane) + 1}`), lanes: lanes, // 使用解析后的车道
repeatDays: scheme.repeatDays || [] // 添加重复日期 repeatDays: repeatDays, // 使用解析后的重复日期
})); enabled: Boolean(scheme.en)
};
});
} }
// 更新默认车道设置 // 更新默认车道设置
if (response.data.parameters.laneSetting) { if (response.data.parameters.laneSetting) {
this.laneDefaults = { this.laneDefaults = {
lane1: response.data.parameters.laneSetting.lane1 || [], lane1: response.data.parameters.laneSetting.lane1 || 0,
lane2: response.data.parameters.laneSetting.lane2 || [], lane2: response.data.parameters.laneSetting.lane2 || 0,
lane3: response.data.parameters.laneSetting.lane3 || [], lane3: response.data.parameters.laneSetting.lane3 || 0,
lane4: response.data.parameters.laneSetting.lane4 || [] lane4: response.data.parameters.laneSetting.lane4 || 0
}; };
} }
@ -766,14 +791,26 @@ export default {
[startTime, endTime] = this.newPlan.timeRange; [startTime, endTime] = this.newPlan.timeRange;
} }
// 处理车道 // 处理车道 - 转换为二进制字符串
const lanes = (this.newPlan.lanes || []).map(lane => { const lanesBinary = [0, 0, 0, 0]; // 初始化为 0000
return String(lane.replace('车道', '') - 1); (this.newPlan.lanes || []).forEach(lane => {
const laneIndex = parseInt(lane.replace('车道', '')) - 1; // 获取车道索引
if (laneIndex >= 0 && laneIndex < 4) {
lanesBinary[laneIndex] = 1; // 设置为 1
}
}); });
const lanesBinaryString = lanesBinary.join(''); // 转换为字符串
// 处理重复日期 - 转换为二进制字符串
const repeatDaysBinary = Array(7).fill(0); // 初始化为 0000000
(this.newPlan.repeatDays || []).forEach(day => {
repeatDaysBinary[day] = 1; // 设置为 1
});
const repeatDaysBinaryString = repeatDaysBinary.join(''); // 转换为字符串
const editedPlan = { const editedPlan = {
JSON_id: getNextJsonId(), JSON_id: getNextJsonId(),
command: "set_scheme", command: "add_scheme",
parameters: { parameters: {
scheme: [{ scheme: [{
id: this.currentEditId, id: this.currentEditId,
@ -783,8 +820,8 @@ export default {
start: formatTime(startTime), start: formatTime(startTime),
end: formatTime(endTime) end: formatTime(endTime)
}, },
lanes: lanes, lanes: lanesBinaryString, // 使用二进制字符串
repeatDays: this.newPlan.repeatDays.map(day => Number(day)) repeatDays: repeatDaysBinaryString // 使用二进制字符串
}] }]
} }
}; };
@ -842,10 +879,10 @@ export default {
JSON_id: getNextJsonId(), JSON_id: getNextJsonId(),
command: "default_lane_setting", command: "default_lane_setting",
parameters: { parameters: {
lane1: this.laneDefaults.lane1 || [], lane1: parseInt(this.laneDefaults.lane1) || 0,
lane2: this.laneDefaults.lane2 || [], lane2: parseInt(this.laneDefaults.lane2) || 0,
lane3: this.laneDefaults.lane3 || [], lane3: parseInt(this.laneDefaults.lane3) || 0,
lane4: this.laneDefaults.lane4 || [] lane4: parseInt(this.laneDefaults.lane4) || 0
} }
}; };
@ -888,6 +925,15 @@ export default {
// 处理方案提交 // 处理方案提交
handlePlanSubmit() { handlePlanSubmit() {
// 验证车道模式是否选择
if (this.newPlan.selectedMode === null) {
ElMessage({
message: '请选择车道模式',
type: 'error'
});
return; // 终止提交
}
if (this.isEdit) { if (this.isEdit) {
this.saveEditPlan(); this.saveEditPlan();
} else { } else {
@ -900,7 +946,7 @@ export default {
try { try {
const statusData = { const statusData = {
JSON_id: getNextJsonId(), JSON_id: getNextJsonId(),
command: "set_scheme_status", command: "add_scheme_status",
parameters: { parameters: {
id: row.id, id: row.id,
enabled: val enabled: val

125
可变车道JSON协议.json
View File

@ -1,27 +1,23 @@
登入界面JSON格式 登录界面
(Web → 单片机) (Web → 单片机)
json{
{
"command": "login", "command": "login",
"parameters": { "parameters": {
"username": "string", "username": "string",
"password": "string" "password": "string"
} }
} }
(单片机 → Web) (单片机 → Web)
json{
{
"command": "login_response", "command": "login_response",
"parameters": { "parameters": {
"status": 0, // 0: 成功, 1: 失败 "status": 0, // 0: 成功, 1: 失败
"message": "Login successful" // 成功或失败的提示信息 "message": "Login successful" // 成功或失败的提示信息
} }
} }
(修改密码) 修改密码
(Web → 单片机) (Web → 单片机)
{ json{
"JSON_id": 2, "JSON_id": 2,
"command": "change_password", "command": "change_password",
"parameters": { "parameters": {
@ -30,28 +26,23 @@
} }
} }
(单片机 → Web) (单片机 → Web)
json{
{
"command": "change_password_response", "command": "change_password_response",
"parameters": { "parameters": {
"status": 0, // 0: 成功, 1: 失败 "status": 0, // 0: 成功, 1: 失败
"message": "Psword changed successfully" "message": "Password changed successfully"
} }
} }
时间设置JSON格式 时间设置
(Web → 单片机) (Web → 单片机)
json{
{
"command": "set_time", "command": "set_time",
"parameters": { "parameters": {
"timestamp": "2025-01-13T12:00:00Z" "timestamp": "2025-01-13T12:00:00Z"
} }
} }
(单片机 → Web) (单片机 → Web)
json{
{
"command": "set_time_response", "command": "set_time_response",
"parameters": { "parameters": {
"status": 0, // 0: 成功, 1: 失败 "status": 0, // 0: 成功, 1: 失败
@ -59,9 +50,8 @@
} }
} }
模式设置 模式设置
(Web (Web → 单片机)
json{
{
"command": "set_mode", "command": "set_mode",
"parameters": { "parameters": {
"mode": 0, // 智能模式 "mode": 0, // 智能模式
@ -72,10 +62,8 @@
} }
} }
} }
(单片机 → Web) (单片机 → Web)
json{
{
"command": "set_mode_response", "command": "set_mode_response",
"parameters": { "parameters": {
"status": 0, // 0: 成功, 1: 失败 "status": 0, // 0: 成功, 1: 失败
@ -83,156 +71,137 @@
} }
} }
方案设置 方案设置
(Web → 单片机) (Web → 单片机)
{ json{
"command": "set_scheme", "command": "add_scheme",
"parameters": { "parameters": {
"scheme": [ "scheme": [
{ {
"id": 1, "id": 1,
"en": 1,
"name": "方案1", "name": "方案1",
"selectedMode": "1", // 1:直行，2:左转，3:右转，4:掉头 "selectedMode": 1, // 1:直行，2:左转，3:右转，4:掉头
"timeRange": { "timeRange": {
"start": "08:00", "start": "08:00",
"end": "10:00" "end": "10:00"
}, },
"lanes": [ "lanes": "0100", // 用二进制表示车道状态，这里表示第二车道开启
"0", "repeatDays": "0000001" // 用二进制表示重复日期，这里表示周日重复
"1"
],
"repeatDays": [0, 1, 2, 3, 4, 5, 6] // 表示周一到周日每天都重复执行该方案
} }
] ]
} }
} }
(单片机 → Web) (单片机 → Web)
json{
{ "command": "add_scheme_response",
"command": "set_scheme_response",
"parameters": { "parameters": {
"status": 0, // 0: 成功, 1: 失败 "status": 0, // 0: 成功, 1: 失败
"message": "Add Plan successfully" "message": "Add Plan successfully"
} }
} }
基本信息
基本信息
(Web → 单片机) (Web → 单片机)
{ json{
"command": "get_device_info", "command": "get_device_info",
"parameters": {} "parameters": {}
} }
(单片机 → Web) (单片机 → Web)
{ json{
"command": "get_device_info_response", "command": "get_device_info_response",
"parameters": { "parameters": {
"version": "1.0.3", // 版本号 "version": "1.0.3", // 版本号
"compileTime": "2025-01-14T10:30:00Z" "compileTime": "2025-01-14T10:30:00Z"
} }
} }
获取所有信息 获取所有信息
(Web → 单片机) (Web → 单片机)
{ json{
"command": "get_all_info", "command": "get_all_info",
"parameters": {} "parameters": {}
} }
(单片机 → Web) (单片机 → Web)
{ json{
"command": "get_all_info_response", "command": "get_all_info_response",
"parameters": { "parameters": {
"set_mode": 0, // 智能模式 "set_mode": 0, // 智能模式
"scheme": [ "scheme": [
{ {
"id": 1, "id": 1,
"en": 1,
"name": "方案1", "name": "方案1",
"selectedMode": "1", // 1:直行，2:左转，3:右转，4:掉头 "selectedMode": 1, // 1:直行，2:左转，3:右转，4:掉头
"timeRange": { "timeRange": {
"start": "08:00", "start": "08:00",
"end": "10:00" "end": "10:00"
}, },
"lanes": [ "lanes": "0100", // 用二进制表示车道状态，这里表示第二车道开启
"0", "repeatDays": "0000001" // 用二进制表示重复日期，这里表示周日重复
"1"
],
"repeatDays": [0, 1, 2, 3, 4, 5, 6] // 表示周一到周日每天都重复执行该方案
} }
], ],
"laneSetting": { "laneSetting": {
"lane1": "0", //0左转直行 1右转直行 "lane1": 0, //0左转直行 1右转直行
"lane2": "1", "lane2": 1,
"lane3": "0", "lane3": 0,
"lane4": "1" "lane4": 1
}, },
"deviceInfo": { "deviceInfo": {
"version": "1.0.3", "version": "1.0.3",
"compileTime": "2025-01-14 10:30:00" "compileTime": "2025-01-14 10:30:00"
} }
} }
} }
默认车道设置 默认车道设置
(Web → 单片机) (Web → 单片机)
json{
{
"command": "default_lane_setting", "command": "default_lane_setting",
"parameters": { "parameters": {
"lane1": "0", //0左转直行 1右转直行 "lane1": 0, //0左转直行 1右转直行
"lane2": "1", "lane2": 1,
"lane3": "2", "lane3": 0,
"lane4": "3" "lane4": 1
} }
} }
(单片机 → Web) (单片机 → Web)
{ json{
"command": "default_lane_setting", "command": "default_lane_setting_response",
"parameters": { "parameters": {
"status": 0, // 0: 成功, 1: 失败 "status": 0, // 0: 成功, 1: 失败
"message": "Set successfully" "message": "Set successfully"
} }
} }
使能部分 使能部分
(Web → 单片机) (Web → 单片机)
{ json{
"JSON_id": 30, "JSON_id": 30,
"command": "set_scheme_status", "command": "set_scheme_status",
"parameters": { "parameters": {
"id": 1, "id": 1,
"enabled": false "enable": false
} }
} }
(单片机 → Web) (单片机 → Web)
{ json{
"command": "set_scheme_status_response", "command": "set_scheme_status_response",
"parameters": { "parameters": {
"status": 0, // 0: 成功, 1: 失败 "status": 0, // 0: 成功, 1: 失败
"message": "Set successfully" "message": "Set successfully"
} }
} }
删除方案 删除方案
(Web → 单片机) (Web → 单片机)
{ json{
"command": "delete_scheme", "command": "delete_scheme",
"parameters": { "parameters": {
"id": 1 "id": 1
} }
} }
(单片机 → Web) (单片机 → Web)
{ json{
"command": "delete_scheme_response", "command": "delete_scheme_response",
"parameters": { "parameters": {
"status": 0, // 0: 成功, 1: 失败 "status": 0, // 0: 成功, 1: 失败
"message": "Delete successfully" "message": "Delete successfully"
} }
} }