From f411393e2360eea00e5048a9a186bd5689fadfb7 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Wed, 31 Jan 2024 15:23:46 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=80=A7=E7=94=B5?=
 =?UTF-8?q?=E8=A1=A8=E6=97=A5=E7=BB=9F=E8=AE=A1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tjanalysis/index.ts                   |   5 +
 .../tjanalysis/electricdatatotal/index.vue    |  36 +++-
 src/views/tjanalysis/irealdatatotal/index.vue | 170 ++++++++++++++++++
 3 files changed, 210 insertions(+), 1 deletion(-)
 create mode 100644 src/views/tjanalysis/irealdatatotal/index.vue

diff --git a/src/api/tjanalysis/index.ts b/src/api/tjanalysis/index.ts
index e4414aa..a3cb065 100644
--- a/src/api/tjanalysis/index.ts
+++ b/src/api/tjanalysis/index.ts
@@ -5,6 +5,11 @@ export const queryIrealdataTj = async (params) => {
   return await request.get({ url: `/tjanalysis/queryIrealdataTj`, params })
 }
 
+// 获取一次主表时间范围统计报表数据
+export const queryIrealdataTimeTj = async (params) => {
+  return await request.get({ url: `/tjanalysis/queryIrealdataTimeTj`, params })
+}
+
 // 获取智能电表日统计报表数据
 export const queryElectricdataTj = async (params) => {
   return await request.get({ url: `/tjanalysis/queryElectricdataTj`, params })
diff --git a/src/views/tjanalysis/electricdatatotal/index.vue b/src/views/tjanalysis/electricdatatotal/index.vue
index 994df51..6c0e25d 100644
--- a/src/views/tjanalysis/electricdatatotal/index.vue
+++ b/src/views/tjanalysis/electricdatatotal/index.vue
@@ -62,7 +62,23 @@ const handleQuery = async () => {
 }
 
 const resetQuery = async () => {
-  queryParams.dateRange = []
+   // 获取当前日期  
+let today = new Date();  
+  
+  // 计算昨天的日期  
+  today.setDate(today.getDate() - 1);  
+    
+  // 格式化日期为 "yyyy-MM-dd"  
+  let year = today.getFullYear();  
+  let month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1，并确保是两位数  
+  let date = String(today.getDate()).padStart(2, '0'); // 确保日期是两位数  
+    
+  let yesterdayAsString = `${year}-${month}-${date}`;  
+    
+  console.log(yesterdayAsString);  
+
+
+  queryParams.dateRange=[yesterdayAsString,yesterdayAsString]
   getList()
 }
 
@@ -119,7 +135,25 @@ function getSummaries(param) {
 
 /** 初始化 **/
 onMounted(async () => {
+ // 获取当前日期  
+let today = new Date();  
+  
+  // 计算昨天的日期  
+  today.setDate(today.getDate() - 1);  
+    
+  // 格式化日期为 "yyyy-MM-dd"  
+  let year = today.getFullYear();  
+  let month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1，并确保是两位数  
+  let date = String(today.getDate()).padStart(2, '0'); // 确保日期是两位数  
+    
+  let yesterdayAsString = `${year}-${month}-${date}`;  
+    
+  console.log(yesterdayAsString);  
+
+
+  queryParams.dateRange=[yesterdayAsString,yesterdayAsString]
   getList()
+  
 })
 
 </script>
diff --git a/src/views/tjanalysis/irealdatatotal/index.vue b/src/views/tjanalysis/irealdatatotal/index.vue
new file mode 100644
index 0000000..0259be3
--- /dev/null
+++ b/src/views/tjanalysis/irealdatatotal/index.vue
@@ -0,0 +1,170 @@
+<template>
+  <ContentWrap>
+    <!-- 智能电表统计表搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="日期" prop="dateRange">
+        <el-date-picker
+          v-model="queryParams.dateRange"
+          style="width: 240px; height: 30px"
+          value-format="YYYY-MM-DD"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+        />
+      </el-form-item>
+      <el-form-item label="仪表的描述总用电表" prop="mcode">
+        <el-select v-model="queryParams.flag" placeholder="请选择">
+          <el-option
+            v-for="item in typeList"
+            :key="item.flag"
+            :label="item.mname"
+            :value="item.flag" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button size="mini" @click="resetQuery">重置</el-button>
+        <!-- <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button> -->
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading" :data="dataList.dList" border="true" >
+      highlight-current-row="无功" prop="wugong" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="无功" prop="wugong" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="总" prop="idescTotal" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="峰" prop="idescF" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="谷" prop="idescG" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="平" prop="idescP" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="尖峰" prop="idescPt" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="功率因数" prop="gy" align="center" :show-overflow-tooltip="true" />
+    </el-table>
+  </ContentWrap>
+
+</template>
+
+<script setup lang="ts">
+import * as TjanalysisApi from '@/api/tjanalysis'
+import { formatDate } from '@/utils/formatTime'
+
+defineOptions({ name: 'PlatscaleAnalysis' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const loading = ref(true)
+const dataList = reactive({dList: [] , total: 0})
+
+const queryParams = reactive({
+  dateRange: [],
+  flag:'0'
+})
+
+const typeList= ref([{"flag":"0","mname":"主变1号"},{"flag":"1","mname":"主变2号"}]);
+
+const handleQuery = async () => {
+  getList()
+}
+
+const resetQuery = async () => {
+   // 获取当前日期  
+let today = new Date();  
+  
+  // 计算昨天的日期  
+  today.setDate(today.getDate() - 1);  
+    
+  // 格式化日期为 "yyyy-MM-dd"  
+  let year = today.getFullYear();  
+  let month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1，并确保是两位数  
+  let date = String(today.getDate()).padStart(2, '0'); // 确保日期是两位数  
+    
+  let yesterdayAsString = `${year}-${month}-${date}`;  
+    
+  console.log(yesterdayAsString);  
+
+
+  queryParams.dateRange=[yesterdayAsString,yesterdayAsString]
+  getList()
+}
+
+const getList = async () => {
+  const res = await TjanalysisApi.queryIrealdataTimeTj(queryParams)
+  console.log(res)
+  if (res != null && res.dataList != null) {
+    dataList.dList = res.dataList
+  }
+  loading.value = false
+}
+
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.queryIrealdataTimeTj(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "一次主表统计表.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
+
+function getSummaries(param) {
+  const { columns, data } = param;
+  const sums = [];
+  columns.forEach((column, index) => {
+    // console.log(column)
+    if (index === 0) {
+      sums[index] = '总';
+      // return;
+    } 
+    
+    const values = data.map(item => Number(item[column.property]));
+    if (!values.every(value => isNaN(value))) {
+      sums[index] = values.reduce((prev, curr) => {
+        const value = Number(curr);
+        if (!isNaN(value)) {
+          return prev + curr;
+        } else {
+          return prev;
+        }
+      }, 0);
+      // sums[index] += ' 元';
+    } else {
+      // sums[index] = 'N/A';
+    }
+  });
+
+  return sums;
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  // 获取当前日期  
+let today = new Date();  
+  
+  // 计算昨天的日期  
+  today.setDate(today.getDate() - 1);  
+    
+  // 格式化日期为 "yyyy-MM-dd"  
+  let year = today.getFullYear();  
+  let month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1，并确保是两位数  
+  let date = String(today.getDate()).padStart(2, '0'); // 确保日期是两位数  
+    
+  let yesterdayAsString = `${year}-${month}-${date}`;  
+    
+  console.log(yesterdayAsString);  
+
+
+  queryParams.dateRange=[yesterdayAsString,yesterdayAsString]
+  getList()
+})
+
+</script>
+

From 7d62345322e116a4984ad79a8273092d2b996448 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Mon, 4 Mar 2024 11:55:27 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8+?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E9=83=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basedata/marketplaceData/index.ts     |  57 +++
 src/views/basedata/marketplaceData/index.vue  | 231 ++++++++++++
 .../marketplaceData/marketplaceData.data.ts   | 131 +++++++
 src/views/lab/platscale/index.vue             |   2 +-
 src/views/lab/platscaledata/index.vue         | 259 +++++++++++++
 src/views/lab/platscaledata/platscale.data.ts | 341 ++++++++++++++++++
 .../tjanalysis/electricdatatotal/index.vue    |   5 +-
 7 files changed, 1023 insertions(+), 3 deletions(-)
 create mode 100644 src/api/basedata/marketplaceData/index.ts
 create mode 100644 src/views/basedata/marketplaceData/index.vue
 create mode 100644 src/views/basedata/marketplaceData/marketplaceData.data.ts
 create mode 100644 src/views/lab/platscaledata/index.vue
 create mode 100644 src/views/lab/platscaledata/platscale.data.ts

diff --git a/src/api/basedata/marketplaceData/index.ts b/src/api/basedata/marketplaceData/index.ts
new file mode 100644
index 0000000..3e71444
--- /dev/null
+++ b/src/api/basedata/marketplaceData/index.ts
@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface MarketplaceDataVO {
+  id: number
+  type: string
+  name: string
+  describes: string
+  price: number
+  amountIncrease: string
+  field1: string
+  field2: string
+  field3: string
+  field4: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询市场数据管理列表
+export const getMarketplaceDataPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/basic/marketplace-data/senior', data })
+  } else {
+    return await request.get({ url: `/basic/marketplace-data/page`, params })
+  }
+}
+
+// 查询市场数据管理详情
+export const getMarketplaceData = async (id: number) => {
+  return await request.get({ url: `/basic/marketplace-data/get?id=` + id })
+}
+
+// 新增市场数据管理
+export const createMarketplaceData = async (data: MarketplaceDataVO) => {
+  return await request.post({ url: `/basic/marketplace-data/create`, data })
+}
+
+// 修改市场数据管理
+export const updateMarketplaceData = async (data: MarketplaceDataVO) => {
+  return await request.put({ url: `/basic/marketplace-data/update`, data })
+}
+
+// 删除市场数据管理
+export const deleteMarketplaceData = async (id: number) => {
+  return await request.delete({ url: `/basic/marketplace-data/delete?id=` + id })
+}
+
+// 导出市场数据管理 Excel
+export const exportMarketplaceData = async (params) => {
+  return await request.download({ url: `/basic/marketplace-data/export-excel`, params })
+}
+
+// 下载导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/basic/marketplace-data/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/basedata/marketplaceData/index.vue b/src/views/basedata/marketplaceData/index.vue
new file mode 100644
index 0000000..949475e
--- /dev/null
+++ b/src/views/basedata/marketplaceData/index.vue
@@ -0,0 +1,231 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="MarketplaceData.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="MarketplaceData.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="MarketplaceDataRules"
+    :formAllSchemas="MarketplaceData.allSchemas"
+    :searchTableParams="searchTableParams"
+    :apiUpdate="MarketplaceDataApi.updateMarketplaceData"
+    :apiCreate="MarketplaceDataApi.createMarketplaceData"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="MarketplaceData.allSchemas" /> -->
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/basic/marketplace-data/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { MarketplaceData,MarketplaceDataRules } from './marketplaceData.data'
+import * as MarketplaceDataApi from '@/api/basedata/marketplaceData'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+// import TableHead from '@/components/TableHead/src/TableHead.vue'
+// import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+// import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'marketplace' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(MarketplaceData.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: MarketplaceDataApi.getMarketplaceDataPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:marketplaceData:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:marketplaceData:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn(null), // 编辑
+  defaultButtons.mainListDeleteBtn(null), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicMarketplaceData')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MarketplaceDataApi.deleteMarketplaceData(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await MarketplaceDataApi.exportMarketplaceData(setSearchParams)
+    download.excel(data, '市场数据管理.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '市场数据管理导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await MarketplaceDataApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/basedata/marketplaceData/marketplaceData.data.ts b/src/views/basedata/marketplaceData/marketplaceData.data.ts
new file mode 100644
index 0000000..f4ea32e
--- /dev/null
+++ b/src/views/basedata/marketplaceData/marketplaceData.data.ts
@@ -0,0 +1,131 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MarketplaceDataRules = reactive({
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+export const MarketplaceData = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '品种',
+    field: 'type',
+    sort: 'custom',
+                form: {
+                  component: 'Select'
+                },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '品种名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    
+  },
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '价格',
+    field: 'price',
+    sort: 'custom',
+    form:{
+      component:'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 4
+      }
+
+    }
+  },
+  {
+    label: '涨幅情况',
+    field: 'amountIncrease',
+    sort: 'custom',
+  },
+  {
+    label: '预留字段1',
+    field: 'field1',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '预留字段2',
+    field: 'field2',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '预留字段3',
+    field: 'field3',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '预留字段4',
+    field: 'field4',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/lab/platscale/index.vue b/src/views/lab/platscale/index.vue
index 352115a..7e40dcb 100644
--- a/src/views/lab/platscale/index.vue
+++ b/src/views/lab/platscale/index.vue
@@ -113,7 +113,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultSyncDataBtn(null), // 同步
+  // defaultButtons.defaultSyncDataBtn(null), // 同步
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultSetBtn(null), // 设置
   // {
diff --git a/src/views/lab/platscaledata/index.vue b/src/views/lab/platscaledata/index.vue
new file mode 100644
index 0000000..c9d956d
--- /dev/null
+++ b/src/views/lab/platscaledata/index.vue
@@ -0,0 +1,259 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Platscale.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Platscale.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <!-- <el-button type="text" @click="auditStatus(row)">确认</el-button> -->
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="PlatscaleRules"
+    :formAllSchemas="Platscale.allSchemas"
+    :searchTableParams="searchTableParams"
+    :apiUpdate="PlatscaleApi.updatePlatscale"
+    :apiCreate="PlatscaleApi.createPlatscale"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <el-dialog title="请选择同步日期" v-model="syncData.dialogVisible" width="20%">
+    <div class="block">
+      <!-- <span class="demonstration">默认</span> -->
+      <el-date-picker
+        v-model="syncData.busDate"
+        type="date"
+        value-format="YYYY-MM-DD"
+        placeholder="选择同步日期" style="width:100%" />
+    </div>
+    <br />
+    <span class="dialog-footer">
+      <el-button @click="syncData.dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="toSyncData">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Platscale,PlatscaleRules } from './platscale.data'
+import * as PlatscaleApi from '@/api/lab/platscale'
+import * as AsyncdataApi from '@/api/lab/asyncdata'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'platscaledata' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Platscale.allSchemas.tableColumns)
+
+const syncData = reactive({dialogVisible: false , busDate: ''})
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PlatscaleApi.getPlatscalePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultSyncDataBtn(null), // 同步
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  }  else if (val == 'syncData') { // 同步
+    syncData.dialogVisible = true
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+function toSyncData () {
+  syncData.dialogVisible = false
+  AsyncdataApi.asyncLabData({busType: '1' , busDate: syncData.busDate}).then((data) => {
+    if (data) {
+      message.success('操作成功')
+      getList()
+    } else {
+      message.warning('正在执行同步操作, 5分钟之内不要重复执行 , 请等待......')
+    }
+  })
+}
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn(null), // 编辑
+  // defaultButtons.mainListDeleteBtn(null), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+// 确认审核操作事件
+const auditStatus = async (row) => {
+  let data = {id: row.id , auditStatus: '1'}
+  // 确认
+  await message.confirm('确认?')
+  // 修改
+  await PlatscaleApi.updatePlatscale(data)
+  message.success('操作成功')
+  // 刷新列表
+  await getList()
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PlatscaleApi.deletePlatscale(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PlatscaleApi.exportPlatscale(setSearchParams)
+    download.excel(data, '实验室-地衡.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '实验室-地衡导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  // importTemplateData.templateUrl = await PlatscaleApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/lab/platscaledata/platscale.data.ts b/src/views/lab/platscaledata/platscale.data.ts
new file mode 100644
index 0000000..5739ac6
--- /dev/null
+++ b/src/views/lab/platscaledata/platscale.data.ts
@@ -0,0 +1,341 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter , dateFormatter2 } from '@/utils/formatTime'
+
+// 表单校验
+export const PlatscaleRules = reactive({
+})
+
+export const Platscale = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '主键、自增',
+  //   field: 'id',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
+  // {
+  //   label: '批号',
+  //   field: 'batchNo',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 150
+  //   }
+  // },
+  // {
+  //   label: '送样单位',
+  //   field: 'sydw',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   table: {
+  //     width: 150
+  //   }
+  // },
+  // {
+  //   label: '标准',
+  //   field: 'standard',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   table: {
+  //     width: 150
+  //   }
+  // },
+  // {
+  //   label: '材质',
+  //   field: 'cz',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   table: {
+  //     width: 150
+  //   }
+  // },
+  // {
+  //   label: '规格',
+  //   field: 'guig',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   table: {
+  //     width: 150
+  //   }
+  // },
+  // {
+  //   label: '实验人',
+  //   field: 'testUser',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   dictType: DICT_TYPE.LAB_USER_TEST_TYPE,
+  //   dictClass: 'number'
+  // },
+  {
+    label: '车号',
+    field: 'ch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '车型',
+    field: 'cx',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '品种',
+    field: 'pz',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '供货单位',
+    field: 'ghdw',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '运输单位',
+    field: 'ysdw',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '出入库',
+    field: 'crk',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '毛重',
+    field: 'mz',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '皮重',
+    field: 'pzh',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '净重',
+    field: 'jz',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '检斤员',
+    field: 'jjy',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '日期',
+    field: 'rq',
+    sort: 'custom',
+    isSearch: false,
+    formatter: dateFormatter2,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'date'
+      }
+    },
+    table: {
+      width: 200
+    }
+  },
+  {
+    label: '一次计量时间',
+    field: 'jlsjOne',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        valueFormat: 'HH:mm:ss',
+        type: 'time'
+      }
+    },
+    table: {
+      width: 200
+    }
+  },
+  {
+    label: '二次计量时间',
+    field: 'jlsjTwo',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        valueFormat: 'HH:mm:ss',
+        type: 'time'
+      }
+    },
+    table: {
+      width: 200
+    }
+  },
+  {
+    label: '编号',
+    field: 'bh',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '送货单位',
+    field: 'shdw',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '性质',
+    field: 'xz',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '防伪码',
+    field: 'fwm',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '抽样时间',
+    field: 'cysj',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 200
+    }
+  },
+  {
+    label: '抽样编号',
+    field: 'cybh',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '抽样结果',
+    field: 'cyjg',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '报告单编号',
+    field: 'bgdbh',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '是否抽检',
+    field: 'sfcj',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '数据源',
+    field: 'dataSource',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
+  // {
+  //   label: '审核状态',
+  //   field: 'auditStatus',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 120,
+  //     fixed: 'right'
+  //   },
+  //   dictType: DICT_TYPE.LAB_AUDIT_STATUS,
+  //   dictClass: 'number'
+  // },
+  {
+    label: '采集时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 180,
+  //     fixed: 'right'
+  //   }
+  // }
+]))
diff --git a/src/views/tjanalysis/electricdatatotal/index.vue b/src/views/tjanalysis/electricdatatotal/index.vue
index 6c0e25d..6667d81 100644
--- a/src/views/tjanalysis/electricdatatotal/index.vue
+++ b/src/views/tjanalysis/electricdatatotal/index.vue
@@ -23,8 +23,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table
-      v-loading="loading" :data="dataList.dList" border="true" 
-      highlight-current-row="true">
+      v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true">
       <el-table-column label="线路名称(智能电表)" prop="mname" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="总" prop="idescTotal" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="峰" prop="idescF" align="center" :show-overflow-tooltip="true" />
