From 3dcf4eb78a743843940fa481e4d4c346c1777492 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 31 十二月 2022 16:41:04 +0800
Subject: [PATCH] 1

---
 /dev/null                    |  575 ---------------------------------
 ExportMap/Sources/Test.qpt   |  308 +++++++++---------
 JavaCode/App.config          |    4 
 ExportMap/Sources/Test.qgz   |    0 
 ExportMap/up.html            |    2 
 ExportMap/ExportMap.csproj   |   30 -
 JavaCode/FrmMain.Designer.cs |   17 
 ExportMap/lf.html            |   37 +
 8 files changed, 197 insertions(+), 776 deletions(-)

diff --git a/ExportMap/ExportMap.csproj b/ExportMap/ExportMap.csproj
index 0407b69..e3fcdc7 100644
--- a/ExportMap/ExportMap.csproj
+++ b/ExportMap/ExportMap.csproj
@@ -116,9 +116,6 @@
     <Content Include="Sources\Lengend.png" />
     <Content Include="Sources\logo.png" />
     <Content Include="Sources\render.py" />
-    <Content Include="Sources\shps\SITEPOINT.shp.xml" />
-    <Content Include="Sources\shps\STATIONSERIES.shp.xml" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.shp.xml" />
     <Content Include="export.html" />
     <Content Include="up.html" />
     <Content Include="Web.config">
@@ -159,33 +156,6 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="Sources\Test.qgz" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Sources\shps\SITEPOINT.cpg" />
-    <Content Include="Sources\shps\SITEPOINT.dbf" />
-    <Content Include="Sources\shps\SITEPOINT.prj" />
-    <Content Include="Sources\shps\SITEPOINT.qix" />
-    <Content Include="Sources\shps\SITEPOINT.sbn" />
-    <Content Include="Sources\shps\SITEPOINT.sbx" />
-    <Content Include="Sources\shps\SITEPOINT.shi" />
-    <Content Include="Sources\shps\SITEPOINT.shp" />
-    <Content Include="Sources\shps\SITEPOINT.shx" />
-    <Content Include="Sources\shps\STATIONSERIES.cpg" />
-    <Content Include="Sources\shps\STATIONSERIES.dbf" />
-    <Content Include="Sources\shps\STATIONSERIES.prj" />
-    <Content Include="Sources\shps\STATIONSERIES.qix" />
-    <Content Include="Sources\shps\STATIONSERIES.shi" />
-    <Content Include="Sources\shps\STATIONSERIES.shp" />
-    <Content Include="Sources\shps\STATIONSERIES.shx" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.cpg" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.dbf" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.prj" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.qix" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.sbn" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.sbx" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.shi" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.shp" />
-    <Content Include="Sources\shps\VALVEHOUSEPOINT.shx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Sources\Template.qpt">
diff --git a/ExportMap/Sources/Test.qgz b/ExportMap/Sources/Test.qgz
index 45f864d..6b6e3db 100644
--- a/ExportMap/Sources/Test.qgz
+++ b/ExportMap/Sources/Test.qgz
Binary files differ
diff --git a/ExportMap/Sources/Test.qpt b/ExportMap/Sources/Test.qpt
index 352cee3..62baa91 100644
--- a/ExportMap/Sources/Test.qpt
+++ b/ExportMap/Sources/Test.qpt
@@ -1,9 +1,9 @@
-<Layout name="Test" units="mm" printResolution="300" worldFileMap="{4e649c5d-cabe-431f-a385-d69809d87ebf}">
- <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
- <Grid resolution="10" resUnits="mm" offsetX="0" offsetUnits="mm" offsetY="0"/>
+<Layout worldFileMap="{4e649c5d-cabe-431f-a385-d69809d87ebf}" units="mm" printResolution="300" name="Test">
+ <Snapper snapToItems="1" snapToGuides="1" snapToGrid="0" tolerance="5"/>
+ <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
  <PageCollection>
-  <symbol type="fill" force_rhr="0" name="" alpha="1" clip_to_extent="1">
-   <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+  <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="" type="fill">
+   <layer locked="0" class="SimpleFill" pass="0" enabled="1">
     <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
     <prop k="color" v="255,255,255,255"/>
     <prop k="joinstyle" v="miter"/>
@@ -17,28 +17,28 @@
     <prop k="style" v="solid"/>
     <data_defined_properties>
      <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option value="" name="name" type="QString"/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option value="collection" name="type" type="QString"/>
      </Option>
     </data_defined_properties>
    </layer>
   </symbol>
-  <LayoutItem frame="false" size="297,210,mm" uuid="{72530018-3d33-4843-b661-79580c9b15e3}" id="" blendMode="0" itemRotation="0" positionLock="false" groupUuid="" zValue="0" type="65638" background="true" excludeFromExports="0" referencePoint="0" opacity="1" templateUuid="{72530018-3d33-4843-b661-79580c9b15e3}" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" visibility="1" position="0,0,mm" frameJoinStyle="miter">
-   <FrameColor blue="0" red="0" green="0" alpha="255"/>
-   <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+  <LayoutItem positionLock="false" background="true" positionOnPage="0,0,mm" id="" itemRotation="0" visibility="1" frame="false" opacity="1" templateUuid="{72530018-3d33-4843-b661-79580c9b15e3}" uuid="{72530018-3d33-4843-b661-79580c9b15e3}" type="65638" frameJoinStyle="miter" excludeFromExports="0" outlineWidthM="0.3,mm" position="0,0,mm" size="297,210,mm" groupUuid="" referencePoint="0" zValue="0" blendMode="0">
+   <FrameColor alpha="255" red="0" blue="0" green="0"/>
+   <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
    <LayoutObject>
     <dataDefinedProperties>
      <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option value="" name="name" type="QString"/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option value="collection" name="type" type="QString"/>
      </Option>
     </dataDefinedProperties>
     <customproperties/>
    </LayoutObject>
-   <symbol type="fill" force_rhr="0" name="" alpha="1" clip_to_extent="1">
-    <layer enabled="1" pass="0" class="SimpleFill" locked="0">
+   <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="" type="fill">
+    <layer locked="0" class="SimpleFill" pass="0" enabled="1">
      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
      <prop k="color" v="255,255,255,255"/>
      <prop k="joinstyle" v="miter"/>
@@ -52,9 +52,9 @@
      <prop k="style" v="solid"/>
      <data_defined_properties>
       <Option type="Map">
-       <Option type="QString" name="name" value=""/>
+       <Option value="" name="name" type="QString"/>
        <Option name="properties"/>
-       <Option type="QString" name="type" value="collection"/>
+       <Option value="collection" name="type" type="QString"/>
       </Option>
      </data_defined_properties>
     </layer>
@@ -62,108 +62,108 @@
   </LayoutItem>
   <GuideCollection visible="1"/>
  </PageCollection>
- <LayoutItem frame="false" size="10.4237,11.1743,mm" uuid="{6a1655ac-d65f-4163-9e89-5f98536a0c31}" id="鎸囧寳閽�" blendMode="0" anchorPoint="0" svgBorderColor="0,0,0,255" itemRotation="0" northOffset="0" positionLock="true" groupUuid="" zValue="8" mapUuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" type="65640" background="false" excludeFromExports="0" northMode="0" pictureWidth="8.85237" file=":/images/north_arrows/layout_default_north_arrow.svg" referencePoint="0" opacity="1" svgFillColor="255,255,255,255" templateUuid="{6a1655ac-d65f-4163-9e89-5f98536a0c31}" resizeMode="0" positionOnPage="278.938,2.42978,mm" mode="0" outlineWidthM="0.3,mm" visibility="1" position="278.938,2.42978,mm" pictureRotation="0" frameJoinStyle="miter" pictureHeight="11.1743" svgBorderWidth="0.2">
-  <FrameColor blue="0" red="0" green="0" alpha="255"/>
-  <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+ <LayoutItem svgBorderColor="0,0,0,255" positionLock="true" mode="0" background="false" svgBorderWidth="0.2" positionOnPage="278.938,2.42978,mm" id="鎸囧寳閽�" itemRotation="0" mapUuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" visibility="1" frame="false" pictureWidth="8.85237" opacity="1" resizeMode="0" templateUuid="{6a1655ac-d65f-4163-9e89-5f98536a0c31}" uuid="{6a1655ac-d65f-4163-9e89-5f98536a0c31}" pictureHeight="11.1743" type="65640" file=":/images/north_arrows/layout_default_north_arrow.svg" frameJoinStyle="miter" excludeFromExports="0" outlineWidthM="0.3,mm" position="278.938,2.42978,mm" pictureRotation="0" size="10.4237,11.1743,mm" northMode="0" northOffset="0" groupUuid="" referencePoint="0" zValue="8" blendMode="0" svgFillColor="255,255,255,255" anchorPoint="0">
+  <FrameColor alpha="255" red="0" blue="0" green="0"/>
+  <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
   <LayoutObject>
    <dataDefinedProperties>
     <Option type="Map">
-     <Option type="QString" name="name" value=""/>
+     <Option value="" name="name" type="QString"/>
      <Option name="properties"/>
-     <Option type="QString" name="type" value="collection"/>
+     <Option value="collection" name="type" type="QString"/>
     </Option>
    </dataDefinedProperties>
    <customproperties/>
   </LayoutObject>
  </LayoutItem>
- <LayoutItem frame="false" size="76.0244,9.39831,mm" uuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" id="鍏徃" blendMode="0" valign="128" itemRotation="0" positionLock="true" groupUuid="" zValue="8" type="65641" background="false" excludeFromExports="0" labelText="涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�" referencePoint="0" opacity="1" marginY="0" marginX="0" templateUuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" positionOnPage="212.337,195.29,mm" htmlState="0" outlineWidthM="0.3,mm" visibility="1" position="212.337,195.29,mm" halign="4" frameJoinStyle="miter">
-  <FrameColor blue="0" red="0" green="0" alpha="255"/>
-  <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+ <LayoutItem valign="128" positionLock="true" background="false" positionOnPage="212.337,195.29,mm" marginY="0" id="鍏徃" labelText="涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�" itemRotation="0" visibility="1" frame="false" opacity="1" halign="4" templateUuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" uuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" marginX="0" type="65641" frameJoinStyle="miter" excludeFromExports="0" outlineWidthM="0.3,mm" position="212.337,195.29,mm" size="76.0244,9.39831,mm" groupUuid="" referencePoint="0" zValue="8" blendMode="0" htmlState="0">
+  <FrameColor alpha="255" red="0" blue="0" green="0"/>
+  <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
   <LayoutObject>
    <dataDefinedProperties>
     <Option type="Map">
