大屏

huanghongfeng

2024-07-04 08dd2afd7a9614dad029e94918516b068d413cac

大屏

 ´úÂë¹ÜÀí/PCS/WCS_Client/package.json

@@ -11,12 +11,14 @@
  "dependencies": {
    "@element-plus/icons-vue": "^2.1.0",
    "@microsoft/signalr": "^6.0.4",
    "@vue/reactivity": "^3.4.31",
    "ali-oss": "^6.17.1",
    "axios": "^0.21.1",
    "core-js": "^3.6.5",
    "echarts": "^5.0.2",
    "element-plus": "^2.2.14",
    "less": "^4.1.1",
    "lodash": "^4.17.21",
    "vue": "^3.2.37",
    "vue-draggable-next": "^2.0.1",
    "vue-router": "^4.0.0-0",

 ´úÂë¹ÜÀí/PCS/WCS_Client/src/api/http.js

@@ -12,7 +12,7 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
    axios.defaults.baseURL = 'http://192.168.12.101:8099/';
    axios.defaults.baseURL = 'http://127.0.0.1:8099/';
}
else if (process.env.NODE_ENV == 'debug') {
    axios.defaults.baseURL = 'http://192.168.12.101:8099/';

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/PLCDBItem/Oiling_machine.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,81 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace WIDESEA_Comm.PLCDBItem
{
    public class Oiling_machine
    {
        /// <summary>
        /// å¯¹è±¡é›†åˆ
        /// </summary>
        public static List<Oiling_machine> Oiling_machineDBItem = new List<Oiling_machine>();

        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// è‡ªåŠ¨æ¨¡å¼
        /// </summary>
        public bool R_Automatic_mode{ get; set; }

        /// <summary>
        /// æ‰‹åŠ¨æ¨¡å¼
        /// </summary>
        public bool R_Manual_mode { get; set; }

        /// <summary>
        /// è‡ªåŠ¨è¿è¡Œä¸­
        /// </summary>
        public bool R_AutoRunning { get; set; }

        /// <summary>
        /// 1：无故障， 0：有故障
        /// </summary>
        public bool R_NO_FAULT { get; set; }

        /// <summary>
        /// è®¾å¤‡ä¸Šç”µ
        /// </summary>
        public bool R_state_power_on { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public bool R_state_automatic_se_lected { get; set; }

        /// <summary>
        /// æ€¥åœä¿¡å·
        /// </summary>
        public bool R_EstopOK { get; set; }

        /// <summary>
        /// è½¦è½®åˆ°è¾¾å–·æ²¹é“¾æ¡
        /// </summary>
        public bool R_WheelOnPosition { get; set; }

        /// <summary>
        /// è½¦è½®SN号
        /// </summary>
        public string R_Wheel_SN { get; set; }

        /// <summary>
        /// è½¦è½®ç±»åž‹
        /// </summary>
        public Int16 R_Wheel_Type { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public byte R_Part_Status { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public byte R_Part_Process { get; set; }
    }
}

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/GetWheelDate.cs

@@ -6,6 +6,7 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Comm;
using WIDESEA_Comm.PLCDBItem;
using WIDESEA_Core.Extensions;
using WIDESEA_WCS.WCSClient;

@@ -397,5 +398,87 @@
            }
            return gantryDBItems;
        }


        /// <summary>
        /// èŽ·å–涂油机信息
        /// </summary>
        /// <param name="client"></param>
        /// <returns></returns>
        public static List<Oiling_machine> GetOiling_machine(PLCClient client)
        {
            List<Oiling_machine> gantryDBItems = new List<Oiling_machine>();
            PropertyInfo[] propertyInfos = typeof(Oiling_machine).GetProperties();
            var groups = client.itemGroups.Where(x => x.opratortype == "oiler").OrderBy(x => x.Methods).ThenBy(x => x.name).GroupBy(x => x.Methods).ToList();
            foreach (var key in groups)
            {
                try
                {
                    Oiling_machine StackerDBItem = new Oiling_machine();
                    foreach (var propertyInfo in propertyInfos)
                    {
                        if (propertyInfo.Name == "Name")
                        {
                            StackerDBItem.Name = key.Key;
                        }
                        else
                        {
                            DBItemGroup group = key.FirstOrDefault(x => x.name == propertyInfo.Name);
                            if (group != null)
                            {
                                var readData = DBExtension.Read(group, client);
                                switch (propertyInfo.Name)
                                {
                                    case "R_Automatic_mode":
                                        StackerDBItem.R_Automatic_mode = Convert.ToBoolean(readData);
                                        break;
                                    case "R_Manual_mode":
                                        StackerDBItem.R_Manual_mode = Convert.ToBoolean(readData);
                                        break;
                                    case "R_AutoRunning":
                                        StackerDBItem.R_AutoRunning = Convert.ToBoolean(readData);
                                        break;
                                    case "R_NO_FAULT":
                                        StackerDBItem.R_NO_FAULT = Convert.ToBoolean(readData);
                                        break;
                                    case "R_state_power_on":
                                        StackerDBItem.R_state_power_on = Convert.ToBoolean(readData);
                                        break;
                                    case "R_state_automatic_se_lected":
                                        StackerDBItem.R_state_automatic_se_lected = Convert.ToBoolean(readData);
                                        break;
                                    case "R_EstopOK":
                                        StackerDBItem.R_EstopOK = Convert.ToBoolean(readData);
                                        break;
                                    case "R_WheelOnPosition":
                                        StackerDBItem.R_WheelOnPosition = Convert.ToBoolean(readData);
                                        break;
                                    case "R_Wheel_SN":
                                        StackerDBItem.R_Wheel_SN = Convert.ToString(readData);
                                        break;
                                    case "R_Wheel_Type":
                                        StackerDBItem.R_Wheel_Type = Convert.ToInt16(readData);
                                        break;
                                    case "R_Part_Status":
                                        StackerDBItem.R_Part_Status = Convert.ToByte(readData);
                                        break;
                                    case "R_Part_Process":
                                        StackerDBItem.R_Part_Process = Convert.ToByte(readData);
                                        break;
                                }
                            }
                        }
                    }
                    gantryDBItems.Add(StackerDBItem);
                }
                catch (Exception ex)
                {

                }

            }
            return gantryDBItems;
        }

    }
}

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/Wheel_info_trace.cs

