From 250d5ad07eff7adca82205d6f02e5d404c4210f3 Mon Sep 17 00:00:00 2001
From: "daikun1@bosssoft.com.cn" <daikun1@bosssoft.com.cn>
Date: Fri, 22 Dec 2023 11:19:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/lab/asyncdata/index.js                |   8 +
 .../lab/stretch/stretchthreehundred/index.ts  |   5 +
 src/api/pszc/pszccommon/index.ts              |  22 +++
 src/api/tjanalysis/index.ts                   |  19 +++
 src/components/Qxview/src/QxviewThree.vue     |  42 ++++-
 src/layout/components/Message/src/Message.vue |  14 +-
 src/layout/components/ToolHeader.vue          |  10 +-
 src/utils/disposition/defaultButtons.ts       |  13 ++
 src/views/lab/impact/index.vue                | 153 ++++++++++--------
 src/views/lab/platscale/index.vue             |  34 +++-
 src/views/lab/platscale/platscale.data.ts     |   9 ++
 src/views/lab/spectrum/index.vue              |  40 ++++-
 src/views/lab/spectrum/spectrum.data.ts       |  25 ++-
 .../lab/stretch/stretchthousandnew/index.vue  |  35 +++-
 .../lab/stretch/stretchthreehundred/index.vue |  48 +++++-
 .../cdelectricdata/cdElectricdata.data.ts     |  73 +++++++--
 .../pszc/cdnatgasdata/cdNatgasdata.data.ts    |  72 +++++++--
 .../pszc/cdpuncherdata/cdPuncherdata.data.ts  |  72 +++++++--
 .../pszc/cdslotfurnace/cdSlotfurnace.data.ts  |  72 +++++++--
 .../cdsmelterfurnace/cdSmelterfurnace.data.ts |  72 +++++++--
 .../pszc/cdstepfurnace/cdStepfurnace.data.ts  |  72 +++++++--
 .../pszc/cdwatermeter/cdWatermeter.data.ts    |  72 +++++++--
 .../hrAnnularfurnace108.data.ts               |  72 +++++++--
 .../hrAnnularfurnace90.data.ts                |  72 +++++++--
 .../hrAnnularfurnacegas108.data.ts            |  72 +++++++--
 .../hrElongatordata108.data.ts                |  72 +++++++--
 .../hrElongatordata90.data.ts                 |  72 +++++++--
 .../pszc/hrnatgasdata/hrNatgasdata.data.ts    |  72 +++++++--
 .../hrpuncherdata108/hrPuncherdata108.data.ts |  72 +++++++--
 .../hrpuncherdata90/hrPuncherdata90.data.ts   |  72 +++++++--
 .../hrSizingmilldata108.data.ts               |  72 +++++++--
 .../hrSizingmilldata90.data.ts                |  72 +++++++--
 .../hrwatermeter108/hrWatermeter108.data.ts   |  72 +++++++--
 .../hrwatermeter90/hrWatermeter90.data.ts     |  72 +++++++--
 .../tjanalysis/electricdatatotal/index.vue    | 126 +++++++++++++++
 src/views/tjanalysis/irealdata/index.vue      |  22 +--
 src/views/tjanalysis/natgasdatacd/index.vue   | 121 ++++++++++++++
 src/views/tjanalysis/natgasdatahr/index.vue   | 120 ++++++++++++++
 src/views/tjanalysis/waterday/index.vue       | 125 ++++++++++++++
 39 files changed, 2004 insertions(+), 356 deletions(-)
 create mode 100644 src/api/lab/asyncdata/index.js
 create mode 100644 src/api/pszc/pszccommon/index.ts
 create mode 100644 src/views/tjanalysis/electricdatatotal/index.vue
 create mode 100644 src/views/tjanalysis/natgasdatacd/index.vue
 create mode 100644 src/views/tjanalysis/natgasdatahr/index.vue
 create mode 100644 src/views/tjanalysis/waterday/index.vue

diff --git a/src/api/lab/asyncdata/index.js b/src/api/lab/asyncdata/index.js
new file mode 100644
index 0000000..c67306a
--- /dev/null
+++ b/src/api/lab/asyncdata/index.js
@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+
+export const asyncLabData = async (params) => {
+    return await request.get({
+        url: `/lab/asynclab/asyncLabData`,
+        params
+    })
+}
\ No newline at end of file
diff --git a/src/api/lab/stretch/stretchthreehundred/index.ts b/src/api/lab/stretch/stretchthreehundred/index.ts
index e1b4022..efdd5eb 100644
--- a/src/api/lab/stretch/stretchthreehundred/index.ts
+++ b/src/api/lab/stretch/stretchthreehundred/index.ts
@@ -113,6 +113,11 @@ export const importTemplate = () => {
   return request.download({ url: '/lab/stretchthreehundred/get-import-template' })
 }
 