-     <Option type="QString" name="name" value=""/>
+     <Option value="" name="name" type="QString"/>
      <Option name="properties"/>
-     <Option type="QString" name="type" value="collection"/>
+     <Option value="collection" name="type" type="QString"/>
     </Option>
    </dataDefinedProperties>
    <customproperties/>
   </LayoutObject>
   <LabelFont description="瀹嬩綋,14,-1,5,50,0,0,0,0,0,甯歌" style="甯歌"/>
-  <FontColor blue="0" red="0" green="0" alpha="255"/>
+  <FontColor alpha="255" red="0" blue="0" green="0"/>
  </LayoutItem>
- <LayoutItem frame="false" size="43.6229,72.286,mm" uuid="{a53c1ba6-77af-48ea-bd86-8e12ae041979}" id="鍥句緥" blendMode="0" anchorPoint="0" svgBorderColor="0,0,0,255" itemRotation="0" northOffset="0" positionLock="false" groupUuid="" zValue="8" mapUuid="" type="65640" background="false" excludeFromExports="0" northMode="0" pictureWidth="43.6229" file="E:\terrait\TianJin\ExportMap\ExportMap\Sources\Lengend.png" referencePoint="0" opacity="1" svgFillColor="255,255,255,255" templateUuid="{a53c1ba6-77af-48ea-bd86-8e12ae041979}" resizeMode="1" positionOnPage="11.7,117,mm" mode="1" outlineWidthM="0.3,mm" visibility="1" position="11.7,117,mm" pictureRotation="0" frameJoinStyle="miter" pictureHeight="72.286" svgBorderWidth="0.2">
-  <FrameColor blue="0" red="0" green="0" alpha="255"/>
-  <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+ <LayoutItem svgBorderColor="0,0,0,255" positionLock="true" mode="1" background="false" svgBorderWidth="0.2" positionOnPage="11.7,117,mm" id="鍥句緥" itemRotation="0" mapUuid="" visibility="1" frame="false" pictureWidth="43.6229" opacity="1" resizeMode="1" templateUuid="{a53c1ba6-77af-48ea-bd86-8e12ae041979}" uuid="{a53c1ba6-77af-48ea-bd86-8e12ae041979}" pictureHeight="72.286" type="65640" file="./Lengend.png" frameJoinStyle="miter" excludeFromExports="0" outlineWidthM="0.3,mm" position="11.7,117,mm" pictureRotation="0" size="43.6229,72.286,mm" northMode="0" northOffset="0" groupUuid="" referencePoint="0" zValue="8" blendMode="0" svgFillColor="255,255,255,255" anchorPoint="0">
+  <FrameColor alpha="255" red="0" blue="0" green="0"/>
+  <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
   <LayoutObject>
    <dataDefinedProperties>
     <Option type="Map">
-     <Option type="QString" name="name" value=""/>
+     <Option value="" name="name" type="QString"/>
      <Option name="properties"/>
-     <Option type="QString" name="type" value="collection"/>
+     <Option value="collection" name="type" type="QString"/>
     </Option>
    </dataDefinedProperties>
    <customproperties/>
   </LayoutObject>
  </LayoutItem>
- <LayoutItem frame="false" size="11.6809,10.7409,mm" uuid="{29298722-a58a-42f7-85d1-04564ad9366d}" id="Logo" blendMode="0" anchorPoint="0" svgBorderColor="0,0,0,255" itemRotation="0" northOffset="0" positionLock="true" groupUuid="" zValue="7" mapUuid="" type="65640" background="false" excludeFromExports="0" northMode="0" pictureWidth="10.7409" file="E:\terrait\TianJin\ExportMap\ExportMap\Sources\logo.png" referencePoint="0" opacity="1" svgFillColor="255,255,255,255" templateUuid="{29298722-a58a-42f7-85d1-04564ad9366d}" resizeMode="0" positionOnPage="200.5,194.948,mm" mode="1" outlineWidthM="0.3,mm" visibility="1" position="200.5,194.948,mm" pictureRotation="0" frameJoinStyle="miter" pictureHeight="10.7409" svgBorderWidth="0.2">
-  <FrameColor blue="0" red="0" green="0" alpha="255"/>
-  <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+ <LayoutItem svgBorderColor="0,0,0,255" positionLock="true" mode="1" background="false" svgBorderWidth="0.2" positionOnPage="200.5,194.948,mm" id="Logo" itemRotation="0" mapUuid="" visibility="1" frame="false" pictureWidth="10.7409" opacity="1" resizeMode="0" templateUuid="{29298722-a58a-42f7-85d1-04564ad9366d}" uuid="{29298722-a58a-42f7-85d1-04564ad9366d}" pictureHeight="10.7409" type="65640" file="./logo.png" frameJoinStyle="miter" excludeFromExports="0" outlineWidthM="0.3,mm" position="200.5,194.948,mm" pictureRotation="0" size="11.6809,10.7409,mm" northMode="0" northOffset="0" groupUuid="" referencePoint="0" zValue="7" blendMode="0" svgFillColor="255,255,255,255" anchorPoint="0">
+  <FrameColor alpha="255" red="0" blue="0" green="0"/>
+  <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
   <LayoutObject>
    <dataDefinedProperties>
     <Option type="Map">
-     <Option type="QString" name="name" value=""/>
+     <Option value="" name="name" type="QString"/>
      <Option name="properties"/>
-     <Option type="QString" name="type" value="collection"/>
+     <Option value="collection" name="type" type="QString"/>
     </Option>
    </dataDefinedProperties>
    <customproperties/>
   </LayoutObject>
  </LayoutItem>
- <LayoutItem frame="false" size="39.6466,15.6032,mm" sectionX="0" uuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}" id="璇存槑" blendMode="0" itemRotation="0" positionLock="false" groupUuid="" zValue="6" type="65647" background="false" excludeFromExports="0" multiFrame="{3f590e9a-19b4-46d3-90bb-6a188b24aaa6}" sectionWidth="39.6466" referencePoint="0" opacity="1" hidePageIfEmpty="0" multiFrameTemplateUuid="{3f590e9a-19b4-46d3-90bb-6a188b24aaa6}" templateUuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}" sectionY="0" positionOnPage="247,174,mm" hideBackgroundIfEmpty="0" sectionHeight="15.6032" outlineWidthM="0.3,mm" visibility="1" position="247,174,mm" frameJoinStyle="miter">
-  <FrameColor blue="0" red="0" green="0" alpha="255"/>
-  <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+ <LayoutItem positionLock="true" sectionWidth="39.6466" background="false" positionOnPage="247,174,mm" id="璇存槑" itemRotation="0" hideBackgroundIfEmpty="0" visibility="1" frame="false" sectionY="0" hidePageIfEmpty="0" opacity="1" templateUuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}" uuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}" type="65647" frameJoinStyle="miter" excludeFromExports="0" outlineWidthM="0.3,mm" position="247,174,mm" size="39.6466,15.6032,mm" groupUuid="" referencePoint="0" zValue="6" blendMode="0" sectionHeight="15.6032" multiFrameTemplateUuid="{3f590e9a-19b4-46d3-90bb-6a188b24aaa6}" sectionX="0" multiFrame="{3f590e9a-19b4-46d3-90bb-6a188b24aaa6}">
+  <FrameColor alpha="255" red="0" blue="0" green="0"/>
+  <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
   <LayoutObject>
    <dataDefinedProperties>
     <Option type="Map">
-     <Option type="QString" name="name" value=""/>
+     <Option value="" name="name" type="QString"/>
      <Option name="properties"/>
-     <Option type="QString" name="type" value="collection"/>
+     <Option value="collection" name="type" type="QString"/>
     </Option>
    </dataDefinedProperties>
    <customproperties/>
   </LayoutObject>
  </LayoutItem>
- <LayoutItem frame="false" size="129.364,11.1743,mm" uuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" id="鏍囬" blendMode="0" valign="128" itemRotation="0" positionLock="true" groupUuid="" zValue="4" type="65641" background="false" excludeFromExports="0" labelText="绠¢亾鍩虹澶ф暟鎹钩鍙帮紙DW1-1锛�" referencePoint="0" opacity="1" marginY="0" marginX="0" templateUuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" positionOnPage="84.816,2.42978,mm" htmlState="0" outlineWidthM="0.3,mm" visibility="1" position="84.816,2.42978,mm" halign="4" frameJoinStyle="miter">
-  <FrameColor blue="0" red="0" green="0" alpha="255"/>
-  <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+ <LayoutItem valign="128" positionLock="true" background="false" positionOnPage="84.816,2.42978,mm" marginY="0" id="鏍囬" labelText="绠¢亾鍩虹澶ф暟鎹钩鍙帮紙DW1-1锛�" itemRotation="0" visibility="1" frame="false" opacity="1" halign="4" templateUuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" uuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" marginX="0" type="65641" frameJoinStyle="miter" excludeFromExports="0" outlineWidthM="0.3,mm" position="84.816,2.42978,mm" size="129.364,11.1743,mm" groupUuid="" referencePoint="0" zValue="4" blendMode="0" htmlState="0">
+  <FrameColor alpha="255" red="0" blue="0" green="0"/>
+  <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
   <LayoutObject>
    <dataDefinedProperties>
     <Option type="Map">
-     <Option type="QString" name="name" value=""/>
+     <Option value="" name="name" type="QString"/>
      <Option name="properties"/>
-     <Option type="QString" name="type" value="collection"/>
+     <Option value="collection" name="type" type="QString"/>
     </Option>
    </dataDefinedProperties>
    <customproperties/>
   </LayoutObject>
   <LabelFont description="寰蒋闆呴粦,24,-1,5,75,0,0,0,0,0,Bold" style="Bold"/>
-  <FontColor blue="0" red="0" green="0" alpha="255"/>
+  <FontColor alpha="255" red="0" blue="0" green="0"/>
  </LayoutItem>
