Browse Source

PC端支持打开测量页面

loki.wu 2 years ago
parent
commit
fc9a90a572

+ 1 - 1
fis/App.axaml.cs

@@ -36,7 +36,7 @@ namespace fis
             try
             {
                 var manager = AppManager.Get<ISecondaryScreenManager>();
-                await manager.ShowWindowByTypeAsync(WindowType.Measure, "http://" + ShellConfig.Instance.AppHost+ "/index.html", new System.Collections.Generic.Dictionary<string, string>(),false);
+                await manager.ShowWindowByTypeAsync(WindowType.Measure, "http://" + ShellConfig.Instance.AppHost+ "/index.html?page=measure", new System.Collections.Generic.Dictionary<string, string>(),false);
             }
             catch (Exception ex) {
                 

+ 1 - 1
fis/IPlatformService.cs

@@ -44,7 +44,7 @@ namespace fis
         /// </summary>
         /// <param name="name"></param>
         /// <returns></returns>
-        bool OpenImageMeasure(string token, string patientCode, string index, string imageIndex);
+        bool OpenImageMeasure(string token, string patientCode, string remedicalCode, string recordCode);
 
         /// <summary>
         /// 打开报告模板设计器

+ 2 - 2
fis/MainWindow.axaml.cs

@@ -35,7 +35,7 @@ namespace fis
             ExtendClientAreaTitleBarHeightHint = -1;
             MainThreadSyncContext = SynchronizationContext.Current;
 #if DEBUG
-            this.AttachDevTools();
+           // this.AttachDevTools();
          
 #endif
         }
@@ -70,7 +70,7 @@ namespace fis
             _browser.BrowserInitialized += () =>
             {
 #if DEBUG
-                _browser!.ShowDeveloperTools();
+            //    _browser!.ShowDeveloperTools();
 #endif
             };
             browserContainer.Child = _browser;

+ 0 - 1
fis/Managers/SecondaryScreenManager.cs

@@ -44,7 +44,6 @@ namespace fis.Win.Dev.Managers
                         window.WindowState = WindowState.Minimized;
                         window.ShowInTaskbar = false;
                         window.Show();
-                     //   Task.Delay(1000).Wait();
                         window.Hide();
                     }
                     else

+ 3 - 3
fis/PlatformService.cs

@@ -37,12 +37,12 @@ namespace fis
         /// <param name="index"></param>
         /// <param name="imageIndex"></param>
         /// <returns></returns>
-        public bool OpenImageMeasure(string token,string patientCode,string index,string imageIndex) {
+        public bool OpenImageMeasure(string token,string patientCode,string remedicalCode, string recordCode) {
             var dictionary = new Dictionary<string, string>();
             dictionary.Add("token", token);
             dictionary.Add("patientCode", patientCode);
-            dictionary.Add("index", index);
-            dictionary.Add("imageIndex", imageIndex);
+            dictionary.Add("remedicalCode", remedicalCode);
+            dictionary.Add("recordCode", recordCode);
             var manager = AppManager.Get<ISecondaryScreenManager>();
             manager.ShowWindowByTypeAsync(WindowType.Measure,"http://" + ShellConfig.Instance.AppHost + "/#/measure/measure_home", dictionary).GetAwaiter().GetResult();
             return true;

+ 3 - 3
fis/SlaveWindow.axaml.cs

@@ -31,7 +31,7 @@ namespace fis
             ExtendClientAreaTitleBarHeightHint = -1;
             MainThreadSyncContext = SynchronizationContext.Current;
 #if DEBUG
-         //   this.AttachDevTools();
+            this.AttachDevTools();
 #endif
             Closing += SlaveWindow_Closing;
         }
@@ -158,7 +158,7 @@ namespace fis
                 var appHandler = new FileSystemHostHandler(ShellConfig.Instance.AppHost, ShellConfig.Instance.AppResourcePath);
                 var resourceHandler = new FileSystemHostHandler(ShellConfig.Instance.LocalResourceHost, ShellConfig.Instance.LocalResourcePath);
                 var handler = new HostRequestHandler();
-              //  handler.RegisterHostHandler(resourceHandler);
+                //  handler.RegisterHostHandler(resourceHandler);
                 handler.RegisterHostHandler(appHandler);
                 _browser = new AvaloniaCefBrowser
                 {
@@ -189,7 +189,7 @@ namespace fis
             _browser.BrowserInitialized += () =>
             {
 #if DEBUG
-           //  _browser!.ShowDeveloperTools();
+             _browser!.ShowDeveloperTools();
 #endif
             };
             var language = CultureInfo.CurrentCulture.Name;