From 5019f78817338b196421a1df9c76633fb672630a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?= <188633308@qq.com> Date: Tue, 18 May 2021 12:07:32 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E5=AE=89=E5=85=A8=E7=9A=84=E5=B9=95=E5=A2=99=E5=92=8C?= =?UTF-8?q?=E9=9D=A2=E7=A0=96=E8=A1=A8=E5=8D=95,=E6=9C=AA=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Ewide.Core/Ewide.Core.xml | 31 -- Api/Ewide.Core/Extension/PageExtensions.cs | 4 +- Api/Ewide.Core/applicationconfig.json | 2 +- Web/.env.production | 2 +- .../doc-code/seed/form-page/tab-form/tab.vue | 54 +- Web/public/index.html | 2 +- Web/src/assets/style/app.less | 1 + Web/src/assets/style/lib/form-page.less | 80 +-- Web/src/assets/style/lib/form.less | 59 +- Web/src/assets/style/lib/radio.less | 10 + Web/src/assets/style/main.less | 139 +++-- Web/src/components/yoTable/index.js | 6 - .../house/houseInfo/form/base/aspect.vue | 34 +- .../house/houseInfo/form/base/attachments.vue | 2 +- .../house/houseInfo/form/base/building.vue | 124 +++-- .../house/houseInfo/form/base/drawing.vue | 36 +- .../house/houseInfo/form/base/fund.vue | 2 +- .../houseInfo/form/base/identification.vue | 2 +- .../house/houseInfo/form/base/index.vue | 3 +- .../houseInfo/form/base/investigation.vue | 2 +- .../house/houseInfo/form/base/manager.vue | 2 +- .../house/houseInfo/form/base/ownership.vue | 2 +- .../house/houseInfo/form/base/unit.vue | 2 +- .../house/houseInfo/form/coating/index.vue | 3 + .../house/houseInfo/form/curtainWall/base.vue | 504 ++++++++++++++++++ .../houseInfo/form/curtainWall/cnopy.vue | 196 +++++++ .../houseInfo/form/curtainWall/glass.vue | 317 +++++++++++ .../houseInfo/form/curtainWall/index.vue | 126 +++++ .../houseInfo/form/curtainWall/metal.vue | 191 +++++++ .../houseInfo/form/curtainWall/other.vue | 301 +++++++++++ .../houseInfo/form/curtainWall/patrol.vue | 3 + .../houseInfo/form/curtainWall/skylight.vue | 210 ++++++++ .../houseInfo/form/curtainWall/stone.vue | 205 +++++++ .../house/houseInfo/form/curtainWall/unit.vue | 156 ++++++ .../house/houseInfo/form/faceBrick/base.vue | 260 +++++++++ .../house/houseInfo/form/faceBrick/index.vue | 106 ++++ .../house/houseInfo/form/faceBrick/patrol.vue | 386 ++++++++++++++ .../house/houseInfo/form/faceBrick/unit.vue | 156 ++++++ .../business/house/houseInfo/form/index.vue | 104 +++- .../house/houseInfo/form/whiteWash/index.vue | 3 + Web/src/pages/system/doc/seed/pageForm.vue | 2 +- Web/src/views/main/_layout/content.vue | 97 ++-- Web/src/views/main/_layout/header/index.vue | 2 +- 43 files changed, 3613 insertions(+), 316 deletions(-) create mode 100644 Web/src/assets/style/lib/radio.less create mode 100644 Web/src/pages/business/house/houseInfo/form/coating/index.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/base.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/cnopy.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/glass.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/index.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/metal.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/other.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/patrol.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/skylight.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/stone.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/curtainWall/unit.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/faceBrick/base.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/faceBrick/index.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/faceBrick/patrol.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/faceBrick/unit.vue create mode 100644 Web/src/pages/business/house/houseInfo/form/whiteWash/index.vue diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml index 3f4a01c..5275165 100644 --- a/Api/Ewide.Core/Ewide.Core.xml +++ b/Api/Ewide.Core/Ewide.Core.xml @@ -680,16 +680,6 @@ 字典类型表 - - - 父Id - - - - - 父Ids - - 名称 @@ -4004,11 +3994,6 @@ 状态(字典 0正常 1停用 2删除) - - - 父id - - 名称 @@ -4177,22 +4162,6 @@ - - - 创建Pids格式 - 如果pid是0顶级节点,pids就是 [0]; - 如果pid不是顶级节点,pids就是 pid菜单的 pids + [pid] + , - - - - - - - 根据节点Id获取所有子节点Id集合,包含自己 - - - - 附属机构和职位参数 diff --git a/Api/Ewide.Core/Extension/PageExtensions.cs b/Api/Ewide.Core/Extension/PageExtensions.cs index bf16fd2..c71b777 100644 --- a/Api/Ewide.Core/Extension/PageExtensions.cs +++ b/Api/Ewide.Core/Extension/PageExtensions.cs @@ -23,12 +23,12 @@ namespace Ewide.Core.Extension var defaultField = hasSort ? "Sort" : (hasId ? "Id" : ""); // 约定默认每张表都有Id排序 - var orderStr = string.IsNullOrEmpty(defaultField) ? "" : defaultField + (descSort ? " Desc" : " Asc"); + var orderStr = string.IsNullOrEmpty(defaultField) ? "" : defaultField + (descSort ? " Asc" : " Desc"); // 排序是否可用-排序字段和排序顺序都为非空才启用排序 if (!string.IsNullOrEmpty(pageInput.SortField) && !string.IsNullOrEmpty(pageInput.SortOrder)) { - orderStr = $"{pageInput.SortField} {(pageInput.SortOrder == pageInput.DescStr ? "Desc" : "Asc")}"; + orderStr = $"{pageInput.SortField} {(pageInput.SortOrder == pageInput.DescStr ? "Asc" : "Desc")}"; } return orderStr; } diff --git a/Api/Ewide.Core/applicationconfig.json b/Api/Ewide.Core/applicationconfig.json index 97ad50d..19135e6 100644 --- a/Api/Ewide.Core/applicationconfig.json +++ b/Api/Ewide.Core/applicationconfig.json @@ -25,7 +25,7 @@ "WriteXmlPath": { "SeedData": "SeedDataXml", "DataBase": "DataBaseXml", - "ReadSelect": "DataBase" // SeedData 和 DataBase 两个中间选 + "ReadSelect": "SeedData" // SeedData 和 DataBase 两个中间选 }, "RSA": { "publickey": "tu98wMoo297l+juulU4a3Xx7c2SZ93f0gTPKohE0uz4o8jWN8zXnAAfhf6MMTlkgf+qIwaORLtBQohDcX6Xp02Qe7Cq2LujVR+YJHxy2uo8+KTc5Rj/d0OkTjeCozGaJQH0XrwUO7w+rDnyXzA52IvMZPnUV3KnOj1mPH0IhrOU=AQAB", diff --git a/Web/.env.production b/Web/.env.production index d4173eb..13b6a6b 100644 --- a/Web/.env.production +++ b/Web/.env.production @@ -1,3 +1,3 @@ VUE_APP_NODE_ENV=production -VUE_APP_BASE_URL=http://localhost:60161 +VUE_APP_BASE_URL=http://localhost:5566 VUE_APP_DEV_KEY=%0!qF2BpcVorlNceu#kP4SVS1bPiMUqI71%rITatPIosNOCrot@mV7PJ&br$CVvF \ No newline at end of file diff --git a/Web/public/doc-code/seed/form-page/tab-form/tab.vue b/Web/public/doc-code/seed/form-page/tab-form/tab.vue index 52585a4..bfa678b 100644 --- a/Web/public/doc-code/seed/form-page/tab-form/tab.vue +++ b/Web/public/doc-code/seed/form-page/tab-form/tab.vue @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/Web/public/index.html b/Web/public/index.html index 8e7c4be..23b4ccb 100644 --- a/Web/public/index.html +++ b/Web/public/index.html @@ -6,7 +6,7 @@ <%= htmlWebpackPlugin.options.title %> - +