commit

04.系统编码/App/Content/scripts/beijing/app.js

@@ -61,10 +61,14 @@
             $('.main').width(width);
             $('.shrink').addClass('shrink-toggle');
             $('.right').addClass('right-toggle');
+            $('.real-btn').addClass('real-btn-toggle');
+            $('.shadow').addClass('shadow-toggle');
         } else {
             $('.main').width(width - 280);
             $('.shrink').removeClass('shrink-toggle');
             $('.right').removeClass('right-toggle');
+            $('.real-btn').removeClass('real-btn-toggle');
+            $('.shadow').removeClass('shadow-toggle');
         }
     }
 };

04.系统编码/App/Content/scripts/menggu/app.js

@@ -14,6 +14,7 @@
         window.onresize = this.Relayout.bind(this);
         $('#real-time').on('click', this.OnRealtimeTabClick.bind(this));
         $('#history-time').on('click', this.OnHistoryTabClick.bind(this));
+        $('#shrink').on('click', this.OnShrinkClick.bind(this));
     };
 
     this.Relayout = function () {
@@ -51,6 +52,24 @@
     this.HideDialog = function () {
         $('.dialog').hide();
     };
+
+    this.OnShrinkClick = function () {
+        var width = $(window).width();
+        this.IsShrink = !this.IsShrink;
+        if (this.IsShrink) {
+            $('.main').width(width);
+            $('.shrink').addClass('shrink-toggle');
+            $('.right').addClass('right-toggle');
+            $('.real-btn').addClass('real-btn-toggle');
+            $('.shadow').addClass('shadow-toggle');
+        } else {
+            $('.main').width(width - 280);
+            $('.shrink').removeClass('shrink-toggle');
+            $('.right').removeClass('right-toggle');
+            $('.real-btn').removeClass('real-btn-toggle');
+            $('.shadow').removeClass('shadow-toggle');
+        }
+    }
 };
 
 $(document).ready(function () {

04.系统编码/App/Content/scripts/system-management/config-management/edit-line-color.js

@@ -1,6 +1,7 @@
 var EditLineColor = function (parent) {
     this.Parent = parent;
     this.Dialog = $('#edit-line-color-dialog');
+    this.LineColor = {};
 
     this.Setup = function () {
         $("#color-picker").on("change", this.ColorChange.bind(this));
@@ -11,20 +12,51 @@
 
     this.Show = function (data) {
         this.Dialog.show();
-        console.log(data);
+        this.LineColor = data;
+        var rgbColor = this.getColor(data.Value);
         $("#color").textbox('setValue', data.Value);
-        $('#color-picker').val('#ff0000');
+        $('#color-picker').val(rgbColor);
     };
 
     this.ColorChange = function () {
-        $("#color").textbox('setValue', $('#color-picker').val());
+        var color = this.getHexColor($('#color-picker').val());
+        $("#color").textbox('setValue', color);
     };
 
     this.OnSureButtonClick = function () {
+        this.LineColor.Value = $('#color').textbox('getValue');
+
+        this.UpdateLineWidth();
         this.Dialog.hide();
+        this.Parent.DisabledEvent();
+    };
+
+    this.UpdateLineWidth = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/ConfigManagement/Update',
+            data: this.LineColor,
+            success: function () {
+                this.Parent.ReLoadTableData();
+            }.bind(this)
+        });
     };
 
     this.HideDialog = function () {
         this.Dialog.hide();
     };
+
+    this.getColor = function (color) {
+        var rgb = color.split(',');
+        var r = parseInt(rgb[0].split('(')[1]);
+        var g = parseInt(rgb[1]);
+        var b = parseInt(rgb[2].split(')')[0]);
+        var hex = "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1);
+        return hex;
+    };
+
+    this.getHexColor = function (hex) {
+        return "rgba(" + parseInt("0x" + hex.slice(1, 3)) + "," + parseInt("0x" + hex.slice(3, 5)) + "," + parseInt("0x" + hex.slice(5, 7)) + ")"
+    }
 };

04.系统编码/App/Content/scripts/system-management/config-management/edit-line-width.js

