diff --git a/20220313_Excel/.vs/TempTask/v16/.suo b/20220313_Excel/.vs/TempTask/v16/.suo index 59b508b..c0c80d2 100644 Binary files a/20220313_Excel/.vs/TempTask/v16/.suo and b/20220313_Excel/.vs/TempTask/v16/.suo differ diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.Views.dll b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.Views.dll index ed16329..4250c6b 100644 Binary files a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.Views.dll and b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.Views.dll differ diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.Views.pdb b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.Views.pdb index 71caaec..5685e71 100644 Binary files a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.Views.pdb and b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.Views.pdb differ diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.dll b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.dll index 836c9c7..3f12213 100644 Binary files a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.dll and b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.dll differ diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.pdb b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.pdb index 2fb8e0a..a23915b 100644 Binary files a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.pdb and b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/TempTask.WebEntry.pdb differ diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_2_1.json b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_2_1.json index 05f9960..4aab3e2 100644 --- a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_2_1.json +++ b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_2_1.json @@ -6,18 +6,18 @@ "G": "SJLJWC", "H": "YOY", "I": "WCLJWCL", - "J": "", - "K": "", - "L": "", + "J": "YEARWCZC", + "K": "YEARYOYZC", + "L": "YEARWCLZC", "M": "XDJD", - "N": "JHND", + "N": "JHJD", "O": "JHJDFJ", "P": "SJLJWC", "Q": "YOY", "R": "WCLJWCL", - "S": "", - "T": "", - "U": "", + "S": "SJLJWCZC", + "T": "YOYZC", + "U": "WCLJWCLZC", "V": "REBUILDPROJECT", "W": "REBUILDNUM", "X": "REBUILDRATE", @@ -26,6 +26,6 @@ "AA": "WORKRATE", "AB": "FGWNEWPROJECT", "AC": "FGWNEWNUMS", - "AD": "IMPORTANT_FGWRATE" + "AD": "FGWNEWRATE" } } diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_1.json b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_1.json index 8f6d654..abd7889 100644 --- a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_1.json +++ b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_1.json @@ -6,18 +6,18 @@ "G": "SJLJWC", "H": "YOY", "I": "WCLJWCL", - "J": "", - "K": "", - "L": "", + "J": "YEARWCZC", + "K": "YEARYOYZC", + "L": "YEARWCLZC", "M": "XDJD", - "N": "JHND", + "N": "JHJD", "O": "JHJDFJ", "P": "SJLJWC", "Q": "YOY", "R": "WCLJWCL", - "S": "", - "T": "", - "U": "", + "S": "SJLJWCZC", + "T": "YOYZC", + "U": "WCLJWCLZC", "V": "REBUILDPROJECT", "W": "REBUILDNUM", "X": "REBUILDRATE", @@ -26,6 +26,6 @@ "AA": "WORKRATE", "AB": "FGWNEWPROJECT", "AC": "FGWNEWNUMS", - "AD": "IMPORTANT_FGWRATE" + "AD": "FGWNEWRATE" } } diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_2.json b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_2.json index 7bada2d..6d05478 100644 --- a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_2.json +++ b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_2.json @@ -6,18 +6,18 @@ "E": "SJLJWC", "F": "YOY", "G": "WCLJWCL", - "H": "", - "I": "", - "J": "", + "H": "YEARWCZC", + "I": "YEARYOYZC", + "J": "YEARWCLZC", "K": "XDJD", - "L": "JHND", + "L": "JHJD", "M": "JHJDFJ", "N": "SJLJWC", "O": "YOY", "P": "WCLJWCL", - "Q": "", - "R": "", - "S": "", + "Q": "SJLJWCZC", + "R": "YOYZC", + "S": "WCLJWCLZC", "T": "REBUILDPROJECT", "U": "REBUILDNUM", "V": "REBUILDRATE", diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_5.json b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_5.json index 5a22537..3673123 100644 --- a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_5.json +++ b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_5.json @@ -7,7 +7,7 @@ "F": "YOY", "G": "WCLJWCL", "H": "XDJD", - "I": "JHND", + "I": "JHJD", "J": "JHJDFJ", "K": "SJLJWC", "L": "YOY", diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_6.json b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_6.json index a907663..d18a987 100644 --- a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_6.json +++ b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_6.json @@ -7,7 +7,7 @@ "F": "YOYMJ", "G": "WCLJWCLMJ", "H": "XDJDMJ", - "I": "JHNDMJ", + "I": "JHJDMJ", "J": "JHJDFJMJ", "K": "SJLJWCMJ", "L": "YOYMJ", diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_7.json b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_7.json index 604a07c..155a632 100644 --- a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_7.json +++ b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/column_name_match_3_7.json @@ -7,7 +7,7 @@ "F": "YOYGZ", "G": "WCLJWCLGZ", "H": "XDJDGZ", - "I": "JHNDGZ", + "I": "JHJDGZ", "J": "JHJDFJGZ", "K": "SJLJWCGZ", "L": "YOYGZ", diff --git a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/urlconfig.json b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/urlconfig.json index d56515a..3b83cc3 100644 --- a/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/urlconfig.json +++ b/20220313_Excel/TempTask.WebEntry/bin/Debug/net5.0/urlconfig.json @@ -14,10 +14,10 @@ "sheet_no": 1, "sheet_name": "关键信息", "start_row": 5, - "null_row_count": 11, + "null_row_count": 12, "start_cell": "B", "null_cell_count": 27, - "url": "", + "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/totalKeyRate", "skip_rows": [ 10, 12 ] }, { @@ -37,11 +37,21 @@ "sheets": [ { "sheet_no": 1, - "sheet_name": "城市更新-分行业(关键指标)" + "sheet_name": "城市更新-分行业(关键指标)", + "start_row": 4, + "null_row_count": 8, + "start_cell": "D", + "null_cell_count": 27, + "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/cityUpdateKeyRate" }, { "sheet_no": 2, - "sheet_name": "分地区(关键指标)" + "sheet_name": "分地区(关键指标)", + "start_row": 4, + "null_row_count": 14, + "start_cell": "B", + "null_cell_count": 24, + "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=104,105,106,107,108,109" }, { "sheet_no": 3, @@ -73,7 +83,7 @@ "start_row": 5, "null_row_count": 7, "start_cell": "D", - "null_cell_count": 21, + "null_cell_count": 27, "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/houseInvestKeyRate" }, { @@ -82,12 +92,26 @@ "start_row": 5, "null_row_count": 13, "start_cell": "B", - "null_cell_count": 18, - "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/houseInvestAreaKeyRate" + "null_cell_count": 24, + "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate1?type=101,102,103" }, { "sheet_no": 3, - "sheet_name": "GDP支撑指标-分地区、分行业(关键指标)" + "sheet_name": "安置房套数-分地区", + "start_row": 5, + "null_row_count": 13, + "start_cell": "B", + "null_cell_count": 18, + "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=301" + }, + { + "sheet_no": 4, + "sheet_name": "保障性租赁住房-分地区(关键指标)", + "start_row": 5, + "null_row_count": 13, + "start_cell": "B", + "null_cell_count": 12, + "url": "http://10.19.94.196:81/data-system/api/bigScreen/house/areaKeyRate2?type=302" }, { "sheet_no": 5, diff --git a/20220313_Excel/TempTask.WebEntry/column_name_match_1_1.json b/20220313_Excel/TempTask.WebEntry/column_name_match_1_1.json index 411536e..4ff4db3 100644 --- a/20220313_Excel/TempTask.WebEntry/column_name_match_1_1.json +++ b/20220313_Excel/TempTask.WebEntry/column_name_match_1_1.json @@ -6,9 +6,9 @@ "E": "SJLJWC", "F": "YOY", "G": "WCLJWCL", - "H": "YEARWCZC", - "I": "YEARYOYZC", - "J": "YEARWCLZC", + "H": "SJLJWCZC", + "I": "YOYZC", + "J": "WCLJWCLZC", "K": "XDJD", "L": "JHJD", "M": "JHJDFJ", diff --git a/20220313_Excel/TempTask.WebEntry/column_name_match_2_1.json b/20220313_Excel/TempTask.WebEntry/column_name_match_2_1.json index 4aab3e2..716e15d 100644 --- a/20220313_Excel/TempTask.WebEntry/column_name_match_2_1.json +++ b/20220313_Excel/TempTask.WebEntry/column_name_match_2_1.json @@ -6,9 +6,9 @@ "G": "SJLJWC", "H": "YOY", "I": "WCLJWCL", - "J": "YEARWCZC", - "K": "YEARYOYZC", - "L": "YEARWCLZC", + "J": "SJLJWCZC", + "K": "YOYZC", + "L": "WCLJWCLZC", "M": "XDJD", "N": "JHJD", "O": "JHJDFJ", diff --git a/20220313_Excel/TempTask.WebEntry/column_name_match_2_2.json b/20220313_Excel/TempTask.WebEntry/column_name_match_2_2.json index 1222a6f..50b58a2 100644 --- a/20220313_Excel/TempTask.WebEntry/column_name_match_2_2.json +++ b/20220313_Excel/TempTask.WebEntry/column_name_match_2_2.json @@ -6,23 +6,26 @@ "E": "SJLJWC", "F": "YOY", "G": "WCLJWCL", - "H": "XDJD", - "I": "JHJD", - "J": "JHJDFJ", - "K": "SJLJWC", - "L": "YOY", - "M": "WCLJWCL", - "N": "SJLJWCZC", - "O": "YOYZC", - "P": "WCLJWCLZC", - "Q": "REBUILDPROJECT", - "R": "REBUILDNUM", - "S": "REBUILDRATE", - "T": "WORKPROJECT", - "U": "WORKNUM", - "V": "WORKRATE", - "W": "FGWNEWPROJECT", - "X": "FGWNEWNUMS", - "Y": "FGWNEWRATE" + "H": "SJLJWCZC", + "I": "YOYZC", + "J": "WCLJWCLZC", + "K": "XDJD", + "L": "JHJD", + "M": "JHJDFJ", + "N": "SJLJWC", + "O": "YOY", + "P": "WCLJWCL", + "Q": "SJLJWCZC", + "R": "YOYZC", + "S": "WCLJWCLZC", + "T": "REBUILDPROJECT", + "U": "REBUILDNUM", + "V": "REBUILDRATE", + "W": "WORKPROJECT", + "X": "WORKNUM", + "Y": "WORKRATE", + "Z": "FGWNEWPROJECT", + "AA": "FGWNEWNUMS", + "AB": "FGWNEWRATE" } } diff --git a/20220313_Excel/TempTask.WebEntry/column_name_match_3_1.json b/20220313_Excel/TempTask.WebEntry/column_name_match_3_1.json index abd7889..940fda9 100644 --- a/20220313_Excel/TempTask.WebEntry/column_name_match_3_1.json +++ b/20220313_Excel/TempTask.WebEntry/column_name_match_3_1.json @@ -6,9 +6,9 @@ "G": "SJLJWC", "H": "YOY", "I": "WCLJWCL", - "J": "YEARWCZC", - "K": "YEARYOYZC", - "L": "YEARWCLZC", + "J": "SJLJWCZC", + "K": "YOYZC", + "L": "WCLJWCLZC", "M": "XDJD", "N": "JHJD", "O": "JHJDFJ", diff --git a/20220313_Excel/TempTask.WebEntry/column_name_match_3_2.json b/20220313_Excel/TempTask.WebEntry/column_name_match_3_2.json index 6d05478..c758ce2 100644 --- a/20220313_Excel/TempTask.WebEntry/column_name_match_3_2.json +++ b/20220313_Excel/TempTask.WebEntry/column_name_match_3_2.json @@ -6,9 +6,11 @@ "E": "SJLJWC", "F": "YOY", "G": "WCLJWCL", - "H": "YEARWCZC", - "I": "YEARYOYZC", - "J": "YEARWCLZC", + //"H": "YEARWCZC", + "H": "SJLJWCZC", + "I": "YOYZC", + //"J": "YEARWCLZC", + "J": "WCLJWCLZC", "K": "XDJD", "L": "JHJD", "M": "JHJDFJ", diff --git a/20220313_Excel/TempTask.WebEntry/obj/Debug/net5.0/Razor/Views/Home/Index.cshtml.g.cs b/20220313_Excel/TempTask.WebEntry/obj/Debug/net5.0/Razor/Views/Home/Index.cshtml.g.cs index 592d03e..af36901 100644 --- a/20220313_Excel/TempTask.WebEntry/obj/Debug/net5.0/Razor/Views/Home/Index.cshtml.g.cs +++ b/20220313_Excel/TempTask.WebEntry/obj/Debug/net5.0/Razor/Views/Home/Index.cshtml.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "D:\temp_task\20220313\code\TempTask.WebEntry\Views\Home\Index.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "12b5a2a81ad18994daf766364de0c2c704c2abf8" +#pragma checksum "D:\temp_task\20220313\gitcode\number_zj\20220313_Excel\TempTask.WebEntry\Views\Home\Index.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "34f2fbcac363ec62d82659f31dd55160e6c7faed" // #pragma warning disable 1591 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.Views_Home_Index), @"mvc.1.0.view", @"/Views/Home/Index.cshtml")] @@ -12,7 +12,7 @@ namespace AspNetCore using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; - [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"12b5a2a81ad18994daf766364de0c2c704c2abf8", @"/Views/Home/Index.cshtml")] + [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"34f2fbcac363ec62d82659f31dd55160e6c7faed", @"/Views/Home/Index.cshtml")] public class Views_Home_Index : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage { #line hidden @@ -41,7 +41,7 @@ namespace AspNetCore public async override global::System.Threading.Tasks.Task ExecuteAsync() { WriteLiteral("\r\n\r\n\r\n"); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("head", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "12b5a2a81ad18994daf766364de0c2c704c2abf82700", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("head", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "34f2fbcac363ec62d82659f31dd55160e6c7faed2728", async() => { WriteLiteral(@" @@ -62,19 +62,31 @@ namespace AspNetCore Write(__tagHelperExecutionContext.Output); __tagHelperExecutionContext = __tagHelperScopeManager.End(); WriteLiteral("\r\n\r\n"); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("body", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "12b5a2a81ad18994daf766364de0c2c704c2abf84090", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("body", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "34f2fbcac363ec62d82659f31dd55160e6c7faed4118", async() => { WriteLiteral(@" - 年 - 月 第 - 周 + 年: + 月: + + 周: + - 下载文件-总表\r\n 下载文件-城市更新\r\n 下载文件-房地产业\r\n \r\n \r\n"); + + + 下载文件 + + + 总表 + 城市更新 + 房地产业 + + + + +"); } ); __Microsoft_AspNetCore_Mvc_Razor_TagHelpers_BodyTagHelper = CreateTagHelper(); @@ -92,9 +104,7 @@ namespace AspNetCore el: '#app', data: function () { return { - loading_zongbiao: false, - loading_chengshigengxin: false, - loading_fangdichan: false, + loading: false, year: '', month: '', week: '' @@ -107,28 +117,23 @@ namespace AspNetCore this.week = this.getMonthWeek(now); }, methods: { - - //总表 - loading_zongbiao_false() { this.loading_zongbiao = false }, - downloadfile_zongbiao() { - this.loading_zongbiao = true; - let url = '/api/num-zj/download'; - this.download(url, 1, ""总表.xlsx"", this.loading_zongbiao_false); - }, - //城市更新 - loading_chengshigengxin_false() { this.loading_chengshigengxin = false }, - "); - WriteLiteral(@" downloadfile_chengshigengxin() { - this.loading_chengshigengxin = true; - let url = '/api/num-zj/download'; - this.download(url, 2, ""住建系统抓投资情况通报(城市更新).xlsx"", this.loading_chengshigengxin_false); - }, - //房地产业 - loading_fangdichan_false() { this.loading_fangdichan = false }, - downloadfile_fangdichan() { - this.loading_fangdichan = true; - let url = '/api/num-zj/download'; - this.download(url, 3, ""住建系统抓投资情况通报(房地产业+GDP支撑性指标).xlsx"", this.loading_fangdichan_false); + loading_false() { this.loading = false }, + downloadfile(a) { + let excel_name; + switch (a) { + case ""1"": + excel_name = ""总表.xlsx""; + break; + case ""2"": + excel_name = ""住建系统抓投资情况通报(城市更新).xlsx""; + break; + case ""3"": + excel_name = ""住建系统抓投资情况通报(房地产业+GDP支撑性指标).xlsx""; + break; + } + "); + WriteLiteral(@" this.loading = true; + this.download('/api/num-zj/download', a, excel_name, this.loading_false); }, download(url, type, filename, callback) { let _this = this; @@ -137,8 +142,7 @@ namespace AspNetCore method: 'post', url: url, data: { type: type, year: _this.year, month: _this.month, week: _this.week }, - responseType: ""blob"""); - WriteLiteral(@", + responseType: ""blob"", }).then(function (response) { console.log(response); //解析文件充blod中解析 @@ -148,7 +152,8 @@ namespace AspNetCore const link = document.createElement(""a""); link.style.display = ""none""; link.href = url; - link.setAttribute(""download"", filename); + l"); + WriteLiteral(@"ink.setAttribute(""download"", filename); document.body.appendChild(link); link.click(); document.body.removeChild(link); @@ -162,8 +167,7 @@ namespace AspNetCore }) }) }, - getMonthWeek(no"); - WriteLiteral(@"w) { + getMonthWeek(now) { var a = now.getYear(); var b = now.getMonth() + 1; var c = now.getDate(); @@ -175,13 +179,8 @@ namespace AspNetCore var date = new Date(a, parseInt(b) - 1, c), w = date.getDay(), d = date.getDate(); return Math.ceil( (d + 6 - w) / 7 - ); - } - } - }) - - -"); + "); + WriteLiteral(" );\r\n }\r\n }\r\n })\r\n\r\n\r\n