@@ -87,6 +87,8 @@
                            info.trace_billetID = Work.billetID.ToString();
                        }
                        traceRepository.Add(info, true);


                        client.Write(key.FirstOrDefault(x => x.name == "oi_on").dbAddress, (byte)0);//信号复位
                    }
                    #endregion

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/One_two_unitJob.cs

@@ -105,19 +105,20 @@
            VOLContext context = new VOLContext();
            Idt_plcinfodetailRepository repository = new dt_plcinfodetailRepository(context);
            List<dt_plcinfodetail> plcinfodetail = new List<dt_plcinfodetail>();
            string name = "VK5";
            for (int i = 1; i <= 2; i++)
            string name = "Pipeline";
            for (int i = 1; i <= 3; i++)
            {
                dt_plcinfodetail dt_Plcinfodetail1 = new dt_plcinfodetail()
                {
                    plcdetail_id = Guid.NewGuid(),
                    plcdetail_iotype = name,
                    plcdetail_db = "DB603",
                    plcdetail_value = (0 + (i - 1) * 144).ToString(),
                    plcdetail_valtype = "byte",
                    plcdetail_name = "oi_on",
                    plcdetail_opratortype = "labeller",
                    plcdetail_remark = "申请",
                    plcdetail_db = "DB29",
                    plcdetail_value = (21 + (i - 1) * 80).ToString(),
                    plcdetail_valtype = "string",
                    plcdetail_len = 20,
                    plcdetail_name = "R_Wheel_SN",
                    plcdetail_opratortype = "oiler",
                    plcdetail_remark = "Wheel_SN",
                    plcdetail_number = i + "单元",
                };
                plcinfodetail.Add(dt_Plcinfodetail1);
@@ -125,13 +126,12 @@
                {
                    plcdetail_id = Guid.NewGuid(),
                    plcdetail_iotype = name,
                    plcdetail_db = "DB603",
                    plcdetail_value = (2 + (i - 1) * 144).ToString(),
                    plcdetail_len = 20,
                    plcdetail_valtype = "string",
                    plcdetail_name = "o_wp_id",
                    plcdetail_opratortype = "labeller",
                    plcdetail_remark = "车轮SN号",
                    plcdetail_db = "DB29",
                    plcdetail_value = (22 + (i - 1) * 80).ToString(),
                    plcdetail_valtype = "int16",
                    plcdetail_name = "R_Wheel_Type",
                    plcdetail_opratortype = "oiler",
                    plcdetail_remark = "Wheel_Type",
                    plcdetail_number = i + "单元",
                };
                plcinfodetail.Add(dt_Plcinfodetail2);
@@ -139,13 +139,12 @@
                {
                    plcdetail_id = Guid.NewGuid(),
                    plcdetail_iotype = name,
                    plcdetail_db = "DB603",
                    plcdetail_value = (24 + (i - 1) * 144).ToString(),
                    plcdetail_len = 20,
                    plcdetail_valtype = "string",
                    plcdetail_name = "i_job_id",
                    plcdetail_opratortype = "labeller",
                    plcdetail_remark = "工单编号",
                    plcdetail_db = "DB29",
                    plcdetail_value = (24 + (i - 1) * 80).ToString(),
                    plcdetail_valtype = "byte",
                    plcdetail_name = "R_Part_Status",
                    plcdetail_opratortype = "oiler",
                    plcdetail_remark = "Part_Status",
                    plcdetail_number = i + "单元",
                };
                plcinfodetail.Add(dt_Plcinfodetail3);
@@ -153,85 +152,15 @@
                {
                    plcdetail_id = Guid.NewGuid(),
                    plcdetail_iotype = name,
                    plcdetail_db = "DB603",
                    plcdetail_value = (22 + (i - 1) * 144).ToString(),
                    plcdetail_db = "DB29",
                    plcdetail_value = (25 + (i - 1) * 80).ToString(),
                    plcdetail_valtype = "byte",
                    plcdetail_name = "i_status",
                    plcdetail_opratortype = "labeller",
                    plcdetail_remark = "状态",
                    plcdetail_name = "R_Part_Process",
                    plcdetail_opratortype = "oiler",
                    plcdetail_remark = "Part_Process",
                    plcdetail_number = i + "单元",
                };
                plcinfodetail.Add(dt_Plcinfodetail4);
                dt_plcinfodetail dt_Plcinfodetail5 = new dt_plcinfodetail()
                {
                    plcdetail_id = Guid.NewGuid(),
                    plcdetail_iotype = name,
                    plcdetail_db = "DB603",
                    plcdetail_value = (44 + (i - 1) * 144).ToString(),
                    plcdetail_len = 20,
                    plcdetail_valtype = "string",
                    plcdetail_name = "i_heat_id",
                    plcdetail_opratortype = "labeller",
                    plcdetail_remark = "炉代号",
                    plcdetail_number = i + "单元",
                };
                plcinfodetail.Add(dt_Plcinfodetail5);
                dt_plcinfodetail dt_Plcinfodetail6 = new dt_plcinfodetail()
                {
                    plcdetail_id = Guid.NewGuid(),
                    plcdetail_iotype = name,
                    plcdetail_db = "DB603",
                    plcdetail_value = (64 + (i - 1) * 144).ToString(),
                    plcdetail_len = 20,
                    plcdetail_valtype = "string",
                    plcdetail_name = "i_billet_id",
                    plcdetail_opratortype = "labeller",
                    plcdetail_remark = "钢坯号",
                    plcdetail_number = i + "单元",
                };
                plcinfodetail.Add(dt_Plcinfodetail6);
                dt_plcinfodetail dt_Plcinfodetail7 = new dt_plcinfodetail()
                {
                    plcdetail_id = Guid.NewGuid(),
                    plcdetail_iotype = name,
                    plcdetail_db = "DB603",
                    plcdetail_value = (84 + (i - 1) * 144).ToString(),
                    plcdetail_len = 20,
                    plcdetail_valtype = "string",
                    plcdetail_name = "i_batch_id",
                    plcdetail_opratortype = "labeller",
                    plcdetail_remark = "热处理批次",
                    plcdetail_number = i + "单元",
                };
                plcinfodetail.Add(dt_Plcinfodetail7);
                dt_plcinfodetail dt_Plcinfodetail8 = new dt_plcinfodetail()
                {
                    plcdetail_id = Guid.NewGuid(),
                    plcdetail_iotype = name,
                    plcdetail_db = "DB603",
                    plcdetail_value = (104 + (i - 1) * 144).ToString(),
                    plcdetail_len = 20,
                    plcdetail_valtype = "string",
                    plcdetail_name = "i_drawing_id",
                    plcdetail_opratortype = "labeller",
                    plcdetail_remark = "图号",
                    plcdetail_number = i + "单元",
                };
                plcinfodetail.Add(dt_Plcinfodetail8);
                dt_plcinfodetail dt_Plcinfodetail9 = new dt_plcinfodetail()
                {
                    plcdetail_id = Guid.NewGuid(),
                    plcdetail_iotype = name,
                    plcdetail_db = "DB603",
                    plcdetail_value = (124 + (i - 1) * 144).ToString(),
                    plcdetail_len = 20,
                    plcdetail_valtype = "string",
                    plcdetail_name = "i_wheel_type",
                    plcdetail_opratortype = "labeller",
                    plcdetail_remark = "i_wheel_type",
                    plcdetail_number = i + "单元",
                };
                plcinfodetail.Add(dt_Plcinfodetail9);
            }
            repository.AddRange(plcinfodetail, true);
        }

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/PipelineJob.cs

