名称和权限优化

src/views/analysisrule/AnalysisRule.data.ts

@@ -21,7 +21,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'remarks'
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'companyId_dictText'
   },
@@ -70,7 +70,7 @@ export const columnsJx: BasicColumn[] = [
     dataIndex: 'remarks'
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'companyId_dictText'
   },
@@ -105,7 +105,7 @@ export const superQuerySchema = {
   sim: {title: '卡号',order: 0,view: 'text', type: 'string',},
   code: {title: '规则代码 1 2 3 4 5 ',order: 1,view: 'text', type: 'string',},
   remarks: {title: '规则描述 1:0141规则码 2:31字节长度 3:73字节长度 4:26字节长度 5:不解析',order: 2,view: 'text', type: 'string',},
-  companyId: {title: '热力公司ID',order: 3,view: 'number', type: 'number',dictTable: "bl_thermalcompany", dictCode: 'id', dictText: 'company_name',},
+  companyId: {title: '供热公司ID',order: 3,view: 'number', type: 'number',dictTable: "bl_thermalcompany", dictCode: 'id', dictText: 'company_name',},
   sourceId: {title: '锅炉房ID',order: 4,view: 'number', type: 'number',dictTable: "bl_heatsource", dictCode: 'id', dictText: 'source_name',},
   stationId: {title: '换热站ID',order: 5,view: 'number', type: 'number',dictTable: "bl_heatsourcestation", dictCode: 'id', dictText: 'station_name',},
   createDate: {title: '创建时间',order: 6,view: 'date', type: 'string',},

src/views/analysisrule/AnalysisRuleList.vue

@@ -5,27 +5,27 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
         :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="sim">
               <template #label><span title="电话号">电话号</span></template>
               <JInput v-model:value="queryParam.sim" placeholder="请输入电话号" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="companyId">
-              <template #label><span title="热力公司">热力公司</span></template>
+              <template #label><span title="供热公司">公司</span></template>
-              <j-dict-select-tag placeholder="请选择热力公司" v-model:value="queryParam.companyId"
+              <j-dict-select-tag placeholder="请选择供热公司" v-model:value="queryParam.companyId"
-                dictCode="bl_thermalcompany,company_name,id" allow-clear />
+                :dictCode="`bl_thermalcompany,company_name,id,region_type = '${queryParam.regionType}'`" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="sourceId">
               <template #label><span title="锅炉房">锅炉房</span></template>
               <j-dict-select-tag placeholder="请选择锅炉房" v-model:value="queryParam.sourceId"
                 :dictCode="`bl_heatsource,source_name,id ,company_id = '${queryParam.companyId || -1}' `" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="stationId">
               <template #label><span title="换热站">换热站</span></template>
               <j-dict-select-tag placeholder="请选择换热站" v-model:value="queryParam.stationId"
@@ -33,7 +33,7 @@
                 allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :lg="4">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
@@ -133,7 +133,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     canResize: false,
     useSearchForm: false,
     actionColumn: {
-      width: 120,
+      width: 140,
       fixed: 'right',
     },
     beforeFetch: async (params) => {
@@ -229,6 +229,19 @@ function getTableAction(record) {
     {
       label: '详情',
       onClick: handleDetail.bind(null, record),
+    },
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+      auth: 'analysisrule:bl_analysis_rule:edit'
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
+      },
+      auth: 'analysisrule:bl_analysis_rule:delete'
     }
   ];
 }

src/views/analysisrule/AnalysisRuleListJx.vue

@@ -5,35 +5,35 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
         :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="sim">
               <template #label><span title="电话号">电话号</span></template>
               <JInput v-model:value="queryParam.sim" placeholder="请输入电话号" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="companyId">
-              <template #label><span title="热力公司">热力公司</span></template>
+              <template #label><span title="供热公司">公司</span></template>
-              <j-dict-select-tag placeholder="请选择热力公司" v-model:value="queryParam.companyId"
+              <j-dict-select-tag placeholder="请选择供热公司" v-model:value="queryParam.companyId"
-                dictCode="bl_thermalcompany,company_name,id" allow-clear />
+                                 :dictCode="`bl_thermalcompany,company_name,id,region_type = '${queryParam.regionType}'`" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="sourceId">
               <template #label><span title="锅炉房">锅炉房</span></template>
               <j-dict-select-tag placeholder="请选择锅炉房" v-model:value="queryParam.sourceId"
                 :dictCode="`bl_heatsource,source_name,id ,company_id = '${queryParam.companyId || -1}' `" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+<!--          <a-col :lg="5">-->
-            <a-form-item name="stationId">
+<!--            <a-form-item name="stationId">-->
-              <template #label><span title="换热站">换热站</span></template>
+<!--              <template #label><span title="换热站">换热站</span></template>-->
-              <j-dict-select-tag placeholder="请选择换热站" v-model:value="queryParam.stationId"
+<!--              <j-dict-select-tag placeholder="请选择换热站" v-model:value="queryParam.stationId"-->
-                :dictCode="`bl_heatsourcestation,station_name,id,source_id = '${queryParam.sourceId || -1}' `"
+<!--                :dictCode="`bl_heatsourcestation,station_name,id,source_id = '${queryParam.sourceId || -1}' `"-->
-                allow-clear />
+<!--                allow-clear />-->
-            </a-form-item>
+<!--            </a-form-item>-->
-          </a-col>
+<!--          </a-col>-->
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :lg="4">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
@@ -133,7 +133,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     canResize: false,
     useSearchForm: false,
     actionColumn: {
-      width: 120,
+      width: 140,
       fixed: 'right',
     },
     beforeFetch: async (params) => {
@@ -229,6 +229,19 @@ function getTableAction(record) {
     {
       label: '详情',
       onClick: handleDetail.bind(null, record),
+    },
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+      auth: 'analysisrule:bl_analysis_rule:edit'
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
+      },
+      auth: 'analysisrule:bl_analysis_rule:delete'
     }
   ];
 }

src/views/analysisrule/components/AnalysisRuleForm.vue

@@ -21,9 +21,9 @@
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="热力公司" v-bind="validateInfos.companyId" id="AnalysisRuleForm-companyId"
+              <a-form-item label="供热公司" v-bind="validateInfos.companyId" id="AnalysisRuleForm-companyId"
                 name="companyId">
-                <j-dict-select-tag v-model:value="formData.companyId" :dictCode="`bl_thermalcompany,company_name,id,region_type = '${formData.regionType}'`" placeholder="请选择热力公司"  allow-clear />
+                <j-dict-select-tag v-model:value="formData.companyId" :dictCode="`bl_thermalcompany,company_name,id,region_type = '${formData.regionType}'`" placeholder="请选择供热公司"  allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="24">