- <LayoutItem frame="true" size="280,174,mm" uuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" id="鍦板浘" mapRotation="0" blendMode="0" itemRotation="0" positionLock="true" groupUuid="" labelMargin="0,mm" zValue="2" type="65639" background="true" excludeFromExports="0" followPreset="false" referencePoint="0" keepLayerSet="false" opacity="1" isTemporal="0" templateUuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" positionOnPage="9,18,mm" mapFlags="0" drawCanvasItems="true" outlineWidthM="4,px" followPresetName="" visibility="1" position="9,18,mm" frameJoinStyle="round">
-  <FrameColor blue="0" red="0" green="0" alpha="255"/>
-  <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+ <LayoutItem positionLock="true" background="true" positionOnPage="9,18,mm" followPreset="false" id="鍦板浘" itemRotation="0" visibility="1" frame="true" opacity="1" drawCanvasItems="true" mapRotation="0" templateUuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" uuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" isTemporal="0" type="65639" frameJoinStyle="round" excludeFromExports="0" outlineWidthM="4,px" position="9,18,mm" size="280,174,mm" mapFlags="0" groupUuid="" keepLayerSet="false" referencePoint="0" zValue="2" blendMode="0" followPresetName="" labelMargin="0,mm">
+  <FrameColor alpha="255" red="0" blue="0" green="0"/>
+  <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
   <LayoutObject>
    <dataDefinedProperties>
     <Option type="Map">
-     <Option type="QString" name="name" value=""/>
+     <Option value="" name="name" type="QString"/>
      <Option name="properties"/>
-     <Option type="QString" name="type" value="collection"/>
+     <Option value="collection" name="type" type="QString"/>
     </Option>
    </dataDefinedProperties>
    <customproperties/>
   </LayoutObject>
-  <Extent xmax="152.1417474619615291" xmin="64.38422237834893735" ymin="9.87192880480484547" ymax="64.4069622496211025"/>
+  <Extent ymax="64.40696224962117356" xmax="152.1417474619615291" xmin="64.38422237834893735" ymin="9.87192880480477086"/>
   <crs>
    <spatialrefsys>
     <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -178,10 +178,10 @@
    </spatialrefsys>
   </crs>
   <LayerSet/>
-  <ComposerMapGrid gridFramePenThickness="0.5" offsetX="0" leftFrameDivisions="0" bottomAnnotationDisplay="0" blendMode="0" name="缃戞牸" showAnnotation="1" crossLength="3" topFrameDivisions="0" uuid="{33b582a6-ae09-42c2-b50b-ae68c9d6d71a}" intervalY="15" rotatedTicksMarginToCorner="0" bottomFrameDivisions="0" gridFramePenColor="0,0,0,255" gridFrameStyle="3" annotationFormat="0" gridStyle="3" rightAnnotationDirection="2" gridFrameWidth="1" bottomAnnotationDirection="0" minimumIntervalWidth="12" offsetY="5" topAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="10" leftAnnotationDirection="2" leftAnnotationPosition="1" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" frameAnnotationDistance="0.5" frameFillColor1="255,255,255,255" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" rotatedAnnotationsEnabled="1" show="0" rotatedAnnotationsLengthMode="0" rightAnnotationDisplay="0" rightFrameDivisions="0" annotationPrecision="3" gridFrameSideFlags="15" intervalX="15" frameFillColor2="0,0,0,255" topAnnotationDisplay="0" position="3" gridFrameMargin="0" leftAnnotationDisplay="0" unit="1" annotationExpression="" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="1" rightAnnotationPosition="1">
+  <ComposerMapGrid leftAnnotationDirection="2" leftAnnotationDisplay="0" topFrameDivisions="0" intervalY="15" topAnnotationPosition="1" rightFrameDivisions="0" frameFillColor1="255,255,255,255" showAnnotation="1" minimumIntervalWidth="12" maximumIntervalWidth="10" rotatedTicksLengthMode="0" name="缃戞牸" unit="1" bottomAnnotationDisplay="0" offsetY="5" rotatedAnnotationsMinimumAngle="0" gridStyle="3" rotatedAnnotationsMarginToCorner="0" rotatedTicksEnabled="1" show="0" annotationExpression="" rightAnnotationPosition="1" gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomFrameDivisions="0" offsetX="0" position="3" bottomAnnotationDirection="0" annotationPrecision="3" topAnnotationDisplay="0" gridFrameStyle="3" leftFrameDivisions="0" leftAnnotationPosition="1" frameAnnotationDistance="0.5" rotatedTicksMinimumAngle="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="1" crossLength="3" gridFrameWidth="1" intervalX="15" frameFillColor2="0,0,0,255" bottomAnnotationPosition="1" rightAnnotationDirection="2" rightAnnotationDisplay="0" gridFramePenThickness="0.5" annotationFormat="0" uuid="{33b582a6-ae09-42c2-b50b-ae68c9d6d71a}" gridFramePenColor="0,0,0,255" blendMode="0" topAnnotationDirection="0" rotatedAnnotationsLengthMode="0">
    <lineStyle>
-    <symbol type="line" force_rhr="0" name="" alpha="0.616" clip_to_extent="1">
-     <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="0.616" clip_to_extent="1" force_rhr="0" name="" type="line">
+     <layer locked="0" class="SimpleLine" pass="0" enabled="1">
       <prop k="align_dash_pattern" v="0"/>
       <prop k="capstyle" v="round"/>
       <prop k="customdash" v="0.66;2"/>
@@ -205,17 +205,17 @@
       <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
       <data_defined_properties>
        <Option type="Map">
-        <Option type="QString" name="name" value=""/>
+        <Option value="" name="name" type="QString"/>
         <Option name="properties"/>
-        <Option type="QString" name="type" value="collection"/>
+        <Option value="collection" name="type" type="QString"/>
        </Option>
       </data_defined_properties>
      </layer>
     </symbol>
    </lineStyle>
    <markerStyle>
-    <symbol type="marker" force_rhr="0" name="" alpha="1" clip_to_extent="1">
-     <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+    <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="" type="marker">
+     <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
       <prop k="angle" v="0"/>
       <prop k="color" v="0,0,0,255"/>
       <prop k="horizontal_anchor_point" v="1"/>
@@ -236,9 +236,9 @@
       <prop k="vertical_anchor_point" v="1"/>
       <data_defined_properties>
        <Option type="Map">
-        <Option type="QString" name="name" value=""/>
+        <Option value="" name="name" type="QString"/>
         <Option name="properties"/>
-        <Option type="QString" name="type" value="collection"/>
+        <Option value="collection" name="type" type="QString"/>
        </Option>
       </data_defined_properties>
      </layer>
@@ -255,12 +255,12 @@
     <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
     <geographicflag>true</geographicflag>
    </spatialrefsys>
-   <text-style blendMode="0" textOrientation="horizontal" fontKerning="1" namedStyle="" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontFamily="SimSun" allowHtml="0" textColor="0,0,0,255" capitalization="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" previewBkgrdColor="255,255,255,255" fontSize="8" fontWeight="50" fontUnderline="0" fontItalic="0" fontSizeUnit="Point">
-    <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
-    <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128" maskEnabled="0" maskType="0" maskSize="1.5" maskOpacity="1"/>
-    <background shapeDraw="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBlendMode="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRotationType="0" shapeOpacity="1">
-     <symbol type="marker" force_rhr="0" name="markerSymbol" alpha="1" clip_to_extent="1">
-      <layer enabled="1" pass="0" class="SimpleMarker" locked="0">
+   <text-style textColor="0,0,0,255" fontKerning="1" fontSizeUnit="Point" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="SimSun" fontLetterSpacing="0" capitalization="0" namedStyle="" fontItalic="0" fontWordSpacing="0" multilineHeight="1" fontUnderline="0" blendMode="0" textOpacity="1" fontSize="8" fontStrikeout="0" fontWeight="50" previewBkgrdColor="255,255,255,255">
+    <text-buffer bufferSizeUnits="MM" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+    <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+    <background shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderWidth="0" shapeOffsetY="0" shapeOpacity="1" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeJoinStyle="64" shapeRotation="0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeRadiiUnit="MM" shapeOffsetX="0" shapeRadiiX="0" shapeBlendMode="0" shapeType="0">
+     <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" type="marker">
+      <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
        <prop k="angle" v="0"/>
        <prop k="color" v="231,113,72,255"/>
        <prop k="horizontal_anchor_point" v="1"/>
@@ -281,56 +281,56 @@
        <prop k="vertical_anchor_point" v="1"/>
        <data_defined_properties>
         <Option type="Map">
-         <Option type="QString" name="name" value=""/>
+         <Option value="" name="name" type="QString"/>
          <Option name="properties"/>
-         <Option type="QString" name="type" value="collection"/>
+         <Option value="collection" name="type" type="QString"/>
         </Option>
        </data_defined_properties>
       </layer>
      </symbol>
     </background>
-    <shadow shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOpacity="0.7" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+    <shadow shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOpacity="0.7" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0"/>
     <dd_properties>
      <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option value="" name="name" type="QString"/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option value="collection" name="type" type="QString"/>
      </Option>
     </dd_properties>
    </text-style>
    <LayoutObject>
     <dataDefinedProperties>
      <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option value="" name="name" type="QString"/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option value="collection" name="type" type="QString"/>
      </Option>
     </dataDefinedProperties>
     <customproperties/>
    </LayoutObject>
   </ComposerMapGrid>
-  <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+  <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
   <labelBlockingItems/>
-  <atlasClippingSettings enabled="0" restrictLayers="0" clippingType="1" forceLabelsInside="0">
+  <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
    <layersToClip/>
   </atlasClippingSettings>
-  <itemClippingSettings clipSource="" enabled="0" clippingType="1" forceLabelsInside="0"/>
+  <itemClippingSettings forceLabelsInside="0" enabled="0" clippingType="1" clipSource=""/>
  </LayoutItem>
- <LayoutItem frame="false" size="292.354,205.447,mm" uuid="{76e708b9-4aa8-4365-b8ba-3157f836dfa9}" id="杈规" blendMode="0" itemRotation="0" positionLock="true" shapeType="1" groupUuid="" zValue="1" type="65643" background="false" excludeFromExports="0" cornerRadiusMeasure="0,mm" referencePoint="0" opacity="1" templateUuid="{76e708b9-4aa8-4365-b8ba-3157f836dfa9}" positionOnPage="2.6816,2,mm" outlineWidthM="0.3,mm" visibility="1" position="2.6816,2,mm" frameJoinStyle="miter">
-  <FrameColor blue="0" red="0" green="0" alpha="255"/>
-  <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+ <LayoutItem positionLock="true" background="false" positionOnPage="2.6816,2,mm" id="杈规" itemRotation="0" visibility="1" frame="false" opacity="1" templateUuid="{76e708b9-4aa8-4365-b8ba-3157f836dfa9}" uuid="{76e708b9-4aa8-4365-b8ba-3157f836dfa9}" type="65643" frameJoinStyle="miter" excludeFromExports="0" outlineWidthM="0.3,mm" position="2.6816,2,mm" size="292.354,205.447,mm" groupUuid="" referencePoint="0" zValue="1" blendMode="0" cornerRadiusMeasure="0,mm" shapeType="1">
+  <FrameColor alpha="255" red="0" blue="0" green="0"/>
+  <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
   <LayoutObject>
    <dataDefinedProperties>
     <Option type="Map">
