瀏覽代碼

修改左侧和顶部公共框架样式

xzxwsk 3 月之前
父節點
當前提交
5159721d6e

二進制
projects/src/main/webapp/asset/css/images/icon_06_2.png


+ 1 - 1
projects/src/main/webapp/asset/css/images/left/export.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs><style>.a{fill:#fff;}</style></defs><path class="a" d="M97.143,85.143h-2v-6l-4-4h-16v20h10v2h-10a2,2,0,0,1-2-2v-20a2,2,0,0,1,2-2h17l5,5Zm-3.879,5-2.585-2.586,1.414-1.414,4.95,4.95-4.95,4.95-1.414-1.415,2.484-2.485H81.143v-2ZM77.23,79.311h2.1l.735,1.588.853-1.588h1.954L81.3,82.026l1.689,2.983H80.92l-.853-1.835-1.005,1.835H77.143l1.68-2.983Zm6.406-2.168h1.776v7.866H83.636Zm2.594,6.288,1.758-.2a1.093,1.093,0,0,0,.305.552.777.777,0,0,0,.522.166.764.764,0,0,0,.552-.187.453.453,0,0,0,.153-.35.41.41,0,0,0-.2-.364,3.131,3.131,0,0,0-.762-.225,6.758,6.758,0,0,1-1.282-.368,1.428,1.428,0,0,1-.605-.571,1.875,1.875,0,0,1,.02-1.888,1.6,1.6,0,0,1,.731-.61,3.208,3.208,0,0,1,1.25-.2,3.542,3.542,0,0,1,1.22.156,1.568,1.568,0,0,1,.657.482,2.7,2.7,0,0,1,.437.886l-1.68.2a.732.732,0,0,0-.217-.4.77.77,0,0,0-.505-.172.612.612,0,0,0-.437.132.426.426,0,0,0-.137.32.349.349,0,0,0,.174.316,2.371,2.371,0,0,0,.757.193,4.372,4.372,0,0,1,1.314.343,1.547,1.547,0,0,1,.66.628,1.8,1.8,0,0,1,.228.9,2.047,2.047,0,0,1-.242.96,1.75,1.75,0,0,1-.761.744,3.046,3.046,0,0,1-1.417.276,2.845,2.845,0,0,1-1.8-.445A2.065,2.065,0,0,1,86.23,83.431Z" transform="translate(-73.143 -73.143)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs></defs><path class="a" d="M97.143,85.143h-2v-6l-4-4h-16v20h10v2h-10a2,2,0,0,1-2-2v-20a2,2,0,0,1,2-2h17l5,5Zm-3.879,5-2.585-2.586,1.414-1.414,4.95,4.95-4.95,4.95-1.414-1.415,2.484-2.485H81.143v-2ZM77.23,79.311h2.1l.735,1.588.853-1.588h1.954L81.3,82.026l1.689,2.983H80.92l-.853-1.835-1.005,1.835H77.143l1.68-2.983Zm6.406-2.168h1.776v7.866H83.636Zm2.594,6.288,1.758-.2a1.093,1.093,0,0,0,.305.552.777.777,0,0,0,.522.166.764.764,0,0,0,.552-.187.453.453,0,0,0,.153-.35.41.41,0,0,0-.2-.364,3.131,3.131,0,0,0-.762-.225,6.758,6.758,0,0,1-1.282-.368,1.428,1.428,0,0,1-.605-.571,1.875,1.875,0,0,1,.02-1.888,1.6,1.6,0,0,1,.731-.61,3.208,3.208,0,0,1,1.25-.2,3.542,3.542,0,0,1,1.22.156,1.568,1.568,0,0,1,.657.482,2.7,2.7,0,0,1,.437.886l-1.68.2a.732.732,0,0,0-.217-.4.77.77,0,0,0-.505-.172.612.612,0,0,0-.437.132.426.426,0,0,0-.137.32.349.349,0,0,0,.174.316,2.371,2.371,0,0,0,.757.193,4.372,4.372,0,0,1,1.314.343,1.547,1.547,0,0,1,.66.628,1.8,1.8,0,0,1,.228.9,2.047,2.047,0,0,1-.242.96,1.75,1.75,0,0,1-.761.744,3.046,3.046,0,0,1-1.417.276,2.845,2.845,0,0,1-1.8-.445A2.065,2.065,0,0,1,86.23,83.431Z" transform="translate(-73.143 -73.143)"/></svg>

+ 1 - 1
projects/src/main/webapp/asset/css/images/left/fxdp.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="34" height="31" viewBox="0 0 34 31"><defs><style>.a{fill:#fff;}</style></defs><path class="a" d="M124.731,118.815v20.366H95.454V118.815ZM93.074,139.182a2.4,2.4,0,0,0,2.342,2.452h29.277a2.272,2.272,0,0,0,1.653-.723,2.483,2.483,0,0,0,.727-1.728V118.815a2.4,2.4,0,0,0-2.342-2.452H95.454a2.282,2.282,0,0,0-1.653.714,2.511,2.511,0,0,0-.727,1.738Zm27.917,8.182a1.2,1.2,0,0,0,1.171-1.221v-.056a1.283,1.283,0,0,0-.34-.874,1.174,1.174,0,0,0-.831-.357H99.156a1.205,1.205,0,0,0-1.171,1.231v.056a1.2,1.2,0,0,0,1.171,1.221Zm-12.117-2.48h2.342v-3.25h-2.285Zm-8.66-13.076,5.865-5.73,1,1.118-5.865,5.73Zm11.484,0,5.855-5.73,1.02,1.118-5.855,5.73Zm-1.228.15-3.23-3.758a1.791,1.791,0,0,1-2.017-.6,1.768,1.768,0,0,1-.037-2.095,1.786,1.786,0,0,1,3.244,1.014,1.87,1.87,0,0,1-.113.648l3.258,3.814a1.613,1.613,0,0,1,1.294.169,1.764,1.764,0,0,1,.841,1.522,1.679,1.679,0,0,1-.8,1.56,1.7,1.7,0,0,1-1.763,0,1.679,1.679,0,0,1-.8-1.56A1.87,1.87,0,0,1,110.47,131.958Zm-11.437.376a1.69,1.69,0,1,1,1.69,1.766,1.733,1.733,0,0,1-1.215-.533A1.714,1.714,0,0,1,99.034,132.333Zm17.84-6.256a1.69,1.69,0,1,1,1.7,1.757,1.733,1.733,0,0,1-1.217-.527,1.714,1.714,0,0,1-.483-1.23Z" transform="translate(-93.074 -116.364)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="34" height="31" viewBox="0 0 34 31"><defs></defs><path class="a" d="M124.731,118.815v20.366H95.454V118.815ZM93.074,139.182a2.4,2.4,0,0,0,2.342,2.452h29.277a2.272,2.272,0,0,0,1.653-.723,2.483,2.483,0,0,0,.727-1.728V118.815a2.4,2.4,0,0,0-2.342-2.452H95.454a2.282,2.282,0,0,0-1.653.714,2.511,2.511,0,0,0-.727,1.738Zm27.917,8.182a1.2,1.2,0,0,0,1.171-1.221v-.056a1.283,1.283,0,0,0-.34-.874,1.174,1.174,0,0,0-.831-.357H99.156a1.205,1.205,0,0,0-1.171,1.231v.056a1.2,1.2,0,0,0,1.171,1.221Zm-12.117-2.48h2.342v-3.25h-2.285Zm-8.66-13.076,5.865-5.73,1,1.118-5.865,5.73Zm11.484,0,5.855-5.73,1.02,1.118-5.855,5.73Zm-1.228.15-3.23-3.758a1.791,1.791,0,0,1-2.017-.6,1.768,1.768,0,0,1-.037-2.095,1.786,1.786,0,0,1,3.244,1.014,1.87,1.87,0,0,1-.113.648l3.258,3.814a1.613,1.613,0,0,1,1.294.169,1.764,1.764,0,0,1,.841,1.522,1.679,1.679,0,0,1-.8,1.56,1.7,1.7,0,0,1-1.763,0,1.679,1.679,0,0,1-.8-1.56A1.87,1.87,0,0,1,110.47,131.958Zm-11.437.376a1.69,1.69,0,1,1,1.69,1.766,1.733,1.733,0,0,1-1.215-.533A1.714,1.714,0,0,1,99.034,132.333Zm17.84-6.256a1.69,1.69,0,1,1,1.7,1.757,1.733,1.733,0,0,1-1.217-.527,1.714,1.714,0,0,1-.483-1.23Z" transform="translate(-93.074 -116.364)"/></svg>

+ 1 - 1
projects/src/main/webapp/asset/css/images/left/gzt.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="34" height="34" viewBox="0 0 34 34"><defs><style>.a{fill:#fff;}</style></defs><path class="a" d="M115.327,112.64h-27.7a3.157,3.157,0,0,0-3.148,3.148v19.2a3.157,3.157,0,0,0,3.148,3.148H98.959v6.4H89.831a1.049,1.049,0,0,0,0,2.1h23.4a1.049,1.049,0,0,0,0-2.1h-9.968v-6.4h12.066a3.157,3.157,0,0,0,3.148-3.148v-19.2A3.031,3.031,0,0,0,115.327,112.64Zm1.049,22.352a1.051,1.051,0,0,1-1.049,1.049h-27.7a1.051,1.051,0,0,1-1.049-1.049v-19.2a1.051,1.051,0,0,1,1.049-1.049h27.7a1.051,1.051,0,0,1,1.049,1.049Zm0,0" transform="translate(-84.48 -112.64)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="34" height="34" viewBox="0 0 34 34"><defs></defs><path class="a" d="M115.327,112.64h-27.7a3.157,3.157,0,0,0-3.148,3.148v19.2a3.157,3.157,0,0,0,3.148,3.148H98.959v6.4H89.831a1.049,1.049,0,0,0,0,2.1h23.4a1.049,1.049,0,0,0,0-2.1h-9.968v-6.4h12.066a3.157,3.157,0,0,0,3.148-3.148v-19.2A3.031,3.031,0,0,0,115.327,112.64Zm1.049,22.352a1.051,1.051,0,0,1-1.049,1.049h-27.7a1.051,1.051,0,0,1-1.049-1.049v-19.2a1.051,1.051,0,0,1,1.049-1.049h27.7a1.051,1.051,0,0,1,1.049,1.049Zm0,0" transform="translate(-84.48 -112.64)"/></svg>

+ 1 - 1
projects/src/main/webapp/asset/css/images/left/sbdwxmgl.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="35" height="33" viewBox="0 0 35 33"><defs><style>.a{fill:#fff;}</style></defs><path class="a" d="M112.384,205.35h-1.639V190.8a4.536,4.536,0,0,0-3.176-4.336l-6.4-2.025v-4.921a4.246,4.246,0,0,0-4.245-4.241H86.782a4.246,4.246,0,0,0-4.245,4.241V205.35H80.312a1.462,1.462,0,1,0,0,2.925h32.072a1.462,1.462,0,1,0,0-2.925Zm-26.92,0V179.516a1.321,1.321,0,0,1,1.317-1.316H96.934a1.321,1.321,0,0,1,1.317,1.316V205.35Zm15.707,0V187.508l5.511,1.748a1.611,1.611,0,0,1,1.134,1.55v14.551h-6.646Z" transform="translate(-78.848 -175.275)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="35" height="33" viewBox="0 0 35 33"><defs></defs><path class="a" d="M112.384,205.35h-1.639V190.8a4.536,4.536,0,0,0-3.176-4.336l-6.4-2.025v-4.921a4.246,4.246,0,0,0-4.245-4.241H86.782a4.246,4.246,0,0,0-4.245,4.241V205.35H80.312a1.462,1.462,0,1,0,0,2.925h32.072a1.462,1.462,0,1,0,0-2.925Zm-26.92,0V179.516a1.321,1.321,0,0,1,1.317-1.316H96.934a1.321,1.321,0,0,1,1.317,1.316V205.35Zm15.707,0V187.508l5.511,1.748a1.611,1.611,0,0,1,1.134,1.55v14.551h-6.646Z" transform="translate(-78.848 -175.275)"/></svg>

+ 1 - 1
projects/src/main/webapp/asset/css/images/left/xmjdjzjgl.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="35" viewBox="0 0 32 35"><defs><style>.a{fill:#fff;}</style></defs><path class="a" d="M164.382,130.2h4.188v2.564h-4.188v3.262h-2.561v-3.262h-4.188v-2.562h4.188v-2.679h-4.188v-2.564h4.186l-4.1-4.1,1.813-1.809,3.6,3.608,3.488-3.494,1.811,1.809-3.981,3.987h4.126v2.562h-4.189V130.2Zm-22.8,2.474h8.085v-19a5.015,5.015,0,0,1,2.983-4.584l.914-.4v-4.913l-10.529,4.655a2.444,2.444,0,0,0-1.459,2.235v22.011Zm-2.563,2.562h-2.441v-2.564h2.443v-22a5,5,0,0,1,2.98-4.581l11.019-4.873a2.209,2.209,0,0,1,3.1,2.025v4.317l8.3-3.665a2.209,2.209,0,0,1,3.1,2.025V115.5H164.96v-9.039l-11.278,4.982a2.447,2.447,0,0,0-1.456,2.24v19h3.49v2.562h-16.7Z" transform="translate(-136.576 -101.031)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="35" viewBox="0 0 32 35"><defs></defs><path class="a" d="M164.382,130.2h4.188v2.564h-4.188v3.262h-2.561v-3.262h-4.188v-2.562h4.188v-2.679h-4.188v-2.564h4.186l-4.1-4.1,1.813-1.809,3.6,3.608,3.488-3.494,1.811,1.809-3.981,3.987h4.126v2.562h-4.189V130.2Zm-22.8,2.474h8.085v-19a5.015,5.015,0,0,1,2.983-4.584l.914-.4v-4.913l-10.529,4.655a2.444,2.444,0,0,0-1.459,2.235v22.011Zm-2.563,2.562h-2.441v-2.564h2.443v-22a5,5,0,0,1,2.98-4.581l11.019-4.873a2.209,2.209,0,0,1,3.1,2.025v4.317l8.3-3.665a2.209,2.209,0,0,1,3.1,2.025V115.5H164.96v-9.039l-11.278,4.982a2.447,2.447,0,0,0-1.456,2.24v19h3.49v2.562h-16.7Z" transform="translate(-136.576 -101.031)"/></svg>

+ 1 - 1
projects/src/main/webapp/asset/css/images/left/xmjg.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="27.998" height="34" viewBox="0 0 27.998 34"><defs><style>.a{fill:#fff;}</style></defs><path class="a" d="M15.053,34h0L12.66,32.584a8.105,8.105,0,0,1,2.814-2.975,16.707,16.707,0,0,1,2.813-1.133A5.12,5.12,0,0,0,21.1,27.2a11.283,11.283,0,0,0,4.08-8.642V7.509a12.22,12.22,0,0,1-1.673.115,13.644,13.644,0,0,1-9.581-4.082A12.162,12.162,0,0,1,9.653,6.586,13.026,13.026,0,0,1,4.495,7.631a13.75,13.75,0,0,1-1.822-.122V18.558a11.111,11.111,0,0,0,1.565,5.685,11.422,11.422,0,0,0,4.2,4.09l1.266.426a1.432,1.432,0,0,1,.563,1.983A1.49,1.49,0,0,1,9,31.508a1.341,1.341,0,0,1-.7-.2l-1.125-.567A13.461,13.461,0,0,1,1.9,25.659a14.082,14.082,0,0,1-1.9-7.1V5.666A1.279,1.279,0,0,1,.563,4.533a.976.976,0,0,1,.7-.235,1.825,1.825,0,0,1,.567.093,2.6,2.6,0,0,0,.985.283,9.954,9.954,0,0,0,1.82.168A9.924,9.924,0,0,0,12.8.567,1.712,1.712,0,0,1,13.927,0a1.265,1.265,0,0,1,1.126.567,10.552,10.552,0,0,0,3.72,3.165,10.4,10.4,0,0,0,4.671,1.111,10.642,10.642,0,0,0,1.878-.168,4.5,4.5,0,0,1,.486-.128,2.046,2.046,0,0,0,.5-.154,1.631,1.631,0,0,1,.525-.093,1.3,1.3,0,0,1,.741.235.77.77,0,0,1,.281,1.133V18.558a14.026,14.026,0,0,1-5.064,10.767,9.4,9.4,0,0,1-3.8,1.842,6.625,6.625,0,0,0-2.11.85A4.951,4.951,0,0,0,15.053,34ZM13.5,21.092a1.522,1.522,0,0,1-.985-.419L9.425,17.6a1.343,1.343,0,0,1,0-1.955,1.367,1.367,0,0,1,1.97,0l2.11,2.1,3.658-3.632a1.367,1.367,0,0,1,1.969,0,1.343,1.343,0,0,1,0,1.956l-4.642,4.61A1.278,1.278,0,0,1,13.5,21.092Z" transform="translate(0 0)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="27.998" height="34" viewBox="0 0 27.998 34"><defs></defs><path class="a" d="M15.053,34h0L12.66,32.584a8.105,8.105,0,0,1,2.814-2.975,16.707,16.707,0,0,1,2.813-1.133A5.12,5.12,0,0,0,21.1,27.2a11.283,11.283,0,0,0,4.08-8.642V7.509a12.22,12.22,0,0,1-1.673.115,13.644,13.644,0,0,1-9.581-4.082A12.162,12.162,0,0,1,9.653,6.586,13.026,13.026,0,0,1,4.495,7.631a13.75,13.75,0,0,1-1.822-.122V18.558a11.111,11.111,0,0,0,1.565,5.685,11.422,11.422,0,0,0,4.2,4.09l1.266.426a1.432,1.432,0,0,1,.563,1.983A1.49,1.49,0,0,1,9,31.508a1.341,1.341,0,0,1-.7-.2l-1.125-.567A13.461,13.461,0,0,1,1.9,25.659a14.082,14.082,0,0,1-1.9-7.1V5.666A1.279,1.279,0,0,1,.563,4.533a.976.976,0,0,1,.7-.235,1.825,1.825,0,0,1,.567.093,2.6,2.6,0,0,0,.985.283,9.954,9.954,0,0,0,1.82.168A9.924,9.924,0,0,0,12.8.567,1.712,1.712,0,0,1,13.927,0a1.265,1.265,0,0,1,1.126.567,10.552,10.552,0,0,0,3.72,3.165,10.4,10.4,0,0,0,4.671,1.111,10.642,10.642,0,0,0,1.878-.168,4.5,4.5,0,0,1,.486-.128,2.046,2.046,0,0,0,.5-.154,1.631,1.631,0,0,1,.525-.093,1.3,1.3,0,0,1,.741.235.77.77,0,0,1,.281,1.133V18.558a14.026,14.026,0,0,1-5.064,10.767,9.4,9.4,0,0,1-3.8,1.842,6.625,6.625,0,0,0-2.11.85A4.951,4.951,0,0,0,15.053,34ZM13.5,21.092a1.522,1.522,0,0,1-.985-.419L9.425,17.6a1.343,1.343,0,0,1,0-1.955,1.367,1.367,0,0,1,1.97,0l2.11,2.1,3.658-3.632a1.367,1.367,0,0,1,1.969,0,1.343,1.343,0,0,1,0,1.956l-4.642,4.61A1.278,1.278,0,0,1,13.5,21.092Z" transform="translate(0 0)"/></svg>

+ 1 - 1
projects/src/main/webapp/asset/css/images/left/xtgl.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="33" height="33" viewBox="0 0 33 33"><defs><style>.a{fill:#fff;}</style></defs><path class="a" d="M23.719,31.674V30.181a5.26,5.26,0,0,1-1.366-.568L21.3,30.67a1.326,1.326,0,0,1-1.875-1.875l1.057-1.056a5.259,5.259,0,0,1-.569-1.368H18.415a1.326,1.326,0,1,1,0-2.652h1.493a5.259,5.259,0,0,1,.569-1.368L19.419,21.3a1.326,1.326,0,0,1,1.875-1.875l1.056,1.057a5.259,5.259,0,0,1,1.368-.569V18.415a1.326,1.326,0,1,1,2.652,0v1.493a5.259,5.259,0,0,1,1.368.569l1.056-1.059a1.326,1.326,0,1,1,1.875,1.875l-1.057,1.056a5.26,5.26,0,0,1,.568,1.368h1.493a1.326,1.326,0,1,1,0,2.652H30.181a5.26,5.26,0,0,1-.568,1.368l1.057,1.056a1.326,1.326,0,0,1-1.875,1.875l-1.056-1.057a5.259,5.259,0,0,1-1.368.568v1.493a1.326,1.326,0,0,1-2.652,0Zm-1.326-6.629a2.652,2.652,0,1,0,2.652-2.652A2.652,2.652,0,0,0,22.393,25.045ZM6.629,33a1.326,1.326,0,1,1,0-2.652h5.156V26.371h-8.1A3.694,3.694,0,0,1,0,22.687v-19A3.694,3.694,0,0,1,3.683,0H29.317A3.694,3.694,0,0,1,33,3.683v9.429a1.326,1.326,0,0,1-2.652,0V4.493a1.847,1.847,0,0,0-1.842-1.842H4.493A1.847,1.847,0,0,0,2.652,4.493V17.052h10.46a1.326,1.326,0,1,1,0,2.652H2.652v2.173a1.847,1.847,0,0,0,1.842,1.842h8.618a1.326,1.326,0,0,1,1.326,1.326v6.629A1.326,1.326,0,0,1,13.112,33Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="33" height="33" viewBox="0 0 33 33"><defs></defs><path class="a" d="M23.719,31.674V30.181a5.26,5.26,0,0,1-1.366-.568L21.3,30.67a1.326,1.326,0,0,1-1.875-1.875l1.057-1.056a5.259,5.259,0,0,1-.569-1.368H18.415a1.326,1.326,0,1,1,0-2.652h1.493a5.259,5.259,0,0,1,.569-1.368L19.419,21.3a1.326,1.326,0,0,1,1.875-1.875l1.056,1.057a5.259,5.259,0,0,1,1.368-.569V18.415a1.326,1.326,0,1,1,2.652,0v1.493a5.259,5.259,0,0,1,1.368.569l1.056-1.059a1.326,1.326,0,1,1,1.875,1.875l-1.057,1.056a5.26,5.26,0,0,1,.568,1.368h1.493a1.326,1.326,0,1,1,0,2.652H30.181a5.26,5.26,0,0,1-.568,1.368l1.057,1.056a1.326,1.326,0,0,1-1.875,1.875l-1.056-1.057a5.259,5.259,0,0,1-1.368.568v1.493a1.326,1.326,0,0,1-2.652,0Zm-1.326-6.629a2.652,2.652,0,1,0,2.652-2.652A2.652,2.652,0,0,0,22.393,25.045ZM6.629,33a1.326,1.326,0,1,1,0-2.652h5.156V26.371h-8.1A3.694,3.694,0,0,1,0,22.687v-19A3.694,3.694,0,0,1,3.683,0H29.317A3.694,3.694,0,0,1,33,3.683v9.429a1.326,1.326,0,0,1-2.652,0V4.493a1.847,1.847,0,0,0-1.842-1.842H4.493A1.847,1.847,0,0,0,2.652,4.493V17.052h10.46a1.326,1.326,0,1,1,0,2.652H2.652v2.173a1.847,1.847,0,0,0,1.842,1.842h8.618a1.326,1.326,0,0,1,1.326,1.326v6.629A1.326,1.326,0,0,1,13.112,33Z"/></svg>

+ 1 - 1
projects/src/main/webapp/asset/css/images/left/zhgd.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="38" height="29" viewBox="0 0 38 29"><defs><style>.a{fill:#fff;}</style></defs><path class="a" d="M5.378,29A5.409,5.409,0,0,1,2.667,18.929V16.173a16.1,16.1,0,1,1,32.19,0v2.691A5.409,5.409,0,0,1,32.259,29ZM9.816,7.184A12.693,12.693,0,0,0,6.11,16.173v4.741l-1.705,1a1.946,1.946,0,0,0,.972,3.624H32.259a1.946,1.946,0,0,0,.932-3.647l-1.777-.987V16.173A12.746,12.746,0,0,0,26.158,5.856l-1.213,6.915a1.722,1.722,0,1,1-3.391-.6l1.4-8a12.678,12.678,0,0,0-8.306-.029l1.408,8.024a1.722,1.722,0,1,1-3.391.6L11.443,5.8A12.757,12.757,0,0,0,9.816,7.184Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="29" viewBox="0 0 38 29"><defs></defs><path class="a" d="M5.378,29A5.409,5.409,0,0,1,2.667,18.929V16.173a16.1,16.1,0,1,1,32.19,0v2.691A5.409,5.409,0,0,1,32.259,29ZM9.816,7.184A12.693,12.693,0,0,0,6.11,16.173v4.741l-1.705,1a1.946,1.946,0,0,0,.972,3.624H32.259a1.946,1.946,0,0,0,.932-3.647l-1.777-.987V16.173A12.746,12.746,0,0,0,26.158,5.856l-1.213,6.915a1.722,1.722,0,1,1-3.391-.6l1.4-8a12.678,12.678,0,0,0-8.306-.029l1.408,8.024a1.722,1.722,0,1,1-3.391.6L11.443,5.8A12.757,12.757,0,0,0,9.816,7.184Z"/></svg>

+ 1 - 1
projects/src/main/webapp/asset/css/images/left/zjfwk.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="35" height="29" viewBox="0 0 35 29"><defs><style>.a{fill:#fff;}</style></defs><g transform="translate(0)"><g transform="translate(0 0)"><path class="a" d="M20.2,29a1.258,1.258,0,0,1-1.279-1.237v0A1.258,1.258,0,0,1,20.2,26.523H31.85a1.258,1.258,0,0,1,1.279,1.237v0A1.259,1.259,0,0,1,31.85,29Zm-5.487-1.972C12.483,24.97,6.695,19.621,3.533,16.669.074,13.433-.9,9.3.852,5.637,2.506,2.181,6.667-.492,10.424.123c2.494.4,4.826,1.712,7.483,2.711.967-.527,2.359-1.3,3.772-2.043,4.009-2.106,9.654.276,11.947,3.851a8.838,8.838,0,0,1-.565,10.245,1.28,1.28,0,0,1-1.024.5,1.294,1.294,0,0,1-.9-.363,1.2,1.2,0,0,1-.127-1.6,6.892,6.892,0,0,0,1.371-3.2,6.146,6.146,0,0,0-.921-4.275,8.229,8.229,0,0,0-6.415-3.473,4.566,4.566,0,0,0-2.147.492c-1.018.534-2.052,1.1-2.882,1.557l-.854.468-1.051.572L16.983,5.14c-.894-.336-1.732-.7-2.542-1.044A20.175,20.175,0,0,0,10,2.563a4.175,4.175,0,0,0-.677-.054A7.525,7.525,0,0,0,3.169,6.677a5.977,5.977,0,0,0-.443,4.073,8.534,8.534,0,0,0,2.579,4.138C6.821,16.3,8.385,17.73,9.9,19.11c1.766,1.612,4.954,4.591,6.592,6.121a1.217,1.217,0,0,1,.017,1.776,1.314,1.314,0,0,1-1.794.021ZM20.2,24.065a1.258,1.258,0,0,1-1.279-1.237v0A1.258,1.258,0,0,1,20.2,21.587H31.85a1.258,1.258,0,0,1,1.279,1.237v0a1.259,1.259,0,0,1-1.279,1.237Zm0-4.96a1.258,1.258,0,0,1-1.279-1.237v0A1.258,1.258,0,0,1,20.2,16.628H31.85a1.258,1.258,0,0,1,1.279,1.237v0a1.259,1.259,0,0,1-1.279,1.237Z"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="35" height="29" viewBox="0 0 35 29"><defs></defs><g transform="translate(0)"><g transform="translate(0 0)"><path class="a" d="M20.2,29a1.258,1.258,0,0,1-1.279-1.237v0A1.258,1.258,0,0,1,20.2,26.523H31.85a1.258,1.258,0,0,1,1.279,1.237v0A1.259,1.259,0,0,1,31.85,29Zm-5.487-1.972C12.483,24.97,6.695,19.621,3.533,16.669.074,13.433-.9,9.3.852,5.637,2.506,2.181,6.667-.492,10.424.123c2.494.4,4.826,1.712,7.483,2.711.967-.527,2.359-1.3,3.772-2.043,4.009-2.106,9.654.276,11.947,3.851a8.838,8.838,0,0,1-.565,10.245,1.28,1.28,0,0,1-1.024.5,1.294,1.294,0,0,1-.9-.363,1.2,1.2,0,0,1-.127-1.6,6.892,6.892,0,0,0,1.371-3.2,6.146,6.146,0,0,0-.921-4.275,8.229,8.229,0,0,0-6.415-3.473,4.566,4.566,0,0,0-2.147.492c-1.018.534-2.052,1.1-2.882,1.557l-.854.468-1.051.572L16.983,5.14c-.894-.336-1.732-.7-2.542-1.044A20.175,20.175,0,0,0,10,2.563a4.175,4.175,0,0,0-.677-.054A7.525,7.525,0,0,0,3.169,6.677a5.977,5.977,0,0,0-.443,4.073,8.534,8.534,0,0,0,2.579,4.138C6.821,16.3,8.385,17.73,9.9,19.11c1.766,1.612,4.954,4.591,6.592,6.121a1.217,1.217,0,0,1,.017,1.776,1.314,1.314,0,0,1-1.794.021ZM20.2,24.065a1.258,1.258,0,0,1-1.279-1.237v0A1.258,1.258,0,0,1,20.2,21.587H31.85a1.258,1.258,0,0,1,1.279,1.237v0a1.259,1.259,0,0,1-1.279,1.237Zm0-4.96a1.258,1.258,0,0,1-1.279-1.237v0A1.258,1.258,0,0,1,20.2,16.628H31.85a1.258,1.258,0,0,1,1.279,1.237v0a1.259,1.259,0,0,1-1.279,1.237Z"/></g></g></svg>

+ 7 - 8
projects/src/main/webapp/vmodules/index.jsp

@@ -18,10 +18,14 @@
     <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
-<body>
-	<div class="layui-layout layui-layout-admin">
-		<jsp:include page="top.jsp"/>
+<body class="frame_bg">
+	<div class="layui-layout layui-layout-admin frame pd0">
 		<jsp:include page="leftMenu.jsp"/>
+		<!-- 内容区域 -->
+		<div class="layui-body">
+			<jsp:include page="top.jsp"/>
+			<iframe id="rightContent"></iframe>
+		</div>
 	</div>
     <div class="layui-form" id="resetPasswordForm" style="display: none;padding: 30px" lay-filter="resetForm">
 	<div class="layui-form-item">
@@ -78,8 +82,3 @@ function openRestPanel(){
 </script>
 </body>
 </html>
-<style>
-	.layui-layout-admin{
-		padding: 0 !important;
-	}
-</style>

+ 59 - 38
projects/src/main/webapp/vmodules/leftMenu.jsp

@@ -4,32 +4,40 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <!-- 左侧导航区域 -->
-<div id="leftMenu">
+<div id="leftMenu" class="layui-side left_menu" :class="{close: collapse}">
     <!-- <div class="top_menu" @click="changeSide" v-if="collapse"></div> -->
-    <div class="layui-side left_menu" :class="{close: collapse}">
-        <!-- <div :class="['top_menu', {collapse}]" @click="changeSide" v-if="!collapse"></div> -->
-        <div class="layui-side-scroll" style="width: 200px">
-            <ul class="layui-nav layui-nav-tree" style="width: 200px" lay-filter="test">
-                <li :class="['layui-nav-item', {'layui-nav-itemed layui-nav-itemed-hand': active === index}]"
-                    v-for="(item, index) in navLs" :key="index" v-if="menuCode.indexOf(item.code) >= 0"
-                >
-                    <a :title="item.txt" @click="onSelectItem(index)" class='icon' style="color: #ffffff !important;"
-                       :class="active === index? item.activeIcon :item.icon" href="javascript:;">{{item.txt}}</a>
-                    <!-- <a v-else :title="item.txt" @click="onSelectItem(index)" :class="['icon', ]" href="javascript:;">{{item.txt}}</a> -->
-
-                    <dl class="layui-nav-child" v-if="item.child != null">
-                        <dd v-for="(it,ind) in item.child" :key="ind" v-if="menuCode.indexOf(it.code) >= 0">
-                            <a :title="it.txt" href="javascript:;" :class="['icon', it.icon]"
-                               style="font-size: 12px;text-indent: 1rem" @click="onSelectItem(index,ind)">{{it.txt}}</a>
-                        </dd>
-                    </dl>
-                </li>
-            </ul>
-        </div>
+    <div class="header_content_left">
+        <div class="header_code"></div>
+        <div class="header_text">哈密市投资项目智慧平台</div>
     </div>
-    <!-- 内容区域 -->
-    <div class="layui-body">
-        <iframe id="rightContent"></iframe>
+    <div class="expand_collapse_btn" @click="changeSide"></div>
+    <div class="layui-side-scroll">
+        <ul class="layui-nav layui-nav-tree" lay-filter="test">
+            <li :class="['layui-nav-item', {'layui-nav-itemed layui-nav-itemed-hand': Number(active) === index}]"
+                v-for="(item, index) in navLs" :key="index" v-if="menuCode.indexOf(item.code) >= 0"
+            >
+                <a :title="item.txt" @click="onSelectItem(index)" href="javascript:;">
+                    <div class="left">
+                        <i class='icon'
+                           :class="Number(active) === index ? item.activeIcon : item.icon"
+                        ></i>{{item.txt}}
+                    </div>
+                    <i class="layui-icon layui-icon-down"></i>
+                </a>
+                <!-- <a v-else :title="item.txt" @click="onSelectItem(index)" :class="['icon', ]" href="javascript:;">{{item.txt}}</a> -->
+
+                <dl class="layui-nav-child" v-if="item.child != null">
+                    <dd v-if="menuCode.indexOf(it.code) >= 0"
+                        v-for="(it,ind) in item.child" :key="'inner_' + ind"
+                        :class="{'layui-this': it.code === curSelectedMenu}"
+                    >
+                        <a :title="it.txt" href="javascript:;"
+                           @click="onSelectItem(index,ind)"
+                        >{{it.txt}}</a>
+                    </dd>
+                </dl>
+            </li>
+        </ul>
     </div>
 </div>
 <script type="text/javascript">
@@ -40,11 +48,13 @@
             winH: 0,
             collapse: false,
             tabActive: 1,
+            curSelectedMenu: '',
             isDialog: '${isDialog}',
             active: 0, // 左侧菜单选中项
             buttonActive: 1,
             buttonActive2: 1,
             menuCode: "${menuCode}".split(","),
+            topBreadcrumb: '',
             navLs: [
                 {
                     icon: 'icon_big_screen_active',
@@ -317,9 +327,16 @@
             imgLs: 10
         },
         mounted: function () {
-            this.init();
+            const self = this
+            const si = setInterval(() => {
+                if (document.querySelector('#rightContent')) {
+                    self.init();
+                    clearInterval(si)
+                }
+            }, 100)
             window.addEventListener("message", e => {
-                this.changeSide(e.data.collapse)
+                console.log('leftMenu receive message:', e.data)
+                this.changeSide(e.data.collapse ?? false)
             });
             window.toWorkBench = this.toWorkBench;
             window.toTask = this.toTask;
@@ -331,9 +348,9 @@
                 }
                 const $ = layui.jquery
                 // $('#rightContent').width(document.body.clientWidth - 190).height(document.body.clientHeight - 50);
-                window.addEventListener('resize', function () {
-                    // $('#rightContent').height(document.body.clientHeight - 50);
-                })
+                // window.addEventListener('resize', function () {
+                //     $('#rightContent').height(document.body.clientHeight - 50);
+                // })
 
                 //通过hash值的索引定位应该加载哪个页面
                 var href = window.location.href;
@@ -393,14 +410,17 @@
 
             },
 
-            changeSide: function (status = true) {
-                this.collapse = !status
-                if (this.collapse) {
-                    $("#rightContent").parent().addClass("close");
+            changeSide: function (status) {
+                if (typeof status === 'boolean') {
+                    this.collapse = status
                 } else {
-                    $("#rightContent").parent().removeClass("close");
+                    this.collapse = !this.collapse
                 }
-                $("#rightContent").width("100%");
+                const iframeObj =  $("#rightContent")
+                iframeObj[0].contentWindow.postMessage({
+                    collapse: this.collapse,
+                    topBreadcrumb: this.topBreadcrumb,
+                });
             },
             toWorkBench: function () {
                 var index = this.navLs.findIndex(item => {
@@ -435,9 +455,10 @@
                         }
                         window.location.hash = index + "_" + ind;
                         var parentNodeText = this.navLs[index].txt;
-                        var arrowHtml = '<div class="top-arrow-html"></div>';
+                        this.curSelectedMenu = this.navLs[index].child?.[ind].code ?? ''
                         $("#rightContent").attr("src", App.getUrl(chooseNode.url));
-                        $(".top-breadcrumb").html(parentNodeText + arrowHtml + chooseNode.txt);
+                        const htmlStr = '<span style="margin-right: 5px; color: #dde1e6;">' + parentNodeText + ' /</span>' + chooseNode.txt
+                        this.topBreadcrumb = htmlStr
                     } else {
                         App.msg.warn("正在建设中");
                     }
@@ -448,7 +469,7 @@
                     }
                     window.location.hash = index;
                     $("#rightContent").attr("src", App.getUrl(this.navLs[index].url));
-                    $(".top-breadcrumb").text(this.navLs[index].txt);
+                    this.topBreadcrumb = this.navLs[index].txt
                 }
             },
             onChangeActive: function (index) {

+ 498 - 0
projects/src/main/webapp/vmodules/leftMenu_old.jsp

@@ -0,0 +1,498 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<!-- 左侧导航区域 -->
+<div id="leftMenu">
+    <!-- <div class="top_menu" @click="changeSide" v-if="collapse"></div> -->
+    <div class="layui-side left_menu" :class="{close: collapse}">
+        <!-- <div :class="['top_menu', {collapse}]" @click="changeSide" v-if="!collapse"></div> -->
+        <div class="layui-side-scroll" style="width: 200px">
+            <ul class="layui-nav layui-nav-tree" style="width: 200px" lay-filter="test">
+                <li :class="['layui-nav-item', {'layui-nav-itemed layui-nav-itemed-hand': active === index}]"
+                    v-for="(item, index) in navLs" :key="index" v-if="menuCode.indexOf(item.code) >= 0"
+                >
+                    <a :title="item.txt" @click="onSelectItem(index)" class='icon' style="color: #ffffff !important;"
+                       :class="active === index? item.activeIcon :item.icon" href="javascript:;">{{item.txt}}</a>
+                    <!-- <a v-else :title="item.txt" @click="onSelectItem(index)" :class="['icon', ]" href="javascript:;">{{item.txt}}</a> -->
+
+                    <dl class="layui-nav-child" v-if="item.child != null">
+                        <dd v-for="(it,ind) in item.child" :key="ind" v-if="menuCode.indexOf(it.code) >= 0">
+                            <a :title="it.txt" href="javascript:;" :class="['icon', it.icon]"
+                               style="font-size: 12px;text-indent: 1rem" @click="onSelectItem(index,ind)">{{it.txt}}</a>
+                        </dd>
+                    </dl>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <!-- 内容区域 -->
+    <div class="layui-body">
+        <iframe id="rightContent"></iframe>
+    </div>
+</div>
+<script type="text/javascript">
+    var year = new Date().getFullYear();
+    new Vue({
+        el: "#leftMenu",
+        data: {
+            winH: 0,
+            collapse: false,
+            tabActive: 1,
+            isDialog: '${isDialog}',
+            active: 0, // 左侧菜单选中项
+            buttonActive: 1,
+            buttonActive2: 1,
+            menuCode: "${menuCode}".split(","),
+            navLs: [
+                {
+                    icon: 'icon_big_screen_active',
+                    activeIcon: 'icon_big_screen_active',
+                    code: '101',
+                    txt: '智慧分析大屏',
+                    url: 'statics/analysisScreenTwo'
+                },
+                {
+                    icon: 'icon_work_bench_active',
+                    activeIcon: 'icon_work_bench_active',
+                    code: '201',
+                    txt: '互动工作台',
+                    url: 'workBench/zrWorkBench',
+                    kind: ["1", "4"]
+                },
+                {
+                    icon: 'icon_project_active',
+                    activeIcon: 'icon_project_active',
+                    code: '4',
+                    txt: '项目四库管理',
+                    child: [
+
+                        {
+                            txt: '储备库',
+                            code: '402',
+                            url: 'subject/subInfo/projTz?type=3',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_cb_${loginUserId}")
+                            }
+                        },
+                        {
+                            txt: '新建库',
+                            code: '408',
+                            url: 'subject/subInfo/projTz?type=0',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_xj_${loginUserId}")
+                            }
+                        },
+                        {
+                            txt: '在建库',
+                            code: '401',
+                            url: 'subject/subInfo/projTz?type=1',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_main_${loginUserId}")
+                            }
+                        },
+                        {
+                            txt: '投产库',
+                            code: '403',
+                            url: 'subject/subInfo/projTz?type=4',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_end_${loginUserId}")
+                            }
+                        }
+                        ,
+                        {
+                            txt: '项目总库',
+                            code: '404',
+                            url: 'subject/subInfo/projTz?type=5',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_end_${loginUserId}")
+                            }
+                        }
+                    ]
+                },
+                {
+                    icon: 'icon_organ_manage_active',
+                    activeIcon: 'icon_organ_manage_active',
+                    code: '3',
+                    txt: '项目前期管理',
+                    child: [
+                        {
+                            txt: '项目信息申报',
+                            code: '301',
+                            url: 'subject/subInfo/report'
+                        },
+                        {
+                            txt: '前期手续办理情况',
+                            code: '303',
+                            url: 'subject/subInfo/pre'/* ?type=qx */
+                        }
+                    ]
+                },
+                {
+                    icon: 'icon_project_active',
+                    activeIcon: 'icon_project_active',
+                    code: '1999',
+                    txt: '重点项目调度',
+                    child: [
+                        {
+                            txt: '储备项目',
+                            code: '1103',
+                            url: 'subject/subInfo/projTz?type=yearReserve',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_yearReserve_${loginUserId}")
+                            }
+                        },
+                        {
+                            txt: '新建项目',
+                            code: '1101',
+                            url: 'subject/subInfo/projTz?type=yearNew',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_yearNew_${loginUserId}")
+                            }
+                        },
+                        {
+                            txt: '在建项目',
+                            code: '1102',
+                            url: 'subject/subInfo/projTz?type=yearExtend',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_yearExtend_${loginUserId}")
+                            }
+                        },
+                        {
+                            txt: '投产项目',
+                            code: '1104',
+                            url: 'subject/subInfo/projTz?type=yearSum',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_yearSum_${loginUserId}")
+                            }
+                        },
+                    ]
+                },
+                {
+                    icon: 'icon_over_time_active', activeIcon: 'icon_over_time_active',
+                    code: '5',
+                    txt: '统计分析',
+                    url: 'tjfx/index'
+                    // url: 'register/underConstruction'
+                },
+                {
+                    icon: 'icon_over_time_active',
+                    activeIcon: 'icon_over_time_active',
+                    code: '6',
+                    txt: '预警问题督办',
+                    child: [
+                        {
+                            txt: '问题统计分析',
+                            code: '602',
+                            icon: 'icon_question_gz',
+                            url: 'problem/info/index'
+                            // url: 'register/underConstruction'
+                        },
+                        {
+                            txt: '问题推送处理',
+                            code: '603',
+                            url: "problemtrack/index"
+                            // url: 'register/underConstruction'
+
+                        }
+                    ]
+                },
+                {
+                    icon: 'icon_zjfwk_active',
+                    activeIcon: 'icon_zjfwk_active',
+                    txt: '智联工地',
+                    code: '7',
+                    child: [
+                        {
+                            code: '702',
+                            txt: '项目地图',
+                            url: 'smart/query'
+                            //url: 'register/underConstruction'
+                        },
+                        {
+                            code: '703',
+                            txt: '实时视频',
+                            url: 'smart/vedio'
+                            //url: 'register/underConstruction'
+                        },
+                        {
+                            txt: '周调度图片',
+                            code: '706',
+                            url: 'graphicProgress/list'
+                            // url: 'register/underConstruction'
+                        },
+                        {
+                            txt: '月航拍全景',
+                            code: '707',
+                            url: 'aerial/list'
+                            // url: 'register/underConstruction'
+                        }
+
+                    ]
+                },
+                {
+                    icon: 'icon_project_xtgl_active',
+                    activeIcon: 'icon_project_xtgl_active',
+                    code: '9',
+                    txt: '系统管理',
+                    child: [
+                        {
+                            txt: '项目单位信息',
+                            code: '904',
+                            url: 'register/query'
+                        },
+                        {
+                            txt: '行业部门信息',
+                            code: '906',
+                            url: 'junit/index'
+                        },
+                        {
+                            txt: '字典管理',
+                            code: '909',
+                            url: 'dicsystable/index',
+                        },
+                        {
+                            txt: '行业设置',
+                            code: '918',
+                            url: 'subIndu/index',
+                        },
+                        {
+                            txt: '公告管理',
+                            code: '910',
+                            url: 'notice/index'
+                        },
+                        {
+                            txt: '系统参数设置',
+                            code: '911',
+                            url: 'sysTable/index'
+                        },
+                        {
+                            txt: '操作日志查询',
+                            code: '913',
+                            url: 'subDataLog/index'
+                        },
+                        {
+                            txt: '登录日志',
+                            code: '920',
+                            url: 'loginlog/index'
+                        },
+                        {
+                            txt: '审计日志',
+                            code: '408',
+                            url: 'auditLog/index'
+                        },
+                        {
+                            txt: '短信日志查询',
+                            code: '915',
+                            url: 'msgLog/index'
+                        },
+                        {
+                            code: '917',
+                            txt: 'A项目年度计划',
+                            // url: 'annualPlan/index'
+                            url: 'annualPlan/index'
+                        },
+                        {
+                            txt: 'B项目周报',
+                            code: '406',
+                            // url: 'weekReport/view'
+                            url: 'weekReport/view'
+                        },
+                        {
+                            txt: 'C项目月报',
+                            code: '407',
+                            // url: 'monthReport/view'
+                            url: 'monthReport/view'
+                        },
+                        {
+                            txt: 'D每个月项目转换情况',
+                            code: '450',
+                            url: 'tjfx/xmzhtj'
+                            // url: 'register/underConstruction'
+                        },
+                    ]
+                }
+            ],
+            imgLs: 10
+        },
+        mounted: function () {
+            this.init();
+            window.addEventListener("message", e => {
+                this.changeSide(e.data.collapse)
+            });
+            window.toWorkBench = this.toWorkBench;
+            window.toTask = this.toTask;
+        },
+        methods: {
+            init: function () {
+                if (this.isDialog === '1') {
+                    this.toTask();
+                }
+                const $ = layui.jquery
+                // $('#rightContent').width(document.body.clientWidth - 190).height(document.body.clientHeight - 50);
+                window.addEventListener('resize', function () {
+                    // $('#rightContent').height(document.body.clientHeight - 50);
+                })
+
+                //通过hash值的索引定位应该加载哪个页面
+                var href = window.location.href;
+                var toUrl = href.replace(App.getUrl("index"), "");
+                if (toUrl.indexOf("#") == 0 && toUrl.length >= 2) {
+                    var hashIndex = toUrl.replace("#", "").split("_");
+                    for (var i = 0; i < hashIndex.length; i++) {
+                        if (!isNumber(hashIndex[i])) {
+                            return;
+                        }
+                    }
+                    if (hashIndex.length > 1) {
+                        this.onSelectItem(hashIndex[0], hashIndex[1]);
+                    } else {
+                        this.onSelectItem(hashIndex[0]);
+                    }
+                    //页面选中
+                    /* for(var i =0;i<this.navLs.length;i++){
+                        if (this.navLs[i].child != null){
+                            //再次循环
+                            for (var j=0;j<this.navLs[i].child.length;j++){
+                                if(toUrl.indexOf(this.navLs[i].child[j].url) >= 0){
+                                    $("#rightContent").attr("src",App.getUrl(toUrl.substring(2,toUrl.length)));
+                                    this.active = i;
+                                    break;
+                                }
+                            }
+                        }else{
+                            if(toUrl.indexOf(this.navLs[i].url) >= 0){
+                                $("#rightContent").attr("src",App.getUrl(toUrl.substring(2,toUrl.length)));
+                                this.active = i;
+                                break;
+                            }
+                        }
+
+                    } */
+
+                } else {
+                    //初始化选中第一个菜单
+                    for (var i = 0; i < this.navLs.length; i++) {
+                        if (this.menuCode.indexOf(this.navLs[i].code) >= 0) {
+                            if (this.navLs[i].child) {
+                                var child = this.navLs[i].child;
+                                for (var j = 0; j < child.length; j++) {
+                                    if (this.menuCode.indexOf(child[j].code) >= 0) {
+                                        this.onSelectItem(i, j);
+                                        return;
+                                    }
+                                }
+                            } else {
+                                this.onSelectItem(i);
+                                return;
+                            }
+                        }
+                    }
+                }
+
+            },
+
+            changeSide: function (status = true) {
+                this.collapse = !status
+                if (this.collapse) {
+                    $("#rightContent").parent().addClass("close");
+                } else {
+                    $("#rightContent").parent().removeClass("close");
+                }
+                $("#rightContent").width("100%");
+            },
+            toWorkBench: function () {
+                var index = this.navLs.findIndex(item => {
+                    return item.txt === '工作台';
+                });
+                this.onSelectItem(index)
+            },
+            toTask: function () {
+                /*       top.App.openLayer({
+                           title : "项目调度情况",
+                           content : App.getUrl("meetingRecords/show"),
+                           height : "700",
+                           width : "90%"
+                       });*/
+                //详情
+                var index = top.layer.open({
+                    type: 2,
+                    area: ['95%', '100%'],
+                    content: App.getUrl("taskRecords/show"),
+                    shade: 0.5,
+                    shadeClose: true
+                });
+                //top.layer.full(index);
+            },
+            onSelectItem: function (index, ind) {
+                this.active = index;
+                if (ind != undefined) {
+                    var chooseNode = this.navLs[index]["child"][ind];
+                    if (chooseNode.url) {
+                        if (chooseNode.before && typeof (chooseNode.before) == 'function') {
+                            chooseNode.before();
+                        }
+                        window.location.hash = index + "_" + ind;
+                        var parentNodeText = this.navLs[index].txt;
+                        var arrowHtml = '<div class="top-arrow-html"></div>';
+                        $("#rightContent").attr("src", App.getUrl(chooseNode.url));
+                        $(".top-breadcrumb").html(parentNodeText + arrowHtml + chooseNode.txt);
+                    } else {
+                        App.msg.warn("正在建设中");
+                    }
+                } else if (this.navLs[index].url) {
+                    var chooseNode = this.navLs[index];
+                    if (chooseNode.before && typeof (chooseNode.before) == 'function') {
+                        chooseNode.before();
+                    }
+                    window.location.hash = index;
+                    $("#rightContent").attr("src", App.getUrl(this.navLs[index].url));
+                    $(".top-breadcrumb").text(this.navLs[index].txt);
+                }
+            },
+            onChangeActive: function (index) {
+                this.tabActive = index
+            },
+            onButtonActive: function (index) {
+                this.buttonActive = index
+            },
+            onView: function () {
+                const $ = layui.jquery
+                layer.open({
+                    type: 1,
+                    title: '确认信息',
+                    skin: 'pop_info_class',
+                    id: 'layerPop1', //防止重复弹出
+                    content: $('#popInfo'),
+                    btn: ['取消', '提交'],
+                    btnAlign: 'c', //按钮居中
+                    yes: function () {
+                        layer.closeAll();
+                    },
+                    btn2: function () {
+                    },
+                    cancel: function () {
+                        layer.closeAll();
+                    }
+                })
+            }
+        }
+    });
+    window.onresize = function () {
+        $("#rightContent").css("width", "100%");
+    }
+</script>
+<style>
+    #rightContent {
+        width: 100%;
+        border: none;
+        height: calc(100% - 6px);
+    }
+
+    .left_menu {
+        width: 200px;
+    }
+</style>
+
+

+ 1 - 0
projects/src/main/webapp/vmodules/outFrame.jsp

@@ -20,6 +20,7 @@
           media="all"/>
     <link rel="stylesheet" href="${WebSite.asset}/lib/vuejs/myvue.css"/>
     <link rel="stylesheet" href="${WebSite.asset}/css/style.css?version=${version}"/>
+    <link rel="stylesheet" href="${WebSite.asset}/css/style_new.css?version=${version}"/>
     <style>
         body {
             background-color: #F2F2F2;

+ 211 - 0
projects/src/main/webapp/vmodules/outFrame_old.jsp

@@ -0,0 +1,211 @@
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<%@ page isELIgnored="false" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="referrer" content="no-referrer"/>
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"/>
+    <title>哈密市投资项目智慧平台</title>
+    <link rel="icon" href="${domain}/favicon.ico"/>
+    <link rel="stylesheet" type="text/css"
+          href="${WebSite.asset}/lib/layui-v2.5.5/css/layui.css?version=${version}"
+          media="all"/>
+    <link rel="stylesheet" href="${WebSite.asset}/lib/vuejs/myvue.css"/>
+    <link rel="stylesheet" href="${WebSite.asset}/css/style.css?version=${version}"/>
+    <style>
+        body {
+            background-color: #F2F2F2;
+        }
+    </style>
+</head>
+<body>
+<div id="news" class="news" v-cloak>
+    <div class="header">
+        <div class="header_content">
+            <div class="header_content_left">
+                <div class="header_code"></div>
+                <div class="header_text">
+                    <div class="title" style="font-size: 24px;color: #0F4082 ;">哈密市投资项目智慧平台</div>
+<%--                    <div class="sub_title" style="font-size: 16px;color: #0F4082;letter-spacing:1.7px;">Hami City Project Visual Management--%>
+<%--                        Platform--%>
+<%--                    </div>--%>
+                </div>
+            </div>
+            <div class="header_content_right">
+                <div class="content_right">
+                    <div class="content_right_code"></div>
+                    扫码下载应用
+                </div>
+                <div class="content_left">
+                    <div class="time">
+                        <span class="year_month_day">{{year_month_day}}</span>
+                    </div>
+                      <div class="time collect">
+                         <span class="xq">{{xq}}</span>
+                    </div>
+                    <div class="collect">
+                        <div class="iconf" style="margin-right: 5px"></div>
+                        收藏
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="func_choice">
+        <div class="func_choice_content">
+            <div class="func_choice_left">
+                <div class="active" style="box-shadow: 0 0 0 0 transparent">首页</div>
+                <c:forEach items="${columns}" var="co" varStatus="index">
+                    <div class="news_list_text">
+                        <a target="_blank" href="${domain }/policy/document/columnDocument_${co.id}">${co.title}</a>
+                    </div>
+                    <div class="news_list_text_cutline"></div>
+                </c:forEach>
+            </div>
+            <div class="func_choice_right">
+                <a href="${domain }/login">登录</a>
+                <span>|</span>
+                <a href="${domain }/register/">注册</a>
+            </div>
+        </div>
+    </div>
+
+    <div class="banner_newsBox">
+        <div class="banner">
+            <div class="layui-carousel" id="carousel">
+                <div carousel-item>
+                    <c:forEach items="${ banner}" var="ba">
+                        <div style="position:relative">
+                            <a target="_blank" href="${domain }/policy/document/detail_${ba.id}"><img
+                                    src="${ba.coverImg}" style="width:100%"></a>
+                            <div class="banner_text" onclick="detail('${ba.id}')">
+                                <div class="banner_title" onclick="detail('${ba.id}')"
+                                     title="${ba.title }">${ba.title }</div>
+                            </div>
+                        </div>
+                    </c:forEach>
+                </div>
+            </div>
+        </div>
+        <div class="first_news">
+            <div class="news_list_title">
+                <div class="news_list_text">
+                    <div class="news_list_icon"></div>
+                    <a target="_blank"
+                       href="${domain }/policy/document/columnDocument_${bannerRight.id}">${bannerRight.title }</a>
+                </div>
+
+                <%--                <div class="news_list_more">--%>
+                <%--                    <a target="_blank" href="${domain }/policy/document/columnDocument_${bannerRight.id}">更多》</a>--%>
+                <%--                </div>--%>
+            </div>
+            <div>
+                <c:forEach items="${bannerRight.list}" var="de">
+                    <div class="news_list_listItem" onclick="detail('${de.id}')">
+                        <div class="news_list_titleText">
+                            <div class="news_list_listIcon"></div>
+                            <div class="news_list_listTitle" title="${de.title }">${de.title}</div>
+                        </div>
+
+                        <div class="news_list_time"><fmt:formatDate value="${de.publishDate }"
+                                                                    pattern="yyyy-MM-dd"/></div>
+                    </div>
+                </c:forEach>
+            </div>
+        </div>
+
+    </div>
+    <div class="news_top_div">
+        <div class="news_top">
+        </div>
+    </div>
+
+    <%-- <div class="news_list">
+        <div class="news_list_title">
+            <c:forEach items="${columns}" var="co" varStatus="index">
+                <div class="news_list_text">
+                    <a target="_blank" href="${domain }/policy/document/columnDocument_${co.id}">${co.title}</a>
+                </div>
+            </c:forEach>
+        </div>
+    </div> --%>
+
+    <div class="footer">
+        <div class="footer_content">
+            <div class="footer_box_logo">
+                <div class="footer_gov_first"></div>
+                <div class="footer_gov_second"></div>
+            </div>
+
+            <div class="footer_text">
+                网站地址 | 联系我们
+                <div class="footer_text_line">
+                    <div>主办单位:哈密市发展和改革委员会</div>
+                    <div>新ICP备1000219X&nbsp;&nbsp;&nbsp;&nbsp; 网站标识码:6522000001 &nbsp;&nbsp;&nbsp;&nbsp;新公网安备 65220102000001号</div>
+                    <div>哈密市发展和改革委员会版权所有,如离转取,请注明来源</div>
+                </div>
+
+            </div>
+
+            <div class="footer_download" style="font-size: 12px;">
+                <div class="footer_qrCode"></div>
+                扫码下载应用
+            </div>
+        </div>
+    </div>
+</div>
+<jsp:include page="common/common-js-include.jsp"></jsp:include>
+<script type="text/javascript">
+    new Vue({
+        el: "#news",
+        data: {
+            year_month_day: '',
+            xq: '',
+        },
+        mounted: function () {
+            this.init()
+        },
+        methods: {
+            init: function () {
+                var now = new Date();
+                var year = now.getFullYear();
+                var month = String(now.getMonth() + 1).padStart(2, '0');
+                var date = String(now.getDate()).padStart(2, '0');
+                this.year_month_day = year + '年' + month + '月' + date + '日';
+                var dayOfWeek = now.getDay();
+                var weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+                this.xq = weekDays[dayOfWeek];
+            },
+
+        }
+    });
+
+    function detail(id) {
+        window.open("${domain}/policy/document/detail_" + id, "_blank");
+    };
+
+</script>
+
+<script>
+    layui.use('carousel', function () {
+        var carousel = layui.carousel;
+        //建造实例
+        carousel.render({
+            elem: '#carousel'
+            , width: '100%' //设置容器宽度
+            , height: '100%'
+            , arrow: 'always' //始终显示箭头
+            //,anim: 'updown' //切换动画方式
+        });
+    });
+</script>
+</body>
+</html>

+ 15 - 11
projects/src/main/webapp/vmodules/top.jsp

@@ -66,14 +66,13 @@
     }
 </style>
 <div class="layui-header" id="top">
-    <div class="menu-collapse" @click="changeSide">
+    <%--<div class="menu-collapse" @click="changeSide">
         <div class="menu-collapse-icon" :class="{close: collapse}"></div>
     </div>
 
     <div class="top-cutline"></div>
-
-
-    <div class="layui-logo" style="">哈密市投资项目智慧平台</div>
+    <div class="layui-logo" style="">哈密市投资项目智慧平台</div>--%>
+    <div class="prompt"><span class="date">2024年12月20日 星期五</span></div>
     <c:if test="${isShowDialog==1}">
         <div class="top-task" onClick="toTask()">
             <div class="top-dashboard-icon"></div>
@@ -85,19 +84,22 @@
         <div class="top-dashboard-icon"></div>
         工作台
     </div>
-    <div class="top-arrow"></div>
-    <div class="top-breadcrumb"></div>
+    <%--<div class="top-arrow"></div>
+    <div class="top-breadcrumb"></div>--%>
 
     <ul class="layui-nav layui-layout-right">
-        <li class="layui-nav-item">
+        <li class="layui-nav-item" style="flex: 1;">
             <div id="noticeUl"></div>
         </li>
-        <li class="layui-nav-item">
+        <%--<li class="layui-nav-item">
             <div class="top-cutline-normal"></div>
-        </li>
+        </li>--%>
         <li class="layui-nav-item">
             <div style="display: flex; align-items: center; height: 100%;">
-                <button class="layui-btn" @click="changeSystem">返回发改委系统</button>
+                <button class="layui-btn"
+                    style="border-radius: 5px; background-color: #0073EF;"
+                    @click="changeSystem"
+                >返回发改委系统</button>
             </div>
         </li>
         <li class="layui-nav-item">
@@ -113,7 +115,9 @@
         <li class="layui-nav-item">
             <div class="top-avatar"></div>
         </li>
-        <li class="layui-nav-item"><a href="${domain}/logout" class="logout"></a></li>
+        <li class="layui-nav-item"><a href="${domain}/logout"><span class="logout"
+            style="margin: 0"
+        ></span>退出</a></li>
     </ul>
 </div>
 <script type="text/javascript">

+ 144 - 0
projects/src/main/webapp/vmodules/top_old.jsp

@@ -0,0 +1,144 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<!DOCTYPE html>
+<!-- 头部区域 -->
+<style>
+    .notice_ul {
+        display: flex;
+        align-items: center;
+        float: right;
+        width: 565px;
+        height: 20px;
+        margin: 5px 10px 0 0;
+        padding: 20px;
+        box-sizing: border-box;
+        font-size: 20px;
+        color: #FF8D02;
+        background: #FFEEB6;
+        border-radius: 13px;
+        overflow: hidden;
+    }
+
+    /* .notice_ul li {
+        height: 30px;
+        line-height: 60px;
+    } */
+
+    .notice_title {
+        display: flex;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    .notice_icon {
+        width: 20px;
+        height: 22px;
+        margin: auto 30px auto 7px;
+        background-image: url(${domain}/asset/css/images/icon_notice.svg);
+        background-size: 100% 100%;
+    }
+
+    .top-cutline-normal {
+        width: 1px;
+        height: 50px;
+        background: #0B2F60;
+        box-shadow: 1px 0px 0px 0px #1C56A3;
+    }
+
+    .top-avatar {
+        width: 37px;
+        height: 37px;
+        margin: 9px 0 auto 9px;
+        border-radius: 50%;
+        background-image: url(${domain}/asset/css/images/avatar-default.png);
+        background-size: 100% 100%;
+    }
+
+    .layui-logo {
+        left: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        width: 265px !important;
+        font-size: 18px;
+    }
+</style>
+<div class="layui-header" id="top">
+    <div class="menu-collapse" @click="changeSide">
+        <div class="menu-collapse-icon" :class="{close: collapse}"></div>
+    </div>
+
+    <div class="top-cutline"></div>
+
+
+    <div class="layui-logo" style="">哈密市投资项目智慧平台</div>
+    <c:if test="${isShowDialog==1}">
+        <div class="top-task" onClick="toTask()">
+            <div class="top-dashboard-icon"></div>
+            调度
+        </div>
+    </c:if>
+
+    <div class="top-dashboard" onClick="toWorkBench()">
+        <div class="top-dashboard-icon"></div>
+        工作台
+    </div>
+    <div class="top-arrow"></div>
+    <div class="top-breadcrumb"></div>
+
+    <ul class="layui-nav layui-layout-right">
+        <li class="layui-nav-item">
+            <div id="noticeUl"></div>
+        </li>
+        <li class="layui-nav-item">
+            <div class="top-cutline-normal"></div>
+        </li>
+        <li class="layui-nav-item">
+            <div style="display: flex; align-items: center; height: 100%;">
+                <button class="layui-btn" @click="changeSystem">返回发改委系统</button>
+            </div>
+        </li>
+        <li class="layui-nav-item">
+            <a style="padding:0;margin-left:25px;">
+				<span class="txt">
+                    ${realName}
+                </span>
+                <ul class="sub_menu">
+                    <li onClick="openRestPanel()"><img src="${WebSite.asset }/css/images/u48.svg"/>修改密码</li>
+                </ul>
+            </a>
+        </li>
+        <li class="layui-nav-item">
+            <div class="top-avatar"></div>
+        </li>
+        <li class="layui-nav-item"><a href="${domain}/logout" class="logout"></a></li>
+    </ul>
+</div>
+<script type="text/javascript">
+    new Vue({
+        el: "#top",
+        data: {
+            collapse: true,
+        },
+        methods: {
+            changeSide: function () {
+                this.collapse = !this.collapse;
+                window.parent.postMessage({collapse: this.collapse}, "*");
+            },
+            changeSystem() {
+                App.postJson("/api/app/switch/toFgw", {type:'0'}, function (res) {
+                    console.log(res);
+                    if(res.code ===200){
+                        var targetUrl = res.msg+"/index";
+                        var cookiesToSend = "rememberMe="+res.data.token;
+                        // 将需要携带的cookie通过URL参数的形式附加到目标URL上
+                        targetUrl += "?cookies=" + encodeURIComponent(cookiesToSend);
+                        window.location.href = targetUrl;
+                    }
+                });
+            }
+        }
+    })
+</script>