Browse Source

修改数据结构

DGJ 1 year ago
parent
commit
899b0d015d

+ 21 - 21
Assets/Game/ShowDevice/DeviceDetailsControl.cs

@@ -66,43 +66,43 @@ public class DeviceDetailsControl : AbstractController
         //deviceId.text = DeviceParameter.deviceId.ToString();
         //deviceName.text = DeviceParameter.deviceName;
         deviceModel.text = DeviceParameter.deviceModel;
-        assetTagNumber.text = DeviceParameter.assetTagNumber;
+        assetTagNumber.text = DeviceParameter.assetNumber;
         serialNumber.text = DeviceParameter.serialNumber;
-        equipmentNumber.text = DeviceParameter.equipmentNumber;
+        equipmentNumber.text = DeviceParameter.deviceNumber;
         assetStatus.text = DeviceParameter.assetStatus;
         deviceStatus.text = DeviceParameter.deviceStatus;
-        deliveryData.text = DeviceParameter.deliveryData;
+        deliveryData.text = DeviceParameter.deliveryDate;
 
-        enabledDate.text = DeviceParameter.enabledDate;
+        enabledDate.text = DeviceParameter.activationDate;
         serverUsageType.text = DeviceParameter.serverUsageType;
-        typicalModel.text = DeviceParameter.typicalModel;
-        equipmentBrand.text = DeviceParameter.equipmentBrand;
+        typicalModel.text = DeviceParameter.typical;
+        equipmentBrand.text = DeviceParameter.deviceNumber;
         manufacturer.text = DeviceParameter.manufacturer;
-        equipmentWeight.text = DeviceParameter.equipmentWeight.ToString();
-        equipmentPower.text = DeviceParameter.equipmentPower.ToString();
-        originType.text = DeviceParameter.originType;
-        collectionCPName.text = DeviceParameter.collectionCPName;
+        equipmentWeight.text = DeviceParameter.eight;
+        equipmentPower.text = DeviceParameter.power;
+        originType.text = DeviceParameter.origin;
+        collectionCPName.text = DeviceParameter.catalogProductName;
         resourcePool.text = DeviceParameter.resourcePool;
 
-        wherePOD.text = DeviceParameter.wherePOD;
-        networkDomain.text = DeviceParameter.networkDomain;
-        city.text = DeviceParameter.city;
+        wherePOD.text = DeviceParameter.pod;
+        networkDomain.text = DeviceParameter.network;
+        city.text = DeviceParameter.province;
         building.text = DeviceParameter.building;
         floor.text = DeviceParameter.floor;
-        computerRoomName.text = DeviceParameter.computerRoomName;
+        computerRoomName.text = DeviceParameter.engineRoomName;
         cabinetNumber.text = DeviceParameter.cabinetNumber;
-        uMessage.text = DeviceParameter.uMessage;
+        uMessage.text = DeviceParameter.u;
         deviceOrientation.text = DeviceParameter.deviceOrientation;
 
-        manageIP.text = DeviceParameter.manageIP;
+        manageIP.text = DeviceParameter.managementIP;
         saveIP.text = DeviceParameter.saveIP;
         iPMIIP.text = DeviceParameter.iPMIIP;
         businessIP.text = DeviceParameter.businessIP;
-        equipmentSupplier.text = DeviceParameter.equipmentSupplier;
-        territorialPAManager.text = DeviceParameter.territorialPAManager;
-        equipmentBTTOrganization.text = DeviceParameter.equipmentBTTOrganization;
-        facilityManagementOrganization.text = DeviceParameter.facilityManagementOrganization;
-        equipmentMaintenanceOrganization.text = DeviceParameter.equipmentMaintenanceOrganization;
+        equipmentSupplier.text = DeviceParameter.supplier;
+        territorialPAManager.text = DeviceParameter.provincePrincipal;
+        equipmentBTTOrganization.text = DeviceParameter.ownershipOrganization;
+        facilityManagementOrganization.text = DeviceParameter.managementOrganization;
+        equipmentMaintenanceOrganization.text = DeviceParameter.maintenanceOrganization;
 
         businessSystem.text = DeviceParameter.businessSystem;
 

File diff suppressed because it is too large
+ 118 - 118
Assets/Resources/DataItem.prefab


+ 244 - 1
Assets/Scripts/Data/MachineRoomData.cs