@@ -12,6 +12,7 @@
using System.Xml.Linq;
using WIDESEA_Comm;
using WIDESEA_Comm.LogInfo;
using WIDESEA_Comm.PLCDBItem;
using WIDESEA_Comm.TaskNo;
using WIDESEA_Core.BaseProvider;
using WIDESEA_Core.EFDbContext;
@@ -58,6 +59,10 @@
            pipeline.Loadinglevel(client);
            pipeline.AutoEmptyTray(client);
            pipeline.StationState(client);

            #region æ•°æ®é‡‡é›†
            Oiling_machine.Oiling_machineDBItem = GetDate.GetOiling_machine(client);
            #endregion
        }
    }
}

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs

@@ -45,9 +45,9 @@
            info_interaction.labeller(client);
            #endregion
            #region è½¦è½®ä¿¡æ¯è¿½æº¯
            Wheel_info_trace.Wheel_online(client);
            /*Wheel_info_trace.Wheel_online(client);
            Wheel_info_trace.Wheel_machine(client);
            Wheel_info_trace.Wheel_offline(client);
            Wheel_info_trace.Wheel_offline(client);*/
            #endregion
            #region ä¿¡æ¯é‡‡é›†
            WheelDBItem.VK4WheelDBItem = GetDate.GetWheelDate(client);

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs

@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Linq;
using WIDESEA_Comm;
using WIDESEA_Comm.PLCDBItem;
using WIDESEA_Core.EFDbContext;
using WIDESEA_Core.Extensions;
using WIDESEA_Core.Utilities;
@@ -39,7 +40,8 @@
        {
            var DBIems = WheelDBItem.VK4WheelDBItem; //获取辊道，输送线信息
            var DBIems2 = VKDBItem.VK4DBItem;       //VK4状态信息对象集合
                                                    // VK4桁架机械手对象集合

            var DBIems3 = Oiling_machine.Oiling_machineDBItem;

            if (DBIems.Count == 0)
            {
@@ -767,6 +769,7 @@
        }
        #endregion

        #region pcs平面图库位信息
        [HttpPost("dt_stationinfolist")]
        public IActionResult dt_stationinfolist()
        {
@@ -796,5 +799,9 @@
            }
            return Ok(responseData);
        }
        #endregion


       
    }
}

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WebApi/appsettings.json

@@ -16,7 +16,7 @@
  "Connection": {
    "DBType": "MsSql", //MySql/MsSql/PgSql  //数据库类型，如果使用的是sqlserver此处应设置为MsSql
    //sqlserver连接字符串P@ssw0rd
    "DbConnectionString": "Data Source=192.168.12.101;Initial Catalog=WIDESEA_DB;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
    "DbConnectionString": "Data Source=.;Initial Catalog=WIDESEA_DB_TY_TY;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
    //"DbConnectionString": "Data Source=.;Initial Catalog=WIDESEA_DB;Persist Security Info=True;User ID=sa;Password=P@ssw0rd;Connect Timeout=500;",

    //mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20)

 ´úÂë¹ÜÀí/WMS/WMS_Client/package.json

@@ -11,12 +11,14 @@
  "dependencies": {
    "@element-plus/icons-vue": "^2.1.0",
    "@microsoft/signalr": "^6.0.4",
    "@vue/reactivity": "^3.4.31",
    "ali-oss": "^6.17.1",
    "axios": "^0.21.1",
    "core-js": "^3.6.5",
    "echarts": "^5.0.2",
    "element-plus": "^2.2.14",
    "less": "^4.1.1",
    "lodash": "^4.17.21",
    "vue": "^3.2.37",
    "vue-draggable-next": "^2.0.1",
    "vue-router": "^4.0.0-0",

 ´úÂë¹ÜÀí/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs

@@ -171,7 +171,7 @@
            var data3 = db2.Find(_ => true).Where(x => x.stationCode.Contains("A") || x.stationCode.Contains("B") || x.stationCode.Contains("C") || x.stationCode.Contains("D01")).ToList();

            //库区图号数量,外加空托数量
            var Number_wheels = data3.Where(_ => true)
            var Number_wheels1 = data3.Where(_ => true)
             .GroupBy(s => new
             {
                 stationType = string.IsNullOrEmpty(s.stationType) ? s.tray_type : s.stationType,
@@ -183,6 +183,7 @@
                 tray_type = g.Key.tray_type
             }).ToList();

            var Number_wheels = Number_wheels1.Where(x => x.stationType != "LargeTray" && x.stationType != "SmallTray").ToList();
            #endregion


@@ -262,9 +263,23 @@
                    x.Key.stationType,
                    combined_heatNumber = string.Join(", ", x.Select(y => y.heatNumber).Distinct())
                })
                .Where(x => !string.IsNullOrEmpty(x.stationType) && !string.IsNullOrEmpty(x.combined_heatNumber))
                .OrderBy(x => x.Area)
                .ThenBy(x => x.line)
                .GroupBy(x => x.line) // ä½¿ç”¨ GroupBy æŒ‰ Line å­—段分组
                .Select(group =>
                {
                // æ‰¾åˆ°æ¯ä¸ªåˆ†ç»„中第一个 stationType ä¸ä¸ºç©ºçš„元素
                var firstWithStationType = group.FirstOrDefault(x => !string.IsNullOrEmpty(x.stationType));
                if (firstWithStationType != null)
                {
                    return firstWithStationType;
                }
                else
                {
                // å¦‚果分组中都是 stationType ä¸ºç©ºï¼Œåˆ™è¿”回第一个元素（此时即为 stationType ä¸ºç©ºçš„）
                    return group.First();
                }
                })
                .ToList();

                dataList = dataList.Concat(data).ToList();