-     <Option type="QString" name="name" value=""/>
+     <Option value="" name="name" type="QString"/>
      <Option name="properties"/>
-     <Option type="QString" name="type" value="collection"/>
+     <Option value="collection" name="type" type="QString"/>
     </Option>
    </dataDefinedProperties>
    <customproperties/>
   </LayoutObject>
-  <symbol type="fill" force_rhr="0" name="" alpha="1" clip_to_extent="1">
-   <layer enabled="1" pass="0" class="SimpleLine" locked="0">
+  <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="" type="fill">
+   <layer locked="0" class="SimpleLine" pass="0" enabled="1">
     <prop k="align_dash_pattern" v="0"/>
     <prop k="capstyle" v="square"/>
     <prop k="customdash" v="5;2"/>
@@ -354,131 +354,131 @@
     <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
     <data_defined_properties>
      <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option value="" name="name" type="QString"/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option value="collection" name="type" type="QString"/>
      </Option>
     </data_defined_properties>
    </layer>
   </symbol>
  </LayoutItem>
- <LayoutMultiFrame uuid="{3b12245e-8390-439c-bcc3-c9bbf6061b53}" showEmptyRows="0" horizontalGrid="1" type="65652" headerHAlignment="0" emptyTableMode="0" showGrid="0" cellMargin="1" wrapBehavior="0" backgroundColor="255,255,255,255" verticalGrid="1" templateUuid="{3b12245e-8390-439c-bcc3-c9bbf6061b53}" resizeMode="0" headerMode="2" gridColor="0,0,0,255" includeHeader="0" emptyTableMessage="" gridStrokeWidth="0.5">
+ <LayoutMultiFrame backgroundColor="255,255,255,255" headerMode="2" horizontalGrid="1" gridColor="0,0,0,255" resizeMode="0" verticalGrid="1" headerHAlignment="0" emptyTableMode="0" templateUuid="{3b12245e-8390-439c-bcc3-c9bbf6061b53}" uuid="{3b12245e-8390-439c-bcc3-c9bbf6061b53}" showEmptyRows="0" type="65652" cellMargin="1" gridStrokeWidth="0.5" showGrid="0" includeHeader="0" wrapBehavior="0" emptyTableMessage="">
   <childFrame uuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}" templateUuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}"/>
   <LayoutObject>
    <dataDefinedProperties>
     <Option type="Map">
-     <Option type="QString" name="name" value=""/>
+     <Option value="" name="name" type="QString"/>
      <Option name="properties"/>
-     <Option type="QString" name="type" value="collection"/>
+     <Option value="collection" name="type" type="QString"/>
     </Option>
    </dataDefinedProperties>
    <customproperties/>
   </LayoutObject>
   <headerTextFormat>
-   <text-style blendMode="0" textOrientation="horizontal" fontKerning="1" namedStyle="" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontFamily="SimSun" allowHtml="0" textColor="0,0,0,255" capitalization="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" previewBkgrdColor="255,255,255,255" fontSize="10" fontWeight="50" fontUnderline="0" fontItalic="0" fontSizeUnit="Point">
-    <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
-    <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128" maskEnabled="0" maskType="0" maskSize="1.5" maskOpacity="1"/>
-    <background shapeDraw="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBlendMode="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRotationType="0" shapeOpacity="1"/>
-    <shadow shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOpacity="0.7" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+   <text-style textColor="0,0,0,255" fontKerning="1" fontSizeUnit="Point" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="SimSun" fontLetterSpacing="0" capitalization="0" namedStyle="" fontItalic="0" fontWordSpacing="0" multilineHeight="1" fontUnderline="0" blendMode="0" textOpacity="1" fontSize="10" fontStrikeout="0" fontWeight="50" previewBkgrdColor="255,255,255,255">
+    <text-buffer bufferSizeUnits="MM" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+    <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+    <background shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderWidth="0" shapeOffsetY="0" shapeOpacity="1" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeJoinStyle="64" shapeRotation="0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeRadiiUnit="MM" shapeOffsetX="0" shapeRadiiX="0" shapeBlendMode="0" shapeType="0"/>
+    <shadow shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOpacity="0.7" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0"/>
     <dd_properties>
      <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option value="" name="name" type="QString"/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option value="collection" name="type" type="QString"/>
      </Option>
     </dd_properties>
    </text-style>
   </headerTextFormat>
   <contentTextFormat>
-   <text-style blendMode="0" textOrientation="horizontal" fontKerning="1" namedStyle="" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontFamily="SimSun" allowHtml="0" textColor="0,0,0,255" capitalization="0" fontLetterSpacing="0" fontStrikeout="0" fontWordSpacing="0" previewBkgrdColor="255,255,255,255" fontSize="10" fontWeight="50" fontUnderline="0" fontItalic="0" fontSizeUnit="Point">
-    <text-buffer bufferDraw="0" bufferSize="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferNoFill="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
-    <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128" maskEnabled="0" maskType="0" maskSize="1.5" maskOpacity="1"/>
-    <background shapeDraw="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeX="0" shapeOffsetY="0" shapeBlendMode="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeRadiiX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRotationType="0" shapeOpacity="1"/>
-    <shadow shadowOffsetAngle="135" shadowBlendMode="6" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOpacity="0.7" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255"/>
+   <text-style textColor="0,0,0,255" fontKerning="1" fontSizeUnit="Point" textOrientation="horizontal" allowHtml="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="SimSun" fontLetterSpacing="0" capitalization="0" namedStyle="" fontItalic="0" fontWordSpacing="0" multilineHeight="1" fontUnderline="0" blendMode="0" textOpacity="1" fontSize="10" fontStrikeout="0" fontWeight="50" previewBkgrdColor="255,255,255,255">
+    <text-buffer bufferSizeUnits="MM" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferNoFill="1" bufferOpacity="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+    <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskSize="1.5" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+    <background shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderWidth="0" shapeOffsetY="0" shapeOpacity="1" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeRotationType="0" shapeJoinStyle="64" shapeRotation="0" shapeSizeY="0" shapeBorderColor="128,128,128,255" shapeRadiiUnit="MM" shapeOffsetX="0" shapeRadiiX="0" shapeBlendMode="0" shapeType="0"/>
+    <shadow shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetAngle="135" shadowBlendMode="6" shadowOpacity="0.7" shadowScale="100" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0"/>
     <dd_properties>
      <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option value="" name="name" type="QString"/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option value="collection" name="type" type="QString"/>
      </Option>
     </dd_properties>
    </text-style>
   </contentTextFormat>
   <displayColumns>
-   <column heading="" attribute="" sortOrder="0" vAlignment="128" width="0" sortByRank="0" hAlignment="1">
-    <backgroundColor blue="0" red="0" green="0" alpha="0"/>
+   <column sortByRank="0" vAlignment="128" width="0" sortOrder="0" hAlignment="1" attribute="" heading="">
+    <backgroundColor alpha="0" red="0" blue="0" green="0"/>
    </column>
-   <column heading="璇存槑" attribute="" sortOrder="0" vAlignment="128" width="0" sortByRank="0" hAlignment="1">
-    <backgroundColor blue="0" red="0" green="0" alpha="0"/>
+   <column sortByRank="0" vAlignment="128" width="0" sortOrder="0" hAlignment="1" attribute="" heading="璇存槑">
+    <backgroundColor alpha="0" red="0" blue="0" green="0"/>
    </column>
   </displayColumns>
   <sortColumns/>
   <cellStyles>
-   <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
+   <oddColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+   <evenColumns cellBackgroundColor="255,255,255,255" enabled="0"/>
+   <oddRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+   <evenRows cellBackgroundColor="255,255,255,255" enabled="0"/>
+   <firstColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+   <lastColumn cellBackgroundColor="255,255,255,255" enabled="0"/>
+   <headerRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+   <firstRow cellBackgroundColor="255,255,255,255" enabled="0"/>
+   <lastRow cellBackgroundColor="255,255,255,255" enabled="0"/>
   </cellStyles>
   <headers>
-   <header heading="" attribute="" sortOrder="0" vAlignment="128" width="0" sortByRank="0" hAlignment="1">
-    <backgroundColor blue="0" red="0" green="0" alpha="0"/>
+   <header sortByRank="0" vAlignment="128" width="0" sortOrder="0" hAlignment="1" attribute="" heading="">
+    <backgroundColor alpha="0" red="0" blue="0" green="0"/>
    </header>
-   <header heading="璇存槑" attribute="" sortOrder="0" vAlignment="128" width="0" sortByRank="0" hAlignment="1">
-    <backgroundColor blue="0" red="0" green="0" alpha="0"/>
+   <header sortByRank="0" vAlignment="128" width="0" sortOrder="0" hAlignment="1" attribute="" heading="璇存槑">
+    <backgroundColor alpha="0" red="0" blue="0" green="0"/>
    </header>
   </headers>
   <contents>
    <row>
     <Option type="Map">
-     <Option type="color" name="background" value=""/>
-     <Option type="QString" name="content" value="璇�"/>
-     <Option type="color" name="foreground" value=""/>
-     <Option type="int" name="halign" value="2"/>
-     <Option type="int" name="valign" value="0"/>
+     <Option value="" name="background" type="color"/>
+     <Option value="璇�" name="content" type="QString"/>
+     <Option value="" name="foreground" type="color"/>
+     <Option value="2" name="halign" type="int"/>
+     <Option value="0" name="valign" type="int"/>
     </Option>
     <Option type="Map">
-     <Option type="color" name="background" value=""/>
-     <Option type="QString" name="content" value="鏄�"/>
-     <Option type="color" name="foreground" value=""/>
-     <Option type="int" name="halign" value="0"/>
-     <Option type="int" name="valign" value="0"/>
+     <Option value="" name="background" type="color"/>
+     <Option value="鏄�" name="content" type="QString"/>
+     <Option value="" name="foreground" type="color"/>
+     <Option value="0" name="halign" type="int"/>
+     <Option value="0" name="valign" type="int"/>
     </Option>
    </row>
    <row>
     <Option type="Map">