@@ -33,6 +32,8 @@
       <el-table-column label="谷值比例" prop="idescGt" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="平" prop="idescP" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="平值比例" prop="idescPt" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="尖峰" prop="idescJ" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="平值比例" prop="idescJt" align="center" :show-overflow-tooltip="true" />
     </el-table>
   </ContentWrap>
 

From efc589cc6923b95cb9d4616c09eb9ae0bf8d1b7b Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Mon, 4 Mar 2024 17:23:11 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tjanalysis/index.ts                   | 20 +++++++++++++++++++
 src/views/tjanalysis/electricdata/index.vue   | 13 ++++++++++++
 src/views/tjanalysis/irealdata/index.vue      | 14 +++++++++++++
 src/views/tjanalysis/irealdatatotal/index.vue |  6 +++---
 src/views/tjanalysis/natgasdatacd/index.vue   | 14 +++++++++++++
 5 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/src/api/tjanalysis/index.ts b/src/api/tjanalysis/index.ts
index a3cb065..6902e21 100644
--- a/src/api/tjanalysis/index.ts
+++ b/src/api/tjanalysis/index.ts
@@ -5,16 +5,31 @@ export const queryIrealdataTj = async (params) => {
   return await request.get({ url: `/tjanalysis/queryIrealdataTj`, params })
 }
 
