1.解决TCP添加失败问题
2.所有搜索记录倒叙排 3.优化:出入记录、库存记录增加货架类型分类查询 4.权限 5.优化下载app二维码
This commit is contained in:
@ -10,6 +10,7 @@ using System.Drawing.Imaging;
|
||||
using System.IO;
|
||||
using System.IO.Ports;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Reflection.Emit;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
@ -26,6 +27,20 @@ namespace 货架标准上位机.ViewModel
|
||||
{
|
||||
public class SetViewModel : BindableBase
|
||||
{
|
||||
public SetViewModel()
|
||||
{
|
||||
IPHostEntry host = Dns.GetHostEntry(Dns.GetHostName());
|
||||
|
||||
IPList = host.AddressList
|
||||
.Where(ipAddress => ipAddress.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork && !IPAddress.IsLoopback(ipAddress))
|
||||
.Select(t => t.ToString()).ToList();
|
||||
if (IPList != null && IPList.Count > 0)
|
||||
{
|
||||
SelectedIP = IPList[0];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private List<int> SaveLoginCountData_ = new List<int> { 3, 5, 7, 10 };
|
||||
//记忆最大数量下拉框
|
||||
public List<int> SaveLoginCountData { get => SaveLoginCountData_; set { SetProperty(ref SaveLoginCountData_, value); } }
|
||||
@ -39,6 +54,22 @@ namespace 货架标准上位机.ViewModel
|
||||
|
||||
|
||||
#region 页面输入信息
|
||||
private List<string> ipList;
|
||||
public List<string> IPList
|
||||
{
|
||||
get => ipList;
|
||||
set { SetProperty(ref ipList, value); }
|
||||
}
|
||||
|
||||
private string selectedIP;
|
||||
public string SelectedIP
|
||||
{
|
||||
get => selectedIP;
|
||||
set { SetProperty(ref selectedIP, value); }
|
||||
}
|
||||
|
||||
|
||||
|
||||
private List<string> scannerComList;
|
||||
public List<string> ScannerComList
|
||||
{
|
||||
@ -238,7 +269,7 @@ namespace 货架标准上位机.ViewModel
|
||||
if (Result != null && Result.Code == 200)
|
||||
{
|
||||
//拼凑url
|
||||
var downLoadUrl = LocalFile.Config.ApiIpHost + $"fileDownload/downloadApp?fileName={Result.Data}";
|
||||
var downLoadUrl = $"http://{SelectedIP}:8888/" + $"fileDownload/downloadApp?fileName={Result.Data}";
|
||||
//生成二维码
|
||||
var qrCodeImage = GenerateQRCode(downLoadUrl);
|
||||
//展示二维码
|
||||
|
Reference in New Issue
Block a user