From 3037ddc8c6e0519a9e1ae6d0a9cc002033047a02 Mon Sep 17 00:00:00 2001
From: Administrator <3174665893@qq.com>
Date: 星期六, 09 十一月 2024 15:59:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
/dev/null | 88 --------------------------------------------
Client/黎弘霖/code/DeviceManageServer.zip | 0
Client/姜可庚/document/项目模块解决问题思路.docx | 0
Server/马渝杭/document/项目总结_马渝杭.docx | 0
Client/黎弘霖/code/DeviceManageClient.zip | 0
Client/冀浩昶/log/总结.docx | 0
common.h | 7 +++
Client/黎弘霖/log/设备管理模块总结.docx | 0
Client/姜可庚/log/姜可庚_1107.doc | 0
Client/冀浩昶/document/总结.docx | 0
Client/王鑫鑫/document/地图标注总结.docx | 0
11 files changed, 7 insertions(+), 88 deletions(-)
diff --git "a/Client/\345\206\200\346\265\251\346\230\266/document/\346\200\273\347\273\223.docx" "b/Client/\345\206\200\346\265\251\346\230\266/document/\346\200\273\347\273\223.docx"
new file mode 100644
index 0000000..e81792d
--- /dev/null
+++ "b/Client/\345\206\200\346\265\251\346\230\266/document/\346\200\273\347\273\223.docx"
Binary files differ
diff --git "a/Client/\345\206\200\346\265\251\346\230\266/log/\346\200\273\347\273\223.docx" "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\200\273\347\273\223.docx"
new file mode 100644
index 0000000..e81792d
--- /dev/null
+++ "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\200\273\347\273\223.docx"
Binary files differ
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/document/\351\241\271\347\233\256\346\250\241\345\235\227\350\247\243\345\206\263\351\227\256\351\242\230\346\200\235\350\267\257.docx" "b/Client/\345\247\234\345\217\257\345\272\232/document/\351\241\271\347\233\256\346\250\241\345\235\227\350\247\243\345\206\263\351\227\256\351\242\230\346\200\235\350\267\257.docx"
new file mode 100644
index 0000000..66e311d
--- /dev/null
+++ "b/Client/\345\247\234\345\217\257\345\272\232/document/\351\241\271\347\233\256\346\250\241\345\235\227\350\247\243\345\206\263\351\227\256\351\242\230\346\200\235\350\267\257.docx"
Binary files differ
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1107.doc" "b/Client/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1107.doc"
new file mode 100644
index 0000000..75292a2
--- /dev/null
+++ "b/Client/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1107.doc"
Binary files differ
diff --git "a/Client/\347\216\213\351\221\253\351\221\253/document/\345\234\260\345\233\276\346\240\207\346\263\250\346\200\273\347\273\223.docx" "b/Client/\347\216\213\351\221\253\351\221\253/document/\345\234\260\345\233\276\346\240\207\346\263\250\346\200\273\347\273\223.docx"
new file mode 100644
index 0000000..6e8d281
--- /dev/null
+++ "b/Client/\347\216\213\351\221\253\351\221\253/document/\345\234\260\345\233\276\346\240\207\346\263\250\346\200\273\347\273\223.docx"
Binary files differ
diff --git "a/Client/\351\273\216\345\274\230\351\234\226/code/DeviceManageClient.zip" "b/Client/\351\273\216\345\274\230\351\234\226/code/DeviceManageClient.zip"
new file mode 100644
index 0000000..3e4a2f7
--- /dev/null
+++ "b/Client/\351\273\216\345\274\230\351\234\226/code/DeviceManageClient.zip"
Binary files differ
diff --git "a/Client/\351\273\216\345\274\230\351\234\226/code/DeviceManageServer.zip" "b/Client/\351\273\216\345\274\230\351\234\226/code/DeviceManageServer.zip"
new file mode 100644
index 0000000..46a7799
--- /dev/null
+++ "b/Client/\351\273\216\345\274\230\351\234\226/code/DeviceManageServer.zip"
Binary files differ
diff --git "a/Client/\351\273\216\345\274\230\351\234\226/code/Devices_Management_Struct.h" "b/Client/\351\273\216\345\274\230\351\234\226/code/Devices_Management_Struct.h"
deleted file mode 100644
index 28278eb..0000000
--- "a/Client/\351\273\216\345\274\230\351\234\226/code/Devices_Management_Struct.h"
+++ /dev/null
@@ -1,88 +0,0 @@
-#pragma once
-enum TypeInfo
-{
- AD_REQ,//添加设备请求
- AD_RES,//添加设备响应
- MD_REQ,//修改设备请求
- MD_RES,//修改设备响应
- QD_REQ,//查询设备请求
- QD_RES,//查询设备响应
-};
-struct Head
-{
- int type;
- int len;
-};
-struct DevicesInfo
-{
- int deviceID;
- char deviceName[32];//设备名称
- char deviceStatus[32];//设备状态
- char manufacturer[100];//厂家
- char devicesType[32];//设备类型
- double longitude;//经度
- double latitude;//纬度
- char purchasingTime[15];//购买时间
- char installTime[15];//安装时间
- char devicesSerialNumber[32];//设备编码
-};
-//添加设备
-struct ADReq//添加请求
-{
- Head head;
- char deviceName[32];
- ADReq() {
- head.type = AD_REQ;
- head.len = sizeof(ADReq);
- }
-
-};
-
-struct ADRes//添加响应
-{
- Head head;
- int type;
- ADRes() {
- head.type = AD_RES;
- head.len = sizeof(ADRes);
- }
-
-};
-//修改设备
-struct MDRes//修改请求
-{
- Head head;
- DevicesInfo info;
- MDRes() {
- head.type = MD_RES;
- head.len = sizeof(MDRes);
- }
-};
-struct MDReq//修改响应
-{
- Head head;
- int type;
- MDReq() {
- head.type = MD_REQ;
- head.len = sizeof(MDReq);
- }
-};
-//查询设备
-struct QDReq//查询请求
-{
- Head head;
- DevicesInfo info;
- QDReq() {
- head.type = QD_REQ;
- head.len = sizeof(QDReq);
- }
-};
-struct QDRes//查询响应
-{
- Head head;
- int type;
- QDRes() {
- head.type = QD_RES;
- head.len = sizeof(QDRes);
- }
-};
\ No newline at end of file
diff --git "a/Client/\351\273\216\345\274\230\351\234\226/log/\350\256\276\345\244\207\347\256\241\347\220\206\346\250\241\345\235\227\346\200\273\347\273\223.docx" "b/Client/\351\273\216\345\274\230\351\234\226/log/\350\256\276\345\244\207\347\256\241\347\220\206\346\250\241\345\235\227\346\200\273\347\273\223.docx"
new file mode 100644
index 0000000..3faacbf
--- /dev/null
+++ "b/Client/\351\273\216\345\274\230\351\234\226/log/\350\256\276\345\244\207\347\256\241\347\220\206\346\250\241\345\235\227\346\200\273\347\273\223.docx"
Binary files differ
diff --git "a/Server/\351\251\254\346\270\235\346\235\255/document/\351\241\271\347\233\256\346\200\273\347\273\223_\351\251\254\346\270\235\346\235\255.docx" "b/Server/\351\251\254\346\270\235\346\235\255/document/\351\241\271\347\233\256\346\200\273\347\273\223_\351\251\254\346\270\235\346\235\255.docx"
new file mode 100644
index 0000000..62b5b94
--- /dev/null
+++ "b/Server/\351\251\254\346\270\235\346\235\255/document/\351\241\271\347\233\256\346\200\273\347\273\223_\351\251\254\346\270\235\346\235\255.docx"
Binary files differ
diff --git a/common.h b/common.h
index f8d143a..022d89f 100644
--- a/common.h
+++ b/common.h
@@ -745,10 +745,17 @@
struct MonoutputInfo
{
+<<<<<<< HEAD
+ char month[32];//鏈堜唤
+ double aOutput;//a浜у搧鏈堜骇閲�
+ double bOutput;//b浜у搧鏈堜骇閲�
+ double cOutput;//c浜у搧鏈堜骇閲�
+=======
char date[32];//日期
double aOutput;//a产品月产量
double bOutput;//b产品月产量
double cOutput;//c产品月产量
+>>>>>>> 83817169914cd859e4a7e0b5f0685dd0c072a974
};
//添加生产计划的请求结构体
--
Gitblit v1.8.0