+// 导出一次主表日统计报表
+export const exportIrealdataTj = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportIrealdataTj`, params})
+}
+
 // 获取一次主表时间范围统计报表数据
 export const queryIrealdataTimeTj = async (params) => {
   return await request.get({ url: `/tjanalysis/queryIrealdataTimeTj`, params })
 }
 
+// 导出一次主表时间范围统计报表数据
+export const exportIrealdataTimeTj = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportIrealdataTimeTj`, params })
+}
+
 // 获取智能电表日统计报表数据
 export const queryElectricdataTj = async (params) => {
   return await request.get({ url: `/tjanalysis/queryElectricdataTj`, params })
 }
 
+// 导出智能电表日统计报表数据数据
+export const exportElectricdataTj = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportElectricdataTj`, params })
+}
+
 // 获取地衡数据统计
 export const queryTjPlatScales = async (params) => {
   return await request.get({ url: `/tjanalysis/queryTjPlatScales`, params })
@@ -45,6 +60,11 @@ export const queryNatgasDatacdDay = async (params) => {
   return await request.get({ url: `/tjanalysis/queryNatgasDatacdDay`, params})
 }
 
+// 导出冷拔天然气数据日统计报表
+export const exportNatgasDatacdDay = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportNatgasDatacdDay`, params})
+}
+
 // 热轧天然气数据日统计报表
 export const queryNatgasdataDay = async (params) => {
   return await request.get({ url: `/tjanalysis/queryNatgasdataDay`, params})
diff --git a/src/views/tjanalysis/electricdata/index.vue b/src/views/tjanalysis/electricdata/index.vue
index 0834db1..7416bc3 100644
--- a/src/views/tjanalysis/electricdata/index.vue
+++ b/src/views/tjanalysis/electricdata/index.vue
@@ -23,6 +23,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -106,6 +107,18 @@ const getList = async () => {
   loading.value = false
 }
 
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportElectricdataTj(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "智能电表日统计数据.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
 
 /** 初始化 **/
 onMounted(async () => {
diff --git a/src/views/tjanalysis/irealdata/index.vue b/src/views/tjanalysis/irealdata/index.vue
index 023f473..a45530d 100644
--- a/src/views/tjanalysis/irealdata/index.vue
+++ b/src/views/tjanalysis/irealdata/index.vue
@@ -14,6 +14,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -115,6 +116,19 @@ function tableCellClassName({row, column, rowIndex, columnIndex}) {
   }
 }
 
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportIrealdataTj(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "一次主表日统计数据.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/tjanalysis/irealdatatotal/index.vue b/src/views/tjanalysis/irealdatatotal/index.vue
index 0259be3..93a2257 100644
--- a/src/views/tjanalysis/irealdatatotal/index.vue
+++ b/src/views/tjanalysis/irealdatatotal/index.vue
@@ -24,7 +24,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
-        <!-- <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button> -->
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -103,13 +103,13 @@ const getList = async () => {
 }
 
 const exportElecTotal = async () => {
-  const res = await TjanalysisApi.queryIrealdataTimeTj(queryParams)
+  const res = await TjanalysisApi.exportIrealdataTimeTj(queryParams)
   if (res != null) {
     let url = window.URL.createObjectURL(new Blob([res]));
     let link = document.createElement("a");
     link.style.display = "none";
     link.href = url;
-    link.setAttribute("download", "一次主表统计表.xlsx"); 
+    link.setAttribute("download", "一次主表日统计数据.xlsx"); 
     document.body.appendChild(link);
     link.click();
   }
diff --git a/src/views/tjanalysis/natgasdatacd/index.vue b/src/views/tjanalysis/natgasdatacd/index.vue
index ac5e20b..1b289d5 100644
--- a/src/views/tjanalysis/natgasdatacd/index.vue
+++ b/src/views/tjanalysis/natgasdatacd/index.vue
@@ -23,6 +23,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -103,6 +104,19 @@ const getList = async () => {
   loading.value = false
 }
 
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportNatgasDatacdDay(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "冷拔天然气数据日统计.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
+
 
 /** 初始化 **/
 onMounted(async () => {

From 8f7922e4dc87095572ee526b14ccfda03f17ee25 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Tue, 5 Mar 2024 13:29:31 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E8=A1=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tjanalysis/index.ts                   | 30 +++++++++++++++++++
 src/components/Pagination/index.vue           |  5 ++++
 .../tjanalysis/hrelongatordata/index.vue      | 14 +++++++++
 src/views/tjanalysis/hrpuncherdata/index.vue  | 14 +++++++++
 .../tjanalysis/hrsizingmilldata/index.vue     | 14 +++++++++
 src/views/tjanalysis/irealdata/index.vue      |  3 +-
 src/views/tjanalysis/natgasdatahr/index.vue   | 14 ++++++++-
 .../tjanalysis/natgasdatatotal/index.vue      | 14 ++++++++-
 src/views/tjanalysis/platscale/index.vue      |  6 ++--
 src/views/tjanalysis/waterday/index.vue       | 14 +++++++++
 10 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/src/api/tjanalysis/index.ts b/src/api/tjanalysis/index.ts
index 6902e21..adfff23 100644
--- a/src/api/tjanalysis/index.ts
+++ b/src/api/tjanalysis/index.ts
@@ -45,6 +45,11 @@ export const queryNatgasdatatotal = async (params) => {
   return await request.get({ url: `/tjanalysis/queryNatgasdatatotal`, params })
 }
 
+// 导出天然气总流量日统计
+export const exportNatgasDataTotal = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportNatgasDataTotal`, params })
+}
+
 // 智能报表统计
 export const queryElectricdataAllTj = async (params) => {
   return await request.get({ url: `/tjanalysis/queryElectricdataAllTj`, params })
@@ -70,11 +75,21 @@ export const queryNatgasdataDay = async (params) => {
   return await request.get({ url: `/tjanalysis/queryNatgasdataDay`, params})
 }
 
+// 导出热轧天然气数据日统计报表
+export const exportNatgasDataDay = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportNatgasDataDay`, params})
+}
+
 // 智能水表数据日统计表
 export const queryWaterDay = async (params) => {
   return await request.get({ url: `/tjanalysis/queryWaterDay`, params})
 }
 
+// 导出智能水表数据日统计表
+export const exportWaterDay = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportWaterDay`, params})
+}
+
 // 冷拔-拔机日统计报表
 export const queryXcqtyDay = async (params) => {
   return await request.get({ url: `/tjanalysis/queryXcqtyDay`, params})
@@ -85,13 +100,28 @@ export const queryHrpuncherDay = async (params) => {
   return await request.get({ url: `/tjanalysis/queryHrpuncherDay`, params })
 }
 
+// 导出热轧穿孔机日统计报表
+export const exportHrpuncherDay = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportHrpuncherDay`, params })
+}
+
 // 获取热轧延伸机日统计报表
 export const queryRzcjinfoDay = async (params) => {
   return await request.get({ url: `/tjanalysis/queryRzcjinfoDay`, params })
 }
 
+// 导出热轧延伸机日统计报表
+export const exportRzcjinfoDay = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportRzcjinfoDay`, params })
+}
+
 
 // 获取热轧定经机日统计报表
 export const querySizingmillDay = async (params) => {
   return await request.get({ url: `/tjanalysis/querySizingmillDay`, params })
+}
+
+// 导出热轧定经机日统计报表
+export const exportSizingmillDay = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportSizingmillDay`, params })
 }