@@ -142,7 +142,7 @@ public class MachineParameters
 /// <summary>
 /// 刀片机设备信息
 /// </summary>
-public class DeviceParameters
+public class DeviceParameters3
 {
     /// <summary>
     ///  设备ID
@@ -316,6 +316,249 @@ public class DeviceParameters
 
 }
 
+
+/// <summary>
+/// 刀片机设备信息
+/// </summary>
+public class DeviceParameters
+{
+    /// <summary>
+    ///  设备ID
+    /// </summary>
+    public string id { get; set; }
+    /// <summary>
+    /// 设备名称
+    /// </summary>
+    public string deviceName { get; set; }
+    /// <summary>
+    /// 设备型号
+    /// </summary>
+    public string deviceModel { get; set; }
+    /// <summary>
+    /// 设备类型
+    /// </summary>
+    public string deviceType { get; set; }
+    /// <summary>
+    /// 资产标签号
+    /// </summary>
+    public string assetNumber { get; set; }
+    /// <summary>
+    /// 序列号
+    /// </summary>
+    public string serialNumber { get; set; }
+    /// <summary>
+    /// 设备编码
+    /// </summary>
+    public string deviceNumber { get; set; }
+    /// <summary>
+    /// 资产状态
+    /// </summary>
+    public string assetStatus { get; set; }
+    /// <summary>
+    /// 设备状态
+    /// </summary>
+    public string deviceStatus { get; set; }
+    /// <summary>
+    /// 交付日期
+    /// </summary>
+    public string deliveryDate { get; set; }
+    /// <summary>
+    /// 启用日期
+    /// </summary>
+    public string activationDate { get; set; }
+    /// <summary>
+    /// 服务器使用类型
+    /// </summary>
+    public string serverUsageType { get; set; }
+    /// <summary>
+    /// 典配模型
+    /// </summary>
+    public string typical { get; set; }
+    /// <summary>
+    /// 设备品牌
+    /// </summary>
+    public string deviceBrand { get; set; }
+    /// <summary>
+    /// 生产厂商
+    /// </summary>
+    public string manufacturer { get; set; }
+    /// <summary>
+    /// 设备重量(KG)
+    /// </summary>
+    public string eight { get; set; }
+    /// <summary>
+    /// 设备功率(W)
+    /// </summary>
+    public string power { get; set; }
+    /// <summary>
+    /// 产地类型
+    /// </summary>
+    public string origin { get; set; }
+    /// <summary>
+    /// 集采目录产品名称
+    /// </summary>
+    public string catalogProductName { get; set; }
+    /// <summary>
+    /// 所在资源池
+    /// </summary>
+    public string resourcePool { get; set; }
+    /// <summary>
+    /// 所在POD
+    /// </summary>
+    public string pod { get; set; }
+    /// <summary>
+    /// 所在网络域
+    /// </summary>
+    public string network { get; set; }
+    /// <summary>
+    /// 设备重要级别
+    /// </summary>
+    public string importanceLevel { get; set; }
+    /// <summary>
+    /// 成套设备编码
+    /// </summary>
+    public string completeEquipmentCode { get; set; }
+    /// <summary>
+    /// 是否有RFID标签
+    /// </summary>
+    public string RFID { get; set; }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string remark { get; set; }
+    /// <summary>
+    /// 所在城市
+    /// </summary>
+    public string province { get; set; }
+    /// <summary>
+    /// 所在楼宇
+    /// </summary>
+    public string building { get; set; }
+    /// <summary>
+    /// 所在楼层
+    /// </summary>
+    public string floor { get; set; }
+    /// <summary>
+    /// 所在机房名称
+    /// </summary>
+    public string engineRoomName { get; set; }
+    /// <summary>
+    /// 所在机房编码
+    /// </summary>
+    public string engineRoomCode { get; set; }
+    /// <summary>
+    /// 机柜编号
+    /// </summary>
+    public string cabinetNumber { get; set; }
+    /// <summary>
+    /// U位信息
+    /// </summary>
+    public string u { get; set; }
+    /// <summary>
+    /// 设备朝向
+    /// </summary>
+    public string deviceOrientation { get; set; }
+    /// <summary>
+    /// 管理IP
+    /// </summary>
+    public string managementIP { get; set; }
+    /// <summary>
+    /// 监控ID
+    /// </summary>
+    public string monitoringID { get; set; }
+    /// <summary>
+    /// 存储IP
+    /// </summary>
+    public string saveIP { get; set; }
+    /// <summary>
+    /// IPMIP
+    /// </summary>
+    public string iPMIIP { get; set; }
+    /// <summary>
+    /// 业务IP
+    /// </summary>
+    public string businessIP { get; set; }
+    /// <summary>
+    /// 项目名称
+    /// </summary>
+    public string projectName { get; set; }
+    /// <summary>
+    /// 项目编码
+    /// </summary>
+    public string projectNumber { get; set; }
+    /// <summary>
+    /// 设备供货商
+    /// </summary>
+    public string supplier { get; set; }
+    /// <summary>
+    /// 资产责任人
+    /// </summary>
+    public string principal { get; set; }
+    /// <summary>
+    /// 属地省资产负责人
+    /// </summary>
+    public string provincePrincipal { get; set; }
+    /// <summary>
+    /// 设备归属组织
+    /// </summary>
+    public string ownershipOrganization { get; set; }
+    /// <summary>
+    /// 设备管理组织
+    /// </summary>
+    public string managementOrganization { get; set; }
+    /// <summary>
+    /// 设备维护组织
+    /// </summary>
+    public string maintenanceOrganization { get; set; }
+    /// <summary>
+    /// 设备使用组织
+    /// </summary>
+    public string usageOrganization { get; set; }
+    /// <summary>
+    /// 业务系统
+    /// </summary>
+    public string businessSystem { get; set; }
+    /// <summary>
+    /// 设备应用类型
+    /// </summary>
+    public string applicationType { get; set; }
+    /// <summary>
+    /// 资源名称
+    /// </summary>
+    public string resourceName { get; set; }
+    /// <summary>
+    ///  创建时间
+    /// </summary>
+    public string createTime { get; set; }
+
+}
+
+public class BrielDeviceParmaters
+{
+    /// <summary>
+    ///  设备ID
+    /// </summary>
+    public string id { get; set; }
+    /// <summary>
+    /// 设备名称
+    /// </summary>
+    public string deviceName { get; set; }
+    /// <summary>
+    /// 设备类型
+    /// </summary>
+    public string deviceType { get; set; }
+
+    /// <summary>
+    /// 设备品牌
+    /// </summary>
+    public string deviceBrand { get; set; }
+
+    /// <summary>
+    /// 管理IP
+    /// </summary>
+    public string managementIP { get; set; }
+}
+
 /// <summary>
 /// 告警信息
 /// </summary>