@@ -11,15 +11,24 @@
 
     this.Show = function (data) {
         this.Dialog.show();
-        console.log(data)
         this.Config = data;
         $("#width").textbox('setValue', data.Value);
     };
 
     this.OnSureButtonClick = function () {
-        this.Config.Value = $('#width').textbox('getValue');
-        this.UpdateLineWidth();
-        this.Dialog.hide();
+        this.validation();
+    };
+
+    this.validation = function () {
+        if ($("#width").textbox('getValue').trim() === '' || $("#width").textbox('getValue').trim === null) {
+            alert('请输入宽度值');
+            return
+        } else {
+            this.Config.Value = $('#width').textbox('getValue');
+            this.UpdateLineWidth();
+            this.Dialog.hide();
+            this.Parent.DisabledEvent();
+        }
     };
 
     this.UpdateLineWidth = function () {
@@ -27,7 +36,7 @@
             type: "POST",
             dataType: 'text',
             url: '/ConfigManagement/Update',
-            data: this.User,
+            data: this.Config,
             success: function () {
                 this.Parent.ReLoadTableData();
             }.bind(this)

04.系统编码/App/Content/scripts/system-management/config-management/edit-locate-icon.js

@@ -1,6 +1,7 @@
 var EditLocateIcon = function (parent) {
     this.Parent = parent;
     this.Dialog = $('#edit-locate-icon-dialog');
+    this.LocateIcon = {};
 
     this.Setup = function () {
         $('#file').on('change', this.onFileChange.bind(this))
@@ -11,15 +12,32 @@
 
     this.Show = function (data) {
         this.Dialog.show();
-        //$("#path").textbox('setValue', data.Value);
+        this.LocateIcon = data;
+        $("#path").textbox('setValue', data.Value);
     };
 
-    this.onFileChange = function () {
-        $("#path").textbox('setValue', $('#file').val());
+    this.onFileChange = function (event) {
+        $("#path").textbox('setValue', event.target.files[0].name);
     };
 
     this.OnSureButtonClick = function () {
+        this.LocateIcon.Value = $('#path').textbox('getValue');
+
+        this.UpdateLocateIcon();
         this.Dialog.hide();
+        this.Parent.DisabledEvent();
+    };
+
+    this.UpdateLocateIcon = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/ConfigManagement/Update',
+            data: this.LocateIcon,
+            success: function () {
+                this.Parent.ReLoadTableData();
+            }.bind(this)
+        });
     };
 
     this.HideDialog = function () {

04.系统编码/App/Content/scripts/system-management/config-management/index.js

@@ -1,11 +1,4 @@
 var App = function () {
-
-    //this.data = {
-    //    "total": 20,
-    //    "rows": [{ Id: 1, Name: '线条宽度', Value: "2", Unit: '像素' },
-    //        { Id: 2, Name: '线条颜色', Value: "#ff0000", Unit: '-' },
-    //        { Id: 3, Name: '定位图标', Value: "", Unit: '-' }]
-    //};
     this.data = {};
     this.selectedRow = [];
     this.EditLineWidth = new EditLineWidth(this);
@@ -60,11 +53,10 @@
             dataType: 'text',
             url: '/ConfigManagement/Query',
             data: {
-                pageIndex: 1,
-                pageSize: 1000
+                page: 1,
+                rows: 1000
             },
             success: function (result) {
-                console.log(JSON.parse(result));
                 var value = JSON.parse(result);
                 this.data['total'] = value.length;
                 this.data['rows'] = value;
@@ -91,6 +83,10 @@
     };
 
     this.OnTaskUnselected = function (index, row) {
+        this.DisabledEvent();
+    };
+
+    this.DisabledEvent = function () {
         $('#edit-btn').prop('disabled', true);
     };
 

04.系统编码/App/Content/scripts/system-management/org-management/add.js

@@ -12,8 +12,17 @@
     };
 
     this.OnSureButtonClick = function () {
-        this.AddOrg();
-        this.HideDialog();
+        this.validation();
+    };
+
+    this.validation = function () {
+        if ($("#name").textbox('getValue').trim() === '' || $("#name").textbox('getValue').trim === null) {
+            alert('请输入机构名称');
+            return
+        } else {
+            this.AddOrg();
+            this.HideDialog();
+        }
     };
 
     this.AddOrg = function () {

04.系统编码/App/Content/scripts/system-management/org-management/edit.js

@@ -16,10 +16,19 @@
     };
 
     this.OnSureButtonClick = function () {
-        this.Org.Name = $('#org-name').textbox('getValue');
+        this.validation();
+    };
+
+    this.validation = function () {
+        if ($("#org-name").textbox('getValue').trim() === '' || $("#org-name").textbox('getValue').trim === null) {
+            alert('请输入机构名称');
+            return
+        } else {
+            this.Org.Name = $('#org-name').textbox('getValue');
 
-        this.EditOrg();
-        this.HideDialog();
+            this.EditOrg();
+            this.HideDialog();
+        }
     };
 
     this.EditOrg = function () {

04.系统编码/App/Content/scripts/system-management/org-management/index.js

@@ -61,17 +61,9 @@
     };
 
     this.ReLoadTableData = function () {
-        $.ajax({
-            type: "POST",
-            dataType: 'text',
-            url: '/OrgManagement/Query',
-            data: {
-                pageIndex: 1,
-                pageSize: 30
-            },
-            success: function (result) {
-                $('#task-grid').datagrid('loadData', JSON.parse(result));
-            }.bind(this)
+        $('#task-grid').datagrid({
+            method: "POST",
+            url: '/OrgManagement/Query'
         });
     };
 

04.系统编码/App/Content/scripts/system-management/user-management/add.js

@@ -20,8 +20,8 @@
             dataType: 'text',
             url: '/OrgManagement/Query',
             data: {
-                pageIndex: 1,
-                pageSize: 10000
+                page: 1,
+                rows: 10000
             },
             success: function (result) {
                 console.log(result)
@@ -42,8 +42,7 @@
     };
     
     this.OnSureButtonClick = function () {
-        this.AddUser();
-        this.HideDialog();
+        this.validation();
     };
 
     this.HideDialog = function () {
@@ -83,4 +82,23 @@
             LoginPassword: $('#loginPassword').textbox('getValue')
         }
     };
+
+    this.validation = function () {
+        if ($("#name").textbox('getValue').trim() === '' || $("#name").textbox('getValue').trim === null) {
+            alert('请输入姓名');
+            return
+        } else if ($('#add-dialog-org-list').combobox('getValue') === '') {
+            alert('请选择机构');
+            return;
+        } else if ($("#loginAccount").textbox('getValue').trim() === '' || $("#loginAccount").textbox('getValue').trim === null) {
+            alert('请输入登录账户');
+            return
+        } else if ($("#loginPassword").textbox('getValue').trim() === '' || $("#loginPassword").textbox('getValue').trim === null) {
+            alert('请输入登录密码');
+            return
+        } else {
+            this.AddUser();
+            this.HideDialog();
+        }
+    };
 };

04.系统编码/App/Content/scripts/system-management/user-management/edit.js

@@ -26,8 +26,8 @@
             dataType: 'text',
             url: '/OrgManagement/Query',
             data: {
-                pageIndex: 1,
-                pageSize: 10000
+                page: 1,
+                rows: 10000
             },
             success: function (result) {
                 console.log(this.User.OrgId)
@@ -50,14 +50,32 @@
     };
 
     this.OnSureButtonClick = function () {
-        this.User.OrgId = $('#edit-dialog-org-list').combobox('getValue');
-        this.User.Gender = parseInt($('#sex span.active').attr('gender'));
-        this.User.RealName = $("#username").textbox('getValue');
-        this.User.LoginName = $('#account').textbox('getValue');
-        this.User.LoginPassWord = $('#password').textbox('getValue');
+        this.validation();
+    };
+
+    this.validation = function () {
+        if ($("#username").textbox('getValue').trim() === '' || $("#username").textbox('getValue').trim === null) {
+            alert('请输入姓名');
+            return
+        } else if ($('#edit-dialog-org-list').combobox('getValue') === '') {
+            alert('请选择机构');
+            return;
+        } else if ($("#account").textbox('getValue').trim() === '' || $("#account").textbox('getValue').trim === null) {
+            alert('请输入登录账户');
+            return
+        } else if ($("#password").textbox('getValue').trim() === '' || $("#password").textbox('getValue').trim === null) {
+            alert('请输入登录密码');
+            return
+        } else {
+            this.User.OrgId = $('#edit-dialog-org-list').combobox('getValue');
+            this.User.Gender = parseInt($('#sex span.active').attr('gender'));
+            this.User.RealName = $("#username").textbox('getValue');
+            this.User.LoginName = $('#account').textbox('getValue');
+            this.User.LoginPassWord = $('#password').textbox('getValue');
 
-        this.EditUser();
-        this.HideDialog();
+            this.EditUser();
+            this.HideDialog();
+        }
     };
 
     this.HideDialog = function () {

04.系统编码/App/Content/scripts/system-management/user-management/index.js

@@ -41,8 +41,8 @@
             dataType: 'text',
             url: '/OrgManagement/Query',
             data: {
-                pageIndex: 1,
-                pageSize: 10000
+                page: 1,
+                rows: 10000
             },
             success: function (result) {
                 var data = JSON.parse(result).rows;
@@ -99,19 +99,6 @@
     };
 
     this.ReLoadTableData = function (orgId) {
-/*        $.ajax({
-            type: "POST",
-            dataType: 'text',
-            url: '/UserManagement/Query',
-            data: {
-                orgId: orgId,
-                pageIndex: 1,
-                pageSize: 30
-            },
-            success: function (result) {
-                this.userGrid.datagrid('loadData', JSON.parse(result));
-            }.bind(this)
-        });*/
         this.userGrid.datagrid({
             method: "POST",
             url: '/UserManagement/Query',

04.系统编码/App/Content/scripts/tiananmen/app.js

@@ -12,6 +12,7 @@
 
         $('.particle-switch a').on('click', this.OnParticleSwitchButtonClick.bind(this));
         $('#calc-btn').on('click', this.OnRefreshButtonClick.bind(this));
+        $('#shrink').on('click', this.OnShrinkClick.bind(this));
     };
 
     this.ReLayout = function () {
@@ -45,6 +46,22 @@
         this.ResetTimeList();
         this.Slider.Startup();
     };
+
+    this.OnShrinkClick = function () {
+        var width = $(window).width();
+        this.IsShrink = !this.IsShrink;
+        if (this.IsShrink) {
+            $('.main').width(width);
+            $('.shrink').addClass('shrink-toggle');
+            $('.right').addClass('right-toggle');
+            $('.btn-group').addClass('real-btn-toggle');
+        } else {
+            $('.main').width(width - 280);
+            $('.shrink').removeClass('shrink-toggle');
+            $('.right').removeClass('right-toggle');
+            $('.btn-group').removeClass('real-btn-toggle');
+        }
+    }
 };
 
 $(document).ready(function () {

04.系统编码/App/Content/styles/index.css

@@ -771,6 +771,22 @@
     background: url("../images/icon-nexted.png") no-repeat center center;
 }
 
+.btn-group,
+.real-btn,
+.shadow {
+    transition: all 0.5s;
+}
+
+.real-btn-toggle {
+    right: -163px;
+    transition: all 0.5s;
+}
+
+.shadow-toggle {
+    right: -286px;
+    transition: all 0.5s;
+}
+
 .spinner-arrow {
     background-color: #F4F4F4 !important;
 }

04.系统编码/App/Views/ConfigManagement/EditLineColor.cshtml

@@ -11,7 +11,7 @@
                     <div class="row">
                         <div class="col single-col">
                             <label>线条颜色&nbsp;<span class="star">*</span></label>
-                            <input type="text" id="color" class="easyui-textbox" prompt="请输入线条颜色" />
+                            <input type="text" id="color" class="easyui-textbox" prompt="请选择线条颜色" data-options="editable: false" />
                             <input type="color" id="color-picker" value="#ffffff" class="color-picker" />
                         </div>
                     </div>

04.系统编码/App/Views/ConfigManagement/EditLineWidth.cshtml

@@ -11,7 +11,7 @@
                     <div class="row">
                         <div class="col single-col">
                             <label>宽度值（像素）&nbsp;<span class="star">*</span></label>
-                            <input type="text" id="width" class="easyui-textbox" prompt="请输入姓名" />
+                            <input type="text" id="width" class="easyui-textbox" prompt="请输入宽度值" />
                         </div>
                     </div>
                 </div>

04.系统编码/App/Views/Menggu/Index.cshtml

@@ -31,6 +31,8 @@
     </div>
 </div>
 
+<div class="shrink" id="shrink"></div>
+
 <div class="bg"></div>
 
 <div class="dialog dialog-manage">

04.系统编码/App/Views/Tiananmen/Index.cshtml

@@ -74,6 +74,8 @@
     </div>
 </div>
 
+<div class="shrink" id="shrink"></div>
+
 <div class="shade">
     <div class="load">
         正在计算任务(编号:<span id="task-id-span"></span>)，请稍后...