diff --git a/.env.production b/.env.production
index f355372..8cc62d9 100644
--- a/.env.production
+++ b/.env.production
@@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 #后台接口父地址(必填)
-VITE_GLOB_API_URL=/jeecgboot
+VITE_GLOB_API_URL=/api
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8080/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8050/jeecg-boot
 
 # 接口父路径前缀
 VITE_GLOB_API_URL_PREFIX=
diff --git a/index.html b/index.html
index 1ad2b78..df9d580 100644
--- a/index.html
+++ b/index.html
@@ -166,12 +166,12 @@
       </div>
     </div>
     <script type="module" src="/src/main.ts"></script>
-    <script src="/static/baidu/js/script/city.js"></script>
+    <!-- <script src="/static/baidu/js/script/city.js"></script>
     <script src="/static/baidu/js/artDialog/artDialog.source.js?skin=chrome"></script>
     <script src="/static/baidu/js/artDialog/iframeTools.source.js"></script>
-    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=9QkBtTHNnppQPAx49wGSdgD1E3pZ0LB7"></script>
+    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=9QkBtTHNnppQPAx49wGSdgD1E3pZ0LB7"></script> -->
     <!-- 百度统计 -->
-    <script>
+    <!-- <script>
       var _hmt = _hmt || [];
       (function() {
         var hm = document.createElement("script");
@@ -179,7 +179,7 @@
         var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(hm, s);
       })();
-    </script>
+    </script> -->
 
   </body>
 </html>
