数据库调整

code/SxajApi/ZMajApi.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

code/Website/UI/Catalog/ad_catalog_info_handler.ashx.cs

@@ -8,6 +8,7 @@ using System.Web.Services.Protocols;
 using DBUtility;
 using System.Collections.Generic;
 using System.Text;
+using System.Linq;
 namespace tfWebMis
 {
     /// <summary>
@@ -161,7 +162,7 @@ namespace tfWebMis
                         rlt.msg = "修改保存失败:" + DbError.getErrorMsg();
                     }
                 };
-                FormatTree();
+                //FormatTree();
             }
             catch (Exception exception)
             {
@@ -186,14 +187,25 @@ namespace tfWebMis
 
                 string strSql = $@"select count(category) from ad_catalog where category='{pk}' ";
                 int num = Convert.ToInt32(DbHelper.GetValue(strSql));
+                var flag = true;
+
                 if (num > 0)
                 {
+                    flag = false;
                     rlt.success = false;
                     rlt.msg = "该目录下已存在相应档案，无法删除";
                 }
-                else
+                if (flag) { 
-                {
+                    var list = bll_ad_catalog_info.GetModelList($"tid={pk}");
-                    if (bll_ad_catalog_info.Delete(pk))
+                    if (list != null && list.Count() > 0)
+                    {
+                        flag = false;
+                        rlt.success = false;
+                        rlt.msg = "该目录下已存在子节点，请先删除子节点";
+                    }
+                }
+                if (flag) { 
+                if (bll_ad_catalog_info.Delete(pk))
                     {
                         rlt.success = true;
                         rlt.msg = "当前目录删除成功";
@@ -204,8 +216,8 @@ namespace tfWebMis
                         rlt.msg = "删除失败:" + DbError.getErrorMsg();
                     }
                 }
-
             }
+       
             else
             {
                 rlt.success = false;
@@ -469,7 +481,7 @@ namespace tfWebMis
                     rlt.success = false;
                     rlt.msg = "目录转移失败:" + DbError.getErrorMsg();
                 }
-                FormatTree();
+                //FormatTree();
             }
             catch (Exception exception)
             {
@@ -497,12 +509,13 @@ namespace tfWebMis
         private void NewTreeData(HttpContext context)
         {
 
-            BLL.ad_catalog_info_BLL bll_catalog_info = new BLL.ad_catalog_info_BLL();
+            /*BLL.ad_catalog_info_BLL bll_catalog_info = new BLL.ad_catalog_info_BLL();
             List<Model.ad_catalog_info> ad_catalog_info_list = new List<Model.ad_catalog_info>(bll_catalog_info.GetModelList("", "cnum asc"));
             if (ad_catalog_info_list.Count == 0)
             {
                 return;
             }
+         
 
             Model.ad_catalog_info parent = ad_catalog_info_list.Find(v => v._tid == "0");
             if (parent == null)
@@ -520,9 +533,44 @@ namespace tfWebMis
                 children = new List<TreeModel>()
             };
             BuildTree(p, ad_catalog_info_list);
-            string strJson = JSONHelper.SerializeObject(p.children[0].children);
+            string strJson = JSONHelper.SerializeObject(p.children[0].children);*/
+
+            var sql = @"select id,t.cname text,id as dbid,nvl(tid,0) as dbpid,cnum,'' iconCls from ad_catalog_info t order by nvl(tid,0),t.cnum";
+            var list = DbHelper.GetList<TreeModel>(sql);
+            if (list == null) { 
+                list=new List<TreeModel>();
+            }
+            var list_result = list.Where(a => a.dbpid.Equals("0")).ToList();
+            foreach (var item in list_result)
+            {
+               
+                item.children = GetChildrens(item, list);
+            }
+            string strJson = JSONHelper.SerializeObject(list_result);
             context.Response.Write(strJson);
         }
+
+
+        /// <summary>
+        /// 递归，生产树形结构
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        public List<TreeModel> GetChildrens(TreeModel node, List<TreeModel> list)
+        {
+            List<TreeModel> childrens = list.Where(c => c.dbpid.Equals(node.dbid)).ToList();
+            foreach (var item in childrens)
+            {
+                var Chlidrens = GetChildrens(item, list);
+                item.children = Chlidrens;
+               
+            }
+            return childrens;
+
+        }
+
+
         private void BuildTree(TreeModel tree, List<Model.ad_catalog_info> ad_catalog_info_list)
         {
             foreach (var m in ad_catalog_info_list)

code/Website/UI/Catalog/ad_catalog_info_list.aspx

@@ -1,11 +1,11 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ad_catalog_info_list.aspx.cs" Inherits="tfWebMis.ad_catalog_info_list" %>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head id="head">
     <title>档案目录管理</title>
-    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/gray/easyui.css" />
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css" />
     <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css" />
     <script type="text/javascript" src="/js/easyui/jquery.min.js"></script>
     <script type="text/javascript" src="/js/easyui/jquery.easyui.min.js"></script>
@@ -64,7 +64,7 @@
                         <div class="fitem" style="padding-left: 200px; margin-bottom: 15px;">
                             <div class="label">排序序号:</div>
                             <div class="control">
-                                <input id="cnum" name="cnum" class="easyui-textbox" style="height: 25px;" />
+                                <input id="cnum" name="cnum"  class="easyui-numberbox" style="width:200px;height: 25px;" required="true"/>
                             </div>
                         </div>
                         <div class="fitem" style="padding-left: 200px; margin-bottom: 15px;">
@@ -137,7 +137,7 @@
                                 <div class="fitem">
                                     <div class="label">排列序号:</div>
                                     <div class="control">
-                                        <input id="nnum" name="nnum" class="easyui-textbox"  required="true"/>
+                                        <input id="nnum" name="nnum" class="easyui-numberbox" style="width:200px;" required="true"/>
                                     </div>
                                 </div>
                                 <div class="fitem">
@@ -167,9 +167,10 @@
             $("#siteTree").tree({
                 url: "/UI/Catalog/ad_catalog_info_handler.ashx?mode=newtree",
                 animate: true,
+                lines: true,
                 method: "post",
                 formatter: function (node) {
-                    
+
                     var sText = node.id == "0" ? node.text : node.id + ":" + node.text;
                     var nodeHtml = "<div title=\"" + sText + "\" style=\" font-size:14px\">" + node.text + "[" + node.cnum + "]"
                         + " </div>";
@@ -193,7 +194,7 @@
         function onSearch() {
             $("#datagrid").datagrid({
                 url: "/UI/Catalog/ad_catalog_info_handler.ashx?mode=qry",
-               // queryParams: $("#searchForm").serializeObject()
+                // queryParams: $("#searchForm").serializeObject()
 
             })
         }
@@ -212,14 +213,20 @@
             var id = $("#nodeid").val();
             var name = $("#nodename").val();
             var cnum = $("#nodecnum").val();
-     
+
             $("#id").textbox('setValue', id);
             $("#cname").textbox('setValue', name);
             $("#cnum").textbox('setValue', cnum);
             $("#mode").val("upd");
         }
         function saveForm() {
+
             var type = $("#mode").val();
+            if (type == "") {
+                $("#mode").val("ins");
+            }
+            type = $("#mode").val();
+
             /*URL支持参数受限制，可采用submit,post提交Ajax表单*/
             $('#frmAjax').form('submit', {
                 url: '/UI/Catalog/ad_catalog_info_handler.ashx?mode=' + type,
@@ -230,6 +237,7 @@
                     return isTrue;
                 },
                 success: function (result) {
+
                     resultJSON = $.parseJSON(result);
                     if (resultJSON.success) {
                         $.messager.alert('提示', resultJSON.msg, 'info', function () {
@@ -252,7 +260,7 @@
                 $.post('/UI/Catalog/ad_catalog_info_handler.ashx?mode=del', { pk: id }, function (result) {
                     utils.message(result, function () {
                         $('#siteTree').tree('reload'); //重新加载载数据
-                        Add();
+
                     });
                 }, 'json');
             });

code/Website/UI/Catalog/ad_file_management.aspx

@@ -6,7 +6,7 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>标准化档案</title>
-    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/gray/easyui.css" />
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css" />
     <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css" />
     <script type="text/javascript" src="/js/easyui/jquery.min.js"></script>
     <script type="text/javascript" src="/js/easyui/jquery.easyui.min.js"></script>
@@ -132,15 +132,16 @@
 
         function loadTreeInfo() {
             $("#siteTree").tree({
-                url: "/UI/Catalog/ad_catalog_info_handler.ashx?mode=tree&tid=10002",
+                url: "/UI/Catalog/ad_catalog_info_handler.ashx?mode=newtree",
                 animate: true,
+                lines:true,
                 method: "post",
-                formatter: function (node) {
+               /* formatter: function (node) {
                     var sText = node.id == "0" ? node.text : node.id + ":" + node.text;
                     var nodeHtml = "<div title=\"" + sText + "\" style=\" font-size:14px\">" + node.text
                         + " </div>";
                     return nodeHtml;
-                },
+                },*/
                 onSelect: function (node) {
                     $("#tid").val(node.id);
                     $("#datagrid").datagrid("clearSelections");

code/Website/Website.csproj.user

@@ -2,23 +2,22 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <NameOfLastUsedPublishProfile>E:\com_project\中牟\web\code\Website\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\work\C#\中牟燃气安监系统\zmrqaj\code\Website\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <StartPageUrl>
+          <StartPageUrl>login.aspx</StartPageUrl>
-          </StartPageUrl>
+          <StartAction>SpecificPage</StartAction>
-          <StartAction>CurrentPage</StartAction>
           <AspNetDebugging>True</AspNetDebugging>
           <SilverlightDebugging>False</SilverlightDebugging>
           <NativeDebugging>False</NativeDebugging>