+// 查询曲线实验编号列表
+export const getQxSyzbhs = async (syzbh: String) => {
+  return await request.get({ url: `/lab/stretchthreehundred/getQxSyzbhs?syzbh=` + syzbh })
+}
+
 // 查询曲线图数据
 export const getStretchThreeQxInfo = async (syzbh: String) => {
   return await request.get({ url: `/lab/stretchthreehundred/getStretchThreeQxInfo?syzbh=` + syzbh })
diff --git a/src/api/pszc/pszccommon/index.ts b/src/api/pszc/pszccommon/index.ts
new file mode 100644
index 0000000..46b7d00
--- /dev/null
+++ b/src/api/pszc/pszccommon/index.ts
@@ -0,0 +1,22 @@
+import request from '@/config/axios'
+
+// 动态获取下拉数据
+// flag 1 冷拔-步进炉 ；2  冷拔-固熔炉 ; 3 冷拔-缝式炉 ; 4 冷拔-水表 ; 5 冷拔-智能电表 ; 6 冷拔-穿孔机 ; 7 冷拔-天然气总量
+// type 1 数据点数据 ; 2 仪表数据
+export const selectCdPros = async (params) => {
+  return await request.get({ url: `/pszccommon/selectCdPros`, params })
+}
+
+// flag  1 环形加热炉 ；2  穿孔机 ; 3 延伸机 ; 4 定经机 ; 5 热轧水表
+export const selectHr90Pros = async (params) => {
+  return await request.get({ url: `/pszccommon/selectHr90Pros`, params })
+}
+
+// flag  1 环形加热炉 ；2 环形加热炉天然气管理  ; 3  穿孔机 ; 4 延伸机 ; 5 定经机 ; 6 热轧水表
+export const selectHr108Pros = async (params) => {
+  return await request.get({ url: `/pszccommon/selectHr108Pros`, params })
+}
+
+export const selectHrTrqPros = async (params) => {
+  return await request.get({ url: `/pszccommon/selectHrTrqPros`, params })
+}
\ No newline at end of file
diff --git a/src/api/tjanalysis/index.ts b/src/api/tjanalysis/index.ts
index f37559b..450548c 100644
--- a/src/api/tjanalysis/index.ts
+++ b/src/api/tjanalysis/index.ts
@@ -25,3 +25,22 @@ export const queryNatgasdatatotal = async (params) => {
   return await request.get({ url: `/tjanalysis/queryNatgasdatatotal`, params })
 }
 
+// 智能报表统计
+export const queryElectricdataAllTj = async (params) => {
+  return await request.get({ url: `/tjanalysis/queryElectricdataAllTj`, params })
+}
+
+// 导出智能报表
+export const exportElectricdataAllTj = async (params) => {
+  return await request.download({ url: `/tjanalysis/exportElectricdataAllTj`, params})
+}
+
+// 热轧天然气数据日统计报表
+export const queryNatgasdataDay = async (params) => {
+  return await request.get({ url: `/tjanalysis/queryNatgasdataDay`, params})
+}
+
+// 智能水表数据日统计表
+export const queryWaterDay = async (params) => {
+  return await request.get({ url: `/tjanalysis/queryWaterDay`, params})
+}
diff --git a/src/components/Qxview/src/QxviewThree.vue b/src/components/Qxview/src/QxviewThree.vue
index 3257b03..650bb94 100644
--- a/src/components/Qxview/src/QxviewThree.vue
+++ b/src/components/Qxview/src/QxviewThree.vue
@@ -1,19 +1,40 @@
 <template>
-  <Dialog v-model="dialogVisible" title="曲线明细" width="700">
+  <Dialog v-model="dialogVisible" title="曲线明细" width="800">
     <el-row class="mt-5px" :gutter="20" justify="space-between">
-      <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" class="mb-10px">
+      <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24">
         <el-card shadow="never">
           <el-skeleton :loading="loading" animated>
             <el-row :gutter="20" justify="space-between">
               <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
                 <el-skeleton :loading="loading" animated>
-                  <Echart :options="lineOptionsData" :width="650" :height="400" />
+                  <Echart :options="lineOptionsData" :width="450" :height="400" />
                 </el-skeleton>
               </el-col>
             </el-row>
           </el-skeleton>
         </el-card>
       </el-col>
+      <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24">
+        <el-card shadow="never" style="height: 440px">
+          <template #header>
+            <div class="h-3 flex justify-between">
+              <span>实验编号</span>
+            </div>
+          </template>
+          <el-skeleton :loading="loading" animated>
+            <div data-name="123" style="height: 380px; overflow-y: auto;">
+              <div v-for="(item, index) in sybhList" :key="`dynamics-${index}`">
+                <div style="height: 10px">
+                  <el-button type="text" @click="changeData(item)">
+                    {{ item }}
+                  </el-button>
+                </div>
+                <el-divider style="height: 1px" />
+              </div>
+            </div>
+          </el-skeleton>
+        </el-card>
+      </el-col>
     </el-row>
   </Dialog>  
 </template>
@@ -24,17 +45,20 @@ import { formatTime } from '@/utils'
 import { useUserStore } from '@/store/modules/user'
 import { useWatermark } from '@/hooks/web/useWatermark'
 import { pieOptions, barOptions , lineOptions } from './echarts-data'
+import * as Stretch300Api from '@/api/lab/stretch/stretchthreehundred'
+
 defineOptions({ name: 'QxviewThree' })
 
 const { t } = useI18n()
 const userStore = useUserStore()
 const { setWatermark } = useWatermark()
 const loading = ref(false)
+const sybhList = ref([])
 const dialogVisible = ref(false) // 弹窗的是否展示
 const lineOptionsData = reactive<EChartsOption>(lineOptions) as EChartsOption
 
-const open = (vData , title) => {
-  console.log(vData)
+const open = (bhList , vData , title) => {
+  sybhList.value = bhList
   initData(vData , title)
   loading.value = false
   dialogVisible.value = true
@@ -42,6 +66,14 @@ const open = (vData , title) => {
 
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
+const changeData = async (item) => {
+  const data = await Stretch300Api.getStretchThreeQxInfo(item)
+  if (data != null && data.dataList != null) {
+    initData(data.dataList , "实验力-位移")
+  } else {
+    initData([] , "实验力-位移")
+  }
+}
 // 初始化曲线数据
 const initData = async (datas , title) => {
   if (datas != null) {
diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue
index 28f796b..553250b 100644
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -33,14 +33,14 @@ const goMyList = () => {
 // ========== 初始化 =========
 onMounted(() => {
   // 首次加载小红点
-  getUnreadCount()
+  // getUnreadCount()
   // 轮询刷新小红点
-  setInterval(
-    () => {
-      getUnreadCount()
-    },
-    1000 * 60 * 2
-  )
+  // setInterval(
+  //   () => {
+  //     getUnreadCount()
+  //   },
+  //   1000 * 60 * 2
+  // )
 })
 </script>
 <template>
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue
index ec7882d..246cbcf 100644
--- a/src/layout/components/ToolHeader.vue
+++ b/src/layout/components/ToolHeader.vue
@@ -35,7 +35,7 @@ const layout = computed(() => appStore.getLayout)
 const locale = computed(() => appStore.getLocale)
 
 // 消息图标
-const message = computed(() => appStore.getMessage)
+// const message = computed(() => appStore.getMessage)
 
 export default defineComponent({
   name: 'ToolHeader',
@@ -70,9 +70,11 @@ export default defineComponent({
               color="var(--top-header-text-color)"
             ></LocaleDropdown>
           ) : undefined}
-          {message.value ? (
-            <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
-          ) : undefined}
+          {
+          //   message.value ? (
+          //   <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
+          // ) : undefined
+          }
           <UserInfo></UserInfo>
         </div>
       </div>
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index ee76609..8b319df 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -31,6 +31,19 @@ export function defaultImportBtn(option:any) {
   })
 }
 
+// 同步按钮
+export function defaultSyncDataBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '同步',
+    name: 'syncData',
+    hide: false,
+    type: 'primary',
+    // icon: 'ep:plus',
+    color: '',
+    hasPermi: ''
+  })
+}
+
 // 导出按钮
 export function defaultExportBtn(option:any) {
   return __defaultBtnOption(option,{
diff --git a/src/views/lab/impact/index.vue b/src/views/lab/impact/index.vue
index be05266..f67012a 100644
--- a/src/views/lab/impact/index.vue
+++ b/src/views/lab/impact/index.vue
@@ -1,63 +1,81 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="Impact.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="Impact.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="ImpactRules"
-    :formAllSchemas="Impact.allSchemas"
-    :searchTableParams="searchTableParams"
-    :apiUpdate="ImpactApi.updateImpact"
-    :apiCreate="ImpactApi.createImpact"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
-
+  <div>
+    <ContentWrap>
+      <!-- 搜索工作栏 -->
+      <Search :schema="Impact.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Impact.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="ImpactRules"
+      :formAllSchemas="Impact.allSchemas"
+      :searchTableParams="searchTableParams"
+      :apiUpdate="ImpactApi.updateImpact"
+      :apiCreate="ImpactApi.createImpact"
+      @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>
+  </div>
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
 import { Impact,ImpactRules } from './impact.data'
 import * as ImpactApi from '@/api/lab/impact'
+import * as AsyncdataApi from '@/api/lab/asyncdata'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'Impact' })
@@ -70,20 +88,15 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(Impact.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 searchTableParams = ref([])
 
 const { tableObject, tableMethods } = useTable({
   getListApi: ImpactApi.getImpactPage // 分页接口
@@ -95,6 +108,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({}), // 新增
+  defaultButtons.defaultSyncDataBtn(null), // 同步
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultSetBtn(null), // 设置
 ]
@@ -109,12 +123,25 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') { // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'syncData') { // 同步
+    syncData.dialogVisible = true
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
+function toSyncData () {
+  syncData.dialogVisible = false
+  AsyncdataApi.asyncLabData({busType: '2' , busDate: syncData.busDate}).then((data) => {
+    if (data) {
+      message.success('操作成功')
+      getList()
+    } else {
+      message.warning('正在执行同步操作, 5分钟之内不要重复执行 , 请等待......')
+    }
+  })
+}
+
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn({}), // 编辑
@@ -219,7 +246,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await ImpactApi.importTemplate()
+  // importTemplateData.templateUrl = await ImpactApi.importTemplate()
 })
 
 </script>
\ No newline at end of file
diff --git a/src/views/lab/platscale/index.vue b/src/views/lab/platscale/index.vue
index e5ab422..352115a 100644
--- a/src/views/lab/platscale/index.vue
+++ b/src/views/lab/platscale/index.vue
@@ -52,12 +52,28 @@
     :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: 'Platscale' })
@@ -70,6 +86,8 @@ 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
@@ -95,6 +113,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultSyncDataBtn(null), // 同步
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultSetBtn(null), // 设置
   // {
@@ -117,12 +136,25 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') { // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
+  }  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), // 编辑
diff --git a/src/views/lab/platscale/platscale.data.ts b/src/views/lab/platscale/platscale.data.ts
index da3ff0c..7297556 100644
--- a/src/views/lab/platscale/platscale.data.ts
+++ b/src/views/lab/platscale/platscale.data.ts
@@ -288,6 +288,15 @@ export const Platscale = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
+  {
+    label: '数据源',
+    field: 'dataSource',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    }
+  },
   // {
   //   label: '审核状态',
   //   field: 'auditStatus',
