From ded861027a5eb38560c9cab1b4f26d3864484b21 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 19 Jun 2025 09:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/tq/electricity/apilog/ApiLogList.vue  | 12 +--
 .../iot/tq/electricity/electricity.data.ts    | 36 +++++----
 src/views/iot/tq/electricity/index.vue        | 20 +++--
 .../NuIotTqApiRequestLog.data.ts              | 76 +++++++++++++-----
 .../utils/departUtils/DepartUtils.data.ts     | 12 ++-
 .../utils/departUtils/DepartUtilsList.vue     |  5 +-
 src/views/utils/nuUtils/HldyUtils.data.ts     | 10 ++-
 src/views/utils/nuUtils/HldyUtilsIndex.vue    | 80 +++++++++++++++++++
 src/views/utils/nuUtils/HldyUtilsList.vue     |  5 +-
 src/views/utils/nuUtils/HldyUtilsModal.vue    |  6 +-
 10 files changed, 195 insertions(+), 67 deletions(-)
 create mode 100644 src/views/utils/nuUtils/HldyUtilsIndex.vue

diff --git a/src/views/iot/tq/electricity/apilog/ApiLogList.vue b/src/views/iot/tq/electricity/apilog/ApiLogList.vue
index c000e8e..42e8ee6 100644
--- a/src/views/iot/tq/electricity/apilog/ApiLogList.vue
+++ b/src/views/iot/tq/electricity/apilog/ApiLogList.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="p-2">
     <a-tabs v-model:activeKey="activeKey" type="card" @change="handleChange">
-      <a-tab-pane key="9" tab="清零">
-        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal9"></NuIotTqApiRequestLogList>
-      </a-tab-pane>
-      <a-tab-pane key="3" tab="抄表" force-render>
+      <a-tab-pane key="3" tab="抄表" >
         <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal3"></NuIotTqApiRequestLogList>
       </a-tab-pane>
+      <a-tab-pane key="9" tab="清零" force-render>
+        <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal9"></NuIotTqApiRequestLogList>
+      </a-tab-pane>
       <a-tab-pane key="10" tab="电表拉闸" force-render>
         <NuIotTqApiRequestLogList ref="nuIotTqApiRequestLogListModal10"></NuIotTqApiRequestLogList>
       </a-tab-pane>
@@ -22,14 +22,14 @@
 
   import NuIotTqApiRequestLogList from '/@/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue';
 
-const activeKey= ref('9');
+const activeKey= ref('3');
 const dbsbInfo = ref<any>({});
 const nuIotTqApiRequestLogListModal9 = ref();
 const nuIotTqApiRequestLogListModal3 = ref();
 const nuIotTqApiRequestLogListModal10 = ref();
 const nuIotTqApiRequestLogListModal11 = ref();
   function initLog(record){
-    activeKey.value = "9";
+    activeKey.value = "3";
     getDataList(activeKey.value, record);
     dbsbInfo.value = record;
   }
diff --git a/src/views/iot/tq/electricity/electricity.data.ts b/src/views/iot/tq/electricity/electricity.data.ts
index 82bda7a..cab0bc5 100644
--- a/src/views/iot/tq/electricity/electricity.data.ts
+++ b/src/views/iot/tq/electricity/electricity.data.ts
@@ -4,12 +4,12 @@ import {FormSchema} from '/@/components/Table';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '机构',
+    title: '单元编码',
     align: "center",
-    dataIndex: 'departName'
+    dataIndex: 'nuId'
   },
   {
-    title: '护理单元',
+    title: '单元名称',
     align: "center",
     dataIndex: 'nuName'
   },
@@ -19,10 +19,16 @@ export const columns: BasicColumn[] = [
     dataIndex: 'address'
   },
   {
-    title: '采集器号',
+    title: '机构名称',
     align: "center",
-    dataIndex: 'cid'
+    dataIndex: 'departName',
+    width: 220,
   },
+  // {
+  //   title: '采集器号',
+  //   align: "center",
+  //   dataIndex: 'cid'
+  // },
   {
     title: '设备状态',
     align: "center",
@@ -72,16 +78,16 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'connectTime'
   },
