From 865bde0577c156842f75dbc6ffacdc3b414504e5 Mon Sep 17 00:00:00 2001
From: fuguobin <fgbin2008@163.com>
Date: Thu, 21 Mar 2024 10:06:57 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/model/asset/addParams.vue | 291 ++++++++++++++++++++++++++++
 src/views/model/asset/params.vue    | 200 +++++++++++++------
 2 files changed, 436 insertions(+), 55 deletions(-)
 create mode 100644 src/views/model/asset/addParams.vue

diff --git a/src/views/model/asset/addParams.vue b/src/views/model/asset/addParams.vue
new file mode 100644
index 0000000..cec031b
--- /dev/null
+++ b/src/views/model/asset/addParams.vue
@@ -0,0 +1,291 @@
+<template>
+  <div class="app-container">
+    <el-collapse class="paramsCollapse" v-model="activeNames">
+      <el-collapse-item title="基本信息" name="1">
+        <el-form :inline="true" :model="addForm" class="demo-form-inline">
+          <el-form-item label="资产编号">
+            <el-input
+              v-model="addForm.num"
+              placeholder="资产编号"
+              clearable
+              readonly
+            />
+          </el-form-item>
+          <el-form-item label="资产名称">
+            <el-input v-model="addForm.name" placeholder="资产名称" clearable />
+          </el-form-item>
+          <el-form-item label="组成设备">
+            <el-select
+              v-model="addForm.device"
+              multiple
+              filterable
+              allow-create
+              default-first-option
+              :reserve-keyword="false"
+              placeholder="组成设备"
+              style="width: 240px"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="success" @click="selectParams">选择参数</el-button>
+          </el-form-item>
+        </el-form>
+      </el-collapse-item>
+      <el-collapse-item title="参数列表" name="2">
+        <vxe-table
+          class="tableCollapse"
+          border
+          ref="tableRef"
+          max-height="400"
+          :row-config="{ isHover: true }"
+          :loading="loading"
+          :data="tableListData"
+        >
+          <vxe-column type="checkbox" width="60"></vxe-column>
+          <vxe-column field="role" title="参数编码"></vxe-column>
+          <vxe-column
+            field="address"
+            title="参数名称"
+            :filters="addressOptions"
+            :filter-method="filterAddressMethod"
+            :filter-recover-method="filterAddressRecoverMethod"
+          >
+            <template #filter="{ $panel, column }">
+              <vxe-input
+                class="filterInput"
+                v-for="(option, index) in column.filters"
+                :key="index"
+                v-model="option.data"
+                @input="$panel.changeOption($event, !!option.data, option)"
+                @keyup.enter="$panel.confirmFilter()"
+                placeholder="参数名称"
+                size="mini"
+              ></vxe-input>
+            </template>
+          </vxe-column>
+          <vxe-column field="youxiao" title="是否有效">
+            <template #default="{ row }">
+              <vxe-checkbox v-model="row.youxiao"></vxe-checkbox>
+            </template>
+          </vxe-column>
+          <vxe-column field="kekong" title="是否可控">
+            <template #default="{ row }">
+              <vxe-checkbox v-model="row.kekong"></vxe-checkbox>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </el-collapse-item>
+    </el-collapse>
+    <el-dialog
+      class="addDialog"
+      v-model="dialogTableVisible"
+      title="选择参数"
+      width="900"
+    >
+      <vxe-table
+        class="tableDialog"
+        border
+        ref="tableRef"
+        max-height="400"
+        :row-config="{ isHover: true }"
+        :loading="loading"
+        :data="tableData"
+      >
+        <vxe-column type="checkbox" width="60"></vxe-column>
+        <vxe-column field="id" title="设备编码" sortable></vxe-column>
+        <vxe-column field="name" title="设备名称"></vxe-column>
+        <vxe-column field="role" title="参数编码"></vxe-column>
+        <vxe-column
+          field="age"
+          title="参数模版名称"
+          :filters="ageOptions"
+          :filter-method="filterAgeMethod"
+          :filter-recover-method="filterAgeRecoverMethod"
+        >
+          <template #filter="{ $panel, column }">
+            <vxe-input
+              class="filterInput"
+              v-for="(option, index) in column.filters"
+              :key="index"
+              v-model="option.data"
+              @input="$panel.changeOption($event, !!option.data, option)"
+              @keyup.enter="$panel.confirmFilter()"
+              placeholder="参数模版名称"
+              size="mini"
+            ></vxe-input>
+          </template>
+        </vxe-column>
+        <vxe-column
+          field="address"
+          title="参数名称"
+          :filters="addressOptions"
+          :filter-method="filterAddressMethod"
+          :filter-recover-method="filterAddressRecoverMethod"
+        >
+          <template #filter="{ $panel, column }">
+            <vxe-input
+              class="filterInput"
+              v-for="(option, index) in column.filters"
+              :key="index"
+              v-model="option.data"
+              @input="$panel.changeOption($event, !!option.data, option)"
+              @keyup.enter="$panel.confirmFilter()"
+              placeholder="参数名称"
+              size="mini"
+            ></vxe-input>
+          </template>
+        </vxe-column>
+        <vxe-column
+          field="sex"
+          title="分区"
+          :filter-multiple="false"
+          :filters="sexOptions"
+        ></vxe-column>
+      </vxe-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogTableVisible = false">取消</el-button>
+          <el-button type="primary" @click="dialogTableVisible = false">
+            确认
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script setup>
+import { ref, reactive, onMounted } from "vue";
+import { useRoute } from "vue-router";
+const activeNames = ref(["1", "2"]);
+const route = useRoute();
+const dialogTableVisible = ref(false);
+const addForm = reactive({
+  num: route.query.assetCode,
+  name: "",
+  device: [],
+});
+const options = [
+  {
+    value: "HTML",
+    label: "HTML",
+  },
+  {
+    value: "CSS",
+    label: "CSS",
+  },
+  {
+    value: "JavaScript",
+    label: "JavaScript",
+  },
+];
+const tableRef = ref();
+const loading = ref(false);
+const tableData = ref([
+  {
+    id: 10001,
+    name: "Test1",
+    role: "Develop",
+    sex: "Man",
+    age: 28,
+    address: "test",
+  },
+  {
+    id: 10002,
+    name: "Test2",
+    role: "admin",
+    sex: "Man",
+    age: 29,
+    address: "asd",
+  },
+  {
+    id: 10003,
+    name: "Test3",
+    role: "useer",
+    sex: "Man",
+    age: 22,
+    address: "qsx",
+  },
+]);
+const tableListData = ref([
+  {
+    id: 10001,
+    name: "Test1",
+    role: "Develop",
+    sex: "Man",
+    age: 28,
+    address: "test",
+    youxiao: true,
+    kekong: false,
+  },
+  {
+    id: 10002,
+    name: "Test2",
+    role: "admin",
+    sex: "Man",
+    age: 29,
+    address: "asd",
+    youxiao: false,
+    kekong: true,
+  },
+  {
+    id: 10003,
+    name: "Test3",
+    role: "useer",
+    sex: "Man",
+    age: 22,
+    address: "qsx",
+    youxiao: false,
+    kekong: false,
+  },
+]);
+const sexOptions = ref([
+  { label: "高", value: "Man" },
+  { label: "中", value: "Women" },
+]);
+const ageOptions = ref([{ data: "" }]);
+const addressOptions = ref([{ data: "" }]);
+const filterAgeMethod = ({ option, row }) => {
+  return row.age === Number(option.data);
+};
+const filterAgeRecoverMethod = ({ option }) => {
+  // 如果是自定义筛选模板，当为点击确认时，该选项将被恢复为默认值
+  option.data = "";
+};
+const filterAddressMethod = ({ option, row }) => {
+  return row.address === option.data;
+};
+const filterAddressRecoverMethod = ({ option }) => {
+  // 如果是自定义筛选模板，当为点击确认时，该选项将被恢复为默认值
+  option.data = "";
+};
+onMounted(() => {});
+function selectParams() {
+  //选择参数
+  dialogTableVisible.value = true;
+}
+</script>
+<style scoped>
+.paramsCollapse {
+  .tableCollapse {
+    .filterInput {
+      width: 120px;
+      margin: 10px;
+    }
+  }
+}
+:deep(.addDialog) {
+  .tableDialog {
+    .filterInput {
+      width: 120px;
+      margin: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/model/asset/params.vue b/src/views/model/asset/params.vue
index 2ea1cde..10ec9d7 100644
--- a/src/views/model/asset/params.vue
+++ b/src/views/model/asset/params.vue
@@ -1,44 +1,95 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="资产编号" prop="assetCode">
-        <el-input v-model="queryParams.assetCode" placeholder="请输入资产编号" disabled = false clearable @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.assetCode"
+          placeholder="请输入资产编号"
+          disabled="false"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="设备uuid" prop="deviceUuid">
-        <el-input v-model="queryParams.deviceUuid" placeholder="请输入设备uuid" clearable @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.deviceUuid"
+          placeholder="请输入设备uuid"
+          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-input
+          v-model="queryParams.paramCode"
+          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-input
+          v-model="queryParams.paramClassName"
+          placeholder="请输入参数模版"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.name"
+          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-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-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-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-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-button type="warning" icon="Download" @click="handleExport"
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="paramsList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="paramsList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="资产编码" align="center" prop="assetCode" />
       <el-table-column label="设备uuid" align="center" prop="deviceUuid" />
@@ -48,28 +99,48 @@
       <el-table-column label="分区" align="center" prop="partion" />
       <el-table-column label="是否有效" align="center" prop="flagEnabled" />
       <el-table-column label="是否可控" align="center" prop="contrlFlag" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <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>
+          <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" />
+    <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="600px" append-to-body>
       <el-form ref="paramsRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="资产编号" prop="assetCode">
-              <el-input v-model="form.assetCode" placeholder="" disabled=false />
+              <el-input
+                v-model="form.assetCode"
+                placeholder=""
+                disabled="false"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="设备uuid" prop="deviceUuid">
-              <el-input v-model="form.deviceUuid" placeholder="请输入设备uuid" />
+              <el-input
+                v-model="form.deviceUuid"
+                placeholder="请输入设备uuid"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -110,8 +181,14 @@
 </template>
 
 <script setup name="AssetParams">
-import { listParams, getParams, delParams, addParams, updateParams } from "@/api/model/asset/params";
-import { useRouter } from 'vue-router'
+import {
+  listParams,
+  getParams,
+  delParams,
+  addParams,
+  updateParams,
+} from "@/api/model/asset/params";
+import { useRouter } from "vue-router";
 const { proxy } = getCurrentInstance();
 const router = useRouter();
 const paramsList = ref([]);
@@ -125,20 +202,20 @@ const total = ref(0);
 const title = ref("");
 const assetCode = router.currentRoute.value.query.assetCode;
 const contrlFlag = ref([
-  {label: '可控', value: true, elTagType: 'default', elTagClass: null}, 
-  {label: '不可控', value: false, elTagType: 'default', elTagClass: null}
+  { label: "可控", value: true, elTagType: "default", elTagClass: null },
+  { label: "不可控", value: false, elTagType: "default", elTagClass: null },
 ]);
 const enabled = ref([
-  {label: '有效', value: true, elTagType: 'default', elTagClass: null}, 
-  {label: '无效', value: false, elTagType: 'default', elTagClass: null}
+  { label: "有效", value: true, elTagType: "default", elTagClass: null },
+  { label: "无效", value: false, elTagType: "default", elTagClass: null },
 ]);
 const contrlFlagTable = ref([
-  {label: '可控', value: 'true', elTagType: 'default', elTagClass: null}, 
-  {label: '不可控', value: 'false', elTagType: 'default', elTagClass: null}
+  { label: "可控", value: "true", elTagType: "default", elTagClass: null },
+  { label: "不可控", value: "false", elTagType: "default", elTagClass: null },
 ]);
 const enabledTable = ref([
-  {label: '有效', value: 'true', elTagType: 'default', elTagClass: null}, 
-  {label: '无效', value: 'false', elTagType: 'default', elTagClass: null}
+  { label: "有效", value: "true", elTagType: "default", elTagClass: null },
+  { label: "无效", value: "false", elTagType: "default", elTagClass: null },
 ]);
 
 const data = reactive({
@@ -153,10 +230,9 @@ const data = reactive({
     paramClassName: null,
     name: null,
     flagEnabled: null,
-    contrlFlag: null
+    contrlFlag: null,
   },
-  rules: {
-  }
+  rules: {},
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -165,7 +241,7 @@ const { queryParams, form, rules } = toRefs(data);
 function getList() {
   queryParams.value.assetCode = assetCode;
   loading.value = true;
-  listParams(queryParams.value).then(response => {
+  listParams(queryParams.value).then((response) => {
     paramsList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -198,7 +274,7 @@ function reset() {
     paramClassName: null,
     name: null,
     flagEnabled: null,
-    contrlFlag: null
+    contrlFlag: null,
   };
   proxy.resetForm("paramsRef");
 }
@@ -217,24 +293,30 @@ function resetQuery() {
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  reset();
-  form.value.assetCode = assetCode
-  open.value = true;
-  title.value = "添加资产参数";
+  router.push({
+    path: "AddParams",
+    query: {
+      assetCode,
+    },
+  });
+  // reset();
+  // form.value.assetCode = assetCode
+  // open.value = true;
+  // title.value = "添加资产参数";
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  const _id = row.id || ids.value
-  getParams(_id).then(response => {
+  const _id = row.id || ids.value;
+  getParams(_id).then((response) => {
     form.value = response.data;
     open.value = true;
     title.value = "修改资产参数";
@@ -243,16 +325,16 @@ function handleUpdate(row) {
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["paramsRef"].validate(valid => {
+  proxy.$refs["paramsRef"].validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateParams(form.value).then(response => {
+        updateParams(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-        addParams(form.value).then(response => {
+        addParams(form.value).then((response) => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -265,19 +347,27 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除资产参数编号为"' + _ids + '"的数据项？').then(function () {
-    return delParams(_ids);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => { });
+  proxy.$modal
+    .confirm('是否确认删除资产参数编号为"' + _ids + '"的数据项？')
+    .then(function () {
+      return delParams(_ids);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('asset/params/export', {
-    ...queryParams.value
-  }, `params_${new Date().getTime()}.xlsx`)
+  proxy.download(
+    "asset/params/export",
+    {
+      ...queryParams.value,
+    },
+    `params_${new Date().getTime()}.xlsx`
+  );
 }
 
 getList();

From 7541df30fde733ed0f4bfdbfab55502cf572f99d Mon Sep 17 00:00:00 2001
From: bobol <bobolixyz@163.com>
Date: Thu, 21 Mar 2024 18:04:43 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/dcHeatStandardDeviceStrategyConf.js |  67 +++
 src/views/model/heatapiconf/index.vue         | 525 +++++++++++++-----
 src/views/model/heatapiconf/paramModel.vue    |  82 ++-
 3 files changed, 523 insertions(+), 151 deletions(-)
 create mode 100644 src/api/model/dcHeatStandardDeviceStrategyConf.js

diff --git a/src/api/model/dcHeatStandardDeviceStrategyConf.js b/src/api/model/dcHeatStandardDeviceStrategyConf.js
new file mode 100644
index 0000000..1b5fe3a
--- /dev/null
+++ b/src/api/model/dcHeatStandardDeviceStrategyConf.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 查询设备策略配置列表
+export function listDcHeatStandardDeviceStrategyConf(query) {
+  return request({
+    url: '/model/dcHeatStandardDeviceStrategyConf/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备策略配置详细
+export function getDcHeatStandardDeviceStrategyConf(id) {
+  return request({
+    url: '/model/dcHeatStandardDeviceStrategyConf/' + id,
+    method: 'get'
+  })
+}
+
+// 新增设备策略配置
+export function addDcHeatStandardDeviceStrategyConf(data) {
+  return request({
+    url: '/model/dcHeatStandardDeviceStrategyConf',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量新增设备策略配置
+export function addBatchDcHeatStandardDeviceStrategyConf(confId, list) {
+  return request({
+    url: '/model/dcHeatStandardDeviceStrategyConf',
+    method: 'post',
+    params: {
+      confId: confId
+    },
+    data: {
+      list: list
+    }
+  })
+}
+
+// 修改设备策略配置
+export function updateDcHeatStandardDeviceStrategyConf(data) {
+  return request({
+    url: '/model/dcHeatStandardDeviceStrategyConf',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备策略配置
+export function delDcHeatStandardDeviceStrategyConf(id) {
+  return request({
+    url: '/model/dcHeatStandardDeviceStrategyConf/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出设备策略配置
+export function exportDcHeatStandardDeviceStrategyConf(query) {
+  return request({
+    url: '/${baseUrl}/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/views/model/heatapiconf/index.vue b/src/views/model/heatapiconf/index.vue
index 71f907c..23c2baa 100644
--- a/src/views/model/heatapiconf/index.vue
+++ b/src/views/model/heatapiconf/index.vue
@@ -3,38 +3,41 @@
     <el-row>
       <el-col :span="4" class="card-box">
         <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
+                    style="margin-bottom: 20px"/>
         </div>
         <div class="head-container">
           <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all
-            @node-click="handleNodeClick" />
+                   :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all
+                   @node-click="handleNodeClick"/>
         </div>
       </el-col>
       <el-col :span="20">
-        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" 
-          class="my-custom-form">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
+                 class="my-custom-form">
           <el-row>
             <el-col :span="8">
               <el-form-item label="排除设备" prop="excludeDevices" label-width="auto">
                 <el-select v-model="queryParams.excludeDevices" placeholder="请选择排除设备" clearable multiple>
                   <el-option
-                    v-for="dict in listDeviceAll"
-                    :key="dict.uuid"
-                    :label="dict.deviceName"
-                    :value="dict.uuid"
+                      v-for="dict in listDeviceAll"
+                      :key="dict.uuid"
+                      :label="dict.deviceName"
+                      :value="dict.uuid"
                   />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item label="标准值" prop="standard" label-width="auto">
-                <el-input v-model="queryParams.standard" placeholder="请输入标准值" clearable @keyup.enter="handleQuery" />
+                <el-input v-model="queryParams.standard" placeholder="请输入标准值" clearable
+                          @keyup.enter="handleQuery"/>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item label="发送地址" prop="sendIp" label-width="auto">
-                <el-input v-model="queryParams.sendIp" placeholder="请输入发送地址" clearable @keyup.enter="handleQuery" />
+                <el-input v-model="queryParams.sendIp" placeholder="请输入发送地址" clearable
+                          @keyup.enter="handleQuery"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -62,18 +65,21 @@
         </el-row>
 
         <el-table v-loading="loading" :data="heatapiconfList" @selection-change="handleSelectionChange"
-          :max-height="tableHeight" :border="true" :column-width-draggable="true">
-          <el-table-column type="selection" width="55" align="center" fixed="left" />
+                  :max-height="tableHeight" :border="true" :column-width-draggable="true">
+          <el-table-column type="selection" width="55" align="center" fixed="left"/>
           <!-- <el-table-column label="主键" align="center" prop="id" /> -->
-          <el-table-column label="机构编号" align="center" prop="orgCode" />
-          <el-table-column label="机构名称" align="center" prop="orgName" />
-          <el-table-column label="排除设备" align="center" prop="excludeDevices" show-overflow-tooltip="true" >
-            <template #default="scope">
-              {{getDevicesNames(scope.row.excludeDevices)}}
-            </template>
-          </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="orgCode"/>
+          <el-table-column label="机构名称" align="center" prop="orgName"/>
+          <!--          <el-table-column label="排除设备" align="center" prop="excludeDevices" show-overflow-tooltip="true" >-->
+          <!--            <template #default="scope">-->
+          <!--              {{getDevicesNames(scope.row.excludeDevices)}}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column label="推送方" align="center" prop="pushingCounterpart"
+                           :formatter="formatterPushingCounterpart"/>
+          <!--          <el-table-column label="策略" align="center" prop="strategy" :formatter="formatterStrategy"/>-->
+          <el-table-column label="标准值" align="center" prop="standard"/>
+          <!--          <el-table-column label="发送地址" align="center" prop="sendIp"/>-->
           <el-table-column label="是否发送" align="center" prop="available">
             <template #default="scope">
               <el-switch v-model="scope.row.available" @change="changeEnabled(scope.row)"/>
@@ -85,11 +91,11 @@
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="300"
-            :fixed="fixedColumns ? 'right' : false">
+                           :fixed="fixedColumns ? 'right' : false">
             <template #header>
-              <div class="fixed-column-header" style="text-align: center;display: block;" @dblclick="toggleFixedColumns">
-                <span style="text-align: center;display: block;">操作<img style="width:10px;margin-left:5px"
-                    v-show="fixedColumns" :src="lock" alt="Image" /></span>
+              <div class="fixed-column-header" style="text-align: center;display: block;"
+                   @dblclick="toggleFixedColumns">
+                <span style="text-align: center;display: block;">操作<img style="width:10px;margin-left:5px" v-show="fixedColumns" :src="lock" alt="Image"/></span>
               </div>
             </template>
             <template #default="scope">
@@ -101,57 +107,81 @@
         </el-table>
 
         <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize" @pagination="getList" />
+                    v-model:limit="queryParams.pageSize" @pagination="getList"/>
 
       </el-col>
     </el-row>
 
     <!-- 添加或修改供热办推送接口配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="700px" append-to-body draggable>
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body draggable :close-on-click-modal="false">
       <el-form ref="heatapiconfRef" :model="form" :rules="rules" label-width="80px">
-
         <el-row>
           <el-col :span="12">
-            <el-form-item label="所属公司" prop="orgCode">
-              <el-tree-select 
-                :disabled = "editable"
-                v-model="form.orgCode" 
-                :data="deptOptions"
-                :props="{ value: 'id', label: 'label', children: 'children' }" 
-                value-key="id" 
-                placeholder="请选择"
-                check-strictly 
-                :default-expand-all="true" 
-                @node-click="selectDept" 
-                filterable  
-                style="width:100%" 
+            <el-form-item label="热源" prop="orgCode">
+              <el-tree-select
+                  v-model="form.orgCode"
+                  :data="deptOptions"
+                  :props="{ value: 'id', label: 'label', children: 'children' }"
+                  value-key="id"
+                  placeholder="请选择"
+                  check-strictly
+                  :default-expand-all="true"
+                  @node-click="selectDept"
+                  filterable
+                  style="width:100%"
+                  :disabled="editable"
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="推送方" prop="pushingCounterpart">
+              <el-select v-model="form.pushingCounterpart" placeholder="请选择推送方" style="width: 100%;">
+                <el-option v-for="dict in pushing_counterpart" :key="dict.value" :label="dict.label"
+                           :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="标准值" prop="standard">
-              <el-input v-model="form.standard" placeholder="请输入标准值" />
+              <el-input type="number" v-model="form.standard" placeholder="请输入标准值"/>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="发送地址" prop="sendIp" v-hasPermi="['model:heatapiconf:edit']">
-              <el-input v-model="form.sendIp" placeholder="请输入发送地址" />
+          <el-col :span="12">
+            <el-form-item label="日期范围" prop="dateRange">
+              <el-date-picker
+                  v-model="form.dateRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="起始日期"
+                  end-placeholder="结束日期"
+                  value-format="YYYY-MM-DD"
+                  @change="dateRangeChange"
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="排除设备" prop="excludeDevices">
-              <el-select v-model="form.excludeDevices" placeholder="请选择排除设备" clearable multiple style="width:100%" >
-                <el-option
-                  v-for="dict in listDevices"
-                  :key="dict.uuid"
-                  :label="dict.deviceName"
-                  :value="dict.uuid"
-                />
-              </el-select>
+          <el-col :span="12">
+            <el-form-item label="时间间隔" prop="pushingInterval">
+              <el-input type="number" v-model="form.pushingInterval" placeholder="请输入发送时间间隔">
+                <template #append>分钟</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
+      <el-button type="success" icon="Plus" @click="handleAddStrategyConf" :disabled="disabled">选择设备</el-button>
+      <el-table :data="deviceStrategyConfList" style="width: 100%; margin-top: 10px" height="300px">
+        <el-table-column type="index" width="50"/>
+        <el-table-column prop="deviceUuid" label="设备" :formatter="formatterDevicesName"/>
+        <el-table-column prop="strategy" label="策略" :formatter="formatterStrategy"/>
+        <el-table-column prop="adjustedValue" label="调整值"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="300"
+                         :fixed="fixedColumns ? 'right' : false">
+          <template #default="scope">
+            <el-button type="text" icon="Edit" @click="handleUpdateStrategyConf(scope.row)">修改</el-button>
+            <el-button type="text" icon="Delete" @click="handleDeleteStrategyConf(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -159,17 +189,86 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog title="编辑设备调整策略" v-model="openStrategyConfEditForm" width="500px" append-to-body draggable
+               :close-on-click-modal="false">
+      <el-form ref="strategyConfEditFormRef" :model="strategyConfEditForm" :rules="strategyConfEditRules"
+               label-width="80px">
+        <el-form-item label="设备：" prop="deviceName">
+          {{ getDevicesName(strategyConfEditForm.deviceUuid) }}
+        </el-form-item>
+        <el-form-item label="策略：" prop="strategy">
+          <el-select v-model="strategyConfEditForm.strategy" placeholder="请选择策略" style="width: 100%;">
+            <el-option v-for="dict in effective_strategy" :key="dict.value" :label="dict.label"
+                       :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="调整值：" prop="adjustedValue">
+          <el-input type="number" v-model="strategyConfEditForm.adjustedValue" placeholder="请输入调整值" :disabled="strategyConfEditForm.strategy !== '1'"/>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitStrategyConfEditForm">确 定</el-button>
+          <el-button @click="cancelStrategyConfEditForm">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="新增设备" v-model="openStrategyConfAddForm" width="500px" append-to-body draggable
+               :close-on-click-modal="false">
+      <el-form ref="strategyConfSaveFormRef" :model="strategyConfSaveForm" :rules="strategyConfSaveRules"
+               label-width="70px">
+        <el-form-item label="设备：" prop="deviceList">
+          <el-select
+              v-model="strategyConfSaveForm.deviceList"
+              multiple
+              filterable
+              placeholder="请选择设备"
+              style="width: 100%"
+          >
+            <el-option
+                v-for="item in deviceList"
+                :key="item.uuid"
+                :label="item.deviceName"
+                :value="item.uuid"
+                :disabled="item.disabled"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitStrategyConfAddForm">确 定</el-button>
+          <el-button @click="cancelStrategyConfAddForm">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
-<style lang="scss" > @import "@/assets/styles/self-defined.scss";
+<style lang="scss"> @import "@/assets/styles/self-defined.scss";
 </style>
 <script setup name="Heatapiconf">
-import { listHeatapiconf, getHeatapiconf, delHeatapiconf, addHeatapiconf, updateHeatapiconf } from "@/api/model/heatapiconf";
-import { listDeviceNoPage } from "@/api/model/device";
-import { deptTreeSelect,deptTreeSelectNew } from "@/api/system/user";
+import {
+  listHeatapiconf,
+  getHeatapiconf,
+  delHeatapiconf,
+  addHeatapiconf,
+  updateHeatapiconf
+} from "@/api/model/heatapiconf";
+import {
+  listDcHeatStandardDeviceStrategyConf,
+  addBatchDcHeatStandardDeviceStrategyConf,
+  updateDcHeatStandardDeviceStrategyConf
+} from "@/api/model/dcHeatStandardDeviceStrategyConf";
+import {listDeviceNoPage} from "@/api/model/device";
+import {deptTreeSelect, deptTreeSelectNew} from "@/api/system/user";
 import lock from "@/assets/icons/svg/lock.svg";
-import { ElMessageBox } from 'element-plus';
-const { proxy } = getCurrentInstance();
+import {ElMessageBox} from 'element-plus';
+import { nextTick } from 'vue'
+
+const {proxy} = getCurrentInstance();
+const {pushing_counterpart, effective_strategy} = proxy.useDict('pushing_counterpart', 'effective_strategy');
 
 const heatapiconfList = ref([]);
 const open = ref(false);
@@ -201,13 +300,29 @@ const data = reactive({
     pageSize: 10,
     orgCode: null,
     standard: null,
-    excludeDevices:[],
+    excludeDevices: [],
   },
-  rules: {
-  }
+  rules: {}
+});
+
+const {queryParams, form, rules} = toRefs(data);
+const deviceList = ref([]);
+const deviceStrategyConfList = ref([]);
+const openStrategyConfEditForm = ref(false);
+const strategyConfEditForm = ref({});
+const strategyConfEditRules = ref({});
+const openStrategyConfAddForm = ref(false);
+const strategyConfSaveForm = ref({
+  deviceList: []
+});
+const strategyConfSaveRules = ref({
+  deviceList: [{
+    required: true,
+    message: '请选择设备',
+    trigger: 'change'
+  }]
 });
 
-const { queryParams, form, rules } = toRefs(data);
 
 /** 查询供热办推送接口配置列表 */
 function getList() {
@@ -275,6 +390,8 @@ function handleSelectionChange(selection) {
 
 /** 新增按钮操作 */
 function handleAdd() {
+  form.value = {};
+  deviceStrategyConfList.value = [];
   form.value.standard = null;
   form.value.available = true;
   form.value.sendIp = null;
@@ -282,18 +399,17 @@ function handleAdd() {
   form.value.computeSwitchTotal = true;
   title.value = "添加供热办推送接口配置";
   form.value.excludeDevices = null;
-  getListDevice();
-  if(treeSelected.value != null && treeSelected.value != ''){
+  if (treeSelected.value != null && treeSelected.value != '') {
     editable.value = true;
-  }else{
+  } else {
     editable.value = false;
   }
-  
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
+  deviceStrategyConfList.value = [];
   const _id = row.id || ids.value
   if (_id.length === 0) {
     ElMessageBox.alert('请选择需要修改的记录', '提示', {
@@ -311,13 +427,19 @@ function handleUpdate(row) {
   getListDevice(row.orgCode);
   getHeatapiconf(_id).then(response => {
     form.value = response.data;
-    if(form.value.excludeDevices != null && form.value.excludeDevices?.trim() != ""){
+    if (form.value.startDate && form.value.endDate) {
+      form.value.dateRange = [form.value.startDate, form.value.endDate];
+    }
+    if (form.value.excludeDevices != null && form.value.excludeDevices?.trim() != "") {
       form.value.excludeDevices = form.value.excludeDevices.split(",");
-    }else{
+    } else {
       form.value.excludeDevices = null;
     } // 将机构名称赋值给form对象的orgName属性
-    open.value = true;
-    title.value = "修改供热办推送接口配置";
+    listDcHeatStandardDeviceStrategyConf({confId: _id, pageNum: 1, pageSize: 1000}).then(res => {
+      deviceStrategyConfList.value = res.rows;
+      open.value = true;
+      title.value = "修改供热办推送接口配置";
+    });
   });
   editable.value = true;
 
@@ -329,6 +451,7 @@ function submitForm() {
     if (valid) {
       if (form.value.id != null) {
         form.value.excludeDevices = form.value.excludeDevices?.join(",");
+        form.value.deviceStrategyConfList = deviceStrategyConfList.value;
         updateHeatapiconf(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
@@ -362,7 +485,8 @@ function handleDelete(row) {
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => { });
+  }).catch(() => {
+  });
 }
 
 function getDeptTreeSelectNew() {
@@ -450,10 +574,10 @@ onUnmounted(() => {
   window.removeEventListener('resize', calculateTableHeight);
 });
 watch(
-  [collapseVisible, showSearch],
-  () => {
-    calculateTableHeight();
-  }
+    [collapseVisible, showSearch],
+    () => {
+      calculateTableHeight();
+    }
 );
 const calculateTableHeight = () => {
   nextTick(() => {
@@ -466,11 +590,12 @@ const calculateTableHeight = () => {
     tableHeight.value = remainingHeight + 'px';
   });
 };
+
 function getDeptTreeNew(data) {
   const result = [];
   data.forEach(item => {
     if (item.orgType === '1003') {
-      const newItem = { ...item }; // 使用深拷贝创建新的部门对象
+      const newItem = {...item}; // 使用深拷贝创建新的部门对象
       newItem.children = []; // 将叶节点的 children 属性设置为空数组，不包含子节点
       newItem.isLeaf = false;
       newItem.id = String(item.id);
@@ -478,7 +603,7 @@ function getDeptTreeNew(data) {
     } else if (item.children) {
       const children = getDeptTreeNew(item.children); // 递归调用处理子节点
       if (children.length > 0) {
-        const newItem = { ...item }; // 使用深拷贝创建新的部门对象
+        const newItem = {...item}; // 使用深拷贝创建新的部门对象
         newItem.children = children;
         newItem.isLeaf = true;
         newItem.id = String(item.id);
@@ -490,97 +615,231 @@ function getDeptTreeNew(data) {
 }
 
 
-function changeEnabled(row){
+function changeEnabled(row) {
   ElMessageBox.confirm('确定修改该推送状态吗', '提示', {
-      distinguishCancelAndClose: true,
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-  })
-  .then(() => {
-    console.log("确定");
-    let param = {
-      id:row.id,
-      available:row.available
-    }
-    updateHeatapiconf(param);
+    distinguishCancelAndClose: true,
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
   })
-  .catch((action) => {
-    console.log("取消");
-    row.available = !row.available;
-  })
-  
+      .then(() => {
+        console.log("确定");
+        let param = {
+          id: row.id,
+          available: row.available
+        }
+        updateHeatapiconf(param);
+      })
+      .catch((action) => {
+        console.log("取消");
+        row.available = !row.available;
+      })
+
 }
 
-function turnToParamConf(row){
+function turnToParamConf(row) {
   router.push({
     path: "heatParamModel",
     query: {
-      standardConfId:row.id,
+      standardConfId: row.id,
     }
   });
 }
 
 function getListDevice(orgCode) {
   let param = {};
-  if(orgCode != null && typeof orgCode === 'string'){
+  if (orgCode != null && typeof orgCode === 'string') {
     param.orgCode = orgCode;
-  }else{
+  } else {
     param.orgCode = form.value.orgCode;
   }
   listDeviceNoPage(param).then(response => {
     listDevices.value = response.data;
+    console.log("设备", listDevices.value);
   });
 }
 
-function getDevicesNames(deviceIds){
+function getDevicesNames(deviceIds) {
 
-if(!deviceIds) return '';
-let deviceIdSet = new Set(deviceIds.split(','));
-let deviceMap = new Map();
-listDeviceAll.value.forEach(device => {
-  deviceMap.set(device.uuid, device.deviceName);
-});
-let deviceNames = [];
-for (let deviceId of deviceIdSet) {
-  let name = deviceMap.get(deviceId);
-  if (name) {
-    deviceNames.push(name);
-  } else {
-    console.log("该设备没能匹配到对应设备名称："+deviceId)
+  if (!deviceIds) return '';
+  let deviceIdSet = new Set(deviceIds.split(','));
+  let deviceMap = new Map();
+  listDeviceAll.value.forEach(device => {
+    deviceMap.set(device.uuid, device.deviceName);
+  });
+  let deviceNames = [];
+  for (let deviceId of deviceIdSet) {
+    let name = deviceMap.get(deviceId);
+    if (name) {
+      deviceNames.push(name);
+    } else {
+      console.log("该设备没能匹配到对应设备名称：" + deviceId)
+    }
   }
-}
-return deviceNames.join(',');
+  return deviceNames.join(',');
 }
 
-function getDevicesAll(){
+function getDevicesAll() {
   listDeviceNoPage().then(response => {
     listDeviceAll.value = response.data;
   });
 }
 
-function changeSwitch(row){
+function changeSwitch(row) {
   ElMessageBox.confirm('确定修改该计算启用状态吗', '提示', {
-      distinguishCancelAndClose: true,
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
+    distinguishCancelAndClose: true,
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
   })
-  .then(() => {
-    console.log("确定");
-    let param = {
-      id:row.id,
-      computeSwitchTotal:row.computeSwitchTotal
+      .then(() => {
+        console.log("确定");
+        let param = {
+          id: row.id,
+          computeSwitchTotal: row.computeSwitchTotal
+        }
+        updateHeatapiconf(param);
+      })
+      .catch((action) => {
+        console.log("取消");
+        row.computeSwitchTotal = !row.computeSwitchTotal;
+      })
+
+}
+
+/**
+ * 格式化推送方
+ * @param row
+ * @param column
+ * @param cellValue
+ * @param index
+ */
+function formatterPushingCounterpart(row, column, cellValue, index) {
+  if (pushing_counterpart.value && pushing_counterpart.value.length > 0) {
+    let arr = pushing_counterpart.value.filter(item => {
+      if (item.value == cellValue) {
+        return item;
+      }
+    })
+    if (arr && arr.length > 0) {
+      return arr[0].label;
     }
-    updateHeatapiconf(param);
+  }
+}
+
+/**
+ * 格式化策略
+ * @param row
+ * @param column
+ * @param cellValue
+ * @param index
+ */
+function formatterStrategy(row, column, cellValue, index) {
+  if (effective_strategy.value && effective_strategy.value.length > 0) {
+    let arr = effective_strategy.value.filter(item => {
+      if (item.value == cellValue) {
+        return item;
+      }
+    })
+    if (arr && arr.length > 0) {
+      return arr[0].label;
+    }
+  }
+}
+
+/**
+ * 日期范围改变
+ * @param dataRange
+ */
+function dateRangeChange(dataRange) {
+  if (dataRange && dataRange.length > 0) {
+    form.value.startDate = dataRange[0];
+    form.value.endDate = dataRange[1];
+  }
+}
+
+function handleAddStrategyConf() {
+  deviceList.value = JSON.parse(JSON.stringify(listDevices.value));
+  console.log("deviceList", deviceList.value, deviceStrategyConfList.value);
+  if (deviceStrategyConfList.value && deviceStrategyConfList.value.length > 0) {
+    deviceList.value.forEach(device => {
+      let arr = deviceStrategyConfList.value.filter(item => item.deviceUuid === device.uuid);
+      if (arr && arr.length > 0) {
+        device.disabled = true;
+      }
+    })
+  }
+  strategyConfSaveForm.value.deviceList = [];
+  openStrategyConfAddForm.value = true;
+  nextTick(() => {
+    if (proxy.$refs["strategyConfSaveFormRef"]) {
+      proxy.$refs["strategyConfSaveFormRef"].clearValidate();
+    }
+  })
+}
+
+function handleUpdateStrategyConf(row) {
+  strategyConfEditForm.value = row;
+  openStrategyConfEditForm.value = true;
+}
+
+function handleDeleteStrategyConf(index) {
+  console.log("index", index);
+  proxy.$modal.confirm('是否确认删除该设备？').then(function () {
+    deviceStrategyConfList.value.splice(index, 1);
   })
-  .catch((action) => {
-    console.log("取消");
-    row.computeSwitchTotal = !row.computeSwitchTotal;
+}
+
+function submitStrategyConfEditForm() {
+  proxy.$refs["strategyConfEditFormRef"].validate(valid => {
+    if (valid) {
+      cancelStrategyConfEditForm();
+    }
+  });
+}
+
+function cancelStrategyConfEditForm() {
+  openStrategyConfEditForm.value = false;
+}
+
+function submitStrategyConfAddForm() {
+  proxy.$refs["strategyConfSaveFormRef"].validate(valid => {
+    if (valid) {
+      console.log("deviceStrategyConfList", deviceStrategyConfList.value);
+      listDevices.value.filter(obj => strategyConfSaveForm.value.deviceList.includes(obj.uuid)).forEach(obj => {
+        deviceStrategyConfList.value.push({
+          deviceUuid: obj.uuid,
+          strategy: 0
+        });
+      });
+      cancelStrategyConfAddForm();
+    }
   })
-  
+}
+
+function cancelStrategyConfAddForm() {
+  openStrategyConfAddForm.value = false;
+}
+
+function formatterDevicesName(row, column, cellValue, index) {
+  let arr = listDevices.value.filter(obj => obj.uuid === cellValue);
+  if (arr && arr.length > 0) {
+    return arr[0].deviceName;
+  } else {
+    return '';
+  }
+}
+
+function getDevicesName(deviceUuid) {
+  let arr = listDevices.value.filter(obj => obj.uuid === deviceUuid);
+  if (arr && arr.length > 0) {
+    return arr[0].deviceName;
+  } else {
+    return '';
+  }
 }
 
 getDevicesAll();
 getDeptTree();
 getDeptTreeSelectNew();
 getList();
+
 </script>
diff --git a/src/views/model/heatapiconf/paramModel.vue b/src/views/model/heatapiconf/paramModel.vue
index eb8b355..ce4f080 100644
--- a/src/views/model/heatapiconf/paramModel.vue
+++ b/src/views/model/heatapiconf/paramModel.vue
@@ -42,6 +42,11 @@
           {{ getParamClassName(scope.row.paramClassId) }}
         </template>
       </el-table-column>
+      <el-table-column label="推送方参数" align="center" prop="paramClassId">
+        <template #default="scope">
+          {{ scope.row.pushingCounterpartParam }}
+        </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)"/>
@@ -49,7 +54,7 @@
       </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> -->
+           <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>
@@ -59,7 +64,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改热源推送参数配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable destroy-on-close>
       <el-form ref="heatParamModelRef" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
@@ -71,7 +76,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
       <template #footer>
@@ -81,6 +85,23 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog title="编辑" v-model="openEdit" width="500px" append-to-body draggable destroy-on-close>
+      <el-form ref="heatParamModelEditRef" :model="editForm" :rules="editRules" label-width="110px">
+        <el-form-item label="参数模版：" prop="paramClassId">
+          {{paramClassFormat(editForm.paramClassId)}}
+        </el-form-item>
+        <el-form-item label="推送方参数：" prop="pushingCounterpartParam">
+          <el-input v-model="editForm.pushingCounterpartParam" placeholder="请输入推送方参数"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitEditForm">确 定</el-button>
+          <el-button @click="cancelEdit">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 <style lang="scss" > @import "@/assets/styles/self-defined.scss";
@@ -101,6 +122,7 @@ const { proxy } = getCurrentInstance();
 
 const heatParamModelList = ref([]);
 const open = ref(false);
+const openEdit = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref([]);
@@ -130,6 +152,10 @@ const data = reactive({
 });
 
 const { queryParams, form, rules } = toRefs(data);
+const editForm = ref({});
+const editRules = ref({
+  pushingCounterpartParam: [{ required: true, message: "推送方参数不能为空", trigger: "blur" }],
+});
 /** 查询热源推送参数配置列表 */
 
 function getList() {
@@ -211,22 +237,31 @@ function handleAdd() {
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset();
-  paramClassSelectedOld.value = [];
-  paramClassListNew.value = paramClassList.value;
-  let param = {
-    standardConfId:standardConfId
-  }
-  listHeatParamModelNoPage(param).then(response => {
-    response.data?.forEach(item=>{
-      paramClassSelectedOld.value.push(item.paramClassId);
-    });
-    form.value.paramClassId = paramClassSelectedOld.value;
-    open.value = true;
-    title.value = "修改热源推送参数配置";
+  editForm.value = row;
+  openEdit.value = true;
+  // proxy.resetForm("heatParamModelEditRef");
+}
+
+function submitEditForm() {
+  proxy.$refs["heatParamModelEditRef"].validate(valid => {
+    if (valid) {
+      if (editForm.value.id != null) {
+        updateHeatParamModel(editForm.value).then(response => {
+          proxy.$modal.msgSuccess("保存成功");
+          openEdit.value = false;
+          getList();
+        });
+      }
+    }
   });
 }
 
+function cancelEdit() {
+  proxy.$refs["heatParamModelEditRef"].resetFields();
+  openEdit.value = false;
+  getList();
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["heatParamModelRef"].validate(valid => {
@@ -310,8 +345,9 @@ function getHeatList() {
 
 
 function getHeatName(standardConfId) {
+  console.log(standardConfId, heatList.value)
   for (let item of heatList.value) {
-    if (String(item.id) === standardConfId) {
+    if (String(item.id) === String(standardConfId)) {
       return item.orgName
     }
   }
@@ -378,7 +414,17 @@ function theSameToEachOther(row){
   }
 }
 
-
+function paramClassFormat(paramClassId) {
+  console.log(paramClassId, paramClassList.value)
+  let paramClassName = '';
+  if (paramClassId) {
+    let arr = paramClassList.value.filter((item) => item.paramClassCode === paramClassId)
+    if (arr && arr.length > 0) {
+      paramClassName = arr[0].paramClassName;
+    }
+  }
+  return paramClassName;
+}
 
 getHeatList();
 getParamModel();

From 614f70d596ca2e77c511ebf252b761e27c2306e7 Mon Sep 17 00:00:00 2001
From: fuguobin <fgbin2008@163.com>
Date: Thu, 21 Mar 2024 18:07:08 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                    |   2 +-
 src/api/model/asset/params.js       |  57 +++--
 src/views/model/asset/addParams.vue | 340 +++++++++++++++++++---------
 src/views/model/asset/index.vue     | 281 ++++++++++++++++-------
 src/views/model/asset/params.vue    |  20 +-
 5 files changed, 476 insertions(+), 224 deletions(-)

diff --git a/.env.development b/.env.development
index 218ef3c..38a0253 100644
--- a/.env.development
+++ b/.env.development
@@ -5,5 +5,5 @@ VITE_APP_TITLE = 联美运营系统
 VITE_APP_ENV = 'development'
 
 # 联美运营系统/开发环境
-VITE_APP_BASE_API = 'http://localhost:9010'
+VITE_APP_BASE_API = 'http://10.10.10.56:9010'
 VITE_APP_BASE_API_IMAGE = 'http://localhost:9010'
diff --git a/src/api/model/asset/params.js b/src/api/model/asset/params.js
index 1d027d9..1435f90 100644
--- a/src/api/model/asset/params.js
+++ b/src/api/model/asset/params.js
@@ -1,53 +1,62 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 查询资产参数列表
 export function listParams(query) {
   return request({
-    url: '/model/dcBaseAssetParams/list',
-    method: 'get',
-    params: query
-  })
+    url: "/model/dcBaseAssetParams/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询资产参数详细
 export function getParams(id) {
   return request({
-    url: '/model/dcBaseAssetParams/' + id,
-    method: 'get'
-  })
+    url: "/model/dcBaseAssetParams/" + id,
+    method: "get",
+  });
 }
 
 // 新增资产参数
 export function addParams(data) {
   return request({
-    url: '/model/dcBaseAssetParams',
-    method: 'post',
-    data: data
-  })
+    url: "/model/dcBaseAssetParams",
+    method: "post",
+    data: data,
+  });
 }
 
 // 修改资产参数
 export function updateParams(data) {
   return request({
-    url: '/model/dcBaseAssetParams',
-    method: 'put',
-    data: data
-  })
+    url: "/model/dcBaseAssetParams",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除资产参数
 export function delParams(id) {
   return request({
-    url: '/model/dcBaseAssetParams/' + id,
-    method: 'delete'
-  })
+    url: "/model/dcBaseAssetParams/" + id,
+    method: "delete",
+  });
 }
 
 // 导出资产参数
 export function exportParams(query) {
   return request({
-    url: '/${baseUrl}/export',
-    method: 'get',
-    params: query
-  })
-}
\ No newline at end of file
+    url: "/${baseUrl}/export",
+    method: "get",
+    params: query,
+  });
+}
+
+// 根据设备查询设备参数列表
+export function listByDeviceUuids(data) {
+  return request({
+    url: "/model/dcBaseDeviceParam/listByDeviceUuids",
+    method: "post",
+    data: data,
+  });
+}
diff --git a/src/views/model/asset/addParams.vue b/src/views/model/asset/addParams.vue
index cec031b..1b51a62 100644
--- a/src/views/model/asset/addParams.vue
+++ b/src/views/model/asset/addParams.vue
@@ -1,22 +1,83 @@
 <template>
   <div class="app-container">
+    <div class="submitBtn">
+      <el-button
+        type="primary"
+        :icon="Check"
+        @click="paramSubmit(paramsFormRef)"
+      >
+        提交
+      </el-button>
+    </div>
     <el-collapse class="paramsCollapse" v-model="activeNames">
       <el-collapse-item title="基本信息" name="1">
-        <el-form :inline="true" :model="addForm" class="demo-form-inline">
-          <el-form-item label="资产编号">
+        <el-form
+          ref="paramsFormRef"
+          class="paramsForm"
+          :rules="paramsRules"
+          :inline="true"
+          :model="paramsForm"
+        >
+          <el-form-item label="组织" prop="orgName">
+            <el-tree-select
+              v-model="paramsForm.orgName"
+              :data="deptOptions"
+              :props="{
+                value: 'label',
+                label: 'label',
+                children: 'children',
+              }"
+              value-key="id"
+              placeholder="请选择"
+              check-strictly
+              :default-expand-all="true"
+              @node-click="selectDept"
+            />
+          </el-form-item>
+          <el-form-item label="编码">
             <el-input
-              v-model="addForm.num"
-              placeholder="资产编号"
+              v-model="paramsForm.assetCode"
+              placeholder="编码"
               clearable
-              readonly
             />
           </el-form-item>
-          <el-form-item label="资产名称">
-            <el-input v-model="addForm.name" placeholder="资产名称" clearable />
+          <el-form-item label="是否可用" prop="flagEnabled">
+            <el-select
+              v-model="paramsForm.flagEnabled"
+              placeholder="请选择是否可用"
+            >
+              <el-option
+                v-for="dict in enabledFlag"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="名称" prop="assetName">
+            <el-input
+              v-model="paramsForm.assetName"
+              placeholder="名称"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="类别" prop="assetType">
+            <el-select
+              v-model="paramsForm.assetType"
+              placeholder="请选择类别"
+              clearable
+            >
+              <el-option
+                v-for="dict in dc_asset_attr"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="组成设备">
             <el-select
-              v-model="addForm.device"
+              v-model="paramsDevice"
               multiple
               filterable
               allow-create
@@ -26,10 +87,10 @@
               style="width: 240px"
             >
               <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                v-for="item in deviceOption"
+                :key="item.id"
+                :label="item.deviceName"
+                :value="item.centerDeviceCode"
               />
             </el-select>
           </el-form-item>
@@ -42,16 +103,16 @@
         <vxe-table
           class="tableCollapse"
           border
-          ref="tableRef"
+          ref="paramsTableRef"
           max-height="400"
           :row-config="{ isHover: true }"
           :loading="loading"
-          :data="tableListData"
+          :data="paramsList"
         >
           <vxe-column type="checkbox" width="60"></vxe-column>
-          <vxe-column field="role" title="参数编码"></vxe-column>
+          <vxe-column field="paramCode" title="参数编码"></vxe-column>
           <vxe-column
-            field="address"
+            field="paramName"
             title="参数名称"
             :filters="addressOptions"
             :filter-method="filterAddressMethod"
@@ -70,14 +131,14 @@
               ></vxe-input>
             </template>
           </vxe-column>
-          <vxe-column field="youxiao" title="是否有效">
+          <vxe-column field="flagEnabled" title="是否有效">
             <template #default="{ row }">
-              <vxe-checkbox v-model="row.youxiao"></vxe-checkbox>
+              <vxe-checkbox v-model="row.flagEnabled"></vxe-checkbox>
             </template>
           </vxe-column>
-          <vxe-column field="kekong" title="是否可控">
+          <vxe-column field="contrlFlag" title="是否可控">
             <template #default="{ row }">
-              <vxe-checkbox v-model="row.kekong"></vxe-checkbox>
+              <vxe-checkbox v-model="row.contrlFlag"></vxe-checkbox>
             </template>
           </vxe-column>
         </vxe-table>
@@ -87,23 +148,23 @@
       class="addDialog"
       v-model="dialogTableVisible"
       title="选择参数"
-      width="900"
+      width="1200"
     >
       <vxe-table
         class="tableDialog"
         border
-        ref="tableRef"
+        ref="addTableRef"
         max-height="400"
         :row-config="{ isHover: true }"
         :loading="loading"
-        :data="tableData"
+        :data="paramsData"
       >
         <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="id" title="设备编码" sortable></vxe-column>
-        <vxe-column field="name" title="设备名称"></vxe-column>
-        <vxe-column field="role" title="参数编码"></vxe-column>
+        <vxe-column field="deviceUuid" title="设备编码" sortable></vxe-column>
+        <vxe-column field="deviceName" title="设备名称"></vxe-column>
+        <vxe-column field="paramCode" title="参数编码"></vxe-column>
         <vxe-column
-          field="age"
+          field="paramModelName"
           title="参数模版名称"
           :filters="ageOptions"
           :filter-method="filterAgeMethod"
@@ -123,7 +184,7 @@
           </template>
         </vxe-column>
         <vxe-column
-          field="address"
+          field="paramName"
           title="参数名称"
           :filters="addressOptions"
           :filter-method="filterAddressMethod"
@@ -143,7 +204,7 @@
           </template>
         </vxe-column>
         <vxe-column
-          field="sex"
+          field="partion"
           title="分区"
           :filter-multiple="false"
           :filters="sexOptions"
@@ -152,9 +213,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="dialogTableVisible = false">取消</el-button>
-          <el-button type="primary" @click="dialogTableVisible = false">
-            确认
-          </el-button>
+          <el-button type="primary" @click="addConfirm"> 确认 </el-button>
         </div>
       </template>
     </el-dialog>
@@ -163,94 +222,65 @@
 <script setup>
 import { ref, reactive, onMounted } from "vue";
 import { useRoute } from "vue-router";
+import { deptTreeSelect } from "@/api/system/user";
+import { listByDeviceUuids } from "@/api/model/asset/params";
+import { listDeviceNoPage } from "@/api/model/device";
+import {
+  listInfo,
+  getInfo,
+  delInfo,
+  addInfo,
+  updateInfo,
+} from "@/api/model/asset/info";
+import { Check } from "@element-plus/icons-vue";
+
+const { proxy } = getCurrentInstance();
+const { dc_asset_attr } = proxy.useDict("dc_asset_attr");
+
 const activeNames = ref(["1", "2"]);
 const route = useRoute();
+const id = route.query.id;
+const paramsFormRef = ref();
 const dialogTableVisible = ref(false);
-const addForm = reactive({
-  num: route.query.assetCode,
-  name: "",
-  device: [],
+const deptOptions = ref([]);
+const paramsData = ref([]);
+const paramsList = ref([]);
+const paramsCode = ref([]);
+const paramsDevice = ref([]);
+const deviceOption = ref([]);
+const enabledFlag = ref([
+  { label: "可用", value: 1, elTagType: "default", elTagClass: null },
+  { label: "不可用", value: 0, elTagType: "default", elTagClass: null },
+]);
+const paramsForm = reactive({
+  assetCode: "",
+  flagEnabled: null,
+  assetName: "",
+  assetType: "",
+  orgCode: null,
+  orgName: "",
+  assetParamsDtos: [
+    {
+      paramCode: "",
+      flagEnabled: false,
+      contrlFlag: false,
+    },
+  ],
 });
-const options = [
-  {
-    value: "HTML",
-    label: "HTML",
-  },
-  {
-    value: "CSS",
-    label: "CSS",
-  },
-  {
-    value: "JavaScript",
-    label: "JavaScript",
-  },
-];
-const tableRef = ref();
+const paramsTableRef = ref();
+const addTableRef = ref();
 const loading = ref(false);
-const tableData = ref([
-  {
-    id: 10001,
-    name: "Test1",
-    role: "Develop",
-    sex: "Man",
-    age: 28,
-    address: "test",
-  },
-  {
-    id: 10002,
-    name: "Test2",
-    role: "admin",
-    sex: "Man",
-    age: 29,
-    address: "asd",
-  },
-  {
-    id: 10003,
-    name: "Test3",
-    role: "useer",
-    sex: "Man",
-    age: 22,
-    address: "qsx",
-  },
-]);
-const tableListData = ref([
-  {
-    id: 10001,
-    name: "Test1",
-    role: "Develop",
-    sex: "Man",
-    age: 28,
-    address: "test",
-    youxiao: true,
-    kekong: false,
-  },
-  {
-    id: 10002,
-    name: "Test2",
-    role: "admin",
-    sex: "Man",
-    age: 29,
-    address: "asd",
-    youxiao: false,
-    kekong: true,
-  },
-  {
-    id: 10003,
-    name: "Test3",
-    role: "useer",
-    sex: "Man",
-    age: 22,
-    address: "qsx",
-    youxiao: false,
-    kekong: false,
-  },
-]);
 const sexOptions = ref([
-  { label: "高", value: "Man" },
-  { label: "中", value: "Women" },
+  { label: "高区", value: "高区" },
+  { label: "中区", value: "中区" },
+  { label: "低区", value: "低区" },
 ]);
 const ageOptions = ref([{ data: "" }]);
 const addressOptions = ref([{ data: "" }]);
+const paramsRules = reactive({
+  assetName: [{ required: true, message: "请输入资产名称", trigger: "blur" }],
+});
+
 const filterAgeMethod = ({ option, row }) => {
   return row.age === Number(option.data);
 };
@@ -265,11 +295,95 @@ const filterAddressRecoverMethod = ({ option }) => {
   // 如果是自定义筛选模板，当为点击确认时，该选项将被恢复为默认值
   option.data = "";
 };
-onMounted(() => {});
+onMounted(() => {
+  const dsfsdf = route.query.id;
+  debugger;
+  getDeptTree();
+  getDevice();
+});
+function getDeptTree() {
+  //获取部门树
+  deptTreeSelect().then((response) => {
+    deptOptions.value = response.data;
+  });
+}
+function getDevice() {
+  //获取部门树
+  listDeviceNoPage().then((response) => {
+    deviceOption.value = response.data;
+  });
+}
+
 function selectParams() {
   //选择参数
-  dialogTableVisible.value = true;
+  if (paramsDevice.value.length != 0) {
+    const params = {
+      deviceUuids: paramsDevice.value,
+      excludeParamCodes: [],
+    };
+    listByDeviceUuids(params).then((res) => {
+      if (res.code === 200) {
+        paramsData.value = res.data;
+        dialogTableVisible.value = true;
+      }
+    });
+  }
+}
+function selectDept(val) {
+  //部门参数选择
+  paramsForm.orgCode = val.id;
 }
+function addConfirm() {
+  //选择参数确认
+  const $addTable = addTableRef.value;
+  if ($addTable) {
+    const selectRecords = $addTable.getCheckboxRecords();
+    paramsList.value = selectRecords.map((item) => {
+      return {
+        ...item,
+        flagEnabled: false,
+        contrlFlag: false,
+      };
+    });
+    paramsCode.value = selectRecords.map((item) => item.paramCode);
+    dialogTableVisible.value = false;
+  }
+}
+
+const paramSubmit = async (formEl) => {
+  //提交
+  if (!formEl) return;
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const $submitTable = paramsTableRef.value;
+      if ($submitTable) {
+        const selectParamsList = $submitTable.getCheckboxRecords();
+        const selectParamsListArr = selectParamsList.map((item) => ({
+          paramCode: item.paramCode,
+          flagEnabled: item.flagEnabled,
+          contrlFlag: item.contrlFlag,
+        }));
+        paramsForm.assetParamsDtos = selectParamsListArr;
+        if (id.value != undefined) {
+          updateInfo(paramsForm).then((response) => {
+            proxy.$modal.msgSuccess("修改成功");
+            open.value = false;
+            getList();
+          });
+        } else {
+          addInfo(paramsForm).then((response) => {
+            proxy.$modal.msgSuccess("新增成功");
+            open.value = false;
+            getList();
+          });
+        }
+        console.log(paramsForm);
+      }
+    } else {
+      console.log("error submit!", fields);
+    }
+  });
+};
 </script>
 <style scoped>
 .paramsCollapse {
diff --git a/src/views/model/asset/index.vue b/src/views/model/asset/index.vue
index 028efc7..fcf316e 100644
--- a/src/views/model/asset/index.vue
+++ b/src/views/model/asset/index.vue
@@ -3,52 +3,110 @@
     <el-row>
       <el-col :span="4" class="card-box">
         <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            prefix-icon="Search"
+            style="margin-bottom: 20px"
+          />
         </div>
         <div class="head-container">
-          <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all
-            @node-click="handleNodeClick" />
+          <el-tree
+            :data="deptOptions"
+            :props="{ label: 'label', children: 'children' }"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="deptTreeRef"
+            node-key="id"
+            highlight-current
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
         </div>
       </el-col>
       <el-col :span="20" class="card-box">
-        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form
+          :model="queryParams"
+          ref="queryRef"
+          :inline="true"
+          v-show="showSearch"
+          label-width="100px"
+        >
           <el-form-item label="编码" prop="assetCode">
-            <el-input v-model="queryParams.assetCode" placeholder="请输入编码" clearable @keyup.enter="handleQuery" />
+            <el-input
+              v-model="queryParams.assetCode"
+              placeholder="请输入编码"
+              clearable
+              @keyup.enter="handleQuery"
+            />
           </el-form-item>
           <!-- <el-form-item label="是否有效" prop="flagEnabled">
             <el-input v-model="queryParams.flagEnabled" placeholder="请输入是否有效" clearable @keyup.enter="handleQuery" />
           </el-form-item> -->
           <el-form-item label="名称" prop="assetName">
-            <el-input v-model="queryParams.assetName" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
+            <el-input
+              v-model="queryParams.assetName"
+              placeholder="请输入名称"
+              clearable
+              @keyup.enter="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="类别" prop="assetType">
-            <el-select v-model="queryParams.assetType" placeholder="请选择类别" clearable>
-              <el-option v-for="dict in dc_asset_attr" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-select
+              v-model="queryParams.assetType"
+              placeholder="请选择类别"
+              clearable
+            >
+              <el-option
+                v-for="dict in dc_asset_attr"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
             </el-select>
           </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-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-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="Edit" @click="handleUpdate">修改</el-button>
+            <el-button type="success" icon="Delete" @click="handleDelete"
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" icon="Delete" @click="handleDelete">删除</el-button>
+            <el-button type="warning" icon="Download" @click="handleExport"
+              >导出</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>
+          <right-toolbar
+            v-model:showSearch="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+        <el-table
+          v-loading="loading"
+          :data="infoList"
+          @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="assetCode" />
@@ -59,19 +117,43 @@
             </template>
           </el-table-column>
           <el-table-column label="组织" align="center" prop="orgName" />
-          <el-table-column label="操作" align="center" width="350" class-name="small-padding fixed-width">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="350"
+            class-name="small-padding fixed-width"
+          >
             <template #default="scope">
-              <el-button type="text" icon="Edit" @click="handleParams(scope.row)">参数</el-button>
+              <el-button
+                type="text"
+                icon="Edit"
+                @click="handleParams(scope.row)"
+                >参数</el-button
+              >
               <!-- <el-button type="text" icon="Edit" @click="handleDevices(scope.row)">关联设备</el-button> -->
-              <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
-              <el-button type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+              <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" />
-
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
@@ -81,14 +163,29 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="组织" prop="orgName">
-              <el-tree-select v-model="form.orgName" :data="deptOptions"
-                :props="{ value: 'label', label: 'label', children: 'children' }" value-key="id" placeholder="请选择"
-                check-strictly :default-expand-all="true" @node-click="selectDept" />
+              <el-tree-select
+                v-model="form.orgName"
+                :data="deptOptions"
+                :props="{
+                  value: 'label',
+                  label: 'label',
+                  children: 'children',
+                }"
+                value-key="id"
+                placeholder="请选择"
+                check-strictly
+                :default-expand-all="true"
+                @node-click="selectDept"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="false">
             <el-form-item label="所属组织编码" prop="orgCode">
-              <el-input v-model="form.orgCode" placeholder="请选择组织名称" disabled />
+              <el-input
+                v-model="form.orgCode"
+                placeholder="请选择组织名称"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -98,8 +195,16 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="是否可用" prop="flagEnabled">
-              <el-select v-model="form.flagEnabled" placeholder="请选择是否可用">
-                <el-option v-for="dict in enabledFlag" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-select
+                v-model="form.flagEnabled"
+                placeholder="请选择是否可用"
+              >
+                <el-option
+                  v-for="dict in enabledFlag"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -111,12 +216,15 @@
           <el-col :span="12">
             <el-form-item label="类别" prop="assetType">
               <el-select v-model="form.assetType" placeholder="请选择类别">
-                <el-option v-for="dict in dc_asset_attr" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
+                <el-option
+                  v-for="dict in dc_asset_attr"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
       <template #footer>
@@ -130,11 +238,17 @@
 </template>
 
 <script setup name="AssetInfo">
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/model/asset/info";
+import {
+  listInfo,
+  getInfo,
+  delInfo,
+  addInfo,
+  updateInfo,
+} from "@/api/model/asset/info";
 import { deptTreeSelect } from "@/api/system/user";
 
 const { proxy } = getCurrentInstance();
-const { dc_asset_attr } = proxy.useDict('dc_asset_attr');
+const { dc_asset_attr } = proxy.useDict("dc_asset_attr");
 const router = useRouter();
 const infoList = ref([]);
 const open = ref(false);
@@ -147,8 +261,8 @@ const total = ref(0);
 const title = ref("");
 
 const enabledFlag = ref([
-  { label: '可用', value: 1, elTagType: 'default', elTagClass: null },
-  { label: '不可用', value: 0, elTagType: 'default', elTagClass: null }
+  { label: "可用", value: 1, elTagType: "default", elTagClass: null },
+  { label: "不可用", value: 0, elTagType: "default", elTagClass: null },
 ]);
 
 const data = reactive({
@@ -162,10 +276,9 @@ const data = reactive({
     assetName: null,
     assetType: null,
     orgCode: null,
-    orgName: null
+    orgName: null,
   },
-  rules: {
-  }
+  rules: {},
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -173,7 +286,7 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询资产信息列表 */
 function getList() {
   loading.value = true;
-  listInfo(queryParams.value).then(response => {
+  listInfo(queryParams.value).then((response) => {
     infoList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -205,12 +318,11 @@ function reset() {
     assetName: null,
     assetType: null,
     orgCode: null,
-    orgName: null
+    orgName: null,
   };
   proxy.resetForm("infoRef");
 }
 
-
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
@@ -225,20 +337,19 @@ function resetQuery() {
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 
-
 /** 跳转参数 */
 function handleParams(row) {
   router.push({
     path: "AssetParams",
     query: {
       id: row.id,
-      assetCode: row.assetCode
-    }
+      assetCode: row.assetCode,
+    },
   });
 }
 /** 跳转关联设备 */
@@ -247,41 +358,51 @@ function handleDevice(row) {
     path: "params",
     query: {
       id: row.id,
-      assetCode: row.assetCode
-    }
+      assetCode: row.assetCode,
+    },
   });
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  reset();
-  open.value = true;
-  title.value = "添加资产信息";
+  router.push({
+    path: "AddParams",
+  });
+  // reset();
+  // open.value = true;
+  // title.value = "添加资产信息";
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset();
-  const _id = row.id || ids.value
-  getInfo(_id).then(response => {
-    form.value = response.data;
-    open.value = true;
-    title.value = "修改资产信息";
+  // reset();
+  const id = row.id || ids.value;
+  debugger;
+  router.push({
+    path: "AddParams",
+    query: {
+      id,
+    },
   });
+  // getInfo(_id).then((response) => {
+  //   form.value = response.data;
+  //   open.value = true;
+  //   title.value = "修改资产信息";
+  // });
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["infoRef"].validate(valid => {
+  proxy.$refs["infoRef"].validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateInfo(form.value).then(response => {
+        updateInfo(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-        addInfo(form.value).then(response => {
+        addInfo(form.value).then((response) => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -294,19 +415,27 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除资产信息编号为"' + _ids + '"的数据项？').then(function () {
-    return delInfo(_ids);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => { });
+  proxy.$modal
+    .confirm('是否确认删除资产信息编号为"' + _ids + '"的数据项？')
+    .then(function () {
+      return delInfo(_ids);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('model.asset/info/export', {
-    ...queryParams.value
-  }, `info_${new Date().getTime()}.xlsx`)
+  proxy.download(
+    "model.asset/info/export",
+    {
+      ...queryParams.value,
+    },
+    `info_${new Date().getTime()}.xlsx`
+  );
 }
 
 getList();
@@ -316,10 +445,10 @@ getDeptTree();
 const deptOptions = ref([]);
 const deptName = ref(null);
 function getDeptTree() {
-  deptTreeSelect().then(response => {
+  deptTreeSelect().then((response) => {
     deptOptions.value = response.data;
   });
-};
+}
 /** 通过条件过滤节点  */
 const filterNode = (value, data) => {
   if (!value) return true;
@@ -329,13 +458,13 @@ const filterNode = (value, data) => {
 function handleNodeClick(data) {
   queryParams.value.orgCode = data.id;
   handleQuery();
-};
+}
 
 function selectDept(val) {
   form.value.orgCode = val.id;
 }
 /** 根据名称筛选部门树 */
-watch(deptName, val => {
+watch(deptName, (val) => {
   proxy.$refs["deptTreeRef"].filter(val);
 });
 </script>
diff --git a/src/views/model/asset/params.vue b/src/views/model/asset/params.vue
index 10ec9d7..7069041 100644
--- a/src/views/model/asset/params.vue
+++ b/src/views/model/asset/params.vue
@@ -300,16 +300,16 @@ function handleSelectionChange(selection) {
 
 /** 新增按钮操作 */
 function handleAdd() {
-  router.push({
-    path: "AddParams",
-    query: {
-      assetCode,
-    },
-  });
-  // reset();
-  // form.value.assetCode = assetCode
-  // open.value = true;
-  // title.value = "添加资产参数";
+  // router.push({
+  //   path: "AddParams",
+  //   query: {
+  //     assetCode,
+  //   },
+  // });
+  reset();
+  form.value.assetCode = assetCode;
+  open.value = true;
+  title.value = "添加资产参数";
 }
 
 /** 修改按钮操作 */

From 77ada34378f7e52121a6c02dd0efb9b95a34a87e Mon Sep 17 00:00:00 2001
From: fuguobin <fgbin2008@163.com>
Date: Fri, 22 Mar 2024 17:01:46 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js           | 130 +++++++------
 src/views/model/asset/addParams.vue | 277 ++++++++++++++++++++--------
 src/views/model/asset/index.vue     |   3 +-
 3 files changed, 269 insertions(+), 141 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6d8c05f..43a4e5d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,70 +1,78 @@
-import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
-import defAva from '@/assets/images/profile.jpg'
+import { login, logout, getInfo } from "@/api/login";
+import { getToken, setToken, removeToken } from "@/utils/auth";
+import defAva from "@/assets/images/profile.jpg";
 
-const useUserStore = defineStore(
-  'user',
-  {
-    state: () => ({
-      token: getToken(),
-      name: '',
-      avatar: '',
-      roles: [],
-      permissions: []
-    }),
-    actions: {
-      // 登录
-      login(userInfo) {
-        const username = userInfo.username.trim()
-        const password = userInfo.password
-        const code = userInfo.code
-        const uuid = userInfo.uuid
-        return new Promise((resolve, reject) => {
-          login(username, password, code, uuid).then(res => {
-            setToken(res.token)
-            this.token = res.token
-            resolve()
-          }).catch(error => {
-            reject(error)
+const useUserStore = defineStore("user", {
+  state: () => ({
+    token: getToken(),
+    name: "",
+    avatar: "",
+    roles: [],
+    permissions: [],
+  }),
+  actions: {
+    // 登录
+    login(userInfo) {
+      const username = userInfo.username.trim();
+      const password = userInfo.password;
+      const code = userInfo.code;
+      const uuid = userInfo.uuid;
+      return new Promise((resolve, reject) => {
+        login(username, password, code, uuid)
+          .then((res) => {
+            setToken(res.token);
+            this.token = res.token;
+            resolve();
           })
-        })
-      },
-      // 获取用户信息
-      getInfo() {
-        return new Promise((resolve, reject) => {
-          getInfo().then(res => {
-            const user = res.user
-            const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+    // 获取用户信息
+    getInfo() {
+      return new Promise((resolve, reject) => {
+        getInfo()
+          .then((res) => {
+            const user = res.user;
+            const avatar =
+              user.avatar == "" || user.avatar == null
+                ? defAva
+                : import.meta.env.VITE_APP_BASE_API + user.avatar;
 
-            if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-              this.roles = res.roles
-              this.permissions = res.permissions
+            if (res.roles && res.roles.length > 0) {
+              // 验证返回的roles是否是一个非空数组
+              this.roles = res.roles;
+              this.permissions = res.permissions;
             } else {
-              this.roles = ['ROLE_DEFAULT']
+              this.roles = ["ROLE_DEFAULT"];
             }
-            this.name = user.userName
+            this.name = user.userName;
             this.avatar = avatar;
-            resolve(res)
-          }).catch(error => {
-            reject(error)
+            resolve(res);
           })
-        })
-      },
-      // 退出系统
-      logOut() {
-        return new Promise((resolve, reject) => {
-          logout(this.token).then(() => {
-            this.token = ''
-            this.roles = []
-            this.permissions = []
-            removeToken()
-            resolve()
-          }).catch(error => {
-            reject(error)
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+    // 退出系统
+    logOut() {
+      return new Promise((resolve, reject) => {
+        logout(this.token)
+          .then(() => {
+            this.token = "";
+            this.roles = [];
+            this.permissions = [];
+            removeToken();
+            resolve();
           })
-        })
-      }
-    }
-  })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+  },
+});
 
-export default useUserStore
+export default useUserStore;
diff --git a/src/views/model/asset/addParams.vue b/src/views/model/asset/addParams.vue
index 1b51a62..87081cd 100644
--- a/src/views/model/asset/addParams.vue
+++ b/src/views/model/asset/addParams.vue
@@ -3,10 +3,10 @@
     <div class="submitBtn">
       <el-button
         type="primary"
-        :icon="Check"
+        :icon="submitIcon"
         @click="paramSubmit(paramsFormRef)"
       >
-        提交
+        {{ paramsText }}
       </el-button>
     </div>
     <el-collapse class="paramsCollapse" v-model="activeNames">
@@ -16,11 +16,11 @@
           class="paramsForm"
           :rules="paramsRules"
           :inline="true"
-          :model="paramsForm"
+          :model="formData.paramsForm"
         >
           <el-form-item label="组织" prop="orgName">
             <el-tree-select
-              v-model="paramsForm.orgName"
+              v-model="formData.paramsForm.orgName"
               :data="deptOptions"
               :props="{
                 value: 'label',
@@ -34,16 +34,16 @@
               @node-click="selectDept"
             />
           </el-form-item>
-          <el-form-item label="编码">
+          <el-form-item label="编码" prop="assetCode">
             <el-input
-              v-model="paramsForm.assetCode"
+              v-model="formData.paramsForm.assetCode"
               placeholder="编码"
               clearable
             />
           </el-form-item>
           <el-form-item label="是否可用" prop="flagEnabled">
             <el-select
-              v-model="paramsForm.flagEnabled"
+              v-model="formData.paramsForm.flagEnabled"
               placeholder="请选择是否可用"
             >
               <el-option
@@ -56,14 +56,14 @@
           </el-form-item>
           <el-form-item label="名称" prop="assetName">
             <el-input
-              v-model="paramsForm.assetName"
+              v-model="formData.paramsForm.assetName"
               placeholder="名称"
               clearable
             />
           </el-form-item>
           <el-form-item label="类别" prop="assetType">
             <el-select
-              v-model="paramsForm.assetType"
+              v-model="formData.paramsForm.assetType"
               placeholder="请选择类别"
               clearable
             >
@@ -75,31 +75,48 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="组成设备">
-            <el-select
-              v-model="paramsDevice"
-              multiple
-              filterable
-              allow-create
-              default-first-option
-              :reserve-keyword="false"
-              placeholder="组成设备"
-              style="width: 240px"
-            >
-              <el-option
-                v-for="item in deviceOption"
-                :key="item.id"
-                :label="item.deviceName"
-                :value="item.centerDeviceCode"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="success" @click="selectParams">选择参数</el-button>
-          </el-form-item>
+          <div>
+            <el-form-item label="组成设备">
+              <el-select
+                v-model="paramsDevice"
+                multiple
+                filterable
+                allow-create
+                default-first-option
+                collapse-tags
+                collapse-tags-tooltip
+                :max-collapse-tags="3"
+                :reserve-keyword="false"
+                placeholder="组成设备"
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="item in deviceOption"
+                  :key="item.id"
+                  :label="item.deviceName"
+                  :value="item.centerDeviceCode"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="success" @click="selectParams"
+                >选择参数</el-button
+              >
+            </el-form-item>
+          </div>
         </el-form>
       </el-collapse-item>
       <el-collapse-item title="参数列表" name="2">
+        <vxe-toolbar>
+          <template #buttons>
+            <vxe-button
+              status="danger"
+              content="删除"
+              icon="vxe-icon-delete"
+              @click="removeEvent()"
+            ></vxe-button>
+          </template>
+        </vxe-toolbar>
         <vxe-table
           class="tableCollapse"
           border
@@ -115,8 +132,8 @@
             field="paramName"
             title="参数名称"
             :filters="addressOptions"
-            :filter-method="filterAddressMethod"
-            :filter-recover-method="filterAddressRecoverMethod"
+            :filter-method="filterParamName"
+            :filter-recover-method="filterParamNameRecover"
           >
             <template #filter="{ $panel, column }">
               <vxe-input
@@ -141,6 +158,15 @@
               <vxe-checkbox v-model="row.contrlFlag"></vxe-checkbox>
             </template>
           </vxe-column>
+          <vxe-column title="操作" width="100" show-overflow>
+            <template #default="{ row }">
+              <vxe-button
+                type="text"
+                icon="vxe-icon-delete"
+                @click="removeEvent(row)"
+              ></vxe-button>
+            </template>
+          </vxe-column>
         </vxe-table>
       </el-collapse-item>
     </el-collapse>
@@ -167,8 +193,8 @@
           field="paramModelName"
           title="参数模版名称"
           :filters="ageOptions"
-          :filter-method="filterAgeMethod"
-          :filter-recover-method="filterAgeRecoverMethod"
+          :filter-method="filterParamModel"
+          :filter-recover-method="filterParamModelRecover"
         >
           <template #filter="{ $panel, column }">
             <vxe-input
@@ -187,8 +213,8 @@
           field="paramName"
           title="参数名称"
           :filters="addressOptions"
-          :filter-method="filterAddressMethod"
-          :filter-recover-method="filterAddressRecoverMethod"
+          :filter-method="filterParamNameSel"
+          :filter-recover-method="filterParamNameRecoverSel"
         >
           <template #filter="{ $panel, column }">
             <vxe-input
@@ -221,9 +247,13 @@
 </template>
 <script setup>
 import { ref, reactive, onMounted } from "vue";
-import { useRoute } from "vue-router";
+import { ElMessage } from "element-plus";
 import { deptTreeSelect } from "@/api/system/user";
-import { listByDeviceUuids } from "@/api/model/asset/params";
+import {
+  listByDeviceUuids,
+  listParams,
+  delParams,
+} from "@/api/model/asset/params";
 import { listDeviceNoPage } from "@/api/model/device";
 import {
   listInfo,
@@ -239,7 +269,11 @@ const { dc_asset_attr } = proxy.useDict("dc_asset_attr");
 
 const activeNames = ref(["1", "2"]);
 const route = useRoute();
+const router = useRouter();
 const id = route.query.id;
+const ids = ref();
+const submitIcon = ref("Plus");
+const paramsText = ref("新增");
 const paramsFormRef = ref();
 const dialogTableVisible = ref(false);
 const deptOptions = ref([]);
@@ -252,55 +286,95 @@ const enabledFlag = ref([
   { label: "可用", value: 1, elTagType: "default", elTagClass: null },
   { label: "不可用", value: 0, elTagType: "default", elTagClass: null },
 ]);
-const paramsForm = reactive({
-  assetCode: "",
-  flagEnabled: null,
-  assetName: "",
-  assetType: "",
-  orgCode: null,
-  orgName: "",
-  assetParamsDtos: [
-    {
-      paramCode: "",
-      flagEnabled: false,
-      contrlFlag: false,
-    },
-  ],
+const formData = reactive({
+  paramsForm: {
+    assetCode: "",
+    flagEnabled: null,
+    assetName: "",
+    assetType: "",
+    orgCode: null,
+    orgName: "",
+    assetParamsDtos: [
+      {
+        paramCode: "",
+        flagEnabled: false,
+        contrlFlag: false,
+      },
+    ],
+  },
 });
 const paramsTableRef = ref();
 const addTableRef = ref();
 const loading = ref(false);
 const sexOptions = ref([
-  { label: "高区", value: "高区" },
-  { label: "中区", value: "中区" },
-  { label: "低区", value: "低区" },
+  { label: "A", value: "A" },
+  { label: "B", value: "B" },
+  { label: "C", value: "C" },
+  { label: "D", value: "D" },
 ]);
 const ageOptions = ref([{ data: "" }]);
 const addressOptions = ref([{ data: "" }]);
 const paramsRules = reactive({
+  orgName: [{ required: true, message: "请选择组织", trigger: "change" }],
+  assetCode: [{ required: true, message: "请输入编码", trigger: "blur" }],
+  flagEnabled: [
+    { required: true, message: "请选择是否可用", trigger: "change" },
+  ],
   assetName: [{ required: true, message: "请输入资产名称", trigger: "blur" }],
+  assetType: [{ required: true, message: "请选择类别", trigger: "change" }],
 });
 
-const filterAgeMethod = ({ option, row }) => {
-  return row.age === Number(option.data);
+const filterParamModel = ({ option, row }) => {
+  //参数模板名称搜索
+  return row.paramModelName === option.data;
 };
-const filterAgeRecoverMethod = ({ option }) => {
-  // 如果是自定义筛选模板，当为点击确认时，该选项将被恢复为默认值
+const filterParamModelRecover = ({ option }) => {
+  // 参数模板名称如果是自定义筛选模板，当为点击确认时，该选项将被恢复为默认值
   option.data = "";
 };
-const filterAddressMethod = ({ option, row }) => {
-  return row.address === option.data;
+const filterParamName = ({ option, row }) => {
+  //参数名称搜索
+  return row.paramName === option.data;
 };
-const filterAddressRecoverMethod = ({ option }) => {
-  // 如果是自定义筛选模板，当为点击确认时，该选项将被恢复为默认值
+const filterParamNameRecover = ({ option }) => {
+  // 参数名称如果是自定义筛选模板，当为点击确认时，该选项将被恢复为默认值
+  option.data = "";
+};
+const filterParamNameSel = ({ option, row }) => {
+  //选择参数名称搜索
+  return row.paramName === option.data;
+};
+const filterParamNameRecoverSel = ({ option }) => {
+  // 参数名称如果是自定义筛选模板，当为点击确认时，该选项将被恢复为默认值
   option.data = "";
 };
 onMounted(() => {
-  const dsfsdf = route.query.id;
-  debugger;
+  if (route.query.id != undefined) {
+    getBasicInfo();
+    getParamsList();
+  }
   getDeptTree();
   getDevice();
 });
+function getBasicInfo() {
+  getInfo(route.query.id).then((response) => {
+    formData.paramsForm = response.data;
+    submitIcon.value = "Check";
+    paramsText.value = "修改";
+  });
+}
+function getParamsList() {
+  //获取参数列表
+  const params = {
+    assetCode: route.query.assetCode,
+  };
+  listParams(params).then((res) => {
+    if (res.code === 200) {
+      paramsList.value = res.rows;
+      paramsCode.value = paramsList.value.map((item) => item.paramCode);
+    }
+  });
+}
 function getDeptTree() {
   //获取部门树
   deptTreeSelect().then((response) => {
@@ -319,7 +393,7 @@ function selectParams() {
   if (paramsDevice.value.length != 0) {
     const params = {
       deviceUuids: paramsDevice.value,
-      excludeParamCodes: [],
+      excludeParamCodes: paramsCode.value,
     };
     listByDeviceUuids(params).then((res) => {
       if (res.code === 200) {
@@ -327,29 +401,73 @@ function selectParams() {
         dialogTableVisible.value = true;
       }
     });
+  } else {
+    ElMessage({
+      message: "请先选择组成设备！",
+      type: "warning",
+    });
   }
 }
 function selectDept(val) {
   //部门参数选择
-  paramsForm.orgCode = val.id;
+  formData.paramsForm.orgCode = val.id;
 }
 function addConfirm() {
   //选择参数确认
   const $addTable = addTableRef.value;
   if ($addTable) {
     const selectRecords = $addTable.getCheckboxRecords();
-    paramsList.value = selectRecords.map((item) => {
-      return {
+    selectRecords.map((item) => {
+      paramsList.value.push({
         ...item,
         flagEnabled: false,
         contrlFlag: false,
-      };
+      });
     });
-    paramsCode.value = selectRecords.map((item) => item.paramCode);
+    paramsCode.value = paramsList.value.map((item) => item.paramCode);
+    console.log(paramsList.value, paramsCode.value);
     dialogTableVisible.value = false;
   }
 }
 
+const removeEvent = async (row) => {
+  //删除
+  if (row) {
+    ids.value = row.id;
+  } else {
+    const $submitTable = paramsTableRef.value;
+    ids.value = $submitTable.getCheckboxRecords().map((item) => item.id);
+    if (ids.value.length === 0) {
+      ElMessage({
+        message: "请选择删除数据！",
+        type: "warning",
+      });
+      return;
+    }
+  }
+  if (route.query.id != undefined) {
+    proxy.$modal
+      .confirm("是否确认删除数据项？")
+      .then(function () {
+        return delParams(ids.value);
+      })
+      .then(() => {
+        getParamsList();
+        proxy.$modal.msgSuccess("删除成功");
+      })
+      .catch(() => {});
+  } else {
+    const $submitTable = paramsTableRef.value;
+    const selectParamsList = $submitTable.getCheckboxRecords();
+    if ($submitTable) {
+      $submitTable.remove(row || selectParamsList);
+      paramsList.value = $submitTable.getTableData().tableData;
+      paramsCode.value = paramsList.value.map((item) => item.paramCode);
+      console.log(paramsList.value);
+    }
+  }
+};
+
 const paramSubmit = async (formEl) => {
   //提交
   if (!formEl) return;
@@ -363,21 +481,22 @@ const paramSubmit = async (formEl) => {
           flagEnabled: item.flagEnabled,
           contrlFlag: item.contrlFlag,
         }));
-        paramsForm.assetParamsDtos = selectParamsListArr;
-        if (id.value != undefined) {
-          updateInfo(paramsForm).then((response) => {
+        formData.paramsForm.assetParamsDtos = selectParamsListArr;
+        if (route.query.id != undefined) {
+          updateInfo(formData.paramsForm).then((response) => {
             proxy.$modal.msgSuccess("修改成功");
             open.value = false;
-            getList();
           });
         } else {
-          addInfo(paramsForm).then((response) => {
+          addInfo(formData.paramsForm).then((response) => {
             proxy.$modal.msgSuccess("新增成功");
             open.value = false;
-            getList();
           });
         }
-        console.log(paramsForm);
+        router.push({
+          path: "AssetInfo",
+        });
+        console.log(formData.paramsForm);
       }
     } else {
       console.log("error submit!", fields);
diff --git a/src/views/model/asset/index.vue b/src/views/model/asset/index.vue
index fcf316e..5c5318e 100644
--- a/src/views/model/asset/index.vue
+++ b/src/views/model/asset/index.vue
@@ -377,11 +377,12 @@ function handleAdd() {
 function handleUpdate(row) {
   // reset();
   const id = row.id || ids.value;
-  debugger;
+  const assetCode = row.assetCode;
   router.push({
     path: "AddParams",
     query: {
       id,
+      assetCode,
     },
   });
   // getInfo(_id).then((response) => {

From ac359a3ced99ff38f2eeed5a053982980990ccb3 Mon Sep 17 00:00:00 2001
From: fuguobin <fgbin2008@163.com>
Date: Fri, 22 Mar 2024 17:36:26 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/model/asset/addParams.vue | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/model/asset/addParams.vue b/src/views/model/asset/addParams.vue
index 87081cd..6960ac0 100644
--- a/src/views/model/asset/addParams.vue
+++ b/src/views/model/asset/addParams.vue
@@ -475,19 +475,28 @@ const paramSubmit = async (formEl) => {
     if (valid) {
       const $submitTable = paramsTableRef.value;
       if ($submitTable) {
-        const selectParamsList = $submitTable.getCheckboxRecords();
-        const selectParamsListArr = selectParamsList.map((item) => ({
-          paramCode: item.paramCode,
-          flagEnabled: item.flagEnabled,
-          contrlFlag: item.contrlFlag,
-        }));
-        formData.paramsForm.assetParamsDtos = selectParamsListArr;
         if (route.query.id != undefined) {
+          const selectParamsList = $submitTable.getCheckboxRecords();
+          console.log(selectParamsList);
+          const selectParamsListArr = selectParamsList.map((item) => ({
+            id: item.id,
+            paramCode: item.paramCode,
+            flagEnabled: item.flagEnabled,
+            contrlFlag: item.contrlFlag,
+          }));
+          formData.paramsForm.assetParamsDtos = selectParamsListArr;
           updateInfo(formData.paramsForm).then((response) => {
             proxy.$modal.msgSuccess("修改成功");
             open.value = false;
           });
         } else {
+          const selectParamsList = $submitTable.getCheckboxRecords();
+          const selectParamsListArr = selectParamsList.map((item) => ({
+            paramCode: item.paramCode,
+            flagEnabled: item.flagEnabled,
+            contrlFlag: item.contrlFlag,
+          }));
+          formData.paramsForm.assetParamsDtos = selectParamsListArr;
           addInfo(formData.paramsForm).then((response) => {
             proxy.$modal.msgSuccess("新增成功");
             open.value = false;

From 98443b79855ec7c14db5982d88dee3e15def2c60 Mon Sep 17 00:00:00 2001
From: bobol <bobolixyz@163.com>
Date: Fri, 22 Mar 2024 18:06:43 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/model/heatapiconf/index.vue | 49 ++++++++++++---------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/views/model/heatapiconf/index.vue b/src/views/model/heatapiconf/index.vue
index 23c2baa..b6c8c00 100644
--- a/src/views/model/heatapiconf/index.vue
+++ b/src/views/model/heatapiconf/index.vue
@@ -17,13 +17,13 @@
                  class="my-custom-form">
           <el-row>
             <el-col :span="8">
-              <el-form-item label="排除设备" prop="excludeDevices" label-width="auto">
-                <el-select v-model="queryParams.excludeDevices" placeholder="请选择排除设备" clearable multiple>
+              <el-form-item label="推送方" prop="pushingCounterpart" label-width="auto">
+                <el-select v-model="queryParams.pushingCounterpart" placeholder="请选择推送方" clearable>
                   <el-option
-                      v-for="dict in listDeviceAll"
-                      :key="dict.uuid"
-                      :label="dict.deviceName"
-                      :value="dict.uuid"
+                      v-for="dict in pushing_counterpart"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
                   />
                 </el-select>
               </el-form-item>
@@ -34,12 +34,6 @@
                           @keyup.enter="handleQuery"/>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item label="发送地址" prop="sendIp" label-width="auto">
-                <el-input v-model="queryParams.sendIp" placeholder="请输入发送地址" clearable
-                          @keyup.enter="handleQuery"/>
-              </el-form-item>
-            </el-col>
             <el-col :span="8">
               <el-form-item class="childTextAlignLeft">
                 <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -67,19 +61,11 @@
         <el-table v-loading="loading" :data="heatapiconfList" @selection-change="handleSelectionChange"
                   :max-height="tableHeight" :border="true" :column-width-draggable="true">
           <el-table-column type="selection" width="55" align="center" fixed="left"/>
-          <!-- <el-table-column label="主键" align="center" prop="id" /> -->
           <el-table-column label="机构编号" align="center" prop="orgCode"/>
           <el-table-column label="机构名称" align="center" prop="orgName"/>
-          <!--          <el-table-column label="排除设备" align="center" prop="excludeDevices" show-overflow-tooltip="true" >-->
-          <!--            <template #default="scope">-->
-          <!--              {{getDevicesNames(scope.row.excludeDevices)}}-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
           <el-table-column label="推送方" align="center" prop="pushingCounterpart"
                            :formatter="formatterPushingCounterpart"/>
-          <!--          <el-table-column label="策略" align="center" prop="strategy" :formatter="formatterStrategy"/>-->
           <el-table-column label="标准值" align="center" prop="standard"/>
-          <!--          <el-table-column label="发送地址" align="center" prop="sendIp"/>-->
           <el-table-column label="是否发送" align="center" prop="available">
             <template #default="scope">
               <el-switch v-model="scope.row.available" @change="changeEnabled(scope.row)"/>
@@ -113,7 +99,7 @@
     </el-row>
 
     <!-- 添加或修改供热办推送接口配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="1000px" append-to-body draggable :close-on-click-modal="false">
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body draggable :close-on-click-modal="false" destroy-on-close>
       <el-form ref="heatapiconfRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -191,7 +177,7 @@
     </el-dialog>
 
     <el-dialog title="编辑设备调整策略" v-model="openStrategyConfEditForm" width="500px" append-to-body draggable
-               :close-on-click-modal="false">
+               :close-on-click-modal="false" destroy-on-close>
       <el-form ref="strategyConfEditFormRef" :model="strategyConfEditForm" :rules="strategyConfEditRules"
                label-width="80px">
         <el-form-item label="设备：" prop="deviceName">
@@ -216,7 +202,7 @@
     </el-dialog>
 
     <el-dialog title="新增设备" v-model="openStrategyConfAddForm" width="500px" append-to-body draggable
-               :close-on-click-modal="false">
+               :close-on-click-modal="false" destroy-on-close>
       <el-form ref="strategyConfSaveFormRef" :model="strategyConfSaveForm" :rules="strategyConfSaveRules"
                label-width="70px">
         <el-form-item label="设备：" prop="deviceList">
@@ -302,7 +288,13 @@ const data = reactive({
     standard: null,
     excludeDevices: [],
   },
-  rules: {}
+  rules: {
+    orgCode: [{required: true, message: "请选择热源", trigger: "change"}],
+    pushingCounterpart: [{required: true, message: "请选择推送方", trigger: "change"}],
+    standard: [{required: true, message: "请选择标准值", trigger: "blur"}],
+    dateRange: [{required: true, message: "请选择日期范围", trigger: "change"}],
+    pushingInterval: [{required: true, message: "请输入时间间隔", trigger: "blur"}],
+  }
 });
 
 const {queryParams, form, rules} = toRefs(data);
@@ -531,7 +523,7 @@ function handleNodeClick(data) {
   queryParams.value.orgCode = data.id;
   form.value.orgCode = data.id;
   form.value.orgName = data.label;
-  disabled.value = data.isLeaf
+  // disabled.value = data.isLeaf
   treeSelected.value = data.id;
   handleQuery();
 }
@@ -758,14 +750,15 @@ function dateRangeChange(dataRange) {
 
 function handleAddStrategyConf() {
   deviceList.value = JSON.parse(JSON.stringify(listDevices.value));
-  console.log("deviceList", deviceList.value, deviceStrategyConfList.value);
+  let deviceArr = [];
   if (deviceStrategyConfList.value && deviceStrategyConfList.value.length > 0) {
     deviceList.value.forEach(device => {
       let arr = deviceStrategyConfList.value.filter(item => item.deviceUuid === device.uuid);
-      if (arr && arr.length > 0) {
-        device.disabled = true;
+      if (!arr || arr.length === 0) {
+        deviceArr.push(device);
       }
     })
+    deviceList.value = deviceArr;
   }
   strategyConfSaveForm.value.deviceList = [];
   openStrategyConfAddForm.value = true;

From 2fe3436b17caec814615ebcd420530ecdc51017a Mon Sep 17 00:00:00 2001
From: bobol <bobolixyz@163.com>
Date: Tue, 26 Mar 2024 14:51:57 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9A=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E7=BD=91=E6=B8=A9=E5=BA=A6=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=80=BC=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=BA=8C=E7=BD=91=E5=9B=9E?=
 =?UTF-8?q?=E6=B8=A9=E8=B0=83=E6=95=B4=E5=80=BC=E5=92=8C=E4=B8=80=E7=BD=91?=
 =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E8=B0=83=E6=95=B4=E5=80=BC=E9=83=BD=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/model/heatapiconf/index.vue | 152 +++++++++++++++++++++++---
 1 file changed, 138 insertions(+), 14 deletions(-)

diff --git a/src/views/model/heatapiconf/index.vue b/src/views/model/heatapiconf/index.vue
index b6c8c00..6538639 100644
--- a/src/views/model/heatapiconf/index.vue
+++ b/src/views/model/heatapiconf/index.vue
@@ -94,12 +94,12 @@
 
         <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
                     v-model:limit="queryParams.pageSize" @pagination="getList"/>
-
       </el-col>
     </el-row>
 
     <!-- 添加或修改供热办推送接口配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="1000px" append-to-body draggable :close-on-click-modal="false" destroy-on-close>
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body draggable :close-on-click-modal="false"
+               destroy-on-close>
       <el-form ref="heatapiconfRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -159,8 +159,21 @@
         <el-table-column type="index" width="50"/>
         <el-table-column prop="deviceUuid" label="设备" :formatter="formatterDevicesName"/>
         <el-table-column prop="strategy" label="策略" :formatter="formatterStrategy"/>
-        <el-table-column prop="adjustedValue" label="调整值"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="300"
+        <el-table-column prop="twoWaterBackTmpt" label="二网回温调整值">
+          <template #header>
+            <div @click="twoWaterBackTmptEditHandler">
+              {{"二网回温调整值"}}<el-icon style="margin-left: 5px;"><EditPen /></el-icon>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="oneWaterTmpt" label="一网供回温调整值">
+          <template #header>
+            <div @click="oneWaterTmptEditHandler">
+              {{"一网供回温调整值"}}<el-icon style="margin-left: 5px;"><EditPen /></el-icon>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300"
                          :fixed="fixedColumns ? 'right' : false">
           <template #default="scope">
             <el-button type="text" icon="Edit" @click="handleUpdateStrategyConf(scope.row)">修改</el-button>
@@ -179,7 +192,7 @@
     <el-dialog title="编辑设备调整策略" v-model="openStrategyConfEditForm" width="500px" append-to-body draggable
                :close-on-click-modal="false" destroy-on-close>
       <el-form ref="strategyConfEditFormRef" :model="strategyConfEditForm" :rules="strategyConfEditRules"
-               label-width="80px">
+               label-width="150px">
         <el-form-item label="设备：" prop="deviceName">
           {{ getDevicesName(strategyConfEditForm.deviceUuid) }}
         </el-form-item>
@@ -189,8 +202,13 @@
                        :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="调整值：" prop="adjustedValue">
-          <el-input type="number" v-model="strategyConfEditForm.adjustedValue" placeholder="请输入调整值" :disabled="strategyConfEditForm.strategy !== '1'"/>
+        <el-form-item label="二网回温调整值：" prop="twoWaterBackTmpt">
+          <el-input type="number" v-model="strategyConfEditForm.twoWaterBackTmpt" placeholder="请输入二网回温调整值"
+                    :disabled="strategyConfEditForm.strategy !== '1'"/>
+        </el-form-item>
+        <el-form-item label="一网供回温调整值：" prop="oneWaterTmpt">
+          <el-input type="number" v-model="strategyConfEditForm.oneWaterTmpt" placeholder="请输入一网供回温调整值"
+                    :disabled="strategyConfEditForm.strategy !== '1'"/>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -230,6 +248,38 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog title="批量修改二网回温调整值" v-model="openEditTwoWaterBackTmpt" width="500px" append-to-body draggable
+               :close-on-click-modal="false" destroy-on-close>
+      <el-form ref="editTwoWaterBackTmptFromRef" :model="editTwoWaterBackTmptFrom" :rules="editTwoWaterBackTmptRules"
+               label-width="150px">
+        <el-form-item label="二网回温调整值：" prop="twoWaterBackTmpt">
+          <el-input type="number" v-model="editTwoWaterBackTmptFrom.twoWaterBackTmpt" placeholder="请输入二网回温调整值"/>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitEditTwoWaterBackTmptFrom">确 定</el-button>
+          <el-button @click="cancelEditTwoWaterBackTmptFrom">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="批量修改一网供回温调整值" v-model="openOneWaterTmptFrom" width="500px" append-to-body draggable
+               :close-on-click-modal="false" destroy-on-close>
+      <el-form ref="editOneWaterTmptFromRef" :model="editOneWaterTmptFrom" :rules="editOneWaterTmptRules"
+               label-width="150px">
+        <el-form-item label="一网供回温调整值：" prop="oneWaterTmpt">
+          <el-input type="number" v-model="editOneWaterTmptFrom.oneWaterTmpt" placeholder="请输入一网供回温调整值"/>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitEditOneWaterTmptFrom">确 定</el-button>
+          <el-button @click="cancelEditOneWaterTmptFrom">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 <style lang="scss"> @import "@/assets/styles/self-defined.scss";
@@ -251,7 +301,7 @@ import {listDeviceNoPage} from "@/api/model/device";
 import {deptTreeSelect, deptTreeSelectNew} from "@/api/system/user";
 import lock from "@/assets/icons/svg/lock.svg";
 import {ElMessageBox} from 'element-plus';
-import { nextTick } from 'vue'
+import {nextTick} from 'vue'
 
 const {proxy} = getCurrentInstance();
 const {pushing_counterpart, effective_strategy} = proxy.useDict('pushing_counterpart', 'effective_strategy');
@@ -302,7 +352,24 @@ const deviceList = ref([]);
 const deviceStrategyConfList = ref([]);
 const openStrategyConfEditForm = ref(false);
 const strategyConfEditForm = ref({});
-const strategyConfEditRules = ref({});
+const strategyConfEditRules = ref({
+  strategy: [{
+    required: true,
+    message: '请选择策略',
+    trigger: 'change'
+  }],
+  twoWaterBackTmpt: [{
+    required: true,
+    message: '请输入二网回温调整值',
+    trigger: 'blur'
+  }],
+  oneWaterTmpt: [{
+      required: true,
+      message: '请输入一网供回温调整值',
+      trigger: 'blur'
+    }
+  ]
+});
 const openStrategyConfAddForm = ref(false);
 const strategyConfSaveForm = ref({
   deviceList: []
@@ -314,6 +381,24 @@ const strategyConfSaveRules = ref({
     trigger: 'change'
   }]
 });
+const openEditTwoWaterBackTmpt = ref(false);
+const editTwoWaterBackTmptFrom = ref({});
+const editTwoWaterBackTmptRules = ref({
+  twoWaterBackTmpt: [{
+    required: true,
+    message: '请输入二网回温调整值',
+    trigger: 'blur'
+  }],
+});
+const openOneWaterTmptFrom = ref(false);
+const editOneWaterTmptFrom = ref({});
+const editOneWaterTmptRules = ref({
+  oneWaterTmpt: [{
+    required: true,
+    message: '请输入一网供回温调整值',
+    trigger: 'blur'
+  }],
+});
 
 
 /** 查询供热办推送接口配置列表 */
@@ -391,11 +476,6 @@ function handleAdd() {
   form.value.computeSwitchTotal = true;
   title.value = "添加供热办推送接口配置";
   form.value.excludeDevices = null;
-  if (treeSelected.value != null && treeSelected.value != '') {
-    editable.value = true;
-  } else {
-    editable.value = false;
-  }
 }
 
 /** 修改按钮操作 */
@@ -830,6 +910,50 @@ function getDevicesName(deviceUuid) {
   }
 }
 
+function twoWaterBackTmptEditHandler() {
+  editTwoWaterBackTmptFrom.value = {};
+  openEditTwoWaterBackTmpt.value = true;
+}
+
+function submitEditTwoWaterBackTmptFrom() {
+  proxy.$refs["editTwoWaterBackTmptFromRef"].validate(valid => {
+    if (valid) {
+      if (deviceStrategyConfList.value && deviceStrategyConfList.value.length > 0) {
+        deviceStrategyConfList.value.forEach(item => {
+          item.twoWaterBackTmpt = editTwoWaterBackTmptFrom.value.twoWaterBackTmpt;
+        })
+      }
+      cancelEditTwoWaterBackTmptFrom();
+    }
+  })
+}
+
+function cancelEditTwoWaterBackTmptFrom() {
+  openEditTwoWaterBackTmpt.value = false;
+}
+
+function oneWaterTmptEditHandler() {
+  editOneWaterTmptFrom.value = {};
+  openOneWaterTmptFrom.value = true;
+}
+
+function submitEditOneWaterTmptFrom() {
+  proxy.$refs["editOneWaterTmptFromRef"].validate(valid => {
+    if (valid) {
+      if (deviceStrategyConfList.value && deviceStrategyConfList.value.length > 0) {
+        deviceStrategyConfList.value.forEach(item => {
+          item.oneWaterTmpt = editOneWaterTmptFrom.value.oneWaterTmpt;
+        })
+      }
+      cancelEditOneWaterTmptFrom();
+    }
+  })
+}
+
+function cancelEditOneWaterTmptFrom() {
+  openOneWaterTmptFrom.value = false;
+}
+
 getDevicesAll();
 getDeptTree();
 getDeptTreeSelectNew();