From fce95773a34c42f36af4372df043b144b72d6438 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期五, 26 四月 2024 10:31:50 +0800 Subject: [PATCH] 1 --- Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html | 2 +- Terra.YaoGan.Web/Terra.YaoGan.Web/html/img/报表分析xz.png | 0 Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js | 2 +- Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj | 1 + Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/tool.js | 21 +++++++++++++++++++-- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj b/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj index 3dfa824..00754f2 100644 --- a/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj +++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj @@ -609,6 +609,7 @@ <Content Include="html\img\鎴潰鍒嗘瀽.png" /> <Content Include="html\img\鎴潰鍒嗘瀽xz.png" /> <Content Include="html\img\鎶ヨ〃鍒嗘瀽.png" /> + <Content Include="html\img\鎶ヨ〃鍒嗘瀽xz.png" /> <Content Include="html\img\鎶ヨ〃鍒嗘瀽_03.png" /> <Content Include="html\img\鏂囦欢鏍憍z.png" /> <Content Include="html\img\鏂囧瓧鏍囨敞.png" /> diff --git "a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/img/\346\212\245\350\241\250\345\210\206\346\236\220xz.png" "b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/img/\346\212\245\350\241\250\345\210\206\346\236\220xz.png" new file mode 100644 index 0000000..789fd64 --- /dev/null +++ "b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/img/\346\212\245\350\241\250\345\210\206\346\236\220xz.png" Binary files differ diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html index 05aafb0..1aede47 100644 --- a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html +++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html @@ -38,7 +38,7 @@ <td class="td" title="澶嶅埗瀵硅薄"><img src="img/leaf.png" class="imgx" data-img="fzdx" /></td> - <!--<td class="td" title="妯″瀷搴�"><img src="img/鍧愭爣.png" class="imgx" data-img="data-lib" /></td>--> + <td class="td" title="缁煎悎缁熻"><img src="img/鎶ヨ〃鍒嗘瀽.png" class="imgx" data-img="dataCount" /></td> </tr> </table> <script type="text/javascript" src="tooljs/tool.js"></script> diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js index 5376076..afe3df1 100644 --- a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js +++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js @@ -118,7 +118,6 @@ }); }) - var url = window.location.href.substring(0, window.location.href.lastIndexOf('/') + 1); //鍧愭爣绯诲伐鍏� @@ -133,6 +132,7 @@ coorsystatus = true; } } + //缁樺埗 function hz(command, param) { sgworld.Command.Execute(command, param); diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/tool.js b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/tool.js index 87de674..a908e3f 100644 --- a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/tool.js +++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/tool.js @@ -96,6 +96,8 @@ case "hsymfx": hsymfx(); break; + case "dataCount": + dataCount(); break; } }); $(".imgx").hover(function () { @@ -103,12 +105,27 @@ $(this).attr("src", dd); $(this).focus(); }, function () { - if($(this).attr("data-sel") == "f"){ + if ($(this).attr("data-sel") == "f") { var mr = $(this).attr("data-mr"); $(this).attr("src", mr); } }); -}) +}); + +// 缁煎悎缁熻 +var showDataCount = false; + +function dataCount() { + showDataCount = !showDataCount; + if (showDataCount) { + // TBAX.createBorderDialog("宸︿笂", url, lT.width, lT.height, lT.top, lT.left, lT.bottom, lT.right); + window.external.createPmDialogDock('showDataCount1', url + "../chart/L1.html", 530, 900, 50, 20, -1, -1); + window.external.createPmDialogDock('showDataCount2', url + "../chart/R1.html", 530, 900, 40, -1, -1, 20); + } else { + window.external.closeDialog("showDataCount1"); + window.external.closeDialog("showDataCount2"); + } +} //娲按娣规病鍒嗘瀽 function hsymfx() { -- Gitblit v1.9.3