@@ -325,7 +340,7 @@
            Idt_agvtaskRepository db = new dt_agvtaskRepository(volContext);
            var dataList = db.Find(_ => true).OrderByDescending(x => x.agv_createtime).ToList();

            var data = dataList.Where(x => x.agv_tasktype != "Queue").Take(15).ToList();
            var data = dataList.Where(x => x.agv_taskstate != "队列" && x.agv_taskstate != "Queue" && x.agv_taskstate != "暂停" && x.agv_taskstate != "Pause").ToList();
            if (data.Count <= 15)
            {
                data = dataList.Take(15).ToList();

 ´úÂë¹ÜÀí/´óÆÁ/src/components/echart/bottom/bottomLeftChart/chart.vue

@@ -1,11 +1,7 @@
<template>
  <div>
    <!-- å¹´åº¦å¼€å·¥çŽ‡ -->
    <Echart
      :options="options"
      id="bottomLeftChart"
      height="480px"
    ></Echart>
    <Echart :options="options" id="bottomLeftChart" height="480px"></Echart>
  </div>
</template>

@@ -50,11 +46,9 @@
              color: "#B4B4B4"
            },
            top: "0%",
            left:"15%"
            
          },
          grid: {
            x: "8%",
            x: "12%",
            width: "90%",
            y: "4%"
          },