-  {
-    title: '上次掉线时间',
-    align: "center",
-    dataIndex: 'disconnectTime'
-  },
-  {
-    title: '描述',
-    align: "center",
-    dataIndex: 'remark'
-  },
+  // {
+  //   title: '上次掉线时间',
+  //   align: "center",
+  //   dataIndex: 'disconnectTime'
+  // },
+  // {
+  //   title: '描述',
+  //   align: "center",
+  //   dataIndex: 'remark'
+  // },
 ];
 
 export const searchFormSchema: FormSchema[] = [
diff --git a/src/views/iot/tq/electricity/index.vue b/src/views/iot/tq/electricity/index.vue
index e406f65..23f33e8 100644
--- a/src/views/iot/tq/electricity/index.vue
+++ b/src/views/iot/tq/electricity/index.vue
@@ -4,17 +4,10 @@
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" preIcon="ant-design:sync-outlined" @click="handleSyncDevice"> 同步设备</a-button>
-        <a-button preIcon="ant-design:sync-outlined" @click="handleSyncCollector"> 同步采集器</a-button>
+        <a-button type="primary" preIcon="ant-design:sync-outlined" @click="handleSyncDevice"> 拉取设备</a-button>
+        <a-button type="primary" preIcon="ant-design:sync-outlined" @click="handleSyncCollector"> 更新在线状态</a-button>
       </template>
       <template #bodyCell="{ column, record, index, text }">
-        <template v-if="column.dataIndex === 'address'">
-          <a @click="showApiLog(record)"> {{record.address}} </a>
-        </template>
-        <template v-if="column.dataIndex === 'departName'">
-          <span v-if="!record.departName"><a @click="handlePzjg(record)"> 未配置 </a></span>
-          <span v-else><a @click="handlePzjg(record)"> {{record.departName}} </a></span>
-        </template>
         <template v-if="column.dataIndex === 'nuName'">
           <span v-if="!record.nuName"><a @click="handlePzhldy(record)"> 未配置 </a></span>
           <span v-else><a @click="handlePzhldy(record)"> {{record.nuName}} </a></span>
@@ -101,7 +94,7 @@ import { defHttp } from '/@/utils/http/axios';
         ],
       },
       actionColumn: {
-        width: 240,
+        width: 290,
         fixed:'right'
       },
       beforeFetch: (params) => {
@@ -135,9 +128,10 @@ import { defHttp } from '/@/utils/http/axios';
   console.log("🚀 ~ handleParams ~ params:", params)
     defHttp.post({
       url: "/iot/tq/electricityMeter/edit",
-      params:params.value
+      params:params
     }).then(res=>{
       console.log("🚀 ~ getTableAction ~ res:", res)
+      reload();
     })
   }
   //同步
@@ -171,6 +165,10 @@ import { defHttp } from '/@/utils/http/axios';
           placement: 'topLeft',
         },
       },