-     <Option type="color" name="background" value=""/>
-     <Option type="QString" name="content" value="姣斾緥灏猴細"/>
-     <Option type="color" name="foreground" value=""/>
-     <Option type="int" name="halign" value="2"/>
-     <Option type="int" name="valign" value="128"/>
+     <Option value="" name="background" type="color"/>
+     <Option value="姣斾緥灏猴細" name="content" type="QString"/>
+     <Option value="" name="foreground" type="color"/>
+     <Option value="2" name="halign" type="int"/>
+     <Option value="128" name="valign" type="int"/>
     </Option>
     <Option type="Map">
-     <Option type="color" name="background" value=""/>
-     <Option type="QString" name="content" value="1锛�25涓�"/>
-     <Option type="color" name="foreground" value=""/>
-     <Option type="int" name="halign" value="1"/>
-     <Option type="int" name="valign" value="128"/>
+     <Option value="" name="background" type="color"/>
+     <Option value="1锛�25涓�" name="content" type="QString"/>
+     <Option value="" name="foreground" type="color"/>
+     <Option value="1" name="halign" type="int"/>
+     <Option value="128" name="valign" type="int"/>
     </Option>
    </row>
    <row>
     <Option type="Map">
-     <Option type="color" name="background" value=""/>
-     <Option type="QString" name="content" value="鍒跺浘鏃堕棿锛�"/>
-     <Option type="color" name="foreground" value=""/>
-     <Option type="int" name="halign" value="2"/>
-     <Option type="int" name="valign" value="128"/>
+     <Option value="" name="background" type="color"/>
+     <Option value="鍒跺浘鏃堕棿锛�" name="content" type="QString"/>
+     <Option value="" name="foreground" type="color"/>
+     <Option value="2" name="halign" type="int"/>
+     <Option value="128" name="valign" type="int"/>
     </Option>
     <Option type="Map">
-     <Option type="color" name="background" value=""/>
-     <Option type="QString" name="content" value="2022.11.06"/>
-     <Option type="color" name="foreground" value=""/>
-     <Option type="int" name="halign" value="1"/>
-     <Option type="int" name="valign" value="128"/>
+     <Option value="" name="background" type="color"/>
+     <Option value="2022.11.06" name="content" type="QString"/>
+     <Option value="" name="foreground" type="color"/>
+     <Option value="1" name="halign" type="int"/>
+     <Option value="128" name="valign" type="int"/>
     </Option>
    </row>
   </contents>
@@ -501,8 +501,6 @@
   <property value="0" key="imageCropMarginTop"/>
   <property value="false" key="imageCropToContents"/>
   <property value="true" key="singleFile"/>
-  <property key="layers" value="椤圭洰,绔欏満,绠¢亾涓績绾�,鎴樼暐閫氶亾,褰卞儚娉ㄨ,褰卞儚鍥�"/>
-  <property key="imgPath" value="E:\terrait\TianJin\ExportMap\ExportMap\Sources\Test.png"/>
  </customproperties>
- <Atlas coverageLayer="" hideCoverage="0" enabled="0" pageNameExpression="" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="0" filterFeatures="0"/>
+ <Atlas filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="0" enabled="0" coverageLayer="" sortFeatures="0" pageNameExpression="" filterFeatures="0"/>
 </Layout>