@@ -113,14 +107,22 @@
            {
              name: "出库量",
              type: "bar",
              barWidth: 40,
              barWidth: 25,
              itemStyle: {
                normal: {
                  barBorderRadius: 5,
                  color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
                    { offset: 0, color: "#956FD4" },
                    { offset: 1, color: "#3EACE5" }
                  ])
                  ]),
                  label: {
                    show: true, // æ˜¾ç¤ºæ ‡ç­¾
                    position: 'top', // æ ‡ç­¾ä½ç½®ï¼Œå¯ä»¥è®¾ç½® 'top', 'insideTop', 'inside', 'insideBottom' ç­‰
                    formatter: '{c}', // æ ‡ç­¾å†…容格式器，{c} è¡¨ç¤ºæ•°æ®å€¼
                    fontSize: 14, // æ ‡ç­¾æ–‡å­—大小，默认为 12
                    fontWeight: 'bold', // æ ‡ç­¾æ–‡å­—粗细，默认为 'normal'
                    color: '#ffffff' // æ ‡ç­¾æ–‡å­—颜色，默认为 '#333'
                  }
                }
              },
              data: newData.barData
@@ -128,8 +130,7 @@
            {
              name: "入库量",
              type: "bar",
              barGap: "-100%",
              barWidth: 40,
              barWidth: 25,
              itemStyle: {
                normal: {
                  barBorderRadius: 5,
@@ -137,7 +138,15 @@
                    { offset: 0, color: "rgba(156,107,211,0.8)" },
                    { offset: 0.2, color: "rgba(156,107,211,0.5)" },
                    { offset: 1, color: "rgba(156,107,211,0.2)" }
                  ])
                  ]),
                  label: {
                    show: true, // æ˜¾ç¤ºæ ‡ç­¾
                    position: 'top', // æ ‡ç­¾ä½ç½®ï¼Œå¯ä»¥è®¾ç½® 'top', 'insideTop', 'inside', 'insideBottom' ç­‰
                    formatter: '{c}', // æ ‡ç­¾å†…容格式器，{c} è¡¨ç¤ºæ•°æ®å€¼
                    fontSize: 14, // æ ‡ç­¾æ–‡å­—大小，默认为 12
                    fontWeight: 'bold', // æ ‡ç­¾æ–‡å­—粗细，默认为 'normal'
                    color: '#ffffff' // æ ‡ç­¾æ–‡å­—颜色，默认为 '#333'
                  }
                }
              },
              z: -12,

 ´úÂë¹ÜÀí/´óÆÁ/src/main.js

@@ -21,7 +21,8 @@

Vue.prototype.$http = axios.create({
  timeout: 20000,
  baseURL: 'http://192.168.12.101:8098', 
  //baseURL: 'http://192.168.12.101:8098', 
  baseURL: 'http://localhost:8098', 
});
//5.x å¼•ç”¨æ–¹å¼ä¸ºæŒ‰éœ€å¼•ç”¨
//希望使用5.x版本的话,需要在package.json中更新版本号,并切换引用方式

 ´úÂë¹ÜÀí/´óÆÁ/src/views/bottomRight.vue

@@ -1,6 +1,6 @@
<template>
  <div id="bottomRight" >
    <div class="bg-color-black" style="width: 100%;">
    <div class="bg-color-black" >
      <!-- <div class="d-flex pt-2 pl-2">
        <span>
          <icon name="chart-area" class="text-icon"></icon>
@@ -33,7 +33,7 @@

<style lang="scss" class>
$box-height: 520px;
$box-width: 895px;
$box-width: 600px;
#bottomRight {
  padding: 14px 16px;
  height: $box-height;

 ´úÂë¹ÜÀí/´óÆÁ/src/views/centerRight3.vue

@@ -1,7 +1,7 @@

<template>
  <div id="centerRight1">
    <div class="bg-color-black" style="width: 100%;">
    <div class="bg-color-black" >
      <div class="d-flex pt-2 pl-2">
        <span>
          <icon name="chart-line" class="text-icon"></icon>