+ 87 - 87
Assets/Scripts/MachineSceneManager.cs

@@ -230,93 +230,93 @@ public class MachineSceneManager : MonoSingleton<MachineSceneManager>
             data.listEquipmentData = JsonConvert.DeserializeObject<List<MachineParameters>>(msg);
         }
 
-        dp1 = new DeviceParameters();
-        dp1.deviceId = 1;
-        dp1.deviceName = "NetView4000_1";
-        dp1.deviceModel = "NetView4000";
-        dp1.deviceType = "流量溯源";
-        dp1.assetTagNumber = "781010G001AAAAAAA";
-        dp1.serialNumber = "B4U120800057";
-        dp1.equipmentNumber = "HW-SEC-OTAAAAAA";
-        dp1.assetStatus = null;
-        dp1.deviceStatus = "运行中";
-        dp1.deliveryData = "2022-11-25";
-        dp1.enabledDate = "2022-05-31";
-        dp1.serverUsageType = null;
-        dp1.typicalModel = null;
-        dp1.equipmentBrand = "神州数码";
-        dp1.manufacturer = "神州数码";
-        dp1.equipmentWeight = 30;
-        dp1.equipmentPower = 1200;
-        dp1.originType = "国产";
-        dp1.collectionCPName = "其它安...";
-        dp1.resourcePool = "湘潭资源池";
-        dp1.wherePOD = "PUB1-1";
-        dp1.networkDomain = "公共域";
-        dp1.city = "湖南";
-        dp1.building = "二级楼";
-        dp1.floor = "5";
-        dp1.computerRoomName = "507机房";
-        dp1.computerRoomCoding = "ITC-4300000...";
-        dp1.cabinetNumber = "P06";
-        dp1.uMessage = "24-24";
-        dp1.deviceOrientation = "前";
-        dp1.manageIP = "10.207.90.50";
-        dp1.saveIP = null;
-        dp1.iPMIIP = null;
-        dp1.businessIP = null;
-        dp1.projectName = "2021年IT基础...";
-        dp1.equipmentSupplier = "神州数码";
-        dp1.assetOwner = "陈国威(chen guo wei)";
-        dp1.territorialPAManager = "张泽宇(zhang ze yu)";
-        dp1.equipmentBTTOrganization = "中移动信息";
-        dp1.facilityManagementOrganization = null;
-        dp1.equipmentMaintenanceOrganization = "湖南公司信...";
-        dp1.businessSystem = null;
-
-        dp2 = new DeviceParameters();
-        dp2.deviceId = 2;
-        dp2.deviceName = "NetView4000_2";
-        dp2.deviceModel = "NetView4000";
-        dp2.deviceType = "流量溯源";
-        dp2.assetTagNumber = "781010G002AAAAAAA";
-        dp2.serialNumber = "B4U120800057";
-        dp2.equipmentNumber = "HW-SEC-OTBBBBB";
-        dp2.assetStatus = null;
-        dp2.deviceStatus = "运行中";
-        dp2.deliveryData = "2022-11-25";
-        dp2.enabledDate = "2022-05-31";
-        dp2.serverUsageType = null;
-        dp2.typicalModel = null;
-        dp2.equipmentBrand = "神州数码";
-        dp2.manufacturer = "神州数码";
-        dp2.equipmentWeight = 30;
-        dp2.equipmentPower = 1200;
-        dp2.originType = "国产";
-        dp2.collectionCPName = "其它安...";
-        dp2.resourcePool = "湘潭资源池";
-        dp2.wherePOD = "PUB1-1";
-        dp2.networkDomain = "公共域";
-        dp2.city = "湖南";
-        dp2.building = "二级楼";
-        dp2.floor = "5";
-        dp2.computerRoomName = "507机房";
-        dp2.computerRoomCoding = "ITC-4300000...";
-        dp2.cabinetNumber = "P06";
-        dp2.uMessage = "24-24";
-        dp2.deviceOrientation = "前";
-        dp2.manageIP = "10.207.90.50";
-        dp2.saveIP = null;
-        dp2.iPMIIP = null;
-        dp2.businessIP = null;
-        dp2.projectName = "2021年IT基础...";
-        dp2.equipmentSupplier = "神州数码";
-        dp2.assetOwner = "陈国威(chen guo wei)";
-        dp2.territorialPAManager = "张泽宇(zhang ze yu)";
-        dp2.equipmentBTTOrganization = "中移动信息";
-        dp2.facilityManagementOrganization = null;
-        dp2.equipmentMaintenanceOrganization = "湖南公司信...";
-        dp2.businessSystem = null;
+        //dp1 = new DeviceParameters();
+        //dp1.deviceId = 1;
+        //dp1.deviceName = "NetView4000_1";
+        //dp1.deviceModel = "NetView4000";
+        //dp1.deviceType = "流量溯源";
+        //dp1.assetTagNumber = "781010G001AAAAAAA";
+        //dp1.serialNumber = "B4U120800057";
+        //dp1.equipmentNumber = "HW-SEC-OTAAAAAA";
+        //dp1.assetStatus = null;
+        //dp1.deviceStatus = "运行中";
+        //dp1.deliveryData = "2022-11-25";
+        //dp1.enabledDate = "2022-05-31";
+        //dp1.serverUsageType = null;
+        //dp1.typicalModel = null;
+        //dp1.equipmentBrand = "神州数码";
+        //dp1.manufacturer = "神州数码";
+        //dp1.equipmentWeight = 30;
+        //dp1.equipmentPower = 1200;
+        //dp1.originType = "国产";
+        //dp1.collectionCPName = "其它安...";
+        //dp1.resourcePool = "湘潭资源池";
+        //dp1.wherePOD = "PUB1-1";
+        //dp1.networkDomain = "公共域";
+        //dp1.city = "湖南";
+        //dp1.building = "二级楼";
+        //dp1.floor = "5";
+        //dp1.computerRoomName = "507机房";
+        //dp1.computerRoomCoding = "ITC-4300000...";
+        //dp1.cabinetNumber = "P06";
+        //dp1.uMessage = "24-24";
+        //dp1.deviceOrientation = "前";
+        //dp1.manageIP = "10.207.90.50";
+        //dp1.saveIP = null;
+        //dp1.iPMIIP = null;
+        //dp1.businessIP = null;
+        //dp1.projectName = "2021年IT基础...";
+        //dp1.equipmentSupplier = "神州数码";
+        //dp1.assetOwner = "陈国威(chen guo wei)";
+        //dp1.territorialPAManager = "张泽宇(zhang ze yu)";
+        //dp1.equipmentBTTOrganization = "中移动信息";
+        //dp1.facilityManagementOrganization = null;
+        //dp1.equipmentMaintenanceOrganization = "湖南公司信...";
+        //dp1.businessSystem = null;
+
+        //dp2 = new DeviceParameters();
+        //dp2.deviceId = 2;
+        //dp2.deviceName = "NetView4000_2";
+        //dp2.deviceModel = "NetView4000";
+        //dp2.deviceType = "流量溯源";
+        //dp2.assetTagNumber = "781010G002AAAAAAA";
+        //dp2.serialNumber = "B4U120800057";
+        //dp2.equipmentNumber = "HW-SEC-OTBBBBB";
+        //dp2.assetStatus = null;
+        //dp2.deviceStatus = "运行中";
+        //dp2.deliveryData = "2022-11-25";
+        //dp2.enabledDate = "2022-05-31";
+        //dp2.serverUsageType = null;
+        //dp2.typicalModel = null;
+        //dp2.equipmentBrand = "神州数码";
+        //dp2.manufacturer = "神州数码";
+        //dp2.equipmentWeight = 30;
+        //dp2.equipmentPower = 1200;
+        //dp2.originType = "国产";
+        //dp2.collectionCPName = "其它安...";
+        //dp2.resourcePool = "湘潭资源池";
+        //dp2.wherePOD = "PUB1-1";
+        //dp2.networkDomain = "公共域";
+        //dp2.city = "湖南";
+        //dp2.building = "二级楼";
+        //dp2.floor = "5";
+        //dp2.computerRoomName = "507机房";
+        //dp2.computerRoomCoding = "ITC-4300000...";
+        //dp2.cabinetNumber = "P06";
+        //dp2.uMessage = "24-24";
+        //dp2.deviceOrientation = "前";
+        //dp2.manageIP = "10.207.90.50";
+        //dp2.saveIP = null;
+        //dp2.iPMIIP = null;
+        //dp2.businessIP = null;
+        //dp2.projectName = "2021年IT基础...";
+        //dp2.equipmentSupplier = "神州数码";
+        //dp2.assetOwner = "陈国威(chen guo wei)";
+        //dp2.territorialPAManager = "张泽宇(zhang ze yu)";
+        //dp2.equipmentBTTOrganization = "中移动信息";
+        //dp2.facilityManagementOrganization = null;
+        //dp2.equipmentMaintenanceOrganization = "湖南公司信...";
+        //dp2.businessSystem = null;
 
 
 