diff --git a/ExportMap/Sources/Test.shp.qgz b/ExportMap/Sources/Test.shp.qgz
deleted file mode 100644
index 9d5e7ec..0000000
--- a/ExportMap/Sources/Test.shp.qgz
+++ /dev/null
Binary files differ
diff --git a/ExportMap/Sources/Test.shp.qpt b/ExportMap/Sources/Test.shp.qpt
deleted file mode 100644
index 57c6ca4..0000000
--- a/ExportMap/Sources/Test.shp.qpt
+++ /dev/null
@@ -1,575 +0,0 @@
-<Layout units="mm" name="Test" worldFileMap="{4e649c5d-cabe-431f-a385-d69809d87ebf}" printResolution="300">
- <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
- <Grid resUnits="mm" offsetX="0" offsetUnits="mm" resolution="10" offsetY="0"/>
- <PageCollection>
-  <symbol type="fill" force_rhr="0" alpha="1" name="" clip_to_extent="1">
-   <layer pass="0" class="SimpleFill" enabled="1" locked="0">
-    <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-    <prop v="255,255,255,255" k="color"/>
-    <prop v="miter" k="joinstyle"/>
-    <prop v="0,0" k="offset"/>
-    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-    <prop v="MM" k="offset_unit"/>
-    <prop v="35,35,35,255" k="outline_color"/>
-    <prop v="no" k="outline_style"/>
-    <prop v="0.26" k="outline_width"/>
-    <prop v="MM" k="outline_width_unit"/>
-    <prop v="solid" k="style"/>
-    <data_defined_properties>
-     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
-      <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
-     </Option>
-    </data_defined_properties>
-   </layer>
-  </symbol>
-  <LayoutItem zValue="0" blendMode="0" itemRotation="0" type="65638" position="0,0,mm" templateUuid="{72530018-3d33-4843-b661-79580c9b15e3}" visibility="1" uuid="{72530018-3d33-4843-b661-79580c9b15e3}" excludeFromExports="0" referencePoint="0" frameJoinStyle="miter" frame="false" id="" background="true" positionLock="false" size="297,210,mm" opacity="1" outlineWidthM="0.3,mm" positionOnPage="0,0,mm" groupUuid="">
-   <FrameColor green="0" alpha="255" blue="0" red="0"/>
-   <BackgroundColor green="255" alpha="255" blue="255" red="255"/>
-   <LayoutObject>
-    <dataDefinedProperties>
-     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
-      <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
-     </Option>
-    </dataDefinedProperties>
-    <customproperties/>
-   </LayoutObject>
-   <symbol type="fill" force_rhr="0" alpha="1" name="" clip_to_extent="1">
-    <layer pass="0" class="SimpleFill" enabled="1" locked="0">
-     <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
-     <prop v="255,255,255,255" k="color"/>
-     <prop v="miter" k="joinstyle"/>
-     <prop v="0,0" k="offset"/>
-     <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-     <prop v="MM" k="offset_unit"/>
-     <prop v="35,35,35,255" k="outline_color"/>
-     <prop v="no" k="outline_style"/>
-     <prop v="0.26" k="outline_width"/>
-     <prop v="MM" k="outline_width_unit"/>
-     <prop v="solid" k="style"/>
-     <data_defined_properties>
-      <Option type="Map">
-       <Option type="QString" value="" name="name"/>
-       <Option name="properties"/>
-       <Option type="QString" value="collection" name="type"/>
-      </Option>
-     </data_defined_properties>
-    </layer>
-   </symbol>
-  </LayoutItem>
-  <GuideCollection visible="1"/>
- </PageCollection>
- <LayoutItem zValue="8" blendMode="0" svgFillColor="255,255,255,255" itemRotation="0" type="65640" position="277.938,2.42978,mm" pictureHeight="11.1743" templateUuid="{6a1655ac-d65f-4163-9e89-5f98536a0c31}" visibility="1" uuid="{6a1655ac-d65f-4163-9e89-5f98536a0c31}" excludeFromExports="0" northMode="0" referencePoint="0" frameJoinStyle="miter" svgBorderColor="0,0,0,255" resizeMode="0" frame="false" id="鎸囧寳閽�" northOffset="0" background="false" positionLock="true" size="10.4237,11.1743,mm" opacity="1" outlineWidthM="0.3,mm" positionOnPage="277.938,2.42978,mm" pictureWidth="8.85237" pictureRotation="0" groupUuid="" mode="0" file=":/images/north_arrows/layout_default_north_arrow.svg" anchorPoint="0" mapUuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" svgBorderWidth="0.2">
-  <FrameColor green="0" alpha="255" blue="0" red="0"/>
-  <BackgroundColor green="255" alpha="255" blue="255" red="255"/>
-  <LayoutObject>
-   <dataDefinedProperties>
-    <Option type="Map">
-     <Option type="QString" value="" name="name"/>
-     <Option name="properties"/>
-     <Option type="QString" value="collection" name="type"/>
-    </Option>
-   </dataDefinedProperties>
-   <customproperties/>
-  </LayoutObject>
- </LayoutItem>
- <LayoutItem zValue="8" blendMode="0" itemRotation="0" type="65641" position="212.337,195.29,mm" templateUuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" visibility="1" uuid="{13528ba9-5ea4-45e3-b56e-a975eb046d54}" excludeFromExports="0" marginX="0" referencePoint="0" frameJoinStyle="miter" frame="false" id="鍏徃" background="false" positionLock="false" size="76.0244,9.39831,mm" opacity="1" labelText="涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�" outlineWidthM="0.3,mm" positionOnPage="212.337,195.29,mm" halign="4" marginY="0" groupUuid="" htmlState="0" valign="128">
-  <FrameColor green="0" alpha="255" blue="0" red="0"/>
-  <BackgroundColor green="255" alpha="255" blue="255" red="255"/>
-  <LayoutObject>
-   <dataDefinedProperties>
-    <Option type="Map">
-     <Option type="QString" value="" name="name"/>
-     <Option name="properties"/>
-     <Option type="QString" value="collection" name="type"/>
-    </Option>
-   </dataDefinedProperties>
-   <customproperties/>
-  </LayoutObject>
-  <LabelFont style="甯歌" description="瀹嬩綋,14,-1,5,50,0,0,0,0,0,甯歌"/>
-  <FontColor green="0" alpha="255" blue="0" red="0"/>
- </LayoutItem>
- <LayoutItem zValue="7" blendMode="0" svgFillColor="255,255,255,255" itemRotation="0" type="65640" position="200.5,194.948,mm" pictureHeight="10.7409" templateUuid="{29298722-a58a-42f7-85d1-04564ad9366d}" visibility="1" uuid="{29298722-a58a-42f7-85d1-04564ad9366d}" excludeFromExports="0" northMode="0" referencePoint="0" frameJoinStyle="miter" svgBorderColor="0,0,0,255" resizeMode="0" frame="false" id="Logo" northOffset="0" background="false" positionLock="true" size="11.6809,10.7409,mm" opacity="1" outlineWidthM="0.3,mm" positionOnPage="200.5,194.948,mm" pictureWidth="10.7409" pictureRotation="0" groupUuid="" mode="1" file="E:\terrait\TianJin\ExportMap\ExportMap\Sources\logo.png" anchorPoint="0" mapUuid="" svgBorderWidth="0.2">
-  <FrameColor green="0" alpha="255" blue="0" red="0"/>
-  <BackgroundColor green="255" alpha="255" blue="255" red="255"/>
-  <LayoutObject>
-   <dataDefinedProperties>
-    <Option type="Map">
-     <Option type="QString" value="" name="name"/>
-     <Option name="properties"/>
-     <Option type="QString" value="collection" name="type"/>
-    </Option>
-   </dataDefinedProperties>
-   <customproperties/>
-  </LayoutObject>
- </LayoutItem>
- <LayoutItem zValue="6" blendMode="0" itemRotation="0" hidePageIfEmpty="0" type="65647" multiFrame="{3f590e9a-19b4-46d3-90bb-6a188b24aaa6}" position="242.194,161,mm" templateUuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}" visibility="1" uuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}" excludeFromExports="0" sectionWidth="43.1968" referencePoint="0" sectionX="0" frameJoinStyle="miter" sectionHeight="25.6574" hideBackgroundIfEmpty="0" frame="false" id="璇存槑" background="false" sectionY="0" positionLock="true" size="43.1968,25.6574,mm" opacity="1" outlineWidthM="0.3,mm" positionOnPage="242.194,161,mm" groupUuid="" multiFrameTemplateUuid="{3f590e9a-19b4-46d3-90bb-6a188b24aaa6}">
-  <FrameColor green="0" alpha="255" blue="0" red="0"/>
-  <BackgroundColor green="255" alpha="255" blue="255" red="255"/>
-  <LayoutObject>
-   <dataDefinedProperties>
-    <Option type="Map">
-     <Option type="QString" value="" name="name"/>
-     <Option name="properties"/>
-     <Option type="QString" value="collection" name="type"/>
-    </Option>
-   </dataDefinedProperties>
-   <customproperties/>
-  </LayoutObject>
- </LayoutItem>
- <LayoutItem zValue="4" blendMode="0" itemRotation="0" type="65641" position="84.816,2.42978,mm" templateUuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" visibility="1" uuid="{81ccb104-2767-491d-8296-cd4ccbebed3e}" excludeFromExports="0" marginX="0" referencePoint="0" frameJoinStyle="miter" frame="false" id="鏍囬" background="false" positionLock="true" size="129.364,11.1743,mm" opacity="1" labelText="绠¢亾鍩虹澶ф暟鎹钩鍙帮紙DW1-1锛�" outlineWidthM="0.3,mm" positionOnPage="84.816,2.42978,mm" halign="4" marginY="0" groupUuid="" htmlState="0" valign="128">
-  <FrameColor green="0" alpha="255" blue="0" red="0"/>
-  <BackgroundColor green="255" alpha="255" blue="255" red="255"/>
-  <LayoutObject>
-   <dataDefinedProperties>
-    <Option type="Map">
-     <Option type="QString" value="" name="name"/>
-     <Option name="properties"/>
-     <Option type="QString" value="collection" name="type"/>
-    </Option>
-   </dataDefinedProperties>
-   <customproperties/>
-  </LayoutObject>
-  <LabelFont style="Bold" description="寰蒋闆呴粦,24,-1,5,75,0,0,0,0,0,Bold"/>
-  <FontColor green="0" alpha="255" blue="0" red="0"/>
- </LayoutItem>
- <LayoutItem itemRotation="0" wrapChar="" title="" positionOnPage="12.9877,152.005,mm" templateUuid="{52b0f928-714f-4672-bc0b-a13e401f8465}" columnCount="1" position="12.9877,152.005,mm" positionLock="true" frame="true" id="鍥句緥" blendMode="0" size="51.5396,34.6028,mm" rasterBorderWidth="0" resizeToContents="0" frameJoinStyle="round" opacity="1" boxSpace="2" uuid="{52b0f928-714f-4672-bc0b-a13e401f8465}" equalColumnWidth="0" background="true" maxSymbolSize="0" rasterBorder="1" excludeFromExports="0" fontColor="#000000" referencePoint="0" symbolHeight="4" wmsLegendWidth="50" wmsLegendHeight="25" outlineWidthM="0.1,mm" columnSpace="2" symbolWidth="7" minSymbolSize="0" symbolAlignment="1" zValue="3" rasterBorderColor="0,0,0,255" groupUuid="" visibility="1" type="65642" splitLayer="0" titleAlignment="1" legendFilterByAtlas="0" lineSpacing="1" map_uuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}">
-  <FrameColor green="0" alpha="255" blue="0" red="0"/>
-  <BackgroundColor green="255" alpha="255" blue="255" red="255"/>
-  <LayoutObject>
-   <dataDefinedProperties>
-    <Option type="Map">
-     <Option type="QString" value="" name="name"/>
-     <Option name="properties"/>
-     <Option type="QString" value="collection" name="type"/>
-    </Option>
-   </dataDefinedProperties>
-   <customproperties/>
-  </LayoutObject>
-  <styles>
-   <style marginBottom="3.5" name="title" alignment="1">
-    <styleFont style="" description="SimSun,16,-1,5,50,0,0,0,0,0"/>
-   </style>
-   <style marginTop="3" name="group" alignment="1">
-    <styleFont style="" description="SimSun,14,-1,5,50,0,0,0,0,0"/>
-   </style>
-   <style marginTop="3" name="subgroup" alignment="1">
-    <styleFont style="" description="SimSun,12,-1,5,50,0,0,0,0,0"/>
-   </style>
-   <style marginTop="2.5" name="symbol" alignment="1">
-    <styleFont style="" description="SimSun,9,-1,5,50,0,0,0,0,0"/>
-   </style>
-   <style marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
-    <styleFont style="" description="SimSun,12,-1,5,50,0,0,0,0,0"/>
-   </style>
-  </styles>
-  <layer-tree-group>
-   <customproperties/>
-   <layer-tree-group name="绠¢亾鍩虹澶ф暟鎹钩鍙�" checked="Qt::Checked" expanded="1">
-    <customproperties/>
-    <layer-tree-layer legend_exp="" id="VALVEHOUSEPOINT_5d566d73_8061_447a_a9e3_3e7adad17bd7" source="./shps/VALVEHOUSEPOINT.shp" providerKey="ogr" legend_split_behavior="0" patch_size="-1,-1" name="闃�瀹�" checked="Qt::Checked" expanded="1">
-     <customproperties/>
-    </layer-tree-layer>
-    <layer-tree-layer legend_exp="" id="SITEPOINT_484a52d0_7a8e_4f9e_9ad3_d940e10e24d3" source="./shps" providerKey="ogr" legend_split_behavior="0" patch_size="-1,-1" name="绔欏満" checked="Qt::Checked" expanded="1">
-     <customproperties/>
-    </layer-tree-layer>
-    <layer-tree-layer legend_exp="" id="STATIONSERIES_5bfe7f3c_86b2_4fda_bae4_c44a33ab33e0" source="./shps/STATIONSERIES.shp" providerKey="ogr" legend_split_behavior="0" patch_size="-1,-1" name="绠¢亾涓績绾�" checked="Qt::Checked" expanded="1">
-     <customproperties/>
-    </layer-tree-layer>
-   </layer-tree-group>
-   <custom-order enabled="0"/>
-  </layer-tree-group>
- </LayoutItem>
- <LayoutItem zValue="2" blendMode="0" itemRotation="0" type="65639" position="9,18,mm" templateUuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" visibility="1" uuid="{4e649c5d-cabe-431f-a385-d69809d87ebf}" excludeFromExports="0" referencePoint="0" frameJoinStyle="round" isTemporal="0" labelMargin="0,mm" mapFlags="0" frame="true" id="鍦板浘" background="true" keepLayerSet="false" positionLock="false" size="280,174,mm" opacity="1" outlineWidthM="4,px" positionOnPage="9,18,mm" followPresetName="" drawCanvasItems="false" groupUuid="" followPreset="false" mapRotation="0">
-  <FrameColor green="0" alpha="255" blue="0" red="0"/>
-  <BackgroundColor green="255" alpha="255" blue="255" red="255"/>
-  <LayoutObject>
-   <dataDefinedProperties>
-    <Option type="Map">
-     <Option type="QString" value="" name="name"/>
-     <Option name="properties"/>
-     <Option type="QString" value="collection" name="type"/>
-    </Option>
-   </dataDefinedProperties>
-   <customproperties/>
-  </LayoutObject>
-  <Extent ymax="64.11233836183852475" ymin="9.57730491702214692" xmin="59.05829972526095162" xmax="146.81582480887351494"/>
-  <crs>
-   <spatialrefsys>
-    <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-    <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-    <srsid>3452</srsid>
-    <srid>4326</srid>
-    <authid>EPSG:4326</authid>
-    <description>WGS 84</description>
-    <projectionacronym>longlat</projectionacronym>
-    <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-    <geographicflag>true</geographicflag>
-   </spatialrefsys>
-  </crs>
-  <LayerSet/>
-  <ComposerMapGrid rotatedTicksMinimumAngle="0" bottomFrameDivisions="0" rightAnnotationPosition="1" annotationFormat="4" intervalX="30" leftAnnotationPosition="1" bottomAnnotationPosition="1" annotationPrecision="3" position="3" offsetX="0" rotatedAnnotationsMinimumAngle="0" frameAnnotationDistance="1" rotatedTicksLengthMode="0" rightAnnotationDisplay="0" name="缃戞牸 1" rotatedAnnotationsMarginToCorner="0" blendMode="0" frameFillColor1="255,255,255,255" leftAnnotationDisplay="0" frameFillColor2="0,0,0,255" gridFramePenThickness="0.29999999999999999" topAnnotationPosition="1" uuid="{33b582a6-ae09-42c2-b50b-ae68c9d6d71a}" gridFrameMargin="0" leftFrameDivisions="0" bottomAnnotationDisplay="0" rotatedAnnotationsEnabled="0" gridFramePenColor="0,0,0,255" gridStyle="3" rotatedTicksEnabled="0" showAnnotation="1" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" rightAnnotationDirection="2" unit="1" rotatedAnnotationsLengthMode="0" crossLength="3" topAnnotationDisplay="0" topAnnotationDirection="0" rightFrameDivisions="0" offsetY="0" gridFrameWidth="2" intervalY="30" leftAnnotationDirection="2" maximumIntervalWidth="10" topFrameDivisions="0" annotationExpression="" gridFrameStyle="0" show="1" bottomAnnotationDirection="0" minimumIntervalWidth="12">
-   <lineStyle>
-    <symbol type="line" force_rhr="0" alpha="0.616" name="" clip_to_extent="1">
-     <layer pass="0" class="SimpleLine" enabled="1" locked="0">
-      <prop v="0" k="align_dash_pattern"/>
-      <prop v="round" k="capstyle"/>
-      <prop v="0.66;2" k="customdash"/>
-      <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-      <prop v="MM" k="customdash_unit"/>
-      <prop v="0" k="dash_pattern_offset"/>
-      <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-      <prop v="MM" k="dash_pattern_offset_unit"/>
-      <prop v="0" k="draw_inside_polygon"/>
-      <prop v="round" k="joinstyle"/>
-      <prop v="0,0,0,255" k="line_color"/>
-      <prop v="solid" k="line_style"/>
-      <prop v="0.5" k="line_width"/>
-      <prop v="MM" k="line_width_unit"/>
-      <prop v="0" k="offset"/>
-      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-      <prop v="MM" k="offset_unit"/>
-      <prop v="0" k="ring_filter"/>
-      <prop v="0" k="tweak_dash_pattern_on_corners"/>
-      <prop v="1" k="use_custom_dash"/>
-      <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-      <data_defined_properties>
-       <Option type="Map">
-        <Option type="QString" value="" name="name"/>
-        <Option name="properties"/>
-        <Option type="QString" value="collection" name="type"/>
-       </Option>
-      </data_defined_properties>
-     </layer>
-    </symbol>
-   </lineStyle>
-   <markerStyle>
-    <symbol type="marker" force_rhr="0" alpha="1" name="" clip_to_extent="1">
-     <layer pass="0" class="SimpleMarker" enabled="1" locked="0">
-      <prop v="0" k="angle"/>
-      <prop v="0,0,0,255" k="color"/>
-      <prop v="1" k="horizontal_anchor_point"/>
-      <prop v="bevel" k="joinstyle"/>
-      <prop v="circle" k="name"/>
-      <prop v="0,0" k="offset"/>
-      <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-      <prop v="MM" k="offset_unit"/>
-      <prop v="35,35,35,255" k="outline_color"/>
-      <prop v="solid" k="outline_style"/>
-      <prop v="0" k="outline_width"/>
-      <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-      <prop v="MM" k="outline_width_unit"/>
-      <prop v="diameter" k="scale_method"/>
-      <prop v="2" k="size"/>
-      <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-      <prop v="MM" k="size_unit"/>
-      <prop v="1" k="vertical_anchor_point"/>
-      <data_defined_properties>
-       <Option type="Map">
-        <Option type="QString" value="" name="name"/>
-        <Option name="properties"/>
-        <Option type="QString" value="collection" name="type"/>
-       </Option>
-      </data_defined_properties>
-     </layer>
-    </symbol>
-   </markerStyle>
-   <spatialrefsys>
-    <wkt>GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-    <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-    <srsid>3452</srsid>
-    <srid>4326</srid>
-    <authid>EPSG:4326</authid>
-    <description>WGS 84</description>
-    <projectionacronym>longlat</projectionacronym>
-    <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-    <geographicflag>true</geographicflag>
-   </spatialrefsys>
-   <text-style capitalization="0" blendMode="0" fontKerning="1" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontItalic="0" fontLetterSpacing="0" fontWordSpacing="0" allowHtml="0" fontUnderline="0" textOpacity="1" fontFamily="SimSun" fontWeight="50" textOrientation="horizontal" textColor="0,0,0,255" fontSizeUnit="Point" fontSize="8" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" namedStyle="">
-    <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSize="1" bufferDraw="0"/>
-    <text-mask maskSize="1.5" maskOpacity="1" maskEnabled="0" maskedSymbolLayers="" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
-    <background shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiY="0" shapeDraw="0" shapeRotation="0" shapeSizeY="0" shapeOffsetX="0" shapeBlendMode="0" shapeType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeType="0" shapeBorderWidth="0">
-     <symbol type="marker" force_rhr="0" alpha="1" name="markerSymbol" clip_to_extent="1">
-      <layer pass="0" class="SimpleMarker" enabled="1" locked="0">
-       <prop v="0" k="angle"/>
-       <prop v="231,113,72,255" k="color"/>
-       <prop v="1" k="horizontal_anchor_point"/>
-       <prop v="bevel" k="joinstyle"/>
-       <prop v="circle" k="name"/>
-       <prop v="0,0" k="offset"/>
-       <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-       <prop v="MM" k="offset_unit"/>
-       <prop v="35,35,35,255" k="outline_color"/>
-       <prop v="solid" k="outline_style"/>
-       <prop v="0" k="outline_width"/>
-       <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-       <prop v="MM" k="outline_width_unit"/>
-       <prop v="diameter" k="scale_method"/>
-       <prop v="2" k="size"/>
-       <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-       <prop v="MM" k="size_unit"/>
-       <prop v="1" k="vertical_anchor_point"/>
-       <data_defined_properties>
-        <Option type="Map">
-         <Option type="QString" value="" name="name"/>
-         <Option name="properties"/>
-         <Option type="QString" value="collection" name="type"/>
-        </Option>
-       </data_defined_properties>
-      </layer>
-     </symbol>
-    </background>
-    <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowUnder="0" shadowOffsetDist="1" shadowScale="100" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
-    <dd_properties>
-     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
-      <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
-     </Option>
-    </dd_properties>
-   </text-style>
-   <LayoutObject>
-    <dataDefinedProperties>
-     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
-      <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
-     </Option>
-    </dataDefinedProperties>
-    <customproperties/>
-   </LayoutObject>
-  </ComposerMapGrid>
-  <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
-  <labelBlockingItems/>
-  <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
-   <layersToClip/>
-  </atlasClippingSettings>
-  <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
- </LayoutItem>
- <LayoutItem zValue="1" blendMode="0" itemRotation="0" type="65643" position="2.6816,2,mm" templateUuid="{76e708b9-4aa8-4365-b8ba-3157f836dfa9}" visibility="1" uuid="{76e708b9-4aa8-4365-b8ba-3157f836dfa9}" excludeFromExports="0" referencePoint="0" frameJoinStyle="miter" frame="false" id="杈规" background="false" cornerRadiusMeasure="0,mm" positionLock="true" size="292.354,205.447,mm" opacity="1" outlineWidthM="0.3,mm" positionOnPage="2.6816,2,mm" groupUuid="" shapeType="1">
-  <FrameColor green="0" alpha="255" blue="0" red="0"/>
-  <BackgroundColor green="255" alpha="255" blue="255" red="255"/>
-  <LayoutObject>
-   <dataDefinedProperties>
-    <Option type="Map">
-     <Option type="QString" value="" name="name"/>
-     <Option name="properties"/>
-     <Option type="QString" value="collection" name="type"/>
-    </Option>
-   </dataDefinedProperties>
-   <customproperties/>
-  </LayoutObject>
-  <symbol type="fill" force_rhr="0" alpha="1" name="" clip_to_extent="1">
-   <layer pass="0" class="SimpleLine" enabled="1" locked="0">
-    <prop v="0" k="align_dash_pattern"/>
-    <prop v="square" k="capstyle"/>
-    <prop v="5;2" k="customdash"/>
-    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-    <prop v="Pixel" k="customdash_unit"/>
-    <prop v="0" k="dash_pattern_offset"/>
-    <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
-    <prop v="MM" k="dash_pattern_offset_unit"/>
-    <prop v="0" k="draw_inside_polygon"/>
-    <prop v="bevel" k="joinstyle"/>
-    <prop v="53,121,177,255" k="line_color"/>
-    <prop v="solid" k="line_style"/>
-    <prop v="0.96" k="line_width"/>
-    <prop v="Pixel" k="line_width_unit"/>
-    <prop v="0" k="offset"/>
-    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-    <prop v="Pixel" k="offset_unit"/>
-    <prop v="0" k="ring_filter"/>
-    <prop v="0" k="tweak_dash_pattern_on_corners"/>
-    <prop v="0" k="use_custom_dash"/>
-    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-    <data_defined_properties>
-     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
-      <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
-     </Option>
-    </data_defined_properties>
-   </layer>
-  </symbol>
- </LayoutItem>
- <LayoutMultiFrame cellMargin="1" type="65652" verticalGrid="1" templateUuid="{3b12245e-8390-439c-bcc3-c9bbf6061b53}" headerMode="2" emptyTableMode="0" uuid="{3b12245e-8390-439c-bcc3-c9bbf6061b53}" horizontalGrid="1" resizeMode="0" includeHeader="0" gridColor="0,0,0,255" backgroundColor="255,255,255,255" wrapBehavior="0" emptyTableMessage="" showEmptyRows="0" headerHAlignment="0" gridStrokeWidth="0.5" showGrid="0" id="MultiFrame">
-  <childFrame uuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}" templateUuid="{7cb1fe59-d2d9-427d-a2d1-4edbc7285021}"/>
-  <LayoutObject>
-   <dataDefinedProperties>
-    <Option type="Map">
-     <Option type="QString" value="" name="name"/>
-     <Option name="properties"/>
-     <Option type="QString" value="collection" name="type"/>
-    </Option>
-   </dataDefinedProperties>
-   <customproperties/>
-  </LayoutObject>
-  <headerTextFormat>
-   <text-style capitalization="0" blendMode="0" fontKerning="1" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontItalic="0" fontLetterSpacing="0" fontWordSpacing="0" allowHtml="0" fontUnderline="0" textOpacity="1" fontFamily="SimSun" fontWeight="50" textOrientation="horizontal" textColor="0,0,0,255" fontSizeUnit="Point" fontSize="10" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" namedStyle="">
-    <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSize="1" bufferDraw="0"/>
-    <text-mask maskSize="1.5" maskOpacity="1" maskEnabled="0" maskedSymbolLayers="" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
-    <background shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiY="0" shapeDraw="0" shapeRotation="0" shapeSizeY="0" shapeOffsetX="0" shapeBlendMode="0" shapeType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeType="0" shapeBorderWidth="0"/>
-    <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowUnder="0" shadowOffsetDist="1" shadowScale="100" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
-    <dd_properties>
-     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
-      <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
-     </Option>
-    </dd_properties>
-   </text-style>
-  </headerTextFormat>
-  <contentTextFormat>
-   <text-style capitalization="0" blendMode="0" fontKerning="1" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontItalic="0" fontLetterSpacing="0" fontWordSpacing="0" allowHtml="0" fontUnderline="0" textOpacity="1" fontFamily="SimSun" fontWeight="50" textOrientation="horizontal" textColor="0,0,0,255" fontSizeUnit="Point" fontSize="10" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontStrikeout="0" namedStyle="">
-    <text-buffer bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSize="1" bufferDraw="0"/>
-    <text-mask maskSize="1.5" maskOpacity="1" maskEnabled="0" maskedSymbolLayers="" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
-    <background shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiY="0" shapeDraw="0" shapeRotation="0" shapeSizeY="0" shapeOffsetX="0" shapeBlendMode="0" shapeType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeType="0" shapeBorderWidth="0"/>
-    <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowUnder="0" shadowOffsetDist="1" shadowScale="100" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
-    <dd_properties>
-     <Option type="Map">
-      <Option type="QString" value="" name="name"/>
-      <Option name="properties"/>
-      <Option type="QString" value="collection" name="type"/>
-     </Option>
-    </dd_properties>
-   </text-style>
-  </contentTextFormat>
-  <displayColumns>
-   <column hAlignment="1" vAlignment="128" heading="" sortByRank="0" attribute="" sortOrder="0" width="0">
-    <backgroundColor green="0" alpha="0" blue="0" red="0"/>
-   </column>
-   <column hAlignment="1" vAlignment="128" heading="璇存槑" sortByRank="0" attribute="" sortOrder="0" width="0">
-    <backgroundColor green="0" alpha="0" blue="0" red="0"/>
-   </column>
-  </displayColumns>
-  <sortColumns/>
-  <cellStyles>
-   <oddColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <evenColumns enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <oddRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <evenRows enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <firstColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <lastColumn enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <headerRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <firstRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-   <lastRow enabled="0" cellBackgroundColor="255,255,255,255"/>
-  </cellStyles>
-  <headers>
-   <header hAlignment="1" vAlignment="128" heading="" sortByRank="0" attribute="" sortOrder="0" width="0">
-    <backgroundColor green="0" alpha="0" blue="0" red="0"/>
-   </header>
-   <header hAlignment="1" vAlignment="128" heading="璇存槑" sortByRank="0" attribute="" sortOrder="0" width="0">
-    <backgroundColor green="0" alpha="0" blue="0" red="0"/>
-   </header>
-  </headers>
-  <contents>
-   <row>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="璇�" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="2" name="halign"/>
-     <Option type="int" value="0" name="valign"/>
-    </Option>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="鏄�" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="0" name="halign"/>
-     <Option type="int" value="0" name="valign"/>
-    </Option>
-   </row>
-   <row>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="鐪佷唤锛�" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="2" name="halign"/>
-     <Option type="int" value="128" name="valign"/>
-    </Option>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="娌冲寳鐪�" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="1" name="halign"/>
-     <Option type="int" value="128" name="valign"/>
-    </Option>
-   </row>
-   <row>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="姣斾緥灏猴細" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="2" name="halign"/>
-     <Option type="int" value="128" name="valign"/>
-    </Option>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="1锛�25涓�" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="1" name="halign"/>
-     <Option type="int" value="128" name="valign"/>
-    </Option>
-   </row>
-   <row>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="褰卞儚鍒嗚鲸鐜囷細" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="0" name="halign"/>
-     <Option type="int" value="0" name="valign"/>
-    </Option>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="20绫�" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="0" name="halign"/>
-     <Option type="int" value="0" name="valign"/>
-    </Option>
-   </row>
-   <row>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="鍒跺浘鏃堕棿锛�" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="2" name="halign"/>
-     <Option type="int" value="0" name="valign"/>
-    </Option>
-    <Option type="Map">
-     <Option type="color" value="" name="background"/>
-     <Option type="QString" value="2022.11.06" name="content"/>
-     <Option type="color" value="" name="foreground"/>
-     <Option type="int" value="0" name="halign"/>
-     <Option type="int" value="0" name="valign"/>
-    </Option>
-   </row>
-  </contents>
-  <rowHeights>
-   <row height="0"/>
-   <row height="0"/>
-   <row height="0"/>
-   <row height="0"/>
-   <row height="0"/>
-  </rowHeights>
-  <columnWidths>
-   <column width="0"/>
-   <column width="0"/>
-  </columnWidths>
- </LayoutMultiFrame>
- <customproperties>
-  <property key="atlasRasterFormat" value="png"/>
-  <property key="imageAntialias" value="true"/>
-  <property key="imageCropMarginBottom" value="0"/>
-  <property key="imageCropMarginLeft" value="0"/>
-  <property key="imageCropMarginRight" value="0"/>
-  <property key="imageCropMarginTop" value="0"/>
-  <property key="imageCropToContents" value="false"/>
-  <property key="singleFile" value="true"/>
-  <property key="layers" value="闃�瀹�,绠¢亾涓績绾�,褰卞儚鍥�"/>
-  <property key="imgPath" value="E:\terrait\TianJin\ExportMap\ExportMap\Sources\Test.png"/>
- </customproperties>
- <Atlas pageNameExpression="" sortFeatures="0" enabled="0" hideCoverage="0" filterFeatures="0" coverageLayer="" filenamePattern="'output_'||@atlas_featurenumber"/>
-</Layout>
diff --git a/ExportMap/lf.html b/ExportMap/lf.html
index b16b8f2..e64c9af 100644
--- a/ExportMap/lf.html
+++ b/ExportMap/lf.html
@@ -75,16 +75,6 @@
       });
     }
 