diff --git a/src/views/lab/spectrum/index.vue b/src/views/lab/spectrum/index.vue
index ad142d1..f889c79 100644
--- a/src/views/lab/spectrum/index.vue
+++ b/src/views/lab/spectrum/index.vue
@@ -51,13 +51,27 @@
     :apiCreate="SpectrumApi.createSpectrum"
     :isBusiness="false"
   />
-
+  <!-- <el-dialog title="请选择同步日期" v-model="syncData.dialogVisible" width="20%">
+    <div class="block">
+      <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 { Spectrum,SpectrumRules } from './spectrum.data'
 import * as SpectrumApi from '@/api/lab/spectrum'
+import * as AsyncdataApi from '@/api/lab/asyncdata'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'Spectrum' })
@@ -70,6 +84,8 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(Spectrum.allSchemas.tableColumns)
 
+const syncData = reactive({dialogVisible: false , busDate: ''})
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -95,6 +111,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({}), // 新增
+  defaultButtons.defaultSyncDataBtn(null), // 同步
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultSetBtn(null), // 设置
   // {
@@ -117,12 +134,31 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') { // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'syncData') { // 同步
+    AsyncdataApi.asyncLabData({busType: '3' , busDate: syncData.busDate}).then((data) => {
+      if (data) {
+        message.success('操作成功')
+        getList()
+      } else {
+        message.warning('正在执行同步操作, 5分钟之内不要重复执行 , 请等待......')
+      }
+    })
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
+// function toSyncData () {
+//   syncData.dialogVisible = false
+//   AsyncdataApi.asyncLabData({busType: '3' , busDate: syncData.busDate}).then((data) => {
+//     if (data) {
+//       message.success('操作成功')
+//     } else {
+//       message.warning('正在执行同步操作, 5分钟之内不要重复执行 , 请等待......')
+//     }
+//   })
+// }
+
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn({}), // 编辑
diff --git a/src/views/lab/spectrum/spectrum.data.ts b/src/views/lab/spectrum/spectrum.data.ts
index 602b548..d64093b 100644
--- a/src/views/lab/spectrum/spectrum.data.ts
+++ b/src/views/lab/spectrum/spectrum.data.ts
@@ -12,9 +12,18 @@ export const Spectrum = useCrudSchemas(reactive<CrudSchema[]>([
   //   sort: 'custom',
   //   isForm: false,
   // },
+  // {
+  //   label: '批次号',
+  //   field: 'batchNo',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 150
+  //   }
+  // },
   {
-    label: '批次号',
-    field: 'batchNo',
+    label: '炉批号(批号)',
+    field: 'lpNo',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -126,12 +135,12 @@ export const Spectrum = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  {
-    label: '预留',
-    field: 'sid1',
-    sort: 'custom',
-    isSearch: false,
-  },
+  // {
+  //   label: '预留',
+  //   field: 'sid1',
+  //   sort: 'custom',
+  //   isSearch: false,
+  // },
   {
     label: '类型',
     field: 'type',
diff --git a/src/views/lab/stretch/stretchthousandnew/index.vue b/src/views/lab/stretch/stretchthousandnew/index.vue
index f28d775..661e285 100644
--- a/src/views/lab/stretch/stretchthousandnew/index.vue
+++ b/src/views/lab/stretch/stretchthousandnew/index.vue
@@ -53,6 +53,22 @@
     :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>
+    
   <Qxview ref="qxviewRef" />
 
 </template>
@@ -61,6 +77,7 @@
 import download from '@/utils/download'
 import { StretchThousandnew,StretchThousandnewRules } from './stretchThousandnew.data'
 import * as StretchThousandnewApi from '@/api/lab/stretch/stretchThousandnew'
+import * as AsyncdataApi from '@/api/lab/asyncdata'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'StretchThousandnew' })
@@ -72,6 +89,8 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(StretchThousandnew.allSchemas.tableColumns)
 
+const syncData = reactive({dialogVisible: false , busDate: ''})
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -101,6 +120,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultSyncDataBtn(null), // 同步
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultSetBtn(null), // 设置
   // {
@@ -123,12 +143,25 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') { // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'syncData') { // 同步
+    syncData.dialogVisible = true
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
+function toSyncData () {
+  syncData.dialogVisible = false
+  AsyncdataApi.asyncLabData({busType: '5' , busDate: syncData.busDate}).then((data) => {
+    if (data) {
+      message.success('操作成功')
+      getList()
+    } else {
+      message.warning('正在执行同步操作, 5分钟之内不要重复执行 , 请等待......')
+    }
+  })
+}
+
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn(null), // 编辑
diff --git a/src/views/lab/stretch/stretchthreehundred/index.vue b/src/views/lab/stretch/stretchthreehundred/index.vue
index a284800..40cb8f8 100644
--- a/src/views/lab/stretch/stretchthreehundred/index.vue
+++ b/src/views/lab/stretch/stretchthreehundred/index.vue
@@ -53,6 +53,22 @@
     :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>
+
   <QxviewThree ref="qxviewThreeRef" />
 
 </template>
@@ -61,6 +77,7 @@
 import download from '@/utils/download'
 import { Stretch300,Stretch300Rules } from './stretchthreehundred.data'
 import * as Stretch300Api from '@/api/lab/stretch/stretchthreehundred'
+import * as AsyncdataApi from '@/api/lab/asyncdata'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 defineOptions({ name: 'Stretch300' })
@@ -74,15 +91,18 @@ routeName.value = route.name
 const tableColumns = ref(Stretch300.allSchemas.tableColumns)
 const qxviewThreeRef = ref()
 
+const syncData = reactive({dialogVisible: false , busDate: ''})
+
 const openQxView = async (row) => {
-  const data = await Stretch300Api.getStretchThreeQxInfo(row.syzbh)
-  if (data != null && data.dataList != null) {
-    qxviewThreeRef.value.open(data.dataList , '实验力-位移')
+  const sybhList = await Stretch300Api.getQxSyzbhs(row.syzbh)
+  if (sybhList != null && sybhList.length > 0) {
+      const data = await Stretch300Api.getStretchThreeQxInfo(sybhList[0])
+      if (data != null && data.dataList != null) {
+        qxviewThreeRef.value.open(sybhList , data.dataList , '实验力-位移')
+      }
   }
 }
 
-
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -108,6 +128,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultSyncDataBtn(null), // 同步
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultSetBtn(null), // 设置
   // {
@@ -130,12 +151,25 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') { // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'syncData') { // 同步
+    syncData.dialogVisible = true
+  }else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
+function toSyncData () {
+  syncData.dialogVisible = false
+  AsyncdataApi.asyncLabData({busType: '4' , busDate: syncData.busDate}).then((data) => {
+    if (data) {
+      message.success('操作成功')
+      getList()
+    } else {
+      message.warning('正在执行同步操作, 5分钟之内不要重复执行 , 请等待......')
+    }
+  })
+}
+
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn(null), // 编辑
diff --git a/src/views/pszc/cdelectricdata/cdElectricdata.data.ts b/src/views/pszc/cdelectricdata/cdElectricdata.data.ts
index 49d205d..a99abcc 100644
--- a/src/views/pszc/cdelectricdata/cdElectricdata.data.ts
+++ b/src/views/pszc/cdelectricdata/cdElectricdata.data.ts
@@ -1,28 +1,52 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+
+// 数据点
+const sjdList = await PszcCommonApi.selectCdPros({flag: '5' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectCdPros({flag: '5' , type: '2'})
 
 // 表单校验
 export const CdElectricdataRules = reactive({
 })
 
 export const CdElectricdata = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +62,32 @@ export const CdElectricdata = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集时间',
diff --git a/src/views/pszc/cdnatgasdata/cdNatgasdata.data.ts b/src/views/pszc/cdnatgasdata/cdNatgasdata.data.ts
index 603c823..c5c60e0 100644
--- a/src/views/pszc/cdnatgasdata/cdNatgasdata.data.ts
+++ b/src/views/pszc/cdnatgasdata/cdNatgasdata.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectCdPros({flag: '7' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectCdPros({flag: '7' , type: '2'})
 
 // 表单校验
 export const CdNatgasdataRules = reactive({
 })
 
 export const CdNatgasdata = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const CdNatgasdata = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/cdpuncherdata/cdPuncherdata.data.ts b/src/views/pszc/cdpuncherdata/cdPuncherdata.data.ts
index 1cef942..7f98c8c 100644
--- a/src/views/pszc/cdpuncherdata/cdPuncherdata.data.ts
+++ b/src/views/pszc/cdpuncherdata/cdPuncherdata.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectCdPros({flag: '6' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectCdPros({flag: '6' , type: '2'})
 
 // 表单校验
 export const CdPuncherdataRules = reactive({
 })
 
 export const CdPuncherdata = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const CdPuncherdata = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/cdslotfurnace/cdSlotfurnace.data.ts b/src/views/pszc/cdslotfurnace/cdSlotfurnace.data.ts
index 0c94aaa..ab54786 100644
--- a/src/views/pszc/cdslotfurnace/cdSlotfurnace.data.ts
+++ b/src/views/pszc/cdslotfurnace/cdSlotfurnace.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectCdPros({flag: '3' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectCdPros({flag: '3' , type: '2'})
 
 // 表单校验
 export const CdSlotfurnaceRules = reactive({
 })
 
 export const CdSlotfurnace = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const CdSlotfurnace = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/cdsmelterfurnace/cdSmelterfurnace.data.ts b/src/views/pszc/cdsmelterfurnace/cdSmelterfurnace.data.ts
index 427672b..616dc07 100644
--- a/src/views/pszc/cdsmelterfurnace/cdSmelterfurnace.data.ts
+++ b/src/views/pszc/cdsmelterfurnace/cdSmelterfurnace.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectCdPros({flag: '2' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectCdPros({flag: '2' , type: '2'})
 
 // 表单校验
 export const CdSmelterfurnaceRules = reactive({
 })
 
 export const CdSmelterfurnace = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const CdSmelterfurnace = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/cdstepfurnace/cdStepfurnace.data.ts b/src/views/pszc/cdstepfurnace/cdStepfurnace.data.ts
index cdb655d..2762aaa 100644
--- a/src/views/pszc/cdstepfurnace/cdStepfurnace.data.ts
+++ b/src/views/pszc/cdstepfurnace/cdStepfurnace.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectCdPros({flag: '1' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectCdPros({flag: '1' , type: '2'})
 
 // 表单校验
 export const CdStepfurnaceRules = reactive({
 })
 
 export const CdStepfurnace = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const CdStepfurnace = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/cdwatermeter/cdWatermeter.data.ts b/src/views/pszc/cdwatermeter/cdWatermeter.data.ts
index 5e806fd..f48f59e 100644
--- a/src/views/pszc/cdwatermeter/cdWatermeter.data.ts
+++ b/src/views/pszc/cdwatermeter/cdWatermeter.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectCdPros({flag: '4' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectCdPros({flag: '4' , type: '2'})
 
 // 表单校验
 export const CdWatermeterRules = reactive({
 })
 
 export const CdWatermeter = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const CdWatermeter = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: true,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrannularfurnace108/hrAnnularfurnace108.data.ts b/src/views/pszc/hrannularfurnace108/hrAnnularfurnace108.data.ts
index 71610b4..314d278 100644
--- a/src/views/pszc/hrannularfurnace108/hrAnnularfurnace108.data.ts
+++ b/src/views/pszc/hrannularfurnace108/hrAnnularfurnace108.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr108Pros({flag: '1' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr108Pros({flag: '1' , type: '2'})
 
 // 表单校验
 export const HrAnnularfurnace108Rules = reactive({
 })
 
 export const HrAnnularfurnace108 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrAnnularfurnace108 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrannularfurnace90/hrAnnularfurnace90.data.ts b/src/views/pszc/hrannularfurnace90/hrAnnularfurnace90.data.ts
index b63ee38..e396d7a 100644
--- a/src/views/pszc/hrannularfurnace90/hrAnnularfurnace90.data.ts
+++ b/src/views/pszc/hrannularfurnace90/hrAnnularfurnace90.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr90Pros({flag: '1' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr90Pros({flag: '1' , type: '2'})
 
 // 表单校验
 export const HrAnnularfurnace90Rules = reactive({
 })
 
 export const HrAnnularfurnace90 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrAnnularfurnace90 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrannularfurnacegas108/hrAnnularfurnacegas108.data.ts b/src/views/pszc/hrannularfurnacegas108/hrAnnularfurnacegas108.data.ts
index d3a9514..22e6777 100644
--- a/src/views/pszc/hrannularfurnacegas108/hrAnnularfurnacegas108.data.ts
+++ b/src/views/pszc/hrannularfurnacegas108/hrAnnularfurnacegas108.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr108Pros({flag: '2' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr108Pros({flag: '2' , type: '2'})
 
 // 表单校验
 export const HrAnnularfurnacegas108Rules = reactive({
 })
 
 export const HrAnnularfurnacegas108 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -31,10 +54,33 @@ export const HrAnnularfurnacegas108 = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
   },
   {
-    label: '仪表的编号',
+    label: '仪表的名称',
     field: 'mcode',
-    sort: 'custom',
-    isSearch: false,
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '仪表的名称',
diff --git a/src/views/pszc/hrelongatordata108/hrElongatordata108.data.ts b/src/views/pszc/hrelongatordata108/hrElongatordata108.data.ts
index e724bd3..e1a8b17 100644
--- a/src/views/pszc/hrelongatordata108/hrElongatordata108.data.ts
+++ b/src/views/pszc/hrelongatordata108/hrElongatordata108.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr108Pros({flag: '4' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr108Pros({flag: '4' , type: '2'})
 
 // 表单校验
 export const HrElongatordata108Rules = reactive({
 })
 
 export const HrElongatordata108 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrElongatordata108 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrelongatordata90/hrElongatordata90.data.ts b/src/views/pszc/hrelongatordata90/hrElongatordata90.data.ts
index 0351b89..8bf1c01 100644
--- a/src/views/pszc/hrelongatordata90/hrElongatordata90.data.ts
+++ b/src/views/pszc/hrelongatordata90/hrElongatordata90.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr90Pros({flag: '3' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr90Pros({flag: '3' , type: '2'})
 
 // 表单校验
 export const HrElongatordata90Rules = reactive({
 })
 
 export const HrElongatordata90 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrElongatordata90 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrnatgasdata/hrNatgasdata.data.ts b/src/views/pszc/hrnatgasdata/hrNatgasdata.data.ts
index 378e09a..2849e66 100644
--- a/src/views/pszc/hrnatgasdata/hrNatgasdata.data.ts
+++ b/src/views/pszc/hrnatgasdata/hrNatgasdata.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHrTrqPros({type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHrTrqPros({type: '2'})
 
 // 表单校验
 export const HrNatgasdataRules = reactive({
 })
 
 export const HrNatgasdata = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrNatgasdata = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrpuncherdata108/hrPuncherdata108.data.ts b/src/views/pszc/hrpuncherdata108/hrPuncherdata108.data.ts
index f9f95a5..08037bb 100644
--- a/src/views/pszc/hrpuncherdata108/hrPuncherdata108.data.ts
+++ b/src/views/pszc/hrpuncherdata108/hrPuncherdata108.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr108Pros({flag: '3' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr108Pros({flag: '3' , type: '2'})
 
 // 表单校验
 export const HrPuncherdata108Rules = reactive({
 })
 
 export const HrPuncherdata108 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrPuncherdata108 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrpuncherdata90/hrPuncherdata90.data.ts b/src/views/pszc/hrpuncherdata90/hrPuncherdata90.data.ts
index a7a099b..90fb37e 100644
--- a/src/views/pszc/hrpuncherdata90/hrPuncherdata90.data.ts
+++ b/src/views/pszc/hrpuncherdata90/hrPuncherdata90.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr90Pros({flag: '2' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr90Pros({flag: '2' , type: '2'})
 
 // 表单校验
 export const HrPuncherdata90Rules = reactive({
 })
 
 export const HrPuncherdata90 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrPuncherdata90 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts b/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts
index 8c185a1..e7f69d4 100644
--- a/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts
+++ b/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr108Pros({flag: '5' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr108Pros({flag: '5' , type: '2'})
 
 // 表单校验
 export const HrSizingmilldata108Rules = reactive({
 })
 
 export const HrSizingmilldata108 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrSizingmilldata108 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts b/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts
index 7754677..e0b424f 100644
--- a/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts
+++ b/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr90Pros({flag: '4' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr90Pros({flag: '4' , type: '2'})
 
 // 表单校验
 export const HrSizingmilldata90Rules = reactive({
 })
 
 export const HrSizingmilldata90 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrSizingmilldata90 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrwatermeter108/hrWatermeter108.data.ts b/src/views/pszc/hrwatermeter108/hrWatermeter108.data.ts
index 946842e..5a6543d 100644
--- a/src/views/pszc/hrwatermeter108/hrWatermeter108.data.ts
+++ b/src/views/pszc/hrwatermeter108/hrWatermeter108.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr108Pros({flag: '6' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr108Pros({flag: '6' , type: '2'})
 
 // 表单校验
 export const HrWatermeter108Rules = reactive({
 })
 
 export const HrWatermeter108 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrWatermeter108 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/pszc/hrwatermeter90/hrWatermeter90.data.ts b/src/views/pszc/hrwatermeter90/hrWatermeter90.data.ts
index 42b639d..1e97b93 100644
--- a/src/views/pszc/hrwatermeter90/hrWatermeter90.data.ts
+++ b/src/views/pszc/hrwatermeter90/hrWatermeter90.data.ts
@@ -1,28 +1,51 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+import * as PszcCommonApi from '@/api/pszc/pszccommon'
+// 数据点
+const sjdList = await PszcCommonApi.selectHr90Pros({flag: '5' , type: '1'})
+// 仪器仪表
+const yqbList = await PszcCommonApi.selectHr90Pros({flag: '5' , type: '2'})
 
 // 表单校验
 export const HrWatermeter90Rules = reactive({
 })
 
 export const HrWatermeter90 = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '主键、自增',
-  //   field: 'id',
-  //   sort: 'custom',
-  //   isForm: false,
-  // },
   {
     label: '数据点编号',
     field: 'icode',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '数据点名称',
-    field: 'iname',
-    sort: 'custom',
-    isSearch: false,
+    field: 'icode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return sjdList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => sjdList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '采集值',
@@ -38,9 +61,32 @@ export const HrWatermeter90 = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '仪表的名称',
-    field: 'mname',
-    sort: 'custom',
-    isSearch: true,
+    field: 'mcode',
+    isTable: true,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return yqbList.find((obj) => obj.code === cellValue)?.label
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => yqbList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'code'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
diff --git a/src/views/tjanalysis/electricdatatotal/index.vue b/src/views/tjanalysis/electricdatatotal/index.vue
new file mode 100644
index 0000000..aa1b5c7
--- /dev/null
+++ b/src/views/tjanalysis/electricdatatotal/index.vue
@@ -0,0 +1,126 @@
+<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>
+        <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="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" />
+      <el-table-column label="峰值比例" prop="idescFt" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="谷" prop="idescG" align="center" :show-overflow-tooltip="true" />
+      <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>
+  </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: []
+})
+
+const handleQuery = async () => {
+  getList()
+}
+
+const resetQuery = async () => {
+  queryParams.dateRange = []
+  getList()
+}
+
+const getList = async () => {
+  const res = await TjanalysisApi.queryElectricdataAllTj(queryParams)
+  console.log(res)
+  if (res != null && res.dataList != null) {
+    dataList.dList = res.dataList
+  }
+  loading.value = false
+}
+
+const exportElecTotal = async () => {
+  const res = await TjanalysisApi.exportElectricdataAllTj(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 () => {
+  getList()
+})
+
+</script>
+
diff --git a/src/views/tjanalysis/irealdata/index.vue b/src/views/tjanalysis/irealdata/index.vue
index 98d1179..977eef4 100644
--- a/src/views/tjanalysis/irealdata/index.vue
+++ b/src/views/tjanalysis/irealdata/index.vue
@@ -25,17 +25,17 @@
       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" prop="num0" :show-overflow-tooltip="true" />
-      <el-table-column label="06:00" prop="num6" :show-overflow-tooltip="true" />
-      <el-table-column label="08:00" prop="num8" :show-overflow-tooltip="true" />
-      <el-table-column label="12:00" prop="num12" :show-overflow-tooltip="true" />
-      <el-table-column label="16:00" prop="num16" :show-overflow-tooltip="true" />
-      <el-table-column label="18:00" prop="num18" :show-overflow-tooltip="true" />
-      <el-table-column label="20:00" prop="num20" :show-overflow-tooltip="true" />
-      <el-table-column label="22:00" prop="num22" :show-overflow-tooltip="true" />
-      <el-table-column label="24:00" prop="num24" :show-overflow-tooltip="true" />
-      <el-table-column label="总(24:00-00:00)" prop="num0024" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="电量" prop="numTj" :show-overflow-tooltip="true" />
+      <el-table-column label="00:00" prop="num0" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="06:00" prop="num6" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="08:00" prop="num8" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="12:00" prop="num12" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="16:00" prop="num16" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="18:00" prop="num18" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="20:00" prop="num20" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="22:00" prop="num22" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="24:00" prop="num24" align="center" :show-overflow-tooltip="true" />
+      <el-table-column label="总(24:00-00:00)" prop="num0024" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="电量" prop="numTj" align="center" :show-overflow-tooltip="true" />
     </el-table>
   </ContentWrap>
 
diff --git a/src/views/tjanalysis/natgasdatacd/index.vue b/src/views/tjanalysis/natgasdatacd/index.vue
new file mode 100644
index 0000000..bff2d18
--- /dev/null
+++ b/src/views/tjanalysis/natgasdatacd/index.vue
@@ -0,0 +1,121 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="queryParams.date"
+          style="width: 240px; height: 30px"
+          value-format="YYYY-MM-DD"
+          type="date"
+        />
+      </el-form-item>
+      <el-form-item label="位置" prop="mcode">
+        <el-select v-model="queryParams.mcode" placeholder="请选择">
+          <el-option
+            v-for="item in types.flagList"
+            :key="item.value"
+            :label="item.name"
+            :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-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-divider content-position="left"><div style="font-size:16px; float: left"><b>天然气：</b></div></el-divider>
+    <el-table
+      v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true" 
+      header-row-style="height: 50px; text-align: center">
+      <!-- <el-table-column label="" prop="mname" align="right" :show-overflow-tooltip="true" width="250" /> -->
+      <el-table-column label="" prop="name" align="right" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="00:00" prop="num0" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="06:00" prop="num6" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="08:00" prop="num8" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="12:00" prop="num12" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="16:00" prop="num16" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="18:00" prop="num18" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="20:00" prop="num20" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="22:00" prop="num22" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="24:00" prop="num24" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="08:00-00:00" prop="num0008" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="16:00-08:00" prop="num0816" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="24:00-16:00" prop="num1624" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="12:00-00:00" prop="num0012" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="24:00-12:00" prop="num1224" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="总(24:00-00:00)" prop="num0024" align="center" :show-overflow-tooltip="true" width="150" />
+      <!-- <el-table-column label="电量" prop="numTj" align="center" :show-overflow-tooltip="true" width="100" /> -->
+    </el-table>
+  </ContentWrap>
+
+</template>
+
+<script setup lang="ts">
+import * as TjanalysisApi from '@/api/tjanalysis'
+import { formatDate } from '@/utils/formatTime'
+import { get } from 'http'
+
+defineOptions({ name: 'Natgasdatahr' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const loading = ref(true)
+const types = reactive({flagList: [
+  {name: '步进炉' , value: 'Gas_hr_001'},
+  {name: '固熔炉' , value: '2'},
+  {name: '缝式炉' , value: '3'}
+]})
+const dataList = reactive({dList: [] , days: 0})
+
+const queryParams = reactive({
+  date: formatDate(new Date() , 'YYYY-MM-DD'),
+  mcode: 'Gas_hr_001',
+  flag: '2'
+})
+
+const handleQuery = async () => {
+  dataList.dList = []
+  getList()
+}
+
+const resetQuery = async () => {
+  dataList.dList = []
+  queryParams.date = formatDate(new Date() , 'YYYY-MM-DD')
+  getList()
+}
+
+const getList = async () => {
+  const res = await TjanalysisApi.queryNatgasdataDay(queryParams)
+  if (res != null && res.dataList != null) {
+    dataList.dList = res.dataList
+  }
+  loading.value = false
+}
+
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
+
+<style>
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+
+  .el-table .success-cols {
+    font-weight: bold;
+  }
+</style>
+
diff --git a/src/views/tjanalysis/natgasdatahr/index.vue b/src/views/tjanalysis/natgasdatahr/index.vue
new file mode 100644
index 0000000..383fcc3
--- /dev/null
+++ b/src/views/tjanalysis/natgasdatahr/index.vue
@@ -0,0 +1,120 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="queryParams.date"
+          style="width: 240px; height: 30px"
+          value-format="YYYY-MM-DD"
+          type="date"
+        />
+      </el-form-item>
+      <el-form-item label="位置" prop="mcode">
+        <el-select v-model="queryParams.mcode" placeholder="请选择">
+          <el-option
+            v-for="item in types.flagList"
+            :key="item.value"
+            :label="item.name"
+            :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-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-divider content-position="left"><div style="font-size:16px; float: left"><b>天然气：</b></div></el-divider>
+    <el-table
+      v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true" 
+      header-row-style="height: 50px; text-align: center">
+      <!-- <el-table-column label="" prop="mname" align="right" :show-overflow-tooltip="true" width="250" /> -->
+      <el-table-column label="" prop="name" align="right" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="00:00" prop="num0" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="06:00" prop="num6" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="08:00" prop="num8" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="12:00" prop="num12" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="16:00" prop="num16" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="18:00" prop="num18" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="20:00" prop="num20" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="22:00" prop="num22" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="24:00" prop="num24" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="08:00-00:00" prop="num0008" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="16:00-08:00" prop="num0816" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="24:00-16:00" prop="num1624" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="12:00-00:00" prop="num0012" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="24:00-12:00" prop="num1224" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="总(24:00-00:00)" prop="num0024" align="center" :show-overflow-tooltip="true" width="150" />
+      <!-- <el-table-column label="电量" prop="numTj" align="center" :show-overflow-tooltip="true" width="100" /> -->
+    </el-table>
+  </ContentWrap>
+
+</template>
+
+<script setup lang="ts">
+import * as TjanalysisApi from '@/api/tjanalysis'
+import { formatDate } from '@/utils/formatTime'
+import { get } from 'http'
+
+defineOptions({ name: 'Natgasdatahr' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const loading = ref(true)
+const types = reactive({flagList: [
+  {name: '热轧108环炉' , value: 'Gas_hr_001'},
+  // {name: '热轧90环炉' , value: '2'}
+]})
+const dataList = reactive({dList: [] , days: 0})
+
+const queryParams = reactive({
+  date: formatDate(new Date() , 'YYYY-MM-DD'),
+  mcode: 'Gas_hr_001',
+  flag: '1'
+})
+
+const handleQuery = async () => {
+  dataList.dList = []
+  getList()
+}
+
+const resetQuery = async () => {
+  dataList.dList = []
+  queryParams.date = formatDate(new Date() , 'YYYY-MM-DD')
+  getList()
+}
+
+const getList = async () => {
+  const res = await TjanalysisApi.queryNatgasdataDay(queryParams)
+  if (res != null && res.dataList != null) {
+    dataList.dList = res.dataList
+  }
+  loading.value = false
+}
+
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
+
+<style>
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+
+  .el-table .success-cols {
+    font-weight: bold;
+  }
+</style>
+
diff --git a/src/views/tjanalysis/waterday/index.vue b/src/views/tjanalysis/waterday/index.vue
new file mode 100644
index 0000000..e24f698
--- /dev/null
+++ b/src/views/tjanalysis/waterday/index.vue
@@ -0,0 +1,125 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="queryParams.date"
+          style="width: 240px; height: 30px"
+          value-format="YYYY-MM-DD"
+          type="date"
+        />
+      </el-form-item>
+      <el-form-item label="位置" prop="mcode">
+        <el-select v-model="queryParams.mcode" placeholder="请选择">
+          <el-option
+            v-for="item in types.flagList"
+            :key="item.value"
+            :label="item.name"
+            :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-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-divider content-position="left"><div style="font-size:16px; float: left"><b>天然气：</b></div></el-divider>
+    <el-table
+      v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true" 
+      header-row-style="height: 50px; text-align: center">
+      <!-- <el-table-column label="" prop="mname" align="right" :show-overflow-tooltip="true" width="250" /> -->
+      <el-table-column label="" prop="name" align="right" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="00:00" prop="num0" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="06:00" prop="num6" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="08:00" prop="num8" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="12:00" prop="num12" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="16:00" prop="num16" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="18:00" prop="num18" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="20:00" prop="num20" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="22:00" prop="num22" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="24:00" prop="num24" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="08:00-00:00" prop="num0008" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="16:00-08:00" prop="num0816" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="24:00-16:00" prop="num1624" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="12:00-00:00" prop="num0012" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="24:00-12:00" prop="num1224" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="总(24:00-00:00)" prop="num0024" align="center" :show-overflow-tooltip="true" width="150" />
+      <!-- <el-table-column label="电量" prop="numTj" align="center" :show-overflow-tooltip="true" width="100" /> -->
+    </el-table>
+  </ContentWrap>
+
+</template>
+
+<script setup lang="ts">
+import * as TjanalysisApi from '@/api/tjanalysis'
+import { formatDate } from '@/utils/formatTime'
+import { get } from 'http'
+
+defineOptions({ name: 'Waterday' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const loading = ref(true)
+const types = reactive({flagList: [
+  {name: '冷拔循环水' , value: 'Gas_hr_001'},
+  {name: '冷拔生产水1' , value: '2'},
+  {name: '冷拔生产水2' , value: '2'},
+  {name: '热轧90循环水' , value: '2'},
+  {name: '热轧90生产水' , value: '2'},
+  {name: '热轧108循环水' , value: '2'},
+  {name: '热轧108生产水' , value: '2'}
+]})
+const dataList = reactive({dList: [] })
+
+const queryParams = reactive({
+  date: formatDate(new Date() , 'YYYY-MM-DD'),
+  mcode: 'Gas_hr_001',
+  flag: '1'
+})
+
+const handleQuery = async () => {
+  dataList.dList = []
+  getList()
+}
+
+const resetQuery = async () => {
+  dataList.dList = []
+  queryParams.date = formatDate(new Date() , 'YYYY-MM-DD')
+  getList()
+}
+
+const getList = async () => {
+  const res = await TjanalysisApi.queryWaterDay(queryParams)
+  if (res != null && res.dataList != null) {
+    dataList.dList = res.dataList
+  }
+  loading.value = false
+}
+
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
+
+<style>
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+
+  .el-table .success-cols {
+    font-weight: bold;
+  }
+</style>
+