+      {
+        label: '日志',
+        onClick: showApiLog.bind(null, record),
+      },
       {
         label: '同步',
         onClick: handleSync.bind(null, record),
diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts b/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts
index 0c6787a..98315c4 100644
--- a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts
+++ b/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts
@@ -16,44 +16,80 @@ export const columns: BasicColumn[] = [
     dataIndex: 'type_dictText'
   },
   {
-    title: '请求时的值',
+    title: '上次请求时的值',
     align: "center",
     dataIndex: 'requestValue'
   },
   {
-    title: '请求时间',
-    align: "center",
-    dataIndex: 'requestTime'
-  },
-  {
-    title: '请求状态',
-    align: "center",
-    dataIndex: 'requestStatus_dictText'
-  },
-  {
-    title: '请求描述',
-    align: "center",
-    dataIndex: 'requestRemark'
-  },
-  {
-    title: '反馈值',
+    title: '本次请求值',
     align: "center",
     dataIndex: 'resolveValue'
   },
   {
-    title: '反馈时间',
+    title: '本次请求时间',
+    align: "center",
+    dataIndex: 'requestTime'
+  },
+  {
+    title: '本次请求状态',
+    align: "center",
+    dataIndex: 'requestStatus_dictText'
+  },
+  {
+    title: '本次反馈时间',
     align: "center",
     dataIndex: 'resolveTime'
   },
   {
-    title: '反馈状态',
+    title: '本次反馈状态',
     align: "center",
     dataIndex: 'resolveStatus_dictText'
   },
   {
     title: '反馈描述',
     align: "center",
-    dataIndex: 'resolveRemark'
+    dataIndex: 'resolveRemark',
+    defaultHidden: true
+  },
+];
+
+//列表数据
+export const columns2: BasicColumn[] = [
+  {
+    title: '表号',
+    align: "center",
+    dataIndex: 'address'
+  },
+  {
+    title: '类型',
+    align: "center",
+    dataIndex: 'type_dictText'
+  },
+  {
+    title: '本次请求时间',
+    align: "center",
+    dataIndex: 'requestTime'
+  },
+  {
+    title: '本次请求状态',
+    align: "center",
+    dataIndex: 'requestStatus_dictText'
+  },
+  {
+    title: '本次反馈时间',
+    align: "center",
+    dataIndex: 'resolveTime'
+  },
+  {
+    title: '本次反馈状态',
+    align: "center",
+    dataIndex: 'resolveStatus_dictText'
+  },
+  {
+    title: '反馈描述',
+    align: "center",
+    dataIndex: 'resolveRemark',
+    defaultHidden: true
   },
 ];
 
diff --git a/src/views/utils/departUtils/DepartUtils.data.ts b/src/views/utils/departUtils/DepartUtils.data.ts
index 7c8600e..5140323 100644
--- a/src/views/utils/departUtils/DepartUtils.data.ts
+++ b/src/views/utils/departUtils/DepartUtils.data.ts
@@ -6,24 +6,28 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '机构/部门名称',
+    title: '机构名称',
     align: "center",
     dataIndex: 'departName'
   },
   {
     title: '机构编码',
     align: "center",
-    dataIndex: 'orgCode'
+    dataIndex: 'orgCode',
+    width: '120px'
   },
   {
     title: '运营开始时间',
     align: "center",
-    dataIndex: 'operationStartTime'
+    dataIndex: 'operationStartTime',
+    width: '150px',
+    defaultHidden: true
   },
   {
     title: '运营到期时间',
     align: "center",
-    dataIndex: 'operationEndTime'
+    dataIndex: 'operationEndTime',
+    width: '150px'
   },
 ];
 
diff --git a/src/views/utils/departUtils/DepartUtilsList.vue b/src/views/utils/departUtils/DepartUtilsList.vue
index e9efbf0..487dd48 100644
--- a/src/views/utils/departUtils/DepartUtilsList.vue
+++ b/src/views/utils/departUtils/DepartUtilsList.vue
@@ -11,6 +11,7 @@
     <BasicTable @register="registerTable" >
       <!--插槽:table标题-->
       <template #tableTitle>