\ No newline at end of file
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index b88997b..b9f4998 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -53,6 +53,8 @@ const props = defineProps({
   }
 })
 
+console.log('2323',props.total);
+
 const emit = defineEmits(['update:page', 'update:limit', 'pagination', 'pagination'])
 const currentPage = computed({
   get() {
@@ -73,8 +75,11 @@ const pageSize = computed({
   }
 })
 const handleSizeChange = (val) => {
+  debugger
   // 如果修改后超过最大页面，强制跳转到第 1 页
   if (currentPage.value * val > props.total) {
+    console.log(currentPage.value)
+    console.log(props.total)
     currentPage.value = 1
   }
   // 触发 pagination 事件，重新加载列表
diff --git a/src/views/tjanalysis/hrelongatordata/index.vue b/src/views/tjanalysis/hrelongatordata/index.vue
index c0c5d1f..662557f 100644
--- a/src/views/tjanalysis/hrelongatordata/index.vue
+++ b/src/views/tjanalysis/hrelongatordata/index.vue
@@ -23,6 +23,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -121,6 +122,19 @@ function tableCellClassName({row, column, rowIndex, columnIndex}) {
   }
 }
 
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportRzcjinfoDay(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "热轧延伸机日统计.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   const res =await DictApi.getStrDictOptions(DICT_TYPE.hrelongatordata);
diff --git a/src/views/tjanalysis/hrpuncherdata/index.vue b/src/views/tjanalysis/hrpuncherdata/index.vue
index fe988ba..9f6eb43 100644
--- a/src/views/tjanalysis/hrpuncherdata/index.vue
+++ b/src/views/tjanalysis/hrpuncherdata/index.vue
@@ -23,6 +23,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -120,6 +121,19 @@ function tableCellClassName({row, column, rowIndex, columnIndex}) {
   }
 }
 
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportHrpuncherDay(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "热轧穿孔机日统计.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   const res =await DictApi.getStrDictOptions(DICT_TYPE.hrpuncherdata);
diff --git a/src/views/tjanalysis/hrsizingmilldata/index.vue b/src/views/tjanalysis/hrsizingmilldata/index.vue
index edfa2c6..51522ee 100644
--- a/src/views/tjanalysis/hrsizingmilldata/index.vue
+++ b/src/views/tjanalysis/hrsizingmilldata/index.vue
@@ -24,6 +24,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -122,6 +123,19 @@ function tableCellClassName({row, column, rowIndex, columnIndex}) {
   }
 }
 
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportSizingmillDay(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "热轧定经机日统计.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   const res =await DictApi.getStrDictOptions(DICT_TYPE.hrsizingmilldata);
diff --git a/src/views/tjanalysis/irealdata/index.vue b/src/views/tjanalysis/irealdata/index.vue
index a45530d..c5d06d8 100644
--- a/src/views/tjanalysis/irealdata/index.vue
+++ b/src/views/tjanalysis/irealdata/index.vue
@@ -74,6 +74,7 @@ const resetQuery = async () => {
 
 const getList = async () => {
   const res = await TjanalysisApi.queryIrealdataTj(queryParams)
+  dataList.dList = []
   if (res != null && res.trList != null) {
     dataList.days  = res.days
     dataList.dList = []
@@ -115,7 +116,7 @@ function tableCellClassName({row, column, rowIndex, columnIndex}) {
     return 'success-cols'
   }
 }
-
+//一次主表日统计报表
 const exportElecTotal = async () => {
   const res = await TjanalysisApi.exportIrealdataTj(queryParams)
   if (res != null) {
diff --git a/src/views/tjanalysis/natgasdatahr/index.vue b/src/views/tjanalysis/natgasdatahr/index.vue
index f940983..1fc1b19 100644
--- a/src/views/tjanalysis/natgasdatahr/index.vue
+++ b/src/views/tjanalysis/natgasdatahr/index.vue
@@ -23,6 +23,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -98,7 +99,18 @@ const getList = async () => {
   }
   loading.value = false
 }
-
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportNatgasDataDay(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "热轧天然气数据日统计.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
 
 /** 初始化 **/
 onMounted(async () => {
diff --git a/src/views/tjanalysis/natgasdatatotal/index.vue b/src/views/tjanalysis/natgasdatatotal/index.vue
index 49204a9..984bfe1 100644
--- a/src/views/tjanalysis/natgasdatatotal/index.vue
+++ b/src/views/tjanalysis/natgasdatatotal/index.vue
@@ -23,6 +23,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -101,7 +102,18 @@ const getList = async () => {
   }
   loading.value = false
 }
-
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportNatgasDataTotal(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "天然气总量日统计.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
 
 /** 初始化 **/
 onMounted(async () => {
diff --git a/src/views/tjanalysis/platscale/index.vue b/src/views/tjanalysis/platscale/index.vue
index aded00e..9686447 100644
--- a/src/views/tjanalysis/platscale/index.vue
+++ b/src/views/tjanalysis/platscale/index.vue
@@ -30,13 +30,14 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true">
-      <el-table-column label="序号" type="index" width="80" align="center" />
+      <el-table-column label="序号1" type="index" width="80" align="center" />
       <el-table-column label="供货单位(使用单位)" prop="ghdw" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="运输单位" prop="ysdw" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="品种" prop="pz" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="总净重（t）" prop="jz" align="center" :show-overflow-tooltip="true" />
     </el-table>
     <pagination
-      v-show="dataList.total>0"
+      v-if="dataList.total>0"
       :total="dataList.total"
       :page="queryParams.pageNo"
       :limit="queryParams.pageSize"
@@ -84,6 +85,7 @@ const getList = async () => {
     dataList.dList = res.list
     dataList.total = res.total
   }
+  console.log('23',dataList.total);
   loading.value = false
 }
 
diff --git a/src/views/tjanalysis/waterday/index.vue b/src/views/tjanalysis/waterday/index.vue
index 65d8723..f6e062c 100644
--- a/src/views/tjanalysis/waterday/index.vue
+++ b/src/views/tjanalysis/waterday/index.vue
@@ -38,6 +38,7 @@
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -132,6 +133,19 @@ const flagChange=async()=>{
   }
 }
 
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportWaterDay(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "智能水表日统计.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   flagList.value = DictApi.getStrDictOptions(DICT_TYPE.Water_Module);

From 6126a611326ab36d765b15b66b07922c78e86b2b Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Thu, 7 Mar 2024 08:19:40 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tjanalysis/index.ts                   |   5 +
 src/utils/dict.ts                             |   5 +-
 .../tjanalysis/energyconsumption/index.vue    | 187 ++++++++++++++++++
 src/views/tjanalysis/platscale/index.vue      |   8 +-
 4 files changed, 202 insertions(+), 3 deletions(-)
 create mode 100644 src/views/tjanalysis/energyconsumption/index.vue

diff --git a/src/api/tjanalysis/index.ts b/src/api/tjanalysis/index.ts
index adfff23..bd444aa 100644
--- a/src/api/tjanalysis/index.ts
+++ b/src/api/tjanalysis/index.ts
@@ -124,4 +124,9 @@ export const querySizingmillDay = async (params) => {
 // 导出热轧定经机日统计报表
 export const exportSizingmillDay = async (params) => {
   return await request.download({ url: `/tjanalysis/exportSizingmillDay`, params })
+}
+
+// 获取能耗统计报表
+export const queryEnergyConsumption = async (params) => {
+  return await request.get({ url: `/tjanalysis/queryEnergyConsumption`, params })
 }
\ No newline at end of file
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index f62e7a7..cdd5072 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -203,5 +203,8 @@ export enum DICT_TYPE {
   LAB_USER_TEST_TYPE = 'test_user_type',
   LAB_AUDIT_STATUS   = 'lab_audit_status',
   LAB_ASYNC_BUS_TYPE = 'lab_async_bus_type',
-  LAB_OPR_TYPE = 'lab_opr_type'
+  LAB_OPR_TYPE = 'lab_opr_type',
+
+// ========== 统计报表能耗单位字典 ============
+ENERGY_CONSUMPTION_TYPE = 'energy_consumption_type'
 }
diff --git a/src/views/tjanalysis/energyconsumption/index.vue b/src/views/tjanalysis/energyconsumption/index.vue
new file mode 100644
index 0000000..a609f9b
--- /dev/null
+++ b/src/views/tjanalysis/energyconsumption/index.vue
@@ -0,0 +1,187 @@
+<template>
+  <ContentWrap>
+    <!-- 能耗搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="日期" prop="dateRange">
+        <el-date-picker
+          v-model="queryParams.dateRange"
+          style="width: 240px; height: 30px"
+          value-format="YYYY-MM-DD"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+        />
+      </el-form-item>
+      <el-form-item label="位置" prop="flag">
+        <el-select v-model="queryParams.flag" placeholder="请选择">
+          <el-option
+            v-for="item in flagList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="success" @click="exportElecTotal" size="mini">导出</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-divider content-position="left"><div style="font-size:16px; float: left"><b>{{names}}</b></div></el-divider>
+    <el-table
+      v-loading="loading" :data="dataList" border="true" highlight-current-row="true" 
+      header-row-style="height: 50px; text-align: center" :span-method="arraySpanMethod" 
+      :row-class-name="tableRowClassName" :cell-class-name="tableCellClassName">
+      <el-table-column label="" prop="name" align="right" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="00:00-08:00" prop="num0008" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="08:00-16:00" prop="num0816" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="16:00-24:00" prop="num1624" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="00:00-12:00" prop="num0012" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="12:00-24:00" prop="num1224" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="总(00:00-24:00)" prop="num0024" align="center" :show-overflow-tooltip="true" />
+    </el-table>
+  </ContentWrap>
+
+</template>
+
+<script setup lang="ts">
+import * as TjanalysisApi from '@/api/tjanalysis'
+import { formatDate } from '@/utils/formatTime'
+import * as DictApi from '@/utils/dict'
+
+defineOptions({ name: 'energyconsumption' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const loading = ref(true)
+const dataList = ref([])
+const names = ref('');
+const queryParams = reactive({
+  dateRange: [],
+  flag: '1'
+})
+
+const flagList =ref([])
+const handleQuery = async () => {
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  names.value = ll?.label
+  dataList.value = [];
+  getList()
+}
+
+const resetQuery = async () => {
+  let today = new Date();  
+  
+  // 计算昨天的日期  
+  today.setDate(today.getDate() - 1);  
+    
+  // 格式化日期为 "yyyy-MM-dd"  
+  let year = today.getFullYear();  
+  let month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1，并确保是两位数  
+  let date = String(today.getDate()).padStart(2, '0'); // 确保日期是两位数  
+    
+  let yesterdayAsString = `${year}-${month}-${date}`;  
+    
+  console.log(yesterdayAsString);  
+
+
+  queryParams.dateRange=[yesterdayAsString,yesterdayAsString]
+  getList()
+}
+
+const getList = async () => {
+  const res = await TjanalysisApi.queryEnergyConsumption(queryParams)
+    dataList.value  = res.dataList
+  loading.value = false
+}
+
+function arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
+  if (rowIndex == 6) {
+    if (columnIndex == 0) {
+      return {
+        rowspan: 1,
+        colspan: 10
+      }
+    } else if (columnIndex == 10) {
+      return {
+        rowspan: 1,
+        colspan: 2
+      }
+    } else {
+      return {
+        rowspan: 0,
+        colspan: 0
+      }
+    }
+  }
+}
+
+function tableRowClassName({row, rowIndex}) {
+  if (rowIndex === 7) {
+    return 'success-row'
+  }
+  return ''
+}
+
+function tableCellClassName({row, column, rowIndex, columnIndex}) {
+  if (columnIndex == 0) {
+    return 'success-cols'
+  }
+}
+
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportHrpuncherDay(queryParams)
+  if (res != null) {
+    let url = window.URL.createObjectURL(new Blob([res]));
+    let link = document.createElement("a");
+    link.style.display = "none";
+    link.href = url;
+    link.setAttribute("download", "热轧穿孔机日统计.xlsx"); 
+    document.body.appendChild(link);
+    link.click();
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+    // 获取当前日期  
+ let today = new Date();  
+  // 计算昨天的日期  
+  today.setDate(today.getDate() - 1);  
+  // 格式化日期为 "yyyy-MM-dd"  
+  let year = today.getFullYear();  
+  let month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要+1，并确保是两位数  
+  let date = String(today.getDate()).padStart(2, '0'); // 确保日期是两位数  
+  let yesterdayAsString = `${year}-${month}-${date}`;  
+  console.log(yesterdayAsString);  
+  queryParams.dateRange=[yesterdayAsString,yesterdayAsString]
+  const res =await DictApi.getStrDictOptions(DICT_TYPE.ENERGY_CONSUMPTION_TYPE);
+  if (res != null && res.length>0) {
+    flagList.value  = res
+    queryParams.flag= flagList.value[0].value;
+    const ll = flagList.value.find(map=>map.value == queryParams.flag);
+    names.value = ll?.label
+  } 
+  getList()
+})
+
+</script>
+
+<style>
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+
+  .el-table .success-cols {
+    font-weight: bold;
+  }
+</style>
+
diff --git a/src/views/tjanalysis/platscale/index.vue b/src/views/tjanalysis/platscale/index.vue
index 9686447..7572518 100644
--- a/src/views/tjanalysis/platscale/index.vue
+++ b/src/views/tjanalysis/platscale/index.vue
@@ -30,7 +30,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true">
-      <el-table-column label="序号1" type="index" width="80" align="center" />
+      <el-table-column label="序号" type="index" width="80" align="center" />
       <el-table-column label="供货单位(使用单位)" prop="ghdw" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="运输单位" prop="ysdw" align="center" :show-overflow-tooltip="true" />
       <el-table-column label="品种" prop="pz" align="center" :show-overflow-tooltip="true" />
@@ -79,7 +79,11 @@ const resetQuery = async () => {
   getList()
 }
 
-const getList = async () => {
+const getList = async (page) => {
+  if(page){
+    queryParams.pageNo = page.page
+    queryParams.pageSize = page.limit
+  }
   const res = await TjanalysisApi.queryTjPlatScales(queryParams)
   if (res != null && res.list != null) {
     dataList.dList = res.list

From e00d51e981e4cc048c78067b6c47de5c3c86e224 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Thu, 7 Mar 2024 10:38:50 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tjanalysis/index.ts                   |  5 +++
 src/views/tjanalysis/electricdata/index.vue   |  7 ++--
 .../tjanalysis/energyconsumption/index.vue    | 33 ++++++++++++-------
 src/views/tjanalysis/irealdatatotal/index.vue |  9 +++--
 4 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/api/tjanalysis/index.ts b/src/api/tjanalysis/index.ts
index bd444aa..38beeb1 100644
--- a/src/api/tjanalysis/index.ts
+++ b/src/api/tjanalysis/index.ts
@@ -129,4 +129,9 @@ export const exportSizingmillDay = async (params) => {
 // 获取能耗统计报表
 export const queryEnergyConsumption = async (params) => {
   return await request.get({ url: `/tjanalysis/queryEnergyConsumption`, params })
+}
+
+// 导出能耗统计报表
+export const exportEnergyConsumption = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportEnergyConsumption`, params })
 }
\ No newline at end of file
diff --git a/src/views/tjanalysis/electricdata/index.vue b/src/views/tjanalysis/electricdata/index.vue
index 7416bc3..3887314 100644
--- a/src/views/tjanalysis/electricdata/index.vue
+++ b/src/views/tjanalysis/electricdata/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ContentWrap>
-    <!-- 搜索工作栏 -->
+    <!-- 智能电表日统计搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="日期" prop="date">
         <el-date-picker
@@ -77,7 +77,8 @@ const dataList = reactive({dList: [] , days: 0})
 
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
-  flag: '2'
+  flag: '2',
+  iname:''
 })
 
 const handleQuery = async () => {
@@ -99,6 +100,8 @@ const getDbTypes = async () => {
 }
 
 const getList = async () => {
+  const ll = dbTypes.typeList.find(map=>map.mcode == queryParams.mcode);
+  
   const res = await TjanalysisApi.queryElectricdataTj(queryParams)
   if (res != null && res.trList != null) {
     dataList.days  = res.days
diff --git a/src/views/tjanalysis/energyconsumption/index.vue b/src/views/tjanalysis/energyconsumption/index.vue
index a609f9b..5e5aa94 100644
--- a/src/views/tjanalysis/energyconsumption/index.vue
+++ b/src/views/tjanalysis/energyconsumption/index.vue
@@ -36,13 +36,19 @@
       v-loading="loading" :data="dataList" border="true" highlight-current-row="true" 
       header-row-style="height: 50px; text-align: center" :span-method="arraySpanMethod" 
       :row-class-name="tableRowClassName" :cell-class-name="tableCellClassName">
-      <el-table-column label="" prop="name" align="right" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="00:00-08:00" prop="num0008" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="08:00-16:00" prop="num0816" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="16:00-24:00" prop="num1624" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="00:00-12:00" prop="num0012" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="12:00-24:00" prop="num1224" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="总(00:00-24:00)" prop="num0024" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="生产单位" prop="name" align="right" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="班组" prop="tiemFrame" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="生产水耗1" prop="fields" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="生产水耗2" prop="fields1" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="循环水" prop="fields2" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="煤量" prop="fields3" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="天然气" prop="fields4" align="center" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="班组用电量" prop="fields5" align="center" :show-overflow-tooltip="true" /> -->
+      <el-table-column label="峰期电量" prop="fields6" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="谷期电量" prop="fields7" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="平期电量" prop="fields8" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="尖峰电量" prop="fields8" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="合计电量" prop="fields5" align="center" :show-overflow-tooltip="true" />
     </el-table>
   </ContentWrap>
 
@@ -66,13 +72,16 @@ const dataList = ref([])
 const names = ref('');
 const queryParams = reactive({
   dateRange: [],
-  flag: '1'
+  flag: '0',
+  iname:''
+
 })
 
 const flagList =ref([])
 const handleQuery = async () => {
   const ll = flagList.value.find(map=>map.value == queryParams.flag);
   names.value = ll?.label
+  queryParams.iname= ll?.label
   dataList.value = [];
   getList()
 }
@@ -99,7 +108,8 @@ const resetQuery = async () => {
 
 const getList = async () => {
   const res = await TjanalysisApi.queryEnergyConsumption(queryParams)
-    dataList.value  = res.dataList
+
+    dataList.value  = res
   loading.value = false
 }
 
@@ -138,13 +148,13 @@ function tableCellClassName({row, column, rowIndex, columnIndex}) {
 }
 
 const exportElecTotal = async () => {
-  const res = await TjanalysisApi.exportHrpuncherDay(queryParams)
+  const res = await TjanalysisApi.exportEnergyConsumption(queryParams)
   if (res != null) {
     let url = window.URL.createObjectURL(new Blob([res]));
     let link = document.createElement("a");
     link.style.display = "none";
     link.href = url;
-    link.setAttribute("download", "热轧穿孔机日统计.xlsx"); 
+    link.setAttribute("download", "能耗日统计.xlsx"); 
     document.body.appendChild(link);
     link.click();
   }
@@ -167,6 +177,7 @@ onMounted(async () => {
   if (res != null && res.length>0) {
     flagList.value  = res
     queryParams.flag= flagList.value[0].value;
+    queryParams.iname= flagList.value[0].label;
     const ll = flagList.value.find(map=>map.value == queryParams.flag);
     names.value = ll?.label
   } 
diff --git a/src/views/tjanalysis/irealdatatotal/index.vue b/src/views/tjanalysis/irealdatatotal/index.vue
index 93a2257..fc81571 100644
--- a/src/views/tjanalysis/irealdatatotal/index.vue
+++ b/src/views/tjanalysis/irealdatatotal/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ContentWrap>
-    <!-- 智能电表统计表搜索工作栏 -->
+    <!-- 一次主表统计搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="日期" prop="dateRange">
         <el-date-picker
@@ -63,7 +63,8 @@ const dataList = reactive({dList: [] , total: 0})
 
 const queryParams = reactive({
   dateRange: [],
-  flag:'0'
+  flag:'0',
+  iname:''
 })
 
 const typeList= ref([{"flag":"0","mname":"主变1号"},{"flag":"1","mname":"主变2号"}]);
@@ -94,6 +95,8 @@ let today = new Date();
 }
 
 const getList = async () => {
+  const ll = typeList.value.find(map=>map.flag == queryParams.flag);
+  queryParams.iname = ll?.mname
   const res = await TjanalysisApi.queryIrealdataTimeTj(queryParams)
   console.log(res)
   if (res != null && res.dataList != null) {
@@ -109,7 +112,7 @@ const exportElecTotal = async () => {
     let link = document.createElement("a");
     link.style.display = "none";
     link.href = url;
-    link.setAttribute("download", "一次主表日统计数据.xlsx"); 
+    link.setAttribute("download", "一次主表统计数据.xlsx"); 
     document.body.appendChild(link);
     link.click();
   }

From 4fb1bc1ea06b4a0e52650d74834e4f53e82da4db Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Thu, 7 Mar 2024 13:45:12 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4=E5=92=8C=E4=B8=8B=E6=9D=A5?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tjanalysis/electricdata/index.vue     |  2 +-
 src/views/tjanalysis/hrelongatordata/index.vue  |  5 ++++-
 src/views/tjanalysis/hrpuncherdata/index.vue    |  5 ++++-
 src/views/tjanalysis/hrsizingmilldata/index.vue |  5 ++++-
 src/views/tjanalysis/natgasdatacd/index.vue     |  5 +++++
 src/views/tjanalysis/natgasdatahr/index.vue     |  5 ++++-
 src/views/tjanalysis/natgasdatatotal/index.vue  |  5 ++++-
 src/views/tjanalysis/platscale/index.vue        |  2 +-
 src/views/tjanalysis/waterday/index.vue         | 10 ++++++++--
 9 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/views/tjanalysis/electricdata/index.vue b/src/views/tjanalysis/electricdata/index.vue
index 3887314..239b596 100644
--- a/src/views/tjanalysis/electricdata/index.vue
+++ b/src/views/tjanalysis/electricdata/index.vue
@@ -101,7 +101,7 @@ const getDbTypes = async () => {
 
 const getList = async () => {
   const ll = dbTypes.typeList.find(map=>map.mcode == queryParams.mcode);
-  
+  queryParams.iname = ll?.mname
   const res = await TjanalysisApi.queryElectricdataTj(queryParams)
   if (res != null && res.trList != null) {
     dataList.days  = res.days
diff --git a/src/views/tjanalysis/hrelongatordata/index.vue b/src/views/tjanalysis/hrelongatordata/index.vue
index 662557f..7dddc6f 100644
--- a/src/views/tjanalysis/hrelongatordata/index.vue
+++ b/src/views/tjanalysis/hrelongatordata/index.vue
@@ -65,7 +65,8 @@ const dataList = ref([])
 const names = ref("热轧108延伸");
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
-  flag: '1'
+  flag: '1',
+  iname:''
 })
 
 const flagList = ref([])
@@ -83,6 +84,8 @@ const resetQuery = async () => {
 }
 
 const getList = async () => {
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  queryParams.iname = ll?.label
   const res = await TjanalysisApi.queryRzcjinfoDay(queryParams)
     dataList.value  = res.dataList
   loading.value = false
diff --git a/src/views/tjanalysis/hrpuncherdata/index.vue b/src/views/tjanalysis/hrpuncherdata/index.vue
index 9f6eb43..65eebd4 100644
--- a/src/views/tjanalysis/hrpuncherdata/index.vue
+++ b/src/views/tjanalysis/hrpuncherdata/index.vue
@@ -65,7 +65,8 @@ const dataList = ref([])
 const names = ref('');
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
-  flag: '1'
+  flag: '1',
+  iname:''
 })
 
 const flagList =ref([])
@@ -82,6 +83,8 @@ const resetQuery = async () => {
 }
 
 const getList = async () => {
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  queryParams.iname = ll?.label
   const res = await TjanalysisApi.queryHrpuncherDay(queryParams)
     dataList.value  = res.dataList
   loading.value = false
diff --git a/src/views/tjanalysis/hrsizingmilldata/index.vue b/src/views/tjanalysis/hrsizingmilldata/index.vue
index 51522ee..de8a9b5 100644
--- a/src/views/tjanalysis/hrsizingmilldata/index.vue
+++ b/src/views/tjanalysis/hrsizingmilldata/index.vue
@@ -66,7 +66,8 @@ const dataList = ref([])
 const names = ref('');
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
-  flag: '1'
+  flag: '1',
+  iname:''
 })
 
 const flagList = ref([])
@@ -84,6 +85,8 @@ const resetQuery = async () => {
 }
 
 const getList = async () => {
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  queryParams.iname = ll?.label
   const res = await TjanalysisApi.querySizingmillDay(queryParams)
     dataList.value  = res.dataList
   loading.value = false
diff --git a/src/views/tjanalysis/natgasdatacd/index.vue b/src/views/tjanalysis/natgasdatacd/index.vue
index 1b289d5..4f0680b 100644
--- a/src/views/tjanalysis/natgasdatacd/index.vue
+++ b/src/views/tjanalysis/natgasdatacd/index.vue
@@ -79,6 +79,7 @@ const dataList = reactive({dList: [] , days: 0})
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
   flag:'0',
+  iname:''
 })
 
 const handleQuery = async () => {
@@ -97,6 +98,10 @@ const resetQuery = async () => {
 }
 
 const getList = async () => {
+  
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  queryParams.iname = ll?.label
+  
   const res = await TjanalysisApi.queryNatgasDatacdDay(queryParams)
   if (res != null && res.dataList != null) {
     dataList.dList = res.dataList
diff --git a/src/views/tjanalysis/natgasdatahr/index.vue b/src/views/tjanalysis/natgasdatahr/index.vue
index 1fc1b19..81ba49a 100644
--- a/src/views/tjanalysis/natgasdatahr/index.vue
+++ b/src/views/tjanalysis/natgasdatahr/index.vue
@@ -78,7 +78,8 @@ const icode = 'Gas_Data_008'
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
   mcode:'',
-  icode: icode//固定查询
+  icode: icode,//固定查询
+  iname:''
 })
 
 const handleQuery = async () => {
@@ -93,6 +94,8 @@ const resetQuery = async () => {
 }
 
 const getList = async () => {
+  const ll = mcodeList.value.find(map=>map.code == queryParams.mcode);
+  queryParams.iname = ll?.label
   const res = await TjanalysisApi.queryNatgasdataDay(queryParams)
   if (res != null && res.dataList != null) {
     dataList.dList = res.dataList
diff --git a/src/views/tjanalysis/natgasdatatotal/index.vue b/src/views/tjanalysis/natgasdatatotal/index.vue
index 984bfe1..da5c9ea 100644
--- a/src/views/tjanalysis/natgasdatatotal/index.vue
+++ b/src/views/tjanalysis/natgasdatatotal/index.vue
@@ -80,7 +80,8 @@ const name = ref("");
 
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
-  flag: 1
+  flag: 1,
+  iname:''
 })
 const handleQuery = async () => {
   let aa  = flagList.value.find(map=>map.value==queryParams.flag);
@@ -96,6 +97,8 @@ const resetQuery = async () => {
 }
 
 const getList = async () => {
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  queryParams.iname = ll?.label
   const res = await TjanalysisApi.queryNatgasdatatotal(queryParams)
   if (res != null && res.trList != null) {
     dataList.dList = res.trList
diff --git a/src/views/tjanalysis/platscale/index.vue b/src/views/tjanalysis/platscale/index.vue
index 7572518..2bf28f9 100644
--- a/src/views/tjanalysis/platscale/index.vue
+++ b/src/views/tjanalysis/platscale/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ContentWrap>
-    <!-- 搜索工作栏 -->
+    <!-- 地衡数据统计搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="使用单位" prop="ghdw">
         <el-input
diff --git a/src/views/tjanalysis/waterday/index.vue b/src/views/tjanalysis/waterday/index.vue
index f6e062c..1810252 100644
--- a/src/views/tjanalysis/waterday/index.vue
+++ b/src/views/tjanalysis/waterday/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ContentWrap>
-    <!-- 搜索工作栏 -->
+    <!-- 智能水表数据日统计表搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="日期" prop="date">
         <el-date-picker
@@ -95,7 +95,9 @@ const dataList = reactive({dList: [] })
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
   mcode: 'Gas_hr_001',
-  flag: '0'
+  flag: '0',
+  iname:'',
+  mname:''
 })
 
 const handleQuery = async () => {
@@ -110,6 +112,10 @@ const resetQuery = async () => {
 }
 
 const getList = async () => {
+  const l1 = flagList.value.find(map=>map.value == queryParams.flag);
+  queryParams.mname = l1?.label
+  const ll = mcodeList.value.find(map=>map.code == queryParams.mcode);
+  queryParams.iname = ll?.label
   const res = await TjanalysisApi.queryWaterDay(queryParams)
   if (res != null && res.dataList != null) {
     dataList.dList = res.dataList