diff --git a/src/components/chart/LineMultiZdy.vue b/src/components/chart/LineMultiZdy.vue
index 47e2797..7102962 100644
--- a/src/components/chart/LineMultiZdy.vue
+++ b/src/components/chart/LineMultiZdy.vue
@@ -37,7 +37,7 @@ function sortByTime(arr: any[]) {
 }
 function splitByRegion(data: any[]) {
   const city = data.filter(d => String(d.regionType).includes('城区'));
-  const county = data.filter(d => String(d.regionType).includes('郊县'));
+  const county = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city), county: sortByTime(county) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -71,7 +71,7 @@ function prepareOptions(records: any[]) {
   const countySW = county.map((r: any) => safeNum(r.view035));
   const countyHW = county.map((r: any) => safeNum(r.view036));
   countyOption = {
-    title: { text: '郊县供/回水温度【实时】', left: 'center', top: 10 },
+    title: { text: '乡镇供/回水温度【实时】', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
diff --git a/src/views/analysisrule/AnalysisRuleListJx.vue b/src/views/analysisrule/AnalysisRuleListJx.vue
index b616777..5022718 100644
--- a/src/views/analysisrule/AnalysisRuleListJx.vue
+++ b/src/views/analysisrule/AnalysisRuleListJx.vue
@@ -137,7 +137,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       fixed: 'right',
     },
     beforeFetch: async (params) => {
-      queryParam.regionType = '郊县'
+      queryParam.regionType = '乡镇'
       return Object.assign(params, queryParam);
     },
   },
@@ -181,7 +181,7 @@ function handleSuperQuery(params) {
  */
 function handleAdd() {
   registerModal.value.disableSubmit = false;
-  registerModal.value.add({regionType:'郊县'});
+  registerModal.value.add({regionType:'乡镇'});
 }
 
 /**
diff --git a/src/views/base/company/Thermalcompany.data.ts b/src/views/base/company/Thermalcompany.data.ts
index cf769a5..323fc2c 100644
--- a/src/views/base/company/Thermalcompany.data.ts
+++ b/src/views/base/company/Thermalcompany.data.ts
@@ -41,10 +41,78 @@ export const columns: BasicColumn[] = [
     dataIndex: 'companyAddress'
   },
 ];
+//列表数据
+export const columnsJx: BasicColumn[] = [
+  {
+    title: '序号',
+    align:"center",
+    dataIndex: 'id'
+  },
+  {
+   title: '公司名称',
+   align:"center",
+   dataIndex: 'companyJxName'
+  },
+   {
+    title: '乡镇名称',
+    align:"center",
+    dataIndex: 'companyName'
+   },
+  {
+    title: '公司类型',
+    align:"center",
+    dataIndex: 'companyType_dictText'
+  },
+  {
+    title: '锅炉房个数',
+    align:"center",
+    dataIndex: 'boilerHouse'
+  },
+  {
+    title: '换热站个数',
+    align:"center",
+    dataIndex: 'barterHeat'
+  },
+   {
+    title: '电话',
+    align:"center",
+    dataIndex: 'companyPhone'
+   },
+  {
+    title: '公司地址',
+    align:"center",
+    dataIndex: 'companyAddress'
+  },
+];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
       label: "公司名称",
+      field: 'companyJxName',
+      component: 'Input',
+      //colProps: {span: 6},
+ 	},
+	{
+      label: "乡镇名称",
+      field: 'companyName',
+      component: 'Input',
+      //colProps: {span: 6},
+ 	},
+	{
+      label: "公司类型",
+      field: 'companyType',
+      component: 'JSelectMultiple',
+      componentProps:{
+          dictCode:"h_company_type"
+      },
+      //colProps: {span: 6},
+ 	},
+];
+
+//查询数据
+export const searchForm2Schema: FormSchema[] = [
+	{
+      label: "公司名称",
       field: 'companyName',
       component: 'Input',
       //colProps: {span: 6},
diff --git a/src/views/base/company/ThermalcompanyListJx.vue b/src/views/base/company/ThermalcompanyListJx.vue
index 16a1075..606abb2 100644
--- a/src/views/base/company/ThermalcompanyListJx.vue
+++ b/src/views/base/company/ThermalcompanyListJx.vue
@@ -39,7 +39,7 @@
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage'
   import ThermalcompanyModal from './components/ThermalcompanyModal.vue'
-  import {columns, searchFormSchema} from './Thermalcompany.data';
+  import {columnsJx, searchFormSchema} from './Thermalcompany.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './Thermalcompany.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
@@ -56,7 +56,7 @@
               column: 'id',
               order: 'asc',
            },
-           columns,
+           columns:columnsJx,
            canResize:false,
            formConfig: {
               //labelWidth: 120,
@@ -73,7 +73,7 @@
                fixed:'right'
             },
             beforeFetch: (params) => {
-              queryParam.regionType = '郊县'
+              queryParam.regionType = '乡镇'
               return Object.assign(params, queryParam);
             },
       },
diff --git a/src/views/base/heatsource/Heatsource.data.ts b/src/views/base/heatsource/Heatsource.data.ts
index ef21c7e..9a7396d 100644
--- a/src/views/base/heatsource/Heatsource.data.ts
+++ b/src/views/base/heatsource/Heatsource.data.ts
@@ -82,7 +82,7 @@ export const searchFormSchemaJx: FormSchema[] = [
     field: 'companyId',
     component: 'JSelectMultiple',
     componentProps:{
-      dictCode:"bl_thermalcompany,company_name,id,del_flag = '0' and region_type = '郊县'"
+      dictCode:"bl_thermalcompany,company_name,id,del_flag = '0' and region_type = '乡镇'"
     },
     //colProps: {span: 6},
   },
diff --git a/src/views/base/heatsource/HeatsourceListJx.vue b/src/views/base/heatsource/HeatsourceListJx.vue
index 7b4b767..524f053 100644
--- a/src/views/base/heatsource/HeatsourceListJx.vue
+++ b/src/views/base/heatsource/HeatsourceListJx.vue
@@ -74,7 +74,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       fixed: 'right'
     },
     beforeFetch: (params) => {
-      queryParam.regionType = '郊县'
+      queryParam.regionType = '乡镇'
       return Object.assign(params, queryParam);
     },
   },
diff --git a/src/views/base/simconfig/SimconfigListJx.vue b/src/views/base/simconfig/SimconfigListJx.vue
index 02c3898..91a7551 100644
--- a/src/views/base/simconfig/SimconfigListJx.vue
+++ b/src/views/base/simconfig/SimconfigListJx.vue
@@ -125,7 +125,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       fixed: 'right'
     },
     beforeFetch: (params) => {
-      queryParam.value.regionType = '郊县'
+      queryParam.value.regionType = '乡镇'
       return Object.assign(params, queryParam.value);
     },
   },
@@ -235,13 +235,13 @@ function searchReset() {
 
 const thermalcompany = ref();
 async function getThermalcompany() {
-  let params = {regionType:'郊县'};
+  let params = {regionType:'乡镇'};
   thermalcompany.value = await companylist(params);
 }
 
 const heatsource = ref();
 async function getHeatsource() {
-  let params = {regionType:'郊县'};
+  let params = {regionType:'乡镇'};
   heatsource.value = await heatsourcelist(params);
 }
 
@@ -251,7 +251,7 @@ async function getHeatsource() {
 // }
 
 async function handleChange1(record) {
-  let params = { companyCompanyId: record,regionType:'郊县' };
+  let params = { companyCompanyId: record,regionType:'乡镇' };
   heatsource.value = await heatsourcelist(params);
   // heatsourcestation.value = [];
   queryParam.value.sourceSourceId = '';
diff --git a/src/views/base/simconfig/components/SimconfigJxForm.vue b/src/views/base/simconfig/components/SimconfigJxForm.vue
index 4281b2e..403fd17 100644
--- a/src/views/base/simconfig/components/SimconfigJxForm.vue
+++ b/src/views/base/simconfig/components/SimconfigJxForm.vue
@@ -193,13 +193,13 @@
 
   const thermalcompany = ref();
   async function getThermalcompany(){
-    let params = {regionType:'郊县'};
+    let params = {regionType:'乡镇'};
     thermalcompany.value = await companylist(params);
   }
 
   const heatsource = ref();
   async function getHeatsource(){
-    let params = {regionType:'郊县'};
+    let params = {regionType:'乡镇'};
     heatsource.value = await heatsourcelist(params);
   }
 
diff --git a/src/views/base/waterFlowConfig/BlWaterFlowConfigListJx.vue b/src/views/base/waterFlowConfig/BlWaterFlowConfigListJx.vue
index 14300f2..80c69cc 100644
--- a/src/views/base/waterFlowConfig/BlWaterFlowConfigListJx.vue
+++ b/src/views/base/waterFlowConfig/BlWaterFlowConfigListJx.vue
@@ -13,13 +13,13 @@
             <a-col :lg="6">
               <a-form-item name="companyCompanyId">
                 <template #label><span title="供热公司">供热公司</span></template>
-                <j-dict-select-tag placeholder="请选择供热公司" v-model:value="queryParam.companyCompanyId" dictCode="bl_thermalcompany,company_name,id,del_flag = '0' and region_type = '郊县'" allow-clear />
+                <j-dict-select-tag placeholder="请选择供热公司" v-model:value="queryParam.companyCompanyId" dictCode="bl_thermalcompany,company_name,id,del_flag = '0' and region_type = '乡镇'" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :lg="6">
               <a-form-item name="sourceSourceId">
                 <template #label><span title="锅炉房">锅炉房</span></template>
-                <j-dict-select-tag placeholder="请选择锅炉房" v-model:value="queryParam.sourceSourceId" :dictCode="`bl_heatsource,source_name,id,del_flag = '0' and region_type = '郊县' and company_id = '${queryParam.companyCompanyId || -1}'`" allow-clear />
+                <j-dict-select-tag placeholder="请选择锅炉房" v-model:value="queryParam.sourceSourceId" :dictCode="`bl_heatsource,source_name,id,del_flag = '0' and region_type = '乡镇' and company_id = '${queryParam.companyCompanyId || -1}'`" allow-clear />
               </a-form-item>
             </a-col>
             <!-- <a-col :lg="6">
@@ -73,7 +73,7 @@
   import { JInput } from '/@/components/Form';
 
   const formRef = ref();
-  const queryParam = reactive<any>({regionType:'郊县'});
+  const queryParam = reactive<any>({regionType:'乡镇'});
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
   const userStore = useUserStore();
@@ -133,7 +133,7 @@
    */
   function handleAdd() {
     registerModal.value.disableSubmit = false;
-    registerModal.value.add({regionType:'郊县'});
+    registerModal.value.add({regionType:'乡镇'});
   }
 
   /**
diff --git a/src/views/dashboard/Analysis/index.vue b/src/views/dashboard/Analysis/index.vue
index 7d986b5..007162e 100644
--- a/src/views/dashboard/Analysis/index.vue
+++ b/src/views/dashboard/Analysis/index.vue
@@ -23,7 +23,7 @@
           <a-tab-pane key="city" tab="城区供回水温度">
             <div ref="cityChartRef" class="chart-large"></div>
           </a-tab-pane>
-          <a-tab-pane key="county" tab="郊县供回水温度">
+          <a-tab-pane key="county" tab="乡镇供回水温度">
             <div ref="countyChartRef" class="chart-large"></div>
           </a-tab-pane>
         </a-tabs>
@@ -33,13 +33,13 @@
       <a-row :gutter="20" class="third-row">
         <a-col :xs="24" :md="12">
           <a-card bordered class="mini-card">
-            <div class="mini-title">郊县瞬时热量【实时】</div>
+            <div class="mini-title">乡镇瞬时热量【实时】</div>
             <div ref="countyPowerChartRef" class="chart-medium"></div>
           </a-card>
         </a-col>
         <a-col :xs="24" :md="12">
           <a-card bordered class="mini-card" style="margin-left: 8px;">
-            <div class="mini-title">郊县瞬时流量【实时】</div>
+            <div class="mini-title">乡镇瞬时流量【实时】</div>
             <div ref="countyFlowChartRef" class="chart-medium"></div>
           </a-card>
         </a-col>
@@ -59,8 +59,8 @@ const activeTab = ref('city');
 const cards = ref([
   { label: '城区锅炉房数量', value: 0, note: '实时统计', color: 'linear-gradient(90deg,#5B8FF9,#2FC25B)' },
   { label: '城区换热站数量', value: 0, note: '实时统计', color: 'linear-gradient(90deg,#2FC25B,#FACC14)' },
-  { label: '郊县数量', value: 0, note: '实时统计', color: 'linear-gradient(90deg,#F04864,#9254DE)' },
-  { label: '郊县锅炉房数量', value: 0, note: '实时统计', color: 'linear-gradient(90deg,#9254DE,#5B8FF9)' }
+  { label: '乡镇数量', value: 0, note: '实时统计', color: 'linear-gradient(90deg,#F04864,#9254DE)' },
+  { label: '乡镇锅炉房数量', value: 0, note: '实时统计', color: 'linear-gradient(90deg,#9254DE,#5B8FF9)' }
 ]);
 
 /* ---- dom refs ---- */
@@ -95,7 +95,7 @@ function sortByTime(arr: any[]) {
 }
 function splitByRegion(data: any[]) {
   const city = data.filter(d => String(d.regionType).includes('城区'));
-  const county = data.filter(d => String(d.regionType).includes('郊县'));
+  const county = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city), county: sortByTime(county) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -129,7 +129,7 @@ function prepareOptions(records: any[]) {
   const countySW = county.map((r: any) => safeNum(r.view035));
   const countyHW = county.map((r: any) => safeNum(r.view036));
   countyOption = {
-    title: { text: '郊县供/回水温度【实时】', left: 'center', top: 10 },
+    title: { text: '乡镇供/回水温度【实时】', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
@@ -240,8 +240,8 @@ async function loadData() {
     cards.value = [
       { label: '城区锅炉房数量', value: s?.cqglfsl ?? 0, note: '实时统计', color: 'linear-gradient(90deg,#5B8FF9,#2FC25B)' },
       { label: '城区换热站数量', value: s?.cqhrzsl ?? 0, note: '实时统计', color: 'linear-gradient(90deg,#2FC25B,#FACC14)' },
-      { label: '郊县数量', value: s?.jxsl ?? 0, note: '实时统计', color: 'linear-gradient(90deg,#F04864,#9254DE)' },
-      { label: '郊县锅炉房数量', value: s?.jxglfsl ?? 0, note: '实时统计', color: 'linear-gradient(90deg,#9254DE,#5B8FF9)' }
+      { label: '乡镇数量', value: s?.jxsl ?? 0, note: '实时统计', color: 'linear-gradient(90deg,#F04864,#9254DE)' },
+      { label: '乡镇锅炉房数量', value: s?.jxglfsl ?? 0, note: '实时统计', color: 'linear-gradient(90deg,#9254DE,#5B8FF9)' }
     ];
 
     // 2. 获取图表数据
diff --git a/src/views/heating/gwrljc/HeatanalysisListJx.vue b/src/views/heating/gwrljc/HeatanalysisListJx.vue
index 49e4db5..8856926 100644
--- a/src/views/heating/gwrljc/HeatanalysisListJx.vue
+++ b/src/views/heating/gwrljc/HeatanalysisListJx.vue
@@ -106,7 +106,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       fullScreen: false,
     },
     beforeFetch: (params) => {
-      queryParam.value.regionType = '郊县'
+      queryParam.value.regionType = '乡镇'
       params.column = '', params.order = '';//新生成的默认不带排序
       return Object.assign(params, queryParam.value);
     },
diff --git a/src/views/heating/heatanalysis/HeatanalysisListJx.vue b/src/views/heating/heatanalysis/HeatanalysisListJx.vue
index 239a156..523ca32 100644
--- a/src/views/heating/heatanalysis/HeatanalysisListJx.vue
+++ b/src/views/heating/heatanalysis/HeatanalysisListJx.vue
@@ -118,7 +118,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       fullScreen: false,
     },
     beforeFetch: (params) => {
-      queryParam.value.regionType = '郊县'
+      queryParam.value.regionType = '乡镇'
       params.column = '', params.order = '';//新生成的默认不带排序
       return Object.assign(params, queryParam.value);
     },
@@ -162,13 +162,13 @@ function searchReset() {
 
 const thermalcompany = ref();
 async function getThermalcompany() {
-  let params = { regionType: '郊县' };
+  let params = { regionType: '乡镇' };
   thermalcompany.value = await companylist(params);
 }
 
 const heatsource = ref();
 async function getHeatsource() {
-  let params = { regionType: '郊县' };
+  let params = { regionType: '乡镇' };
   heatsource.value = await heatsourcelist(params);
 }
 
@@ -178,7 +178,7 @@ async function getHeatsource() {
 // }
 
 async function handleChange1(record) {
-  var params = { companyId: record, regionType: '郊县' };
+  var params = { companyId: record, regionType: '乡镇' };
   heatsource.value = await heatsourcelist(params);
   // heatsourcestation.value = [];
 }
diff --git a/src/views/heating/heatanalysis/components/HeatanalysisModal.vue b/src/views/heating/heatanalysis/components/HeatanalysisModal.vue
index 0275064..0051eae 100644
--- a/src/views/heating/heatanalysis/components/HeatanalysisModal.vue
+++ b/src/views/heating/heatanalysis/components/HeatanalysisModal.vue
@@ -9,7 +9,7 @@
     @cancel="handleCqzxtCancel" :okButtonProps="{ class: { 'jee-hidden': true } }" cancelText="关闭">
     <ZxtCQ ref="cqzxtRef"></ZxtCQ>
   </a-modal>
-  <!-- 郊县折线图 -->
+  <!-- 乡镇折线图 -->
   <a-modal title="详情" width="100vw" wrap-class-name="full-modal" v-if="jxzxtVisible" :visible="jxzxtVisible"
     @cancel="handleJxzxtCancel" :okButtonProps="{ class: { 'jee-hidden': true } }" cancelText="关闭">
     <ZxtJX ref="jxzxtRef"></ZxtJX>
diff --git a/src/views/heating/heatanalysis/components/ZxtJX.vue b/src/views/heating/heatanalysis/components/ZxtJX.vue
index cbc621b..dab1f1f 100644
--- a/src/views/heating/heatanalysis/components/ZxtJX.vue
+++ b/src/views/heating/heatanalysis/components/ZxtJX.vue
@@ -176,7 +176,7 @@ function init(record_: any) {
   const params = {
     pageNo: 1,
     pageSize: -1,
-    regionType: '郊县',
+    regionType: '乡镇',
     view001: record_.view001,
     view002: record_.view002,
     view004: -1,
diff --git a/src/views/heating/history/HeatanalysisHistoryListJx.vue b/src/views/heating/history/HeatanalysisHistoryListJx.vue
index d1be0ac..14e5aaa 100644
--- a/src/views/heating/history/HeatanalysisHistoryListJx.vue
+++ b/src/views/heating/history/HeatanalysisHistoryListJx.vue
@@ -102,7 +102,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       fullScreen: false,
     },
     beforeFetch: (params) => {
-      queryParam.value.regionType = '郊县'
+      queryParam.value.regionType = '乡镇'
       params.column = '', params.order = '';//新生成的默认不带排序
       return Object.assign(params, queryParam.value);
     },
diff --git a/src/views/heating/report/HeatanalysisListJx.vue b/src/views/heating/report/HeatanalysisListJx.vue
index 5dfce5e..181526a 100644
--- a/src/views/heating/report/HeatanalysisListJx.vue
+++ b/src/views/heating/report/HeatanalysisListJx.vue
@@ -150,7 +150,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       fullScreen: false,
     },
     beforeFetch: (params) => {
-      queryParam.value.regionType = '郊县'
+      queryParam.value.regionType = '乡镇'
       params.column = '', params.order = '';//新生成的默认不带排序
       return Object.assign(params, queryParam.value);
     },
diff --git a/src/views/heating/yunwei/index.vue b/src/views/heating/yunwei/index.vue
index 2aadc9d..cb6b74a 100644
--- a/src/views/heating/yunwei/index.vue
+++ b/src/views/heating/yunwei/index.vue
@@ -38,7 +38,7 @@
               <a-select ref="select" placeholder="请选择换区域" v-model:value="queryParam.regionType">
                 <a-select-option value="">全部</a-select-option>
                 <a-select-option value="城区">城区</a-select-option>
-                <a-select-option value="郊县">郊县</a-select-option>
+                <a-select-option value="乡镇">乡镇</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
diff --git a/src/views/screen/Dashboard.vue b/src/views/screen/Dashboard.vue
index 152c83a..09fad60 100644
--- a/src/views/screen/Dashboard.vue
+++ b/src/views/screen/Dashboard.vue
@@ -110,14 +110,14 @@
           </div>
           <div class="right-text">
             <div class="top-text-3">{{ jxsl }}</div>
-            <div class="bottom-text-3">郊县总数</div>
+            <div class="bottom-text-3">乡镇总数</div>
           </div>
-          <div class="left-img" style="cursor: pointer;" @click="openModal(2, '郊县锅炉房')">
+          <div class="left-img" style="cursor: pointer;" @click="openModal(2, '乡镇锅炉房')">
             <img src="./dashboard/dp_icon1.png" />
           </div>
-          <div class="right-text" style="cursor: pointer;" @click="openModal(2, '郊县锅炉房')">
+          <div class="right-text" style="cursor: pointer;" @click="openModal(2, '乡镇锅炉房')">
             <div class="top-text-4">{{ jxglfsl }}</div>
-            <div class="bottom-text-4">郊县锅炉房总数</div>
+            <div class="bottom-text-4">乡镇锅炉房总数</div>
           </div>
         </div>
         <div class="middle">
@@ -125,7 +125,7 @@
             <div class="area-header">
               <div class="header-left">
                 <img src="./dashboard/dp_icon4.png" alt="icon" />
-                <span class="header-left-text">郊县瞬时热量【实时】</span>
+                <span class="header-left-text">乡镇瞬时热量【实时】</span>
               </div>
             </div>
             <div class="area-body"></div>
@@ -134,7 +134,7 @@
             <div class="area-header">
               <div class="header-left">
                 <img src="./dashboard/dp_icon4.png" alt="icon" />
-                <span class="header-left-text">郊县瞬时流量【实时】</span>
+                <span class="header-left-text">乡镇瞬时流量【实时】</span>
               </div>
             </div>
             <div class=" area-body"></div>
@@ -144,7 +144,7 @@
           <div class="area-header">
             <div class="header-left">
               <img src="./dashboard/dp_icon4.png" alt="icon" />
-              <span class="header-left-text">郊县供回水温度【实时】</span>
+              <span class="header-left-text">乡镇供回水温度【实时】</span>
             </div>
             <div class="header-right" style="display: flex; ">
               <div class="header-right">
@@ -443,7 +443,7 @@ function updateChartLine() {
   }, true);
 }
 
-// area-6 郊县柱状图
+// area-6 乡镇柱状图
 function updateChartCounty() {
   if (!chartCounty) return;
 
diff --git a/src/views/screen/components/HeatanalysisList.vue b/src/views/screen/components/HeatanalysisList.vue
index f3bea73..8f0dc1c 100644
--- a/src/views/screen/components/HeatanalysisList.vue
+++ b/src/views/screen/components/HeatanalysisList.vue
@@ -19,13 +19,13 @@
         <tr v-for="(item,index) in list" :key="item.id" :class="index%2==0?'data-list-data-screen':'data-list-data3-screen'">
           <td class="tabulation-screen">{{ item.view004Name!=null?item.view004Name:item.view002Name }}</td>
           <td v-if="item.regionType=='城区'" style="width:20%; text-align: center;">{{ item.datatime }}</td>
-          <td v-if="item.regionType=='郊县'" style="width:20%; text-align: center;">{{ item.view032 }}</td>
+          <td v-if="item.regionType=='乡镇'" style="width:20%; text-align: center;">{{ item.view032 }}</td>
           <td v-if="item.regionType=='城区'&&item.view004==null" style="width:10%; text-align: center;">{{ item.view005 }}</td>
           <td v-if="item.regionType=='城区'&&item.view004==null" style="width:10%; text-align: center;">{{ item.view006 }}</td>
           <td v-if="item.regionType=='城区'&&item.view004!=null" style="width:10%; text-align: center;">{{ item.view009 }}</td>
           <td v-if="item.regionType=='城区'&&item.view004!=null" style="width:10%; text-align: center;">{{ item.view010 }}</td>
-          <td v-if="item.regionType=='郊县'" style="width:10%; text-align: center;">{{ item.view035 }}</td>
-          <td v-if="item.regionType=='郊县'" style="width:10%; text-align: center;">{{ item.view036 }}</td>
+          <td v-if="item.regionType=='乡镇'" style="width:10%; text-align: center;">{{ item.view035 }}</td>
+          <td v-if="item.regionType=='乡镇'" style="width:10%; text-align: center;">{{ item.view036 }}</td>
         </tr>
         </tbody>
       </table>
diff --git a/src/views/screen/components/ZxtJX.vue b/src/views/screen/components/ZxtJX.vue
index 039ee9c..db17acf 100644
--- a/src/views/screen/components/ZxtJX.vue
+++ b/src/views/screen/components/ZxtJX.vue
@@ -198,7 +198,7 @@ function init(record_: any) {
   const params = {
     pageNo: 1,
     pageSize: -1,
-    regionType: '郊县',
+    regionType: '乡镇',
     view001: record_.view001,
     view002: record_.view002,
     startDate: formatDateTime(start),
diff --git a/src/views/screen/screen.vue b/src/views/screen/screen.vue
index 420dde1..7a4ba2c 100644
--- a/src/views/screen/screen.vue
+++ b/src/views/screen/screen.vue
@@ -92,7 +92,7 @@ async function getHistoryList(){
       value1 = Number(list[i].view005);
       value2 = Number(list[i].view006);
     }
-    if(list[i].regionType =='郊县'){
+    if(list[i].regionType =='乡镇'){
       value1 = Number(list[i].view035);
       value2 = Number(list[i].view036);
     }
diff --git a/src/views/staticList/GlfghsjxList.vue b/src/views/staticList/GlfghsjxList.vue
index 80faba4..5b1ed6c 100644
--- a/src/views/staticList/GlfghsjxList.vue
+++ b/src/views/staticList/GlfghsjxList.vue
@@ -29,7 +29,7 @@ function sortByTime(arr: any[]) {
 }
 
 function splitByRegion(data: any[]) {
-  const city = data.filter(d => String(d.regionType).includes('郊县'));
+  const city = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -49,7 +49,7 @@ function prepareOptions(records: any[]) {
   const citySW = city.map((r: any) => safeNum(r.view035));
   const cityHW = city.map((r: any) => safeNum(r.view036));
   cityOption = {
-    title: { text: '郊县锅炉房供/回水温度', left: 'center', top: 10 },
+    title: { text: '乡镇锅炉房供/回水温度', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
diff --git a/src/views/staticList/GlfghsjxListHistory.vue b/src/views/staticList/GlfghsjxListHistory.vue
index 88f8f65..e6f6283 100644
--- a/src/views/staticList/GlfghsjxListHistory.vue
+++ b/src/views/staticList/GlfghsjxListHistory.vue
@@ -51,14 +51,14 @@ function sortByTime(arr: any[]) {
 
 const heatsource = ref();
 async function getHeatsource(){
-  heatsource.value = await heatsourcelist({regionType: '郊县'});
+  heatsource.value = await heatsourcelist({regionType: '乡镇'});
 }
 
 async function handleChange(){
   loadData();
 }
 function splitByRegion(data: any[]) {
-  const city = data.filter(d => String(d.regionType).includes('郊县'));
+  const city = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -75,7 +75,7 @@ function prepareOptions(records: any[]) {
   const citySW = city.map((r: any) => safeNum(r.view005));
   const cityHW = city.map((r: any) => safeNum(r.view006));
   cityOption = {
-    title: { text: '郊县锅炉房历史供/回水温度', left: 'center', top: 10 },
+    title: { text: '乡镇锅炉房历史供/回水温度', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
diff --git a/src/views/staticList/GlfrlljxList.vue b/src/views/staticList/GlfrlljxList.vue
index abc5019..a6b4213 100644
--- a/src/views/staticList/GlfrlljxList.vue
+++ b/src/views/staticList/GlfrlljxList.vue
@@ -29,7 +29,7 @@ function sortByTime(arr: any[]) {
 }
 
 function splitByRegion(data: any[]) {
-  const city = data.filter(d => String(d.regionType).includes('郊县'));
+  const city = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -48,7 +48,7 @@ function prepareOptions(records: any[]) {
   console.log("🚀 ~ prepareOptions ~ cityX:", cityX)
   const citySW = city.map((r: any) => safeNum(r.view037));
   cityOption = {
-    title: { text: '郊县锅炉房热流量', left: 'center', top: 10 },
+    title: { text: '乡镇锅炉房热流量', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
diff --git a/src/views/staticList/GlfrlljxListHistory.vue b/src/views/staticList/GlfrlljxListHistory.vue
index a4353f7..1be109d 100644
--- a/src/views/staticList/GlfrlljxListHistory.vue
+++ b/src/views/staticList/GlfrlljxListHistory.vue
@@ -51,14 +51,14 @@ function sortByTime(arr: any[]) {
 
 const heatsource = ref();
 async function getHeatsource(){
-  heatsource.value = await heatsourcelist({regionType: '郊县'});
+  heatsource.value = await heatsourcelist({regionType: '乡镇'});
 }
 
 async function handleChange(){
   loadData();
 }
 function splitByRegion(data: any[]) {
-  const city = data.filter(d => String(d.regionType).includes('郊县'));
+  const city = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -74,7 +74,7 @@ function prepareOptions(records: any[]) {
   const cityX = buildXAxis(city, 'datatime');
   const citySW = city.map((r: any) => safeNum(r.view037));
   cityOption = {
-    title: { text: '郊县锅炉房历史热流量', left: 'center', top: 10 },
+    title: { text: '乡镇锅炉房历史热流量', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
diff --git a/src/views/staticList/GlfslljxList.vue b/src/views/staticList/GlfslljxList.vue
index fe878c4..133293a 100644
--- a/src/views/staticList/GlfslljxList.vue
+++ b/src/views/staticList/GlfslljxList.vue
@@ -29,7 +29,7 @@ function sortByTime(arr: any[]) {
 }
 
 function splitByRegion(data: any[]) {
-  const city = data.filter(d => String(d.regionType).includes('郊县'));
+  const city = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -48,7 +48,7 @@ function prepareOptions(records: any[]) {
   console.log("🚀 ~ prepareOptions ~ cityX:", cityX)
   const citySW = city.map((r: any) => safeNum(r.view041));
   cityOption = {
-    title: { text: '郊县锅炉房水流量', left: 'center', top: 10 },
+    title: { text: '乡镇锅炉房水流量', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
diff --git a/src/views/staticList/GlfslljxListHistory.vue b/src/views/staticList/GlfslljxListHistory.vue
index e1baac4..4ebe8bb 100644
--- a/src/views/staticList/GlfslljxListHistory.vue
+++ b/src/views/staticList/GlfslljxListHistory.vue
@@ -51,14 +51,14 @@ function sortByTime(arr: any[]) {
 
 const heatsource = ref();
 async function getHeatsource(){
-  heatsource.value = await heatsourcelist({regionType: '郊县'});
+  heatsource.value = await heatsourcelist({regionType: '乡镇'});
 }
 
 async function handleChange(){
   loadData();
 }
 function splitByRegion(data: any[]) {
-  const city = data.filter(d => String(d.regionType).includes('郊县'));
+  const city = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -74,7 +74,7 @@ function prepareOptions(records: any[]) {
   const cityX = buildXAxis(city, 'datatime');
   const citySW = city.map((r: any) => safeNum(r.view037));
   cityOption = {
-    title: { text: '郊县锅炉房历史水流量', left: 'center', top: 10 },
+    title: { text: '乡镇锅炉房历史水流量', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
diff --git a/src/views/staticList/GlfyljxList.vue b/src/views/staticList/GlfyljxList.vue
index ff1b81e..2b83ec2 100644
--- a/src/views/staticList/GlfyljxList.vue
+++ b/src/views/staticList/GlfyljxList.vue
@@ -29,7 +29,7 @@ function sortByTime(arr: any[]) {
 }
 
 function splitByRegion(data: any[]) {
-  const city = data.filter(d => String(d.regionType).includes('郊县'));
+  const city = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -49,7 +49,7 @@ function prepareOptions(records: any[]) {
   const citySW = city.map((r: any) => safeNum(r.view007));
   const cityHW = city.map((r: any) => safeNum(r.view008));
   cityOption = {
-    title: { text: '郊县锅炉房供/回水压力', left: 'center', top: 10 },
+    title: { text: '乡镇锅炉房供/回水压力', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
diff --git a/src/views/staticList/GlfyljxListHistory.vue b/src/views/staticList/GlfyljxListHistory.vue
index 3a66c53..819099a 100644
--- a/src/views/staticList/GlfyljxListHistory.vue
+++ b/src/views/staticList/GlfyljxListHistory.vue
@@ -51,14 +51,14 @@ function sortByTime(arr: any[]) {
 
 const heatsource = ref();
 async function getHeatsource(){
-  heatsource.value = await heatsourcelist({regionType: '郊县'});
+  heatsource.value = await heatsourcelist({regionType: '乡镇'});
 }
 
 async function handleChange(){
   loadData();
 }
 function splitByRegion(data: any[]) {
-  const city = data.filter(d => String(d.regionType).includes('郊县'));
+  const city = data.filter(d => String(d.regionType).includes('乡镇'));
   return { city: sortByTime(city) };
 }
 function buildXAxis(records: any[], key = 'view028') {
@@ -75,7 +75,7 @@ function prepareOptions(records: any[]) {
   const citySW = city.map((r: any) => safeNum(r.view007));
   const cityHW = city.map((r: any) => safeNum(r.view008));
   cityOption = {
-    title: { text: '郊县锅炉房历史供/回水压力', left: 'center', top: 10 },
+    title: { text: '乡镇锅炉房历史供/回水压力', left: 'center', top: 10 },
     tooltip: { trigger: 'axis' },
     legend: { top: 36, left: 'center' },
     grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true },
diff --git a/src/views/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue
index 281df82..46ef334 100644
--- a/src/views/system/loginmini/MiniLogin.vue
+++ b/src/views/system/loginmini/MiniLogin.vue
@@ -24,6 +24,9 @@
           </div>
           <div class="reg-bar">
           </div>
+          <div hidden>
+            {{randCodeData}}
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/views/temperature/app/index.vue b/src/views/temperature/app/index.vue
index 7f1489f..be74660 100644
--- a/src/views/temperature/app/index.vue
+++ b/src/views/temperature/app/index.vue
@@ -89,7 +89,7 @@ onMounted(() => {
 <style lang="less" scoped>
 @font-face {
   font-family: "DS-Digital";//这个是定义字体的名称
-  src: url("@/assets/fonts/DS-DIGII-3.ttf");
+  //  src: url("@/assets/fonts/DS-DIGII-3.ttf");
 }
 .fontTime{
   background: linear-gradient(to right, #47f0ff, #0899ff);
@@ -115,7 +115,7 @@ onMounted(() => {
   background: #2e303e;
 }
 .bgheader{
-  background: url("@/assets/images/background_app.png") no-repeat;
+  // background: url("@/assets/images/background_app.png") no-repeat;
   background-size: 100% 100%;
   //background: #2e303e;
 }
diff --git a/src/views/temperature/report/TemperatureList.vue b/src/views/temperature/report/TemperatureList.vue
index a133c99..5f79fce 100644
--- a/src/views/temperature/report/TemperatureList.vue
+++ b/src/views/temperature/report/TemperatureList.vue
@@ -215,10 +215,10 @@ onMounted(() => {
 
 <style lang="less" scoped>
 @import '/@/assets/loginmini/style/screen.less';
-@font-face {
-  font-family: "DS-Digital";//这个是定义字体的名称
-  src: url("@/assets/fonts/DS-DIGII-3.ttf");
-}
+// @font-face {
+//   font-family: "DS-Digital";//这个是定义字体的名称
+//   src: url("@/assets/fonts/DS-DIGII-3.ttf");
+// }
 .fontTime{
   background: linear-gradient(to right, #47f0ff, #0899ff);
   -webkit-background-clip: text;