src/views/base/company/ThermalcompanyList.vue

@@ -50,7 +50,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '热力公司',
+           title: '供热公司',
            api: list,
            defSort: {
              column: 'id',
@@ -69,7 +69,7 @@
               ],
             },
            actionColumn: {
-               width: 120,
+               width: 140,
                fixed:'right'
             },
             beforeFetch: (params) => {
@@ -78,7 +78,7 @@
             },
       },
        exportConfig: {
-            name:"热力公司",
+            name:"供热公司",
             url: getExportUrl,
             params: queryParam,
           },
@@ -134,6 +134,10 @@
       */
   function getTableAction(record){
      return [
+       {
+         label: '详情',
+         onClick: handleDetail.bind(null, record),
+       },
        {
          label: '编辑',
          onClick: handleEdit.bind(null, record),

src/views/base/company/ThermalcompanyListJx.vue

@@ -50,7 +50,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '热力公司',
+           title: '供热公司',
            api: list,
            defSort: {
               column: 'id',
@@ -69,7 +69,7 @@
               ],
             },
            actionColumn: {
-               width: 120,
+               width: 140,
                fixed:'right'
             },
             beforeFetch: (params) => {
@@ -78,7 +78,7 @@
             },
       },
        exportConfig: {
-            name:"热力公司",
+            name:"供热公司",
             url: getExportUrl,
             params: queryParam,
           },
@@ -134,6 +134,10 @@
       */
   function getTableAction(record){
      return [
+       {
+         label: '详情',
+         onClick: handleDetail.bind(null, record),
+       },
        {
          label: '编辑',
          onClick: handleEdit.bind(null, record),

src/views/base/company/components/ThermalcompanyForm.vue

@@ -75,8 +75,8 @@
               </a-form-item>
             </a-col>
 <!--            <a-col :span="24">
-              <a-form-item label="拥有热源" v-bind="validateInfos.heatSource" id="ThermalcompanyForm-heatSource" name="heatSource">
+              <a-form-item label="拥有锅炉房" v-bind="validateInfos.heatSource" id="ThermalcompanyForm-heatSource" name="heatSource">
-                <a-input-number v-model:value="formData.heatSource" placeholder="请输入拥有热源" style="width: 100%" />
+                <a-input-number v-model:value="formData.heatSource" placeholder="请输入拥有锅炉房" style="width: 100%" />
               </a-form-item>
             </a-col>
             <a-col :span="24">

src/views/base/heatsource/Heatsource.data.ts

@@ -11,7 +11,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'id'
   },
   {
-    title: '热源名称',
+    title: '锅炉房名称',
     align:"center",
     dataIndex: 'sourceName'
   },
@@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'sourcePhone'
   },
   {
-    title: '热源类型',
+    title: '锅炉房类型',
     align:"center",
     dataIndex: 'sourceType_dictText'
   },
@@ -59,7 +59,7 @@ export const searchFormSchema: FormSchema[] = [
       //colProps: {span: 6},
  	},
 	{
-      label: "热力公司",
+      label: "供热公司",
       field: 'companyId',
       component: 'JSelectMultiple',
       componentProps:{
@@ -78,7 +78,7 @@ export const searchFormSchemaJx: FormSchema[] = [
     //colProps: {span: 6},
   },
   {
-    label: "热力公司",
+    label: "供热公司",
     field: 'companyId',
     component: 'JSelectMultiple',
     componentProps:{

src/views/base/heatsource/HeatsourceList.vue

@@ -70,7 +70,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       ],
     },
     actionColumn: {
-      width: 120,
+      width: 140,
       fixed: 'right'
     },
     beforeFetch: (params) => {
@@ -135,6 +135,10 @@ function handleSuccess() {
    */
 function getTableAction(record) {
   return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    },
     {
       label: '编辑',
       onClick: handleEdit.bind(null, record),

src/views/base/heatsource/HeatsourceListJx.vue

@@ -70,7 +70,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       ],
     },
     actionColumn: {
-      width: 120,
+      width: 140,
       fixed: 'right'
     },
     beforeFetch: (params) => {
@@ -135,6 +135,10 @@ function handleSuccess() {
    */
 function getTableAction(record) {
   return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    },
     {
       label: '编辑',
       onClick: handleEdit.bind(null, record),

src/views/base/heatsource/components/HeatsourceForm.vue

@@ -5,8 +5,8 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="HeatsourceForm">
           <a-row>
             <a-col :span="12">
-              <a-form-item label="热源名称" v-bind="validateInfos.sourceName" id="HeatsourceForm-sourceName" name="sourceName">
+              <a-form-item label="锅炉房名称" v-bind="validateInfos.sourceName" id="HeatsourceForm-sourceName" name="sourceName">
-                <a-input v-model:value="formData.sourceName" placeholder="请输入热源名称"  allow-clear ></a-input>
+                <a-input v-model:value="formData.sourceName" placeholder="请输入锅炉房名称"  allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -25,8 +25,8 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="热源类型" v-bind="validateInfos.sourceType" id="HeatsourceForm-sourceType" name="sourceType">
+              <a-form-item label="锅炉房类型" v-bind="validateInfos.sourceType" id="HeatsourceForm-sourceType" name="sourceType">
-                <j-dict-select-tag v-model:value="formData.sourceType" dictCode="h_source_type" placeholder="请选择热源类型"  allow-clear />
+                <j-dict-select-tag v-model:value="formData.sourceType" dictCode="h_source_type" placeholder="请选择锅炉房类型"  allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -214,7 +214,7 @@
   const validatorRules = reactive({
     dutyPeople: [{ required: true, message: '请输入联系人!'},],
     setupTime: [{ required: true, message: '请输入建设时间!'},],
-    sourceName: [{ required: true, message: '请输入热源名称!'},],
+    sourceName: [{ required: true, message: '请输入锅炉房名称!'},],
     sourcePhone: [{ required: true, message: '请输入联系电话!'},],
     companyId: [{ required: true, message: '请输入公司!'},],
     boilerType: [{ required: true, message: '请输入锅炉类型!'},],

src/views/base/simconfig/Simconfig.data.ts

@@ -18,7 +18,7 @@ export const columns: BasicColumn[] = [
     width: 120
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align:"center",
     dataIndex: 'companyCompanyId_dictText'
   },
@@ -66,7 +66,7 @@ export const columnsJx: BasicColumn[] = [
     width: 120
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align:"center",
     dataIndex: 'companyCompanyId_dictText'
   },

src/views/base/simconfig/SimconfigList.vue

@@ -15,8 +15,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="4">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
-              <a-select ref="select" placeholder="请选择热力公司" v-model:value="queryParam.companyCompanyId"
+              <a-select ref="select" placeholder="请选择供热公司" v-model:value="queryParam.companyCompanyId"
                 style="width: 150px" @focus="focus" @change="handleChange1">
                 <a-select-option :value="item.companyId" v-for="item in thermalcompany"
                   :key="item.id">{{ item.companyName }}</a-select-option>
@@ -122,7 +122,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       ],
     },
     actionColumn: {
-      width: 120,
+      width: 140,
       fixed: 'right'
     },
     beforeFetch: (params) => {
@@ -194,6 +194,10 @@ function handleSuccess() {
    */
 function getTableAction(record) {
   return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    },
     {
       label: '编辑',
       onClick: handleEdit.bind(null, record),

src/views/base/simconfig/SimconfigListJx.vue

@@ -15,8 +15,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="4">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
-              <a-select ref="select" placeholder="请选择热力公司" v-model:value="queryParam.companyCompanyId"
+              <a-select ref="select" placeholder="请选择供热公司" v-model:value="queryParam.companyCompanyId"
                 style="width: 150px" @focus="focus" @change="handleChange1">
                 <a-select-option :value="item.companyId" v-for="item in thermalcompany"
                   :key="item.id">{{ item.companyName }}</a-select-option>
@@ -121,7 +121,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       ],
     },
     actionColumn: {
-      width: 120,
+      width: 140,
       fixed: 'right'
     },
     beforeFetch: (params) => {
@@ -193,6 +193,10 @@ function handleSuccess() {
    */
 function getTableAction(record) {
   return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    },
     {
       label: '编辑',
       onClick: handleEdit.bind(null, record),

src/views/base/simconfig/components/SimconfigForm.vue

@@ -20,9 +20,9 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
-              <a-form-item label="热力公司" v-bind="validateInfos.companyCompanyId" id="HeatsourcestationForm-companyCompanyId" name="companyCompanyId">
+              <a-form-item label="供热公司" v-bind="validateInfos.companyCompanyId" id="HeatsourcestationForm-companyCompanyId" name="companyCompanyId">
                 <a-select ref="select"
-                          placeholder="请选择热力公司"
+                          placeholder="请选择供热公司"
                           v-model:value="formData.companyCompanyId"
                           @focus="focus"
                           @change="handleChange1">
@@ -94,7 +94,7 @@
   const validatorRules = reactive({
     sim: [{ required: true, message: '请输入电话号!'},],
     code: [{ required: true, message: '请输入设备号!'},],
-    companyCompanyId: [{ required: true, message: '请选择热力公司!'},],
+    companyCompanyId: [{ required: true, message: '请选择供热公司!'},],
     sourceSourceId: [{ required: true, message: '请选择锅炉房!'},],
   });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });

src/views/base/simconfig/components/SimconfigJxForm.vue

@@ -20,9 +20,9 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
-              <a-form-item label="热力公司" v-bind="validateInfos.companyCompanyId" id="HeatsourcestationForm-companyCompanyId" name="companyCompanyId">
+              <a-form-item label="供热公司" v-bind="validateInfos.companyCompanyId" id="HeatsourcestationForm-companyCompanyId" name="companyCompanyId">
                 <a-select ref="select"
-                          placeholder="请选择热力公司"
+                          placeholder="请选择供热公司"
                           v-model:value="formData.companyCompanyId"
                           @focus="focus"
                           @change="handleChange1">
@@ -94,7 +94,7 @@
   const validatorRules = reactive({
     sim: [{ required: true, message: '请输入电话号!'},],
     code: [{ required: true, message: '请输入设备号!'},],
-    companyCompanyId: [{ required: true, message: '请选择热力公司!'},],
+    companyCompanyId: [{ required: true, message: '请选择供热公司!'},],
     sourceSourceId: [{ required: true, message: '请选择锅炉房!'},],
   });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });

src/views/base/station/Heatsourcestation.data.ts

@@ -18,7 +18,7 @@ export const columns: BasicColumn[] = [
     width: 250
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align:"center",
     dataIndex: 'companyId_dictText',
     width: 150

src/views/base/station/HeatsourcestationList.vue

@@ -5,9 +5,9 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :span="6">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
               <a-select ref="select"
-                        placeholder="请选择热力公司"
+                        placeholder="请选择供热公司"
                         v-model:value="queryParam.companyId"
                         style="width: 250px"
                         @focus="focus"
@@ -17,9 +17,9 @@
             </a-form-item>
           </a-col>
           <a-col :span="5">
-            <a-form-item label="热源站">
+            <a-form-item label="锅炉房">
               <a-select ref="select"
-                        placeholder="请选择热源站"
+                        placeholder="请选择锅炉房"
                         v-model:value="queryParam.sourceId"
                         style="width: 250px"
                         @focus="focus">
@@ -109,7 +109,7 @@
               ],
             },
            actionColumn: {
-               width: 120,
+               width: 140,
                fixed:'right'
             },
             beforeFetch: (params) => {
@@ -181,6 +181,10 @@
 
   function getTableAction(record){
     return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),

src/views/base/station/components/HeatsourcestationForm.vue

@@ -8,7 +8,7 @@
               <a-form-item label="公司" v-bind="validateInfos.companyId" id="HeatsourcestationForm-companyId" name="companyId">
 <!--                <j-dict-select-tag v-model:value="formData.companyId" dictCode="bl_thermalcompany,company_name,id" placeholder="请选择公司" @change="handleChange1" allow-clear />-->
                 <a-select ref="select"
-                          placeholder="请选择热力公司"
+                          placeholder="请选择供热公司"
                           v-model:value="formData.companyId"
                           style="width: 100%"
                           @focus="focus"
@@ -18,10 +18,10 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="热源" v-bind="validateInfos.sourceId" id="HeatsourcestationForm-sourceId" name="sourceId">
+              <a-form-item label="锅炉房" v-bind="validateInfos.sourceId" id="HeatsourcestationForm-sourceId" name="sourceId">
-<!--                <j-dict-select-tag v-model:value="formData.sourceId" dictCode="bl_heatsource,source_name,id" placeholder="请选择热源" allow-clear />-->
+<!--                <j-dict-select-tag v-model:value="formData.sourceId" dictCode="bl_heatsource,source_name,id" placeholder="请选择锅炉房" allow-clear />-->
                 <a-select ref="select"
-                          placeholder="请选择热源站"
+                          placeholder="请选择锅炉房"
                           v-model:value="formData.sourceId"
                           style="width: 100%"
                           @focus="focus">
@@ -164,7 +164,7 @@
     setupTime: [{ required: true, message: '请输入建设时间!'},],
     stationName: [{ required: true, message: '请输入热力站名称!'},],
     companyId: [{ required: true, message: '请选择公司!'},],
-    sourceId: [{ required: true, message: '请选择热源!'},],
+    sourceId: [{ required: true, message: '请选择锅炉房!'},],
   });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 

src/views/base/waterFlowConfig/BlWaterFlowConfig.data.ts

@@ -11,7 +11,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'sn'
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'companyCompanyId_dictText'
   },
@@ -42,6 +42,6 @@ export const superQuerySchema = {
   sn: {title: 'SN',order: 0,view: 'text', type: 'string',},
   occurtime: {title: '注册设备时间',order: 1,view: 'date', type: 'string',},
   companyCompanyId: {title: '公司名称',order: 2,view: 'number', type: 'number',dictTable: "bl_thermalcompany", dictCode: 'id', dictText: 'company_name',},
-  sourceSourceId: {title: '热源名称',order: 3,view: 'number', type: 'number',dictTable: "bl_heatsource", dictCode: 'id', dictText: 'source_name',},
+  sourceSourceId: {title: '锅炉房名称',order: 3,view: 'number', type: 'number',dictTable: "bl_heatsource", dictCode: 'id', dictText: 'source_name',},
   stationStationId: {title: '换热站名称',order: 4,view: 'number', type: 'number',dictTable: "bl_heatsourcestation", dictCode: 'id', dictText: 'station_name',},
 };

src/views/base/waterFlowConfig/BlWaterFlowConfigList.vue

@@ -12,8 +12,8 @@
           </a-col>
             <a-col :lg="6">
               <a-form-item name="companyCompanyId">
-                <template #label><span title="热力公司">热力公司</span></template>
+                <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">
@@ -49,7 +49,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)"/>
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
@@ -86,7 +86,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 140,
         fixed: 'right',
       },
       beforeFetch: async (params) => {
@@ -183,14 +183,6 @@
         onClick: handleEdit.bind(null, record),
         auth: 'waterFlowConfig:bl_water_flow_config:edit'
       },
-    ];
-  }
-
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
@@ -203,9 +195,10 @@
         },
         auth: 'waterFlowConfig:bl_water_flow_config:delete'
       }