@@ -45,26 +45,26 @@
        this.changeNumber()
      setInterval(() => {
        this.changeNumber()
      },10000)
      },100)
    },
    changeNumber() {
      this.$http.post("/api/Largescreen/Current_agvtask", "查询中...")
      this.$http.post('/api/Largescreen/Current_agvtask')
      .then(response => {
          let GetAGVTaskData = []
          if(response.data<=0){
            let data = ["<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>"]
            let data = ["<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>","<span  class='colorRed'>暂无数据</span>"]
            GetAGVTaskData.push(data)
          }else{
            response.data.forEach(element => {
            let data = [element.agv_tasknum,"<span  class='colorRed'>"+element.agv_fromaddress+"</span>" , 
            "<span  class='colorGrass'>" + element.agv_toaddress + "</span>",element.agv_taskstate,
             element.agv_tasktype,element.agv_createtime,element.agv_realesstime]
             element.agv_tasktype]
            GetAGVTaskData.push(data)
          });
          }
          this.config.data = GetAGVTaskData;
          this.config = {
            header: ['任务号', '起点地址', '终点地址', '任务状态','任务类型','创建时间','下发时间'],
            header: ['任务号', '起点地址', '终点地址', '任务状态','任务类型'],
            data: GetAGVTaskData,
            rowNum: 10, //表格行数
            headerHeight: 35,
@@ -87,7 +87,7 @@

<style lang="scss" scoped>
$box-height: 600px;
$box-width: 97%;
$box-width: 100%;

#centerRight1 {
  padding: 16px;

 ´úÂë¹ÜÀí/´óÆÁ/src/views/centerRight4.vue

@@ -46,7 +46,7 @@
      this.GetLocationData();
      setInterval(() => {
        this.GetLocationData()
      },60000)
      },100)
    },
    GetLocationData(){
      var _this=this;
@@ -68,7 +68,7 @@
            oddRowBGC: '#0f1325', //奇数行
            evenRowBGC: '#171c33', //偶数行
            index: true,
            columnWidth: [50,130,100,60,270],
            columnWidth: [50,130,100,60,960],
            align: ['center'],
          }
      }).catch((x)=>{
@@ -81,7 +81,7 @@

<style lang="scss" scoped>
$box-height: 520px;
$box-width: 630px;
$box-width: 850px;
#centerRight1 {
  padding: 10px;
  padding-top: 20px;

 ´úÂë¹ÜÀí/´óÆÁ/src/views/index.vue

@@ -81,9 +81,9 @@

          <!-- ç¬¬å››è¡Œæ•°æ® -->
          <div class="content-box">
            <dv-border-box-13 style="width: 400px;">
            <dv-border-box-12 style="width: 465px;">
              <bottomLeft />
            </dv-border-box-13>
            </dv-border-box-12>

            <div>
              <dv-border-box-12>

 ´úÂë¹ÜÀí/Ì«ÖØPDA/pages/feeding/feeding.vue

@@ -53,14 +53,14 @@
                    this.barcode = e.detail.value;
                } else {
                    var len = this.barcode.split(',').length;
                    if (len <= 4) {
                    if (len <= 5) {
                        this.barcode = this.barcode + ',';
                    }
                    else if(len < 5){ 
                    else if(len < 6){ 
                        this.barcode = this.barcode;
                    }
                     else {
                        this.$t.message.toast('数量最多为5个');
                        this.$t.message.toast('数量最多为6个');
                        this.isfill=true;
                        return;
                    }
@@ -87,25 +87,33 @@
                    return;
                }

                this.$u.post("/api/ToWms/OutsourceInbound", {
                    MainData: {
                        dataSN: this.barcode,
                        stationNo: this.stationNo,
                        creator: uni.getStorageSync('jo_user').userName,
                    }
                }).then(res => {
                    if (res.status) {
                        this.barcode = '',
                            this.station = '',
                            this.stationNo = '',
                            this.$t.message.toast('呼叫AGV成功，请等待AGV取货');
                    } else {
                        this.$t.message.toast(res.message);
                    }
                    console.log(res);
                }).catch(err => {
                uni.showModal({
                    title: '确认',
                    content: '车轮信息：'+this.barcode+',是否呼叫AGV？',
                    success: (res) => {
                      if (res.confirm) {
                       // this.$u.post("/api/ToWms/OutsourceInbound", {
                       //     MainData: {
                       //         dataSN: this.barcode,
                       //         stationNo: this.stationNo,
                       //         creator: uni.getStorageSync('jo_user').userName,
                       //     }
                       // }).then(res => {
                       //     if (res.status) {
                       //         this.barcode = '',
                       //             this.station = '',
                       //             this.stationNo = '',
                       //             this.$t.message.toast('呼叫AGV成功，请等待AGV取货');
                       //     } else {
                       //         this.$t.message.toast(res.message);
                       //     }
                       //     console.log(res);
                       // }).catch(err => {

                })
                       // })
                      }
                    }
                  });
            }
        }
    }