修复bug

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

Hide file tree

Showing 13 changed files with 18 additions and 16 deletions.
diff --git a/ExtApp/ExtApp.BLL/App/LoginBLL.cs b/ExtApp/ExtApp.BLL/App/LoginBLL.cs
@@ -59,6 +59,7 @@ public LoginResult Login(LoginModel model)
         public Result Logout()
         {
             HttpContext.Current.Response.Cookies.Clear();
+            HttpContext.Current.Session.Clear();
             return new Result(200, "注销成功！");
         }
 

diff --git a/ExtApp/ExtApp.Web/Default.aspx b/ExtApp/ExtApp.Web/Default.aspx
@@ -5,13 +5,16 @@
 <html lang="zh-cn">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title>ExtJs权限管理系统</title>
     <link href="<%=theme %>" rel="stylesheet" />
     <link href="packages/extjs/icon.css" rel="stylesheet" />
     <link href="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>
+    <script src="resources/js/jquery.js"></script>
+    <script src="resources/js/require.js"></script>
     <script>
         Ext.require('App.app.desktop.Index');
         Ext.onReady(function () {

diff --git a/ExtApp/ExtApp.Web/ExtApp.Web.csproj b/ExtApp/ExtApp.Web/ExtApp.Web.csproj
@@ -270,8 +270,8 @@
     <Content Include="app\work\store\MessageReceive.js" />
     <Content Include="Default.aspx" />
     <Content Include="Login.aspx" />
-    <Content Include="packages\jquery\jquery.js" />
-    <Content Include="packages\jquery\jquery.min.js" />
+    <Content Include="resources\js\jquery.js" />
+    <Content Include="resources\js\jquery.min.js" />
     <Content Include="packages\map\css\map.css" />
     <Content Include="packages\map\js\mapShow.js" />
     <Content Include="packages\map\js\mapDraw.js" />
@@ -4170,8 +4170,8 @@
     <Content Include="packages\mxGraph\resources\graph.txt" />
     <Content Include="packages\mxGraph\resources\graph_de.txt" />
     <Content Include="packages\mxGraph\resources\graph_zh.txt" />
-    <Content Include="packages\RequireJs\require.js" />
-    <Content Include="packages\RequireJs\require.min.js" />
+    <Content Include="resources\js\require.js" />
+    <Content Include="resources\js\require.min.js" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
@@ -4208,7 +4208,6 @@
   <ItemGroup>
     <Folder Include="resources\css\" />
     <Folder Include="resources\images\" />
-    <Folder Include="resources\js\" />
     <Folder Include="uploads\" />
   </ItemGroup>
   <ItemGroup>

diff --git a/ExtApp/ExtApp.Web/Login.aspx b/ExtApp/ExtApp.Web/Login.aspx
@@ -5,6 +5,7 @@
 <html lang="zh-cn">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title>登录</title>
     <link href="<%=theme %>" rel="stylesheet" />
     <link href="packages/extjs/icon.css" rel="stylesheet" />

diff --git a/ExtApp/ExtApp.Web/app/app/accordion/IndexController.js b/ExtApp/ExtApp.Web/app/app/accordion/IndexController.js
@@ -9,12 +9,10 @@ Ext.define('App.app.accordion.IndexController', {
 
     onLogoutClick: 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/app/app/accordion/MenuController.js b/ExtApp/ExtApp.Web/app/app/accordion/MenuController.js
@@ -93,7 +93,7 @@ Ext.define('App.app.accordion.MenuController', {
                     p = Ext.create('Ext.Container', {
                         title: record.data.Name,
                         closable: true,
-                        html: '<iframe src="index.html?cls=' + url + '" width="100%" height="100%" frameborder="0" scrolling="auto" onload="App.query(\'viewport\').unmask();"></iframe>'
+                        html: '<iframe src="Default.aspx?cls=' + url + '" width="100%" height="100%" frameborder="0" scrolling="auto" onload="App.query(\'viewport\').unmask();"></iframe>'
                     });
                     tp.add(p);
                     tp.setActiveTab(p);
@@ -105,18 +105,18 @@ Ext.define('App.app.accordion.MenuController', {
                         height: '90%',
                         closable: true,
                         modal: true,
-                        html: '<iframe src="index.html?cls=' + url + '" width="100%" height="100%" frameborder="0" scrolling="auto" onload="App.query(\'viewport\').unmask();"></iframe>'
+                        html: '<iframe src="Default.aspx?cls=' + url + '" width="100%" height="100%" frameborder="0" scrolling="auto" onload="App.query(\'viewport\').unmask();"></iframe>'
                     });
                     p.show();
                     App.query('viewport').unmask();
                     break;
                 case 'Top': // 顶层窗口打开
                     App.query('viewport').unmask();
-                    top.window.location = 'index.html?cls=' + url;
+                    top.window.location = 'Default.aspx?cls=' + url;
                     break;
                 case 'Blank': // 新选项卡
                     App.query('viewport').unmask();
-                    window.open('index.html?cls=' + url, '_blank');
+                    window.open('Default.aspx?cls=' + url, '_blank');
                     break;
             }
         } else { // 普通url

diff --git a/ExtApp/ExtApp.Web/app/app/dept/Add.js b/ExtApp/ExtApp.Web/app/app/dept/Add.js
@@ -39,7 +39,7 @@ Ext.define('App.app.dept.Add', {
             allowBlank: false
         }, {
             xtype: 'combo',
-            store: Ext.create('App.store.dic.DeptType'),
+            store: Ext.create('App.app.store.DeptType'),
             name: 'TypeID',
             valueField: 'ID',
             displayField: 'Name',

diff --git a/ExtApp/ExtApp.Web/app/app/dept/List.js b/ExtApp/ExtApp.Web/app/app/dept/List.js
@@ -83,7 +83,7 @@ Ext.define("App.app.dept.List", {
                     allowBlank: false
                 }, {
                     xtype: 'combo',
-                    store: Ext.create('App.store.dic.DeptType'),
+                    store: Ext.create('App.app.store.DeptType'),
                     name: 'TypeID',
                     valueField: 'ID',
                     displayField: 'Name',

diff --git a/ExtApp/ExtApp.Web/app/app/user/Edit.js b/ExtApp/ExtApp.Web/app/app/user/Edit.js
@@ -54,7 +54,7 @@ Ext.define('App.app.user.Edit', {
             valueField: 'ID',
             displayField: 'Name',
             fieldLabel: '<span style="color:red;">*</span>性别',
-            store: Ext.create('App.store.dic.Sex'),
+            store: Ext.create('App.app.store.Sex'),
             editable: false,
             allowBlank: false,
             emptyText: '请选择'
@@ -69,7 +69,7 @@ Ext.define('App.app.user.Edit', {
             name: 'RoleID',
             fieldLabel: '<span style="color:red;">*</span>角色',
             editable: false,
-            store: Ext.create('App.store.authority.RoleAll'),
+            store: Ext.create('App.app.store.RoleAll'),
             valueField: 'ID',
             displayField: 'Name',
             allowBlank: false,

diff --git a/ExtApp/ExtApp.Web/packages/jquery/jquery.js → ExtApp/ExtApp.Web/resources/js/jquery.js b/ExtApp/ExtApp.Web/packages/jquery/jquery.js → ExtApp/ExtApp.Web/resources/js/jquery.js
diff --git a/.../ExtApp.Web/packages/jquery/jquery.min.js → ExtApp/ExtApp.Web/resources/js/jquery.min.js b/.../ExtApp.Web/packages/jquery/jquery.min.js → ExtApp/ExtApp.Web/resources/js/jquery.min.js
diff --git a/.../ExtApp.Web/packages/RequireJs/require.js → ExtApp/ExtApp.Web/resources/js/require.js b/.../ExtApp.Web/packages/RequireJs/require.js → ExtApp/ExtApp.Web/resources/js/require.js
diff --git a/...App.Web/packages/RequireJs/require.min.js → ...pp/ExtApp.Web/resources/js/require.min.js b/...App.Web/packages/RequireJs/require.min.js → ...pp/ExtApp.Web/resources/js/require.min.js