-    ]
+    ];
   }
 
+
   /**
    * 查询
    */

src/views/base/waterFlowConfig/BlWaterFlowConfigListJx.vue

@@ -12,8 +12,8 @@
           </a-col>
             <a-col :lg="6">
               <a-form-item name="companyCompanyId">
-                <template #label><span title="热力公司">热力公司</span></template>
+                <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">
@@ -86,7 +86,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 140,
         fixed: 'right',
       },
       beforeFetch: async (params) => {
@@ -178,6 +178,10 @@
    */
   function getTableAction(record) {
     return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
@@ -195,18 +199,6 @@
     ];
   }
 
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      },
-    ]
-  }
-
   /**
    * 查询
    */

src/views/base/waterFlowConfig/components/BlWaterFlowConfigForm.vue

@@ -10,8 +10,8 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="热力公司" v-bind="validateInfos.companyCompanyId" id="BlWaterFlowConfigForm-companyCompanyId" name="companyCompanyId">
+							<a-form-item label="供热公司" v-bind="validateInfos.companyCompanyId" id="BlWaterFlowConfigForm-companyCompanyId" name="companyCompanyId">
-								<j-dict-select-tag v-model:value="formData.companyCompanyId" :dictCode="`bl_thermalcompany,company_name,id,region_type = '${formData.regionType}'`" placeholder="请选择热力公司"  allow-clear />
+								<j-dict-select-tag v-model:value="formData.companyCompanyId" :dictCode="`bl_thermalcompany,company_name,id,region_type = '${formData.regionType}'`" placeholder="请选择供热公司"  allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
@@ -70,7 +70,7 @@
   const validatorRules = reactive({
     sn: [{ required: true, message: '请输入sn!'},],
     companyCompanyId: [{ required: true, message: '请选择公司名称!'},],
-    sourceSourceId: [{ required: true, message: '请选择热源名称!'},],
+    sourceSourceId: [{ required: true, message: '请选择锅炉房名称!'},],
   });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 