+ 91 - 88
Assets/Scripts/Managers/MachineRoomManager.cs

@@ -56,7 +56,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
     /// </summary>
     private DeviceParameters dp1;
     private DeviceParameters dp2;
-
+    public Text testText;
     /// <summary>
     /// 机房列表
     /// </summary>
@@ -216,93 +216,93 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
             data.listEquipmentData = JsonConvert.DeserializeObject<List<MachineParameters>>(msg);
         }
 
-        dp1 = new DeviceParameters();
-        dp1.deviceId = 1;
-        dp1.deviceName = "NetView4000_1";
-        dp1.deviceModel = "NetView4000";
-        dp1.deviceType = "流量溯源";
-        dp1.assetTagNumber = "781010G001AAAAAAA";
-        dp1.serialNumber = "B4U120800057";
-        dp1.equipmentNumber = "HW-SEC-OTAAAAAA";
-        dp1.assetStatus = null;
-        dp1.deviceStatus = "运行中";
-        dp1.deliveryData = "2022-11-25";
-        dp1.enabledDate = "2022-05-31";
-        dp1.serverUsageType = null;
-        dp1.typicalModel = null;
-        dp1.equipmentBrand = "神州数码";
-        dp1.manufacturer = "神州数码";
-        dp1.equipmentWeight = 30;
-        dp1.equipmentPower = 1200;
-        dp1.originType = "国产";
-        dp1.collectionCPName = "其它安...";
-        dp1.resourcePool = "湘潭资源池";
-        dp1.wherePOD = "PUB1-1";
-        dp1.networkDomain = "公共域";
-        dp1.city = "湖南";
-        dp1.building = "二级楼";
-        dp1.floor = "5";
-        dp1.computerRoomName = "507机房";
-        dp1.computerRoomCoding = "ITC-4300000...";
-        dp1.cabinetNumber = "P06";
-        dp1.uMessage = "24-24";
-        dp1.deviceOrientation = "前";
-        dp1.manageIP = "10.207.90.50";
-        dp1.saveIP = null;
-        dp1.iPMIIP = null;
-        dp1.businessIP = null;
-        dp1.projectName = "2021年IT基础...";
-        dp1.equipmentSupplier = "神州数码";
-        dp1.assetOwner = "陈国威(chen guo wei)";
-        dp1.territorialPAManager = "张泽宇(zhang ze yu)";
-        dp1.equipmentBTTOrganization = "中移动信息";
-        dp1.facilityManagementOrganization = null;
-        dp1.equipmentMaintenanceOrganization = "湖南公司信...";
-        dp1.businessSystem = null;
-
-        dp2 = new DeviceParameters();
-        dp2.deviceId = 2;
-        dp2.deviceName = "NetView4000_2";
-        dp2.deviceModel = "NetView4000";
-        dp2.deviceType = "流量溯源";
-        dp2.assetTagNumber = "781010G002AAAAAAA";
-        dp2.serialNumber = "B4U120800057";
-        dp2.equipmentNumber = "HW-SEC-OTBBBBB";
-        dp2.assetStatus = null;
-        dp2.deviceStatus = "运行中";
-        dp2.deliveryData = "2022-11-25";
-        dp2.enabledDate = "2022-05-31";
-        dp2.serverUsageType = null;
-        dp2.typicalModel = null;
-        dp2.equipmentBrand = "神州数码";
-        dp2.manufacturer = "神州数码";
-        dp2.equipmentWeight = 30;
-        dp2.equipmentPower = 1200;
-        dp2.originType = "国产";
-        dp2.collectionCPName = "其它安...";
-        dp2.resourcePool = "湘潭资源池";
-        dp2.wherePOD = "PUB1-1";
-        dp2.networkDomain = "公共域";
-        dp2.city = "湖南";
-        dp2.building = "二级楼";
-        dp2.floor = "5";
-        dp2.computerRoomName = "507机房";
-        dp2.computerRoomCoding = "ITC-4300000...";
-        dp2.cabinetNumber = "P06";
-        dp2.uMessage = "24-24";
-        dp2.deviceOrientation = "前";
-        dp2.manageIP = "10.207.90.50";
-        dp2.saveIP = null;
-        dp2.iPMIIP = null;
-        dp2.businessIP = null;
-        dp2.projectName = "2021年IT基础...";
-        dp2.equipmentSupplier = "神州数码";
-        dp2.assetOwner = "陈国威(chen guo wei)";
-        dp2.territorialPAManager = "张泽宇(zhang ze yu)";
-        dp2.equipmentBTTOrganization = "中移动信息";
-        dp2.facilityManagementOrganization = null;
-        dp2.equipmentMaintenanceOrganization = "湖南公司信...";
-        dp2.businessSystem = null;
+        //dp1 = new DeviceParameters();
+        //dp1.deviceId = 1;
+        //dp1.deviceName = "NetView4000_1";
+        //dp1.deviceModel = "NetView4000";
+        //dp1.deviceType = "流量溯源";
+        //dp1.assetTagNumber = "781010G001AAAAAAA";
+        //dp1.serialNumber = "B4U120800057";
+        //dp1.equipmentNumber = "HW-SEC-OTAAAAAA";
+        //dp1.assetStatus = null;
+        //dp1.deviceStatus = "运行中";
+        //dp1.deliveryData = "2022-11-25";
+        //dp1.enabledDate = "2022-05-31";
+        //dp1.serverUsageType = null;
+        //dp1.typicalModel = null;
+        //dp1.equipmentBrand = "神州数码";
+        //dp1.manufacturer = "神州数码";
+        //dp1.equipmentWeight = 30;
+        //dp1.equipmentPower = 1200;
+        //dp1.originType = "国产";
+        //dp1.collectionCPName = "其它安...";
+        //dp1.resourcePool = "湘潭资源池";
+        //dp1.wherePOD = "PUB1-1";
+        //dp1.networkDomain = "公共域";
+        //dp1.city = "湖南";
+        //dp1.building = "二级楼";
+        //dp1.floor = "5";
+        //dp1.computerRoomName = "507机房";
+        //dp1.computerRoomCoding = "ITC-4300000...";
+        //dp1.cabinetNumber = "P06";
+        //dp1.uMessage = "24-24";
+        //dp1.deviceOrientation = "前";
+        //dp1.manageIP = "10.207.90.50";
+        //dp1.saveIP = null;
+        //dp1.iPMIIP = null;
+        //dp1.businessIP = null;
+        //dp1.projectName = "2021年IT基础...";
+        //dp1.equipmentSupplier = "神州数码";
+        //dp1.assetOwner = "陈国威(chen guo wei)";
+        //dp1.territorialPAManager = "张泽宇(zhang ze yu)";
+        //dp1.equipmentBTTOrganization = "中移动信息";
+        //dp1.facilityManagementOrganization = null;
+        //dp1.equipmentMaintenanceOrganization = "湖南公司信...";
+        //dp1.businessSystem = null;
+
+        //dp2 = new DeviceParameters();
+        //dp2.deviceId = 2;
+        //dp2.deviceName = "NetView4000_2";
+        //dp2.deviceModel = "NetView4000";
+        //dp2.deviceType = "流量溯源";
+        //dp2.assetTagNumber = "781010G002AAAAAAA";
+        //dp2.serialNumber = "B4U120800057";
+        //dp2.equipmentNumber = "HW-SEC-OTBBBBB";
+        //dp2.assetStatus = null;
+        //dp2.deviceStatus = "运行中";
+        //dp2.deliveryData = "2022-11-25";
+        //dp2.enabledDate = "2022-05-31";
+        //dp2.serverUsageType = null;
+        //dp2.typicalModel = null;
+        //dp2.equipmentBrand = "神州数码";
+        //dp2.manufacturer = "神州数码";
+        //dp2.equipmentWeight = 30;
+        //dp2.equipmentPower = 1200;
+        //dp2.originType = "国产";
+        //dp2.collectionCPName = "其它安...";
+        //dp2.resourcePool = "湘潭资源池";
+        //dp2.wherePOD = "PUB1-1";
+        //dp2.networkDomain = "公共域";
+        //dp2.city = "湖南";
+        //dp2.building = "二级楼";
+        //dp2.floor = "5";
+        //dp2.computerRoomName = "507机房";
+        //dp2.computerRoomCoding = "ITC-4300000...";
+        //dp2.cabinetNumber = "P06";
+        //dp2.uMessage = "24-24";
+        //dp2.deviceOrientation = "前";
+        //dp2.manageIP = "10.207.90.50";
+        //dp2.saveIP = null;
+        //dp2.iPMIIP = null;
+        //dp2.businessIP = null;
+        //dp2.projectName = "2021年IT基础...";
+        //dp2.equipmentSupplier = "神州数码";
+        //dp2.assetOwner = "陈国威(chen guo wei)";
+        //dp2.territorialPAManager = "张泽宇(zhang ze yu)";
+        //dp2.equipmentBTTOrganization = "中移动信息";
+        //dp2.facilityManagementOrganization = null;
+        //dp2.equipmentMaintenanceOrganization = "湖南公司信...";
+        //dp2.businessSystem = null;
 
 
 
@@ -720,7 +720,10 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
         PlayerPrefs.SetString("MachineRoomCabinetData", JsonConvert.SerializeObject(data.listEquipmentData));
         PlayerPrefs.SetString("MachineRoomData", JsonConvert.SerializeObject(data));
 
+        
+
         Debug.Log(" 保存成功 " + JsonConvert.SerializeObject(data));
+        testText.text = JsonConvert.SerializeObject(data);
     }
 
     private void SaveData()

+ 6 - 0
Assets/Scripts/机房数据说明文档.txt

@@ -0,0 +1,6 @@
+	需要提供机房信息
+1. 机房的信息  机房的长宽 机房名称  机房内的机柜列表
+2. 机柜信息  机柜的位置 机柜的长宽  机柜的前后和左右间距  每台机柜对应的识别TagID 单个机柜内的刀片机列表
+3. 刀片机的信息  刀片机的U位 刀片机的详情信息 等数据
+
+总结一下 是个三级列表   机房 ==> 机柜列表      机柜==> 刀片机列表

+ 7 - 0
Assets/Scripts/机房数据说明文档.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cd39c8ed44c8df3429cec353378c116b
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Some files were not shown because too many files changed in this diff