From 620aa1464240bbc95f547bbcc6291bb37abc4da4 Mon Sep 17 00:00:00 2001
From: Jimmy <584481786@qq.com>
Date: Mon, 1 Nov 2021 15:39:42 +0800
Subject: [PATCH] 11

---
 .../GalleryAnnexDocumentsAppService.cs        |   4 +--
 .../GalleryFiles/GalleryFilesAppService.cs    |   4 +--
 Excel导入模板/图样管理批量导入模板.xlsx       | Bin 9415 -> 9451 bytes
 .../Graphic/PatternManager/PattrenList.html   |  25 +++++++++++-------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Code/src/MineTec.ProManager.Application/GalleryAnnexDocuments/GalleryAnnexDocumentsAppService.cs b/Code/src/MineTec.ProManager.Application/GalleryAnnexDocuments/GalleryAnnexDocumentsAppService.cs
index b6cbfeb..07a12c6 100644
--- a/Code/src/MineTec.ProManager.Application/GalleryAnnexDocuments/GalleryAnnexDocumentsAppService.cs
+++ b/Code/src/MineTec.ProManager.Application/GalleryAnnexDocuments/GalleryAnnexDocumentsAppService.cs
@@ -157,8 +157,8 @@ namespace MineTec.ProManager.GalleryAnnexDocuments
             string root = Dir.Parent.Parent.FullName;//获取当前站点路径
 
 
-            string webRootPath = @"D:\FileStore\"; //保存文件路径--本地测试
-            //string webRootPath = @"D:\ProMananger\WebApi\wwwroot"; //保存文件路径--服务器
+            //string webRootPath = @"D:\FileStore\"; //保存文件路径--本地测试
+            string webRootPath = @"D:\ProMananger\WebApi\wwwroot"; //保存文件路径--服务器
             string uploadPath = Path.Combine("uploads", DateTime.Now.ToString("yyyyMMdd"));//增加日期文件夹
             string dirPath = Path.Combine(webRootPath, uploadPath);
             //创建路径
diff --git a/Code/src/MineTec.ProManager.Application/GalleryFiles/GalleryFilesAppService.cs b/Code/src/MineTec.ProManager.Application/GalleryFiles/GalleryFilesAppService.cs
index d74db10..62f181c 100644
--- a/Code/src/MineTec.ProManager.Application/GalleryFiles/GalleryFilesAppService.cs
+++ b/Code/src/MineTec.ProManager.Application/GalleryFiles/GalleryFilesAppService.cs
@@ -188,8 +188,8 @@ namespace MineTec.ProManager.GalleryFiles
             string root = Dir.Parent.Parent.FullName;//获取当前站点路径
 
 
-            string webRootPath = @"E:\FileStore\"; //保存文件路径--本地测试
-            //string webRootPath = @"D:\ProMananger\WebApi\wwwroot"; //保存文件路径--服务器
+            //string webRootPath = @"E:\FileStore\"; //保存文件路径--本地测试
+            string webRootPath = @"D:\ProMananger\WebApi\wwwroot"; //保存文件路径--服务器
             string uploadPath = Path.Combine("uploads", DateTime.Now.ToString("yyyyMMdd"));//增加日期文件夹
             string dirPath = Path.Combine(webRootPath, uploadPath);
             //创建路径
diff --git a/Excel导入模板/图样管理批量导入模板.xlsx b/Excel导入模板/图样管理批量导入模板.xlsx
index 532b66a0ad6d3ea3a607c715cf9528b65f9e64e0..696792b73ef81494bc4591f146ff2f2cf68f2851 100644
GIT binary patch
delta 3884
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
Ll+FtJ_t$>_x;zc$

delta 3858
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

diff --git a/Pages/page/Graphic/PatternManager/PattrenList.html b/Pages/page/Graphic/PatternManager/PattrenList.html
index 9db388d..239924b 100644
--- a/Pages/page/Graphic/PatternManager/PattrenList.html
+++ b/Pages/page/Graphic/PatternManager/PattrenList.html
@@ -45,6 +45,7 @@
             <div class="layui-btn-container">
                 <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加 </button>
                 <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"> 删除 </button>
+                <button type="button" id="LAY-excel-download" class="layui-btn layui-btn-sm" lay-event="download"><i class="layui-icon">&#xe601;</i>下载模板</button>
                 <button type="button" id="LAY-excel-upload" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe67c;</i>导入</button>
             </div>
         </script>
@@ -184,6 +185,10 @@
                     delGalleryFiles(data);
                     return false;
                 }
+                else if (obj.event === 'download') {  // 监听删除操作
+                    var url = 'http://192.168.3.112:21021/TemplateFiles/图样管理批量导入模板.xlsx';
+                    window.location.href = url;
+                }
             });
 
             //监听表格复选框选择
@@ -308,20 +313,20 @@
                     excel.importExcel(files, {
                         // 读取数据的同时梳理数据
                         fields: {
-                            'number': 'A',
-                            'patterntype': 'B',
-                            'filename': 'C',
-                            'signaturecode': 'D',
-                            'subcode': 'E',
-                            'pictureframe': 'F',
-                            'remark': 'G',
+                            'number': 'C',
+                            'patterntype': 'G',
+                            'filename': 'J',
+                            'signaturecode': 'H',
+                            'subcode': 'I',
+                            'pictureframe': 'K',
+                            'remark': 'L',
                         }
                     }, function (data) {
                         var dataArr = data[0].Sheet1;
                         //数据校验
-                        if (dataArr.length > 0) {
+                        if (dataArr.length > 1) {
                             //从1开始，避过标题
-                            for (let index = 1; index < dataArr.length; index++) {
+                            for (let index = 2; index < dataArr.length; index++) {
                                 if (dataArr[index].patterntype != 0 && dataArr[index].patterntype != 2 && dataArr[index].patterntype != 5 && dataArr[index].patterntype != 6 && dataArr[index].patterntype != 8) {
                                     //图样类型
                                     layer.msg("序号：" + dataArr[index].number + " 的数据，图样类型有误，请检查！");
@@ -362,7 +367,7 @@
                         }
 
                         //校验无误，保存导入的数据
-                        for (let index = 1; index < dataArr.length; index++) {
+                        for (let index = 2; index < dataArr.length; index++) {
                             var CurrUserInfo = layui.sessionData('CurrUserInfo');
                             var order = '';
                             $.ajax({