src/views/heating/extract/DataExtractConfig.data.ts

@@ -19,7 +19,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'company'
   },
   {
-    title: '热源站',
+    title: '锅炉房',
     width: 120,
     align: "center",
     dataIndex: 'source'
@@ -45,7 +45,7 @@ export const columns: BasicColumn[] = [
       //   dataIndex: 'oneCompany'
       // },
       // {
-      //   title: '热源站',
+      //   title: '锅炉房',
       //   align: "center",
       //   dataIndex: 'oneSource'
       // },
@@ -87,7 +87,7 @@ export const columns: BasicColumn[] = [
       //   dataIndex: 'twoCompany'
       // },
       // {
-      //   title: '热源站',
+      //   title: '锅炉房',
       //   align: "center",
       //   dataIndex: 'twoSource'
       // },

src/views/heating/extract/DataExtractConfigList.vue

@@ -6,9 +6,9 @@
         <a-row :gutter="24">
           <a-col :span="5">
             <a-form-item>
-              <span title="热力公司">热力公司：</span>
+              <span title="供热公司">供热公司：</span>
               <a-select ref="select"
-                        placeholder="请选择热力公司"
+                        placeholder="请选择供热公司"
                         v-model:value="queryParam.companyId"
                         style="width: 150px"
                         @change="handleChange1">
@@ -18,9 +18,9 @@
           </a-col>
           <a-col :span="4">
             <a-form-item>
-              <span title="热源站">热源站：</span>
+              <span title="锅炉房">锅炉房：</span>
               <a-select ref="select"
-                        placeholder="请选择热源站"
+                        placeholder="请选择锅炉房"
                         v-model:value="queryParam.sourceId"
                         style="width: 150px"
                         @change="handleChange2">

src/views/heating/extract/components/station/DataExtractStaionList.vue

@@ -10,9 +10,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
               <a-select ref="select"
-                        placeholder="请选择热力公司"
+                        placeholder="请选择供热公司"
                         v-model:value="queryParam.view001"
                         style="width: 150px"
                         @change="handleChange1">
@@ -21,9 +21,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item label="热源站">
+            <a-form-item label="锅炉房">
               <a-select ref="select"
-                        placeholder="请选择热源站"
+                        placeholder="请选择锅炉房"
                         v-model:value="queryParam.view002"
                         style="width: 150px"
                         @change="handleChange2">

src/views/heating/extract/components/station/DataExtractStation.data.ts

@@ -12,14 +12,14 @@ export const columns: BasicColumn[] = [
     ellipsis: false
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'view001Name',
     width:140,
     ellipsis: false
   },
   {
-    title: '热源站',
+    title: '锅炉房',
     align: "center",
     dataIndex: 'view002Name',
     ellipsis: false

src/views/heating/extract/components/station/extract/StationExtract.data.ts

@@ -12,14 +12,14 @@ export const columns: BasicColumn[] = [
     ellipsis: false
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'view001Name',
     width:140,
     ellipsis: false
   },
   {
-    title: '热源站',
+    title: '锅炉房',
     align: "center",
     dataIndex: 'view002Name',
     ellipsis: false

src/views/heating/extract/components/station/extract/StationExtractListOne.vue

@@ -4,13 +4,13 @@
     <div class="jeecg-basic-table-form-container">
         <a-row :gutter="24">
           <a-col :lg="4">
-            <span title="热力公司" class="title">SIM: {{queryParam.sim}}</span>
+            <span title="供热公司" class="title">SIM: {{queryParam.sim}}</span>
           </a-col>
           <a-col :lg="5">
-            <span title="热力公司" class="title">热力公司: {{queryParam.view001Name}}</span>
+            <span title="供热公司" class="title">供热公司: {{queryParam.view001Name}}</span>
           </a-col>
           <a-col :lg="6">
-            <span title="热源站" class="title">热源站: {{queryParam.view002Name}}</span>
+            <span title="锅炉房" class="title">锅炉房: {{queryParam.view002Name}}</span>
           </a-col>
           <a-col :lg="7">
             <span title="换热站" class="title">换热站: {{queryParam.view004Name}}</span>

src/views/heating/extract/components/station/extracted/StationExtracted.data.ts

@@ -12,14 +12,14 @@ export const columns: BasicColumn[] = [
     ellipsis: false
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'view001Name',
     width:140,
     ellipsis: false
   },
   {
-    title: '热源站',
+    title: '锅炉房',
     align: "center",
     dataIndex: 'view002Name',
     ellipsis: false

src/views/heating/extract/components/station/extracted/StationExtractedListOne.vue

@@ -4,13 +4,13 @@
     <div class="jeecg-basic-table-form-container">
         <a-row :gutter="24">
           <a-col :lg="4">
-            <span title="热力公司" class="title">SIM: {{queryParam.sim}}</span>
+            <span title="供热公司" class="title">SIM: {{queryParam.sim}}</span>
           </a-col>
           <a-col :lg="5">
-            <span title="热力公司" class="title">热力公司: {{queryParam.view001Name}}</span>
+            <span title="供热公司" class="title">供热公司: {{queryParam.view001Name}}</span>
           </a-col>
           <a-col :lg="6">
-            <span title="热源站" class="title">热源站: {{queryParam.view002Name}}</span>
+            <span title="锅炉房" class="title">锅炉房: {{queryParam.view002Name}}</span>
           </a-col>
           <a-col :lg="7">
             <span title="换热站" class="title">换热站: {{queryParam.view004Name}}</span>

src/views/heating/gwrljc/HeatanalysisListJx.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="5">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
-              <a-select ref="select" placeholder="请选择热力公司" v-model:value="queryParam.view001" style="width: 150px"
+              <a-select ref="select" placeholder="请选择供热公司" v-model:value="queryParam.view001" style="width: 150px"
                 @focus="focus" @change="handleChange1">
                 <a-select-option :value="item.id" v-for="item in thermalcompany" :key="item.id">{{ item.companyName
                 }}</a-select-option>
@@ -14,8 +14,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="5">
-            <a-form-item label="热源站">
+            <a-form-item label="锅炉房">
-              <a-select ref="select" placeholder="请选择热源站" v-model:value="queryParam.view002" style="width: 150px"
+              <a-select ref="select" placeholder="请选择锅炉房" v-model:value="queryParam.view002" style="width: 150px"
                 @focus="focus" @change="handleChange2">
                 <a-select-option :value="item.id" v-for="item in heatsource" :key="item.id">{{ item.sourceName
                 }}</a-select-option>

src/views/heating/heatanalysis/Heatanalysis.data.ts

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'view001Name',
     width:140,
@@ -18,7 +18,7 @@ export const columns: BasicColumn[] = [
     ellipsis: false
   },
   {
-    title: '换热站',
+    title: '锅炉房',
     align: "center",
     dataIndex: 'view004Name',
     ellipsis: false
@@ -92,7 +92,7 @@ export const columns: BasicColumn[] = [
 //列表数据
 export const columnsJx: BasicColumn[] = [
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'view001Name',
     width:100,
@@ -196,7 +196,7 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '热力公司',
+    label: '供热公司',
     field: 'view001Name',
   },
   {
@@ -204,7 +204,7 @@ export const formSchema: FormSchema[] = [
     field: 'view002Name',
   },
   {
-    label: '换热站',
+    label: '锅炉房',
     field: 'view004Name',
   },
   {

src/views/heating/heatanalysis/HeatanalysisList.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="5">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
-              <a-select ref="select" placeholder="请选择热力公司" v-model:value="queryParam.view001" style="width: 150px"
+              <a-select ref="select" placeholder="请选择供热公司" v-model:value="queryParam.view001" style="width: 150px"
                 @focus="focus" @change="handleChange1">
                 <a-select-option :value="item.id" v-for="item in thermalcompany" :key="item.id">{{ item.companyName
                 }}</a-select-option>

src/views/heating/heatanalysis/HeatanalysisListJx.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="5">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
-              <a-select ref="select" placeholder="请选择热力公司" v-model:value="queryParam.view001" style="width: 150px"
+              <a-select ref="select" placeholder="请选择供热公司" v-model:value="queryParam.view001" style="width: 150px"
                 @focus="focus" @change="handleChange1">
                 <a-select-option :value="item.id" v-for="item in thermalcompany" :key="item.id">{{ item.companyName
                 }}</a-select-option>

src/views/heating/heatanalysis/components/HeatanalysisForm.vue

@@ -3,13 +3,13 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24">
-          <a-form-item label="热力公司" v-bind="validateInfos.view001">
+          <a-form-item label="供热公司" v-bind="validateInfos.view001">
-            <a-input-number v-model:value="formData.view001" placeholder="请输入热力公司" style="width: 100%" :disabled="disabled"/>
+            <a-input-number v-model:value="formData.view001" placeholder="请输入供热公司" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="热源站" v-bind="validateInfos.view002">
+          <a-form-item label="锅炉房" v-bind="validateInfos.view002">
-            <a-input-number v-model:value="formData.view002" placeholder="请输入热源站" style="width: 100%" :disabled="disabled"/>
+            <a-input-number v-model:value="formData.view002" placeholder="请输入锅炉房" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">

src/views/heating/heatanalysis/components/ZxtJX.vue

@@ -23,7 +23,7 @@
 import { ref, nextTick, defineProps, onUnmounted } from 'vue';
 import * as echarts from 'echarts';
 import { useMessage } from '/@/hooks/web/useMessage';
-import {jxpage, list} from '/@/views/heating/history/HeatanalysisHistory.api';
+import {jxlist, list} from '/@/views/heating/history/HeatanalysisHistory.api';
 
 const props = defineProps({});
 const { createMessage } = useMessage();
@@ -184,7 +184,7 @@ function init(record_: any) {
     endDate: formatDateTime(end),
   };
 
-  jxpage(params).then((res: any) => {
+  jxlist(params).then((res: any) => {
     const records = (res && res.list) ? res.list : [];
     headerText.value = buildHeader(records, record_);
     initChartsOptions(records);

src/views/heating/history/HeatanalysisHistory.api.ts

@@ -4,8 +4,10 @@ import { useMessage } from "/@/hooks/web/useMessage";
 const { createConfirm } = useMessage();
 
 enum Api {
+  page = '/heating/heatanalysishistory/page',
+  jxpage = '/heating/heatanalysishistory/jxpage',
   list = '/heating/heatanalysishistory/getHistoryList',
-  jxpage = '/heating/heatanalysishistory/getJxHistoryList',
+  jxlist = '/heating/heatanalysishistory/getJxHistoryList',
   companylist = '/heating/thermalcompany/list',
   heatsourcelist = '/heating/heatsource/list',
   heatsourcestationlist = '/heating/heatsourcestation/list',
@@ -15,12 +17,18 @@ enum Api {
  * 列表接口
  * @param params
  */
-export const list = (params) =>
+export const page = (params) =>
-  defHttp.get({url: Api.list, params});
+  defHttp.get({url: Api.page, params});
 
 export const jxpage = (params) =>
   defHttp.get({url: Api.jxpage, params});
 
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+export const jxlist = (params) =>
+  defHttp.get({url: Api.jxlist, params});
+
 export const companylist = (params) =>
   defHttp.get({url: Api.companylist, params});
 

src/views/heating/history/HeatanalysisHistory.data.ts

@@ -4,22 +4,22 @@ import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
+  // {
+  //   title: '电话号',
+  //   align: "center",
+  //   dataIndex: 'sim',
+  //   width:140,
+  //   ellipsis: false
+  // },
   {
-    title: '电话号',
+    title: '供热公司',
-    align: "center",
-    dataIndex: 'sim',
-    width:140,
-    ellipsis: false
-  },
-  {
-    title: '热力公司',
     align: "center",
     dataIndex: 'view001Name',
     width:140,
     ellipsis: false
   },
   {
-    title: '热源站',
+    title: '锅炉房',
     align: "center",
     dataIndex: 'view002Name',
     ellipsis: false
@@ -95,3 +95,110 @@ export const columns: BasicColumn[] = [
       }
     ]},
 ];
+
+export const jxcolumns: BasicColumn[] = [
+  // {
+  //   title: '电话号',
+  //   align: "center",
+  //   dataIndex: 'sim',
+  //   width:140,
+  //   ellipsis: false
+  // },
+  {
+    title: '供热公司',
+    align: "center",
+    dataIndex: 'view001Name',
+    width:140,
+    ellipsis: false
+  },
+  {
+    title: '锅炉房',
+    align: "center",
+    dataIndex: 'view002Name',
+    ellipsis: false
+  },
+  {
+    title: '数据时间',
+    align: "center",
+    dataIndex: 'view032',
+    ellipsis: false
+  },
+  {
+    title: '供水温度',
+    align: "center",
+    width: 90,
+    dataIndex: 'view005',
+  },
+  {
+    title: '回水温度',
+    align: "center",
+    width: 90,
+    dataIndex: 'view006'
+  },
+  {
+    title: '供水压力',
+    align: "center",
+    width: 90,
+    dataIndex: 'view007'
+  },
+  {
+    title: '回水压力',
+    align: "center",
+    width: 90,
+    dataIndex: 'view008'
+  },
+  {
+    title: '瞬时热量',
+    align: "center",
+    width: 90,
+    dataIndex: 'view041'
+  },
+  {
+    title: '正累积热量',
+    align: 'center',
+    width: 90,
+    dataIndex: 'view042',
+  },
+  {
+    title: '负累积热量',
+    align: 'center',
+    width: 90,
+    dataIndex: 'view043',
+  },
+  {
+    title: '净累积热量',
+    align: "center",
+    width: 90,
+    dataIndex: 'view044'
+  },
+  {
+    title: '瞬时流量',
+    align: "center",
+    width: 90,
+    dataIndex: 'view037'
+  },
+  {
+    title: '正累积流量',
+    align: 'center',
+    width: 90,
+    dataIndex: 'view038',
+  },
+  {
+    title: '负累积流量',
+    align: 'center',
+    width: 90,
+    dataIndex: 'view039',
+  },
+  {
+    title: '净累积流量',
+    align: "center",
+    width: 90,
+    dataIndex: 'view040'
+  },
+  {
+    title: '流体速度',
+    align: 'center',
+    width: 90,
+    dataIndex: 'view045',
+  },
+];

src/views/heating/history/HeatanalysisHistoryList.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="5">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
-              <a-select ref="select" placeholder="请选择热力公司" v-model:value="queryParam.view001" @focus="focus"
+              <a-select ref="select" placeholder="请选择供热公司" v-model:value="queryParam.view001" @focus="focus"
                 @change="handleChange1">
                 <a-select-option :value="item.id" v-for="item in thermalcompany"
                   :key="item.id">{{ item.companyName }}</a-select-option>
@@ -14,8 +14,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="5">
-            <a-form-item label="热源站">
+            <a-form-item label="锅炉房">
-              <a-select ref="select" placeholder="请选择热源站" v-model:value="queryParam.view002" @focus="focus"
+              <a-select ref="select" placeholder="请选择锅炉房" v-model:value="queryParam.view002" @focus="focus"
                 @change="handleChange2">
                 <a-select-option :value="item.id" v-for="item in heatsource"
                   :key="item.id">{{ item.sourceName }}</a-select-option>
@@ -70,7 +70,13 @@ import { ref, reactive, onMounted, watch, unref } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { columns } from './HeatanalysisHistory.data';
-import { list, companylist, heatsourcelist, heatsourcestationlist } from './HeatanalysisHistory.api';
+import {
+  list,
+  companylist,
+  heatsourcelist,
+  heatsourcestationlist,
+  page
+} from './HeatanalysisHistory.api';
 
 const queryParam = ref<any>({});
 const toggleSearchStatus = ref<boolean>(false);
@@ -79,7 +85,7 @@ const registerModal = ref();
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
     title: '',
-    api: list,
+    api: page,
     columns,
     canResize: false,
     useSearchForm: false,

src/views/heating/history/HeatanalysisHistoryListJx.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="5">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
-              <a-select ref="select" placeholder="请选择热力公司" v-model:value="queryParam.view001" @focus="focus"
+              <a-select ref="select" placeholder="请选择供热公司" v-model:value="queryParam.view001" @focus="focus"
                 @change="handleChange1">
                 <a-select-option :value="item.id" v-for="item in thermalcompany"
                   :key="item.id">{{ item.companyName }}</a-select-option>
@@ -14,8 +14,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="5">
-            <a-form-item label="热源站">
+            <a-form-item label="锅炉房">
-              <a-select ref="select" placeholder="请选择热源站" v-model:value="queryParam.view002" @focus="focus"
+              <a-select ref="select" placeholder="请选择锅炉房" v-model:value="queryParam.view002" @focus="focus"
                 @change="handleChange2">
                 <a-select-option :value="item.id" v-for="item in heatsource"
                   :key="item.id">{{ item.sourceName }}</a-select-option>
@@ -69,8 +69,13 @@
 import { ref, reactive, onMounted, watch, unref } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
-import { columns } from './HeatanalysisHistory.data';
+import { jxcolumns } from './HeatanalysisHistory.data';
-import { list, companylist, heatsourcelist, heatsourcestationlist } from './HeatanalysisHistory.api';
+import {
+  companylist,
+  heatsourcelist,
+  heatsourcestationlist,
+  jxpage
+} from './HeatanalysisHistory.api';
 
 const queryParam = ref<any>({});
 const toggleSearchStatus = ref<boolean>(false);
@@ -79,8 +84,8 @@ const registerModal = ref();
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
     title: '',
-    api: list,
+    api: jxpage,
-    columns,
+    columns: jxcolumns,
     canResize: false,
     useSearchForm: false,
     clickToRowSelect: false,

src/views/heating/mapmanagement/Markinfo.api.ts

@@ -31,7 +31,7 @@ export const list = (params) => defHttp.get({ url: Api.list, params });
 export const getMarkinfo = (params) => defHttp.get({ url: Api.getMarkinfo, params });
 
 /**
- * 热源信息
+ * 锅炉房信息
  * @param params
  */
 export const getPointInfo = (params) => defHttp.get({ url: Api.getPointInfo, params });

src/views/heating/mapmanagement/components/AddSourceForm.vue

@@ -5,9 +5,9 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="AddSourceForm">
           <a-row>
             <a-col :span="24">
-              <a-form-item label="热源" v-bind="validateInfos.name" id="HeatsourcestationForm-sourceId" name="sourceId">
+              <a-form-item label="锅炉房" v-bind="validateInfos.name" id="HeatsourcestationForm-sourceId" name="sourceId">
                 <a-select ref="dictSelect"
-                          placeholder="请选择热源站"
+                          placeholder="请选择锅炉房"
                           v-model:value="formData.name"
                           style="width: 250px"
                           @focus="focus"
@@ -71,7 +71,7 @@
   const confirmLoading = ref<boolean>(false);
   //表单验证
   const validatorRules = reactive({
-    name: [{ required: true, message: '请选择热源站!'},],
+    name: [{ required: true, message: '请选择锅炉房!'},],
   });
   //注册表单
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });

src/views/heating/mapmanagement/components/AddStationForm.vue

@@ -5,7 +5,7 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="AddSourceForm">
           <a-row>
             <a-col :span="24">
-              <a-form-item label="热源" v-bind="validateInfos.name" id="HeatsourcestationForm-sourceId" name="sourceId">
+              <a-form-item label="锅炉房" v-bind="validateInfos.name" id="HeatsourcestationForm-sourceId" name="sourceId">
                 <a-select ref="dictSelect"
                           placeholder="请选择换热站"
                           v-model:value="formData.name"

src/views/heating/mapmanagement/components/MarkinfoForm.vue

@@ -167,15 +167,15 @@
         }
       },
       {
-        text : '删除所有热源',
+        text : '删除所有锅炉房',
         callback : function(p) {
           art.dialog({
-            content : '您确认清除所有热源网点？',
+            content : '您确认清除所有锅炉房网点？',
             ok : function() {
               deleteAllMarkinfo({},function(){
                 art.dialog({
                   title : "操作结果",
-                  content : "成功删除所有热源网点",
+                  content : "成功删除所有锅炉房网点",
                   fixed : true,
                   drag : false,
                   resize : false,
@@ -212,7 +212,7 @@
     marker.setTitle(description);
     let markerMenu = new BMap.ContextMenu();
     let markMenuItem = [ {
-      text : '删除热源网点',
+      text : '删除锅炉房网点',
       callback : function() {
         //获取当前标注的经纬度
         let p = marker.getPosition();

src/views/heating/report/Heatanalysis.data.ts

@@ -9,14 +9,14 @@ export const columns: BasicColumn[] = [
     ellipsis: false
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'view001Name',
     width:140,
     ellipsis: false
   },
   {
-    title: '热源站',
+    title: '锅炉房',
     align: "center",
     dataIndex: 'view002Name',
     ellipsis: false

src/views/heating/report/HeatanalysisList.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="4">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
-              <a-select ref="select" placeholder="请选择热力公司" v-model:value="queryParam.view001" style="width: 180px"
+              <a-select ref="select" placeholder="请选择供热公司" v-model:value="queryParam.view001" style="width: 180px"
                 @focus="focus" @change="handleChange1">
                 <a-select-option :value="item.id" v-for="item in thermalcompany"
                   :key="item.id">{{ item.companyName }}</a-select-option>
@@ -14,8 +14,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="3">
-            <a-form-item label="热源站">
+            <a-form-item label="锅炉房">
-              <a-select ref="select" placeholder="请选择热源站" v-model:value="queryParam.view002" style="width: 180px"
+              <a-select ref="select" placeholder="请选择锅炉房" v-model:value="queryParam.view002" style="width: 180px"
                 @focus="focus" @change="handleChange2">
                 <a-select-option :value="item.id" v-for="item in heatsource"
                   :key="item.id">{{ item.sourceName }}</a-select-option>

src/views/heating/report/HeatanalysisListJx.vue

@@ -5,8 +5,8 @@
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="4">
-            <a-form-item label="热力公司">
+            <a-form-item label="供热公司">
-              <a-select ref="select" placeholder="请选择热力公司" v-model:value="queryParam.view001" style="width: 180px"
+              <a-select ref="select" placeholder="请选择供热公司" v-model:value="queryParam.view001" style="width: 180px"
                 @focus="focus" @change="handleChange1">
                 <a-select-option :value="item.id" v-for="item in thermalcompany"
                   :key="item.id">{{ item.companyName }}</a-select-option>
@@ -14,8 +14,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="3">
-            <a-form-item label="热源站">
+            <a-form-item label="锅炉房">
-              <a-select ref="select" placeholder="请选择热源站" v-model:value="queryParam.view002" style="width: 180px"
+              <a-select ref="select" placeholder="请选择锅炉房" v-model:value="queryParam.view002" style="width: 180px"
                 @focus="focus" @change="handleChange2">
                 <a-select-option :value="item.id" v-for="item in heatsource"
                   :key="item.id">{{ item.sourceName }}</a-select-option>

src/views/heating/report/components/extract/StationExtract.data.ts

@@ -12,14 +12,14 @@ export const columns: BasicColumn[] = [
     ellipsis: false
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'view001Name',
     width:140,
     ellipsis: false
   },
   {
-    title: '热源站',
+    title: '锅炉房',
     align: "center",
     dataIndex: 'view002Name',
     ellipsis: false

src/views/heating/report/components/extract/StationExtractListOne.vue

@@ -4,13 +4,13 @@
     <div class="jeecg-basic-table-form-container">
         <a-row :gutter="24">
           <a-col :lg="4">
-            <span title="热力公司" class="title">SIM: {{queryParam.sim}}</span>
+            <span title="供热公司" class="title">SIM: {{queryParam.sim}}</span>
           </a-col>
           <a-col :lg="5">
-            <span title="热力公司" class="title">热力公司: {{queryParam.view001Name}}</span>
+            <span title="供热公司" class="title">供热公司: {{queryParam.view001Name}}</span>
           </a-col>
           <a-col :lg="6">
-            <span title="热源站" class="title">热源站: {{queryParam.view002Name}}</span>
+            <span title="锅炉房" class="title">锅炉房: {{queryParam.view002Name}}</span>
           </a-col>
           <a-col :lg="7">
             <span title="换热站" class="title">换热站: {{queryParam.view004Name}}</span>

src/views/heating/report/components/extracted/StationExtracted.data.ts

@@ -12,14 +12,14 @@ export const columns: BasicColumn[] = [
     ellipsis: false
   },
   {
-    title: '热力公司',
+    title: '供热公司',
     align: "center",
     dataIndex: 'view001Name',
     width:140,
     ellipsis: false
   },
   {
-    title: '热源站',
+    title: '锅炉房',
     align: "center",
     dataIndex: 'view002Name',
     ellipsis: false

src/views/heating/report/components/extracted/StationExtractedListOne.vue

@@ -4,13 +4,13 @@
     <div class="jeecg-basic-table-form-container">
         <a-row :gutter="24">
           <a-col :lg="4">
-            <span title="热力公司" class="title">SIM: {{queryParam.sim}}</span>
+            <span title="供热公司" class="title">SIM: {{queryParam.sim}}</span>
           </a-col>
           <a-col :lg="5">
-            <span title="热力公司" class="title">热力公司: {{queryParam.view001Name}}</span>
+            <span title="供热公司" class="title">供热公司: {{queryParam.view001Name}}</span>
           </a-col>
           <a-col :lg="6">
-            <span title="热源站" class="title">热源站: {{queryParam.view002Name}}</span>
+            <span title="锅炉房" class="title">锅炉房: {{queryParam.view002Name}}</span>
           </a-col>
           <a-col :lg="7">
             <span title="换热站" class="title">换热站: {{queryParam.view004Name}}</span>

src/views/heating1/Heatanalysis.data.ts

@@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
    {
-    title: '热源/换热站',
+    title: '锅炉房/换热站',
     align:"center",
     dataIndex: 'view002Name',
      customRender:({record}) =>{
@@ -72,14 +72,14 @@ export const columns: BasicColumn[] = [
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
-      label: "热力公司",
+      label: "供热公司",
       field: 'view001',
       component: 'InputNumber',
       colProps: {span: 4},
       slot:'company',
  	},
 	{
-      label: "热源站",
+      label: "锅炉房",
       field: 'view002',
       component: 'InputNumber',
       colProps: {span: 4},
@@ -104,7 +104,7 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '热源站',
+    label: '锅炉房',
     field: 'view002',
     component: 'InputNumber',
   },

src/views/home/home.vue

@@ -48,8 +48,8 @@
           <table class="tableleft">
             <thead class="data-list-header-home">
             <tr class="data-list-header-home2">
-              <td style="width:20%;">热力公司</td>
+              <td style="width:20%;">供热公司</td>
-              <td style="width:10%;">热源</td>
+              <td style="width:10%;">锅炉房</td>
               <td style="width:20%;">数据时间</td>
               <td style="width:10%;">供水温度</td>
               <td style="width:10%;">回水温度</td>
@@ -93,8 +93,8 @@
           <table class="tableleft">
             <thead class="data-list-header-detail">
             <tr class="data-list-header2">
-              <td style="width:11%;">热力公司</td>
+              <td style="width:11%;">供热公司</td>
-              <td style="width:11%;">热源</td>
+              <td style="width:11%;">锅炉房</td>
               <td style="width:11%;">换热站</td>
               <td style="width:15%;">数据时间</td>
               <td style="width:6%;">供水温度</td>

src/views/screen/components/ZxtCQ.vue

@@ -22,7 +22,7 @@
 import { ref, nextTick, defineProps, onUnmounted } from 'vue';
 import * as echarts from 'echarts';
 import { useMessage } from '/@/hooks/web/useMessage';
-import {jxpage, list} from '/@/views/heating/history/HeatanalysisHistory.api';
+import {jxlist, list} from '/@/views/heating/history/HeatanalysisHistory.api';
 
 const emit = defineEmits(['close']);
 
@@ -194,7 +194,7 @@ function init(record_: any) {
   }
 
   if(record_.regionType == '郊县'){
-    jxpage(params).then((res: any) => {
+    jxlist(params).then((res: any) => {
       const records = (res && res.list) ? res.list : [];
       headerText.value = buildHeader(records, record_);
       initChartsOptions(records,record_);