From 62a43eb6e68c49d6d96c257b36d2a2ad2e08a8ac Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Fri, 17 Nov 2023 16:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E6=9A=96=E5=8A=9E=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/heatMainOperatorLog.js          |  62 ++++
 src/api/model/heatSubOperatorLog.js           |  62 ++++
 .../model/heatapiconf/heatMainOperatorLog.vue | 321 ++++++++++++++++++
 .../model/heatapiconf/heatSendContent.vue     | 149 ++++++++
 src/views/model/heatapiconf/heatSendLog.vue   |  38 ++-
 .../model/heatapiconf/heatSubOperatorLog.vue  | 294 ++++++++++++++++
 src/views/model/heatapiconf/index.vue         |  31 +-
 src/views/model/heatapiconf/paramModel.vue    |  70 +++-
 8 files changed, 1008 insertions(+), 19 deletions(-)
 create mode 100644 src/api/model/heatMainOperatorLog.js
 create mode 100644 src/api/model/heatSubOperatorLog.js
 create mode 100644 src/views/model/heatapiconf/heatMainOperatorLog.vue
 create mode 100644 src/views/model/heatapiconf/heatSendContent.vue
 create mode 100644 src/views/model/heatapiconf/heatSubOperatorLog.vue

diff --git a/src/api/model/heatMainOperatorLog.js b/src/api/model/heatMainOperatorLog.js
new file mode 100644
index 0000000..ce64b91
--- /dev/null
+++ b/src/api/model/heatMainOperatorLog.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询供热办推送主配置操作日志列表
+export function listHeatapi(query) {
+  return request({
+    url: '/model/dcHeatOperatorMainLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询供热办推送主配置操作日志详细
+export function getHeatapi(id) {
+  return request({
+    url: '/model/dcHeatOperatorMainLog/' + id,
+    method: 'get'
+  })
+}
+
+// 新增供热办推送主配置操作日志
+export function addHeatapi(data) {
+  return request({
+    url: '/model/dcHeatOperatorMainLog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改供热办推送主配置操作日志
+export function updateHeatapi(data) {
+  return request({
+    url: '/model/dcHeatOperatorMainLog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供热办推送主配置操作日志
+export function delHeatapi(id) {
+  return request({
+    url: '/model/dcHeatOperatorMainLog/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出供热办推送主配置操作日志
+export function exportHeatapi(query) {
+  return request({
+    url: '/${baseUrl}/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询供热办推送主配置操作日志列表
+export function listHeatapiNew(query) {
+  return request({
+    url: '/model/dcHeatOperatorMainLog/listNew',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/model/heatSubOperatorLog.js b/src/api/model/heatSubOperatorLog.js
new file mode 100644
index 0000000..a7fac35
--- /dev/null
+++ b/src/api/model/heatSubOperatorLog.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询供暖办推送副配置操作日志列表
+export function listLog(query) {
+  return request({
+    url: '/model/dcHeatOperatorSubLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询供暖办推送副配置操作日志详细
+export function getLog(id) {
+  return request({
+    url: '/model/dcHeatOperatorSubLog/' + id,
+    method: 'get'
+  })
+}
+
+// 新增供暖办推送副配置操作日志
+export function addLog(data) {
+  return request({
+    url: '/model/dcHeatOperatorSubLog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改供暖办推送副配置操作日志
+export function updateLog(data) {
+  return request({
+    url: '/model/dcHeatOperatorSubLog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供暖办推送副配置操作日志
+export function delLog(id) {
+  return request({
+    url: '/model/dcHeatOperatorSubLog/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出供暖办推送副配置操作日志
+export function exportLog(query) {
+  return request({
+    url: '/${baseUrl}/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询供暖办推送副配置操作日志列表
+export function listLogNew(query) {
+  return request({
+    url: '/model/dcHeatOperatorSubLog/listNew',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/views/model/heatapiconf/heatMainOperatorLog.vue b/src/views/model/heatapiconf/heatMainOperatorLog.vue
new file mode 100644
index 0000000..0354e5c
--- /dev/null
+++ b/src/views/model/heatapiconf/heatMainOperatorLog.vue
@@ -0,0 +1,321 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="操作类型" prop="operatorType">
+        <el-select v-model="queryParams.operatorType" placeholder="请选择操作类型" clearable>
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="机构编号" prop="orgCode">
+        <el-input
+          v-model="queryParams.orgCode"
+          placeholder="请输入机构编号"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="机构名称" prop="orgName">
+        <el-input
+          v-model="queryParams.orgName"
+          placeholder="请输入机构名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="推送接口" prop="sendIp">
+        <el-input
+          v-model="queryParams.sendIp"
+          placeholder="请输入推送接口"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="标准值" prop="standard">
+        <el-input
+          v-model="queryParams.standard"
+          placeholder="请输入标准值"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Plus"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Edit"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Delete"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="Download"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="heatapiList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
+      <el-table-column label="操作类型" align="center" prop="operatorType" />
+      <el-table-column label="机构编号" align="center" prop="orgCode" />
+      <el-table-column label="机构名称" align="center" prop="orgName" />
+      <el-table-column label="推送接口" align="center" prop="sendIp" />
+      <el-table-column label="标准值" align="center" prop="standard" />
+      <el-table-column label="是否推送" align="center" prop="available" />
+      <el-table-column label="排除设备" align="center" prop="excludeDevices" show-overflow-tooltip="true"/>
+      <el-table-column label="是否计算总开关" align="center" prop="computeSwitchTotal" />
+      <el-table-column label="操作人" align="center" prop="operatorName" />
+      <el-table-column label="操作昵称" align="center" prop="operatorNickName" />
+      <el-table-column label="操作时间" align="center" prop="createTime"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改供热办推送主配置操作日志对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="heatapiRef" :model="form" :rules="rules" label-width="80px">
+    
+<el-row>  
+  <el-col :span="12">
+     <el-form-item label="操作类型" prop="operatorType">
+      <el-select v-model="form.operatorType" placeholder="请选择操作类型">
+        <el-option label="请选择字典生成" value="" />
+      </el-select>
+    </el-form-item>
+  </el-col>
+  <el-col :span="12">
+    <el-form-item label="机构编号" prop="orgCode">
+      <el-input v-model="form.orgCode" placeholder="请输入机构编号" />
+    </el-form-item>
+  </el-col>
+  <el-col :span="12">
+    <el-form-item label="机构名称" prop="orgName">
+      <el-input v-model="form.orgName" placeholder="请输入机构名称" />
+    </el-form-item>
+  </el-col>
+  <el-col :span="12">
+    <el-form-item label="推送接口" prop="sendIp">
+      <el-input v-model="form.sendIp" placeholder="请输入推送接口" />
+    </el-form-item>
+  </el-col>
+  <el-col :span="12">
+    <el-form-item label="标准值" prop="standard">
+      <el-input v-model="form.standard" placeholder="请输入标准值" />
+    </el-form-item>
+  </el-col>
+  <el-col :span="12">
+    <el-form-item label="排除设备" prop="excludeDevices">
+      <el-input v-model="form.excludeDevices" type="textarea" placeholder="请输入内容" />
+    </el-form-item>
+  </el-col>
+
+      </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="HeatMainOperatorLog">
+import { listHeatapi, getHeatapi, delHeatapi, addHeatapi, updateHeatapi, listHeatapiNew } from "@/api/model/heatMainOperatorLog";
+
+const { proxy } = getCurrentInstance();
+
+const heatapiList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    operatorType: null,
+    orgCode: null,
+    orgName: null,
+    sendIp: null,
+    standard: null,
+    available: null,
+    excludeDevices: null,
+    computeSwitchTotal: null
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询供热办推送主配置操作日志列表 */
+function getList() {
+  loading.value = true;
+  listHeatapiNew(queryParams.value).then(response => {
+    heatapiList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    tentantId: null,
+    version: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    deptId: null,
+    userId: null,
+    deleteBy: null,
+    deleteTime: null,
+    id: null,
+    operatorType: null,
+    orgCode: null,
+    orgName: null,
+    sendIp: null,
+    standard: null,
+    available: null,
+    excludeDevices: null,
+    computeSwitchTotal: null
+  };
+  proxy.resetForm("heatapiRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加供热办推送主配置操作日志";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _id = row.id || ids.value
+  getHeatapi(_id).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改供热办推送主配置操作日志";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["heatapiRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateHeatapi(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addHeatapi(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除供热办推送主配置操作日志编号为"' + _ids + '"的数据项？').then(function() {
+    return delHeatapi(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('model/heatapi/export', {
+    ...queryParams.value
+  }, `heatapi_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>
diff --git a/src/views/model/heatapiconf/heatSendContent.vue b/src/views/model/heatapiconf/heatSendContent.vue
new file mode 100644
index 0000000..13ab3db
--- /dev/null
+++ b/src/views/model/heatapiconf/heatSendContent.vue
@@ -0,0 +1,149 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="设备编号" prop="deviceUuid">
+        <el-input
+          v-model="queryParams.deviceUuid"
+          placeholder="请输入设备编号"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input
+          v-model="queryParams.deviceName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参数编号" prop="paramCode">
+        <el-input
+          v-model="queryParams.paramCode"
+          placeholder="请输入参数编号"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参数名称" prop="paramName">
+        <el-input
+          v-model="queryParams.paramName"
+          placeholder="请输入参数名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="currentPageData" class="table-container">
+      <el-table-column type="expand">
+        <template #default="props"  class="blueTheButton">
+          <el-table :data="props.row.params" :border="childBorder" style="margin-left:40px;margin-top:20px">
+            <el-table-column label="参数名称" prop="paramName" />
+            <el-table-column label="参数编号" prop="paramCode" />
+            <el-table-column label="分区" prop="partion" />
+            <el-table-column label="模版编号" prop="paramType" />
+            <el-table-column label="参数值" prop="value" />
+            <el-table-column label="数据时间" prop="timeStamp" />
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column label="热源" align="center" prop="company"/>
+      <el-table-column label="设备名称" align="center" prop="name" />
+      <el-table-column label="设备编号" align="center" prop="deviceId"/>
+    </el-table>
+    <!-- 右下角内容 -->
+    <el-pagination 
+      style="justify-content: flex-end;"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-sizes="[10, 20, 30, 40, 50]"
+      :page-size="pageSize"
+      :total="heatapiContentList.length"
+      layout="sizes, prev, pager, next, jumper"
+    ></el-pagination>
+   
+  </div>
+</template>
+<style lang="scss"> 
+@import "@/assets/styles/self-defined.scss";
+.blueTheButton{
+  color:blue
+}
+</style>
+<script setup>
+import { ref, reactive } from 'vue';
+import { useRouter } from 'vue-router';
+
+const heatapiContentList = ref([]);
+const oldData = ref("");
+const loading = ref(false);
+const showSearch = ref(true);
+const currentPage = ref(1);
+const pageSize = ref(10);
+const queryParams = reactive({
+  deviceUuid: null,
+  deviceName: null,
+  paramCode: null,
+  paramName: null,
+});
+const router = useRouter()
+
+
+function solveData(){
+  const heatapiContentListData = (router.currentRoute._value.query.heatapiContentListData !== undefined && router.currentRoute._value.query.heatapiContentListData !== null)?router.currentRoute._value.query.heatapiContentListData : null;
+  oldData.value = heatapiContentListData;
+  if(heatapiContentListData != null){
+     heatapiContentList.value = JSON.parse(heatapiContentListData);
+     console.log(heatapiContentList.value);
+  }
+}
+
+
+function handleQuery() {
+  // 根据查询参数对 heatapiContentList 进行过滤
+  heatapiContentList.value = JSON.parse(oldData.value).filter(item => {
+    // 根据查询参数进行条件匹配，可以使用正则表达式或其他匹配方式
+    // 这里以设备编号、设备名称、参数编号和参数名称为例进行示范
+    return (
+      (!queryParams.deviceUuid || (item.deviceId && item.deviceId.indexOf(queryParams.deviceUuid) !== -1)) &&
+      (!queryParams.deviceName || (item.name && item.name.indexOf(queryParams.deviceName) !== -1)) &&
+      (!queryParams.paramCode || item.params.some(param => param.paramCode && param.paramCode.indexOf(queryParams.paramCode) !== -1)) &&
+      (!queryParams.paramName || item.params.some(param => param.paramName && param.paramName.indexOf(queryParams.paramName) !== -1))
+    );
+  });
+}
+
+
+function resetQuery() {
+  // 重置查询参数为初始值
+  queryParams.deviceUuid = null;
+  queryParams.deviceName = null;
+  queryParams.paramCode = null,
+  queryParams.paramName = null,
+  // 执行查询操作，显示所有数据
+  heatapiContentList.value = JSON.parse(oldData.value);
+}
+
+
+function handleSizeChange(val) {
+  pageSize.value = val;
+  currentPage.value = 1;
+}
+
+function handleCurrentChange(val) {
+  currentPage.value = val;
+}
+
+const currentPageData = computed(() => {
+  const startIndex = (currentPage.value - 1) * pageSize.value;
+  const endIndex = startIndex + pageSize.value;
+  return heatapiContentList.value.slice(startIndex, endIndex);
+});
+
+solveData();
+</script>
diff --git a/src/views/model/heatapiconf/heatSendLog.vue b/src/views/model/heatapiconf/heatSendLog.vue
index 4b80695..92e8765 100644
--- a/src/views/model/heatapiconf/heatSendLog.vue
+++ b/src/views/model/heatapiconf/heatSendLog.vue
@@ -82,17 +82,11 @@
         </template>
       </el-table-column>
       <el-table-column label="推送目标接口" align="center" prop="sendIp" />
-      <el-table-column 
-      label="推送内容" align="center" prop="infoDetail"
-      show-overflow-tooltip="true"
-      :tooltip-options="{
-        placement: 'bottom',
-        closeDelay: 2000,
-        leaveDelay: 2000,      
-        autoHide: false,
-        popperClass: 'custom-tooltip'
-      }">
-    </el-table-column>
+      <el-table-column label="推送内容" align="center" prop="infoDetail" @click="seeContent(scope.row)" show-overflow-tooltip="true">
+        <template #default="scope">
+          <a class="link" @click="seeContent(scope.row)">{{ scope.row.infoDetail }}</a>
+        </template>
+      </el-table-column>
       <el-table-column label="成功标志" align="center" prop="successFlag">
         <template #default="scope">
           <dict-tag :options="dc_yes_no" :value="scope.row.successFlag"/>
@@ -172,17 +166,24 @@
     </el-dialog>
   </div>
 </template>
-<style lang="scss" > @import "@/assets/styles/self-defined.scss";
+<style lang="scss" > 
+@import "@/assets/styles/self-defined.scss";
 .custom-tooltip {
   max-height: 100px;
   overflow-y: auto;
 }
+.link {
+  color: #409EFF;
+  cursor: pointer;
+  text-decoration: underline;
+}
  
 </style>
 <script setup name="HeatSendLog">
 import { listHeatapi, getHeatapi, delHeatapi, addHeatapi, updateHeatapi } from "@/api/model/heatSendLog";
 import { listHeatapiconf, getHeatapiconf, delHeatapiconf, addHeatapiconf, updateHeatapiconf } from "@/api/model/heatapiconf";
 const { proxy } = getCurrentInstance();
+const router = useRouter();
 const dc_yes_no = ref([
   { label: '成功', value: 'true', elTagType: 'default', elTagClass: null },
   { label: '失败', value: 'false', elTagType: 'default', elTagClass: null }
@@ -199,7 +200,6 @@ const total = ref(0);
 const title = ref("");
 const tooltipConfig = ref({ hideAfter: 3000});
 const heatapiconfList = ref([]);
-
 const data = reactive({
   form: {},
   queryParams: {
@@ -352,6 +352,18 @@ function getConfName(id){
   return name;
 }
 
+function seeContent(row){
+  router.push({
+    path: "heatSendContent",
+    query: {
+      'heatapiContentListData':row.infoDetail
+    }
+  });
+
+
+}
+
+
 getListHeatapiconf();
 getList();
 </script>
diff --git a/src/views/model/heatapiconf/heatSubOperatorLog.vue b/src/views/model/heatapiconf/heatSubOperatorLog.vue
new file mode 100644
index 0000000..a610ee8
--- /dev/null
+++ b/src/views/model/heatapiconf/heatSubOperatorLog.vue
@@ -0,0 +1,294 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="操作类型" prop="operatorType">
+        <el-select v-model="queryParams.operatorType" placeholder="请选择操作类型" clearable>
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="主配置编号" prop="standardConfId">
+        <el-input
+          v-model="queryParams.standardConfId"
+          placeholder="请输入主配置编号"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参数模版编号" prop="paramClassId">
+        <el-input
+          v-model="queryParams.paramClassId"
+          placeholder="请输入参数模版编号"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参数模版名称" prop="paramClassName">
+        <el-input
+          v-model="queryParams.paramClassName"
+          placeholder="请输入参数模版名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Plus"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Edit"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="Delete"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="Download"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="主键" align="center" prop="id" /> -->
+      <el-table-column label="操作类型" align="center" prop="operatorType" />
+      <el-table-column label="主配置编号" align="center" prop="standardConfId" />
+      <el-table-column label="参数模版编号" align="center" prop="paramClassId" />
+      <el-table-column label="参数模版名称" align="center" prop="paramClassName" />
+      <el-table-column label="参数推送开关" align="center" prop="computeSwitch" />
+      <el-table-column label="操作人" align="center" prop="operatorName" />
+      <el-table-column label="操作昵称" align="center" prop="operatorNickName" />
+      <el-table-column label="操作时间" align="center" prop="createTime"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改供暖办推送副配置操作日志对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="logRef" :model="form" :rules="rules" label-width="80px">
+    
+<el-row>  
+  <el-col :span="12">
+     <el-form-item label="操作类型" prop="operatorType">
+      <el-select v-model="form.operatorType" placeholder="请选择操作类型">
+        <el-option label="请选择字典生成" value="" />
+      </el-select>
+    </el-form-item>
+  </el-col>
+  <el-col :span="12">
+    <el-form-item label="主配置编号" prop="standardConfId">
+      <el-input v-model="form.standardConfId" placeholder="请输入主配置编号" />
+    </el-form-item>
+  </el-col>
+  <el-col :span="12">
+    <el-form-item label="参数模版编号" prop="paramClassId">
+      <el-input v-model="form.paramClassId" placeholder="请输入参数模版编号" />
+    </el-form-item>
+  </el-col>
+  <el-col :span="12">
+    <el-form-item label="参数模版名称" prop="paramClassName">
+      <el-input v-model="form.paramClassName" placeholder="请输入参数模版名称" />
+    </el-form-item>
+  </el-col>
+
+      </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="HeatSubOperatorLog">
+import { listLog, getLog, delLog, addLog, updateLog, listLogNew } from "@/api/model/heatSubOperatorLog";
+
+const { proxy } = getCurrentInstance();
+
+const logList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    operatorType: null,
+    standardConfId: null,
+    paramClassId: null,
+    paramClassName: null,
+    computeSwitch: null
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询供暖办推送副配置操作日志列表 */
+function getList() {
+  loading.value = true;
+  listLogNew(queryParams.value).then(response => {
+    logList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    tentantId: null,
+    version: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    deptId: null,
+    userId: null,
+    deleteBy: null,
+    deleteTime: null,
+    id: null,
+    operatorType: null,
+    standardConfId: null,
+    paramClassId: null,
+    paramClassName: null,
+    computeSwitch: null
+  };
+  proxy.resetForm("logRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加供暖办推送副配置操作日志";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _id = row.id || ids.value
+  getLog(_id).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改供暖办推送副配置操作日志";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["logRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateLog(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addLog(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除供暖办推送副配置操作日志编号为"' + _ids + '"的数据项？').then(function() {
+    return delLog(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('model/log/export', {
+    ...queryParams.value
+  }, `log_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>
diff --git a/src/views/model/heatapiconf/index.vue b/src/views/model/heatapiconf/index.vue
index eb9b7de..197f250 100644
--- a/src/views/model/heatapiconf/index.vue
+++ b/src/views/model/heatapiconf/index.vue
@@ -81,11 +81,16 @@
           </el-table-column>
           <el-table-column label="标准值" align="center" prop="standard" />
           <el-table-column label="发送地址" align="center" prop="sendIp" />
-          <el-table-column label="是否启用" align="center" prop="available">
+          <el-table-column label="是否发送" align="center" prop="available">
             <template #default="scope">
               <el-switch v-model="scope.row.available" @change="changeEnabled(scope.row)"/>
             </template>
           </el-table-column>
+          <el-table-column label="是否启用计算" align="center" prop="computeSwitchTotal">
+            <template #default="scope">
+              <el-switch v-model="scope.row.computeSwitchTotal" @change="changeSwitch(scope.row)"/>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="300"
             :fixed="fixedColumns ? 'right' : false">
             <template #header>
@@ -265,6 +270,7 @@ function handleAdd() {
   form.value.available = true;
   form.value.sendIp = null;
   open.value = true;
+  form.value.computeSwitchTotal = true;
   title.value = "添加供热办推送接口配置";
   form.value.excludeDevices = null;
   getListDevice();
@@ -431,7 +437,7 @@ function getDeptTreeNew(data, level = 0) {
 
 
 function changeEnabled(row){
-  ElMessageBox.confirm('确定修改该启用状态吗', '提示', {
+  ElMessageBox.confirm('确定修改该推送状态吗', '提示', {
       distinguishCancelAndClose: true,
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -498,6 +504,27 @@ function getDevicesAll(){
   });
 }
 
+function changeSwitch(row){
+  ElMessageBox.confirm('确定修改该计算启用状态吗', '提示', {
+      distinguishCancelAndClose: true,
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+  })
+  .then(() => {
+    console.log("确定");
+    let param = {
+      id:row.id,
+      computeSwitchTotal:row.computeSwitchTotal
+    }
+    updateHeatapiconf(param);
+  })
+  .catch((action) => {
+    console.log("取消");
+    row.computeSwitchTotal = !row.computeSwitchTotal;
+  })
+  
+}
+
 getDevicesAll();
 getDeptTree();
 getList();
diff --git a/src/views/model/heatapiconf/paramModel.vue b/src/views/model/heatapiconf/paramModel.vue
index 3ac1c45..9d58661 100644
--- a/src/views/model/heatapiconf/paramModel.vue
+++ b/src/views/model/heatapiconf/paramModel.vue
@@ -17,15 +17,15 @@
       <el-col :span="1.5">
         <el-button type="success" icon="Plus" @click="handleAdd">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" icon="Edit" @click="handleUpdate">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="success" icon="Delete" @click="handleDelete">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="warning" icon="Download" @click="handleExport">导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -42,6 +42,11 @@
           {{ getParamClassName(scope.row.paramClassId) }}
         </template>
       </el-table-column>
+      <el-table-column label="是否启用计算" align="center" prop="computeSwitch">
+        <template #default="scope">
+          <el-switch v-model="scope.row.computeSwitch" @change="changeSwitch(scope.row)"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <!-- <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button> -->
@@ -91,6 +96,7 @@
 import { listHeatParamModel, getHeatParamModel, delHeatParamModel, addHeatParamModel, updateHeatParamModel, addBatchHeatParamModel, updateHeatParamModelNew, listHeatParamModelNoPage } from "@/api/model/heatparammodel";
 import { listNoPage } from "@/api/model/heatapiconf";
 import { listParamclassNoPage } from "@/api/model/paramclass";
+import { ElMessageBox } from 'element-plus';
 const { proxy } = getCurrentInstance();
 
 const heatParamModelList = ref([]);
@@ -231,6 +237,7 @@ function submitForm() {
           paramSub.push({
             paramClassId: item,
             standardConfId: standardConfId,
+            computeSwitch: true,
           })
         })
         let paramAll = {
@@ -248,6 +255,7 @@ function submitForm() {
           paramSub.push({
             paramClassId: item,
             standardConfId: standardConfId,
+            computeSwitch: true,
           })
         })
         addBatchHeatParamModel(paramSub).then(response => {
@@ -317,6 +325,60 @@ function getHeatName(standardConfId) {
 // }
 
 
+function changeSwitch(row){
+  ElMessageBox.confirm('确定修改该计算启用状态吗', '提示', {
+      distinguishCancelAndClose: true,
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+  })
+  .then(() => {
+    console.log("确定");
+    let param = {
+      id:row.id,
+      computeSwitch:row.computeSwitch
+    }
+    updateHeatParamModel(param).then(response=>{
+      theSameToEachOther(row);
+    });
+    //同步供温和回温开关
+    
+  })
+  .catch((action) => {
+    console.log("取消");
+    row.computeSwitch = !row.computeSwitch;
+  })
+  
+}
+
+function theSameToEachOther(row){
+  if(row.paramClassId == '045'){
+    heatParamModelList.value.forEach(item=>{
+      if(item.paramClassId == '046'){
+        let param = {
+          id: item.id,
+          computeSwitch:row.computeSwitch,
+        }
+        updateHeatParamModel(param).then(response=>{
+          getList();
+        });
+      }
+    })
+  }else if(row.paramClassId == '046'){
+    heatParamModelList.value.forEach(item=>{
+      if(item.paramClassId == '045'){
+        let param = {
+          id: item.id,
+          computeSwitch:row.computeSwitch,
+        }
+        updateHeatParamModel(param).then(response=>{
+          getList();
+        });
+      }
+    })
+  }
+}
+
+
 
 getHeatList();
 getParamModel();