桌面模式bug修改

tengge1 · May 28, 2017 · c566d1e · c566d1e
1 parent 479aa2e
commit c566d1e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/ExtApp/ExtApp.Web/Default.aspx b/ExtApp/ExtApp.Web/Default.aspx
@@ -9,7 +9,8 @@
     <title>ExtJs权限管理系统</title>
     <link href="<%=theme %>" rel="stylesheet" />
     <link href="packages/extjs/icon.css" rel="stylesheet" />
-    <link href="css/common.css" rel="stylesheet" />
+    <link href="resources/css/desktop.css" rel="stylesheet" />
+    <link href="resources/css/common.css" rel="stylesheet" />
     <script src="packages/extjs/ext-all-debug.js"></script>
     <script src="packages/extjs/locale/locale-zh_CN.js"></script>
     <script src="app/App.js"></script>

diff --git a/ExtApp/ExtApp.Web/ExtApp.Web.csproj b/ExtApp/ExtApp.Web/ExtApp.Web.csproj
@@ -461,7 +461,7 @@
     <Content Include="packages\workflow\resources\app.txt" />
     <Content Include="packages\workflow\resources\app_zh.txt" />
     <Content Include="app\widget\UserSelect.js" />
-    <Content Include="css\common.css" />
+    <Content Include="resources\css\common.css" />
     <Content Include="app\plugin\ProgressBarPager.js" />
     <Content Include="app\renderer\SexRenderer.js" />
     <Content Include="app\renderer\StatusRenderer.js" />
@@ -475,7 +475,7 @@
     <Content Include="app\util\Config.js" />
     <Content Include="app\util\Theme.js" />
     <Content Include="App_Data\ExtApp.sql" />
-    <Content Include="css\desktop.css" />
+    <Content Include="resources\css\desktop.css" />
     <Content Include="images\workflow\grid.gif" />
     <Content Include="packages\CodeMirror\lib\codemirror.css" />
     <Content Include="packages\CodeMirror\lib\codemirror.js" />
@@ -4206,7 +4206,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="resources\css\" />
     <Folder Include="resources\images\" />
     <Folder Include="uploads\" />
   </ItemGroup>

diff --git a/ExtApp/ExtApp.Web/Login.aspx b/ExtApp/ExtApp.Web/Login.aspx
@@ -9,7 +9,7 @@
     <title>登录</title>
     <link href="<%=theme %>" rel="stylesheet" />
     <link href="packages/extjs/icon.css" rel="stylesheet" />
-    <link href="css/common.css" rel="stylesheet" />
+    <link href="/resources/css/common.css" rel="stylesheet" />
     <script src="packages/extjs/ext-all-debug.js"></script>
     <script src="packages/extjs/locale/locale-zh_CN.js"></script>
     <script src="app/App.js"></script>

diff --git a/ExtApp/ExtApp.Web/Web.config b/ExtApp/ExtApp.Web/Web.config
@@ -24,7 +24,7 @@
   <!-- 应用程序配置 -->
   <appSettings>
     <!-- 框架样式（Accordion-折叠面板，Desktop-桌面样式） -->
-    <add key="Style" value="Accordion" />
+    <add key="Style" value="Desktop" />
 
     <!-- 主题路径 -->
     <add key="Theme" value="packages/extjs/themes/theme-classic/theme-classic-all.css" />

diff --git a/ExtApp/ExtApp.Web/app/app/desktop/Index.js b/ExtApp/ExtApp.Web/app/app/desktop/Index.js
@@ -156,12 +156,10 @@ Ext.define('App.app.desktop.Index', {
 
     onLogout: function () { // 注销
         App.confirm('消息', '是否注销？', function () {
-            var config = Ext.create('util.config');
             App.post('/api/Login/Logout', function (r) {
                 var obj = JSON.parse(r);
                 if (obj.Code == 200) {
-                    config.setState('nologin');
-                    window.location.reload();
+                    window.location = 'Login.aspx';
                 }
             });
         });

diff --git a/ExtApp/ExtApp.Web/css/common.css → ExtApp/ExtApp.Web/resources/css/common.css b/ExtApp/ExtApp.Web/css/common.css → ExtApp/ExtApp.Web/resources/css/common.css
diff --git a/ExtApp/ExtApp.Web/css/desktop.css → ExtApp/ExtApp.Web/resources/css/desktop.css b/ExtApp/ExtApp.Web/css/desktop.css → ExtApp/ExtApp.Web/resources/css/desktop.css