+        护理机构
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -49,7 +50,7 @@ import { e } from 'unocss';
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 80,
         fixed: 'right',
       },
       beforeFetch: async (params) => {
@@ -105,7 +106,7 @@ function edit(record) {
     departInfo.value.departName = record.departName;
     departInfo.value.departServerUrl = record.orgCode;
     console.log("🚀 ~ handleEdit ~ departInfo.value:", departInfo.value)
-    emit("ok",departInfo);
+    emit("ok",departInfo.value);
   }
    
   /**
diff --git a/src/views/utils/nuUtils/HldyUtils.data.ts b/src/views/utils/nuUtils/HldyUtils.data.ts
index d96fdd0..14f7531 100644
--- a/src/views/utils/nuUtils/HldyUtils.data.ts
+++ b/src/views/utils/nuUtils/HldyUtils.data.ts
@@ -6,19 +6,21 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '护理单元名称',
+    title: '单元名称',
     align: "center",
     dataIndex: 'nuName'
   },
   {
-    title: '编码',
+    title: '单元编码',
     align: "center",
-    dataIndex: 'code'
+    dataIndex: 'nuId',
+    width: '150px'
   },
   {
     title: '创建时间',
     align: "center",
-    dataIndex: 'createTime'
+    dataIndex: 'createTime',
+    width: '150px'
   },
 ];
 
diff --git a/src/views/utils/nuUtils/HldyUtilsIndex.vue b/src/views/utils/nuUtils/HldyUtilsIndex.vue
new file mode 100644
index 0000000..2140f55
--- /dev/null
+++ b/src/views/utils/nuUtils/HldyUtilsIndex.vue
@@ -0,0 +1,80 @@
+<template>
+  <div class="p-2">
+    <a-row>
+      <a-col :span="12">
+        <DepartUtilsList ref="departUtilsListModal" @ok="departCallback" ></DepartUtilsList>"
+      </a-col>
+      <a-col :span="12">
+        <HldyUtilsList ref="hldyUtilsListModal" @ok="hldyCallback" ></HldyUtilsList>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script lang="ts" name="departUtils-sysDepart" setup>
+  import { ref, reactive } from 'vue';
+  import HldyUtilsList from '/@/views/utils/nuUtils/HldyUtilsList.vue'
+  import DepartUtilsList from '/@/views/utils/departUtils/DepartUtilsList.vue'
+
+  const departUtilsListModal = ref();
+  const hldyUtilsListModal = ref();
+  const departInfo = ref<any>({});
+  const emit = defineEmits(['register', 'ok']);
+  //护理单元回调
+  function hldyCallback(record) { 
+    console.log("🚀 ~ hldyCallback ~ record:", record)
+    
+    console.log("🚀 ~ handleEdit ~ record:", record)
+    departInfo.value.nuId = record.nuId;
+    departInfo.value.nuName = record.nuName;
+    departInfo.value.departId = record.departId;
+    departInfo.value.departName = record.departName;
+    departInfo.value.departServerUrl = record.departServerUrl;
+    console.log("🚀 ~ handleEdit ~ departInfo.value:", departInfo.value)
+    emit("ok",departInfo.value);
+
+  }
+  //机构回调
+  function departCallback(record) {
+    console.log("🚀 ~ departCallback ~ record:", record)
+    hldyUtilsListModal.value.edit(record);
+  }
+
+function edit(record) { 
+  console.log("🚀 ~ edit ~ record:", record.departServerUrl)
+  departInfo.value = record;
+  // queryParam.sysOrgCode = record.departServerUrl;
+  }
+
+  defineExpose({
+    edit,
+  });
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
diff --git a/src/views/utils/nuUtils/HldyUtilsList.vue b/src/views/utils/nuUtils/HldyUtilsList.vue
index 2c54c64..6f83c8e 100644
--- a/src/views/utils/nuUtils/HldyUtilsList.vue
+++ b/src/views/utils/nuUtils/HldyUtilsList.vue
@@ -11,6 +11,7 @@
     <BasicTable @register="registerTable" >
       <!--插槽:table标题-->
       <template #tableTitle>
+        护理单元
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -89,10 +90,10 @@ import { e } from 'unocss';
    */
   function handleEdit(record: Recordable) {
     console.log("🚀 ~ handleEdit ~ record:", record)
-    departInfo.value.nuId = record.id;
+    departInfo.value.nuId = record.nuId;
     departInfo.value.nuName = record.nuName;
     console.log("🚀 ~ handleEdit ~ departInfo.value:", departInfo.value)
-    emit("ok",departInfo);
+    emit("ok",departInfo.value);
   }
    
   /**
diff --git a/src/views/utils/nuUtils/HldyUtilsModal.vue b/src/views/utils/nuUtils/HldyUtilsModal.vue
index 751ad0d..72bcbd5 100644
--- a/src/views/utils/nuUtils/HldyUtilsModal.vue
+++ b/src/views/utils/nuUtils/HldyUtilsModal.vue
@@ -1,16 +1,16 @@
 <template>
   <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <DepartUtilsList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DepartUtilsList>
+    <HldyUtilsIndex ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></HldyUtilsIndex>
   </j-modal>
 </template>
 
 <script lang="ts" setup>
   import { ref, nextTick, defineExpose } from 'vue';
-  import DepartUtilsList from './HldyUtilsList.vue'
+  import HldyUtilsIndex from './HldyUtilsIndex.vue'
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<string>('85%');
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();