增加标题显示团队名

4 years ago · b9c8951c73
10 changed files with 13 additions and 5 deletions
--- a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
+++ b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs
@ -14,12 +14,13 @@ namespace 齐越慧眼
        //public static string ApiBase { get; set; } = "http://localhost:5000";
        public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com";

+        public static UserInfo LoginSystemUser { get; set; }
+
        static string jwtToken;

        public static string JwtToken { 
            get
            {
-                return string.Empty;
                if (string.IsNullOrEmpty(jwtToken))
                {
                    jwtToken = GetMemoryToken().Replace("\r\n","");
--- a/客户端/齐越慧眼/齐越慧眼/LoginWindowViewModel.cs
+++ b/客户端/齐越慧眼/齐越慧眼/LoginWindowViewModel.cs
@ -85,6 +85,8 @@ namespace 齐越慧眼

                        if (u.isOk)
                        {
+                            ApiHelper.LoginSystemUser = u.user;
+
                            if (u.user.DepartmentId == "1463029355104964608")
                            {
                                App.IsPriceTaskUser = true;
--- a/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
+++ b/客户端/齐越慧眼/齐越慧眼/MainWindow.xaml.cs
@ -46,6 +46,7 @@ namespace 齐越慧眼
        {
            UserControls.CatControl catControl = new UserControls.CatControl();
            gridCat.Children.Add(catControl);
+            this.Title += "   "+ApiHelper.LoginSystemUser.DepartmentName;
        }

        public void ChangeTab(string keyWord,int type)
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/api/http.js
@ -17,6 +17,7 @@ let ipAddress = axios.defaults.baseURL;


 axios.defaults.baseURL = 'http://localhost:5000/';
+axios.defaults.baseURL = 'http://hyapi.qiyue666.com/';

 axios.interceptors.request.use((config) => {
  //axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken();
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.cbd86d30.css
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.cbd86d30.css
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/index.html
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/index.html
@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>client</title><link href="/css/app.90b53025.css" rel="preload" as="style"><link href="/css/app.css" rel="preload" as="style"><link href="/css/chunk-vendors.09af4a6b.css" rel="preload" as="style"><link href="/css/chunk-vendors.css" rel="preload" as="style"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/css/chunk-vendors.09af4a6b.css" rel="stylesheet"><link href="/css/chunk-vendors.css" rel="stylesheet"><link href="/css/app.90b53025.css" rel="stylesheet"><link href="/css/app.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/app.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>client</title><link href="/css/app.cbd86d30.css" rel="preload" as="style"><link href="/css/app.css" rel="preload" as="style"><link href="/css/chunk-vendors.09af4a6b.css" rel="preload" as="style"><link href="/css/chunk-vendors.css" rel="preload" as="style"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/css/chunk-vendors.09af4a6b.css" rel="stylesheet"><link href="/css/chunk-vendors.css" rel="stylesheet"><link href="/css/app.cbd86d30.css" rel="stylesheet"><link href="/css/app.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/app.js"></script></body></html>
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
--- a/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/chunk-vendors.js.map
+++ b/客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/chunk-vendors.js.map
--- a/客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj
+++ b/客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj
@ -43,6 +43,7 @@
    <None Remove="vuepage\client\.postcssrc.js" />
    <None Remove="vuepage\dist\css\app.90b53025.css" />
    <None Remove="vuepage\dist\css\app.b0aefef5.css" />
+    <None Remove="vuepage\dist\css\app.cbd86d30.css" />
    <None Remove="vuepage\dist\css\app.css" />
    <None Remove="vuepage\dist\css\chunk-vendors.09af4a6b.css" />
    <None Remove="vuepage\dist\css\chunk-vendors.css" />
@ -72,6 +73,7 @@

  <ItemGroup>
    <EmbeddedResource Include="vuepage\dist\css\app.90b53025.css" />
+    <EmbeddedResource Include="vuepage\dist\css\app.cbd86d30.css" />
    <EmbeddedResource Include="vuepage\dist\css\app.css" />
    <EmbeddedResource Include="vuepage\dist\css\chunk-vendors.09af4a6b.css" />
    <EmbeddedResource Include="vuepage\dist\css\chunk-vendors.css" />