-    function insertUser() {
-      var data = {
-        //
-      };
-      ajax(url + "user/updateUsersPwd" + token, "POST", JSON.stringify(data), "json", null, function (rs) {
-        alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
-        console.log(rs);
-      });
-    }
-
     function ajxUpload() {
       var formData = new FormData();
       var fs = document.getElementById("file1");
@@ -303,10 +293,34 @@
         }
       });
     }
+
+    function downloadPipeReq() {
+      var data = {
+        pwd: encrypt.encrypt("Test!321&456"),
+        gid: 24,
+        tabs: ["bd.dlg_25w_hydl", "bd.dlg_25w_lrdl", "bd.dlg_25w_lrrl", "bd.dlg_25w_hyda"]
+      };
+
+      $.ajax(url + "pipeline/downloadReq" + token, {
+        type: "POST",
+        data: JSON.stringify(data),
+        async: true,
+        cache: false,
+        processData: false,
+        contentType: false,
+        success: function (rs) {
+          alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + ", " + JSON.stringify(rs.result));
+          console.log(rs);
+        },
+        error: function (e) {
+          console.error(e);
+        }
+      });
+    }
   </script>
   <script>
     var url = "http://127.0.0.1:12316/server/";
-    var token = "?token=6d039a6d-0b0a-402d-8fbc-5f236818e6d9";
+    var token = "?token=f4bbbf69-6d3d-42f3-a5cd-2bb6bc045660";
     // 椤圭洰,绔欏満,绠¢亾涓績绾�,鎴樼暐閫氶亾,鐭㈤噺鍥�,褰卞儚娉ㄨ,褰卞儚鍥�
 
     function exportMap1() {
@@ -384,6 +398,7 @@
   <input type="button" value="downloadFile" onclick="downloadFile();" />
   <input type="button" value="uploadShpForMark" onclick="uploadShpForMark();" />
   <input type="button" value="绠$嚎鍒嗘瀽" onclick="pipeAnalysis()" />
+  <input type="button" value="绠$嚎鍒嗘瀽涓嬭浇" onclick="downloadPipeReq()" />
   <br />
   <br />
 
diff --git a/ExportMap/up.html b/ExportMap/up.html
index bbc40e2..6c31ca7 100644
--- a/ExportMap/up.html
+++ b/ExportMap/up.html
@@ -10,7 +10,7 @@
     var app = {};
     var path = "20221128010101";
     var url = "http://127.0.0.1:12316/server/";
-    var token = "e62f5887-a398-4362-8bc1-7dd11b81e42e";
+    var token = "89248366-eb18-404f-a874-d0f94f84b832";
 
     $(function () {
       $("#pathSpan").html(path);
diff --git a/JavaCode/App.config b/JavaCode/App.config
index b619118..7fe7813 100644
--- a/JavaCode/App.config
+++ b/JavaCode/App.config
@@ -2,9 +2,9 @@
 <configuration>
   <appSettings>
     <!-- 69701 -->
-    <!--<add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>-->
+    <add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>
     <!-- 20582 -->
-    <add key="pgConn" value="Server=192.168.20.39;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>
+    <!--<add key="pgConn" value="Server=192.168.20.39;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>-->
   </appSettings>
   <startup> 
       <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
diff --git a/JavaCode/FrmMain.Designer.cs b/JavaCode/FrmMain.Designer.cs
index ccb57a1..afa2ec1 100644
--- a/JavaCode/FrmMain.Designer.cs
+++ b/JavaCode/FrmMain.Designer.cs
@@ -30,12 +30,13 @@
         {
             this.btnSys = new System.Windows.Forms.Button();
             this.btnMybatis = new System.Windows.Forms.Button();
+            this.button1 = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // btnSys
             // 
             this.btnSys.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSys.Location = new System.Drawing.Point(142, 63);
+            this.btnSys.Location = new System.Drawing.Point(143, 37);
             this.btnSys.Name = "btnSys";
             this.btnSys.Size = new System.Drawing.Size(183, 25);
             this.btnSys.TabIndex = 13;
@@ -46,7 +47,7 @@
             // btnMybatis
             // 
             this.btnMybatis.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnMybatis.Location = new System.Drawing.Point(142, 134);
+            this.btnMybatis.Location = new System.Drawing.Point(143, 89);
             this.btnMybatis.Name = "btnMybatis";
             this.btnMybatis.Size = new System.Drawing.Size(183, 25);
             this.btnMybatis.TabIndex = 14;
@@ -54,11 +55,22 @@
             this.btnMybatis.UseVisualStyleBackColor = true;
             this.btnMybatis.Click += new System.EventHandler(this.btnMybatis_Click);
             // 
+            // button1
+            // 
+            this.button1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.button1.Location = new System.Drawing.Point(143, 143);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(183, 25);
+            this.button1.TabIndex = 15;
+            this.button1.Text = "鐢� 鎴� Mybatis Plus";
+            this.button1.UseVisualStyleBackColor = true;
+            // 
             // FrmMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(484, 261);
+            this.Controls.Add(this.button1);
             this.Controls.Add(this.btnMybatis);
             this.Controls.Add(this.btnSys);
             this.Name = "FrmMain";
@@ -72,5 +84,6 @@
 
         private System.Windows.Forms.Button btnSys;
         private System.Windows.Forms.Button btnMybatis;
+        private System.Windows.Forms.Button button1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3